@webiny/api-headless-cms-ddb 6.1.0-beta.3 → 6.2.0-beta.0

package/dynamoDb/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: () => (import("@webiny/api-headless-cms/index.js").StorageTransformPlugin<any, any, import("@webiny/api-headless-cms/types/modelField.js").CmsModelField> | import("../index.js").CmsEntryFieldFilterPathPlugin | import("../types.js").CmsFieldFilterValueTransformPlugin)[];
+declare const _default: () => (import("../index.js").CmsEntryFieldFilterPathPlugin | import("../types.js").CmsFieldFilterValueTransformPlugin)[];
 export default _default;

package/dynamoDb/index.js

@@ -1,8 +1,6 @@
-import { createRichTextStorageTransformPlugin } from "./storage/richText.js";
-import { createLongTextStorageTransformPlugin } from "./storage/longText.js";
 import { createPlainObjectPathPlugin } from "./path/plainObject.js";
 import { createDatetimeTransformValuePlugin } from "./transformValue/datetime.js";
 import { createLocationFolderIdPathPlugin } from "./path/locationFolderId.js";
-export default () => [createRichTextStorageTransformPlugin(), createLongTextStorageTransformPlugin(), createPlainObjectPathPlugin(), createLocationFolderIdPathPlugin(), createDatetimeTransformValuePlugin()];
+export default () => [createPlainObjectPathPlugin(), createLocationFolderIdPathPlugin(), createDatetimeTransformValuePlugin()];
 
 //# sourceMappingURL=index.js.map

package/dynamoDb/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createRichTextStorageTransformPlugin","createLongTextStorageTransformPlugin","createPlainObjectPathPlugin","createDatetimeTransformValuePlugin","createLocationFolderIdPathPlugin"],"sources":["index.ts"],"sourcesContent":["import { createRichTextStorageTransformPlugin } from \"./storage/richText.js\";\nimport { createLongTextStorageTransformPlugin } from \"./storage/longText.js\";\nimport { createPlainObjectPathPlugin } from \"./path/plainObject.js\";\nimport { createDatetimeTransformValuePlugin } from \"./transformValue/datetime.js\";\nimport { createLocationFolderIdPathPlugin } from \"~/dynamoDb/path/locationFolderId.js\";\n\nexport default () => [\n    createRichTextStorageTransformPlugin(),\n    createLongTextStorageTransformPlugin(),\n    createPlainObjectPathPlugin(),\n    createLocationFolderIdPathPlugin(),\n    createDatetimeTransformValuePlugin()\n];\n"],"mappings":"AAAA,SAASA,oCAAoC;AAC7C,SAASC,oCAAoC;AAC7C,SAASC,2BAA2B;AACpC,SAASC,kCAAkC;AAC3C,SAASC,gCAAgC;AAEzC,eAAe,MAAM,CACjBJ,oCAAoC,CAAC,CAAC,EACtCC,oCAAoC,CAAC,CAAC,EACtCC,2BAA2B,CAAC,CAAC,EAC7BE,gCAAgC,CAAC,CAAC,EAClCD,kCAAkC,CAAC,CAAC,CACvC","ignoreList":[]}
+{"version":3,"names":["createPlainObjectPathPlugin","createDatetimeTransformValuePlugin","createLocationFolderIdPathPlugin"],"sources":["index.ts"],"sourcesContent":["import { createPlainObjectPathPlugin } from \"./path/plainObject.js\";\nimport { createDatetimeTransformValuePlugin } from \"./transformValue/datetime.js\";\nimport { createLocationFolderIdPathPlugin } from \"~/dynamoDb/path/locationFolderId.js\";\n\nexport default () => [\n    createPlainObjectPathPlugin(),\n    createLocationFolderIdPathPlugin(),\n    createDatetimeTransformValuePlugin()\n];\n"],"mappings":"AAAA,SAASA,2BAA2B;AACpC,SAASC,kCAAkC;AAC3C,SAASC,gCAAgC;AAEzC,eAAe,MAAM,CACjBF,2BAA2B,CAAC,CAAC,EAC7BE,gCAAgC,CAAC,CAAC,EAClCD,kCAAkC,CAAC,CAAC,CACvC","ignoreList":[]}

package/index.d.ts

@@ -1,3 +1,2 @@
-import type { StorageOperationsFactory } from "./types.js";
 export * from "./plugins/index.js";
-export declare const createStorageOperations: StorageOperationsFactory;
+export declare const registerDynamoDbStorageOperations: () => import("@webiny/handler").RegisterExtensionPlugin<import("@webiny/handler/types.js").Context>[];

package/index.js

@@ -1,25 +1,24 @@
-import dynamoDbValueFilters from "@webiny/db-dynamodb/plugins/filters/index.js";
+import { registerExtension as registerDynamoDbExtension } from "@webiny/db-dynamodb";
 import dynamoDbPlugins from "./dynamoDb/index.js";
 import { ENTITIES } from "./types.js";
 import { createGroupEntity } from "./definitions/group.js";
 import { createModelEntity } from "./definitions/model.js";
 import { createEntryEntity } from "./definitions/entry.js";
-import { PluginsContainer } from "@webiny/plugins";
 import { createGroupsStorageOperations } from "./operations/group/index.js";
 import { createModelsStorageOperations } from "./operations/model/index.js";
 import { createEntriesStorageOperations } from "./operations/entry/index.js";
 import { createFilterCreatePlugins } from "./operations/entry/filtering/plugins/index.js";
