@e22m4u/js-repository 0.8.6 → 0.8.7

package/build-cjs.js

@@ -6,7 +6,7 @@ await esbuild.build({
   outfile: 'dist/cjs/index.cjs',
   format: 'cjs',
   platform: 'node',
-  target: ['node12'],
+  target: ['node18'],
   bundle: true,
   keepNames: true,
   external: [

package/dist/cjs/index.cjs

@@ -1,11 +1,8 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __glob = (map) => (path) => {
   var fn = map[path];
@@ -27,16 +24,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/utils/is-promise.js
 function isPromise(value) {
@@ -207,38 +195,43 @@ var init_is_deep_equal = __esm({
 });
 
 // src/errors/not-implemented-error.js
-var import_js_format, _NotImplementedError, NotImplementedError;
+var import_js_format, NotImplementedError;
 var init_not_implemented_error = __esm({
   "src/errors/not-implemented-error.js"() {
     "use strict";
     import_js_format = require("@e22m4u/js-format");
-    _NotImplementedError = class _NotImplementedError extends import_js_format.Errorf {
+    NotImplementedError = class extends import_js_format.Errorf {
+      static {
+        __name(this, "NotImplementedError");
+      }
     };
-    __name(_NotImplementedError, "NotImplementedError");
-    NotImplementedError = _NotImplementedError;
   }
 });
 
 // src/errors/invalid-argument-error.js
-var import_js_format2, _InvalidArgumentError, InvalidArgumentError;
+var import_js_format2, InvalidArgumentError;
 var init_invalid_argument_error = __esm({
   "src/errors/invalid-argument-error.js"() {
     "use strict";
     import_js_format2 = require("@e22m4u/js-format");
-    _InvalidArgumentError = class _InvalidArgumentError extends import_js_format2.Errorf {
+    InvalidArgumentError = class extends import_js_format2.Errorf {
+      static {
+        __name(this, "InvalidArgumentError");
+      }
     };
-    __name(_InvalidArgumentError, "InvalidArgumentError");
-    InvalidArgumentError = _InvalidArgumentError;
   }
 });
 
 // src/errors/invalid-operator-value-error.js
-var import_js_format3, _InvalidOperatorValueError, InvalidOperatorValueError;
+var import_js_format3, InvalidOperatorValueError;
 var init_invalid_operator_value_error = __esm({
   "src/errors/invalid-operator-value-error.js"() {
     "use strict";
     import_js_format3 = require("@e22m4u/js-format");
-    _InvalidOperatorValueError = class _InvalidOperatorValueError extends Error {
+    InvalidOperatorValueError = class extends Error {
+      static {
+        __name(this, "InvalidOperatorValueError");
+      }
       /**
        * Constructor.
        *
@@ -257,8 +250,6 @@ var init_invalid_operator_value_error = __esm({
         );
       }
     };
-    __name(_InvalidOperatorValueError, "InvalidOperatorValueError");
-    InvalidOperatorValueError = _InvalidOperatorValueError;
   }
 });
 
@@ -465,13 +456,16 @@ var init_utils = __esm({
 });
 
 // src/filter/slice-clause-tool.js
-var import_js_service, _SliceClauseTool, SliceClauseTool;
+var import_js_service, SliceClauseTool;
 var init_slice_clause_tool = __esm({
   "src/filter/slice-clause-tool.js"() {
     "use strict";
     import_js_service = require("@e22m4u/js-service");
     init_errors();
-    _SliceClauseTool = class _SliceClauseTool extends import_js_service.Service {
+    SliceClauseTool = class extends import_js_service.Service {
+      static {
+        __name(this, "SliceClauseTool");
+      }
       /**
        * Slice.
        *
@@ -536,8 +530,6 @@ var init_slice_clause_tool = __esm({
         }
       }
     };
-    __name(_SliceClauseTool, "SliceClauseTool");
-    SliceClauseTool = _SliceClauseTool;
   }
 });
 
@@ -557,14 +549,17 @@ function compareFn(a, b) {
   }
   return 0;
 }
-var import_js_service2, _OrderClauseTool, OrderClauseTool;
+var import_js_service2, OrderClauseTool;
 var init_order_clause_tool = __esm({
   "src/filter/order-clause-tool.js"() {
     "use strict";
     import_js_service2 = require("@e22m4u/js-service");
     init_utils();
     init_errors();
-    _OrderClauseTool = class _OrderClauseTool extends import_js_service2.Service {
+    OrderClauseTool = class extends import_js_service2.Service {
+      static {
+        __name(this, "OrderClauseTool");
+      }
       /**
        * Sort.
        *
@@ -652,21 +647,22 @@ var init_order_clause_tool = __esm({
         return clause;
       }
     };
-    __name(_OrderClauseTool, "OrderClauseTool");
-    OrderClauseTool = _OrderClauseTool;
     __name(compareFn, "compareFn");
   }
 });
 
 // src/filter/operator-clause-tool.js
-var import_js_service3, _OperatorClauseTool, OperatorClauseTool;
+var import_js_service3, OperatorClauseTool;
 var init_operator_clause_tool = __esm({
   "src/filter/operator-clause-tool.js"() {
     "use strict";
     import_js_service3 = require("@e22m4u/js-service");
     init_utils();
     init_errors();
-    _OperatorClauseTool = class _OperatorClauseTool extends import_js_service3.Service {
+    OperatorClauseTool = class extends import_js_service3.Service {
+      static {
+        __name(this, "OperatorClauseTool");
+      }
       /**
        * Compare.
        *
@@ -1147,13 +1143,11 @@ var init_operator_clause_tool = __esm({
         }
       }
     };
-    __name(_OperatorClauseTool, "OperatorClauseTool");
-    OperatorClauseTool = _OperatorClauseTool;
   }
 });
 
 // src/filter/where-clause-tool.js
-var import_js_service4, _WhereClauseTool, WhereClauseTool;
+var import_js_service4, WhereClauseTool;
 var init_where_clause_tool = __esm({
   "src/filter/where-clause-tool.js"() {
     "use strict";
@@ -1161,7 +1155,10 @@ var init_where_clause_tool = __esm({
     init_errors();
     init_operator_clause_tool();
     init_utils();
-    _WhereClauseTool = class _WhereClauseTool extends import_js_service4.Service {
+    WhereClauseTool = class extends import_js_service4.Service {
+      static {
+        __name(this, "WhereClauseTool");
+      }
       /**
        * Filter by where clause.
        *
@@ -1307,8 +1304,6 @@ var init_where_clause_tool = __esm({
         }
       }
     };
-    __name(_WhereClauseTool, "WhereClauseTool");
-    WhereClauseTool = _WhereClauseTool;
   }
 });
 
@@ -1334,14 +1329,17 @@ var init_relation_definition = __esm({
 });
 
 // src/definition/model/relations/relations-definition-validator.js
-var import_js_service5, _RelationsDefinitionValidator, RelationsDefinitionValidator;
+var import_js_service5, RelationsDefinitionValidator;
 var init_relations_definition_validator = __esm({
   "src/definition/model/relations/relations-definition-validator.js"() {
     "use strict";
     import_js_service5 = require("@e22m4u/js-service");
     init_relation_type();
     init_errors();
-    _RelationsDefinitionValidator = class _RelationsDefinitionValidator extends import_js_service5.Service {
+    RelationsDefinitionValidator = class extends import_js_service5.Service {
+      static {
+        __name(this, "RelationsDefinitionValidator");
+      }
       /**
        * Validate.
        *
@@ -1755,8 +1753,6 @@ var init_relations_definition_validator = __esm({
         }
       }
     };
-    __name(_RelationsDefinitionValidator, "RelationsDefinitionValidator");
-    RelationsDefinitionValidator = _RelationsDefinitionValidator;
   }
 });
 
@@ -1807,7 +1803,7 @@ var init_property_uniqueness = __esm({
 });
 
 // src/definition/definition-registry.js
-var import_js_service6, _DefinitionRegistry, DefinitionRegistry;
+var import_js_service6, DefinitionRegistry;
 var init_definition_registry = __esm({
   "src/definition/definition-registry.js"() {
     "use strict";
@@ -1816,7 +1812,10 @@ var init_definition_registry = __esm({
     init_errors();
     init_model();
     init_definition();
-    _DefinitionRegistry = class _DefinitionRegistry extends import_js_service6.Service {
+    DefinitionRegistry = class extends import_js_service6.Service {
+      static {
+        __name(this, "DefinitionRegistry");
+      }
       /**
        * Datasources.
        *
@@ -1908,13 +1907,11 @@ var init_definition_registry = __esm({
         return modelDef;
       }
     };
-    __name(_DefinitionRegistry, "DefinitionRegistry");
-    DefinitionRegistry = _DefinitionRegistry;
   }
 });
 
 // src/definition/model/model-definition-utils.js
-var import_js_service7, DEFAULT_PRIMARY_KEY_PROPERTY_NAME, _ModelDefinitionUtils, ModelDefinitionUtils;
+var import_js_service7, DEFAULT_PRIMARY_KEY_PROPERTY_NAME, ModelDefinitionUtils;
 var init_model_definition_utils = __esm({
   "src/definition/model/model-definition-utils.js"() {
     "use strict";
@@ -1924,7 +1921,10 @@ var init_model_definition_utils = __esm({
     init_definition_registry();
     init_utils();
     DEFAULT_PRIMARY_KEY_PROPERTY_NAME = "id";
-    _ModelDefinitionUtils = class _ModelDefinitionUtils extends import_js_service7.Service {
+    ModelDefinitionUtils = class extends import_js_service7.Service {
+      static {
+        __name(this, "ModelDefinitionUtils");
+      }
       /**
        * Get primary key as property name.
        *
@@ -1980,9 +1980,8 @@ var init_model_definition_utils = __esm({
        * @returns {string}
        */
       getTableNameByModelName(modelName) {
-        var _a;
         const modelDef = this.getService(DefinitionRegistry).getModel(modelName);
-        return (_a = modelDef.tableName) != null ? _a : modelName;
+        return modelDef.tableName ?? modelName;
       }
       /**
        * Get column name by property name.
@@ -1992,7 +1991,6 @@ var init_model_definition_utils = __esm({
        * @returns {string}
        */
       getColumnNameByPropertyName(modelName, propertyName) {
-        var _a;
         const propDefs = this.getPropertiesDefinitionInBaseModelHierarchy(modelName);
         const propDef = propDefs[propertyName];
         if (!propDef) {
@@ -2003,7 +2001,7 @@ var init_model_definition_utils = __esm({
           );
         }
         if (propDef && typeof propDef === "object") {
-          return (_a = propDef.columnName) != null ? _a : propertyName;
+          return propDef.columnName ?? propertyName;
         }
         return propertyName;
       }
@@ -2182,9 +2180,8 @@ var init_model_definition_utils = __esm({
        * @returns {object}
        */
       getOwnPropertiesDefinitionOfPrimaryKeys(modelName) {
-        var _a;
         const modelDef = this.getService(DefinitionRegistry).getModel(modelName);
-        const propDefs = (_a = modelDef.properties) != null ? _a : {};
+        const propDefs = modelDef.properties ?? {};
         const pkPropNames = Object.keys(propDefs).filter((propName) => {
           const propDef = propDefs[propName];
           return typeof propDef === "object" && propDef.primaryKey;
@@ -2198,9 +2195,8 @@ var init_model_definition_utils = __esm({
        * @returns {object}
        */
       getOwnPropertiesDefinitionWithoutPrimaryKeys(modelName) {
-        var _a;
         const modelDef = this.getService(DefinitionRegistry).getModel(modelName);
-        const propDefs = (_a = modelDef.properties) != null ? _a : {};
+        const propDefs = modelDef.properties ?? {};
         return Object.keys(propDefs).reduce((result, propName) => {
           const propDef = propDefs[propName];
           if (typeof propDef === "object" && propDef.primaryKey) {
@@ -2247,9 +2243,8 @@ var init_model_definition_utils = __esm({
        * @returns {object}
        */
       getOwnRelationsDefinition(modelName) {
-        var _a;
         const modelDef = this.getService(DefinitionRegistry).getModel(modelName);
-        return (_a = modelDef.relations) != null ? _a : {};
+        return modelDef.relations ?? {};
       }
       /**
        * Get relations definition in base model hierarchy.
@@ -2260,7 +2255,6 @@ var init_model_definition_utils = __esm({
       getRelationsDefinitionInBaseModelHierarchy(modelName) {
         let result = {};
         const recursion = /* @__PURE__ */ __name((currModelName, prevModelName = void 0) => {
-          var _a;
           if (currModelName === prevModelName) {
             throw new InvalidArgumentError(
               "The model %v has a circular inheritance.",
@@ -2268,7 +2262,7 @@ var init_model_definition_utils = __esm({
             );
           }
           const modelDef = this.getService(DefinitionRegistry).getModel(currModelName);
-          const ownRelDefs = (_a = modelDef.relations) != null ? _a : {};
+          const ownRelDefs = modelDef.relations ?? {};
           result = { ...ownRelDefs, ...result };
           if (modelDef.base) {
             recursion(modelDef.base, currModelName);
@@ -2357,13 +2351,11 @@ var init_model_definition_utils = __esm({
         return void 0;
       }
     };
-    __name(_ModelDefinitionUtils, "ModelDefinitionUtils");
-    ModelDefinitionUtils = _ModelDefinitionUtils;
   }
 });
 
 // src/definition/model/properties/required-property-validator.js
-var import_js_service8, _RequiredPropertyValidator, RequiredPropertyValidator;
+var import_js_service8, RequiredPropertyValidator;
 var init_required_property_validator = __esm({
   "src/definition/model/properties/required-property-validator.js"() {
     "use strict";
@@ -2371,7 +2363,10 @@ var init_required_property_validator = __esm({
     import_js_service8 = require("@e22m4u/js-service");
     init_errors();
     init_model_definition_utils();
-    _RequiredPropertyValidator = class _RequiredPropertyValidator extends import_js_service8.Service {
+    RequiredPropertyValidator = class extends import_js_service8.Service {
+      static {
+        __name(this, "RequiredPropertyValidator");
+      }
       /**
        * Validate.
        *
@@ -2429,13 +2424,11 @@ var init_required_property_validator = __esm({
         }
       }
     };
-    __name(_RequiredPropertyValidator, "RequiredPropertyValidator");
-    RequiredPropertyValidator = _RequiredPropertyValidator;
   }
 });
 
 // src/definition/model/properties/property-uniqueness-validator.js
-var import_js_service9, _PropertyUniquenessValidator, PropertyUniquenessValidator;
+var import_js_service9, PropertyUniquenessValidator;
 var init_property_uniqueness_validator = __esm({
   "src/definition/model/properties/property-uniqueness-validator.js"() {
     "use strict";
@@ -2444,7 +2437,10 @@ var init_property_uniqueness_validator = __esm({
     init_property_uniqueness();
     init_errors();
     init_model_definition_utils();
-    _PropertyUniquenessValidator = class _PropertyUniquenessValidator extends import_js_service9.Service {
+    PropertyUniquenessValidator = class extends import_js_service9.Service {
+      static {
+        __name(this, "PropertyUniquenessValidator");
+      }
       /**
        * Validate.
        *
@@ -2560,20 +2556,21 @@ var init_property_uniqueness_validator = __esm({
         }
       }
     };
-    __name(_PropertyUniquenessValidator, "PropertyUniquenessValidator");
-    PropertyUniquenessValidator = _PropertyUniquenessValidator;
   }
 });
 
 // src/definition/model/properties/primary-keys-definition-validator.js
-var import_js_service10, _PrimaryKeysDefinitionValidator, PrimaryKeysDefinitionValidator;
+var import_js_service10, PrimaryKeysDefinitionValidator;
 var init_primary_keys_definition_validator = __esm({
   "src/definition/model/properties/primary-keys-definition-validator.js"() {
     "use strict";
     import_js_service10 = require("@e22m4u/js-service");
     init_errors();
     init_model_definition_utils();
-    _PrimaryKeysDefinitionValidator = class _PrimaryKeysDefinitionValidator extends import_js_service10.Service {
+    PrimaryKeysDefinitionValidator = class extends import_js_service10.Service {
+      static {
+        __name(this, "PrimaryKeysDefinitionValidator");
+      }
       /**
        * Validate.
        *
@@ -2614,13 +2611,11 @@ var init_primary_keys_definition_validator = __esm({
         }
       }
     };
-    __name(_PrimaryKeysDefinitionValidator, "PrimaryKeysDefinitionValidator");
-    PrimaryKeysDefinitionValidator = _PrimaryKeysDefinitionValidator;
   }
 });
 
 // src/definition/model/properties/properties-definition-validator.js
-var import_js_service11, _PropertiesDefinitionValidator, PropertiesDefinitionValidator;
+var import_js_service11, PropertiesDefinitionValidator;
 var init_properties_definition_validator = __esm({
   "src/definition/model/properties/properties-definition-validator.js"() {
     "use strict";
@@ -2630,7 +2625,10 @@ var init_properties_definition_validator = __esm({
     init_property_uniqueness();
     init_errors();
     init_primary_keys_definition_validator();
-    _PropertiesDefinitionValidator = class _PropertiesDefinitionValidator extends import_js_service11.Service {
+    PropertiesDefinitionValidator = class extends import_js_service11.Service {
+      static {
+        __name(this, "PropertiesDefinitionValidator");
+      }
       /**
        * Validate.
        *
@@ -2857,8 +2855,6 @@ var init_properties_definition_validator = __esm({
         }
       }
     };
-    __name(_PropertiesDefinitionValidator, "PropertiesDefinitionValidator");
-    PropertiesDefinitionValidator = _PropertiesDefinitionValidator;
   }
 });
 
@@ -2884,14 +2880,17 @@ var init_model_definition = __esm({
 });
 
 // src/definition/model/model-data-sanitizer.js
-var import_js_service12, _ModelDataSanitizer, ModelDataSanitizer;
+var import_js_service12, ModelDataSanitizer;
 var init_model_data_sanitizer = __esm({
   "src/definition/model/model-data-sanitizer.js"() {
     "use strict";
     import_js_service12 = require("@e22m4u/js-service");
     init_errors();
     init_model_definition_utils();
-    _ModelDataSanitizer = class _ModelDataSanitizer extends import_js_service12.Service {
+    ModelDataSanitizer = class extends import_js_service12.Service {
+      static {
+        __name(this, "ModelDataSanitizer");
+      }
       /**
        * Validate.
        *
@@ -2917,13 +2916,11 @@ var init_model_data_sanitizer = __esm({
         ).excludeObjectKeysByRelationNames(modelName, modelData);
       }
     };
-    __name(_ModelDataSanitizer, "ModelDataSanitizer");
-    ModelDataSanitizer = _ModelDataSanitizer;
   }
 });
 
 // src/definition/model/model-definition-validator.js
-var import_js_service13, _ModelDefinitionValidator, ModelDefinitionValidator;
+var import_js_service13, ModelDefinitionValidator;
 var init_model_definition_validator = __esm({
   "src/definition/model/model-definition-validator.js"() {
     "use strict";
@@ -2931,7 +2928,10 @@ var init_model_definition_validator = __esm({
     init_errors();
     init_relations();
     init_properties();
-    _ModelDefinitionValidator = class _ModelDefinitionValidator extends import_js_service13.Service {
+    ModelDefinitionValidator = class extends import_js_service13.Service {
+      static {
+        __name(this, "ModelDefinitionValidator");
+      }
       /**
        * Validate.
        *
@@ -2999,8 +2999,6 @@ var init_model_definition_validator = __esm({
         }
       }
     };
-    __name(_ModelDefinitionValidator, "ModelDefinitionValidator");
-    ModelDefinitionValidator = _ModelDefinitionValidator;
   }
 });
 
@@ -3018,13 +3016,16 @@ var init_model = __esm({
 });
 
 // src/definition/datasource/datasource-definition-validator.js
-var import_js_service14, _DatasourceDefinitionValidator, DatasourceDefinitionValidator;
+var import_js_service14, DatasourceDefinitionValidator;
 var init_datasource_definition_validator = __esm({
   "src/definition/datasource/datasource-definition-validator.js"() {
     "use strict";
     import_js_service14 = require("@e22m4u/js-service");
     init_errors();
-    _DatasourceDefinitionValidator = class _DatasourceDefinitionValidator extends import_js_service14.Service {
+    DatasourceDefinitionValidator = class extends import_js_service14.Service {
+      static {
+        __name(this, "DatasourceDefinitionValidator");
+      }
       /**
        * Validate.
        *
@@ -3052,8 +3053,6 @@ var init_datasource_definition_validator = __esm({
         }
       }
     };
-    __name(_DatasourceDefinitionValidator, "DatasourceDefinitionValidator");
-    DatasourceDefinitionValidator = _DatasourceDefinitionValidator;
   }
 });
 
@@ -3076,7 +3075,7 @@ var init_definition = __esm({
 });
 
 // src/filter/fields-clause-tool.js
-var import_js_service15, _FieldsClauseTool, FieldsClauseTool;
+var import_js_service15, FieldsClauseTool;
 var init_fields_clause_tool = __esm({
   "src/filter/fields-clause-tool.js"() {
     "use strict";
@@ -3084,7 +3083,10 @@ var init_fields_clause_tool = __esm({
     init_utils();
     init_errors();
     init_definition();
-    _FieldsClauseTool = class _FieldsClauseTool extends import_js_service15.Service {
+    FieldsClauseTool = class extends import_js_service15.Service {
+      static {
+        __name(this, "FieldsClauseTool");
+      }
       /**
        * Filter.
        *
@@ -3181,13 +3183,11 @@ var init_fields_clause_tool = __esm({
         return fields;
       }
     };
-    __name(_FieldsClauseTool, "FieldsClauseTool");
-    FieldsClauseTool = _FieldsClauseTool;
   }
 });
 
 // src/adapter/decorator/inclusion-decorator.js
-var import_js_service16, _InclusionDecorator, InclusionDecorator;
+var import_js_service16, InclusionDecorator;
 var init_inclusion_decorator = __esm({
   "src/adapter/decorator/inclusion-decorator.js"() {
     "use strict";
@@ -3195,7 +3195,10 @@ var init_inclusion_decorator = __esm({
     import_js_service16 = require("@e22m4u/js-service");
     init_filter();
     init_errors();
-    _InclusionDecorator = class _InclusionDecorator extends import_js_service16.Service {
+    InclusionDecorator = class extends import_js_service16.Service {
+      static {
+        __name(this, "InclusionDecorator");
+      }
       /**
        * Decorate.
        *
@@ -3277,13 +3280,11 @@ var init_inclusion_decorator = __esm({
         };
       }
     };
-    __name(_InclusionDecorator, "InclusionDecorator");
-    InclusionDecorator = _InclusionDecorator;
   }
 });
 
 // src/adapter/decorator/default-values-decorator.js
-var import_js_service17, _DefaultValuesDecorator, DefaultValuesDecorator;
+var import_js_service17, DefaultValuesDecorator;
 var init_default_values_decorator = __esm({
   "src/adapter/decorator/default-values-decorator.js"() {
     "use strict";
@@ -3291,7 +3292,10 @@ var init_default_values_decorator = __esm({
     import_js_service17 = require("@e22m4u/js-service");
     init_errors();
     init_definition();
-    _DefaultValuesDecorator = class _DefaultValuesDecorator extends import_js_service17.Service {
+    DefaultValuesDecorator = class extends import_js_service17.Service {
+      static {
+        __name(this, "DefaultValuesDecorator");
+      }
       /**
        * Decorate.
        *
@@ -3343,13 +3347,11 @@ var init_default_values_decorator = __esm({
         };
       }
     };
-    __name(_DefaultValuesDecorator, "DefaultValuesDecorator");
-    DefaultValuesDecorator = _DefaultValuesDecorator;
   }
 });
 
 // src/adapter/decorator/data-sanitizing-decorator.js
-var import_js_service18, _DataSanitizingDecorator, DataSanitizingDecorator;
+var import_js_service18, DataSanitizingDecorator;
 var init_data_sanitizing_decorator = __esm({
   "src/adapter/decorator/data-sanitizing-decorator.js"() {
     "use strict";
@@ -3357,7 +3359,10 @@ var init_data_sanitizing_decorator = __esm({
     import_js_service18 = require("@e22m4u/js-service");
     init_errors();
     init_definition();
-    _DataSanitizingDecorator = class _DataSanitizingDecorator extends import_js_service18.Service {
+    DataSanitizingDecorator = class extends import_js_service18.Service {
+      static {
+        __name(this, "DataSanitizingDecorator");
+      }
       /**
        * Decorate.
        *
@@ -3399,13 +3404,11 @@ var init_data_sanitizing_decorator = __esm({
         };
       }
     };
-    __name(_DataSanitizingDecorator, "DataSanitizingDecorator");
-    DataSanitizingDecorator = _DataSanitizingDecorator;
   }
 });
 
 // src/adapter/decorator/fields-filtering-decorator.js
-var import_js_service19, _FieldsFilteringDecorator, FieldsFilteringDecorator;
+var import_js_service19, FieldsFilteringDecorator;
 var init_fields_filtering_decorator = __esm({
   "src/adapter/decorator/fields-filtering-decorator.js"() {
     "use strict";
@@ -3413,7 +3416,10 @@ var init_fields_filtering_decorator = __esm({
     import_js_service19 = require("@e22m4u/js-service");
     init_filter();
     init_errors();
-    _FieldsFilteringDecorator = class _FieldsFilteringDecorator extends import_js_service19.Service {
+    FieldsFilteringDecorator = class extends import_js_service19.Service {
+      static {
+        __name(this, "FieldsFilteringDecorator");
+      }
       /**
        * Decorate.
        *
@@ -3489,13 +3495,11 @@ var init_fields_filtering_decorator = __esm({
         };
       }
     };
-    __name(_FieldsFilteringDecorator, "FieldsFilteringDecorator");
-    FieldsFilteringDecorator = _FieldsFilteringDecorator;
   }
 });
 
 // src/adapter/decorator/required-property-decorator.js
-var import_js_service20, _RequiredPropertyDecorator, RequiredPropertyDecorator;
+var import_js_service20, RequiredPropertyDecorator;
 var init_required_property_decorator = __esm({
   "src/adapter/decorator/required-property-decorator.js"() {
     "use strict";
@@ -3503,7 +3507,10 @@ var init_required_property_decorator = __esm({
     import_js_service20 = require("@e22m4u/js-service");
     init_errors();
     init_definition();
-    _RequiredPropertyDecorator = class _RequiredPropertyDecorator extends import_js_service20.Service {
+    RequiredPropertyDecorator = class extends import_js_service20.Service {
+      static {
+        __name(this, "RequiredPropertyDecorator");
+      }
       /**
        * Decorate.
        *
@@ -3544,13 +3551,11 @@ var init_required_property_decorator = __esm({
         };
       }
     };
-    __name(_RequiredPropertyDecorator, "RequiredPropertyDecorator");
-    RequiredPropertyDecorator = _RequiredPropertyDecorator;
   }
 });
 
 // src/adapter/decorator/property-uniqueness-decorator.js
-var import_js_service21, _PropertyUniquenessDecorator, PropertyUniquenessDecorator;
+var import_js_service21, PropertyUniquenessDecorator;
 var init_property_uniqueness_decorator = __esm({
   "src/adapter/decorator/property-uniqueness-decorator.js"() {
     "use strict";
@@ -3558,7 +3563,10 @@ var init_property_uniqueness_decorator = __esm({
     import_js_service21 = require("@e22m4u/js-service");
     init_errors();
     init_definition();
-    _PropertyUniquenessDecorator = class _PropertyUniquenessDecorator extends import_js_service21.Service {
+    PropertyUniquenessDecorator = class extends import_js_service21.Service {
+      static {
+        __name(this, "PropertyUniquenessDecorator");
+      }
       /**
        * Decorate.
        *
@@ -3621,8 +3629,6 @@ var init_property_uniqueness_decorator = __esm({
         };
       }
     };
-    __name(_PropertyUniquenessDecorator, "PropertyUniquenessDecorator");
-    PropertyUniquenessDecorator = _PropertyUniquenessDecorator;
   }
 });
 
@@ -3640,7 +3646,7 @@ var init_decorator = __esm({
 });
 
 // src/adapter/adapter.js
-var import_js_service22, ADAPTER_CLASS_NAME, _Adapter, Adapter;
+var import_js_service22, ADAPTER_CLASS_NAME, Adapter;
 var init_adapter = __esm({
   "src/adapter/adapter.js"() {
     "use strict";
@@ -3648,7 +3654,16 @@ var init_adapter = __esm({
     init_errors();
     init_decorator();
     ADAPTER_CLASS_NAME = "Adapter";
-    _Adapter = class _Adapter extends import_js_service22.Service {
+    Adapter = class _Adapter extends import_js_service22.Service {
+      static {
+        __name(this, "Adapter");
+      }
+      /**
+       * Kinds.
+       *
+       * @type {string[]}
+       */
+      static kinds = [...import_js_service22.Service.kinds, ADAPTER_CLASS_NAME];
       /**
        * Settings.
        *
@@ -3833,14 +3848,6 @@ var init_adapter = __esm({
         );
       }
     };
-    __name(_Adapter, "Adapter");
-    /**
-     * Kinds.
-     *
-     * @type {string[]}
-     */
-    __publicField(_Adapter, "kinds", [...import_js_service22.Service.kinds, ADAPTER_CLASS_NAME]);
-    Adapter = _Adapter;
   }
 });
 
@@ -3849,7 +3856,7 @@ var memory_adapter_exports = {};
 __export(memory_adapter_exports, {
   MemoryAdapter: () => MemoryAdapter
 });
-var _MemoryAdapter, MemoryAdapter;
+var MemoryAdapter;
 var init_memory_adapter = __esm({
   "src/adapter/builtin/memory-adapter.js"() {
     "use strict";
@@ -3858,7 +3865,10 @@ var init_memory_adapter = __esm({
     init_utils();
     init_definition();
     init_filter();
-    _MemoryAdapter = class _MemoryAdapter extends Adapter {
+    MemoryAdapter = class extends Adapter {
+      static {
+        __name(this, "MemoryAdapter");
+      }
       /**
        * Tables.
        *
@@ -3895,7 +3905,6 @@ var init_memory_adapter = __esm({
        * @returns {number}
        */
       _genNextIdValue(modelName, propName) {
-        var _a;
         const modelUtils = this.getService(ModelDefinitionUtils);
         const propType = modelUtils.getDataTypeByPropertyName(modelName, propName);
         if (propType !== DataType.ANY && propType !== DataType.NUMBER) {
@@ -3909,7 +3918,7 @@ var init_memory_adapter = __esm({
         }
         const tableName = modelUtils.getTableNameByModelName(modelName);
         const table = this._getTableOrCreate(modelName);
-        let nextId = (_a = this._lastIds.get(tableName)) != null ? _a : 0;
+        let nextId = this._lastIds.get(tableName) ?? 0;
         do {
           nextId++;
         } while (table.has(nextId));
@@ -3927,9 +3936,8 @@ var init_memory_adapter = __esm({
        * @param {number} idValue
        */
       _updateLastIdValueIfNeeded(modelName, idValue) {
-        var _a;
         const tableName = this.getService(ModelDefinitionUtils).getTableNameByModelName(modelName);
-        const currentLastId = (_a = this._lastIds.get(tableName)) != null ? _a : 0;
+        const currentLastId = this._lastIds.get(tableName) ?? 0;
         if (idValue > currentLastId) {
           this._lastIds.set(tableName, idValue);
         }
@@ -4254,8 +4262,6 @@ var init_memory_adapter = __esm({
         return modelItems.length;
       }
     };
-    __name(_MemoryAdapter, "MemoryAdapter");
-    MemoryAdapter = _MemoryAdapter;
   }
 });
 
@@ -4283,7 +4289,7 @@ function findAdapterCtorInModule(module2) {
   }
   return adapterCtor;
 }
-var import_js_service23, _AdapterLoader, AdapterLoader;
+var import_js_service23, AdapterLoader;
 var init_adapter_loader = __esm({
   "src/adapter/adapter-loader.js"() {
     "use strict";
@@ -4291,7 +4297,10 @@ var init_adapter_loader = __esm({
     init_errors();
     init_adapter();
     init_();
-    _AdapterLoader = class _AdapterLoader extends import_js_service23.Service {
+    AdapterLoader = class extends import_js_service23.Service {
+      static {
+        __name(this, "AdapterLoader");
+      }
       /**
        * Load by name.
        *
@@ -4314,7 +4323,7 @@ var init_adapter_loader = __esm({
         }
         if (!adapterCtor) {
           try {
-            const module2 = await Promise.resolve().then(() => __toESM(require(`@e22m4u/js-repository-${adapterName}-adapter`)));
+            const module2 = await import(`@e22m4u/js-repository-${adapterName}-adapter`);
             adapterCtor = findAdapterCtorInModule(module2);
           } catch {
           }
@@ -4328,14 +4337,12 @@ var init_adapter_loader = __esm({
         return new adapterCtor(this.container, settings);
       }
     };
-    __name(_AdapterLoader, "AdapterLoader");
-    AdapterLoader = _AdapterLoader;
     __name(findAdapterCtorInModule, "findAdapterCtorInModule");
   }
 });
 
 // src/adapter/adapter-registry.js
-var import_js_service24, _AdapterRegistry, AdapterRegistry;
+var import_js_service24, AdapterRegistry;
 var init_adapter_registry = __esm({
   "src/adapter/adapter-registry.js"() {
     "use strict";
@@ -4343,7 +4350,10 @@ var init_adapter_registry = __esm({
     import_js_service24 = require("@e22m4u/js-service");
     init_adapter_loader();
     init_definition();
-    _AdapterRegistry = class _AdapterRegistry extends import_js_service24.Service {
+    AdapterRegistry = class extends import_js_service24.Service {
+      static {
+        __name(this, "AdapterRegistry");
+      }
       /**
        * Adapters.
        *
@@ -4371,8 +4381,6 @@ var init_adapter_registry = __esm({
         return adapter;
       }
     };
-    __name(_AdapterRegistry, "AdapterRegistry");
-    AdapterRegistry = _AdapterRegistry;
   }
 });
 
@@ -4387,7 +4395,7 @@ var init_adapter2 = __esm({
 });
 
 // src/repository/repository.js
-var import_js_service25, _Repository, Repository;
+var import_js_service25, Repository;
 var init_repository = __esm({
   "src/repository/repository.js"() {
     "use strict";
@@ -4395,7 +4403,10 @@ var init_repository = __esm({
     init_errors();
     init_definition();
     init_adapter2();
-    _Repository = class _Repository extends import_js_service25.Service {
+    Repository = class extends import_js_service25.Service {
+      static {
+        __name(this, "Repository");
+      }
       /**
        * Model name.
        *
@@ -4527,7 +4538,7 @@ var init_repository = __esm({
        */
       async findOne(filter = void 0) {
         const adapter = await this.getAdapter();
-        filter = filter != null ? filter : {};
+        filter = filter ?? {};
         filter.limit = 1;
         const result = await adapter.find(this.modelName, filter);
         return result.length ? result[0] : void 0;
@@ -4584,13 +4595,11 @@ var init_repository = __esm({
         return adapter.count(this.modelName, where);
       }
     };
-    __name(_Repository, "Repository");
-    Repository = _Repository;
   }
 });
 
 // src/repository/repository-registry.js
-var import_js_service26, _RepositoryRegistry, RepositoryRegistry;
+var import_js_service26, RepositoryRegistry;
 var init_repository_registry = __esm({
   "src/repository/repository-registry.js"() {
     "use strict";
@@ -4598,7 +4607,10 @@ var init_repository_registry = __esm({
     init_repository();
     init_utils();
     init_errors();
-    _RepositoryRegistry = class _RepositoryRegistry extends import_js_service26.Service {
+    RepositoryRegistry = class extends import_js_service26.Service {
+      static {
+        __name(this, "RepositoryRegistry");
+      }
       /**
        * Repositories.
        *
@@ -4643,8 +4655,6 @@ var init_repository_registry = __esm({
         return repository;
       }
     };
-    __name(_RepositoryRegistry, "RepositoryRegistry");
-    RepositoryRegistry = _RepositoryRegistry;
   }
 });
 
@@ -4658,7 +4668,7 @@ var init_repository2 = __esm({
 });
 
 // src/relations/has-one-resolver.js
-var import_js_service27, _HasOneResolver, HasOneResolver;
+var import_js_service27, HasOneResolver;
 var init_has_one_resolver = __esm({
   "src/relations/has-one-resolver.js"() {
     "use strict";
@@ -4667,7 +4677,10 @@ var init_has_one_resolver = __esm({
     init_errors();
     init_repository2();
     init_definition();
-    _HasOneResolver = class _HasOneResolver extends import_js_service27.Service {
+    HasOneResolver = class extends import_js_service27.Service {
+      static {
+        __name(this, "HasOneResolver");
+      }
       /**
        * Include to.
        *
@@ -4937,13 +4950,11 @@ var init_has_one_resolver = __esm({
         );
       }
     };
-    __name(_HasOneResolver, "HasOneResolver");
-    HasOneResolver = _HasOneResolver;
   }
 });
 
 // src/relations/has-many-resolver.js
-var import_js_service28, _HasManyResolver, HasManyResolver;
+var import_js_service28, HasManyResolver;
 var init_has_many_resolver = __esm({
   "src/relations/has-many-resolver.js"() {
     "use strict";
@@ -4952,7 +4963,10 @@ var init_has_many_resolver = __esm({
     init_errors();
     init_repository2();
     init_definition();
-    _HasManyResolver = class _HasManyResolver extends import_js_service28.Service {
+    HasManyResolver = class extends import_js_service28.Service {
+      static {
+        __name(this, "HasManyResolver");
+      }
       /**
        * Include to.
        *
@@ -5029,9 +5043,8 @@ var init_has_many_resolver = __esm({
           };
           promises.push(
             targetRepository.find(filter).then((result) => {
-              var _a;
               if (result.length) {
-                let targets = (_a = targetsBySourceId.get(sourceId)) != null ? _a : [];
+                let targets = targetsBySourceId.get(sourceId) ?? [];
                 targets = [...targets, ...result];
                 targetsBySourceId.set(sourceId, targets);
               }
@@ -5040,9 +5053,8 @@ var init_has_many_resolver = __esm({
         });
         await Promise.all(promises);
         entities.forEach((entity) => {
-          var _a;
           const sourceId = entity[sourcePkPropName];
-          entity[relationName] = (_a = targetsBySourceId.get(sourceId)) != null ? _a : [];
+          entity[relationName] = targetsBySourceId.get(sourceId) ?? [];
         });
       }
       /**
@@ -5131,9 +5143,8 @@ var init_has_many_resolver = __esm({
           };
           promises.push(
             targetRepository.find(filter).then((result) => {
-              var _a;
               if (result.length) {
-                let targets = (_a = targetsBySourceId.get(sourceId)) != null ? _a : [];
+                let targets = targetsBySourceId.get(sourceId) ?? [];
                 targets = [...targets, ...result];
                 targetsBySourceId.set(sourceId, targets);
               }
@@ -5142,9 +5153,8 @@ var init_has_many_resolver = __esm({
         });
         await Promise.all(promises);
         entities.forEach((entity) => {
-          var _a;
           const sourceId = entity[sourcePkPropName];
-          entity[relationName] = (_a = targetsBySourceId.get(sourceId)) != null ? _a : [];
+          entity[relationName] = targetsBySourceId.get(sourceId) ?? [];
         });
       }
       /**
@@ -5228,13 +5238,11 @@ var init_has_many_resolver = __esm({
         );
       }
     };
-    __name(_HasManyResolver, "HasManyResolver");
-    HasManyResolver = _HasManyResolver;
   }
 });
 
 // src/relations/belongs-to-resolver.js
-var import_js_service29, _BelongsToResolver, BelongsToResolver;
+var import_js_service29, BelongsToResolver;
 var init_belongs_to_resolver = __esm({
   "src/relations/belongs-to-resolver.js"() {
     "use strict";
@@ -5243,7 +5251,10 @@ var init_belongs_to_resolver = __esm({
     init_utils();
     init_repository2();
     init_definition();
-    _BelongsToResolver = class _BelongsToResolver extends import_js_service29.Service {
+    BelongsToResolver = class extends import_js_service29.Service {
+      static {
+        __name(this, "BelongsToResolver");
+      }
       /**
        * Include to.
        *
@@ -5432,9 +5443,8 @@ var init_belongs_to_resolver = __esm({
             ]
           };
           const promise = targetRepository.find(targetFilter).then((result) => {
-            var _a;
             targetEntitiesByTargetNames[targetName] = [
-              ...(_a = targetEntitiesByTargetNames[targetName]) != null ? _a : [],
+              ...targetEntitiesByTargetNames[targetName] ?? [],
               ...result
             ];
           });
@@ -5442,13 +5452,12 @@ var init_belongs_to_resolver = __esm({
         });
         await Promise.all(promises);
         entities.forEach((entity) => {
-          var _a;
           const targetId = entity[foreignKey];
           const targetName = entity[discriminator];
           if (targetId == null || targetName == null || targetEntitiesByTargetNames[targetName] == null) {
             return;
           }
-          const targetEntities = (_a = targetEntitiesByTargetNames[targetName]) != null ? _a : [];
+          const targetEntities = targetEntitiesByTargetNames[targetName] ?? [];
           const targetPkPropName = this.getService(ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
             targetName
           );
@@ -5459,13 +5468,11 @@ var init_belongs_to_resolver = __esm({
         });
       }
     };
-    __name(_BelongsToResolver, "BelongsToResolver");
-    BelongsToResolver = _BelongsToResolver;
   }
 });
 
 // src/relations/references-many-resolver.js
-var import_js_service30, _ReferencesManyResolver, ReferencesManyResolver;
+var import_js_service30, ReferencesManyResolver;
 var init_references_many_resolver = __esm({
   "src/relations/references-many-resolver.js"() {
     "use strict";
@@ -5474,7 +5481,10 @@ var init_references_many_resolver = __esm({
     init_utils();
     init_repository2();
     init_definition();
-    _ReferencesManyResolver = class _ReferencesManyResolver extends import_js_service30.Service {
+    ReferencesManyResolver = class extends import_js_service30.Service {
+      static {
+        __name(this, "ReferencesManyResolver");
+      }
       /**
        * Include to.
        *
@@ -5572,8 +5582,6 @@ var init_references_many_resolver = __esm({
         });
       }
     };
-    __name(_ReferencesManyResolver, "ReferencesManyResolver");
-    ReferencesManyResolver = _ReferencesManyResolver;
   }
 });
 
@@ -5589,7 +5597,7 @@ var init_relations2 = __esm({
 });
 
 // src/filter/include-clause-tool.js
-var import_js_service31, _IncludeClauseTool, IncludeClauseTool;
+var import_js_service31, IncludeClauseTool;
 var init_include_clause_tool = __esm({
   "src/filter/include-clause-tool.js"() {
     "use strict";
@@ -5601,7 +5609,10 @@ var init_include_clause_tool = __esm({
     init_fields_clause_tool();
     init_definition();
     init_relations2();
-    _IncludeClauseTool = class _IncludeClauseTool extends import_js_service31.Service {
+    IncludeClauseTool = class _IncludeClauseTool extends import_js_service31.Service {
+      static {
+        __name(this, "IncludeClauseTool");
+      }
       /**
        * Include to.
        *
@@ -5942,8 +5953,6 @@ var init_include_clause_tool = __esm({
         return void 0;
       }
     };
-    __name(_IncludeClauseTool, "IncludeClauseTool");
-    IncludeClauseTool = _IncludeClauseTool;
   }
 });
 
@@ -6020,7 +6029,10 @@ init_adapter2();
 var import_js_service32 = require("@e22m4u/js-service");
 init_definition();
 init_repository2();
-var _DatabaseSchema = class _DatabaseSchema extends import_js_service32.Service {
+var DatabaseSchema = class extends import_js_service32.Service {
+  static {
+    __name(this, "DatabaseSchema");
+  }
   /**
    * Define datasource.
    *
@@ -6051,8 +6063,6 @@ var _DatabaseSchema = class _DatabaseSchema extends import_js_service32.Service
     return this.getService(RepositoryRegistry).getRepository(modelName);
   }
 };
-__name(_DatabaseSchema, "DatabaseSchema");
-var DatabaseSchema = _DatabaseSchema;
 
 // src/index.js
 init_relations2();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "Реализация репозитория для работы с базами данных",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "require": "./dist/cjs/index.cjs"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=18"
   },
   "scripts": {
     "lint": "tsc && eslint ./src",
@@ -40,11 +40,11 @@
   },
   "dependencies": {
     "@e22m4u/js-format": "~0.4.0",
-    "@e22m4u/js-service": "~0.6.1"
+    "@e22m4u/js-service": "~0.6.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "~20.4.3",
-    "@commitlint/config-conventional": "~20.4.3",
+    "@commitlint/cli": "~20.4.4",
+    "@commitlint/config-conventional": "~20.4.4",
     "@e22m4u/js-spy": "~0.3.6",
     "@eslint/js": "~9.39.2",
     "@types/chai": "~5.2.3",
@@ -53,12 +53,12 @@
     "c8": "~11.0.0",
     "chai": "~6.2.2",
     "chai-as-promised": "~8.0.2",
-    "esbuild": "~0.27.3",
+    "esbuild": "~0.27.4",
     "eslint": "~9.39.2",
     "eslint-config-prettier": "~10.1.8",
-    "eslint-plugin-chai-expect": "~3.1.0",
+    "eslint-plugin-chai-expect": "~4.0.0",
     "eslint-plugin-import": "~2.32.0",
-    "eslint-plugin-jsdoc": "~62.7.1",
+    "eslint-plugin-jsdoc": "~62.8.0",
     "eslint-plugin-mocha": "~11.2.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",