@webiny/api-headless-cms-ddb 6.4.12-beta.5 → 6.5.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-ddb",
-	"version": "6.4.12-beta.5",
+	"version": "6.5.0-beta.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -26,28 +26,28 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.4.12-beta.5",
-		"@webiny/api-headless-cms": "6.4.12-beta.5",
-		"@webiny/aws-sdk": "6.4.12-beta.5",
-		"@webiny/db-dynamodb": "6.4.12-beta.5",
-		"@webiny/error": "6.4.12-beta.5",
-		"@webiny/feature": "6.4.12-beta.5",
-		"@webiny/handler": "6.4.12-beta.5",
-		"@webiny/handler-db": "6.4.12-beta.5",
-		"@webiny/utils": "6.4.12-beta.5",
-		"dataloader": "2.2.3",
-		"dot-prop": "10.2.0",
-		"lodash": "4.18.1"
+		"@webiny/api": "6.5.0-beta.1",
+		"@webiny/api-headless-cms": "6.5.0-beta.1",
+		"@webiny/api-headless-cms-storage": "6.5.0-beta.1",
+		"@webiny/aws-sdk": "6.5.0-beta.1",
+		"@webiny/db-dynamodb": "6.5.0-beta.1",
+		"@webiny/db-utils": "6.5.0-beta.1",
+		"@webiny/error": "6.5.0-beta.1",
+		"@webiny/feature": "6.5.0-beta.1",
+		"@webiny/handler": "6.5.0-beta.1",
+		"@webiny/handler-db": "6.5.0-beta.1",
+		"@webiny/plugins": "6.5.0-beta.1",
+		"@webiny/utils": "6.5.0-beta.1",
+		"dataloader": "2.2.3"
 	},
 	"devDependencies": {
 		"@types/jsonpack": "1.1.6",
-		"@webiny/build-tools": "6.4.12-beta.5",
-		"@webiny/di": "1.1.0",
-		"@webiny/plugins": "6.4.12-beta.5",
-		"@webiny/project-utils": "6.4.12-beta.5",
+		"@webiny/build-tools": "6.5.0-beta.1",
+		"@webiny/di": "1.0.2",
+		"@webiny/project-utils": "6.5.0-beta.1",
 		"jest-dynalite": "3.6.1",
-		"typescript": "6.0.3",
-		"vitest": "5.0.1"
+		"typescript": "7.0.2",
+		"vitest": "4.1.10"
 	},
 	"publishConfig": {
 		"access": "public"

package/plugins/index.d.ts

@@ -1,4 +1,2 @@
-export * from "./CmsEntryFieldFilterPathPlugin.js";
-export * from "./CmsEntryFieldSortingPlugin.js";
-export * from "./CmsEntryFieldFilterPlugin.js";
-export * from "./CmsFieldFilterValueTransformPlugin.js";
+export { CmsEntryFieldFilterPathPlugin, CmsEntryFieldSortingPlugin, createCmsEntryFieldSortingPlugin, CmsEntryFieldFilterPlugin, CmsFieldFilterValueTransformPlugin } from "@webiny/api-headless-cms-storage";
+export type { CreatePathCallable, CmsEntryFieldFilterPluginCreateResponse } from "@webiny/api-headless-cms-storage";

package/plugins/index.js

@@ -1,4 +1 @@
-export * from "./CmsEntryFieldFilterPathPlugin.js";
-export * from "./CmsEntryFieldSortingPlugin.js";
-export * from "./CmsEntryFieldFilterPlugin.js";
-export * from "./CmsFieldFilterValueTransformPlugin.js";
+export { CmsEntryFieldFilterPathPlugin, CmsEntryFieldFilterPlugin, CmsEntryFieldSortingPlugin, CmsFieldFilterValueTransformPlugin, createCmsEntryFieldSortingPlugin } from "@webiny/api-headless-cms-storage";

package/types.d.ts

@@ -1,38 +1,15 @@
-import { type Plugin, PluginsContainer } from "@webiny/plugins/types.js";
-import type { CmsContext, CmsEntryStorageOperations as BaseCmsEntryStorageOperations, CmsModelField, HeadlessCmsStorageOperations as BaseHeadlessCmsStorageOperations } from "@webiny/api-headless-cms/types/index.js";
-import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb/index.js";
+import { PluginsContainer } from "@webiny/plugins/types.js";
+import type { CmsContext, CmsEntryStorageOperations as BaseCmsEntryStorageOperations, HeadlessCmsStorageOperations as BaseHeadlessCmsStorageOperations } from "@webiny/api-headless-cms/types/index.js";
 import type { IEntryEntity, IGroupEntity, IModelEntity } from "./definitions/types.js";
 import type { ITable } from "@webiny/db-dynamodb";
 export type { CmsContext };
 export type { IGroupEntity, IModelEntity, IEntryEntity };
-interface CmsFieldFilterValueTransformParams {
-    /**
-     * A field which value we are transforming.
-     */
-    field: Partial<CmsModelField> & Pick<CmsModelField, "id" | "storageId" | "fieldId" | "settings">;
-    value: any;
-}
-export interface CmsFieldFilterValueTransformPlugin extends Plugin {
-    /**
-     * A plugin type.
-     */
-    type: "cms-field-filter-value-transform";
-    /**
-     * A field type this plugin is for.
-     */
-    fieldType: string;
-    /**
-     * Transform method which expect field definition and value to transform.
-     */
-    transform: (params: CmsFieldFilterValueTransformParams) => any;
-}
 export declare enum ENTITIES {
     GROUPS = "CmsGroups",
     MODELS = "CmsModels",
     ENTRIES = "CmsEntries"
 }
 export interface StorageOperationsFactoryParams {
-    documentClient: DynamoDBDocument;
     table?: string;
     plugins: PluginsContainer;
     container: CmsContext["container"];

package/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../src/types.ts"],"sourcesContent":["import { type Plugin, PluginsContainer } from \"@webiny/plugins/types.js\";\nimport type {\n    CmsContext,\n    CmsEntryStorageOperations as BaseCmsEntryStorageOperations,\n    CmsModelField,\n    HeadlessCmsStorageOperations as BaseHeadlessCmsStorageOperations\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { DynamoDBDocument } from \"@webiny/aws-sdk/client-dynamodb/index.js\";\nimport type { IEntryEntity, IGroupEntity, IModelEntity } from \"~/definitions/types.js\";\nimport type { ITable } from \"@webiny/db-dynamodb\";\n\nexport type { CmsContext };\n\nexport type { IGroupEntity, IModelEntity, IEntryEntity };\n\ninterface CmsFieldFilterValueTransformParams {\n    /**\n     * A field which value we are transforming.\n     */\n    field: Partial<CmsModelField> &\n        Pick<CmsModelField, \"id\" | \"storageId\" | \"fieldId\" | \"settings\">;\n    value: any;\n}\n\nexport interface CmsFieldFilterValueTransformPlugin extends Plugin {\n    /**\n     * A plugin type.\n     */\n    type: \"cms-field-filter-value-transform\";\n    /**\n     * A field type this plugin is for.\n     */\n    fieldType: string;\n    /**\n     * Transform method which expect field definition and value to transform.\n     */\n    transform: (params: CmsFieldFilterValueTransformParams) => any;\n}\n\nexport enum ENTITIES {\n    GROUPS = \"CmsGroups\",\n    MODELS = \"CmsModels\",\n    ENTRIES = \"CmsEntries\"\n}\n\nexport interface StorageOperationsFactoryParams {\n    documentClient: DynamoDBDocument;\n    table?: string;\n    plugins: PluginsContainer;\n    container: CmsContext[\"container\"];\n}\n\nexport interface IHeadlessCmsStorageOperationsGetEntitiesResult {\n    groups: IGroupEntity;\n    models: IModelEntity;\n    entries: IEntryEntity;\n}\n\nexport interface HeadlessCmsStorageOperations extends BaseHeadlessCmsStorageOperations {\n    getTable: () => ITable;\n    getEntities: () => IHeadlessCmsStorageOperationsGetEntitiesResult;\n}\n\nexport interface StorageOperationsFactory {\n    (params: StorageOperationsFactoryParams): HeadlessCmsStorageOperations;\n}\n\nexport interface CmsEntryStorageOperations extends BaseCmsEntryStorageOperations {\n    dataLoaders: IDataLoadersHandler;\n}\n\nexport interface DataLoadersHandlerInterfaceClearAllParams {\n    tenant: string;\n}\nexport interface IDataLoadersHandler {\n    clearAll: (params?: DataLoadersHandlerInterfaceClearAllParams) => void;\n}\n"],"names":["ENTITIES"],"mappings":"AAuCO,IAAKA,iBAAQA,WAAAA,GAAAA,SAARA,QAAQ;;;;WAARA"}
+{"version":3,"file":"types.js","sources":["../src/types.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins/types.js\";\nimport type {\n    CmsContext,\n    CmsEntryStorageOperations as BaseCmsEntryStorageOperations,\n    HeadlessCmsStorageOperations as BaseHeadlessCmsStorageOperations\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { IEntryEntity, IGroupEntity, IModelEntity } from \"~/definitions/types.js\";\nimport type { ITable } from \"@webiny/db-dynamodb\";\n\nexport type { CmsContext };\n\nexport type { IGroupEntity, IModelEntity, IEntryEntity };\n\nexport enum ENTITIES {\n    GROUPS = \"CmsGroups\",\n    MODELS = \"CmsModels\",\n    ENTRIES = \"CmsEntries\"\n}\n\nexport interface StorageOperationsFactoryParams {\n    table?: string;\n    plugins: PluginsContainer;\n    container: CmsContext[\"container\"];\n}\n\nexport interface IHeadlessCmsStorageOperationsGetEntitiesResult {\n    groups: IGroupEntity;\n    models: IModelEntity;\n    entries: IEntryEntity;\n}\n\nexport interface HeadlessCmsStorageOperations extends BaseHeadlessCmsStorageOperations {\n    getTable: () => ITable;\n    getEntities: () => IHeadlessCmsStorageOperationsGetEntitiesResult;\n}\n\nexport interface StorageOperationsFactory {\n    (params: StorageOperationsFactoryParams): HeadlessCmsStorageOperations;\n}\n\nexport interface CmsEntryStorageOperations extends BaseCmsEntryStorageOperations {\n    dataLoaders: IDataLoadersHandler;\n}\n\nexport interface DataLoadersHandlerInterfaceClearAllParams {\n    tenant: string;\n}\nexport interface IDataLoadersHandler {\n    clearAll: (params?: DataLoadersHandlerInterfaceClearAllParams) => void;\n}\n"],"names":["ENTITIES"],"mappings":"AAaO,IAAKA,iBAAQA,WAAAA,GAAAA,SAARA,QAAQ;;;;WAARA"}

