@e22m4u/js-repository 0.8.4 → 0.8.6

package/eslint.config.js

@@ -28,6 +28,7 @@ export default [{
     ...eslintMochaPlugin.configs.recommended.rules,
     ...eslintChaiExpectPlugin.configs['recommended-flat'].rules,
     ...eslintJsdocPlugin.configs['flat/recommended-error'].rules,
+    'curly': 'error',
     'no-duplicate-imports': 'error',
     'import/export': 0,
     'jsdoc/reject-any-type': 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "Реализация репозитория для работы с базами данных",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -12,10 +12,10 @@
     "Datasource",
     "Relations"
   ],
-  "homepage": "https://gitrepos.ru/e22m4u/js-repository",
+  "homepage": "https://gitverse.ru/e22m4u/js-repository",
   "repository": {
     "type": "git",
-    "url": "git+https://gitrepos.ru/e22m4u/js-repository.git"
+    "url": "git+https://gitverse.ru/e22m4u/js-repository.git"
   },
   "type": "module",
   "types": "./src/index.d.ts",
@@ -39,31 +39,31 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-empty-values": "~0.4.0",
-    "@e22m4u/js-format": "~0.3.2",
-    "@e22m4u/js-service": "~0.5.1"
+    "@e22m4u/js-format": "~0.4.0",
+    "@e22m4u/js-service": "~0.6.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "~20.3.0",
-    "@commitlint/config-conventional": "~20.3.0",
-    "@e22m4u/js-spy": "~0.3.5",
+    "@commitlint/cli": "~20.4.3",
+    "@commitlint/config-conventional": "~20.4.3",
+    "@e22m4u/js-spy": "~0.3.6",
+    "@eslint/js": "~9.39.2",
     "@types/chai": "~5.2.3",
     "@types/chai-as-promised": "~8.0.2",
     "@types/mocha": "~10.0.10",
-    "c8": "~10.1.3",
+    "c8": "~11.0.0",
     "chai": "~6.2.2",
     "chai-as-promised": "~8.0.2",
-    "esbuild": "~0.27.2",
+    "esbuild": "~0.27.3",
     "eslint": "~9.39.2",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
     "eslint-plugin-import": "~2.32.0",
-    "eslint-plugin-jsdoc": "~61.5.0",
+    "eslint-plugin-jsdoc": "~62.7.1",
     "eslint-plugin-mocha": "~11.2.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",
-    "prettier": "~3.7.4",
-    "rimraf": "~6.1.2",
+    "prettier": "~3.8.1",
+    "rimraf": "~6.1.3",
     "typescript": "~5.9.3"
   }
 }

package/src/adapter/adapter-loader.js

