@e22m4u/js-repository 0.5.2 → 0.5.4

package/dist/cjs/index.cjs

@@ -403,6 +403,8 @@ function modelNameToModelKey(modelName) {
       "The model name should be a non-empty String without spaces, but %v was given.",
       modelName
     );
+  if (modelName.toLowerCase() !== "model")
+    modelName = modelName.replace(/[-_]?Model$/, "").replace(/[-_](MODEL|model)$/, "");
   return modelName.toLowerCase().replace(/[-_]/g, "");
 }
 var init_model_name_to_model_key = __esm({

package/eslint.config.js

@@ -28,6 +28,8 @@ export default [
       ...eslintChaiExpectPlugin.configs['recommended-flat'].rules,
       ...eslintJsdocPlugin.configs['flat/recommended-error'].rules,
       'no-unused-vars': ['error', {'caughtErrors': 'none'}],
+      'jsdoc/reject-any-type': 0,
+      'jsdoc/reject-function-type': 0,
       'jsdoc/require-param-description': 0,
       'jsdoc/require-returns-description': 0,
       'jsdoc/require-property-description': 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Реализация репозитория для работы с базами данных в Node.js",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -39,9 +39,9 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-empty-values": "~0.0.2",
-    "@e22m4u/js-format": "~0.1.8",
-    "@e22m4u/js-service": "~0.3.6"
+    "@e22m4u/js-empty-values": "~0.0.3",
+    "@e22m4u/js-format": "~0.2.0",
+    "@e22m4u/js-service": "~0.3.8"
   },
   "devDependencies": {
     "@commitlint/cli": "~19.8.1",
@@ -54,18 +54,18 @@
     "chai": "~6.0.1",
     "chai-as-promised": "~8.0.2",
     "chai-spies": "~1.1.0",
-    "esbuild": "~0.25.9",
-    "eslint": "~9.34.0",
+    "esbuild": "~0.25.10",
+    "eslint": "~9.36.0",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-jsdoc": "~54.1.1",
+    "eslint-plugin-jsdoc": "~60.3.0",
     "eslint-plugin-mocha": "~11.1.0",
     "husky": "~9.1.7",
-    "mocha": "~11.7.1",
+    "mocha": "~11.7.2",
     "prettier": "~3.6.2",
     "rimraf": "~6.0.1",
     "ts-node": "~10.9.2",
     "typescript": "~5.9.2",
-    "typescript-eslint": "~8.41.0"
+    "typescript-eslint": "~8.44.1"
   }
 }

package/src/utils/model-name-to-model-key.js

@@ -13,5 +13,9 @@ export function modelNameToModelKey(modelName) {
         'without spaces, but %v was given.',
       modelName,
     );
+  if (modelName.toLowerCase() !== 'model')
+    modelName = modelName
+      .replace(/[-_]?Model$/, '')
+      .replace(/[-_](MODEL|model)$/, '');
   return modelName.toLowerCase().replace(/[-_]/g, '');
 }

package/src/utils/model-name-to-model-key.spec.js

@@ -12,6 +12,8 @@ describe('modelNameToModelKey', function () {
       'UserProfileDetails',
       'user-profile-details',
       'user_profile_details',
+      'User-Profile-Details',
+      'User_Profile_Details',
       'USER-PROFILE-DETAILS',
       'USER_PROFILE_DETAILS',
       'USERPROFILEDETAILS',
@@ -34,6 +36,29 @@ describe('modelNameToModelKey', function () {
     expect(modelNameToModelKey(modelName)).to.be.eq(expected);
   });
 
+  it('should remove the "model" word from a model name', function () {
+    const modelNames = [
+      'userProfileDetailsModel',
+      'UserProfileDetailsModel',
+      'user-profile-details-model',
+      'user_profile_details_model',
+      'User-Profile-Details-Model',
+      'User_Profile_Details_Model',
+      'USER-PROFILE-DETAILS-MODEL',
+      'USER_PROFILE_DETAILS_MODEL',
+    ];
+    modelNames.forEach(v =>
+      expect(modelNameToModelKey(v)).to.be.eq('userprofiledetails'),
+    );
+  });
+
+  it('should not remove the "model" suffix as a part of last word in a model name', function () {
+    const exceptions = ['SUPERMODEL', 'supermodel'];
+    exceptions.forEach(v =>
+      expect(modelNameToModelKey(v)).to.be.eq('supermodel'),
+    );
+  });
+
   it('should throw an error for an empty string', function () {
     const throwable = () => modelNameToModelKey('');
     expect(throwable).to.throw(