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

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

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","CmsElasticsearchModelFieldPlugin","ENTRY_META_FIELDS","isDateTimeEntryMetaField","isIdentityEntryMetaField","getBaseFieldType","liveFields","createSystemField","stateFields","locationFields","createSystemFields","onMetaFields","filter","reduce","current","fieldName","type","unmappedType","keyword","systemField","searchable","sortable","field","storageId","fieldId","settings","parents","byMetaFields","undefined","path","id","entryId","version","status","wbyDeleted","binOriginalFolderId","buildCustomFields","params","fields","fieldTypePlugins","collection","typePlugin","fieldType","fullTextSearch","buildFieldsList","plugins","result","plugin","childFields","length","childResult","Object","assign","identifier","map","p","join","createModelFields","model","fieldDefinitionPlugins","byType","canBeApplied","modelId","unmappedTypes","acc","types","isSearchable","isSortable"],"sources":["fields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelFieldToElasticsearchPlugin } from \"~/types.js\";\nimport type { ModelFieldParent, ModelFields } from \"./types.js\";\nimport { CmsElasticsearchModelFieldPlugin } from \"~/plugins/index.js\";\nimport {\n    ENTRY_META_FIELDS,\n    isDateTimeEntryMetaField,\n    isIdentityEntryMetaField\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { liveFields } from \"./fields/live.js\";\nimport { createSystemField } from \"./fields/createSystemField.js\";\nimport { stateFields } from \"./fields/state.js\";\nimport { locationFields } from \"./fields/location.js\";\n\nconst createSystemFields = (): ModelFields => {\n    const onMetaFields = ENTRY_META_FIELDS.filter(isDateTimeEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"date\",\n                    unmappedType: \"date\",\n                    keyword: false,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\",\n                        settings: {\n                            type: \"dateTimeWithoutTimezone\"\n                        }\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    const byMetaFields = ENTRY_META_FIELDS.filter(isIdentityEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"text\",\n                    unmappedType: undefined,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    path: `${fieldName}.id`,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\"\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    return {\n        id: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"id\",\n                fieldId: \"id\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        entryId: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"entryId\",\n                fieldId: \"entryId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n\n        ...onMetaFields,\n        ...byMetaFields,\n\n        ...locationFields,\n        version: {\n            type: \"number\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"version\",\n                fieldId: \"version\",\n                type: \"number\"\n            }),\n            parents: []\n        },\n        status: {\n            type: \"string\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"status\",\n                fieldId: \"status\",\n                type: \"string\"\n            }),\n            parents: []\n        },\n        wbyDeleted: {\n            type: \"boolean\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"wbyDeleted\",\n                fieldId: \"wbyDeleted\",\n                type: \"boolean\"\n            }),\n            parents: []\n        },\n        binOriginalFolderId: {\n            type: \"text\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"binOriginalFolderId\",\n                fieldId: \"binOriginalFolderId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        ...stateFields,\n        ...liveFields\n    };\n};\n\ninterface UnmappedFieldTypes {\n    [type: string]: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n}\n\ninterface FieldTypePlugin {\n    unmappedType?: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n    searchable: boolean;\n    sortable: boolean;\n    fullTextSearch?: boolean;\n}\n\ninterface FieldTypePlugins {\n    [key: string]: FieldTypePlugin;\n}\n\ninterface BuildCustomFieldsParams {\n    fields: CmsElasticsearchModelFieldPlugin[];\n    fieldTypePlugins: FieldTypePlugins;\n}\n\nconst buildCustomFields = (params: BuildCustomFieldsParams) => {\n    const { fields, fieldTypePlugins } = params;\n\n    return fields.reduce<ModelFields>((collection, field) => {\n        const typePlugin = fieldTypePlugins[field.fieldType];\n        if (!typePlugin) {\n            return collection;\n        }\n        let unmappedType: string | undefined = undefined;\n        if (typePlugin.unmappedType) {\n            unmappedType = typePlugin.unmappedType(field);\n        }\n\n        collection[field.fieldId] = {\n            type: field.fieldType,\n            field: createSystemField({\n                storageId: field.fieldId,\n                fieldId: field.fieldId,\n                type: field.fieldType\n            }),\n            unmappedType,\n            fullTextSearch: field.searchable ? typePlugin.fullTextSearch : false,\n            searchable: field.searchable || typePlugin.searchable,\n            sortable: field.sortable || typePlugin.sortable,\n            systemField: false,\n            path: field.path,\n            parents: []\n        };\n\n        return collection;\n    }, {});\n};\n\ninterface BuildParams {\n    plugins: FieldTypePlugins;\n    fields: CmsModelField[];\n    parents: ModelFieldParent[];\n}\n\nconst buildFieldsList = (params: BuildParams): ModelFields => {\n    const { plugins, fields, parents } = params;\n\n    return fields.reduce<ModelFields>((result, field) => {\n        const fieldType = getBaseFieldType(field);\n        const plugin = plugins[fieldType];\n        if (!plugin) {\n            throw new WebinyError(`There is no plugin for field type \"${field.type}\".`);\n        }\n\n        const { searchable, sortable, unmappedType, fullTextSearch } = plugin;\n        /**\n         * If a field has child fields, go through them and add them to a result.\n         */\n        const childFields = field.settings?.fields || [];\n        if (childFields.length > 0) {\n            /**\n             * Let's build all the child fields\n             */\n            const childResult = buildFieldsList({\n                fields: childFields,\n                plugins,\n                parents: [\n                    ...parents,\n                    {\n                        fieldId: field.fieldId,\n                        storageId: field.storageId,\n                        type: fieldType\n                    }\n                ]\n            });\n            Object.assign(result, childResult);\n        }\n\n        const identifier = [...parents.map(p => p.fieldId), field.fieldId].join(\".\");\n\n        result[identifier] = {\n            type: fieldType,\n            parents,\n            searchable,\n            sortable,\n            fullTextSearch,\n            unmappedType: typeof unmappedType === \"function\" ? unmappedType(field) : undefined,\n            systemField: false,\n            field\n        };\n\n        return result;\n    }, {});\n};\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\n\nexport const createModelFields = ({ plugins, model }: Params) => {\n    const fields = model.fields;\n    const fieldDefinitionPlugins = plugins\n        .byType<CmsElasticsearchModelFieldPlugin>(CmsElasticsearchModelFieldPlugin.type)\n        .filter(plugin => {\n            return plugin.canBeApplied(model.modelId);\n        });\n    /**\n     * Collect all unmappedType from elastic plugins.\n     */\n    const unmappedTypes = plugins\n        .byType<CmsModelFieldToElasticsearchPlugin>(\"cms-model-field-to-elastic-search\")\n        .reduce<UnmappedFieldTypes>((acc, plugin) => {\n            if (!plugin.unmappedType) {\n                return acc;\n            }\n            acc[plugin.fieldType] = plugin.unmappedType;\n            return acc;\n        }, {});\n    /**\n     * Collect all field types from the plugins.\n     */\n    const fieldTypePlugins = plugins\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce<FieldTypePlugins>((types, plugin) => {\n            const { fieldType, fullTextSearch } = plugin;\n            types[fieldType] = {\n                unmappedType: unmappedTypes[fieldType],\n                searchable: plugin.isSearchable,\n                sortable: plugin.isSortable,\n                fullTextSearch\n            };\n            return types;\n        }, {});\n\n    return {\n        ...createSystemFields(),\n        ...buildCustomFields({\n            fields: fieldDefinitionPlugins,\n            fieldTypePlugins\n        }),\n        ...buildFieldsList({\n            fields,\n            plugins: fieldTypePlugins,\n            parents: [\n                {\n                    fieldId: \"values\",\n                    type: \"object\",\n                    storageId: \"values\"\n                }\n            ]\n        })\n    };\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AASvC,SAASC,gCAAgC;AACzC,SACIC,iBAAiB,EACjBC,wBAAwB,EACxBC,wBAAwB,QACrB,uCAAuC;AAC9C,SAASC,gBAAgB,QAAQ,oDAAoD;AACrF,SAASC,UAAU;AACnB,SAASC,iBAAiB;AAC1B,SAASC,WAAW;AACpB,SAASC,cAAc;AAEvB,MAAMC,kBAAkB,GAAGA,CAAA,KAAmB;EAC1C,MAAMC,YAAY,GAAGT,iBAAiB,CAACU,MAAM,CAACT,wBAAwB,CAAC,CAACU,MAAM,CAC1E,CAACC,OAAO,EAAEC,SAAS,KAAK;IACpB,OAAO;MACH,GAAGD,OAAO;MACV,CAACC,SAAS,GAAG;QACTC,IAAI,EAAE,MAAM;QACZC,YAAY,EAAE,MAAM;QACpBC,OAAO,EAAE,KAAK;QACdC,WAAW,EAAE,IAAI;QACjBC,UAAU,EAAE,IAAI;QAChBC,QAAQ,EAAE,IAAI;QACdC,KAAK,EAAEf,iBAAiB,CAAC;UACrBgB,SAAS,EAAER,SAAS;UACpBS,OAAO,EAAET,SAAS;UAClBC,IAAI,EAAE,MAAM;UACZS,QAAQ,EAAE;YACNT,IAAI,EAAE;UACV;QACJ,CAAC,CAAC;QACFU,OAAO,EAAE;MACb;IACJ,CAAC;EACL,CAAC,EACD,CAAC,CACL,CAAC;EAED,MAAMC,YAAY,GAAGzB,iBAAiB,CAACU,MAAM,CAACR,wBAAwB,CAAC,CAACS,MAAM,CAC1E,CAACC,OAAO,EAAEC,SAAS,KAAK;IACpB,OAAO;MACH,GAAGD,OAAO;MACV,CAACC,SAAS,GAAG;QACTC,IAAI,EAAE,MAAM;QACZC,YAAY,EAAEW,SAAS;QACvBT,WAAW,EAAE,IAAI;QACjBC,UAAU,EAAE,IAAI;QAChBC,QAAQ,EAAE,IAAI;QACdQ,IAAI,EAAE,GAAGd,SAAS,KAAK;QACvBO,KAAK,EAAEf,iBAAiB,CAAC;UACrBgB,SAAS,EAAER,SAAS;UACpBS,OAAO,EAAET,SAAS;UAClBC,IAAI,EAAE;QACV,CAAC,CAAC;QACFU,OAAO,EAAE;MACb;IACJ,CAAC;EACL,CAAC,EACD,CAAC,CACL,CAAC;EAED,OAAO;IACHI,EAAE,EAAE;MACAd,IAAI,EAAE,MAAM;MACZG,WAAW,EAAE,IAAI;MACjBC,UAAU,EAAE,IAAI;MAChBC,QAAQ,EAAE,IAAI;MACdC,KAAK,EAAEf,iBAAiB,CAAC;QACrBgB,SAAS,EAAE,IAAI;QACfC,OAAO,EAAE,IAAI;QACbR,IAAI,EAAE;MACV,CAAC,CAAC;MACFU,OAAO,EAAE;IACb,CAAC;IACDK,OAAO,EAAE;MACLf,IAAI,EAAE,MAAM;MACZG,WAAW,EAAE,IAAI;MACjBC,UAAU,EAAE,IAAI;MAChBC,QAAQ,EAAE,IAAI;MACdC,KAAK,EAAEf,iBAAiB,CAAC;QACrBgB,SAAS,EAAE,SAAS;QACpBC,OAAO,EAAE,SAAS;QAClBR,IAAI,EAAE;MACV,CAAC,CAAC;MACFU,OAAO,EAAE;IACb,CAAC;IAED,GAAGf,YAAY;IACf,GAAGgB,YAAY;IAEf,GAAGlB,cAAc;IACjBuB,OAAO,EAAE;MACLhB,IAAI,EAAE,QAAQ;MACdC,YAAY,EAAEW,SAAS;MACvBV,OAAO,EAAE,KAAK;MACdC,WAAW,EAAE,IAAI;MACjBC,UAAU,EAAE,IAAI;MAChBC,QAAQ,EAAE,IAAI;MACdC,KAAK,EAAEf,iBAAiB,CAAC;QACrBgB,SAAS,EAAE,SAAS;QACpBC,OAAO,EAAE,SAAS;QAClBR,IAAI,EAAE;MACV,CAAC,CAAC;MACFU,OAAO,EAAE;IACb,CAAC;IACDO,MAAM,EAAE;MACJjB,IAAI,EAAE,QAAQ;MACdC,YAAY,EAAEW,SAAS;MACvBV,OAAO,EAAE,KAAK;MACdC,WAAW,EAAE,IAAI;MACjBC,UAAU,EAAE,IAAI;MAChBC,QAAQ,EAAE,KAAK;MACfC,KAAK,EAAEf,iBAAiB,CAAC;QACrBgB,SAAS,EAAE,QAAQ;QACnBC,OAAO,EAAE,QAAQ;QACjBR,IAAI,EAAE;MACV,CAAC,CAAC;MACFU,OAAO,EAAE;IACb,CAAC;IACDQ,UAAU,EAAE;MACRlB,IAAI,EAAE,SAAS;MACfC,YAAY,EAAEW,SAAS;MACvBV,OAAO,EAAE,KAAK;MACdC,WAAW,EAAE,IAAI;MACjBC,UAAU,EAAE,IAAI;MAChBC,QAAQ,EAAE,KAAK;MACfC,KAAK,EAAEf,iBAAiB,CAAC;QACrBgB,SAAS,EAAE,YAAY;QACvBC,OAAO,EAAE,YAAY;QACrBR,IAAI,EAAE;MACV,CAAC,CAAC;MACFU,OAAO,EAAE;IACb,CAAC;IACDS,mBAAmB,EAAE;MACjBnB,IAAI,EAAE,MAAM;MACZC,YAAY,EAAEW,SAAS;MACvBV,OAAO,EAAE,KAAK;MACdC,WAAW,EAAE,IAAI;MACjBC,UAAU,EAAE,IAAI;MAChBC,QAAQ,EAAE,KAAK;MACfC,KAAK,EAAEf,iBAAiB,CAAC;QACrBgB,SAAS,EAAE,qBAAqB;QAChCC,OAAO,EAAE,qBAAqB;QAC9BR,IAAI,EAAE;MACV,CAAC,CAAC;MACFU,OAAO,EAAE;IACb,CAAC;IACD,GAAGlB,WAAW;IACd,GAAGF;EACP,CAAC;AACL,CAAC;AAsBD,MAAM8B,iBAAiB,GAAIC,MAA+B,IAAK;EAC3D,MAAM;IAAEC,MAAM;IAAEC;EAAiB,CAAC,GAAGF,MAAM;EAE3C,OAAOC,MAAM,CAACzB,MAAM,CAAc,CAAC2B,UAAU,EAAElB,KAAK,KAAK;IACrD,MAAMmB,UAAU,GAAGF,gBAAgB,CAACjB,KAAK,CAACoB,SAAS,CAAC;IACpD,IAAI,CAACD,UAAU,EAAE;MACb,OAAOD,UAAU;IACrB;IACA,IAAIvB,YAAgC,GAAGW,SAAS;IAChD,IAAIa,UAAU,CAACxB,YAAY,EAAE;MACzBA,YAAY,GAAGwB,UAAU,CAACxB,YAAY,CAACK,KAAK,CAAC;IACjD;IAEAkB,UAAU,CAAClB,KAAK,CAACE,OAAO,CAAC,GAAG;MACxBR,IAAI,EAAEM,KAAK,CAACoB,SAAS;MACrBpB,KAAK,EAAEf,iBAAiB,CAAC;QACrBgB,SAAS,EAAED,KAAK,CAACE,OAAO;QACxBA,OAAO,EAAEF,KAAK,CAACE,OAAO;QACtBR,IAAI,EAAEM,KAAK,CAACoB;MAChB,CAAC,CAAC;MACFzB,YAAY;MACZ0B,cAAc,EAAErB,KAAK,CAACF,UAAU,GAAGqB,UAAU,CAACE,cAAc,GAAG,KAAK;MACpEvB,UAAU,EAAEE,KAAK,CAACF,UAAU,IAAIqB,UAAU,CAACrB,UAAU;MACrDC,QAAQ,EAAEC,KAAK,CAACD,QAAQ,IAAIoB,UAAU,CAACpB,QAAQ;MAC/CF,WAAW,EAAE,KAAK;MAClBU,IAAI,EAAEP,KAAK,CAACO,IAAI;MAChBH,OAAO,EAAE;IACb,CAAC;IAED,OAAOc,UAAU;EACrB,CAAC,EAAE,CAAC,CAAC,CAAC;AACV,CAAC;AAQD,MAAMI,eAAe,GAAIP,MAAmB,IAAkB;EAC1D,MAAM;IAAEQ,OAAO;IAAEP,MAAM;IAAEZ;EAAQ,CAAC,GAAGW,MAAM;EAE3C,OAAOC,MAAM,CAACzB,MAAM,CAAc,CAACiC,MAAM,EAAExB,KAAK,KAAK;IACjD,MAAMoB,SAAS,GAAGrC,gBAAgB,CAACiB,KAAK,CAAC;IACzC,MAAMyB,MAAM,GAAGF,OAAO,CAACH,SAAS,CAAC;IACjC,IAAI,CAACK,MAAM,EAAE;MACT,MAAM,IAAI/C,WAAW,CAAC,sCAAsCsB,KAAK,CAACN,IAAI,IAAI,CAAC;IAC/E;IAEA,MAAM;MAAEI,UAAU;MAAEC,QAAQ;MAAEJ,YAAY;MAAE0B;IAAe,CAAC,GAAGI,MAAM;IACrE;AACR;AACA;IACQ,MAAMC,WAAW,GAAG1B,KAAK,CAACG,QAAQ,EAAEa,MAAM,IAAI,EAAE;IAChD,IAAIU,WAAW,CAACC,MAAM,GAAG,CAAC,EAAE;MACxB;AACZ;AACA;MACY,MAAMC,WAAW,GAAGN,eAAe,CAAC;QAChCN,MAAM,EAAEU,WAAW;QACnBH,OAAO;QACPnB,OAAO,EAAE,CACL,GAAGA,OAAO,EACV;UACIF,OAAO,EAAEF,KAAK,CAACE,OAAO;UACtBD,SAAS,EAAED,KAAK,CAACC,SAAS;UAC1BP,IAAI,EAAE0B;QACV,CAAC;MAET,CAAC,CAAC;MACFS,MAAM,CAACC,MAAM,CAACN,MAAM,EAAEI,WAAW,CAAC;IACtC;IAEA,MAAMG,UAAU,GAAG,CAAC,GAAG3B,OAAO,CAAC4B,GAAG,CAACC,CAAC,IAAIA,CAAC,CAAC/B,OAAO,CAAC,EAAEF,KAAK,CAACE,OAAO,CAAC,CAACgC,IAAI,CAAC,GAAG,CAAC;IAE5EV,MAAM,CAACO,UAAU,CAAC,GAAG;MACjBrC,IAAI,EAAE0B,SAAS;MACfhB,OAAO;MACPN,UAAU;MACVC,QAAQ;MACRsB,cAAc;MACd1B,YAAY,EAAE,OAAOA,YAAY,KAAK,UAAU,GAAGA,YAAY,CAACK,KAAK,CAAC,GAAGM,SAAS;MAClFT,WAAW,EAAE,KAAK;MAClBG;IACJ,CAAC;IAED,OAAOwB,MAAM;EACjB,CAAC,EAAE,CAAC,CAAC,CAAC;AACV,CAAC;AAOD,OAAO,MAAMW,iBAAiB,GAAGA,CAAC;EAAEZ,OAAO;EAAEa;AAAc,CAAC,KAAK;EAC7D,MAAMpB,MAAM,GAAGoB,KAAK,CAACpB,MAAM;EAC3B,MAAMqB,sBAAsB,GAAGd,OAAO,CACjCe,MAAM,CAAmC3D,gCAAgC,CAACe,IAAI,CAAC,CAC/EJ,MAAM,CAACmC,MAAM,IAAI;IACd,OAAOA,MAAM,CAACc,YAAY,CAACH,KAAK,CAACI,OAAO,CAAC;EAC7C,CAAC,CAAC;EACN;AACJ;AACA;EACI,MAAMC,aAAa,GAAGlB,OAAO,CACxBe,MAAM,CAAqC,mCAAmC,CAAC,CAC/E/C,MAAM,CAAqB,CAACmD,GAAG,EAAEjB,MAAM,KAAK;IACzC,IAAI,CAACA,MAAM,CAAC9B,YAAY,EAAE;MACtB,OAAO+C,GAAG;IACd;IACAA,GAAG,CAACjB,MAAM,CAACL,SAAS,CAAC,GAAGK,MAAM,CAAC9B,YAAY;IAC3C,OAAO+C,GAAG;EACd,CAAC,EAAE,CAAC,CAAC,CAAC;EACV;AACJ;AACA;EACI,MAAMzB,gBAAgB,GAAGM,OAAO,CAC3Be,MAAM,CAA+B,4BAA4B,CAAC,CAClE/C,MAAM,CAAmB,CAACoD,KAAK,EAAElB,MAAM,KAAK;IACzC,MAAM;MAAEL,SAAS;MAAEC;IAAe,CAAC,GAAGI,MAAM;IAC5CkB,KAAK,CAACvB,SAAS,CAAC,GAAG;MACfzB,YAAY,EAAE8C,aAAa,CAACrB,SAAS,CAAC;MACtCtB,UAAU,EAAE2B,MAAM,CAACmB,YAAY;MAC/B7C,QAAQ,EAAE0B,MAAM,CAACoB,UAAU;MAC3BxB;IACJ,CAAC;IACD,OAAOsB,KAAK;EAChB,CAAC,EAAE,CAAC,CAAC,CAAC;EAEV,OAAO;IACH,GAAGvD,kBAAkB,CAAC,CAAC;IACvB,GAAG0B,iBAAiB,CAAC;MACjBE,MAAM,EAAEqB,sBAAsB;MAC9BpB;IACJ,CAAC,CAAC;IACF,GAAGK,eAAe,CAAC;MACfN,MAAM;MACNO,OAAO,EAAEN,gBAAgB;MACzBb,OAAO,EAAE,CACL;QACIF,OAAO,EAAE,QAAQ;QACjBR,IAAI,EAAE,QAAQ;QACdO,SAAS,EAAE;MACf,CAAC;IAET,CAAC;EACL,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["WebinyError","ENTRY_META_FIELDS","isDateTimeEntryMetaField","isIdentityEntryMetaField","getBaseFieldType","liveFields","createSystemField","stateFields","locationFields","createSystemFields","onMetaFields","filter","reduce","current","fieldName","type","unmappedType","keyword","systemField","searchable","sortable","field","storageId","fieldId","settings","parents","byMetaFields","undefined","path","id","entryId","version","status","wbyDeleted","binOriginalFolderId","buildFieldsList","params","plugins","fields","result","fieldType","plugin","isFullTextSearchable","fullTextSearch","childFields","length","childResult","Object","assign","identifier","map","p","join","createModelFields","model","fieldRegistry","fieldIndexRegistry","unmappedTypes","getAll","acc","fieldIndex","fieldTypePlugins","types","isSearchable","isSortable"],"sources":["fields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFieldParent, ModelFields } from \"./types.js\";\nimport {\n    ENTRY_META_FIELDS,\n    isDateTimeEntryMetaField,\n    isIdentityEntryMetaField\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { liveFields } from \"./fields/live.js\";\nimport { createSystemField } from \"./fields/createSystemField.js\";\nimport { stateFields } from \"./fields/state.js\";\nimport { locationFields } from \"./fields/location.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\nconst createSystemFields = (): ModelFields => {\n    const onMetaFields = ENTRY_META_FIELDS.filter(isDateTimeEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"date\",\n                    unmappedType: \"date\",\n                    keyword: false,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\",\n                        settings: {\n                            type: \"dateTimeWithoutTimezone\"\n                        }\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    const byMetaFields = ENTRY_META_FIELDS.filter(isIdentityEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"text\",\n                    unmappedType: undefined,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    path: `${fieldName}.id`,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\"\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    return {\n        id: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"id\",\n                fieldId: \"id\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        entryId: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"entryId\",\n                fieldId: \"entryId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n\n        ...onMetaFields,\n        ...byMetaFields,\n\n        ...locationFields,\n        version: {\n            type: \"number\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"version\",\n                fieldId: \"version\",\n                type: \"number\"\n            }),\n            parents: []\n        },\n        status: {\n            type: \"string\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"status\",\n                fieldId: \"status\",\n                type: \"string\"\n            }),\n            parents: []\n        },\n        wbyDeleted: {\n            type: \"boolean\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"wbyDeleted\",\n                fieldId: \"wbyDeleted\",\n                type: \"boolean\"\n            }),\n            parents: []\n        },\n        binOriginalFolderId: {\n            type: \"text\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"binOriginalFolderId\",\n                fieldId: \"binOriginalFolderId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        ...stateFields,\n        ...liveFields\n    };\n};\n\ninterface UnmappedFieldTypes {\n    [type: string]: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n}\n\ninterface FieldTypePlugin {\n    unmappedType?: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n    searchable: boolean;\n    sortable: boolean;\n    isFullTextSearchable?: boolean;\n}\n\ninterface FieldTypePlugins {\n    [key: string]: FieldTypePlugin;\n}\n\ninterface BuildParams {\n    plugins: FieldTypePlugins;\n    fields: CmsModelField[];\n    parents: ModelFieldParent[];\n}\n\nconst buildFieldsList = (params: BuildParams): ModelFields => {\n    const { plugins, fields, parents } = params;\n\n    return fields.reduce<ModelFields>((result, field) => {\n        const fieldType = getBaseFieldType(field);\n        const plugin = plugins[fieldType];\n        if (!plugin) {\n            throw new WebinyError(`There is no plugin for field type \"${field.type}\".`);\n        }\n\n        const { searchable, sortable, unmappedType, isFullTextSearchable: fullTextSearch } = plugin;\n        /**\n         * If a field has child fields, go through them and add them to a result.\n         */\n        const childFields = field.settings?.fields || [];\n        if (childFields.length > 0) {\n            /**\n             * Let's build all the child fields\n             */\n            const childResult = buildFieldsList({\n                fields: childFields,\n                plugins,\n                parents: [\n                    ...parents,\n                    {\n                        fieldId: field.fieldId,\n                        storageId: field.storageId,\n                        type: fieldType\n                    }\n                ]\n            });\n            Object.assign(result, childResult);\n        }\n\n        const identifier = [...parents.map(p => p.fieldId), field.fieldId].join(\".\");\n\n        result[identifier] = {\n            type: fieldType,\n            parents,\n            searchable,\n            sortable,\n            fullTextSearch,\n            unmappedType: typeof unmappedType === \"function\" ? unmappedType(field) : undefined,\n            systemField: false,\n            field\n        };\n\n        return result;\n    }, {});\n};\n\ninterface ICreateModelFieldsParams {\n    model: CmsModel;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n}\n\nexport const createModelFields = ({\n    model,\n    fieldRegistry,\n    fieldIndexRegistry\n}: ICreateModelFieldsParams) => {\n    const fields = model.fields;\n    /**\n     * Collect all unmappedType from field index registry.\n     */\n    const unmappedTypes = fieldIndexRegistry\n        .getAll()\n        .reduce<UnmappedFieldTypes>((acc, fieldIndex) => {\n            if (!fieldIndex.unmappedType) {\n                return acc;\n            }\n            acc[fieldIndex.fieldType] = fieldIndex.unmappedType;\n            return acc;\n        }, {});\n    /**\n     * Collect all field types from the plugins.\n     */\n    const fieldTypePlugins = fieldRegistry.getAll().reduce<FieldTypePlugins>((types, field) => {\n        types[field.fieldType] = {\n            unmappedType: unmappedTypes[field.fieldType],\n            searchable: field.isSearchable,\n            sortable: field.isSortable,\n            isFullTextSearchable: field.isFullTextSearchable\n        };\n        return types;\n    }, {});\n\n    return {\n        ...createSystemFields(),\n        ...buildFieldsList({\n            fields,\n            plugins: fieldTypePlugins,\n            parents: [\n                {\n                    fieldId: \"values\",\n                    type: \"object\",\n                    storageId: \"values\"\n                }\n            ]\n        })\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/entry/elasticsearch/filtering/applyFiltering.d.ts

