@e22m4u/js-repository 0.8.4 → 0.8.6

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

@@ -1,6 +1,5 @@
 import {Service} from '@e22m4u/js-service';
 import {DataType} from './properties/index.js';
-import {BlankValuesService} from '@e22m4u/js-empty-values';
 import {InvalidArgumentError} from '../../errors/index.js';
 import {DefinitionRegistry} from '../definition-registry.js';
 import {cloneDeep, excludeObjectKeys} from '../../utils/index.js';
@@ -33,7 +32,7 @@ export class ModelDefinitionUtils extends Service {
       const isDefaultPrimaryKeyAlreadyInUse = Object.keys(propDefs).includes(
         DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
       );
-      if (isDefaultPrimaryKeyAlreadyInUse)
+      if (isDefaultPrimaryKeyAlreadyInUse) {
         throw new InvalidArgumentError(
           'The property name %v of the model %v is defined as a regular property. ' +
             'In this case, a primary key should be defined explicitly. ' +
@@ -41,6 +40,7 @@ export class ModelDefinitionUtils extends Service {
           DEFAULT_PRIMARY_KEY_PROPERTY_NAME,
           modelName,
         );
+      }
       return DEFAULT_PRIMARY_KEY_PROPERTY_NAME;
     }
     return propNames[0];
@@ -58,9 +58,13 @@ export class ModelDefinitionUtils extends Service {
     try {
       pkColName = this.getColumnNameByPropertyName(modelName, pkPropName);
     } catch (error) {
-      if (!(error instanceof InvalidArgumentError)) throw error;
+      if (!(error instanceof InvalidArgumentError)) {
+        throw error;
+      }
+    }
+    if (pkColName === undefined) {
+      return pkPropName;
     }
-    if (pkColName === undefined) return pkPropName;
     return pkColName;
   }
 
@@ -86,14 +90,16 @@ export class ModelDefinitionUtils extends Service {
     const propDefs =
       this.getPropertiesDefinitionInBaseModelHierarchy(modelName);
     const propDef = propDefs[propertyName];
-    if (!propDef)
+    if (!propDef) {
       throw new InvalidArgumentError(
         'The model %v does not have the property %v.',
         modelName,
         propertyName,
       );
-    if (propDef && typeof propDef === 'object')
+    }
+    if (propDef && typeof propDef === 'object') {
       return propDef.columnName ?? propertyName;
+    }
     return propertyName;
   }
 
@@ -108,20 +114,22 @@ export class ModelDefinitionUtils extends Service {
     const propDefs =
       this.getPropertiesDefinitionInBaseModelHierarchy(modelName);
     const propDef = propDefs[propertyName];
-    if (!propDef)
+    if (!propDef) {
       throw new InvalidArgumentError(
         'The model %v does not have the property %v.',
         modelName,
         propertyName,
       );
-    if (propDef && typeof propDef === 'object')
+    }
+    if (propDef && typeof propDef === 'object') {
       return propDef.default instanceof Function
         ? propDef.default()
         : propDef.default;
+    }
   }
 
   /**
-   * Set default values for empty properties.
+   * Set default values to empty properties.
    *
    * @param {string} modelName
    * @param {object} modelData
@@ -139,16 +147,14 @@ export class ModelDefinitionUtils extends Service {
       ? Object.keys(modelData)
       : Object.keys(propDefs);
     const extendedData = cloneDeep(modelData);
-    const blankValuesService = this.getService(BlankValuesService);
     propNames.forEach(propName => {
       const propDef = propDefs[propName];
       const propValue = extendedData[propName];
-      const propType =
-        propDef != null
-          ? this.getDataTypeFromPropertyDefinition(propDef)
-          : DataType.ANY;
-      const isBlank = blankValuesService.isBlankOf(propType, propValue);
-      if (!isBlank) return;
+      // если значение свойства не является undefined и null,
+      // то свойство пропускается (остается исходное значение)
+      if (propValue != null) {
+        return;
+      }
       if (
         propDef &&
         typeof propDef === 'object' &&
@@ -176,7 +182,9 @@ export class ModelDefinitionUtils extends Service {
     const propNames = Object.keys(propDefs);
     const convertedData = cloneDeep(modelData);
     propNames.forEach(propName => {
-      if (!(propName in convertedData)) return;
+      if (!(propName in convertedData)) {
+        return;
+      }
       const colName = this.getColumnNameByPropertyName(modelName, propName);
       let propValue = convertedData[propName];
       // если значением является объект, то проверяем
@@ -235,7 +243,9 @@ export class ModelDefinitionUtils extends Service {
     const convertedData = cloneDeep(tableData);
     propNames.forEach(propName => {
       const colName = this.getColumnNameByPropertyName(modelName, propName);
-      if (!(colName in convertedData)) return;
+      if (!(colName in convertedData)) {
+        return;
+      }
       let colValue = convertedData[colName];
       // если значением является объект, то проверяем
       // тип свойства и наличие модели для замены
@@ -292,14 +302,18 @@ export class ModelDefinitionUtils extends Service {
     const propDef = propDefs[propertyName];
     if (!propDef) {
       const pkPropName = this.getPrimaryKeyAsPropertyName(modelName);
-      if (pkPropName === propertyName) return DataType.ANY;
+      if (pkPropName === propertyName) {
+        return DataType.ANY;
+      }
       throw new InvalidArgumentError(
         'The model %v does not have the property %v.',
         modelName,
         propertyName,
       );
     }
-    if (typeof propDef === 'string') return propDef;
+    if (typeof propDef === 'string') {
+      return propDef;
+    }
     return propDef.type;
   }
 
@@ -320,15 +334,18 @@ export class ModelDefinitionUtils extends Service {
         propDef,
       );
     }
-    if (typeof propDef === 'string') return propDef;
+    if (typeof propDef === 'string') {
+      return propDef;
+    }
     const dataType = propDef.type;
-    if (!Object.values(DataType).includes(dataType))
+    if (!Object.values(DataType).includes(dataType)) {
       throw new InvalidArgumentError(
         'The given Object to the ModelDefinitionUtils.getDataTypeFromPropertyDefinition ' +
           'should have the "type" property with one of values: %l, but %v was given.',
         Object.values(DataType),
         propDef.type,
       );
+    }
     return dataType;
   }
 
@@ -359,7 +376,9 @@ export class ModelDefinitionUtils extends Service {
     const propDefs = modelDef.properties ?? {};
     return Object.keys(propDefs).reduce((result, propName) => {
       const propDef = propDefs[propName];
-      if (typeof propDef === 'object' && propDef.primaryKey) return result;
+      if (typeof propDef === 'object' && propDef.primaryKey) {
+        return result;
+      }
       return {...result, [propName]: propDef};
     }, {});
   }
@@ -374,21 +393,25 @@ export class ModelDefinitionUtils extends Service {
     let pkPropDefs = {};
     let regularPropDefs = {};
     const recursion = (currModelName, prevModelName = undefined) => {
-      if (currModelName === prevModelName)
+      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);
+      }
       regularPropDefs = {
         ...this.getOwnPropertiesDefinitionWithoutPrimaryKeys(currModelName),
         ...regularPropDefs,
       };
       const modelDef =
         this.getService(DefinitionRegistry).getModel(currModelName);
-      if (modelDef.base) recursion(modelDef.base, currModelName);
+      if (modelDef.base) {
+        recursion(modelDef.base, currModelName);
+      }
     };
     recursion(modelName);
     return {...pkPropDefs, ...regularPropDefs};
@@ -414,16 +437,19 @@ export class ModelDefinitionUtils extends Service {
   getRelationsDefinitionInBaseModelHierarchy(modelName) {
     let result = {};
     const recursion = (currModelName, prevModelName = undefined) => {
-      if (currModelName === prevModelName)
+      if (currModelName === prevModelName) {
         throw new InvalidArgumentError(
           'The model %v has a circular inheritance.',
           currModelName,
         );
+      }
       const modelDef =
         this.getService(DefinitionRegistry).getModel(currModelName);
       const ownRelDefs = modelDef.relations ?? {};
       result = {...ownRelDefs, ...result};
-      if (modelDef.base) recursion(modelDef.base, currModelName);
+      if (modelDef.base) {
+        recursion(modelDef.base, currModelName);
+      }
     };
     recursion(modelName);
     return result;
@@ -446,12 +472,13 @@ export class ModelDefinitionUtils extends Service {
         break;
       }
     }
-    if (!foundDef)
+    if (!foundDef) {
       throw new InvalidArgumentError(
         'The model %v does not have relation name %v.',
         modelName,
         relationName,
       );
+    }
     return foundDef;
   }
 
@@ -463,12 +490,17 @@ export class ModelDefinitionUtils extends Service {
    * @returns {object}
    */
   excludeObjectKeysByRelationNames(modelName, modelData) {
-    if (!modelData || typeof modelData !== 'object' || Array.isArray(modelData))
+    if (
+      !modelData ||
+      typeof modelData !== 'object' ||
+      Array.isArray(modelData)
+    ) {
       throw new InvalidArgumentError(
         'The second argument of ModelDefinitionUtils.excludeObjectKeysByRelationNames ' +
           'should be an Object, but %v was given.',
         modelData,
       );
+    }
     const relDefs = this.getRelationsDefinitionInBaseModelHierarchy(modelName);
     const relNames = Object.keys(relDefs);
     return excludeObjectKeys(modelData, relNames);
@@ -482,26 +514,30 @@ export class ModelDefinitionUtils extends Service {
    * @returns {string|undefined}
    */
   getModelNameOfPropertyValueIfDefined(modelName, propertyName) {
-    if (!modelName || typeof modelName !== 'string')
+    if (!modelName || typeof modelName !== 'string') {
       throw new InvalidArgumentError(
         'Parameter "modelName" of ' +
           'ModelDefinitionUtils.getModelNameOfPropertyValueIfDefined ' +
           'requires a non-empty String, but %v was given.',
         modelName,
       );
-    if (!propertyName || typeof propertyName !== 'string')
+    }
+    if (!propertyName || typeof propertyName !== 'string') {
       throw new InvalidArgumentError(
         'Parameter "propertyName" of ' +
           'ModelDefinitionUtils.getModelNameOfPropertyValueIfDefined ' +
           'requires a non-empty String, but %v was given.',
         propertyName,
       );
+    }
     // если определение свойства не найдено,
     // то возвращаем undefined
     const propDefs =
       this.getPropertiesDefinitionInBaseModelHierarchy(modelName);
     const propDef = propDefs[propertyName];
-    if (!propDef) return undefined;
+    if (!propDef) {
+      return undefined;
+    }
     // если определение свойства является
     // объектом, то проверяем тип и возвращаем
     // название модели
@@ -509,12 +545,15 @@ export class ModelDefinitionUtils extends Service {
       // если тип свойства является объектом,
       // то возвращаем значение опции "model",
       // или undefined
-      if (propDef.type === DataType.OBJECT) return propDef.model || undefined;
+      if (propDef.type === DataType.OBJECT) {
+        return propDef.model || undefined;
+      }
       // если тип свойства является массивом,
       // то возвращаем значение опции "itemModel",
       // или undefined
-      if (propDef.type === DataType.ARRAY)
+      if (propDef.type === DataType.ARRAY) {
         return propDef.itemModel || undefined;
+      }
     }
     // если определение свойства не является
     // объектом, то возвращаем undefined

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

@@ -4,7 +4,6 @@ import {createSandbox} from '@e22m4u/js-spy';
 import {DataType} from './properties/index.js';
 import {RelationType} from './relations/index.js';
 import {DatabaseSchema} from '../../database-schema.js';
-import {BlankValuesService} from '@e22m4u/js-empty-values';
 import {InvalidArgumentError} from '../../errors/index.js';
 
 import {
@@ -480,7 +479,7 @@ describe('ModelDefinitionUtils', function () {
       expect(result).to.be.eql({foo: 'string'});
     });
 
-    it('sets a default value if a property has a blank value', function () {
+    it('sets a default value if a property value is undefined', function () {
       const dbs = new DatabaseSchema();
       dbs.defineModel({
         name: 'model',
@@ -491,12 +490,9 @@ describe('ModelDefinitionUtils', function () {
           },
         },
       });
-      dbs
-        .getService(BlankValuesService)
-        .setBlankValuesOf(DataType.STRING, ['blank']);
       const result = dbs
         .getService(ModelDefinitionUtils)
-        .setDefaultValuesToEmptyProperties('model', {foo: 'blank'});
+        .setDefaultValuesToEmptyProperties('model', {foo: undefined});
       expect(result).to.be.eql({foo: 'placeholder'});
     });
 

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

@@ -13,38 +13,43 @@ export class ModelDefinitionValidator extends Service {
    * @param {object} modelDef
    */
   validate(modelDef) {
-    if (!modelDef || typeof modelDef !== 'object' || Array.isArray(modelDef))
+    if (!modelDef || typeof modelDef !== 'object' || Array.isArray(modelDef)) {
       throw new InvalidArgumentError(
         'The model definition should be an Object, but %v was given.',
         modelDef,
       );
-    if (!modelDef.name || typeof modelDef.name !== 'string')
+    }
+    if (!modelDef.name || typeof modelDef.name !== 'string') {
       throw new InvalidArgumentError(
         'The model definition requires the option "name" ' +
           'as a non-empty String, but %v was given.',
         modelDef.name,
       );
-    if (modelDef.datasource && typeof modelDef.datasource !== 'string')
+    }
+    if (modelDef.datasource && typeof modelDef.datasource !== 'string') {
       throw new InvalidArgumentError(
         'The provided option "datasource" of the model %v ' +
           'should be a String, but %v was given.',
         modelDef.name,
         modelDef.datasource,
       );
-    if (modelDef.base && typeof modelDef.base !== 'string')
+    }
+    if (modelDef.base && typeof modelDef.base !== 'string') {
       throw new InvalidArgumentError(
         'The provided option "base" of the model %v ' +
           'should be a String, but %v was given.',
         modelDef.name,
         modelDef.base,
       );
-    if (modelDef.tableName && typeof modelDef.tableName !== 'string')
+    }
+    if (modelDef.tableName && typeof modelDef.tableName !== 'string') {
       throw new InvalidArgumentError(
         'The provided option "tableName" of the model %v ' +
           'should be a String, but %v was given.',
         modelDef.name,
         modelDef.tableName,
       );
+    }
     if (modelDef.properties) {
       if (
         typeof modelDef.properties !== 'object' ||

package/src/definition/model/properties/primary-keys-definition-validator.js

@@ -20,7 +20,7 @@ export class PrimaryKeysDefinitionValidator extends Service {
     if (propNames.length < 1) {
       const isDefaultPrimaryKeyAlreadyInUse =
         Object.keys(propDefs).includes(DEF_PK);
-      if (isDefaultPrimaryKeyAlreadyInUse)
+      if (isDefaultPrimaryKeyAlreadyInUse) {
         throw new InvalidArgumentError(
           'The property name %v of the model %v is defined as a regular property. ' +
             'In this case, a primary key should be defined explicitly. ' +
@@ -28,15 +28,17 @@ export class PrimaryKeysDefinitionValidator extends Service {
           DEF_PK,
           modelName,
         );
+      }
       return;
     }
-    if (propNames.length > 1)
+    if (propNames.length > 1) {
       throw new InvalidArgumentError(
         'The model definition %v should not have ' +
           'multiple primary keys, but %v keys given.',
         modelName,
         propNames.length,
       );
+    }
     const pkPropName = propNames[0];
     const pkPropDef = propDefs[pkPropName];
     if (

package/src/definition/model/properties/properties-definition-validator.js

@@ -16,12 +16,13 @@ export class PropertiesDefinitionValidator extends Service {
    * @param {object} propDefs
    */
   validate(modelName, propDefs) {
-    if (!modelName || typeof modelName !== 'string')
+    if (!modelName || typeof modelName !== 'string') {
       throw new InvalidArgumentError(
         'The first argument of PropertiesDefinitionValidator.validate ' +
           'should be a non-empty String, but %v was given.',
         modelName,
       );
+    }
     if (!propDefs || typeof propDefs !== 'object' || Array.isArray(propDefs)) {
       throw new InvalidArgumentError(
         'The provided option "properties" of the model %v ' +
@@ -49,20 +50,22 @@ export class PropertiesDefinitionValidator extends Service {
    * @param {object} propDef
    */
   _validateProperty(modelName, propName, propDef) {
-    if (!modelName || typeof modelName !== 'string')
+    if (!modelName || typeof modelName !== 'string') {
       throw new InvalidArgumentError(
         'The first argument of PropertiesDefinitionValidator._validateProperty ' +
           'should be a non-empty String, but %v was given.',
         modelName,
       );
-    if (!propName || typeof propName !== 'string')
+    }
+    if (!propName || typeof propName !== 'string') {
       throw new InvalidArgumentError(
         'The property name of the model %v should be ' +
           'a non-empty String, but %v was given.',
         modelName,
         propName,
       );
-    if (!propDef)
+    }
+    if (!propDef) {
       throw new InvalidArgumentError(
         'The property %v of the model %v should have ' +
           'a property definition, but %v was given.',
@@ -70,8 +73,9 @@ export class PropertiesDefinitionValidator extends Service {
         modelName,
         propDef,
       );
+    }
     if (typeof propDef === 'string') {
-      if (!Object.values(Type).includes(propDef))
+      if (!Object.values(Type).includes(propDef)) {
         throw new InvalidArgumentError(
           'In case of a short property definition, the property %v ' +
             'of the model %v should have one of data types: %l, but %v was given.',
@@ -80,6 +84,7 @@ export class PropertiesDefinitionValidator extends Service {
           Object.values(Type),
           propDef,
         );
+      }
       return;
     }
     if (!propDef || typeof propDef !== 'object' || Array.isArray(propDef)) {
@@ -91,7 +96,7 @@ export class PropertiesDefinitionValidator extends Service {
         propDef,
       );
     }
-    if (!propDef.type || !Object.values(Type).includes(propDef.type))
+    if (!propDef.type || !Object.values(Type).includes(propDef.type)) {
       throw new InvalidArgumentError(
         'The property %v of the model %v requires the option "type" ' +
           'to have one of data types: %l, but %v was given.',
@@ -100,6 +105,7 @@ export class PropertiesDefinitionValidator extends Service {
         Object.values(Type),
         propDef.type,
       );
+    }
     if (propDef.itemType && !Object.values(Type).includes(propDef.itemType)) {
       throw new InvalidArgumentError(
         'The provided option "itemType" of the property %v in the model %v ' +
@@ -119,7 +125,7 @@ export class PropertiesDefinitionValidator extends Service {
         propDef.itemModel,
       );
     }
-    if (propDef.model && typeof propDef.model !== 'string')
+    if (propDef.model && typeof propDef.model !== 'string') {
       throw new InvalidArgumentError(
         'The provided option "model" of the property %v in the model %v ' +
           'should be a String, but %v was given.',
@@ -127,7 +133,8 @@ export class PropertiesDefinitionValidator extends Service {
         modelName,
         propDef.model,
       );
-    if (propDef.primaryKey && typeof propDef.primaryKey !== 'boolean')
+    }
+    if (propDef.primaryKey && typeof propDef.primaryKey !== 'boolean') {
       throw new InvalidArgumentError(
         'The provided option "primaryKey" of the property %v in the model %v ' +
           'should be a Boolean, but %v was given.',
@@ -135,7 +142,8 @@ export class PropertiesDefinitionValidator extends Service {
         modelName,
         propDef.primaryKey,
       );
-    if (propDef.columnName && typeof propDef.columnName !== 'string')
+    }
+    if (propDef.columnName && typeof propDef.columnName !== 'string') {
       throw new InvalidArgumentError(
         'The provided option "columnName" of the property %v in the model %v ' +
           'should be a String, but %v was given.',
@@ -143,7 +151,8 @@ export class PropertiesDefinitionValidator extends Service {
         modelName,
         propDef.columnName,
       );
-    if (propDef.columnType && typeof propDef.columnType !== 'string')
+    }
+    if (propDef.columnType && typeof propDef.columnType !== 'string') {
       throw new InvalidArgumentError(
         'The provided option "columnType" of the property %v in the model %v ' +
           'should be a String, but %v was given.',
@@ -151,7 +160,8 @@ export class PropertiesDefinitionValidator extends Service {
         modelName,
         propDef.columnType,
       );
-    if (propDef.required && typeof propDef.required !== 'boolean')
+    }
+    if (propDef.required && typeof propDef.required !== 'boolean') {
       throw new InvalidArgumentError(
         'The provided option "required" of the property %v in the model %v ' +
           'should be a Boolean, but %v was given.',
@@ -159,28 +169,32 @@ export class PropertiesDefinitionValidator extends Service {
         modelName,
         propDef.required,
       );
-    if (propDef.required && propDef.default !== undefined)
+    }
+    if (propDef.required && propDef.default !== undefined) {
       throw new InvalidArgumentError(
         'The property %v of the model %v is a required property, ' +
           'so it should not have the option "default" to be provided.',
         propName,
         modelName,
       );
-    if (propDef.primaryKey && propDef.required)
+    }
+    if (propDef.primaryKey && propDef.required) {
       throw new InvalidArgumentError(
         'The property %v of the model %v is a primary key, ' +
           'so it should not have the option "required" to be provided.',
         propName,
         modelName,
       );
-    if (propDef.primaryKey && propDef.default !== undefined)
+    }
+    if (propDef.primaryKey && propDef.default !== undefined) {
       throw new InvalidArgumentError(
         'The property %v of the model %v is a primary key, ' +
           'so it should not have the option "default" to be provided.',
         propName,
         modelName,
       );
-    if (propDef.itemType && propDef.type !== Type.ARRAY)
+    }
+    if (propDef.itemType && propDef.type !== Type.ARRAY) {
       throw new InvalidArgumentError(
         'The property %v of the model %v has a non-array type, ' +
           'so it should not have the option "itemType" to be provided.',
@@ -188,7 +202,8 @@ export class PropertiesDefinitionValidator extends Service {
         modelName,
         propDef.type,
       );
-    if (propDef.itemModel && propDef.type !== Type.ARRAY)
+    }
+    if (propDef.itemModel && propDef.type !== Type.ARRAY) {
       throw new InvalidArgumentError(
         'The option "itemModel" is not supported for %s property type, ' +
           'so the property %v of the model %v should not have ' +
@@ -197,6 +212,7 @@ export class PropertiesDefinitionValidator extends Service {
         propName,
         modelName,
       );
+    }
     if (propDef.itemModel && propDef.itemType !== Type.OBJECT) {
       if (propDef.itemType) {
         throw new InvalidArgumentError(
@@ -217,7 +233,7 @@ export class PropertiesDefinitionValidator extends Service {
         );
       }
     }
-    if (propDef.model && propDef.type !== Type.OBJECT)
+    if (propDef.model && propDef.type !== Type.OBJECT) {
       throw new InvalidArgumentError(
         'The option "model" is not supported for %s property type, ' +
           'so the property %v of the model %v should not have ' +
@@ -226,6 +242,7 @@ export class PropertiesDefinitionValidator extends Service {
         propName,
         modelName,
       );
+    }
     if (propDef.unique) {
       if (
         typeof propDef.unique !== 'boolean' &&
@@ -241,12 +258,13 @@ export class PropertiesDefinitionValidator extends Service {
         );
       }
     }
-    if (propDef.unique && propDef.primaryKey)
+    if (propDef.unique && propDef.primaryKey) {
       throw new InvalidArgumentError(
         'The property %v of the model %v is a primary key, ' +
           'so it should not have the option "unique" to be provided.',
         propName,
         modelName,
       );
+    }
   }
 }