@webiny/api-headless-cms-ddb 0.0.0-unstable.6f45466a1d → 0.0.0-unstable.7be00a75a9

package/operations/entry/dataLoader/DataLoaderCache.js

@@ -1,34 +1,27 @@
-export class DataLoaderCache {
-  cache = {};
-  getDataLoader(params) {
-    const key = this.createKey(params);
-    return this.cache[key] || null;
-  }
-  setDataLoader(params, dataLoader) {
-    const key = this.createKey(params);
-    this.cache[key] = dataLoader;
-  }
-  clearAll(params) {
-    if (!params) {
-      for (const current in this.cache) {
-        this.cache[current].clearAll();
-      }
-      return;
+class DataLoaderCache {
+    getDataLoader(params) {
+        const key = this.createKey(params);
+        return this.cache[key] || null;
     }
-    const key = this.createKey({
-      ...params,
-      name: ""
-    });
-    for (const current in this.cache) {
-      if (current.startsWith(key) === false) {
-        continue;
-      }
-      this.cache[current].clearAll();
+    setDataLoader(params, dataLoader) {
+        const key = this.createKey(params);
+        this.cache[key] = dataLoader;
+    }
+    clearAll(params) {
+        if (!params) {
+            for(const current in this.cache)this.cache[current].clearAll();
+            return;
+        }
+        const key = `${params.tenant}_`;
+        for(const current in this.cache)if (false !== current.startsWith(key)) this.cache[current].clearAll();
+    }
+    createKey(params) {
+        return `${params.tenant}_${params.modelId}_${params.name}`;
+    }
+    constructor(){
+        this.cache = {};
     }
-  }
-  createKey(params) {
-    return `${params.tenant}_${params.name}`;
-  }
 }
+export { DataLoaderCache };
 
 //# sourceMappingURL=DataLoaderCache.js.map

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,"file":"operations/entry/dataLoader/DataLoaderCache.js","sources":["../../../../src/operations/entry/dataLoader/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"],"names":["DataLoaderCache","params","key","dataLoader","current"],"mappings":"AAYO,MAAMA;IAGF,cAAgCC,MAAsB,EAA2B;QACpF,MAAMC,MAAM,IAAI,CAAC,SAAS,CAACD;QAE3B,OAAO,IAAI,CAAC,KAAK,CAACC,IAAI,IAAI;IAC9B;IAEO,cAAcD,MAAsB,EAAEE,UAAgC,EAAQ;QACjF,MAAMD,MAAM,IAAI,CAAC,SAAS,CAACD;QAC3B,IAAI,CAAC,KAAK,CAACC,IAAI,GAAGC;IACtB;IAEO,SAASF,MAAuB,EAAQ;QAC3C,IAAI,CAACA,QAAQ;YACT,IAAK,MAAMG,WAAW,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,KAAK,CAACA,QAAQ,CAAC,QAAQ;YAEhC;QACJ;QACA,MAAMF,MAAM,GAAGD,OAAO,MAAM,CAAC,CAAC,CAAC;QAC/B,IAAK,MAAMG,WAAW,IAAI,CAAC,KAAK,CAC5B,IAAIA,AAA4B,UAA5BA,QAAQ,UAAU,CAACF,MAGvB,IAAI,CAAC,KAAK,CAACE,QAAQ,CAAC,QAAQ;IAEpC;IAEQ,UAAUH,MAAsB,EAAU;QAC9C,OAAO,GAAGA,OAAO,MAAM,CAAC,CAAC,EAAEA,OAAO,OAAO,CAAC,CAAC,EAAEA,OAAO,IAAI,EAAE;IAC9D;;aA/BiB,KAAK,GAAyC,CAAC;;AAgCpE"}

package/operations/entry/dataLoader/constants.js

@@ -1,4 +1,5 @@
 const batchScheduleWaitEnv = Number(process.env.WEBINY_API_CMS_ENTRY_BATCH_SCHEDULE_WAIT || "0");
-export const CMS_ENTRY_BATCH_SCHEDULE_WAIT = isNaN(batchScheduleWaitEnv) ? 0 : batchScheduleWaitEnv;
+const CMS_ENTRY_BATCH_SCHEDULE_WAIT = isNaN(batchScheduleWaitEnv) ? 0 : batchScheduleWaitEnv;
+export { CMS_ENTRY_BATCH_SCHEDULE_WAIT };
 
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["batchScheduleWaitEnv","Number","process","env","WEBINY_API_CMS_ENTRY_BATCH_SCHEDULE_WAIT","CMS_ENTRY_BATCH_SCHEDULE_WAIT","isNaN"],"sources":["constants.ts"],"sourcesContent":["const batchScheduleWaitEnv = Number(process.env.WEBINY_API_CMS_ENTRY_BATCH_SCHEDULE_WAIT || \"0\");\nexport const CMS_ENTRY_BATCH_SCHEDULE_WAIT = isNaN(batchScheduleWaitEnv) ? 0 : batchScheduleWaitEnv;\n"],"mappings":"AAAA,MAAMA,oBAAoB,GAAGC,MAAM,CAACC,OAAO,CAACC,GAAG,CAACC,wCAAwC,IAAI,GAAG,CAAC;AAChG,OAAO,MAAMC,6BAA6B,GAAGC,KAAK,CAACN,oBAAoB,CAAC,GAAG,CAAC,GAAGA,oBAAoB","ignoreList":[]}
+{"version":3,"file":"operations/entry/dataLoader/constants.js","sources":["../../../../src/operations/entry/dataLoader/constants.ts"],"sourcesContent":["const batchScheduleWaitEnv = Number(process.env.WEBINY_API_CMS_ENTRY_BATCH_SCHEDULE_WAIT || \"0\");\nexport const CMS_ENTRY_BATCH_SCHEDULE_WAIT = isNaN(batchScheduleWaitEnv) ? 0 : batchScheduleWaitEnv;\n"],"names":["batchScheduleWaitEnv","Number","process","CMS_ENTRY_BATCH_SCHEDULE_WAIT","isNaN"],"mappings":"AAAA,MAAMA,uBAAuBC,OAAOC,QAAQ,GAAG,CAAC,wCAAwC,IAAI;AACrF,MAAMC,gCAAgCC,MAAMJ,wBAAwB,IAAIA"}

package/operations/entry/dataLoader/createBatchScheduleFn.js

@@ -1,19 +1,10 @@
 import { CMS_ENTRY_BATCH_SCHEDULE_WAIT } from "./constants.js";
-
-/**
- * This is to be used when user wants to wait for a number of milliseconds before the batch is executed.
- * Intended to be used internally or for a specific user case.
- * Not to be documented and exposed to publish as it can slow the data loading a lot.
- *
- * https://github.com/graphql/dataloader#batch-scheduling
- */
-export const createBatchScheduleFn = () => {
-  if (CMS_ENTRY_BATCH_SCHEDULE_WAIT <= 0) {
-    return undefined;
-  }
-  return callback => {
-    setTimeout(callback, CMS_ENTRY_BATCH_SCHEDULE_WAIT);
-  };
+const createBatchScheduleFn = ()=>{
+    if (CMS_ENTRY_BATCH_SCHEDULE_WAIT <= 0) return;
+    return (callback)=>{
+        setTimeout(callback, CMS_ENTRY_BATCH_SCHEDULE_WAIT);
+    };
 };
+export { createBatchScheduleFn };
 
 //# sourceMappingURL=createBatchScheduleFn.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["CMS_ENTRY_BATCH_SCHEDULE_WAIT","createBatchScheduleFn","undefined","callback","setTimeout"],"sources":["createBatchScheduleFn.ts"],"sourcesContent":["import { CMS_ENTRY_BATCH_SCHEDULE_WAIT } from \"./constants.js\";\n\n/**\n * This is to be used when user wants to wait for a number of milliseconds before the batch is executed.\n * Intended to be used internally or for a specific user case.\n * Not to be documented and exposed to publish as it can slow the data loading a lot.\n *\n * https://github.com/graphql/dataloader#batch-scheduling\n */\nexport const createBatchScheduleFn = () => {\n    if (CMS_ENTRY_BATCH_SCHEDULE_WAIT <= 0) {\n        return undefined;\n    }\n    return (callback: () => void) => {\n        setTimeout(callback, CMS_ENTRY_BATCH_SCHEDULE_WAIT);\n    };\n};\n"],"mappings":"AAAA,SAASA,6BAA6B;;AAEtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;EACvC,IAAID,6BAA6B,IAAI,CAAC,EAAE;IACpC,OAAOE,SAAS;EACpB;EACA,OAAQC,QAAoB,IAAK;IAC7BC,UAAU,CAACD,QAAQ,EAAEH,6BAA6B,CAAC;EACvD,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/dataLoader/createBatchScheduleFn.js","sources":["../../../../src/operations/entry/dataLoader/createBatchScheduleFn.ts"],"sourcesContent":["import { CMS_ENTRY_BATCH_SCHEDULE_WAIT } from \"./constants.js\";\n\n/**\n * This is to be used when user wants to wait for a number of milliseconds before the batch is executed.\n * Intended to be used internally or for a specific user case.\n * Not to be documented and exposed to publish as it can slow the data loading a lot.\n *\n * https://github.com/graphql/dataloader#batch-scheduling\n */\nexport const createBatchScheduleFn = () => {\n    if (CMS_ENTRY_BATCH_SCHEDULE_WAIT <= 0) {\n        return undefined;\n    }\n    return (callback: () => void) => {\n        setTimeout(callback, CMS_ENTRY_BATCH_SCHEDULE_WAIT);\n    };\n};\n"],"names":["createBatchScheduleFn","CMS_ENTRY_BATCH_SCHEDULE_WAIT","callback","setTimeout"],"mappings":";AASO,MAAMA,wBAAwB;IACjC,IAAIC,iCAAiC,GACjC;IAEJ,OAAO,CAACC;QACJC,WAAWD,UAAUD;IACzB;AACJ"}

package/operations/entry/dataLoader/getAllEntryRevisions.js

@@ -1,32 +1,24 @@
-import DataLoader from "dataloader";
+import dataloader from "dataloader";
 import { createPartitionKey } from "../keys.js";
 import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
-export const createGetAllEntryRevisions = params => {
-  const {
-    entity,
-    tenant
-  } = params;
-  return new DataLoader(async ids => {
-    const results = {};
-    for (const id of ids) {
-      results[id] = (await entity.queryAllClean({
-        partitionKey: createPartitionKey({
-          tenant,
-          id
-        }),
-        options: {
-          beginsWith: "REV#"
-        }
-      })).map(result => {
-        return result.data;
-      });
-    }
-    return ids.map(id => {
-      return results[id] || [];
+const createGetAllEntryRevisions = (params)=>{
+    const { entity, tenant, modelId } = params;
+    return new dataloader(async (ids)=>{
+        const results = {};
+        for (const id of ids)results[id] = (await entity.queryAllClean({
+            partitionKey: createPartitionKey({
+                tenant,
+                id
+            }),
+            options: {
+                beginsWith: "REV#"
+            }
+        })).map((result)=>result.data);
+        return ids.map((id)=>(results[id] || []).filter((item)=>item.modelId === modelId));
+    }, {
+        batchScheduleFn: createBatchScheduleFn()
     });
-  }, {
-    batchScheduleFn: createBatchScheduleFn()
-  });
 };
+export { createGetAllEntryRevisions };
 
 //# sourceMappingURL=getAllEntryRevisions.js.map

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","result","data","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(result => {\n                    return result.data;\n                });\n            }\n\n            return ids.map(id => {\n                return results[id] || [];\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,MAAM,IAAI;QACZ,OAAOA,MAAM,CAACC,IAAI;MACtB,CAAC,CAAC;IACN;IAEA,OAAOT,GAAG,CAACO,GAAG,CAACL,EAAE,IAAI;MACjB,OAAOD,OAAO,CAACC,EAAE,CAAC,IAAI,EAAE;IAC5B,CAAC,CAAC;EACN,CAAC,EACD;IACIQ,eAAe,EAAEf,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/dataLoader/getAllEntryRevisions.js","sources":["../../../../src/operations/entry/dataLoader/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(result => {\n                    return result.data;\n                });\n            }\n\n            return ids.map(id => {\n                return (results[id] || []).filter(item => {\n                    return item.modelId === modelId;\n                });\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"names":["createGetAllEntryRevisions","params","entity","tenant","modelId","DataLoader","ids","results","id","createPartitionKey","result","item","createBatchScheduleFn"],"mappings":";;;AAMO,MAAMA,6BAA6B,CAACC;IACvC,MAAM,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAE,GAAGH;IACpC,OAAO,IAAII,WACP,OAAMC;QACF,MAAMC,UAA6C,CAAC;QAEpD,KAAK,MAAMC,MAAMF,IACbC,OAAO,CAACC,GAAG,GACP,OAAMN,OAAO,aAAa,CAAC;YACvB,cAAcO,mBAAmB;gBAC7BN;gBACAK;YACJ;YACA,SAAS;gBACL,YAAY;YAChB;QACJ,EAAC,EACH,GAAG,CAACE,CAAAA,SACKA,OAAO,IAAI;QAI1B,OAAOJ,IAAI,GAAG,CAACE,CAAAA,KACHD,AAAAA,CAAAA,OAAO,CAACC,GAAG,IAAI,EAAC,EAAG,MAAM,CAACG,CAAAA,OACvBA,KAAK,OAAO,KAAKP;IAGpC,GACA;QACI,iBAAiBQ;IACrB;AAER"}

package/operations/entry/dataLoader/getLatestRevisionByEntryId.js

@@ -1,46 +1,40 @@
-import DataLoader from "dataloader";
+import dataloader from "dataloader";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup.js";
 import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
 import { createLatestSortKey, createPartitionKey } from "../keys.js";
 import { parseIdentifier } from "@webiny/utils";
-export const createGetLatestRevisionByEntryId = params => {
-  const {
-    entity,
-    tenant
-  } = params;
-  const latestKey = createLatestSortKey();
-  return new DataLoader(async ids => {
-    const reader = entity.createEntityReader();
-    const keys = new Set();
-    for (const id of ids) {
-      const partitionKey = createPartitionKey({
-        tenant,
-        id
-      });
-      if (keys.has(partitionKey)) {
-        continue;
-      }
-      keys.add(partitionKey);
-      reader.get({
-        PK: partitionKey,
-        SK: latestKey
-      });
-    }
-    const records = await reader.execute();
-    const items = cleanupItems(entity.entity, records).map(item => {
-      return item.data;
+const createGetLatestRevisionByEntryId = (params)=>{
+    const { entity, tenant, modelId } = params;
+    const latestKey = createLatestSortKey();
+    return new dataloader(async (ids)=>{
+        const reader = entity.createEntityReader();
+        const keys = new Set();
+        for (const id of ids){
+            const partitionKey = createPartitionKey({
+                tenant,
+                id
+            });
+            if (!keys.has(partitionKey)) {
+                keys.add(partitionKey);
+                reader.get({
+                    PK: partitionKey,
+                    SK: latestKey
+                });
+            }
+        }
+        const records = await reader.execute();
+        const items = cleanupItems(entity.entity, records).map((item)=>item.data);
+        return ids.map((id)=>{
+            const { id: entryId } = parseIdentifier(id);
+            return items.filter((item)=>{
+                if (item.modelId !== modelId) return false;
+                return entryId === item.entryId;
+            });
+        });
+    }, {
+        batchScheduleFn: createBatchScheduleFn()
     });
-    return ids.map(id => {
-      const {
-        id: entryId
-      } = parseIdentifier(id);
-      return items.filter(item => {
-        return entryId === item.entryId;
-      });
-    });
-  }, {
-    batchScheduleFn: createBatchScheduleFn()
-  });
 };
+export { createGetLatestRevisionByEntryId };
 
 //# sourceMappingURL=getLatestRevisionByEntryId.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["DataLoader","cleanupItems","createBatchScheduleFn","createLatestSortKey","createPartitionKey","parseIdentifier","createGetLatestRevisionByEntryId","params","entity","tenant","latestKey","ids","reader","createEntityReader","keys","Set","id","partitionKey","has","add","get","PK","SK","records","execute","items","map","item","data","entryId","filter","batchScheduleFn"],"sources":["getLatestRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup.js\";\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\";\nimport { parseIdentifier } from \"@webiny/utils\";\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\n                reader.get({\n                    PK: partitionKey,\n                    SK: latestKey\n                });\n            }\n\n            const records = await reader.execute();\n            const items = cleanupItems(entity.entity, records).map(item => {\n                return item.data;\n            });\n\n            return ids.map(id => {\n                const { id: entryId } = parseIdentifier(id);\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;AACnC,SAASC,YAAY,QAAQ,sCAAsC;AAEnE,SAASC,qBAAqB;AAC9B,SAASC,mBAAmB,EAAEC,kBAAkB;AAEhD,SAASC,eAAe,QAAQ,eAAe;AAE/C,OAAO,MAAMC,gCAAgC,GAAIC,MAAyB,IAAK;EAC3E,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGF,MAAM;EAEjC,MAAMG,SAAS,GAAGP,mBAAmB,CAAC,CAAC;EAEvC,OAAO,IAAIH,UAAU,CACjB,MAAMW,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,GAAGb,kBAAkB,CAAC;QACpCK,MAAM;QACNO;MACJ,CAAC,CAAC;MACF,IAAIF,IAAI,CAACI,GAAG,CAACD,YAAY,CAAC,EAAE;QACxB;MACJ;MACAH,IAAI,CAACK,GAAG,CAACF,YAAY,CAAC;MAEtBL,MAAM,CAACQ,GAAG,CAAC;QACPC,EAAE,EAAEJ,YAAY;QAChBK,EAAE,EAAEZ;MACR,CAAC,CAAC;IACN;IAEA,MAAMa,OAAO,GAAG,MAAMX,MAAM,CAACY,OAAO,CAAC,CAAC;IACtC,MAAMC,KAAK,GAAGxB,YAAY,CAACO,MAAM,CAACA,MAAM,EAAEe,OAAO,CAAC,CAACG,GAAG,CAACC,IAAI,IAAI;MAC3D,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOjB,GAAG,CAACe,GAAG,CAACV,EAAE,IAAI;MACjB,MAAM;QAAEA,EAAE,EAAEa;MAAQ,CAAC,GAAGxB,eAAe,CAACW,EAAE,CAAC;MAC3C,OAAOS,KAAK,CAACK,MAAM,CAACH,IAAI,IAAI;QACxB,OAAOE,OAAO,KAAKF,IAAI,CAACE,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIE,eAAe,EAAE7B,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/dataLoader/getLatestRevisionByEntryId.js","sources":["../../../../src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup.js\";\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\";\nimport { parseIdentifier } from \"@webiny/utils\";\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\n                reader.get({\n                    PK: partitionKey,\n                    SK: latestKey\n                });\n            }\n\n            const records = await reader.execute();\n            const items = cleanupItems(entity.entity, records).map(item => {\n                return item.data;\n            });\n\n            return ids.map(id => {\n                const { id: entryId } = parseIdentifier(id);\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"],"names":["createGetLatestRevisionByEntryId","params","entity","tenant","modelId","latestKey","createLatestSortKey","DataLoader","ids","reader","keys","Set","id","partitionKey","createPartitionKey","records","items","cleanupItems","item","entryId","parseIdentifier","createBatchScheduleFn"],"mappings":";;;;;AAQO,MAAMA,mCAAmC,CAACC;IAC7C,MAAM,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAE,GAAGH;IAEpC,MAAMI,YAAYC;IAElB,OAAO,IAAIC,WACP,OAAMC;QACF,MAAMC,SAASP,OAAO,kBAAkB;QAExC,MAAMQ,OAAO,IAAIC;QAEjB,KAAK,MAAMC,MAAMJ,IAAK;YAClB,MAAMK,eAAeC,mBAAmB;gBACpCX;gBACAS;YACJ;YACA,KAAIF,KAAK,GAAG,CAACG;gBAGbH,KAAK,GAAG,CAACG;gBAETJ,OAAO,GAAG,CAAC;oBACP,IAAII;oBACJ,IAAIR;gBACR;;QACJ;QAEA,MAAMU,UAAU,MAAMN,OAAO,OAAO;QACpC,MAAMO,QAAQC,aAAaf,OAAO,MAAM,EAAEa,SAAS,GAAG,CAACG,CAAAA,OAC5CA,KAAK,IAAI;QAGpB,OAAOV,IAAI,GAAG,CAACI,CAAAA;YACX,MAAM,EAAE,IAAIO,OAAO,EAAE,GAAGC,gBAAgBR;YACxC,OAAOI,MAAM,MAAM,CAACE,CAAAA;gBAChB,IAAIA,KAAK,OAAO,KAAKd,SACjB,OAAO;gBAEX,OAAOe,YAAYD,KAAK,OAAO;YACnC;QACJ;IACJ,GACA;QACI,iBAAiBG;IACrB;AAER"}

package/operations/entry/dataLoader/getPublishedRevisionByEntryId.js

@@ -1,46 +1,40 @@
-import DataLoader from "dataloader";
+import dataloader from "dataloader";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup.js";
 import { createPartitionKey, createPublishedSortKey } from "../keys.js";
 import { parseIdentifier } from "@webiny/utils";
 import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
-export const createGetPublishedRevisionByEntryId = params => {
-  const {
-    entity,
-    tenant
-  } = params;
-  const publishedKey = createPublishedSortKey();
-  return new DataLoader(async ids => {
-    const reader = entity.createEntityReader();
-    const keys = new Set();
-    for (const id of ids) {
-      const partitionKey = createPartitionKey({
-        tenant,
-        id
-      });
-      if (keys.has(partitionKey)) {
-        continue;
-      }
-      keys.add(partitionKey);
-      reader.get({
-        PK: partitionKey,
-        SK: publishedKey
-      });
-    }
-    const records = await reader.execute();
-    const items = cleanupItems(entity.entity, records).map(item => {
-      return item.data;
+const createGetPublishedRevisionByEntryId = (params)=>{
+    const { entity, tenant, modelId } = params;
+    const publishedKey = createPublishedSortKey();
+    return new dataloader(async (ids)=>{
+        const reader = entity.createEntityReader();
+        const keys = new Set();
+        for (const id of ids){
+            const partitionKey = createPartitionKey({
+                tenant,
+                id
+            });
+            if (!keys.has(partitionKey)) {
+                keys.add(partitionKey);
+                reader.get({
+                    PK: partitionKey,
+                    SK: publishedKey
+                });
+            }
+        }
+        const records = await reader.execute();
+        const items = cleanupItems(entity.entity, records).map((item)=>item.data);
+        return ids.map((id)=>{
+            const { id: entryId } = parseIdentifier(id);
+            return items.filter((item)=>{
+                if (item.modelId !== modelId) return false;
+                return entryId === item.entryId;
+            });
+        });
+    }, {
+        batchScheduleFn: createBatchScheduleFn()
     });
-    return ids.map(id => {
-      const {
-        id: entryId
-      } = parseIdentifier(id);
-      return items.filter(item => {
-        return entryId === item.entryId;
-      });
-    });
-  }, {
-    batchScheduleFn: createBatchScheduleFn()
-  });
 };
+export { createGetPublishedRevisionByEntryId };
 
 //# sourceMappingURL=getPublishedRevisionByEntryId.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["DataLoader","cleanupItems","createPartitionKey","createPublishedSortKey","parseIdentifier","createBatchScheduleFn","createGetPublishedRevisionByEntryId","params","entity","tenant","publishedKey","ids","reader","createEntityReader","keys","Set","id","partitionKey","has","add","get","PK","SK","records","execute","items","map","item","data","entryId","filter","batchScheduleFn"],"sources":["getPublishedRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup.js\";\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 { parseIdentifier } from \"@webiny/utils\";\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 records = await reader.execute();\n            const items = cleanupItems(entity.entity, records).map(item => {\n                return item.data;\n            });\n\n            return ids.map(id => {\n                const { id: entryId } = parseIdentifier(id);\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;AACnC,SAASC,YAAY,QAAQ,sCAAsC;AAEnE,SAASC,kBAAkB,EAAEC,sBAAsB;AAEnD,SAASC,eAAe,QAAQ,eAAe;AAC/C,SAASC,qBAAqB;AAE9B,OAAO,MAAMC,mCAAmC,GAAIC,MAAyB,IAAK;EAC9E,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGF,MAAM;EAEjC,MAAMG,YAAY,GAAGP,sBAAsB,CAAC,CAAC;EAC7C,OAAO,IAAIH,UAAU,CACjB,MAAMW,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,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,OAAO,GAAG,MAAMX,MAAM,CAACY,OAAO,CAAC,CAAC;IACtC,MAAMC,KAAK,GAAGxB,YAAY,CAACO,MAAM,CAACA,MAAM,EAAEe,OAAO,CAAC,CAACG,GAAG,CAACC,IAAI,IAAI;MAC3D,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOjB,GAAG,CAACe,GAAG,CAACV,EAAE,IAAI;MACjB,MAAM;QAAEA,EAAE,EAAEa;MAAQ,CAAC,GAAGzB,eAAe,CAACY,EAAE,CAAC;MAC3C,OAAOS,KAAK,CAACK,MAAM,CAACH,IAAI,IAAI;QACxB,OAAOE,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":[]}
+{"version":3,"file":"operations/entry/dataLoader/getPublishedRevisionByEntryId.js","sources":["../../../../src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup.js\";\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 { parseIdentifier } from \"@webiny/utils\";\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 records = await reader.execute();\n            const items = cleanupItems(entity.entity, records).map(item => {\n                return item.data;\n            });\n\n            return ids.map(id => {\n                const { id: entryId } = parseIdentifier(id);\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"],"names":["createGetPublishedRevisionByEntryId","params","entity","tenant","modelId","publishedKey","createPublishedSortKey","DataLoader","ids","reader","keys","Set","id","partitionKey","createPartitionKey","records","items","cleanupItems","item","entryId","parseIdentifier","createBatchScheduleFn"],"mappings":";;;;;AAQO,MAAMA,sCAAsC,CAACC;IAChD,MAAM,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAE,GAAGH;IAEpC,MAAMI,eAAeC;IACrB,OAAO,IAAIC,WACP,OAAMC;QACF,MAAMC,SAASP,OAAO,kBAAkB;QAExC,MAAMQ,OAAO,IAAIC;QAEjB,KAAK,MAAMC,MAAMJ,IAAK;YAClB,MAAMK,eAAeC,mBAAmB;gBACpCX;gBACAS;YACJ;YACA,KAAIF,KAAK,GAAG,CAACG;gBAGbH,KAAK,GAAG,CAACG;gBACTJ,OAAO,GAAG,CAAC;oBACP,IAAII;oBACJ,IAAIR;gBACR;;QACJ;QAEA,MAAMU,UAAU,MAAMN,OAAO,OAAO;QACpC,MAAMO,QAAQC,aAAaf,OAAO,MAAM,EAAEa,SAAS,GAAG,CAACG,CAAAA,OAC5CA,KAAK,IAAI;QAGpB,OAAOV,IAAI,GAAG,CAACI,CAAAA;YACX,MAAM,EAAE,IAAIO,OAAO,EAAE,GAAGC,gBAAgBR;YACxC,OAAOI,MAAM,MAAM,CAACE,CAAAA;gBAChB,IAAIA,KAAK,OAAO,KAAKd,SACjB,OAAO;gBAEX,OAAOe,YAAYD,KAAK,OAAO;YACnC;QACJ;IACJ,GACA;QACI,iBAAiBG;IACrB;AAER"}

package/operations/entry/dataLoader/getRevisionById.js

@@ -1,52 +1,42 @@
-import DataLoader from "dataloader";
+import dataloader from "dataloader";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup.js";
 import { createPartitionKey, createRevisionSortKey } from "../keys.js";
 import { parseIdentifier } from "@webiny/utils";
 import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
-export const createGetRevisionById = params => {
-  const {
-    entity,
-    tenant
-  } = params;
-  return new DataLoader(async ids => {
-    const reader = entity.createEntityReader();
-    const keys = new Set();
-    for (const id of ids) {
-      const partitionKey = createPartitionKey({
-        tenant,
-        id
-      });
-      const {
-        version
-      } = parseIdentifier(id);
-      if (version === null) {
-        continue;
-      }
-      const sortKey = createRevisionSortKey({
-        version
-      });
-      const key = `${partitionKey}__${sortKey}`;
-      if (keys.has(key)) {
-        continue;
-      }
-      keys.add(key);
-      reader.get({
-        PK: partitionKey,
-        SK: sortKey
-      });
-    }
-    const records = await reader.execute();
-    const items = cleanupItems(entity.entity, records).map(item => {
-      return item.data;
+const createGetRevisionById = (params)=>{
+    const { entity, tenant, modelId } = params;
+    return new dataloader(async (ids)=>{
+        const reader = entity.createEntityReader();
+        const keys = new Set();
+        for (const id of ids){
+            const partitionKey = createPartitionKey({
+                tenant,
+                id
+            });
+            const { version } = parseIdentifier(id);
+            if (null === version) continue;
+            const sortKey = createRevisionSortKey({
+                version
+            });
+            const key = `${partitionKey}__${sortKey}`;
+            if (!keys.has(key)) {
+                keys.add(key);
+                reader.get({
+                    PK: partitionKey,
+                    SK: sortKey
+                });
+            }
+        }
+        const records = await reader.execute();
+        const items = cleanupItems(entity.entity, records).map((item)=>item.data);
+        return ids.map((id)=>items.filter((item)=>{
+                if (item.modelId !== modelId) return false;
+                return id === item.id;
+            }));
+    }, {
+        batchScheduleFn: createBatchScheduleFn()
     });
-    return ids.map(id => {
-      return items.filter(item => {
-        return id === item.id;
-      });
-    });
-  }, {
-    batchScheduleFn: createBatchScheduleFn()
-  });
 };
+export { createGetRevisionById };
 
 //# sourceMappingURL=getRevisionById.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["DataLoader","cleanupItems","createPartitionKey","createRevisionSortKey","parseIdentifier","createBatchScheduleFn","createGetRevisionById","params","entity","tenant","ids","reader","createEntityReader","keys","Set","id","partitionKey","version","sortKey","key","has","add","get","PK","SK","records","execute","items","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 { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup.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 records = await reader.execute();\n            const items = cleanupItems(entity.entity, records).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,YAAY,QAAQ,sCAAsC;AACnE,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,IAAIP,UAAU,CACjB,MAAMU,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,OAAO,GAAG,MAAMd,MAAM,CAACe,OAAO,CAAC,CAAC;IACtC,MAAMC,KAAK,GAAG1B,YAAY,CAACO,MAAM,CAACA,MAAM,EAAEiB,OAAO,CAAC,CAACG,GAAG,CAACC,IAAI,IAAI;MAC3D,OAAOA,IAAI,CAACC,IAAI;IACpB,CAAC,CAAC;IAEF,OAAOpB,GAAG,CAACkB,GAAG,CAACb,EAAE,IAAI;MACjB,OAAOY,KAAK,CAACI,MAAM,CAACF,IAAI,IAAI;QACxB,OAAOd,EAAE,KAAKc,IAAI,CAACd,EAAE;MACzB,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIiB,eAAe,EAAE3B,qBAAqB,CAAC;EAC3C,CACJ,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/dataLoader/getRevisionById.js","sources":["../../../../src/operations/entry/dataLoader/getRevisionById.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types/index.js\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup.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 records = await reader.execute();\n            const items = cleanupItems(entity.entity, records).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"],"names":["createGetRevisionById","params","entity","tenant","modelId","DataLoader","ids","reader","keys","Set","id","partitionKey","createPartitionKey","version","parseIdentifier","sortKey","createRevisionSortKey","key","records","items","cleanupItems","item","createBatchScheduleFn"],"mappings":";;;;;AAQO,MAAMA,wBAAwB,CAACC;IAClC,MAAM,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAE,GAAGH;IAEpC,OAAO,IAAII,WACP,OAAMC;QACF,MAAMC,SAASL,OAAO,kBAAkB;QAExC,MAAMM,OAAO,IAAIC;QAEjB,KAAK,MAAMC,MAAMJ,IAAK;YAClB,MAAMK,eAAeC,mBAAmB;gBACpCT;gBACAO;YACJ;YACA,MAAM,EAAEG,OAAO,EAAE,GAAGC,gBAAgBJ;YACpC,IAAIG,AAAY,SAAZA,SACA;YAEJ,MAAME,UAAUC,sBAAsB;gBAClCH;YACJ;YACA,MAAMI,MAAM,GAAGN,aAAa,EAAE,EAAEI,SAAS;YACzC,KAAIP,KAAK,GAAG,CAACS;gBAGbT,KAAK,GAAG,CAACS;gBAETV,OAAO,GAAG,CAAC;oBACP,IAAII;oBACJ,IAAII;gBACR;;QACJ;QAEA,MAAMG,UAAU,MAAMX,OAAO,OAAO;QACpC,MAAMY,QAAQC,aAAalB,OAAO,MAAM,EAAEgB,SAAS,GAAG,CAACG,CAAAA,OAC5CA,KAAK,IAAI;QAGpB,OAAOf,IAAI,GAAG,CAACI,CAAAA,KACJS,MAAM,MAAM,CAACE,CAAAA;gBAChB,IAAIA,KAAK,OAAO,KAAKjB,SACjB,OAAO;gBAEX,OAAOM,OAAOW,KAAK,EAAE;YACzB;IAER,GACA;QACI,iBAAiBC;IACrB;AAER"}

package/operations/entry/dataLoader/index.js

@@ -4,16 +4,15 @@ import { createGetPublishedRevisionByEntryId } from "./getPublishedRevisionByEnt
 import { createGetRevisionById } from "./getRevisionById.js";
 export * from "./DataLoaderCache.js";
 const dataLoaders = {
-  getAllEntryRevisions: createGetAllEntryRevisions,
-  getLatestRevisionByEntryId: createGetLatestRevisionByEntryId,
-  getPublishedRevisionByEntryId: createGetPublishedRevisionByEntryId,
-  getRevisionById: createGetRevisionById
+    getAllEntryRevisions: createGetAllEntryRevisions,
+    getLatestRevisionByEntryId: createGetLatestRevisionByEntryId,
+    getPublishedRevisionByEntryId: createGetPublishedRevisionByEntryId,
+    getRevisionById: createGetRevisionById
 };
-export const getDataLoaderFactory = name => {
-  if (!dataLoaders[name]) {
-    throw new Error(`Missing data loader "${name}".`);
-  }
-  return dataLoaders[name];
+const getDataLoaderFactory = (name)=>{
+    if (!dataLoaders[name]) throw new Error(`Missing data loader "${name}".`);
+    return dataLoaders[name];
 };
+export { getDataLoaderFactory };
 
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createGetAllEntryRevisions","createGetLatestRevisionByEntryId","createGetPublishedRevisionByEntryId","createGetRevisionById","dataLoaders","getAllEntryRevisions","getLatestRevisionByEntryId","getPublishedRevisionByEntryId","getRevisionById","getDataLoaderFactory","name","Error"],"sources":["index.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { createGetAllEntryRevisions } from \"./getAllEntryRevisions.js\";\nimport { createGetLatestRevisionByEntryId } from \"./getLatestRevisionByEntryId.js\";\nimport { createGetPublishedRevisionByEntryId } from \"./getPublishedRevisionByEntryId.js\";\nimport { createGetRevisionById } from \"./getRevisionById.js\";\n\nexport * from \"./DataLoaderCache.js\";\n\ninterface Callable {\n    (params: IDataLoaderParams): DataLoader<any, any>;\n}\n\nconst dataLoaders: Record<string, Callable> = {\n    getAllEntryRevisions: createGetAllEntryRevisions,\n    getLatestRevisionByEntryId: createGetLatestRevisionByEntryId,\n    getPublishedRevisionByEntryId: createGetPublishedRevisionByEntryId,\n    getRevisionById: createGetRevisionById\n};\n\nexport type DataLoaders =\n    | \"getAllEntryRevisions\"\n    | \"getRevisionById\"\n    | \"getPublishedRevisionByEntryId\"\n    | \"getLatestRevisionByEntryId\";\n\nexport const getDataLoaderFactory = (name: string) => {\n    if (!dataLoaders[name]) {\n        throw new Error(`Missing data loader \"${name}\".`);\n    }\n    return dataLoaders[name];\n};\n"],"mappings":"AAEA,SAASA,0BAA0B;AACnC,SAASC,gCAAgC;AACzC,SAASC,mCAAmC;AAC5C,SAASC,qBAAqB;AAE9B;AAMA,MAAMC,WAAqC,GAAG;EAC1CC,oBAAoB,EAAEL,0BAA0B;EAChDM,0BAA0B,EAAEL,gCAAgC;EAC5DM,6BAA6B,EAAEL,mCAAmC;EAClEM,eAAe,EAAEL;AACrB,CAAC;AAQD,OAAO,MAAMM,oBAAoB,GAAIC,IAAY,IAAK;EAClD,IAAI,CAACN,WAAW,CAACM,IAAI,CAAC,EAAE;IACpB,MAAM,IAAIC,KAAK,CAAC,wBAAwBD,IAAI,IAAI,CAAC;EACrD;EACA,OAAON,WAAW,CAACM,IAAI,CAAC;AAC5B,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/dataLoader/index.js","sources":["../../../../src/operations/entry/dataLoader/index.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport type { IDataLoaderParams } from \"./types.js\";\nimport { createGetAllEntryRevisions } from \"./getAllEntryRevisions.js\";\nimport { createGetLatestRevisionByEntryId } from \"./getLatestRevisionByEntryId.js\";\nimport { createGetPublishedRevisionByEntryId } from \"./getPublishedRevisionByEntryId.js\";\nimport { createGetRevisionById } from \"./getRevisionById.js\";\n\nexport * from \"./DataLoaderCache.js\";\n\ninterface Callable {\n    (params: IDataLoaderParams): DataLoader<any, any>;\n}\n\nconst dataLoaders: Record<string, Callable> = {\n    getAllEntryRevisions: createGetAllEntryRevisions,\n    getLatestRevisionByEntryId: createGetLatestRevisionByEntryId,\n    getPublishedRevisionByEntryId: createGetPublishedRevisionByEntryId,\n    getRevisionById: createGetRevisionById\n};\n\nexport type DataLoaders =\n    | \"getAllEntryRevisions\"\n    | \"getRevisionById\"\n    | \"getPublishedRevisionByEntryId\"\n    | \"getLatestRevisionByEntryId\";\n\nexport const getDataLoaderFactory = (name: string) => {\n    if (!dataLoaders[name]) {\n        throw new Error(`Missing data loader \"${name}\".`);\n    }\n    return dataLoaders[name];\n};\n"],"names":["dataLoaders","createGetAllEntryRevisions","createGetLatestRevisionByEntryId","createGetPublishedRevisionByEntryId","createGetRevisionById","getDataLoaderFactory","name","Error"],"mappings":";;;;;AAaA,MAAMA,cAAwC;IAC1C,sBAAsBC;IACtB,4BAA4BC;IAC5B,+BAA+BC;IAC/B,iBAAiBC;AACrB;AAQO,MAAMC,uBAAuB,CAACC;IACjC,IAAI,CAACN,WAAW,CAACM,KAAK,EAClB,MAAM,IAAIC,MAAM,CAAC,qBAAqB,EAAED,KAAK,EAAE,CAAC;IAEpD,OAAON,WAAW,CAACM,KAAK;AAC5B"}

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

@@ -1,3 +0,0 @@
-export {};
-
-//# sourceMappingURL=types.js.map