@e22m4u/js-repository 0.1.16 → 0.1.18

package/eslint.config.js

@@ -0,0 +1,66 @@
+import globals from 'globals';
+import eslintJs from '@eslint/js';
+import eslintTypescript from 'typescript-eslint';
+import eslintJsdocPlugin from 'eslint-plugin-jsdoc';
+import eslintMochaPlugin from 'eslint-plugin-mocha';
+import eslintPrettierConfig from 'eslint-config-prettier';
+import eslintChaiExpectPlugin from 'eslint-plugin-chai-expect';
+
+export default [
+  {
+    files: ['src/**/*.js'],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.es2021,
+        ...globals.mocha,
+      },
+    },
+    plugins: {
+      'jsdoc': eslintJsdocPlugin,
+      'mocha': eslintMochaPlugin,
+      'chai-expect': eslintChaiExpectPlugin,
+    },
+    rules: {
+      ...eslintJs.configs.recommended.rules,
+      ...eslintPrettierConfig.rules,
+      ...eslintMochaPlugin.configs.flat.recommended.rules,
+      ...eslintChaiExpectPlugin.configs['recommended-flat'].rules,
+      ...eslintJsdocPlugin.configs['flat/recommended-error'].rules,
+      'no-unused-vars': ['error', {'caughtErrors': 'none'}],
+      'jsdoc/require-param-description': 0,
+      'jsdoc/require-returns-description': 0,
+      'jsdoc/require-property-description': 0,
+      'jsdoc/tag-lines': ['error', 'any', {startLines: 1}],
+    },
+  },
+  {
+    files: ['src/**/*.ts'],
+    ignores: ['src/**/*.d.ts'],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.es2021,
+        ...globals.mocha,
+      },
+      parser: eslintTypescript.parser,
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+    plugins: {
+      '@typescript-eslint': eslintTypescript.plugin,
+      'mocha': eslintMochaPlugin,
+      'chai-expect': eslintChaiExpectPlugin,
+    },
+    rules: {
+      ...eslintJs.configs.recommended.rules,
+      ...eslintPrettierConfig.rules,
+      ...eslintTypescript.configs.recommended.rules,
+      '@typescript-eslint/no-namespace': 0,
+      '@typescript-eslint/no-var-requires': 0,
+      '@typescript-eslint/no-unnecessary-type-constraint': 0,
+    },
+  },
+];

package/package.json

@@ -1,23 +1,30 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Модуль для работы с базами данных для Node.js",
   "type": "module",
-  "main": "src/index.js",
+  "module": "./src/index.js",
+  "main": "./dist/cjs/index.cjs",
+  "exports": {
+    "types": "./src/index.d.ts",
+    "import": "./src/index.js",
+    "require": "./dist/cjs/index.cjs"
+  },
   "engines": {
-    "node": ">=14"
+    "node": ">=12"
   },
   "scripts": {
-    "lint": "tsc && eslint .",
-    "lint:fix": "tsc && eslint . --fix",
+    "lint": "tsc && eslint ./src",
+    "lint:fix": "tsc && eslint ./src --fix",
     "format": "prettier --write \"./src/**/*.js\"",
     "test": "npm run lint && c8 --reporter=text-summary mocha",
     "test:coverage": "npm run lint && c8 --reporter=text mocha",
+    "build:cjs": "node build-cjs.js",
     "prepare": "husky"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/e22m4u/js-repository.git"
+    "url": "git+https://github.com/e22m4u/js-repository.git"
   },
   "keywords": [
     "Repository",
@@ -30,35 +37,33 @@
   "author": "e22m4u <e22m4u@yandex.ru>",
   "license": "MIT",
   "homepage": "https://github.com/e22m4u/js-repository",
-  "dependencies": {
-    "@e22m4u/js-service": "0.0.12"
-  },
   "peerDependencies": {
-    "@e22m4u/js-service": "0.0.x"
+    "@e22m4u/js-format": "0.1.x",
+    "@e22m4u/js-service": "0.1.x"
   },
   "devDependencies": {
-    "@commitlint/cli": "~19.2.2",
-    "@commitlint/config-conventional": "~19.2.2",
-    "@types/chai": "~4.3.14",
-    "@types/chai-as-promised": "~7.1.8",
+    "@commitlint/cli": "~19.5.0",
+    "@commitlint/config-conventional": "~19.5.0",
+    "@types/chai": "~5.0.0",
+    "@types/chai-as-promised": "~8.0.1",
     "@types/chai-spies": "~1.0.6",
-    "@types/mocha": "~10.0.6",
-    "@typescript-eslint/eslint-plugin": "~7.7.1",
-    "@typescript-eslint/parser": "~7.7.1",
-    "c8": "~9.1.0",
-    "chai": "~4.4.1",
-    "chai-as-promised": "~7.1.1",
+    "@types/mocha": "~10.0.9",
+    "c8": "~10.1.2",
+    "chai": "~5.1.1",
+    "chai-as-promised": "~8.0.0",
     "chai-spies": "~1.1.0",
     "chai-subset": "~1.6.0",
-    "eslint": "~8.57.0",
+    "esbuild": "~0.24.0",
+    "eslint": "~9.12.0",
     "eslint-config-prettier": "~9.1.0",
-    "eslint-plugin-chai-expect": "~3.0.0",
-    "eslint-plugin-jsdoc": "~48.2.3",
-    "eslint-plugin-mocha": "~10.4.3",
-    "husky": "~9.0.11",
-    "mocha": "~10.4.0",
-    "prettier": "~3.2.5",
-    "ts-node": "~10.9.2",
-    "typescript": "~5.4.5"
+    "eslint-plugin-chai-expect": "~3.1.0",
+    "eslint-plugin-jsdoc": "~50.3.1",
+    "eslint-plugin-mocha": "~10.5.0",
+    "husky": "~9.1.6",
+    "mocha": "~10.7.3",
+    "prettier": "~3.3.3",
+    "tsx": "~4.19.1",
+    "typescript": "~5.5.4",
+    "typescript-eslint": "~8.8.1"
   }
 }

