@webiny/api-headless-cms-ddb-es 6.4.0-beta.0 → 6.4.0-beta.2

package/features/CmsEntryOpenSearchFieldIndex/CmsEntryOpenSearchFieldIndexRegistry.d.ts

@@ -2,8 +2,9 @@ import { CmsEntryOpenSearchFieldIndexRegistry as Abstraction } from "./abstracti
 import { CmsEntryOpenSearchFieldIndex } from "./abstractions/CmsEntryOpenSearchFieldIndex.js";
 declare class CmsEntryOpenSearchFieldIndexRegistryImpl implements Abstraction.Interface {
     private readonly fieldIndexing;
+    private readonly cache;
     constructor(fieldIndexing: CmsEntryOpenSearchFieldIndex.Interface[]);
-    get(type: string): CmsEntryOpenSearchFieldIndex.Interface | undefined;
+    get(fieldType: string): CmsEntryOpenSearchFieldIndex.Interface | undefined;
     getDefault(): CmsEntryOpenSearchFieldIndex.Interface;
     getAll(): CmsEntryOpenSearchFieldIndex.Interface[];
 }

package/features/CmsEntryOpenSearchFieldIndex/CmsEntryOpenSearchFieldIndexRegistry.js

@@ -5,12 +5,17 @@ import { FIELD_INDEXING_DEFAULT } from "./constants.js";
 class CmsEntryOpenSearchFieldIndexRegistryImpl {
     constructor(fieldIndexing){
         this.fieldIndexing = fieldIndexing;
+        this.cache = new Map();
     }
-    get(type) {
-        const fieldType = getBaseFieldType({
-            type
+    get(fieldType) {
+        if (this.cache.has(fieldType)) return this.cache.get(fieldType);
+        let indexing = this.fieldIndexing.find((field)=>field.fieldType === fieldType);
+        const baseType = getBaseFieldType({
+            type: fieldType
         });
-        return this.fieldIndexing.find((field)=>field.fieldType === fieldType);
+        if (!indexing && baseType !== fieldType) indexing = this.fieldIndexing.find((field)=>field.fieldType === baseType);
+        this.cache.set(fieldType, indexing);
+        return indexing;
     }
     getDefault() {
         const fieldIndex = this.fieldIndexing.find((field)=>field.fieldType === FIELD_INDEXING_DEFAULT);

package/features/CmsEntryOpenSearchFieldIndex/CmsEntryOpenSearchFieldIndexRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/CmsEntryOpenSearchFieldIndexRegistry.js","sources":["../../../src/features/CmsEntryOpenSearchFieldIndex/CmsEntryOpenSearchFieldIndexRegistry.ts"],"sourcesContent":["import { CmsEntryOpenSearchFieldIndexRegistry as Abstraction } from \"./abstractions/CmsEntryOpenSearchFieldIndexRegistry.js\";\nimport { CmsEntryOpenSearchFieldIndex } from \"./abstractions/CmsEntryOpenSearchFieldIndex.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { FIELD_INDEXING_DEFAULT } from \"./constants.js\";\n\nclass CmsEntryOpenSearchFieldIndexRegistryImpl implements Abstraction.Interface {\n    public constructor(private readonly fieldIndexing: CmsEntryOpenSearchFieldIndex.Interface[]) {}\n\n    public get(type: string): CmsEntryOpenSearchFieldIndex.Interface | undefined {\n        const fieldType = getBaseFieldType({\n            type\n        });\n        return this.fieldIndexing.find(field => field.fieldType === fieldType);\n    }\n\n    public getDefault(): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndex = this.fieldIndexing.find(\n            field => field.fieldType === FIELD_INDEXING_DEFAULT\n        );\n        if (fieldIndex) {\n            return fieldIndex;\n        }\n        /**\n         * This should never happen, as the default field index plugin exists in our code. This can fail during testing.\n         */\n        throw new Error(\n            `Missing default field index plugin. Please make sure to register a plugin with \"${FIELD_INDEXING_DEFAULT}\" field type.`\n        );\n    }\n\n    public getAll(): CmsEntryOpenSearchFieldIndex.Interface[] {\n        return this.fieldIndexing;\n    }\n}\n\nexport const CmsEntryOpenSearchFieldIndexRegistry = Abstraction.createImplementation({\n    implementation: CmsEntryOpenSearchFieldIndexRegistryImpl,\n    dependencies: [[CmsEntryOpenSearchFieldIndex, { multiple: true }]]\n});\n"],"names":["CmsEntryOpenSearchFieldIndexRegistryImpl","fieldIndexing","type","fieldType","getBaseFieldType","field","fieldIndex","FIELD_INDEXING_DEFAULT","Error","CmsEntryOpenSearchFieldIndexRegistry","Abstraction","CmsEntryOpenSearchFieldIndex"],"mappings":";;;;AAKA,MAAMA;IACF,YAAoCC,aAAuD,CAAE;aAAzDA,aAAa,GAAbA;IAA0D;IAEvF,IAAIC,IAAY,EAAsD;QACzE,MAAMC,YAAYC,iBAAiB;YAC/BF;QACJ;QACA,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAACG,CAAAA,QAASA,MAAM,SAAS,KAAKF;IAChE;IAEO,aAAqD;QACxD,MAAMG,aAAa,IAAI,CAAC,aAAa,CAAC,IAAI,CACtCD,CAAAA,QAASA,MAAM,SAAS,KAAKE;QAEjC,IAAID,YACA,OAAOA;QAKX,MAAM,IAAIE,MACN,CAAC,gFAAgF,EAAED,uBAAuB,aAAa,CAAC;IAEhI;IAEO,SAAmD;QACtD,OAAO,IAAI,CAAC,aAAa;IAC7B;AACJ;AAEO,MAAME,4EAAuCC,qCAAAA,oBAAgC,CAAC;IACjF,gBAAgBV;IAChB,cAAc;QAAC;YAACW;YAA8B;gBAAE,UAAU;YAAK;SAAE;KAAC;AACtE"}
+{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/CmsEntryOpenSearchFieldIndexRegistry.js","sources":["../../../src/features/CmsEntryOpenSearchFieldIndex/CmsEntryOpenSearchFieldIndexRegistry.ts"],"sourcesContent":["import { CmsEntryOpenSearchFieldIndexRegistry as Abstraction } from \"./abstractions/CmsEntryOpenSearchFieldIndexRegistry.js\";\nimport { CmsEntryOpenSearchFieldIndex } from \"./abstractions/CmsEntryOpenSearchFieldIndex.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { FIELD_INDEXING_DEFAULT } from \"./constants.js\";\n\nclass CmsEntryOpenSearchFieldIndexRegistryImpl implements Abstraction.Interface {\n    private readonly cache: Map<string, CmsEntryOpenSearchFieldIndex.Interface | undefined> =\n        new Map();\n\n    public constructor(private readonly fieldIndexing: CmsEntryOpenSearchFieldIndex.Interface[]) {}\n\n    public get(fieldType: string): CmsEntryOpenSearchFieldIndex.Interface | undefined {\n        if (this.cache.has(fieldType)) {\n            return this.cache.get(fieldType);\n        }\n\n        let indexing = this.fieldIndexing.find(field => {\n            return field.fieldType === fieldType;\n        });\n        const baseType = getBaseFieldType({\n            type: fieldType\n        });\n        if (!indexing && baseType !== fieldType) {\n            indexing = this.fieldIndexing.find(field => {\n                return field.fieldType === baseType;\n            });\n        }\n        this.cache.set(fieldType, indexing);\n        return indexing;\n    }\n\n    public getDefault(): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndex = this.fieldIndexing.find(\n            field => field.fieldType === FIELD_INDEXING_DEFAULT\n        );\n        if (fieldIndex) {\n            return fieldIndex;\n        }\n        /**\n         * This should never happen, as the default field index plugin exists in our code. This can fail during testing.\n         */\n        throw new Error(\n            `Missing default field index plugin. Please make sure to register a plugin with \"${FIELD_INDEXING_DEFAULT}\" field type.`\n        );\n    }\n\n    public getAll(): CmsEntryOpenSearchFieldIndex.Interface[] {\n        return this.fieldIndexing;\n    }\n}\n\nexport const CmsEntryOpenSearchFieldIndexRegistry = Abstraction.createImplementation({\n    implementation: CmsEntryOpenSearchFieldIndexRegistryImpl,\n    dependencies: [[CmsEntryOpenSearchFieldIndex, { multiple: true }]]\n});\n"],"names":["CmsEntryOpenSearchFieldIndexRegistryImpl","fieldIndexing","Map","fieldType","indexing","field","baseType","getBaseFieldType","fieldIndex","FIELD_INDEXING_DEFAULT","Error","CmsEntryOpenSearchFieldIndexRegistry","Abstraction","CmsEntryOpenSearchFieldIndex"],"mappings":";;;;AAKA,MAAMA;IAIF,YAAoCC,aAAuD,CAAE;aAAzDA,aAAa,GAAbA;aAHnB,KAAK,GAClB,IAAIC;IAEsF;IAEvF,IAAIC,SAAiB,EAAsD;QAC9E,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAACA,YACf,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAACA;QAG1B,IAAIC,WAAW,IAAI,CAAC,aAAa,CAAC,IAAI,CAACC,CAAAA,QAC5BA,MAAM,SAAS,KAAKF;QAE/B,MAAMG,WAAWC,iBAAiB;YAC9B,MAAMJ;QACV;QACA,IAAI,CAACC,YAAYE,aAAaH,WAC1BC,WAAW,IAAI,CAAC,aAAa,CAAC,IAAI,CAACC,CAAAA,QACxBA,MAAM,SAAS,KAAKC;QAGnC,IAAI,CAAC,KAAK,CAAC,GAAG,CAACH,WAAWC;QAC1B,OAAOA;IACX;IAEO,aAAqD;QACxD,MAAMI,aAAa,IAAI,CAAC,aAAa,CAAC,IAAI,CACtCH,CAAAA,QAASA,MAAM,SAAS,KAAKI;QAEjC,IAAID,YACA,OAAOA;QAKX,MAAM,IAAIE,MACN,CAAC,gFAAgF,EAAED,uBAAuB,aAAa,CAAC;IAEhI;IAEO,SAAmD;QACtD,OAAO,IAAI,CAAC,aAAa;IAC7B;AACJ;AAEO,MAAME,4EAAuCC,qCAAAA,oBAAgC,CAAC;IACjF,gBAAgBZ;IAChB,cAAc;QAAC;YAACa;YAA8B;gBAAE,UAAU;YAAK;SAAE;KAAC;AACtE"}

package/features/CmsEntryOpenSearchFieldIndex/abstractions/CmsEntryOpenSearchFieldIndex.d.ts

@@ -1,9 +1,7 @@
 import type { CmsModel, CmsModelField } from "@webiny/api-headless-cms/types/index.js";
-import type { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
 export interface ToIndexParams {
     model: CmsModel;
     field: CmsModelField;
-    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
     value: any;
     rawValue: any;
     getFieldIndex(fieldType: string): ICmsEntryOpenSearchFieldIndex;
@@ -15,7 +13,6 @@ export interface ToIndexValue {
 export interface FromIndexParams {
     model: CmsModel;
     field: CmsModelField;
-    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
     value: any;
     rawValue: any;
     getFieldIndex(fieldType: string): ICmsEntryOpenSearchFieldIndex;

package/features/CmsEntryOpenSearchFieldIndex/abstractions/CmsEntryOpenSearchFieldIndex.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/abstractions/CmsEntryOpenSearchFieldIndex.js","sources":["../../../../src/features/CmsEntryOpenSearchFieldIndex/abstractions/CmsEntryOpenSearchFieldIndex.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\n\nexport interface ToIndexParams {\n    model: CmsModel;\n    field: CmsModelField;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    value: any;\n    rawValue: any;\n    getFieldIndex(fieldType: string): ICmsEntryOpenSearchFieldIndex;\n}\n\nexport interface ToIndexValue {\n    value?: any;\n    rawValue?: any;\n}\n\nexport interface FromIndexParams {\n    model: CmsModel;\n    field: CmsModelField;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    value: any;\n    rawValue: any;\n    getFieldIndex(fieldType: string): ICmsEntryOpenSearchFieldIndex;\n}\n\nexport interface ICmsEntryOpenSearchFieldIndex {\n    readonly fieldType: string;\n    unmappedType?(field: Pick<CmsModelField, \"fieldId\" | \"type\">): string;\n    toIndex(params: ToIndexParams): ToIndexValue;\n    fromIndex(params: FromIndexParams): any;\n}\n\nexport const CmsEntryOpenSearchFieldIndex = createAbstraction<ICmsEntryOpenSearchFieldIndex>(\n    \"Cms/Entry/OpenSearch/FieldIndex\"\n);\n\nexport namespace CmsEntryOpenSearchFieldIndex {\n    export type Interface = ICmsEntryOpenSearchFieldIndex;\n    export type ToIndex = ToIndexParams;\n    export type ToValue = ToIndexValue;\n    export type FromIndex = FromIndexParams;\n}\n"],"names":["CmsEntryOpenSearchFieldIndex","createAbstraction"],"mappings":";AAkCO,MAAMA,+BAA+BC,kBACxC"}
+{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/abstractions/CmsEntryOpenSearchFieldIndex.js","sources":["../../../../src/features/CmsEntryOpenSearchFieldIndex/abstractions/CmsEntryOpenSearchFieldIndex.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\n\nexport interface ToIndexParams {\n    model: CmsModel;\n    field: CmsModelField;\n    value: any;\n    rawValue: any;\n    getFieldIndex(fieldType: string): ICmsEntryOpenSearchFieldIndex;\n}\n\nexport interface ToIndexValue {\n    value?: any;\n    rawValue?: any;\n}\n\nexport interface FromIndexParams {\n    model: CmsModel;\n    field: CmsModelField;\n    value: any;\n    rawValue: any;\n    getFieldIndex(fieldType: string): ICmsEntryOpenSearchFieldIndex;\n}\n\nexport interface ICmsEntryOpenSearchFieldIndex {\n    readonly fieldType: string;\n    unmappedType?(field: Pick<CmsModelField, \"fieldId\" | \"type\">): string;\n    toIndex(params: ToIndexParams): ToIndexValue;\n    fromIndex(params: FromIndexParams): any;\n}\n\nexport const CmsEntryOpenSearchFieldIndex = createAbstraction<ICmsEntryOpenSearchFieldIndex>(\n    \"Cms/Entry/OpenSearch/FieldIndex\"\n);\n\nexport namespace CmsEntryOpenSearchFieldIndex {\n    export type Interface = ICmsEntryOpenSearchFieldIndex;\n    export type ToIndex = ToIndexParams;\n    export type ToValue = ToIndexValue;\n    export type FromIndex = FromIndexParams;\n}\n"],"names":["CmsEntryOpenSearchFieldIndex","createAbstraction"],"mappings":";AA+BO,MAAMA,+BAA+BC,kBACxC"}

package/features/CmsEntryOpenSearchFieldIndex/feature.js

@@ -7,17 +7,19 @@ import { NumberFieldIndex } from "./fields/NumberFieldIndex.js";
 import { DefaultFieldIndex } from "./fields/DefaultFieldIndex.js";
 import { DateTimeFieldIndex } from "./fields/DateTimeFieldIndex.js";
 import { ObjectFieldIndex } from "./fields/ObjectFieldIndex.js";
+import { TextCompressedFieldIndex } from "./fields/TextCompressedFieldIndex.js";
 const CmsEntryOpenSearchFieldIndexFeature = createFeature({
     name: "Cms/Entry/OpenSearch/FieldIndexFeature",
     register: (container)=>{
-        container.register(RichTextFieldIndex);
-        container.register(JsonFieldIndex);
-        container.register(LongTextFieldIndex);
-        container.register(NumberFieldIndex);
-        container.register(DefaultFieldIndex);
-        container.register(DateTimeFieldIndex);
-        container.register(ObjectFieldIndex);
-        container.register(CmsEntryOpenSearchFieldIndexRegistry);
+        container.register(RichTextFieldIndex).inSingletonScope();
+        container.register(JsonFieldIndex).inSingletonScope();
+        container.register(LongTextFieldIndex).inSingletonScope();
+        container.register(NumberFieldIndex).inSingletonScope();
+        container.register(DefaultFieldIndex).inSingletonScope();
+        container.register(DateTimeFieldIndex).inSingletonScope();
+        container.register(ObjectFieldIndex).inSingletonScope();
+        container.register(TextCompressedFieldIndex).inSingletonScope();
+        container.register(CmsEntryOpenSearchFieldIndexRegistry).inSingletonScope();
     }
 });
 export { CmsEntryOpenSearchFieldIndexFeature };

package/features/CmsEntryOpenSearchFieldIndex/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/feature.js","sources":["../../../src/features/CmsEntryOpenSearchFieldIndex/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"./CmsEntryOpenSearchFieldIndexRegistry.js\";\nimport { RichTextFieldIndex } from \"./fields/RichTextFieldIndex.js\";\nimport { JsonFieldIndex } from \"./fields/JsonFieldIndex.js\";\nimport { LongTextFieldIndex } from \"./fields/LongTextFieldIndex.js\";\nimport { NumberFieldIndex } from \"./fields/NumberFieldIndex.js\";\nimport { DefaultFieldIndex } from \"./fields/DefaultFieldIndex.js\";\nimport { DateTimeFieldIndex } from \"./fields/DateTimeFieldIndex.js\";\nimport { ObjectFieldIndex } from \"./fields/ObjectFieldIndex.js\";\n\nexport const CmsEntryOpenSearchFieldIndexFeature = createFeature({\n    name: \"Cms/Entry/OpenSearch/FieldIndexFeature\",\n    register: container => {\n        container.register(RichTextFieldIndex);\n        container.register(JsonFieldIndex);\n        container.register(LongTextFieldIndex);\n        container.register(NumberFieldIndex);\n        container.register(DefaultFieldIndex);\n        container.register(DateTimeFieldIndex);\n        container.register(ObjectFieldIndex);\n        container.register(CmsEntryOpenSearchFieldIndexRegistry);\n    }\n});\n"],"names":["CmsEntryOpenSearchFieldIndexFeature","createFeature","container","RichTextFieldIndex","JsonFieldIndex","LongTextFieldIndex","NumberFieldIndex","DefaultFieldIndex","DateTimeFieldIndex","ObjectFieldIndex","CmsEntryOpenSearchFieldIndexRegistry"],"mappings":";;;;;;;;;AAUO,MAAMA,sCAAsCC,cAAc;IAC7D,MAAM;IACN,UAAUC,CAAAA;QACNA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBH,UAAU,QAAQ,CAACI;QACnBJ,UAAU,QAAQ,CAACK;QACnBL,UAAU,QAAQ,CAACM;QACnBN,UAAU,QAAQ,CAACO;QACnBP,UAAU,QAAQ,CAACQ;IACvB;AACJ"}
+{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/feature.js","sources":["../../../src/features/CmsEntryOpenSearchFieldIndex/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"./CmsEntryOpenSearchFieldIndexRegistry.js\";\nimport { RichTextFieldIndex } from \"./fields/RichTextFieldIndex.js\";\nimport { JsonFieldIndex } from \"./fields/JsonFieldIndex.js\";\nimport { LongTextFieldIndex } from \"./fields/LongTextFieldIndex.js\";\nimport { NumberFieldIndex } from \"./fields/NumberFieldIndex.js\";\nimport { DefaultFieldIndex } from \"./fields/DefaultFieldIndex.js\";\nimport { DateTimeFieldIndex } from \"./fields/DateTimeFieldIndex.js\";\nimport { ObjectFieldIndex } from \"./fields/ObjectFieldIndex.js\";\nimport { TextCompressedFieldIndex } from \"~/features/CmsEntryOpenSearchFieldIndex/fields/TextCompressedFieldIndex.js\";\n\nexport const CmsEntryOpenSearchFieldIndexFeature = createFeature({\n    name: \"Cms/Entry/OpenSearch/FieldIndexFeature\",\n    register: container => {\n        container.register(RichTextFieldIndex).inSingletonScope();\n        container.register(JsonFieldIndex).inSingletonScope();\n        container.register(LongTextFieldIndex).inSingletonScope();\n        container.register(NumberFieldIndex).inSingletonScope();\n        container.register(DefaultFieldIndex).inSingletonScope();\n        container.register(DateTimeFieldIndex).inSingletonScope();\n        container.register(ObjectFieldIndex).inSingletonScope();\n        container.register(TextCompressedFieldIndex).inSingletonScope();\n\n        // must be registered last\n        container.register(CmsEntryOpenSearchFieldIndexRegistry).inSingletonScope();\n    }\n});\n"],"names":["CmsEntryOpenSearchFieldIndexFeature","createFeature","container","RichTextFieldIndex","JsonFieldIndex","LongTextFieldIndex","NumberFieldIndex","DefaultFieldIndex","DateTimeFieldIndex","ObjectFieldIndex","TextCompressedFieldIndex","CmsEntryOpenSearchFieldIndexRegistry"],"mappings":";;;;;;;;;;AAWO,MAAMA,sCAAsCC,cAAc;IAC7D,MAAM;IACN,UAAUC,CAAAA;QACNA,UAAU,QAAQ,CAACC,oBAAoB,gBAAgB;QACvDD,UAAU,QAAQ,CAACE,gBAAgB,gBAAgB;QACnDF,UAAU,QAAQ,CAACG,oBAAoB,gBAAgB;QACvDH,UAAU,QAAQ,CAACI,kBAAkB,gBAAgB;QACrDJ,UAAU,QAAQ,CAACK,mBAAmB,gBAAgB;QACtDL,UAAU,QAAQ,CAACM,oBAAoB,gBAAgB;QACvDN,UAAU,QAAQ,CAACO,kBAAkB,gBAAgB;QACrDP,UAAU,QAAQ,CAACQ,0BAA0B,gBAAgB;QAG7DR,UAAU,QAAQ,CAACS,sCAAsC,gBAAgB;IAC7E;AACJ"}

package/features/CmsEntryOpenSearchFieldIndex/fields/DefaultFieldIndex.d.ts

@@ -1,8 +1,11 @@
 import { CmsEntryOpenSearchFieldIndex } from "../abstractions/CmsEntryOpenSearchFieldIndex.js";
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
 declare class DefaultFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {
+    private readonly fieldRegistry;
     readonly fieldType: "*";
-    toIndex({ field, fieldRegistry, value }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue;
-    fromIndex({ field, fieldRegistry, value, rawValue }: CmsEntryOpenSearchFieldIndex.FromIndex): any;
+    constructor(fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface);
+    toIndex({ field, value }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue;
+    fromIndex({ field, value, rawValue }: CmsEntryOpenSearchFieldIndex.FromIndex): any;
 }
 export declare const DefaultFieldIndex: typeof DefaultFieldIndexImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("../abstractions/CmsEntryOpenSearchFieldIndex.js").ICmsEntryOpenSearchFieldIndex>;

package/features/CmsEntryOpenSearchFieldIndex/fields/DefaultFieldIndex.js

@@ -1,8 +1,13 @@
 import { CmsEntryOpenSearchFieldIndex } from "../abstractions/CmsEntryOpenSearchFieldIndex.js";
 import { FIELD_INDEXING_DEFAULT } from "../constants.js";
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
 class DefaultFieldIndexImpl {
-    toIndex({ field, fieldRegistry, value }) {
-        const fieldType = fieldRegistry.get(field.type);
+    constructor(fieldRegistry){
+        this.fieldRegistry = fieldRegistry;
+        this.fieldType = FIELD_INDEXING_DEFAULT;
+    }
+    toIndex({ field, value }) {
+        const fieldType = this.fieldRegistry.get(field.type);
         if (fieldType?.isSearchable === true) return {
             value
         };
@@ -10,19 +15,18 @@ class DefaultFieldIndexImpl {
             rawValue: value
         };
     }
-    fromIndex({ field, fieldRegistry, value, rawValue }) {
-        const fieldType = fieldRegistry.get(field.type);
+    fromIndex({ field, value, rawValue }) {
+        const fieldType = this.fieldRegistry.get(field.type);
         const isSearchable = fieldType?.isSearchable ?? false;
         if (isSearchable) return void 0 === value ? rawValue : value;
         return void 0 === rawValue ? value : rawValue;
     }
-    constructor(){
-        this.fieldType = FIELD_INDEXING_DEFAULT;
-    }
 }
 const DefaultFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({
     implementation: DefaultFieldIndexImpl,
-    dependencies: []
+    dependencies: [
+        CmsModelFieldToGraphQLRegistry
+    ]
 });
 export { DefaultFieldIndex };
 

package/features/CmsEntryOpenSearchFieldIndex/fields/DefaultFieldIndex.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/fields/DefaultFieldIndex.js","sources":["../../../../src/features/CmsEntryOpenSearchFieldIndex/fields/DefaultFieldIndex.ts"],"sourcesContent":["import { CmsEntryOpenSearchFieldIndex } from \"../abstractions/CmsEntryOpenSearchFieldIndex.js\";\nimport { FIELD_INDEXING_DEFAULT } from \"../constants.js\";\n\nclass DefaultFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {\n    public readonly fieldType = FIELD_INDEXING_DEFAULT;\n\n    public toIndex({\n        field,\n        fieldRegistry,\n        value\n    }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue {\n        const fieldType = fieldRegistry.get(field.type);\n\n        if (fieldType?.isSearchable === true) {\n            return { value };\n        }\n\n        return { rawValue: value };\n    }\n\n    public fromIndex({\n        field,\n        fieldRegistry,\n        value,\n        rawValue\n    }: CmsEntryOpenSearchFieldIndex.FromIndex): any {\n        const fieldType = fieldRegistry.get(field.type);\n        const isSearchable = fieldType?.isSearchable ?? false;\n\n        if (isSearchable) {\n            return value === undefined ? rawValue : value;\n        }\n        return rawValue === undefined ? value : rawValue;\n    }\n}\n\nexport const DefaultFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({\n    implementation: DefaultFieldIndexImpl,\n    dependencies: []\n});\n"],"names":["DefaultFieldIndexImpl","field","fieldRegistry","value","fieldType","rawValue","isSearchable","undefined","FIELD_INDEXING_DEFAULT","DefaultFieldIndex","CmsEntryOpenSearchFieldIndex"],"mappings":";;AAGA,MAAMA;IAGK,QAAQ,EACXC,KAAK,EACLC,aAAa,EACbC,KAAK,EAC8B,EAAwC;QAC3E,MAAMC,YAAYF,cAAc,GAAG,CAACD,MAAM,IAAI;QAE9C,IAAIG,WAAW,iBAAiB,MAC5B,OAAO;YAAED;QAAM;QAGnB,OAAO;YAAE,UAAUA;QAAM;IAC7B;IAEO,UAAU,EACbF,KAAK,EACLC,aAAa,EACbC,KAAK,EACLE,QAAQ,EAC6B,EAAO;QAC5C,MAAMD,YAAYF,cAAc,GAAG,CAACD,MAAM,IAAI;QAC9C,MAAMK,eAAeF,WAAW,gBAAgB;QAEhD,IAAIE,cACA,OAAOH,AAAUI,WAAVJ,QAAsBE,WAAWF;QAE5C,OAAOE,AAAaE,WAAbF,WAAyBF,QAAQE;IAC5C;;aA7BgB,SAAS,GAAGG;;AA8BhC;AAEO,MAAMC,oBAAoBC,6BAA6B,oBAAoB,CAAC;IAC/E,gBAAgBV;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/fields/DefaultFieldIndex.js","sources":["../../../../src/features/CmsEntryOpenSearchFieldIndex/fields/DefaultFieldIndex.ts"],"sourcesContent":["import { CmsEntryOpenSearchFieldIndex } from \"../abstractions/CmsEntryOpenSearchFieldIndex.js\";\nimport { FIELD_INDEXING_DEFAULT } from \"../constants.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\n\nclass DefaultFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {\n    public readonly fieldType = FIELD_INDEXING_DEFAULT;\n    public constructor(private readonly fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface) {}\n\n    public toIndex({\n        field,\n        value\n    }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue {\n        const fieldType = this.fieldRegistry.get(field.type);\n\n        if (fieldType?.isSearchable === true) {\n            return { value };\n        }\n\n        return { rawValue: value };\n    }\n\n    public fromIndex({ field, value, rawValue }: CmsEntryOpenSearchFieldIndex.FromIndex): any {\n        const fieldType = this.fieldRegistry.get(field.type);\n        const isSearchable = fieldType?.isSearchable ?? false;\n\n        if (isSearchable) {\n            return value === undefined ? rawValue : value;\n        }\n        return rawValue === undefined ? value : rawValue;\n    }\n}\n\nexport const DefaultFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({\n    implementation: DefaultFieldIndexImpl,\n    dependencies: [CmsModelFieldToGraphQLRegistry]\n});\n"],"names":["DefaultFieldIndexImpl","fieldRegistry","FIELD_INDEXING_DEFAULT","field","value","fieldType","rawValue","isSearchable","undefined","DefaultFieldIndex","CmsEntryOpenSearchFieldIndex","CmsModelFieldToGraphQLRegistry"],"mappings":";;;AAIA,MAAMA;IAEF,YAAoCC,aAAuD,CAAE;aAAzDA,aAAa,GAAbA;aADpB,SAAS,GAAGC;IACkE;IAEvF,QAAQ,EACXC,KAAK,EACLC,KAAK,EAC8B,EAAwC;QAC3E,MAAMC,YAAY,IAAI,CAAC,aAAa,CAAC,GAAG,CAACF,MAAM,IAAI;QAEnD,IAAIE,WAAW,iBAAiB,MAC5B,OAAO;YAAED;QAAM;QAGnB,OAAO;YAAE,UAAUA;QAAM;IAC7B;IAEO,UAAU,EAAED,KAAK,EAAEC,KAAK,EAAEE,QAAQ,EAA0C,EAAO;QACtF,MAAMD,YAAY,IAAI,CAAC,aAAa,CAAC,GAAG,CAACF,MAAM,IAAI;QACnD,MAAMI,eAAeF,WAAW,gBAAgB;QAEhD,IAAIE,cACA,OAAOH,AAAUI,WAAVJ,QAAsBE,WAAWF;QAE5C,OAAOE,AAAaE,WAAbF,WAAyBF,QAAQE;IAC5C;AACJ;AAEO,MAAMG,oBAAoBC,6BAA6B,oBAAoB,CAAC;IAC/E,gBAAgBV;IAChB,cAAc;QAACW;KAA+B;AAClD"}

package/features/CmsEntryOpenSearchFieldIndex/fields/ObjectFieldIndex.d.ts

@@ -1,8 +1,10 @@
 import { CmsEntryOpenSearchFieldIndex } from "../abstractions/CmsEntryOpenSearchFieldIndex.js";
 declare class ObjectFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {
     readonly fieldType = "object";
-    toIndex({ fieldRegistry, model, field, value: initialValue, rawValue: initialRawValue, getFieldIndex }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue;
-    fromIndex({ field, value, rawValue, model, getFieldIndex, fieldRegistry }: CmsEntryOpenSearchFieldIndex.FromIndex): any;
+    toIndex({ model, field, value: initialValue, rawValue: initialRawValue, getFieldIndex }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue;
+    fromIndex({ field, value, rawValue, model, getFieldIndex }: CmsEntryOpenSearchFieldIndex.FromIndex): any;
+    private processToIndex;
+    private processFromIndex;
 }
 export declare const ObjectFieldIndex: typeof ObjectFieldIndexImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("../abstractions/CmsEntryOpenSearchFieldIndex.js").ICmsEntryOpenSearchFieldIndex>;

package/features/CmsEntryOpenSearchFieldIndex/fields/ObjectFieldIndex.js

@@ -1,47 +1,7 @@
 import { getFieldIdentifiers } from "../../../helpers/index.js";
 import { CmsEntryOpenSearchFieldIndex } from "../abstractions/CmsEntryOpenSearchFieldIndex.js";
-const processToIndex = (params)=>{
-    const { fields, value: sourceValue, rawValue: sourceRawValue, getFieldIndex, fieldRegistry, model } = params;
-    return fields.reduce((values, field)=>{
-        const plugin = getFieldIndex(field.type);
-        const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);
-        if (!identifiers) return values;
-        const { value, rawValue } = plugin.toIndex({
-            model,
-            field,
-            value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
-            rawValue: sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier],
-            getFieldIndex,
-            fieldRegistry
-        });
-        if (void 0 !== value) values.value[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;
-        if (void 0 !== rawValue) values.rawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] = rawValue;
-        return values;
-    }, {
-        value: {},
-        rawValue: {}
-    });
-};
-const processFromIndex = (params)=>{
-    const { fields, value: sourceValue, rawValue: sourceRawValue, getFieldIndex, fieldRegistry, model } = params;
-    return fields.reduce((values, field)=>{
-        const plugin = getFieldIndex(field.type);
-        const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);
-        if (!identifiers) return values;
-        const value = plugin.fromIndex({
-            fieldRegistry,
-            model,
-            field,
-            value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
-            rawValue: sourceRawValue ? sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] : null,
-            getFieldIndex
-        });
-        if (void 0 !== value) values[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;
-        return values;
-    }, {});
-};
 class ObjectFieldIndexImpl {
-    toIndex({ fieldRegistry, model, field, value: initialValue, rawValue: initialRawValue, getFieldIndex }) {
+    toIndex({ model, field, value: initialValue, rawValue: initialRawValue, getFieldIndex }) {
         if (!initialValue) return {
             value: null
         };
@@ -52,12 +12,11 @@ class ObjectFieldIndexImpl {
                 rawValue: []
             };
             for(const key in initialValue){
-                const { value, rawValue } = processToIndex({
+                const { value, rawValue } = this.processToIndex({
                     value: initialValue[key],
                     rawValue: initialRawValue[key],
                     getFieldIndex,
                     model,
-                    fieldRegistry,
                     fields
                 });
                 result.value.push(value);
@@ -68,40 +27,75 @@ class ObjectFieldIndexImpl {
                 rawValue: result.rawValue.length > 0 ? result.rawValue : void 0
             };
         }
-        return processToIndex({
+        return this.processToIndex({
             value: initialValue,
             rawValue: initialRawValue,
             getFieldIndex,
             model,
-            fieldRegistry,
             fields
         });
     }
-    fromIndex({ field, value, rawValue, model, getFieldIndex, fieldRegistry }) {
+    fromIndex({ field, value, rawValue, model, getFieldIndex }) {
         if (!value) return null;
         const fields = field.settings?.fields || [];
         if (field.list) {
             const source = value || rawValue || [];
-            return source.map((_, index)=>processFromIndex({
+            return source.map((_, index)=>this.processFromIndex({
                     value: value ? value[index] || {} : {},
                     rawValue: rawValue ? rawValue[index] || {} : {},
                     getFieldIndex,
                     model,
-                    fieldRegistry,
                     fields
                 }));
         }
-        return processFromIndex({
+        return this.processFromIndex({
             value,
             rawValue,
             getFieldIndex,
             model,
-            fieldRegistry,
             fields
         });
     }
+    processToIndex(params) {
+        const { fields, value: sourceValue, rawValue: sourceRawValue, getFieldIndex, model } = params;
+        return fields.reduce((values, field)=>{
+            const plugin = getFieldIndex(field.type);
+            const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);
+            if (!identifiers) return values;
+            const { value, rawValue } = plugin.toIndex({
+                model,
+                field,
+                value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
+                rawValue: sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier],
+                getFieldIndex
+            });
+            if (void 0 !== value) values.value[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;
+            if (void 0 !== rawValue) values.rawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] = rawValue;
+            return values;
+        }, {
+            value: {},
+            rawValue: {}
+        });
+    }
     constructor(){
         this.fieldType = "object";
+        this.processFromIndex = (params)=>{
+            const { fields, value: sourceValue, rawValue: sourceRawValue, getFieldIndex, model } = params;
+            return fields.reduce((values, field)=>{
+                const plugin = getFieldIndex(field.type);
+                const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);
+                if (!identifiers) return values;
+                const value = plugin.fromIndex({
+                    model,
+                    field,
+                    value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
+                    rawValue: sourceRawValue ? sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] : null,
+                    getFieldIndex
+                });
+                if (void 0 !== value) values[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;
+                return values;
+            }, {});
+        };
     }
 }
 const ObjectFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({

package/features/CmsEntryOpenSearchFieldIndex/fields/ObjectFieldIndex.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/fields/ObjectFieldIndex.js","sources":["../../../../src/features/CmsEntryOpenSearchFieldIndex/fields/ObjectFieldIndex.ts"],"sourcesContent":["import type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\nimport { getFieldIdentifiers } from \"~/helpers/index.js\";\nimport { CmsEntryOpenSearchFieldIndex } from \"../abstractions/CmsEntryOpenSearchFieldIndex.js\";\n\ninterface ProcessToIndexParams {\n    fields: CmsModelField[];\n    value: Record<string, any>;\n    rawValue: Record<string, any>;\n    getFieldIndex: (fieldType: string) => CmsEntryOpenSearchFieldIndex.Interface;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    model: CmsModel;\n}\n\ninterface ReducerValue {\n    value: Record<string, any>;\n    rawValue: Record<string, any>;\n}\n\nconst processToIndex = (params: ProcessToIndexParams): ReducerValue => {\n    const {\n        fields,\n        value: sourceValue,\n        rawValue: sourceRawValue,\n        getFieldIndex,\n        fieldRegistry,\n        model\n    } = params;\n\n    return fields.reduce<ReducerValue>(\n        (values, field) => {\n            const plugin = getFieldIndex(field.type);\n\n            const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);\n            if (!identifiers) {\n                return values;\n            }\n\n            const { value, rawValue } = plugin.toIndex({\n                model,\n                field,\n                value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],\n                rawValue:\n                    sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier],\n                getFieldIndex,\n                fieldRegistry\n            });\n\n            if (value !== undefined) {\n                values.value[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;\n            }\n            if (rawValue !== undefined) {\n                values.rawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] =\n                    rawValue;\n            }\n\n            return values;\n        },\n        { value: {}, rawValue: {} }\n    );\n};\n\ninterface ProcessFromIndexParams {\n    fields: CmsModelField[];\n    value: Record<string, any>;\n    rawValue?: Record<string, any> | null;\n    getFieldIndex: (fieldType: string) => CmsEntryOpenSearchFieldIndex.Interface;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    model: CmsModel;\n}\n\nconst processFromIndex = (params: ProcessFromIndexParams): Record<string, any> => {\n    const {\n        fields,\n        value: sourceValue,\n        rawValue: sourceRawValue,\n        getFieldIndex,\n        fieldRegistry,\n        model\n    } = params;\n\n    return fields.reduce<Record<string, any>>((values, field) => {\n        const plugin = getFieldIndex(field.type);\n\n        const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);\n        if (!identifiers) {\n            return values;\n        }\n\n        const value = plugin.fromIndex({\n            fieldRegistry,\n            model,\n            field,\n            value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],\n            rawValue: sourceRawValue\n                ? sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier]\n                : null,\n            getFieldIndex\n        });\n\n        if (value !== undefined) {\n            values[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;\n        }\n\n        return values;\n    }, {});\n};\n\nclass ObjectFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {\n    public readonly fieldType = \"object\";\n\n    public toIndex({\n        fieldRegistry,\n        model,\n        field,\n        value: initialValue,\n        rawValue: initialRawValue,\n        getFieldIndex\n    }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue {\n        if (!initialValue) {\n            return { value: null };\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        if (field.list) {\n            const result: { value: Record<string, any>[]; rawValue: Record<string, any>[] } = {\n                value: [],\n                rawValue: []\n            };\n            for (const key in initialValue) {\n                const { value, rawValue } = processToIndex({\n                    value: initialValue[key],\n                    rawValue: initialRawValue[key],\n                    getFieldIndex,\n                    model,\n                    fieldRegistry,\n                    fields\n                });\n\n                result.value.push(value);\n                result.rawValue.push(rawValue);\n            }\n\n            return {\n                value: result.value.length > 0 ? result.value : undefined,\n                rawValue: result.rawValue.length > 0 ? result.rawValue : undefined\n            };\n        }\n\n        return processToIndex({\n            value: initialValue,\n            rawValue: initialRawValue,\n            getFieldIndex,\n            model,\n            fieldRegistry,\n            fields\n        });\n    }\n\n    public fromIndex({\n        field,\n        value,\n        rawValue,\n        model,\n        getFieldIndex,\n        fieldRegistry\n    }: CmsEntryOpenSearchFieldIndex.FromIndex): any {\n        if (!value) {\n            return null;\n        }\n\n        const fields = field.settings?.fields || [];\n\n        if (field.list) {\n            const source = value || rawValue || [];\n\n            return source.map((_: any, index: number) =>\n                processFromIndex({\n                    value: value ? value[index] || {} : {},\n                    rawValue: rawValue ? rawValue[index] || {} : {},\n                    getFieldIndex,\n                    model,\n                    fieldRegistry,\n                    fields\n                })\n            );\n        }\n\n        return processFromIndex({\n            value,\n            rawValue,\n            getFieldIndex,\n            model,\n            fieldRegistry,\n            fields\n        });\n    }\n}\n\nexport const ObjectFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({\n    implementation: ObjectFieldIndexImpl,\n    dependencies: []\n});\n"],"names":["processToIndex","params","fields","sourceValue","sourceRawValue","getFieldIndex","fieldRegistry","model","values","field","plugin","identifiers","getFieldIdentifiers","value","rawValue","undefined","processFromIndex","ObjectFieldIndexImpl","initialValue","initialRawValue","result","key","source","_","index","ObjectFieldIndex","CmsEntryOpenSearchFieldIndex"],"mappings":";;AAmBA,MAAMA,iBAAiB,CAACC;IACpB,MAAM,EACFC,MAAM,EACN,OAAOC,WAAW,EAClB,UAAUC,cAAc,EACxBC,aAAa,EACbC,aAAa,EACbC,KAAK,EACR,GAAGN;IAEJ,OAAOC,OAAO,MAAM,CAChB,CAACM,QAAQC;QACL,MAAMC,SAASL,cAAcI,MAAM,IAAI;QAEvC,MAAME,cAAcC,oBAAoBT,aAAaC,gBAAgBK;QACrE,IAAI,CAACE,aACD,OAAOH;QAGX,MAAM,EAAEK,KAAK,EAAEC,QAAQ,EAAE,GAAGJ,OAAO,OAAO,CAAC;YACvCH;YACAE;YACA,OAAON,WAAW,CAACQ,YAAY,eAAe,IAAIA,YAAY,kBAAkB,CAAC;YACjF,UACIP,cAAc,CAACO,YAAY,kBAAkB,IAAIA,YAAY,eAAe,CAAC;YACjFN;YACAC;QACJ;QAEA,IAAIO,AAAUE,WAAVF,OACAL,OAAO,KAAK,CAACG,YAAY,eAAe,IAAIA,YAAY,kBAAkB,CAAC,GAAGE;QAElF,IAAIC,AAAaC,WAAbD,UACAN,OAAO,QAAQ,CAACG,YAAY,kBAAkB,IAAIA,YAAY,eAAe,CAAC,GAC1EG;QAGR,OAAON;IACX,GACA;QAAE,OAAO,CAAC;QAAG,UAAU,CAAC;IAAE;AAElC;AAWA,MAAMQ,mBAAmB,CAACf;IACtB,MAAM,EACFC,MAAM,EACN,OAAOC,WAAW,EAClB,UAAUC,cAAc,EACxBC,aAAa,EACbC,aAAa,EACbC,KAAK,EACR,GAAGN;IAEJ,OAAOC,OAAO,MAAM,CAAsB,CAACM,QAAQC;QAC/C,MAAMC,SAASL,cAAcI,MAAM,IAAI;QAEvC,MAAME,cAAcC,oBAAoBT,aAAaC,gBAAgBK;QACrE,IAAI,CAACE,aACD,OAAOH;QAGX,MAAMK,QAAQH,OAAO,SAAS,CAAC;YAC3BJ;YACAC;YACAE;YACA,OAAON,WAAW,CAACQ,YAAY,eAAe,IAAIA,YAAY,kBAAkB,CAAC;YACjF,UAAUP,iBACJA,cAAc,CAACO,YAAY,kBAAkB,IAAIA,YAAY,eAAe,CAAC,GAC7E;YACNN;QACJ;QAEA,IAAIQ,AAAUE,WAAVF,OACAL,MAAM,CAACG,YAAY,eAAe,IAAIA,YAAY,kBAAkB,CAAC,GAAGE;QAG5E,OAAOL;IACX,GAAG,CAAC;AACR;AAEA,MAAMS;IAGK,QAAQ,EACXX,aAAa,EACbC,KAAK,EACLE,KAAK,EACL,OAAOS,YAAY,EACnB,UAAUC,eAAe,EACzBd,aAAa,EACsB,EAAwC;QAC3E,IAAI,CAACa,cACD,OAAO;YAAE,OAAO;QAAK;QAGzB,MAAMhB,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EAAE;YACZ,MAAMW,SAA4E;gBAC9E,OAAO,EAAE;gBACT,UAAU,EAAE;YAChB;YACA,IAAK,MAAMC,OAAOH,aAAc;gBAC5B,MAAM,EAAEL,KAAK,EAAEC,QAAQ,EAAE,GAAGd,eAAe;oBACvC,OAAOkB,YAAY,CAACG,IAAI;oBACxB,UAAUF,eAAe,CAACE,IAAI;oBAC9BhB;oBACAE;oBACAD;oBACAJ;gBACJ;gBAEAkB,OAAO,KAAK,CAAC,IAAI,CAACP;gBAClBO,OAAO,QAAQ,CAAC,IAAI,CAACN;YACzB;YAEA,OAAO;gBACH,OAAOM,OAAO,KAAK,CAAC,MAAM,GAAG,IAAIA,OAAO,KAAK,GAAGL;gBAChD,UAAUK,OAAO,QAAQ,CAAC,MAAM,GAAG,IAAIA,OAAO,QAAQ,GAAGL;YAC7D;QACJ;QAEA,OAAOf,eAAe;YAClB,OAAOkB;YACP,UAAUC;YACVd;YACAE;YACAD;YACAJ;QACJ;IACJ;IAEO,UAAU,EACbO,KAAK,EACLI,KAAK,EACLC,QAAQ,EACRP,KAAK,EACLF,aAAa,EACbC,aAAa,EACwB,EAAO;QAC5C,IAAI,CAACO,OACD,OAAO;QAGX,MAAMX,SAASO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE3C,IAAIA,MAAM,IAAI,EAAE;YACZ,MAAMa,SAAST,SAASC,YAAY,EAAE;YAEtC,OAAOQ,OAAO,GAAG,CAAC,CAACC,GAAQC,QACvBR,iBAAiB;oBACb,OAAOH,QAAQA,KAAK,CAACW,MAAM,IAAI,CAAC,IAAI,CAAC;oBACrC,UAAUV,WAAWA,QAAQ,CAACU,MAAM,IAAI,CAAC,IAAI,CAAC;oBAC9CnB;oBACAE;oBACAD;oBACAJ;gBACJ;QAER;QAEA,OAAOc,iBAAiB;YACpBH;YACAC;YACAT;YACAE;YACAD;YACAJ;QACJ;IACJ;;aAxFgB,SAAS,GAAG;;AAyFhC;AAEO,MAAMuB,mBAAmBC,6BAA6B,oBAAoB,CAAC;IAC9E,gBAAgBT;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/fields/ObjectFieldIndex.js","sources":["../../../../src/features/CmsEntryOpenSearchFieldIndex/fields/ObjectFieldIndex.ts"],"sourcesContent":["import type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport { getFieldIdentifiers } from \"~/helpers/index.js\";\nimport { CmsEntryOpenSearchFieldIndex } from \"../abstractions/CmsEntryOpenSearchFieldIndex.js\";\n\ninterface ProcessToIndexParams {\n    fields: CmsModelField[];\n    value: Record<string, any>;\n    rawValue: Record<string, any>;\n    getFieldIndex: (fieldType: string) => CmsEntryOpenSearchFieldIndex.Interface;\n    model: CmsModel;\n}\n\ninterface ReducerValue {\n    value: Record<string, any>;\n    rawValue: Record<string, any>;\n}\n\ninterface ProcessFromIndexParams {\n    fields: CmsModelField[];\n    value: Record<string, any>;\n    rawValue?: Record<string, any> | null;\n    getFieldIndex: (fieldType: string) => CmsEntryOpenSearchFieldIndex.Interface;\n    model: CmsModel;\n}\n\nclass ObjectFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {\n    public readonly fieldType = \"object\";\n\n    public toIndex({\n        model,\n        field,\n        value: initialValue,\n        rawValue: initialRawValue,\n        getFieldIndex\n    }: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue {\n        if (!initialValue) {\n            return { value: null };\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        if (field.list) {\n            const result: { value: Record<string, any>[]; rawValue: Record<string, any>[] } = {\n                value: [],\n                rawValue: []\n            };\n            for (const key in initialValue) {\n                const { value, rawValue } = this.processToIndex({\n                    value: initialValue[key],\n                    rawValue: initialRawValue[key],\n                    getFieldIndex,\n                    model,\n                    fields\n                });\n\n                result.value.push(value);\n                result.rawValue.push(rawValue);\n            }\n\n            return {\n                value: result.value.length > 0 ? result.value : undefined,\n                rawValue: result.rawValue.length > 0 ? result.rawValue : undefined\n            };\n        }\n\n        return this.processToIndex({\n            value: initialValue,\n            rawValue: initialRawValue,\n            getFieldIndex,\n            model,\n            fields\n        });\n    }\n\n    public fromIndex({\n        field,\n        value,\n        rawValue,\n        model,\n        getFieldIndex\n    }: CmsEntryOpenSearchFieldIndex.FromIndex): any {\n        if (!value) {\n            return null;\n        }\n\n        const fields = field.settings?.fields || [];\n\n        if (field.list) {\n            const source = value || rawValue || [];\n\n            return source.map((_: any, index: number) =>\n                this.processFromIndex({\n                    value: value ? value[index] || {} : {},\n                    rawValue: rawValue ? rawValue[index] || {} : {},\n                    getFieldIndex,\n                    model,\n                    fields\n                })\n            );\n        }\n\n        return this.processFromIndex({\n            value,\n            rawValue,\n            getFieldIndex,\n            model,\n            fields\n        });\n    }\n\n    private processToIndex(params: ProcessToIndexParams): ReducerValue {\n        const {\n            fields,\n            value: sourceValue,\n            rawValue: sourceRawValue,\n            getFieldIndex,\n            model\n        } = params;\n\n        return fields.reduce<ReducerValue>(\n            (values, field) => {\n                const plugin = getFieldIndex(field.type);\n\n                const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);\n                if (!identifiers) {\n                    return values;\n                }\n\n                const { value, rawValue } = plugin.toIndex({\n                    model,\n                    field,\n                    value: sourceValue[\n                        identifiers.valueIdentifier || identifiers.rawValueIdentifier\n                    ],\n                    rawValue:\n                        sourceRawValue[\n                            identifiers.rawValueIdentifier || identifiers.valueIdentifier\n                        ],\n                    getFieldIndex\n                });\n\n                if (value !== undefined) {\n                    values.value[identifiers.valueIdentifier || identifiers.rawValueIdentifier] =\n                        value;\n                }\n                if (rawValue !== undefined) {\n                    values.rawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] =\n                        rawValue;\n                }\n\n                return values;\n            },\n            { value: {}, rawValue: {} }\n        );\n    }\n\n    private processFromIndex = (params: ProcessFromIndexParams): Record<string, any> => {\n        const {\n            fields,\n            value: sourceValue,\n            rawValue: sourceRawValue,\n            getFieldIndex,\n            model\n        } = params;\n\n        return fields.reduce<Record<string, any>>((values, field) => {\n            const plugin = getFieldIndex(field.type);\n\n            const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);\n            if (!identifiers) {\n                return values;\n            }\n\n            const value = plugin.fromIndex({\n                model,\n                field,\n                value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],\n                rawValue: sourceRawValue\n                    ? sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier]\n                    : null,\n                getFieldIndex\n            });\n\n            if (value !== undefined) {\n                values[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;\n            }\n\n            return values;\n        }, {});\n    };\n}\n\nexport const ObjectFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({\n    implementation: ObjectFieldIndexImpl,\n    dependencies: []\n});\n"],"names":["ObjectFieldIndexImpl","model","field","initialValue","initialRawValue","getFieldIndex","fields","result","key","value","rawValue","undefined","source","_","index","params","sourceValue","sourceRawValue","values","plugin","identifiers","getFieldIdentifiers","ObjectFieldIndex","CmsEntryOpenSearchFieldIndex"],"mappings":"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"}

package/features/CmsEntryOpenSearchFieldIndex/fields/TextCompressedFieldIndex.d.ts

@@ -0,0 +1,14 @@
+import { CmsEntryOpenSearchFieldIndex } from "../abstractions/CmsEntryOpenSearchFieldIndex.js";
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+declare class TextCompressedFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {
+    private readonly fieldRegistry;
+    readonly fieldType = "text:compressed";
+    constructor(fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface);
+    toIndex(params: CmsEntryOpenSearchFieldIndex.ToIndex): CmsEntryOpenSearchFieldIndex.ToValue;
+    fromIndex(params: CmsEntryOpenSearchFieldIndex.FromIndex): any;
+    private isSearchable;
+}
+export declare const TextCompressedFieldIndex: typeof TextCompressedFieldIndexImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("../abstractions/CmsEntryOpenSearchFieldIndex.js").ICmsEntryOpenSearchFieldIndex>;
+};
+export {};

package/features/CmsEntryOpenSearchFieldIndex/fields/TextCompressedFieldIndex.js

@@ -0,0 +1,39 @@
+import { CmsEntryOpenSearchFieldIndex } from "../abstractions/CmsEntryOpenSearchFieldIndex.js";
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+class TextCompressedFieldIndexImpl {
+    constructor(fieldRegistry){
+        this.fieldRegistry = fieldRegistry;
+        this.fieldType = "text:compressed";
+    }
+    toIndex(params) {
+        const { field, value } = params;
+        const isSearchable = this.isSearchable(field);
+        if (isSearchable) return {
+            value
+        };
+        return {
+            rawValue: value
+        };
+    }
+    fromIndex(params) {
+        const { field, value, rawValue } = params;
+        const isSearchable = this.isSearchable(field);
+        if (isSearchable) return void 0 === value ? rawValue : value;
+        return void 0 === rawValue ? value : rawValue;
+    }
+    isSearchable(field) {
+        const fieldType = this.fieldRegistry.get(field.type);
+        if (!fieldType?.isSearchable) return false;
+        if (field.settings?.disableFullTextSearch === true) return false;
+        return true;
+    }
+}
+const TextCompressedFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({
+    implementation: TextCompressedFieldIndexImpl,
+    dependencies: [
+        CmsModelFieldToGraphQLRegistry
+    ]
+});
+export { TextCompressedFieldIndex };
+
+//# sourceMappingURL=TextCompressedFieldIndex.js.map

package/features/CmsEntryOpenSearchFieldIndex/fields/TextCompressedFieldIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/CmsEntryOpenSearchFieldIndex/fields/TextCompressedFieldIndex.js","sources":["../../../../src/features/CmsEntryOpenSearchFieldIndex/fields/TextCompressedFieldIndex.ts"],"sourcesContent":["import { CmsEntryOpenSearchFieldIndex } from \"../abstractions/CmsEntryOpenSearchFieldIndex.js\";\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\n\nclass TextCompressedFieldIndexImpl implements CmsEntryOpenSearchFieldIndex.Interface {\n    public readonly fieldType = \"text:compressed\";\n\n    public constructor(private readonly fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface) {}\n\n    public toIndex(\n        params: CmsEntryOpenSearchFieldIndex.ToIndex\n    ): CmsEntryOpenSearchFieldIndex.ToValue {\n        const { field, value } = params;\n        const isSearchable = this.isSearchable(field);\n\n        if (isSearchable) {\n            return { value };\n        }\n\n        return {\n            rawValue: value\n        };\n    }\n\n    public fromIndex(params: CmsEntryOpenSearchFieldIndex.FromIndex): any {\n        const { field, value, rawValue } = params;\n        const isSearchable = this.isSearchable(field);\n\n        if (isSearchable) {\n            return value === undefined ? rawValue : value;\n        }\n        return rawValue === undefined ? value : rawValue;\n    }\n\n    private isSearchable(field: CmsModelField): boolean {\n        const fieldType = this.fieldRegistry.get(field.type);\n        if (!fieldType?.isSearchable) {\n            return false;\n        } else if (field.settings?.disableFullTextSearch === true) {\n            return false;\n        }\n        return true;\n    }\n}\n\nexport const TextCompressedFieldIndex = CmsEntryOpenSearchFieldIndex.createImplementation({\n    implementation: TextCompressedFieldIndexImpl,\n    dependencies: [CmsModelFieldToGraphQLRegistry]\n});\n"],"names":["TextCompressedFieldIndexImpl","fieldRegistry","params","field","value","isSearchable","rawValue","undefined","fieldType","TextCompressedFieldIndex","CmsEntryOpenSearchFieldIndex","CmsModelFieldToGraphQLRegistry"],"mappings":";;AAIA,MAAMA;IAGF,YAAoCC,aAAuD,CAAE;aAAzDA,aAAa,GAAbA;aAFpB,SAAS,GAAG;IAEkE;IAEvF,QACHC,MAA4C,EACR;QACpC,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGF;QACzB,MAAMG,eAAe,IAAI,CAAC,YAAY,CAACF;QAEvC,IAAIE,cACA,OAAO;YAAED;QAAM;QAGnB,OAAO;YACH,UAAUA;QACd;IACJ;IAEO,UAAUF,MAA8C,EAAO;QAClE,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAEE,QAAQ,EAAE,GAAGJ;QACnC,MAAMG,eAAe,IAAI,CAAC,YAAY,CAACF;QAEvC,IAAIE,cACA,OAAOD,AAAUG,WAAVH,QAAsBE,WAAWF;QAE5C,OAAOE,AAAaC,WAAbD,WAAyBF,QAAQE;IAC5C;IAEQ,aAAaH,KAAoB,EAAW;QAChD,MAAMK,YAAY,IAAI,CAAC,aAAa,CAAC,GAAG,CAACL,MAAM,IAAI;QACnD,IAAI,CAACK,WAAW,cACZ,OAAO;QACJ,IAAIL,MAAM,QAAQ,EAAE,0BAA0B,MACjD,OAAO;QAEX,OAAO;IACX;AACJ;AAEO,MAAMM,2BAA2BC,6BAA6B,oBAAoB,CAAC;IACtF,gBAAgBV;IAChB,cAAc;QAACW;KAA+B;AAClD"}

package/helpers/entryIndexHelpers.d.ts

@@ -10,7 +10,7 @@ interface ExtractEntriesFromIndexParams<T extends CmsEntryValues = CmsEntryValue
     model: CmsModel;
     entries: CmsIndexEntry<T>[];
 }
-interface PrepareElasticsearchDataParams<T extends CmsEntryValues = CmsEntryValues> extends SetupEntriesIndexHelpersParams {
+interface PrepareElasticsearchDataParams<T extends CmsEntryValues = CmsEntryValues> extends Omit<SetupEntriesIndexHelpersParams, "fieldRegistry"> {
     model: CmsModel;
     entry: CmsEntry<T>;
     storageEntry: CmsEntry<T>;

package/helpers/entryIndexHelpers.js

@@ -1,7 +1,7 @@
 import { WebinyError } from "@webiny/error";
 import { getFieldIdentifier, getFieldIdentifiers } from "./fieldIdentifier.js";
 const prepareEntryToIndex = (params)=>{
-    const { fieldRegistry, fieldIndexRegistry, storageEntry, entry, model } = params;
+    const { fieldIndexRegistry, storageEntry, entry, model } = params;
     function getFieldIndex(type) {
         const fieldIndexing = fieldIndexRegistry.get(type);
         if (fieldIndexing) return fieldIndexing;
@@ -14,7 +14,6 @@ const prepareEntryToIndex = (params)=>{
         if (!identifier) continue;
         const fieldIndex = getFieldIndex(field.type);
         const { value, rawValue } = fieldIndex.toIndex({
-            fieldRegistry,
             model,
             field,
             rawValue: entry.values[identifier],
@@ -48,7 +47,6 @@ const extractEntriesFromIndex = ({ fieldRegistry, fieldIndexRegistry, entries, m
                 const key = identifiers.valueIdentifier;
                 const rawKey = identifiers.rawValueIdentifier;
                 indexValues[key] = fieldIndex.fromIndex({
-                    fieldRegistry,
                     model,
                     field,
                     getFieldIndex,

package/helpers/entryIndexHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers/entryIndexHelpers.js","sources":["../../src/helpers/entryIndexHelpers.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsIndexEntry } from \"~/types.js\";\nimport { getFieldIdentifier, getFieldIdentifiers } from \"~/helpers/fieldIdentifier.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\nimport type {\n    CmsEntryOpenSearchFieldIndex,\n    CmsEntryOpenSearchFieldIndexRegistry\n} from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\ninterface SetupEntriesIndexHelpersParams {\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n}\n\ninterface ExtractEntriesFromIndexParams<\n    T extends CmsEntryValues = CmsEntryValues\n> extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entries: CmsIndexEntry<T>[];\n}\n\ninterface PrepareElasticsearchDataParams<\n    T extends CmsEntryValues = CmsEntryValues\n> extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n}\n\nexport const prepareEntryToIndex = <T extends CmsEntryValues = CmsEntryValues>(\n    params: PrepareElasticsearchDataParams<T>\n): CmsIndexEntry<T> => {\n    const { fieldRegistry, fieldIndexRegistry, storageEntry, entry, model } = params;\n\n    function getFieldIndex(type: string): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndexing = fieldIndexRegistry.get(type);\n        if (fieldIndexing) {\n            return fieldIndexing;\n        }\n        return fieldIndexRegistry.getDefault();\n    }\n\n    // These objects will contain values processed by field index implementations\n    const values: T = {} as T;\n    const rawValues: T = {} as T;\n\n    // We're only interested in current model fields.\n    for (const field of model.fields) {\n        const identifier = getFieldIdentifier(storageEntry.values, field) as keyof T;\n        if (!identifier) {\n            continue;\n        }\n\n        const fieldIndex = getFieldIndex(field.type);\n\n        const { value, rawValue } = fieldIndex.toIndex({\n            fieldRegistry,\n            model,\n            field,\n            rawValue: entry.values[identifier],\n            value: storageEntry.values[identifier],\n            getFieldIndex\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[identifier] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[identifier] = rawValue;\n        }\n    }\n    return {\n        ...storageEntry,\n        values,\n        rawValues\n    };\n};\n\nexport const extractEntriesFromIndex = <T extends CmsEntryValues = CmsEntryValues>({\n    fieldRegistry,\n    fieldIndexRegistry,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams<T>): CmsEntry<T>[] => {\n    function getFieldIndex(type: string): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndex = fieldIndexRegistry.get(type);\n        if (fieldIndex) {\n            return fieldIndex;\n        }\n        return fieldIndexRegistry.getDefault();\n    }\n\n    const list: CmsEntry<T>[] = [];\n\n    for (const entry of entries) {\n        // This object will contain values processed by field index plugins\n        const indexValues: T = {} as T;\n\n        // We only consider fields that are present in the model\n        for (const field of model.fields) {\n            const fieldType = fieldRegistry.get(field.type);\n            if (!fieldType) {\n                throw new WebinyError(\n                    `Missing field type \"${field.type}\". Extract entries from index.`\n                );\n            }\n\n            const fieldIndex = getFieldIndex(field.type);\n            /**\n             * We can safely cast as the code will not continue in case of no identifiers.\n             */\n            const identifiers = getFieldIdentifiers(entry.values, entry.rawValues, field);\n            if (!identifiers) {\n                continue;\n            }\n            try {\n                const key = identifiers.valueIdentifier as keyof T;\n                const rawKey = identifiers.rawValueIdentifier as keyof T;\n                indexValues[key] = fieldIndex.fromIndex({\n                    fieldRegistry,\n                    model,\n                    field,\n                    getFieldIndex,\n                    value: entry.values[key || rawKey],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues ? entry.rawValues[rawKey || key] : null\n                });\n            } catch (ex) {\n                throw new WebinyError(\n                    ex.message || \"Could not transform entry field from index.\",\n                    ex.code || \"FIELD_FROM_INDEX_ERROR\",\n                    {\n                        field,\n                        entry\n                    }\n                );\n            }\n        }\n        /**\n         * Let's have a new entry so we do not modify the original one.\n         */\n        const newEntry: CmsEntry<T> = {\n            ...entry,\n            values: indexValues\n        };\n        /**\n         * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.\n         */\n        // @ts-expect-error\n        delete newEntry[\"rawValues\"];\n        // @ts-expect-error\n        delete newEntry[\"TYPE\"];\n        // @ts-expect-error\n        delete newEntry[\"__type\"];\n        // @ts-expect-error\n        delete newEntry[\"latest\"];\n        // @ts-expect-error\n        delete newEntry[\"published\"];\n        list.push({\n            ...newEntry\n        });\n    }\n\n    return list;\n};\n"],"names":["prepareEntryToIndex","params","fieldRegistry","fieldIndexRegistry","storageEntry","entry","model","getFieldIndex","type","fieldIndexing","values","rawValues","field","identifier","getFieldIdentifier","fieldIndex","value","rawValue","extractEntriesFromIndex","entries","list","indexValues","fieldType","WebinyError","identifiers","getFieldIdentifiers","key","rawKey","ex","newEntry"],"mappings":";;AA8BO,MAAMA,sBAAsB,CAC/BC;IAEA,MAAM,EAAEC,aAAa,EAAEC,kBAAkB,EAAEC,YAAY,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGL;IAE1E,SAASM,cAAcC,IAAY;QAC/B,MAAMC,gBAAgBN,mBAAmB,GAAG,CAACK;QAC7C,IAAIC,eACA,OAAOA;QAEX,OAAON,mBAAmB,UAAU;IACxC;IAGA,MAAMO,SAAY,CAAC;IACnB,MAAMC,YAAe,CAAC;IAGtB,KAAK,MAAMC,SAASN,MAAM,MAAM,CAAE;QAC9B,MAAMO,aAAaC,mBAAmBV,aAAa,MAAM,EAAEQ;QAC3D,IAAI,CAACC,YACD;QAGJ,MAAME,aAAaR,cAAcK,MAAM,IAAI;QAE3C,MAAM,EAAEI,KAAK,EAAEC,QAAQ,EAAE,GAAGF,WAAW,OAAO,CAAC;YAC3Cb;YACAI;YACAM;YACA,UAAUP,MAAM,MAAM,CAACQ,WAAW;YAClC,OAAOT,aAAa,MAAM,CAACS,WAAW;YACtCN;QACJ;QAEA,IAAI,AAAiB,WAAVS,OACPN,MAAM,CAACG,WAAW,GAAGG;QAGzB,IAAI,AAAoB,WAAbC,UACPN,SAAS,CAACE,WAAW,GAAGI;IAEhC;IACA,OAAO;QACH,GAAGb,YAAY;QACfM;QACAC;IACJ;AACJ;AAEO,MAAMO,0BAA0B,CAA4C,EAC/EhB,aAAa,EACbC,kBAAkB,EAClBgB,OAAO,EACPb,KAAK,EAC0B;IAC/B,SAASC,cAAcC,IAAY;QAC/B,MAAMO,aAAaZ,mBAAmB,GAAG,CAACK;QAC1C,IAAIO,YACA,OAAOA;QAEX,OAAOZ,mBAAmB,UAAU;IACxC;IAEA,MAAMiB,OAAsB,EAAE;IAE9B,KAAK,MAAMf,SAASc,QAAS;QAEzB,MAAME,cAAiB,CAAC;QAGxB,KAAK,MAAMT,SAASN,MAAM,MAAM,CAAE;YAC9B,MAAMgB,YAAYpB,cAAc,GAAG,CAACU,MAAM,IAAI;YAC9C,IAAI,CAACU,WACD,MAAM,IAAIC,YACN,CAAC,oBAAoB,EAAEX,MAAM,IAAI,CAAC,8BAA8B,CAAC;YAIzE,MAAMG,aAAaR,cAAcK,MAAM,IAAI;YAI3C,MAAMY,cAAcC,oBAAoBpB,MAAM,MAAM,EAAEA,MAAM,SAAS,EAAEO;YACvE,IAAKY,aAGL,IAAI;gBACA,MAAME,MAAMF,YAAY,eAAe;gBACvC,MAAMG,SAASH,YAAY,kBAAkB;gBAC7CH,WAAW,CAACK,IAAI,GAAGX,WAAW,SAAS,CAAC;oBACpCb;oBACAI;oBACAM;oBACAL;oBACA,OAAOF,MAAM,MAAM,CAACqB,OAAOC,OAAO;oBAIlC,UAAUtB,MAAM,SAAS,GAAGA,MAAM,SAAS,CAACsB,UAAUD,IAAI,GAAG;gBACjE;YACJ,EAAE,OAAOE,IAAI;gBACT,MAAM,IAAIL,YACNK,GAAG,OAAO,IAAI,+CACdA,GAAG,IAAI,IAAI,0BACX;oBACIhB;oBACAP;gBACJ;YAER;QACJ;QAIA,MAAMwB,WAAwB;YAC1B,GAAGxB,KAAK;YACR,QAAQgB;QACZ;QAKA,OAAOQ,QAAQ,CAAC,YAAY;QAE5B,OAAOA,QAAQ,CAAC,OAAO;QAEvB,OAAOA,QAAQ,CAAC,SAAS;QAEzB,OAAOA,QAAQ,CAAC,SAAS;QAEzB,OAAOA,QAAQ,CAAC,YAAY;QAC5BT,KAAK,IAAI,CAAC;YACN,GAAGS,QAAQ;QACf;IACJ;IAEA,OAAOT;AACX"}
+{"version":3,"file":"helpers/entryIndexHelpers.js","sources":["../../src/helpers/entryIndexHelpers.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsIndexEntry } from \"~/types.js\";\nimport { getFieldIdentifier, getFieldIdentifiers } from \"~/helpers/fieldIdentifier.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\nimport type {\n    CmsEntryOpenSearchFieldIndex,\n    CmsEntryOpenSearchFieldIndexRegistry\n} from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\ninterface SetupEntriesIndexHelpersParams {\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n}\n\ninterface ExtractEntriesFromIndexParams<\n    T extends CmsEntryValues = CmsEntryValues\n> extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entries: CmsIndexEntry<T>[];\n}\n\ninterface PrepareElasticsearchDataParams<T extends CmsEntryValues = CmsEntryValues> extends Omit<\n    SetupEntriesIndexHelpersParams,\n    \"fieldRegistry\"\n> {\n    model: CmsModel;\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n}\n\nexport const prepareEntryToIndex = <T extends CmsEntryValues = CmsEntryValues>(\n    params: PrepareElasticsearchDataParams<T>\n): CmsIndexEntry<T> => {\n    const { fieldIndexRegistry, storageEntry, entry, model } = params;\n\n    function getFieldIndex(type: string): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndexing = fieldIndexRegistry.get(type);\n        if (fieldIndexing) {\n            return fieldIndexing;\n        }\n        return fieldIndexRegistry.getDefault();\n    }\n\n    // These objects will contain values processed by field index implementations\n    const values: T = {} as T;\n    const rawValues: T = {} as T;\n\n    // We're only interested in current model fields.\n    for (const field of model.fields) {\n        const identifier = getFieldIdentifier(storageEntry.values, field) as keyof T;\n        if (!identifier) {\n            continue;\n        }\n\n        const fieldIndex = getFieldIndex(field.type);\n\n        const { value, rawValue } = fieldIndex.toIndex({\n            model,\n            field,\n            rawValue: entry.values[identifier],\n            value: storageEntry.values[identifier],\n            getFieldIndex\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[identifier] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[identifier] = rawValue;\n        }\n    }\n    return {\n        ...storageEntry,\n        values,\n        rawValues\n    };\n};\n\nexport const extractEntriesFromIndex = <T extends CmsEntryValues = CmsEntryValues>({\n    fieldRegistry,\n    fieldIndexRegistry,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams<T>): CmsEntry<T>[] => {\n    function getFieldIndex(type: string): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndex = fieldIndexRegistry.get(type);\n        if (fieldIndex) {\n            return fieldIndex;\n        }\n        return fieldIndexRegistry.getDefault();\n    }\n\n    const list: CmsEntry<T>[] = [];\n\n    for (const entry of entries) {\n        // This object will contain values processed by field index plugins\n        const indexValues: T = {} as T;\n\n        // We only consider fields that are present in the model\n        for (const field of model.fields) {\n            const fieldType = fieldRegistry.get(field.type);\n            if (!fieldType) {\n                throw new WebinyError(\n                    `Missing field type \"${field.type}\". Extract entries from index.`\n                );\n            }\n\n            const fieldIndex = getFieldIndex(field.type);\n            /**\n             * We can safely cast as the code will not continue in case of no identifiers.\n             */\n            const identifiers = getFieldIdentifiers(entry.values, entry.rawValues, field);\n            if (!identifiers) {\n                continue;\n            }\n            try {\n                const key = identifiers.valueIdentifier as keyof T;\n                const rawKey = identifiers.rawValueIdentifier as keyof T;\n                indexValues[key] = fieldIndex.fromIndex({\n                    model,\n                    field,\n                    getFieldIndex,\n                    value: entry.values[key || rawKey],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues ? entry.rawValues[rawKey || key] : null\n                });\n            } catch (ex) {\n                throw new WebinyError(\n                    ex.message || \"Could not transform entry field from index.\",\n                    ex.code || \"FIELD_FROM_INDEX_ERROR\",\n                    {\n                        field,\n                        entry\n                    }\n                );\n            }\n        }\n        /**\n         * Let's have a new entry so we do not modify the original one.\n         */\n        const newEntry: CmsEntry<T> = {\n            ...entry,\n            values: indexValues\n        };\n        /**\n         * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.\n         */\n        // @ts-expect-error\n        delete newEntry[\"rawValues\"];\n        // @ts-expect-error\n        delete newEntry[\"TYPE\"];\n        // @ts-expect-error\n        delete newEntry[\"__type\"];\n        // @ts-expect-error\n        delete newEntry[\"latest\"];\n        // @ts-expect-error\n        delete newEntry[\"published\"];\n        list.push({\n            ...newEntry\n        });\n    }\n\n    return list;\n};\n"],"names":["prepareEntryToIndex","params","fieldIndexRegistry","storageEntry","entry","model","getFieldIndex","type","fieldIndexing","values","rawValues","field","identifier","getFieldIdentifier","fieldIndex","value","rawValue","extractEntriesFromIndex","fieldRegistry","entries","list","indexValues","fieldType","WebinyError","identifiers","getFieldIdentifiers","key","rawKey","ex","newEntry"],"mappings":";;AA+BO,MAAMA,sBAAsB,CAC/BC;IAEA,MAAM,EAAEC,kBAAkB,EAAEC,YAAY,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGJ;IAE3D,SAASK,cAAcC,IAAY;QAC/B,MAAMC,gBAAgBN,mBAAmB,GAAG,CAACK;QAC7C,IAAIC,eACA,OAAOA;QAEX,OAAON,mBAAmB,UAAU;IACxC;IAGA,MAAMO,SAAY,CAAC;IACnB,MAAMC,YAAe,CAAC;IAGtB,KAAK,MAAMC,SAASN,MAAM,MAAM,CAAE;QAC9B,MAAMO,aAAaC,mBAAmBV,aAAa,MAAM,EAAEQ;QAC3D,IAAI,CAACC,YACD;QAGJ,MAAME,aAAaR,cAAcK,MAAM,IAAI;QAE3C,MAAM,EAAEI,KAAK,EAAEC,QAAQ,EAAE,GAAGF,WAAW,OAAO,CAAC;YAC3CT;YACAM;YACA,UAAUP,MAAM,MAAM,CAACQ,WAAW;YAClC,OAAOT,aAAa,MAAM,CAACS,WAAW;YACtCN;QACJ;QAEA,IAAI,AAAiB,WAAVS,OACPN,MAAM,CAACG,WAAW,GAAGG;QAGzB,IAAI,AAAoB,WAAbC,UACPN,SAAS,CAACE,WAAW,GAAGI;IAEhC;IACA,OAAO;QACH,GAAGb,YAAY;QACfM;QACAC;IACJ;AACJ;AAEO,MAAMO,0BAA0B,CAA4C,EAC/EC,aAAa,EACbhB,kBAAkB,EAClBiB,OAAO,EACPd,KAAK,EAC0B;IAC/B,SAASC,cAAcC,IAAY;QAC/B,MAAMO,aAAaZ,mBAAmB,GAAG,CAACK;QAC1C,IAAIO,YACA,OAAOA;QAEX,OAAOZ,mBAAmB,UAAU;IACxC;IAEA,MAAMkB,OAAsB,EAAE;IAE9B,KAAK,MAAMhB,SAASe,QAAS;QAEzB,MAAME,cAAiB,CAAC;QAGxB,KAAK,MAAMV,SAASN,MAAM,MAAM,CAAE;YAC9B,MAAMiB,YAAYJ,cAAc,GAAG,CAACP,MAAM,IAAI;YAC9C,IAAI,CAACW,WACD,MAAM,IAAIC,YACN,CAAC,oBAAoB,EAAEZ,MAAM,IAAI,CAAC,8BAA8B,CAAC;YAIzE,MAAMG,aAAaR,cAAcK,MAAM,IAAI;YAI3C,MAAMa,cAAcC,oBAAoBrB,MAAM,MAAM,EAAEA,MAAM,SAAS,EAAEO;YACvE,IAAKa,aAGL,IAAI;gBACA,MAAME,MAAMF,YAAY,eAAe;gBACvC,MAAMG,SAASH,YAAY,kBAAkB;gBAC7CH,WAAW,CAACK,IAAI,GAAGZ,WAAW,SAAS,CAAC;oBACpCT;oBACAM;oBACAL;oBACA,OAAOF,MAAM,MAAM,CAACsB,OAAOC,OAAO;oBAIlC,UAAUvB,MAAM,SAAS,GAAGA,MAAM,SAAS,CAACuB,UAAUD,IAAI,GAAG;gBACjE;YACJ,EAAE,OAAOE,IAAI;gBACT,MAAM,IAAIL,YACNK,GAAG,OAAO,IAAI,+CACdA,GAAG,IAAI,IAAI,0BACX;oBACIjB;oBACAP;gBACJ;YAER;QACJ;QAIA,MAAMyB,WAAwB;YAC1B,GAAGzB,KAAK;YACR,QAAQiB;QACZ;QAKA,OAAOQ,QAAQ,CAAC,YAAY;QAE5B,OAAOA,QAAQ,CAAC,OAAO;QAEvB,OAAOA,QAAQ,CAAC,SAAS;QAEzB,OAAOA,QAAQ,CAAC,SAAS;QAEzB,OAAOA,QAAQ,CAAC,YAAY;QAC5BT,KAAK,IAAI,CAAC;YACN,GAAGS,QAAQ;QACf;IACJ;IAEA,OAAOT;AACX"}