@webiny/api-headless-cms-storage 0.0.0-unstable.0d717d18dd → 0.0.0-unstable.a4f3e4ea8b

package/cms/storageHelpers.d.ts

@@ -1,8 +1,10 @@
 import type { CmsEntry, CmsEntryUniqueValue, CmsEntryValues, CmsModel, StorageOperationsCmsModel } from "@webiny/api-headless-cms/types/index.js";
-import type { Container } from "@webiny/di";
+import type { PluginsContainer } from "@webiny/plugins";
+import { StorageOperationsCmsModelPlugin } from "@webiny/api-headless-cms";
 import type { StorageTransformRegistry } from "@webiny/api-headless-cms/exports/api/cms/storage.js";
 import type { FilterItemFromStorage } from "../filtering/fields/types.js";
-export declare const createStorageModelAccessor: (container: Container) => {
+export declare const createStorageModelAccessor: (plugins: PluginsContainer) => {
+    getPlugin: () => StorageOperationsCmsModelPlugin;
     getModel: <T extends CmsEntryValues = CmsEntryValues>(model: CmsModel) => StorageOperationsCmsModel<T>;
 };
 export declare const createStorageTransformCallable: (storageTransformRegistry: StorageTransformRegistry.Interface, model: StorageOperationsCmsModel) => FilterItemFromStorage;

package/cms/storageHelpers.js

@@ -1,13 +1,18 @@
-import { CmsStorageModelProvider } from "@webiny/api-headless-cms/features/shared/abstractions.js";
+import { StorageOperationsCmsModelPlugin } from "@webiny/api-headless-cms";
 import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
-const createStorageModelAccessor = (container)=>{
+const createStorageModelAccessor = (plugins)=>{
     let cached;
-    const getProvider = ()=>{
-        if (!cached) cached = container.resolve(CmsStorageModelProvider);
+    const getPlugin = ()=>{
+        if (cached) return cached;
+        cached = plugins.oneByType(StorageOperationsCmsModelPlugin.type);
         return cached;
     };
-    const getModel = (model)=>getProvider().getModel(model);
+    const getModel = (model)=>{
+        const plugin = getPlugin();
+        return plugin.getModel(model);
+    };
     return {
+        getPlugin,
         getModel
     };
 };

package/cms/storageHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"cms/storageHelpers.js","sources":["../../src/cms/storageHelpers.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryUniqueValue,\n    CmsEntryValues,\n    CmsModel,\n    CmsModelField,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Container } from \"@webiny/di\";\nimport { CmsStorageModelProvider } from \"@webiny/api-headless-cms/features/shared/abstractions.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport type { StorageTransformRegistry } from \"@webiny/api-headless-cms/exports/api/cms/storage.js\";\nimport type { FilterItemFromStorage } from \"../filtering/fields/types.js\";\n\n/* Creates a lazy-cached getter for the storage representation of a CMS model. */\nexport const createStorageModelAccessor = (container: Container) => {\n    let cached: CmsStorageModelProvider.Interface | undefined;\n\n    const getProvider = () => {\n        if (!cached) {\n            cached = container.resolve(CmsStorageModelProvider);\n        }\n        return cached;\n    };\n\n    const getModel = <T extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel\n    ): StorageOperationsCmsModel<T> => {\n        return getProvider().getModel<T>(model);\n    };\n\n    return { getModel };\n};\n\n/* Creates a fromStorage transform callable for a given model. */\nexport const createStorageTransformCallable = (\n    storageTransformRegistry: StorageTransformRegistry.Interface,\n    model: StorageOperationsCmsModel\n): FilterItemFromStorage => {\n    return async (field: CmsModelField, value: unknown) => {\n        const fieldType = getBaseFieldType(field);\n        const storageTransform = storageTransformRegistry.get(fieldType);\n\n        if (!storageTransform) {\n            return value;\n        }\n\n        const result = await storageTransform.fromStorage({\n            model,\n            field,\n            value,\n            getStorageTransform(ft: string) {\n                return storageTransformRegistry.get(ft) || storageTransformRegistry.get(\"*\")!;\n            }\n        });\n\n        return result;\n    };\n};\n\n/* Aggregates unique values for a given field across a list of CMS entries. */\nexport const aggregateUniqueFieldValues = <T extends CmsEntryValues = CmsEntryValues>(\n    items: CmsEntry<T>[],\n    fieldId: string\n): CmsEntryUniqueValue[] => {\n    const result: Record<string, CmsEntryUniqueValue> = {};\n\n    for (const item of items) {\n        const fieldValue = item.values[fieldId] as string[] | string | undefined;\n\n        if (fieldValue == null) {\n            continue;\n        }\n\n        const values = Array.isArray(fieldValue) ? fieldValue : [fieldValue];\n\n        if (values.length === 0) {\n            continue;\n        }\n\n        for (const value of values) {\n            result[value] = {\n                value,\n                count: (result[value]?.count || 0) + 1\n            };\n        }\n    }\n\n    return Object.values(result)\n        .sort((a, b) => (a.value > b.value ? 1 : b.value > a.value ? -1 : 0))\n        .sort((a, b) => b.count - a.count);\n};\n"],"names":["createStorageModelAccessor","container","cached","getProvider","CmsStorageModelProvider","getModel","model","createStorageTransformCallable","storageTransformRegistry","field","value","fieldType","getBaseFieldType","storageTransform","result","ft","aggregateUniqueFieldValues","items","fieldId","item","fieldValue","values","Array","Object","a","b"],"mappings":";;AAeO,MAAMA,6BAA6B,CAACC;IACvC,IAAIC;IAEJ,MAAMC,cAAc;QAChB,IAAI,CAACD,QACDA,SAASD,UAAU,OAAO,CAACG;QAE/B,OAAOF;IACX;IAEA,MAAMG,WAAW,CACbC,QAEOH,cAAc,QAAQ,CAAIG;IAGrC,OAAO;QAAED;IAAS;AACtB;AAGO,MAAME,iCAAiC,CAC1CC,0BACAF,QAEO,OAAOG,OAAsBC;QAChC,MAAMC,YAAYC,iBAAiBH;QACnC,MAAMI,mBAAmBL,yBAAyB,GAAG,CAACG;QAEtD,IAAI,CAACE,kBACD,OAAOH;QAGX,MAAMI,SAAS,MAAMD,iBAAiB,WAAW,CAAC;YAC9CP;YACAG;YACAC;YACA,qBAAoBK,EAAU;gBAC1B,OAAOP,yBAAyB,GAAG,CAACO,OAAOP,yBAAyB,GAAG,CAAC;YAC5E;QACJ;QAEA,OAAOM;IACX;AAIG,MAAME,6BAA6B,CACtCC,OACAC;IAEA,MAAMJ,SAA8C,CAAC;IAErD,KAAK,MAAMK,QAAQF,MAAO;QACtB,MAAMG,aAAaD,KAAK,MAAM,CAACD,QAAQ;QAEvC,IAAIE,AAAc,QAAdA,YACA;QAGJ,MAAMC,SAASC,MAAM,OAAO,CAACF,cAAcA,aAAa;YAACA;SAAW;QAEpE,IAAIC,AAAkB,MAAlBA,OAAO,MAAM,EAIjB,KAAK,MAAMX,SAASW,OAChBP,MAAM,CAACJ,MAAM,GAAG;YACZA;YACA,OAAQI,AAAAA,CAAAA,MAAM,CAACJ,MAAM,EAAE,SAAS,KAAK;QACzC;IAER;IAEA,OAAOa,OAAO,MAAM,CAACT,QAChB,IAAI,CAAC,CAACU,GAAGC,IAAOD,EAAE,KAAK,GAAGC,EAAE,KAAK,GAAG,IAAIA,EAAE,KAAK,GAAGD,EAAE,KAAK,GAAG,KAAK,GACjE,IAAI,CAAC,CAACA,GAAGC,IAAMA,EAAE,KAAK,GAAGD,EAAE,KAAK;AACzC"}
+{"version":3,"file":"cms/storageHelpers.js","sources":["../../src/cms/storageHelpers.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryUniqueValue,\n    CmsEntryValues,\n    CmsModel,\n    CmsModelField,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { StorageOperationsCmsModelPlugin } from \"@webiny/api-headless-cms\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport type { StorageTransformRegistry } from \"@webiny/api-headless-cms/exports/api/cms/storage.js\";\nimport type { FilterItemFromStorage } from \"../filtering/fields/types.js\";\n\n/* Creates a lazy-cached getter for StorageOperationsCmsModelPlugin. */\nexport const createStorageModelAccessor = (plugins: PluginsContainer) => {\n    let cached: StorageOperationsCmsModelPlugin | undefined;\n\n    const getPlugin = () => {\n        if (cached) {\n            return cached;\n        }\n\n        cached = plugins.oneByType<StorageOperationsCmsModelPlugin>(\n            StorageOperationsCmsModelPlugin.type\n        );\n\n        return cached;\n    };\n\n    const getModel = <T extends CmsEntryValues = CmsEntryValues>(\n        model: CmsModel\n    ): StorageOperationsCmsModel<T> => {\n        const plugin = getPlugin();\n        return plugin.getModel<T>(model);\n    };\n\n    return { getPlugin, getModel };\n};\n\n/* Creates a fromStorage transform callable for a given model. */\nexport const createStorageTransformCallable = (\n    storageTransformRegistry: StorageTransformRegistry.Interface,\n    model: StorageOperationsCmsModel\n): FilterItemFromStorage => {\n    return async (field: CmsModelField, value: unknown) => {\n        const fieldType = getBaseFieldType(field);\n        const storageTransform = storageTransformRegistry.get(fieldType);\n\n        if (!storageTransform) {\n            return value;\n        }\n\n        const result = await storageTransform.fromStorage({\n            model,\n            field,\n            value,\n            getStorageTransform(ft: string) {\n                return storageTransformRegistry.get(ft) || storageTransformRegistry.get(\"*\")!;\n            }\n        });\n\n        return result;\n    };\n};\n\n/* Aggregates unique values for a given field across a list of CMS entries. */\nexport const aggregateUniqueFieldValues = <T extends CmsEntryValues = CmsEntryValues>(\n    items: CmsEntry<T>[],\n    fieldId: string\n): CmsEntryUniqueValue[] => {\n    const result: Record<string, CmsEntryUniqueValue> = {};\n\n    for (const item of items) {\n        const fieldValue = item.values[fieldId] as string[] | string | undefined;\n\n        if (fieldValue == null) {\n            continue;\n        }\n\n        const values = Array.isArray(fieldValue) ? fieldValue : [fieldValue];\n\n        if (values.length === 0) {\n            continue;\n        }\n\n        for (const value of values) {\n            result[value] = {\n                value,\n                count: (result[value]?.count || 0) + 1\n            };\n        }\n    }\n\n    return Object.values(result)\n        .sort((a, b) => (a.value > b.value ? 1 : b.value > a.value ? -1 : 0))\n        .sort((a, b) => b.count - a.count);\n};\n"],"names":["createStorageModelAccessor","plugins","cached","getPlugin","StorageOperationsCmsModelPlugin","getModel","model","plugin","createStorageTransformCallable","storageTransformRegistry","field","value","fieldType","getBaseFieldType","storageTransform","result","ft","aggregateUniqueFieldValues","items","fieldId","item","fieldValue","values","Array","Object","a","b"],"mappings":";;AAeO,MAAMA,6BAA6B,CAACC;IACvC,IAAIC;IAEJ,MAAMC,YAAY;QACd,IAAID,QACA,OAAOA;QAGXA,SAASD,QAAQ,SAAS,CACtBG,gCAAgC,IAAI;QAGxC,OAAOF;IACX;IAEA,MAAMG,WAAW,CACbC;QAEA,MAAMC,SAASJ;QACf,OAAOI,OAAO,QAAQ,CAAID;IAC9B;IAEA,OAAO;QAAEH;QAAWE;IAAS;AACjC;AAGO,MAAMG,iCAAiC,CAC1CC,0BACAH,QAEO,OAAOI,OAAsBC;QAChC,MAAMC,YAAYC,iBAAiBH;QACnC,MAAMI,mBAAmBL,yBAAyB,GAAG,CAACG;QAEtD,IAAI,CAACE,kBACD,OAAOH;QAGX,MAAMI,SAAS,MAAMD,iBAAiB,WAAW,CAAC;YAC9CR;YACAI;YACAC;YACA,qBAAoBK,EAAU;gBAC1B,OAAOP,yBAAyB,GAAG,CAACO,OAAOP,yBAAyB,GAAG,CAAC;YAC5E;QACJ;QAEA,OAAOM;IACX;AAIG,MAAME,6BAA6B,CACtCC,OACAC;IAEA,MAAMJ,SAA8C,CAAC;IAErD,KAAK,MAAMK,QAAQF,MAAO;QACtB,MAAMG,aAAaD,KAAK,MAAM,CAACD,QAAQ;QAEvC,IAAIE,AAAc,QAAdA,YACA;QAGJ,MAAMC,SAASC,MAAM,OAAO,CAACF,cAAcA,aAAa;YAACA;SAAW;QAEpE,IAAIC,AAAkB,MAAlBA,OAAO,MAAM,EAIjB,KAAK,MAAMX,SAASW,OAChBP,MAAM,CAACJ,MAAM,GAAG;YACZA;YACA,OAAQI,AAAAA,CAAAA,MAAM,CAACJ,MAAM,EAAE,SAAS,KAAK;QACzC;IAER;IAEA,OAAOa,OAAO,MAAM,CAACT,QAChB,IAAI,CAAC,CAACU,GAAGC,IAAOD,EAAE,KAAK,GAAGC,EAAE,KAAK,GAAG,IAAIA,EAAE,KAAK,GAAGD,EAAE,KAAK,GAAG,KAAK,GACjE,IAAI,CAAC,CAACA,GAAGC,IAAMA,EAAE,KAAK,GAAGD,EAAE,KAAK;AACzC"}

package/filtering/expressions/createExpressions.d.ts

@@ -1,11 +1,9 @@
 import type { CmsEntryListWhere } from "@webiny/api-headless-cms/types/index.js";
+import type { PluginsContainer } from "@webiny/plugins";
 import type { Field } from "../fields/types.js";
 import { ValueFilter, ValueFilterRegistry } from "@webiny/db-utils";
-import type { FieldFilterCreateRegistry } from "../../features/fieldFilterCreate/abstractions.js";
-import type { FieldFilterValueTransformRegistry } from "../../features/fieldFilterValueTransform/abstractions.js";
 interface ICreateExpressionsParams {
-    filterCreateRegistry: FieldFilterCreateRegistry.Interface;
-    transformRegistry: FieldFilterValueTransformRegistry.Interface;
+    plugins: PluginsContainer;
     valueFilterRegistry: ValueFilterRegistry.Interface;
     where: Partial<CmsEntryListWhere>;
     fields: Record<string, Field>;

package/filtering/expressions/createExpressions.js

@@ -1,17 +1,30 @@
 import error from "@webiny/error";
+import { getMappedPlugins } from "../mapPlugins.js";
 import { extractWhereParams } from "../where.js";
 import { transformValue } from "../transform.js";
-import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
+import { CmsEntryFieldFilterPlugin } from "../../plugins/CmsEntryFieldFilterPlugin.js";
 import { getWhereValues } from "../values.js";
+import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
 const createExpressions = (params)=>{
-    const { where, filterCreateRegistry, transformRegistry, fields, valueFilterRegistry } = params;
-    const getHandler = (type)=>{
+    const { where, plugins, fields, valueFilterRegistry } = params;
+    const transformValuePlugins = getMappedPlugins({
+        plugins,
+        type: "cms-field-filter-value-transform",
+        property: "fieldType"
+    });
+    const fieldFilterCreatePlugins = getMappedPlugins({
+        plugins,
+        type: CmsEntryFieldFilterPlugin.type,
+        property: "fieldType"
+    });
+    const defaultFilterCreatePlugin = fieldFilterCreatePlugins["*"];
+    const getFilterCreatePlugin = (type)=>{
         const fieldType = getBaseFieldType({
             type
         });
-        const handler = filterCreateRegistry.get(fieldType) || filterCreateRegistry.getDefault();
-        if (handler) return handler;
-        throw new error(`There is no filter create handler for the field type "${fieldType}".`, "MISSING_FILTER_CREATE_HANDLER", {
+        const filterCreatePlugin = fieldFilterCreatePlugins[fieldType] || defaultFilterCreatePlugin;
+        if (filterCreatePlugin) return filterCreatePlugin;
+        throw new error(`There is no filter create plugin for the field type "${fieldType}".`, "MISSING_FILTER_CREATE_PLUGIN", {
             fieldType
         });
     };
@@ -65,22 +78,22 @@ const createExpressions = (params)=>{
             if (!field) throw new error(`There is no field with the fieldId "${fieldId}".`, "FIELD_ERROR", {
                 fieldId
             });
-            const handler = getHandler(field.type);
+            const filterCreatePlugin = getFilterCreatePlugin(field.type);
             const fieldType = getBaseFieldType(field);
-            const transformHandler = transformRegistry.get(fieldType);
+            const transformValuePlugin = transformValuePlugins[fieldType];
             const transformValueCallable = (value)=>{
-                if (!transformHandler) return value;
-                return transformHandler.transform({
+                if (!transformValuePlugin) return value;
+                return transformValuePlugin.transform({
                     field,
                     value
                 });
             };
-            const result = handler.create({
+            const result = filterCreatePlugin.create({
                 key,
                 value,
                 valueFilterRegistry,
-                transformRegistry,
-                getHandler,
+                transformValuePlugins,
+                getFilterCreatePlugin,
                 operation,
                 negate,
                 field,

package/filtering/expressions/createExpressions.js.map

@@ -1 +1 @@
-{"version":3,"file":"filtering/expressions/createExpressions.js","sources":["../../../src/filtering/expressions/createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Field } from \"../fields/types.js\";\nimport { extractWhereParams } from \"../where.js\";\nimport { transformValue } from \"../transform.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { ValueFilter, ValueFilterRegistry } from \"@webiny/db-utils\";\nimport type { FieldFilterCreateRegistry } from \"../../features/fieldFilterCreate/abstractions.js\";\nimport type { FieldFilterValueTransformRegistry } from \"../../features/fieldFilterValueTransform/abstractions.js\";\nimport { getWhereValues } from \"../values.js\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\n}\n\ninterface ICreateExpressionsParams {\n    filterCreateRegistry: FieldFilterCreateRegistry.Interface;\n    transformRegistry: FieldFilterValueTransformRegistry.Interface;\n    valueFilterRegistry: ValueFilterRegistry.Interface;\n    where: Partial<CmsEntryListWhere>;\n    fields: Record<string, Field>;\n}\n\nexport type ExpressionCondition = \"AND\" | \"OR\";\n\nexport interface Expression {\n    expressions: Expression[];\n    filters: Filter[];\n    condition: ExpressionCondition;\n}\n\nexport interface Filter {\n    field: Field;\n    path: string;\n    fieldPathId: string;\n    filter: ValueFilter.Interface;\n    negate: boolean;\n    compareValue: any;\n    transformValue: <I = any, O = any>(value: I) => O;\n}\n\nexport const createExpressions = (params: ICreateExpressionsParams): Expression => {\n    const { where, filterCreateRegistry, transformRegistry, fields, valueFilterRegistry } = params;\n\n    const getHandler = (type: string) => {\n        const fieldType = getBaseFieldType({ type });\n        const handler = filterCreateRegistry.get(fieldType) || filterCreateRegistry.getDefault();\n        if (handler) {\n            return handler;\n        }\n        throw new WebinyError(\n            `There is no filter create handler for the field type \"${fieldType}\".`,\n            \"MISSING_FILTER_CREATE_HANDLER\",\n            { fieldType }\n        );\n    };\n\n    const createExpression = ({ where, condition }: CreateExpressionParams): Expression => {\n        const expression: Expression = {\n            filters: [],\n            expressions: [],\n            condition\n        };\n\n        for (const key in where) {\n            const value = where[key as keyof typeof where];\n            if (value === undefined) {\n                continue;\n            }\n\n            if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, key);\n                const childExpression: Expression = {\n                    condition: \"AND\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n            if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, key);\n                const childExpression: Expression = {\n                    condition: \"OR\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n\n            const whereParams = extractWhereParams(key);\n            if (!whereParams) {\n                continue;\n            }\n\n            const { fieldId, operation, negate } = whereParams;\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(\n                    `There is no field with the fieldId \"${fieldId}\".`,\n                    \"FIELD_ERROR\",\n                    { fieldId }\n                );\n            }\n\n            const handler = getHandler(field.type);\n            const fieldType = getBaseFieldType(field);\n            const transformHandler = transformRegistry.get(fieldType);\n\n            const transformValueCallable = (value: any) => {\n                if (!transformHandler) {\n                    return value;\n                }\n                return transformHandler.transform({ field, value });\n            };\n\n            const result = handler.create({\n                key,\n                value,\n                valueFilterRegistry,\n                transformRegistry,\n                getHandler,\n                operation,\n                negate,\n                field,\n                fields,\n                compareValue: transformValue({\n                    value,\n                    transform: transformValueCallable\n                }),\n                transformValue: transformValueCallable\n            });\n\n            if (!result || (Array.isArray(result) && result.length === 0)) {\n                continue;\n            }\n\n            expression.filters.push(...(Array.isArray(result) ? result : [result]));\n        }\n\n        return expression;\n    };\n\n    const expression = createExpression({\n        where,\n        condition: \"AND\"\n    });\n\n    if (expression.filters.length > 0 || expression.expressions.length !== 1) {\n        return expression;\n    }\n    return expression.expressions[0];\n};\n"],"names":["createExpressions","params","where","filterCreateRegistry","transformRegistry","fields","valueFilterRegistry","getHandler","type","fieldType","getBaseFieldType","handler","WebinyError","createExpression","condition","expression","key","value","undefined","childWhereList","getWhereValues","childExpression","childWhere","result","whereParams","extractWhereParams","fieldId","operation","negate","field","transformHandler","transformValueCallable","transformValue","Array"],"mappings":"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"}
+{"version":3,"file":"filtering/expressions/createExpressions.js","sources":["../../../src/filtering/expressions/createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ICmsFieldFilterValueTransformPlugin } from \"../../plugins/CmsFieldFilterValueTransformPlugin.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Field } from \"../fields/types.js\";\nimport { getMappedPlugins } from \"../mapPlugins.js\";\nimport { extractWhereParams } from \"../where.js\";\nimport { transformValue } from \"../transform.js\";\nimport { CmsEntryFieldFilterPlugin } from \"../../plugins/CmsEntryFieldFilterPlugin.js\";\nimport { getWhereValues } from \"../values.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { ValueFilter, ValueFilterRegistry } from \"@webiny/db-utils\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\n}\n\ninterface ICreateExpressionsParams {\n    plugins: PluginsContainer;\n    valueFilterRegistry: ValueFilterRegistry.Interface;\n    where: Partial<CmsEntryListWhere>;\n    fields: Record<string, Field>;\n}\n\nexport type ExpressionCondition = \"AND\" | \"OR\";\n\nexport interface Expression {\n    expressions: Expression[];\n    filters: Filter[];\n    condition: ExpressionCondition;\n}\n\nexport interface Filter {\n    field: Field;\n    path: string;\n    fieldPathId: string;\n    filter: ValueFilter.Interface;\n    negate: boolean;\n    compareValue: any;\n    transformValue: <I = any, O = any>(value: I) => O;\n}\n\nexport const createExpressions = (params: ICreateExpressionsParams): Expression => {\n    const { where, plugins, fields, valueFilterRegistry } = params;\n\n    const transformValuePlugins = getMappedPlugins<ICmsFieldFilterValueTransformPlugin>({\n        plugins,\n        type: \"cms-field-filter-value-transform\",\n        property: \"fieldType\"\n    });\n    const fieldFilterCreatePlugins = getMappedPlugins<CmsEntryFieldFilterPlugin>({\n        plugins,\n        type: CmsEntryFieldFilterPlugin.type,\n        property: \"fieldType\"\n    });\n\n    const defaultFilterCreatePlugin = fieldFilterCreatePlugins[\"*\"] as CmsEntryFieldFilterPlugin;\n\n    const getFilterCreatePlugin = (type: string) => {\n        const fieldType = getBaseFieldType({\n            type\n        });\n        const filterCreatePlugin = fieldFilterCreatePlugins[fieldType] || defaultFilterCreatePlugin;\n        if (filterCreatePlugin) {\n            return filterCreatePlugin;\n        }\n        throw new WebinyError(\n            `There is no filter create plugin for the field type \"${fieldType}\".`,\n            \"MISSING_FILTER_CREATE_PLUGIN\",\n            {\n                fieldType\n            }\n        );\n    };\n\n    const createExpression = ({ where, condition }: CreateExpressionParams): Expression => {\n        const expression: Expression = {\n            filters: [],\n            expressions: [],\n            condition\n        };\n\n        for (const key in where) {\n            const value = where[key as keyof typeof where];\n            if (value === undefined) {\n                continue;\n            }\n\n            /*\n             * If there are \"AND\" or \"OR\" keys, let's sort them out first.\n             *\n             * AND conditional.\n             */\n            if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, key);\n                const childExpression: Expression = {\n                    condition: \"AND\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n            /* OR conditional. */\n            if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, key);\n\n                const childExpression: Expression = {\n                    condition: \"OR\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n\n            const whereParams = extractWhereParams(key);\n            if (!whereParams) {\n                continue;\n            }\n\n            const { fieldId, operation, negate } = whereParams;\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(\n                    `There is no field with the fieldId \"${fieldId}\".`,\n                    \"FIELD_ERROR\",\n                    {\n                        fieldId\n                    }\n                );\n            }\n\n            /* We need a filter create plugin for this type. */\n            const filterCreatePlugin = getFilterCreatePlugin(field.type);\n\n            const fieldType = getBaseFieldType(field);\n\n            const transformValuePlugin: ICmsFieldFilterValueTransformPlugin =\n                transformValuePlugins[fieldType];\n\n            const transformValueCallable = (value: any) => {\n                if (!transformValuePlugin) {\n                    return value;\n                }\n                return transformValuePlugin.transform({\n                    field,\n                    value\n                });\n            };\n\n            const result = filterCreatePlugin.create({\n                key,\n                value,\n                valueFilterRegistry,\n                transformValuePlugins,\n                getFilterCreatePlugin,\n                operation,\n                negate,\n                field,\n                fields,\n                compareValue: transformValue({\n                    value,\n                    transform: transformValueCallable\n                }),\n                transformValue: transformValueCallable\n            });\n            /*\n             * There is a possibility of:\n             * - no result\n             * - result being an array\n             * - result being an object.\n             */\n            if (!result || (Array.isArray(result) && result.length === 0)) {\n                continue;\n            }\n\n            expression.filters.push(...(Array.isArray(result) ? result : [result]));\n        }\n\n        return expression;\n    };\n\n    const expression = createExpression({\n        where,\n        condition: \"AND\"\n    });\n    /*\n     * If the first expression has no filters and has only one expression, put that expression as main one.\n     * This will mostly be used when having an OR condition as the single expression in the root level of the where.\n     */\n    if (expression.filters.length > 0 || expression.expressions.length !== 1) {\n        return expression;\n    }\n    return expression.expressions[0];\n};\n"],"names":["createExpressions","params","where","plugins","fields","valueFilterRegistry","transformValuePlugins","getMappedPlugins","fieldFilterCreatePlugins","CmsEntryFieldFilterPlugin","defaultFilterCreatePlugin","getFilterCreatePlugin","type","fieldType","getBaseFieldType","filterCreatePlugin","WebinyError","createExpression","condition","expression","key","value","undefined","childWhereList","getWhereValues","childExpression","childWhere","result","whereParams","extractWhereParams","fieldId","operation","negate","field","transformValuePlugin","transformValueCallable","transformValue","Array"],"mappings":"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"}

package/filtering/fields/createFields.d.ts

@@ -1,11 +1,9 @@
 import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
 import type { Field } from "./types.js";
-import type { FieldFilterPathRegistry } from "../../features/fieldFilterPath/abstractions.js";
-import type { FieldFilterValueTransformRegistry } from "../../features/fieldFilterValueTransform/abstractions.js";
+import type { PluginsContainer } from "@webiny/plugins";
 interface Params {
     fields: CmsModelField[];
-    pathRegistry: FieldFilterPathRegistry.Interface;
-    transformRegistry: FieldFilterValueTransformRegistry.Interface;
+    plugins: PluginsContainer;
 }
 export declare const createFields: (params: Params) => {
     [x: string]: Field;

package/filtering/fields/createFields.js

@@ -1,11 +1,13 @@
 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, pathRegistry, transformRegistry, system } = params;
+    const { fields, parents, transformValuePlugins, valuePathPlugins, system } = params;
     return fields.reduce((collection, field)=>{
         const fieldType = getBaseFieldType(field);
-        const transformHandler = transformRegistry.get(fieldType);
-        const pathHandler = pathRegistry.get(fieldType);
+        const transformPlugin = transformValuePlugins[fieldType];
+        const valuePathPlugin = valuePathPlugins[fieldType];
         const fieldId = [
             ...parents,
             {
@@ -17,15 +19,15 @@ const createFieldCollection = (params)=>{
             ...field,
             parents,
             system,
-            createPath: (pathParams)=>{
-                if (pathHandler && pathHandler.canUse(field, parents.map((p)=>p.fieldId))) return pathHandler.createPath(pathParams);
+            createPath: (params)=>{
+                if (valuePathPlugin && valuePathPlugin.canUse(field, parents.map((p)=>p.fieldId))) return valuePathPlugin.createPath(params);
                 return parents.map((parent)=>parent.fieldId).concat([
-                    pathParams.field.fieldId
+                    params.field.fieldId
                 ]).join(".");
             },
             transform: (value)=>{
-                if (!transformHandler) return value;
-                return transformHandler.transform({
+                if (!transformPlugin) return value;
+                return transformPlugin.transform({
                     field,
                     value
                 });
@@ -42,8 +44,8 @@ const createFieldCollection = (params)=>{
                     list: field.list
                 }
             ],
-            pathRegistry,
-            transformRegistry,
+            transformValuePlugins,
+            valuePathPlugins,
             system
         });
         Object.assign(collection, result);
@@ -51,18 +53,28 @@ const createFieldCollection = (params)=>{
     }, {});
 };
 const createFields = (params)=>{
-    const { fields, pathRegistry, transformRegistry } = 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(),
-        pathRegistry,
-        transformRegistry,
+        transformValuePlugins,
+        valuePathPlugins,
         parents: [],
         system: true
     });
     const result = createFieldCollection({
         fields,
-        pathRegistry,
-        transformRegistry,
+        transformValuePlugins,
+        valuePathPlugins,
         parents: [
             {
                 fieldId: "values",

package/filtering/fields/createFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"filtering/fields/createFields.js","sources":["../../../src/filtering/fields/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 { FieldFilterPathRegistry } from \"../../features/fieldFilterPath/abstractions.js\";\nimport type { FieldFilterValueTransformRegistry } from \"../../features/fieldFilterValueTransform/abstractions.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface Params {\n    fields: CmsModelField[];\n    pathRegistry: FieldFilterPathRegistry.Interface;\n    transformRegistry: FieldFilterValueTransformRegistry.Interface;\n}\n\ninterface FieldCollection {\n    [key: string]: Field;\n}\n\ninterface AddFieldsToCollectionParams {\n    fields: CmsModelField[];\n    parents: FieldParent[];\n    pathRegistry: FieldFilterPathRegistry.Interface;\n    transformRegistry: FieldFilterValueTransformRegistry.Interface;\n    system: boolean;\n}\n\nconst createFieldCollection = (params: AddFieldsToCollectionParams): FieldCollection => {\n    const { fields, parents, pathRegistry, transformRegistry, system } = params;\n    return fields.reduce<FieldCollection>((collection, field) => {\n        const fieldType = getBaseFieldType(field);\n        const transformHandler = transformRegistry.get(fieldType);\n        const pathHandler = pathRegistry.get(fieldType);\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: pathParams => {\n                if (\n                    pathHandler &&\n                    pathHandler.canUse(\n                        field,\n                        parents.map(p => p.fieldId)\n                    )\n                ) {\n                    return pathHandler.createPath(pathParams);\n                }\n\n                return parents\n                    .map(parent => parent.fieldId)\n                    .concat([pathParams.field.fieldId])\n                    .join(\".\");\n            },\n            transform: value => {\n                if (!transformHandler) {\n                    return value;\n                }\n                return transformHandler.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            pathRegistry,\n            transformRegistry,\n            system\n        });\n        Object.assign(collection, result);\n        return collection;\n    }, {});\n};\n\nexport const createFields = (params: Params) => {\n    const { fields, pathRegistry, transformRegistry } = params;\n\n    const collection = createFieldCollection({\n        fields: createSystemFields(),\n        pathRegistry,\n        transformRegistry,\n        parents: [],\n        system: true\n    });\n\n    const result = createFieldCollection({\n        fields,\n        pathRegistry,\n        transformRegistry,\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","pathRegistry","transformRegistry","system","collection","field","fieldType","getBaseFieldType","transformHandler","pathHandler","fieldId","f","pathParams","p","parent","value","childFields","result","Object","createFields","createSystemFields"],"mappings":";;AAyBA,MAAMA,wBAAwB,CAACC;IAC3B,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAEC,YAAY,EAAEC,iBAAiB,EAAEC,MAAM,EAAE,GAAGL;IACrE,OAAOC,OAAO,MAAM,CAAkB,CAACK,YAAYC;QAC/C,MAAMC,YAAYC,iBAAiBF;QACnC,MAAMG,mBAAmBN,kBAAkB,GAAG,CAACI;QAC/C,MAAMG,cAAcR,aAAa,GAAG,CAACK;QAErC,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,YAAYS,CAAAA;gBACR,IACIH,eACAA,YAAY,MAAM,CACdJ,OACAL,QAAQ,GAAG,CAACa,CAAAA,IAAKA,EAAE,OAAO,IAG9B,OAAOJ,YAAY,UAAU,CAACG;gBAGlC,OAAOZ,QACF,GAAG,CAACc,CAAAA,SAAUA,OAAO,OAAO,EAC5B,MAAM,CAAC;oBAACF,WAAW,KAAK,CAAC,OAAO;iBAAC,EACjC,IAAI,CAAC;YACd;YACA,WAAWG,CAAAA;gBACP,IAAI,CAACP,kBACD,OAAOO;gBAEX,OAAOP,iBAAiB,SAAS,CAAC;oBAC9BH;oBACAU;gBACJ;YACJ;QACJ;QACA,MAAMC,cAAcX,MAAM,QAAQ,EAAE;QACpC,IAAI,CAACW,aAAa,QACd,OAAOZ;QAGX,MAAMa,SAASpB,sBAAsB;YACjC,QAAQmB;YACR,SAAS;mBACFhB;gBACH;oBACI,SAASK,MAAM,OAAO;oBACtB,MAAMA,MAAM,IAAI;gBACpB;aACH;YACDJ;YACAC;YACAC;QACJ;QACAe,OAAO,MAAM,CAACd,YAAYa;QAC1B,OAAOb;IACX,GAAG,CAAC;AACR;AAEO,MAAMe,eAAe,CAACrB;IACzB,MAAM,EAAEC,MAAM,EAAEE,YAAY,EAAEC,iBAAiB,EAAE,GAAGJ;IAEpD,MAAMM,aAAaP,sBAAsB;QACrC,QAAQuB;QACRnB;QACAC;QACA,SAAS,EAAE;QACX,QAAQ;IACZ;IAEA,MAAMe,SAASpB,sBAAsB;QACjCE;QACAE;QACAC;QACA,SAAS;YACL;gBACI,SAAS;gBACT,MAAM;YACV;SACH;QACD,QAAQ;IACZ;IAEA,OAAO;QACH,GAAGE,UAAU;QACb,GAAGa,MAAM;IACb;AACJ"}
+{"version":3,"file":"filtering/fields/createFields.js","sources":["../../../src/filtering/fields/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 { ICmsFieldFilterValueTransformPlugin } from \"../../plugins/CmsFieldFilterValueTransformPlugin.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, ICmsFieldFilterValueTransformPlugin>;\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        /* The required fieldId is a product of all of its parents and its own fieldId. */\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<ICmsFieldFilterValueTransformPlugin>({\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;QAGnD,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,iBAAsD;QAChFD;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/filtering/fields/extractSort.d.ts

@@ -1,6 +1,6 @@
 import type { Field } from "./types.js";
+import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
-import type { FieldSortingRegistry } from "../../features/fieldSorting/abstractions.js";
 interface IResponse {
     valuePath: string;
     reverse: boolean;
@@ -11,7 +11,7 @@ interface IParams {
     model: CmsModel;
     sortBy: string;
     fields: Record<string, Field>;
-    sortingRegistry: FieldSortingRegistry.Interface;
+    plugins: PluginsContainer;
 }
 export declare const extractSort: (params: IParams) => IResponse;
 export {};

package/filtering/fields/extractSort.js

@@ -1,4 +1,5 @@
 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 {
@@ -17,7 +18,7 @@ const extractSortInfo = (sortBy)=>{
     });
 };
 const extractSort = (params)=>{
-    const { model, sortBy, fields, sortingRegistry } = 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";
@@ -25,14 +26,14 @@ const extractSort = (params)=>{
         if (f.parents.length > 0) return false;
         return f.fieldId === fieldId;
     });
-    const handler = sortingRegistry.find({
-        model,
-        field,
-        fieldId,
-        order,
-        sortBy
-    });
-    if (handler) return handler.createSort({
+    const plugin = plugins.byType(CmsEntryFieldSortingPlugin.type).reverse().find((plugin)=>plugin.canUse({
+            model,
+            field,
+            fieldId,
+            order,
+            sortBy
+        }));
+    if (plugin) return plugin.createSort({
         model,
         fieldId,
         order,

package/filtering/fields/extractSort.js.map

@@ -1 +1 @@
-{"version":3,"file":"filtering/fields/extractSort.js","sources":["../../../src/filtering/fields/extractSort.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { Field } from \"./types.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { FieldSortingRegistry } from \"../../features/fieldSorting/abstractions.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    sortingRegistry: FieldSortingRegistry.Interface;\n}\n\nexport const extractSort = (params: IParams): IResponse => {\n    const { model, sortBy, fields, sortingRegistry } = params;\n    const { fieldId, isValues: isValuesSorting, order } = extractSortInfo(sortBy);\n\n    const field = Object.values(fields).find(f => {\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 handler = sortingRegistry.find({\n        model,\n        field,\n        fieldId,\n        order,\n        sortBy\n    });\n\n    if (handler) {\n        return handler.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","sortingRegistry","fieldId","isValuesSorting","order","field","Object","f","isValues","handler","valuePath"],"mappings":";AAKA,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,eAAe,EAAE,GAAGH;IACnD,MAAM,EAAEI,OAAO,EAAE,UAAUC,eAAe,EAAEC,KAAK,EAAE,GAAGZ,gBAAgBC;IAEtE,MAAMY,QAAQC,OAAO,MAAM,CAACN,QAAQ,IAAI,CAACO,CAAAA;QACrC,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,UAAUR,gBAAgB,IAAI,CAAC;QACjCF;QACAM;QACAH;QACAE;QACAX;IACJ;IAEA,IAAIgB,SACA,OAAOA,QAAQ,UAAU,CAAC;QACtBV;QACAG;QACAE;QACAX;QACAY;QACAL;IACJ;IACG,IAAI,CAACK,OACR,MAAM,IAAIT,MACN,sDACA,uBACA;QACIM;QACAF;IACJ;IAGR,MAAMU,YAAYL,MAAM,UAAU,CAAC;QAC/BA;IACJ;IACA,OAAO;QACHA;QACAH;QACAQ;QACA,SAASN,AAAU,WAAVA;IACb;AACJ"}
+{"version":3,"file":"filtering/fields/extractSort.js","sources":["../../../src/filtering/fields/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        /* We do not support sorting by nested fields. */\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;QAErC,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/filtering/filter.d.ts

@@ -1,11 +1,9 @@
 import type { CmsEntry, CmsEntryListWhere, CmsEntryValues } from "@webiny/api-headless-cms/types/index.js";
+import type { PluginsContainer } from "@webiny/plugins";
 import type { Field } from "./fields/types.js";
 import { ValueFilterRegistry } from "@webiny/db-utils";
-import type { FieldFilterCreateRegistry } from "../features/fieldFilterCreate/abstractions.js";
-import type { FieldFilterValueTransformRegistry } from "../features/fieldFilterValueTransform/abstractions.js";
 interface IFilterParams<T extends CmsEntryValues = CmsEntryValues> {
-    filterCreateRegistry: FieldFilterCreateRegistry.Interface;
-    transformRegistry: FieldFilterValueTransformRegistry.Interface;
+    plugins: PluginsContainer;
     valueFilterRegistry: ValueFilterRegistry.Interface;
     items: CmsEntry<T>[];
     where: Partial<CmsEntryListWhere>;

package/filtering/filter.js

@@ -39,12 +39,11 @@ const executeExpressions = (params)=>{
     return "OR" !== condition;
 };
 const filter_filter = (params)=>{
-    const { items: records, where, filterCreateRegistry, transformRegistry, fields, fullTextSearch, valueFilterRegistry } = params;
+    const { items: records, where, plugins, fields, fullTextSearch, valueFilterRegistry } = params;
     const keys = Object.keys(where);
     if (0 === keys.length && !fullTextSearch) return records;
     const expression = createExpressions({
-        filterCreateRegistry,
-        transformRegistry,
+        plugins,
         where,
         fields,
         valueFilterRegistry

package/filtering/filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"filtering/filter.js","sources":["../../src/filtering/filter.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryListWhere,\n    CmsEntryValues\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { Field } from \"./fields/types.js\";\nimport { createFullTextSearch } from \"./fullTextSearch.js\";\nimport type { Expression, ExpressionCondition, Filter } from \"./expressions/createExpressions.js\";\nimport { createExpressions } from \"./expressions/createExpressions.js\";\nimport { transformValue } from \"./transform.js\";\nimport { getValue } from \"./getValue.js\";\nimport { ValueFilterRegistry } from \"@webiny/db-utils\";\nimport type { FieldFilterCreateRegistry } from \"../features/fieldFilterCreate/abstractions.js\";\nimport type { FieldFilterValueTransformRegistry } from \"../features/fieldFilterValueTransform/abstractions.js\";\n\ninterface ExecuteFilterParams {\n    value: any;\n    filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n    const { value, filter } = params;\n\n    const canUse = filter.filter.canUse({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (!canUse) {\n        return true;\n    }\n\n    const matched = filter.filter.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    for (const filter of filters) {\n        const value = getCachedValue(filter);\n\n        const result = executeFilter({\n            value,\n            filter\n        });\n        if (!result) {\n            return false;\n        }\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    return condition === \"OR\" ? false : true;\n};\n\ninterface IFilterParams<T extends CmsEntryValues = CmsEntryValues> {\n    filterCreateRegistry: FieldFilterCreateRegistry.Interface;\n    transformRegistry: FieldFilterValueTransformRegistry.Interface;\n    valueFilterRegistry: ValueFilterRegistry.Interface;\n    items: CmsEntry<T>[];\n    where: Partial<CmsEntryListWhere>;\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: IFilterParams<T>\n): CmsEntry<T>[] => {\n    const {\n        items: records,\n        where,\n        filterCreateRegistry,\n        transformRegistry,\n        fields,\n        fullTextSearch,\n        valueFilterRegistry\n    } = params;\n\n    const keys = Object.keys(where);\n    if (keys.length === 0 && !fullTextSearch) {\n        return records;\n    }\n    const expression = createExpressions({\n        filterCreateRegistry,\n        transformRegistry,\n        where,\n        fields,\n        valueFilterRegistry\n    });\n\n    if (\n        expression.filters.length === 0 &&\n        expression.expressions.length === 0 &&\n        !fullTextSearch?.term\n    ) {\n        return records;\n    }\n    const fullTextSearchFilter = valueFilterRegistry.get(\"contains\");\n    if (!fullTextSearchFilter) {\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        filter: fullTextSearchFilter\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        if (!exprResult || !search) {\n            return exprResult;\n        }\n\n        return search(record);\n    });\n};\n"],"names":["executeFilter","params","value","filter","canUse","matched","executeExpressions","expressions","getCachedValue","filters","condition","result","expression","records","where","filterCreateRegistry","transformRegistry","fields","fullTextSearch","valueFilterRegistry","keys","Object","createExpressions","fullTextSearchFilter","WebinyError","search","createFullTextSearch","record","cachedValues","path","undefined","plainValue","getValue","rawValue","transformValue","exprResult"],"mappings":";;;;;AAqBA,MAAMA,gBAAgB,CAACC;IACnB,MAAM,EAAEC,KAAK,EAAEC,MAAM,EAAE,GAAGF;IAE1B,MAAMG,SAASD,OAAO,MAAM,CAAC,MAAM,CAAC;QAChCD;QACA,cAAcC,OAAO,YAAY;IACrC;IACA,IAAI,CAACC,QACD,OAAO;IAGX,MAAMC,UAAUF,OAAO,MAAM,CAAC,OAAO,CAAC;QAClCD;QACA,cAAcC,OAAO,YAAY;IACrC;IACA,IAAIA,OAAO,MAAM,EACb,OAAOE,AAAY,UAAZA;IAEX,OAAOA;AACX;AASA,MAAMC,qBAAqB,CAACL;IACxB,MAAM,EAAEM,WAAW,EAAEC,cAAc,EAAEC,OAAO,EAAEC,SAAS,EAAE,GAAGT;IAC5D,IAAIM,AAAuB,MAAvBA,YAAY,MAAM,IAAUE,AAAmB,MAAnBA,QAAQ,MAAM,EAC1C,OAAO;IAEX,KAAK,MAAMN,UAAUM,QAAS;QAC1B,MAAMP,QAAQM,eAAeL;QAE7B,MAAMQ,SAASX,cAAc;YACzBE;YACAC;QACJ;QACA,IAAI,CAACQ,QACD,OAAO;IAEf;IACA,KAAK,MAAMC,cAAcL,YAAa;QAClC,MAAMI,SAASL,mBAAmB;YAC9B,GAAGM,UAAU;YACbJ;QACJ;QACA,IAAIG,UAAUD,AAAc,SAAdA,WACV,OAAO;QACJ,IAAI,CAACC,UAAUD,AAAa,SAAbA,WAClB,OAAO;IAEf;IACA,OAAOA,AAAc,SAAdA;AACX;AAeO,MAAMP,gBAAS,CAClBF;IAEA,MAAM,EACF,OAAOY,OAAO,EACdC,KAAK,EACLC,oBAAoB,EACpBC,iBAAiB,EACjBC,MAAM,EACNC,cAAc,EACdC,mBAAmB,EACtB,GAAGlB;IAEJ,MAAMmB,OAAOC,OAAO,IAAI,CAACP;IACzB,IAAIM,AAAgB,MAAhBA,KAAK,MAAM,IAAU,CAACF,gBACtB,OAAOL;IAEX,MAAMD,aAAaU,kBAAkB;QACjCP;QACAC;QACAF;QACAG;QACAE;IACJ;IAEA,IACIP,AAA8B,MAA9BA,WAAW,OAAO,CAAC,MAAM,IACzBA,AAAkC,MAAlCA,WAAW,WAAW,CAAC,MAAM,IAC7B,CAACM,gBAAgB,MAEjB,OAAOL;IAEX,MAAMU,uBAAuBJ,oBAAoB,GAAG,CAAC;IACrD,IAAI,CAACI,sBACD,MAAM,IAAIC,MACN,0DACA;IAIR,MAAMC,SAASC,qBAAqB;QAChC,MAAMR,gBAAgB;QACtB,cAAcA,gBAAgB;QAC9BD;QACA,QAAQM;IACZ;IAEA,OAAOV,QAAQ,MAAM,CAACc,CAAAA;QAClB,MAAMC,eAAoC,CAAC;QAE3C,MAAMpB,iBAAiB,CAACL;YACpB,MAAM,EAAE0B,IAAI,EAAE,GAAG1B;YACjB,IAAIyB,AAAuBE,WAAvBF,YAAY,CAACC,KAAK,EAClB,OAAOD,YAAY,CAACC,KAAK;YAE7B,MAAME,aAAaC,SAASL,QAAQE;YAEpC,MAAMI,WAAWC,eAAe;gBAC5B,OAAOH;gBACP,WAAW5B,OAAO,cAAc;YACpC;YAEAyB,YAAY,CAACC,KAAK,GAAGI;YACrB,OAAOA;QACX;QAEA,MAAME,aAAa7B,mBAAmB;YAAE,GAAGM,UAAU;YAAEJ;QAAe;QACtE,IAAI,CAAC2B,cAAc,CAACV,QAChB,OAAOU;QAGX,OAAOV,OAAOE;IAClB;AACJ"}
+{"version":3,"file":"filtering/filter.js","sources":["../../src/filtering/filter.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryListWhere,\n    CmsEntryValues\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Field } from \"./fields/types.js\";\nimport { createFullTextSearch } from \"./fullTextSearch.js\";\nimport type { Expression, ExpressionCondition, Filter } from \"./expressions/createExpressions.js\";\nimport { createExpressions } from \"./expressions/createExpressions.js\";\nimport { transformValue } from \"./transform.js\";\nimport { getValue } from \"./getValue.js\";\nimport { ValueFilterRegistry } from \"@webiny/db-utils\";\n\ninterface ExecuteFilterParams {\n    value: any;\n    filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n    const { value, filter } = params;\n\n    /* We need to check if the filter can be used. If it cannot, we will just return true. */\n    const canUse = filter.filter.canUse({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (!canUse) {\n        return true;\n    }\n\n    const matched = filter.filter.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    /* Always run filters first as they might trigger an early return. */\n    for (const filter of filters) {\n        const value = getCachedValue(filter);\n\n        const result = executeFilter({\n            value,\n            filter\n        });\n        /* Filters are ALWAYS executed as an AND. So if even one is false, everything false. */\n        if (!result) {\n            return false;\n        }\n    }\n    /* Then we move onto expressions, which are basically nested upon nested filters with different conditions. */\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 IFilterParams<T extends CmsEntryValues = CmsEntryValues> {\n    plugins: PluginsContainer;\n    valueFilterRegistry: ValueFilterRegistry.Interface;\n    items: CmsEntry<T>[];\n    where: Partial<CmsEntryListWhere>;\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: IFilterParams<T>\n): CmsEntry<T>[] => {\n    const { items: records, where, plugins, fields, fullTextSearch, valueFilterRegistry } = 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        valueFilterRegistry\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    if (\n        expression.filters.length === 0 &&\n        expression.expressions.length === 0 &&\n        !fullTextSearch?.term\n    ) {\n        return records;\n    }\n    /* We need the contains plugin to run the full text search. */\n    const fullTextSearchFilter = valueFilterRegistry.get(\"contains\");\n    if (!fullTextSearchFilter) {\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        filter: fullTextSearchFilter\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"],"names":["executeFilter","params","value","filter","canUse","matched","executeExpressions","expressions","getCachedValue","filters","condition","result","expression","records","where","plugins","fields","fullTextSearch","valueFilterRegistry","keys","Object","createExpressions","fullTextSearchFilter","WebinyError","search","createFullTextSearch","record","cachedValues","path","undefined","plainValue","getValue","rawValue","transformValue","exprResult"],"mappings":";;;;;AAoBA,MAAMA,gBAAgB,CAACC;IACnB,MAAM,EAAEC,KAAK,EAAEC,MAAM,EAAE,GAAGF;IAG1B,MAAMG,SAASD,OAAO,MAAM,CAAC,MAAM,CAAC;QAChCD;QACA,cAAcC,OAAO,YAAY;IACrC;IACA,IAAI,CAACC,QACD,OAAO;IAGX,MAAMC,UAAUF,OAAO,MAAM,CAAC,OAAO,CAAC;QAClCD;QACA,cAAcC,OAAO,YAAY;IACrC;IACA,IAAIA,OAAO,MAAM,EACb,OAAOE,AAAY,UAAZA;IAEX,OAAOA;AACX;AASA,MAAMC,qBAAqB,CAACL;IACxB,MAAM,EAAEM,WAAW,EAAEC,cAAc,EAAEC,OAAO,EAAEC,SAAS,EAAE,GAAGT;IAC5D,IAAIM,AAAuB,MAAvBA,YAAY,MAAM,IAAUE,AAAmB,MAAnBA,QAAQ,MAAM,EAC1C,OAAO;IAGX,KAAK,MAAMN,UAAUM,QAAS;QAC1B,MAAMP,QAAQM,eAAeL;QAE7B,MAAMQ,SAASX,cAAc;YACzBE;YACAC;QACJ;QAEA,IAAI,CAACQ,QACD,OAAO;IAEf;IAEA,KAAK,MAAMC,cAAcL,YAAa;QAClC,MAAMI,SAASL,mBAAmB;YAC9B,GAAGM,UAAU;YACbJ;QACJ;QACA,IAAIG,UAAUD,AAAc,SAAdA,WACV,OAAO;QACJ,IAAI,CAACC,UAAUD,AAAa,SAAbA,WAClB,OAAO;IAEf;IAMA,OAAOA,AAAc,SAAdA;AACX;AAcO,MAAMP,gBAAS,CAClBF;IAEA,MAAM,EAAE,OAAOY,OAAO,EAAEC,KAAK,EAAEC,OAAO,EAAEC,MAAM,EAAEC,cAAc,EAAEC,mBAAmB,EAAE,GAAGjB;IAExF,MAAMkB,OAAOC,OAAO,IAAI,CAACN;IACzB,IAAIK,AAAgB,MAAhBA,KAAK,MAAM,IAAU,CAACF,gBACtB,OAAOJ;IAEX,MAAMD,aAAaS,kBAAkB;QACjCN;QACAD;QACAE;QACAE;IACJ;IAGA,IACIN,AAA8B,MAA9BA,WAAW,OAAO,CAAC,MAAM,IACzBA,AAAkC,MAAlCA,WAAW,WAAW,CAAC,MAAM,IAC7B,CAACK,gBAAgB,MAEjB,OAAOJ;IAGX,MAAMS,uBAAuBJ,oBAAoB,GAAG,CAAC;IACrD,IAAI,CAACI,sBACD,MAAM,IAAIC,MACN,0DACA;IAIR,MAAMC,SAASC,qBAAqB;QAChC,MAAMR,gBAAgB;QACtB,cAAcA,gBAAgB;QAC9BD;QACA,QAAQM;IACZ;IAEA,OAAOT,QAAQ,MAAM,CAACa,CAAAA;QAClB,MAAMC,eAAoC,CAAC;QAE3C,MAAMnB,iBAAiB,CAACL;YACpB,MAAM,EAAEyB,IAAI,EAAE,GAAGzB;YACjB,IAAIwB,AAAuBE,WAAvBF,YAAY,CAACC,KAAK,EAClB,OAAOD,YAAY,CAACC,KAAK;YAE7B,MAAME,aAAaC,SAASL,QAAQE;YAEpC,MAAMI,WAAWC,eAAe;gBAC5B,OAAOH;gBACP,WAAW3B,OAAO,cAAc;YACpC;YAEAwB,YAAY,CAACC,KAAK,GAAGI;YACrB,OAAOA;QACX;QAEA,MAAME,aAAa5B,mBAAmB;YAAE,GAAGM,UAAU;YAAEJ;QAAe;QAKtE,IAAI,CAAC0B,cAAc,CAACV,QAChB,OAAOU;QAGX,OAAOV,OAAOE;IAClB;AACJ"}

package/filtering/sort.d.ts

@@ -1,12 +1,12 @@
 import type { CmsEntry, CmsEntryValues, CmsModel } from "@webiny/api-headless-cms/types/index.js";
 import type { Field } from "./fields/types.js";
-import type { FieldSortingRegistry } from "../features/fieldSorting/abstractions.js";
+import type { PluginsContainer } from "@webiny/plugins";
 interface Params<T extends CmsEntryValues = CmsEntryValues> {
     model: CmsModel;
     items: CmsEntry<T>[];
     sort?: string[];
     fields: Record<string, Field>;
-    sortingRegistry: FieldSortingRegistry.Interface;
+    plugins: PluginsContainer;
 }
 export declare const sort: <T extends CmsEntryValues = CmsEntryValues>(params: Params<T>) => CmsEntry<T>[];
 export {};

package/filtering/sort.js

@@ -3,7 +3,7 @@ import sortBy from "lodash/sortBy.js";
 import { extractSort } from "./fields/extractSort.js";
 import * as __rspack_external_dot_prop_0ebbd169 from "dot-prop";
 const sort_sort = (params)=>{
-    const { model, items, sort = [], fields, sortingRegistry } = params;
+    const { model, items, sort = [], fields, plugins } = params;
     if (items.length <= 1) return items;
     if (0 === sort.length) sort.push("savedOn_DESC");
     else if (sort.length > 1) throw new error("Sorting is limited to a single field.", "SORT_MULTIPLE_FIELDS_ERROR", {
@@ -17,7 +17,7 @@ const sort_sort = (params)=>{
         model,
         sortBy: firstSort,
         fields,
-        sortingRegistry
+        plugins
     });
     const itemsToSort = items.map((item)=>({
             id: item.id,

package/filtering/sort.js.map

@@ -1 +1 @@
-{"version":3,"file":"filtering/sort.js","sources":["../../src/filtering/sort.ts"],"sourcesContent":["import type { CmsEntry, CmsEntryValues, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport * as dotProp from \"dot-prop\";\nimport lodashSortBy from \"lodash/sortBy.js\";\nimport { extractSort } from \"./fields/extractSort.js\";\nimport type { Field } from \"./fields/types.js\";\nimport type { FieldSortingRegistry } from \"../features/fieldSorting/abstractions.js\";\n\ninterface Params<T extends CmsEntryValues = CmsEntryValues> {\n    model: CmsModel;\n    items: CmsEntry<T>[];\n    sort?: string[];\n    fields: Record<string, Field>;\n    sortingRegistry: FieldSortingRegistry.Interface;\n}\n\ninterface SortedItem {\n    id: string;\n    value: any;\n}\n\nexport const sort = <T extends CmsEntryValues = CmsEntryValues>(\n    params: Params<T>\n): CmsEntry<T>[] => {\n    const { model, items, sort = [], fields, sortingRegistry } = params;\n    if (items.length <= 1) {\n        return items;\n    } else if (sort.length === 0) {\n        sort.push(\"savedOn_DESC\");\n    } else if (sort.length > 1) {\n        throw new WebinyError(\n            \"Sorting is limited to a single field.\",\n            \"SORT_MULTIPLE_FIELDS_ERROR\",\n            {\n                sort\n            }\n        );\n    }\n    const [firstSort] = sort;\n    if (!firstSort) {\n        throw new WebinyError(\"Empty sort array item.\", \"SORT_EMPTY_ERROR\", {\n            sort\n        });\n    }\n\n    const { fieldId, field, valuePath, reverse } = extractSort({\n        model,\n        sortBy: firstSort,\n        fields,\n        sortingRegistry\n    });\n\n    const itemsToSort = items.map(item => {\n        return {\n            id: item.id,\n            value: field.transform(dotProp.getProperty(item, valuePath))\n        };\n    });\n    const sortedItems: SortedItem[] = lodashSortBy(itemsToSort, \"value\");\n    const newItems = sortedItems.map(s => {\n        const item = items.find(i => i.id === s.id);\n        if (item) {\n            return item;\n        }\n        throw new WebinyError(\n            \"Could not find item by given id after the sorting.\",\n            \"SORTING_ITEMS_ERROR\",\n            {\n                id: s.id,\n                sortingBy: fieldId,\n                reverse\n            }\n        );\n    });\n    if (!reverse) {\n        return newItems;\n    }\n    return newItems.reverse();\n};\n"],"names":["sort","params","model","items","fields","sortingRegistry","WebinyError","firstSort","fieldId","field","valuePath","reverse","extractSort","itemsToSort","item","dotProp","sortedItems","lodashSortBy","newItems","s","i"],"mappings":";;;;AAqBO,MAAMA,YAAO,CAChBC;IAEA,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAEH,OAAO,EAAE,EAAEI,MAAM,EAAEC,eAAe,EAAE,GAAGJ;IAC7D,IAAIE,MAAM,MAAM,IAAI,GAChB,OAAOA;IACJ,IAAIH,AAAgB,MAAhBA,KAAK,MAAM,EAClBA,KAAK,IAAI,CAAC;SACP,IAAIA,KAAK,MAAM,GAAG,GACrB,MAAM,IAAIM,MACN,yCACA,8BACA;QACIN;IACJ;IAGR,MAAM,CAACO,UAAU,GAAGP;IACpB,IAAI,CAACO,WACD,MAAM,IAAID,MAAY,0BAA0B,oBAAoB;QAChEN;IACJ;IAGJ,MAAM,EAAEQ,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAEC,OAAO,EAAE,GAAGC,YAAY;QACvDV;QACA,QAAQK;QACRH;QACAC;IACJ;IAEA,MAAMQ,cAAcV,MAAM,GAAG,CAACW,CAAAA,OACnB;YACH,IAAIA,KAAK,EAAE;YACX,OAAOL,MAAM,SAAS,CAACM,oCAAAA,WAAmB,CAACD,MAAMJ;QACrD;IAEJ,MAAMM,cAA4BC,OAAaJ,aAAa;IAC5D,MAAMK,WAAWF,YAAY,GAAG,CAACG,CAAAA;QAC7B,MAAML,OAAOX,MAAM,IAAI,CAACiB,CAAAA,IAAKA,EAAE,EAAE,KAAKD,EAAE,EAAE;QAC1C,IAAIL,MACA,OAAOA;QAEX,MAAM,IAAIR,MACN,sDACA,uBACA;YACI,IAAIa,EAAE,EAAE;YACR,WAAWX;YACXG;QACJ;IAER;IACA,IAAI,CAACA,SACD,OAAOO;IAEX,OAAOA,SAAS,OAAO;AAC3B"}
+{"version":3,"file":"filtering/sort.js","sources":["../../src/filtering/sort.ts"],"sourcesContent":["import type { CmsEntry, CmsEntryValues, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport * as dotProp from \"dot-prop\";\nimport lodashSortBy from \"lodash/sortBy.js\";\nimport { extractSort } from \"./fields/extractSort.js\";\nimport type { Field } from \"./fields/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\n\ninterface Params<T extends CmsEntryValues = CmsEntryValues> {\n    model: CmsModel;\n    items: CmsEntry<T>[];\n    sort?: string[];\n    fields: Record<string, Field>;\n    plugins: PluginsContainer;\n}\n\ninterface SortedItem {\n    id: string;\n    value: any;\n}\n\nexport const sort = <T extends CmsEntryValues = CmsEntryValues>(\n    params: Params<T>\n): CmsEntry<T>[] => {\n    const { model, items, sort = [], fields, plugins } = params;\n    if (items.length <= 1) {\n        return items;\n    } else if (sort.length === 0) {\n        sort.push(\"savedOn_DESC\");\n    } else if (sort.length > 1) {\n        throw new WebinyError(\n            \"Sorting is limited to a single field.\",\n            \"SORT_MULTIPLE_FIELDS_ERROR\",\n            {\n                sort\n            }\n        );\n    }\n    const [firstSort] = sort;\n    if (!firstSort) {\n        throw new WebinyError(\"Empty sort array item.\", \"SORT_EMPTY_ERROR\", {\n            sort\n        });\n    }\n\n    const { fieldId, field, valuePath, reverse } = extractSort({\n        model,\n        sortBy: firstSort,\n        fields,\n        plugins\n    });\n\n    const itemsToSort = items.map(item => {\n        return {\n            id: item.id,\n            value: field.transform(dotProp.getProperty(item, valuePath))\n        };\n    });\n    const sortedItems: SortedItem[] = lodashSortBy(itemsToSort, \"value\");\n    const newItems = sortedItems.map(s => {\n        const item = items.find(i => i.id === s.id);\n        if (item) {\n            return item;\n        }\n        /* This is impossible to happen because sorting items does not remove the items. BUT, we need to have this check just in case for development purposes. */\n        throw new WebinyError(\n            \"Could not find item by given id after the sorting.\",\n            \"SORTING_ITEMS_ERROR\",\n            {\n                id: s.id,\n                sortingBy: fieldId,\n                reverse\n            }\n        );\n    });\n    if (!reverse) {\n        return newItems;\n    }\n    return newItems.reverse();\n};\n"],"names":["sort","params","model","items","fields","plugins","WebinyError","firstSort","fieldId","field","valuePath","reverse","extractSort","itemsToSort","item","dotProp","sortedItems","lodashSortBy","newItems","s","i"],"mappings":";;;;AAqBO,MAAMA,YAAO,CAChBC;IAEA,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAEH,OAAO,EAAE,EAAEI,MAAM,EAAEC,OAAO,EAAE,GAAGJ;IACrD,IAAIE,MAAM,MAAM,IAAI,GAChB,OAAOA;IACJ,IAAIH,AAAgB,MAAhBA,KAAK,MAAM,EAClBA,KAAK,IAAI,CAAC;SACP,IAAIA,KAAK,MAAM,GAAG,GACrB,MAAM,IAAIM,MACN,yCACA,8BACA;QACIN;IACJ;IAGR,MAAM,CAACO,UAAU,GAAGP;IACpB,IAAI,CAACO,WACD,MAAM,IAAID,MAAY,0BAA0B,oBAAoB;QAChEN;IACJ;IAGJ,MAAM,EAAEQ,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAEC,OAAO,EAAE,GAAGC,YAAY;QACvDV;QACA,QAAQK;QACRH;QACAC;IACJ;IAEA,MAAMQ,cAAcV,MAAM,GAAG,CAACW,CAAAA,OACnB;YACH,IAAIA,KAAK,EAAE;YACX,OAAOL,MAAM,SAAS,CAACM,oCAAAA,WAAmB,CAACD,MAAMJ;QACrD;IAEJ,MAAMM,cAA4BC,OAAaJ,aAAa;IAC5D,MAAMK,WAAWF,YAAY,GAAG,CAACG,CAAAA;QAC7B,MAAML,OAAOX,MAAM,IAAI,CAACiB,CAAAA,IAAKA,EAAE,EAAE,KAAKD,EAAE,EAAE;QAC1C,IAAIL,MACA,OAAOA;QAGX,MAAM,IAAIR,MACN,sDACA,uBACA;YACI,IAAIa,EAAE,EAAE;YACR,WAAWX;YACXG;QACJ;IAER;IACA,IAAI,CAACA,SACD,OAAOO;IAEX,OAAOA,SAAS,OAAO;AAC3B"}

package/index.d.ts

@@ -17,8 +17,3 @@ export { createDatetimeTransformValuePlugin } from "./transforms/datetime.js";
 export { createStorageModelAccessor, createStorageTransformCallable, aggregateUniqueFieldValues } from "./cms/storageHelpers.js";
 export type { Field } from "./filtering/fields/types.js";
 export type { FilterItemFromStorage } from "./filtering/fields/types.js";
-export { FieldFilterPathRegistry, type IFieldFilterPathHandler, type IFieldFilterPathRegistry } from "./features/fieldFilterPath/abstractions.js";
-export { FieldFilterValueTransformRegistry, type IFieldFilterValueTransformHandler, type IFieldFilterValueTransformRegistry } from "./features/fieldFilterValueTransform/abstractions.js";
-export { FieldFilterCreateRegistry, type IFieldFilterCreateHandler, type IFieldFilterCreateParams, type IFieldFilterCreateRegistry, type IFieldFilterCreateResult } from "./features/fieldFilterCreate/abstractions.js";
-export { FieldSortingRegistry, type IFieldSortingCanUseParams, type IFieldSortingCreateParams, type IFieldSortingHandler, type IFieldSortingRegistry, type IFieldSortingResult } from "./features/fieldSorting/abstractions.js";
-export { FilterRegistriesFeature } from "./features/FilterRegistriesFeature.js";

package/index.js

@@ -12,8 +12,3 @@ export { createPlainObjectPathPlugin } from "./path/plainObject.js";
 export { createLocationFolderIdPathPlugin } from "./path/locationFolderId.js";
 export { createDatetimeTransformValuePlugin } from "./transforms/datetime.js";
 export { aggregateUniqueFieldValues, createStorageModelAccessor, createStorageTransformCallable } from "./cms/storageHelpers.js";
-export { FieldFilterPathRegistry } from "./features/fieldFilterPath/abstractions.js";
-export { FieldFilterValueTransformRegistry } from "./features/fieldFilterValueTransform/abstractions.js";
-export { FieldFilterCreateRegistry } from "./features/fieldFilterCreate/abstractions.js";
-export { FieldSortingRegistry } from "./features/fieldSorting/abstractions.js";
-export { FilterRegistriesFeature } from "./features/FilterRegistriesFeature.js";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-storage",
-	"version": "0.0.0-unstable.0d717d18dd",
+	"version": "0.0.0-unstable.a4f3e4ea8b",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"type": "module",
@@ -10,20 +10,18 @@
 		"directory": "packages/api-headless-cms-storage"
 	},
 	"dependencies": {
-		"@webiny/api": "0.0.0-unstable.0d717d18dd",
-		"@webiny/api-headless-cms": "0.0.0-unstable.0d717d18dd",
-		"@webiny/db-utils": "0.0.0-unstable.0d717d18dd",
-		"@webiny/di": "1.0.2",
-		"@webiny/error": "0.0.0-unstable.0d717d18dd",
-		"@webiny/feature": "0.0.0-unstable.0d717d18dd",
-		"@webiny/plugins": "0.0.0-unstable.0d717d18dd",
+		"@webiny/api": "0.0.0-unstable.a4f3e4ea8b",
+		"@webiny/api-headless-cms": "0.0.0-unstable.a4f3e4ea8b",
+		"@webiny/db-utils": "0.0.0-unstable.a4f3e4ea8b",
+		"@webiny/error": "0.0.0-unstable.a4f3e4ea8b",
+		"@webiny/plugins": "0.0.0-unstable.a4f3e4ea8b",
 		"date-fns": "4.4.0",
 		"dot-prop": "10.2.0",
 		"lodash": "4.18.1"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "0.0.0-unstable.0d717d18dd",
-		"@webiny/project-utils": "0.0.0-unstable.0d717d18dd",
+		"@webiny/build-tools": "0.0.0-unstable.a4f3e4ea8b",
+		"@webiny/project-utils": "0.0.0-unstable.a4f3e4ea8b",
 		"typescript": "7.0.2",
 		"vitest": "4.1.10"
 	},