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

package/configurations.d.ts

@@ -1,6 +1,6 @@
 import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 import type { CmsContext } from "./types.js";
-import type { ElasticsearchIndexRequestBody } from "@webiny/api-elasticsearch/types.js";
+import type { OpenSearchIndexRequestBody } from "@webiny/api-opensearch/types.js";
 interface ConfigurationsElasticsearch {
     index: string;
 }
@@ -12,7 +12,7 @@ export interface ConfigurationsIndexSettingsParams {
 }
 export interface Configurations {
     es: (params: CmsElasticsearchParams) => ConfigurationsElasticsearch;
-    indexSettings: (params: ConfigurationsIndexSettingsParams) => Partial<ElasticsearchIndexRequestBody>;
+    indexSettings: (params: ConfigurationsIndexSettingsParams) => Partial<OpenSearchIndexRequestBody>;
 }
 export declare const configurations: Configurations;
 export {};

package/configurations.js

@@ -1,5 +1,5 @@
 import WebinyError from "@webiny/error";
-import { getElasticsearchIndexPrefix, getLastAddedIndexPlugin, isSharedElasticsearchIndex } from "@webiny/api-elasticsearch";
+import { getOpenSearchIndexPrefix, getLastAddedIndexPlugin, isSharedOpenSearchIndex as isSharedElasticsearchIndex } from "@webiny/api-opensearch";
 import { CmsEntryElasticsearchIndexPlugin } from "./plugins/index.js";
 export const configurations = {
   es({
@@ -13,7 +13,7 @@ export const configurations = {
     }
     const sharedIndex = isSharedElasticsearchIndex();
     const index = [sharedIndex ? "root" : tenant, "headless-cms", model.modelId].join("-").toLowerCase();
-    const prefix = getElasticsearchIndexPrefix();
+    const prefix = getOpenSearchIndexPrefix();
     if (!prefix) {
       return {
         index

package/configurations.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","getElasticsearchIndexPrefix","getLastAddedIndexPlugin","isSharedElasticsearchIndex","CmsEntryElasticsearchIndexPlugin","configurations","es","model","tenant","sharedIndex","index","modelId","join","toLowerCase","prefix","indexSettings","context","plugin","container","plugins","type","body"],"sources":["configurations.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { CmsContext } from \"~/types.js\";\nimport {\n    getElasticsearchIndexPrefix,\n    getLastAddedIndexPlugin,\n    isSharedElasticsearchIndex\n} from \"@webiny/api-elasticsearch\";\nimport type { ElasticsearchIndexRequestBody } from \"@webiny/api-elasticsearch/types.js\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/index.js\";\n\ninterface ConfigurationsElasticsearch {\n    index: string;\n}\n\nexport interface CmsElasticsearchParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\nexport interface ConfigurationsIndexSettingsParams {\n    context: CmsContext;\n}\n\nexport interface Configurations {\n    es: (params: CmsElasticsearchParams) => ConfigurationsElasticsearch;\n    indexSettings: (\n        params: ConfigurationsIndexSettingsParams\n    ) => Partial<ElasticsearchIndexRequestBody>;\n}\n\nexport const configurations: Configurations = {\n    es({ model }) {\n        const { tenant } = model;\n\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        }\n\n        const sharedIndex = isSharedElasticsearchIndex();\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = getElasticsearchIndexPrefix();\n\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    },\n    indexSettings: ({ context }) => {\n        const plugin = getLastAddedIndexPlugin<CmsEntryElasticsearchIndexPlugin>({\n            container: context.plugins,\n            type: CmsEntryElasticsearchIndexPlugin.type\n        });\n\n        return plugin ? plugin.body : {};\n    }\n};\n"],"mappings":"AACA,OAAOA,WAAW,MAAM,eAAe;AAEvC,SACIC,2BAA2B,EAC3BC,uBAAuB,EACvBC,0BAA0B,QACvB,2BAA2B;AAElC,SAASC,gCAAgC;AAqBzC,OAAO,MAAMC,cAA8B,GAAG;EAC1CC,EAAEA,CAAC;IAAEC;EAAM,CAAC,EAAE;IACV,MAAM;MAAEC;IAAO,CAAC,GAAGD,KAAK;IAExB,IAAI,CAACC,MAAM,EAAE;MACT,MAAM,IAAIR,WAAW,CACjB,4EAA4E,EAC5E,cACJ,CAAC;IACL;IAEA,MAAMS,WAAW,GAAGN,0BAA0B,CAAC,CAAC;IAChD,MAAMO,KAAK,GAAG,CAACD,WAAW,GAAG,MAAM,GAAGD,MAAM,EAAE,cAAc,EAAED,KAAK,CAACI,OAAO,CAAC,CACvEC,IAAI,CAAC,GAAG,CAAC,CACTC,WAAW,CAAC,CAAC;IAElB,MAAMC,MAAM,GAAGb,2BAA2B,CAAC,CAAC;IAE5C,IAAI,CAACa,MAAM,EAAE;MACT,OAAO;QACHJ;MACJ,CAAC;IACL;IACA,OAAO;MACHA,KAAK,EAAEI,MAAM,GAAGJ;IACpB,CAAC;EACL,CAAC;EACDK,aAAa,EAAEA,CAAC;IAAEC;EAAQ,CAAC,KAAK;IAC5B,MAAMC,MAAM,GAAGf,uBAAuB,CAAmC;MACrEgB,SAAS,EAAEF,OAAO,CAACG,OAAO;MAC1BC,IAAI,EAAEhB,gCAAgC,CAACgB;IAC3C,CAAC,CAAC;IAEF,OAAOH,MAAM,GAAGA,MAAM,CAACI,IAAI,GAAG,CAAC,CAAC;EACpC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["WebinyError","getOpenSearchIndexPrefix","getLastAddedIndexPlugin","isSharedOpenSearchIndex","isSharedElasticsearchIndex","CmsEntryElasticsearchIndexPlugin","configurations","es","model","tenant","sharedIndex","index","modelId","join","toLowerCase","prefix","indexSettings","context","plugin","container","plugins","type","body"],"sources":["configurations.ts"],"sourcesContent":["import type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\nimport type { CmsContext } from \"~/types.js\";\nimport {\n    getOpenSearchIndexPrefix as getOpenSearchIndexPrefix,\n    getLastAddedIndexPlugin,\n    isSharedOpenSearchIndex as isSharedElasticsearchIndex\n} from \"@webiny/api-opensearch\";\nimport type { OpenSearchIndexRequestBody } from \"@webiny/api-opensearch/types.js\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/index.js\";\n\ninterface ConfigurationsElasticsearch {\n    index: string;\n}\n\nexport interface CmsElasticsearchParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\nexport interface ConfigurationsIndexSettingsParams {\n    context: CmsContext;\n}\n\nexport interface Configurations {\n    es: (params: CmsElasticsearchParams) => ConfigurationsElasticsearch;\n    indexSettings: (\n        params: ConfigurationsIndexSettingsParams\n    ) => Partial<OpenSearchIndexRequestBody>;\n}\n\nexport const configurations: Configurations = {\n    es({ model }) {\n        const { tenant } = model;\n\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        }\n\n        const sharedIndex = isSharedElasticsearchIndex();\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = getOpenSearchIndexPrefix();\n\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    },\n    indexSettings: ({ context }) => {\n        const plugin = getLastAddedIndexPlugin<CmsEntryElasticsearchIndexPlugin>({\n            container: context.plugins,\n            type: CmsEntryElasticsearchIndexPlugin.type\n        });\n\n        return plugin ? plugin.body : {};\n    }\n};\n"],"mappings":"AACA,OAAOA,WAAW,MAAM,eAAe;AAEvC,SACIC,wBAAoD,EACpDC,uBAAuB,EACvBC,uBAAuB,IAAIC,0BAA0B,QAClD,wBAAwB;AAE/B,SAASC,gCAAgC;AAqBzC,OAAO,MAAMC,cAA8B,GAAG;EAC1CC,EAAEA,CAAC;IAAEC;EAAM,CAAC,EAAE;IACV,MAAM;MAAEC;IAAO,CAAC,GAAGD,KAAK;IAExB,IAAI,CAACC,MAAM,EAAE;MACT,MAAM,IAAIT,WAAW,CACjB,4EAA4E,EAC5E,cACJ,CAAC;IACL;IAEA,MAAMU,WAAW,GAAGN,0BAA0B,CAAC,CAAC;IAChD,MAAMO,KAAK,GAAG,CAACD,WAAW,GAAG,MAAM,GAAGD,MAAM,EAAE,cAAc,EAAED,KAAK,CAACI,OAAO,CAAC,CACvEC,IAAI,CAAC,GAAG,CAAC,CACTC,WAAW,CAAC,CAAC;IAElB,MAAMC,MAAM,GAAGd,wBAAwB,CAAC,CAAC;IAEzC,IAAI,CAACc,MAAM,EAAE;MACT,OAAO;QACHJ;MACJ,CAAC;IACL;IACA,OAAO;MACHA,KAAK,EAAEI,MAAM,GAAGJ;IACpB,CAAC;EACL,CAAC;EACDK,aAAa,EAAEA,CAAC;IAAEC;EAAQ,CAAC,KAAK;IAC5B,MAAMC,MAAM,GAAGhB,uBAAuB,CAAmC;MACrEiB,SAAS,EAAEF,OAAO,CAACG,OAAO;MAC1BC,IAAI,EAAEhB,gCAAgC,CAACgB;IAC3C,CAAC,CAAC;IAEF,OAAOH,MAAM,GAAGA,MAAM,CAACI,IAAI,GAAG,CAAC,CAAC;EACpC;AACJ,CAAC","ignoreList":[]}

package/elasticsearch/createElasticsearchIndex.d.ts

@@ -1,4 +1,4 @@
-import type { Client } from "@elastic/elasticsearch";
+import type { Client } from "@webiny/api-opensearch";
 import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 export interface CreateElasticsearchIndexParams {

package/elasticsearch/createElasticsearchIndex.js

@@ -1,5 +1,5 @@
 import { CmsEntryElasticsearchIndexPlugin } from "../plugins/CmsEntryElasticsearchIndexPlugin.js";
-import { createIndex } from "@webiny/api-elasticsearch";
+import { createIndex } from "@webiny/api-opensearch";
 import { configurations } from "../configurations.js";
 export const createElasticsearchIndex = async params => {
   const {

package/elasticsearch/createElasticsearchIndex.js.map

@@ -1 +1 @@
-{"version":3,"names":["CmsEntryElasticsearchIndexPlugin","createIndex","configurations","createElasticsearchIndex","params","client","plugins","model","index","es","type","tenant","onExists","console","log","name","onError","ex","error"],"sources":["createElasticsearchIndex.ts"],"sourcesContent":["import type { Client } from \"@elastic/elasticsearch\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin.js\";\nimport { createIndex } from \"@webiny/api-elasticsearch\";\nimport { configurations } from \"~/configurations.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\nexport interface CreateElasticsearchIndexParams {\n    client: Client;\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\n\nexport const createElasticsearchIndex = async (params: CreateElasticsearchIndexParams) => {\n    const { client, plugins, model } = params;\n\n    const { index } = configurations.es({\n        model\n    });\n\n    await createIndex({\n        client,\n        index,\n        type: CmsEntryElasticsearchIndexPlugin.type,\n        tenant: model.tenant,\n        plugins,\n        onExists: () => {\n            console.log(\n                `Elasticsearch index \"${index}\" for the CMS model \"${model.name}\" already exists.`\n            );\n        },\n        onError: ex => {\n            console.error(\n                `Could not create Elasticsearch index \"${index}\" for the CMS model \"${model.name}\".`\n            );\n            console.error(ex);\n            return ex;\n        }\n    });\n};\n"],"mappings":"AAEA,SAASA,gCAAgC;AACzC,SAASC,WAAW,QAAQ,2BAA2B;AACvD,SAASC,cAAc;AASvB,OAAO,MAAMC,wBAAwB,GAAG,MAAOC,MAAsC,IAAK;EACtF,MAAM;IAAEC,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAEzC,MAAM;IAAEI;EAAM,CAAC,GAAGN,cAAc,CAACO,EAAE,CAAC;IAChCF;EACJ,CAAC,CAAC;EAEF,MAAMN,WAAW,CAAC;IACdI,MAAM;IACNG,KAAK;IACLE,IAAI,EAAEV,gCAAgC,CAACU,IAAI;IAC3CC,MAAM,EAAEJ,KAAK,CAACI,MAAM;IACpBL,OAAO;IACPM,QAAQ,EAAEA,CAAA,KAAM;MACZC,OAAO,CAACC,GAAG,CACP,wBAAwBN,KAAK,wBAAwBD,KAAK,CAACQ,IAAI,mBACnE,CAAC;IACL,CAAC;IACDC,OAAO,EAAEC,EAAE,IAAI;MACXJ,OAAO,CAACK,KAAK,CACT,yCAAyCV,KAAK,wBAAwBD,KAAK,CAACQ,IAAI,IACpF,CAAC;MACDF,OAAO,CAACK,KAAK,CAACD,EAAE,CAAC;MACjB,OAAOA,EAAE;IACb;EACJ,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["CmsEntryElasticsearchIndexPlugin","createIndex","configurations","createElasticsearchIndex","params","client","plugins","model","index","es","type","tenant","onExists","console","log","name","onError","ex","error"],"sources":["createElasticsearchIndex.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin.js\";\nimport { createIndex } from \"@webiny/api-opensearch\";\nimport { configurations } from \"~/configurations.js\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\nexport interface CreateElasticsearchIndexParams {\n    client: Client;\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\n\nexport const createElasticsearchIndex = async (params: CreateElasticsearchIndexParams) => {\n    const { client, plugins, model } = params;\n\n    const { index } = configurations.es({\n        model\n    });\n\n    await createIndex({\n        client,\n        index,\n        type: CmsEntryElasticsearchIndexPlugin.type,\n        tenant: model.tenant,\n        plugins,\n        onExists: () => {\n            console.log(\n                `Elasticsearch index \"${index}\" for the CMS model \"${model.name}\" already exists.`\n            );\n        },\n        onError: ex => {\n            console.error(\n                `Could not create Elasticsearch index \"${index}\" for the CMS model \"${model.name}\".`\n            );\n            console.error(ex);\n            return ex;\n        }\n    });\n};\n"],"mappings":"AAEA,SAASA,gCAAgC;AACzC,SAASC,WAAW,QAAQ,wBAAwB;AACpD,SAASC,cAAc;AASvB,OAAO,MAAMC,wBAAwB,GAAG,MAAOC,MAAsC,IAAK;EACtF,MAAM;IAAEC,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAEzC,MAAM;IAAEI;EAAM,CAAC,GAAGN,cAAc,CAACO,EAAE,CAAC;IAChCF;EACJ,CAAC,CAAC;EAEF,MAAMN,WAAW,CAAC;IACdI,MAAM;IACNG,KAAK;IACLE,IAAI,EAAEV,gCAAgC,CAACU,IAAI;IAC3CC,MAAM,EAAEJ,KAAK,CAACI,MAAM;IACpBL,OAAO;IACPM,QAAQ,EAAEA,CAAA,KAAM;MACZC,OAAO,CAACC,GAAG,CACP,wBAAwBN,KAAK,wBAAwBD,KAAK,CAACQ,IAAI,mBACnE,CAAC;IACL,CAAC;IACDC,OAAO,EAAEC,EAAE,IAAI;MACXJ,OAAO,CAACK,KAAK,CACT,yCAAyCV,KAAK,wBAAwBD,KAAK,CAACQ,IAAI,IACpF,CAAC;MACDF,OAAO,CAACK,KAAK,CAACD,EAAE,CAAC;MACjB,OAAOA,EAAE;IACb;EACJ,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/elasticsearch/deleteElasticsearchIndex.d.ts

@@ -1,4 +1,4 @@
-import type { Client } from "@elastic/elasticsearch";
+import type { Client } from "@webiny/api-opensearch";
 import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 interface DeleteElasticsearchIndexParams {
     client: Client;

package/elasticsearch/deleteElasticsearchIndex.js.map

@@ -1 +1 @@
-{"version":3,"names":["configurations","deleteElasticsearchIndex","params","client","model","index","es","body","exists","indices","delete","ignore_unavailable","ex","console","log","message"],"sources":["deleteElasticsearchIndex.ts"],"sourcesContent":["import type { Client } from \"@elastic/elasticsearch\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { configurations } from \"~/configurations.js\";\n\ninterface DeleteElasticsearchIndexParams {\n    client: Client;\n    model: CmsModel;\n}\n\nexport const deleteElasticsearchIndex = async (\n    params: DeleteElasticsearchIndexParams\n): Promise<void> => {\n    const { client, model } = params;\n\n    const { index } = configurations.es({\n        model\n    });\n    const { body: exists } = await client.indices.exists({\n        index\n    });\n    if (!exists) {\n        return;\n    }\n\n    try {\n        await client.indices.delete({\n            index,\n            ignore_unavailable: true\n        });\n    } catch (ex) {\n        console.log(`Could not delete Elasticsearch index \"${index}\". Please do it manually.`);\n        console.log(ex.message);\n    }\n};\n"],"mappings":"AAEA,SAASA,cAAc;AAOvB,OAAO,MAAMC,wBAAwB,GAAG,MACpCC,MAAsC,IACtB;EAChB,MAAM;IAAEC,MAAM;IAAEC;EAAM,CAAC,GAAGF,MAAM;EAEhC,MAAM;IAAEG;EAAM,CAAC,GAAGL,cAAc,CAACM,EAAE,CAAC;IAChCF;EACJ,CAAC,CAAC;EACF,MAAM;IAAEG,IAAI,EAAEC;EAAO,CAAC,GAAG,MAAML,MAAM,CAACM,OAAO,CAACD,MAAM,CAAC;IACjDH;EACJ,CAAC,CAAC;EACF,IAAI,CAACG,MAAM,EAAE;IACT;EACJ;EAEA,IAAI;IACA,MAAML,MAAM,CAACM,OAAO,CAACC,MAAM,CAAC;MACxBL,KAAK;MACLM,kBAAkB,EAAE;IACxB,CAAC,CAAC;EACN,CAAC,CAAC,OAAOC,EAAE,EAAE;IACTC,OAAO,CAACC,GAAG,CAAC,yCAAyCT,KAAK,2BAA2B,CAAC;IACtFQ,OAAO,CAACC,GAAG,CAACF,EAAE,CAACG,OAAO,CAAC;EAC3B;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["configurations","deleteElasticsearchIndex","params","client","model","index","es","body","exists","indices","delete","ignore_unavailable","ex","console","log","message"],"sources":["deleteElasticsearchIndex.ts"],"sourcesContent":["import type { Client } from \"@webiny/api-opensearch\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { configurations } from \"~/configurations.js\";\n\ninterface DeleteElasticsearchIndexParams {\n    client: Client;\n    model: CmsModel;\n}\n\nexport const deleteElasticsearchIndex = async (\n    params: DeleteElasticsearchIndexParams\n): Promise<void> => {\n    const { client, model } = params;\n\n    const { index } = configurations.es({\n        model\n    });\n    const { body: exists } = await client.indices.exists({\n        index\n    });\n    if (!exists) {\n        return;\n    }\n\n    try {\n        await client.indices.delete({\n            index,\n            ignore_unavailable: true\n        });\n    } catch (ex) {\n        console.log(`Could not delete Elasticsearch index \"${index}\". Please do it manually.`);\n        console.log(ex.message);\n    }\n};\n"],"mappings":"AAEA,SAASA,cAAc;AAOvB,OAAO,MAAMC,wBAAwB,GAAG,MACpCC,MAAsC,IACtB;EAChB,MAAM;IAAEC,MAAM;IAAEC;EAAM,CAAC,GAAGF,MAAM;EAEhC,MAAM;IAAEG;EAAM,CAAC,GAAGL,cAAc,CAACM,EAAE,CAAC;IAChCF;EACJ,CAAC,CAAC;EACF,MAAM;IAAEG,IAAI,EAAEC;EAAO,CAAC,GAAG,MAAML,MAAM,CAACM,OAAO,CAACD,MAAM,CAAC;IACjDH;EACJ,CAAC,CAAC;EACF,IAAI,CAACG,MAAM,EAAE;IACT;EACJ;EAEA,IAAI;IACA,MAAML,MAAM,CAACM,OAAO,CAACC,MAAM,CAAC;MACxBL,KAAK;MACLM,kBAAkB,EAAE;IACxB,CAAC,CAAC;EACN,CAAC,CAAC,OAAOC,EAAE,EAAE;IACTC,OAAO,CAACC,GAAG,CAAC,yCAAyCT,KAAK,2BAA2B,CAAC;IACtFQ,OAAO,CAACC,GAAG,CAACF,EAAE,CAACG,OAAO,CAAC;EAC3B;AACJ,CAAC","ignoreList":[]}

package/elasticsearch/indexing/dateTimeIndexing.js

@@ -9,12 +9,6 @@ const convertNumberToTime = value => {
   if (value === undefined || value === null) {
     return null;
   }
-  // TODO remove when v5 goes out
-  // this is a fix for pre beta.5
-  if (String(value).match(/^([0-9]{2}):([0-9]{2})/) !== null) {
-    return String(value);
-  }
-  //
   const hours = Math.floor(value / 60 / 60);
   const minutes = Math.floor((value - hours * 60 * 60) / 60);
   const seconds = Math.floor(value - hours * 60 * 60 - minutes * 60);

package/elasticsearch/indexing/dateTimeIndexing.js.map

@@ -1 +1 @@
-{"version":3,"names":["convertTimeToNumber","time","hours","minutes","seconds","split","map","Number","convertNumberToTime","value","undefined","String","match","Math","floor","v","padStart","join","convertValueFromIndex","field","type","settings","dateValue","Date","toISOString","slice","convertValueToIndex","name","fieldType","unmappedType","toIndex","Array","isArray","fromIndex"],"sources":["dateTimeIndexing.ts"],"sourcesContent":["import type { CmsModelDateTimeField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelFieldToElasticsearchPlugin } from \"~/types.js\";\n\nconst convertTimeToNumber = (time?: string): number | null => {\n    if (!time) {\n        return null;\n    }\n    const [hours, minutes, seconds = 0] = time.split(\":\").map(Number);\n    return hours * 60 * 60 + minutes * 60 + seconds;\n};\n\nconst convertNumberToTime = (value?: number): string | null => {\n    if (value === undefined || value === null) {\n        return null;\n    }\n    // TODO remove when v5 goes out\n    // this is a fix for pre beta.5\n    if (String(value).match(/^([0-9]{2}):([0-9]{2})/) !== null) {\n        return String(value);\n    }\n    //\n    const hours = Math.floor(value / 60 / 60);\n\n    const minutes = Math.floor((value - hours * 60 * 60) / 60);\n\n    const seconds = Math.floor(value - hours * 60 * 60 - minutes * 60);\n\n    return [hours, minutes, seconds].map(v => String(v).padStart(2, \"0\")).join(\":\");\n};\n\nconst convertValueFromIndex = (\n    value: string | number,\n    field: CmsModelDateTimeField\n): string | null => {\n    const type = field.settings?.type;\n    if (type === \"time\") {\n        return convertNumberToTime(value as number);\n    } else if (!value) {\n        return null;\n    } else if (type === \"dateTimeWithTimezone\") {\n        return value as string;\n    } else if (type === \"date\") {\n        const dateValue = new Date(value);\n        return dateValue.toISOString().slice(0, 10);\n    }\n    return new Date(value).toISOString();\n};\n\nconst convertValueToIndex = (value: string, field: CmsModelDateTimeField) => {\n    if (!value) {\n        return null;\n    } else if (field.settings?.type === \"time\") {\n        return convertTimeToNumber(value);\n    }\n    return value;\n};\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-datetime\",\n    fieldType: \"datetime\",\n    unmappedType: () => {\n        return \"date\";\n    },\n    toIndex({ field, value }) {\n        if (Array.isArray(value) === true) {\n            return {\n                value: value.map((v: string) => {\n                    return convertValueToIndex(v, field as CmsModelDateTimeField);\n                })\n            };\n        }\n        const dateValue = convertValueToIndex(value, field as CmsModelDateTimeField);\n        return {\n            value: dateValue\n        };\n    },\n    fromIndex({ field, value }) {\n        if (Array.isArray(value)) {\n            return value.map((v: string) => {\n                return convertValueFromIndex(v, field as CmsModelDateTimeField);\n            });\n        }\n        return convertValueFromIndex(value, field as CmsModelDateTimeField);\n    }\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["convertTimeToNumber","time","hours","minutes","seconds","split","map","Number","convertNumberToTime","value","undefined","Math","floor","v","String","padStart","join","convertValueFromIndex","field","type","settings","dateValue","Date","toISOString","slice","convertValueToIndex","name","fieldType","unmappedType","toIndex","Array","isArray","fromIndex"],"sources":["dateTimeIndexing.ts"],"sourcesContent":["import type { CmsModelDateTimeField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsModelFieldToElasticsearchPlugin } from \"~/types.js\";\n\nconst convertTimeToNumber = (time?: string): number | null => {\n    if (!time) {\n        return null;\n    }\n    const [hours, minutes, seconds = 0] = time.split(\":\").map(Number);\n    return hours * 60 * 60 + minutes * 60 + seconds;\n};\n\nconst convertNumberToTime = (value?: number): string | null => {\n    if (value === undefined || value === null) {\n        return null;\n    }\n\n    const hours = Math.floor(value / 60 / 60);\n\n    const minutes = Math.floor((value - hours * 60 * 60) / 60);\n\n    const seconds = Math.floor(value - hours * 60 * 60 - minutes * 60);\n\n    return [hours, minutes, seconds].map(v => String(v).padStart(2, \"0\")).join(\":\");\n};\n\nconst convertValueFromIndex = (\n    value: string | number,\n    field: CmsModelDateTimeField\n): string | null => {\n    const type = field.settings?.type;\n    if (type === \"time\") {\n        return convertNumberToTime(value as number);\n    } else if (!value) {\n        return null;\n    } else if (type === \"dateTimeWithTimezone\") {\n        return value as string;\n    } else if (type === \"date\") {\n        const dateValue = new Date(value);\n        return dateValue.toISOString().slice(0, 10);\n    }\n    return new Date(value).toISOString();\n};\n\nconst convertValueToIndex = (value: string, field: CmsModelDateTimeField) => {\n    if (!value) {\n        return null;\n    } else if (field.settings?.type === \"time\") {\n        return convertTimeToNumber(value);\n    }\n    return value;\n};\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-datetime\",\n    fieldType: \"datetime\",\n    unmappedType: () => {\n        return \"date\";\n    },\n    toIndex({ field, value }) {\n        if (Array.isArray(value) === true) {\n            return {\n                value: value.map((v: string) => {\n                    return convertValueToIndex(v, field as CmsModelDateTimeField);\n                })\n            };\n        }\n        const dateValue = convertValueToIndex(value, field as CmsModelDateTimeField);\n        return {\n            value: dateValue\n        };\n    },\n    fromIndex({ field, value }) {\n        if (Array.isArray(value)) {\n            return value.map((v: string) => {\n                return convertValueFromIndex(v, field as CmsModelDateTimeField);\n            });\n        }\n        return convertValueFromIndex(value, field as CmsModelDateTimeField);\n    }\n});\n"],"mappings":"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","ignoreList":[]}

package/elasticsearch/indices/base.js

@@ -1,4 +1,4 @@
-import { getBaseConfiguration } from "@webiny/api-elasticsearch";
+import { getBaseConfiguration } from "@webiny/api-opensearch";
 import { CmsEntryElasticsearchIndexPlugin } from "../../plugins/CmsEntryElasticsearchIndexPlugin.js";
 export const base = new CmsEntryElasticsearchIndexPlugin({
   body: getBaseConfiguration()

package/elasticsearch/indices/base.js.map

@@ -1 +1 @@
-{"version":3,"names":["getBaseConfiguration","CmsEntryElasticsearchIndexPlugin","base","body"],"sources":["base.ts"],"sourcesContent":["import { getBaseConfiguration } from \"@webiny/api-elasticsearch\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin.js\";\n\nexport const base = new CmsEntryElasticsearchIndexPlugin({\n    body: getBaseConfiguration()\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,2BAA2B;AAChE,SAASC,gCAAgC;AAEzC,OAAO,MAAMC,IAAI,GAAG,IAAID,gCAAgC,CAAC;EACrDE,IAAI,EAAEH,oBAAoB,CAAC;AAC/B,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["getBaseConfiguration","CmsEntryElasticsearchIndexPlugin","base","body"],"sources":["base.ts"],"sourcesContent":["import { getBaseConfiguration } from \"@webiny/api-opensearch\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin.js\";\n\nexport const base = new CmsEntryElasticsearchIndexPlugin({\n    body: getBaseConfiguration()\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,wBAAwB;AAC7D,SAASC,gCAAgC;AAEzC,OAAO,MAAMC,IAAI,GAAG,IAAID,gCAAgC,CAAC;EACrDE,IAAI,EAAEH,oBAAoB,CAAC;AAC/B,CAAC,CAAC","ignoreList":[]}

package/index.js

@@ -10,7 +10,7 @@ import { createEntryEntity } from "./definitions/entry.js";
 import { createElasticsearchIndex } from "./elasticsearch/createElasticsearchIndex.js";
 import { PluginsContainer } from "@webiny/plugins";
 import { createGroupsStorageOperations } from "./operations/group/index.js";
-import { createElasticsearchEntity, createElasticsearchTable, ElasticsearchQueryBuilderOperatorPlugin } from "@webiny/api-elasticsearch";
+import { createOpenSearchEntity, createOpenSearchTable, OpenSearchQueryBuilderOperatorPlugin } from "@webiny/api-opensearch";
 import { elasticsearchIndexPlugins } from "./elasticsearch/indices/index.js";
 import { deleteElasticsearchIndex } from "./elasticsearch/deleteElasticsearchIndex.js";
 import { CmsElasticsearchModelFieldPlugin, CmsEntryElasticsearchBodyModifierPlugin, CmsEntryElasticsearchFullTextSearchPlugin, CmsEntryElasticsearchIndexPlugin, CmsEntryElasticsearchQueryBuilderValueSearchPlugin, CmsEntryElasticsearchQueryModifierPlugin, CmsEntryElasticsearchSortModifierPlugin, CmsEntryElasticsearchValuesModifier } from "./plugins/index.js";
@@ -36,7 +36,7 @@ export const createStorageOperations = params => {
     name: table || process.env.DB_TABLE,
     documentClient
   });
-  const tableElasticsearchInstance = createElasticsearchTable({
+  const tableElasticsearchInstance = createOpenSearchTable({
     name: esTable,
     documentClient
   });
@@ -53,7 +53,7 @@ export const createStorageOperations = params => {
       entityName: ENTITIES.ENTRIES,
       table: tableInstance
     }),
-    entriesEs: createElasticsearchEntity({
+    entriesEs: createOpenSearchEntity({
       entityName: ENTITIES.ENTRIES_ES,
       table: tableElasticsearchInstance
     })
@@ -106,8 +106,8 @@ export const createStorageOperations = params => {
       /**
        * Attach the elasticsearch into context if it is not already attached.
        */
-      if (!context.elasticsearch) {
-        context.elasticsearch = elasticsearch;
+      if (!context.opensearch) {
+        context.opensearch = elasticsearch;
       }
 
       /**
@@ -123,7 +123,7 @@ export const createStorageOperations = params => {
        * We need to fetch all the plugin types in the list from the main container.
        * This way we do not need to register plugins in the storage plugins contains.
        */
-      const types = [ElasticsearchQueryBuilderOperatorPlugin.type,
+      const types = [OpenSearchQueryBuilderOperatorPlugin.type,
       // Headless CMS
       "cms-model-field-to-graphql", CmsEntryFilterPlugin.type, CmsEntryElasticsearchBodyModifierPlugin.type, CmsEntryElasticsearchFullTextSearchPlugin.type, CmsEntryElasticsearchIndexPlugin.type, CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type, CmsEntryElasticsearchQueryModifierPlugin.type, CmsEntryElasticsearchSortModifierPlugin.type, CmsElasticsearchModelFieldPlugin.type, StorageOperationsCmsModelPlugin.type, StorageTransformPlugin.type, CmsEntryElasticsearchValuesModifier.type, CompressorPlugin.type];
       for (const type of types) {

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["dynamoDbValueFilters","elasticsearchPlugins","dynamoDbPlugins","createModelsStorageOperations","createEntriesStorageOperations","ENTITIES","createGroupEntity","createModelEntity","createEntryEntity","createElasticsearchIndex","PluginsContainer","createGroupsStorageOperations","createElasticsearchEntity","createElasticsearchTable","ElasticsearchQueryBuilderOperatorPlugin","elasticsearchIndexPlugins","deleteElasticsearchIndex","CmsElasticsearchModelFieldPlugin","CmsEntryElasticsearchBodyModifierPlugin","CmsEntryElasticsearchFullTextSearchPlugin","CmsEntryElasticsearchIndexPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","CmsEntryElasticsearchQueryModifierPlugin","CmsEntryElasticsearchSortModifierPlugin","CmsEntryElasticsearchValuesModifier","createFilterPlugins","CmsEntryFilterPlugin","StorageOperationsCmsModelPlugin","StorageTransformPlugin","createCreateIndexTask","CompressorPlugin","ModelAfterCreateEventHandler","ModelAfterCreateFromEventHandler","ModelAfterDeleteEventHandler","createTable","createStorageOperations","params","table","esTable","documentClient","elasticsearch","plugins","userPlugins","tableInstance","name","process","env","DB_TABLE","tableElasticsearchInstance","entities","groups","entityName","GROUPS","models","MODELS","entries","ENTRIES","entriesEs","ENTRIES_ES","entity","esEntity","beforeInit","context","db","registry","register","item","app","tags","types","type","mergeByType","dataLoaders","clearAll","init","container","registerFactory","handle","event","model","payload","client","getEntities","getTable","getEsTable"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters/index.js\";\nimport elasticsearchPlugins from \"./elasticsearch/index.js\";\nimport dynamoDbPlugins from \"./dynamoDb/index.js\";\nimport { createModelsStorageOperations } from \"./operations/model/index.js\";\nimport { createEntriesStorageOperations } from \"./operations/entry/index.js\";\nimport type { StorageOperationsFactory } from \"~/types.js\";\nimport { ENTITIES } from \"~/types.js\";\nimport { createGroupEntity } from \"~/definitions/group.js\";\nimport { createModelEntity } from \"~/definitions/model.js\";\nimport { createEntryEntity } from \"~/definitions/entry.js\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex.js\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group/index.js\";\nimport {\n    createElasticsearchEntity,\n    createElasticsearchTable,\n    ElasticsearchQueryBuilderOperatorPlugin\n} from \"@webiny/api-elasticsearch\";\nimport { elasticsearchIndexPlugins } from \"./elasticsearch/indices/index.js\";\nimport { deleteElasticsearchIndex } from \"./elasticsearch/deleteElasticsearchIndex.js\";\nimport {\n    CmsElasticsearchModelFieldPlugin,\n    CmsEntryElasticsearchBodyModifierPlugin,\n    CmsEntryElasticsearchFullTextSearchPlugin,\n    CmsEntryElasticsearchIndexPlugin,\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    CmsEntryElasticsearchQueryModifierPlugin,\n    CmsEntryElasticsearchSortModifierPlugin,\n    CmsEntryElasticsearchValuesModifier\n} from \"~/plugins/index.js\";\nimport { createFilterPlugins } from \"~/operations/entry/elasticsearch/filtering/plugins/index.js\";\nimport { CmsEntryFilterPlugin } from \"~/plugins/CmsEntryFilterPlugin.js\";\nimport { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { createCreateIndexTask } from \"~/tasks/createIndexTaskPlugin.js\";\nimport { CompressorPlugin } from \"@webiny/api\";\nimport { ModelAfterCreateEventHandler } from \"@webiny/api-headless-cms/features/contentModel/CreateModel/index.js\";\nimport { ModelAfterCreateFromEventHandler } from \"@webiny/api-headless-cms/features/contentModel/CreateModelFrom/events.js\";\nimport { ModelAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentModel/DeleteModel/events.js\";\nimport { createTable } from \"@webiny/db-dynamodb\";\n\nexport * from \"./plugins/index.js\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { table, esTable, documentClient, elasticsearch, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        name: table || (process.env.DB_TABLE as string),\n        documentClient\n    });\n    const tableElasticsearchInstance = createElasticsearchTable({\n        name: esTable,\n        documentClient\n    });\n\n    const entities = {\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance\n        }),\n        entriesEs: createElasticsearchEntity({\n            entityName: ENTITIES.ENTRIES_ES,\n            table: tableElasticsearchInstance\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Field plugins for Elasticsearch.\n         */\n        elasticsearchPlugins(),\n        /**\n         * Built-in Elasticsearch index templates.\n         */\n        elasticsearchIndexPlugins(),\n        /**\n         * Filter plugins used to apply filtering from where conditions to Elasticsearch query.\n         */\n        createFilterPlugins(),\n        /**\n         * User defined custom plugins.\n         * They are at the end because we can then override existing plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    const entries = createEntriesStorageOperations({\n        entity: entities.entries,\n        esEntity: entities.entriesEs,\n        plugins,\n        elasticsearch\n    });\n\n    return {\n        name: \"dynamodb:elasticsearch\",\n        beforeInit: async context => {\n            context.db.registry.register({\n                item: entities.entries,\n                app: \"cms\",\n                tags: [\"regular\", entities.entries.name]\n            });\n            context.db.registry.register({\n                item: entities.entriesEs,\n                app: \"cms\",\n                tags: [\"es\", entities.entriesEs.name]\n            });\n            /**\n             * Attach the elasticsearch into context if it is not already attached.\n             */\n            if (!context.elasticsearch) {\n                context.elasticsearch = elasticsearch;\n            }\n\n            /**\n             * This registers the task implementation\n             */\n            createCreateIndexTask(context);\n\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins(), elasticsearchIndexPlugins()]);\n            /**\n             * We need to fetch all the plugin types in the list from the main container.\n             * This way we do not need to register plugins in the storage plugins contains.\n             */\n            const types: string[] = [\n                ElasticsearchQueryBuilderOperatorPlugin.type,\n                // Headless CMS\n                \"cms-model-field-to-graphql\",\n                CmsEntryFilterPlugin.type,\n                CmsEntryElasticsearchBodyModifierPlugin.type,\n                CmsEntryElasticsearchFullTextSearchPlugin.type,\n                CmsEntryElasticsearchIndexPlugin.type,\n                CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type,\n                CmsEntryElasticsearchQueryModifierPlugin.type,\n                CmsEntryElasticsearchSortModifierPlugin.type,\n                CmsElasticsearchModelFieldPlugin.type,\n                StorageOperationsCmsModelPlugin.type,\n                StorageTransformPlugin.type,\n                CmsEntryElasticsearchValuesModifier.type,\n                CompressorPlugin.type\n            ];\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n            entries.dataLoaders.clearAll();\n        },\n        init: async context => {\n            /**\n             * TODO @pavel\n             * Moved operations to AFTER create/from because at in before the model does not have modelId - to create the index.\n             */\n            context.container.registerFactory(ModelAfterCreateEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await createElasticsearchIndex({\n                        client: elasticsearch,\n                        model,\n                        plugins\n                    });\n                }\n            }));\n\n            context.container.registerFactory(ModelAfterCreateFromEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await createElasticsearchIndex({\n                        client: elasticsearch,\n                        model,\n                        plugins\n                    });\n                }\n            }));\n\n            context.container.registerFactory(ModelAfterDeleteEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await deleteElasticsearchIndex({\n                        client: elasticsearch,\n                        model\n                    });\n                }\n            }));\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        getEsTable: () => tableElasticsearchInstance,\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models,\n            elasticsearch\n        }),\n        entries\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["dynamoDbValueFilters","elasticsearchPlugins","dynamoDbPlugins","createModelsStorageOperations","createEntriesStorageOperations","ENTITIES","createGroupEntity","createModelEntity","createEntryEntity","createElasticsearchIndex","PluginsContainer","createGroupsStorageOperations","createOpenSearchEntity","createOpenSearchTable","OpenSearchQueryBuilderOperatorPlugin","elasticsearchIndexPlugins","deleteElasticsearchIndex","CmsElasticsearchModelFieldPlugin","CmsEntryElasticsearchBodyModifierPlugin","CmsEntryElasticsearchFullTextSearchPlugin","CmsEntryElasticsearchIndexPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","CmsEntryElasticsearchQueryModifierPlugin","CmsEntryElasticsearchSortModifierPlugin","CmsEntryElasticsearchValuesModifier","createFilterPlugins","CmsEntryFilterPlugin","StorageOperationsCmsModelPlugin","StorageTransformPlugin","createCreateIndexTask","CompressorPlugin","ModelAfterCreateEventHandler","ModelAfterCreateFromEventHandler","ModelAfterDeleteEventHandler","createTable","createStorageOperations","params","table","esTable","documentClient","elasticsearch","plugins","userPlugins","tableInstance","name","process","env","DB_TABLE","tableElasticsearchInstance","entities","groups","entityName","GROUPS","models","MODELS","entries","ENTRIES","entriesEs","ENTRIES_ES","entity","esEntity","beforeInit","context","db","registry","register","item","app","tags","opensearch","types","type","mergeByType","dataLoaders","clearAll","init","container","registerFactory","handle","event","model","payload","client","getEntities","getTable","getEsTable"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters/index.js\";\nimport elasticsearchPlugins from \"./elasticsearch/index.js\";\nimport dynamoDbPlugins from \"./dynamoDb/index.js\";\nimport { createModelsStorageOperations } from \"./operations/model/index.js\";\nimport { createEntriesStorageOperations } from \"./operations/entry/index.js\";\nimport type { StorageOperationsFactory } from \"~/types.js\";\nimport { ENTITIES } from \"~/types.js\";\nimport { createGroupEntity } from \"~/definitions/group.js\";\nimport { createModelEntity } from \"~/definitions/model.js\";\nimport { createEntryEntity } from \"~/definitions/entry.js\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex.js\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group/index.js\";\nimport {\n    createOpenSearchEntity,\n    createOpenSearchTable,\n    OpenSearchQueryBuilderOperatorPlugin\n} from \"@webiny/api-opensearch\";\nimport { elasticsearchIndexPlugins } from \"./elasticsearch/indices/index.js\";\nimport { deleteElasticsearchIndex } from \"./elasticsearch/deleteElasticsearchIndex.js\";\nimport {\n    CmsElasticsearchModelFieldPlugin,\n    CmsEntryElasticsearchBodyModifierPlugin,\n    CmsEntryElasticsearchFullTextSearchPlugin,\n    CmsEntryElasticsearchIndexPlugin,\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    CmsEntryElasticsearchQueryModifierPlugin,\n    CmsEntryElasticsearchSortModifierPlugin,\n    CmsEntryElasticsearchValuesModifier\n} from \"~/plugins/index.js\";\nimport { createFilterPlugins } from \"~/operations/entry/elasticsearch/filtering/plugins/index.js\";\nimport { CmsEntryFilterPlugin } from \"~/plugins/CmsEntryFilterPlugin.js\";\nimport { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { createCreateIndexTask } from \"~/tasks/createIndexTaskPlugin.js\";\nimport { CompressorPlugin } from \"@webiny/api\";\nimport { ModelAfterCreateEventHandler } from \"@webiny/api-headless-cms/features/contentModel/CreateModel/index.js\";\nimport { ModelAfterCreateFromEventHandler } from \"@webiny/api-headless-cms/features/contentModel/CreateModelFrom/events.js\";\nimport { ModelAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentModel/DeleteModel/events.js\";\nimport { createTable } from \"@webiny/db-dynamodb\";\n\nexport * from \"./plugins/index.js\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { table, esTable, documentClient, elasticsearch, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        name: table || (process.env.DB_TABLE as string),\n        documentClient\n    });\n    const tableElasticsearchInstance = createOpenSearchTable({\n        name: esTable,\n        documentClient\n    });\n\n    const entities = {\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance\n        }),\n        entriesEs: createOpenSearchEntity({\n            entityName: ENTITIES.ENTRIES_ES,\n            table: tableElasticsearchInstance\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Field plugins for Elasticsearch.\n         */\n        elasticsearchPlugins(),\n        /**\n         * Built-in Elasticsearch index templates.\n         */\n        elasticsearchIndexPlugins(),\n        /**\n         * Filter plugins used to apply filtering from where conditions to Elasticsearch query.\n         */\n        createFilterPlugins(),\n        /**\n         * User defined custom plugins.\n         * They are at the end because we can then override existing plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    const entries = createEntriesStorageOperations({\n        entity: entities.entries,\n        esEntity: entities.entriesEs,\n        plugins,\n        elasticsearch\n    });\n\n    return {\n        name: \"dynamodb:elasticsearch\",\n        beforeInit: async context => {\n            context.db.registry.register({\n                item: entities.entries,\n                app: \"cms\",\n                tags: [\"regular\", entities.entries.name]\n            });\n            context.db.registry.register({\n                item: entities.entriesEs,\n                app: \"cms\",\n                tags: [\"es\", entities.entriesEs.name]\n            });\n            /**\n             * Attach the elasticsearch into context if it is not already attached.\n             */\n            if (!context.opensearch) {\n                context.opensearch = elasticsearch;\n            }\n\n            /**\n             * This registers the task implementation\n             */\n            createCreateIndexTask(context);\n\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins(), elasticsearchIndexPlugins()]);\n            /**\n             * We need to fetch all the plugin types in the list from the main container.\n             * This way we do not need to register plugins in the storage plugins contains.\n             */\n            const types: string[] = [\n                OpenSearchQueryBuilderOperatorPlugin.type,\n                // Headless CMS\n                \"cms-model-field-to-graphql\",\n                CmsEntryFilterPlugin.type,\n                CmsEntryElasticsearchBodyModifierPlugin.type,\n                CmsEntryElasticsearchFullTextSearchPlugin.type,\n                CmsEntryElasticsearchIndexPlugin.type,\n                CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type,\n                CmsEntryElasticsearchQueryModifierPlugin.type,\n                CmsEntryElasticsearchSortModifierPlugin.type,\n                CmsElasticsearchModelFieldPlugin.type,\n                StorageOperationsCmsModelPlugin.type,\n                StorageTransformPlugin.type,\n                CmsEntryElasticsearchValuesModifier.type,\n                CompressorPlugin.type\n            ];\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n            entries.dataLoaders.clearAll();\n        },\n        init: async context => {\n            /**\n             * TODO @pavel\n             * Moved operations to AFTER create/from because at in before the model does not have modelId - to create the index.\n             */\n            context.container.registerFactory(ModelAfterCreateEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await createElasticsearchIndex({\n                        client: elasticsearch,\n                        model,\n                        plugins\n                    });\n                }\n            }));\n\n            context.container.registerFactory(ModelAfterCreateFromEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await createElasticsearchIndex({\n                        client: elasticsearch,\n                        model,\n                        plugins\n                    });\n                }\n            }));\n\n            context.container.registerFactory(ModelAfterDeleteEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await deleteElasticsearchIndex({\n                        client: elasticsearch,\n                        model\n                    });\n                }\n            }));\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        getEsTable: () => tableElasticsearchInstance,\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models,\n            elasticsearch\n        }),\n        entries\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/entry/dataLoader/DataLoaderCache.d.ts

@@ -2,6 +2,7 @@ import type DataLoader from "dataloader";
 export interface CacheKeyParams {
     name: string;
     tenant: string;
+    modelId: string;
 }
 export interface ClearAllParams {
     tenant: string;

package/operations/entry/dataLoader/DataLoaderCache.js

@@ -15,10 +15,7 @@ export class DataLoaderCache {
       }
       return;
     }
-    const key = this.createKey({
-      ...params,
-      name: ""
-    });
+    const key = `${params.tenant}_`;
     for (const current in this.cache) {
       if (current.startsWith(key) === false) {
         continue;
@@ -27,7 +24,7 @@ export class DataLoaderCache {
     }
   }
   createKey(params) {
-    return `${params.tenant}_${params.name}`;
+    return `${params.tenant}_${params.modelId}_${params.name}`;
   }
 }
 

package/operations/entry/dataLoader/DataLoaderCache.js.map

@@ -1 +1 @@
-{"version":3,"names":["DataLoaderCache","cache","getDataLoader","params","key","createKey","setDataLoader","dataLoader","clearAll","current","name","startsWith","tenant"],"sources":["DataLoaderCache.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nexport interface CacheKeyParams {\n    name: string;\n    tenant: string;\n}\n\nexport interface ClearAllParams {\n    tenant: string;\n}\n\nexport class DataLoaderCache {\n    private readonly cache: Record<string, DataLoader<any, any>> = {};\n\n    public getDataLoader<I = any, R = any>(params: CacheKeyParams): DataLoader<I, R> | null {\n        const key = this.createKey(params);\n\n        return this.cache[key] || null;\n    }\n\n    public setDataLoader(params: CacheKeyParams, dataLoader: DataLoader<any, any>): void {\n        const key = this.createKey(params);\n        this.cache[key] = dataLoader;\n    }\n\n    public clearAll(params?: ClearAllParams): void {\n        if (!params) {\n            for (const current in this.cache) {\n                this.cache[current].clearAll();\n            }\n            return;\n        }\n        const key = this.createKey({\n            ...params,\n            name: \"\"\n        });\n        for (const current in this.cache) {\n            if (current.startsWith(key) === false) {\n                continue;\n            }\n            this.cache[current].clearAll();\n        }\n    }\n\n    private createKey(params: CacheKeyParams): string {\n        return `${params.tenant}_${params.name}`;\n    }\n}\n"],"mappings":"AAWA,OAAO,MAAMA,eAAe,CAAC;EACRC,KAAK,GAAyC,CAAC,CAAC;EAE1DC,aAAaA,CAAmBC,MAAsB,EAA2B;IACpF,MAAMC,GAAG,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAElC,OAAO,IAAI,CAACF,KAAK,CAACG,GAAG,CAAC,IAAI,IAAI;EAClC;EAEOE,aAAaA,CAACH,MAAsB,EAAEI,UAAgC,EAAQ;IACjF,MAAMH,GAAG,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAClC,IAAI,CAACF,KAAK,CAACG,GAAG,CAAC,GAAGG,UAAU;EAChC;EAEOC,QAAQA,CAACL,MAAuB,EAAQ;IAC3C,IAAI,CAACA,MAAM,EAAE;MACT,KAAK,MAAMM,OAAO,IAAI,IAAI,CAACR,KAAK,EAAE;QAC9B,IAAI,CAACA,KAAK,CAACQ,OAAO,CAAC,CAACD,QAAQ,CAAC,CAAC;MAClC;MACA;IACJ;IACA,MAAMJ,GAAG,GAAG,IAAI,CAACC,SAAS,CAAC;MACvB,GAAGF,MAAM;MACTO,IAAI,EAAE;IACV,CAAC,CAAC;IACF,KAAK,MAAMD,OAAO,IAAI,IAAI,CAACR,KAAK,EAAE;MAC9B,IAAIQ,OAAO,CAACE,UAAU,CAACP,GAAG,CAAC,KAAK,KAAK,EAAE;QACnC;MACJ;MACA,IAAI,CAACH,KAAK,CAACQ,OAAO,CAAC,CAACD,QAAQ,CAAC,CAAC;IAClC;EACJ;EAEQH,SAASA,CAACF,MAAsB,EAAU;IAC9C,OAAO,GAAGA,MAAM,CAACS,MAAM,IAAIT,MAAM,CAACO,IAAI,EAAE;EAC5C;AACJ","ignoreList":[]}
+{"version":3,"names":["DataLoaderCache","cache","getDataLoader","params","key","createKey","setDataLoader","dataLoader","clearAll","current","tenant","startsWith","modelId","name"],"sources":["DataLoaderCache.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nexport interface CacheKeyParams {\n    name: string;\n    tenant: string;\n    modelId: string;\n}\n\nexport interface ClearAllParams {\n    tenant: string;\n}\n\nexport class DataLoaderCache {\n    private readonly cache: Record<string, DataLoader<any, any>> = {};\n\n    public getDataLoader<I = any, R = any>(params: CacheKeyParams): DataLoader<I, R> | null {\n        const key = this.createKey(params);\n\n        return this.cache[key] || null;\n    }\n\n    public setDataLoader(params: CacheKeyParams, dataLoader: DataLoader<any, any>): void {\n        const key = this.createKey(params);\n        this.cache[key] = dataLoader;\n    }\n\n    public clearAll(params?: ClearAllParams): void {\n        if (!params) {\n            for (const current in this.cache) {\n                this.cache[current].clearAll();\n            }\n            return;\n        }\n        const key = `${params.tenant}_`;\n        for (const current in this.cache) {\n            if (current.startsWith(key) === false) {\n                continue;\n            }\n            this.cache[current].clearAll();\n        }\n    }\n\n    private createKey(params: CacheKeyParams): string {\n        return `${params.tenant}_${params.modelId}_${params.name}`;\n    }\n}\n"],"mappings":"AAYA,OAAO,MAAMA,eAAe,CAAC;EACRC,KAAK,GAAyC,CAAC,CAAC;EAE1DC,aAAaA,CAAmBC,MAAsB,EAA2B;IACpF,MAAMC,GAAG,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAElC,OAAO,IAAI,CAACF,KAAK,CAACG,GAAG,CAAC,IAAI,IAAI;EAClC;EAEOE,aAAaA,CAACH,MAAsB,EAAEI,UAAgC,EAAQ;IACjF,MAAMH,GAAG,GAAG,IAAI,CAACC,SAAS,CAACF,MAAM,CAAC;IAClC,IAAI,CAACF,KAAK,CAACG,GAAG,CAAC,GAAGG,UAAU;EAChC;EAEOC,QAAQA,CAACL,MAAuB,EAAQ;IAC3C,IAAI,CAACA,MAAM,EAAE;MACT,KAAK,MAAMM,OAAO,IAAI,IAAI,CAACR,KAAK,EAAE;QAC9B,IAAI,CAACA,KAAK,CAACQ,OAAO,CAAC,CAACD,QAAQ,CAAC,CAAC;MAClC;MACA;IACJ;IACA,MAAMJ,GAAG,GAAG,GAAGD,MAAM,CAACO,MAAM,GAAG;IAC/B,KAAK,MAAMD,OAAO,IAAI,IAAI,CAACR,KAAK,EAAE;MAC9B,IAAIQ,OAAO,CAACE,UAAU,CAACP,GAAG,CAAC,KAAK,KAAK,EAAE;QACnC;MACJ;MACA,IAAI,CAACH,KAAK,CAACQ,OAAO,CAAC,CAACD,QAAQ,CAAC,CAAC;IAClC;EACJ;EAEQH,SAASA,CAACF,MAAsB,EAAU;IAC9C,OAAO,GAAGA,MAAM,CAACO,MAAM,IAAIP,MAAM,CAACS,OAAO,IAAIT,MAAM,CAACU,IAAI,EAAE;EAC9D;AACJ","ignoreList":[]}

package/operations/entry/dataLoader/getAllEntryRevisions.js

@@ -4,7 +4,8 @@ import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
 export const createGetAllEntryRevisions = params => {
   const {
     entity,
-    tenant
+    tenant,
+    modelId
   } = params;
   return new DataLoader(async ids => {
     const results = {};
@@ -22,7 +23,9 @@ export const createGetAllEntryRevisions = params => {
       });
     }
     return ids.map(entryId => {
-      return results[entryId] || [];
+      return (results[entryId] || []).filter(item => {
+        return item.modelId === modelId;
+      });
     });
   }, {
     batchScheduleFn: createBatchScheduleFn()

package/operations/entry/dataLoader/getAllEntryRevisions.js.map

@@ -1 +1 @@
-{"version":3,"names":["DataLoader","createPartitionKey","createBatchScheduleFn","createGetAllEntryRevisions","params","entity","tenant","ids","results","id","queryAllClean","partitionKey","options","beginsWith","map","item","data","entryId","batchScheduleFn"],"sources":["getAllEntryRevisions.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createPartitionKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\n\nexport const createGetAllEntryRevisions = (params: IDataLoaderParams) => {\n    const { entity, tenant } = params;\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const results: Record<string, CmsStorageEntry[]> = {};\n\n            for (const id of ids) {\n                results[id] = (\n                    await entity.queryAllClean({\n                        partitionKey: createPartitionKey({\n                            tenant,\n                            id\n                        }),\n                        options: {\n                            beginsWith: \"REV#\"\n                        }\n                    })\n                ).map(item => {\n                    return item.data;\n                });\n            }\n\n            return ids.map(entryId => {\n                return results[entryId] || [];\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,kBAAkB;AAE3B,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,0BAA0B,GAAIC,MAAyB,IAAK;EACrE,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGF,MAAM;EACjC,OAAO,IAAIJ,UAAU,CACjB,MAAMO,GAAG,IAAI;IACT,MAAMC,OAA0C,GAAG,CAAC,CAAC;IAErD,KAAK,MAAMC,EAAE,IAAIF,GAAG,EAAE;MAClBC,OAAO,CAACC,EAAE,CAAC,GAAG,CACV,MAAMJ,MAAM,CAACK,aAAa,CAAC;QACvBC,YAAY,EAAEV,kBAAkB,CAAC;UAC7BK,MAAM;UACNG;QACJ,CAAC,CAAC;QACFG,OAAO,EAAE;UACLC,UAAU,EAAE;QAChB;MACJ,CAAC,CAAC,EACJC,GAAG,CAACC,IAAI,IAAI;QACV,OAAOA,IAAI,CAACC,IAAI;MACpB,CAAC,CAAC;IACN;IAEA,OAAOT,GAAG,CAACO,GAAG,CAACG,OAAO,IAAI;MACtB,OAAOT,OAAO,CAACS,OAAO,CAAC,IAAI,EAAE;IACjC,CAAC,CAAC;EACN,CAAC,EACD;IACIC,eAAe,EAAEhB,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["DataLoader","createPartitionKey","createBatchScheduleFn","createGetAllEntryRevisions","params","entity","tenant","modelId","ids","results","id","queryAllClean","partitionKey","options","beginsWith","map","item","data","entryId","filter","batchScheduleFn"],"sources":["getAllEntryRevisions.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createPartitionKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\n\nexport const createGetAllEntryRevisions = (params: IDataLoaderParams) => {\n    const { entity, tenant, modelId } = params;\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const results: Record<string, CmsStorageEntry[]> = {};\n\n            for (const id of ids) {\n                results[id] = (\n                    await entity.queryAllClean({\n                        partitionKey: createPartitionKey({\n                            tenant,\n                            id\n                        }),\n                        options: {\n                            beginsWith: \"REV#\"\n                        }\n                    })\n                ).map(item => {\n                    return item.data;\n                });\n            }\n\n            return ids.map(entryId => {\n                return (results[entryId] || []).filter(item => {\n                    return item.modelId === modelId;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,kBAAkB;AAE3B,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,0BAA0B,GAAIC,MAAyB,IAAK;EACrE,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EAC1C,OAAO,IAAIJ,UAAU,CACjB,MAAMQ,GAAG,IAAI;IACT,MAAMC,OAA0C,GAAG,CAAC,CAAC;IAErD,KAAK,MAAMC,EAAE,IAAIF,GAAG,EAAE;MAClBC,OAAO,CAACC,EAAE,CAAC,GAAG,CACV,MAAML,MAAM,CAACM,aAAa,CAAC;QACvBC,YAAY,EAAEX,kBAAkB,CAAC;UAC7BK,MAAM;UACNI;QACJ,CAAC,CAAC;QACFG,OAAO,EAAE;UACLC,UAAU,EAAE;QAChB;MACJ,CAAC,CAAC,EACJC,GAAG,CAACC,IAAI,IAAI;QACV,OAAOA,IAAI,CAACC,IAAI;MACpB,CAAC,CAAC;IACN;IAEA,OAAOT,GAAG,CAACO,GAAG,CAACG,OAAO,IAAI;MACtB,OAAO,CAACT,OAAO,CAACS,OAAO,CAAC,IAAI,EAAE,EAAEC,MAAM,CAACH,IAAI,IAAI;QAC3C,OAAOA,IAAI,CAACT,OAAO,KAAKA,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIa,eAAe,EAAElB,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/operations/entry/dataLoader/getLatestRevisionByEntryId.js

@@ -4,7 +4,8 @@ import { createLatestSortKey, createPartitionKey } from "../keys.js";
 export const createGetLatestRevisionByEntryId = params => {
   const {
     entity,
-    tenant
+    tenant,
+    modelId
   } = params;
   const latestKey = createLatestSortKey();
   return new DataLoader(async ids => {
@@ -29,6 +30,9 @@ export const createGetLatestRevisionByEntryId = params => {
     });
     return ids.map(entryId => {
       return items.filter(item => {
+        if (item.modelId !== modelId) {
+          return false;
+        }
         return entryId === item.entryId;
       });
     });

package/operations/entry/dataLoader/getLatestRevisionByEntryId.js.map

@@ -1 +1 @@
-{"version":3,"names":["DataLoader","createBatchScheduleFn","createLatestSortKey","createPartitionKey","createGetLatestRevisionByEntryId","params","entity","tenant","latestKey","ids","reader","createEntityReader","keys","Set","id","partitionKey","has","add","get","PK","SK","items","execute","map","item","data","entryId","filter","batchScheduleFn"],"sources":["getLatestRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\nimport { createLatestSortKey, createPartitionKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\n\nexport const createGetLatestRevisionByEntryId = (params: IDataLoaderParams) => {\n    const { entity, tenant } = params;\n\n    const latestKey = createLatestSortKey();\n\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const reader = entity.createEntityReader();\n\n            const keys = new Set<string>();\n\n            for (const id of ids) {\n                const partitionKey = createPartitionKey({\n                    tenant,\n                    id\n                });\n                if (keys.has(partitionKey)) {\n                    continue;\n                }\n                keys.add(partitionKey);\n                reader.get({\n                    PK: partitionKey,\n                    SK: latestKey\n                });\n            }\n\n            const items = (await reader.execute()).map(item => {\n                return item.data;\n            });\n\n            return ids.map(entryId => {\n                return items.filter(item => {\n                    return entryId === item.entryId;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,qBAAqB;AAC9B,SAASC,mBAAmB,EAAEC,kBAAkB;AAGhD,OAAO,MAAMC,gCAAgC,GAAIC,MAAyB,IAAK;EAC3E,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGF,MAAM;EAEjC,MAAMG,SAAS,GAAGN,mBAAmB,CAAC,CAAC;EAEvC,OAAO,IAAIF,UAAU,CACjB,MAAMS,GAAG,IAAI;IACT,MAAMC,MAAM,GAAGJ,MAAM,CAACK,kBAAkB,CAAC,CAAC;IAE1C,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAS,CAAC;IAE9B,KAAK,MAAMC,EAAE,IAAIL,GAAG,EAAE;MAClB,MAAMM,YAAY,GAAGZ,kBAAkB,CAAC;QACpCI,MAAM;QACNO;MACJ,CAAC,CAAC;MACF,IAAIF,IAAI,CAACI,GAAG,CAACD,YAAY,CAAC,EAAE;QACxB;MACJ;MACAH,IAAI,CAACK,GAAG,CAACF,YAAY,CAAC;MACtBL,MAAM,CAACQ,GAAG,CAAC;QACPC,EAAE,EAAEJ,YAAY;QAChBK,EAAE,EAAEZ;MACR,CAAC,CAAC;IACN;IAEA,MAAMa,KAAK,GAAG,CAAC,MAAMX,MAAM,CAACY,OAAO,CAAC,CAAC,EAAEC,GAAG,CAACC,IAAI,IAAI;MAC/C,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOhB,GAAG,CAACc,GAAG,CAACG,OAAO,IAAI;MACtB,OAAOL,KAAK,CAACM,MAAM,CAACH,IAAI,IAAI;QACxB,OAAOE,OAAO,KAAKF,IAAI,CAACE,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIE,eAAe,EAAE3B,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["DataLoader","createBatchScheduleFn","createLatestSortKey","createPartitionKey","createGetLatestRevisionByEntryId","params","entity","tenant","modelId","latestKey","ids","reader","createEntityReader","keys","Set","id","partitionKey","has","add","get","PK","SK","items","execute","map","item","data","entryId","filter","batchScheduleFn"],"sources":["getLatestRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\nimport { createLatestSortKey, createPartitionKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\n\nexport const createGetLatestRevisionByEntryId = (params: IDataLoaderParams) => {\n    const { entity, tenant, modelId } = params;\n\n    const latestKey = createLatestSortKey();\n\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const reader = entity.createEntityReader();\n\n            const keys = new Set<string>();\n\n            for (const id of ids) {\n                const partitionKey = createPartitionKey({\n                    tenant,\n                    id\n                });\n                if (keys.has(partitionKey)) {\n                    continue;\n                }\n                keys.add(partitionKey);\n                reader.get({\n                    PK: partitionKey,\n                    SK: latestKey\n                });\n            }\n\n            const items = (await reader.execute()).map(item => {\n                return item.data;\n            });\n\n            return ids.map(entryId => {\n                return items.filter(item => {\n                    if (item.modelId !== modelId) {\n                        return false;\n                    }\n                    return entryId === item.entryId;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,qBAAqB;AAC9B,SAASC,mBAAmB,EAAEC,kBAAkB;AAGhD,OAAO,MAAMC,gCAAgC,GAAIC,MAAyB,IAAK;EAC3E,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EAE1C,MAAMI,SAAS,GAAGP,mBAAmB,CAAC,CAAC;EAEvC,OAAO,IAAIF,UAAU,CACjB,MAAMU,GAAG,IAAI;IACT,MAAMC,MAAM,GAAGL,MAAM,CAACM,kBAAkB,CAAC,CAAC;IAE1C,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAS,CAAC;IAE9B,KAAK,MAAMC,EAAE,IAAIL,GAAG,EAAE;MAClB,MAAMM,YAAY,GAAGb,kBAAkB,CAAC;QACpCI,MAAM;QACNQ;MACJ,CAAC,CAAC;MACF,IAAIF,IAAI,CAACI,GAAG,CAACD,YAAY,CAAC,EAAE;QACxB;MACJ;MACAH,IAAI,CAACK,GAAG,CAACF,YAAY,CAAC;MACtBL,MAAM,CAACQ,GAAG,CAAC;QACPC,EAAE,EAAEJ,YAAY;QAChBK,EAAE,EAAEZ;MACR,CAAC,CAAC;IACN;IAEA,MAAMa,KAAK,GAAG,CAAC,MAAMX,MAAM,CAACY,OAAO,CAAC,CAAC,EAAEC,GAAG,CAACC,IAAI,IAAI;MAC/C,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOhB,GAAG,CAACc,GAAG,CAACG,OAAO,IAAI;MACtB,OAAOL,KAAK,CAACM,MAAM,CAACH,IAAI,IAAI;QACxB,IAAIA,IAAI,CAACjB,OAAO,KAAKA,OAAO,EAAE;UAC1B,OAAO,KAAK;QAChB;QACA,OAAOmB,OAAO,KAAKF,IAAI,CAACE,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIE,eAAe,EAAE5B,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/operations/entry/dataLoader/getPublishedRevisionByEntryId.js

@@ -4,7 +4,8 @@ import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
 export const createGetPublishedRevisionByEntryId = params => {
   const {
     entity,
-    tenant
+    tenant,
+    modelId
   } = params;
   const publishedKey = createPublishedSortKey();
   return new DataLoader(async ids => {
@@ -29,6 +30,9 @@ export const createGetPublishedRevisionByEntryId = params => {
     });
     return ids.map(entryId => {
       return items.filter(item => {
+        if (item.modelId !== modelId) {
+          return false;
+        }
         return entryId === item.entryId;
       });
     });

package/operations/entry/dataLoader/getPublishedRevisionByEntryId.js.map

@@ -1 +1 @@
-{"version":3,"names":["DataLoader","createPartitionKey","createPublishedSortKey","createBatchScheduleFn","createGetPublishedRevisionByEntryId","params","entity","tenant","publishedKey","ids","reader","createEntityReader","keys","Set","id","partitionKey","has","add","get","PK","SK","items","execute","map","item","data","entryId","filter","batchScheduleFn"],"sources":["getPublishedRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createPartitionKey, createPublishedSortKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\n\nexport const createGetPublishedRevisionByEntryId = (params: IDataLoaderParams) => {\n    const { entity, tenant } = params;\n\n    const publishedKey = createPublishedSortKey();\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const reader = entity.createEntityReader();\n\n            const keys = new Set<string>();\n\n            for (const id of ids) {\n                const partitionKey = createPartitionKey({\n                    tenant,\n                    id\n                });\n                if (keys.has(partitionKey)) {\n                    continue;\n                }\n                keys.add(partitionKey);\n                reader.get({\n                    PK: partitionKey,\n                    SK: publishedKey\n                });\n            }\n\n            const items = (await reader.execute()).map(item => {\n                return item.data;\n            });\n\n            return ids.map(entryId => {\n                return items.filter(item => {\n                    return entryId === item.entryId;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,kBAAkB,EAAEC,sBAAsB;AAEnD,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,mCAAmC,GAAIC,MAAyB,IAAK;EAC9E,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGF,MAAM;EAEjC,MAAMG,YAAY,GAAGN,sBAAsB,CAAC,CAAC;EAC7C,OAAO,IAAIF,UAAU,CACjB,MAAMS,GAAG,IAAI;IACT,MAAMC,MAAM,GAAGJ,MAAM,CAACK,kBAAkB,CAAC,CAAC;IAE1C,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAS,CAAC;IAE9B,KAAK,MAAMC,EAAE,IAAIL,GAAG,EAAE;MAClB,MAAMM,YAAY,GAAGd,kBAAkB,CAAC;QACpCM,MAAM;QACNO;MACJ,CAAC,CAAC;MACF,IAAIF,IAAI,CAACI,GAAG,CAACD,YAAY,CAAC,EAAE;QACxB;MACJ;MACAH,IAAI,CAACK,GAAG,CAACF,YAAY,CAAC;MACtBL,MAAM,CAACQ,GAAG,CAAC;QACPC,EAAE,EAAEJ,YAAY;QAChBK,EAAE,EAAEZ;MACR,CAAC,CAAC;IACN;IAEA,MAAMa,KAAK,GAAG,CAAC,MAAMX,MAAM,CAACY,OAAO,CAAC,CAAC,EAAEC,GAAG,CAACC,IAAI,IAAI;MAC/C,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOhB,GAAG,CAACc,GAAG,CAACG,OAAO,IAAI;MACtB,OAAOL,KAAK,CAACM,MAAM,CAACH,IAAI,IAAI;QACxB,OAAOE,OAAO,KAAKF,IAAI,CAACE,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIE,eAAe,EAAEzB,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["DataLoader","createPartitionKey","createPublishedSortKey","createBatchScheduleFn","createGetPublishedRevisionByEntryId","params","entity","tenant","modelId","publishedKey","ids","reader","createEntityReader","keys","Set","id","partitionKey","has","add","get","PK","SK","items","execute","map","item","data","entryId","filter","batchScheduleFn"],"sources":["getPublishedRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createPartitionKey, createPublishedSortKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\n\nexport const createGetPublishedRevisionByEntryId = (params: IDataLoaderParams) => {\n    const { entity, tenant, modelId } = params;\n\n    const publishedKey = createPublishedSortKey();\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const reader = entity.createEntityReader();\n\n            const keys = new Set<string>();\n\n            for (const id of ids) {\n                const partitionKey = createPartitionKey({\n                    tenant,\n                    id\n                });\n                if (keys.has(partitionKey)) {\n                    continue;\n                }\n                keys.add(partitionKey);\n                reader.get({\n                    PK: partitionKey,\n                    SK: publishedKey\n                });\n            }\n\n            const items = (await reader.execute()).map(item => {\n                return item.data;\n            });\n\n            return ids.map(entryId => {\n                return items.filter(item => {\n                    if (item.modelId !== modelId) {\n                        return false;\n                    }\n                    return entryId === item.entryId;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,kBAAkB,EAAEC,sBAAsB;AAEnD,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,mCAAmC,GAAIC,MAAyB,IAAK;EAC9E,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EAE1C,MAAMI,YAAY,GAAGP,sBAAsB,CAAC,CAAC;EAC7C,OAAO,IAAIF,UAAU,CACjB,MAAMU,GAAG,IAAI;IACT,MAAMC,MAAM,GAAGL,MAAM,CAACM,kBAAkB,CAAC,CAAC;IAE1C,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAS,CAAC;IAE9B,KAAK,MAAMC,EAAE,IAAIL,GAAG,EAAE;MAClB,MAAMM,YAAY,GAAGf,kBAAkB,CAAC;QACpCM,MAAM;QACNQ;MACJ,CAAC,CAAC;MACF,IAAIF,IAAI,CAACI,GAAG,CAACD,YAAY,CAAC,EAAE;QACxB;MACJ;MACAH,IAAI,CAACK,GAAG,CAACF,YAAY,CAAC;MACtBL,MAAM,CAACQ,GAAG,CAAC;QACPC,EAAE,EAAEJ,YAAY;QAChBK,EAAE,EAAEZ;MACR,CAAC,CAAC;IACN;IAEA,MAAMa,KAAK,GAAG,CAAC,MAAMX,MAAM,CAACY,OAAO,CAAC,CAAC,EAAEC,GAAG,CAACC,IAAI,IAAI;MAC/C,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOhB,GAAG,CAACc,GAAG,CAACG,OAAO,IAAI;MACtB,OAAOL,KAAK,CAACM,MAAM,CAACH,IAAI,IAAI;QACxB,IAAIA,IAAI,CAACjB,OAAO,KAAKA,OAAO,EAAE;UAC1B,OAAO,KAAK;QAChB;QACA,OAAOmB,OAAO,KAAKF,IAAI,CAACE,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIE,eAAe,EAAE1B,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/operations/entry/dataLoader/getRevisionById.js

@@ -5,7 +5,8 @@ import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
 export const createGetRevisionById = params => {
   const {
     entity,
-    tenant
+    tenant,
+    modelId
   } = params;
   return new DataLoader(async ids => {
     const reader = entity.createEntityReader();
@@ -39,6 +40,9 @@ export const createGetRevisionById = params => {
     });
     return ids.map(id => {
       return items.filter(item => {
+        if (item.modelId !== modelId) {
+          return false;
+        }
         return id === item.id;
       });
     });

package/operations/entry/dataLoader/getRevisionById.js.map

@@ -1 +1 @@
-{"version":3,"names":["DataLoader","createPartitionKey","createRevisionSortKey","parseIdentifier","createBatchScheduleFn","createGetRevisionById","params","entity","tenant","ids","reader","createEntityReader","keys","Set","id","partitionKey","version","sortKey","key","has","add","get","PK","SK","items","execute","map","item","data","filter","batchScheduleFn"],"sources":["getRevisionById.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createPartitionKey, createRevisionSortKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\n\nexport const createGetRevisionById = (params: IDataLoaderParams) => {\n    const { entity, tenant } = params;\n\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const reader = entity.createEntityReader();\n\n            const keys = new Set<string>();\n\n            for (const id of ids) {\n                const partitionKey = createPartitionKey({\n                    tenant,\n                    id\n                });\n                const { version } = parseIdentifier(id);\n                if (version === null) {\n                    continue;\n                }\n                const sortKey = createRevisionSortKey({\n                    version\n                });\n                const key = `${partitionKey}__${sortKey}`;\n                if (keys.has(key)) {\n                    continue;\n                }\n                keys.add(key);\n\n                reader.get({\n                    PK: partitionKey,\n                    SK: sortKey\n                });\n            }\n\n            const items = (await reader.execute()).map(item => {\n                return item.data;\n            });\n\n            return ids.map(id => {\n                return items.filter(item => {\n                    return id === item.id;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,kBAAkB,EAAEC,qBAAqB;AAElD,SAASC,eAAe,QAAQ,eAAe;AAC/C,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,qBAAqB,GAAIC,MAAyB,IAAK;EAChE,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGF,MAAM;EAEjC,OAAO,IAAIN,UAAU,CACjB,MAAMS,GAAG,IAAI;IACT,MAAMC,MAAM,GAAGH,MAAM,CAACI,kBAAkB,CAAC,CAAC;IAE1C,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAS,CAAC;IAE9B,KAAK,MAAMC,EAAE,IAAIL,GAAG,EAAE;MAClB,MAAMM,YAAY,GAAGd,kBAAkB,CAAC;QACpCO,MAAM;QACNM;MACJ,CAAC,CAAC;MACF,MAAM;QAAEE;MAAQ,CAAC,GAAGb,eAAe,CAACW,EAAE,CAAC;MACvC,IAAIE,OAAO,KAAK,IAAI,EAAE;QAClB;MACJ;MACA,MAAMC,OAAO,GAAGf,qBAAqB,CAAC;QAClCc;MACJ,CAAC,CAAC;MACF,MAAME,GAAG,GAAG,GAAGH,YAAY,KAAKE,OAAO,EAAE;MACzC,IAAIL,IAAI,CAACO,GAAG,CAACD,GAAG,CAAC,EAAE;QACf;MACJ;MACAN,IAAI,CAACQ,GAAG,CAACF,GAAG,CAAC;MAEbR,MAAM,CAACW,GAAG,CAAC;QACPC,EAAE,EAAEP,YAAY;QAChBQ,EAAE,EAAEN;MACR,CAAC,CAAC;IACN;IAEA,MAAMO,KAAK,GAAG,CAAC,MAAMd,MAAM,CAACe,OAAO,CAAC,CAAC,EAAEC,GAAG,CAACC,IAAI,IAAI;MAC/C,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOnB,GAAG,CAACiB,GAAG,CAACZ,EAAE,IAAI;MACjB,OAAOU,KAAK,CAACK,MAAM,CAACF,IAAI,IAAI;QACxB,OAAOb,EAAE,KAAKa,IAAI,CAACb,EAAE;MACzB,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIgB,eAAe,EAAE1B,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["DataLoader","createPartitionKey","createRevisionSortKey","parseIdentifier","createBatchScheduleFn","createGetRevisionById","params","entity","tenant","modelId","ids","reader","createEntityReader","keys","Set","id","partitionKey","version","sortKey","key","has","add","get","PK","SK","items","execute","map","item","data","filter","batchScheduleFn"],"sources":["getRevisionById.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createPartitionKey, createRevisionSortKey } from \"~/operations/entry/keys.js\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn.js\";\n\nexport const createGetRevisionById = (params: IDataLoaderParams) => {\n    const { entity, tenant, modelId } = params;\n\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async ids => {\n            const reader = entity.createEntityReader();\n\n            const keys = new Set<string>();\n\n            for (const id of ids) {\n                const partitionKey = createPartitionKey({\n                    tenant,\n                    id\n                });\n                const { version } = parseIdentifier(id);\n                if (version === null) {\n                    continue;\n                }\n                const sortKey = createRevisionSortKey({\n                    version\n                });\n                const key = `${partitionKey}__${sortKey}`;\n                if (keys.has(key)) {\n                    continue;\n                }\n                keys.add(key);\n\n                reader.get({\n                    PK: partitionKey,\n                    SK: sortKey\n                });\n            }\n\n            const items = (await reader.execute()).map(item => {\n                return item.data;\n            });\n\n            return ids.map(id => {\n                return items.filter(item => {\n                    if (item.modelId !== modelId) {\n                        return false;\n                    }\n                    return id === item.id;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,YAAY;AAEnC,SAASC,kBAAkB,EAAEC,qBAAqB;AAElD,SAASC,eAAe,QAAQ,eAAe;AAC/C,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,qBAAqB,GAAIC,MAAyB,IAAK;EAChE,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EAE1C,OAAO,IAAIN,UAAU,CACjB,MAAMU,GAAG,IAAI;IACT,MAAMC,MAAM,GAAGJ,MAAM,CAACK,kBAAkB,CAAC,CAAC;IAE1C,MAAMC,IAAI,GAAG,IAAIC,GAAG,CAAS,CAAC;IAE9B,KAAK,MAAMC,EAAE,IAAIL,GAAG,EAAE;MAClB,MAAMM,YAAY,GAAGf,kBAAkB,CAAC;QACpCO,MAAM;QACNO;MACJ,CAAC,CAAC;MACF,MAAM;QAAEE;MAAQ,CAAC,GAAGd,eAAe,CAACY,EAAE,CAAC;MACvC,IAAIE,OAAO,KAAK,IAAI,EAAE;QAClB;MACJ;MACA,MAAMC,OAAO,GAAGhB,qBAAqB,CAAC;QAClCe;MACJ,CAAC,CAAC;MACF,MAAME,GAAG,GAAG,GAAGH,YAAY,KAAKE,OAAO,EAAE;MACzC,IAAIL,IAAI,CAACO,GAAG,CAACD,GAAG,CAAC,EAAE;QACf;MACJ;MACAN,IAAI,CAACQ,GAAG,CAACF,GAAG,CAAC;MAEbR,MAAM,CAACW,GAAG,CAAC;QACPC,EAAE,EAAEP,YAAY;QAChBQ,EAAE,EAAEN;MACR,CAAC,CAAC;IACN;IAEA,MAAMO,KAAK,GAAG,CAAC,MAAMd,MAAM,CAACe,OAAO,CAAC,CAAC,EAAEC,GAAG,CAACC,IAAI,IAAI;MAC/C,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOnB,GAAG,CAACiB,GAAG,CAACZ,EAAE,IAAI;MACjB,OAAOU,KAAK,CAACK,MAAM,CAACF,IAAI,IAAI;QACxB,IAAIA,IAAI,CAACnB,OAAO,KAAKA,OAAO,EAAE;UAC1B,OAAO,KAAK;QAChB;QACA,OAAOM,EAAE,KAAKa,IAAI,CAACb,EAAE;MACzB,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIgB,eAAe,EAAE3B,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}

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

@@ -2,4 +2,5 @@ import type { IEntryEntity } from "../../../definitions/types.js";
 export interface IDataLoaderParams {
     entity: IEntryEntity;
     tenant: string;
+    modelId: string;
 }

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { IEntryEntity } from \"~/definitions/types.js\";\n\nexport interface IDataLoaderParams {\n    entity: IEntryEntity;\n    tenant: string;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { IEntryEntity } from \"~/definitions/types.js\";\n\nexport interface IDataLoaderParams {\n    entity: IEntryEntity;\n    tenant: string;\n    modelId: string;\n}\n"],"mappings":"","ignoreList":[]}

package/operations/entry/dataLoaders.js

@@ -48,6 +48,7 @@ export class DataLoadersHandler {
     } = params;
     const cacheParams = {
       tenant: model.tenant,
+      modelId: model.modelId,
       name
     };
     let loader = this.cache.getDataLoader(cacheParams);
@@ -57,7 +58,8 @@ export class DataLoadersHandler {
     const factory = getDataLoaderFactory(name);
     loader = factory({
       entity: this.entity,
-      tenant: model.tenant
+      tenant: model.tenant,
+      modelId: model.modelId
     });
     this.cache.setDataLoader(cacheParams, loader);
     return loader;

package/operations/entry/dataLoaders.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","DataLoaderCache","getDataLoaderFactory","parseIdentifier","DataLoadersHandler","cache","constructor","params","entity","getAllEntryRevisions","ids","map","id","entryId","loadMany","getRevisionById","getPublishedRevisionByEntryId","getLatestRevisionByEntryId","getLoader","name","model","cacheParams","tenant","loader","getDataLoader","factory","setDataLoader","results","Array","isArray","reduce","acc","res","message","code","data","JSON","stringify","push","ex","error","clearAll"],"sources":["dataLoaders.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport type {\n    CmsEntryValues,\n    CmsModel,\n    CmsStorageEntry\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CacheKeyParams } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport { DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport type { DataLoaders } from \"~/operations/entry/dataLoader/index.js\";\nimport { getDataLoaderFactory } from \"~/operations/entry/dataLoader/index.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport type { DataLoadersHandlerInterfaceClearAllParams, IDataLoadersHandler } from \"~/types.js\";\nimport type { IEntryEntity } from \"~/definitions/types.js\";\n\ninterface DataLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n    ids: readonly string[];\n}\n\ninterface GetLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\ninterface IDataLoadersHandlerParams {\n    entity: IEntryEntity;\n}\n\nexport interface ClearAllParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\nexport class DataLoadersHandler implements IDataLoadersHandler {\n    private readonly entity;\n    private readonly cache = new DataLoaderCache();\n\n    public constructor(params: IDataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getAllEntryRevisions\", params, ids);\n    }\n\n    public async getRevisionById<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        return await this.loadMany<T>(\"getRevisionById\", params, params.ids);\n    }\n\n    public async getPublishedRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getPublishedRevisionByEntryId\", params, ids);\n    }\n\n    public async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getLatestRevisionByEntryId\", params, ids);\n    }\n\n    /**\n     * TODO @ts-refactor\n     * Maybe pass on the generics to DataLoader definition?\n     */\n    private getLoader(name: DataLoaders, params: GetLoaderParams): DataLoader<any, any> {\n        const { model } = params;\n        const cacheParams: CacheKeyParams = {\n            tenant: model.tenant,\n            name\n        };\n        let loader = this.cache.getDataLoader(cacheParams);\n        if (loader) {\n            return loader;\n        }\n        const factory = getDataLoaderFactory(name);\n        loader = factory({\n            entity: this.entity,\n            tenant: model.tenant\n        });\n        this.cache.setDataLoader(cacheParams, loader);\n        return loader;\n    }\n\n    private async loadMany<T extends CmsEntryValues = CmsEntryValues>(\n        loader: DataLoaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsStorageEntry<T>[]> {\n        let results: CmsStorageEntry<T>[] = [];\n        try {\n            results = await this.getLoader(loader, params).loadMany(ids);\n            if (Array.isArray(results) === true) {\n                return results.reduce<CmsStorageEntry<T>[]>((acc, res) => {\n                    if (Array.isArray(res) === false) {\n                        if (res && res.message) {\n                            throw new WebinyError(res.message, res.code, {\n                                ...res,\n                                data: JSON.stringify(res.data || {})\n                            });\n                        }\n                        throw new WebinyError(\n                            \"Result from the data loader must be an array of arrays which contain requested items.\",\n                            \"DATA_LOADER_RESULTS_ERROR\",\n                            {\n                                ...params,\n                                loader\n                            }\n                        );\n                    }\n                    acc.push(...res);\n                    return acc;\n                }, []);\n            }\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Data loader error.\",\n                ex.code || \"DATA_LOADER_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    loader,\n                    ids\n                }\n            );\n        }\n        throw new WebinyError(\n            `Data loader did not return array of items or empty array.`,\n            \"INVALID_DATA_LOADER_RESULT\",\n            {\n                loader,\n                ids,\n                results\n            }\n        );\n    }\n\n    public clearAll(params?: DataLoadersHandlerInterfaceClearAllParams): void {\n        this.cache.clearAll(params?.model);\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","DataLoaderCache","getDataLoaderFactory","parseIdentifier","DataLoadersHandler","cache","constructor","params","entity","getAllEntryRevisions","ids","map","id","entryId","loadMany","getRevisionById","getPublishedRevisionByEntryId","getLatestRevisionByEntryId","getLoader","name","model","cacheParams","tenant","modelId","loader","getDataLoader","factory","setDataLoader","results","Array","isArray","reduce","acc","res","message","code","data","JSON","stringify","push","ex","error","clearAll"],"sources":["dataLoaders.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport type {\n    CmsEntryValues,\n    CmsModel,\n    CmsStorageEntry\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CacheKeyParams } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport { DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport type { DataLoaders } from \"~/operations/entry/dataLoader/index.js\";\nimport { getDataLoaderFactory } from \"~/operations/entry/dataLoader/index.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport type { DataLoadersHandlerInterfaceClearAllParams, IDataLoadersHandler } from \"~/types.js\";\nimport type { IEntryEntity } from \"~/definitions/types.js\";\n\ninterface DataLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n    ids: readonly string[];\n}\n\ninterface GetLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\ninterface IDataLoadersHandlerParams {\n    entity: IEntryEntity;\n}\n\nexport interface ClearAllParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\nexport class DataLoadersHandler implements IDataLoadersHandler {\n    private readonly entity;\n    private readonly cache = new DataLoaderCache();\n\n    public constructor(params: IDataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getAllEntryRevisions\", params, ids);\n    }\n\n    public async getRevisionById<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        return await this.loadMany<T>(\"getRevisionById\", params, params.ids);\n    }\n\n    public async getPublishedRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getPublishedRevisionByEntryId\", params, ids);\n    }\n\n    public async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getLatestRevisionByEntryId\", params, ids);\n    }\n\n    /**\n     * TODO @ts-refactor\n     * Maybe pass on the generics to DataLoader definition?\n     */\n    private getLoader(name: DataLoaders, params: GetLoaderParams): DataLoader<any, any> {\n        const { model } = params;\n        const cacheParams: CacheKeyParams = {\n            tenant: model.tenant,\n            modelId: model.modelId,\n            name\n        };\n        let loader = this.cache.getDataLoader(cacheParams);\n        if (loader) {\n            return loader;\n        }\n        const factory = getDataLoaderFactory(name);\n        loader = factory({\n            entity: this.entity,\n            tenant: model.tenant,\n            modelId: model.modelId\n        });\n        this.cache.setDataLoader(cacheParams, loader);\n        return loader;\n    }\n\n    private async loadMany<T extends CmsEntryValues = CmsEntryValues>(\n        loader: DataLoaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsStorageEntry<T>[]> {\n        let results: CmsStorageEntry<T>[] = [];\n        try {\n            results = await this.getLoader(loader, params).loadMany(ids);\n            if (Array.isArray(results) === true) {\n                return results.reduce<CmsStorageEntry<T>[]>((acc, res) => {\n                    if (Array.isArray(res) === false) {\n                        if (res && res.message) {\n                            throw new WebinyError(res.message, res.code, {\n                                ...res,\n                                data: JSON.stringify(res.data || {})\n                            });\n                        }\n                        throw new WebinyError(\n                            \"Result from the data loader must be an array of arrays which contain requested items.\",\n                            \"DATA_LOADER_RESULTS_ERROR\",\n                            {\n                                ...params,\n                                loader\n                            }\n                        );\n                    }\n                    acc.push(...res);\n                    return acc;\n                }, []);\n            }\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Data loader error.\",\n                ex.code || \"DATA_LOADER_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    loader,\n                    ids\n                }\n            );\n        }\n        throw new WebinyError(\n            `Data loader did not return array of items or empty array.`,\n            \"INVALID_DATA_LOADER_RESULT\",\n            {\n                loader,\n                ids,\n                results\n            }\n        );\n    }\n\n    public clearAll(params?: DataLoadersHandlerInterfaceClearAllParams): void {\n        this.cache.clearAll(params?.model);\n    }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,4 +1,4 @@
-import type { BoolQueryConfig } from "@webiny/api-elasticsearch/types.js";
+import type { QueryDslBoolQuery as BoolQueryConfig } from "@webiny/api-opensearch/types.js";
 /**
  * This function will assign a minimum_should_match for the query if conditions are met:
  * * should is an array