@e22m4u/js-repository 0.3.1 → 0.3.3

package/.mocharc.json

@@ -1,5 +1,5 @@
 {
   "extension": ["js", "ts"],
   "spec": "src/**/*.spec.{js,ts}",
-  "require": ["tsx"]
+  "require": ["ts-node/register"]
 }

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 e22m4u@yandex.ru
+Copyright (c) 2023-2025 Mikhail Evstropov <e22m4u@yandex.ru>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cjs/index.cjs

@@ -2415,25 +2415,25 @@ var init_model_definition_utils = __esm({
        * @returns {object}
        */
       getPropertiesDefinitionInBaseModelHierarchy(modelName) {
-        let result = {};
         let pkPropDefs = {};
+        let regularPropDefs = {};
         const recursion = /* @__PURE__ */ __name((currModelName, prevModelName = void 0) => {
           if (currModelName === prevModelName)
             throw new InvalidArgumentError(
               "The model %v has a circular inheritance.",
               currModelName
             );
-          if (Object.keys(pkPropDefs).length === 0) {
+          if (Object.keys(pkPropDefs).length === 0)
             pkPropDefs = this.getOwnPropertiesDefinitionOfPrimaryKeys(currModelName);
-            result = { ...result, ...pkPropDefs };
-          }
-          const regularPropDefs = this.getOwnPropertiesDefinitionWithoutPrimaryKeys(currModelName);
-          result = { ...regularPropDefs, ...result };
+          regularPropDefs = {
+            ...this.getOwnPropertiesDefinitionWithoutPrimaryKeys(currModelName),
+            ...regularPropDefs
+          };
           const modelDef = this.getService(DefinitionRegistry).getModel(currModelName);
           if (modelDef.base) recursion(modelDef.base, currModelName);
         }, "recursion");
         recursion(modelName);
-        return result;
+        return { ...pkPropDefs, ...regularPropDefs };
       }
       /**
        * Get own relations definition.

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Реализация репозитория для работы с базами данных в Node.js",
-  "author": "e22m4u <e22m4u@yandex.ru>",
+  "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
   "keywords": [
     "Repository",
@@ -39,11 +39,9 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-empty-values": "~0.0.1"
-  },
-  "peerDependencies": {
-    "@e22m4u/js-format": "~0.1.0",
-    "@e22m4u/js-service": "~0.3.0"
+    "@e22m4u/js-empty-values": "~0.0.2",
+    "@e22m4u/js-format": "~0.1.8",
+    "@e22m4u/js-service": "~0.3.3"
   },
   "devDependencies": {
     "@commitlint/cli": "~19.8.1",
@@ -53,21 +51,21 @@
     "@types/chai-spies": "~1.0.6",
     "@types/mocha": "~10.0.10",
     "c8": "~10.1.3",
-    "chai": "~5.2.0",
+    "chai": "~5.2.1",
     "chai-as-promised": "~8.0.1",
     "chai-spies": "~1.1.0",
-    "esbuild": "~0.25.5",
-    "eslint": "~9.30.0",
-    "eslint-config-prettier": "~10.1.5",
+    "esbuild": "~0.25.9",
+    "eslint": "~9.33.0",
+    "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-jsdoc": "~51.2.3",
+    "eslint-plugin-jsdoc": "~54.1.0",
     "eslint-plugin-mocha": "~11.1.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.1",
     "prettier": "~3.6.2",
     "rimraf": "~6.0.1",
-    "tsx": "~4.20.3",
-    "typescript": "~5.8.3",
-    "typescript-eslint": "~8.35.0"
+    "ts-node": "~10.9.2",
+    "typescript": "~5.9.2",
+    "typescript-eslint": "~8.39.1"
   }
 }

package/src/database-schema.d.ts

@@ -32,6 +32,6 @@ export declare class DatabaseSchema extends Service {
   getRepository<
     Data extends object = ModelData,
     IdType extends ModelId = ModelId,
-    IdName extends string = DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
+    IdName extends string = typeof DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
   >(modelName: string): Repository<Data, IdType, IdName>;
 }

package/src/definition/model/model-definition-utils.d.ts

@@ -9,7 +9,7 @@ import {RelationDefinitionMap} from './model-definition.js';
 /**
  * Default primary key property name.
  */
-export type DEFAULT_PRIMARY_KEY_PROPERTY_NAME = 'id';
+export const DEFAULT_PRIMARY_KEY_PROPERTY_NAME: 'id';
 
 /**
  * Model definition utils.

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

@@ -372,28 +372,27 @@ export class ModelDefinitionUtils extends Service {
    * @returns {object}
    */
   getPropertiesDefinitionInBaseModelHierarchy(modelName) {
-    let result = {};
     let pkPropDefs = {};
+    let regularPropDefs = {};
     const recursion = (currModelName, prevModelName = undefined) => {
       if (currModelName === prevModelName)
         throw new InvalidArgumentError(
           'The model %v has a circular inheritance.',
           currModelName,
         );
-      if (Object.keys(pkPropDefs).length === 0) {
+      if (Object.keys(pkPropDefs).length === 0)
         pkPropDefs =
           this.getOwnPropertiesDefinitionOfPrimaryKeys(currModelName);
-        result = {...result, ...pkPropDefs};
-      }
-      const regularPropDefs =
-        this.getOwnPropertiesDefinitionWithoutPrimaryKeys(currModelName);
-      result = {...regularPropDefs, ...result};
+      regularPropDefs = {
+        ...this.getOwnPropertiesDefinitionWithoutPrimaryKeys(currModelName),
+        ...regularPropDefs,
+      };
       const modelDef =
         this.getService(DefinitionRegistry).getModel(currModelName);
       if (modelDef.base) recursion(modelDef.base, currModelName);
     };
     recursion(modelName);
-    return result;
+    return {...pkPropDefs, ...regularPropDefs};
   }
 
   /**

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

@@ -1567,6 +1567,25 @@ describe('ModelDefinitionUtils', function () {
         'The model "model" has a circular inheritance.',
       );
     });
+
+    it('places a primary key definition at the start of the result', function () {
+      const dbs = new DatabaseSchema();
+      dbs.defineModel({
+        name: 'model',
+        properties: {
+          foo: DataType.STRING,
+          id: {
+            type: DataType.STRING,
+            primaryKey: true,
+          },
+          bar: DataType.NUMBER,
+        },
+      });
+      const result = dbs
+        .getService(ModelDefinitionUtils)
+        .getPropertiesDefinitionInBaseModelHierarchy('model');
+      expect(Object.keys(result)).to.be.eql(['id', 'foo', 'bar']);
+    });
   });
 
   describe('getOwnRelationsDefinition', function () {

package/src/repository/repository-registry.d.ts

@@ -24,6 +24,6 @@ export declare class RepositoryRegistry extends Service {
   getRepository<
     Data extends ModelData = ModelData,
     IdType extends ModelId = ModelId,
-    IdName extends string = DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
+    IdName extends string = typeof DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
   >(modelName: string): Repository<Data, IdType, IdName>;
 }

package/src/repository/repository.d.ts

@@ -16,7 +16,7 @@ import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME} from '../definition/index.js';
 export declare class Repository<
   Data extends object = ModelData,
   IdType extends ModelId = ModelId,
-  IdName extends string = DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
+  IdName extends string = typeof DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
   FlatData extends ModelData = Flatten<Data>,
 > extends Service {
   // it fixes unused generic bug