package/src/adapter/adapter.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../chai.js';
 import {Schema} from '../schema.js';
 import {Adapter} from './adapter.js';
 import {Service} from '@e22m4u/js-service';

package/src/adapter/builtin/memory-adapter.js

@@ -164,6 +164,7 @@ export class MemoryAdapter extends Adapter {
    * @param {object|undefined} filter
    * @returns {Promise<object>}
    */
+  // eslint-disable-next-line no-unused-vars
   async replaceOrCreate(modelName, modelData, filter = undefined) {
     const pkPropName =
       this.getService(ModelDefinitionUtils).getPrimaryKeyAsPropertyName(

package/src/adapter/decorator/data-sanitizing-decorator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
 import {Schema} from '../../schema.js';
 import {ModelDataSanitizer} from '../../definition/index.js';

package/src/adapter/decorator/data-transformation-decorator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
 import {Schema} from '../../schema.js';
 import {ModelDataTransformer} from '../../definition/index.js';

package/src/adapter/decorator/data-validation-decorator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
 import {Schema} from '../../schema.js';
 import {ModelDataValidator} from '../../definition/index.js';

package/src/adapter/decorator/default-values-decorator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
 import {Schema} from '../../schema.js';
 import {DataType} from '../../definition/index.js';

package/src/adapter/decorator/fields-filtering-decorator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
 import {Schema} from '../../schema.js';
 import {FieldsClauseTool} from '../../filter/index.js';

package/src/adapter/decorator/inclusion-decorator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
 import {Schema} from '../../schema.js';
 import {IncludeClauseTool} from '../../filter/index.js';

package/src/adapter/decorator/property-uniqueness-decorator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
 import {Schema} from '../../schema.js';
 import {PropertyUniquenessValidator} from '../../definition/index.js';

package/src/chai.js

@@ -0,0 +1,11 @@
+import * as chaiTools from 'chai';
+import chaiSpies from 'chai-spies';
+import chaiSubset from 'chai-subset';
+import chaiAsPromised from 'chai-as-promised';
+const chai = {...chaiTools};
+
+chaiSpies(chai, chai.util);
+chaiSubset(chai, chai.util);
+chaiAsPromised(chai, chai.util);
+
+export {chai};

package/src/definition/definition-registry.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../chai.js';
 import {ModelDefinitionValidator} from './model/index.js';
 import {DefinitionRegistry} from './definition-registry.js';
 import {DatasourceDefinitionValidator} from '../definition/index.js';

package/src/definition/model/model-definition-utils.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {Schema} from '../../schema.js';
 import {format} from '@e22m4u/js-format';
 import {DataType} from './properties/index.js';

package/src/definition/model/model-definition-validator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../chai.js';
 import {format} from '@e22m4u/js-format';
 import {RelationsDefinitionValidator} from './relations/index.js';
 import {PropertiesDefinitionValidator} from './properties/index.js';

package/src/definition/model/properties/properties-definition-validator.spec.js

@@ -1,5 +1,5 @@
-import chai from 'chai';
 import {expect} from 'chai';
+import {chai} from '../../../chai.js';
 import {DataType} from './data-type.js';
 import {format} from '@e22m4u/js-format';
 import {PropertyUniqueness} from './property-uniqueness.js';

package/src/utils/get-decorator-target-type.spec.js

@@ -56,6 +56,7 @@ describe('getDecoratorTargetType', function () {
 
   it('returns CONSTRUCTOR_PARAMETER', function () {
     class Target {
+      // eslint-disable-next-line no-unused-vars
       constructor(param) {}
     }
     validate(DTT.CONSTRUCTOR_PARAMETER)(Target, undefined, 0);
@@ -63,6 +64,7 @@ describe('getDecoratorTargetType', function () {
 
   it('returns STATIC_METHOD_PARAMETER', function () {
     class Target {
+      // eslint-disable-next-line no-unused-vars
       static method(param) {}
     }
     validate(DTT.STATIC_METHOD_PARAMETER)(Target, 'method', 0);
@@ -70,6 +72,7 @@ describe('getDecoratorTargetType', function () {
 
   it('returns INSTANCE_METHOD_PARAMETER', function () {
     class Target {
+      // eslint-disable-next-line no-unused-vars
       method(param) {}
     }
     validate(DTT.INSTANCE_METHOD_PARAMETER)(Target.prototype, 'method', 0);

package/src/utils/is-deep-equal.js

@@ -58,7 +58,7 @@ export function isDeepEqual(firstValue, secondValue) {
     // the property value.
     const propertyNamesA = [...keysA, ...symbolsA];
     for (const propertyNameA of propertyNamesA) {
-      if (!b.hasOwnProperty(propertyNameA)) return false;
+      if (!Object.prototype.hasOwnProperty.call(b, propertyNameA)) return false;
       const propertyValueA = a[propertyNameA];
       const propertyValueB = b[propertyNameA];
       if (!compare(propertyValueA, propertyValueB)) return false;

package/.eslintignore

@@ -1 +0,0 @@
-*.d.ts

package/.eslintrc.cjs

@@ -1,51 +0,0 @@
-module.exports = {
-  env: {
-    es2021: true,
-    node: true
-  },
-  parserOptions: {
-    sourceType: 'module',
-    ecmaVersion: 13,
-  },
-  overrides: [
-    {
-      files: ['**/*.js'],
-      plugins: [
-        'mocha',
-        'jsdoc',
-        'chai-expect',
-      ],
-      extends: [
-        'prettier',
-        'plugin:jsdoc/recommended',
-        'plugin:mocha/recommended',
-        'plugin:chai-expect/recommended',
-        'plugin:jsdoc/recommended-error',
-      ],
-      rules: {
-        'jsdoc/require-param-description': 0,
-        'jsdoc/require-returns-description': 0,
-        'jsdoc/require-property-description': 0,
-        'jsdoc/tag-lines': ['error', 'any', {startLines: 1}],
-      },
-    },
-    {
-      files: ['**/*.ts'],
-      plugins: [
-        'mocha',
-        'chai-expect',
-        '@typescript-eslint',
-      ],
-      extends: [
-        'prettier',
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended',
-      ],
-      rules: {
-        '@typescript-eslint/no-namespace': 0,
-        '@typescript-eslint/no-var-requires': 0,
-        '@typescript-eslint/no-unnecessary-type-constraint': 0,
-      },
-    }
-  ]
-}

package/.mocharc.cjs

@@ -1,7 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  extension: ['js', 'ts'],
-  spec: 'src/**/*.spec.{js,ts}',
-  require: [path.join(__dirname, 'mocha.setup.js')],
-}

package/mocha.setup.js

@@ -1,15 +0,0 @@
-process.env['NODE_ENV'] = 'test';
-
-// ts loader
-import {register} from 'node:module';
-import {pathToFileURL} from 'node:url';
-register('ts-node/esm', pathToFileURL('./'));
-
-// chai
-import chai from 'chai';
-import chaiSpies from 'chai-spies';
-import chaiSubset from 'chai-subset';
-import chaiAsPromised from 'chai-as-promised';
-chai.use(chaiSpies);
-chai.use(chaiSubset);
-chai.use(chaiAsPromised);