Merge 0a0f0d6 into 1c146ae

.dockerignore

@@ -2,6 +2,10 @@
 /!.idea/runConfigurations
 /.base-frame-tmp
 /coverage
+/dist
+/lib
 /node_modules
 /packages
 /test/node_modules
+/test/dist
+*.tsbuildinfo

.editorconfig

@@ -24,4 +24,3 @@ ij_typescript_enforce_trailing_comma = whenmultiline
 ij_typescript_use_double_quotes = false
 ij_typescript_use_semicolon_after_statement = false
 ij_typescript_spaces_within_imports = true
-

.eslintignore

@@ -2,9 +2,14 @@
 /.idea
 /.semaphore
 /coverage
+/dist
 /lib
 /node_modules
 /resource
 /packages
 .*.js
-/jest*.config.js
+.*.json
+package-lock.json
+tsconfig*.json
+typedoc.json
+jest.config*.ts

.eslintrc.js → .eslintrc.cjs

@@ -1,17 +1,17 @@
 const namingConvention = () => {
 	// prettier-ignore
 	return [
-    { selector: ['default'], format: null, modifiers: ['public'], leadingUnderscore: 'forbid' },
-    { selector: ['default'], format: ['camelCase'], modifiers: ['protected'], leadingUnderscore: 'require' },
-    { selector: ['default'], format: ['camelCase'], modifiers: ['private'], prefix: ['__'] },
+		{ selector: ['default'], 								 format: null,           modifiers: ['public'],    leadingUnderscore: 'forbid' },
+		{ selector: ['default'], 								 format: ['camelCase'],  modifiers: ['protected'], leadingUnderscore: 'require' },
+		{ selector: ['default'], 								 format: ['camelCase'],  modifiers: ['private'],   prefix: ['__'] },
 		{ selector: ['accessor'], 							 format: ['camelCase'],  modifiers: ['public'],    leadingUnderscore: 'forbid' },
 		{ selector: ['accessor'], 							 format: ['camelCase'],  modifiers: ['protected'], leadingUnderscore: 'require' },
 		{ selector: ['accessor'], 							 format: ['camelCase'],  modifiers: ['private'],   prefix: ['__'] },
-    { selector: ['enum'], format: ['PascalCase'] },
-    { selector: ['enumMember'], format: ['UPPER_CASE'] },
+		{ selector: ['enum'], 									 format: ['PascalCase'] },
+		{ selector: ['enumMember'], 						 format: ['UPPER_CASE'] },
 		{ selector: ['classMethod', 'accessor'], format: ['PascalCase'], modifiers: ['public', 'static'] },
 		{ selector: ['classProperty'], 					 format: ['UPPER_CASE'], modifiers: ['public', 'static'] },
-  ]
+	]
 }
 
 module.exports = {
@@ -41,24 +41,24 @@ module.exports = {
 	parser: '@typescript-eslint/parser',
 	parserOptions: {
 		ecmaVersion: 'ESNext',
-		project: './tsconfig-eslint.json',
+		project: './resource/tsconfig/eslint.json',
 		sourceType: 'module',
 	},
 	plugins: ['@typescript-eslint', 'eslint-plugin-import', 'import', 'no-only-tests', 'no-loops', 'jest', 'sort-keys-fix'],
 	rules: {
 		// ESLINT
-		'no-restricted-imports': [
-			'error',
-			{
-				patterns: [
-					{
-						group: ['**/index'],
-						message: 'Please use `.../something` instead of ``.../something/index`',
-					},
-				],
-			},
-		],
-
+		// 'no-restricted-imports': [
+		// 	'error',
+		// 	{
+		// 		patterns: [
+		// 			{
+		// 				group: ['**/index'],
+		// 				message: 'Please use `.../something` instead of ``.../something/index`',
+		// 			},
+		// 		],
+		// 	},
+		// ],
+		'@typescript-eslint/prefer-ts-expect-error': 'off',
 		'prefer-arrow-callback': 'error',
 		'no-confusing-arrow': 'error',
 		'no-constant-condition': 'error',

.github/workflows/lint-test.yml

@@ -12,14 +12,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set Node.js version
-        run: echo "NODE_VERSION=$(cat .nvmrc)" >> $GITHUB_ENV
-      - name: Install Node.js
-        uses: actions/setup-node@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: 'npm'
+          node-version-file: .nvmrc
+          cache: "npm"
       - run: npm ci
       - run: npm run lint
-      - run: npm run test
+      - run: npm run test:unit

.gitignore

@@ -2,7 +2,10 @@
 /!.idea/runConfigurations
 /.base-frame-tmp
 /coverage
+/dist
+/lib
 /node_modules
 /packages
 /test/node_modules
 /test/dist
+*.tsbuildinfo

.husky/commit-msg

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 . "$(dirname "$0")/_/husky.sh"
 
 npx --no-install commitlint --edit "$1"

.husky/pre-commit

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 . "$(dirname "$0")/_/husky.sh"
 
 npx lint-staged

.ncurc.json

@@ -1,3 +1,6 @@
 {
-	"reject": ["typescript"]
+	"reject": [
+		"semantic-release",
+		"date-fns"
+	]
 }

.nvmrc

@@ -1 +1 @@
-v18.15.0
+v20.11.1

.prettierignore

@@ -1,6 +1,7 @@
 /.idea
 /.semaphore
 /coverage
+/dist
 /lib
 /node_modules
 /resource

.releaserc.json

@@ -14,7 +14,12 @@
 		[
 			"@semantic-release/git",
 			{
-				"assets": ["lib/", "package.json", "package-lock.json", "CHANGELOG.md"],
+				"assets": [
+					"dist/",
+					"package.json",
+					"package-lock.json",
+					"CHANGELOG.md"
+				],
 				"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
 			}
 		]

.semaphore/alpha.yml

@@ -23,7 +23,7 @@ blocks:
             - git remote rm origin
             - git remote add origin https://$GH_USER:$GH_TOKEN@github.com/beecode-rs/msh-util.git
             - git checkout tags/v$VERSION -b tmp-alpha-branch
-            - docker build -f .docker/Dockerfile -t bc-msh-util-deploy .
-            - docker run --rm -e CI bc-msh-util-deploy sh -c "npm config set '//registry.npmjs.org/:_authToken' $NPM_TOKEN && npm run bump-version $VERSION-alpha && npm publish --access public -tag alpha && git tag v$VERSION-alpha && git push origin --tags"
+            - docker build -f ./resource/docker/Dockerfile -t bc-msh-util-deploy .
+            - docker run --rm -e CI bc-msh-util-deploy sh -c "npm config set '//registry.npmjs.org/:_authToken' $NPM_TOKEN && npm run npm-bump-version $VERSION-alpha && npm publish --access public -tag alpha && git tag v$VERSION-alpha && git push origin --tags"
     skip:
       when: branch != 'main'

.semaphore/prod.yml

@@ -23,7 +23,7 @@ blocks:
             - git remote rm origin
             - git remote add origin https://$GH_USER:$GH_TOKEN@github.com/beecode-rs/msh-util.git
             - git checkout tags/v$VERSION -b tmp-prod-branch
-            - docker build -f .docker/Dockerfile -t bc-msh-util-deploy .
+            - docker build -f ./resource/docker/Dockerfile -t bc-msh-util-deploy .
             - docker run --rm -e CI bc-msh-util-deploy sh -c "npm config set '//registry.npmjs.org/:_authToken' $NPM_TOKEN && npm publish --access public && git tag v$VERSION-prod && git push origin --tags"
     skip:
       when: branch != 'main'

.semaphore/semaphore.yml

@@ -15,7 +15,7 @@ blocks:
           commands:
             - checkout
             - echo $DOCKER_PASSWORD | docker login --username "$DOCKER_USERNAME" --password-stdin
-            - docker build -f .docker/Dockerfile -t bc-msh-util .
+            - docker build -f ./resource/docker/Dockerfile -t bc-msh-util .
             - docker save -o bc-msh-util.tar bc-msh-util
             - cache store bc-msh-util-docker-image-$SEMAPHORE_GIT_SHA bc-msh-util.tar
 
@@ -29,7 +29,7 @@ blocks:
             - checkout
             - cache restore bc-msh-util-docker-image-$SEMAPHORE_GIT_SHA
             - docker load -i bc-msh-util.tar
-            - docker run --rm -e CODECOV_TOKEN bc-msh-util sh -c 'npm run test:unit:coverage && npm run test:unit:coverage:publish'
+            - docker run --rm -e CODECOV_TOKEN bc-msh-util sh -c 'npm run test-coverage-unit && npm run test-coverage-unit-publish'
 
   - name: Bump Version
     task:
@@ -43,7 +43,7 @@ blocks:
             - docker load -i bc-msh-util.tar
             - touch version.txt
             - sudo chown -R packer:packer version.txt
-            - docker run --rm -v ./version.txt:/usr/app/version.txt -e GH_TOKEN -e NPM_TOKEN -e GH_USER -e CI bc-msh-util npm run semantic-release
+            - docker run --rm -v ./version.txt:/usr/app/version.txt -e GH_TOKEN -e NPM_TOKEN -e GH_USER -e CI bc-msh-util npm run npm-semantic-release
             - cat version.txt
             - cache store bc-msh-util-version-$SEMAPHORE_GIT_SHA version.txt
     skip:

babel.config.cjs

@@ -0,0 +1,29 @@
+const tsConfig = require('./resource/tsconfig/esm.json')
+
+module.exports = function (api) {
+	api.cache(true)
+
+	const ignore = ['node_modules', ...(tsConfig.exclude ?? [])]
+	const plugins = [
+		[
+			'@babel/plugin-transform-modules-commonjs',
+			{
+				strictMode: true,
+			},
+		],
+		[
+			'@babel/plugin-proposal-decorators',
+			{
+				version: '2023-11',
+			},
+		],
+	]
+
+	const presets = ['@babel/preset-env', '@babel/preset-typescript']
+
+	return {
+		plugins,
+		presets,
+		ignore
+	}
+}

jest.config.int.ts

@@ -0,0 +1,10 @@
+// @ts-expect-error
+import sharedConfig from './jest.config.ts'
+import type { JestConfigWithTsJest } from 'ts-jest'
+
+const jestConfig: JestConfigWithTsJest = {
+	...sharedConfig,
+	testMatch: ['**/__tests__/*.(spec|test).[jt]s?(x)'],
+}
+
+export default jestConfig

jest.config.ts

@@ -0,0 +1,18 @@
+import type { JestConfigWithTsJest } from 'ts-jest'
+
+const jestConfig: JestConfigWithTsJest = {
+	clearMocks: true,
+	maxConcurrency: 1,
+	moduleNameMapper: {
+		'^#src$': '<rootDir>/src',
+		'^#src/(.*)$': '<rootDir>/src/$1',
+	},
+	preset: 'ts-jest/presets/default-esm',
+	setupFilesAfterEnv: ['jest-extended/all', '<rootDir>/src/__tests__/index-jest-setup.ts'],
+	testEnvironment: 'node',
+	testMatch: ['<rootDir>/src/**/*.(spec|test).[jt]s?(x)'],
+	testPathIgnorePatterns: ['/node_modules/'],
+	transform: {},
+}
+
+export default jestConfig

jest.config.unit.ts

@@ -0,0 +1,10 @@
+// @ts-expect-error
+import sharedConfig from './jest.config'
+import type { JestConfigWithTsJest } from 'ts-jest'
+
+const jestConfig: JestConfigWithTsJest = {
+	...sharedConfig,
+	testPathIgnorePatterns: [...(sharedConfig.testPathIgnorePatterns ?? []), '/__tests__/'],
+}
+
+export default jestConfig

lib.util.iml

@@ -3,10 +3,13 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/coverage" />
       <excludeFolder url="file://$MODULE_DIR$/lib" />
       <excludeFolder url="file://$MODULE_DIR$/node_modules" />
       <excludeFolder url="file://$MODULE_DIR$/packages" />
+      <excludeFolder url="file://$MODULE_DIR$/.husky/_" />
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />