@webiny/api-headless-cms-ddb-es 5.15.0-beta.3 → 5.16.0-beta.2

package/configurations.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 const configurations = {
   db: () => ({
-    table: process.env.DB_TABLE_HEADLESS_CMS,
+    table: process.env.DB_TABLE_HEADLESS_CMS || process.env.DB_TABLE,
     keys: [{
       primary: true,
       unique: true,

package/configurations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/configurations.ts"],"names":["configurations","db","table","process","env","DB_TABLE_HEADLESS_CMS","keys","primary","unique","name","fields","esDb","DB_TABLE_HEADLESS_CMS_ELASTICSEARCH","DB_TABLE_ELASTICSEARCH","es","context","model","tenant","tenancy","getCurrentTenant","Error","sharedIndex","ELASTICSEARCH_SHARED_INDEXES","locale","cms","getLocale","code","index","id","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"mappings":";;;;;;AA4BA,MAAMA,cAA8B,GAAG;AACnCC,EAAAA,EAAE,EAAE,OAAO;AACPC,IAAAA,KAAK,EAAEC,OAAO,CAACC,GAAR,CAAYC,qBADZ;AAEPC,IAAAA,IAAI,EAAE,CACF;AACIC,MAAAA,OAAO,EAAE,IADb;AAEIC,MAAAA,MAAM,EAAE,IAFZ;AAGIC,MAAAA,IAAI,EAAE,SAHV;AAIIC,MAAAA,MAAM,EAAE,CAAC;AAAED,QAAAA,IAAI,EAAE;AAAR,OAAD,EAAiB;AAAEA,QAAAA,IAAI,EAAE;AAAR,OAAjB;AAJZ,KADE;AAFC,GAAP,CAD+B;AAYnCE,EAAAA,IAAI,EAAE,OAAO;AACTT,IAAAA,KAAK,EACDC,OAAO,CAACC,GAAR,CAAYQ,mCAAZ,IAAmDT,OAAO,CAACC,GAAR,CAAYS,sBAF1D;AAGTP,IAAAA,IAAI,EAAE,CACF;AACIC,MAAAA,OAAO,EAAE,IADb;AAEIC,MAAAA,MAAM,EAAE,IAFZ;AAGIC,MAAAA,IAAI,EAAE,SAHV;AAIIC,MAAAA,MAAM,EAAE,CAAC;AAAED,QAAAA,IAAI,EAAE;AAAR,OAAD,EAAiB;AAAEA,QAAAA,IAAI,EAAE;AAAR,OAAjB;AAJZ,KADE;AAHG,GAAP,CAZ6B;;AAwBnCK,EAAAA,EAAE,CAACC,OAAD,EAAUC,KAAV,EAAiB;AACf,UAAMC,MAAM,GAAGF,OAAO,CAACG,OAAR,CAAgBC,gBAAhB,EAAf;;AACA,QAAI,CAACF,MAAL,EAAa;AACT,YAAM,IAAIG,KAAJ,CAAW,2CAAX,CAAN;AACH;;AAED,UAAMC,WAAW,GAAGlB,OAAO,CAACC,GAAR,CAAYkB,4BAAZ,KAA6C,MAAjE;AACA,UAAMC,MAAM,GAAGR,OAAO,CAACS,GAAR,CAAYC,SAAZ,GAAwBC,IAAvC;AACA,UAAMC,KAAK,GAAG,CAACN,WAAW,GAAG,MAAH,GAAYJ,MAAM,CAACW,EAA/B,EAAmC,cAAnC,EAAmDL,MAAnD,EAA2DP,KAAK,CAACa,OAAjE,EACTC,IADS,CACJ,GADI,EAETC,WAFS,EAAd;AAIA,UAAMC,MAAM,GAAG7B,OAAO,CAACC,GAAR,CAAY6B,2BAA3B;;AACA,QAAID,MAAJ,EAAY;AACR,aAAO;AAAEL,QAAAA,KAAK,EAAEK,MAAM,GAAGL;AAAlB,OAAP;AACH;;AACD,WAAO;AAAEA,MAAAA;AAAF,KAAP;AACH;;AAzCkC,CAAvC;eA4Ce3B,c","sourcesContent":["import { CmsContentModel, CmsContext } from \"@webiny/api-headless-cms/types\";\n\ninterface DatabaseConfigKeyFields {\n    name: string;\n}\n\ninterface DatabaseConfigKeys {\n    primary: boolean;\n    unique: boolean;\n    name: string;\n    fields: DatabaseConfigKeyFields[];\n}\n\nexport interface CmsDatabaseConfig {\n    table: string;\n    keys: DatabaseConfigKeys[];\n}\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface Configurations {\n    db: () => CmsDatabaseConfig;\n    esDb: () => CmsDatabaseConfig;\n    es: (context: CmsContext, model: CmsContentModel) => ElasticsearchConfig;\n}\n\nconst configurations: Configurations = {\n    db: () => ({\n        table: process.env.DB_TABLE_HEADLESS_CMS,\n        keys: [\n            {\n                primary: true,\n                unique: true,\n                name: \"primary\",\n                fields: [{ name: \"PK\" }, { name: \"SK\" }]\n            }\n        ]\n    }),\n    esDb: () => ({\n        table:\n            process.env.DB_TABLE_HEADLESS_CMS_ELASTICSEARCH || process.env.DB_TABLE_ELASTICSEARCH,\n        keys: [\n            {\n                primary: true,\n                unique: true,\n                name: \"primary\",\n                fields: [{ name: \"PK\" }, { name: \"SK\" }]\n            }\n        ]\n    }),\n    es(context, model) {\n        const tenant = context.tenancy.getCurrentTenant();\n        if (!tenant) {\n            throw new Error(`There is no tenant on \"context.security\".`);\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const locale = context.cms.getLocale().code;\n        const index = [sharedIndex ? \"root\" : tenant.id, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX;\n        if (prefix) {\n            return { index: prefix + index };\n        }\n        return { index };\n    }\n};\n\nexport default configurations;\n"],"file":"configurations.js"}
+{"version":3,"sources":["../src/configurations.ts"],"names":["configurations","db","table","process","env","DB_TABLE_HEADLESS_CMS","DB_TABLE","keys","primary","unique","name","fields","esDb","DB_TABLE_HEADLESS_CMS_ELASTICSEARCH","DB_TABLE_ELASTICSEARCH","es","context","model","tenant","tenancy","getCurrentTenant","Error","sharedIndex","ELASTICSEARCH_SHARED_INDEXES","locale","cms","getLocale","code","index","id","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"mappings":";;;;;;AA4BA,MAAMA,cAA8B,GAAG;AACnCC,EAAAA,EAAE,EAAE,OAAO;AACPC,IAAAA,KAAK,EAAEC,OAAO,CAACC,GAAR,CAAYC,qBAAZ,IAAqCF,OAAO,CAACC,GAAR,CAAYE,QADjD;AAEPC,IAAAA,IAAI,EAAE,CACF;AACIC,MAAAA,OAAO,EAAE,IADb;AAEIC,MAAAA,MAAM,EAAE,IAFZ;AAGIC,MAAAA,IAAI,EAAE,SAHV;AAIIC,MAAAA,MAAM,EAAE,CAAC;AAAED,QAAAA,IAAI,EAAE;AAAR,OAAD,EAAiB;AAAEA,QAAAA,IAAI,EAAE;AAAR,OAAjB;AAJZ,KADE;AAFC,GAAP,CAD+B;AAYnCE,EAAAA,IAAI,EAAE,OAAO;AACTV,IAAAA,KAAK,EACDC,OAAO,CAACC,GAAR,CAAYS,mCAAZ,IAAmDV,OAAO,CAACC,GAAR,CAAYU,sBAF1D;AAGTP,IAAAA,IAAI,EAAE,CACF;AACIC,MAAAA,OAAO,EAAE,IADb;AAEIC,MAAAA,MAAM,EAAE,IAFZ;AAGIC,MAAAA,IAAI,EAAE,SAHV;AAIIC,MAAAA,MAAM,EAAE,CAAC;AAAED,QAAAA,IAAI,EAAE;AAAR,OAAD,EAAiB;AAAEA,QAAAA,IAAI,EAAE;AAAR,OAAjB;AAJZ,KADE;AAHG,GAAP,CAZ6B;;AAwBnCK,EAAAA,EAAE,CAACC,OAAD,EAAUC,KAAV,EAAiB;AACf,UAAMC,MAAM,GAAGF,OAAO,CAACG,OAAR,CAAgBC,gBAAhB,EAAf;;AACA,QAAI,CAACF,MAAL,EAAa;AACT,YAAM,IAAIG,KAAJ,CAAW,2CAAX,CAAN;AACH;;AAED,UAAMC,WAAW,GAAGnB,OAAO,CAACC,GAAR,CAAYmB,4BAAZ,KAA6C,MAAjE;AACA,UAAMC,MAAM,GAAGR,OAAO,CAACS,GAAR,CAAYC,SAAZ,GAAwBC,IAAvC;AACA,UAAMC,KAAK,GAAG,CAACN,WAAW,GAAG,MAAH,GAAYJ,MAAM,CAACW,EAA/B,EAAmC,cAAnC,EAAmDL,MAAnD,EAA2DP,KAAK,CAACa,OAAjE,EACTC,IADS,CACJ,GADI,EAETC,WAFS,EAAd;AAIA,UAAMC,MAAM,GAAG9B,OAAO,CAACC,GAAR,CAAY8B,2BAA3B;;AACA,QAAID,MAAJ,EAAY;AACR,aAAO;AAAEL,QAAAA,KAAK,EAAEK,MAAM,GAAGL;AAAlB,OAAP;AACH;;AACD,WAAO;AAAEA,MAAAA;AAAF,KAAP;AACH;;AAzCkC,CAAvC;eA4Ce5B,c","sourcesContent":["import { CmsContentModel, CmsContext } from \"@webiny/api-headless-cms/types\";\n\ninterface DatabaseConfigKeyFields {\n    name: string;\n}\n\ninterface DatabaseConfigKeys {\n    primary: boolean;\n    unique: boolean;\n    name: string;\n    fields: DatabaseConfigKeyFields[];\n}\n\nexport interface CmsDatabaseConfig {\n    table: string;\n    keys: DatabaseConfigKeys[];\n}\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface Configurations {\n    db: () => CmsDatabaseConfig;\n    esDb: () => CmsDatabaseConfig;\n    es: (context: CmsContext, model: CmsContentModel) => ElasticsearchConfig;\n}\n\nconst configurations: Configurations = {\n    db: () => ({\n        table: process.env.DB_TABLE_HEADLESS_CMS || process.env.DB_TABLE,\n        keys: [\n            {\n                primary: true,\n                unique: true,\n                name: \"primary\",\n                fields: [{ name: \"PK\" }, { name: \"SK\" }]\n            }\n        ]\n    }),\n    esDb: () => ({\n        table:\n            process.env.DB_TABLE_HEADLESS_CMS_ELASTICSEARCH || process.env.DB_TABLE_ELASTICSEARCH,\n        keys: [\n            {\n                primary: true,\n                unique: true,\n                name: \"primary\",\n                fields: [{ name: \"PK\" }, { name: \"SK\" }]\n            }\n        ]\n    }),\n    es(context, model) {\n        const tenant = context.tenancy.getCurrentTenant();\n        if (!tenant) {\n            throw new Error(`There is no tenant on \"context.security\".`);\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const locale = context.cms.getLocale().code;\n        const index = [sharedIndex ? \"root\" : tenant.id, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX;\n        if (prefix) {\n            return { index: prefix + index };\n        }\n        return { index };\n    }\n};\n\nexport default configurations;\n"],"file":"configurations.js"}

package/helpers/createElasticsearchQueryBody.js

@@ -25,29 +25,10 @@ var _fields = require("./fields");
 
 var _CmsEntryElasticsearchFieldPlugin = require("../plugins/CmsEntryElasticsearchFieldPlugin");
 
+var _where = require("@webiny/api-elasticsearch/where");
+
 const specialFields = ["published", "latest"];
 const noKeywordFields = ["date", "number", "boolean"];
-const parseWhereKeyRegExp = new RegExp(/^([a-zA-Z0-9]+)(_[a-zA-Z0-9_]+)?$/);
-
-const parseWhereKey = key => {
-  const match = key.match(parseWhereKeyRegExp);
-
-  if (!match) {
-    throw new Error(`It is not possible to search by key "${key}"`);
-  }
-
-  const [, field, operation = "eq"] = match;
-  const op = operation.match(/^_/) ? operation.substr(1) : operation;
-
-  if (!field.match(/^([a-zA-Z]+)$/)) {
-    throw new Error(`Cannot filter by "${field}".`);
-  }
-
-  return {
-    field,
-    op
-  };
-};
 
 const createElasticsearchSortParams = args => {
   const {
@@ -80,8 +61,7 @@ const createElasticsearchSortParams = args => {
     return plugins;
   }, {});
   return (0, _sort.createSort)({
-    context,
-    plugins: sortPlugins,
+    fieldPlugins: sortPlugins,
     sort
   });
 };
@@ -238,8 +218,8 @@ const execElasticsearchBuildQueryPlugins = args => {
 
     const {
       field,
-      op
-    } = parseWhereKey(key);
+      operator
+    } = (0, _where.parseWhereKey)(key);
     const modelField = modelFields[field];
 
     if (!modelField) {
@@ -255,11 +235,11 @@ const execElasticsearchBuildQueryPlugins = args => {
       throw new _error.default(`Field "${field}" is not searchable.`);
     }
 
-    const plugin = operatorPlugins[op];
+    const plugin = operatorPlugins[operator];
 
     if (!plugin) {
       throw new _error.default("Operator plugin missing.", "PLUGIN_MISSING", {
-        operator: op
+        operator
       });
     }
 
@@ -281,7 +261,6 @@ const execElasticsearchBuildQueryPlugins = args => {
       basePath: fieldPath,
       path: keyword ? `${fieldPath}.keyword` : fieldPath,
       value,
-      context,
       keyword
     });
   }

package/helpers/createElasticsearchQueryBody.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/helpers/createElasticsearchQueryBody.ts"],"names":["specialFields","noKeywordFields","parseWhereKeyRegExp","RegExp","parseWhereKey","key","match","Error","field","operation","op","substr","createElasticsearchSortParams","args","context","sort","modelFields","parentPath","searchPlugins","length","undefined","sortPlugins","Object","values","reduce","plugins","modelField","searchPlugin","type","fieldId","CmsEntryElasticsearchFieldPlugin","unmappedType","keyword","hasKeyword","sortable","isSortable","searchable","isSearchable","path","createFieldPath","createInitialQueryValue","where","query","must","must_not","should","filter","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","tenancy","getCurrentTenant","push","term","id","published","TYPE_ENTRY_PUBLISHED","latest","TYPE_ENTRY_LATEST","WebinyError","createPath","isSystemField","includes","execElasticsearchBuildQueryPlugins","sf","keys","operatorPlugins","hasOwnProperty","cmsField","plugin","operator","fieldSearchPlugin","value","fieldPath","apply","basePath","createElasticsearchQueryBody","params","model","after","limit","queryPlugins","byType","pl","modify","bool","size","search_after","track_total_hits"],"mappings":"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","sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { operatorPluginsList } from \"./operatorPluginsList\";\nimport { transformValueForSearch } from \"./transformValueForSearch\";\nimport { searchPluginsList } from \"./searchPluginsList\";\nimport {\n    CmsContentEntryListArgs,\n    CmsContentEntryListSort,\n    CmsContentEntryListWhere,\n    CmsContentModel,\n    CmsContext\n} from \"@webiny/api-headless-cms/types\";\nimport { ElasticsearchQueryBuilderValueSearchPlugin, ElasticsearchQueryPlugin } from \"~/types\";\nimport {\n    TYPE_ENTRY_LATEST,\n    TYPE_ENTRY_PUBLISHED\n} from \"~/operations/entry/CmsContentEntryDynamoElastic\";\nimport {\n    SearchBody as esSearchBody,\n    Sort as esSort,\n    ElasticsearchBoolQueryConfig\n} from \"@webiny/api-elasticsearch/types\";\nimport { decodeCursor } from \"@webiny/api-elasticsearch/cursors\";\nimport { createSort } from \"@webiny/api-elasticsearch/sort\";\nimport { createModelFields, ModelField, ModelFields } from \"./fields\";\nimport { CmsEntryElasticsearchFieldPlugin } from \"~/plugins/CmsEntryElasticsearchFieldPlugin\";\n\ninterface CreateElasticsearchParams {\n    context: CmsContext;\n    model: CmsContentModel;\n    args: CmsContentEntryListArgs;\n    parentPath?: string;\n}\n\ninterface CreateElasticsearchSortParams {\n    context: CmsContext;\n    sort?: CmsContentEntryListSort;\n    modelFields: ModelFields;\n    parentPath?: string;\n    model: CmsContentModel;\n    searchPlugins: Record<string, ElasticsearchQueryBuilderValueSearchPlugin>;\n}\n\ninterface CreateElasticsearchQueryArgs {\n    model: CmsContentModel;\n    context: CmsContext;\n    where: CmsContentEntryListWhere;\n    modelFields: ModelFields;\n    parentPath?: string;\n    searchPlugins: Record<string, ElasticsearchQueryBuilderValueSearchPlugin>;\n}\n\nconst specialFields = [\"published\", \"latest\"];\nconst noKeywordFields = [\"date\", \"number\", \"boolean\"];\n\nconst parseWhereKeyRegExp = new RegExp(/^([a-zA-Z0-9]+)(_[a-zA-Z0-9_]+)?$/);\n\nconst parseWhereKey = (key: string) => {\n    const match = key.match(parseWhereKeyRegExp);\n\n    if (!match) {\n        throw new Error(`It is not possible to search by key \"${key}\"`);\n    }\n\n    const [, field, operation = \"eq\"] = match;\n    const op = operation.match(/^_/) ? operation.substr(1) : operation;\n\n    if (!field.match(/^([a-zA-Z]+)$/)) {\n        throw new Error(`Cannot filter by \"${field}\".`);\n    }\n\n    return { field, op };\n};\n\nconst createElasticsearchSortParams = (args: CreateElasticsearchSortParams): esSort => {\n    const { context, sort, modelFields, parentPath, searchPlugins } = args;\n\n    if (!sort || sort.length === 0) {\n        return undefined;\n    }\n\n    const sortPlugins = Object.values(modelFields).reduce((plugins, modelField) => {\n        const searchPlugin = searchPlugins[modelField.type];\n\n        plugins[modelField.field.fieldId] = new CmsEntryElasticsearchFieldPlugin({\n            unmappedType: modelField.unmappedType,\n            keyword: hasKeyword(modelField),\n            sortable: modelField.isSortable,\n            searchable: modelField.isSearchable,\n            field: modelField.field.fieldId,\n            path: createFieldPath({\n                context,\n                parentPath,\n                modelField: modelField,\n                searchPlugin\n            })\n        });\n        return plugins;\n    }, {});\n\n    return createSort({\n        context,\n        plugins: sortPlugins,\n        sort\n    });\n};\n/**\n * Latest and published are specific in Elasticsearch to that extend that they are tagged in the __type property.\n * We allow either published or either latest.\n * Latest is used in the manage API and published in the read API.\n */\nconst createInitialQueryValue = (\n    args: CreateElasticsearchQueryArgs\n): ElasticsearchBoolQueryConfig => {\n    const { where, context } = args;\n\n    const query: ElasticsearchBoolQueryConfig = {\n        must: [],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n\n    // When ES index is shared between tenants, we need to filter records by tenant ID\n    const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n    if (sharedIndex) {\n        const tenant = context.tenancy.getCurrentTenant();\n        query.must.push({ term: { \"tenant.keyword\": tenant.id } });\n    }\n    /**\n     * We must transform published and latest where args into something that is understandable by our Elasticsearch\n     */\n    if (where.published === true) {\n        query.must.push({\n            term: {\n                \"__type.keyword\": TYPE_ENTRY_PUBLISHED\n            }\n        });\n    } else if (where.latest === true) {\n        query.must.push({\n            term: {\n                \"__type.keyword\": TYPE_ENTRY_LATEST\n            }\n        });\n    }\n    // we do not allow not published and not latest\n    else if (where.published === false) {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query with \"published\" set at false.`,\n            \"ELASTICSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    } else if (where.latest === false) {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query with \"latest\" set at false.`,\n            \"ELASTICSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    }\n    //\n    return query;\n};\n\ninterface CreateFieldPathParams {\n    modelField: ModelField;\n    searchPlugin?: ElasticsearchQueryBuilderValueSearchPlugin;\n    context: CmsContext;\n    parentPath?: string;\n}\nconst createFieldPath = ({\n    modelField,\n    searchPlugin,\n    context,\n    parentPath\n}: CreateFieldPathParams): string => {\n    let path;\n    if (searchPlugin && typeof searchPlugin.createPath === \"function\") {\n        path = searchPlugin.createPath({\n            field: modelField.field,\n            context\n        });\n    } else if (typeof modelField.path === \"function\") {\n        path = modelField.path(modelField.field.fieldId);\n    }\n    if (!path) {\n        path = modelField.path || modelField.field.fieldId || modelField.field.id;\n    }\n    return modelField.isSystemField || !parentPath || path.match(parentPath)\n        ? path\n        : `${parentPath}.${path}`;\n};\n\nconst hasKeyword = (modelField: ModelField): boolean => {\n    /**\n     * We defined some field types that MUST have no keyword added to the field path\n     */\n    if (noKeywordFields.includes(modelField.type)) {\n        return false;\n    } else if (modelField.unmappedType) {\n        /**\n         * If modelField has unmapped type defined, do not add keyword.\n         */\n        return false;\n    } else if (modelField.keyword === false) {\n        /**\n         * And if specifically defined that modelField has no keyword, do not add it.\n         */\n        return false;\n    }\n    /**\n     * All other fields have keyword added.\n     */\n    return true;\n};\n/*\n * Iterate through where keys and apply plugins where necessary\n */\nconst execElasticsearchBuildQueryPlugins = (\n    args: CreateElasticsearchQueryArgs\n): ElasticsearchBoolQueryConfig => {\n    const { where, modelFields, parentPath, context, searchPlugins } = args;\n    const query = createInitialQueryValue(args);\n\n    /**\n     * Always remove special fields, as these do not exist in Elasticsearch.\n     */\n    for (const sf of specialFields) {\n        delete where[sf];\n    }\n\n    if (!where || Object.keys(where).length === 0) {\n        return query;\n    }\n\n    const operatorPlugins = operatorPluginsList(context);\n\n    for (const key in where) {\n        if (where.hasOwnProperty(key) === false) {\n            continue;\n        }\n        /**\n         * We do not need to go further if value is undefined.\n         * There are few hardcoded possibilities when value is undefined, for example, ownedBy.\n         */\n        if (where[key] === undefined) {\n            continue;\n        }\n        const { field, op } = parseWhereKey(key);\n        const modelField = modelFields[field];\n\n        if (!modelField) {\n            throw new WebinyError(`There is no field \"${field}\".`);\n        }\n        const { isSearchable = false, field: cmsField } = modelField;\n        if (!isSearchable) {\n            throw new WebinyError(`Field \"${field}\" is not searchable.`);\n        }\n        const plugin = operatorPlugins[op];\n        if (!plugin) {\n            throw new WebinyError(\"Operator plugin missing.\", \"PLUGIN_MISSING\", {\n                operator: op\n            });\n        }\n        const fieldSearchPlugin = searchPlugins[modelField.type];\n        const value = transformValueForSearch({\n            plugins: searchPlugins,\n            field: cmsField,\n            value: where[key],\n            context\n        });\n\n        const fieldPath = createFieldPath({\n            context,\n            searchPlugin: fieldSearchPlugin,\n            modelField,\n            parentPath: parentPath\n        });\n        const keyword = hasKeyword(modelField);\n        plugin.apply(query, {\n            basePath: fieldPath,\n            path: keyword ? `${fieldPath}.keyword` : fieldPath,\n            value,\n            context,\n            keyword\n        });\n    }\n\n    return query;\n};\n\nexport const createElasticsearchQueryBody = (params: CreateElasticsearchParams): esSearchBody => {\n    const { context, model, args, parentPath = null } = params;\n    const { where, after, limit, sort } = args;\n\n    const modelFields = createModelFields(context, model);\n    const searchPlugins = searchPluginsList(context);\n\n    const query = execElasticsearchBuildQueryPlugins({\n        model,\n        context,\n        where,\n        modelFields,\n        parentPath,\n        searchPlugins\n    });\n\n    const queryPlugins =\n        context.plugins.byType<ElasticsearchQueryPlugin>(\"cms-elasticsearch-query\");\n    for (const pl of queryPlugins) {\n        pl.modify({ query, model, context });\n    }\n\n    return {\n        query: {\n            bool: {\n                must: query.must.length > 0 ? query.must : undefined,\n                must_not: query.must_not.length > 0 ? query.must_not : undefined,\n                should: query.should.length > 0 ? query.should : undefined,\n                filter: query.filter.length > 0 ? query.filter : undefined\n            }\n        },\n        sort: createElasticsearchSortParams({\n            context,\n            sort,\n            modelFields,\n            parentPath,\n            model,\n            searchPlugins\n        }),\n        size: limit + 1,\n        // eslint-disable-next-line\n        search_after: decodeCursor(after) as any,\n        // eslint-disable-next-line\n        track_total_hits: true\n    };\n};\n"],"file":"createElasticsearchQueryBody.js"}
+{"version":3,"sources":["../../src/helpers/createElasticsearchQueryBody.ts"],"names":["specialFields","noKeywordFields","createElasticsearchSortParams","args","context","sort","modelFields","parentPath","searchPlugins","length","undefined","sortPlugins","Object","values","reduce","plugins","modelField","searchPlugin","type","field","fieldId","CmsEntryElasticsearchFieldPlugin","unmappedType","keyword","hasKeyword","sortable","isSortable","searchable","isSearchable","path","createFieldPath","fieldPlugins","createInitialQueryValue","where","query","must","must_not","should","filter","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","tenant","tenancy","getCurrentTenant","push","term","id","published","TYPE_ENTRY_PUBLISHED","latest","TYPE_ENTRY_LATEST","WebinyError","createPath","isSystemField","match","includes","execElasticsearchBuildQueryPlugins","sf","keys","operatorPlugins","key","hasOwnProperty","operator","cmsField","plugin","fieldSearchPlugin","value","fieldPath","apply","basePath","createElasticsearchQueryBody","params","model","after","limit","queryPlugins","byType","pl","modify","bool","size","search_after","track_total_hits"],"mappings":"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","sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { operatorPluginsList } from \"./operatorPluginsList\";\nimport { transformValueForSearch } from \"./transformValueForSearch\";\nimport { searchPluginsList } from \"./searchPluginsList\";\nimport {\n    CmsContentEntryListArgs,\n    CmsContentEntryListSort,\n    CmsContentEntryListWhere,\n    CmsContentModel,\n    CmsContext\n} from \"@webiny/api-headless-cms/types\";\nimport { ElasticsearchQueryBuilderValueSearchPlugin, ElasticsearchQueryPlugin } from \"~/types\";\nimport {\n    TYPE_ENTRY_LATEST,\n    TYPE_ENTRY_PUBLISHED\n} from \"~/operations/entry/CmsContentEntryDynamoElastic\";\nimport {\n    SearchBody as esSearchBody,\n    Sort as esSort,\n    ElasticsearchBoolQueryConfig\n} from \"@webiny/api-elasticsearch/types\";\nimport { decodeCursor } from \"@webiny/api-elasticsearch/cursors\";\nimport { createSort } from \"@webiny/api-elasticsearch/sort\";\nimport { createModelFields, ModelField, ModelFields } from \"./fields\";\nimport { CmsEntryElasticsearchFieldPlugin } from \"~/plugins/CmsEntryElasticsearchFieldPlugin\";\nimport { parseWhereKey } from \"@webiny/api-elasticsearch/where\";\n\ninterface CreateElasticsearchParams {\n    context: CmsContext;\n    model: CmsContentModel;\n    args: CmsContentEntryListArgs;\n    parentPath?: string;\n}\n\ninterface CreateElasticsearchSortParams {\n    context: CmsContext;\n    sort?: CmsContentEntryListSort;\n    modelFields: ModelFields;\n    parentPath?: string;\n    model: CmsContentModel;\n    searchPlugins: Record<string, ElasticsearchQueryBuilderValueSearchPlugin>;\n}\n\ninterface CreateElasticsearchQueryArgs {\n    model: CmsContentModel;\n    context: CmsContext;\n    where: CmsContentEntryListWhere;\n    modelFields: ModelFields;\n    parentPath?: string;\n    searchPlugins: Record<string, ElasticsearchQueryBuilderValueSearchPlugin>;\n}\n\nconst specialFields = [\"published\", \"latest\"];\nconst noKeywordFields = [\"date\", \"number\", \"boolean\"];\n\nconst createElasticsearchSortParams = (args: CreateElasticsearchSortParams): esSort => {\n    const { context, sort, modelFields, parentPath, searchPlugins } = args;\n\n    if (!sort || sort.length === 0) {\n        return undefined;\n    }\n\n    const sortPlugins: Record<string, CmsEntryElasticsearchFieldPlugin> = Object.values(\n        modelFields\n    ).reduce((plugins, modelField) => {\n        const searchPlugin = searchPlugins[modelField.type];\n\n        plugins[modelField.field.fieldId] = new CmsEntryElasticsearchFieldPlugin({\n            unmappedType: modelField.unmappedType,\n            keyword: hasKeyword(modelField),\n            sortable: modelField.isSortable,\n            searchable: modelField.isSearchable,\n            field: modelField.field.fieldId,\n            path: createFieldPath({\n                context,\n                parentPath,\n                modelField: modelField,\n                searchPlugin\n            })\n        });\n        return plugins;\n    }, {});\n\n    return createSort({\n        fieldPlugins: sortPlugins,\n        sort\n    });\n};\n/**\n * Latest and published are specific in Elasticsearch to that extend that they are tagged in the __type property.\n * We allow either published or either latest.\n * Latest is used in the manage API and published in the read API.\n */\nconst createInitialQueryValue = (\n    args: CreateElasticsearchQueryArgs\n): ElasticsearchBoolQueryConfig => {\n    const { where, context } = args;\n\n    const query: ElasticsearchBoolQueryConfig = {\n        must: [],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n\n    // When ES index is shared between tenants, we need to filter records by tenant ID\n    const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n    if (sharedIndex) {\n        const tenant = context.tenancy.getCurrentTenant();\n        query.must.push({ term: { \"tenant.keyword\": tenant.id } });\n    }\n    /**\n     * We must transform published and latest where args into something that is understandable by our Elasticsearch\n     */\n    if (where.published === true) {\n        query.must.push({\n            term: {\n                \"__type.keyword\": TYPE_ENTRY_PUBLISHED\n            }\n        });\n    } else if (where.latest === true) {\n        query.must.push({\n            term: {\n                \"__type.keyword\": TYPE_ENTRY_LATEST\n            }\n        });\n    }\n    // we do not allow not published and not latest\n    else if (where.published === false) {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query with \"published\" set at false.`,\n            \"ELASTICSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    } else if (where.latest === false) {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query with \"latest\" set at false.`,\n            \"ELASTICSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    }\n    //\n    return query;\n};\n\ninterface CreateFieldPathParams {\n    modelField: ModelField;\n    searchPlugin?: ElasticsearchQueryBuilderValueSearchPlugin;\n    context: CmsContext;\n    parentPath?: string;\n}\nconst createFieldPath = ({\n    modelField,\n    searchPlugin,\n    context,\n    parentPath\n}: CreateFieldPathParams): string => {\n    let path;\n    if (searchPlugin && typeof searchPlugin.createPath === \"function\") {\n        path = searchPlugin.createPath({\n            field: modelField.field,\n            context\n        });\n    } else if (typeof modelField.path === \"function\") {\n        path = modelField.path(modelField.field.fieldId);\n    }\n    if (!path) {\n        path = modelField.path || modelField.field.fieldId || modelField.field.id;\n    }\n    return modelField.isSystemField || !parentPath || path.match(parentPath)\n        ? path\n        : `${parentPath}.${path}`;\n};\n\nconst hasKeyword = (modelField: ModelField): boolean => {\n    /**\n     * We defined some field types that MUST have no keyword added to the field path\n     */\n    if (noKeywordFields.includes(modelField.type)) {\n        return false;\n    } else if (modelField.unmappedType) {\n        /**\n         * If modelField has unmapped type defined, do not add keyword.\n         */\n        return false;\n    } else if (modelField.keyword === false) {\n        /**\n         * And if specifically defined that modelField has no keyword, do not add it.\n         */\n        return false;\n    }\n    /**\n     * All other fields have keyword added.\n     */\n    return true;\n};\n/*\n * Iterate through where keys and apply plugins where necessary\n */\nconst execElasticsearchBuildQueryPlugins = (\n    args: CreateElasticsearchQueryArgs\n): ElasticsearchBoolQueryConfig => {\n    const { where, modelFields, parentPath, context, searchPlugins } = args;\n    const query = createInitialQueryValue(args);\n\n    /**\n     * Always remove special fields, as these do not exist in Elasticsearch.\n     */\n    for (const sf of specialFields) {\n        delete where[sf];\n    }\n\n    if (!where || Object.keys(where).length === 0) {\n        return query;\n    }\n\n    const operatorPlugins = operatorPluginsList(context);\n\n    for (const key in where) {\n        if (where.hasOwnProperty(key) === false) {\n            continue;\n        }\n        /**\n         * We do not need to go further if value is undefined.\n         * There are few hardcoded possibilities when value is undefined, for example, ownedBy.\n         */\n        if (where[key] === undefined) {\n            continue;\n        }\n        const { field, operator } = parseWhereKey(key);\n        const modelField = modelFields[field];\n\n        if (!modelField) {\n            throw new WebinyError(`There is no field \"${field}\".`);\n        }\n        const { isSearchable = false, field: cmsField } = modelField;\n        if (!isSearchable) {\n            throw new WebinyError(`Field \"${field}\" is not searchable.`);\n        }\n        const plugin = operatorPlugins[operator];\n        if (!plugin) {\n            throw new WebinyError(\"Operator plugin missing.\", \"PLUGIN_MISSING\", {\n                operator\n            });\n        }\n        const fieldSearchPlugin = searchPlugins[modelField.type];\n        const value = transformValueForSearch({\n            plugins: searchPlugins,\n            field: cmsField,\n            value: where[key],\n            context\n        });\n\n        const fieldPath = createFieldPath({\n            context,\n            searchPlugin: fieldSearchPlugin,\n            modelField,\n            parentPath: parentPath\n        });\n        const keyword = hasKeyword(modelField);\n        plugin.apply(query, {\n            basePath: fieldPath,\n            path: keyword ? `${fieldPath}.keyword` : fieldPath,\n            value,\n            keyword\n        });\n    }\n\n    return query;\n};\n\nexport const createElasticsearchQueryBody = (params: CreateElasticsearchParams): esSearchBody => {\n    const { context, model, args, parentPath = null } = params;\n    const { where, after, limit, sort } = args;\n\n    const modelFields = createModelFields(context, model);\n    const searchPlugins = searchPluginsList(context);\n\n    const query = execElasticsearchBuildQueryPlugins({\n        model,\n        context,\n        where,\n        modelFields,\n        parentPath,\n        searchPlugins\n    });\n\n    const queryPlugins =\n        context.plugins.byType<ElasticsearchQueryPlugin>(\"cms-elasticsearch-query\");\n    for (const pl of queryPlugins) {\n        pl.modify({ query, model, context });\n    }\n\n    return {\n        query: {\n            bool: {\n                must: query.must.length > 0 ? query.must : undefined,\n                must_not: query.must_not.length > 0 ? query.must_not : undefined,\n                should: query.should.length > 0 ? query.should : undefined,\n                filter: query.filter.length > 0 ? query.filter : undefined\n            }\n        },\n        sort: createElasticsearchSortParams({\n            context,\n            sort,\n            modelFields,\n            parentPath,\n            model,\n            searchPlugins\n        }),\n        size: limit + 1,\n        // eslint-disable-next-line\n        search_after: decodeCursor(after) as any,\n        // eslint-disable-next-line\n        track_total_hits: true\n    };\n};\n"],"file":"createElasticsearchQueryBody.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-ddb-es",
-	"version": "5.15.0-beta.3",
+	"version": "5.16.0-beta.2",
 	"main": "index.js",
 	"keywords": [
 		"@webiny/api-headless-cms",
@@ -23,14 +23,14 @@
 	"license": "MIT",
 	"dependencies": {
 		"@babel/runtime": "7.15.3",
-		"@webiny/api-headless-cms": "5.15.0-beta.3",
-		"@webiny/api-upgrade": "5.15.0-beta.3",
-		"@webiny/db-dynamodb": "5.15.0-beta.3",
-		"@webiny/error": "5.15.0-beta.3",
-		"@webiny/handler": "5.15.0-beta.3",
-		"@webiny/handler-aws": "5.15.0-beta.3",
-		"@webiny/handler-db": "5.15.0-beta.3",
-		"@webiny/plugins": "5.15.0-beta.3",
+		"@webiny/api-headless-cms": "5.16.0-beta.2",
+		"@webiny/api-upgrade": "5.16.0-beta.2",
+		"@webiny/db-dynamodb": "5.16.0-beta.2",
+		"@webiny/error": "5.16.0-beta.2",
+		"@webiny/handler": "5.16.0-beta.2",
+		"@webiny/handler-aws": "5.16.0-beta.2",
+		"@webiny/handler-db": "5.16.0-beta.2",
+		"@webiny/plugins": "5.16.0-beta.2",
 		"dataloader": "2.0.0",
 		"dynamodb-toolbox": "0.3.4",
 		"jsonpack": "1.1.5",
@@ -46,10 +46,10 @@
 		"@elastic/elasticsearch": "7.12.0",
 		"@shelf/jest-elasticsearch": "^1.0.0",
 		"@types/jsonpack": "^1.1.0",
-		"@webiny/api-dynamodb-to-elasticsearch": "^5.15.0-beta.3",
-		"@webiny/api-elasticsearch": "^5.15.0-beta.3",
-		"@webiny/cli": "^5.15.0-beta.3",
-		"@webiny/project-utils": "^5.15.0-beta.3",
+		"@webiny/api-dynamodb-to-elasticsearch": "^5.16.0-beta.2",
+		"@webiny/api-elasticsearch": "^5.16.0-beta.2",
+		"@webiny/cli": "^5.16.0-beta.2",
+		"@webiny/project-utils": "^5.16.0-beta.2",
 		"jest": "^26.6.3",
 		"jest-dynalite": "^3.2.0",
 		"jest-environment-node": "^26.6.2",
@@ -68,5 +68,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "50bbde7aa0b1bea0277ca01dcaf3e8e09e0f4a52"
+	"gitHead": "f8ca0ffc49737da9d2f797382c4df9c701d6f037"
 }