@e22m4u/js-repository 0.4.0 → 0.5.0

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

@@ -28,7 +28,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The first argument of PropertiesDefinitionValidator.validate ' +
-            'should be a non-empty String, but %s given.',
+            'should be a non-empty String, but %s was given.',
           v,
         );
       expect(validate('')).to.throw(error('""'));
@@ -47,7 +47,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "properties" of the model "model" ' +
-            'should be an Object, but %s given.',
+            'should be an Object, but %s was given.',
           v,
         );
       expect(validate('str')).to.throw(error('"str"'));
@@ -65,7 +65,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The property name of the model "model" should be ' +
-            'a non-empty String, but %s given.',
+            'a non-empty String, but %s was given.',
           v,
         );
       expect(validate({['']: {}})).to.throw(error('""'));
@@ -77,7 +77,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The property "foo" of the model "model" should have ' +
-            'a property definition, but %s given.',
+            'a property definition, but %s was given.',
           v,
         );
       expect(validate(undefined)).to.throw(error('undefined'));
@@ -91,7 +91,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'In case of a short property definition, the property "foo" ' +
-            'of the model "model" should have one of data types: %l, but %s given.',
+            'of the model "model" should have one of data types: %l, but %s was given.',
           Object.values(DataType),
           v,
         );
@@ -104,7 +104,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'In case of a full property definition, the property "foo" ' +
-            'of the model "model" should be an Object, but %s given.',
+            'of the model "model" should be an Object, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -118,7 +118,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The property "foo" of the model "model" requires the option "type" ' +
-            'to have one of data types: %l, but %s given.',
+            'to have one of data types: %l, but %s was given.',
           Object.values(DataType),
           v,
         );
@@ -141,7 +141,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "itemType" of the property "foo" in the model "model" ' +
-            'should have one of data types: %l, but %s given.',
+            'should have one of data types: %l, but %s was given.',
           Object.values(DataType),
           v,
         );
@@ -165,7 +165,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "itemModel" of the property "foo" ' +
-            'in the model "model" should be a String, but %s given.',
+            'in the model "model" should be a String, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -186,7 +186,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "model" of the property "foo" in the model "model" ' +
-            'should be a String, but %s given.',
+            'should be a String, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -207,7 +207,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "primaryKey" of the property "foo" in the model "model" ' +
-            'should be a Boolean, but %s given.',
+            'should be a Boolean, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -228,7 +228,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "columnName" of the property "foo" in the model "model" ' +
-            'should be a String, but %s given.',
+            'should be a String, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -249,7 +249,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "columnType" of the property "foo" in the model "model" ' +
-            'should be a String, but %s given.',
+            'should be a String, but %s was given.',
           v,
         );
       expect(validate(10)).to.throw(error('10'));
@@ -270,7 +270,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "required" of the property "foo" in the model "model" ' +
-            'should be a Boolean, but %s given.',
+            'should be a Boolean, but %s was given.',
           v,
         );
       expect(validate('str')).to.throw(error('"str"'));
@@ -426,7 +426,7 @@ describe('PropertiesDefinitionValidator', function () {
       expect(V.validate).to.have.been.called.with.exactly('model', propDefs);
     });
 
