@webiny/api-headless-cms-ddb 6.3.0-beta.4 → 6.4.0-beta.0

package/operations/entry/filtering/createFields.js

@@ -2,105 +2,92 @@ import { createSystemFields } from "./systemFields.js";
 import { CmsEntryFieldFilterPathPlugin } from "../../../plugins/index.js";
 import { getMappedPlugins } from "./mapPlugins.js";
 import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
-const createFieldCollection = params => {
-  const {
-    fields,
-    parents,
-    transformValuePlugins,
-    valuePathPlugins,
-    system
-  } = params;
-  return fields.reduce((collection, field) => {
-    const fieldType = getBaseFieldType(field);
-    const transformPlugin = transformValuePlugins[fieldType];
-    const valuePathPlugin = valuePathPlugins[fieldType];
-
-    /**
-     * The required fieldId is a product of all of its parents and its own fieldId.
-     */
-    const fieldId = [...parents, {
-      fieldId: field.fieldId,
-      list: field.list
-    }].map(f => f.fieldId).join(".");
-    collection[fieldId] = {
-      ...field,
-      parents,
-      system,
-      createPath: params => {
-        if (valuePathPlugin && valuePathPlugin.canUse(field, parents.map(p => p.fieldId))) {
-          return valuePathPlugin.createPath(params);
-        }
-        return parents.map(parent => parent.fieldId).concat([params.field.fieldId]).join(".");
-      },
-      transform: value => {
-        if (!transformPlugin) {
-          return value;
-        }
-        return transformPlugin.transform({
-          field,
-          value
+const createFieldCollection = (params)=>{
+    const { fields, parents, transformValuePlugins, valuePathPlugins, system } = params;
+    return fields.reduce((collection, field)=>{
+        const fieldType = getBaseFieldType(field);
+        const transformPlugin = transformValuePlugins[fieldType];
+        const valuePathPlugin = valuePathPlugins[fieldType];
+        const fieldId = [
+            ...parents,
+            {
+                fieldId: field.fieldId,
+                list: field.list
+            }
+        ].map((f)=>f.fieldId).join(".");
+        collection[fieldId] = {
+            ...field,
+            parents,
+            system,
+            createPath: (params)=>{
+                if (valuePathPlugin && valuePathPlugin.canUse(field, parents.map((p)=>p.fieldId))) return valuePathPlugin.createPath(params);
+                return parents.map((parent)=>parent.fieldId).concat([
+                    params.field.fieldId
+                ]).join(".");
+            },
+            transform: (value)=>{
+                if (!transformPlugin) return value;
+                return transformPlugin.transform({
+                    field,
+                    value
+                });
+            }
+        };
+        const childFields = field.settings?.fields;
+        if (!childFields?.length) return collection;
+        const result = createFieldCollection({
+            fields: childFields,
+            parents: [
+                ...parents,
+                {
+                    fieldId: field.fieldId,
+                    list: field.list
+                }
+            ],
+            transformValuePlugins,
+            valuePathPlugins,
+            system
         });
-      }
-    };
-    const childFields = field.settings?.fields;
-    if (!childFields?.length) {
-      return collection;
-    }
+        Object.assign(collection, result);
+        return collection;
+    }, {});
+};
+const createFields = (params)=>{
+    const { fields, plugins } = params;
+    const transformValuePlugins = getMappedPlugins({
+        plugins,
+        type: "cms-field-filter-value-transform",
+        property: "fieldType"
+    });
+    const valuePathPlugins = getMappedPlugins({
+        plugins,
+        type: CmsEntryFieldFilterPathPlugin.type,
+        property: "fieldType"
+    });
+    const collection = createFieldCollection({
+        fields: createSystemFields(),
+        transformValuePlugins,
+        valuePathPlugins,
+        parents: [],
+        system: true
+    });
     const result = createFieldCollection({
-      fields: childFields,
-      parents: [...parents, {
-        fieldId: field.fieldId,
-        list: field.list
-      }],
-      transformValuePlugins,
-      valuePathPlugins,
-      system
+        fields,
+        transformValuePlugins,
+        valuePathPlugins,
+        parents: [
+            {
+                fieldId: "values",
+                list: false
+            }
+        ],
+        system: false
     });
-    Object.assign(collection, result);
-    return collection;
-  }, {});
-};
-/**
- * This method will map the fieldId (fieldId -> field) to the actual field.
- *
- * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).
- */
-export const createFields = params => {
-  const {
-    fields,
-    plugins
-  } = params;
-  const transformValuePlugins = getMappedPlugins({
-    plugins,
-    type: "cms-field-filter-value-transform",
-    property: "fieldType"
-  });
-  const valuePathPlugins = getMappedPlugins({
-    plugins,
-    type: CmsEntryFieldFilterPathPlugin.type,
-    property: "fieldType"
-  });
-  const collection = createFieldCollection({
-    fields: createSystemFields(),
-    transformValuePlugins,
-    valuePathPlugins,
-    parents: [],
-    system: true
-  });
-  const result = createFieldCollection({
-    fields,
-    transformValuePlugins,
-    valuePathPlugins,
-    parents: [{
-      fieldId: "values",
-      list: false
-    }],
-    system: false
-  });
-  return {
-    ...collection,
-    ...result
-  };
+    return {
+        ...collection,
+        ...result
+    };
 };
+export { createFields };
 
 //# sourceMappingURL=createFields.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createSystemFields","CmsEntryFieldFilterPathPlugin","getMappedPlugins","getBaseFieldType","createFieldCollection","params","fields","parents","transformValuePlugins","valuePathPlugins","system","reduce","collection","field","fieldType","transformPlugin","valuePathPlugin","fieldId","list","map","f","join","createPath","canUse","p","parent","concat","transform","value","childFields","settings","length","result","Object","assign","createFields","plugins","type","property"],"sources":["createFields.ts"],"sourcesContent":["import type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createSystemFields } from \"./systemFields.js\";\nimport type { Field, FieldParent } from \"./types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport { CmsEntryFieldFilterPathPlugin } from \"~/plugins/index.js\";\nimport { getMappedPlugins } from \"./mapPlugins.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface Params {\n    fields: CmsModelField[];\n    plugins: PluginsContainer;\n}\n\ninterface FieldCollection {\n    [key: string]: Field;\n}\n\ninterface AddFieldsToCollectionParams {\n    fields: CmsModelField[];\n    parents: FieldParent[];\n    transformValuePlugins: Record<string, CmsFieldFilterValueTransformPlugin>;\n    valuePathPlugins: Record<string, CmsEntryFieldFilterPathPlugin>;\n    system: boolean;\n}\n\nconst createFieldCollection = (params: AddFieldsToCollectionParams): FieldCollection => {\n    const { fields, parents, transformValuePlugins, valuePathPlugins, system } = params;\n    return fields.reduce<FieldCollection>((collection, field) => {\n        const fieldType = getBaseFieldType(field);\n        const transformPlugin = transformValuePlugins[fieldType];\n        const valuePathPlugin = valuePathPlugins[fieldType];\n\n        /**\n         * The required fieldId is a product of all of its parents and its own fieldId.\n         */\n        const fieldId = [\n            ...parents,\n            {\n                fieldId: field.fieldId,\n                list: field.list\n            }\n        ]\n            .map(f => f.fieldId)\n            .join(\".\");\n\n        collection[fieldId] = {\n            ...field,\n            parents,\n            system,\n            createPath: params => {\n                if (\n                    valuePathPlugin &&\n                    valuePathPlugin.canUse(\n                        field,\n                        parents.map(p => p.fieldId)\n                    )\n                ) {\n                    return valuePathPlugin.createPath(params);\n                }\n\n                return parents\n                    .map(parent => parent.fieldId)\n                    .concat([params.field.fieldId])\n                    .join(\".\");\n            },\n            transform: value => {\n                if (!transformPlugin) {\n                    return value;\n                }\n                return transformPlugin.transform({\n                    field,\n                    value\n                });\n            }\n        };\n        const childFields = field.settings?.fields;\n        if (!childFields?.length) {\n            return collection;\n        }\n\n        const result = createFieldCollection({\n            fields: childFields,\n            parents: [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    list: field.list\n                }\n            ],\n            transformValuePlugins,\n            valuePathPlugins,\n            system\n        });\n        Object.assign(collection, result);\n        return collection;\n    }, {});\n};\n/**\n * This method will map the fieldId (fieldId -> field) to the actual field.\n *\n * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).\n */\nexport const createFields = (params: Params) => {\n    const { fields, plugins } = params;\n\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\n        plugins,\n        type: \"cms-field-filter-value-transform\",\n        property: \"fieldType\"\n    });\n    const valuePathPlugins = getMappedPlugins<CmsEntryFieldFilterPathPlugin>({\n        plugins,\n        type: CmsEntryFieldFilterPathPlugin.type,\n        property: \"fieldType\"\n    });\n\n    const collection = createFieldCollection({\n        fields: createSystemFields(),\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [],\n        system: true\n    });\n\n    const result = createFieldCollection({\n        fields,\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [\n            {\n                fieldId: \"values\",\n                list: false\n            }\n        ],\n        system: false\n    });\n\n    return {\n        ...collection,\n        ...result\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"operations/entry/filtering/createFields.js","sources":["../../../../src/operations/entry/filtering/createFields.ts"],"sourcesContent":["import type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createSystemFields } from \"./systemFields.js\";\nimport type { Field, FieldParent } from \"./types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport { CmsEntryFieldFilterPathPlugin } from \"~/plugins/index.js\";\nimport { getMappedPlugins } from \"./mapPlugins.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface Params {\n    fields: CmsModelField[];\n    plugins: PluginsContainer;\n}\n\ninterface FieldCollection {\n    [key: string]: Field;\n}\n\ninterface AddFieldsToCollectionParams {\n    fields: CmsModelField[];\n    parents: FieldParent[];\n    transformValuePlugins: Record<string, CmsFieldFilterValueTransformPlugin>;\n    valuePathPlugins: Record<string, CmsEntryFieldFilterPathPlugin>;\n    system: boolean;\n}\n\nconst createFieldCollection = (params: AddFieldsToCollectionParams): FieldCollection => {\n    const { fields, parents, transformValuePlugins, valuePathPlugins, system } = params;\n    return fields.reduce<FieldCollection>((collection, field) => {\n        const fieldType = getBaseFieldType(field);\n        const transformPlugin = transformValuePlugins[fieldType];\n        const valuePathPlugin = valuePathPlugins[fieldType];\n\n        /**\n         * The required fieldId is a product of all of its parents and its own fieldId.\n         */\n        const fieldId = [\n            ...parents,\n            {\n                fieldId: field.fieldId,\n                list: field.list\n            }\n        ]\n            .map(f => f.fieldId)\n            .join(\".\");\n\n        collection[fieldId] = {\n            ...field,\n            parents,\n            system,\n            createPath: params => {\n                if (\n                    valuePathPlugin &&\n                    valuePathPlugin.canUse(\n                        field,\n                        parents.map(p => p.fieldId)\n                    )\n                ) {\n                    return valuePathPlugin.createPath(params);\n                }\n\n                return parents\n                    .map(parent => parent.fieldId)\n                    .concat([params.field.fieldId])\n                    .join(\".\");\n            },\n            transform: value => {\n                if (!transformPlugin) {\n                    return value;\n                }\n                return transformPlugin.transform({\n                    field,\n                    value\n                });\n            }\n        };\n        const childFields = field.settings?.fields;\n        if (!childFields?.length) {\n            return collection;\n        }\n\n        const result = createFieldCollection({\n            fields: childFields,\n            parents: [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    list: field.list\n                }\n            ],\n            transformValuePlugins,\n            valuePathPlugins,\n            system\n        });\n        Object.assign(collection, result);\n        return collection;\n    }, {});\n};\n/**\n * This method will map the fieldId (fieldId -> field) to the actual field.\n *\n * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).\n */\nexport const createFields = (params: Params) => {\n    const { fields, plugins } = params;\n\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\n        plugins,\n        type: \"cms-field-filter-value-transform\",\n        property: \"fieldType\"\n    });\n    const valuePathPlugins = getMappedPlugins<CmsEntryFieldFilterPathPlugin>({\n        plugins,\n        type: CmsEntryFieldFilterPathPlugin.type,\n        property: \"fieldType\"\n    });\n\n    const collection = createFieldCollection({\n        fields: createSystemFields(),\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [],\n        system: true\n    });\n\n    const result = createFieldCollection({\n        fields,\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [\n            {\n                fieldId: \"values\",\n                list: false\n            }\n        ],\n        system: false\n    });\n\n    return {\n        ...collection,\n        ...result\n    };\n};\n"],"names":["createFieldCollection","params","fields","parents","transformValuePlugins","valuePathPlugins","system","collection","field","fieldType","getBaseFieldType","transformPlugin","valuePathPlugin","fieldId","f","p","parent","value","childFields","result","Object","createFields","plugins","getMappedPlugins","CmsEntryFieldFilterPathPlugin","createSystemFields"],"mappings":";;;;AA0BA,MAAMA,wBAAwB,CAACC;IAC3B,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAEC,qBAAqB,EAAEC,gBAAgB,EAAEC,MAAM,EAAE,GAAGL;IAC7E,OAAOC,OAAO,MAAM,CAAkB,CAACK,YAAYC;QAC/C,MAAMC,YAAYC,iBAAiBF;QACnC,MAAMG,kBAAkBP,qBAAqB,CAACK,UAAU;QACxD,MAAMG,kBAAkBP,gBAAgB,CAACI,UAAU;QAKnD,MAAMI,UAAU;eACTV;YACH;gBACI,SAASK,MAAM,OAAO;gBACtB,MAAMA,MAAM,IAAI;YACpB;SACH,CACI,GAAG,CAACM,CAAAA,IAAKA,EAAE,OAAO,EAClB,IAAI,CAAC;QAEVP,UAAU,CAACM,QAAQ,GAAG;YAClB,GAAGL,KAAK;YACRL;YACAG;YACA,YAAYL,CAAAA;gBACR,IACIW,mBACAA,gBAAgB,MAAM,CAClBJ,OACAL,QAAQ,GAAG,CAACY,CAAAA,IAAKA,EAAE,OAAO,IAG9B,OAAOH,gBAAgB,UAAU,CAACX;gBAGtC,OAAOE,QACF,GAAG,CAACa,CAAAA,SAAUA,OAAO,OAAO,EAC5B,MAAM,CAAC;oBAACf,OAAO,KAAK,CAAC,OAAO;iBAAC,EAC7B,IAAI,CAAC;YACd;YACA,WAAWgB,CAAAA;gBACP,IAAI,CAACN,iBACD,OAAOM;gBAEX,OAAON,gBAAgB,SAAS,CAAC;oBAC7BH;oBACAS;gBACJ;YACJ;QACJ;QACA,MAAMC,cAAcV,MAAM,QAAQ,EAAE;QACpC,IAAI,CAACU,aAAa,QACd,OAAOX;QAGX,MAAMY,SAASnB,sBAAsB;YACjC,QAAQkB;YACR,SAAS;mBACFf;gBACH;oBACI,SAASK,MAAM,OAAO;oBACtB,MAAMA,MAAM,IAAI;gBACpB;aACH;YACDJ;YACAC;YACAC;QACJ;QACAc,OAAO,MAAM,CAACb,YAAYY;QAC1B,OAAOZ;IACX,GAAG,CAAC;AACR;AAMO,MAAMc,eAAe,CAACpB;IACzB,MAAM,EAAEC,MAAM,EAAEoB,OAAO,EAAE,GAAGrB;IAE5B,MAAMG,wBAAwBmB,iBAAqD;QAC/ED;QACA,MAAM;QACN,UAAU;IACd;IACA,MAAMjB,mBAAmBkB,iBAAgD;QACrED;QACA,MAAME,8BAA8B,IAAI;QACxC,UAAU;IACd;IAEA,MAAMjB,aAAaP,sBAAsB;QACrC,QAAQyB;QACRrB;QACAC;QACA,SAAS,EAAE;QACX,QAAQ;IACZ;IAEA,MAAMc,SAASnB,sBAAsB;QACjCE;QACAE;QACAC;QACA,SAAS;YACL;gBACI,SAAS;gBACT,MAAM;YACV;SACH;QACD,QAAQ;IACZ;IAEA,OAAO;QACH,GAAGE,UAAU;QACb,GAAGY,MAAM;IACb;AACJ"}

package/operations/entry/filtering/extractSort.js

@@ -1,84 +1,60 @@
-import WebinyError from "@webiny/error";
+import error 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 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]
+    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
-  });
+    throw new error("Problem in determining the sorting for the entry items.", "SORT_EXTRACT_ERROR", {
+        sortBy
+    });
 };