package/dynamoDb/path/locationFolderId.d.ts

@@ -1,2 +0,0 @@
-import { CmsEntryFieldFilterPathPlugin } from "../../plugins/CmsEntryFieldFilterPathPlugin.js";
-export declare const createLocationFolderIdPathPlugin: () => CmsEntryFieldFilterPathPlugin;

package/dynamoDb/path/locationFolderId.js

@@ -1,21 +0,0 @@
-import error from "@webiny/error";
-import { CmsEntryFieldFilterPathPlugin } from "../../plugins/CmsEntryFieldFilterPathPlugin.js";
-const createPath = ({ field })=>{
-    const { path } = field.settings || {};
-    if (!path) throw new error("Missing path settings value.", "FIELD_SETTINGS_ERROR", {
-        field
-    });
-    return path;
-};
-const createLocationFolderIdPathPlugin = ()=>new CmsEntryFieldFilterPathPlugin({
-        fieldType: "text",
-        path: createPath,
-        canUse: (field, parents)=>{
-            if ("folderId" !== field.fieldId) return false;
-            else if (!parents?.length) return false;
-            return "wbyAco_location" === parents[0];
-        }
-    });
-export { createLocationFolderIdPathPlugin };
-
-//# sourceMappingURL=locationFolderId.js.map

