Browse Source

chore: renames to @e22m4u/js-repository and fixes d.ts files

e22m4u 2 years ago
parent
commit
771d9e379e
100 changed files with 216 additions and 215 deletions
  1. 10 10
      README.md
  2. 12 11
      package.json
  3. 3 3
      src/adapter/adapter-loader.d.ts
  4. 2 2
      src/adapter/adapter-loader.js
  5. 2 2
      src/adapter/adapter-registry.d.ts
  6. 1 1
      src/adapter/adapter-registry.js
  7. 8 8
      src/adapter/adapter.d.ts
  8. 1 1
      src/adapter/adapter.js
  9. 2 2
      src/adapter/adapter.spec.js
  10. 8 8
      src/adapter/builtin/memory-adapter.d.ts
  11. 1 1
      src/adapter/builtin/memory-adapter.spec.js
  12. 1 1
      src/adapter/decorator/data-sanitizing-decorator.d.ts
  13. 1 1
      src/adapter/decorator/data-sanitizing-decorator.js
  14. 1 1
      src/adapter/decorator/data-validation-decorator.d.ts
  15. 1 1
      src/adapter/decorator/data-validation-decorator.js
  16. 1 1
      src/adapter/decorator/default-values-decorator.d.ts
  17. 1 1
      src/adapter/decorator/default-values-decorator.js
  18. 1 1
      src/adapter/decorator/fields-filtering-decorator.d.ts
  19. 1 1
      src/adapter/decorator/fields-filtering-decorator.js
  20. 1 1
      src/adapter/decorator/inclusion-decorator.d.ts
  21. 1 1
      src/adapter/decorator/inclusion-decorator.js
  22. 5 5
      src/adapter/decorator/index.d.ts
  23. 3 3
      src/adapter/index.d.ts
  24. 2 2
      src/definition/datasource/datasource-definition-validator.d.ts
  25. 1 1
      src/definition/datasource/datasource-definition-validator.js
  26. 1 1
      src/definition/datasource/datasource-definition-validator.spec.js
  27. 2 2
      src/definition/datasource/index.d.ts
  28. 3 3
      src/definition/definition-registry.d.ts
  29. 1 1
      src/definition/definition-registry.js
  30. 3 3
      src/definition/index.d.ts
  31. 7 7
      src/definition/model/index.d.ts
  32. 2 2
      src/definition/model/model-data-sanitizer.d.ts
  33. 1 1
      src/definition/model/model-data-sanitizer.js
  34. 3 3
      src/definition/model/model-data-validator.d.ts
  35. 1 1
      src/definition/model/model-data-validator.js
  36. 1 1
      src/definition/model/model-data-validator.spec.js
  37. 6 6
      src/definition/model/model-definition-utils.d.ts
  38. 1 1
      src/definition/model/model-definition-utils.js
  39. 1 1
      src/definition/model/model-definition-utils.spec.js
  40. 2 2
      src/definition/model/model-definition-validator.d.ts
  41. 1 1
      src/definition/model/model-definition-validator.js
  42. 1 1
      src/definition/model/model-definition-validator.spec.js
  43. 2 2
      src/definition/model/model-definition.d.ts
  44. 2 2
      src/definition/model/properties/default-values-definition-validator.d.ts
  45. 1 1
      src/definition/model/properties/default-values-definition-validator.js
  46. 1 1
      src/definition/model/properties/default-values-definition-validator.spec.js
  47. 5 5
      src/definition/model/properties/index.d.ts
  48. 2 2
      src/definition/model/properties/primary-keys-definition-validator.d.ts
  49. 1 1
      src/definition/model/properties/primary-keys-definition-validator.js
  50. 1 1
      src/definition/model/properties/primary-keys-definition-validator.spec.js
  51. 2 2
      src/definition/model/properties/properties-definition-validator.d.ts
  52. 1 1
      src/definition/model/properties/properties-definition-validator.js
  53. 1 1
      src/definition/model/properties/properties-definition-validator.spec.js
  54. 1 1
      src/definition/model/properties/property-definition.d.ts
  55. 3 3
      src/definition/model/relations/index.d.ts
  56. 1 1
      src/definition/model/relations/relation-definition.d.ts
  57. 2 2
      src/definition/model/relations/relations-definition-validator.d.ts
  58. 1 1
      src/definition/model/relations/relations-definition-validator.js
  59. 1 1
      src/definition/model/relations/relations-definition-validator.spec.js
  60. 3 3
      src/errors/index.d.ts
  61. 1 1
      src/errors/invalid-argument-error.d.ts
  62. 1 1
      src/errors/invalid-argument-error.js
  63. 1 1
      src/errors/invalid-argument-error.spec.js
  64. 1 1
      src/errors/invalid-operator-value-error.js
  65. 1 1
      src/errors/not-implemented-error.d.ts
  66. 1 1
      src/errors/not-implemented-error.js
  67. 1 1
      src/errors/not-implemented-error.spec.js
  68. 4 4
      src/filter/fields-clause-tool.d.ts
  69. 1 1
      src/filter/fields-clause-tool.js
  70. 1 1
      src/filter/fields-clause-tool.spec.js
  71. 1 1
      src/filter/filter.d.ts
  72. 5 5
      src/filter/include-clause-tool.d.ts
  73. 1 1
      src/filter/include-clause-tool.js
  74. 1 1
      src/filter/include-clause-tool.spec.js
  75. 7 7
      src/filter/index.d.ts
  76. 1 1
      src/filter/operator-clause-tool.d.ts
  77. 1 1
      src/filter/operator-clause-tool.js
  78. 1 1
      src/filter/operator-clause-tool.spec.js
  79. 3 3
      src/filter/order-clause-tool.d.ts
  80. 1 1
      src/filter/order-clause-tool.js
  81. 1 1
      src/filter/order-clause-tool.spec.js
  82. 2 2
      src/filter/slice-clause-tool.d.ts
  83. 1 1
      src/filter/slice-clause-tool.js
  84. 1 1
      src/filter/slice-clause-tool.spec.js
  85. 3 3
      src/filter/where-clause-tool.d.ts
  86. 1 1
      src/filter/where-clause-tool.js
  87. 1 1
      src/filter/where-clause-tool.spec.js
  88. 9 9
      src/index.d.ts
  89. 3 3
      src/relations/belongs-to-resolver.d.ts
  90. 1 1
      src/relations/belongs-to-resolver.js
  91. 1 1
      src/relations/belongs-to-resolver.spec.js
  92. 3 3
      src/relations/has-many-resolver.d.ts
  93. 1 1
      src/relations/has-many-resolver.js
  94. 1 1
      src/relations/has-many-resolver.spec.js
  95. 3 3
      src/relations/has-one-resolver.d.ts
  96. 1 1
      src/relations/has-one-resolver.js
  97. 1 1
      src/relations/has-one-resolver.spec.js
  98. 4 4
      src/relations/index.d.ts
  99. 3 3
      src/relations/references-many-resolver.d.ts
  100. 1 1
      src/relations/references-many-resolver.js

