@e22m4u/js-repository 0.4.0 → 0.5.0

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

@@ -30,7 +30,7 @@ export class PropertyValidatorRegistry extends Service {
     if (!name || typeof name !== 'string')
       throw new InvalidArgumentError(
         'A name of the property validator must ' +
-          'be a non-empty String, but %v given.',
+          'be a non-empty String, but %v was given.',
         name,
       );
     if (name in this._validators)
@@ -40,7 +40,7 @@ export class PropertyValidatorRegistry extends Service {
       );
     if (typeof validator !== 'function')
       throw new InvalidArgumentError(
-        'The property validator %v must be a Function, but %v given.',
+        'The property validator %v must be a Function, but %v was given.',
         name,
         validator,
       );

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

@@ -30,7 +30,7 @@ describe('PropertyValidatorRegistry', function () {
       const error = v =>
         format(
           'A name of the property validator must ' +
-            'be a non-empty String, but %s given.',
+            'be a non-empty String, but %s was given.',
           v,
         );
       expect(throwable('')).to.throw(error('""'));
@@ -59,7 +59,7 @@ describe('PropertyValidatorRegistry', function () {
       const throwable = v => () => pvr.addValidator('test', v);
       const error = v =>
         format(
-          'The property validator "test" must be a Function, but %s given.',
+          'The property validator "test" must be a Function, but %s was given.',
           v,
         );
       expect(throwable('str')).to.throw(error('"str"'));

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

@@ -20,6 +20,6 @@ export type PropertyValidator = (
  * Property validate options.
  */
 export type PropertyValidateOptions =
-  | string
-  | string[]
+  | (string | PropertyValidator)
+  | (string | PropertyValidator)[]
   | {[key: string]: unknown};

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

@@ -17,13 +17,13 @@ export class RelationsDefinitionValidator extends Service {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
         'The first argument of RelationsDefinitionValidator.validate ' +
-          'should be a non-empty String, but %v given.',
+          'should be a non-empty String, but %v was given.',
         modelName,
       );
     if (!relDefs || typeof relDefs !== 'object' || Array.isArray(relDefs))
       throw new InvalidArgumentError(
         'The provided option "relations" of the model %v ' +
-          'should be an Object, but %v given.',
+          'should be an Object, but %v was given.',
         modelName,
         relDefs,
       );
@@ -45,19 +45,19 @@ export class RelationsDefinitionValidator extends Service {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
         'The first argument of RelationsDefinitionValidator._validateRelation ' +
-          'should be a non-empty String, but %v given.',
+          'should be a non-empty String, but %v was given.',
         modelName,
       );
     if (!relName || typeof relName !== 'string')
       throw new InvalidArgumentError(
         'The relation name of the model %v should be ' +
-          'a non-empty String, but %v given.',
+          'a non-empty String, but %v was given.',
         modelName,
         relName,
       );
     if (!relDef || typeof relDef !== 'object' || Array.isArray(relDef))
       throw new InvalidArgumentError(
-        'The relation %v of the model %v should be an Object, but %v given.',
+        'The relation %v of the model %v should be an Object, but %v was given.',
         relName,
         modelName,
         relDef,
@@ -65,7 +65,7 @@ export class RelationsDefinitionValidator extends Service {
     if (!relDef.type || !Object.values(Type).includes(relDef.type))
       throw new InvalidArgumentError(
         'The relation %v of the model %v requires the option "type" ' +
-          'to have one of relation types: %l, but %v given.',
+          'to have one of relation types: %l, but %v was given.',
         relName,
         modelName,
         Object.values(Type),
@@ -112,7 +112,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v has the type "belongsTo", ' +
             'so it expects the option "polymorphic" to be a Boolean, ' +
-            'but %v given.',
+            'but %v was given.',
           relName,
           modelName,
           relDef.polymorphic,
@@ -121,7 +121,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v is a polymorphic "belongsTo" relation, ' +
             'so it expects the provided option "foreignKey" to be a String, ' +
-            'but %v given.',
+            'but %v was given.',
           relName,
           modelName,
           relDef.foreignKey,
@@ -130,7 +130,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v is a polymorphic "belongsTo" relation, ' +
             'so it expects the provided option "discriminator" to be a String, ' +
-            'but %v given.',
+            'but %v was given.',
           relName,
           modelName,
           relDef.discriminator,
@@ -141,7 +141,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v has the type "belongsTo", ' +
             'so it requires the option "model" to be a non-empty String, ' +
-            'but %v given.',
+            'but %v was given.',
           relName,
           modelName,
           relDef.model,
@@ -150,7 +150,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v has the type "belongsTo", ' +
             'so it expects the provided option "foreignKey" to be a String, ' +
-            'but %v given.',
+            'but %v was given.',
           relName,
           modelName,
           relDef.foreignKey,
@@ -208,7 +208,7 @@ export class RelationsDefinitionValidator extends Service {
       throw new InvalidArgumentError(
         'The relation %v of the model %v has the type "hasOne", ' +
           'so it requires the option "model" to be a non-empty String, ' +
-          'but %v given.',
+          'but %v was given.',
         relName,
         modelName,
         relDef.model,
@@ -238,7 +238,7 @@ export class RelationsDefinitionValidator extends Service {
           throw new InvalidArgumentError(
             'The relation %v of the model %v has the option "polymorphic" ' +
               'with "true" value, so it requires the option "foreignKey" ' +
-              'to be a non-empty String, but %v given.',
+              'to be a non-empty String, but %v was given.',
             relName,
             modelName,
             relDef.foreignKey,
@@ -247,7 +247,7 @@ export class RelationsDefinitionValidator extends Service {
           throw new InvalidArgumentError(
             'The relation %v of the model %v has the option "polymorphic" ' +
               'with "true" value, so it requires the option "discriminator" ' +
-              'to be a non-empty String, but %v given.',
+              'to be a non-empty String, but %v was given.',
             relName,
             modelName,
             relDef.discriminator,
@@ -256,7 +256,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v has the type "hasOne", ' +
             'so it expects the provided option "polymorphic" to be ' +
-            'a String or a Boolean, but %v given.',
+            'a String or a Boolean, but %v was given.',
           relName,
           modelName,
           relDef.polymorphic,
@@ -268,7 +268,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v has the type "hasOne", ' +
             'so it requires the option "foreignKey" to be a non-empty String, ' +
-            'but %v given.',
+            'but %v was given.',
           relName,
           modelName,
           relDef.foreignKey,
@@ -326,7 +326,7 @@ export class RelationsDefinitionValidator extends Service {
       throw new InvalidArgumentError(
         'The relation %v of the model %v has the type "hasMany", ' +
           'so it requires the option "model" to be a non-empty String, ' +
-          'but %v given.',
+          'but %v was given.',
         relName,
         modelName,
         relDef.model,
@@ -356,7 +356,7 @@ export class RelationsDefinitionValidator extends Service {
           throw new InvalidArgumentError(
             'The relation %v of the model %v has the option "polymorphic" ' +
               'with "true" value, so it requires the option "foreignKey" ' +
-              'to be a non-empty String, but %v given.',
+              'to be a non-empty String, but %v was given.',
             relName,
             modelName,
             relDef.foreignKey,
@@ -365,7 +365,7 @@ export class RelationsDefinitionValidator extends Service {
           throw new InvalidArgumentError(
             'The relation %v of the model %v has the option "polymorphic" ' +
               'with "true" value, so it requires the option "discriminator" ' +
-              'to be a non-empty String, but %v given.',
+              'to be a non-empty String, but %v was given.',
             relName,
             modelName,
             relDef.discriminator,
@@ -374,7 +374,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v has the type "hasMany", ' +
             'so it expects the provided option "polymorphic" to be ' +
-            'a String or a Boolean, but %v given.',
+            'a String or a Boolean, but %v was given.',
           relName,
           modelName,
           relDef.polymorphic,
@@ -386,7 +386,7 @@ export class RelationsDefinitionValidator extends Service {
         throw new InvalidArgumentError(
           'The relation %v of the model %v has the type "hasMany", ' +
             'so it requires the option "foreignKey" to be a non-empty String, ' +
-            'but %v given.',
+            'but %v was given.',
           relName,
           modelName,
           relDef.foreignKey,
@@ -424,7 +424,7 @@ export class RelationsDefinitionValidator extends Service {
       throw new InvalidArgumentError(
         'The relation %v of the model %v has the type "referencesMany", ' +
           'so it requires the option "model" to be a non-empty String, ' +
-          'but %v given.',
+          'but %v was given.',
         relName,
         modelName,
         relDef.model,
@@ -433,7 +433,7 @@ export class RelationsDefinitionValidator extends Service {
       throw new InvalidArgumentError(
         'The relation %v of the model %v has the type "referencesMany", ' +
           'so it expects the provided option "foreignKey" to be a String, ' +
-          'but %v given.',
+          'but %v was given.',
         relName,
         modelName,
         relDef.foreignKey,

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

@@ -12,7 +12,7 @@ describe('RelationsDefinitionValidator', function () {
       const error = v =>
         format(
           'The first argument of RelationsDefinitionValidator.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('""'));
@@ -31,7 +31,7 @@ describe('RelationsDefinitionValidator', function () {
       const error = v =>
         format(
           'The provided option "relations" 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"'));
@@ -49,7 +49,7 @@ describe('RelationsDefinitionValidator', function () {
       const error = v =>
         format(
           'The relation 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('""'));
@@ -61,7 +61,7 @@ describe('RelationsDefinitionValidator', function () {
       const error = v =>
         format(
           'The relation "foo" of the model "model" should ' +
-            'be an Object, but %s given.',
+            'be an Object, but %s was given.',
           v,
         );
       expect(validate('str')).to.throw(error('"str"'));
@@ -82,7 +82,7 @@ describe('RelationsDefinitionValidator', function () {
       const error = v =>
         format(
           'The relation "foo" of the model "model" requires the option "type" ' +
-            'to have one of relation types: %l, but %s given.',
+            'to have one of relation types: %l, but %s was given.',
           Object.values(RelationType),
           v,
         );
@@ -111,7 +111,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "belongsTo", ' +
                 'so it requires the option "model" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -138,7 +138,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "belongsTo", ' +
                 'so it expects the provided option "foreignKey" to be a String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate(10)).to.throw(error('10'));
@@ -181,7 +181,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "belongsTo", ' +
                 'so it expects the option "polymorphic" to be a Boolean, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('str')).to.throw(error('"str"'));
@@ -204,7 +204,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" is a polymorphic "belongsTo" relation, ' +
                 'so it expects the provided option "foreignKey" to be a String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate(10)).to.throw(error('10'));
@@ -231,7 +231,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" is a polymorphic "belongsTo" relation, ' +
                 'so it expects the provided option "discriminator" to be a String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate(10)).to.throw(error('10'));
@@ -262,7 +262,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasOne", ' +
                 'so it requires the option "model" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -289,7 +289,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasOne", ' +
                 'so it requires the option "foreignKey" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -334,7 +334,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasOne", ' +
                 'so it requires the option "model" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -399,7 +399,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasOne", ' +
                 'so it requires the option "model" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -428,7 +428,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the option "polymorphic" ' +
                 'with "true" value, so it requires the option "foreignKey" ' +
-                'to be a non-empty String, but %s given.',
+                'to be a non-empty String, but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -457,7 +457,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the option "polymorphic" ' +
                 'with "true" value, so it requires the option "discriminator" ' +
-                'to be a non-empty String, but %s given.',
+                'to be a non-empty String, but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -488,7 +488,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasMany", ' +
                 'so it requires the option "model" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -515,7 +515,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasMany", ' +
                 'so it requires the option "foreignKey" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -560,7 +560,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasMany", ' +
                 'so it requires the option "model" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -625,7 +625,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the type "hasMany", ' +
                 'so it requires the option "model" to be a non-empty String, ' +
-                'but %s given.',
+                'but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -654,7 +654,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the option "polymorphic" ' +
                 'with "true" value, so it requires the option "foreignKey" ' +
-                'to be a non-empty String, but %s given.',
+                'to be a non-empty String, but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -683,7 +683,7 @@ describe('RelationsDefinitionValidator', function () {
             format(
               'The relation "foo" of the model "model" has the option "polymorphic" ' +
                 'with "true" value, so it requires the option "discriminator" ' +
-                'to be a non-empty String, but %s given.',
+                'to be a non-empty String, but %s was given.',
               v,
             );
           expect(validate('')).to.throw(error('""'));
@@ -712,7 +712,7 @@ describe('RelationsDefinitionValidator', function () {
           format(
             'The relation "foo" of the model "model" has the type "referencesMany", ' +
               'so it requires the option "model" to be a non-empty String, ' +
-              'but %s given.',
+              'but %s was given.',
             v,
           );
         expect(validate('')).to.throw(error('""'));
@@ -739,7 +739,7 @@ describe('RelationsDefinitionValidator', function () {
           format(
             'The relation "foo" of the model "model" has the type "referencesMany", ' +
               'so it expects the provided option "foreignKey" to be a String, ' +
-              'but %s given.',
+              'but %s was given.',
             v,
           );
         expect(validate(10)).to.throw(error('10'));

package/src/errors/invalid-operator-value-error.js

@@ -14,7 +14,7 @@ export class InvalidOperatorValueError extends Error {
   constructor(operator, expected, value) {
     super(
       format(
-        'Condition of {%s: ...} should have %s, but %v given.',
+        'Condition of {%s: ...} should have %s, but %v was given.',
         operator,
         expected,
         value,

package/src/errors/invalid-operator-value-error.spec.js

@@ -5,7 +5,7 @@ describe('InvalidOperatorValueError', function () {
   it('sets specific message', function () {
     const error = new InvalidOperatorValueError('exists', 'a boolean', '');
     const message =
-      'Condition of {exists: ...} should have a boolean, but "" given.';
+      'Condition of {exists: ...} should have a boolean, but "" was given.';
     expect(error.message).to.be.eq(message);
   });
 });

package/src/filter/fields-clause-tool.js

@@ -22,7 +22,7 @@ export class FieldsClauseTool extends Service {
       if (!entity || typeof entity !== 'object' || Array.isArray(entity))
         throw new InvalidArgumentError(
           'The first argument of FieldsClauseTool.filter should be an Object or ' +
-            'an Array of Object, but %v given.',
+            'an Array of Object, but %v was given.',
           entity,
         );
     });
@@ -30,7 +30,7 @@ export class FieldsClauseTool extends Service {
     if (!modelName || typeof modelName !== 'string')
       throw new InvalidArgumentError(
         'The second argument of FieldsClauseTool.filter should be ' +
-          'a non-empty String, but %v given.',
+          'a non-empty String, but %v was given.',
         modelName,
       );
 
@@ -42,7 +42,7 @@ export class FieldsClauseTool extends Service {
       if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
           'The provided option "fields" should be a non-empty String ' +
-            'or an Array of non-empty String, but %v given.',
+            'or an Array of non-empty String, but %v was given.',
           field,
         );
     });
@@ -70,7 +70,7 @@ export class FieldsClauseTool extends Service {
       if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
           'The provided option "fields" should be a non-empty String ' +
-            'or an Array of non-empty String, but %v given.',
+            'or an Array of non-empty String, but %v was given.',
           field,
         );
     });
@@ -90,7 +90,7 @@ export class FieldsClauseTool extends Service {
       if (!field || typeof field !== 'string')
         throw new InvalidArgumentError(
           'The provided option "fields" should be a non-empty String ' +
-            'or an Array of non-empty String, but %v given.',
+            'or an Array of non-empty String, but %v was given.',
           field,
         );
     });

package/src/filter/fields-clause-tool.spec.js

@@ -24,7 +24,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The first argument of FieldsClauseTool.filter should be an Object or ' +
-                'an Array of Object, but %s given.',
+                'an Array of Object, but %s was given.',
               v,
             );
           expect(throwable('str')).to.throw(error('"str"'));
@@ -45,7 +45,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The second argument of FieldsClauseTool.filter should be ' +
-                'a non-empty String, but %s given.',
+                'a non-empty String, but %s was given.',
               v,
             );
           expect(throwable('')).to.throw(error('""'));
@@ -64,7 +64,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The provided option "fields" should be a non-empty String ' +
-                'or an Array of non-empty String, but %s given.',
+                'or an Array of non-empty String, but %s was given.',
               v,
             );
           expect(throwable('')).to.throw(error('""'));
@@ -103,7 +103,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The first argument of FieldsClauseTool.filter should be an Object or ' +
-                'an Array of Object, but %s given.',
+                'an Array of Object, but %s was given.',
               v,
             );
           expect(throwable('str')).to.throw(error('"str"'));
@@ -124,7 +124,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The second argument of FieldsClauseTool.filter should be ' +
-                'a non-empty String, but %s given.',
+                'a non-empty String, but %s was given.',
               v,
             );
           expect(throwable('')).to.throw(error('""'));
@@ -143,7 +143,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The provided option "fields" should be a non-empty String ' +
-                'or an Array of non-empty String, but %s given.',
+                'or an Array of non-empty String, but %s was given.',
               v,
             );
           expect(throwable([''])).to.throw(error('""'));
@@ -189,7 +189,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The first argument of FieldsClauseTool.filter should be an Object or ' +
-                'an Array of Object, but %s given.',
+                'an Array of Object, but %s was given.',
               v,
             );
           expect(throwable(['str'])).to.throw(error('"str"'));
@@ -216,7 +216,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The second argument of FieldsClauseTool.filter should be ' +
-                'a non-empty String, but %s given.',
+                'a non-empty String, but %s was given.',
               v,
             );
           expect(throwable('')).to.throw(error('""'));
@@ -243,7 +243,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The provided option "fields" should be a non-empty String ' +
-                'or an Array of non-empty String, but %s given.',
+                'or an Array of non-empty String, but %s was given.',
               v,
             );
           expect(throwable('')).to.throw(error('""'));
@@ -306,7 +306,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The first argument of FieldsClauseTool.filter should be an Object or ' +
-                'an Array of Object, but %s given.',
+                'an Array of Object, but %s was given.',
               v,
             );
           expect(throwable(['str'])).to.throw(error('"str"'));
@@ -333,7 +333,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The second argument of FieldsClauseTool.filter should be ' +
-                'a non-empty String, but %s given.',
+                'a non-empty String, but %s was given.',
               v,
             );
           expect(throwable('')).to.throw(error('""'));
@@ -360,7 +360,7 @@ describe('FieldsClauseTool', function () {
           const error = v =>
             format(
               'The provided option "fields" should be a non-empty String ' +
-                'or an Array of non-empty String, but %s given.',
+                'or an Array of non-empty String, but %s was given.',
               v,
             );
           expect(throwable([''])).to.throw(error('""'));
@@ -414,7 +414,7 @@ describe('FieldsClauseTool', function () {
         const error = v =>
           format(
             'The provided option "fields" should be a non-empty String ' +
-              'or an Array of non-empty String, but %s given.',
+              'or an Array of non-empty String, but %s was given.',
             v,
           );
         expect(throwable('')).to.throw(error('""'));
@@ -435,7 +435,7 @@ describe('FieldsClauseTool', function () {
         const error = v =>
           format(
             'The provided option "fields" should be a non-empty String ' +
-              'or an Array of non-empty String, but %s given.',
+              'or an Array of non-empty String, but %s was given.',
             v,
           );
         expect(throwable([''])).to.throw(error('""'));
@@ -460,7 +460,7 @@ describe('FieldsClauseTool', function () {
         const error = v =>
           format(
             'The provided option "fields" should be a non-empty String ' +
-              'or an Array of non-empty String, but %s given.',
+              'or an Array of non-empty String, but %s was given.',
             v,
           );
         expect(throwable('')).to.throw(error('""'));
@@ -487,7 +487,7 @@ describe('FieldsClauseTool', function () {
         const error = v =>
           format(
             'The provided option "fields" should be a non-empty String ' +
-              'or an Array of non-empty String, but %s given.',
+              'or an Array of non-empty String, but %s was given.',
             v,
           );
         expect(throwable([''])).to.throw(error('""'));