package/dynamoDb/path/locationFolderId.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dynamoDb/path/locationFolderId.js","sources":["../../../src/dynamoDb/path/locationFolderId.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport WebinyError from \"@webiny/error\";\nimport type { CreatePathCallable } from \"~/plugins/CmsEntryFieldFilterPathPlugin.js\";\nimport { CmsEntryFieldFilterPathPlugin } from \"~/plugins/CmsEntryFieldFilterPathPlugin.js\";\n\nconst createPath: CreatePathCallable = ({ field }) => {\n    const { path } = field.settings || {};\n    if (!path) {\n        throw new WebinyError(\"Missing path settings value.\", \"FIELD_SETTINGS_ERROR\", {\n            field\n        });\n    }\n    return path;\n};\n\nexport const createLocationFolderIdPathPlugin = (): CmsEntryFieldFilterPathPlugin => {\n    return new CmsEntryFieldFilterPathPlugin({\n        fieldType: \"text\",\n        path: createPath,\n        canUse: (field, parents) => {\n            if (field.fieldId !== \"folderId\") {\n                return false;\n            } else if (!parents?.length) {\n                return false;\n            }\n            return parents[0] === \"wbyAco_location\";\n        }\n    });\n};\n"],"names":["createPath","field","path","WebinyError","createLocationFolderIdPathPlugin","CmsEntryFieldFilterPathPlugin","parents"],"mappings":";;AAOA,MAAMA,aAAiC,CAAC,EAAEC,KAAK,EAAE;IAC7C,MAAM,EAAEC,IAAI,EAAE,GAAGD,MAAM,QAAQ,IAAI,CAAC;IACpC,IAAI,CAACC,MACD,MAAM,IAAIC,MAAY,gCAAgC,wBAAwB;QAC1EF;IACJ;IAEJ,OAAOC;AACX;AAEO,MAAME,mCAAmC,IACrC,IAAIC,8BAA8B;QACrC,WAAW;QACX,MAAML;QACN,QAAQ,CAACC,OAAOK;YACZ,IAAIL,AAAkB,eAAlBA,MAAM,OAAO,EACb,OAAO;iBACJ,IAAI,CAACK,SAAS,QACjB,OAAO;YAEX,OAAOA,AAAe,sBAAfA,OAAO,CAAC,EAAE;QACrB;IACJ"}

