@e22m4u/js-repository 0.8.7 → 0.8.8

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

@@ -44,8 +44,8 @@ describe('ModelDefinitionUtils', function () {
       const throwable = () => mdu.getPrimaryKeyAsPropertyName('model');
       expect(throwable).to.throw(
         format(
-          'The property name %v of the model "model" is defined as a regular property. ' +
-            'In this case, a primary key should be defined explicitly. ' +
+          'Property name %v of the model "model" is defined as a regular property. ' +
+            'In this case, a primary key must be defined explicitly. ' +
             'Do use the option "primaryKey" to specify the primary key.',
           DEF_PK,
         ),
@@ -179,8 +179,8 @@ describe('ModelDefinitionUtils', function () {
       const throwable = () => mdu.getPrimaryKeyAsColumnName('model');
       expect(throwable).to.throw(
         format(
-          'The property name %v of the model "model" is defined as a regular property. ' +
-            'In this case, a primary key should be defined explicitly. ' +
+          'Property name %v of the model "model" is defined as a regular property. ' +
+            'In this case, a primary key must be defined explicitly. ' +
             'Do use the option "primaryKey" to specify the primary key.',
           DEF_PK,
         ),
@@ -1222,8 +1222,8 @@ describe('ModelDefinitionUtils', function () {
       const throwable = v => () => mdu.getDataTypeFromPropertyDefinition(v);
       const error = v =>
         format(
-          'The argument "propDef" of the ModelDefinitionUtils.getDataTypeFromPropertyDefinition ' +
-            'should be an Object or the DataType enum, but %s was given.',
+          'Parameter "propDef" must be an Object or a DataType, ' +
+            'but %s was given.',
           v,
         );
       expect(throwable('str')).to.throw(error('"str"'));
@@ -1245,8 +1245,7 @@ describe('ModelDefinitionUtils', function () {
         mdu.getDataTypeFromPropertyDefinition({type: v});
       const error = v =>
         format(
-          'The given Object to the ModelDefinitionUtils.getDataTypeFromPropertyDefinition ' +
-            'should have the "type" property with one of values: %l, but %s was given.',
+          'Option "type" must be one of values: %l, but %s was given.',
           Object.values(DataType),
           v,
         );
@@ -1562,9 +1561,7 @@ describe('ModelDefinitionUtils', function () {
         dbs
           .getService(ModelDefinitionUtils)
           .getPropertiesDefinitionInBaseModelHierarchy('model');
-      expect(throwable).to.throw(
-        'The model "model" has a circular inheritance.',
-      );
+      expect(throwable).to.throw('Model "model" has a circular inheritance.');
     });
 
     it('places a primary key definition at the start of the result', function () {
@@ -1782,9 +1779,7 @@ describe('ModelDefinitionUtils', function () {
         dbs
           .getService(ModelDefinitionUtils)
           .getRelationsDefinitionInBaseModelHierarchy('model');
-      expect(throwable).to.throw(
-        'The model "model" has a circular inheritance.',
-      );
+      expect(throwable).to.throw('Model "model" has a circular inheritance.');
     });
   });
 
@@ -1795,7 +1790,7 @@ describe('ModelDefinitionUtils', function () {
         dbs
           .getService(ModelDefinitionUtils)
           .getRelationDefinitionByName('model', 'myRelation');
-      expect(throwable).to.throw('The model "model" is not defined.');
+      expect(throwable).to.throw('Model "model" is not defined.');
     });
 
     it('throws an error if a given relation is not found', function () {
@@ -1808,7 +1803,7 @@ describe('ModelDefinitionUtils', function () {
           .getService(ModelDefinitionUtils)
           .getRelationDefinitionByName('model', 'myRelation');
       expect(throwable).to.throw(
-        'The model "model" does not have relation name "myRelation".',
+        'Model "model" does not have relation name "myRelation".',
       );
     });
 
@@ -1924,11 +1919,7 @@ describe('ModelDefinitionUtils', function () {
           .getService(ModelDefinitionUtils)
           .excludeObjectKeysByRelationNames('model', v);
       const error = v =>
-        format(
-          'The second argument of ModelDefinitionUtils.excludeObjectKeysByRelationNames ' +
-            'should be an Object, but %s was given.',
-          v,
-        );
+        format('Parameter "modelData" must be an Object, but %s was given.', v);
       expect(throwable('')).to.throw(error('""'));
       expect(throwable('str')).to.throw(error('"str"'));
       expect(throwable(10)).to.throw(error('10'));

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

@@ -15,37 +15,37 @@ export class ModelDefinitionValidator extends Service {
   validate(modelDef) {
     if (!modelDef || typeof modelDef !== 'object' || Array.isArray(modelDef)) {
       throw new InvalidArgumentError(
-        'The model definition should be an Object, but %v was given.',
+        'Model definition must be an Object, but %v was given.',
         modelDef,
       );
     }
     if (!modelDef.name || typeof modelDef.name !== 'string') {
       throw new InvalidArgumentError(
-        'The model definition requires the option "name" ' +
+        'Model definition requires the option "name" ' +
           'as a non-empty String, but %v was given.',
         modelDef.name,
       );
     }
     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.',
+        'Option "datasource" of the model %v ' +
+          'must be a String, but %v was given.',
         modelDef.name,
         modelDef.datasource,
       );
     }
     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.',
+        'Option "base" of the model %v ' +
+          'must be a String, but %v was given.',
         modelDef.name,
         modelDef.base,
       );
     }
     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.',
+        'Option "tableName" of the model %v ' +
+          'must be a String, but %v was given.',
         modelDef.name,
         modelDef.tableName,
       );
@@ -56,8 +56,8 @@ export class ModelDefinitionValidator extends Service {
         Array.isArray(modelDef.properties)
       ) {
         throw new InvalidArgumentError(
-          'The provided option "properties" of the model %v ' +
-            'should be an Object, but %v was given.',
+          'Option "properties" of the model %v ' +
+            'must be an Object, but %v was given.',
           modelDef.name,
           modelDef.properties,
         );
@@ -73,8 +73,8 @@ export class ModelDefinitionValidator extends Service {
         Array.isArray(modelDef.relations)
       ) {
         throw new InvalidArgumentError(
-          'The provided option "relations" of the model %v ' +
-            'should be an Object, but %v was given.',
+          'Option "relations" of the model %v ' +
+            'must be an Object, but %v was given.',
           modelDef.name,
           modelDef.relations,
         );

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

@@ -17,10 +17,7 @@ describe('ModelDefinitionValidator', function () {
     it('requires the given definition to be an object', function () {
       const validate = v => () => S.validate(v);
       const error = v =>
-        format(
-          'The model definition should be an Object, but %s was given.',
-          v,
-        );
+        format('Model definition must be an Object, but %s was given.', v);
       expect(validate('str')).to.throw(error('"str"'));
       expect(validate(10)).to.throw(error('10'));
       expect(validate(true)).to.throw(error('true'));
@@ -35,7 +32,7 @@ describe('ModelDefinitionValidator', function () {
       const validate = v => () => S.validate({name: v});
       const error = v =>
         format(
-          'The model definition requires the option "name" ' +
+          'Model definition requires the option "name" ' +
             'as a non-empty String, but %s was given.',
           v,
         );
@@ -54,8 +51,8 @@ describe('ModelDefinitionValidator', function () {
       const validate = v => () => S.validate({name: 'model', datasource: v});
       const error = v =>
         format(
-          'The provided option "datasource" of the model "model" ' +
-            'should be a String, but %s was given.',
+          'Option "datasource" of the model "model" ' +
+            'must be a String, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -69,8 +66,8 @@ describe('ModelDefinitionValidator', function () {
       const validate = v => () => S.validate({name: 'model', base: v});
       const error = v =>
         format(
-          'The provided option "base" of the model "model" ' +
-            'should be a String, but %s was given.',
+          'Option "base" of the model "model" ' +
+            'must be a String, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -84,8 +81,8 @@ describe('ModelDefinitionValidator', function () {
       const validate = v => () => S.validate({name: 'model', tableName: v});
       const error = v =>
         format(
-          'The provided option "tableName" of the model "model" ' +
-            'should be a String, but %s was given.',
+          'Option "tableName" of the model "model" ' +
+            'must be a String, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -99,8 +96,8 @@ describe('ModelDefinitionValidator', function () {
       const validate = v => () => S.validate({name: 'model', properties: v});
       const error = v =>
         format(
-          'The provided option "properties" of the model "model" ' +
-            'should be an Object, but %s was given.',
+          'Option "properties" of the model "model" ' +
+            'must be an Object, but %s was given.',
           v,
         );
       expect(validate('str')).to.throw(error('"str"'));
@@ -114,8 +111,8 @@ describe('ModelDefinitionValidator', function () {
       const validate = v => () => S.validate({name: 'model', relations: v});
       const error = v =>
         format(
-          'The provided option "relations" of the model "model" ' +
-            'should be an Object, but %s was given.',
+          'Option "relations" of the model "model" ' +
+            'must be an Object, but %s was given.',
           v,
         );
       expect(validate('str')).to.throw(error('"str"'));

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

@@ -22,8 +22,8 @@ export class PrimaryKeysDefinitionValidator extends Service {
         Object.keys(propDefs).includes(DEF_PK);
       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. ' +
+          'Property name %v of the model %v is defined as a regular property. ' +
+            'In this case, a primary key must be defined explicitly. ' +
             'Do use the option "primaryKey" to specify the primary key.',
           DEF_PK,
           modelName,
@@ -33,8 +33,8 @@ export class PrimaryKeysDefinitionValidator extends Service {
     }
     if (propNames.length > 1) {
       throw new InvalidArgumentError(
-        'The model definition %v should not have ' +
-          'multiple primary keys, but %v keys given.',
+        'Model definition %v must not have multiple primary keys, ' +
+          'but %v keys were given.',
         modelName,
         propNames.length,
       );

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

@@ -41,8 +41,8 @@ describe('PrimaryKeysDefinitionValidator', function () {
           },
         });
       expect(throwable).to.throw(
-        'The model definition "model" should not have ' +
-          'multiple primary keys, but 2 keys given.',
+        'Model definition "model" must not have multiple primary keys, ' +
+          'but 2 keys were given.',
       );
     });
 
@@ -53,8 +53,8 @@ describe('PrimaryKeysDefinitionValidator', function () {
         });
       expect(throwable).to.throw(
         format(
-          'The property name %v of the model "model" is defined as a regular property. ' +
-            'In this case, a primary key should be defined explicitly. ' +
+          'Property name %v of the model "model" is defined as a regular property. ' +
+            'In this case, a primary key must be defined explicitly. ' +
             'Do use the option "primaryKey" to specify the primary key.',
           DEF_PK,
         ),
@@ -70,8 +70,8 @@ describe('PrimaryKeysDefinitionValidator', function () {
         });
       expect(throwable).to.throw(
         format(
-          'The property name %v of the model "model" is defined as a regular property. ' +
-            'In this case, a primary key should be defined explicitly. ' +
+          'Property name %v of the model "model" is defined as a regular property. ' +
+            'In this case, a primary key must be defined explicitly. ' +
             'Do use the option "primaryKey" to specify the primary key.',
           DEF_PK,
         ),
@@ -88,8 +88,8 @@ describe('PrimaryKeysDefinitionValidator', function () {
         });
       expect(throwable).to.throw(
         format(
-          'The property name %v of the model "model" is defined as a regular property. ' +
-            'In this case, a primary key should be defined explicitly. ' +
+          'Property name %v of the model "model" is defined as a regular property. ' +
+            'In this case, a primary key must be defined explicitly. ' +
             'Do use the option "primaryKey" to specify the primary key.',
           DEF_PK,
         ),

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

@@ -18,15 +18,14 @@ export class PropertiesDefinitionValidator extends Service {
   validate(modelName, propDefs) {
     if (!modelName || typeof modelName !== 'string') {
       throw new InvalidArgumentError(
-        'The first argument of PropertiesDefinitionValidator.validate ' +
-          'should be a non-empty String, but %v was given.',
+        'Parameter "modelName" must 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 ' +
-          'should be an Object, but %v was given.',
+        'Option "properties" of the model %v ' +
+          'must be an Object, but %v was given.',
         modelName,
         propDefs,
       );
@@ -52,14 +51,13 @@ export class PropertiesDefinitionValidator extends Service {
   _validateProperty(modelName, propName, propDef) {
     if (!modelName || typeof modelName !== 'string') {
       throw new InvalidArgumentError(
-        'The first argument of PropertiesDefinitionValidator._validateProperty ' +
-          'should be a non-empty String, but %v was given.',
+        'Parameter "modelName" must be a non-empty String, but %v was given.',
         modelName,
       );
     }
     if (!propName || typeof propName !== 'string') {
       throw new InvalidArgumentError(
-        'The property name of the model %v should be ' +
+        'Property name of the model %v must be ' +
           'a non-empty String, but %v was given.',
         modelName,
         propName,
@@ -67,8 +65,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     if (!propDef) {
       throw new InvalidArgumentError(
-        'The property %v of the model %v should have ' +
-          'a property definition, but %v was given.',
+        'Property %v of the model %v must have a property definition, ' +
+          'but %v was given.',
         propName,
         modelName,
         propDef,
@@ -78,7 +76,8 @@ export class PropertiesDefinitionValidator extends Service {
       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.',
+            'of the model %v must have one of data types: %l, ' +
+            'but %v was given.',
           propName,
           modelName,
           Object.values(Type),
@@ -90,7 +89,7 @@ export class PropertiesDefinitionValidator extends Service {
     if (!propDef || typeof propDef !== 'object' || Array.isArray(propDef)) {
       throw new InvalidArgumentError(
         'In case of a full property definition, the property %v ' +
-          'of the model %v should be an Object, but %v was given.',
+          'of the model %v must be an Object, but %v was given.',
         propName,
         modelName,
         propDef,
@@ -98,7 +97,7 @@ export class PropertiesDefinitionValidator extends Service {
     }
     if (!propDef.type || !Object.values(Type).includes(propDef.type)) {
       throw new InvalidArgumentError(
-        'The property %v of the model %v requires the option "type" ' +
+        'Property %v of the model %v requires the option "type" ' +
           'to have one of data types: %l, but %v was given.',
         propName,
         modelName,
@@ -108,7 +107,7 @@ export class PropertiesDefinitionValidator extends Service {
     }
     if (propDef.itemType && !Object.values(Type).includes(propDef.itemType)) {
       throw new InvalidArgumentError(
-        'The provided option "itemType" of the property %v in the model %v ' +
+        'Option "itemType" of the property %v in the model %v ' +
           'should have one of data types: %l, but %v was given.',
         propName,
         modelName,
@@ -118,8 +117,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     if (propDef.itemModel && typeof propDef.itemModel !== 'string') {
       throw new InvalidArgumentError(
-        'The provided option "itemModel" of the property %v in the model %v ' +
-          'should be a String, but %v was given.',
+        'Option "itemModel" of the property %v in the model %v ' +
+          'must be a String, but %v was given.',
         propName,
         modelName,
         propDef.itemModel,
@@ -127,8 +126,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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.',
+        'Option "model" of the property %v in the model %v ' +
+          'must be a String, but %v was given.',
         propName,
         modelName,
         propDef.model,
@@ -136,8 +135,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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.',
+        'Option "primaryKey" of the property %v in the model %v ' +
+          'must be a Boolean, but %v was given.',
         propName,
         modelName,
         propDef.primaryKey,
@@ -145,8 +144,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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.',
+        'Option "columnName" of the property %v in the model %v ' +
+          'must be a String, but %v was given.',
         propName,
         modelName,
         propDef.columnName,
@@ -154,8 +153,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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.',
+        'Option "columnType" of the property %v in the model %v ' +
+          'must be a String, but %v was given.',
         propName,
         modelName,
         propDef.columnType,
@@ -163,8 +162,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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.',
+        'Option "required" of the property %v in the model %v ' +
+          'must be a Boolean, but %v was given.',
         propName,
         modelName,
         propDef.required,
@@ -172,32 +171,32 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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.',
+        'Property %v of the model %v is a required property, ' +
+          'so it must not have the option "default" to be provided.',
         propName,
         modelName,
       );
     }
     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.',
+        'Property %v of the model %v is a primary key, ' +
+          'so it must not have the option "required" to be provided.',
         propName,
         modelName,
       );
     }
     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.',
+        'Property %v of the model %v is a primary key, ' +
+          'so it must not have the option "default" to be provided.',
         propName,
         modelName,
       );
     }
     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.',
+        'Property %v of the model %v has a non-array type, ' +
+          'so it must not have the option "itemType" to be provided.',
         propName,
         modelName,
         propDef.type,
@@ -205,8 +204,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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 ' +
+        'Option "itemModel" is not supported for %s property type, ' +
+          'so the property %v of the model %v must not have ' +
           'the option "itemModel" to be provided.',
         capitalize(propDef.type),
         propName,
@@ -216,7 +215,7 @@ export class PropertiesDefinitionValidator extends Service {
     if (propDef.itemModel && propDef.itemType !== Type.OBJECT) {
       if (propDef.itemType) {
         throw new InvalidArgumentError(
-          'The provided option "itemModel" requires the option "itemType" ' +
+          'Option "itemModel" requires the option "itemType" ' +
             'to be explicitly set to Object, but the property %v of ' +
             'the model %v has specified item type as %s.',
           propName,
@@ -225,7 +224,7 @@ export class PropertiesDefinitionValidator extends Service {
         );
       } else {
         throw new InvalidArgumentError(
-          'The provided option "itemModel" requires the option "itemType" ' +
+          'Option "itemModel" requires the option "itemType" ' +
             'to be explicitly set to Object, but the property %v of ' +
             'the model %v does not have specified item type.',
           propName,
@@ -235,8 +234,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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 ' +
+        'Option "model" is not supported for %s property type, ' +
+          'so the property %v of the model %v must not have ' +
           'the option "model" to be provided.',
         capitalize(propDef.type),
         propName,
@@ -249,8 +248,8 @@ export class PropertiesDefinitionValidator extends Service {
         !Object.values(PropertyUniqueness).includes(propDef.unique)
       ) {
         throw new InvalidArgumentError(
-          'The provided option "unique" of the property %v in the model %v ' +
-            'should be a Boolean or one of values: %l, but %v was given.',
+          'Option "unique" of the property %v in the model %v ' +
+            'must be a Boolean or one of values: %l, but %v was given.',
           propName,
           modelName,
           Object.values(PropertyUniqueness),
@@ -260,8 +259,8 @@ export class PropertiesDefinitionValidator extends Service {
     }
     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.',
+        'Property %v of the model %v is a primary key, ' +
+          'so it must not have the option "unique" to be provided.',
         propName,
         modelName,
       );