@@ -1,8 +1,9 @@
-import type { OpenSearchQueryBuilderOperatorPlugins, OpenSearchQuerySearchValuePlugins } from "../../../../operations/entry/elasticsearch/types.js";
-import type { ApplyFilteringCb } from "../../../../plugins/CmsEntryFilterPlugin.js";
+import type { OpenSearchQueryBuilderOperatorPlugins } from "../../../../operations/entry/elasticsearch/types.js";
+import type { CmsEntryOpenSearchFilter } from "../../../../features/CmsEntryOpenSearchFilter/index.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../../../features/CmsEntryOpenSearchValueSearch/index.js";
 interface CreateParams {
     operatorPlugins: OpenSearchQueryBuilderOperatorPlugins;
-    searchPlugins: OpenSearchQuerySearchValuePlugins;
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
 }
-export declare const createApplyFiltering: ({ operatorPlugins, searchPlugins }: CreateParams) => ApplyFilteringCb;
+export declare const createApplyFiltering: ({ operatorPlugins, valueSearchRegistry }: CreateParams) => CmsEntryOpenSearchFilter.ApplyFiltering;
 export {};

package/operations/entry/elasticsearch/filtering/applyFiltering.js

@@ -4,10 +4,10 @@ import { hasKeyword } from "../keyword.js";
 import { createFieldPathFactory } from "./path.js";
 export const createApplyFiltering = ({
   operatorPlugins,
-  searchPlugins
+  valueSearchRegistry
 }) => {
   const createFieldPath = createFieldPathFactory({
-    plugins: searchPlugins
+    valueSearchRegistry
   });
   return params => {
     const {
@@ -24,7 +24,7 @@ export const createApplyFiltering = ({
       });
     }
     const value = transformValueForSearch({
-      plugins: searchPlugins,
+      valueSearchRegistry,
       field: field.field,
       value: initialValue
     });

package/operations/entry/elasticsearch/filtering/applyFiltering.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","transformValueForSearch","hasKeyword","createFieldPathFactory","createApplyFiltering","operatorPlugins","searchPlugins","createFieldPath","plugins","params","key","value","initialValue","query","operator","field","plugin","keyword","basePath","path","originalValue","apply","name","fieldId"],"sources":["applyFiltering.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { transformValueForSearch } from \"~/operations/entry/elasticsearch/transformValueForSearch.js\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword.js\";\nimport type {\n    OpenSearchQueryBuilderOperatorPlugins,\n    OpenSearchQuerySearchValuePlugins\n} from \"~/operations/entry/elasticsearch/types.js\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path.js\";\nimport type { ApplyFilteringCb } from \"~/plugins/CmsEntryFilterPlugin.js\";\n\ninterface CreateParams {\n    operatorPlugins: OpenSearchQueryBuilderOperatorPlugins;\n    searchPlugins: OpenSearchQuerySearchValuePlugins;\n}\n\nexport const createApplyFiltering = ({\n    operatorPlugins,\n    searchPlugins\n}: CreateParams): ApplyFilteringCb => {\n    const createFieldPath = createFieldPathFactory({\n        plugins: searchPlugins\n    });\n\n    return params => {\n        const { key, value: initialValue, query, operator, field } = params;\n\n        const plugin = operatorPlugins[operator];\n        if (!plugin) {\n            throw new WebinyError(\n                `Elasticsearch operator \"${operator}\" plugin missing.`,\n                \"PLUGIN_MISSING\",\n                {\n                    operator\n                }\n            );\n        }\n\n        const value = transformValueForSearch({\n            plugins: searchPlugins,\n            field: field.field,\n            value: initialValue\n        });\n\n        const keyword = hasKeyword(field);\n\n        const { basePath, path } = createFieldPath({\n            field,\n            value,\n            originalValue: initialValue,\n            key,\n            keyword\n        });\n\n        plugin.apply(query, {\n            name: field.field.fieldId,\n            basePath,\n            path,\n            value,\n            keyword\n        });\n    };\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AACvC,SAASC,uBAAuB;AAChC,SAASC,UAAU;AAKnB,SAASC,sBAAsB;AAQ/B,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACjCC,eAAe;EACfC;AACU,CAAC,KAAuB;EAClC,MAAMC,eAAe,GAAGJ,sBAAsB,CAAC;IAC3CK,OAAO,EAAEF;EACb,CAAC,CAAC;EAEF,OAAOG,MAAM,IAAI;IACb,MAAM;MAAEC,GAAG;MAAEC,KAAK,EAAEC,YAAY;MAAEC,KAAK;MAAEC,QAAQ;MAAEC;IAAM,CAAC,GAAGN,MAAM;IAEnE,MAAMO,MAAM,GAAGX,eAAe,CAACS,QAAQ,CAAC;IACxC,IAAI,CAACE,MAAM,EAAE;MACT,MAAM,IAAIhB,WAAW,CACjB,2BAA2Bc,QAAQ,mBAAmB,EACtD,gBAAgB,EAChB;QACIA;MACJ,CACJ,CAAC;IACL;IAEA,MAAMH,KAAK,GAAGV,uBAAuB,CAAC;MAClCO,OAAO,EAAEF,aAAa;MACtBS,KAAK,EAAEA,KAAK,CAACA,KAAK;MAClBJ,KAAK,EAAEC;IACX,CAAC,CAAC;IAEF,MAAMK,OAAO,GAAGf,UAAU,CAACa,KAAK,CAAC;IAEjC,MAAM;MAAEG,QAAQ;MAAEC;IAAK,CAAC,GAAGZ,eAAe,CAAC;MACvCQ,KAAK;MACLJ,KAAK;MACLS,aAAa,EAAER,YAAY;MAC3BF,GAAG;MACHO;IACJ,CAAC,CAAC;IAEFD,MAAM,CAACK,KAAK,CAACR,KAAK,EAAE;MAChBS,IAAI,EAAEP,KAAK,CAACA,KAAK,CAACQ,OAAO;MACzBL,QAAQ;MACRC,IAAI;MACJR,KAAK;MACLM;IACJ,CAAC,CAAC;EACN,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["WebinyError","transformValueForSearch","hasKeyword","createFieldPathFactory","createApplyFiltering","operatorPlugins","valueSearchRegistry","createFieldPath","params","key","value","initialValue","query","operator","field","plugin","keyword","basePath","path","originalValue","apply","name","fieldId"],"sources":["applyFiltering.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { transformValueForSearch } from \"~/operations/entry/elasticsearch/transformValueForSearch.js\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword.js\";\nimport type { OpenSearchQueryBuilderOperatorPlugins } from \"~/operations/entry/elasticsearch/types.js\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path.js\";\nimport type { CmsEntryOpenSearchFilter } from \"~/features/CmsEntryOpenSearchFilter/index.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface CreateParams {\n    operatorPlugins: OpenSearchQueryBuilderOperatorPlugins;\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n}\n\nexport const createApplyFiltering = ({\n    operatorPlugins,\n    valueSearchRegistry\n}: CreateParams): CmsEntryOpenSearchFilter.ApplyFiltering => {\n    const createFieldPath = createFieldPathFactory({\n        valueSearchRegistry\n    });\n\n    return params => {\n        const { key, value: initialValue, query, operator, field } = params;\n\n        const plugin = operatorPlugins[operator];\n        if (!plugin) {\n            throw new WebinyError(\n                `Elasticsearch operator \"${operator}\" plugin missing.`,\n                \"PLUGIN_MISSING\",\n                {\n                    operator\n                }\n            );\n        }\n\n        const value = transformValueForSearch({\n            valueSearchRegistry,\n            field: field.field,\n            value: initialValue\n        });\n\n        const keyword = hasKeyword(field);\n\n        const { basePath, path } = createFieldPath({\n            field,\n            value,\n            originalValue: initialValue,\n            key,\n            keyword\n        });\n\n        plugin.apply(query, {\n            name: field.field.fieldId,\n            basePath,\n            path,\n            value,\n            keyword\n        });\n    };\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AACvC,SAASC,uBAAuB;AAChC,SAASC,UAAU;AAEnB,SAASC,sBAAsB;AAS/B,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACjCC,eAAe;EACfC;AACU,CAAC,KAA8C;EACzD,MAAMC,eAAe,GAAGJ,sBAAsB,CAAC;IAC3CG;EACJ,CAAC,CAAC;EAEF,OAAOE,MAAM,IAAI;IACb,MAAM;MAAEC,GAAG;MAAEC,KAAK,EAAEC,YAAY;MAAEC,KAAK;MAAEC,QAAQ;MAAEC;IAAM,CAAC,GAAGN,MAAM;IAEnE,MAAMO,MAAM,GAAGV,eAAe,CAACQ,QAAQ,CAAC;IACxC,IAAI,CAACE,MAAM,EAAE;MACT,MAAM,IAAIf,WAAW,CACjB,2BAA2Ba,QAAQ,mBAAmB,EACtD,gBAAgB,EAChB;QACIA;MACJ,CACJ,CAAC;IACL;IAEA,MAAMH,KAAK,GAAGT,uBAAuB,CAAC;MAClCK,mBAAmB;MACnBQ,KAAK,EAAEA,KAAK,CAACA,KAAK;MAClBJ,KAAK,EAAEC;IACX,CAAC,CAAC;IAEF,MAAMK,OAAO,GAAGd,UAAU,CAACY,KAAK,CAAC;IAEjC,MAAM;MAAEG,QAAQ;MAAEC;IAAK,CAAC,GAAGX,eAAe,CAAC;MACvCO,KAAK;MACLJ,KAAK;MACLS,aAAa,EAAER,YAAY;MAC3BF,GAAG;MACHO;IACJ,CAAC,CAAC;IAEFD,MAAM,CAACK,KAAK,CAACR,KAAK,EAAE;MAChBS,IAAI,EAAEP,KAAK,CAACA,KAAK,CAACQ,OAAO;MACzBL,QAAQ;MACRC,IAAI;MACJR,KAAK;MACLM;IACJ,CAAC,CAAC;EACN,CAAC;AACL,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/filtering/exec.d.ts

@@ -2,10 +2,14 @@ import type { CmsEntryListWhere, CmsModel } from "@webiny/api-headless-cms/types
 import type { ModelFields } from "../../../../operations/entry/elasticsearch/types.js";
 import type { PluginsContainer } from "@webiny/plugins";
 import type { OpenSearchBoolQueryConfig } from "@webiny/api-opensearch/types.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../../../features/CmsEntryOpenSearchValueSearch/index.js";
+import type { CmsEntryOpenSearchFilterRegistry } from "../../../../features/CmsEntryOpenSearchFilter/index.js";
 export interface CreateExecParams {
     model: CmsModel;
     fields: ModelFields;
     plugins: PluginsContainer;
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
+    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;
 }
 export interface IExecParams {
     where: CmsEntryListWhere;

package/operations/entry/elasticsearch/filtering/exec.js

@@ -1,52 +1,28 @@
 import WebinyError from "@webiny/error";
-import { createSearchPluginList } from "../plugins/search.js";
 import { createOperatorPluginList } from "../plugins/operator.js";
 import { createBaseQuery } from "../initialQuery.js";
 import { parseWhereKey } from "@webiny/api-opensearch";
 import { getWhereValues } from "./values.js";
 import { getPopulated } from "./populated.js";
 import { createApplyFiltering } from "./applyFiltering.js";
-import { CmsEntryFilterPlugin } from "../../../../plugins/CmsEntryFilterPlugin.js";
 import { assignMinimumShouldMatchToQuery } from "../assignMinimumShouldMatchToQuery.js";
-import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
 export const createExecFiltering = params => {
   const {
     fields,
     plugins,
-    model
+    model,
+    valueSearchRegistry,
+    filterRegistry
   } = params;
-
-  /**
-   * We need the search plugins as key -> plugin value, so it is easy to find plugin we need, without iterating through array.
-   */
-  const searchPlugins = createSearchPluginList({
-    plugins
-  });
-  /**
-   * We need the operator plugins, which we execute on our where conditions.
-   */
   const operatorPlugins = createOperatorPluginList({
     plugins
   });
   const applyFiltering = createApplyFiltering({
     operatorPlugins,
-    searchPlugins
+    valueSearchRegistry
   });
-  const filteringPlugins = plugins.byType(CmsEntryFilterPlugin.type).reduce((collection, plugin) => {
-    collection[plugin.fieldType] = plugin;
-    return collection;
-  }, {});
-  const getFilterPlugin = type => {
-    const fieldType = getBaseFieldType({
-      type
-    });
-    const plugin = filteringPlugins[fieldType] || filteringPlugins["*"];
-    if (plugin) {
-      return plugin;
-    }
-    throw new WebinyError(`There is no filtering plugin for the given field type "${fieldType}".`, "FILTERING_PLUGIN_ERROR", {
-      fieldType
-    });
+  const getFilter = type => {
+    return filterRegistry.get(type);
   };
   const execFiltering = params => {
     const {
@@ -54,9 +30,6 @@ export const createExecFiltering = params => {
       query,
       isValues = false
     } = params;
-    /**
-     * No point in continuing if no "where" conditions exist.
-     */
     const keys = Object.keys(initialWhere);
     if (keys.length === 0) {
       return;
@@ -64,17 +37,9 @@ export const createExecFiltering = params => {
     const where = structuredClone(initialWhere);
     for (const key in where) {
       const value = where[key];
-      /**
-       * We always skip if no value is defined.
-       * Only skip undefined value, null is valid.
-       */
       if (value === undefined) {
         continue;
-      }
-      //
-      /**
-       * When we are running with AND, the "value" MUST be an array.
-       */else if (key === "AND") {
+      } else if (key === "AND") {
         const childWhereList = getWhereValues(value, "AND");
         const childQuery = createBaseQuery();
         for (const childWhere of childWhereList) {
@@ -92,15 +57,8 @@ export const createExecFiltering = params => {
           bool: childQueryBool
         });
         continue;
-      }
-      //
-      /**
-       * When we are running with OR, the "value" must be an array.
-       */else if (key === "OR") {
+      } else if (key === "OR") {
         const childWhereList = getWhereValues(value, "OR");
-        /**
-         * Each of the conditions MUST produce it's own should section.
-         */
         const should = [];
         for (const childWhere of childWhereList) {
           const childQuery = createBaseQuery();
@@ -121,10 +79,6 @@ export const createExecFiltering = params => {
           continue;
         }
         query.should.push(...should);
-        /**
-         * If there are any should, minimum to have is 1.
-         * Of course, do not override if it's already set.
-         */
         assignMinimumShouldMatchToQuery({
           query
         });
@@ -142,13 +96,6 @@ export const createExecFiltering = params => {
         operator
       } = parseWhereKey(key);
       let fieldId = isValues ? `values.${whereFieldId}` : whereFieldId;
-
-      /**
-       * TODO This will be required until the storage operations receive the fieldId instead of field storageId.
-       * TODO For this to work without field searching, we need to refactor how the query looks like.
-       *
-       * Storage operations should NEVER receive an field storageId, only alias - fieldId.
-       */
       const cmsModelField = model.fields.find(f => f.fieldId === fieldId);
       if (!cmsModelField && !fields[fieldId]) {
         throw new WebinyError(`There is no CMS Model Field "${fieldId}".`);
@@ -159,10 +106,10 @@ export const createExecFiltering = params => {
       if (!field) {
         throw new WebinyError(`There is no field "${fieldId}".`, "EXEC_FILTERING_ERROR");
       }
-      const filterPlugin = getFilterPlugin(field.type);
-      filterPlugin.exec({
+      const filter = getFilter(field.type);
+      filter.exec({
         applyFiltering,
-        getFilterPlugin,
+        getFilter,
         key,
         value,
         operator,

package/operations/entry/elasticsearch/filtering/exec.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","createSearchPluginList","createOperatorPluginList","createBaseQuery","parseWhereKey","getWhereValues","getPopulated","createApplyFiltering","CmsEntryFilterPlugin","assignMinimumShouldMatchToQuery","getBaseFieldType","createExecFiltering","params","fields","plugins","model","searchPlugins","operatorPlugins","applyFiltering","filteringPlugins","byType","type","reduce","collection","plugin","fieldType","getFilterPlugin","execFiltering","where","initialWhere","query","isValues","keys","Object","length","structuredClone","key","value","undefined","childWhereList","childQuery","childWhere","childQueryBool","filter","push","bool","should","field","whereFieldId","operator","fieldId","cmsModelField","find","f","filterPlugin","exec"],"sources":["exec.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    OpenSearchBoolQueryConfig,\n    QueryDslQueryContainer as Query\n} from \"@webiny/api-opensearch/types.js\";\nimport { createSearchPluginList } from \"~/operations/entry/elasticsearch/plugins/search.js\";\nimport { createOperatorPluginList } from \"~/operations/entry/elasticsearch/plugins/operator.js\";\nimport { createBaseQuery } from \"~/operations/entry/elasticsearch/initialQuery.js\";\nimport { parseWhereKey } from \"@webiny/api-opensearch\";\nimport { getWhereValues } from \"./values.js\";\nimport { getPopulated } from \"./populated.js\";\nimport { createApplyFiltering } from \"./applyFiltering.js\";\nimport { CmsEntryFilterPlugin } from \"~/plugins/CmsEntryFilterPlugin.js\";\nimport { assignMinimumShouldMatchToQuery } from \"~/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\nexport interface CreateExecParams {\n    model: CmsModel;\n    fields: ModelFields;\n    plugins: PluginsContainer;\n}\nexport interface IExecParams {\n    where: CmsEntryListWhere;\n    query: OpenSearchBoolQueryConfig;\n    isValues?: boolean;\n}\nexport interface CreateExecFilteringResponse {\n    (params: IExecParams): void;\n}\nexport const createExecFiltering = (params: CreateExecParams): CreateExecFilteringResponse => {\n    const { fields, plugins, model } = params;\n\n    /**\n     * We need the search plugins as key -> plugin value, so it is easy to find plugin we need, without iterating through array.\n     */\n    const searchPlugins = createSearchPluginList({\n        plugins\n    });\n    /**\n     * We need the operator plugins, which we execute on our where conditions.\n     */\n    const operatorPlugins = createOperatorPluginList({\n        plugins\n    });\n\n    const applyFiltering = createApplyFiltering({\n        operatorPlugins,\n        searchPlugins\n    });\n\n    const filteringPlugins = plugins\n        .byType<CmsEntryFilterPlugin>(CmsEntryFilterPlugin.type)\n        .reduce<Record<string, CmsEntryFilterPlugin>>((collection, plugin) => {\n            collection[plugin.fieldType] = plugin;\n\n            return collection;\n        }, {});\n\n    const getFilterPlugin = (type: string) => {\n        const fieldType = getBaseFieldType({\n            type\n        });\n\n        const plugin = filteringPlugins[fieldType] || filteringPlugins[\"*\"];\n        if (plugin) {\n            return plugin;\n        }\n        throw new WebinyError(\n            `There is no filtering plugin for the given field type \"${fieldType}\".`,\n            \"FILTERING_PLUGIN_ERROR\",\n            {\n                fieldType\n            }\n        );\n    };\n\n    const execFiltering = (params: IExecParams) => {\n        const { where: initialWhere, query, isValues = false } = params;\n        /**\n         * No point in continuing if no \"where\" conditions exist.\n         */\n        const keys = Object.keys(initialWhere);\n        if (keys.length === 0) {\n            return;\n        }\n        const where = structuredClone(initialWhere);\n\n        for (const key in where) {\n            const value = where[key as keyof typeof where];\n            /**\n             * We always skip if no value is defined.\n             * Only skip undefined value, null is valid.\n             */\n            if (value === undefined) {\n                continue;\n            }\n            //\n            /**\n             * When we are running with AND, the \"value\" MUST be an array.\n             */\n            else if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, \"AND\");\n\n                const childQuery = createBaseQuery();\n\n                for (const childWhere of childWhereList) {\n                    execFiltering({\n                        query: childQuery,\n                        where: childWhere,\n                        isValues\n                    });\n                }\n                const childQueryBool = getPopulated(childQuery);\n                if (Object.keys(childQueryBool).length === 0) {\n                    continue;\n                }\n                query.filter.push({\n                    bool: childQueryBool\n                });\n\n                continue;\n            }\n            //\n            /**\n             * When we are running with OR, the \"value\" must be an array.\n             */\n            else if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, \"OR\");\n                /**\n                 * Each of the conditions MUST produce it's own should section.\n                 */\n                const should: Query[] = [];\n                for (const childWhere of childWhereList) {\n                    const childQuery = createBaseQuery();\n                    execFiltering({\n                        query: childQuery,\n                        where: childWhere,\n                        isValues\n                    });\n                    const childQueryBool = getPopulated(childQuery);\n                    if (Object.keys(childQueryBool).length === 0) {\n                        continue;\n                    }\n                    should.push({\n                        bool: childQueryBool\n                    });\n                }\n                if (should.length === 0) {\n                    continue;\n                }\n                query.should.push(...should);\n                /**\n                 * If there are any should, minimum to have is 1.\n                 * Of course, do not override if it's already set.\n                 */\n                assignMinimumShouldMatchToQuery({\n                    query\n                });\n                continue;\n            } else if (key === \"values\") {\n                execFiltering({\n                    query,\n                    where: where[key] as CmsEntryListWhere,\n                    isValues: true\n                });\n                continue;\n            }\n            const { field: whereFieldId, operator } = parseWhereKey(key);\n\n            let fieldId: string = isValues ? `values.${whereFieldId}` : whereFieldId;\n\n            /**\n             * TODO This will be required until the storage operations receive the fieldId instead of field storageId.\n             * TODO For this to work without field searching, we need to refactor how the query looks like.\n             *\n             * Storage operations should NEVER receive an field storageId, only alias - fieldId.\n             */\n            const cmsModelField = model.fields.find(f => f.fieldId === fieldId);\n            if (!cmsModelField && !fields[fieldId]) {\n                throw new WebinyError(`There is no CMS Model Field \"${fieldId}\".`);\n            } else if (cmsModelField) {\n                fieldId = cmsModelField.fieldId;\n            }\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(`There is no field \"${fieldId}\".`, \"EXEC_FILTERING_ERROR\");\n            }\n            const filterPlugin = getFilterPlugin(field.type);\n\n            filterPlugin.exec({\n                applyFiltering,\n                getFilterPlugin,\n                key,\n                value,\n                operator,\n                field,\n                fields,\n                query\n            });\n        }\n    };\n\n    return execFiltering;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","createOperatorPluginList","createBaseQuery","parseWhereKey","getWhereValues","getPopulated","createApplyFiltering","assignMinimumShouldMatchToQuery","createExecFiltering","params","fields","plugins","model","valueSearchRegistry","filterRegistry","operatorPlugins","applyFiltering","getFilter","type","get","execFiltering","where","initialWhere","query","isValues","keys","Object","length","structuredClone","key","value","undefined","childWhereList","childQuery","childWhere","childQueryBool","filter","push","bool","should","field","whereFieldId","operator","fieldId","cmsModelField","find","f","exec"],"sources":["exec.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    OpenSearchBoolQueryConfig,\n    QueryDslQueryContainer as Query\n} from \"@webiny/api-opensearch/types.js\";\nimport { createOperatorPluginList } from \"~/operations/entry/elasticsearch/plugins/operator.js\";\nimport { createBaseQuery } from \"~/operations/entry/elasticsearch/initialQuery.js\";\nimport { parseWhereKey } from \"@webiny/api-opensearch\";\nimport { getWhereValues } from \"./values.js\";\nimport { getPopulated } from \"./populated.js\";\nimport { createApplyFiltering } from \"./applyFiltering.js\";\nimport { assignMinimumShouldMatchToQuery } from \"~/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport type { CmsEntryOpenSearchFilterRegistry } from \"~/features/CmsEntryOpenSearchFilter/index.js\";\n\nexport interface CreateExecParams {\n    model: CmsModel;\n    fields: ModelFields;\n    plugins: PluginsContainer;\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;\n}\nexport interface IExecParams {\n    where: CmsEntryListWhere;\n    query: OpenSearchBoolQueryConfig;\n    isValues?: boolean;\n}\nexport interface CreateExecFilteringResponse {\n    (params: IExecParams): void;\n}\nexport const createExecFiltering = (params: CreateExecParams): CreateExecFilteringResponse => {\n    const { fields, plugins, model, valueSearchRegistry, filterRegistry } = params;\n\n    const operatorPlugins = createOperatorPluginList({\n        plugins\n    });\n\n    const applyFiltering = createApplyFiltering({\n        operatorPlugins,\n        valueSearchRegistry\n    });\n\n    const getFilter = (type: string) => {\n        return filterRegistry.get(type);\n    };\n\n    const execFiltering = (params: IExecParams) => {\n        const { where: initialWhere, query, isValues = false } = params;\n        const keys = Object.keys(initialWhere);\n        if (keys.length === 0) {\n            return;\n        }\n        const where = structuredClone(initialWhere);\n\n        for (const key in where) {\n            const value = where[key as keyof typeof where];\n            if (value === undefined) {\n                continue;\n            } else if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, \"AND\");\n                const childQuery = createBaseQuery();\n                for (const childWhere of childWhereList) {\n                    execFiltering({ query: childQuery, where: childWhere, isValues });\n                }\n                const childQueryBool = getPopulated(childQuery);\n                if (Object.keys(childQueryBool).length === 0) {\n                    continue;\n                }\n                query.filter.push({ bool: childQueryBool });\n                continue;\n            } else if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, \"OR\");\n                const should: Query[] = [];\n                for (const childWhere of childWhereList) {\n                    const childQuery = createBaseQuery();\n                    execFiltering({ query: childQuery, where: childWhere, isValues });\n                    const childQueryBool = getPopulated(childQuery);\n                    if (Object.keys(childQueryBool).length === 0) {\n                        continue;\n                    }\n                    should.push({ bool: childQueryBool });\n                }\n                if (should.length === 0) {\n                    continue;\n                }\n                query.should.push(...should);\n                assignMinimumShouldMatchToQuery({ query });\n                continue;\n            } else if (key === \"values\") {\n                execFiltering({\n                    query,\n                    where: where[key] as CmsEntryListWhere,\n                    isValues: true\n                });\n                continue;\n            }\n            const { field: whereFieldId, operator } = parseWhereKey(key);\n            let fieldId: string = isValues ? `values.${whereFieldId}` : whereFieldId;\n\n            const cmsModelField = model.fields.find(f => f.fieldId === fieldId);\n            if (!cmsModelField && !fields[fieldId]) {\n                throw new WebinyError(`There is no CMS Model Field \"${fieldId}\".`);\n            } else if (cmsModelField) {\n                fieldId = cmsModelField.fieldId;\n            }\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(`There is no field \"${fieldId}\".`, \"EXEC_FILTERING_ERROR\");\n            }\n            const filter = getFilter(field.type);\n\n            filter.exec({\n                applyFiltering,\n                getFilter,\n                key,\n                value,\n                operator,\n                field,\n                fields,\n                query\n            });\n        }\n    };\n\n    return execFiltering;\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/entry/elasticsearch/filtering/path.d.ts

@@ -1,6 +1,7 @@
-import type { OpenSearchQuerySearchValuePlugins, ModelField } from "../../../../operations/entry/elasticsearch/types.js";
+import type { ModelField } from "../../../../operations/entry/elasticsearch/types.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../../../features/CmsEntryOpenSearchValueSearch/index.js";
 interface FieldPathFactoryParams {
-    plugins: OpenSearchQuerySearchValuePlugins;
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
 }
 interface FieldPathParams {
     field: ModelField;
@@ -9,7 +10,7 @@ interface FieldPathParams {
     originalValue: any;
     keyword: boolean;
 }
-export declare const createFieldPathFactory: ({ plugins }: FieldPathFactoryParams) => (params: FieldPathParams) => {
+export declare const createFieldPathFactory: ({ valueSearchRegistry }: FieldPathFactoryParams) => (params: FieldPathParams) => {
     basePath: string;
     path: string;
 };

package/operations/entry/elasticsearch/filtering/path.js

@@ -1,6 +1,5 @@
-import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
 export const createFieldPathFactory = ({
-  plugins
+  valueSearchRegistry
 }) => {
   return params => {
     const {
@@ -10,11 +9,10 @@ export const createFieldPathFactory = ({
       keyword,
       originalValue
     } = params;
-    const fieldType = getBaseFieldType(field);
-    const plugin = plugins[fieldType];
+    const search = valueSearchRegistry.get(field.type);
     let fieldPath = null;
-    if (plugin) {
-      fieldPath = plugin.createPath({
+    if (search) {
+      fieldPath = search.createPath({
         field: field.field,
         value,
         key,

package/operations/entry/elasticsearch/filtering/path.js.map

@@ -1 +1 @@
-{"version":3,"names":["getBaseFieldType","createFieldPathFactory","plugins","params","field","key","value","keyword","originalValue","fieldType","plugin","fieldPath","createPath","storageId","path","result","parents","map","p","concat","basePath","join"],"sources":["path.ts"],"sourcesContent":["import type {\n    OpenSearchQuerySearchValuePlugins,\n    ModelField\n} from \"~/operations/entry/elasticsearch/types.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface FieldPathFactoryParams {\n    plugins: OpenSearchQuerySearchValuePlugins;\n}\ninterface FieldPathParams {\n    field: ModelField;\n    key: string;\n    value: any;\n    originalValue: any;\n    keyword: boolean;\n}\n\nexport const createFieldPathFactory = ({ plugins }: FieldPathFactoryParams) => {\n    return (params: FieldPathParams) => {\n        const { field, key, value, keyword, originalValue } = params;\n        const fieldType = getBaseFieldType(field);\n        const plugin = plugins[fieldType];\n\n        let fieldPath: string | null = null;\n        if (plugin) {\n            fieldPath = plugin.createPath({ field: field.field, value, key, originalValue });\n        }\n        if (!fieldPath) {\n            fieldPath = field.field.storageId;\n            if (field.path) {\n                fieldPath = typeof field.path === \"function\" ? field.path(value) : field.path;\n            }\n        }\n\n        const result: string[] = field.parents.map(p => p.storageId).concat([fieldPath]);\n\n        return {\n            basePath: result.join(\".\"),\n            path: result.concat(keyword ? [\"keyword\"] : []).join(\".\")\n        };\n    };\n};\n"],"mappings":"AAIA,SAASA,gBAAgB,QAAQ,oDAAoD;AAarF,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EAAEC;AAAgC,CAAC,KAAK;EAC3E,OAAQC,MAAuB,IAAK;IAChC,MAAM;MAAEC,KAAK;MAAEC,GAAG;MAAEC,KAAK;MAAEC,OAAO;MAAEC;IAAc,CAAC,GAAGL,MAAM;IAC5D,MAAMM,SAAS,GAAGT,gBAAgB,CAACI,KAAK,CAAC;IACzC,MAAMM,MAAM,GAAGR,OAAO,CAACO,SAAS,CAAC;IAEjC,IAAIE,SAAwB,GAAG,IAAI;IACnC,IAAID,MAAM,EAAE;MACRC,SAAS,GAAGD,MAAM,CAACE,UAAU,CAAC;QAAER,KAAK,EAAEA,KAAK,CAACA,KAAK;QAAEE,KAAK;QAAED,GAAG;QAAEG;MAAc,CAAC,CAAC;IACpF;IACA,IAAI,CAACG,SAAS,EAAE;MACZA,SAAS,GAAGP,KAAK,CAACA,KAAK,CAACS,SAAS;MACjC,IAAIT,KAAK,CAACU,IAAI,EAAE;QACZH,SAAS,GAAG,OAAOP,KAAK,CAACU,IAAI,KAAK,UAAU,GAAGV,KAAK,CAACU,IAAI,CAACR,KAAK,CAAC,GAAGF,KAAK,CAACU,IAAI;MACjF;IACJ;IAEA,MAAMC,MAAgB,GAAGX,KAAK,CAACY,OAAO,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACL,SAAS,CAAC,CAACM,MAAM,CAAC,CAACR,SAAS,CAAC,CAAC;IAEhF,OAAO;MACHS,QAAQ,EAAEL,MAAM,CAACM,IAAI,CAAC,GAAG,CAAC;MAC1BP,IAAI,EAAEC,MAAM,CAACI,MAAM,CAACZ,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAACc,IAAI,CAAC,GAAG;IAC5D,CAAC;EACL,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["createFieldPathFactory","valueSearchRegistry","params","field","key","value","keyword","originalValue","search","get","type","fieldPath","createPath","storageId","path","result","parents","map","p","concat","basePath","join"],"sources":["path.ts"],"sourcesContent":["import type { ModelField } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface FieldPathFactoryParams {\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n}\ninterface FieldPathParams {\n    field: ModelField;\n    key: string;\n    value: any;\n    originalValue: any;\n    keyword: boolean;\n}\n\nexport const createFieldPathFactory = ({ valueSearchRegistry }: FieldPathFactoryParams) => {\n    return (params: FieldPathParams) => {\n        const { field, key, value, keyword, originalValue } = params;\n        const search = valueSearchRegistry.get(field.type);\n\n        let fieldPath: string | null = null;\n        if (search) {\n            fieldPath = search.createPath({ field: field.field, value, key, originalValue });\n        }\n        if (!fieldPath) {\n            fieldPath = field.field.storageId;\n            if (field.path) {\n                fieldPath = typeof field.path === \"function\" ? field.path(value) : field.path;\n            }\n        }\n\n        const result: string[] = field.parents.map(p => p.storageId).concat([fieldPath]);\n\n        return {\n            basePath: result.join(\".\"),\n            path: result.concat(keyword ? [\"keyword\"] : []).join(\".\")\n        };\n    };\n};\n"],"mappings":"AAcA,OAAO,MAAMA,sBAAsB,GAAGA,CAAC;EAAEC;AAA4C,CAAC,KAAK;EACvF,OAAQC,MAAuB,IAAK;IAChC,MAAM;MAAEC,KAAK;MAAEC,GAAG;MAAEC,KAAK;MAAEC,OAAO;MAAEC;IAAc,CAAC,GAAGL,MAAM;IAC5D,MAAMM,MAAM,GAAGP,mBAAmB,CAACQ,GAAG,CAACN,KAAK,CAACO,IAAI,CAAC;IAElD,IAAIC,SAAwB,GAAG,IAAI;IACnC,IAAIH,MAAM,EAAE;MACRG,SAAS,GAAGH,MAAM,CAACI,UAAU,CAAC;QAAET,KAAK,EAAEA,KAAK,CAACA,KAAK;QAAEE,KAAK;QAAED,GAAG;QAAEG;MAAc,CAAC,CAAC;IACpF;IACA,IAAI,CAACI,SAAS,EAAE;MACZA,SAAS,GAAGR,KAAK,CAACA,KAAK,CAACU,SAAS;MACjC,IAAIV,KAAK,CAACW,IAAI,EAAE;QACZH,SAAS,GAAG,OAAOR,KAAK,CAACW,IAAI,KAAK,UAAU,GAAGX,KAAK,CAACW,IAAI,CAACT,KAAK,CAAC,GAAGF,KAAK,CAACW,IAAI;MACjF;IACJ;IAEA,MAAMC,MAAgB,GAAGZ,KAAK,CAACa,OAAO,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACL,SAAS,CAAC,CAACM,MAAM,CAAC,CAACR,SAAS,CAAC,CAAC;IAEhF,OAAO;MACHS,QAAQ,EAAEL,MAAM,CAACM,IAAI,CAAC,GAAG,CAAC;MAC1BP,IAAI,EAAEC,MAAM,CAACI,MAAM,CAACb,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAACe,IAAI,CAAC,GAAG;IAC5D,CAAC;EACL,CAAC;AACL,CAAC","ignoreList":[]}

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

@@ -1,9 +1,9 @@
 import type { OpenSearchBoolQueryConfig } from "@webiny/api-opensearch/types.js";
 import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
-import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsEntryOpenSearchFullTextSearch } from "../../../features/CmsEntryOpenSearchFullTextSearch/index.js";
 import type { ModelFields } from "../../../operations/entry/elasticsearch/types.js";
 interface Params {
-    plugins: PluginsContainer;
+    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];
     model: CmsModel;
     query: OpenSearchBoolQueryConfig;
     term?: string;

package/operations/entry/elasticsearch/fullTextSearch.js

@@ -1,9 +1,8 @@
 import { normalizeValue } from "@webiny/api-opensearch";
-import { CmsEntryElasticsearchFullTextSearchPlugin, createCmsEntryElasticsearchFullTextSearchPlugin } from "../../../plugins/index.js";
 /**
- * Our default plugin is working with the AND operator for the multiple words query string.
+ * Our default implementation works with the AND operator for the multiple words query string.
  */
-const defaultPlugin = createCmsEntryElasticsearchFullTextSearchPlugin({
+const defaultFullTextSearch = {
   apply: params => {
     const {
       query,
@@ -21,44 +20,41 @@ const defaultPlugin = createCmsEntryElasticsearchFullTextSearchPlugin({
       }
     });
   }
-});
-defaultPlugin.name = "headless-cms.elasticsearch.entry.fullTextSearch.default";
-const getPlugin = params => {
+};
+const getFullTextSearch = params => {
   const {
-    container,
+    fullTextSearches,
     model
   } = params;
   /**
-   * We need to reverse the plugins, so we can take the last one first - possibility to override existing plugins.
+   * We need to reverse the list, so we can take the last one first - possibility to override existing implementations.
    */
-  const plugins = container.byType(CmsEntryElasticsearchFullTextSearchPlugin.type).reverse();
+  const reversed = [...fullTextSearches].reverse();
   /**
-   * We need to find the most specific plugin for the given model.
-   * Also, we need to use the first possible plugin if the specific one is not found.
+   * We need to find the most specific implementation for the given model.
+   * Also, we need to use the first possible implementation if the specific one is not found.
    */
-  let plugin = null;
-  for (const pl of plugins) {
-    const models = pl.models || [];
+  let fallback = null;
+  for (const item of reversed) {
+    const models = item.models || [];
     /**
-     * We take the first available plugin for the given model.
+     * We take the first available implementation for the given model.
      */
     if (models.includes(model.modelId)) {
-      return pl;
-    }
-    /**
-     * Then we set the first possible plugin, which has no models defined, as the default one.
-     * It is important not to set the plugin which has models defined as they are specifically for the targeted model.
-     */
-    //
-    else if (!plugin && models.length === 0) {
-      plugin = pl;
+      return item;
+    } else if (!fallback && models.length === 0) {
+      /**
+       * Then we set the first possible implementation, which has no models defined, as the default one.
+       * It is important not to set the one which has models defined as they are specifically for the targeted model.
+       */
+      fallback = item;
     }
   }
-  return plugin || defaultPlugin;
+  return fallback || defaultFullTextSearch;
 };
 export const applyFullTextSearch = params => {
   const {
-    plugins,
+    fullTextSearches,
     query,
     term,
     fields,
@@ -68,11 +64,11 @@ export const applyFullTextSearch = params => {
   if (!term || term.length === 0 || keys.length === 0) {
     return;
   }
-  const plugin = getPlugin({
-    container: plugins,
+  const fullTextSearch = getFullTextSearch({
+    fullTextSearches,
     model
   });
-  plugin.apply({
+  fullTextSearch.apply({
     model,
     createFieldPath: field => {
       if (typeof field.path === "function") {

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

@@ -1 +1 @@
-{"version":3,"names":["normalizeValue","CmsEntryElasticsearchFullTextSearchPlugin","createCmsEntryElasticsearchFullTextSearchPlugin","defaultPlugin","apply","params","query","term","fields","createFieldPath","prepareTerm","must","push","query_string","allow_leading_wildcard","Object","values","map","default_operator","name","getPlugin","container","model","plugins","byType","type","reverse","plugin","pl","models","includes","modelId","length","applyFullTextSearch","keys","field","path","systemField","storageId"],"sources":["fullTextSearch.ts"],"sourcesContent":["import type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\nimport { normalizeValue } from \"@webiny/api-opensearch\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport {\n    CmsEntryElasticsearchFullTextSearchPlugin,\n    createCmsEntryElasticsearchFullTextSearchPlugin\n} from \"~/plugins/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\n\n/**\n * Our default plugin is working with the AND operator for the multiple words query string.\n */\nconst defaultPlugin = createCmsEntryElasticsearchFullTextSearchPlugin({\n    apply: params => {\n        const { query, term, fields, createFieldPath, prepareTerm } = params;\n\n        query.must.push({\n            query_string: {\n                allow_leading_wildcard: true,\n                fields: Object.values(fields).map(createFieldPath),\n                query: `*${prepareTerm(term)}*`,\n                default_operator: \"and\"\n            }\n        });\n    }\n});\ndefaultPlugin.name = \"headless-cms.elasticsearch.entry.fullTextSearch.default\";\n\ninterface GetPluginParams {\n    container: PluginsContainer;\n    model: CmsModel;\n}\nconst getPlugin = (params: GetPluginParams): CmsEntryElasticsearchFullTextSearchPlugin => {\n    const { container, model } = params;\n    /**\n     * We need to reverse the plugins, so we can take the last one first - possibility to override existing plugins.\n     */\n    const plugins = container\n        .byType<CmsEntryElasticsearchFullTextSearchPlugin>(\n            CmsEntryElasticsearchFullTextSearchPlugin.type\n        )\n        .reverse();\n    /**\n     * We need to find the most specific plugin for the given model.\n     * Also, we need to use the first possible plugin if the specific one is not found.\n     */\n    let plugin: CmsEntryElasticsearchFullTextSearchPlugin | null = null;\n    for (const pl of plugins) {\n        const models = pl.models || [];\n        /**\n         * We take the first available plugin for the given model.\n         */\n        if (models.includes(model.modelId)) {\n            return pl;\n        }\n        /**\n         * Then we set the first possible plugin, which has no models defined, as the default one.\n         * It is important not to set the plugin which has models defined as they are specifically for the targeted model.\n         */\n        //\n        else if (!plugin && models.length === 0) {\n            plugin = pl;\n        }\n    }\n\n    return plugin || defaultPlugin;\n};\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    query: OpenSearchBoolQueryConfig;\n    term?: string;\n    fields: ModelFields;\n}\nexport const applyFullTextSearch = (params: Params): void => {\n    const { plugins, query, term, fields, model } = params;\n    const keys = Object.keys(fields);\n    if (!term || term.length === 0 || keys.length === 0) {\n        return;\n    }\n\n    const plugin = getPlugin({\n        container: plugins,\n        model\n    });\n\n    plugin.apply({\n        model,\n        createFieldPath: field => {\n            if (typeof field.path === \"function\") {\n                return field.path(term);\n            } else if (field.systemField) {\n                return field.path || field.field.storageId;\n            }\n            return `values.${field.path || field.field.storageId}`;\n        },\n        fields,\n        query,\n        term,\n        prepareTerm: normalizeValue\n    });\n};\n"],"mappings":"AACA,SAASA,cAAc,QAAQ,wBAAwB;AAGvD,SACIC,yCAAyC,EACzCC,+CAA+C;AAInD;AACA;AACA;AACA,MAAMC,aAAa,GAAGD,+CAA+C,CAAC;EAClEE,KAAK,EAAEC,MAAM,IAAI;IACb,MAAM;MAAEC,KAAK;MAAEC,IAAI;MAAEC,MAAM;MAAEC,eAAe;MAAEC;IAAY,CAAC,GAAGL,MAAM;IAEpEC,KAAK,CAACK,IAAI,CAACC,IAAI,CAAC;MACZC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BN,MAAM,EAAEO,MAAM,CAACC,MAAM,CAACR,MAAM,CAAC,CAACS,GAAG,CAACR,eAAe,CAAC;QAClDH,KAAK,EAAE,IAAII,WAAW,CAACH,IAAI,CAAC,GAAG;QAC/BW,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ,CAAC,CAAC;AACFf,aAAa,CAACgB,IAAI,GAAG,yDAAyD;AAM9E,MAAMC,SAAS,GAAIf,MAAuB,IAAgD;EACtF,MAAM;IAAEgB,SAAS;IAAEC;EAAM,CAAC,GAAGjB,MAAM;EACnC;AACJ;AACA;EACI,MAAMkB,OAAO,GAAGF,SAAS,CACpBG,MAAM,CACHvB,yCAAyC,CAACwB,IAC9C,CAAC,CACAC,OAAO,CAAC,CAAC;EACd;AACJ;AACA;AACA;EACI,IAAIC,MAAwD,GAAG,IAAI;EACnE,KAAK,MAAMC,EAAE,IAAIL,OAAO,EAAE;IACtB,MAAMM,MAAM,GAAGD,EAAE,CAACC,MAAM,IAAI,EAAE;IAC9B;AACR;AACA;IACQ,IAAIA,MAAM,CAACC,QAAQ,CAACR,KAAK,CAACS,OAAO,CAAC,EAAE;MAChC,OAAOH,EAAE;IACb;IACA;AACR;AACA;AACA;IACQ;IAAA,KACK,IAAI,CAACD,MAAM,IAAIE,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;MACrCL,MAAM,GAAGC,EAAE;IACf;EACJ;EAEA,OAAOD,MAAM,IAAIxB,aAAa;AAClC,CAAC;AASD,OAAO,MAAM8B,mBAAmB,GAAI5B,MAAc,IAAW;EACzD,MAAM;IAAEkB,OAAO;IAAEjB,KAAK;IAAEC,IAAI;IAAEC,MAAM;IAAEc;EAAM,CAAC,GAAGjB,MAAM;EACtD,MAAM6B,IAAI,GAAGnB,MAAM,CAACmB,IAAI,CAAC1B,MAAM,CAAC;EAChC,IAAI,CAACD,IAAI,IAAIA,IAAI,CAACyB,MAAM,KAAK,CAAC,IAAIE,IAAI,CAACF,MAAM,KAAK,CAAC,EAAE;IACjD;EACJ;EAEA,MAAML,MAAM,GAAGP,SAAS,CAAC;IACrBC,SAAS,EAAEE,OAAO;IAClBD;EACJ,CAAC,CAAC;EAEFK,MAAM,CAACvB,KAAK,CAAC;IACTkB,KAAK;IACLb,eAAe,EAAE0B,KAAK,IAAI;MACtB,IAAI,OAAOA,KAAK,CAACC,IAAI,KAAK,UAAU,EAAE;QAClC,OAAOD,KAAK,CAACC,IAAI,CAAC7B,IAAI,CAAC;MAC3B,CAAC,MAAM,IAAI4B,KAAK,CAACE,WAAW,EAAE;QAC1B,OAAOF,KAAK,CAACC,IAAI,IAAID,KAAK,CAACA,KAAK,CAACG,SAAS;MAC9C;MACA,OAAO,UAAUH,KAAK,CAACC,IAAI,IAAID,KAAK,CAACA,KAAK,CAACG,SAAS,EAAE;IAC1D,CAAC;IACD9B,MAAM;IACNF,KAAK;IACLC,IAAI;IACJG,WAAW,EAAEV;EACjB,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["normalizeValue","defaultFullTextSearch","apply","params","query","term","fields","createFieldPath","prepareTerm","must","push","query_string","allow_leading_wildcard","Object","values","map","default_operator","getFullTextSearch","fullTextSearches","model","reversed","reverse","fallback","item","models","includes","modelId","length","applyFullTextSearch","keys","fullTextSearch","field","path","systemField","storageId"],"sources":["fullTextSearch.ts"],"sourcesContent":["import type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\nimport { normalizeValue } from \"@webiny/api-opensearch\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\n\n/**\n * Our default implementation works with the AND operator for the multiple words query string.\n */\nconst defaultFullTextSearch: CmsEntryOpenSearchFullTextSearch.Interface = {\n    apply: params => {\n        const { query, term, fields, createFieldPath, prepareTerm } = params;\n\n        query.must.push({\n            query_string: {\n                allow_leading_wildcard: true,\n                fields: Object.values(fields).map(createFieldPath),\n                query: `*${prepareTerm(term)}*`,\n                default_operator: \"and\"\n            }\n        });\n    }\n};\n\ninterface GetFullTextSearchParams {\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    model: CmsModel;\n}\nconst getFullTextSearch = (\n    params: GetFullTextSearchParams\n): CmsEntryOpenSearchFullTextSearch.Interface => {\n    const { fullTextSearches, model } = params;\n    /**\n     * We need to reverse the list, so we can take the last one first - possibility to override existing implementations.\n     */\n    const reversed = [...fullTextSearches].reverse();\n    /**\n     * We need to find the most specific implementation for the given model.\n     * Also, we need to use the first possible implementation if the specific one is not found.\n     */\n    let fallback: CmsEntryOpenSearchFullTextSearch.Interface | null = null;\n    for (const item of reversed) {\n        const models = item.models || [];\n        /**\n         * We take the first available implementation for the given model.\n         */\n        if (models.includes(model.modelId)) {\n            return item;\n        } else if (!fallback && models.length === 0) {\n            /**\n             * Then we set the first possible implementation, which has no models defined, as the default one.\n             * It is important not to set the one which has models defined as they are specifically for the targeted model.\n             */\n            fallback = item;\n        }\n    }\n\n    return fallback || defaultFullTextSearch;\n};\n\ninterface Params {\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    model: CmsModel;\n    query: OpenSearchBoolQueryConfig;\n    term?: string;\n    fields: ModelFields;\n}\nexport const applyFullTextSearch = (params: Params): void => {\n    const { fullTextSearches, query, term, fields, model } = params;\n    const keys = Object.keys(fields);\n    if (!term || term.length === 0 || keys.length === 0) {\n        return;\n    }\n\n    const fullTextSearch = getFullTextSearch({\n        fullTextSearches,\n        model\n    });\n\n    fullTextSearch.apply({\n        model,\n        createFieldPath: field => {\n            if (typeof field.path === \"function\") {\n                return field.path(term);\n            } else if (field.systemField) {\n                return field.path || field.field.storageId;\n            }\n            return `values.${field.path || field.field.storageId}`;\n        },\n        fields,\n        query,\n        term,\n        prepareTerm: normalizeValue\n    });\n};\n"],"mappings":"AACA,SAASA,cAAc,QAAQ,wBAAwB;AAKvD;AACA;AACA;AACA,MAAMC,qBAAiE,GAAG;EACtEC,KAAK,EAAEC,MAAM,IAAI;IACb,MAAM;MAAEC,KAAK;MAAEC,IAAI;MAAEC,MAAM;MAAEC,eAAe;MAAEC;IAAY,CAAC,GAAGL,MAAM;IAEpEC,KAAK,CAACK,IAAI,CAACC,IAAI,CAAC;MACZC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BN,MAAM,EAAEO,MAAM,CAACC,MAAM,CAACR,MAAM,CAAC,CAACS,GAAG,CAACR,eAAe,CAAC;QAClDH,KAAK,EAAE,IAAII,WAAW,CAACH,IAAI,CAAC,GAAG;QAC/BW,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ,CAAC;AAMD,MAAMC,iBAAiB,GACnBd,MAA+B,IACc;EAC7C,MAAM;IAAEe,gBAAgB;IAAEC;EAAM,CAAC,GAAGhB,MAAM;EAC1C;AACJ;AACA;EACI,MAAMiB,QAAQ,GAAG,CAAC,GAAGF,gBAAgB,CAAC,CAACG,OAAO,CAAC,CAAC;EAChD;AACJ;AACA;AACA;EACI,IAAIC,QAA2D,GAAG,IAAI;EACtE,KAAK,MAAMC,IAAI,IAAIH,QAAQ,EAAE;IACzB,MAAMI,MAAM,GAAGD,IAAI,CAACC,MAAM,IAAI,EAAE;IAChC;AACR;AACA;IACQ,IAAIA,MAAM,CAACC,QAAQ,CAACN,KAAK,CAACO,OAAO,CAAC,EAAE;MAChC,OAAOH,IAAI;IACf,CAAC,MAAM,IAAI,CAACD,QAAQ,IAAIE,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;MACzC;AACZ;AACA;AACA;MACYL,QAAQ,GAAGC,IAAI;IACnB;EACJ;EAEA,OAAOD,QAAQ,IAAIrB,qBAAqB;AAC5C,CAAC;AASD,OAAO,MAAM2B,mBAAmB,GAAIzB,MAAc,IAAW;EACzD,MAAM;IAAEe,gBAAgB;IAAEd,KAAK;IAAEC,IAAI;IAAEC,MAAM;IAAEa;EAAM,CAAC,GAAGhB,MAAM;EAC/D,MAAM0B,IAAI,GAAGhB,MAAM,CAACgB,IAAI,CAACvB,MAAM,CAAC;EAChC,IAAI,CAACD,IAAI,IAAIA,IAAI,CAACsB,MAAM,KAAK,CAAC,IAAIE,IAAI,CAACF,MAAM,KAAK,CAAC,EAAE;IACjD;EACJ;EAEA,MAAMG,cAAc,GAAGb,iBAAiB,CAAC;IACrCC,gBAAgB;IAChBC;EACJ,CAAC,CAAC;EAEFW,cAAc,CAAC5B,KAAK,CAAC;IACjBiB,KAAK;IACLZ,eAAe,EAAEwB,KAAK,IAAI;MACtB,IAAI,OAAOA,KAAK,CAACC,IAAI,KAAK,UAAU,EAAE;QAClC,OAAOD,KAAK,CAACC,IAAI,CAAC3B,IAAI,CAAC;MAC3B,CAAC,MAAM,IAAI0B,KAAK,CAACE,WAAW,EAAE;QAC1B,OAAOF,KAAK,CAACC,IAAI,IAAID,KAAK,CAACA,KAAK,CAACG,SAAS;MAC9C;MACA,OAAO,UAAUH,KAAK,CAACC,IAAI,IAAID,KAAK,CAACA,KAAK,CAACG,SAAS,EAAE;IAC1D,CAAC;IACD5B,MAAM;IACNF,KAAK;IACLC,IAAI;IACJG,WAAW,EAAER;EACjB,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

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

@@ -1,12 +1,12 @@
 import type { Sort as OpenSearchSort } from "@webiny/api-opensearch/types.js";
-import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsEntryListSort, CmsModel } from "@webiny/api-headless-cms/types/index.js";
 import type { ModelFields } from "./types.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../../features/CmsEntryOpenSearchValueSearch/index.js";
 interface Params {
-    plugins: PluginsContainer;
     sort?: CmsEntryListSort;
     modelFields: ModelFields;
     model: CmsModel;
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
 }
 export declare const createElasticsearchSort: (params: Params) => OpenSearchSort;
 export {};

package/operations/entry/elasticsearch/sort.js

@@ -1,6 +1,5 @@
 import { createSort, OpenSearchFieldPlugin } from "@webiny/api-opensearch";
 import { hasKeyword } from "./keyword.js";
-import { createSearchPluginList } from "./plugins/search.js";
 import { createFieldPathFactory } from "./filtering/path.js";
 import { NoValueContainer } from "../../../values/NoValueContainer.js";
 const matchField = input => {
@@ -28,7 +27,7 @@ export const createElasticsearchSort = params => {
   const {
     sort,
     modelFields,
-    plugins
+    valueSearchRegistry
   } = params;
   if (!sort || sort.length === 0) {
     return [{
@@ -37,11 +36,8 @@ export const createElasticsearchSort = params => {
       }
     }];
   }
-  const searchPlugins = createSearchPluginList({
-    plugins
-  });
   const createFieldPath = createFieldPathFactory({
-    plugins: searchPlugins
+    valueSearchRegistry
   });
   const fieldIdToStorageIdIdMap = {};
   const sortPlugins = Object.values(modelFields).reduce((plugins, field) => {