package/dynamoDb/path/plainObject.d.ts

@@ -1,2 +0,0 @@
-import { CmsEntryFieldFilterPathPlugin } from "../../plugins/CmsEntryFieldFilterPathPlugin.js";
-export declare const createPlainObjectPathPlugin: () => CmsEntryFieldFilterPathPlugin;

package/dynamoDb/path/plainObject.js

@@ -1,16 +0,0 @@
-import error from "@webiny/error";
-import { CmsEntryFieldFilterPathPlugin } from "../../plugins/CmsEntryFieldFilterPathPlugin.js";
-const createPath = ({ field })=>{
-    const { path } = field.settings || {};
-    if (!path) throw new error("Missing path settings value.", "FIELD_SETTINGS_ERROR", {
-        field
-    });
-    return path;
-};
-const createPlainObjectPathPlugin = ()=>new CmsEntryFieldFilterPathPlugin({
-        fieldType: "plainObject",
-        path: createPath
-    });
-export { createPlainObjectPathPlugin };
-
-//# sourceMappingURL=plainObject.js.map

package/dynamoDb/path/plainObject.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dynamoDb/path/plainObject.js","sources":["../../../src/dynamoDb/path/plainObject.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport WebinyError from \"@webiny/error\";\nimport type { CreatePathCallable } from \"~/plugins/CmsEntryFieldFilterPathPlugin.js\";\nimport { CmsEntryFieldFilterPathPlugin } from \"~/plugins/CmsEntryFieldFilterPathPlugin.js\";\n\nconst createPath: CreatePathCallable = ({ field }) => {\n    const { path } = field.settings || {};\n    if (!path) {\n        throw new WebinyError(\"Missing path settings value.\", \"FIELD_SETTINGS_ERROR\", {\n            field\n        });\n    }\n    return path;\n};\n\nexport const createPlainObjectPathPlugin = (): CmsEntryFieldFilterPathPlugin => {\n    return new CmsEntryFieldFilterPathPlugin({\n        fieldType: \"plainObject\",\n        path: createPath\n    });\n};\n"],"names":["createPath","field","path","WebinyError","createPlainObjectPathPlugin","CmsEntryFieldFilterPathPlugin"],"mappings":";;AAOA,MAAMA,aAAiC,CAAC,EAAEC,KAAK,EAAE;IAC7C,MAAM,EAAEC,IAAI,EAAE,GAAGD,MAAM,QAAQ,IAAI,CAAC;IACpC,IAAI,CAACC,MACD,MAAM,IAAIC,MAAY,gCAAgC,wBAAwB;QAC1EF;IACJ;IAEJ,OAAOC;AACX;AAEO,MAAME,8BAA8B,IAChC,IAAIC,8BAA8B;QACrC,WAAW;QACX,MAAML;IACV"}

package/dynamoDb/transformValue/datetime.d.ts

@@ -1,5 +0,0 @@
-/**
- * File is @internal
- */
-import type { CmsFieldFilterValueTransformPlugin } from "../../types.js";
-export declare const createDatetimeTransformValuePlugin: () => CmsFieldFilterValueTransformPlugin;

package/dynamoDb/transformValue/datetime.js

@@ -1,29 +0,0 @@
-import { TimeTransformPlugin } from "@webiny/db-dynamodb/plugins/definitions/TimeTransformPlugin.js";
-import { DateTimeTransformPlugin } from "@webiny/db-dynamodb/plugins/definitions/DateTimeTransformPlugin.js";
-const timeTransformer = new TimeTransformPlugin({
-    fields: [
-        "*"
-    ]
-});
-const dateTimeTransformer = new DateTimeTransformPlugin({
-    fields: [
-        "*"
-    ]
-});
-const createDatetimeTransformValuePlugin = ()=>({
-        type: "cms-field-filter-value-transform",
-        name: "cms-field-value-filter-transform-datetime",
-        fieldType: "datetime",
-        transform: ({ field, value })=>{
-            const { type } = field.settings || {};
-            if ("time" === type) return timeTransformer.transform({
-                value
-            });
-            return dateTimeTransformer.transform({
-                value
-            });
-        }
-    });
-export { createDatetimeTransformValuePlugin };
-
-//# sourceMappingURL=datetime.js.map