-import { CmsEntryFieldFilterPathPlugin, CmsEntryFieldFilterPlugin, CmsEntryFieldSortingPlugin, CmsFieldFilterValueTransformPlugin } from "./plugins/index.js";
-import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
-import { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from "@webiny/api-headless-cms";
-import { CompressorPlugin } from "@webiny/api";
 import { createTable } from "./definitions/table.js";
+import { createRegisterExtensionPlugin } from "@webiny/handler";
+import { createFeature } from "@webiny/feature/api/index.js";
+import { StorageOperationsFactory as StorageOperationsFactoryAbstraction } from "@webiny/api-headless-cms/exports/api/cms/storage.js";
 export * from "./plugins/index.js";
-export const createStorageOperations = params => {
+const createDynamoDbStorageOperations = params => {
   const {
     table,
     documentClient,
-    plugins: userPlugins
+    plugins,
+    container
   } = params;
   const tableInstance = createTable({
     name: table,
@@ -39,11 +38,7 @@ export const createStorageOperations = params => {
       table: tableInstance
     })
   };
-  const plugins = new PluginsContainer([
-  /**
-   * DynamoDB filter plugins for the where conditions.
-   */
-  dynamoDbValueFilters(),
+  plugins.register([
   /**
    * Field plugins for DynamoDB.
    */
@@ -51,36 +46,22 @@ export const createStorageOperations = params => {
   /**
    * Filter create plugins.
    */
-  createFilterCreatePlugins(),
-  /**
-   * User defined custom plugins.
-   */
-  ...(userPlugins || [])]);
+  createFilterCreatePlugins()]);
   const entries = createEntriesStorageOperations({
     entity: entities.entries,
+    container,
     plugins
   });
   return {
     name: "dynamodb",
-    beforeInit: async context => {
-      const types = ["cms-model-field-to-graphql", CmsEntryFieldFilterPathPlugin.type, CmsFieldFilterValueTransformPlugin.type, CmsEntryFieldFilterPlugin.type, CmsEntryFieldSortingPlugin.type, ValueFilterPlugin.type, StorageOperationsCmsModelPlugin.type, StorageTransformPlugin.type, CompressorPlugin.type];
-      /**
-       * Collect all required plugins from parent context.
-       */
-      for (const type of types) {
-        plugins.mergeByType(context.plugins, type);
-      }
-      /**
-       * Pass the plugins to the parent context.
-       */
-      context.plugins.register([dynamoDbPlugins()]);
+    beforeInit: async () => {
       entries.dataLoaders.clearAll();
     },
     getEntities: () => entities,
     getTable: () => tableInstance,
     groups: createGroupsStorageOperations({
       entity: entities.groups,
-      plugins
+      container
     }),
     models: createModelsStorageOperations({
       entity: entities.models
@@ -88,5 +69,29 @@ export const createStorageOperations = params => {
     entries
   };
 };
+class DynamoDbStorageOperationsFactoryImpl {
+  async create(context) {
+    return createDynamoDbStorageOperations({
+      documentClient: context.db.driver.getClient(),
+      plugins: context.plugins,
+      container: context.container
+    });
+  }
+}
+const DynamoDbStorageOperationsFactory = StorageOperationsFactoryAbstraction.createImplementation({
+  implementation: DynamoDbStorageOperationsFactoryImpl,
+  dependencies: []
+});
+const storageOperationsFeature = createFeature({
+  name: "cms.storageOperations.openSearch",
+  register: container => {
+    container.register(DynamoDbStorageOperationsFactory).inSingletonScope();
+  }
+});
+export const registerDynamoDbStorageOperations = () => {
+  return [registerDynamoDbExtension(), createRegisterExtensionPlugin(context => {
+    return storageOperationsFeature.register(context.container);
+  })];
+};
 
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["dynamoDbValueFilters","dynamoDbPlugins","ENTITIES","createGroupEntity","createModelEntity","createEntryEntity","PluginsContainer","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations","createFilterCreatePlugins","CmsEntryFieldFilterPathPlugin","CmsEntryFieldFilterPlugin","CmsEntryFieldSortingPlugin","CmsFieldFilterValueTransformPlugin","ValueFilterPlugin","StorageOperationsCmsModelPlugin","StorageTransformPlugin","CompressorPlugin","createTable","createStorageOperations","params","table","documentClient","plugins","userPlugins","tableInstance","name","entities","groups","entityName","GROUPS","models","MODELS","entries","ENTRIES","entity","beforeInit","context","types","type","mergeByType","register","dataLoaders","clearAll","getEntities","getTable"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters/index.js\";\nimport dynamoDbPlugins from \"./dynamoDb/index.js\";\nimport type { StorageOperationsFactory } from \"~/types.js\";\nimport { ENTITIES } from \"~/types.js\";\nimport { createGroupEntity } from \"~/definitions/group.js\";\nimport { createModelEntity } from \"~/definitions/model.js\";\nimport { createEntryEntity } from \"~/definitions/entry.js\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group/index.js\";\nimport { createModelsStorageOperations } from \"~/operations/model/index.js\";\nimport { createEntriesStorageOperations } from \"./operations/entry/index.js\";\n\nimport { createFilterCreatePlugins } from \"~/operations/entry/filtering/plugins/index.js\";\nimport {\n    CmsEntryFieldFilterPathPlugin,\n    CmsEntryFieldFilterPlugin,\n    CmsEntryFieldSortingPlugin,\n    CmsFieldFilterValueTransformPlugin\n} from \"~/plugins/index.js\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js\";\nimport { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { CompressorPlugin } from \"@webiny/api\";\nimport { createTable } from \"~/definitions/table.js\";\n\nexport * from \"./plugins/index.js\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { table, documentClient, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        name: table,\n        documentClient\n    });\n\n    const entities = {\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Filter create plugins.\n         */\n        createFilterCreatePlugins(),\n        /**\n         * User defined custom plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    const entries = createEntriesStorageOperations({\n        entity: entities.entries,\n        plugins\n    });\n\n    return {\n        name: \"dynamodb\",\n        beforeInit: async context => {\n            const types: string[] = [\n                \"cms-model-field-to-graphql\",\n                CmsEntryFieldFilterPathPlugin.type,\n                CmsFieldFilterValueTransformPlugin.type,\n                CmsEntryFieldFilterPlugin.type,\n                CmsEntryFieldSortingPlugin.type,\n                ValueFilterPlugin.type,\n                StorageOperationsCmsModelPlugin.type,\n                StorageTransformPlugin.type,\n                CompressorPlugin.type\n            ];\n            /**\n             * Collect all required plugins from parent context.\n             */\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n\n            entries.dataLoaders.clearAll();\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models\n        }),\n        entries\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["registerExtension","registerDynamoDbExtension","dynamoDbPlugins","ENTITIES","createGroupEntity","createModelEntity","createEntryEntity","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations","createFilterCreatePlugins","createTable","createRegisterExtensionPlugin","createFeature","StorageOperationsFactory","StorageOperationsFactoryAbstraction","createDynamoDbStorageOperations","params","table","documentClient","plugins","container","tableInstance","name","entities","groups","entityName","GROUPS","models","MODELS","entries","ENTRIES","register","entity","beforeInit","dataLoaders","clearAll","getEntities","getTable","DynamoDbStorageOperationsFactoryImpl","create","context","db","driver","getClient","DynamoDbStorageOperationsFactory","createImplementation","implementation","dependencies","storageOperationsFeature","inSingletonScope","registerDynamoDbStorageOperations"],"sources":["index.ts"],"sourcesContent":["import { registerExtension as registerDynamoDbExtension } from \"@webiny/db-dynamodb\";\nimport dynamoDbPlugins from \"./dynamoDb/index.js\";\nimport type { CmsContext, StorageOperationsFactory } from \"~/types.js\";\nimport { ENTITIES } from \"~/types.js\";\nimport { createGroupEntity } from \"~/definitions/group.js\";\nimport { createModelEntity } from \"~/definitions/model.js\";\nimport { createEntryEntity } from \"~/definitions/entry.js\";\nimport { createGroupsStorageOperations } from \"~/operations/group/index.js\";\nimport { createModelsStorageOperations } from \"~/operations/model/index.js\";\nimport { createEntriesStorageOperations } from \"./operations/entry/index.js\";\nimport { createFilterCreatePlugins } from \"~/operations/entry/filtering/plugins/index.js\";\nimport { createTable } from \"~/definitions/table.js\";\nimport { createRegisterExtensionPlugin } from \"@webiny/handler\";\nimport { createFeature } from \"@webiny/feature/api/index.js\";\nimport { StorageOperationsFactory as StorageOperationsFactoryAbstraction } from \"@webiny/api-headless-cms/exports/api/cms/storage.js\";\nimport type { DynamoDBDocument } from \"@webiny/aws-sdk/client-dynamodb/index.js\";\n\nexport * from \"./plugins/index.js\";\n\nconst createDynamoDbStorageOperations: StorageOperationsFactory = params => {\n    const { table, documentClient, plugins, container } = params;\n\n    const tableInstance = createTable({\n        name: table,\n        documentClient\n    });\n\n    const entities = {\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance\n        })\n    };\n\n    plugins.register([\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Filter create plugins.\n         */\n        createFilterCreatePlugins()\n    ]);\n\n    const entries = createEntriesStorageOperations({\n        entity: entities.entries,\n        container,\n        plugins\n    });\n\n    return {\n        name: \"dynamodb\",\n        beforeInit: async () => {\n            entries.dataLoaders.clearAll();\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            container\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models\n        }),\n        entries\n    };\n};\n\nclass DynamoDbStorageOperationsFactoryImpl\n    implements StorageOperationsFactoryAbstraction.Interface\n{\n    public async create(context: CmsContext) {\n        return createDynamoDbStorageOperations({\n            documentClient: context.db.driver.getClient() as DynamoDBDocument,\n            plugins: context.plugins,\n            container: context.container\n        });\n    }\n}\n\nconst DynamoDbStorageOperationsFactory = StorageOperationsFactoryAbstraction.createImplementation({\n    implementation: DynamoDbStorageOperationsFactoryImpl,\n    dependencies: []\n});\n\nconst storageOperationsFeature = createFeature({\n    name: \"cms.storageOperations.openSearch\",\n    register: container => {\n        container.register(DynamoDbStorageOperationsFactory).inSingletonScope();\n    }\n});\n\nexport const registerDynamoDbStorageOperations = () => {\n    return [\n        registerDynamoDbExtension(),\n        createRegisterExtensionPlugin(context => {\n            return storageOperationsFeature.register(context.container);\n        })\n    ];\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,9 +1,10 @@
-import type { CmsEntryListWhere } from "@webiny/api-headless-cms/types/index.js";
-import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
+import type { CmsContext, CmsEntryListWhere } from "@webiny/api-headless-cms/types/index.js";
 import type { PluginsContainer } from "@webiny/plugins";
 import type { Field } from "./types.js";
-interface Params {
+import { ValueFilter } from "@webiny/db-dynamodb/feature/ValueFilter/index.js";
+interface ICreateExpressionsParams {
     plugins: PluginsContainer;
+    container: CmsContext["container"];
     where: Partial<CmsEntryListWhere>;
     fields: Record<string, Field>;
 }
@@ -17,10 +18,10 @@ export interface Filter {
     field: Field;
     path: string;
     fieldPathId: string;
-    plugin: ValueFilterPlugin;
+    filter: ValueFilter.Interface;
     negate: boolean;
     compareValue: any;
     transformValue: <I = any, O = any>(value: I) => O;
 }
-export declare const createExpressions: (params: Params) => Expression;
+export declare const createExpressions: (params: ICreateExpressionsParams) => Expression;
 export {};

package/operations/entry/filtering/createExpressions.js

@@ -1,22 +1,19 @@
 import WebinyError from "@webiny/error";
-import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
 import { getMappedPlugins } from "./mapPlugins.js";
 import { extractWhereParams } from "./where.js";
 import { transformValue } from "./transform.js";
 import { CmsEntryFieldFilterPlugin } from "../../../plugins/CmsEntryFieldFilterPlugin.js";
 import { getWhereValues } from "./values.js";
 import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
+import { ValueFilterRegistry } from "@webiny/db-dynamodb/exports/api/db.js";
 export const createExpressions = params => {
   const {
     where,
     plugins,
-    fields
+    fields,
+    container
   } = params;
-  const filterPlugins = getMappedPlugins({
-    plugins,
-    type: ValueFilterPlugin.type,
-    property: "operation"
-  });
+  const valueFilterRegistry = container.resolve(ValueFilterRegistry);
   const transformValuePlugins = getMappedPlugins({
     plugins,
     type: "cms-field-filter-value-transform",
@@ -132,7 +129,7 @@ export const createExpressions = params => {
       const result = filterCreatePlugin.create({
         key,
         value,
-        valueFilterPlugins: filterPlugins,
+        valueFilterRegistry,
         transformValuePlugins,
         getFilterCreatePlugin,
         operation,

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

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","ValueFilterPlugin","getMappedPlugins","extractWhereParams","transformValue","CmsEntryFieldFilterPlugin","getWhereValues","getBaseFieldType","createExpressions","params","where","plugins","fields","filterPlugins","type","property","transformValuePlugins","fieldFilterCreatePlugins","defaultFilterCreatePlugin","getFilterCreatePlugin","fieldType","filterCreatePlugin","createExpression","condition","expression","filters","expressions","key","value","undefined","childWhereList","childExpression","childWhere","result","push","whereParams","fieldId","operation","negate","field","transformValuePlugin","transformValueCallable","transform","create","valueFilterPlugins","compareValue","Array","isArray","length"],"sources":["createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.js\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Field } from \"./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 \"~/operations/entry/filtering/values.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\n}\n\ninterface Params {\n    plugins: PluginsContainer;\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    plugin: ValueFilterPlugin;\n    negate: boolean;\n    compareValue: any;\n    transformValue: <I = any, O = any>(value: I) => O;\n}\n\nexport const createExpressions = (params: Params): Expression => {\n    const { where, plugins, fields } = params;\n    const filterPlugins = getMappedPlugins<ValueFilterPlugin>({\n        plugins,\n        type: ValueFilterPlugin.type,\n        property: \"operation\"\n    });\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\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             *\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            /**\n             * OR conditional\n             */\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            /**\n             * We need a filter create plugin for this type.\n             */\n            const filterCreatePlugin = getFilterCreatePlugin(field.type);\n\n            const fieldType = getBaseFieldType(field);\n\n            const transformValuePlugin: CmsFieldFilterValueTransformPlugin =\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                valueFilterPlugins: filterPlugins,\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"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","getMappedPlugins","extractWhereParams","transformValue","CmsEntryFieldFilterPlugin","getWhereValues","getBaseFieldType","ValueFilterRegistry","createExpressions","params","where","plugins","fields","container","valueFilterRegistry","resolve","transformValuePlugins","type","property","fieldFilterCreatePlugins","defaultFilterCreatePlugin","getFilterCreatePlugin","fieldType","filterCreatePlugin","createExpression","condition","expression","filters","expressions","key","value","undefined","childWhereList","childExpression","childWhere","result","push","whereParams","fieldId","operation","negate","field","transformValuePlugin","transformValueCallable","transform","create","compareValue","Array","isArray","length"],"sources":["createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsContext, CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Field } from \"./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 \"~/operations/entry/filtering/values.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { ValueFilter } from \"@webiny/db-dynamodb/feature/ValueFilter/index.js\";\nimport { ValueFilterRegistry } from \"@webiny/db-dynamodb/exports/api/db.js\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\n}\n\ninterface ICreateExpressionsParams {\n    plugins: PluginsContainer;\n    container: CmsContext[\"container\"];\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, container } = params;\n    const valueFilterRegistry = container.resolve(ValueFilterRegistry);\n\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\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             *\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            /**\n             * OR conditional\n             */\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            /**\n             * We need a filter create plugin for this type.\n             */\n            const filterCreatePlugin = getFilterCreatePlugin(field.type);\n\n            const fieldType = getBaseFieldType(field);\n\n            const transformValuePlugin: CmsFieldFilterValueTransformPlugin =\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"],"mappings":"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","ignoreList":[]}

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

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

package/operations/entry/filtering/filter.js

@@ -1,9 +1,9 @@
-import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
 import WebinyError from "@webiny/error";
 import { createFullTextSearch } from "./fullTextSearch.js";
 import { createExpressions } from "./createExpressions.js";
 import { transformValue } from "./transform.js";
 import { getValue } from "./getValue.js";
+import { ValueFilterRegistry } from "@webiny/db-dynamodb/exports/api/db.js";
 const executeFilter = params => {
   const {
     value,
@@ -14,14 +14,14 @@ const executeFilter = params => {
    * We need to check if the filter can be used.
    * If it cannot, we will just return true.
    */
-  const canUse = filter.plugin.canUse({
+  const canUse = filter.filter.canUse({
     value,
     compareValue: filter.compareValue
   });
   if (!canUse) {
     return true;
   }
-  const matched = filter.plugin.matches({
+  const matched = filter.filter.matches({
     value,
     compareValue: filter.compareValue
   });
@@ -84,8 +84,10 @@ export const filter = params => {
     where,
     plugins,
     fields,
-    fullTextSearch
+    fullTextSearch,
+    container
   } = params;
+  const valueFilterRegistry = container.resolve(ValueFilterRegistry);
   const keys = Object.keys(where);
   if (keys.length === 0 && !fullTextSearch) {
     return records;
@@ -93,7 +95,8 @@ export const filter = params => {
   const expression = createExpressions({
     plugins,
     where,
-    fields
+    fields,
+    container
   });
 
   /**
@@ -105,15 +108,15 @@ export const filter = params => {
   /**
    * We need the contains plugin to run the full text search.
    */
-  const fullTextSearchPlugin = plugins.byType(ValueFilterPlugin.type).find(plugin => plugin.getOperation() === "contains");
-  if (!fullTextSearchPlugin) {
+  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,
-    plugin: fullTextSearchPlugin
+    filter: fullTextSearchFilter
   });
   return records.filter(record => {
     const cachedValues = {};

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

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

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

@@ -1,11 +1,11 @@
-import type { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
 import type { CmsEntry } from "@webiny/api-headless-cms/types/index.js";
 import type { Field } from "./types.js";
+import { ValueFilter } from "@webiny/db-dynamodb/exports/api/db.js";
 interface Params {
     term?: string;
     targetFields?: string[];
     fields: Record<string, Field>;
-    plugin: ValueFilterPlugin;
+    filter: ValueFilter.Interface;
 }
 /**
  * Unfortunately we must use the contains plugin directly as plugins do not support multi field searching.

package/operations/entry/filtering/fullTextSearch.js

@@ -8,7 +8,7 @@ export const createFullTextSearch = params => {
     term,
     targetFields,
     fields: fieldDefinitions,
-    plugin
+    filter
   } = params;
   if (!term || term.trim().length === 0 || !targetFields || targetFields.length === 0) {
     return null;
@@ -28,7 +28,7 @@ export const createFullTextSearch = params => {
       if (!value) {
         continue;
       }
-      if (plugin.matches({
+      if (filter.matches({
         value,
         compareValue: term
       }) === true) {

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

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","getValue","createFullTextSearch","params","term","targetFields","fields","fieldDefinitions","plugin","trim","length","item","target","field","value","matches","compareValue"],"sources":["fullTextSearch.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js\";\nimport type { CmsEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Field } from \"./types.js\";\nimport { getValue } from \"./getValue.js\";\n\ninterface Params {\n    term?: string;\n    targetFields?: string[];\n    fields: Record<string, Field>;\n    plugin: ValueFilterPlugin;\n}\n\n/**\n * Unfortunately we must use the contains plugin directly as plugins do not support multi field searching.\n */\nexport const createFullTextSearch = (params: Params) => {\n    const { term, targetFields, fields: fieldDefinitions, plugin } = params;\n    if (!term || term.trim().length === 0 || !targetFields || targetFields.length === 0) {\n        return null;\n    }\n    return (item: CmsEntry) => {\n        for (const target of targetFields) {\n            /**\n             * As fields is a mapped Field objects where key is a path to the value, we can directly find the related field.\n             */\n            const field = fieldDefinitions[target];\n\n            if (!field) {\n                throw new WebinyError(`Unknown field \"${target}\" in the model.`, \"UNKNOWN_FIELD\", {\n                    target\n                });\n            }\n            const value = getValue(item, target);\n            if (!value) {\n                continue;\n            }\n            if (plugin.matches({ value, compareValue: term }) === true) {\n                return true;\n            }\n        }\n        return false;\n    };\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AAIvC,SAASC,QAAQ;AASjB;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAIC,MAAc,IAAK;EACpD,MAAM;IAAEC,IAAI;IAAEC,YAAY;IAAEC,MAAM,EAAEC,gBAAgB;IAAEC;EAAO,CAAC,GAAGL,MAAM;EACvE,IAAI,CAACC,IAAI,IAAIA,IAAI,CAACK,IAAI,CAAC,CAAC,CAACC,MAAM,KAAK,CAAC,IAAI,CAACL,YAAY,IAAIA,YAAY,CAACK,MAAM,KAAK,CAAC,EAAE;IACjF,OAAO,IAAI;EACf;EACA,OAAQC,IAAc,IAAK;IACvB,KAAK,MAAMC,MAAM,IAAIP,YAAY,EAAE;MAC/B;AACZ;AACA;MACY,MAAMQ,KAAK,GAAGN,gBAAgB,CAACK,MAAM,CAAC;MAEtC,IAAI,CAACC,KAAK,EAAE;QACR,MAAM,IAAIb,WAAW,CAAC,kBAAkBY,MAAM,iBAAiB,EAAE,eAAe,EAAE;UAC9EA;QACJ,CAAC,CAAC;MACN;MACA,MAAME,KAAK,GAAGb,QAAQ,CAACU,IAAI,EAAEC,MAAM,CAAC;MACpC,IAAI,CAACE,KAAK,EAAE;QACR;MACJ;MACA,IAAIN,MAAM,CAACO,OAAO,CAAC;QAAED,KAAK;QAAEE,YAAY,EAAEZ;MAAK,CAAC,CAAC,KAAK,IAAI,EAAE;QACxD,OAAO,IAAI;MACf;IACJ;IACA,OAAO,KAAK;EAChB,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["WebinyError","getValue","createFullTextSearch","params","term","targetFields","fields","fieldDefinitions","filter","trim","length","item","target","field","value","matches","compareValue"],"sources":["fullTextSearch.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { Field } from \"./types.js\";\nimport { getValue } from \"./getValue.js\";\nimport { ValueFilter } from \"@webiny/db-dynamodb/exports/api/db.js\";\n\ninterface Params {\n    term?: string;\n    targetFields?: string[];\n    fields: Record<string, Field>;\n    filter: ValueFilter.Interface;\n}\n\n/**\n * Unfortunately we must use the contains plugin directly as plugins do not support multi field searching.\n */\nexport const createFullTextSearch = (params: Params) => {\n    const { term, targetFields, fields: fieldDefinitions, filter } = params;\n    if (!term || term.trim().length === 0 || !targetFields || targetFields.length === 0) {\n        return null;\n    }\n    return (item: CmsEntry) => {\n        for (const target of targetFields) {\n            /**\n             * As fields is a mapped Field objects where key is a path to the value, we can directly find the related field.\n             */\n            const field = fieldDefinitions[target];\n\n            if (!field) {\n                throw new WebinyError(`Unknown field \"${target}\" in the model.`, \"UNKNOWN_FIELD\", {\n                    target\n                });\n            }\n            const value = getValue(item, target);\n            if (!value) {\n                continue;\n            }\n            if (filter.matches({ value, compareValue: term }) === true) {\n                return true;\n            }\n        }\n        return false;\n    };\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AAGvC,SAASC,QAAQ;AAUjB;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAIC,MAAc,IAAK;EACpD,MAAM;IAAEC,IAAI;IAAEC,YAAY;IAAEC,MAAM,EAAEC,gBAAgB;IAAEC;EAAO,CAAC,GAAGL,MAAM;EACvE,IAAI,CAACC,IAAI,IAAIA,IAAI,CAACK,IAAI,CAAC,CAAC,CAACC,MAAM,KAAK,CAAC,IAAI,CAACL,YAAY,IAAIA,YAAY,CAACK,MAAM,KAAK,CAAC,EAAE;IACjF,OAAO,IAAI;EACf;EACA,OAAQC,IAAc,IAAK;IACvB,KAAK,MAAMC,MAAM,IAAIP,YAAY,EAAE;MAC/B;AACZ;AACA;MACY,MAAMQ,KAAK,GAAGN,gBAAgB,CAACK,MAAM,CAAC;MAEtC,IAAI,CAACC,KAAK,EAAE;QACR,MAAM,IAAIb,WAAW,CAAC,kBAAkBY,MAAM,iBAAiB,EAAE,eAAe,EAAE;UAC9EA;QACJ,CAAC,CAAC;MACN;MACA,MAAME,KAAK,GAAGb,QAAQ,CAACU,IAAI,EAAEC,MAAM,CAAC;MACpC,IAAI,CAACE,KAAK,EAAE;QACR;MACJ;MACA,IAAIN,MAAM,CAACO,OAAO,CAAC;QAAED,KAAK;QAAEE,YAAY,EAAEZ;MAAK,CAAC,CAAC,KAAK,IAAI,EAAE;QACxD,OAAO,IAAI;MACf;IACJ;IACA,OAAO,KAAK;EAChB,CAAC;AACL,CAAC","ignoreList":[]}

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

@@ -9,10 +9,10 @@ export const createDefaultFilterCreate = () => {
         transformValue,
         field,
         compareValue,
-        valueFilterPlugins
+        valueFilterRegistry
       } = params;
-      const plugin = valueFilterPlugins[params.operation];
-      if (!plugin) {
+      const filter = valueFilterRegistry.get(params.operation);
+      if (!filter) {
         throw new WebinyError(`Missing ValueFilterPlugin for operation "${params.operation}".`, "MISSING_OPERATION_PLUGIN", {
           operation: params.operation
         });
@@ -26,7 +26,7 @@ export const createDefaultFilterCreate = () => {
         path: field.createPath({
           field
         }),
-        plugin
+        filter
       };
     }
   });

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

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","CmsEntryFieldFilterPlugin","createDefaultFilterCreate","plugin","fieldType","ALL","create","params","negate","transformValue","field","compareValue","valueFilterPlugins","operation","fieldPathId","parents","map","f","fieldId","join","path","createPath","name"],"sources":["defaultFilterCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin.js\";\n\nexport const createDefaultFilterCreate = () => {\n    const plugin = new CmsEntryFieldFilterPlugin({\n        fieldType: CmsEntryFieldFilterPlugin.ALL,\n        create: params => {\n            const { negate, transformValue, field, compareValue, valueFilterPlugins } = params;\n            const plugin = valueFilterPlugins[params.operation];\n            if (!plugin) {\n                throw new WebinyError(\n                    `Missing ValueFilterPlugin for operation \"${params.operation}\".`,\n                    \"MISSING_OPERATION_PLUGIN\",\n                    {\n                        operation: params.operation\n                    }\n                );\n            }\n            return {\n                negate,\n                transformValue,\n                field,\n                compareValue,\n                fieldPathId: [...field.parents.map(f => f.fieldId), field.fieldId].join(\".\"),\n                path: field.createPath({\n                    field\n                }),\n                plugin\n            };\n        }\n    });\n\n    plugin.name = `headless-cms.ddb.filter.default`;\n\n    return plugin;\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AACvC,SAASC,yBAAyB;AAElC,OAAO,MAAMC,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,MAAM,GAAG,IAAIF,yBAAyB,CAAC;IACzCG,SAAS,EAAEH,yBAAyB,CAACI,GAAG;IACxCC,MAAM,EAAEC,MAAM,IAAI;MACd,MAAM;QAAEC,MAAM;QAAEC,cAAc;QAAEC,KAAK;QAAEC,YAAY;QAAEC;MAAmB,CAAC,GAAGL,MAAM;MAClF,MAAMJ,MAAM,GAAGS,kBAAkB,CAACL,MAAM,CAACM,SAAS,CAAC;MACnD,IAAI,CAACV,MAAM,EAAE;QACT,MAAM,IAAIH,WAAW,CACjB,4CAA4CO,MAAM,CAACM,SAAS,IAAI,EAChE,0BAA0B,EAC1B;UACIA,SAAS,EAAEN,MAAM,CAACM;QACtB,CACJ,CAAC;MACL;MACA,OAAO;QACHL,MAAM;QACNC,cAAc;QACdC,KAAK;QACLC,YAAY;QACZG,WAAW,EAAE,CAAC,GAAGJ,KAAK,CAACK,OAAO,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,OAAO,CAAC,EAAER,KAAK,CAACQ,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;QAC5EC,IAAI,EAAEV,KAAK,CAACW,UAAU,CAAC;UACnBX;QACJ,CAAC,CAAC;QACFP;MACJ,CAAC;IACL;EACJ,CAAC,CAAC;EAEFA,MAAM,CAACmB,IAAI,GAAG,iCAAiC;EAE/C,OAAOnB,MAAM;AACjB,CAAC","ignoreList":[]}
+{"version":3,"names":["WebinyError","CmsEntryFieldFilterPlugin","createDefaultFilterCreate","plugin","fieldType","ALL","create","params","negate","transformValue","field","compareValue","valueFilterRegistry","filter","get","operation","fieldPathId","parents","map","f","fieldId","join","path","createPath","name"],"sources":["defaultFilterCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin.js\";\n\nexport const createDefaultFilterCreate = () => {\n    const plugin = new CmsEntryFieldFilterPlugin({\n        fieldType: CmsEntryFieldFilterPlugin.ALL,\n        create: params => {\n            const { negate, transformValue, field, compareValue, valueFilterRegistry } = params;\n            const filter = valueFilterRegistry.get(params.operation);\n            if (!filter) {\n                throw new WebinyError(\n                    `Missing ValueFilterPlugin for operation \"${params.operation}\".`,\n                    \"MISSING_OPERATION_PLUGIN\",\n                    {\n                        operation: params.operation\n                    }\n                );\n            }\n            return {\n                negate,\n                transformValue,\n                field,\n                compareValue,\n                fieldPathId: [...field.parents.map(f => f.fieldId), field.fieldId].join(\".\"),\n                path: field.createPath({\n                    field\n                }),\n                filter\n            };\n        }\n    });\n\n    plugin.name = `headless-cms.ddb.filter.default`;\n\n    return plugin;\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AACvC,SAASC,yBAAyB;AAElC,OAAO,MAAMC,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,MAAM,GAAG,IAAIF,yBAAyB,CAAC;IACzCG,SAAS,EAAEH,yBAAyB,CAACI,GAAG;IACxCC,MAAM,EAAEC,MAAM,IAAI;MACd,MAAM;QAAEC,MAAM;QAAEC,cAAc;QAAEC,KAAK;QAAEC,YAAY;QAAEC;MAAoB,CAAC,GAAGL,MAAM;MACnF,MAAMM,MAAM,GAAGD,mBAAmB,CAACE,GAAG,CAACP,MAAM,CAACQ,SAAS,CAAC;MACxD,IAAI,CAACF,MAAM,EAAE;QACT,MAAM,IAAIb,WAAW,CACjB,4CAA4CO,MAAM,CAACQ,SAAS,IAAI,EAChE,0BAA0B,EAC1B;UACIA,SAAS,EAAER,MAAM,CAACQ;QACtB,CACJ,CAAC;MACL;MACA,OAAO;QACHP,MAAM;QACNC,cAAc;QACdC,KAAK;QACLC,YAAY;QACZK,WAAW,EAAE,CAAC,GAAGN,KAAK,CAACO,OAAO,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,OAAO,CAAC,EAAEV,KAAK,CAACU,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;QAC5EC,IAAI,EAAEZ,KAAK,CAACa,UAAU,CAAC;UACnBb;QACJ,CAAC,CAAC;QACFG;MACJ,CAAC;IACL;EACJ,CAAC,CAAC;EAEFV,MAAM,CAACqB,IAAI,GAAG,iCAAiC;EAE/C,OAAOrB,MAAM;AACjB,CAAC","ignoreList":[]}

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

@@ -9,7 +9,7 @@ export const objectFilterCreate = () => {
     create: params => {
       const {
         value: objectValue,
-        valueFilterPlugins,
+        valueFilterRegistry,
         transformValuePlugins,
         getFilterCreatePlugin,
         field: parentField,
@@ -52,7 +52,7 @@ export const objectFilterCreate = () => {
         const result = filterCreatePlugin.create({
           key,
           value,
-          valueFilterPlugins,
+          valueFilterRegistry,
           transformValuePlugins,
           getFilterCreatePlugin,
           operation,

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

@@ -1 +1 @@
-{"version":3,"names":["CmsEntryFieldFilterPlugin","extractWhereParams","WebinyError","transformValue","getBaseFieldType","objectFilterCreate","plugin","fieldType","create","params","value","objectValue","valueFilterPlugins","transformValuePlugins","getFilterCreatePlugin","field","parentField","fields","filters","key","undefined","whereParams","negate","fieldId","operation","fieldPath","parents","map","p","concat","join","filterCreatePlugin","transformValuePlugin","transformValueCallable","transform","result","compareValue","Array","isArray","push","name"],"sources":["objectFilterCreate.ts"],"sourcesContent":["import { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin.js\";\nimport { extractWhereParams } from \"~/operations/entry/filtering/where.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport { transformValue } from \"~/operations/entry/filtering/transform.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\nexport const objectFilterCreate = () => {\n    const plugin = new CmsEntryFieldFilterPlugin({\n        fieldType: \"object\",\n        create: params => {\n            const {\n                value: objectValue,\n                valueFilterPlugins,\n                transformValuePlugins,\n                getFilterCreatePlugin,\n                field: parentField,\n                fields\n            } = params;\n\n            const filters = [];\n\n            for (const key in objectValue) {\n                const value = objectValue[key];\n                if (value === undefined) {\n                    continue;\n                }\n                const whereParams = extractWhereParams(key);\n                if (!whereParams) {\n                    continue;\n                }\n                const { negate, fieldId, operation } = whereParams;\n\n                const fieldPath = parentField.parents\n                    .map(p => p.fieldId)\n                    .concat([parentField.fieldId, fieldId])\n                    .join(\".\");\n\n                const field = fields[fieldPath];\n                if (!field) {\n                    throw new WebinyError(\n                        `There is no field with the field path \"${fieldPath}\".`,\n                        \"FIELD_ERROR\",\n                        {\n                            fieldId\n                        }\n                    );\n                }\n\n                const fieldType = getBaseFieldType(field);\n\n                const filterCreatePlugin = getFilterCreatePlugin(fieldType);\n\n                const transformValuePlugin: CmsFieldFilterValueTransformPlugin =\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                    valueFilterPlugins,\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                if (!result) {\n                    continue;\n                }\n                if (Array.isArray(result)) {\n                    filters.push(...result);\n                    continue;\n                }\n\n                filters.push(result);\n            }\n            return filters;\n        }\n    });\n\n    plugin.name = `headless-cms.ddb.filter.object`;\n\n    return plugin;\n};\n"],"mappings":"AAAA,SAASA,yBAAyB;AAClC,SAASC,kBAAkB;AAC3B,OAAOC,WAAW,MAAM,eAAe;AAEvC,SAASC,cAAc;AACvB,SAASC,gBAAgB,QAAQ,oDAAoD;AAErF,OAAO,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;EACpC,MAAMC,MAAM,GAAG,IAAIN,yBAAyB,CAAC;IACzCO,SAAS,EAAE,QAAQ;IACnBC,MAAM,EAAEC,MAAM,IAAI;MACd,MAAM;QACFC,KAAK,EAAEC,WAAW;QAClBC,kBAAkB;QAClBC,qBAAqB;QACrBC,qBAAqB;QACrBC,KAAK,EAAEC,WAAW;QAClBC;MACJ,CAAC,GAAGR,MAAM;MAEV,MAAMS,OAAO,GAAG,EAAE;MAElB,KAAK,MAAMC,GAAG,IAAIR,WAAW,EAAE;QAC3B,MAAMD,KAAK,GAAGC,WAAW,CAACQ,GAAG,CAAC;QAC9B,IAAIT,KAAK,KAAKU,SAAS,EAAE;UACrB;QACJ;QACA,MAAMC,WAAW,GAAGpB,kBAAkB,CAACkB,GAAG,CAAC;QAC3C,IAAI,CAACE,WAAW,EAAE;UACd;QACJ;QACA,MAAM;UAAEC,MAAM;UAAEC,OAAO;UAAEC;QAAU,CAAC,GAAGH,WAAW;QAElD,MAAMI,SAAS,GAAGT,WAAW,CAACU,OAAO,CAChCC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACL,OAAO,CAAC,CACnBM,MAAM,CAAC,CAACb,WAAW,CAACO,OAAO,EAAEA,OAAO,CAAC,CAAC,CACtCO,IAAI,CAAC,GAAG,CAAC;QAEd,MAAMf,KAAK,GAAGE,MAAM,CAACQ,SAAS,CAAC;QAC/B,IAAI,CAACV,KAAK,EAAE;UACR,MAAM,IAAIb,WAAW,CACjB,0CAA0CuB,SAAS,IAAI,EACvD,aAAa,EACb;YACIF;UACJ,CACJ,CAAC;QACL;QAEA,MAAMhB,SAAS,GAAGH,gBAAgB,CAACW,KAAK,CAAC;QAEzC,MAAMgB,kBAAkB,GAAGjB,qBAAqB,CAACP,SAAS,CAAC;QAE3D,MAAMyB,oBAAwD,GAC1DnB,qBAAqB,CAACN,SAAS,CAAC;QAEpC,MAAM0B,sBAAsB,GAAIvB,KAAU,IAAK;UAC3C,IAAI,CAACsB,oBAAoB,EAAE;YACvB,OAAOtB,KAAK;UAChB;UACA,OAAOsB,oBAAoB,CAACE,SAAS,CAAC;YAClCnB,KAAK;YACLL;UACJ,CAAC,CAAC;QACN,CAAC;QAED,MAAMyB,MAAM,GAAGJ,kBAAkB,CAACvB,MAAM,CAAC;UACrCW,GAAG;UACHT,KAAK;UACLE,kBAAkB;UAClBC,qBAAqB;UACrBC,qBAAqB;UACrBU,SAAS;UACTF,MAAM;UACNP,KAAK;UACLE,MAAM;UACNmB,YAAY,EAAEjC,cAAc,CAAC;YACzBO,KAAK;YACLwB,SAAS,EAAED;UACf,CAAC,CAAC;UACF9B,cAAc,EAAE8B;QACpB,CAAC,CAAC;QACF,IAAI,CAACE,MAAM,EAAE;UACT;QACJ;QACA,IAAIE,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;UACvBjB,OAAO,CAACqB,IAAI,CAAC,GAAGJ,MAAM,CAAC;UACvB;QACJ;QAEAjB,OAAO,CAACqB,IAAI,CAACJ,MAAM,CAAC;MACxB;MACA,OAAOjB,OAAO;IAClB;EACJ,CAAC,CAAC;EAEFZ,MAAM,CAACkC,IAAI,GAAG,gCAAgC;EAE9C,OAAOlC,MAAM;AACjB,CAAC","ignoreList":[]}
+{"version":3,"names":["CmsEntryFieldFilterPlugin","extractWhereParams","WebinyError","transformValue","getBaseFieldType","objectFilterCreate","plugin","fieldType","create","params","value","objectValue","valueFilterRegistry","transformValuePlugins","getFilterCreatePlugin","field","parentField","fields","filters","key","undefined","whereParams","negate","fieldId","operation","fieldPath","parents","map","p","concat","join","filterCreatePlugin","transformValuePlugin","transformValueCallable","transform","result","compareValue","Array","isArray","push","name"],"sources":["objectFilterCreate.ts"],"sourcesContent":["import { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin.js\";\nimport { extractWhereParams } from \"~/operations/entry/filtering/where.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport { transformValue } from \"~/operations/entry/filtering/transform.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\nexport const objectFilterCreate = () => {\n    const plugin = new CmsEntryFieldFilterPlugin({\n        fieldType: \"object\",\n        create: params => {\n            const {\n                value: objectValue,\n                valueFilterRegistry,\n                transformValuePlugins,\n                getFilterCreatePlugin,\n                field: parentField,\n                fields\n            } = params;\n\n            const filters = [];\n\n            for (const key in objectValue) {\n                const value = objectValue[key];\n                if (value === undefined) {\n                    continue;\n                }\n                const whereParams = extractWhereParams(key);\n                if (!whereParams) {\n                    continue;\n                }\n                const { negate, fieldId, operation } = whereParams;\n\n                const fieldPath = parentField.parents\n                    .map(p => p.fieldId)\n                    .concat([parentField.fieldId, fieldId])\n                    .join(\".\");\n\n                const field = fields[fieldPath];\n                if (!field) {\n                    throw new WebinyError(\n                        `There is no field with the field path \"${fieldPath}\".`,\n                        \"FIELD_ERROR\",\n                        {\n                            fieldId\n                        }\n                    );\n                }\n\n                const fieldType = getBaseFieldType(field);\n\n                const filterCreatePlugin = getFilterCreatePlugin(fieldType);\n\n                const transformValuePlugin: CmsFieldFilterValueTransformPlugin =\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                if (!result) {\n                    continue;\n                }\n                if (Array.isArray(result)) {\n                    filters.push(...result);\n                    continue;\n                }\n\n                filters.push(result);\n            }\n            return filters;\n        }\n    });\n\n    plugin.name = `headless-cms.ddb.filter.object`;\n\n    return plugin;\n};\n"],"mappings":"AAAA,SAASA,yBAAyB;AAClC,SAASC,kBAAkB;AAC3B,OAAOC,WAAW,MAAM,eAAe;AAEvC,SAASC,cAAc;AACvB,SAASC,gBAAgB,QAAQ,oDAAoD;AAErF,OAAO,MAAMC,kBAAkB,GAAGA,CAAA,KAAM;EACpC,MAAMC,MAAM,GAAG,IAAIN,yBAAyB,CAAC;IACzCO,SAAS,EAAE,QAAQ;IACnBC,MAAM,EAAEC,MAAM,IAAI;MACd,MAAM;QACFC,KAAK,EAAEC,WAAW;QAClBC,mBAAmB;QACnBC,qBAAqB;QACrBC,qBAAqB;QACrBC,KAAK,EAAEC,WAAW;QAClBC;MACJ,CAAC,GAAGR,MAAM;MAEV,MAAMS,OAAO,GAAG,EAAE;MAElB,KAAK,MAAMC,GAAG,IAAIR,WAAW,EAAE;QAC3B,MAAMD,KAAK,GAAGC,WAAW,CAACQ,GAAG,CAAC;QAC9B,IAAIT,KAAK,KAAKU,SAAS,EAAE;UACrB;QACJ;QACA,MAAMC,WAAW,GAAGpB,kBAAkB,CAACkB,GAAG,CAAC;QAC3C,IAAI,CAACE,WAAW,EAAE;UACd;QACJ;QACA,MAAM;UAAEC,MAAM;UAAEC,OAAO;UAAEC;QAAU,CAAC,GAAGH,WAAW;QAElD,MAAMI,SAAS,GAAGT,WAAW,CAACU,OAAO,CAChCC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACL,OAAO,CAAC,CACnBM,MAAM,CAAC,CAACb,WAAW,CAACO,OAAO,EAAEA,OAAO,CAAC,CAAC,CACtCO,IAAI,CAAC,GAAG,CAAC;QAEd,MAAMf,KAAK,GAAGE,MAAM,CAACQ,SAAS,CAAC;QAC/B,IAAI,CAACV,KAAK,EAAE;UACR,MAAM,IAAIb,WAAW,CACjB,0CAA0CuB,SAAS,IAAI,EACvD,aAAa,EACb;YACIF;UACJ,CACJ,CAAC;QACL;QAEA,MAAMhB,SAAS,GAAGH,gBAAgB,CAACW,KAAK,CAAC;QAEzC,MAAMgB,kBAAkB,GAAGjB,qBAAqB,CAACP,SAAS,CAAC;QAE3D,MAAMyB,oBAAwD,GAC1DnB,qBAAqB,CAACN,SAAS,CAAC;QAEpC,MAAM0B,sBAAsB,GAAIvB,KAAU,IAAK;UAC3C,IAAI,CAACsB,oBAAoB,EAAE;YACvB,OAAOtB,KAAK;UAChB;UACA,OAAOsB,oBAAoB,CAACE,SAAS,CAAC;YAClCnB,KAAK;YACLL;UACJ,CAAC,CAAC;QACN,CAAC;QAED,MAAMyB,MAAM,GAAGJ,kBAAkB,CAACvB,MAAM,CAAC;UACrCW,GAAG;UACHT,KAAK;UACLE,mBAAmB;UACnBC,qBAAqB;UACrBC,qBAAqB;UACrBU,SAAS;UACTF,MAAM;UACNP,KAAK;UACLE,MAAM;UACNmB,YAAY,EAAEjC,cAAc,CAAC;YACzBO,KAAK;YACLwB,SAAS,EAAED;UACf,CAAC,CAAC;UACF9B,cAAc,EAAE8B;QACpB,CAAC,CAAC;QACF,IAAI,CAACE,MAAM,EAAE;UACT;QACJ;QACA,IAAIE,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;UACvBjB,OAAO,CAACqB,IAAI,CAAC,GAAGJ,MAAM,CAAC;UACvB;QACJ;QAEAjB,OAAO,CAACqB,IAAI,CAACJ,MAAM,CAAC;MACxB;MACA,OAAOjB,OAAO;IAClB;EACJ,CAAC,CAAC;EAEFZ,MAAM,CAACkC,IAAI,GAAG,gCAAgC;EAE9C,OAAOlC,MAAM;AACjB,CAAC","ignoreList":[]}