Просмотр исходного кода

chore: removes PredicateClause

e22m4u 2 лет назад
Родитель
Сommit
cdc2dc0c5d
3 измененных файлов с 0 добавлено и 20 удалено
  1. 0 13
      src/filter/filter-clause.d.ts
  2. 0 1
      src/filter/where-clause-tool.js
  3. 0 6
      src/filter/where-clause-tool.spec.js

+ 0 - 13
src/filter/filter-clause.d.ts

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

+ 0 - 1
src/filter/where-clause-tool.js

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

+ 0 - 6
src/filter/where-clause-tool.spec.js

@@ -272,12 +272,6 @@ describe('WhereClauseTool', function () {
       expect(result[0]).to.be.eql(OBJECTS[2]);
       expect(result[0]).to.be.eql(OBJECTS[2]);
       expect(result[1]).to.be.eql(OBJECTS[3]);
       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 () {
   describe('validateWhereClause', function () {