package/dynamoDb/transformValue/datetime.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dynamoDb/transformValue/datetime.js","sources":["../../../src/dynamoDb/transformValue/datetime.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport { TimeTransformPlugin } from \"@webiny/db-dynamodb/plugins/definitions/TimeTransformPlugin.js\";\nimport { DateTimeTransformPlugin } from \"@webiny/db-dynamodb/plugins/definitions/DateTimeTransformPlugin.js\";\n\nconst timeTransformer = new TimeTransformPlugin({\n    fields: [\"*\"]\n});\nconst dateTimeTransformer = new DateTimeTransformPlugin({\n    fields: [\"*\"]\n});\n\nexport const createDatetimeTransformValuePlugin = (): CmsFieldFilterValueTransformPlugin => {\n    return {\n        type: \"cms-field-filter-value-transform\",\n        name: \"cms-field-value-filter-transform-datetime\",\n        fieldType: \"datetime\",\n        /**\n         * Always transform into the milliseconds.\n         */\n        transform: ({ field, value }) => {\n            const { type } = field.settings || {};\n            if (type === \"time\") {\n                return timeTransformer.transform({\n                    value\n                });\n            }\n            return dateTimeTransformer.transform({\n                value\n            });\n        }\n    };\n};\n"],"names":["timeTransformer","TimeTransformPlugin","dateTimeTransformer","DateTimeTransformPlugin","createDatetimeTransformValuePlugin","field","value","type"],"mappings":";;AAOA,MAAMA,kBAAkB,IAAIC,oBAAoB;IAC5C,QAAQ;QAAC;KAAI;AACjB;AACA,MAAMC,sBAAsB,IAAIC,wBAAwB;IACpD,QAAQ;QAAC;KAAI;AACjB;AAEO,MAAMC,qCAAqC,IACvC;QACH,MAAM;QACN,MAAM;QACN,WAAW;QAIX,WAAW,CAAC,EAAEC,KAAK,EAAEC,KAAK,EAAE;YACxB,MAAM,EAAEC,IAAI,EAAE,GAAGF,MAAM,QAAQ,IAAI,CAAC;YACpC,IAAIE,AAAS,WAATA,MACA,OAAOP,gBAAgB,SAAS,CAAC;gBAC7BM;YACJ;YAEJ,OAAOJ,oBAAoB,SAAS,CAAC;gBACjCI;YACJ;QACJ;IACJ"}

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

@@ -1,27 +0,0 @@
-import type { CmsContext, CmsEntryListWhere } from "@webiny/api-headless-cms/types/index.js";
-import type { PluginsContainer } from "@webiny/plugins";
-import type { Field } from "./types.js";
-import { ValueFilter } from "@webiny/db-dynamodb/feature/ValueFilter/index.js";
-interface ICreateExpressionsParams {
-    plugins: PluginsContainer;
-    container: CmsContext["container"];
-    where: Partial<CmsEntryListWhere>;
-    fields: Record<string, Field>;
-}
-export type ExpressionCondition = "AND" | "OR";
-export interface Expression {
-    expressions: Expression[];
-    filters: Filter[];
-    condition: ExpressionCondition;
-}
-export interface Filter {
-    field: Field;
-    path: string;
-    fieldPathId: string;
-    filter: ValueFilter.Interface;
-    negate: boolean;
-    compareValue: any;
-    transformValue: <I = any, O = any>(value: I) => O;
-}
-export declare const createExpressions: (params: ICreateExpressionsParams) => Expression;
-export {};

package/operations/entry/filtering/createExpressions.js