-    it('the option "validate" should have a non-empty String, an Array of String or an Object', function () {
+    it('the option "validate" should have a non-empty String, a Function, an Array or an Object', function () {
       const validate = v => () => {
         const foo = {
           type: DataType.ANY,
@@ -436,9 +436,10 @@ describe('PropertiesDefinitionValidator', function () {
       };
       const error = v =>
         format(
-          'The provided option "validate" of the property "foo" in the model "model" ' +
-            'should be a non-empty String, an Array of String or an Object, ' +
-            'but %s given.',
+          'The provided option "validate" for the property "foo" in the model "model" ' +
+            'should be either a validator name, a validator function, an array ' +
+            'of validator names or functions, or an object mapping validator ' +
+            'names to their arguments, but %s was given.',
           v,
         );
       expect(validate('')).to.throw(error('""'));
@@ -446,9 +447,10 @@ describe('PropertiesDefinitionValidator', function () {
       expect(validate(0)).to.throw(error('0'));
       expect(validate(true)).to.throw(error('true'));
       expect(validate(false)).to.throw(error('false'));
-      expect(validate(() => undefined)).to.throw(error('Function'));
       validate('myValidator')();
+      validate(() => true)();
       validate(['myValidator'])();
+      validate([() => true])();
       validate([])();
       validate({myValidator: true})();
       validate({})();
@@ -456,6 +458,34 @@ describe('PropertiesDefinitionValidator', function () {
       validate(undefined)();
     });
 
+    it('the option "validate" with an Array value requires elements to be a non-empty String or a Function', function () {
+      const validate = v => () => {
+        const foo = {
+          type: DataType.ANY,
+          validate: [v],
+        };
+        S.validate('model', {foo});
+      };
+      const error = v =>
+        format(
+          'The provided option "validate" for the property "foo" in the model "model" ' +
+            'has an Array value that should contain validator names or validator functions, ' +
+            'but %s was given.',
+          v,
+        );
+      expect(validate('')).to.throw(error('""'));
+      expect(validate(10)).to.throw(error('10'));
+      expect(validate(0)).to.throw(error('0'));
+      expect(validate(true)).to.throw(error('true'));
+      expect(validate(false)).to.throw(error('false'));
+      expect(validate([1, 2, 3])).to.throw(error('Array'));
+      expect(validate({foo: 'bar'})).to.throw(error('Object'));
+      expect(validate(null)).to.throw(error('null'));
+      expect(validate(undefined)).to.throw(error('undefined'));
+      validate('myValidator')();
+      validate(() => true)();
+    });
+
     it('the option "validate" requires only existing validator names', function () {
       const validate = v => () => {
         const foo = {
@@ -473,7 +503,7 @@ describe('PropertiesDefinitionValidator', function () {
       validate({myValidator: true})();
     });
 
-    it('the option "transform" should have a non-empty String, an Array of String or an Object', function () {
+    it('the option "transform" should have a non-empty String, a Function, an Array or an Object', function () {
       const validate = v => () => {
         const foo = {
           type: DataType.ANY,
@@ -483,9 +513,10 @@ describe('PropertiesDefinitionValidator', function () {
       };
       const error = v =>
         format(
-          'The provided option "transform" of the property "foo" in the model "model" ' +
-            'should be a non-empty String, an Array of String or an Object, ' +
-            'but %s given.',
+          'The provided option "transform" for the property "foo" in the model "model" ' +
+            'should be either a transformer name, a transformer function, an array ' +
+            'of transformer names or functions, or an object mapping transformer ' +
+            'names to their arguments, but %s was given.',
           v,
         );
       expect(validate('')).to.throw(error('""'));
@@ -493,9 +524,10 @@ describe('PropertiesDefinitionValidator', function () {
       expect(validate(0)).to.throw(error('0'));
       expect(validate(true)).to.throw(error('true'));
       expect(validate(false)).to.throw(error('false'));
-      expect(validate(() => undefined)).to.throw(error('Function'));
       validate('myTransformer')();
+      validate(v => v)();
       validate(['myTransformer'])();
+      validate([v => v])();
       validate([])();
       validate({myTransformer: true})();
       validate({})();
@@ -503,6 +535,34 @@ describe('PropertiesDefinitionValidator', function () {
       validate(undefined)();
     });
 
+    it('the option "transform" with an Array value requires elements to be a non-empty String or a Function', function () {
+      const validate = v => () => {
+        const foo = {
+          type: DataType.ANY,
+          transform: [v],
+        };
+        S.validate('model', {foo});
+      };
+      const error = v =>
+        format(
+          'The provided option "transform" for the property "foo" in the model "model" ' +
+            'has an Array value that should contain transformer names or transformer functions, ' +
+            'but %s was given.',
+          v,
+        );
+      expect(validate('')).to.throw(error('""'));
+      expect(validate(10)).to.throw(error('10'));
+      expect(validate(0)).to.throw(error('0'));
+      expect(validate(true)).to.throw(error('true'));
+      expect(validate(false)).to.throw(error('false'));
+      expect(validate([1, 2, 3])).to.throw(error('Array'));
+      expect(validate({foo: 'bar'})).to.throw(error('Object'));
+      expect(validate(null)).to.throw(error('null'));
+      expect(validate(undefined)).to.throw(error('undefined'));
+      validate('myTransformer')();
+      validate(v => v)();
+    });
+
     it('the option "transform" requires only existing transformer names', function () {
       const validate = v => () => {
         const foo = {
@@ -531,7 +591,7 @@ describe('PropertiesDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "unique" of the property "foo" in the model "model" ' +
-            'should be a Boolean or one of values: %l, but %s given.',
+            'should be a Boolean or one of values: %l, but %s was given.',
           Object.values(PropertyUniqueness),
           v,
         );

package/src/definition/model/properties/property-transformer/builtin/index.d.ts

@@ -1,4 +1,3 @@
 export * from './trim-transformer.js';
 export * from './to-lower-case-transformer.js';
 export * from './to-upper-case-transformer.js';
-export * from './to-title-case-transformer.js';

package/src/definition/model/properties/property-transformer/builtin/index.js

@@ -1,4 +1,3 @@
 export * from './trim-transformer.js';
 export * from './to-lower-case-transformer.js';
 export * from './to-upper-case-transformer.js';
-export * from './to-title-case-transformer.js';

package/src/definition/model/properties/property-transformer/builtin/to-lower-case-transformer.d.ts

@@ -3,4 +3,4 @@ import {PropertyTransformer} from '../property-transformer.js';
 /**
  * To lower case transformer.
  */
-export declare type toLowerCaseTransformer = PropertyTransformer;
+export const toLowerCaseTransformer: PropertyTransformer;

package/src/definition/model/properties/property-transformer/builtin/to-lower-case-transformer.js

@@ -12,7 +12,7 @@ export function toLowerCaseTransformer(value, options, context) {
   if (value == null) return value;
   if (typeof value === 'string') return value.toLowerCase();
   throw new InvalidArgumentError(
-    'The property transformer %v requires a String value, but %v given.',
+    'The property transformer %v requires a String value, but %v was given.',
     context.transformerName,
     value,
   );

package/src/definition/model/properties/property-transformer/builtin/to-lower-case-transformer.spec.js

@@ -22,7 +22,7 @@ describe('toLowerCaseTransformer', function () {
       });
     const error = v =>
       format(
-        'The property transformer "toLowerCase" requires a String value, but %s given.',
+        'The property transformer "toLowerCase" requires a String value, but %s was given.',
         v,
       );
     expect(throwable(10)).to.throw(error('10'));

package/src/definition/model/properties/property-transformer/builtin/to-upper-case-transformer.d.ts

@@ -3,4 +3,4 @@ import {PropertyTransformer} from '../property-transformer.js';
 /**
  * To upper case transformer.
  */
-export declare type toUpperCaseTransformer = PropertyTransformer;
+export const toUpperCaseTransformer: PropertyTransformer;

package/src/definition/model/properties/property-transformer/builtin/to-upper-case-transformer.js

@@ -12,7 +12,7 @@ export function toUpperCaseTransformer(value, options, context) {
   if (value == null) return value;
   if (typeof value === 'string') return value.toUpperCase();
   throw new InvalidArgumentError(
-    'The property transformer %v requires a String value, but %v given.',
+    'The property transformer %v requires a String value, but %v was given.',
     context.transformerName,
     value,
   );

package/src/definition/model/properties/property-transformer/builtin/to-upper-case-transformer.spec.js

@@ -22,7 +22,7 @@ describe('toUpperCaseTransformer', function () {
       });
     const error = v =>
       format(
-        'The property transformer "toUpperCase" requires a String value, but %s given.',
+        'The property transformer "toUpperCase" requires a String value, but %s was given.',
         v,
       );
     expect(throwable(10)).to.throw(error('10'));

package/src/definition/model/properties/property-transformer/builtin/trim-transformer.js

@@ -12,7 +12,7 @@ export function trimTransformer(value, options, context) {
   if (value == null) return value;
   if (typeof value === 'string') return value.trim();
   throw new InvalidArgumentError(
-    'The property transformer %v requires a String value, but %v given.',
+    'The property transformer %v requires a String value, but %v was given.',
     context.transformerName,
     value,
   );

package/src/definition/model/properties/property-transformer/builtin/trim-transformer.spec.js

@@ -22,7 +22,7 @@ describe('trimTransformer', function () {
       });
     const error = v =>
       format(
-        'The property transformer "trim" requires a String value, but %s given.',
+        'The property transformer "trim" requires a String value, but %s was given.',
         v,
       );
     expect(throwable(10)).to.throw(error('10'));

package/src/definition/model/properties/property-transformer/property-transformer-registry.js

@@ -2,7 +2,6 @@ import {Service} from '@e22m4u/js-service';
 import {trimTransformer} from './builtin/index.js';
 import {toUpperCaseTransformer} from './builtin/index.js';
 import {toLowerCaseTransformer} from './builtin/index.js';
-import {toTitleCaseTransformer} from './builtin/index.js';
 import {InvalidArgumentError} from '../../../../errors/index.js';
 
 /**
@@ -18,7 +17,6 @@ export class PropertyTransformerRegistry extends Service {
     trim: trimTransformer,
     toUpperCase: toUpperCaseTransformer,
     toLowerCase: toLowerCaseTransformer,
-    toTitleCase: toTitleCaseTransformer,
   };
 
   /**
@@ -32,7 +30,7 @@ export class PropertyTransformerRegistry extends Service {
     if (!name || typeof name !== 'string')
       throw new InvalidArgumentError(
         'A name of the property transformer must ' +
-          'be a non-empty String, but %v given.',
+          'be a non-empty String, but %v was given.',
         name,
       );
     if (name in this._transformers)
@@ -42,7 +40,7 @@ export class PropertyTransformerRegistry extends Service {
       );
     if (typeof transformer !== 'function')
       throw new InvalidArgumentError(
-        'The property transformer %v must be a Function, but %v given.',
+        'The property transformer %v must be a Function, but %v was given.',
         name,
         transformer,
       );

package/src/definition/model/properties/property-transformer/property-transformer-registry.spec.js

@@ -3,7 +3,6 @@ import {format} from '@e22m4u/js-format';
 import {trimTransformer} from './builtin/index.js';
 import {toUpperCaseTransformer} from './builtin/index.js';
 import {toLowerCaseTransformer} from './builtin/index.js';
-import {toTitleCaseTransformer} from './builtin/index.js';
 import {PropertyTransformerRegistry} from './property-transformer-registry.js';
 
 describe('PropertyTransformerRegistry', function () {
@@ -14,7 +13,6 @@ describe('PropertyTransformerRegistry', function () {
         trim: trimTransformer,
         toUpperCase: toUpperCaseTransformer,
         toLowerCase: toLowerCaseTransformer,
-        toTitleCase: toTitleCaseTransformer,
       });
     });
 
@@ -32,7 +30,7 @@ describe('PropertyTransformerRegistry', function () {
       const error = v =>
         format(
           'A name of the property transformer must ' +
-            'be a non-empty String, but %s given.',
+            'be a non-empty String, but %s was given.',
           v,
         );
       expect(throwable('')).to.throw(error('""'));
@@ -61,7 +59,7 @@ describe('PropertyTransformerRegistry', function () {
       const throwable = v => () => ptr.addTransformer('test', v);
       const error = v =>
         format(
-          'The property transformer "test" must be a Function, but %s given.',
+          'The property transformer "test" must be a Function, but %s was given.',
           v,
         );
       expect(throwable('str')).to.throw(error('"str"'));

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

@@ -22,6 +22,6 @@ export declare type PropertyTransformer = (
  * Property transform options.
  */
 export type PropertyTransformOptions =
-  | string
-  | string[]
+  | (string | PropertyTransformer)
+  | (string | PropertyTransformer)[]
   | {[key: string]: unknown};

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

@@ -30,24 +30,24 @@ export class PropertyUniquenessValidator extends Service {
     if (typeof countMethod !== 'function')
       throw new InvalidArgumentError(
         'The parameter "countMethod" of the PropertyUniquenessValidator ' +
-          'must be a Function, but %v given.',
+          'must be a Function, but %v was given.',
         countMethod,
       );
     if (!methodName || typeof methodName !== 'string')
       throw new InvalidArgumentError(
         'The parameter "methodName" of the PropertyUniquenessValidator ' +
-          'must be a non-empty String, but %v given.',
+          'must be a non-empty String, but %v was given.',
         methodName,
       );
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
         'The parameter "modelName" of the PropertyUniquenessValidator ' +
-          'must be a non-empty String, but %v given.',
+          'must be a non-empty String, but %v was given.',
         modelName,
       );
     if (!isPureObject(modelData))
       throw new InvalidArgumentError(
-        'The data of the model %v should be an Object, but %v given.',
+        'The data of the model %v should be an Object, but %v was given.',
         modelName,
         modelData,
       );

package/src/definition/model/properties/property-uniqueness-validator.spec.js

@@ -25,7 +25,7 @@ describe('PropertyUniquenessValidator', function () {
       const error = v =>
         format(
           'The parameter "countMethod" of the PropertyUniquenessValidator ' +
-            'must be a Function, but %s given.',
+            'must be a Function, but %s was given.',
           v,
         );
       await expect(throwable('str')).to.be.rejectedWith(error('"str"'));
@@ -60,7 +60,7 @@ describe('PropertyUniquenessValidator', function () {
       const error = v =>
         format(
           'The parameter "methodName" of the PropertyUniquenessValidator ' +
-            'must be a non-empty String, but %s given.',
+            'must be a non-empty String, but %s was given.',
           v,
         );
       await expect(throwable('')).to.be.rejectedWith(error('""'));
@@ -95,7 +95,7 @@ describe('PropertyUniquenessValidator', function () {
       const error = v =>
         format(
           'The parameter "modelName" of the PropertyUniquenessValidator ' +
-            'must be a non-empty String, but %s given.',
+            'must be a non-empty String, but %s was given.',
           v,
         );
       await expect(throwable('')).to.be.rejectedWith(error('""'));
@@ -129,7 +129,7 @@ describe('PropertyUniquenessValidator', function () {
       const throwable = v => puv.validate(() => 0, 'create', 'model', v);
       const error = v =>
         format(
-          'The data of the model "model" should be an Object, but %s given.',
+          'The data of the model "model" should be an Object, but %s was given.',
           v,
         );
       await expect(throwable('str')).to.be.rejectedWith(error('"str"'));

package/src/definition/model/properties/property-validator/builtin/max-length-validator.d.ts

@@ -3,4 +3,4 @@ import {PropertyValidator} from '../property-validator.js';
 /**
  * Max length validator.
  */
-export declare type maxLengthValidator = PropertyValidator;
+export const maxLengthValidator: PropertyValidator;

package/src/definition/model/properties/property-validator/builtin/max-length-validator.js

@@ -13,7 +13,7 @@ export function maxLengthValidator(value, options, context) {
   if (typeof options !== 'number')
     throw new InvalidArgumentError(
       'The validator %v requires the "options" argument ' +
-        'as a Number, but %v given.',
+        'as a Number, but %v was given.',
       context.validatorName,
       options,
     );
@@ -21,7 +21,7 @@ export function maxLengthValidator(value, options, context) {
     return value.length <= options;
   throw new InvalidArgumentError(
     'The property validator %v requires a String ' +
-      'or an Array value, but %v given.',
+      'or an Array value, but %v was given.',
     context.validatorName,
     value,
   );

package/src/definition/model/properties/property-validator/builtin/max-length-validator.spec.js

@@ -23,7 +23,7 @@ describe('maxLengthValidator', function () {
     const error = v =>
       format(
         'The property validator "myValidator" requires a String ' +
-          'or an Array value, but %s given.',
+          'or an Array value, but %s was given.',
         v,
       );
     expect(throwable(10)).to.throw(error('10'));
@@ -48,7 +48,7 @@ describe('maxLengthValidator', function () {
     const error = v =>
       format(
         'The validator "myValidator" requires the "options" argument ' +
-          'as a Number, but %s given.',
+          'as a Number, but %s was given.',
         v,
       );
     expect(throwable('str')).to.throw(error('"str"'));

package/src/definition/model/properties/property-validator/builtin/min-length-validator.d.ts

@@ -3,4 +3,4 @@ import {PropertyValidator} from '../property-validator.js';
 /**
  * Min length validator.
  */
-export declare type minLengthValidator = PropertyValidator;
+export const minLengthValidator: PropertyValidator;

package/src/definition/model/properties/property-validator/builtin/min-length-validator.js

@@ -13,7 +13,7 @@ export function minLengthValidator(value, options, context) {
   if (typeof options !== 'number')
     throw new InvalidArgumentError(
       'The validator %v requires the "options" argument ' +
-        'as a Number, but %v given.',
+        'as a Number, but %v was given.',
       context.validatorName,
       options,
     );
@@ -21,7 +21,7 @@ export function minLengthValidator(value, options, context) {
     return value.length >= options;
   throw new InvalidArgumentError(
     'The property validator %v requires a String ' +
-      'or an Array value, but %v given.',
+      'or an Array value, but %v was given.',
     context.validatorName,
     value,
   );

package/src/definition/model/properties/property-validator/builtin/min-length-validator.spec.js

@@ -23,7 +23,7 @@ describe('minLengthValidator', function () {
     const error = v =>
       format(
         'The property validator "myValidator" requires a String ' +
-          'or an Array value, but %s given.',
+          'or an Array value, but %s was given.',
         v,
       );
     expect(throwable(10)).to.throw(error('10'));
@@ -48,7 +48,7 @@ describe('minLengthValidator', function () {
     const error = v =>
       format(
         'The validator "myValidator" requires the "options" argument ' +
-          'as a Number, but %s given.',
+          'as a Number, but %s was given.',
         v,
       );
     expect(throwable('str')).to.throw(error('"str"'));

package/src/definition/model/properties/property-validator/builtin/regexp-validator.d.ts

@@ -3,4 +3,4 @@ import {PropertyValidator} from '../property-validator.js';
 /**
  * Regexp validator.
  */
-export declare type regexpValidator = PropertyValidator;
+export const regexpValidator: PropertyValidator;

package/src/definition/model/properties/property-validator/builtin/regexp-validator.js

@@ -14,7 +14,7 @@ export function regexpValidator(value, options, context) {
   if (typeof options !== 'string' && !(options instanceof RegExp))
     throw new InvalidArgumentError(
       'The validator %v requires the "options" argument ' +
-        'as a String or RegExp, but %v given.',
+        'as a String or RegExp, but %v was given.',
       context.validatorName,
       options,
     );
@@ -23,7 +23,7 @@ export function regexpValidator(value, options, context) {
     return regexp.test(value);
   }
   throw new InvalidArgumentError(
-    'The property validator %v requires ' + 'a String value, but %v given.',
+    'The property validator %v requires ' + 'a String value, but %v was given.',
     context.validatorName,
     value,
   );

package/src/definition/model/properties/property-validator/builtin/regexp-validator.spec.js

@@ -23,7 +23,7 @@ describe('regexpValidator', function () {
     const error = v =>
       format(
         'The property validator "myValidator" requires ' +
-          'a String value, but %s given.',
+          'a String value, but %s was given.',
         v,
       );
     expect(throwable(true)).to.throw(error('true'));
@@ -45,7 +45,7 @@ describe('regexpValidator', function () {
     const error = v =>
       format(
         'The validator "myValidator" requires the "options" argument ' +
-          'as a String or RegExp, but %s given.',
+          'as a String or RegExp, but %s was given.',
         v,
       );
     expect(throwable(true)).to.throw(error('true'));