From 4a0ea1438bc15d0d0e0e69c6661425d2799a7ab2 Mon Sep 17 00:00:00 2001 From: kami2693 Date: Wed, 6 Nov 2024 19:14:15 +0100 Subject: [PATCH] solution --- .eslintrc.js | 10 ---------- .github/workflows/test.yml-template | 23 +++++++++++++++++++++++ package-lock.json | 9 +++++---- package.json | 2 +- src/convertToObject.js | 19 ++++++++++++++++++- 5 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/test.yml-template diff --git a/.eslintrc.js b/.eslintrc.js index f44c7a1df..e69de29bb 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,10 +0,0 @@ -module.exports = { - extends: '@mate-academy/eslint-config', - env: { - jest: true - }, - rules: { - 'no-proto': 0 - }, - plugins: ['jest'] -}; diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 000000000..bb13dfc45 --- /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 02e16147d..0f8d13be2 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": "^1.9.12", "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": "1.9.12", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", + "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", "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 b8daf8250..60940aaf2 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": "^1.9.12", "eslint": "^8.57.0", "eslint-plugin-jest": "^28.6.0", "eslint-plugin-node": "^11.1.0", diff --git a/src/convertToObject.js b/src/convertToObject.js index 32c556ea4..2d238802d 100644 --- a/src/convertToObject.js +++ b/src/convertToObject.js @@ -6,7 +6,24 @@ * @return {object} */ function convertToObject(sourceString) { - // write your code here + const result = {}; + const rules = sourceString.split(';'); + + rules.forEach((rule) => { + const clearRule = rule.trim(); + + if (clearRule) { + const parts = clearRule.split(':'); + const key = parts[0].trim(); + const value = parts.length > 1 ? parts.slice(1).join(':').trim() : ''; + + if (key) { + result[key] = value; + } + } + }); + + return result; } module.exports = convertToObject;