@e22m4u/js-repository 0.5.1 → 0.5.3

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Реализация репозитория для работы с базами данных в Node.js",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",

package/src/definition/model/properties/data-type.d.ts

@@ -1,11 +1,16 @@
 /**
  * Data type.
  */
-export declare enum DataType {
-  ANY = 'any',
-  STRING = 'string',
-  NUMBER = 'number',
-  BOOLEAN = 'boolean',
-  ARRAY = 'array',
-  OBJECT = 'object',
-}
+export declare const DataType: {
+  ANY: 'any';
+  STRING: 'string';
+  NUMBER: 'number';
+  BOOLEAN: 'boolean';
+  ARRAY: 'array';
+  OBJECT: 'object';
+};
+
+/**
+ * Type of DataType.
+ */
+export type DataType = (typeof DataType)[keyof typeof DataType];

package/src/definition/model/properties/property-definition.d.ts

@@ -7,8 +7,8 @@ import {PropertyTransformOptions} from './property-transformer/index.js';
  * Full property definition.
  */
 export declare type FullPropertyDefinition = {
-  type: `${DataType}`;
-  itemType?: `${DataType}`;
+  type: DataType;
+  itemType?: DataType;
   itemModel?: string;
   model?: string;
   primaryKey?: boolean;
@@ -18,7 +18,7 @@ export declare type FullPropertyDefinition = {
   default?: unknown;
   validate?: PropertyValidateOptions;
   transform?: PropertyTransformOptions;
-  unique?: boolean | `${PropertyUniqueness}`;
+  unique?: boolean | PropertyUniqueness;
 };
 
 /**

package/src/definition/model/properties/property-uniqueness.d.ts

@@ -1,8 +1,14 @@
 /**
  * Property uniqueness.
  */
-export declare enum PropertyUniqueness {
-  STRICT = 'strict',
-  SPARSE = 'sparse',
-  NON_UNIQUE = 'nonUnique',
-}
+export declare const PropertyUniqueness: {
+  STRICT: 'strict';
+  SPARSE: 'sparse';
+  NON_UNIQUE: 'nonUnique';
+};
+
+/**
+ * Type of PropertyUniqueness.
+ */
+export type PropertyUniqueness =
+  (typeof PropertyUniqueness)[keyof typeof PropertyUniqueness];

package/src/definition/model/relations/relation-definition.d.ts

@@ -50,7 +50,7 @@ export declare type RelationDefinition =
  * ```
  */
 export declare type BelongsToDefinition = {
-  type: `${RelationType.BELONGS_TO}`;
+  type: typeof RelationType.BELONGS_TO;
   polymorphic?: false;
   model: string;
   foreignKey?: string;
@@ -78,7 +78,7 @@ export declare type BelongsToDefinition = {
  * ```
  */
 export declare type PolyBelongsToDefinition = {
-  type: `${RelationType.BELONGS_TO}`;
+  type: typeof RelationType.BELONGS_TO;
   polymorphic: true;
   foreignKey?: string;
   discriminator?: string;
@@ -97,7 +97,7 @@ export declare type PolyBelongsToDefinition = {
  * ```
  */
 export declare type HasOneDefinition = {
-  type: `${RelationType.HAS_ONE}`;
+  type: typeof RelationType.HAS_ONE;
   model: string;
   foreignKey: string;
   polymorphic?: false;
@@ -117,7 +117,7 @@ export declare type HasOneDefinition = {
  * ```
  */
 export declare type PolyHasOneDefinitionWithTargetRelationName = {
-  type: `${RelationType.HAS_ONE}`;
+  type: typeof RelationType.HAS_ONE;
   model: string;
   polymorphic: string;
   foreignKey?: undefined;
@@ -139,7 +139,7 @@ export declare type PolyHasOneDefinitionWithTargetRelationName = {
  * ```
  */
 export declare type PolyHasOneDefinitionWithTargetKeys = {
-  type: `${RelationType.HAS_ONE}`;
+  type: typeof RelationType.HAS_ONE;
   model: string;
   polymorphic: true;
   foreignKey: string;
@@ -159,7 +159,7 @@ export declare type PolyHasOneDefinitionWithTargetKeys = {
  * ```
  */
 export declare type HasManyDefinition = {
-  type: `${RelationType.HAS_MANY}`;
+  type: typeof RelationType.HAS_MANY;
   model: string;
   foreignKey: string;
   polymorphic?: false;
@@ -179,7 +179,7 @@ export declare type HasManyDefinition = {
  * ```
  */
 export declare type PolyHasManyDefinitionWithTargetRelationName = {
-  type: `${RelationType.HAS_MANY}`;
+  type: typeof RelationType.HAS_MANY;
   model: string;
   polymorphic: string;
   foreignKey?: undefined;
@@ -201,7 +201,7 @@ export declare type PolyHasManyDefinitionWithTargetRelationName = {
  * ```
  */
 export declare type PolyHasManyDefinitionWithTargetKeys = {
-  type: `${RelationType.HAS_MANY}`;
+  type: typeof RelationType.HAS_MANY;
   model: string;
   polymorphic: true;
   foreignKey: string;
@@ -229,7 +229,7 @@ export declare type PolyHasManyDefinitionWithTargetKeys = {
  * ```
  */
 export declare type ReferencesManyDefinition = {
-  type: `${RelationType.REFERENCES_MANY}`;
+  type: typeof RelationType.REFERENCES_MANY;
   model: string;
   foreignKey?: string;
   discriminator?: undefined;

package/src/definition/model/relations/relation-type.d.ts

@@ -1,9 +1,14 @@
 /**
  * Relation type.
  */
-export declare enum RelationType {
-  BELONGS_TO = 'belongsTo',
-  HAS_ONE = 'hasOne',
-  HAS_MANY = 'hasMany',
-  REFERENCES_MANY = 'referencesMany',
-}
+export declare const RelationType: {
+  BELONGS_TO: 'belongsTo';
+  HAS_ONE: 'hasOne';
+  HAS_MANY: 'hasMany';
+  REFERENCES_MANY: 'referencesMany';
+};
+
+/**
+ * Type of RelationType.
+ */
+export type RelationType = (typeof RelationType)[keyof typeof RelationType];

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(