From 05196d7ce1b3a85d685daa3aa6560c4ef01e36aa Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 29 Jan 2026 16:59:16 +0200 Subject: [PATCH 1/3] solution --- .github/workflows/test.yml-template | 23 +++++++++++++++++++++++ package-lock.json | 9 +++++---- package.json | 2 +- src/arrayMethodSort.js | 18 ++++++++++++++++-- 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/test.yml-template diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 00000000..bb13dfc4 --- /dev/null +++ b/.github/workflows/test.yml-template @@ -0,0 +1,23 @@ +name: Test + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - run: npm test diff --git a/package-lock.json b/package-lock.json index eadb3115..84d432db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^2.1.3", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-node": "^11.1.0", @@ -1467,10 +1467,11 @@ } }, "node_modules/@mate-academy/scripts": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz", - "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz", + "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 9c0b7bbd..0827621b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "license": "GPL-3.0", "devDependencies": { "@mate-academy/eslint-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^2.1.3", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-node": "^11.1.0", diff --git a/src/arrayMethodSort.js b/src/arrayMethodSort.js index 32363d0d..8cae1fa9 100644 --- a/src/arrayMethodSort.js +++ b/src/arrayMethodSort.js @@ -4,8 +4,22 @@ * Implement method Sort */ function applyCustomSort() { - [].__proto__.sort2 = function(compareFunction) { - // write code here + [].__proto__.sort2 = function (compareFunction) { + let temp; + + for (let i = 0; i < this.length; i++) { + for (let j = 0; j < this.length - 1; j++) { + const num = compareFunction(this[j], this[j + 1]); + + if (num > 0) { + temp = this[j]; + this[j] = this[j + 1]; + this[j + 1] = temp; + } + } + } + + return this; }; } From d61a6f90e8c6f9b303d251ba619dd087bc6a0766 Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 29 Jan 2026 17:31:49 +0200 Subject: [PATCH 2/3] update solution --- src/arrayMethodSort.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/arrayMethodSort.js b/src/arrayMethodSort.js index 8cae1fa9..19a25cf6 100644 --- a/src/arrayMethodSort.js +++ b/src/arrayMethodSort.js @@ -5,11 +5,28 @@ */ function applyCustomSort() { [].__proto__.sort2 = function (compareFunction) { + const compare = + compareFunction || + ((a, b) => { + const sA = String(a); + const sB = String(b); + + if (sA > sB) { + return 1; + } + + if (sA < sB) { + return -1; + } + + return 0; + }); + let temp; for (let i = 0; i < this.length; i++) { for (let j = 0; j < this.length - 1; j++) { - const num = compareFunction(this[j], this[j + 1]); + const num = compare(this[j], this[j + 1]); if (num > 0) { temp = this[j]; From cc7a06a9d17c5eff4996cf85bc3e317b9819b6e2 Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 29 Jan 2026 17:44:03 +0200 Subject: [PATCH 3/3] update loop`s condition --- src/arrayMethodSort.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/arrayMethodSort.js b/src/arrayMethodSort.js index 19a25cf6..a6327608 100644 --- a/src/arrayMethodSort.js +++ b/src/arrayMethodSort.js @@ -5,27 +5,27 @@ */ function applyCustomSort() { [].__proto__.sort2 = function (compareFunction) { - const compare = - compareFunction || - ((a, b) => { - const sA = String(a); - const sB = String(b); - - if (sA > sB) { - return 1; - } + const defaultCompare = (a, b) => { + const strA = String(a); + const strB = String(b); - if (sA < sB) { - return -1; - } + if (strA > strB) { + return 1; + } + + if (strA < strB) { + return -1; + } + + return 0; + }; - return 0; - }); + const compare = compareFunction || defaultCompare; let temp; for (let i = 0; i < this.length; i++) { - for (let j = 0; j < this.length - 1; j++) { + for (let j = 0; j < this.length - 1 - i; j++) { const num = compare(this[j], this[j + 1]); if (num > 0) {