@webiny/api-headless-cms-ddb 0.0.0-unstable.bca7b3e350 → 0.0.0-unstable.c27f4d8a31

package/operations/entry/filtering/extractSort.js

@@ -1,43 +1,52 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.extractSort = void 0;
-
-var _error = _interopRequireDefault(require("@webiny/error"));
-
-var _plugins = require("../../../plugins");
-
-const extractSort = params => {
+import WebinyError from "@webiny/error";
+import { CmsEntryFieldSortingPlugin } from "../../../plugins/index.js";
+const extractSortInfo = sortBy => {
+  const rootSorting = sortBy.match(/^([a-zA-Z]+)_(ASC|DESC)$/);
+  if (rootSorting) {
+    return {
+      fieldId: rootSorting[1],
+      isValues: false,
+      order: rootSorting[2]
+    };
+  }
+  const valuesSorting = sortBy.match(/^values_([a-zA-Z0-9]+)_(ASC|DESC)$/);
+  if (valuesSorting) {
+    return {
+      fieldId: valuesSorting[1],
+      isValues: true,
+      order: valuesSorting[2]
+    };
+  }
+  throw new WebinyError("Problem in determining the sorting for the entry items.", "SORT_EXTRACT_ERROR", {
+    sortBy
+  });
+};
+export const extractSort = params => {
   const {
     model,
     sortBy,
     fields,
     plugins
   } = params;
-  const result = sortBy.split("_");
-
-  if (result.length !== 2) {
-    throw new _error.default("Problem in determining the sorting for the entry items.", "SORT_EXTRACT_ERROR", {
-      sortBy
-    });
-  }
-
-  const [fieldId, order] = result;
-  const field = Object.values(fields).find(field => {
+  const {
+    fieldId,
+    isValues: isValuesSorting,
+    order
+  } = extractSortInfo(sortBy);
+  const field = Object.values(fields).find(f => {
     /**
      * We do not support sorting by nested fields.
      */
-    if (field.parents.length > 0) {
+    const isValues = f.parents[0]?.fieldId === "values";
+    if (isValues && isValuesSorting) {
+      return f.fieldId === fieldId;
+    }
+    if (f.parents.length > 0) {
       return false;
     }
-
-    return field.fieldId === fieldId;
+    return f.fieldId === fieldId;
   });
-  const plugin = plugins.byType(_plugins.CmsEntryFieldSortingPlugin.type).reverse().find(plugin => {
+  const plugin = plugins.byType(CmsEntryFieldSortingPlugin.type).reverse().find(plugin => {
     return plugin.canUse({
       model,
       field,
@@ -46,7 +55,6 @@ const extractSort = params => {
       sortBy
     });
   });
-
   if (plugin) {
     return plugin.createSort({
       model,
@@ -57,12 +65,11 @@ const extractSort = params => {
       fields
     });
   } else if (!field) {
-    throw new _error.default("Sorting field does not exist in the content model.", "SORTING_FIELD_ERROR", {
+    throw new WebinyError("Sorting field does not exist in the content model.", "SORTING_FIELD_ERROR", {
       fieldId,
       fields
     });
   }
-
   const valuePath = field.createPath({
     field
   });
@@ -74,4 +81,4 @@ const extractSort = params => {
   };
 };
 
-exports.extractSort = extractSort;
+//# sourceMappingURL=extractSort.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["extractSort","params","model","sortBy","fields","plugins","result","split","length","WebinyError","fieldId","order","field","Object","values","find","parents","plugin","byType","CmsEntryFieldSortingPlugin","type","reverse","canUse","createSort","valuePath","createPath"],"sources":["extractSort.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { Field } from \"./types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryFieldSortingPlugin } from \"~/plugins\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ninterface Result {\n    valuePath: string;\n    reverse: boolean;\n    fieldId: string;\n    field: Field;\n}\n\ninterface Params {\n    model: CmsModel;\n    sortBy: string;\n    fields: Record<string, Field>;\n    plugins: PluginsContainer;\n}\n\nexport const extractSort = (params: Params): Result => {\n    const { model, sortBy, fields, plugins } = params;\n    const result = sortBy.split(\"_\");\n    if (result.length !== 2) {\n        throw new WebinyError(\n            \"Problem in determining the sorting for the entry items.\",\n            \"SORT_EXTRACT_ERROR\",\n            {\n                sortBy\n            }\n        );\n    }\n    const [fieldId, order] = result as [string, \"ASC\" | \"DESC\"];\n\n    const field = Object.values(fields).find(field => {\n        /**\n         * We do not support sorting by nested fields.\n         */\n        if (field.parents.length > 0) {\n            return false;\n        }\n        return field.fieldId === fieldId;\n    });\n\n    const plugin = plugins\n        .byType<CmsEntryFieldSortingPlugin>(CmsEntryFieldSortingPlugin.type)\n        .reverse()\n        .find(plugin => {\n            return plugin.canUse({\n                model,\n                field,\n                fieldId,\n                order,\n                sortBy\n            });\n        });\n\n    if (plugin) {\n        return plugin.createSort({\n            model,\n            fieldId,\n            order,\n            sortBy,\n            field,\n            fields\n        });\n    } else if (!field) {\n        throw new WebinyError(\n            \"Sorting field does not exist in the content model.\",\n            \"SORTING_FIELD_ERROR\",\n            {\n                fieldId,\n                fields\n            }\n        );\n    }\n    const valuePath = field.createPath({\n        field\n    });\n    return {\n        field,\n        fieldId,\n        valuePath,\n        reverse: order === \"DESC\"\n    };\n};\n"],"mappings":";;;;;;;;;AAAA;;AAGA;;AAiBO,MAAMA,WAAW,GAAIC,MAAD,IAA4B;EACnD,MAAM;IAAEC,KAAF;IAASC,MAAT;IAAiBC,MAAjB;IAAyBC;EAAzB,IAAqCJ,MAA3C;EACA,MAAMK,MAAM,GAAGH,MAAM,CAACI,KAAP,CAAa,GAAb,CAAf;;EACA,IAAID,MAAM,CAACE,MAAP,KAAkB,CAAtB,EAAyB;IACrB,MAAM,IAAIC,cAAJ,CACF,yDADE,EAEF,oBAFE,EAGF;MACIN;IADJ,CAHE,CAAN;EAOH;;EACD,MAAM,CAACO,OAAD,EAAUC,KAAV,IAAmBL,MAAzB;EAEA,MAAMM,KAAK,GAAGC,MAAM,CAACC,MAAP,CAAcV,MAAd,EAAsBW,IAAtB,CAA2BH,KAAK,IAAI;IAC9C;AACR;AACA;IACQ,IAAIA,KAAK,CAACI,OAAN,CAAcR,MAAd,GAAuB,CAA3B,EAA8B;MAC1B,OAAO,KAAP;IACH;;IACD,OAAOI,KAAK,CAACF,OAAN,KAAkBA,OAAzB;EACH,CARa,CAAd;EAUA,MAAMO,MAAM,GAAGZ,OAAO,CACjBa,MADU,CACyBC,mCAAA,CAA2BC,IADpD,EAEVC,OAFU,GAGVN,IAHU,CAGLE,MAAM,IAAI;IACZ,OAAOA,MAAM,CAACK,MAAP,CAAc;MACjBpB,KADiB;MAEjBU,KAFiB;MAGjBF,OAHiB;MAIjBC,KAJiB;MAKjBR;IALiB,CAAd,CAAP;EAOH,CAXU,CAAf;;EAaA,IAAIc,MAAJ,EAAY;IACR,OAAOA,MAAM,CAACM,UAAP,CAAkB;MACrBrB,KADqB;MAErBQ,OAFqB;MAGrBC,KAHqB;MAIrBR,MAJqB;MAKrBS,KALqB;MAMrBR;IANqB,CAAlB,CAAP;EAQH,CATD,MASO,IAAI,CAACQ,KAAL,EAAY;IACf,MAAM,IAAIH,cAAJ,CACF,oDADE,EAEF,qBAFE,EAGF;MACIC,OADJ;MAEIN;IAFJ,CAHE,CAAN;EAQH;;EACD,MAAMoB,SAAS,GAAGZ,KAAK,CAACa,UAAN,CAAiB;IAC/Bb;EAD+B,CAAjB,CAAlB;EAGA,OAAO;IACHA,KADG;IAEHF,OAFG;IAGHc,SAHG;IAIHH,OAAO,EAAEV,KAAK,KAAK;EAJhB,CAAP;AAMH,CAjEM"}
+{"version":3,"names":["WebinyError","CmsEntryFieldSortingPlugin","extractSortInfo","sortBy","rootSorting","match","fieldId","isValues","order","valuesSorting","extractSort","params","model","fields","plugins","isValuesSorting","field","Object","values","find","f","parents","length","plugin","byType","type","reverse","canUse","createSort","valuePath","createPath"],"sources":["extractSort.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { Field } from \"./types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryFieldSortingPlugin } from \"~/plugins/index.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\nconst extractSortInfo = (sortBy: string) => {\n    const rootSorting = sortBy.match(/^([a-zA-Z]+)_(ASC|DESC)$/);\n    if (rootSorting) {\n        return {\n            fieldId: rootSorting[1],\n            isValues: false,\n            order: rootSorting[2] as \"ASC\" | \"DESC\"\n        };\n    }\n    const valuesSorting = sortBy.match(/^values_([a-zA-Z0-9]+)_(ASC|DESC)$/);\n    if (valuesSorting) {\n        return {\n            fieldId: valuesSorting[1],\n            isValues: true,\n            order: valuesSorting[2] as \"ASC\" | \"DESC\"\n        };\n    }\n    throw new WebinyError(\n        \"Problem in determining the sorting for the entry items.\",\n        \"SORT_EXTRACT_ERROR\",\n        {\n            sortBy\n        }\n    );\n};\n\ninterface IResponse {\n    valuePath: string;\n    reverse: boolean;\n    fieldId: string;\n    field: Field;\n}\n\ninterface IParams {\n    model: CmsModel;\n    sortBy: string;\n    fields: Record<string, Field>;\n    plugins: PluginsContainer;\n}\n\nexport const extractSort = (params: IParams): IResponse => {\n    const { model, sortBy, fields, plugins } = params;\n    const { fieldId, isValues: isValuesSorting, order } = extractSortInfo(sortBy);\n\n    const field = Object.values(fields).find(f => {\n        /**\n         * We do not support sorting by nested fields.\n         */\n        const isValues = f.parents[0]?.fieldId === \"values\";\n        if (isValues && isValuesSorting) {\n            return f.fieldId === fieldId;\n        }\n        if (f.parents.length > 0) {\n            return false;\n        }\n        return f.fieldId === fieldId;\n    });\n\n    const plugin = plugins\n        .byType<CmsEntryFieldSortingPlugin>(CmsEntryFieldSortingPlugin.type)\n        .reverse()\n        .find(plugin => {\n            return plugin.canUse({\n                model,\n                field,\n                fieldId,\n                order,\n                sortBy\n            });\n        });\n\n    if (plugin) {\n        return plugin.createSort({\n            model,\n            fieldId,\n            order,\n            sortBy,\n            field,\n            fields\n        });\n    } else if (!field) {\n        throw new WebinyError(\n            \"Sorting field does not exist in the content model.\",\n            \"SORTING_FIELD_ERROR\",\n            {\n                fieldId,\n                fields\n            }\n        );\n    }\n    const valuePath = field.createPath({\n        field\n    });\n    return {\n        field,\n        fieldId,\n        valuePath,\n        reverse: order === \"DESC\"\n    };\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AAGvC,SAASC,0BAA0B;AAGnC,MAAMC,eAAe,GAAIC,MAAc,IAAK;EACxC,MAAMC,WAAW,GAAGD,MAAM,CAACE,KAAK,CAAC,0BAA0B,CAAC;EAC5D,IAAID,WAAW,EAAE;IACb,OAAO;MACHE,OAAO,EAAEF,WAAW,CAAC,CAAC,CAAC;MACvBG,QAAQ,EAAE,KAAK;MACfC,KAAK,EAAEJ,WAAW,CAAC,CAAC;IACxB,CAAC;EACL;EACA,MAAMK,aAAa,GAAGN,MAAM,CAACE,KAAK,CAAC,oCAAoC,CAAC;EACxE,IAAII,aAAa,EAAE;IACf,OAAO;MACHH,OAAO,EAAEG,aAAa,CAAC,CAAC,CAAC;MACzBF,QAAQ,EAAE,IAAI;MACdC,KAAK,EAAEC,aAAa,CAAC,CAAC;IAC1B,CAAC;EACL;EACA,MAAM,IAAIT,WAAW,CACjB,yDAAyD,EACzD,oBAAoB,EACpB;IACIG;EACJ,CACJ,CAAC;AACL,CAAC;AAgBD,OAAO,MAAMO,WAAW,GAAIC,MAAe,IAAgB;EACvD,MAAM;IAAEC,KAAK;IAAET,MAAM;IAAEU,MAAM;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EACjD,MAAM;IAAEL,OAAO;IAAEC,QAAQ,EAAEQ,eAAe;IAAEP;EAAM,CAAC,GAAGN,eAAe,CAACC,MAAM,CAAC;EAE7E,MAAMa,KAAK,GAAGC,MAAM,CAACC,MAAM,CAACL,MAAM,CAAC,CAACM,IAAI,CAACC,CAAC,IAAI;IAC1C;AACR;AACA;IACQ,MAAMb,QAAQ,GAAGa,CAAC,CAACC,OAAO,CAAC,CAAC,CAAC,EAAEf,OAAO,KAAK,QAAQ;IACnD,IAAIC,QAAQ,IAAIQ,eAAe,EAAE;MAC7B,OAAOK,CAAC,CAACd,OAAO,KAAKA,OAAO;IAChC;IACA,IAAIc,CAAC,CAACC,OAAO,CAACC,MAAM,GAAG,CAAC,EAAE;MACtB,OAAO,KAAK;IAChB;IACA,OAAOF,CAAC,CAACd,OAAO,KAAKA,OAAO;EAChC,CAAC,CAAC;EAEF,MAAMiB,MAAM,GAAGT,OAAO,CACjBU,MAAM,CAA6BvB,0BAA0B,CAACwB,IAAI,CAAC,CACnEC,OAAO,CAAC,CAAC,CACTP,IAAI,CAACI,MAAM,IAAI;IACZ,OAAOA,MAAM,CAACI,MAAM,CAAC;MACjBf,KAAK;MACLI,KAAK;MACLV,OAAO;MACPE,KAAK;MACLL;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;EAEN,IAAIoB,MAAM,EAAE;IACR,OAAOA,MAAM,CAACK,UAAU,CAAC;MACrBhB,KAAK;MACLN,OAAO;MACPE,KAAK;MACLL,MAAM;MACNa,KAAK;MACLH;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAI,CAACG,KAAK,EAAE;IACf,MAAM,IAAIhB,WAAW,CACjB,oDAAoD,EACpD,qBAAqB,EACrB;MACIM,OAAO;MACPO;IACJ,CACJ,CAAC;EACL;EACA,MAAMgB,SAAS,GAAGb,KAAK,CAACc,UAAU,CAAC;IAC/Bd;EACJ,CAAC,CAAC;EACF,OAAO;IACHA,KAAK;IACLV,OAAO;IACPuB,SAAS;IACTH,OAAO,EAAElB,KAAK,KAAK;EACvB,CAAC;AACL,CAAC","ignoreList":[]}

package/operations/entry/filtering/filter.d.ts

@@ -1,8 +1,8 @@
-import { CmsEntry, CmsEntryListWhere } from "@webiny/api-headless-cms/types";
-import { PluginsContainer } from "@webiny/plugins";
-import { Field } from "./types";
-interface Params {
-    items: CmsEntry[];
+import type { CmsEntry, CmsEntryListWhere, CmsEntryValues } from "@webiny/api-headless-cms/types/index.js";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { Field } from "./types.js";
+interface Params<T extends CmsEntryValues = CmsEntryValues> {
+    items: CmsEntry<T>[];
     where: Partial<CmsEntryListWhere>;
     plugins: PluginsContainer;
     fields: Record<string, Field>;
@@ -11,5 +11,5 @@ interface Params {
         fields?: string[];
     };
 }
-export declare const filter: (params: Params) => CmsEntry[];
+export declare const filter: <T extends CmsEntryValues = CmsEntryValues>(params: Params<T>) => CmsEntry<T>[];
 export {};

package/operations/entry/filtering/filter.js

@@ -1,43 +1,35 @@
-"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");
-
+import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
+import WebinyError from "@webiny/error";
+import { createFullTextSearch } from "./fullTextSearch.js";
+import { createExpressions } from "./createExpressions.js";
+import { transformValue } from "./transform.js";
+import { getValue } from "./getValue.js";
 const executeFilter = params => {
   const {
     value,
     filter
   } = params;
+
+  /**
+   * We need to check if the filter can be used.
+   * If it cannot, we will just return true.
+   */
+  const canUse = filter.plugin.canUse({
+    value,
+    compareValue: filter.compareValue
+  });
+  if (!canUse) {
+    return true;
+  }
   const matched = filter.plugin.matches({
     value,
     compareValue: filter.compareValue
   });
-
   if (filter.negate) {
     return matched === false;
   }
-
   return matched;
 };
-
 const executeExpressions = params => {
   const {
     expressions,
@@ -45,15 +37,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 +53,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 +60,11 @@ 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), {}, {
+    const result = executeExpressions({
+      ...expression,
       getCachedValue
-    }));
-
+    });
     if (result && condition === "OR") {
       return true;
     } else if (!result && condition == "AND") {
@@ -90,12 +76,9 @@ 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 => {
+export const filter = params => {
   const {
     items: records,
     where,
@@ -104,75 +87,64 @@ const filter = params => {
     fullTextSearch
   } = params;
   const keys = Object.keys(where);
-
   if (keys.length === 0 && !fullTextSearch) {
     return records;
   }
-
-  const expression = (0, _createExpressions.createExpressions)({
+  const expression = 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)) {
+  if (expression.filters.length === 0 && expression.expressions.length === 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");
-
+  const fullTextSearchPlugin = plugins.byType(ValueFilterPlugin.type).find(plugin => plugin.getOperation() === "contains");
   if (!fullTextSearchPlugin) {
-    throw new _error.default(`Missing "contains" plugin to run the full-text search.`, "MISSING_PLUGIN");
+    throw new WebinyError(`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,
+  const search = createFullTextSearch({
+    term: fullTextSearch?.term,
+    targetFields: fullTextSearch?.fields,
     fields,
     plugin: fullTextSearchPlugin
   });
   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)({
+      const plainValue = getValue(record, path);
+      const rawValue = transformValue({
         value: plainValue,
         transform: filter.transformValue
       });
       cachedValues[path] = rawValue;
       return rawValue;
     };
-
-    const exprResult = executeExpressions((0, _objectSpread2.default)((0, _objectSpread2.default)({}, expression), {}, {
+    const exprResult = executeExpressions({
+      ...expression,
       getCachedValue
-    }));
+    });
     /**
      * 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;
+//# sourceMappingURL=filter.js.map

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":["ValueFilterPlugin","WebinyError","createFullTextSearch","createExpressions","transformValue","getValue","executeFilter","params","value","filter","canUse","plugin","compareValue","matched","matches","negate","executeExpressions","expressions","getCachedValue","filters","condition","length","result","expression","items","records","where","plugins","fields","fullTextSearch","keys","Object","term","fullTextSearchPlugin","byType","type","find","getOperation","search","targetFields","record","cachedValues","path","undefined","plainValue","rawValue","transform","exprResult"],"sources":["filter.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryListWhere,\n    CmsEntryValues\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Field } from \"./types.js\";\nimport { createFullTextSearch } from \"./fullTextSearch.js\";\nimport type { Expression, ExpressionCondition, Filter } from \"./createExpressions.js\";\nimport { createExpressions } from \"./createExpressions.js\";\nimport { transformValue } from \"./transform.js\";\nimport { getValue } from \"~/operations/entry/filtering/getValue.js\";\n\ninterface ExecuteFilterParams {\n    value: any;\n    filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n    const { value, filter } = params;\n\n    /**\n     * We need to check if the filter can be used.\n     * If it cannot, we will just return true.\n     */\n    const canUse = filter.plugin.canUse({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (!canUse) {\n        return true;\n    }\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<T extends CmsEntryValues = CmsEntryValues> {\n    items: CmsEntry<T>[];\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 = <T extends CmsEntryValues = CmsEntryValues>(\n    params: Params<T>\n): CmsEntry<T>[] => {\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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","ignoreList":[]}

package/operations/entry/filtering/fullTextSearch.d.ts

@@ -1,6 +1,6 @@
-import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin";
-import { CmsEntry } from "@webiny/api-headless-cms/types";
-import { Field } from "./types";
+import type { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
+import type { CmsEntry } from "@webiny/api-headless-cms/types/index.js";
+import type { Field } from "./types.js";
 interface Params {
     term?: string;
     targetFields?: string[];

package/operations/entry/filtering/fullTextSearch.js

@@ -1,50 +1,33 @@
-"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");
-
+import WebinyError from "@webiny/error";
+import { getValue } from "./getValue.js";
 /**
  * Unfortunately we must use the contains plugin directly as plugins do not support multi field searching.
  */
-const createFullTextSearch = params => {
+export const createFullTextSearch = params => {
   const {
     term,
     targetFields,
     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", {
+        throw new WebinyError(`Unknown field "${target}" in the model.`, "UNKNOWN_FIELD", {
           target
         });
       }
-
-      const value = (0, _getValue.getValue)(item.values, target);
-
+      const value = getValue(item, target);
       if (!value) {
         continue;
       }
-
       if (plugin.matches({
         value,
         compareValue: term
@@ -52,9 +35,8 @@ const createFullTextSearch = params => {
         return true;
       }
     }
-
     return false;
   };
 };
 
-exports.createFullTextSearch = createFullTextSearch;
+//# sourceMappingURL=fullTextSearch.js.map

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":["WebinyError","getValue","createFullTextSearch","params","term","targetFields","fields","fieldDefinitions","plugin","trim","length","item","target","field","value","matches","compareValue"],"sources":["fullTextSearch.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js\";\nimport type { CmsEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Field } from \"./types.js\";\nimport { getValue } from \"./getValue.js\";\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, 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,OAAOA,WAAW,MAAM,eAAe;AAIvC,SAASC,QAAQ;AASjB;AACA;AACA;AACA,OAAO,MAAMC,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,CAAC,CAAC,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,IAAIb,WAAW,CAAC,kBAAkBY,MAAM,iBAAiB,EAAE,eAAe,EAAE;UAC9EA;QACJ,CAAC,CAAC;MACN;MACA,MAAME,KAAK,GAAGb,QAAQ,CAACU,IAAI,EAAEC,MAAM,CAAC;MACpC,IAAI,CAACE,KAAK,EAAE;QACR;MACJ;MACA,IAAIN,MAAM,CAACO,OAAO,CAAC;QAAED,KAAK;QAAEE,YAAY,EAAEZ;MAAK,CAAC,CAAC,KAAK,IAAI,EAAE;QACxD,OAAO,IAAI;MACf;IACJ;IACA,OAAO,KAAK;EAChB,CAAC;AACL,CAAC","ignoreList":[]}

package/operations/entry/filtering/getValue.js

@@ -1,16 +1,8 @@
-"use strict";
-
-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 +10,50 @@ 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) {
+  }
+  const value = target?.[path];
+  if (value === 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) => {
+export 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;
+//# sourceMappingURL=getValue.js.map

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> | undefined, input: string[]): any[] | undefined => {\n    const paths = [...input];\n    const path = paths.shift();\n\n    if (!path) {\n        return undefined;\n    }\n\n    const value = target?.[path];\n    if (value === undefined) {\n        return undefined;\n    }\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,GAAGA,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,GAAGA,CAACN,MAAuC,EAAEO,KAAe,KAAwB;EAC1F,MAAMC,KAAK,GAAG,CAAC,GAAGD,KAAK,CAAC;EACxB,MAAME,IAAI,GAAGD,KAAK,CAACE,KAAK,CAAC,CAAC;EAE1B,IAAI,CAACD,IAAI,EAAE;IACP,OAAOE,SAAS;EACpB;EAEA,MAAMC,KAAK,GAAGZ,MAAM,GAAGS,IAAI,CAAC;EAC5B,IAAIG,KAAK,KAAKD,SAAS,EAAE;IACrB,OAAOA,SAAS;EACpB;EACA,IAAIH,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;AACA,OAAO,MAAMW,QAAQ,GAAGA,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,CAAC,gBAAgB,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,CACX,iEAAiEb,KAAK,CAACiB,IAAI,CACvE,GACJ,CAAC,OAAOH,QAAQ,CAACG,IAAI,CAAC,GAAG,CAAC,GAC9B,CAAC;EACL;EAEA,OAAOnB,IAAI,CAACN,MAAM,EAAEQ,KAAK,CAAC;AAC9B,CAAC","ignoreList":[]}