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

package/operations/entry/elasticsearch/sort.js.map

@@ -1 +1 @@
-{"version":3,"names":["createSort","OpenSearchFieldPlugin","hasKeyword","createSearchPluginList","createFieldPathFactory","NoValueContainer","matchField","input","valuesMatch","match","fieldId","order","isValues","nonValues","createElasticsearchSort","params","sort","modelFields","plugins","length","searchPlugins","createFieldPath","fieldIdToStorageIdIdMap","sortPlugins","Object","values","reduce","field","parents","fieldIdPath","path","key","storageId","value","create","keyword","originalValue","unmappedType","sortable","searchable","ALL","transformedSort","map","matched","filter","Boolean","fieldPlugins"],"sources":["sort.ts"],"sourcesContent":["import type { Sort as OpenSearchSort } from \"@webiny/api-opensearch/types.js\";\nimport { createSort, OpenSearchFieldPlugin } from \"@webiny/api-opensearch\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsEntryListSort, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"./types.js\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword.js\";\nimport { createSearchPluginList } from \"~/operations/entry/elasticsearch/plugins/search.js\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path.js\";\nimport { NoValueContainer } from \"~/values/NoValueContainer.js\";\n\ninterface IMatchFieldResponse {\n    fieldId: string;\n    isValues: boolean;\n    order: \"ASC\" | \"DESC\";\n}\n\nconst matchField = (input: string): IMatchFieldResponse | null => {\n    const valuesMatch = input.match(/^values_([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (valuesMatch) {\n        const [, fieldId, order] = valuesMatch;\n        return {\n            fieldId,\n            isValues: true,\n            order: order as \"ASC\" | \"DESC\"\n        };\n    }\n    const nonValues = input.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (!nonValues) {\n        return null;\n    }\n    const [, fieldId, order] = nonValues;\n    return {\n        fieldId,\n        isValues: false,\n        order: order as \"ASC\" | \"DESC\"\n    };\n};\n\ninterface Params {\n    plugins: PluginsContainer;\n    sort?: CmsEntryListSort;\n    modelFields: ModelFields;\n    model: CmsModel;\n}\n\nexport const createElasticsearchSort = (params: Params): OpenSearchSort => {\n    const { sort, modelFields, plugins } = params;\n\n    if (!sort || sort.length === 0) {\n        return [\n            {\n                [\"id.keyword\"]: {\n                    order: \"asc\"\n                }\n            }\n        ];\n    }\n\n    const searchPlugins = createSearchPluginList({\n        plugins\n    });\n\n    const createFieldPath = createFieldPathFactory({\n        plugins: searchPlugins\n    });\n\n    const fieldIdToStorageIdIdMap: Record<string, string> = {};\n\n    const sortPlugins = Object.values(modelFields).reduce<Record<string, OpenSearchFieldPlugin>>(\n        (plugins, field) => {\n            /**\n             * We do not support sorting by nested fields.\n             */\n            const isValues = field.parents.length === 1 && field.parents[0].fieldId === \"values\";\n            if (field.parents.length > 0 && !isValues) {\n                return plugins;\n            }\n\n            const fieldId = field.field.fieldId;\n            const fieldIdPath = isValues ? `values.${fieldId}` : fieldId;\n\n            fieldIdToStorageIdIdMap[fieldIdPath] = fieldIdPath;\n\n            const { path } = createFieldPath({\n                key: field.field.storageId,\n                field,\n                value: NoValueContainer.create(),\n                keyword: false,\n                originalValue: NoValueContainer.create()\n            });\n            /**\n             * Plugins must be stored with fieldId as key because it is later used to find the sorting plugin.\n             */\n            plugins[fieldIdPath] = new OpenSearchFieldPlugin({\n                unmappedType: field.unmappedType,\n                keyword: hasKeyword(field),\n                sortable: field.sortable,\n                searchable: field.searchable,\n                field: fieldId,\n                path\n            });\n            return plugins;\n        },\n        {\n            [\"*\"]: new OpenSearchFieldPlugin({\n                field: OpenSearchFieldPlugin.ALL,\n                keyword: false\n            })\n        }\n    );\n\n    const transformedSort = sort\n        .map(value => {\n            const matched = matchField(value);\n            if (!matched) {\n                return null;\n            }\n            const { fieldId, order, isValues } = matched;\n            const key = isValues ? `values.${fieldId}` : fieldId;\n            if (fieldIdToStorageIdIdMap[key]) {\n                return `${fieldIdToStorageIdIdMap[key]}_${order}`;\n            }\n\n            return value;\n        })\n        .filter(Boolean) as string[];\n    return createSort({\n        fieldPlugins: sortPlugins,\n        sort: transformedSort\n    });\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createSort","OpenSearchFieldPlugin","hasKeyword","createFieldPathFactory","NoValueContainer","matchField","input","valuesMatch","match","fieldId","order","isValues","nonValues","createElasticsearchSort","params","sort","modelFields","valueSearchRegistry","length","createFieldPath","fieldIdToStorageIdIdMap","sortPlugins","Object","values","reduce","plugins","field","parents","fieldIdPath","path","key","storageId","value","create","keyword","originalValue","unmappedType","sortable","searchable","ALL","transformedSort","map","matched","filter","Boolean","fieldPlugins"],"sources":["sort.ts"],"sourcesContent":["import type { Sort as OpenSearchSort } from \"@webiny/api-opensearch/types.js\";\nimport { createSort, OpenSearchFieldPlugin } from \"@webiny/api-opensearch\";\nimport type { CmsEntryListSort, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"./types.js\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword.js\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path.js\";\nimport { NoValueContainer } from \"~/values/NoValueContainer.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface IMatchFieldResponse {\n    fieldId: string;\n    isValues: boolean;\n    order: \"ASC\" | \"DESC\";\n}\n\nconst matchField = (input: string): IMatchFieldResponse | null => {\n    const valuesMatch = input.match(/^values_([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (valuesMatch) {\n        const [, fieldId, order] = valuesMatch;\n        return {\n            fieldId,\n            isValues: true,\n            order: order as \"ASC\" | \"DESC\"\n        };\n    }\n    const nonValues = input.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (!nonValues) {\n        return null;\n    }\n    const [, fieldId, order] = nonValues;\n    return {\n        fieldId,\n        isValues: false,\n        order: order as \"ASC\" | \"DESC\"\n    };\n};\n\ninterface Params {\n    sort?: CmsEntryListSort;\n    modelFields: ModelFields;\n    model: CmsModel;\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n}\n\nexport const createElasticsearchSort = (params: Params): OpenSearchSort => {\n    const { sort, modelFields, valueSearchRegistry } = params;\n\n    if (!sort || sort.length === 0) {\n        return [\n            {\n                [\"id.keyword\"]: {\n                    order: \"asc\"\n                }\n            }\n        ];\n    }\n\n    const createFieldPath = createFieldPathFactory({\n        valueSearchRegistry\n    });\n\n    const fieldIdToStorageIdIdMap: Record<string, string> = {};\n\n    const sortPlugins = Object.values(modelFields).reduce<Record<string, OpenSearchFieldPlugin>>(\n        (plugins, field) => {\n            /**\n             * We do not support sorting by nested fields.\n             */\n            const isValues = field.parents.length === 1 && field.parents[0].fieldId === \"values\";\n            if (field.parents.length > 0 && !isValues) {\n                return plugins;\n            }\n\n            const fieldId = field.field.fieldId;\n            const fieldIdPath = isValues ? `values.${fieldId}` : fieldId;\n\n            fieldIdToStorageIdIdMap[fieldIdPath] = fieldIdPath;\n\n            const { path } = createFieldPath({\n                key: field.field.storageId,\n                field,\n                value: NoValueContainer.create(),\n                keyword: false,\n                originalValue: NoValueContainer.create()\n            });\n            /**\n             * Plugins must be stored with fieldId as key because it is later used to find the sorting plugin.\n             */\n            plugins[fieldIdPath] = new OpenSearchFieldPlugin({\n                unmappedType: field.unmappedType,\n                keyword: hasKeyword(field),\n                sortable: field.sortable,\n                searchable: field.searchable,\n                field: fieldId,\n                path\n            });\n            return plugins;\n        },\n        {\n            [\"*\"]: new OpenSearchFieldPlugin({\n                field: OpenSearchFieldPlugin.ALL,\n                keyword: false\n            })\n        }\n    );\n\n    const transformedSort = sort\n        .map(value => {\n            const matched = matchField(value);\n            if (!matched) {\n                return null;\n            }\n            const { fieldId, order, isValues } = matched;\n            const key = isValues ? `values.${fieldId}` : fieldId;\n            if (fieldIdToStorageIdIdMap[key]) {\n                return `${fieldIdToStorageIdIdMap[key]}_${order}`;\n            }\n\n            return value;\n        })\n        .filter(Boolean) as string[];\n    return createSort({\n        fieldPlugins: sortPlugins,\n        sort: transformedSort\n    });\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/entry/elasticsearch/transformValueForSearch.d.ts

@@ -1,16 +1,9 @@
-/**
- * We use any for input and output because they really can be anything.
- * Plugin, if exists, makes sure that response value is correct.
- */
 import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
-import type { OpenSearchQuerySearchValuePlugins } from "./types.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../../features/CmsEntryOpenSearchValueSearch/index.js";
 interface Params {
-    plugins: OpenSearchQuerySearchValuePlugins;
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
     field: CmsModelField;
     value: any;
 }
-/**
- * Transformed value can be anything.
- */
 export declare const transformValueForSearch: (params: Params) => any;
 export {};

package/operations/entry/elasticsearch/transformValueForSearch.js

@@ -1,24 +1,14 @@
-/**
- * We use any for input and output because they really can be anything.
- * Plugin, if exists, makes sure that response value is correct.
- */
-
-import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
-/**
- * Transformed value can be anything.
- */
 export const transformValueForSearch = params => {
   const {
     field,
-    plugins,
+    valueSearchRegistry,
     value
   } = params;
-  const fieldType = getBaseFieldType(field);
-  const plugin = plugins[fieldType];
-  if (!plugin) {
+  const search = valueSearchRegistry.get(field.type);
+  if (!search) {
     return value;
   }
-  return plugin.transform({
+  return search.transform({
     field,
     value
   });

package/operations/entry/elasticsearch/transformValueForSearch.js.map

@@ -1 +1 @@
-{"version":3,"names":["getBaseFieldType","transformValueForSearch","params","field","plugins","value","fieldType","plugin","transform"],"sources":["transformValueForSearch.ts"],"sourcesContent":["/**\n * We use any for input and output because they really can be anything.\n * Plugin, if exists, makes sure that response value is correct.\n */\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { OpenSearchQuerySearchValuePlugins } from \"./types.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface Params {\n    plugins: OpenSearchQuerySearchValuePlugins;\n    field: CmsModelField;\n    value: any;\n}\n\n/**\n * Transformed value can be anything.\n */\nexport const transformValueForSearch = (params: Params): any => {\n    const { field, plugins, value } = params;\n    const fieldType = getBaseFieldType(field);\n    const plugin = plugins[fieldType];\n    if (!plugin) {\n        return value;\n    }\n    return plugin.transform({ field, value });\n};\n"],"mappings":"AAAA;AACA;AACA;AACA;;AAGA,SAASA,gBAAgB,QAAQ,oDAAoD;AAQrF;AACA;AACA;AACA,OAAO,MAAMC,uBAAuB,GAAIC,MAAc,IAAU;EAC5D,MAAM;IAAEC,KAAK;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EACxC,MAAMI,SAAS,GAAGN,gBAAgB,CAACG,KAAK,CAAC;EACzC,MAAMI,MAAM,GAAGH,OAAO,CAACE,SAAS,CAAC;EACjC,IAAI,CAACC,MAAM,EAAE;IACT,OAAOF,KAAK;EAChB;EACA,OAAOE,MAAM,CAACC,SAAS,CAAC;IAAEL,KAAK;IAAEE;EAAM,CAAC,CAAC;AAC7C,CAAC","ignoreList":[]}
+{"version":3,"names":["transformValueForSearch","params","field","valueSearchRegistry","value","search","get","type","transform"],"sources":["transformValueForSearch.ts"],"sourcesContent":["import type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface Params {\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    field: CmsModelField;\n    value: any;\n}\n\nexport const transformValueForSearch = (params: Params): any => {\n    const { field, valueSearchRegistry, value } = params;\n    const search = valueSearchRegistry.get(field.type);\n    if (!search) {\n        return value;\n    }\n    return search.transform({ field, value });\n};\n"],"mappings":"AASA,OAAO,MAAMA,uBAAuB,GAAIC,MAAc,IAAU;EAC5D,MAAM;IAAEC,KAAK;IAAEC,mBAAmB;IAAEC;EAAM,CAAC,GAAGH,MAAM;EACpD,MAAMI,MAAM,GAAGF,mBAAmB,CAACG,GAAG,CAACJ,KAAK,CAACK,IAAI,CAAC;EAClD,IAAI,CAACF,MAAM,EAAE;IACT,OAAOD,KAAK;EAChB;EACA,OAAOC,MAAM,CAACG,SAAS,CAAC;IAAEN,KAAK;IAAEE;EAAM,CAAC,CAAC;AAC7C,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/types.d.ts

@@ -1,4 +1,3 @@
-import type { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../../../plugins/index.js";
 import type { OpenSearchQueryBuilderOperatorPlugin } from "@webiny/api-opensearch";
 import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
 /**
@@ -32,10 +31,4 @@ export interface ModelFields {
 export interface OpenSearchQueryBuilderOperatorPlugins {
     [key: string]: OpenSearchQueryBuilderOperatorPlugin;
 }
-/**
- * ./plugins/search
- */
-export interface OpenSearchQuerySearchValuePlugins {
-    [fieldType: string]: CmsEntryElasticsearchQueryBuilderValueSearchPlugin;
-}
 export {};

package/operations/entry/elasticsearch/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from \"~/plugins/index.js\";\nimport type { OpenSearchQueryBuilderOperatorPlugin } from \"@webiny/api-opensearch\";\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\n\n/**\n * ./fields\n */\ntype ModelFieldPath = string | ((value: string) => string);\n\nexport type FieldType = \"text\" | \"date\" | \"datetime\" | \"time\" | \"number\" | \"boolean\" | string;\n\nexport interface ModelFieldParent {\n    fieldId: string;\n    storageId: string;\n    type: FieldType;\n}\nexport interface ModelField {\n    unmappedType?: string;\n    keyword?: boolean;\n    searchable: boolean;\n    sortable: boolean;\n    type: FieldType;\n    systemField?: boolean;\n    field: CmsModelField;\n    path?: ModelFieldPath;\n    fullTextSearch?: boolean;\n    parents: ModelFieldParent[];\n}\n\nexport interface ModelFields {\n    [fieldId: string]: ModelField;\n}\n\n/**\n * ./plugins/operator\n */\nexport interface OpenSearchQueryBuilderOperatorPlugins {\n    [key: string]: OpenSearchQueryBuilderOperatorPlugin;\n}\n/**\n * ./plugins/search\n */\nexport interface OpenSearchQuerySearchValuePlugins {\n    [fieldType: string]: CmsEntryElasticsearchQueryBuilderValueSearchPlugin;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { OpenSearchQueryBuilderOperatorPlugin } from \"@webiny/api-opensearch\";\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\n\n/**\n * ./fields\n */\ntype ModelFieldPath = string | ((value: string) => string);\n\nexport type FieldType = \"text\" | \"date\" | \"datetime\" | \"time\" | \"number\" | \"boolean\" | string;\n\nexport interface ModelFieldParent {\n    fieldId: string;\n    storageId: string;\n    type: FieldType;\n}\nexport interface ModelField {\n    unmappedType?: string;\n    keyword?: boolean;\n    searchable: boolean;\n    sortable: boolean;\n    type: FieldType;\n    systemField?: boolean;\n    field: CmsModelField;\n    path?: ModelFieldPath;\n    fullTextSearch?: boolean;\n    parents: ModelFieldParent[];\n}\n\nexport interface ModelFields {\n    [fieldId: string]: ModelField;\n}\n\n/**\n * ./plugins/operator\n */\nexport interface OpenSearchQueryBuilderOperatorPlugins {\n    [key: string]: OpenSearchQueryBuilderOperatorPlugin;\n}\n"],"mappings":"","ignoreList":[]}

package/operations/entry/index.d.ts

@@ -1,12 +1,32 @@
 import type { Client } from "@webiny/api-opensearch";
-import type { PluginsContainer } from "@webiny/plugins";
 import { type IOpenSearchEntity as IElasticsearchEntity } from "@webiny/api-opensearch";
+import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsEntryStorageOperations } from "../../types.js";
 import type { IEntryEntity } from "../../definitions/types.js";
+import type { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+import { CompressionHandler } from "@webiny/utils/features/compression/abstractions/CompressionHandler.js";
+import type { CmsEntryOpenSearchBodyModifier } from "../../features/CmsEntryOpenSearchBodyModifier/index.js";
+import type { CmsEntryOpenSearchSortModifier } from "../../features/CmsEntryOpenSearchSortModifier/index.js";
+import type { CmsEntryOpenSearchValuesModifier } from "../../features/CmsEntryOpenSearchValuesModifier/index.js";
+import type { CmsEntryOpenSearchQueryModifier } from "../../features/CmsEntryOpenSearchQueryModifier/index.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../features/CmsEntryOpenSearchValueSearch/index.js";
+import type { CmsEntryOpenSearchFullTextSearch } from "../../features/CmsEntryOpenSearchFullTextSearch/index.js";
+import type { CmsEntryOpenSearchFieldIndexRegistry } from "../../features/CmsEntryOpenSearchFieldIndex/index.js";
+import type { CmsEntryOpenSearchFilterRegistry } from "../../features/CmsEntryOpenSearchFilter/index.js";
 export interface CreateEntriesStorageOperationsParams {
     entity: IEntryEntity;
     esEntity: IElasticsearchEntity;
     elasticsearch: Client;
     plugins: PluginsContainer;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
+    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;
+    compressionHandler: CompressionHandler.Interface;
+    bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[];
+    sortModifiers: CmsEntryOpenSearchSortModifier.Interface[];
+    queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[];
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
+    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];
+    valuesModifiers: CmsEntryOpenSearchValuesModifier.Interface[];
+    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;
 }
 export declare const createEntriesStorageOperations: (params: CreateEntriesStorageOperationsParams) => CmsEntryStorageOperations;

package/operations/entry/index.js

@@ -1,10 +1,11 @@
-import WebinyError from "@webiny/error";
+import { WebinyError } from "@webiny/error";
 import { CONTENT_ENTRY_STATUS } from "@webiny/api-headless-cms/types/index.js";
 import { extractEntriesFromIndex } from "../../helpers/index.js";
 import { configurations } from "../../configurations.js";
+import { createLimit, decodeCursor, encodeCursor } from "@webiny/api-opensearch";
 import { DataLoadersHandler } from "./dataLoaders.js";
 import { createEntryLatestKeys, createEntryPublishedKeys, createEntryRevisionKeys, createLatestSortKey, createPartitionKey, createPublishedSortKey, createRevisionSortKey } from "./keys.js";
-import { compress, createLimit, decodeCursor, decompress, encodeCursor } from "@webiny/api-opensearch";
+import { getTotalCount } from "@webiny/api-opensearch/types.js";
 import { createElasticsearchBody } from "./elasticsearch/body.js";
 import { shouldIgnoreEsResponseError } from "./elasticsearch/shouldIgnoreEsResponseError.js";
 import { StorageOperationsCmsModelPlugin } from "@webiny/api-headless-cms";
@@ -30,7 +31,17 @@ export const createEntriesStorageOperations = params => {
     entity,
     esEntity,
     elasticsearch,
-    plugins
+    plugins,
+    fieldRegistry,
+    fieldIndexRegistry,
+    compressionHandler,
+    bodyModifiers,
+    sortModifiers,
+    queryModifiers,
+    valueSearchRegistry,
+    fullTextSearches,
+    valuesModifiers,
+    filterRegistry
   } = params;
   let storageOperationsCmsModelPlugin;
   const getStorageOperationsCmsModelPlugin = () => {
@@ -58,10 +69,13 @@ export const createEntriesStorageOperations = params => {
     initialEntry.locked = locked;
     initialStorageEntry.locked = locked;
     const transformer = createTransformer({
-      plugins,
+      fieldRegistry,
+      fieldIndexRegistry,
       model,
       entry: initialEntry,
-      storageEntry: initialStorageEntry
+      storageEntry: initialStorageEntry,
+      compressionHandler,
+      valuesModifiers
     });
     const {
       entry,
@@ -146,10 +160,13 @@ export const createEntriesStorageOperations = params => {
     } = params;
     const model = getStorageOperationsModel(initialModel);
     const transformer = createTransformer({
-      plugins,
       model,
       entry: initialEntry,
-      storageEntry: initialStorageEntry
+      storageEntry: initialStorageEntry,
+      fieldRegistry,
+      fieldIndexRegistry,
+      compressionHandler,
+      valuesModifiers
     });
     const {
       entry,
@@ -245,10 +262,13 @@ export const createEntriesStorageOperations = params => {
     } = params;
     const model = getStorageOperationsModel(initialModel);
     const transformer = createTransformer({
-      plugins,
+      valuesModifiers,
       model,
       entry: initialEntry,
-      storageEntry: initialStorageEntry
+      storageEntry: initialStorageEntry,
+      fieldRegistry,
+      fieldIndexRegistry,
+      compressionHandler
     });
     const {
       entry,
@@ -355,8 +375,8 @@ export const createEntriesStorageOperations = params => {
          */
         const latestEsEntry = await esEntity.getClean(latestKeys);
         if (latestEsEntry) {
-          const latestEsEntryDataDecompressed = await decompress(plugins, latestEsEntry.data);
-          const updatedLatestEntry = await compress(plugins, {
+          const latestEsEntryDataDecompressed = await compressionHandler.decompress(latestEsEntry.data);
+          const updatedLatestEntry = await compressionHandler.compress({
             ...latestEsEntryDataDecompressed,
             ...updatedEntryLevelMetaFields
           });
@@ -477,7 +497,7 @@ export const createEntriesStorageOperations = params => {
       }
       return {
         ...record,
-        data: await decompress(plugins, record.data)
+        data: await compressionHandler.decompress(record.data)
       };
     }))).filter(item => !!item);
     if (esItems.length === 0) {
@@ -488,7 +508,7 @@ export const createEntriesStorageOperations = params => {
         put: await Promise.all(esItems.map(async item => {
           return {
             ...item,
-            data: await compress(plugins, {
+            data: await compressionHandler.compress({
               ...item.data,
               location: {
                 ...item.data?.location,
@@ -513,10 +533,13 @@ export const createEntriesStorageOperations = params => {
     } = params;
     const model = getStorageOperationsModel(initialModel);
     const transformer = createTransformer({
-      plugins,
+      valuesModifiers,
       model,
       entry: initialEntry,
-      storageEntry: initialStorageEntry
+      storageEntry: initialStorageEntry,
+      fieldRegistry,
+      fieldIndexRegistry,
+      compressionHandler
     });
     const {
       entry,
@@ -615,7 +638,7 @@ export const createEntriesStorageOperations = params => {
       }
       return {
         ...record,
-        data: await decompress(plugins, record.data)
+        data: await compressionHandler.decompress(record.data)
       };
     }))).filter(item => !!item);
     if (esItems.length === 0) {
@@ -629,7 +652,7 @@ export const createEntriesStorageOperations = params => {
     for (const item of esItems) {
       elasticsearchEntityBatch.put({
         ...item,
-        data: await compress(plugins, {
+        data: await compressionHandler.compress({
           ...item.data,
           ...updatedEntryMetaFields,
           wbyDeleted: entry.wbyDeleted,
@@ -659,10 +682,13 @@ export const createEntriesStorageOperations = params => {
     } = params;
     const model = getStorageOperationsModel(initialModel);
     const transformer = createTransformer({
-      plugins,
+      valuesModifiers,
       model,
       entry: initialEntry,
-      storageEntry: initialStorageEntry
+      storageEntry: initialStorageEntry,
+      fieldRegistry,
+      fieldIndexRegistry,
+      compressionHandler
     });
     const {
       entry,
@@ -758,7 +784,7 @@ export const createEntriesStorageOperations = params => {
       }
       return {
         ...record,
-        data: await decompress(plugins, record.data)
+        data: await compressionHandler.decompress(record.data)
       };
     }))).filter(item => !!item);
     if (esItems.length === 0) {
@@ -772,7 +798,7 @@ export const createEntriesStorageOperations = params => {
     for (const item of esItems) {
       elasticsearchEntityBatch.put({
         ...item,
-        data: await compress(plugins, {
+        data: await compressionHandler.compress({
           ...item.data,
           ...updatedEntryMetaFields,
           wbyDeleted: entry.wbyDeleted,
@@ -926,10 +952,13 @@ export const createEntriesStorageOperations = params => {
         data: latestStorageEntry
       });
       const latestTransformer = createTransformer({
-        plugins,
+        valuesModifiers,
         model,
         entry: latestEntry,
-        storageEntry: initialLatestStorageEntry
+        storageEntry: initialLatestStorageEntry,
+        fieldRegistry,
+        fieldIndexRegistry,
+        compressionHandler
       });
       const esLatestData = await latestTransformer.getElasticsearchLatestEntryData();
       const esLatestKeys = createEntryLatestKeys(latestEntry);
@@ -1045,6 +1074,14 @@ export const createEntriesStorageOperations = params => {
     });
     const body = createElasticsearchBody({
       model,
+      fieldRegistry,
+      fieldIndexRegistry,
+      bodyModifiers,
+      sortModifiers,
+      queryModifiers,
+      valueSearchRegistry,
+      fullTextSearches,
+      filterRegistry,
       params: {
         ...params,
         limit,
@@ -1081,9 +1118,10 @@ export const createEntriesStorageOperations = params => {
     const {
       hits,
       total
-    } = response?.body?.hits || {};
+    } = response.body.hits;
     const items = extractEntriesFromIndex({
-      plugins,
+      fieldRegistry,
+      fieldIndexRegistry,
       model,
       entries: hits.map(item => {
         return item._source;
@@ -1108,7 +1146,7 @@ export const createEntriesStorageOperations = params => {
     const cursor = items.length > 0 ? encodeCursor(hits[items.length - 1].sort) || null : null;
     return {
       hasMoreItems,
-      totalCount: total.value,
+      totalCount: getTotalCount(total),
       cursor,
       items
     };
@@ -1130,10 +1168,13 @@ export const createEntriesStorageOperations = params => {
     } = params;
     const model = getStorageOperationsModel(initialModel);
     const transformer = createTransformer({
-      plugins,
+      valuesModifiers,
       model,
       entry: initialEntry,
-      storageEntry: initialStorageEntry
+      storageEntry: initialStorageEntry,
+      fieldRegistry,
+      fieldIndexRegistry,
+      compressionHandler
     });
     const {
       entry,
@@ -1295,18 +1336,21 @@ export const createEntriesStorageOperations = params => {
      * No need to transform it for the storage because it was fetched
      * directly from the Elasticsearch table, where it sits transformed.
      */
-    const latestEsEntryDataDecompressed = await decompress(plugins, latestEsEntry.data);
+    const latestEsEntryDataDecompressed = await compressionHandler.decompress(latestEsEntry.data);
     if (publishingLatestRevision) {
       const updatedMetaFields = pickEntryMetaFields(entry);
       const latestTransformer = createTransformer({
-        plugins,
+        valuesModifiers,
         model,
         transformedToIndex: {
           ...latestEsEntryDataDecompressed,
           status: CONTENT_ENTRY_STATUS.PUBLISHED,
           locked: true,
           ...updatedMetaFields
-        }
+        },
+        fieldRegistry,
+        fieldIndexRegistry,
+        compressionHandler
       });
       const esEntryLatestKeys = createEntryLatestKeys(latestEsEntryDataDecompressed);
       elasticsearchEntityWriter.put({
@@ -1322,12 +1366,12 @@ export const createEntriesStorageOperations = params => {
        */
       const latestEsEntry = await esEntity.getClean(latestKeys);
       if (latestEsEntry) {
-        const latestEsEntryDataDecompressed = await decompress(plugins, latestEsEntry.data);
+        const latestEsEntryDataDecompressed = await compressionHandler.decompress(latestEsEntry.data);
         let latestRevisionStatus = latestEsEntryDataDecompressed.status;
         if (latestRevisionStatus === CONTENT_ENTRY_STATUS.PUBLISHED) {
           latestRevisionStatus = CONTENT_ENTRY_STATUS.UNPUBLISHED;
         }
-        const updatedLatestEntry = await compress(plugins, {
+        const updatedLatestEntry = await compressionHandler.compress({
           ...latestEsEntryDataDecompressed,
           ...updatedEntryLevelMetaFields,
           status: latestRevisionStatus
@@ -1378,10 +1422,13 @@ export const createEntriesStorageOperations = params => {
     } = params;
     const model = getStorageOperationsModel(initialModel);
     const transformer = createTransformer({
-      plugins,
+      valuesModifiers,
       model,
       entry: initialEntry,
-      storageEntry: initialStorageEntry
+      storageEntry: initialStorageEntry,
+      fieldRegistry,
+      fieldIndexRegistry,
+      compressionHandler
     });
     const {
       entry,
@@ -1617,6 +1664,14 @@ export const createEntriesStorageOperations = params => {
     });
     const initialBody = createElasticsearchBody({
       model,
+      fieldRegistry,
+      fieldIndexRegistry,
+      bodyModifiers,
+      sortModifiers,
+      queryModifiers,
+      valueSearchRegistry,
+      fullTextSearches,
+      filterRegistry,
       params: {
         limit: 1,
         where
@@ -1661,11 +1716,13 @@ export const createEntriesStorageOperations = params => {
         body
       });
     }
-    const buckets = response.body.aggregations["getUniqueFieldValues"]?.buckets || [];
-    return buckets.map(file => {
+    const aggregations = response.body.aggregations || {};
+    const agg = aggregations["getUniqueFieldValues"];
+    const buckets = agg && "buckets" in agg && Array.isArray(agg.buckets) ? agg.buckets : [];
+    return buckets.map(bucket => {
       return {
-        value: file.key,
-        count: file.doc_count
+        value: bucket.key,
+        count: bucket.doc_count
       };
     });
   };