@e22m4u/js-repository 0.0.35 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "description": "Абстракция для работы с базами данных для Node.js",
   "type": "module",
   "main": "src/index.js",

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, %v given.',
+        'Condition of {%s: ...} should have %s, but %v 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, "" given.';
+      'Condition of {exists: ...} should have a boolean, but "" given.';
     expect(error.message).to.be.eq(message);
   });
 });

package/src/filter/filter-clause.d.ts

@@ -1,5 +1,3 @@
-import {ModelData} from '../types.js';
-
 /**
  * Filter clause.
  */
@@ -45,20 +43,9 @@ export declare type ItemFilterClause = Pick<FilterClause, 'fields' | 'include'>;
  * ```
  */
 export declare type WhereClause =
-  | PredicateClause
-  | PropertiesClause
-  | AndClause
-  | OrClause;
-
-/**
- * Predicate clause.
- *
- * @example
- * ```ts
- * (value) => value.featured === true;
- * ```
- */
-export type PredicateClause = (value: ModelData) => boolean;
+  & PropertiesClause
+  & AndClause
+  & OrClause;
 
 /**
  * Properties clause.

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

@@ -56,7 +56,6 @@ export class WhereClauseTool extends Service {
    * @returns {Function}
    */
   _createFilter(whereClause) {
-    if (typeof whereClause === 'function') return whereClause;
     if (typeof whereClause !== 'object' || Array.isArray(whereClause))
       throw new InvalidArgumentError(
         'The provided option "where" should be an Object, but %v given.',

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

@@ -272,12 +272,6 @@ describe('WhereClauseTool', function () {
       expect(result[0]).to.be.eql(OBJECTS[2]);
       expect(result[1]).to.be.eql(OBJECTS[3]);
     });
-
-    it('uses the given function to filter values', function () {
-      const result = S.filter(OBJECTS, v => v.nickname === 'Flower');
-      expect(result).to.have.length(1);
-      expect(result[0]).to.be.eql(OBJECTS[1]);
-    });
   });
 
   describe('validateWhereClause', function () {