-export const extractSort = params => {
-  const {
-    model,
-    sortBy,
-    fields,
-    plugins
-  } = params;
-  const {
-    fieldId,
-    isValues: isValuesSorting,
-    order
-  } = extractSortInfo(sortBy);
-  const field = Object.values(fields).find(f => {
-    /**
-     * We do not support sorting by nested fields.
-     */
-    const isValues = f.parents[0]?.fieldId === "values";
-    if (isValues && isValuesSorting) {
-      return f.fieldId === fieldId;
-    }
-    if (f.parents.length > 0) {
-      return false;
-    }
-    return f.fieldId === fieldId;
-  });
-  const plugin = plugins.byType(CmsEntryFieldSortingPlugin.type).reverse().find(plugin => {
-    return plugin.canUse({
-      model,
-      field,
-      fieldId,
-      order,
-      sortBy
+const extractSort = (params)=>{
+    const { model, sortBy, fields, plugins } = params;
+    const { fieldId, isValues: isValuesSorting, order } = extractSortInfo(sortBy);
+    const field = Object.values(fields).find((f)=>{
+        const isValues = f.parents[0]?.fieldId === "values";
+        if (isValues && isValuesSorting) return f.fieldId === fieldId;
+        if (f.parents.length > 0) return false;
+        return f.fieldId === fieldId;
     });
-  });
-  if (plugin) {
-    return plugin.createSort({
-      model,
-      fieldId,
-      order,
-      sortBy,
-      field,
-      fields
+    const plugin = plugins.byType(CmsEntryFieldSortingPlugin.type).reverse().find((plugin)=>plugin.canUse({
+            model,
+            field,
+            fieldId,
+            order,
+            sortBy
+        }));
+    if (plugin) return plugin.createSort({
+        model,
+        fieldId,
+        order,
+        sortBy,
+        field,
+        fields
     });
-  } else if (!field) {
-    throw new WebinyError("Sorting field does not exist in the content model.", "SORTING_FIELD_ERROR", {
-      fieldId,
-      fields
+    if (!field) throw new error("Sorting field does not exist in the content model.", "SORTING_FIELD_ERROR", {
+        fieldId,
+        fields
     });
-  }
-  const valuePath = field.createPath({
-    field
-  });
-  return {
-    field,
-    fieldId,
-    valuePath,
-    reverse: order === "DESC"
-  };
+    const valuePath = field.createPath({
+        field
+    });
+    return {
+        field,
+        fieldId,
+        valuePath,
+        reverse: "DESC" === order
+    };
 };
+export { extractSort };
 
 //# sourceMappingURL=extractSort.js.map

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

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"operations/entry/filtering/extractSort.js","sources":["../../../../src/operations/entry/filtering/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"],"names":["extractSortInfo","sortBy","rootSorting","valuesSorting","WebinyError","extractSort","params","model","fields","plugins","fieldId","isValuesSorting","order","field","Object","f","isValues","plugin","CmsEntryFieldSortingPlugin","valuePath"],"mappings":";;AAMA,MAAMA,kBAAkB,CAACC;IACrB,MAAMC,cAAcD,OAAO,KAAK,CAAC;IACjC,IAAIC,aACA,OAAO;QACH,SAASA,WAAW,CAAC,EAAE;QACvB,UAAU;QACV,OAAOA,WAAW,CAAC,EAAE;IACzB;IAEJ,MAAMC,gBAAgBF,OAAO,KAAK,CAAC;IACnC,IAAIE,eACA,OAAO;QACH,SAASA,aAAa,CAAC,EAAE;QACzB,UAAU;QACV,OAAOA,aAAa,CAAC,EAAE;IAC3B;IAEJ,MAAM,IAAIC,MACN,2DACA,sBACA;QACIH;IACJ;AAER;AAgBO,MAAMI,cAAc,CAACC;IACxB,MAAM,EAAEC,KAAK,EAAEN,MAAM,EAAEO,MAAM,EAAEC,OAAO,EAAE,GAAGH;IAC3C,MAAM,EAAEI,OAAO,EAAE,UAAUC,eAAe,EAAEC,KAAK,EAAE,GAAGZ,gBAAgBC;IAEtE,MAAMY,QAAQC,OAAO,MAAM,CAACN,QAAQ,IAAI,CAACO,CAAAA;QAIrC,MAAMC,WAAWD,EAAE,OAAO,CAAC,EAAE,EAAE,YAAY;QAC3C,IAAIC,YAAYL,iBACZ,OAAOI,EAAE,OAAO,KAAKL;QAEzB,IAAIK,EAAE,OAAO,CAAC,MAAM,GAAG,GACnB,OAAO;QAEX,OAAOA,EAAE,OAAO,KAAKL;IACzB;IAEA,MAAMO,SAASR,QACV,MAAM,CAA6BS,2BAA2B,IAAI,EAClE,OAAO,GACP,IAAI,CAACD,CAAAA,SACKA,OAAO,MAAM,CAAC;YACjBV;YACAM;YACAH;YACAE;YACAX;QACJ;IAGR,IAAIgB,QACA,OAAOA,OAAO,UAAU,CAAC;QACrBV;QACAG;QACAE;QACAX;QACAY;QACAL;IACJ;IACG,IAAI,CAACK,OACR,MAAM,IAAIT,MACN,sDACA,uBACA;QACIM;QACAF;IACJ;IAGR,MAAMW,YAAYN,MAAM,UAAU,CAAC;QAC/BA;IACJ;IACA,OAAO;QACHA;QACAH;QACAS;QACA,SAASP,AAAU,WAAVA;IACb;AACJ"}

package/operations/entry/filtering/filter.js

@@ -1,153 +1,85 @@
-import WebinyError from "@webiny/error";
+import error from "@webiny/error";
 import { createFullTextSearch } from "./fullTextSearch.js";
 import { createExpressions } from "./createExpressions.js";
 import { transformValue } from "./transform.js";
 import { getValue } from "./getValue.js";
 import { ValueFilterRegistry } from "@webiny/db-dynamodb/exports/api/db.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.filter.canUse({
-    value,
-    compareValue: filter.compareValue
-  });
-  if (!canUse) {
-    return true;
-  }
-  const matched = filter.filter.matches({
-    value,
-    compareValue: filter.compareValue
-  });
-  if (filter.negate) {
-    return matched === false;
-  }
-  return matched;
-};
-const executeExpressions = params => {
-  const {
-    expressions,
-    getCachedValue,
-    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({
-      value,
-      filter
+const executeFilter = (params)=>{
+    const { value, filter } = params;
+    const canUse = filter.filter.canUse({
+        value,
+        compareValue: filter.compareValue
     });
-    /**
-     * Filters are ALWAYS executed as an AND.
-     * So if even one is false, everything false.
-     */
-    if (!result) {
-      return false;
-    }
-  }
-  /**
-   * Then we move onto expressions, which are basically nested upon nested filters with different conditions.
-   */
-  for (const expression of expressions) {
-    const result = executeExpressions({
-      ...expression,
-      getCachedValue
+    if (!canUse) return true;
+    const matched = filter.filter.matches({
+        value,
+        compareValue: filter.compareValue
     });
-    if (result && condition === "OR") {
-      return true;
-    } else if (!result && condition == "AND") {
-      return false;
+    if (filter.negate) return false === matched;
+    return matched;
+};
+const executeExpressions = (params)=>{
+    const { expressions, getCachedValue, filters, condition } = params;
+    if (0 === expressions.length && 0 === filters.length) return true;
+    for (const filter of filters){
+        const value = getCachedValue(filter);
+        const result = executeFilter({
+            value,
+            filter
+        });
+        if (!result) return false;
+    }
+    for (const expression of expressions){
+        const result = executeExpressions({
+            ...expression,
+            getCachedValue
+        });
+        if (result && "OR" === condition) return true;
+        if (!result && "AND" == condition) return false;
     }
-  }
-  /**
-   * If condition is an OR, we can fail the expressions check because the code would return a lot earlier than this line.
-   *
-   * 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;
+    return "OR" !== condition;
 };
-export const filter = params => {
-  const {
-    items: records,
-    where,
-    plugins,
-    fields,
-    fullTextSearch,
-    container
-  } = params;
-  const valueFilterRegistry = container.resolve(ValueFilterRegistry);
-  const keys = Object.keys(where);
-  if (keys.length === 0 && !fullTextSearch) {
-    return records;
-  }
-  const expression = createExpressions({
-    plugins,
-    where,
-    fields,
-    container
-  });
-
-  /**
-   * 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?.term) {
-    return records;
-  }
-  /**
-   * We need the contains plugin to run the full text search.
-   */
-  const fullTextSearchFilter = valueFilterRegistry.get("contains");
-  if (!fullTextSearchFilter) {
-    throw new WebinyError(`Missing "contains" plugin to run the full-text search.`, "MISSING_PLUGIN");
-  }
-  const search = createFullTextSearch({
-    term: fullTextSearch?.term,
-    targetFields: fullTextSearch?.fields,
-    fields,
-    filter: fullTextSearchFilter
-  });
-  return records.filter(record => {
-    const cachedValues = {};
-    const getCachedValue = filter => {
-      const {
-        path
-      } = filter;
-      if (cachedValues[path] !== undefined) {
-        return cachedValues[path];
-      }
-      const plainValue = getValue(record, path);
-      const rawValue = transformValue({
-        value: plainValue,
-        transform: filter.transformValue
-      });
-      cachedValues[path] = rawValue;
-      return rawValue;
-    };
-    const exprResult = executeExpressions({
-      ...expression,
-      getCachedValue
+const filter_filter = (params)=>{
+    const { items: records, where, plugins, fields, fullTextSearch, container } = params;
+    const valueFilterRegistry = container.resolve(ValueFilterRegistry);
+    const keys = Object.keys(where);
+    if (0 === keys.length && !fullTextSearch) return records;
+    const expression = createExpressions({
+        plugins,
+        where,
+        fields,
+        container
+    });
+    if (0 === expression.filters.length && 0 === expression.expressions.length && !fullTextSearch?.term) return records;
+    const fullTextSearchFilter = valueFilterRegistry.get("contains");
+    if (!fullTextSearchFilter) throw new error('Missing "contains" plugin to run the full-text search.', "MISSING_PLUGIN");
+    const search = createFullTextSearch({
+        term: fullTextSearch?.term,
+        targetFields: fullTextSearch?.fields,
+        fields,
+        filter: fullTextSearchFilter
+    });
+    return records.filter((record)=>{
+        const cachedValues = {};
+        const getCachedValue = (filter)=>{
+            const { path } = filter;
+            if (void 0 !== cachedValues[path]) return cachedValues[path];
+            const plainValue = getValue(record, path);
+            const rawValue = transformValue({
+                value: plainValue,
+                transform: filter.transformValue
+            });
+            cachedValues[path] = rawValue;
+            return rawValue;
+        };
+        const exprResult = executeExpressions({
+            ...expression,
+            getCachedValue
+        });
+        if (!exprResult || !search) return exprResult;
+        return search(record);
     });
-    /**
-     * 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);
-  });
 };
+export { filter_filter as filter };
 
 //# sourceMappingURL=filter.js.map