@webiny/api-headless-cms-ddb 5.34.8 → 5.35.0-beta.1

package/operations/entry/filtering/filter.js

@@ -1,26 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.filter = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _ValueFilterPlugin = require("@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin");
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _fullTextSearch = require("./fullTextSearch");
-
 var _createExpressions = require("./createExpressions");
-
 var _transform = require("./transform");
-
 var _getValue = require("./getValue");
-
 const executeFilter = params => {
   const {
     value,
@@ -30,14 +21,11 @@ const executeFilter = params => {
     value,
     compareValue: filter.compareValue
   });
-
   if (filter.negate) {
     return matched === false;
   }
-
   return matched;
 };
-
 const executeExpressions = params => {
   const {
     expressions,
@@ -45,15 +33,12 @@ const executeExpressions = params => {
     filters,
     condition
   } = params;
-
   if (expressions.length === 0 && filters.length === 0) {
     return true;
   }
   /**
    * Always run filters first as they might trigger an early return.
    */
-
-
   for (const filter of filters) {
     const value = getCachedValue(filter);
     const result = executeFilter({
@@ -64,7 +49,6 @@ const executeExpressions = params => {
      * Filters are ALWAYS executed as an AND.
      * So if even one is false, everything false.
      */
-
     if (!result) {
       return false;
     }
@@ -72,13 +56,10 @@ const executeExpressions = params => {
   /**
    * Then we move onto expressions, which are basically nested upon nested filters with different conditions.
    */
-
-
   for (const expression of expressions) {
     const result = executeExpressions((0, _objectSpread2.default)((0, _objectSpread2.default)({}, expression), {}, {
       getCachedValue
     }));
-
     if (result && condition === "OR") {
       return true;
     } else if (!result && condition == "AND") {
@@ -90,11 +71,8 @@ const executeExpressions = params => {
    *
    * Also, if condition is not an OR, we can say that the expressions check is ok, because it would fail a lot earlier than this line.
    */
-
-
   return condition === "OR" ? false : true;
 };
-
 const filter = params => {
   const {
     items: records,
@@ -104,34 +82,28 @@ const filter = params => {
     fullTextSearch
   } = params;
   const keys = Object.keys(where);
-
   if (keys.length === 0 && !fullTextSearch) {
     return records;
   }
-
   const expression = (0, _createExpressions.createExpressions)({
     plugins,
     where,
     fields
   });
+
   /**
    * No point in going further if there are no expressions to be applied and no full text search to be executed.
    */
-
   if (expression.filters.length === 0 && expression.expressions.length === 0 && !(fullTextSearch !== null && fullTextSearch !== void 0 && fullTextSearch.term)) {
     return records;
   }
   /**
    * We need the contains plugin to run the full text search.
    */
-
-
   const fullTextSearchPlugin = plugins.byType(_ValueFilterPlugin.ValueFilterPlugin.type).find(plugin => plugin.getOperation() === "contains");
-
   if (!fullTextSearchPlugin) {
     throw new _error.default(`Missing "contains" plugin to run the full-text search.`, "MISSING_PLUGIN");
   }
-
   const search = (0, _fullTextSearch.createFullTextSearch)({
     term: fullTextSearch === null || fullTextSearch === void 0 ? void 0 : fullTextSearch.term,
     targetFields: fullTextSearch === null || fullTextSearch === void 0 ? void 0 : fullTextSearch.fields,
@@ -140,16 +112,13 @@ const filter = params => {
   });
   return records.filter(record => {
     const cachedValues = {};
-
     const getCachedValue = filter => {
       const {
         path
       } = filter;
-
       if (cachedValues[path] !== undefined) {
         return cachedValues[path];
       }
-
       const plainValue = (0, _getValue.getValue)(record, path);
       const rawValue = (0, _transform.transformValue)({
         value: plainValue,
@@ -158,7 +127,6 @@ const filter = params => {
       cachedValues[path] = rawValue;
       return rawValue;
     };
-
     const exprResult = executeExpressions((0, _objectSpread2.default)((0, _objectSpread2.default)({}, expression), {}, {
       getCachedValue
     }));
@@ -166,13 +134,10 @@ const filter = params => {
      * If expression result is false we do not need to continue further.
      * Also, if there is no full text search defined, just return the expression result.
      */
-
     if (!exprResult || !search) {
       return exprResult;
     }
-
     return search(record);
   });
 };
-
 exports.filter = filter;

package/operations/entry/filtering/filter.js.map

@@ -1 +1 @@
-{"version":3,"names":["executeFilter","params","value","filter","matched","plugin","matches","compareValue","negate","executeExpressions","expressions","getCachedValue","filters","condition","length","result","expression","items","records","where","plugins","fields","fullTextSearch","keys","Object","createExpressions","term","fullTextSearchPlugin","byType","ValueFilterPlugin","type","find","getOperation","WebinyError","search","createFullTextSearch","targetFields","record","cachedValues","path","undefined","plainValue","getValue","rawValue","transformValue","transform","exprResult"],"sources":["filter.ts"],"sourcesContent":["import { CmsEntry, CmsEntryListWhere } from \"@webiny/api-headless-cms/types\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport WebinyError from \"@webiny/error\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { Field } from \"./types\";\nimport { createFullTextSearch } from \"./fullTextSearch\";\nimport { createExpressions, Expression, ExpressionCondition, Filter } from \"./createExpressions\";\nimport { transformValue } from \"./transform\";\nimport { getValue } from \"~/operations/entry/filtering/getValue\";\n\ninterface ExecuteFilterParams {\n    value: any;\n    filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n    const { value, filter } = params;\n\n    const matched = filter.plugin.matches({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (filter.negate) {\n        return matched === false;\n    }\n    return matched;\n};\n\ninterface ExecuteExpressionsParams {\n    getCachedValue: (filter: Filter) => Promise<any>;\n    expressions: Expression[];\n    filters: Filter[];\n    condition: ExpressionCondition;\n}\n\nconst executeExpressions = (params: ExecuteExpressionsParams): boolean => {\n    const { expressions, getCachedValue, filters, condition } = params;\n    if (expressions.length === 0 && filters.length === 0) {\n        return true;\n    }\n    /**\n     * Always run filters first as they might trigger an early return.\n     */\n    for (const filter of filters) {\n        const value = getCachedValue(filter);\n\n        const result = executeFilter({\n            value,\n            filter\n        });\n        /**\n         * Filters are ALWAYS executed as an AND.\n         * So if even one is false, everything false.\n         */\n        if (!result) {\n            return false;\n        }\n    }\n    /**\n     * Then we move onto expressions, which are basically nested upon nested filters with different conditions.\n     */\n    for (const expression of expressions) {\n        const result = executeExpressions({\n            ...expression,\n            getCachedValue\n        });\n        if (result && condition === \"OR\") {\n            return true;\n        } else if (!result && condition == \"AND\") {\n            return false;\n        }\n    }\n    /**\n     * If condition is an OR, we can fail the expressions check because the code would return a lot earlier than this line.\n     *\n     * Also, if condition is not an OR, we can say that the expressions check is ok, because it would fail a lot earlier than this line.\n     */\n    return condition === \"OR\" ? false : true;\n};\n\ninterface Params {\n    items: CmsEntry[];\n    where: Partial<CmsEntryListWhere>;\n    plugins: PluginsContainer;\n    fields: Record<string, Field>;\n    fullTextSearch?: {\n        term?: string;\n        fields?: string[];\n    };\n}\n\nexport const filter = (params: Params): CmsEntry[] => {\n    const { items: records, where, plugins, fields, fullTextSearch } = params;\n\n    const keys = Object.keys(where);\n    if (keys.length === 0 && !fullTextSearch) {\n        return records;\n    }\n    const expression = createExpressions({\n        plugins,\n        where,\n        fields\n    });\n\n    /**\n     * No point in going further if there are no expressions to be applied and no full text search to be executed.\n     */\n    if (\n        expression.filters.length === 0 &&\n        expression.expressions.length === 0 &&\n        !fullTextSearch?.term\n    ) {\n        return records;\n    }\n    /**\n     * We need the contains plugin to run the full text search.\n     */\n    const fullTextSearchPlugin = plugins\n        .byType<ValueFilterPlugin>(ValueFilterPlugin.type)\n        .find(plugin => plugin.getOperation() === \"contains\");\n    if (!fullTextSearchPlugin) {\n        throw new WebinyError(\n            `Missing \"contains\" plugin to run the full-text search.`,\n            \"MISSING_PLUGIN\"\n        );\n    }\n\n    const search = createFullTextSearch({\n        term: fullTextSearch?.term,\n        targetFields: fullTextSearch?.fields,\n        fields,\n        plugin: fullTextSearchPlugin\n    });\n\n    return records.filter(record => {\n        const cachedValues: Record<string, any> = {};\n\n        const getCachedValue = (filter: Filter) => {\n            const { path } = filter;\n            if (cachedValues[path] !== undefined) {\n                return cachedValues[path];\n            }\n            const plainValue = getValue(record, path);\n\n            const rawValue = transformValue({\n                value: plainValue,\n                transform: filter.transformValue\n            });\n\n            cachedValues[path] = rawValue;\n            return rawValue;\n        };\n\n        const exprResult = executeExpressions({ ...expression, getCachedValue });\n        /**\n         * If expression result is false we do not need to continue further.\n         * Also, if there is no full text search defined, just return the expression result.\n         */\n        if (!exprResult || !search) {\n            return exprResult;\n        }\n\n        return search(record);\n    });\n};\n"],"mappings":"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"}
+{"version":3,"names":["executeFilter","params","value","filter","matched","plugin","matches","compareValue","negate","executeExpressions","expressions","getCachedValue","filters","condition","length","result","expression","items","records","where","plugins","fields","fullTextSearch","keys","Object","createExpressions","term","fullTextSearchPlugin","byType","ValueFilterPlugin","type","find","getOperation","WebinyError","search","createFullTextSearch","targetFields","record","cachedValues","path","undefined","plainValue","getValue","rawValue","transformValue","transform","exprResult"],"sources":["filter.ts"],"sourcesContent":["import { CmsEntry, CmsEntryListWhere } from \"@webiny/api-headless-cms/types\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport WebinyError from \"@webiny/error\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { Field } from \"./types\";\nimport { createFullTextSearch } from \"./fullTextSearch\";\nimport { createExpressions, Expression, ExpressionCondition, Filter } from \"./createExpressions\";\nimport { transformValue } from \"./transform\";\nimport { getValue } from \"~/operations/entry/filtering/getValue\";\n\ninterface ExecuteFilterParams {\n    value: any;\n    filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n    const { value, filter } = params;\n\n    const matched = filter.plugin.matches({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (filter.negate) {\n        return matched === false;\n    }\n    return matched;\n};\n\ninterface ExecuteExpressionsParams {\n    getCachedValue: (filter: Filter) => Promise<any>;\n    expressions: Expression[];\n    filters: Filter[];\n    condition: ExpressionCondition;\n}\n\nconst executeExpressions = (params: ExecuteExpressionsParams): boolean => {\n    const { expressions, getCachedValue, filters, condition } = params;\n    if (expressions.length === 0 && filters.length === 0) {\n        return true;\n    }\n    /**\n     * Always run filters first as they might trigger an early return.\n     */\n    for (const filter of filters) {\n        const value = getCachedValue(filter);\n\n        const result = executeFilter({\n            value,\n            filter\n        });\n        /**\n         * Filters are ALWAYS executed as an AND.\n         * So if even one is false, everything false.\n         */\n        if (!result) {\n            return false;\n        }\n    }\n    /**\n     * Then we move onto expressions, which are basically nested upon nested filters with different conditions.\n     */\n    for (const expression of expressions) {\n        const result = executeExpressions({\n            ...expression,\n            getCachedValue\n        });\n        if (result && condition === \"OR\") {\n            return true;\n        } else if (!result && condition == \"AND\") {\n            return false;\n        }\n    }\n    /**\n     * If condition is an OR, we can fail the expressions check because the code would return a lot earlier than this line.\n     *\n     * Also, if condition is not an OR, we can say that the expressions check is ok, because it would fail a lot earlier than this line.\n     */\n    return condition === \"OR\" ? false : true;\n};\n\ninterface Params {\n    items: CmsEntry[];\n    where: Partial<CmsEntryListWhere>;\n    plugins: PluginsContainer;\n    fields: Record<string, Field>;\n    fullTextSearch?: {\n        term?: string;\n        fields?: string[];\n    };\n}\n\nexport const filter = (params: Params): CmsEntry[] => {\n    const { items: records, where, plugins, fields, fullTextSearch } = params;\n\n    const keys = Object.keys(where);\n    if (keys.length === 0 && !fullTextSearch) {\n        return records;\n    }\n    const expression = createExpressions({\n        plugins,\n        where,\n        fields\n    });\n\n    /**\n     * No point in going further if there are no expressions to be applied and no full text search to be executed.\n     */\n    if (\n        expression.filters.length === 0 &&\n        expression.expressions.length === 0 &&\n        !fullTextSearch?.term\n    ) {\n        return records;\n    }\n    /**\n     * We need the contains plugin to run the full text search.\n     */\n    const fullTextSearchPlugin = plugins\n        .byType<ValueFilterPlugin>(ValueFilterPlugin.type)\n        .find(plugin => plugin.getOperation() === \"contains\");\n    if (!fullTextSearchPlugin) {\n        throw new WebinyError(\n            `Missing \"contains\" plugin to run the full-text search.`,\n            \"MISSING_PLUGIN\"\n        );\n    }\n\n    const search = createFullTextSearch({\n        term: fullTextSearch?.term,\n        targetFields: fullTextSearch?.fields,\n        fields,\n        plugin: fullTextSearchPlugin\n    });\n\n    return records.filter(record => {\n        const cachedValues: Record<string, any> = {};\n\n        const getCachedValue = (filter: Filter) => {\n            const { path } = filter;\n            if (cachedValues[path] !== undefined) {\n                return cachedValues[path];\n            }\n            const plainValue = getValue(record, path);\n\n            const rawValue = transformValue({\n                value: plainValue,\n                transform: filter.transformValue\n            });\n\n            cachedValues[path] = rawValue;\n            return rawValue;\n        };\n\n        const exprResult = executeExpressions({ ...expression, getCachedValue });\n        /**\n         * If expression result is false we do not need to continue further.\n         * Also, if there is no full text search defined, just return the expression result.\n         */\n        if (!exprResult || !search) {\n            return exprResult;\n        }\n\n        return search(record);\n    });\n};\n"],"mappings":"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"}

package/operations/entry/filtering/fullTextSearch.js

@@ -1,16 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFullTextSearch = void 0;
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _getValue = require("./getValue");
-
 /**
  * Unfortunately we must use the contains plugin directly as plugins do not support multi field searching.
  */
@@ -21,30 +17,24 @@ const createFullTextSearch = params => {
     fields: fieldDefinitions,
     plugin
   } = params;
-
   if (!term || term.trim().length === 0 || !targetFields || targetFields.length === 0) {
     return null;
   }
-
   return item => {
     for (const target of targetFields) {
       /**
        * As fields is a mapped Field objects where key is a path to the value, we can directly find the related field.
        */
       const field = fieldDefinitions[target];
-
       if (!field) {
         throw new _error.default(`Unknown field "${target}" in the model.`, "UNKNOWN_FIELD", {
           target
         });
       }
-
       const value = (0, _getValue.getValue)(item.values, target);
-
       if (!value) {
         continue;
       }
-
       if (plugin.matches({
         value,
         compareValue: term
@@ -52,9 +42,7 @@ const createFullTextSearch = params => {
         return true;
       }
     }
-
     return false;
   };
 };
-
 exports.createFullTextSearch = createFullTextSearch;

package/operations/entry/filtering/fullTextSearch.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFullTextSearch","params","term","targetFields","fields","fieldDefinitions","plugin","trim","length","item","target","field","WebinyError","value","getValue","values","matches","compareValue"],"sources":["fullTextSearch.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\nimport { Field } from \"./types\";\nimport { getValue } from \"./getValue\";\n\ninterface Params {\n    term?: string;\n    targetFields?: string[];\n    fields: Record<string, Field>;\n    plugin: ValueFilterPlugin;\n}\n\n/**\n * Unfortunately we must use the contains plugin directly as plugins do not support multi field searching.\n */\nexport const createFullTextSearch = (params: Params) => {\n    const { term, targetFields, fields: fieldDefinitions, plugin } = params;\n    if (!term || term.trim().length === 0 || !targetFields || targetFields.length === 0) {\n        return null;\n    }\n    return (item: CmsEntry) => {\n        for (const target of targetFields) {\n            /**\n             * As fields is a mapped Field objects where key is a path to the value, we can directly find the related field.\n             */\n            const field = fieldDefinitions[target];\n\n            if (!field) {\n                throw new WebinyError(`Unknown field \"${target}\" in the model.`, \"UNKNOWN_FIELD\", {\n                    target\n                });\n            }\n            const value = getValue(item.values, target);\n            if (!value) {\n                continue;\n            }\n            if (plugin.matches({ value, compareValue: term }) === true) {\n                return true;\n            }\n        }\n        return false;\n    };\n};\n"],"mappings":";;;;;;;;;AAAA;;AAIA;;AASA;AACA;AACA;AACO,MAAMA,oBAAoB,GAAIC,MAAD,IAAoB;EACpD,MAAM;IAAEC,IAAF;IAAQC,YAAR;IAAsBC,MAAM,EAAEC,gBAA9B;IAAgDC;EAAhD,IAA2DL,MAAjE;;EACA,IAAI,CAACC,IAAD,IAASA,IAAI,CAACK,IAAL,GAAYC,MAAZ,KAAuB,CAAhC,IAAqC,CAACL,YAAtC,IAAsDA,YAAY,CAACK,MAAb,KAAwB,CAAlF,EAAqF;IACjF,OAAO,IAAP;EACH;;EACD,OAAQC,IAAD,IAAoB;IACvB,KAAK,MAAMC,MAAX,IAAqBP,YAArB,EAAmC;MAC/B;AACZ;AACA;MACY,MAAMQ,KAAK,GAAGN,gBAAgB,CAACK,MAAD,CAA9B;;MAEA,IAAI,CAACC,KAAL,EAAY;QACR,MAAM,IAAIC,cAAJ,CAAiB,kBAAiBF,MAAO,iBAAzC,EAA2D,eAA3D,EAA4E;UAC9EA;QAD8E,CAA5E,CAAN;MAGH;;MACD,MAAMG,KAAK,GAAG,IAAAC,kBAAA,EAASL,IAAI,CAACM,MAAd,EAAsBL,MAAtB,CAAd;;MACA,IAAI,CAACG,KAAL,EAAY;QACR;MACH;;MACD,IAAIP,MAAM,CAACU,OAAP,CAAe;QAAEH,KAAF;QAASI,YAAY,EAAEf;MAAvB,CAAf,MAAkD,IAAtD,EAA4D;QACxD,OAAO,IAAP;MACH;IACJ;;IACD,OAAO,KAAP;EACH,CArBD;AAsBH,CA3BM"}
+{"version":3,"names":["createFullTextSearch","params","term","targetFields","fields","fieldDefinitions","plugin","trim","length","item","target","field","WebinyError","value","getValue","values","matches","compareValue"],"sources":["fullTextSearch.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport { CmsEntry } from \"@webiny/api-headless-cms/types\";\nimport { Field } from \"./types\";\nimport { getValue } from \"./getValue\";\n\ninterface Params {\n    term?: string;\n    targetFields?: string[];\n    fields: Record<string, Field>;\n    plugin: ValueFilterPlugin;\n}\n\n/**\n * Unfortunately we must use the contains plugin directly as plugins do not support multi field searching.\n */\nexport const createFullTextSearch = (params: Params) => {\n    const { term, targetFields, fields: fieldDefinitions, plugin } = params;\n    if (!term || term.trim().length === 0 || !targetFields || targetFields.length === 0) {\n        return null;\n    }\n    return (item: CmsEntry) => {\n        for (const target of targetFields) {\n            /**\n             * As fields is a mapped Field objects where key is a path to the value, we can directly find the related field.\n             */\n            const field = fieldDefinitions[target];\n\n            if (!field) {\n                throw new WebinyError(`Unknown field \"${target}\" in the model.`, \"UNKNOWN_FIELD\", {\n                    target\n                });\n            }\n            const value = getValue(item.values, target);\n            if (!value) {\n                continue;\n            }\n            if (plugin.matches({ value, compareValue: term }) === true) {\n                return true;\n            }\n        }\n        return false;\n    };\n};\n"],"mappings":";;;;;;;AAAA;AAIA;AASA;AACA;AACA;AACO,MAAMA,oBAAoB,GAAIC,MAAc,IAAK;EACpD,MAAM;IAAEC,IAAI;IAAEC,YAAY;IAAEC,MAAM,EAAEC,gBAAgB;IAAEC;EAAO,CAAC,GAAGL,MAAM;EACvE,IAAI,CAACC,IAAI,IAAIA,IAAI,CAACK,IAAI,EAAE,CAACC,MAAM,KAAK,CAAC,IAAI,CAACL,YAAY,IAAIA,YAAY,CAACK,MAAM,KAAK,CAAC,EAAE;IACjF,OAAO,IAAI;EACf;EACA,OAAQC,IAAc,IAAK;IACvB,KAAK,MAAMC,MAAM,IAAIP,YAAY,EAAE;MAC/B;AACZ;AACA;MACY,MAAMQ,KAAK,GAAGN,gBAAgB,CAACK,MAAM,CAAC;MAEtC,IAAI,CAACC,KAAK,EAAE;QACR,MAAM,IAAIC,cAAW,CAAE,kBAAiBF,MAAO,iBAAgB,EAAE,eAAe,EAAE;UAC9EA;QACJ,CAAC,CAAC;MACN;MACA,MAAMG,KAAK,GAAG,IAAAC,kBAAQ,EAACL,IAAI,CAACM,MAAM,EAAEL,MAAM,CAAC;MAC3C,IAAI,CAACG,KAAK,EAAE;QACR;MACJ;MACA,IAAIP,MAAM,CAACU,OAAO,CAAC;QAAEH,KAAK;QAAEI,YAAY,EAAEf;MAAK,CAAC,CAAC,KAAK,IAAI,EAAE;QACxD,OAAO,IAAI;MACf;IACJ;IACA,OAAO,KAAK;EAChB,CAAC;AACL,CAAC;AAAC"}

package/operations/entry/filtering/getValue.js

@@ -4,13 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getValue = void 0;
-
 const addArrayResult = (target, result) => {
   for (const r of result) {
     if (target.some(t => r === t)) {
       continue;
     }
-
     target.push(r);
   }
 };
@@ -18,64 +16,48 @@ const addArrayResult = (target, result) => {
  * A recursive function which goes through given input paths and returns the value in it.
  * In case a path is an array, it goes through the array of those values to get values further down the path line.
  */
-
-
 const find = (target, input) => {
   const paths = [...input];
   const path = paths.shift();
-
   if (!path) {
     return undefined;
   } else if (target[path] === undefined) {
     return undefined;
   }
-
   const value = target[path];
-
   if (paths.length === 0) {
     return value;
   } else if (Array.isArray(value)) {
     if (value.length === 0) {
       return undefined;
     }
-
     return value.reduce((collection, v) => {
       const result = find(v, paths);
-
       if (result === undefined) {
         return collection;
       } else if (Array.isArray(result)) {
         addArrayResult(collection, result);
         return collection;
       }
-
       collection.push(result);
       return collection;
     }, []);
   }
-
   return find(value, paths);
 };
 /**
  * A wrapper function for the find function.
  * Basically it transforms input paths to an array (and runs various checks).
  */
-
-
 const getValue = (target, input) => {
   const paths = Array.isArray(input) ? input : input.split(".");
-
   if (paths.length === 0) {
     throw new Error(`Path is empty!`);
   }
-
   const filtered = paths.filter(Boolean);
-
   if (paths.length !== filtered.length) {
     throw new Error(`Input path is different than the filtered empty path string. (${paths.join(".")} to ${filtered.join(".")})`);
   }
-
   return find(target, paths);
 };
-
 exports.getValue = getValue;

package/operations/entry/filtering/getValue.js.map

@@ -1 +1 @@
-{"version":3,"names":["addArrayResult","target","result","r","some","t","push","find","input","paths","path","shift","undefined","value","length","Array","isArray","reduce","collection","v","getValue","split","Error","filtered","filter","Boolean","join"],"sources":["getValue.ts"],"sourcesContent":["const addArrayResult = (target: any[], result: any[]): void => {\n    for (const r of result) {\n        if (target.some(t => r === t)) {\n            continue;\n        }\n        target.push(r);\n    }\n};\n/**\n * A recursive function which goes through given input paths and returns the value in it.\n * In case a path is an array, it goes through the array of those values to get values further down the path line.\n */\nconst find = (target: Record<string, any>, input: string[]): any[] | undefined => {\n    const paths = [...input];\n    const path = paths.shift();\n\n    if (!path) {\n        return undefined;\n    } else if (target[path] === undefined) {\n        return undefined;\n    }\n    const value = target[path];\n    if (paths.length === 0) {\n        return value;\n    } else if (Array.isArray(value)) {\n        if (value.length === 0) {\n            return undefined;\n        }\n        return value.reduce<any[]>((collection, v) => {\n            const result = find(v, paths);\n            if (result === undefined) {\n                return collection;\n            } else if (Array.isArray(result)) {\n                addArrayResult(collection, result);\n                return collection;\n            }\n            collection.push(result);\n            return collection;\n        }, []);\n    }\n    return find(value, paths);\n};\n/**\n * A wrapper function for the find function.\n * Basically it transforms input paths to an array (and runs various checks).\n */\nexport const getValue = (target: Record<string, any>, input: string | string[]): any => {\n    const paths = Array.isArray(input) ? input : input.split(\".\");\n    if (paths.length === 0) {\n        throw new Error(`Path is empty!`);\n    }\n    const filtered = paths.filter(Boolean);\n    if (paths.length !== filtered.length) {\n        throw new Error(\n            `Input path is different than the filtered empty path string. (${paths.join(\n                \".\"\n            )} to ${filtered.join(\".\")})`\n        );\n    }\n\n    return find(target, paths);\n};\n"],"mappings":";;;;;;;AAAA,MAAMA,cAAc,GAAG,CAACC,MAAD,EAAgBC,MAAhB,KAAwC;EAC3D,KAAK,MAAMC,CAAX,IAAgBD,MAAhB,EAAwB;IACpB,IAAID,MAAM,CAACG,IAAP,CAAYC,CAAC,IAAIF,CAAC,KAAKE,CAAvB,CAAJ,EAA+B;MAC3B;IACH;;IACDJ,MAAM,CAACK,IAAP,CAAYH,CAAZ;EACH;AACJ,CAPD;AAQA;AACA;AACA;AACA;;;AACA,MAAMI,IAAI,GAAG,CAACN,MAAD,EAA8BO,KAA9B,KAAqE;EAC9E,MAAMC,KAAK,GAAG,CAAC,GAAGD,KAAJ,CAAd;EACA,MAAME,IAAI,GAAGD,KAAK,CAACE,KAAN,EAAb;;EAEA,IAAI,CAACD,IAAL,EAAW;IACP,OAAOE,SAAP;EACH,CAFD,MAEO,IAAIX,MAAM,CAACS,IAAD,CAAN,KAAiBE,SAArB,EAAgC;IACnC,OAAOA,SAAP;EACH;;EACD,MAAMC,KAAK,GAAGZ,MAAM,CAACS,IAAD,CAApB;;EACA,IAAID,KAAK,CAACK,MAAN,KAAiB,CAArB,EAAwB;IACpB,OAAOD,KAAP;EACH,CAFD,MAEO,IAAIE,KAAK,CAACC,OAAN,CAAcH,KAAd,CAAJ,EAA0B;IAC7B,IAAIA,KAAK,CAACC,MAAN,KAAiB,CAArB,EAAwB;MACpB,OAAOF,SAAP;IACH;;IACD,OAAOC,KAAK,CAACI,MAAN,CAAoB,CAACC,UAAD,EAAaC,CAAb,KAAmB;MAC1C,MAAMjB,MAAM,GAAGK,IAAI,CAACY,CAAD,EAAIV,KAAJ,CAAnB;;MACA,IAAIP,MAAM,KAAKU,SAAf,EAA0B;QACtB,OAAOM,UAAP;MACH,CAFD,MAEO,IAAIH,KAAK,CAACC,OAAN,CAAcd,MAAd,CAAJ,EAA2B;QAC9BF,cAAc,CAACkB,UAAD,EAAahB,MAAb,CAAd;QACA,OAAOgB,UAAP;MACH;;MACDA,UAAU,CAACZ,IAAX,CAAgBJ,MAAhB;MACA,OAAOgB,UAAP;IACH,CAVM,EAUJ,EAVI,CAAP;EAWH;;EACD,OAAOX,IAAI,CAACM,KAAD,EAAQJ,KAAR,CAAX;AACH,CA7BD;AA8BA;AACA;AACA;AACA;;;AACO,MAAMW,QAAQ,GAAG,CAACnB,MAAD,EAA8BO,KAA9B,KAAgE;EACpF,MAAMC,KAAK,GAAGM,KAAK,CAACC,OAAN,CAAcR,KAAd,IAAuBA,KAAvB,GAA+BA,KAAK,CAACa,KAAN,CAAY,GAAZ,CAA7C;;EACA,IAAIZ,KAAK,CAACK,MAAN,KAAiB,CAArB,EAAwB;IACpB,MAAM,IAAIQ,KAAJ,CAAW,gBAAX,CAAN;EACH;;EACD,MAAMC,QAAQ,GAAGd,KAAK,CAACe,MAAN,CAAaC,OAAb,CAAjB;;EACA,IAAIhB,KAAK,CAACK,MAAN,KAAiBS,QAAQ,CAACT,MAA9B,EAAsC;IAClC,MAAM,IAAIQ,KAAJ,CACD,iEAAgEb,KAAK,CAACiB,IAAN,CAC7D,GAD6D,CAE/D,OAAMH,QAAQ,CAACG,IAAT,CAAc,GAAd,CAAmB,GAHzB,CAAN;EAKH;;EAED,OAAOnB,IAAI,CAACN,MAAD,EAASQ,KAAT,CAAX;AACH,CAfM"}
+{"version":3,"names":["addArrayResult","target","result","r","some","t","push","find","input","paths","path","shift","undefined","value","length","Array","isArray","reduce","collection","v","getValue","split","Error","filtered","filter","Boolean","join"],"sources":["getValue.ts"],"sourcesContent":["const addArrayResult = (target: any[], result: any[]): void => {\n    for (const r of result) {\n        if (target.some(t => r === t)) {\n            continue;\n        }\n        target.push(r);\n    }\n};\n/**\n * A recursive function which goes through given input paths and returns the value in it.\n * In case a path is an array, it goes through the array of those values to get values further down the path line.\n */\nconst find = (target: Record<string, any>, input: string[]): any[] | undefined => {\n    const paths = [...input];\n    const path = paths.shift();\n\n    if (!path) {\n        return undefined;\n    } else if (target[path] === undefined) {\n        return undefined;\n    }\n    const value = target[path];\n    if (paths.length === 0) {\n        return value;\n    } else if (Array.isArray(value)) {\n        if (value.length === 0) {\n            return undefined;\n        }\n        return value.reduce<any[]>((collection, v) => {\n            const result = find(v, paths);\n            if (result === undefined) {\n                return collection;\n            } else if (Array.isArray(result)) {\n                addArrayResult(collection, result);\n                return collection;\n            }\n            collection.push(result);\n            return collection;\n        }, []);\n    }\n    return find(value, paths);\n};\n/**\n * A wrapper function for the find function.\n * Basically it transforms input paths to an array (and runs various checks).\n */\nexport const getValue = (target: Record<string, any>, input: string | string[]): any => {\n    const paths = Array.isArray(input) ? input : input.split(\".\");\n    if (paths.length === 0) {\n        throw new Error(`Path is empty!`);\n    }\n    const filtered = paths.filter(Boolean);\n    if (paths.length !== filtered.length) {\n        throw new Error(\n            `Input path is different than the filtered empty path string. (${paths.join(\n                \".\"\n            )} to ${filtered.join(\".\")})`\n        );\n    }\n\n    return find(target, paths);\n};\n"],"mappings":";;;;;;AAAA,MAAMA,cAAc,GAAG,CAACC,MAAa,EAAEC,MAAa,KAAW;EAC3D,KAAK,MAAMC,CAAC,IAAID,MAAM,EAAE;IACpB,IAAID,MAAM,CAACG,IAAI,CAACC,CAAC,IAAIF,CAAC,KAAKE,CAAC,CAAC,EAAE;MAC3B;IACJ;IACAJ,MAAM,CAACK,IAAI,CAACH,CAAC,CAAC;EAClB;AACJ,CAAC;AACD;AACA;AACA;AACA;AACA,MAAMI,IAAI,GAAG,CAACN,MAA2B,EAAEO,KAAe,KAAwB;EAC9E,MAAMC,KAAK,GAAG,CAAC,GAAGD,KAAK,CAAC;EACxB,MAAME,IAAI,GAAGD,KAAK,CAACE,KAAK,EAAE;EAE1B,IAAI,CAACD,IAAI,EAAE;IACP,OAAOE,SAAS;EACpB,CAAC,MAAM,IAAIX,MAAM,CAACS,IAAI,CAAC,KAAKE,SAAS,EAAE;IACnC,OAAOA,SAAS;EACpB;EACA,MAAMC,KAAK,GAAGZ,MAAM,CAACS,IAAI,CAAC;EAC1B,IAAID,KAAK,CAACK,MAAM,KAAK,CAAC,EAAE;IACpB,OAAOD,KAAK;EAChB,CAAC,MAAM,IAAIE,KAAK,CAACC,OAAO,CAACH,KAAK,CAAC,EAAE;IAC7B,IAAIA,KAAK,CAACC,MAAM,KAAK,CAAC,EAAE;MACpB,OAAOF,SAAS;IACpB;IACA,OAAOC,KAAK,CAACI,MAAM,CAAQ,CAACC,UAAU,EAAEC,CAAC,KAAK;MAC1C,MAAMjB,MAAM,GAAGK,IAAI,CAACY,CAAC,EAAEV,KAAK,CAAC;MAC7B,IAAIP,MAAM,KAAKU,SAAS,EAAE;QACtB,OAAOM,UAAU;MACrB,CAAC,MAAM,IAAIH,KAAK,CAACC,OAAO,CAACd,MAAM,CAAC,EAAE;QAC9BF,cAAc,CAACkB,UAAU,EAAEhB,MAAM,CAAC;QAClC,OAAOgB,UAAU;MACrB;MACAA,UAAU,CAACZ,IAAI,CAACJ,MAAM,CAAC;MACvB,OAAOgB,UAAU;IACrB,CAAC,EAAE,EAAE,CAAC;EACV;EACA,OAAOX,IAAI,CAACM,KAAK,EAAEJ,KAAK,CAAC;AAC7B,CAAC;AACD;AACA;AACA;AACA;AACO,MAAMW,QAAQ,GAAG,CAACnB,MAA2B,EAAEO,KAAwB,KAAU;EACpF,MAAMC,KAAK,GAAGM,KAAK,CAACC,OAAO,CAACR,KAAK,CAAC,GAAGA,KAAK,GAAGA,KAAK,CAACa,KAAK,CAAC,GAAG,CAAC;EAC7D,IAAIZ,KAAK,CAACK,MAAM,KAAK,CAAC,EAAE;IACpB,MAAM,IAAIQ,KAAK,CAAE,gBAAe,CAAC;EACrC;EACA,MAAMC,QAAQ,GAAGd,KAAK,CAACe,MAAM,CAACC,OAAO,CAAC;EACtC,IAAIhB,KAAK,CAACK,MAAM,KAAKS,QAAQ,CAACT,MAAM,EAAE;IAClC,MAAM,IAAIQ,KAAK,CACV,iEAAgEb,KAAK,CAACiB,IAAI,CACvE,GAAG,CACL,OAAMH,QAAQ,CAACG,IAAI,CAAC,GAAG,CAAE,GAAE,CAChC;EACL;EAEA,OAAOnB,IAAI,CAACN,MAAM,EAAEQ,KAAK,CAAC;AAC9B,CAAC;AAAC"}

package/operations/entry/filtering/index.js

@@ -15,7 +15,5 @@ Object.defineProperty(exports, "sort", {
     return _sort.sort;
   }
 });
-
 var _filter = require("./filter");
-
 var _sort = require("./sort");

package/operations/entry/filtering/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export { filter } from \"./filter\";\nexport { sort } from \"./sort\";\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;;AACA"}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export { filter } from \"./filter\";\nexport { sort } from \"./sort\";\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AACA"}

package/operations/entry/filtering/mapPlugins.js

@@ -1,14 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getMappedPlugins = void 0;
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 const getMappedPlugins = params => {
   const {
     plugins: pluginsContainer,
@@ -16,24 +13,19 @@ const getMappedPlugins = params => {
     property
   } = params;
   const plugins = pluginsContainer.byType(type);
-
   if (plugins.length === 0) {
     return {};
   }
-
   return plugins.reduce((collection, plugin) => {
     const key = plugin[property];
-
     if (typeof key !== "string") {
       throw new _error.default("Property to map the plugins on must be a string.", "PLUGIN_PROPERTY_ERROR", {
         type,
         property
       });
     }
-
     collection[key] = plugin;
     return collection;
   }, {});
 };
-
 exports.getMappedPlugins = getMappedPlugins;

package/operations/entry/filtering/mapPlugins.js.map

@@ -1 +1 @@
-{"version":3,"names":["getMappedPlugins","params","plugins","pluginsContainer","type","property","byType","length","reduce","collection","plugin","key","WebinyError"],"sources":["mapPlugins.ts"],"sourcesContent":["import { Plugin, PluginsContainer } from \"@webiny/plugins/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    type: string;\n    property: string;\n}\nexport const getMappedPlugins = <T extends Plugin>(params: Params) => {\n    const { plugins: pluginsContainer, type, property } = params;\n    const plugins = pluginsContainer.byType<T>(type);\n    if (plugins.length === 0) {\n        return {};\n    }\n    return plugins.reduce<Record<string, T>>((collection, plugin) => {\n        const key: keyof typeof plugin = plugin[property];\n        if (typeof key !== \"string\") {\n            throw new WebinyError(\n                \"Property to map the plugins on must be a string.\",\n                \"PLUGIN_PROPERTY_ERROR\",\n                {\n                    type,\n                    property\n                }\n            );\n        }\n        collection[key] = plugin;\n        return collection;\n    }, {});\n};\n"],"mappings":";;;;;;;;;AACA;;AAOO,MAAMA,gBAAgB,GAAsBC,MAAnB,IAAsC;EAClE,MAAM;IAAEC,OAAO,EAAEC,gBAAX;IAA6BC,IAA7B;IAAmCC;EAAnC,IAAgDJ,MAAtD;EACA,MAAMC,OAAO,GAAGC,gBAAgB,CAACG,MAAjB,CAA2BF,IAA3B,CAAhB;;EACA,IAAIF,OAAO,CAACK,MAAR,KAAmB,CAAvB,EAA0B;IACtB,OAAO,EAAP;EACH;;EACD,OAAOL,OAAO,CAACM,MAAR,CAAkC,CAACC,UAAD,EAAaC,MAAb,KAAwB;IAC7D,MAAMC,GAAwB,GAAGD,MAAM,CAACL,QAAD,CAAvC;;IACA,IAAI,OAAOM,GAAP,KAAe,QAAnB,EAA6B;MACzB,MAAM,IAAIC,cAAJ,CACF,kDADE,EAEF,uBAFE,EAGF;QACIR,IADJ;QAEIC;MAFJ,CAHE,CAAN;IAQH;;IACDI,UAAU,CAACE,GAAD,CAAV,GAAkBD,MAAlB;IACA,OAAOD,UAAP;EACH,CAdM,EAcJ,EAdI,CAAP;AAeH,CArBM"}
+{"version":3,"names":["getMappedPlugins","params","plugins","pluginsContainer","type","property","byType","length","reduce","collection","plugin","key","WebinyError"],"sources":["mapPlugins.ts"],"sourcesContent":["import { Plugin, PluginsContainer } from \"@webiny/plugins/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    type: string;\n    property: string;\n}\nexport const getMappedPlugins = <T extends Plugin>(params: Params) => {\n    const { plugins: pluginsContainer, type, property } = params;\n    const plugins = pluginsContainer.byType<T>(type);\n    if (plugins.length === 0) {\n        return {};\n    }\n    return plugins.reduce<Record<string, T>>((collection, plugin) => {\n        const key: keyof typeof plugin = plugin[property];\n        if (typeof key !== \"string\") {\n            throw new WebinyError(\n                \"Property to map the plugins on must be a string.\",\n                \"PLUGIN_PROPERTY_ERROR\",\n                {\n                    type,\n                    property\n                }\n            );\n        }\n        collection[key] = plugin;\n        return collection;\n    }, {});\n};\n"],"mappings":";;;;;;;AACA;AAOO,MAAMA,gBAAgB,GAAsBC,MAAc,IAAK;EAClE,MAAM;IAAEC,OAAO,EAAEC,gBAAgB;IAAEC,IAAI;IAAEC;EAAS,CAAC,GAAGJ,MAAM;EAC5D,MAAMC,OAAO,GAAGC,gBAAgB,CAACG,MAAM,CAAIF,IAAI,CAAC;EAChD,IAAIF,OAAO,CAACK,MAAM,KAAK,CAAC,EAAE;IACtB,OAAO,CAAC,CAAC;EACb;EACA,OAAOL,OAAO,CAACM,MAAM,CAAoB,CAACC,UAAU,EAAEC,MAAM,KAAK;IAC7D,MAAMC,GAAwB,GAAGD,MAAM,CAACL,QAAQ,CAAC;IACjD,IAAI,OAAOM,GAAG,KAAK,QAAQ,EAAE;MACzB,MAAM,IAAIC,cAAW,CACjB,kDAAkD,EAClD,uBAAuB,EACvB;QACIR,IAAI;QACJC;MACJ,CAAC,CACJ;IACL;IACAI,UAAU,CAACE,GAAG,CAAC,GAAGD,MAAM;IACxB,OAAOD,UAAU;EACrB,CAAC,EAAE,CAAC,CAAC,CAAC;AACV,CAAC;AAAC"}

package/operations/entry/filtering/plugins/defaultFilterCreate.js

@@ -1,16 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDefaultFilterCreate = void 0;
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _CmsEntryFieldFilterPlugin = require("../../../../plugins/CmsEntryFieldFilterPlugin");
-
 const createDefaultFilterCreate = () => {
   return new _CmsEntryFieldFilterPlugin.CmsEntryFieldFilterPlugin({
     fieldType: _CmsEntryFieldFilterPlugin.CmsEntryFieldFilterPlugin.ALL,
@@ -23,13 +19,11 @@ const createDefaultFilterCreate = () => {
         valueFilterPlugins
       } = params;
       const plugin = valueFilterPlugins[params.operation];
-
       if (!plugin) {
         throw new _error.default(`Missing ValueFilterPlugin for operation "${params.operation}".`, "MISSING_OPERATION_PLUGIN", {
           operation: params.operation
         });
       }
-
       return {
         negate,
         transformValue,
@@ -44,5 +38,4 @@ const createDefaultFilterCreate = () => {
     }
   });
 };
-
 exports.createDefaultFilterCreate = createDefaultFilterCreate;

package/operations/entry/filtering/plugins/defaultFilterCreate.js.map

@@ -1 +1 @@
-{"version":3,"names":["createDefaultFilterCreate","CmsEntryFieldFilterPlugin","fieldType","ALL","create","params","negate","transformValue","field","compareValue","valueFilterPlugins","plugin","operation","WebinyError","fieldPathId","parents","map","f","fieldId","join","path","createPath"],"sources":["defaultFilterCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin\";\n\nexport const createDefaultFilterCreate = () => {\n    return new CmsEntryFieldFilterPlugin({\n        fieldType: CmsEntryFieldFilterPlugin.ALL,\n        create: params => {\n            const { negate, transformValue, field, compareValue, valueFilterPlugins } = params;\n            const plugin = valueFilterPlugins[params.operation];\n            if (!plugin) {\n                throw new WebinyError(\n                    `Missing ValueFilterPlugin for operation \"${params.operation}\".`,\n                    \"MISSING_OPERATION_PLUGIN\",\n                    {\n                        operation: params.operation\n                    }\n                );\n            }\n            return {\n                negate,\n                transformValue,\n                field,\n                compareValue,\n                fieldPathId: [...field.parents.map(f => f.fieldId), field.fieldId].join(\".\"),\n                path: field.createPath({\n                    field\n                }),\n                plugin\n            };\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEO,MAAMA,yBAAyB,GAAG,MAAM;EAC3C,OAAO,IAAIC,oDAAJ,CAA8B;IACjCC,SAAS,EAAED,oDAAA,CAA0BE,GADJ;IAEjCC,MAAM,EAAEC,MAAM,IAAI;MACd,MAAM;QAAEC,MAAF;QAAUC,cAAV;QAA0BC,KAA1B;QAAiCC,YAAjC;QAA+CC;MAA/C,IAAsEL,MAA5E;MACA,MAAMM,MAAM,GAAGD,kBAAkB,CAACL,MAAM,CAACO,SAAR,CAAjC;;MACA,IAAI,CAACD,MAAL,EAAa;QACT,MAAM,IAAIE,cAAJ,CACD,4CAA2CR,MAAM,CAACO,SAAU,IAD3D,EAEF,0BAFE,EAGF;UACIA,SAAS,EAAEP,MAAM,CAACO;QADtB,CAHE,CAAN;MAOH;;MACD,OAAO;QACHN,MADG;QAEHC,cAFG;QAGHC,KAHG;QAIHC,YAJG;QAKHK,WAAW,EAAE,CAAC,GAAGN,KAAK,CAACO,OAAN,CAAcC,GAAd,CAAkBC,CAAC,IAAIA,CAAC,CAACC,OAAzB,CAAJ,EAAuCV,KAAK,CAACU,OAA7C,EAAsDC,IAAtD,CAA2D,GAA3D,CALV;QAMHC,IAAI,EAAEZ,KAAK,CAACa,UAAN,CAAiB;UACnBb;QADmB,CAAjB,CANH;QASHG;MATG,CAAP;IAWH;EAzBgC,CAA9B,CAAP;AA2BH,CA5BM"}
+{"version":3,"names":["createDefaultFilterCreate","CmsEntryFieldFilterPlugin","fieldType","ALL","create","params","negate","transformValue","field","compareValue","valueFilterPlugins","plugin","operation","WebinyError","fieldPathId","parents","map","f","fieldId","join","path","createPath"],"sources":["defaultFilterCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin\";\n\nexport const createDefaultFilterCreate = () => {\n    return new CmsEntryFieldFilterPlugin({\n        fieldType: CmsEntryFieldFilterPlugin.ALL,\n        create: params => {\n            const { negate, transformValue, field, compareValue, valueFilterPlugins } = params;\n            const plugin = valueFilterPlugins[params.operation];\n            if (!plugin) {\n                throw new WebinyError(\n                    `Missing ValueFilterPlugin for operation \"${params.operation}\".`,\n                    \"MISSING_OPERATION_PLUGIN\",\n                    {\n                        operation: params.operation\n                    }\n                );\n            }\n            return {\n                negate,\n                transformValue,\n                field,\n                compareValue,\n                fieldPathId: [...field.parents.map(f => f.fieldId), field.fieldId].join(\".\"),\n                path: field.createPath({\n                    field\n                }),\n                plugin\n            };\n        }\n    });\n};\n"],"mappings":";;;;;;;AAAA;AACA;AAEO,MAAMA,yBAAyB,GAAG,MAAM;EAC3C,OAAO,IAAIC,oDAAyB,CAAC;IACjCC,SAAS,EAAED,oDAAyB,CAACE,GAAG;IACxCC,MAAM,EAAEC,MAAM,IAAI;MACd,MAAM;QAAEC,MAAM;QAAEC,cAAc;QAAEC,KAAK;QAAEC,YAAY;QAAEC;MAAmB,CAAC,GAAGL,MAAM;MAClF,MAAMM,MAAM,GAAGD,kBAAkB,CAACL,MAAM,CAACO,SAAS,CAAC;MACnD,IAAI,CAACD,MAAM,EAAE;QACT,MAAM,IAAIE,cAAW,CAChB,4CAA2CR,MAAM,CAACO,SAAU,IAAG,EAChE,0BAA0B,EAC1B;UACIA,SAAS,EAAEP,MAAM,CAACO;QACtB,CAAC,CACJ;MACL;MACA,OAAO;QACHN,MAAM;QACNC,cAAc;QACdC,KAAK;QACLC,YAAY;QACZK,WAAW,EAAE,CAAC,GAAGN,KAAK,CAACO,OAAO,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,OAAO,CAAC,EAAEV,KAAK,CAACU,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;QAC5EC,IAAI,EAAEZ,KAAK,CAACa,UAAU,CAAC;UACnBb;QACJ,CAAC,CAAC;QACFG;MACJ,CAAC;IACL;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/operations/entry/filtering/plugins/index.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFilterCreatePlugins = void 0;
-
 var _defaultFilterCreate = require("./defaultFilterCreate");
-
 var _refFilterCreate = require("./refFilterCreate");
-
 var _objectFilterCreate = require("./objectFilterCreate");
-
 const createFilterCreatePlugins = () => {
   return [(0, _defaultFilterCreate.createDefaultFilterCreate)(), (0, _refFilterCreate.createRefFilterCreate)(), (0, _objectFilterCreate.objectFilterCreate)()];
 };
-
 exports.createFilterCreatePlugins = createFilterCreatePlugins;

package/operations/entry/filtering/plugins/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFilterCreatePlugins","createDefaultFilterCreate","createRefFilterCreate","objectFilterCreate"],"sources":["index.ts"],"sourcesContent":["import { createDefaultFilterCreate } from \"./defaultFilterCreate\";\nimport { createRefFilterCreate } from \"./refFilterCreate\";\nimport { objectFilterCreate } from \"./objectFilterCreate\";\n\nexport const createFilterCreatePlugins = () => {\n    return [createDefaultFilterCreate(), createRefFilterCreate(), objectFilterCreate()];\n};\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AAEO,MAAMA,yBAAyB,GAAG,MAAM;EAC3C,OAAO,CAAC,IAAAC,8CAAA,GAAD,EAA8B,IAAAC,sCAAA,GAA9B,EAAuD,IAAAC,sCAAA,GAAvD,CAAP;AACH,CAFM"}
+{"version":3,"names":["createFilterCreatePlugins","createDefaultFilterCreate","createRefFilterCreate","objectFilterCreate"],"sources":["index.ts"],"sourcesContent":["import { createDefaultFilterCreate } from \"./defaultFilterCreate\";\nimport { createRefFilterCreate } from \"./refFilterCreate\";\nimport { objectFilterCreate } from \"./objectFilterCreate\";\n\nexport const createFilterCreatePlugins = () => {\n    return [createDefaultFilterCreate(), createRefFilterCreate(), objectFilterCreate()];\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AAEO,MAAMA,yBAAyB,GAAG,MAAM;EAC3C,OAAO,CAAC,IAAAC,8CAAyB,GAAE,EAAE,IAAAC,sCAAqB,GAAE,EAAE,IAAAC,sCAAkB,GAAE,CAAC;AACvF,CAAC;AAAC"}

package/operations/entry/filtering/plugins/objectFilterCreate.js

@@ -1,20 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.objectFilterCreate = void 0;
-
 var _CmsEntryFieldFilterPlugin = require("../../../../plugins/CmsEntryFieldFilterPlugin");
-
 var _where = require("../where");
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _transform = require("../transform");
-
 const objectFilterCreate = () => {
   return new _CmsEntryFieldFilterPlugin.CmsEntryFieldFilterPlugin({
     fieldType: "object",
@@ -28,20 +22,15 @@ const objectFilterCreate = () => {
         fields
       } = params;
       const filters = [];
-
       for (const key in objectValue) {
         const value = objectValue[key];
-
         if (value === undefined) {
           continue;
         }
-
         const whereParams = (0, _where.extractWhereParams)(key);
-
         if (!whereParams) {
           continue;
         }
-
         const {
           negate,
           fieldId,
@@ -49,27 +38,22 @@ const objectFilterCreate = () => {
         } = whereParams;
         const fieldPath = parentField.parents.map(p => p.fieldId).concat([parentField.fieldId, fieldId]).join(".");
         const field = fields[fieldPath];
-
         if (!field) {
           throw new _error.default(`There is no field with the field path "${fieldPath}".`, "FIELD_ERROR", {
             fieldId
           });
         }
-
         const filterCreatePlugin = getFilterCreatePlugin(field.type);
         const transformValuePlugin = transformValuePlugins[field.type];
-
         const transformValueCallable = value => {
           if (!transformValuePlugin) {
             return value;
           }
-
           return transformValuePlugin.transform({
             field,
             value
           });
         };
-
         const result = filterCreatePlugin.create({
           key,
           value,
@@ -86,22 +70,17 @@ const objectFilterCreate = () => {
           }),
           transformValue: transformValueCallable
         });
-
         if (!result) {
           continue;
         }
-
         if (Array.isArray(result)) {
           filters.push(...result);
           continue;
         }
-
         filters.push(result);
       }
-
       return filters;
     }
   });
 };
-
 exports.objectFilterCreate = objectFilterCreate;