@@ -14,11 +14,12 @@ export class AdapterLoader extends Service {
    * @returns {Promise<Adapter>}
    */
   async loadByName(adapterName, settings = undefined) {
-    if (!adapterName || typeof adapterName !== 'string')
+    if (!adapterName || typeof adapterName !== 'string') {
       throw new InvalidArgumentError(
         'The adapter name should be a non-empty String, but %v was given.',
         adapterName,
       );
+    }
     let adapterCtor;
     try {
       const module = await import(`./builtin/${adapterName}-adapter.js`);
@@ -26,7 +27,7 @@ export class AdapterLoader extends Service {
     } catch {
       /**/
     }
-    if (!adapterCtor)
+    if (!adapterCtor) {
       try {
         const module = await import(
           `@e22m4u/js-repository-${adapterName}-adapter`
@@ -35,11 +36,13 @@ export class AdapterLoader extends Service {
       } catch {
         /**/
       }
-    if (!adapterCtor)
+    }
+    if (!adapterCtor) {
       throw new InvalidArgumentError(
         'The adapter %v is not found.',
         adapterName,
       );
+    }
     return new adapterCtor(this.container, settings);
   }
 }
@@ -52,7 +55,9 @@ export class AdapterLoader extends Service {
  */
 function findAdapterCtorInModule(module) {
   let adapterCtor;
-  if (!module || typeof module !== 'object' || Array.isArray(module)) return;
+  if (!module || typeof module !== 'object' || Array.isArray(module)) {
+    return;
+  }
   for (const ctor of Object.values(module)) {
     if (
       typeof ctor === 'function' &&

package/src/adapter/adapter-registry.js

@@ -22,7 +22,9 @@ export class AdapterRegistry extends Service {
    */
   async getAdapter(datasourceName) {
     let adapter = this._adapters[datasourceName];
-    if (adapter) return adapter;
+    if (adapter) {
+      return adapter;
+    }
     const datasource =
       this.getService(DefinitionRegistry).getDatasource(datasourceName);
     const adapterName = datasource.adapter;

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

@@ -37,7 +37,9 @@ export class MemoryAdapter extends Adapter {
     const tableName =
       this.getService(ModelDefinitionUtils).getTableNameByModelName(modelName);
     let table = this._tables.get(tableName);
-    if (table) return table;
+    if (table) {
+      return table;
+    }
     table = new Map();
     this._tables.set(tableName, table);
     return table;
@@ -121,13 +123,14 @@ export class MemoryAdapter extends Adapter {
     }
 
     const table = this._getTableOrCreate(modelName);
-    if (table.has(idValue))
+    if (table.has(idValue)) {
       throw new InvalidArgumentError(
         'The value %v of the primary key %v already exists in the model %v.',
         idValue,
         pkPropName,
         modelName,
       );
+    }
 
     modelData = cloneDeep(modelData);
     modelData[pkPropName] = idValue;
@@ -159,13 +162,14 @@ export class MemoryAdapter extends Adapter {
       this.getService(ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
         modelName,
       );
-    if (!isExists)
+    if (!isExists) {
       throw new InvalidArgumentError(
         'The value %v of the primary key %v does not exist in the model %v.',
         id,
         pkPropName,
         modelName,
       );
+    }
 
     modelData = cloneDeep(modelData);
     modelData[pkPropName] = id;
@@ -230,7 +234,9 @@ export class MemoryAdapter extends Adapter {
   async patch(modelName, modelData, where = undefined) {
     const table = this._getTableOrCreate(modelName);
     const tableItems = Array.from(table.values());
-    if (!tableItems.length) return 0;
+    if (!tableItems.length) {
+      return 0;
+    }
     let modelItems = tableItems.map(tableItem =>
       this.getService(ModelDefinitionUtils).convertColumnNamesToPropertyNames(
         modelName,
@@ -238,8 +244,9 @@ export class MemoryAdapter extends Adapter {
       ),
     );
 
-    if (where && typeof where === 'object')
+    if (where && typeof where === 'object') {
       modelItems = this.getService(WhereClauseTool).filter(modelItems, where);
+    }
     const size = modelItems.length;
 
     const pkPropName =
@@ -277,13 +284,14 @@ export class MemoryAdapter extends Adapter {
       this.getService(ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
         modelName,
       );
-    if (existingTableData == null)
+    if (existingTableData == null) {
       throw new InvalidArgumentError(
         'The value %v of the primary key %v does not exist in the model %v.',
         id,
         pkPropName,
         modelName,
       );
+    }
 
     modelData = cloneDeep(modelData);
     delete modelData[pkPropName];
@@ -320,19 +328,22 @@ export class MemoryAdapter extends Adapter {
     );
 
     if (filter && typeof filter === 'object') {
-      if (filter.where)
+      if (filter.where) {
         modelItems = this.getService(WhereClauseTool).filter(
           modelItems,
           filter.where,
         );
-      if (filter.skip || filter.limit)
+      }
+      if (filter.skip || filter.limit) {
         modelItems = this.getService(SliceClauseTool).slice(
           modelItems,
           filter.skip,
           filter.limit,
         );
-      if (filter.order)
+      }
+      if (filter.order) {
         this.getService(OrderClauseTool).sort(modelItems, filter.order);
+      }
     }
     return modelItems;
   }
@@ -353,13 +364,14 @@ export class MemoryAdapter extends Adapter {
       this.getService(ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
         modelName,
       );
-    if (!tableData)
+    if (!tableData) {
       throw new InvalidArgumentError(
         'The value %v of the primary key %v does not exist in the model %v.',
         id,
         pkPropName,
         modelName,
       );
+    }
     return this.getService(
       ModelDefinitionUtils,
     ).convertColumnNamesToPropertyNames(modelName, tableData);
@@ -375,7 +387,9 @@ export class MemoryAdapter extends Adapter {
   async delete(modelName, where = undefined) {
     const table = this._getTableOrCreate(modelName);
     const tableItems = Array.from(table.values());
-    if (!tableItems.length) return 0;
+    if (!tableItems.length) {
+      return 0;
+    }
     let modelItems = tableItems.map(tableItem =>
       this.getService(ModelDefinitionUtils).convertColumnNamesToPropertyNames(
         modelName,
@@ -383,8 +397,9 @@ export class MemoryAdapter extends Adapter {
       ),
     );
 
-    if (where && typeof where === 'object')
+    if (where && typeof where === 'object') {
       modelItems = this.getService(WhereClauseTool).filter(modelItems, where);
+    }
     const size = modelItems.length;
 
     const idPropName =
@@ -441,8 +456,9 @@ export class MemoryAdapter extends Adapter {
       ),
     );
 
-    if (where && typeof where === 'object')
+    if (where && typeof where === 'object') {
       modelItems = this.getService(WhereClauseTool).filter(modelItems, where);
+    }
     return modelItems.length;
   }
 }

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

@@ -13,12 +13,13 @@ export class DataSanitizingDecorator extends Service {
    * @param {Adapter} adapter
    */
   decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
+    if (!adapter || !(adapter instanceof Adapter)) {
       throw new InvalidArgumentError(
         'The first argument of DataSanitizingDecorator.decorate should be ' +
           'an Adapter instance, but %v was given.',
         adapter,
       );
+    }
 
     const sanitizer = adapter.getService(ModelDataSanitizer);
     const sanitize = (...args) => sanitizer.sanitize(...args);

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

@@ -13,12 +13,13 @@ export class DefaultValuesDecorator extends Service {
    * @param {Adapter} adapter
    */
   decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
+    if (!adapter || !(adapter instanceof Adapter)) {
       throw new InvalidArgumentError(
         'The first argument of DefaultValuesDecorator.decorate should be ' +
           'an Adapter instance, but %v was given.',
         adapter,
       );
+    }
 
     const utils = adapter.getService(ModelDefinitionUtils);
     const setDefaults = (...args) =>

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

@@ -13,12 +13,13 @@ export class FieldsFilteringDecorator extends Service {
    * @param {Adapter} adapter
    */
   decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
+    if (!adapter || !(adapter instanceof Adapter)) {
       throw new InvalidArgumentError(
         'The first argument of FieldsFilteringDecorator.decorate should be ' +
           'an Adapter instance, but %v was given.',
         adapter,
       );
+    }
 
     const tool = adapter.getService(FieldsClauseTool);
     const selectFields = (...args) => tool.filter(...args);
@@ -26,8 +27,9 @@ export class FieldsFilteringDecorator extends Service {
     const create = adapter.create;
     adapter.create = async function (modelName, modelData, filter) {
       let result = await create.call(this, modelName, modelData, filter);
-      if (filter && typeof filter === 'object' && filter.fields)
+      if (filter && typeof filter === 'object' && filter.fields) {
         result = selectFields(result, modelName, filter.fields);
+      }
       return result;
     };
 
@@ -40,8 +42,9 @@ export class FieldsFilteringDecorator extends Service {
         modelData,
         filter,
       );
-      if (filter && typeof filter === 'object' && filter.fields)
+      if (filter && typeof filter === 'object' && filter.fields) {
         result = selectFields(result, modelName, filter.fields);
+      }
       return result;
     };
 
@@ -53,32 +56,36 @@ export class FieldsFilteringDecorator extends Service {
         modelData,
         filter,
       );
-      if (filter && typeof filter === 'object' && filter.fields)
+      if (filter && typeof filter === 'object' && filter.fields) {
         result = selectFields(result, modelName, filter.fields);
+      }
       return result;
     };
 
     const patchById = adapter.patchById;
     adapter.patchById = async function (modelName, id, modelData, filter) {
       let result = await patchById.call(this, modelName, id, modelData, filter);
-      if (filter && typeof filter === 'object' && filter.fields)
+      if (filter && typeof filter === 'object' && filter.fields) {
         result = selectFields(result, modelName, filter.fields);
+      }
       return result;
     };
 
     const find = adapter.find;
     adapter.find = async function (modelName, filter) {
       let result = await find.call(this, modelName, filter);
-      if (filter && typeof filter === 'object' && filter.fields)
+      if (filter && typeof filter === 'object' && filter.fields) {
         result = selectFields(result, modelName, filter.fields);
+      }
       return result;
     };
 
     const findById = adapter.findById;
     adapter.findById = async function (modelName, id, filter) {
       let result = await findById.call(this, modelName, id, filter);
-      if (filter && typeof filter === 'object' && filter.fields)
+      if (filter && typeof filter === 'object' && filter.fields) {
         result = selectFields(result, modelName, filter.fields);
+      }
       return result;
     };
   }

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

@@ -13,12 +13,13 @@ export class InclusionDecorator extends Service {
    * @param {Adapter} adapter
    */
   decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
+    if (!adapter || !(adapter instanceof Adapter)) {
       throw new InvalidArgumentError(
         'The first argument of InclusionDecorator.decorate should be ' +
           'an Adapter instance, but %v was given.',
         adapter,
       );
+    }
 
     const tool = adapter.getService(IncludeClauseTool);
     const includeTo = (...args) => tool.includeTo(...args);
@@ -26,8 +27,9 @@ export class InclusionDecorator extends Service {
     const create = adapter.create;
     adapter.create = async function (modelName, modelData, filter) {
       const retvalData = await create.call(this, modelName, modelData, filter);
-      if (filter && typeof filter === 'object' && filter.include)
+      if (filter && typeof filter === 'object' && filter.include) {
         await includeTo([retvalData], modelName, filter.include);
+      }
       return retvalData;
     };
 
@@ -40,8 +42,9 @@ export class InclusionDecorator extends Service {
         modelData,
         filter,
       );
-      if (filter && typeof filter === 'object' && filter.include)
+      if (filter && typeof filter === 'object' && filter.include) {
         await includeTo([retvalData], modelName, filter.include);
+      }
       return retvalData;
     };
 
@@ -53,8 +56,9 @@ export class InclusionDecorator extends Service {
         modelData,
         filter,
       );
-      if (filter && typeof filter === 'object' && filter.include)
+      if (filter && typeof filter === 'object' && filter.include) {
         await includeTo([retvalData], modelName, filter.include);
+      }
       return retvalData;
     };
 
@@ -67,24 +71,27 @@ export class InclusionDecorator extends Service {
         modelData,
         filter,
       );
-      if (filter && typeof filter === 'object' && filter.include)
+      if (filter && typeof filter === 'object' && filter.include) {
         await includeTo([retvalData], modelName, filter.include);
+      }
       return retvalData;
     };
 
     const find = adapter.find;
     adapter.find = async function (modelName, filter) {
       const modelItems = await find.call(this, modelName, filter);
-      if (filter && typeof filter === 'object' && filter.include)
+      if (filter && typeof filter === 'object' && filter.include) {
         await includeTo(modelItems, modelName, filter.include);
+      }
       return modelItems;
     };
 
     const findById = adapter.findById;
     adapter.findById = async function (modelName, id, filter) {
       const retvalData = await findById.call(this, modelName, id, filter);
-      if (filter && typeof filter === 'object' && filter.include)
+      if (filter && typeof filter === 'object' && filter.include) {
         await includeTo([retvalData], modelName, filter.include);
+      }
       return retvalData;
     };
   }

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

@@ -13,12 +13,13 @@ export class PropertyUniquenessDecorator extends Service {
    * @param {Adapter} adapter
    */
   decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
+    if (!adapter || !(adapter instanceof Adapter)) {
       throw new InvalidArgumentError(
         'The first argument of PropertyUniquenessDecorator.decorate should be ' +
           'an Adapter instance, but %v was given.',
         adapter,
       );
+    }
     const validator = this.getService(PropertyUniquenessValidator);
 
     const create = adapter.create;

package/src/adapter/decorator/required-property-decorator.js

@@ -13,12 +13,13 @@ export class RequiredPropertyDecorator extends Service {
    * @param {Adapter} adapter
    */
   decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
+    if (!adapter || !(adapter instanceof Adapter)) {
       throw new InvalidArgumentError(
         'The first argument of RequiredPropertyDecorator.decorate should be ' +
           'an Adapter instance, but %v was given.',
         adapter,
       );
+    }
     const validator = this.getService(RequiredPropertyValidator);
 
     const create = adapter.create;

package/src/definition/datasource/datasource-definition-validator.js

@@ -11,23 +11,26 @@ export class DatasourceDefinitionValidator extends Service {
    * @param {object} datasourceDef
    */
   validate(datasourceDef) {
-    if (!datasourceDef || typeof datasourceDef !== 'object')
+    if (!datasourceDef || typeof datasourceDef !== 'object') {
       throw new InvalidArgumentError(
         'The datasource definition should be an Object, but %v was given.',
         datasourceDef,
       );
-    if (!datasourceDef.name || typeof datasourceDef.name !== 'string')
+    }
+    if (!datasourceDef.name || typeof datasourceDef.name !== 'string') {
       throw new InvalidArgumentError(
         'The datasource definition requires the option "name" ' +
           'as a non-empty String, but %v was given.',
         datasourceDef.name,
       );
-    if (!datasourceDef.adapter || typeof datasourceDef.adapter !== 'string')
+    }
+    if (!datasourceDef.adapter || typeof datasourceDef.adapter !== 'string') {
       throw new InvalidArgumentError(
         'The datasource %v requires the option "adapter" ' +
           'as a non-empty String, but %v was given.',
         datasourceDef.name,
         datasourceDef.adapter,
       );
+    }
   }
 }

package/src/definition/definition-registry.js

@@ -30,11 +30,12 @@ export class DefinitionRegistry extends Service {
   addDatasource(datasourceDef) {
     this.getService(DatasourceDefinitionValidator).validate(datasourceDef);
     const name = datasourceDef.name;
-    if (name in this._datasources)
+    if (name in this._datasources) {
       throw new InvalidArgumentError(
         'The datasource %v is already defined.',
         name,
       );
+    }
     this._datasources[name] = datasourceDef;
   }
 
@@ -56,8 +57,9 @@ export class DefinitionRegistry extends Service {
    */
   getDatasource(name) {
     const datasourceDef = this._datasources[name];
-    if (!datasourceDef)
+    if (!datasourceDef) {
       throw new InvalidArgumentError('The datasource %v is not defined.', name);
+    }
     return datasourceDef;
   }
 
@@ -69,11 +71,12 @@ export class DefinitionRegistry extends Service {
   addModel(modelDef) {
     this.getService(ModelDefinitionValidator).validate(modelDef);
     const modelKey = modelNameToModelKey(modelDef.name);
-    if (modelKey in this._models)
+    if (modelKey in this._models) {
       throw new InvalidArgumentError(
         'The model %v is already defined.',
         modelDef.name,
       );
+    }
     this._models[modelKey] = modelDef;
   }
 
@@ -97,8 +100,9 @@ export class DefinitionRegistry extends Service {
   getModel(name) {
     const modelKey = modelNameToModelKey(name);
     const modelDef = this._models[modelKey];
-    if (!modelDef)
+    if (!modelDef) {
       throw new InvalidArgumentError('The model %v is not defined.', name);
+    }
     return modelDef;
   }
 }

package/src/definition/model/model-data-sanitizer.js

@@ -14,18 +14,20 @@ export class ModelDataSanitizer extends Service {
    * @returns {object}
    */
   sanitize(modelName, modelData) {
-    if (!modelName || typeof modelName !== 'string')
+    if (!modelName || typeof modelName !== 'string') {
       throw new InvalidArgumentError(
         'The first argument of ModelDataSanitizer.sanitize ' +
           'should be a string, but %v was given.',
         modelName,
       );
-    if (!modelData || typeof modelData !== 'object')
+    }
+    if (!modelData || typeof modelData !== 'object') {
       throw new InvalidArgumentError(
         'The second argument of ModelDataSanitizer.sanitize ' +
           'should be an Object, but %v was given.',
         modelData,
       );
+    }
     return this.getService(
       ModelDefinitionUtils,
     ).excludeObjectKeysByRelationNames(modelName, modelData);