Merge 1fa57c9 into 9f7a239

.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

@@ -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

@@ -6,3 +6,4 @@
 /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,5 +1,5 @@
 {
-  "reject": [
-    "typescript"
-  ]
+	"reject": [
+		"semantic-release"
+	]
 }

.nvmrc

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

.prettierignore

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

.prettierrc.json

@@ -1,10 +1,10 @@
 {
-  "arrowParens": "always",
-  "bracketSpacing": true,
-  "printWidth": 130,
-  "semi": false,
-  "singleQuote": true,
-  "tabWidth": 2,
-  "trailingComma": "es5",
-  "useTabs": true
+	"arrowParens": "always",
+	"bracketSpacing": true,
+	"printWidth": 130,
+	"semi": false,
+	"singleQuote": true,
+	"tabWidth": 2,
+	"trailingComma": "es5",
+	"useTabs": true
 }

.releaserc.json

@@ -1,24 +1,30 @@
 {
-  "branches": "main",
-  "plugins": [
-    "@semantic-release/commit-analyzer",
-    "@semantic-release/release-notes-generator",
-    [
-      "@semantic-release/exec",
-      {
-        "prepareCmd": "echo VERSION=${nextRelease.version} > version.txt && npm version ${nextRelease.version}"
-      }
-    ],
-    "@semantic-release/changelog",
-    "@semantic-release/github",
-    [
-      "@semantic-release/git",
-      {
-        "assets": ["lib/", "package.json", "package-lock.json", "CHANGELOG.md"],
-        "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-      }
-    ]
-  ],
-  "preset": "angular",
-  "repositoryUrl": "git@github.com:beecode-rs/msh-entity.git"
+	"branches": "main",
+	"plugins": [
+		"@semantic-release/commit-analyzer",
+		"@semantic-release/release-notes-generator",
+		[
+			"@semantic-release/exec",
+			{
+				"prepareCmd": "echo VERSION=${nextRelease.version} > version.txt && npm version ${nextRelease.version}"
+			}
+		],
+		"@semantic-release/changelog",
+		"@semantic-release/github",
+		[
+			"@semantic-release/git",
+			{
+				"assets": [
+					"dist/",
+					"lib/",
+					"package.json",
+					"package-lock.json",
+					"CHANGELOG.md"
+				],
+				"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+			}
+		]
+	],
+	"preset": "angular",
+	"repositoryUrl": "git@github.com:beecode-rs/msh-entity.git"
 }

.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-entity.git
             - git checkout tags/v$VERSION -b tmp-alpha-branch
-            - docker build -f .docker/Dockerfile -t bc-msh-entity-deploy .
-            - docker run --rm -e CI bc-msh-entity-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-entity-deploy .
+            - docker run --rm -e CI bc-msh-entity-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-entity.git
             - git checkout tags/v$VERSION -b tmp-prod-branch
-            - docker build -f .docker/Dockerfile -t bc-msh-entity-deploy .
+            - docker build -f ./resource/docker/Dockerfile -t bc-msh-entity-deploy .
             - docker run --rm -e CI bc-msh-entity-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-entity .
+            - docker build -f ./resource/docker/Dockerfile -t bc-msh-entity .
             - docker save -o bc-msh-entity.tar bc-msh-entity
             - cache store bc-msh-entity-docker-image-$SEMAPHORE_GIT_SHA bc-msh-entity.tar
 
@@ -29,7 +29,7 @@ blocks:
             - checkout
             - cache restore bc-msh-entity-docker-image-$SEMAPHORE_GIT_SHA
             - docker load -i bc-msh-entity.tar
-            - docker run --rm -e CODECOV_TOKEN bc-msh-entity sh -c 'npm run test:unit:coverage && npm run test:unit:coverage:publish'
+            - docker run --rm -e CODECOV_TOKEN bc-msh-entity 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-entity.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-entity 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-entity npm run npm-semantic-release
             - cat version.txt
             - cache store bc-msh-entity-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
+	}
+}

dist/entity-cache/memory.d.ts

@@ -0,0 +1,27 @@
+import { Subject } from 'rxjs/internal/Subject';
+export type EntityCache<ENTITY> = {
+    id: string;
+    entity: ENTITY;
+};
+export type EntityCacheCallBack<ENTITY> = (cbParams: EntityCache<ENTITY>) => void;
+export type EntityCacheSubscription = {
+    unsubscribe: () => void;
+};
+export declare class EntityCacheMemory<ENTITY> {
+    protected _memory: {
+        [k: string]: {
+            entity?: ENTITY;
+            timeoutMs?: number;
+        };
+    };
+    protected _subject: Subject<EntityCache<ENTITY>>;
+    getById(id: string): {
+        needToFetch?: boolean;
+        entity?: ENTITY;
+    };
+    set(params: EntityCache<ENTITY>, timeoutOffsetMs?: number): void;
+    subscribeById(id: string, callback: (par: EntityCache<ENTITY>) => void): EntityCacheSubscription;
+    protected _calculateTimeout(timeoutOffsetMs?: number): number | undefined;
+    protected _timeoutExpired(timeoutMs?: number): boolean;
+}
+//# sourceMappingURL=memory.d.ts.map

dist/entity-cache/promise-service.d.ts

@@ -0,0 +1,16 @@
+import { EntityCacheCallBack, EntityCacheMemory, EntityCacheSubscription } from '../entity-cache/memory.js';
+export declare abstract class EntityCachePromiseService<ENTITY, ID extends string | number = string> {
+    protected readonly _dao: EntityCacheMemory<ENTITY>;
+    protected abstract readonly _timeoutOffsetMs?: number;
+    protected abstract _entityAsync(id: ID): Promise<ENTITY>;
+    protected constructor(dao?: EntityCacheMemory<ENTITY>);
+    /**
+     * Subscribe to entity cache change and retrieve cached value if not undefined
+     * @param {ID} id - entity unique identifier
+     * @param {EntityCacheCallBack<ENTITY>} callback -
+     * @returns {EntityCacheSubscription}
+     */
+    subscribeToEntityChangeById(id: ID, callback: EntityCacheCallBack<ENTITY>): EntityCacheSubscription;
+    forceRefresh(id: ID): void;
+}
+//# sourceMappingURL=promise-service.d.ts.map