@@ -1,124 +0,0 @@
-import error from "@webiny/error";
-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";
-const createExpressions = (params)=>{
-    const { where, plugins, fields, container } = params;
-    const valueFilterRegistry = container.resolve(ValueFilterRegistry);
-    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 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
-        });
-    };
-    const createExpression = ({ where, condition })=>{
-        const expression = {
-            filters: [],
-            expressions: [],
-            condition
-        };
-        for(const key in where){
-            const value = where[key];
-            if (void 0 === value) continue;
-            if ("AND" === key) {
-                const childWhereList = getWhereValues(value, key);
-                const childExpression = {
-                    condition: "AND",
-                    filters: [],
-                    expressions: []
-                };
-                for (const childWhere of childWhereList){
-                    const result = createExpression({
-                        where: childWhere,
-                        condition: "AND"
-                    });
-                    childExpression.expressions.push(result);
-                }
-                expression.expressions.push(childExpression);
-                continue;
-            }
-            if ("OR" === key) {
-                const childWhereList = getWhereValues(value, key);
-                const childExpression = {
-                    condition: "OR",
-                    filters: [],
-                    expressions: []
-                };
-                for (const childWhere of childWhereList){
-                    const result = createExpression({
-                        where: childWhere,
-                        condition: "AND"
-                    });
-                    childExpression.expressions.push(result);
-                }
-                expression.expressions.push(childExpression);
-                continue;
-            }
-            const whereParams = extractWhereParams(key);
-            if (!whereParams) continue;
-            const { fieldId, operation, negate } = whereParams;
-            const field = fields[fieldId];
-            if (!field) throw new error(`There is no field with the fieldId "${fieldId}".`, "FIELD_ERROR", {
-                fieldId
-            });
-            const filterCreatePlugin = getFilterCreatePlugin(field.type);
-            const fieldType = getBaseFieldType(field);
-            const transformValuePlugin = transformValuePlugins[fieldType];
-            const transformValueCallable = (value)=>{
-                if (!transformValuePlugin) return value;
-                return transformValuePlugin.transform({
-                    field,
-                    value
-                });
-            };
-            const result = filterCreatePlugin.create({
-                key,
-                value,
-                valueFilterRegistry,
-                transformValuePlugins,
-                getFilterCreatePlugin,
-                operation,
-                negate,
-                field,
-                fields,
-                compareValue: transformValue({
-                    value,
-                    transform: transformValueCallable
-                }),
-                transformValue: transformValueCallable
-            });
-            if (!(!result || Array.isArray(result) && 0 === result.length)) expression.filters.push(...Array.isArray(result) ? result : [
-                result
-            ]);
-        }
-        return expression;
-    };
-    const expression = createExpression({
-        where,
-        condition: "AND"
-    });
-    if (expression.filters.length > 0 || 1 !== expression.expressions.length) return expression;
-    return expression.expressions[0];
-};
-export { createExpressions };
-
-//# sourceMappingURL=createExpressions.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"operations/entry/filtering/createExpressions.js","sources":["../../../../src/operations/entry/filtering/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"],"names":["createExpressions","params","where","plugins","fields","container","valueFilterRegistry","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/operations/entry/filtering/createFields.d.ts

@@ -1,16 +0,0 @@
-import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
-import type { Field } from "./types.js";
-import type { PluginsContainer } from "@webiny/plugins";
-interface Params {
-    fields: CmsModelField[];
-    plugins: PluginsContainer;
-}
-/**
- * This method will map the fieldId (fieldId -> field) to the actual field.
- *
- * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).
- */
-export declare const createFields: (params: Params) => {
-    [x: string]: Field;
-};
-export {};

package/operations/entry/filtering/createFields.js

@@ -1,93 +0,0 @@
-import { createSystemFields } from "./systemFields.js";
-import { CmsEntryFieldFilterPathPlugin } from "../../../plugins/index.js";
-import { getMappedPlugins } from "./mapPlugins.js";
-import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
-const createFieldCollection = (params)=>{
-    const { fields, parents, transformValuePlugins, valuePathPlugins, system } = params;
-    return fields.reduce((collection, field)=>{
-        const fieldType = getBaseFieldType(field);
-        const transformPlugin = transformValuePlugins[fieldType];
-        const valuePathPlugin = valuePathPlugins[fieldType];
-        const fieldId = [
-            ...parents,
-            {
-                fieldId: field.fieldId,
-                list: field.list
-            }
-        ].map((f)=>f.fieldId).join(".");
-        collection[fieldId] = {
-            ...field,
-            parents,
-            system,
-            createPath: (params)=>{
-                if (valuePathPlugin && valuePathPlugin.canUse(field, parents.map((p)=>p.fieldId))) return valuePathPlugin.createPath(params);
-                return parents.map((parent)=>parent.fieldId).concat([
-                    params.field.fieldId
-                ]).join(".");
-            },
-            transform: (value)=>{
-                if (!transformPlugin) return value;
-                return transformPlugin.transform({
-                    field,
-                    value
-                });
-            }
-        };
-        const childFields = field.settings?.fields;
-        if (!childFields?.length) return collection;
-        const result = createFieldCollection({
-            fields: childFields,
-            parents: [
-                ...parents,
-                {
-                    fieldId: field.fieldId,
-                    list: field.list
-                }
-            ],
-            transformValuePlugins,
-            valuePathPlugins,
-            system
-        });
-        Object.assign(collection, result);
-        return collection;
-    }, {});
-};
-const createFields = (params)=>{
-    const { fields, plugins } = params;
-    const transformValuePlugins = getMappedPlugins({
-        plugins,
-        type: "cms-field-filter-value-transform",
-        property: "fieldType"
-    });
-    const valuePathPlugins = getMappedPlugins({
-        plugins,
-        type: CmsEntryFieldFilterPathPlugin.type,
-        property: "fieldType"
-    });
-    const collection = createFieldCollection({
-        fields: createSystemFields(),
-        transformValuePlugins,
-        valuePathPlugins,
-        parents: [],
-        system: true
-    });
-    const result = createFieldCollection({
-        fields,
-        transformValuePlugins,
-        valuePathPlugins,
-        parents: [
-            {
-                fieldId: "values",
-                list: false
-            }
-        ],
-        system: false
-    });
-    return {
-        ...collection,
-        ...result
-    };
-};
-export { createFields };
-
-//# sourceMappingURL=createFields.js.map

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

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

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

