Merge pull request #9 from sineverba/refactor-repository

Refactor repository

.circleci/config.yml

@@ -1,15 +1,24 @@
 version: 2.1
 jobs:
-
   test:
     docker:
       - image: cimg/node:20.10.0
-
+    resource_class: medium
+    environment:
+      NPM_VERSION: 10.2.5
     steps:
       - checkout
-      - run: npm ci
-      - run: npx jest
-
+      - run:
+          name: "Setup NPM version"
+          command: npm install npm@${NPM_VERSION}
+      - run:
+          name: "Setup project"
+          command: npm ci
+      - run:
+          name: "Run test"
+          command: npx jest
+      - store_test_results:
+          path: ./.test_report
 workflows:
   version: 2
   test:

.gitignore

@@ -1,10 +1,5 @@
-coverage
-node_modules
-build
-npm-debug.log
-.env
-.DS_Store
-.npmrc
-.nyc_output
-.scannerwork
-dist/
+.scannerwork/
+.test_report/
+coverage/
+dist/
+node_modules/

.prettierignore

@@ -0,0 +1 @@
+__tests__/

.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "tabWidth": 2,
+  "trailingComma": "none"
+}

.semaphore/build-deploy.yml

@@ -7,17 +7,21 @@ agent:
     os_image: ubuntu2004
 
 global_job_config:
+  env_vars:
+    - name: NPM_VERSION
+      value: 10.2.5
   secrets:
     - name: ACCESS_TOKENS
 
 blocks:
-  - name: Deploy
+  - name: Deploy to NPM
     task:
       jobs:
-        - name: Deploy
+        - name: Deploy to NPM
           commands:
             - checkout
+            - npm install npm@$NPM_VERSION
             - npm ci
             - npm run build
             - mv npmrc.txt .npmrc
-            - npm publish
+            - npm publish

.semaphore/semaphore.yml

@@ -9,7 +9,9 @@ agent:
 global_job_config:
   env_vars:
     - name: SONARSCANNER_VERSION
-      value: 5.0.1
+      value: 10.0.2.1398_5.0.1
+    - name: NPM_VERSION
+      value: 10.2.5
   secrets:
     - name: ACCESS_TOKENS
 
@@ -35,21 +37,30 @@ blocks:
           - checkout
           - cache restore
       jobs:
-        - name: Test
+        - name: Test previous Node versions
           matrix:
             - env_var: NODE_VERSION
-              values: [ "14", "16", "18", "20" ]
+              values: [ "14","16", "18" ]
           commands:
             - sem-version node $NODE_VERSION
             - npx jest
+        - name: Test current Node versions
+          commands:
+            - rm -r node_modules/
+            - nvm install
+            - nvm use
+            - npm install npm@$NPM_VERSION
+            - npm ci
+            - npx jest
+            - '[[ -f ./.test_report/junit.xml ]] && test-results publish ./.test_report/junit.xml'
+            - test-results gen-pipeline-report
         - name: Prettier
           commands:
             - rm -r node_modules/
             - nvm install
             - nvm use
             - npm ci
             - npm run prettier
-
   - name: Coverage
     skip:
       when: "tag =~ '.*'"

CHANGELOG.md

@@ -1,3 +1,6 @@
+# Next version
++ Refactor repository
+
 ## 1.2.0
 + Upgrade dependencies
 

Makefile

@@ -1,15 +1,19 @@
-SONARSCANNER_VERSION=5.0.1
+SONARSCANNER_VERSION=10.0.2.1398_5.0.1
 
 sonar:
-	docker run --rm -it \
+	docker run \
+		--rm \
+		-it \
 		--name sonarscanner \
 		-v $(PWD):/usr/src \
 		-e SONAR_HOST_URL=$(SONAR_HOST_URL) \
 		-e SONAR_TOKEN=$(SONAR_TOKEN) \
 		sonarsource/sonar-scanner-cli:$(SONARSCANNER_VERSION)
 
 upgrade:
-	npx ncu -u
-	npm install
+	npx ncu \
+		-x eslint \
+		-u 
 	npx update-browserslist-db@latest
-	npm audit fix
+	npm install
+	npm audit fix || exit 0;

README.md

@@ -58,9 +58,3 @@ console.log(newData);
  */
 
 ```
-
-#### Tests
-
-`npm run test` for simple test
-
-`npm run cover` for coverage

eslint.config.mjs

@@ -0,0 +1,14 @@
+// @ts-check
+
+import eslint from "@eslint/js";
+import prettierConfig from "eslint-config-prettier";
+import tseslint from "typescript-eslint";
+
+export default tseslint.config({
+  files: ["src/index.ts"],
+  extends: [
+    eslint.configs.recommended,
+    ...tseslint.configs.recommended,
+    prettierConfig
+  ]
+});

jest.config.js

@@ -1,5 +1,11 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-};
+  preset: "ts-jest",
+  reporters: ["default", ["jest-junit", { outputDirectory: ".test_report" }]],
+  setupFilesAfterEnv: ["<rootDir>/setupTest.js"],
+  testEnvironment: "jsdom",
+  moduleNameMapper: {
+    // Force module uuid to resolve with the CJS entry point, because Jest does not support package.json.exports. See https://github.com/uuidjs/uuid/issues/451
+    uuid: require.resolve("uuid")
+  }
+};