+ 10 - 10
README.md

@@ -1,22 +1,22 @@
-## @e22m4u/node-repository
+## @e22m4u/js-repository
 
 Абстракция для работы с базами данных для Node.js
 
 | адаптер | описание                                                                                                                                        |
 |---------|-------------------------------------------------------------------------------------------------------------------------------------------------|
 | memory  | виртуальная база в памяти процесса (для разработки и тестирования)                                                                              |
-| mongodb | MongoDB - система управления NoSQL базами данных (*[требует установки](https://www.npmjs.com/package/@e22m4u/node-repository-mongodb-adapter))* |
+| mongodb | MongoDB - система управления NoSQL базами данных (*[требует установки](https://www.npmjs.com/package/@e22m4u/js-repository-mongodb-adapter))* |
 
 ## Установка
 
 ```bash
-npm install @e22m4u/node-repository
+npm install @e22m4u/js-repository
 ```
 
-Опционально устанавливаем адаптер, например [mongodb](https://www.npmjs.com/package/@e22m4u/node-repository-mongodb-adapter)
+Опционально устанавливаем адаптер, например [mongodb](https://www.npmjs.com/package/@e22m4u/js-repository-mongodb-adapter)
 
 ```bash
-npm install @e22m4u/node-repository-mongodb-adapter
+npm install @e22m4u/js-repository-mongodb-adapter
 ```
 
 ## Пример
@@ -24,7 +24,7 @@ npm install @e22m4u/node-repository-mongodb-adapter
 Создаем экземпляр класса `Schema`
 
 ```js
-import {Schema} from '@e22m4u/node-repository';
+import {Schema} from '@e22m4u/js-repository';
 
 const schema = new Schema();
 ```
@@ -116,7 +116,7 @@ await userRep.deleteById(fedor.id); // true
 Получение репозитория модели:
 
 ```js
-import {Schema} from '@e22m4u/node-repository';
+import {Schema} from '@e22m4u/js-repository';
 
 const schema = new Schema();
 // создаем источник
@@ -130,9 +130,9 @@ const repositorty = schema.getRepository('myModel');
 Переопределение конструктора:
 
 ```js
-import {Schema} from '@e22m4u/node-repository';
-import {Repository} from '@e22m4u/node-repository';
-import {RepositoryRegistry} from '@e22m4u/node-repository';
+import {Schema} from '@e22m4u/js-repository';
+import {Repository} from '@e22m4u/js-repository';
+import {RepositoryRegistry} from '@e22m4u/js-repository';
 
 class MyRepository extends Repository {
   /*...*/

+ 12 - 11
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@e22m4u/node-repository",
+  "name": "@e22m4u/js-repository",
   "version": "0.0.30",
   "description": "Абстракция для работы с базами данных для Node.js",
   "type": "module",
@@ -8,16 +8,16 @@
     "node": ">=14"
   },
   "scripts": {
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "format": "prettier --write \"./src/**/*.{js,ts}\"",
-    "test": "eslint . && c8 --reporter=text-summary mocha",
-    "test:coverage": "eslint . && c8 --reporter=text mocha",
+    "lint": "tsc && eslint .",
+    "lint:fix": "tsc && eslint . --fix",
+    "format": "prettier --write \"./src/**/*.js\"",
+    "test": "npm run lint && c8 --reporter=text-summary mocha",
+    "test:coverage": "npm run lint && c8 --reporter=text mocha",
     "prepare": "npx husky install"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/e22m4u/node-repository.git"
+    "url": "https://github.com/e22m4u/js-repository.git"
   },
   "keywords": [
     "Repository",
@@ -31,10 +31,10 @@
   ],
   "author": "e22m4u <e22m4u@gmail.com>",
   "license": "MIT",
-  "homepage": "https://github.com/e22m4u/node-repository",
+  "homepage": "https://github.com/e22m4u/js-repository",
   "dependencies": {
-    "@e22m4u/service": "0.0.6",
-    "@e22m4u/util-format": "0.0.6"
+    "@e22m4u/js-service": "0.0.7",
+    "@e22m4u/js-format": "0.0.7"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
@@ -51,6 +51,7 @@
     "eslint-plugin-mocha": "^10.1.0",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
-    "prettier": "^3.0.1"
+    "prettier": "^3.0.1",
+    "typescript": "^5.2.2"
   }
 }

+ 3 - 3
src/adapter/adapter-loader.d.ts

@@ -1,6 +1,6 @@
-import {Adapter} from './adapter';
-import {AnyObject} from '../types';
-import {Service} from '@e22m4u/service';
+import {Adapter} from './adapter.js';
+import {AnyObject} from '../types.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Adapter loader.

+ 2 - 2
src/adapter/adapter-loader.js

@@ -1,5 +1,5 @@
 import {Adapter} from './adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../errors/index.js';
 
 /**
@@ -29,7 +29,7 @@ export class AdapterLoader extends Service {
     if (!adapterCtor)
       try {
         const module = await import(
-          `@e22m4u/node-repository-${adapterName}-adapter`
+          `@e22m4u/js-repository-${adapterName}-adapter`
         );
         adapterCtor = findAdapterCtorInModule(module);
       } catch (e) {

+ 2 - 2
src/adapter/adapter-registry.d.ts

@@ -1,5 +1,5 @@
-import {Adapter} from './adapter';
-import {Service} from '@e22m4u/service';
+import {Adapter} from './adapter.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Adapter registry.

+ 1 - 1
src/adapter/adapter-registry.js

@@ -1,5 +1,5 @@
 import {Adapter} from './adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {AdapterLoader} from './adapter-loader.js';
 import {DefinitionRegistry} from '../definition/index.js';
 

+ 8 - 8
src/adapter/adapter.d.ts

@@ -1,11 +1,11 @@
-import {Filter} from '../filter';
-import {ModelId} from '../types';
-import {AnyObject} from '../types';
-import {ModelData} from '../types';
-import {ItemFilter} from '../filter';
-import {WhereClause} from '../filter';
-import {Service} from '@e22m4u/service';
-import {ServiceContainer} from '@e22m4u/service';
+import {ModelId} from '../types.js';
+import {AnyObject} from '../types.js';
+import {ModelData} from '../types.js';
+import {Filter} from '../filter/index.js';
+import {Service} from '@e22m4u/js-service';
+import {ItemFilter} from '../filter/index.js';
+import {WhereClause} from '../filter/index.js';
+import {ServiceContainer} from '@e22m4u/js-service';
 
 /**
  * Adapter.

+ 1 - 1
src/adapter/adapter.js

@@ -1,6 +1,6 @@
 /* eslint no-unused-vars: 0 */
 /* eslint jsdoc/require-returns-check: 0 */
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {NotImplementedError} from '../errors/index.js';
 import {InclusionDecorator} from './decorator/index.js';
 import {DefaultValuesDecorator} from './decorator/index.js';

+ 2 - 2
src/adapter/adapter.spec.js

@@ -2,13 +2,13 @@ import chai from 'chai';
 import {expect} from 'chai';
 import {Schema} from '../schema.js';
 import {Adapter} from './adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
+import {ServiceContainer} from '@e22m4u/js-service';
 import {InclusionDecorator} from './decorator/index.js';
 import {DefaultValuesDecorator} from './decorator/index.js';
 import {DataValidationDecorator} from './decorator/index.js';
 import {DataSanitizingDecorator} from './decorator/index.js';
 import {FieldsFilteringDecorator} from './decorator/index.js';
-import {ServiceContainer} from '@e22m4u/service';
 
 const sandbox = chai.spy.sandbox();
 

+ 8 - 8
src/adapter/builtin/memory-adapter.d.ts

@@ -1,11 +1,11 @@
-import {Adapter} from '../adapter';
-import {Filter} from '../../filter';
-import {ModelId} from '../../types';
-import {AnyObject} from '../../types';
-import {ModelData} from '../../types';
-import {ItemFilter} from '../../filter';
-import {WhereClause} from '../../filter';
-import {ServiceContainer} from '@e22m4u/service';
+import {Adapter} from '../adapter.js';
+import {ModelId} from '../../types.js';
+import {AnyObject} from '../../types.js';
+import {ModelData} from '../../types.js';
+import {Filter} from '../../filter/index.js';
+import {ItemFilter} from '../../filter/index.js';
+import {WhereClause} from '../../filter/index.js';
+import {ServiceContainer} from '@e22m4u/js-service';
 
 /**
  * Memory adapter.

+ 1 - 1
src/adapter/builtin/memory-adapter.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {Schema} from '../../schema.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {MemoryAdapter} from './memory-adapter.js';
 import {DataType} from '../../definition/index.js';
 import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../../definition/index.js';

+ 1 - 1
src/adapter/decorator/data-sanitizing-decorator.d.ts

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Data sanitizing decorator.

+ 1 - 1
src/adapter/decorator/data-sanitizing-decorator.js

@@ -1,5 +1,5 @@
 import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../../errors/index.js';
 import {ModelDataSanitizer} from '../../definition/index.js';
 

+ 1 - 1
src/adapter/decorator/data-validation-decorator.d.ts

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Data validation decorator.

+ 1 - 1
src/adapter/decorator/data-validation-decorator.js

@@ -1,5 +1,5 @@
 import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../../errors/index.js';
 import {ModelDataValidator} from '../../definition/index.js';
 

+ 1 - 1
src/adapter/decorator/default-values-decorator.d.ts

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Default values decorator.

+ 1 - 1
src/adapter/decorator/default-values-decorator.js

@@ -1,5 +1,5 @@
 import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../../errors/index.js';
 import {ModelDefinitionUtils} from '../../definition/index.js';
 

+ 1 - 1
src/adapter/decorator/fields-filtering-decorator.d.ts

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Fields filtering decorator.

+ 1 - 1
src/adapter/decorator/fields-filtering-decorator.js

@@ -1,5 +1,5 @@
 import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {FieldsClauseTool} from '../../filter/index.js';
 import {InvalidArgumentError} from '../../errors/index.js';
 

+ 1 - 1
src/adapter/decorator/inclusion-decorator.d.ts

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Inclusion decorator.

+ 1 - 1
src/adapter/decorator/inclusion-decorator.js

@@ -1,5 +1,5 @@
 import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {IncludeClauseTool} from '../../filter/index.js';
 import {InvalidArgumentError} from '../../errors/index.js';
 

+ 5 - 5
src/adapter/decorator/index.d.ts

@@ -1,5 +1,5 @@
-export * from './inclusion-decorator';
-export * from './default-values-decorator';
-export * from './data-sanitizing-decorator';
-export * from './data-validation-decorator';
-export * from './fields-filtering-decorator';
+export * from './inclusion-decorator.js';
+export * from './default-values-decorator.js';
+export * from './data-sanitizing-decorator.js';
+export * from './data-validation-decorator.js';
+export * from './fields-filtering-decorator.js';

+ 3 - 3
src/adapter/index.d.ts

@@ -1,3 +1,3 @@
-export * from './adapter';
-export * from './adapter-loader';
-export * from './adapter-registry';
+export * from './adapter.js';
+export * from './adapter-loader.js';
+export * from './adapter-registry.js';

+ 2 - 2
src/definition/datasource/datasource-definition-validator.d.ts

@@ -1,5 +1,5 @@
-import {Service} from '@e22m4u/service';
-import {DatasourceDefinition} from './datasource-definition';
+import {Service} from '@e22m4u/js-service';
+import {DatasourceDefinition} from './datasource-definition.js';
 
 /**
  * Datasource definition validator.

+ 1 - 1
src/definition/datasource/datasource-definition-validator.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../../errors/index.js';
 
 /**

+ 1 - 1
src/definition/datasource/datasource-definition-validator.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {DatasourceDefinitionValidator} from './datasource-definition-validator.js';
 
 const S = new DatasourceDefinitionValidator();

+ 2 - 2
src/definition/datasource/index.d.ts

@@ -1,2 +1,2 @@
-export * from './datasource-definition';
-export * from './datasource-definition-validator';
+export * from './datasource-definition.js';
+export * from './datasource-definition-validator.js';

+ 3 - 3
src/definition/definition-registry.d.ts

@@ -1,6 +1,6 @@
-import {Service} from '@e22m4u/service';
-import {ModelDefinition} from './model';
-import {DatasourceDefinition} from './datasource';
+import {Service} from '@e22m4u/js-service';
+import {ModelDefinition} from './model/index.js';
+import {DatasourceDefinition} from './datasource/index.js';
 
 /**
  * Definition registry.

+ 1 - 1
src/definition/definition-registry.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../errors/index.js';
 import {ModelDefinitionValidator} from './model/index.js';
 import {DatasourceDefinitionValidator} from '../definition/index.js';

+ 3 - 3
src/definition/index.d.ts

@@ -1,3 +1,3 @@
-export * from './model';
-export * from './datasource';
-export * from './definition-registry';
+export * from './model/index.js';
+export * from './datasource/index.js';
+export * from './definition-registry.js';

+ 7 - 7
src/definition/model/index.d.ts

@@ -1,7 +1,7 @@
-export * from './relations';
-export * from './properties';
-export * from './model-definition';
-export * from './model-data-validator';
-export * from './model-data-sanitizer';
-export * from './model-definition-utils';
-export * from './model-definition-validator';
+export * from './relations/index.js';
+export * from './properties/index.js';
+export * from './model-definition.js';
+export * from './model-data-validator.js';
+export * from './model-data-sanitizer.js';
+export * from './model-definition-utils.js';
+export * from './model-definition-validator.js';

+ 2 - 2
src/definition/model/model-data-sanitizer.d.ts

@@ -1,5 +1,5 @@
-import {ModelData} from '../../types';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../../types.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Model data sanitizer.

+ 1 - 1
src/definition/model/model-data-sanitizer.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../../errors/index.js';
 import {ModelDefinitionUtils} from './model-definition-utils.js';
 

+ 3 - 3
src/definition/model/model-data-validator.d.ts

@@ -1,6 +1,6 @@
-import {Service} from '@e22m4u/service';
-import {ModelData} from '../../types';
-import {PropertyDefinition} from './properties';
+import {ModelData} from '../../types.js';
+import {Service} from '@e22m4u/js-service';
+import {PropertyDefinition} from './properties/index.js';
 
 /**
  * Model data validator.

+ 1 - 1
src/definition/model/model-data-validator.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {DataType} from './properties/index.js';
 import {getCtorName} from '../../utils/index.js';
 import {isPureObject} from '../../utils/index.js';

+ 1 - 1
src/definition/model/model-data-validator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {Schema} from '../../schema.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {DataType} from './properties/index.js';
 import {ModelDataValidator} from './model-data-validator.js';
 

+ 6 - 6
src/definition/model/model-definition-utils.d.ts

@@ -1,9 +1,9 @@
-import {DataType} from './properties';
-import {ModelData} from '../../types';
-import {Service} from '@e22m4u/service';
-import {RelationDefinition} from './relations';
-import {PropertyDefinitionMap} from './model-definition';
-import {RelationDefinitionMap} from './model-definition';
+import {ModelData} from '../../types.js';
+import {Service} from '@e22m4u/js-service';
+import {DataType} from './properties/index.js';
+import {RelationDefinition} from './relations/index.js';
+import {PropertyDefinitionMap} from './model-definition.js';
+import {RelationDefinitionMap} from './model-definition.js';
 
 /**
  * Default primary key property name.

+ 1 - 1
src/definition/model/model-definition-utils.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {DataType} from './properties/index.js';
 import {cloneDeep} from '../../utils/index.js';
 import {excludeObjectKeys} from '../../utils/index.js';

+ 1 - 1
src/definition/model/model-definition-utils.spec.js

@@ -1,7 +1,7 @@
 import chai from 'chai';
 import {expect} from 'chai';
 import {Schema} from '../../schema.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {DataType} from './properties/index.js';
 import {RelationType} from './relations/index.js';
 import {InvalidArgumentError} from '../../errors/index.js';

+ 2 - 2
src/definition/model/model-definition-validator.d.ts

@@ -1,5 +1,5 @@
-import {Service} from '@e22m4u/service';
-import {ModelDefinition} from './model-definition';
+import {Service} from '@e22m4u/js-service';
+import {ModelDefinition} from './model-definition.js';
 
 /**
  * Model definition validator.

+ 1 - 1
src/definition/model/model-definition-validator.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../../errors/index.js';
 import {RelationsDefinitionValidator} from './relations/index.js';
 import {PropertiesDefinitionValidator} from './properties/index.js';

+ 1 - 1
src/definition/model/model-definition-validator.spec.js

@@ -1,6 +1,6 @@
 import chai from 'chai';
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {RelationsDefinitionValidator} from './relations/index.js';
 import {PropertiesDefinitionValidator} from './properties/index.js';
 import {ModelDefinitionValidator} from './model-definition-validator.js';

+ 2 - 2
src/definition/model/model-definition.d.ts

@@ -1,5 +1,5 @@
-import {RelationDefinition} from './relations';
-import {PropertyDefinition} from './properties';
+import {RelationDefinition} from './relations/index.js';
+import {PropertyDefinition} from './properties/index.js';
 
 /**
  * Property definition map.

+ 2 - 2
src/definition/model/properties/default-values-definition-validator.d.ts

@@ -1,5 +1,5 @@
-import {Service} from '@e22m4u/service';
-import {PropertyDefinitionMap} from '../model-definition';
+import {Service} from '@e22m4u/js-service';
+import {PropertyDefinitionMap} from '../model-definition.js';
 
 /**
  * Default values definition validator.

+ 1 - 1
src/definition/model/properties/default-values-definition-validator.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {ModelDataValidator} from '../model-data-validator.js';
 import {InvalidArgumentError} from '../../../errors/index.js';
 

+ 1 - 1
src/definition/model/properties/default-values-definition-validator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {DataType} from './data-type.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {DefaultValuesDefinitionValidator} from './default-values-definition-validator.js';
 
 const S = new DefaultValuesDefinitionValidator();

+ 5 - 5
src/definition/model/properties/index.d.ts

@@ -1,5 +1,5 @@
-export * from './data-type';
-export * from './property-definition';
-export * from './properties-definition-validator';
-export * from './primary-keys-definition-validator';
-export * from './default-values-definition-validator';
+export * from './data-type.js';
+export * from './property-definition.js';
+export * from './properties-definition-validator.js';
+export * from './primary-keys-definition-validator.js';
+export * from './default-values-definition-validator.js';

+ 2 - 2
src/definition/model/properties/primary-keys-definition-validator.d.ts

@@ -1,5 +1,5 @@
-import {Service} from '@e22m4u/service';
-import {PropertyDefinitionMap} from '../model-definition';
+import {Service} from '@e22m4u/js-service';
+import {PropertyDefinitionMap} from '../model-definition.js';
 
 /**
  * Primary keys definition validator.

+ 1 - 1
src/definition/model/properties/primary-keys-definition-validator.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../../../errors/index.js';
 import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../model-definition-utils.js';
 

+ 1 - 1
src/definition/model/properties/primary-keys-definition-validator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {DataType} from './data-type.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {PrimaryKeysDefinitionValidator} from './primary-keys-definition-validator.js';
 import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../model-definition-utils.js';
 

+ 2 - 2
src/definition/model/properties/properties-definition-validator.d.ts

@@ -1,5 +1,5 @@
-import {Service} from '@e22m4u/service';
-import {PropertyDefinitionMap} from '../model-definition';
+import {Service} from '@e22m4u/js-service';
+import {PropertyDefinitionMap} from '../model-definition.js';
 
 /**
  * Properties definition validator.

+ 1 - 1
src/definition/model/properties/properties-definition-validator.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {DataType as Type} from './data-type.js';
 import {InvalidArgumentError} from '../../../errors/index.js';
 import {PrimaryKeysDefinitionValidator} from './primary-keys-definition-validator.js';

+ 1 - 1
src/definition/model/properties/properties-definition-validator.spec.js

@@ -1,7 +1,7 @@
 import chai from 'chai';
 import {expect} from 'chai';
 import {DataType} from './data-type.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {PropertiesDefinitionValidator} from './properties-definition-validator.js';
 import {PrimaryKeysDefinitionValidator} from './primary-keys-definition-validator.js';
 import {DefaultValuesDefinitionValidator} from './default-values-definition-validator.js';

+ 1 - 1
src/definition/model/properties/property-definition.d.ts

@@ -1,4 +1,4 @@
-import {DataType} from './data-type';
+import {DataType} from './data-type.js';
 
 /**
  * Full property definition.

+ 3 - 3
src/definition/model/relations/index.d.ts

@@ -1,3 +1,3 @@
-export * from './relation-type';
-export * from './relation-definition';
-export * from './relations-definition-validator';
+export * from './relation-type.js';
+export * from './relation-definition.js';
+export * from './relations-definition-validator.js';

+ 1 - 1
src/definition/model/relations/relation-definition.d.ts

@@ -1,4 +1,4 @@
-import {RelationType} from './relation-type';
+import {RelationType} from './relation-type.js';
 
 /**
  * Relation definition.

+ 2 - 2
src/definition/model/relations/relations-definition-validator.d.ts

@@ -1,5 +1,5 @@
-import {Service} from '@e22m4u/service';
-import {RelationDefinitionMap} from '../model-definition';
+import {Service} from '@e22m4u/js-service';
+import {RelationDefinitionMap} from '../model-definition.js';
 
 /**
  * Relations definition validator.

+ 1 - 1
src/definition/model/relations/relations-definition-validator.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {RelationType} from './relation-type.js';
 import {RelationType as Type} from './relation-type.js';
 import {InvalidArgumentError} from '../../../errors/index.js';

+ 1 - 1
src/definition/model/relations/relations-definition-validator.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {RelationType} from './relation-type.js';
 import {RelationsDefinitionValidator} from './relations-definition-validator.js';
 

+ 3 - 3
src/errors/index.d.ts

@@ -1,3 +1,3 @@
-export * from './not-implemented-error';
-export * from './invalid-argument-error';
-export * from './invalid-operator-value-error';
+export * from './not-implemented-error.js';
+export * from './invalid-argument-error.js';
+export * from './invalid-operator-value-error.js';

+ 1 - 1
src/errors/invalid-argument-error.d.ts

@@ -1,4 +1,4 @@
-import {Errorf} from '@e22m4u/util-format';
+import {Errorf} from '@e22m4u/js-format';
 
 /**
  * Invalid argument error.

+ 1 - 1
src/errors/invalid-argument-error.js

@@ -1,4 +1,4 @@
-import {Errorf} from '@e22m4u/util-format';
+import {Errorf} from '@e22m4u/js-format';
 
 /**
  * Invalid argument error.

+ 1 - 1
src/errors/invalid-argument-error.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {InvalidArgumentError} from './invalid-argument-error.js';
 
 describe('InvalidArgumentError', function () {

+ 1 - 1
src/errors/invalid-operator-value-error.js

@@ -1,4 +1,4 @@
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 
 /**
  * Invalid operator value error.

+ 1 - 1
src/errors/not-implemented-error.d.ts

@@ -1,4 +1,4 @@
-import {Errorf} from '@e22m4u/util-format';
+import {Errorf} from '@e22m4u/js-format';
 
 /**
  * Not implemented error.

+ 1 - 1
src/errors/not-implemented-error.js

@@ -1,4 +1,4 @@
-import {Errorf} from '@e22m4u/util-format';
+import {Errorf} from '@e22m4u/js-format';
 
 /**
  * Not implemented error.

+ 1 - 1
src/errors/not-implemented-error.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {NotImplementedError} from './not-implemented-error.js';
 
 describe('NotImplementedError', function () {

+ 4 - 4
src/filter/fields-clause-tool.d.ts

@@ -1,7 +1,7 @@
-import {ModelData} from '../types';
-import {FieldsClause} from './filter';
-import {Service} from '@e22m4u/service';
-import {NormalizedFieldsClause} from './filter';
+import {ModelData} from '../types.js';
+import {FieldsClause} from './filter.js';
+import {Service} from '@e22m4u/js-service';
+import {NormalizedFieldsClause} from './filter.js';
 
 /**
  * Field clause tool.

+ 1 - 1
src/filter/fields-clause-tool.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {selectObjectKeys} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
 import {ModelDefinitionUtils} from '../definition/index.js';

+ 1 - 1
src/filter/fields-clause-tool.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {Schema} from '../schema.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {FieldsClauseTool} from './fields-clause-tool.js';
 import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '../definition/index.js';
 

+ 1 - 1
src/filter/filter.d.ts

@@ -1,4 +1,4 @@
-import {ModelData} from '../types';
+import {ModelData} from '../types.js';
 
 /**
  * Filter.

+ 5 - 5
src/filter/include-clause-tool.d.ts

@@ -1,8 +1,8 @@
-import {Filter} from './filter';
-import {ModelData} from '../types';
-import {IncludeClause} from './filter';
-import {Service} from '@e22m4u/service';
-import {NormalizedIncludeClause} from './filter';
+import {Filter} from './filter.js';
+import {ModelData} from '../types.js';
+import {IncludeClause} from './filter.js';
+import {Service} from '@e22m4u/js-service';
+import {NormalizedIncludeClause} from './filter.js';
 
 /**
  * Include clause tool.

+ 1 - 1
src/filter/include-clause-tool.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {RelationType} from '../definition/index.js';
 import {HasOneResolver} from '../relations/index.js';
 import {HasManyResolver} from '../relations/index.js';

+ 1 - 1
src/filter/include-clause-tool.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {IncludeClauseTool} from './include-clause-tool.js';
 
 describe('IncludeClauseTool', function () {

+ 7 - 7
src/filter/index.d.ts

@@ -1,7 +1,7 @@
-export * from './filter';
-export * from './slice-clause-tool';
-export * from './order-clause-tool';
-export * from './where-clause-tool';
-export * from './fields-clause-tool';
-export * from './include-clause-tool';
-export * from './operator-clause-tool';
+export * from './filter.js';
+export * from './slice-clause-tool.js';
+export * from './order-clause-tool.js';
+export * from './where-clause-tool.js';
+export * from './fields-clause-tool.js';
+export * from './include-clause-tool.js';
+export * from './operator-clause-tool.js';

+ 1 - 1
src/filter/operator-clause-tool.d.ts

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Operator clause tool.

+ 1 - 1
src/filter/operator-clause-tool.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {stringToRegexp} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
 import {InvalidOperatorValueError} from '../errors/index.js';

+ 1 - 1
src/filter/operator-clause-tool.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {OperatorClauseTool} from './operator-clause-tool.js';
 import {InvalidOperatorValueError} from '../errors/index.js';
 

+ 3 - 3
src/filter/order-clause-tool.d.ts

@@ -1,6 +1,6 @@
-import {ModelData} from '../types';
-import {OrderClause} from './filter';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../types.js';
+import {OrderClause} from './filter.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Order clause tool.

+ 1 - 1
src/filter/order-clause-tool.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {getValueByPath} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
 

+ 1 - 1
src/filter/order-clause-tool.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {OrderClauseTool} from './order-clause-tool.js';
 
 const S = new OrderClauseTool();

+ 2 - 2
src/filter/slice-clause-tool.d.ts

@@ -1,5 +1,5 @@
-import {ModelData} from '../types';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../types.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Slice clause tool.

+ 1 - 1
src/filter/slice-clause-tool.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {InvalidArgumentError} from '../errors/index.js';
 
 /**

+ 1 - 1
src/filter/slice-clause-tool.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {SliceClauseTool} from './slice-clause-tool.js';
 
 const S = new SliceClauseTool();

+ 3 - 3
src/filter/where-clause-tool.d.ts

@@ -1,6 +1,6 @@
-import {ModelData} from '../types';
-import {WhereClause} from './filter';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../types.js';
+import {WhereClause} from './filter.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Where clause tool.

+ 1 - 1
src/filter/where-clause-tool.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {getValueByPath} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';
 import {OperatorClauseTool} from './operator-clause-tool.js';

+ 1 - 1
src/filter/where-clause-tool.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {WhereClauseTool} from './where-clause-tool.js';
 
 const S = new WhereClauseTool();

+ 9 - 9
src/index.d.ts

@@ -1,9 +1,9 @@
-export * from './types';
-export * from './utils';
-export * from './schema';
-export * from './filter';
-export * from './errors';
-export * from './adapter';
-export * from './relations';
-export * from './definition';
-export * from './repository';
+export * from './types.js';
+export * from './schema.js';
+export * from './utils/index.js';
+export * from './filter/index.js';
+export * from './errors/index.js';
+export * from './adapter/index.js';
+export * from './relations/index.js';
+export * from './definition/index.js';
+export * from './repository/index.js';

+ 3 - 3
src/relations/belongs-to-resolver.d.ts

@@ -1,6 +1,6 @@
-import {Filter} from '../filter';
-import {ModelData} from '../types';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../types.js';
+import {Filter} from '../filter/index.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Belongs to resolver.

+ 1 - 1
src/relations/belongs-to-resolver.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {cloneDeep} from '../utils/index.js';
 import {singularize} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';

+ 1 - 1
src/relations/belongs-to-resolver.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {Schema} from '../schema.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {DataType} from '../definition/index.js';
 import {RelationType} from '../definition/index.js';
 import {BelongsToResolver} from './belongs-to-resolver.js';

+ 3 - 3
src/relations/has-many-resolver.d.ts

@@ -1,6 +1,6 @@
-import {Filter} from '../filter';
-import {ModelData} from '../types';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../types.js';
+import {Filter} from '../filter/index.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Has many resolver.

+ 1 - 1
src/relations/has-many-resolver.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {cloneDeep} from '../utils/index.js';
 import {RelationType} from '../definition/index.js';
 import {InvalidArgumentError} from '../errors/index.js';

+ 1 - 1
src/relations/has-many-resolver.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {Schema} from '../schema.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {DataType} from '../definition/index.js';
 import {RelationType} from '../definition/index.js';
 import {HasManyResolver} from './has-many-resolver.js';

+ 3 - 3
src/relations/has-one-resolver.d.ts

@@ -1,6 +1,6 @@
-import {Filter} from '../filter';
-import {ModelData} from '../types';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../types.js';
+import {Filter} from '../filter/index.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * Has one resolver.

+ 1 - 1
src/relations/has-one-resolver.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {cloneDeep} from '../utils/index.js';
 import {RelationType} from '../definition/index.js';
 import {InvalidArgumentError} from '../errors/index.js';

+ 1 - 1
src/relations/has-one-resolver.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import {Schema} from '../schema.js';
-import {format} from '@e22m4u/util-format';
+import {format} from '@e22m4u/js-format';
 import {DataType} from '../definition/index.js';
 import {RelationType} from '../definition/index.js';
 import {HasOneResolver} from './has-one-resolver.js';

+ 4 - 4
src/relations/index.d.ts

@@ -1,4 +1,4 @@
-export * from './has-one-resolver';
-export * from './has-many-resolver';
-export * from './belongs-to-resolver';
-export * from './references-many-resolver';
+export * from './has-one-resolver.js';
+export * from './has-many-resolver.js';
+export * from './belongs-to-resolver.js';
+export * from './references-many-resolver.js';

+ 3 - 3
src/relations/references-many-resolver.d.ts

@@ -1,6 +1,6 @@
-import {Filter} from '../filter';
-import {ModelData} from '../types';
-import {Service} from '@e22m4u/service';
+import {ModelData} from '../types.js';
+import {Filter} from '../filter/index.js';
+import {Service} from '@e22m4u/js-service';
 
 /**
  * References many resolver.

+ 1 - 1
src/relations/references-many-resolver.js

@@ -1,4 +1,4 @@
-import {Service} from '@e22m4u/service';
+import {Service} from '@e22m4u/js-service';
 import {cloneDeep} from '../utils/index.js';
 import {singularize} from '../utils/index.js';
 import {InvalidArgumentError} from '../errors/index.js';

Some files were not shown because too many files changed in this diff