@@ -1,17 +0,0 @@
-import type { Field } from "./types.js";
-import type { PluginsContainer } from "@webiny/plugins";
-import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
-interface IResponse {
-    valuePath: string;
-    reverse: boolean;
-    fieldId: string;
-    field: Field;
-}
-interface IParams {
-    model: CmsModel;
-    sortBy: string;
-    fields: Record<string, Field>;
-    plugins: PluginsContainer;
-}
-export declare const extractSort: (params: IParams) => IResponse;
-export {};

package/operations/entry/filtering/extractSort.js

@@ -1,60 +0,0 @@
-import error from "@webiny/error";
-import { CmsEntryFieldSortingPlugin } from "../../../plugins/index.js";
-const extractSortInfo = (sortBy)=>{
-    const rootSorting = sortBy.match(/^([a-zA-Z]+)_(ASC|DESC)$/);
-    if (rootSorting) return {
-        fieldId: rootSorting[1],
-        isValues: false,
-        order: rootSorting[2]
-    };
-    const valuesSorting = sortBy.match(/^values_([a-zA-Z0-9]+)_(ASC|DESC)$/);
-    if (valuesSorting) return {
-        fieldId: valuesSorting[1],
-        isValues: true,
-        order: valuesSorting[2]
-    };
-    throw new error("Problem in determining the sorting for the entry items.", "SORT_EXTRACT_ERROR", {
-        sortBy
-    });
-};
-const extractSort = (params)=>{
-    const { model, sortBy, fields, plugins } = params;
-    const { fieldId, isValues: isValuesSorting, order } = extractSortInfo(sortBy);
-    const field = Object.values(fields).find((f)=>{
-        const isValues = f.parents[0]?.fieldId === "values";
-        if (isValues && isValuesSorting) return f.fieldId === fieldId;
-        if (f.parents.length > 0) return false;
-        return f.fieldId === fieldId;
-    });
-    const plugin = plugins.byType(CmsEntryFieldSortingPlugin.type).reverse().find((plugin)=>plugin.canUse({
-            model,
-            field,
-            fieldId,
-            order,
-            sortBy
-        }));
-    if (plugin) return plugin.createSort({
-        model,
-        fieldId,
-        order,
-        sortBy,
-        field,
-        fields
-    });
-    else if (!field) throw new error("Sorting field does not exist in the content model.", "SORTING_FIELD_ERROR", {
-        fieldId,
-        fields
-    });
-    const valuePath = field.createPath({
-        field
-    });
-    return {
-        field,
-        fieldId,
-        valuePath,
-        reverse: "DESC" === order
-    };
-};
-export { extractSort };
-
-//# sourceMappingURL=extractSort.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"operations/entry/filtering/extractSort.js","sources":["../../../../src/operations/entry/filtering/extractSort.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { Field } from \"./types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryFieldSortingPlugin } from \"~/plugins/index.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\nconst extractSortInfo = (sortBy: string) => {\n    const rootSorting = sortBy.match(/^([a-zA-Z]+)_(ASC|DESC)$/);\n    if (rootSorting) {\n        return {\n            fieldId: rootSorting[1],\n            isValues: false,\n            order: rootSorting[2] as \"ASC\" | \"DESC\"\n        };\n    }\n    const valuesSorting = sortBy.match(/^values_([a-zA-Z0-9]+)_(ASC|DESC)$/);\n    if (valuesSorting) {\n        return {\n            fieldId: valuesSorting[1],\n            isValues: true,\n            order: valuesSorting[2] as \"ASC\" | \"DESC\"\n        };\n    }\n    throw new WebinyError(\n        \"Problem in determining the sorting for the entry items.\",\n        \"SORT_EXTRACT_ERROR\",\n        {\n            sortBy\n        }\n    );\n};\n\ninterface IResponse {\n    valuePath: string;\n    reverse: boolean;\n    fieldId: string;\n    field: Field;\n}\n\ninterface IParams {\n    model: CmsModel;\n    sortBy: string;\n    fields: Record<string, Field>;\n    plugins: PluginsContainer;\n}\n\nexport const extractSort = (params: IParams): IResponse => {\n    const { model, sortBy, fields, plugins } = params;\n    const { fieldId, isValues: isValuesSorting, order } = extractSortInfo(sortBy);\n\n    const field = Object.values(fields).find(f => {\n        /**\n         * We do not support sorting by nested fields.\n         */\n        const isValues = f.parents[0]?.fieldId === \"values\";\n        if (isValues && isValuesSorting) {\n            return f.fieldId === fieldId;\n        }\n        if (f.parents.length > 0) {\n            return false;\n        }\n        return f.fieldId === fieldId;\n    });\n\n    const plugin = plugins\n        .byType<CmsEntryFieldSortingPlugin>(CmsEntryFieldSortingPlugin.type)\n        .reverse()\n        .find(plugin => {\n            return plugin.canUse({\n                model,\n                field,\n                fieldId,\n                order,\n                sortBy\n            });\n        });\n\n    if (plugin) {\n        return plugin.createSort({\n            model,\n            fieldId,\n            order,\n            sortBy,\n            field,\n            fields\n        });\n    } else if (!field) {\n        throw new WebinyError(\n            \"Sorting field does not exist in the content model.\",\n            \"SORTING_FIELD_ERROR\",\n            {\n                fieldId,\n                fields\n            }\n        );\n    }\n    const valuePath = field.createPath({\n        field\n    });\n    return {\n        field,\n        fieldId,\n        valuePath,\n        reverse: order === \"DESC\"\n    };\n};\n"],"names":["extractSortInfo","sortBy","rootSorting","valuesSorting","WebinyError","extractSort","params","model","fields","plugins","fieldId","isValuesSorting","order","field","Object","f","isValues","plugin","CmsEntryFieldSortingPlugin","valuePath"],"mappings":";;AAMA,MAAMA,kBAAkB,CAACC;IACrB,MAAMC,cAAcD,OAAO,KAAK,CAAC;IACjC,IAAIC,aACA,OAAO;QACH,SAASA,WAAW,CAAC,EAAE;QACvB,UAAU;QACV,OAAOA,WAAW,CAAC,EAAE;IACzB;IAEJ,MAAMC,gBAAgBF,OAAO,KAAK,CAAC;IACnC,IAAIE,eACA,OAAO;QACH,SAASA,aAAa,CAAC,EAAE;QACzB,UAAU;QACV,OAAOA,aAAa,CAAC,EAAE;IAC3B;IAEJ,MAAM,IAAIC,MACN,2DACA,sBACA;QACIH;IACJ;AAER;AAgBO,MAAMI,cAAc,CAACC;IACxB,MAAM,EAAEC,KAAK,EAAEN,MAAM,EAAEO,MAAM,EAAEC,OAAO,EAAE,GAAGH;IAC3C,MAAM,EAAEI,OAAO,EAAE,UAAUC,eAAe,EAAEC,KAAK,EAAE,GAAGZ,gBAAgBC;IAEtE,MAAMY,QAAQC,OAAO,MAAM,CAACN,QAAQ,IAAI,CAACO,CAAAA;QAIrC,MAAMC,WAAWD,EAAE,OAAO,CAAC,EAAE,EAAE,YAAY;QAC3C,IAAIC,YAAYL,iBACZ,OAAOI,EAAE,OAAO,KAAKL;QAEzB,IAAIK,EAAE,OAAO,CAAC,MAAM,GAAG,GACnB,OAAO;QAEX,OAAOA,EAAE,OAAO,KAAKL;IACzB;IAEA,MAAMO,SAASR,QACV,MAAM,CAA6BS,2BAA2B,IAAI,EAClE,OAAO,GACP,IAAI,CAACD,CAAAA,SACKA,OAAO,MAAM,CAAC;YACjBV;YACAM;YACAH;YACAE;YACAX;QACJ;IAGR,IAAIgB,QACA,OAAOA,OAAO,UAAU,CAAC;QACrBV;QACAG;QACAE;QACAX;QACAY;QACAL;IACJ;SACG,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"}