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

package/operations/entry/transformations/index.js

@@ -1,24 +1,25 @@
 import { transformEntryKeys } from "./transformEntryKeys.js";
 import { transformEntryToIndex } from "./transformEntryToIndex.js";
-import { CmsEntryElasticsearchValuesModifier } from "../../../plugins/index.js";
 import { modifyEntryValues as modifyEntryValuesCallable } from "./modifyEntryValues.js";
-import { compress } from "@webiny/api-opensearch";
 import { createLatestRecordType, createPublishedRecordType } from "../recordType.js";
 import WebinyError from "@webiny/error";
 export const createTransformer = params => {
   const {
-    plugins,
     model,
+    fieldRegistry,
+    fieldIndexRegistry,
     entry: baseEntry,
     storageEntry: baseStorageEntry,
-    transformedToIndex: initialTransformedEntryToIndex = undefined
+    transformedToIndex: initialTransformedEntryToIndex = undefined,
+    compressionHandler,
+    valuesModifiers
   } = params;
   let transformedEntryKeys = undefined;
   let transformedEntryToIndex = initialTransformedEntryToIndex;
   let modifiedEntryValues = undefined;
   let elasticsearchLatestEntry = undefined;
   let elasticsearchPublishedEntry = undefined;
-  const modifierPlugins = plugins.byType(CmsEntryElasticsearchValuesModifier.type).filter(pl => pl.canModify(model.modelId));
+  const applicableModifiers = valuesModifiers.filter(m => m.canModify(model.modelId));
   const modifyEntryValues = () => {
     if (initialTransformedEntryToIndex || !baseEntry) {
       throw new WebinyError(`Should not call the "modifyEntryValues" when "transformedToIndex" is provided.`, "METHOD_NOT_ALLOWED", {
@@ -29,12 +30,12 @@ export const createTransformer = params => {
       return modifiedEntryValues;
     }
     const modifiedEntry = modifyEntryValuesCallable({
-      plugins: modifierPlugins,
+      modifiers: applicableModifiers,
       model,
       entry: baseEntry
     });
     const modifiedStorageEntry = modifyEntryValuesCallable({
-      plugins: modifierPlugins,
+      modifiers: applicableModifiers,
       model,
       entry: baseStorageEntry
     });
@@ -71,7 +72,7 @@ export const createTransformer = params => {
        * - run modifiers
        * - transform keys
        */
-      if (modifierPlugins.length > 0) {
+      if (applicableModifiers.length > 0) {
         const result = modifyEntryValues();
         entry = result.entry;
         storageEntry = result.storageEntry;
@@ -83,10 +84,11 @@ export const createTransformer = params => {
         storageEntry = result.storageEntry;
       }
       return transformedEntryToIndex = transformEntryToIndex({
-        plugins,
         model,
         entry,
-        storageEntry
+        storageEntry,
+        fieldRegistry,
+        fieldIndexRegistry
       });
     },
     getElasticsearchLatestEntryData: async function () {
@@ -94,7 +96,7 @@ export const createTransformer = params => {
         return elasticsearchLatestEntry;
       }
       const entry = this.transformToIndex();
-      return elasticsearchLatestEntry = await compress(plugins, {
+      return elasticsearchLatestEntry = await compressionHandler.compress({
         ...entry,
         latest: true,
         TYPE: createLatestRecordType(),
@@ -106,7 +108,7 @@ export const createTransformer = params => {
         return elasticsearchPublishedEntry;
       }
       const entry = this.transformToIndex();
-      return elasticsearchPublishedEntry = await compress(plugins, {
+      return elasticsearchPublishedEntry = await compressionHandler.compress({
         ...entry,
         published: true,
         TYPE: createPublishedRecordType(),

package/operations/entry/transformations/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["transformEntryKeys","transformEntryToIndex","CmsEntryElasticsearchValuesModifier","modifyEntryValues","modifyEntryValuesCallable","compress","createLatestRecordType","createPublishedRecordType","WebinyError","createTransformer","params","plugins","model","entry","baseEntry","storageEntry","baseStorageEntry","transformedToIndex","initialTransformedEntryToIndex","undefined","transformedEntryKeys","transformedEntryToIndex","modifiedEntryValues","elasticsearchLatestEntry","elasticsearchPublishedEntry","modifierPlugins","byType","type","filter","pl","canModify","modelId","modifiedEntry","modifiedStorageEntry","transformToIndex","length","result","getElasticsearchLatestEntryData","latest","TYPE","__type","getElasticsearchPublishedEntryData","published"],"sources":["index.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsStorageEntry,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { transformEntryKeys } from \"./transformEntryKeys.js\";\nimport type { CmsIndexEntry } from \"~/types.js\";\nimport { transformEntryToIndex } from \"~/operations/entry/transformations/transformEntryToIndex.js\";\nimport { CmsEntryElasticsearchValuesModifier } from \"~/plugins/index.js\";\nimport { modifyEntryValues as modifyEntryValuesCallable } from \"~/operations/entry/transformations/modifyEntryValues.js\";\nimport { compress } from \"@webiny/api-opensearch\";\nimport {\n    createLatestRecordType,\n    createPublishedRecordType\n} from \"~/operations/entry/recordType.js\";\nimport WebinyError from \"@webiny/error\";\n\ninterface BaseTransformerParams<T extends CmsEntryValues = CmsEntryValues> {\n    plugins: PluginsContainer;\n    model: StorageOperationsCmsModel<T>;\n}\n\ninterface EntryTransformerParams<T extends CmsEntryValues = CmsEntryValues>\n    extends BaseTransformerParams<T> {\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n    transformedToIndex?: never;\n}\n\ninterface TransformedEntryTransformerParams<T extends CmsEntryValues = CmsEntryValues>\n    extends BaseTransformerParams<T> {\n    entry?: never;\n    storageEntry?: never;\n    transformedToIndex: CmsIndexEntry<T>;\n}\n\ninterface TransformedKeysEntry<T extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n}\n\ninterface ModifiedEntryValues<T extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n}\n\ninterface TransformerResult<T extends CmsEntryValues = CmsEntryValues> {\n    transformEntryKeys: () => TransformedKeysEntry<T>;\n    transformToIndex: () => CmsIndexEntry<T>;\n    getElasticsearchLatestEntryData: () => Promise<Record<string, any>>;\n    getElasticsearchPublishedEntryData: () => Promise<Record<string, any>>;\n}\n\nexport const createTransformer = <T extends CmsEntryValues = CmsEntryValues>(\n    params: EntryTransformerParams<T> | TransformedEntryTransformerParams<T>\n): TransformerResult<T> => {\n    const {\n        plugins,\n        model,\n        entry: baseEntry,\n        storageEntry: baseStorageEntry,\n        transformedToIndex: initialTransformedEntryToIndex = undefined\n    } = params;\n\n    let transformedEntryKeys: TransformedKeysEntry<T> | undefined = undefined;\n    let transformedEntryToIndex: CmsIndexEntry<T> | undefined = initialTransformedEntryToIndex;\n    let modifiedEntryValues: ModifiedEntryValues<T> | undefined = undefined;\n    let elasticsearchLatestEntry: any = undefined;\n    let elasticsearchPublishedEntry: any = undefined;\n\n    const modifierPlugins = plugins\n        .byType<CmsEntryElasticsearchValuesModifier>(CmsEntryElasticsearchValuesModifier.type)\n        .filter(pl => pl.canModify(model.modelId));\n\n    const modifyEntryValues = () => {\n        if (initialTransformedEntryToIndex || !baseEntry) {\n            throw new WebinyError(\n                `Should not call the \"modifyEntryValues\" when \"transformedToIndex\" is provided.`,\n                \"METHOD_NOT_ALLOWED\",\n                {\n                    entry: initialTransformedEntryToIndex\n                }\n            );\n        }\n        if (modifiedEntryValues) {\n            return modifiedEntryValues;\n        }\n        const modifiedEntry = modifyEntryValuesCallable<T>({\n            plugins: modifierPlugins,\n            model,\n            entry: baseEntry\n        });\n        const modifiedStorageEntry = modifyEntryValuesCallable<T>({\n            plugins: modifierPlugins,\n            model,\n            entry: baseStorageEntry\n        });\n\n        return (modifiedEntryValues = transformEntryKeys<T>({\n            model,\n            entry: modifiedEntry,\n            storageEntry: modifiedStorageEntry\n        }));\n    };\n\n    return {\n        transformEntryKeys: function () {\n            if (initialTransformedEntryToIndex || !baseEntry) {\n                throw new WebinyError(\n                    `Should not call the \"modifyEntryValues\" when \"transformedToIndex\" is provided.`,\n                    \"METHOD_NOT_ALLOWED\",\n                    {\n                        entry: initialTransformedEntryToIndex\n                    }\n                );\n            }\n            if (transformedEntryKeys) {\n                return transformedEntryKeys;\n            }\n            return (transformedEntryKeys = transformEntryKeys({\n                model,\n                entry: baseEntry,\n                storageEntry: baseStorageEntry\n            }));\n        },\n        transformToIndex: function () {\n            if (transformedEntryToIndex) {\n                return transformedEntryToIndex;\n            }\n            let entry: CmsEntry<T>;\n            let storageEntry: CmsStorageEntry<T>;\n            /**\n             * In case there are value modifier plugins, we need to\n             * - run modifiers\n             * - transform keys\n             */\n            if (modifierPlugins.length > 0) {\n                const result = modifyEntryValues();\n                entry = result.entry;\n                storageEntry = result.storageEntry;\n            }\n            // In case there are no modifier plugins, just transform the keys - or used already transformed.\n            else {\n                const result = this.transformEntryKeys();\n                entry = result.entry;\n                storageEntry = result.storageEntry;\n            }\n            return (transformedEntryToIndex = transformEntryToIndex<T>({\n                plugins,\n                model,\n                entry,\n                storageEntry\n            }));\n        },\n        getElasticsearchLatestEntryData: async function () {\n            if (elasticsearchLatestEntry) {\n                return elasticsearchLatestEntry;\n            }\n            const entry = this.transformToIndex();\n\n            return (elasticsearchLatestEntry = await compress(plugins, {\n                ...entry,\n                latest: true,\n                TYPE: createLatestRecordType(),\n                __type: createLatestRecordType()\n            }));\n        },\n        getElasticsearchPublishedEntryData: async function () {\n            if (elasticsearchPublishedEntry) {\n                return elasticsearchPublishedEntry;\n            }\n            const entry = this.transformToIndex();\n\n            return (elasticsearchPublishedEntry = await compress(plugins, {\n                ...entry,\n                published: true,\n                TYPE: createPublishedRecordType(),\n                __type: createPublishedRecordType()\n            }));\n        }\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["transformEntryKeys","transformEntryToIndex","modifyEntryValues","modifyEntryValuesCallable","createLatestRecordType","createPublishedRecordType","WebinyError","createTransformer","params","model","fieldRegistry","fieldIndexRegistry","entry","baseEntry","storageEntry","baseStorageEntry","transformedToIndex","initialTransformedEntryToIndex","undefined","compressionHandler","valuesModifiers","transformedEntryKeys","transformedEntryToIndex","modifiedEntryValues","elasticsearchLatestEntry","elasticsearchPublishedEntry","applicableModifiers","filter","m","canModify","modelId","modifiedEntry","modifiers","modifiedStorageEntry","transformToIndex","length","result","getElasticsearchLatestEntryData","compress","latest","TYPE","__type","getElasticsearchPublishedEntryData","published"],"sources":["index.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsStorageEntry,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { transformEntryKeys } from \"./transformEntryKeys.js\";\nimport type { CmsIndexEntry } from \"~/types.js\";\nimport { transformEntryToIndex } from \"~/operations/entry/transformations/transformEntryToIndex.js\";\nimport type { CmsEntryOpenSearchValuesModifier } from \"~/features/CmsEntryOpenSearchValuesModifier/index.js\";\nimport { modifyEntryValues as modifyEntryValuesCallable } from \"~/operations/entry/transformations/modifyEntryValues.js\";\nimport {\n    createLatestRecordType,\n    createPublishedRecordType\n} from \"~/operations/entry/recordType.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport { CompressionHandler } from \"@webiny/utils/features/compression/abstractions/CompressionHandler.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\ninterface BaseTransformerParams<T extends CmsEntryValues = CmsEntryValues> {\n    model: StorageOperationsCmsModel<T>;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n    compressionHandler: Pick<CompressionHandler.Interface, \"compress\">;\n    valuesModifiers: CmsEntryOpenSearchValuesModifier.Interface[];\n}\n\ninterface EntryTransformerParams<T extends CmsEntryValues = CmsEntryValues>\n    extends BaseTransformerParams<T> {\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n    transformedToIndex?: never;\n}\n\ninterface TransformedEntryTransformerParams<T extends CmsEntryValues = CmsEntryValues>\n    extends BaseTransformerParams<T> {\n    entry?: never;\n    storageEntry?: never;\n    transformedToIndex: CmsIndexEntry<T>;\n}\n\ninterface TransformedKeysEntry<T extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n}\n\ninterface ModifiedEntryValues<T extends CmsEntryValues = CmsEntryValues> {\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n}\n\ninterface TransformerResult<T extends CmsEntryValues = CmsEntryValues> {\n    transformEntryKeys: () => TransformedKeysEntry<T>;\n    transformToIndex: () => CmsIndexEntry<T>;\n    getElasticsearchLatestEntryData: () => Promise<Record<string, any>>;\n    getElasticsearchPublishedEntryData: () => Promise<Record<string, any>>;\n}\n\nexport const createTransformer = <T extends CmsEntryValues = CmsEntryValues>(\n    params: EntryTransformerParams<T> | TransformedEntryTransformerParams<T>\n): TransformerResult<T> => {\n    const {\n        model,\n        fieldRegistry,\n        fieldIndexRegistry,\n        entry: baseEntry,\n        storageEntry: baseStorageEntry,\n        transformedToIndex: initialTransformedEntryToIndex = undefined,\n        compressionHandler,\n        valuesModifiers\n    } = params;\n\n    let transformedEntryKeys: TransformedKeysEntry<T> | undefined = undefined;\n    let transformedEntryToIndex: CmsIndexEntry<T> | undefined = initialTransformedEntryToIndex;\n    let modifiedEntryValues: ModifiedEntryValues<T> | undefined = undefined;\n    let elasticsearchLatestEntry: any = undefined;\n    let elasticsearchPublishedEntry: any = undefined;\n\n    const applicableModifiers = valuesModifiers.filter(m => m.canModify(model.modelId));\n\n    const modifyEntryValues = () => {\n        if (initialTransformedEntryToIndex || !baseEntry) {\n            throw new WebinyError(\n                `Should not call the \"modifyEntryValues\" when \"transformedToIndex\" is provided.`,\n                \"METHOD_NOT_ALLOWED\",\n                {\n                    entry: initialTransformedEntryToIndex\n                }\n            );\n        }\n        if (modifiedEntryValues) {\n            return modifiedEntryValues;\n        }\n        const modifiedEntry = modifyEntryValuesCallable<T>({\n            modifiers: applicableModifiers,\n            model,\n            entry: baseEntry\n        });\n        const modifiedStorageEntry = modifyEntryValuesCallable<T>({\n            modifiers: applicableModifiers,\n            model,\n            entry: baseStorageEntry\n        });\n\n        return (modifiedEntryValues = transformEntryKeys<T>({\n            model,\n            entry: modifiedEntry,\n            storageEntry: modifiedStorageEntry\n        }));\n    };\n\n    return {\n        transformEntryKeys: function () {\n            if (initialTransformedEntryToIndex || !baseEntry) {\n                throw new WebinyError(\n                    `Should not call the \"modifyEntryValues\" when \"transformedToIndex\" is provided.`,\n                    \"METHOD_NOT_ALLOWED\",\n                    {\n                        entry: initialTransformedEntryToIndex\n                    }\n                );\n            }\n            if (transformedEntryKeys) {\n                return transformedEntryKeys;\n            }\n            return (transformedEntryKeys = transformEntryKeys({\n                model,\n                entry: baseEntry,\n                storageEntry: baseStorageEntry\n            }));\n        },\n        transformToIndex: function () {\n            if (transformedEntryToIndex) {\n                return transformedEntryToIndex;\n            }\n            let entry: CmsEntry<T>;\n            let storageEntry: CmsStorageEntry<T>;\n            /**\n             * In case there are value modifier plugins, we need to\n             * - run modifiers\n             * - transform keys\n             */\n            if (applicableModifiers.length > 0) {\n                const result = modifyEntryValues();\n                entry = result.entry;\n                storageEntry = result.storageEntry;\n            }\n            // In case there are no modifier plugins, just transform the keys - or used already transformed.\n            else {\n                const result = this.transformEntryKeys();\n                entry = result.entry;\n                storageEntry = result.storageEntry;\n            }\n            return (transformedEntryToIndex = transformEntryToIndex<T>({\n                model,\n                entry,\n                storageEntry,\n                fieldRegistry,\n                fieldIndexRegistry\n            }));\n        },\n        getElasticsearchLatestEntryData: async function () {\n            if (elasticsearchLatestEntry) {\n                return elasticsearchLatestEntry;\n            }\n            const entry = this.transformToIndex();\n\n            return (elasticsearchLatestEntry = await compressionHandler.compress({\n                ...entry,\n                latest: true,\n                TYPE: createLatestRecordType(),\n                __type: createLatestRecordType()\n            }));\n        },\n        getElasticsearchPublishedEntryData: async function () {\n            if (elasticsearchPublishedEntry) {\n                return elasticsearchPublishedEntry;\n            }\n            const entry = this.transformToIndex();\n\n            return (elasticsearchPublishedEntry = await compressionHandler.compress({\n                ...entry,\n                published: true,\n                TYPE: createPublishedRecordType(),\n                __type: createPublishedRecordType()\n            }));\n        }\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/entry/transformations/modifyEntryValues.d.ts

@@ -1,8 +1,8 @@
 import type { CmsEntry, CmsEntryValues, StorageOperationsCmsModel } from "@webiny/api-headless-cms/types/index.js";
-import type { CmsEntryElasticsearchValuesModifier } from "../../../plugins/index.js";
+import type { CmsEntryOpenSearchValuesModifier } from "../../../features/CmsEntryOpenSearchValuesModifier/index.js";
 interface Params<T extends CmsEntryValues = CmsEntryValues> {
     model: StorageOperationsCmsModel<T>;
-    plugins: CmsEntryElasticsearchValuesModifier[];
+    modifiers: CmsEntryOpenSearchValuesModifier.Interface[];
     entry: CmsEntry<T>;
 }
 export declare const modifyEntryValues: <T extends CmsEntryValues = CmsEntryValues>(params: Params<T>) => {

package/operations/entry/transformations/modifyEntryValues.js

@@ -1,12 +1,12 @@
 export const modifyEntryValues = params => {
   const {
-    plugins,
+    modifiers,
     model,
     entry
   } = params;
   let values = entry.values;
-  for (const plugin of plugins) {
-    values = plugin.modify({
+  for (const modifier of modifiers) {
+    values = modifier.modify({
       model,
       entry,
       values

package/operations/entry/transformations/modifyEntryValues.js.map

@@ -1 +1 @@
-{"version":3,"names":["modifyEntryValues","params","plugins","model","entry","values","plugin","modify"],"sources":["modifyEntryValues.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryValues,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsEntryElasticsearchValuesModifier } from \"~/plugins/index.js\";\n\ninterface Params<T extends CmsEntryValues = CmsEntryValues> {\n    model: StorageOperationsCmsModel<T>;\n    plugins: CmsEntryElasticsearchValuesModifier[];\n    entry: CmsEntry<T>;\n}\n\nexport const modifyEntryValues = <T extends CmsEntryValues = CmsEntryValues>(params: Params<T>) => {\n    const { plugins, model, entry } = params;\n    let values = entry.values;\n    for (const plugin of plugins) {\n        values = plugin.modify<T>({\n            model,\n            entry,\n            values\n        });\n    }\n    return {\n        ...entry,\n        values\n    };\n};\n"],"mappings":"AAaA,OAAO,MAAMA,iBAAiB,GAA+CC,MAAiB,IAAK;EAC/F,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGH,MAAM;EACxC,IAAII,MAAM,GAAGD,KAAK,CAACC,MAAM;EACzB,KAAK,MAAMC,MAAM,IAAIJ,OAAO,EAAE;IAC1BG,MAAM,GAAGC,MAAM,CAACC,MAAM,CAAI;MACtBJ,KAAK;MACLC,KAAK;MACLC;IACJ,CAAC,CAAC;EACN;EACA,OAAO;IACH,GAAGD,KAAK;IACRC;EACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["modifyEntryValues","params","modifiers","model","entry","values","modifier","modify"],"sources":["modifyEntryValues.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryValues,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsEntryOpenSearchValuesModifier } from \"~/features/CmsEntryOpenSearchValuesModifier/index.js\";\n\ninterface Params<T extends CmsEntryValues = CmsEntryValues> {\n    model: StorageOperationsCmsModel<T>;\n    modifiers: CmsEntryOpenSearchValuesModifier.Interface[];\n    entry: CmsEntry<T>;\n}\n\nexport const modifyEntryValues = <T extends CmsEntryValues = CmsEntryValues>(params: Params<T>) => {\n    const { modifiers, model, entry } = params;\n    let values = entry.values;\n    for (const modifier of modifiers) {\n        values = modifier.modify<T>({\n            model,\n            entry,\n            values\n        });\n    }\n    return {\n        ...entry,\n        values\n    };\n};\n"],"mappings":"AAaA,OAAO,MAAMA,iBAAiB,GAA+CC,MAAiB,IAAK;EAC/F,MAAM;IAAEC,SAAS;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAC1C,IAAII,MAAM,GAAGD,KAAK,CAACC,MAAM;EACzB,KAAK,MAAMC,QAAQ,IAAIJ,SAAS,EAAE;IAC9BG,MAAM,GAAGC,QAAQ,CAACC,MAAM,CAAI;MACxBJ,KAAK;MACLC,KAAK;MACLC;IACJ,CAAC,CAAC;EACN;EACA,OAAO;IACH,GAAGD,KAAK;IACRC;EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/operations/entry/transformations/transformEntryToIndex.d.ts

@@ -1,10 +1,12 @@
-import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsEntry, CmsEntryValues, CmsStorageEntry, StorageOperationsCmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/features/graphql/index.js";
+import type { CmsEntryOpenSearchFieldIndexRegistry } from "../../../features/CmsEntryOpenSearchFieldIndex/index.js";
 interface TransformEntryToIndexParams<T extends CmsEntryValues = CmsEntryValues> {
-    plugins: PluginsContainer;
     model: StorageOperationsCmsModel<T>;
     entry: CmsEntry<T>;
     storageEntry: CmsStorageEntry<T>;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
+    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;
 }
 export declare const transformEntryToIndex: <T extends CmsEntryValues = CmsEntryValues>(params: TransformEntryToIndexParams<T>) => import("../../../types").CmsIndexEntry<T>;
 export {};

package/operations/entry/transformations/transformEntryToIndex.js

@@ -1,16 +1,18 @@
 import { prepareEntryToIndex } from "../../../helpers/index.js";
 export const transformEntryToIndex = params => {
   const {
-    plugins,
     model,
     entry,
-    storageEntry
+    storageEntry,
+    fieldRegistry,
+    fieldIndexRegistry
   } = params;
   const result = prepareEntryToIndex({
-    plugins,
     model,
     entry: structuredClone(entry),
-    storageEntry: structuredClone(storageEntry)
+    storageEntry: structuredClone(storageEntry),
+    fieldRegistry,
+    fieldIndexRegistry
   });
   delete result["PK"];
   delete result["SK"];

package/operations/entry/transformations/transformEntryToIndex.js.map

@@ -1 +1 @@
-{"version":3,"names":["prepareEntryToIndex","transformEntryToIndex","params","plugins","model","entry","storageEntry","result","structuredClone"],"sources":["transformEntryToIndex.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsStorageEntry,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { prepareEntryToIndex } from \"~/helpers/index.js\";\n\ninterface TransformEntryToIndexParams<T extends CmsEntryValues = CmsEntryValues> {\n    plugins: PluginsContainer;\n    model: StorageOperationsCmsModel<T>;\n    entry: CmsEntry<T>;\n    storageEntry: CmsStorageEntry<T>;\n}\n\nexport const transformEntryToIndex = <T extends CmsEntryValues = CmsEntryValues>(\n    params: TransformEntryToIndexParams<T>\n) => {\n    const { plugins, model, entry, storageEntry } = params;\n    const result = prepareEntryToIndex<T>({\n        plugins,\n        model,\n        entry: structuredClone(entry),\n        storageEntry: structuredClone(storageEntry)\n    });\n\n    delete result[\"PK\"];\n    delete result[\"SK\"];\n    delete result[\"GSI1_PK\"];\n    delete result[\"GSI1_SK\"];\n    delete result[\"published\"];\n    delete result[\"latest\"];\n\n    return result;\n};\n"],"mappings":"AAOA,SAASA,mBAAmB;AAS5B,OAAO,MAAMC,qBAAqB,GAC9BC,MAAsC,IACrC;EACD,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC,KAAK;IAAEC;EAAa,CAAC,GAAGJ,MAAM;EACtD,MAAMK,MAAM,GAAGP,mBAAmB,CAAI;IAClCG,OAAO;IACPC,KAAK;IACLC,KAAK,EAAEG,eAAe,CAACH,KAAK,CAAC;IAC7BC,YAAY,EAAEE,eAAe,CAACF,YAAY;EAC9C,CAAC,CAAC;EAEF,OAAOC,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,WAAW,CAAC;EAC1B,OAAOA,MAAM,CAAC,QAAQ,CAAC;EAEvB,OAAOA,MAAM;AACjB,CAAC","ignoreList":[]}
+{"version":3,"names":["prepareEntryToIndex","transformEntryToIndex","params","model","entry","storageEntry","fieldRegistry","fieldIndexRegistry","result","structuredClone"],"sources":["transformEntryToIndex.ts"],"sourcesContent":["import type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsStorageEntry,\n    StorageOperationsCmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { prepareEntryToIndex } from \"~/helpers/index.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport type { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\ninterface TransformEntryToIndexParams<T extends CmsEntryValues = CmsEntryValues> {\n    model: StorageOperationsCmsModel<T>;\n    entry: CmsEntry<T>;\n    storageEntry: CmsStorageEntry<T>;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n}\n\nexport const transformEntryToIndex = <T extends CmsEntryValues = CmsEntryValues>(\n    params: TransformEntryToIndexParams<T>\n) => {\n    const { model, entry, storageEntry, fieldRegistry, fieldIndexRegistry } = params;\n    const result = prepareEntryToIndex<T>({\n        model,\n        entry: structuredClone(entry),\n        storageEntry: structuredClone(storageEntry),\n        fieldRegistry,\n        fieldIndexRegistry\n    });\n\n    delete result[\"PK\"];\n    delete result[\"SK\"];\n    delete result[\"GSI1_PK\"];\n    delete result[\"GSI1_SK\"];\n    delete result[\"published\"];\n    delete result[\"latest\"];\n\n    return result;\n};\n"],"mappings":"AAMA,SAASA,mBAAmB;AAY5B,OAAO,MAAMC,qBAAqB,GAC9BC,MAAsC,IACrC;EACD,MAAM;IAAEC,KAAK;IAAEC,KAAK;IAAEC,YAAY;IAAEC,aAAa;IAAEC;EAAmB,CAAC,GAAGL,MAAM;EAChF,MAAMM,MAAM,GAAGR,mBAAmB,CAAI;IAClCG,KAAK;IACLC,KAAK,EAAEK,eAAe,CAACL,KAAK,CAAC;IAC7BC,YAAY,EAAEI,eAAe,CAACJ,YAAY,CAAC;IAC3CC,aAAa;IACbC;EACJ,CAAC,CAAC;EAEF,OAAOC,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,IAAI,CAAC;EACnB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,SAAS,CAAC;EACxB,OAAOA,MAAM,CAAC,WAAW,CAAC;EAC1B,OAAOA,MAAM,CAAC,QAAQ,CAAC;EAEvB,OAAOA,MAAM;AACjB,CAAC","ignoreList":[]}

package/operations/group/index.d.ts

@@ -1,9 +1,9 @@
 import type { CmsGroupStorageOperations } from "@webiny/api-headless-cms/types/index.js";
-import type { PluginsContainer } from "@webiny/plugins";
 import { IGroupEntity } from "../../definitions/types.js";
+import type { CmsContext } from "../../types.js";
 interface CreateGroupsStorageOperationsParams {
     entity: IGroupEntity;
-    plugins: PluginsContainer;
+    container: CmsContext["container"];
 }
 export declare const createGroupsStorageOperations: (params: CreateGroupsStorageOperationsParams) => CmsGroupStorageOperations;
 export {};

package/operations/group/index.js

@@ -1,5 +1,6 @@
 import WebinyError from "@webiny/error";
-import { filterItems, sortItems, ValueFilterPlugin } from "@webiny/db-dynamodb";
+import { sortItems } from "@webiny/db-dynamodb";
+import { FilterUtil } from "@webiny/db-dynamodb/exports/api/db.js";
 const createPartitionKey = params => {
   const {
     tenant
@@ -25,12 +26,9 @@ const createType = () => {
 export const createGroupsStorageOperations = params => {
   const {
     entity,
-    plugins
+    container
   } = params;
-  const filteringPlugins = plugins.byType(ValueFilterPlugin.type);
-  if (filteringPlugins.length === 0) {
-    throw new WebinyError("DynamoDB filtering plugins not loaded.", "MISSING_DYNAMODB_FILTERING_PLUGINS");
-  }
+  const filterUtil = container.resolve(FilterUtil);
   const create = async params => {
     const {
       group
@@ -119,11 +117,10 @@ export const createGroupsStorageOperations = params => {
         where
       });
     }
-    const filteredItems = filterItems({
+    const filteredItems = filterUtil.filter({
       items: records,
       where,
-      fields: [],
-      plugins
+      fields: []
     });
     if (!sort || sort.length === 0) {
       return filteredItems;

package/operations/group/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","filterItems","sortItems","ValueFilterPlugin","createPartitionKey","params","tenant","createSortKeys","id","createKeys","PK","SK","GSI_TENANT","createType","createGroupsStorageOperations","entity","plugins","filteringPlugins","byType","type","length","create","group","keys","put","data","TYPE","ex","message","code","error","update","deleteGroup","delete","get","result","list","sort","where","records","ddbRecords","queryAll","partitionKey","options","gte","map","item","filteredItems","items","fields"],"sources":["index.ts"],"sourcesContent":["import type {\n    CmsGroup,\n    CmsGroupStorageOperations,\n    CmsGroupStorageOperationsCreateParams,\n    CmsGroupStorageOperationsDeleteParams,\n    CmsGroupStorageOperationsGetParams,\n    CmsGroupStorageOperationsListParams,\n    CmsGroupStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport { filterItems, sortItems, ValueFilterPlugin } from \"@webiny/db-dynamodb\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { IGroupEntity } from \"~/definitions/types.js\";\n\ninterface PartitionKeyParams {\n    tenant: string;\n}\nconst createPartitionKey = (params: PartitionKeyParams): string => {\n    const { tenant } = params;\n    return `T#${tenant}#CMS#CMG`;\n};\n\ninterface SortKeyParams {\n    id: string;\n}\nconst createSortKeys = (params: SortKeyParams): string => {\n    const { id } = params;\n    return id;\n};\n\ninterface IDynamoDbTableKeys {\n    PK: string;\n    SK: string;\n    GSI_TENANT: string;\n}\nconst createKeys = (params: PartitionKeyParams & SortKeyParams): IDynamoDbTableKeys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKeys(params),\n        GSI_TENANT: params.tenant\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.group\";\n};\n\ninterface CreateGroupsStorageOperationsParams {\n    entity: IGroupEntity;\n    plugins: PluginsContainer;\n}\nexport const createGroupsStorageOperations = (\n    params: CreateGroupsStorageOperationsParams\n): CmsGroupStorageOperations => {\n    const { entity, plugins } = params;\n\n    const filteringPlugins = plugins.byType<ValueFilterPlugin>(ValueFilterPlugin.type);\n    if (filteringPlugins.length === 0) {\n        throw new WebinyError(\n            \"DynamoDB filtering plugins not loaded.\",\n            \"MISSING_DYNAMODB_FILTERING_PLUGINS\"\n        );\n    }\n\n    const create = async (params: CmsGroupStorageOperationsCreateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                data: group,\n                TYPE: createType(),\n                ...keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create group.\",\n                ex.code || \"CREATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const update = async (params: CmsGroupStorageOperationsUpdateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                data: group,\n                TYPE: createType(),\n                ...keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update group.\",\n                ex.code || \"UPDATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const deleteGroup = async (params: CmsGroupStorageOperationsDeleteParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.delete(keys);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete group.\",\n                ex.code || \"DELETE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const get = async (params: CmsGroupStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            const result = await entity.get(keys);\n\n            return result ? result.data : null;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get group.\",\n                ex.code || \"GET_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    keys\n                }\n            );\n        }\n    };\n    const list = async (params: CmsGroupStorageOperationsListParams) => {\n        const { sort, where } = params;\n\n        let records: CmsGroup[] = [];\n        try {\n            const ddbRecords = await entity.queryAll({\n                partitionKey: createPartitionKey(where),\n                options: {\n                    gte: \" \"\n                }\n            });\n            records = ddbRecords.map(item => item.data);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list groups.\",\n                ex.code || \"LIST_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    sort,\n                    where\n                }\n            );\n        }\n\n        const filteredItems = filterItems({\n            items: records,\n            where,\n            fields: [],\n            plugins\n        });\n        if (!sort || sort.length === 0) {\n            return filteredItems;\n        }\n\n        return sortItems({\n            items: filteredItems,\n            sort\n        });\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteGroup,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","sortItems","FilterUtil","createPartitionKey","params","tenant","createSortKeys","id","createKeys","PK","SK","GSI_TENANT","createType","createGroupsStorageOperations","entity","container","filterUtil","resolve","create","group","keys","put","data","TYPE","ex","message","code","error","update","deleteGroup","delete","get","result","list","sort","where","records","ddbRecords","queryAll","partitionKey","options","gte","map","item","filteredItems","filter","items","fields","length"],"sources":["index.ts"],"sourcesContent":["import type {\n    CmsGroup,\n    CmsGroupStorageOperations,\n    CmsGroupStorageOperationsCreateParams,\n    CmsGroupStorageOperationsDeleteParams,\n    CmsGroupStorageOperationsGetParams,\n    CmsGroupStorageOperationsListParams,\n    CmsGroupStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport { sortItems } from \"@webiny/db-dynamodb\";\nimport { IGroupEntity } from \"~/definitions/types.js\";\nimport { FilterUtil } from \"@webiny/db-dynamodb/exports/api/db.js\";\nimport type { CmsContext } from \"~/types.js\";\n\ninterface PartitionKeyParams {\n    tenant: string;\n}\nconst createPartitionKey = (params: PartitionKeyParams): string => {\n    const { tenant } = params;\n    return `T#${tenant}#CMS#CMG`;\n};\n\ninterface SortKeyParams {\n    id: string;\n}\nconst createSortKeys = (params: SortKeyParams): string => {\n    const { id } = params;\n    return id;\n};\n\ninterface IDynamoDbTableKeys {\n    PK: string;\n    SK: string;\n    GSI_TENANT: string;\n}\nconst createKeys = (params: PartitionKeyParams & SortKeyParams): IDynamoDbTableKeys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKeys(params),\n        GSI_TENANT: params.tenant\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.group\";\n};\n\ninterface CreateGroupsStorageOperationsParams {\n    entity: IGroupEntity;\n    container: CmsContext[\"container\"];\n}\nexport const createGroupsStorageOperations = (\n    params: CreateGroupsStorageOperationsParams\n): CmsGroupStorageOperations => {\n    const { entity, container } = params;\n\n    const filterUtil = container.resolve(FilterUtil);\n\n    const create = async (params: CmsGroupStorageOperationsCreateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                data: group,\n                TYPE: createType(),\n                ...keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create group.\",\n                ex.code || \"CREATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const update = async (params: CmsGroupStorageOperationsUpdateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                data: group,\n                TYPE: createType(),\n                ...keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update group.\",\n                ex.code || \"UPDATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const deleteGroup = async (params: CmsGroupStorageOperationsDeleteParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.delete(keys);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete group.\",\n                ex.code || \"DELETE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const get = async (params: CmsGroupStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            const result = await entity.get(keys);\n\n            return result ? result.data : null;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get group.\",\n                ex.code || \"GET_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    keys\n                }\n            );\n        }\n    };\n    const list = async (params: CmsGroupStorageOperationsListParams) => {\n        const { sort, where } = params;\n\n        let records: CmsGroup[] = [];\n        try {\n            const ddbRecords = await entity.queryAll({\n                partitionKey: createPartitionKey(where),\n                options: {\n                    gte: \" \"\n                }\n            });\n            records = ddbRecords.map(item => item.data);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list groups.\",\n                ex.code || \"LIST_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    sort,\n                    where\n                }\n            );\n        }\n\n        const filteredItems = filterUtil.filter({\n            items: records,\n            where,\n            fields: []\n        });\n        if (!sort || sort.length === 0) {\n            return filteredItems;\n        }\n\n        return sortItems({\n            items: filteredItems,\n            sort\n        });\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteGroup,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-ddb-es",
-	"version": "6.1.0-beta.3",
+	"version": "6.2.0-beta.0",
 	"type": "module",
 	"main": "index.js",
 	"keywords": [
@@ -27,39 +27,41 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.1.0-beta.3",
-		"@webiny/api-elasticsearch-tasks": "6.1.0-beta.3",
-		"@webiny/api-headless-cms": "6.1.0-beta.3",
-		"@webiny/api-opensearch": "6.1.0-beta.3",
-		"@webiny/aws-sdk": "6.1.0-beta.3",
-		"@webiny/db-dynamodb": "6.1.0-beta.3",
-		"@webiny/error": "6.1.0-beta.3",
-		"@webiny/handler-db": "6.1.0-beta.3",
-		"@webiny/plugins": "6.1.0-beta.3",
-		"@webiny/utils": "6.1.0-beta.3",
+		"@webiny/api": "6.2.0-beta.0",
+		"@webiny/api-elasticsearch-tasks": "6.2.0-beta.0",
+		"@webiny/api-headless-cms": "6.2.0-beta.0",
+		"@webiny/api-opensearch": "6.2.0-beta.0",
+		"@webiny/aws-sdk": "6.2.0-beta.0",
+		"@webiny/db-dynamodb": "6.2.0-beta.0",
+		"@webiny/error": "6.2.0-beta.0",
+		"@webiny/feature": "6.2.0-beta.0",
+		"@webiny/handler-db": "6.2.0-beta.0",
+		"@webiny/plugins": "6.2.0-beta.0",
+		"@webiny/utils": "6.2.0-beta.0",
 		"dataloader": "2.2.3",
-		"lodash": "4.17.23"
+		"lodash": "4.18.1"
 	},
 	"devDependencies": {
 		"@types/jsonpack": "1.1.6",
-		"@webiny/api-core": "6.1.0-beta.3",
-		"@webiny/api-dynamodb-to-elasticsearch": "6.1.0-beta.3",
-		"@webiny/build-tools": "6.1.0-beta.3",
-		"@webiny/handler": "6.1.0-beta.3",
-		"@webiny/handler-aws": "6.1.0-beta.3",
-		"@webiny/handler-graphql": "6.1.0-beta.3",
-		"@webiny/project-utils": "6.1.0-beta.3",
-		"@webiny/tasks": "6.1.0-beta.3",
-		"@webiny/wcp": "6.1.0-beta.3",
+		"@webiny/api-core": "6.2.0-beta.0",
+		"@webiny/api-dynamodb-to-elasticsearch": "6.2.0-beta.0",
+		"@webiny/build-tools": "6.2.0-beta.0",
+		"@webiny/di": "0.2.3",
+		"@webiny/handler": "6.2.0-beta.0",
+		"@webiny/handler-aws": "6.2.0-beta.0",
+		"@webiny/handler-graphql": "6.2.0-beta.0",
+		"@webiny/project-utils": "6.2.0-beta.0",
+		"@webiny/tasks": "6.2.0-beta.0",
+		"@webiny/wcp": "6.2.0-beta.0",
 		"jest-dynalite": "3.6.1",
 		"prettier": "3.6.2",
 		"rimraf": "6.1.3",
 		"typescript": "5.9.3",
-		"vitest": "4.1.2"
+		"vitest": "4.1.4"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
-	"gitHead": "65e0ac1889b3392c99b8cac6cde508e1e831c715"
+	"gitHead": "3d3148358b6febbc857371930871743bec3b3939"
 }

package/tasks/createIndexTaskPlugin.js

@@ -1,6 +1,7 @@
 import { OpensearchTenantIndexFactory } from "@webiny/api-elasticsearch-tasks";
 import { ListModelsUseCase } from "@webiny/api-headless-cms/features/contentModel/ListModels/index.js";
 import { configurations } from "../configurations.js";
+import { CmsEntryOpenSearchIndex } from "../features/CmsEntryOpenSearchIndex/index.js";
 class CreateElasticsearchIndexTask {
   constructor(context, listModels) {
     this.context = context;
@@ -12,6 +13,7 @@ class CreateElasticsearchIndexTask {
     if (models.length === 0) {
       return [];
     }
+    const indexConfigs = this.context.container.resolveAll(CmsEntryOpenSearchIndex);
     const indexes = models.map(model => {
       const {
         index
@@ -24,7 +26,12 @@ class CreateElasticsearchIndexTask {
       return {
         index,
         settings: configurations.indexSettings({
-          context: this.context
+          indexConfigs,
+          model: {
+            modelId: model.modelId,
+            tenant: tenant.id,
+            group: model.group
+          }
         })
       };
     });

package/tasks/createIndexTaskPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["OpensearchTenantIndexFactory","ListModelsUseCase","configurations","CreateElasticsearchIndexTask","constructor","context","listModels","getIndexList","tenant","result","execute","models","value","length","indexes","map","model","index","es","modelId","id","settings","indexSettings","createCreateIndexTask","container","registerFactory","resolve"],"sources":["createIndexTaskPlugin.ts"],"sourcesContent":["import { OpensearchTenantIndexFactory } from \"@webiny/api-elasticsearch-tasks\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { configurations } from \"~/configurations.js\";\nimport type { CmsContext } from \"~/types.js\";\n\nclass CreateElasticsearchIndexTask implements OpensearchTenantIndexFactory.Interface {\n    constructor(\n        private context: CmsContext,\n        private listModels: ListModelsUseCase.Interface\n    ) {}\n\n    async getIndexList(tenant: Tenant): Promise<OpensearchTenantIndexFactory.IndexConfig[]> {\n        const result = await this.listModels.execute();\n        const models = result.value;\n\n        if (models.length === 0) {\n            return [];\n        }\n\n        const indexes = models.map<OpensearchTenantIndexFactory.IndexConfig>(model => {\n            const { index } = configurations.es({\n                model: {\n                    modelId: model.modelId,\n                    tenant: tenant.id\n                }\n            });\n            return {\n                index,\n                settings: configurations.indexSettings({\n                    context: this.context\n                })\n            };\n        });\n\n        return indexes;\n    }\n}\n\nexport const createCreateIndexTask = (context: CmsContext) => {\n    context.container.registerFactory(OpensearchTenantIndexFactory, () => {\n        const listModels = context.container.resolve(ListModelsUseCase);\n        return new CreateElasticsearchIndexTask(context, listModels);\n    });\n};\n"],"mappings":"AAAA,SAASA,4BAA4B,QAAQ,iCAAiC;AAE9E,SAASC,iBAAiB,QAAQ,oEAAoE;AACtG,SAASC,cAAc;AAGvB,MAAMC,4BAA4B,CAAmD;EACjFC,WAAWA,CACCC,OAAmB,EACnBC,UAAuC,EACjD;IAAA,KAFUD,OAAmB,GAAnBA,OAAmB;IAAA,KACnBC,UAAuC,GAAvCA,UAAuC;EAChD;EAEH,MAAMC,YAAYA,CAACC,MAAc,EAAuD;IACpF,MAAMC,MAAM,GAAG,MAAM,IAAI,CAACH,UAAU,CAACI,OAAO,CAAC,CAAC;IAC9C,MAAMC,MAAM,GAAGF,MAAM,CAACG,KAAK;IAE3B,IAAID,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;MACrB,OAAO,EAAE;IACb;IAEA,MAAMC,OAAO,GAAGH,MAAM,CAACI,GAAG,CAA2CC,KAAK,IAAI;MAC1E,MAAM;QAAEC;MAAM,CAAC,GAAGf,cAAc,CAACgB,EAAE,CAAC;QAChCF,KAAK,EAAE;UACHG,OAAO,EAAEH,KAAK,CAACG,OAAO;UACtBX,MAAM,EAAEA,MAAM,CAACY;QACnB;MACJ,CAAC,CAAC;MACF,OAAO;QACHH,KAAK;QACLI,QAAQ,EAAEnB,cAAc,CAACoB,aAAa,CAAC;UACnCjB,OAAO,EAAE,IAAI,CAACA;QAClB,CAAC;MACL,CAAC;IACL,CAAC,CAAC;IAEF,OAAOS,OAAO;EAClB;AACJ;AAEA,OAAO,MAAMS,qBAAqB,GAAIlB,OAAmB,IAAK;EAC1DA,OAAO,CAACmB,SAAS,CAACC,eAAe,CAACzB,4BAA4B,EAAE,MAAM;IAClE,MAAMM,UAAU,GAAGD,OAAO,CAACmB,SAAS,CAACE,OAAO,CAACzB,iBAAiB,CAAC;IAC/D,OAAO,IAAIE,4BAA4B,CAACE,OAAO,EAAEC,UAAU,CAAC;EAChE,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["OpensearchTenantIndexFactory","ListModelsUseCase","configurations","CmsEntryOpenSearchIndex","CreateElasticsearchIndexTask","constructor","context","listModels","getIndexList","tenant","result","execute","models","value","length","indexConfigs","container","resolveAll","indexes","map","model","index","es","modelId","id","settings","indexSettings","group","createCreateIndexTask","registerFactory","resolve"],"sources":["createIndexTaskPlugin.ts"],"sourcesContent":["import { OpensearchTenantIndexFactory } from \"@webiny/api-elasticsearch-tasks\";\nimport type { Tenant } from \"@webiny/api-core/types/tenancy.js\";\nimport { ListModelsUseCase } from \"@webiny/api-headless-cms/features/contentModel/ListModels/index.js\";\nimport { configurations } from \"~/configurations.js\";\nimport type { CmsContext } from \"~/types.js\";\nimport { CmsEntryOpenSearchIndex } from \"~/features/CmsEntryOpenSearchIndex/index.js\";\n\nclass CreateElasticsearchIndexTask implements OpensearchTenantIndexFactory.Interface {\n    constructor(\n        private context: CmsContext,\n        private listModels: ListModelsUseCase.Interface\n    ) {}\n\n    async getIndexList(tenant: Tenant): Promise<OpensearchTenantIndexFactory.IndexConfig[]> {\n        const result = await this.listModels.execute();\n        const models = result.value;\n\n        if (models.length === 0) {\n            return [];\n        }\n\n        const indexConfigs = this.context.container.resolveAll(CmsEntryOpenSearchIndex);\n\n        const indexes = models.map<OpensearchTenantIndexFactory.IndexConfig>(model => {\n            const { index } = configurations.es({\n                model: {\n                    modelId: model.modelId,\n                    tenant: tenant.id\n                }\n            });\n            return {\n                index,\n                settings: configurations.indexSettings({\n                    indexConfigs,\n                    model: {\n                        modelId: model.modelId,\n                        tenant: tenant.id,\n                        group: model.group\n                    }\n                })\n            };\n        });\n\n        return indexes;\n    }\n}\n\nexport const createCreateIndexTask = (context: CmsContext) => {\n    context.container.registerFactory(OpensearchTenantIndexFactory, () => {\n        const listModels = context.container.resolve(ListModelsUseCase);\n        return new CreateElasticsearchIndexTask(context, listModels);\n    });\n};\n"],"mappings":"AAAA,SAASA,4BAA4B,QAAQ,iCAAiC;AAE9E,SAASC,iBAAiB,QAAQ,oEAAoE;AACtG,SAASC,cAAc;AAEvB,SAASC,uBAAuB;AAEhC,MAAMC,4BAA4B,CAAmD;EACjFC,WAAWA,CACCC,OAAmB,EACnBC,UAAuC,EACjD;IAAA,KAFUD,OAAmB,GAAnBA,OAAmB;IAAA,KACnBC,UAAuC,GAAvCA,UAAuC;EAChD;EAEH,MAAMC,YAAYA,CAACC,MAAc,EAAuD;IACpF,MAAMC,MAAM,GAAG,MAAM,IAAI,CAACH,UAAU,CAACI,OAAO,CAAC,CAAC;IAC9C,MAAMC,MAAM,GAAGF,MAAM,CAACG,KAAK;IAE3B,IAAID,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;MACrB,OAAO,EAAE;IACb;IAEA,MAAMC,YAAY,GAAG,IAAI,CAACT,OAAO,CAACU,SAAS,CAACC,UAAU,CAACd,uBAAuB,CAAC;IAE/E,MAAMe,OAAO,GAAGN,MAAM,CAACO,GAAG,CAA2CC,KAAK,IAAI;MAC1E,MAAM;QAAEC;MAAM,CAAC,GAAGnB,cAAc,CAACoB,EAAE,CAAC;QAChCF,KAAK,EAAE;UACHG,OAAO,EAAEH,KAAK,CAACG,OAAO;UACtBd,MAAM,EAAEA,MAAM,CAACe;QACnB;MACJ,CAAC,CAAC;MACF,OAAO;QACHH,KAAK;QACLI,QAAQ,EAAEvB,cAAc,CAACwB,aAAa,CAAC;UACnCX,YAAY;UACZK,KAAK,EAAE;YACHG,OAAO,EAAEH,KAAK,CAACG,OAAO;YACtBd,MAAM,EAAEA,MAAM,CAACe,EAAE;YACjBG,KAAK,EAAEP,KAAK,CAACO;UACjB;QACJ,CAAC;MACL,CAAC;IACL,CAAC,CAAC;IAEF,OAAOT,OAAO;EAClB;AACJ;AAEA,OAAO,MAAMU,qBAAqB,GAAItB,OAAmB,IAAK;EAC1DA,OAAO,CAACU,SAAS,CAACa,eAAe,CAAC7B,4BAA4B,EAAE,MAAM;IAClE,MAAMO,UAAU,GAAGD,OAAO,CAACU,SAAS,CAACc,OAAO,CAAC7B,iBAAiB,CAAC;IAC/D,OAAO,IAAIG,4BAA4B,CAACE,OAAO,EAAEC,UAAU,CAAC;EAChE,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/types.d.ts

@@ -1,11 +1,11 @@
-import type { Plugin, PluginCollection } from "@webiny/plugins/types.js";
-import type { CmsContext as BaseCmsContext, CmsEntry, CmsEntryStorageOperations as BaseCmsEntryStorageOperations, CmsEntryValues, CmsModel, CmsModelField, CmsModelFieldToGraphQLPlugin, CmsModelFieldType, HeadlessCmsStorageOperations as BaseHeadlessCmsStorageOperations } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsContext as BaseCmsContext, CmsEntry, CmsEntryStorageOperations as BaseCmsEntryStorageOperations, CmsEntryValues, CmsModel, HeadlessCmsStorageOperations as BaseHeadlessCmsStorageOperations } from "@webiny/api-headless-cms/types/index.js";
 import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb/index.js";
-import type { Client } from "@webiny/api-opensearch";
+import type { Client, IOpenSearchEntity as IElasticsearchEntity, OpenSearchContext } from "@webiny/api-opensearch";
 import type { PluginsContainer } from "@webiny/plugins";
 import type { IEntryEntity, IGroupEntity, IModelEntity } from "./definitions/types.js";
-import type { IOpenSearchEntity as IElasticsearchEntity } from "@webiny/api-opensearch";
 import type { ITable } from "@webiny/db-dynamodb";
+export interface CmsContext extends BaseCmsContext, OpenSearchContext {
+}
 /**
  * A definition of the entry that is being prepared for the Elasticsearch.
  *
@@ -22,108 +22,6 @@ export interface CmsIndexEntry<T extends CmsEntryValues = CmsEntryValues> extend
      */
     [key: string]: any;
 }
-/**
- * Arguments for the method that is transforming content entry in its original form to the one we are storing to the Elasticsearch.
- *
- * @category Elasticsearch
- * @category CmsEntry
- */
-export interface CmsModelFieldToElasticsearchToParams {
-    plugins: PluginsContainer;
-    model: CmsModel;
-    field: CmsModelField;
-    /**
-     * Raw value on the entry - before prepare for storage.
-     */
-    rawValue: any;
-    /**
-     * Value prepared for storage received from base api-headless-cms package.
-     */
-    value: any;
-    getFieldIndexPlugin(fieldType: string): CmsModelFieldToElasticsearchPlugin;
-    getFieldTypePlugin(fieldType: string): CmsModelFieldToGraphQLPlugin;
-}
-/**
- * Arguments for the method that is transforming content entry from Elasticsearch into the original one.
- *
- * @category Elasticsearch
- * @category CmsEntry
- */
-export interface CmsModelFieldToElasticsearchFromParams {
-    plugins: PluginsContainer;
-    model: CmsModel;
-    field: CmsModelField;
-    value: any;
-    rawValue: any;
-    getFieldIndexPlugin(fieldType: string): CmsModelFieldToElasticsearchPlugin;
-    getFieldTypePlugin(fieldType: string): CmsModelFieldToGraphQLPlugin;
-}
-interface ToIndexValue {
-    /**
-     * Use this key to store value for indexing.
-     */
-    value?: any;
-    /**
-     * Use this key to tell ES that this value should not be indexed.
-     */
-    rawValue?: any;
-}
-/**
- * A plugin defining transformation of entry for Elasticsearch.
- *
- * @category Plugin
- * @category ContentModelField
- * @category CmsEntry
- * @category Elasticsearch
- */
-export interface CmsModelFieldToElasticsearchPlugin extends Plugin {
-    /**
-     * A plugin type
-     */
-    type: "cms-model-field-to-elastic-search";
-    /**
-     * A unique identifier of the field type (text, number, json, myField, ...).
-     *
-     * ```ts
-     * fieldType: "myField"
-     * ```
-     */
-    fieldType: CmsModelFieldType;
-    /**
-     * If you need to define a type when building an Elasticsearch query.
-     * Check [dateTimeIndexing](https://github.com/webiny/webiny-js/blob/3074165701b8b45e5fc6ac2444caace7d04ada66/packages/api-headless-cms/src/content/plugins/es/indexing/dateTimeIndexing.ts) plugin for usage example.
-     *
-     * ```ts
-     * unmappedType: "date"
-     * ```
-     */
-    unmappedType?: (field: Pick<CmsModelField, "fieldId" | "type">) => string;
-    /**
-     * This is meant to do some transformation of the entry, preferably only to fieldType it was defined for. Nothing is stopping you to do anything you want to other fields, but try to separate field transformations.
-     * It returns `Partial<CmsContentIndexEntryType>`. Always return a top-level property of the entry since it is merged via spread operator.
-     *
-     * ```ts
-     * toIndex({ value }) {
-     *    return {
-     *        value: value, // This will be stored and indexed
-     *        rawValue: JSON.stringify(value) // This will be stored but excluded from indexing
-     *    };
-     * }
-     * ```
-     */
-    toIndex?: (params: CmsModelFieldToElasticsearchToParams) => ToIndexValue;
-    /**
-     * This is meant to revert a transformation done in the `toIndex` method.
-     * You have access to "value" or a "rawValue", depending on what you returned from `toIndex`.
-     *
-     * ```ts
-     * fromIndex({ value, rawValue }) {
-     *     return JSON.parse(rawValue);
-     * }
-     * ```
-     */
-    fromIndex?: (params: CmsModelFieldToElasticsearchFromParams) => any;
-}
 export declare enum ENTITIES {
     GROUPS = "CmsGroups",
     MODELS = "CmsModels",
@@ -135,10 +33,8 @@ export interface StorageOperationsFactoryParams {
     elasticsearch: Client;
     table?: string;
     esTable?: string;
-    plugins?: PluginCollection;
-}
-export interface CmsContext extends BaseCmsContext {
-    [key: string]: any;
+    plugins: PluginsContainer;
+    container: CmsContext["container"];
 }
 export interface IGetEntitiesResponse {
     groups: IGroupEntity;
@@ -146,7 +42,7 @@ export interface IGetEntitiesResponse {
     entries: IEntryEntity;
     entriesEs: IElasticsearchEntity;
 }
-export interface HeadlessCmsStorageOperations extends BaseHeadlessCmsStorageOperations<CmsContext> {
+export interface HeadlessCmsStorageOperations extends BaseHeadlessCmsStorageOperations {
     getTable: () => ITable;
     getEsTable: () => ITable;
     getEntities: () => IGetEntitiesResponse;
@@ -163,4 +59,3 @@ export interface DataLoadersHandlerInterfaceClearAllParams {
 export interface IDataLoadersHandler {
     clearAll: (params?: DataLoadersHandlerInterfaceClearAllParams) => void;
 }
-export {};