@webiny/api-headless-cms-ddb 6.0.0-alpha.5 → 6.0.0-rc.0

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_filters","_interopRequireDefault","require","_dynamoDb","_types","_table","_system","_group","_model","_entry","_plugins","_system2","_group2","_model2","_entry2","_plugins2","_plugins3","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_ValueFilterPlugin","_apiHeadlessCms","_api","createStorageOperations","params","attributes","table","documentClient","plugins","userPlugins","tableInstance","createTable","entities","system","createSystemEntity","entityName","ENTITIES","SYSTEM","groups","createGroupEntity","GROUPS","models","createModelEntity","MODELS","entries","createEntryEntity","ENTRIES","PluginsContainer","dynamoDbValueFilters","dynamoDbPlugins","createFilterCreatePlugins","createEntriesStorageOperations","entity","name","beforeInit","context","types","CmsEntryFieldFilterPathPlugin","type","CmsFieldFilterValueTransformPlugin","CmsEntryFieldFilterPlugin","CmsEntryFieldSortingPlugin","ValueFilterPlugin","StorageOperationsCmsModelPlugin","StorageTransformPlugin","CompressorPlugin","mergeByType","register","dataLoaders","clearAll","getEntities","getTable","createSystemStorageOperations","createGroupsStorageOperations","createModelsStorageOperations"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport dynamoDbPlugins from \"./dynamoDb\";\nimport type { StorageOperationsFactory } from \"~/types\";\nimport { ENTITIES } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createGroupEntity } from \"~/definitions/group\";\nimport { createModelEntity } from \"~/definitions/model\";\nimport { createEntryEntity } from \"~/definitions/entry\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createSystemStorageOperations } from \"~/operations/system\";\nimport { createGroupsStorageOperations } from \"~/operations/group\";\nimport { createModelsStorageOperations } from \"~/operations/model\";\nimport { createEntriesStorageOperations } from \"./operations/entry\";\n\nimport { createFilterCreatePlugins } from \"~/operations/entry/filtering/plugins\";\nimport {\n    CmsEntryFieldFilterPathPlugin,\n    CmsEntryFieldFilterPlugin,\n    CmsEntryFieldSortingPlugin,\n    CmsFieldFilterValueTransformPlugin\n} from \"~/plugins\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { CompressorPlugin } from \"@webiny/api\";\n\nexport * from \"./plugins\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { attributes, table, documentClient, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        table,\n        documentClient\n    });\n\n    const entities = {\n        system: createSystemEntity({\n            entityName: ENTITIES.SYSTEM,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SYSTEM] : {}\n        }),\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.GROUPS] : {}\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.MODELS] : {}\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES] : {}\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         * Filter create plugins.\n         */\n        createFilterCreatePlugins(),\n        /**\n         * User defined custom plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    const entries = createEntriesStorageOperations({\n        entity: entities.entries,\n        plugins\n    });\n\n    return {\n        name: \"dynamodb\",\n        beforeInit: async context => {\n            const types: string[] = [\n                \"cms-model-field-to-graphql\",\n                CmsEntryFieldFilterPathPlugin.type,\n                CmsFieldFilterValueTransformPlugin.type,\n                CmsEntryFieldFilterPlugin.type,\n                CmsEntryFieldSortingPlugin.type,\n                ValueFilterPlugin.type,\n                StorageOperationsCmsModelPlugin.type,\n                StorageTransformPlugin.type,\n                CompressorPlugin.type\n            ];\n            /**\n             * Collect all required plugins from parent context.\n             */\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n\n            entries.dataLoaders.clearAll();\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        system: createSystemStorageOperations({\n            entity: entities.system\n        }),\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models\n        }),\n        entries\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["dynamoDbValueFilters","dynamoDbPlugins","ENTITIES","createGroupEntity","createModelEntity","createEntryEntity","PluginsContainer","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations","createFilterCreatePlugins","CmsEntryFieldFilterPathPlugin","CmsEntryFieldFilterPlugin","CmsEntryFieldSortingPlugin","CmsFieldFilterValueTransformPlugin","ValueFilterPlugin","StorageOperationsCmsModelPlugin","StorageTransformPlugin","CompressorPlugin","createTable","createStorageOperations","params","table","documentClient","plugins","userPlugins","tableInstance","name","entities","groups","entityName","GROUPS","models","MODELS","entries","ENTRIES","entity","beforeInit","context","types","type","mergeByType","register","dataLoaders","clearAll","getEntities","getTable"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters/index.js\";\nimport dynamoDbPlugins from \"./dynamoDb/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 { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group/index.js\";\nimport { createModelsStorageOperations } from \"~/operations/model/index.js\";\nimport { createEntriesStorageOperations } from \"./operations/entry/index.js\";\n\nimport { createFilterCreatePlugins } from \"~/operations/entry/filtering/plugins/index.js\";\nimport {\n    CmsEntryFieldFilterPathPlugin,\n    CmsEntryFieldFilterPlugin,\n    CmsEntryFieldSortingPlugin,\n    CmsFieldFilterValueTransformPlugin\n} from \"~/plugins/index.js\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js\";\nimport { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { CompressorPlugin } from \"@webiny/api\";\nimport { createTable } from \"~/definitions/table.js\";\n\nexport * from \"./plugins/index.js\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { table, documentClient, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        name: table,\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    };\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         * Filter create plugins.\n         */\n        createFilterCreatePlugins(),\n        /**\n         * User defined custom plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    const entries = createEntriesStorageOperations({\n        entity: entities.entries,\n        plugins\n    });\n\n    return {\n        name: \"dynamodb\",\n        beforeInit: async context => {\n            const types: string[] = [\n                \"cms-model-field-to-graphql\",\n                CmsEntryFieldFilterPathPlugin.type,\n                CmsFieldFilterValueTransformPlugin.type,\n                CmsEntryFieldFilterPlugin.type,\n                CmsEntryFieldSortingPlugin.type,\n                ValueFilterPlugin.type,\n                StorageOperationsCmsModelPlugin.type,\n                StorageTransformPlugin.type,\n                CompressorPlugin.type\n            ];\n            /**\n             * Collect all required plugins from parent context.\n             */\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n\n            entries.dataLoaders.clearAll();\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models\n        }),\n        entries\n    };\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -2,11 +2,9 @@ import type DataLoader from "dataloader";
 export interface CacheKeyParams {
     name: string;
     tenant: string;
-    locale: string;
 }
 export interface ClearAllParams {
     tenant: string;
-    locale: string;
 }
 export declare class DataLoaderCache {
     private readonly cache;

package/operations/entry/dataLoader/DataLoaderCache.js

@@ -1,10 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DataLoaderCache = void 0;
-class DataLoaderCache {
+export class DataLoaderCache {
   cache = {};
   getDataLoader(params) {
     const key = this.createKey(params);
@@ -33,9 +27,8 @@ class DataLoaderCache {
     }
   }
   createKey(params) {
-    return `${params.tenant}_${params.locale}_${params.name}`;
+    return `${params.tenant}_${params.name}`;
   }
 }
-exports.DataLoaderCache = 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","locale","exports"],"sources":["DataLoaderCache.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nexport interface CacheKeyParams {\n    name: string;\n    tenant: string;\n    locale: string;\n}\n\nexport interface ClearAllParams {\n    tenant: string;\n    locale: 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.locale}_${params.name}`;\n    }\n}\n"],"mappings":";;;;;;AAaO,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,CAACU,MAAM,IAAIV,MAAM,CAACO,IAAI,EAAE;EAC7D;AACJ;AAACI,OAAA,CAAAd,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"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":[]}

package/operations/entry/dataLoader/constants.js

@@ -1,10 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CMS_ENTRY_BATCH_SCHEDULE_WAIT = void 0;
 const batchScheduleWaitEnv = Number(process.env.WEBINY_API_CMS_ENTRY_BATCH_SCHEDULE_WAIT || "0");
-const CMS_ENTRY_BATCH_SCHEDULE_WAIT = exports.CMS_ENTRY_BATCH_SCHEDULE_WAIT = isNaN(batchScheduleWaitEnv) ? 0 : batchScheduleWaitEnv;
+export const CMS_ENTRY_BATCH_SCHEDULE_WAIT = isNaN(batchScheduleWaitEnv) ? 0 : batchScheduleWaitEnv;
 
 //# 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","exports","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;AACzF,MAAMC,6BAA6B,GAAAC,OAAA,CAAAD,6BAAA,GAAGE,KAAK,CAACP,oBAAoB,CAAC,GAAG,CAAC,GAAGA,oBAAoB","ignoreList":[]}
+{"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":[]}

package/operations/entry/dataLoader/createBatchScheduleFn.js

@@ -1,10 +1,5 @@
-"use strict";
+import { CMS_ENTRY_BATCH_SCHEDULE_WAIT } from "./constants.js";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createBatchScheduleFn = void 0;
-var _constants = require("./constants");
 /**
  * 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.
@@ -12,14 +7,13 @@ var _constants = require("./constants");
  *
  * https://github.com/graphql/dataloader#batch-scheduling
  */
-const createBatchScheduleFn = () => {
-  if (_constants.CMS_ENTRY_BATCH_SCHEDULE_WAIT <= 0) {
+export const createBatchScheduleFn = () => {
+  if (CMS_ENTRY_BATCH_SCHEDULE_WAIT <= 0) {
     return undefined;
   }
   return callback => {
-    setTimeout(callback, _constants.CMS_ENTRY_BATCH_SCHEDULE_WAIT);
+    setTimeout(callback, CMS_ENTRY_BATCH_SCHEDULE_WAIT);
   };
 };
-exports.createBatchScheduleFn = createBatchScheduleFn;
 
 //# sourceMappingURL=createBatchScheduleFn.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_constants","require","createBatchScheduleFn","CMS_ENTRY_BATCH_SCHEDULE_WAIT","undefined","callback","setTimeout","exports"],"sources":["createBatchScheduleFn.ts"],"sourcesContent":["import { CMS_ENTRY_BATCH_SCHEDULE_WAIT } from \"./constants\";\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,IAAAA,UAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,qBAAqB,GAAGA,CAAA,KAAM;EACvC,IAAIC,wCAA6B,IAAI,CAAC,EAAE;IACpC,OAAOC,SAAS;EACpB;EACA,OAAQC,QAAoB,IAAK;IAC7BC,UAAU,CAACD,QAAQ,EAAEF,wCAA6B,CAAC;EACvD,CAAC;AACL,CAAC;AAACI,OAAA,CAAAL,qBAAA,GAAAA,qBAAA","ignoreList":[]}
+{"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":[]}

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

@@ -1,4 +1,4 @@
 import DataLoader from "dataloader";
-import type { CmsStorageEntry } from "@webiny/api-headless-cms/types";
-import type { DataLoaderParams } from "./types";
-export declare const createGetAllEntryRevisions: (params: DataLoaderParams) => DataLoader<string, CmsStorageEntry[], string>;
+import type { CmsStorageEntry } from "@webiny/api-headless-cms/types/index.js";
+import type { IDataLoaderParams } from "./types.js";
+export declare const createGetAllEntryRevisions: (params: IDataLoaderParams) => DataLoader<string, CmsStorageEntry<import("@webiny/api-headless-cms/types/types.js").CmsEntryValues>[], string>;

package/operations/entry/dataLoader/getAllEntryRevisions.js

@@ -1,45 +1,32 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createGetAllEntryRevisions = void 0;
-var _dataloader = _interopRequireDefault(require("dataloader"));
-var _query = require("@webiny/db-dynamodb/utils/query");
-var _keys = require("../keys");
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-var _createBatchScheduleFn = require("./createBatchScheduleFn");
-const createGetAllEntryRevisions = params => {
+import DataLoader from "dataloader";
+import { createPartitionKey } from "../keys.js";
+import { createBatchScheduleFn } from "./createBatchScheduleFn.js";
+export const createGetAllEntryRevisions = params => {
   const {
     entity,
-    locale,
     tenant
   } = params;
-  return new _dataloader.default(async ids => {
+  return new DataLoader(async ids => {
     const results = {};
     for (const id of ids) {
-      const queryAllParams = {
-        entity,
-        partitionKey: (0, _keys.createPartitionKey)({
+      results[id] = (await entity.queryAllClean({
+        partitionKey: createPartitionKey({
           tenant,
-          locale,
           id
         }),
         options: {
           beginsWith: "REV#"
         }
-      };
-      const items = await (0, _query.queryAll)(queryAllParams);
-      results[id] = (0, _cleanup.cleanupItems)(entity, items);
+      })).map(result => {
+        return result.data;
+      });
     }
     return ids.map(id => {
       return results[id] || [];
     });
   }, {
-    batchScheduleFn: (0, _createBatchScheduleFn.createBatchScheduleFn)()
+    batchScheduleFn: createBatchScheduleFn()
   });
 };
-exports.createGetAllEntryRevisions = createGetAllEntryRevisions;
 
 //# sourceMappingURL=getAllEntryRevisions.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_dataloader","_interopRequireDefault","require","_query","_keys","_cleanup","_createBatchScheduleFn","createGetAllEntryRevisions","params","entity","locale","tenant","DataLoader","ids","results","id","queryAllParams","partitionKey","createPartitionKey","options","beginsWith","items","queryAll","cleanupItems","map","batchScheduleFn","createBatchScheduleFn","exports"],"sources":["getAllEntryRevisions.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport type { QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { queryAll } from \"@webiny/db-dynamodb/utils/query\";\nimport { createPartitionKey } from \"~/operations/entry/keys\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport type { DataLoaderParams } from \"./types\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn\";\n\nexport const createGetAllEntryRevisions = (params: DataLoaderParams) => {\n    const { entity, locale, tenant } = params;\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async (ids: readonly string[]) => {\n            const results: Record<string, CmsStorageEntry[]> = {};\n            for (const id of ids) {\n                const queryAllParams: QueryAllParams = {\n                    entity,\n                    partitionKey: createPartitionKey({\n                        tenant,\n                        locale,\n                        id\n                    }),\n                    options: {\n                        beginsWith: \"REV#\"\n                    }\n                };\n                const items = await queryAll<CmsStorageEntry>(queryAllParams);\n                results[id] = cleanupItems(entity, items);\n            }\n\n            return ids.map(id => {\n                return results[id] || [];\n            });\n        },\n        {\n            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AACA,IAAAG,QAAA,GAAAH,OAAA;AAEA,IAAAI,sBAAA,GAAAJ,OAAA;AAEO,MAAMK,0BAA0B,GAAIC,MAAwB,IAAK;EACpE,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGH,MAAM;EACzC,OAAO,IAAII,mBAAU,CACjB,MAAOC,GAAsB,IAAK;IAC9B,MAAMC,OAA0C,GAAG,CAAC,CAAC;IACrD,KAAK,MAAMC,EAAE,IAAIF,GAAG,EAAE;MAClB,MAAMG,cAA8B,GAAG;QACnCP,MAAM;QACNQ,YAAY,EAAE,IAAAC,wBAAkB,EAAC;UAC7BP,MAAM;UACND,MAAM;UACNK;QACJ,CAAC,CAAC;QACFI,OAAO,EAAE;UACLC,UAAU,EAAE;QAChB;MACJ,CAAC;MACD,MAAMC,KAAK,GAAG,MAAM,IAAAC,eAAQ,EAAkBN,cAAc,CAAC;MAC7DF,OAAO,CAACC,EAAE,CAAC,GAAG,IAAAQ,qBAAY,EAACd,MAAM,EAAEY,KAAK,CAAC;IAC7C;IAEA,OAAOR,GAAG,CAACW,GAAG,CAACT,EAAE,IAAI;MACjB,OAAOD,OAAO,CAACC,EAAE,CAAC,IAAI,EAAE;IAC5B,CAAC,CAAC;EACN,CAAC,EACD;IACIU,eAAe,EAAE,IAAAC,4CAAqB,EAAC;EAC3C,CACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAApB,0BAAA,GAAAA,0BAAA","ignoreList":[]}
+{"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":[]}

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

@@ -1,4 +1,4 @@
 import DataLoader from "dataloader";
-import type { CmsStorageEntry } from "@webiny/api-headless-cms/types";
-import type { DataLoaderParams } from "./types";
-export declare const createGetLatestRevisionByEntryId: (params: DataLoaderParams) => DataLoader<string, CmsStorageEntry[], string>;
+import type { CmsStorageEntry } from "@webiny/api-headless-cms/types/index.js";
+import type { IDataLoaderParams } from "./types.js";
+export declare const createGetLatestRevisionByEntryId: (params: IDataLoaderParams) => DataLoader<string, CmsStorageEntry<import("@webiny/api-headless-cms/types/types.js").CmsEntryValues>[], string>;

package/operations/entry/dataLoader/getLatestRevisionByEntryId.js

@@ -1,56 +1,46 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createGetLatestRevisionByEntryId = void 0;
-var _dataloader = _interopRequireDefault(require("dataloader"));
-var _dbDynamodb = require("@webiny/db-dynamodb");
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-var _createBatchScheduleFn = require("./createBatchScheduleFn");
-var _keys = require("../keys");
-var _utils = require("@webiny/utils");
-const createGetLatestRevisionByEntryId = params => {
+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,
-    locale,
     tenant
   } = params;
-  const latestKey = (0, _keys.createLatestSortKey)();
-  return new _dataloader.default(async ids => {
-    const queries = ids.reduce((collection, id) => {
-      const partitionKey = (0, _keys.createPartitionKey)({
+  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,
-        locale,
         id
       });
-      if (collection[partitionKey]) {
-        return collection;
+      if (keys.has(partitionKey)) {
+        continue;
       }
-      collection[partitionKey] = entity.getBatch({
+      keys.add(partitionKey);
+      reader.get({
         PK: partitionKey,
         SK: latestKey
       });
-      return collection;
-    }, {});
-    const records = await (0, _dbDynamodb.batchReadAll)({
-      table: entity.table,
-      items: Object.values(queries)
+    }
+    const records = await reader.execute();
+    const items = cleanupItems(entity.entity, records).map(item => {
+      return item.data;
     });
-    const items = (0, _cleanup.cleanupItems)(entity, records);
     return ids.map(id => {
       const {
         id: entryId
-      } = (0, _utils.parseIdentifier)(id);
+      } = parseIdentifier(id);
       return items.filter(item => {
         return entryId === item.entryId;
       });
     });
   }, {
-    batchScheduleFn: (0, _createBatchScheduleFn.createBatchScheduleFn)()
+    batchScheduleFn: createBatchScheduleFn()
   });
 };
-exports.createGetLatestRevisionByEntryId = createGetLatestRevisionByEntryId;
 
 //# sourceMappingURL=getLatestRevisionByEntryId.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_dataloader","_interopRequireDefault","require","_dbDynamodb","_cleanup","_createBatchScheduleFn","_keys","_utils","createGetLatestRevisionByEntryId","params","entity","locale","tenant","latestKey","createLatestSortKey","DataLoader","ids","queries","reduce","collection","id","partitionKey","createPartitionKey","getBatch","PK","SK","records","batchReadAll","table","items","Object","values","cleanupItems","map","entryId","parseIdentifier","filter","item","batchScheduleFn","createBatchScheduleFn","exports"],"sources":["getLatestRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn\";\nimport { createLatestSortKey, createPartitionKey } from \"~/operations/entry/keys\";\nimport type { DataLoaderParams } from \"./types\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\nexport const createGetLatestRevisionByEntryId = (params: DataLoaderParams) => {\n    const { entity, locale, tenant } = params;\n\n    const latestKey = createLatestSortKey();\n\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async (ids: readonly string[]) => {\n            const queries = ids.reduce<Record<string, any>>((collection, id) => {\n                const partitionKey = createPartitionKey({\n                    tenant,\n                    locale,\n                    id\n                });\n                if (collection[partitionKey]) {\n                    return collection;\n                }\n                collection[partitionKey] = entity.getBatch({\n                    PK: partitionKey,\n                    SK: latestKey\n                });\n                return collection;\n            }, {});\n\n            const records = await batchReadAll<CmsStorageEntry>({\n                table: entity.table,\n                items: Object.values(queries)\n            });\n            const items = cleanupItems(entity, records);\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,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,sBAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAEA,IAAAK,MAAA,GAAAL,OAAA;AAEO,MAAMM,gCAAgC,GAAIC,MAAwB,IAAK;EAC1E,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGH,MAAM;EAEzC,MAAMI,SAAS,GAAG,IAAAC,yBAAmB,EAAC,CAAC;EAEvC,OAAO,IAAIC,mBAAU,CACjB,MAAOC,GAAsB,IAAK;IAC9B,MAAMC,OAAO,GAAGD,GAAG,CAACE,MAAM,CAAsB,CAACC,UAAU,EAAEC,EAAE,KAAK;MAChE,MAAMC,YAAY,GAAG,IAAAC,wBAAkB,EAAC;QACpCV,MAAM;QACND,MAAM;QACNS;MACJ,CAAC,CAAC;MACF,IAAID,UAAU,CAACE,YAAY,CAAC,EAAE;QAC1B,OAAOF,UAAU;MACrB;MACAA,UAAU,CAACE,YAAY,CAAC,GAAGX,MAAM,CAACa,QAAQ,CAAC;QACvCC,EAAE,EAAEH,YAAY;QAChBI,EAAE,EAAEZ;MACR,CAAC,CAAC;MACF,OAAOM,UAAU;IACrB,CAAC,EAAE,CAAC,CAAC,CAAC;IAEN,MAAMO,OAAO,GAAG,MAAM,IAAAC,wBAAY,EAAkB;MAChDC,KAAK,EAAElB,MAAM,CAACkB,KAAK;MACnBC,KAAK,EAAEC,MAAM,CAACC,MAAM,CAACd,OAAO;IAChC,CAAC,CAAC;IACF,MAAMY,KAAK,GAAG,IAAAG,qBAAY,EAACtB,MAAM,EAAEgB,OAAO,CAAC;IAE3C,OAAOV,GAAG,CAACiB,GAAG,CAACb,EAAE,IAAI;MACjB,MAAM;QAAEA,EAAE,EAAEc;MAAQ,CAAC,GAAG,IAAAC,sBAAe,EAACf,EAAE,CAAC;MAC3C,OAAOS,KAAK,CAACO,MAAM,CAACC,IAAI,IAAI;QACxB,OAAOH,OAAO,KAAKG,IAAI,CAACH,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACII,eAAe,EAAE,IAAAC,4CAAqB,EAAC;EAC3C,CACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAhC,gCAAA,GAAAA,gCAAA","ignoreList":[]}
+{"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":[]}

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

@@ -1,4 +1,4 @@
 import DataLoader from "dataloader";
-import type { CmsStorageEntry } from "@webiny/api-headless-cms/types";
-import type { DataLoaderParams } from "./types";
-export declare const createGetPublishedRevisionByEntryId: (params: DataLoaderParams) => DataLoader<string, CmsStorageEntry[], string>;
+import type { CmsStorageEntry } from "@webiny/api-headless-cms/types/index.js";
+import type { IDataLoaderParams } from "./types.js";
+export declare const createGetPublishedRevisionByEntryId: (params: IDataLoaderParams) => DataLoader<string, CmsStorageEntry<import("@webiny/api-headless-cms/types/types.js").CmsEntryValues>[], string>;

package/operations/entry/dataLoader/getPublishedRevisionByEntryId.js

@@ -1,56 +1,46 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createGetPublishedRevisionByEntryId = void 0;
-var _dataloader = _interopRequireDefault(require("dataloader"));
-var _dbDynamodb = require("@webiny/db-dynamodb");
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-var _keys = require("../keys");
-var _utils = require("@webiny/utils");
-var _createBatchScheduleFn = require("./createBatchScheduleFn");
-const createGetPublishedRevisionByEntryId = params => {
+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,
-    locale,
     tenant
   } = params;
-  const publishedKey = (0, _keys.createPublishedSortKey)();
-  return new _dataloader.default(async ids => {
-    const queries = ids.reduce((collection, id) => {
-      const partitionKey = (0, _keys.createPartitionKey)({
+  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,
-        locale,
         id
       });
-      if (collection[partitionKey]) {
-        return collection;
+      if (keys.has(partitionKey)) {
+        continue;
       }
-      collection[partitionKey] = entity.getBatch({
+      keys.add(partitionKey);
+      reader.get({
         PK: partitionKey,
         SK: publishedKey
       });
-      return collection;
-    }, {});
-    const records = await (0, _dbDynamodb.batchReadAll)({
-      table: entity.table,
-      items: Object.values(queries)
+    }
+    const records = await reader.execute();
+    const items = cleanupItems(entity.entity, records).map(item => {
+      return item.data;
     });
-    const items = (0, _cleanup.cleanupItems)(entity, records);
     return ids.map(id => {
       const {
         id: entryId
-      } = (0, _utils.parseIdentifier)(id);
+      } = parseIdentifier(id);
       return items.filter(item => {
         return entryId === item.entryId;
       });
     });
   }, {
-    batchScheduleFn: (0, _createBatchScheduleFn.createBatchScheduleFn)()
+    batchScheduleFn: createBatchScheduleFn()
   });
 };
-exports.createGetPublishedRevisionByEntryId = createGetPublishedRevisionByEntryId;
 
 //# sourceMappingURL=getPublishedRevisionByEntryId.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_dataloader","_interopRequireDefault","require","_dbDynamodb","_cleanup","_keys","_utils","_createBatchScheduleFn","createGetPublishedRevisionByEntryId","params","entity","locale","tenant","publishedKey","createPublishedSortKey","DataLoader","ids","queries","reduce","collection","id","partitionKey","createPartitionKey","getBatch","PK","SK","records","batchReadAll","table","items","Object","values","cleanupItems","map","entryId","parseIdentifier","filter","item","batchScheduleFn","createBatchScheduleFn","exports"],"sources":["getPublishedRevisionByEntryId.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport { createPartitionKey, createPublishedSortKey } from \"~/operations/entry/keys\";\nimport type { DataLoaderParams } from \"./types\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn\";\n\nexport const createGetPublishedRevisionByEntryId = (params: DataLoaderParams) => {\n    const { entity, locale, tenant } = params;\n\n    const publishedKey = createPublishedSortKey();\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async (ids: readonly string[]) => {\n            const queries = ids.reduce<Record<string, ReturnType<typeof entity.getBatch>>>(\n                (collection, id) => {\n                    const partitionKey = createPartitionKey({\n                        tenant,\n                        locale,\n                        id\n                    });\n                    if (collection[partitionKey]) {\n                        return collection;\n                    }\n                    collection[partitionKey] = entity.getBatch({\n                        PK: partitionKey,\n                        SK: publishedKey\n                    });\n                    return collection;\n                },\n                {}\n            );\n\n            const records = await batchReadAll<CmsStorageEntry>({\n                table: entity.table,\n                items: Object.values(queries)\n            });\n            const items = cleanupItems(entity, records);\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,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,KAAA,GAAAH,OAAA;AAEA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,sBAAA,GAAAL,OAAA;AAEO,MAAMM,mCAAmC,GAAIC,MAAwB,IAAK;EAC7E,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGH,MAAM;EAEzC,MAAMI,YAAY,GAAG,IAAAC,4BAAsB,EAAC,CAAC;EAC7C,OAAO,IAAIC,mBAAU,CACjB,MAAOC,GAAsB,IAAK;IAC9B,MAAMC,OAAO,GAAGD,GAAG,CAACE,MAAM,CACtB,CAACC,UAAU,EAAEC,EAAE,KAAK;MAChB,MAAMC,YAAY,GAAG,IAAAC,wBAAkB,EAAC;QACpCV,MAAM;QACND,MAAM;QACNS;MACJ,CAAC,CAAC;MACF,IAAID,UAAU,CAACE,YAAY,CAAC,EAAE;QAC1B,OAAOF,UAAU;MACrB;MACAA,UAAU,CAACE,YAAY,CAAC,GAAGX,MAAM,CAACa,QAAQ,CAAC;QACvCC,EAAE,EAAEH,YAAY;QAChBI,EAAE,EAAEZ;MACR,CAAC,CAAC;MACF,OAAOM,UAAU;IACrB,CAAC,EACD,CAAC,CACL,CAAC;IAED,MAAMO,OAAO,GAAG,MAAM,IAAAC,wBAAY,EAAkB;MAChDC,KAAK,EAAElB,MAAM,CAACkB,KAAK;MACnBC,KAAK,EAAEC,MAAM,CAACC,MAAM,CAACd,OAAO;IAChC,CAAC,CAAC;IACF,MAAMY,KAAK,GAAG,IAAAG,qBAAY,EAACtB,MAAM,EAAEgB,OAAO,CAAC;IAE3C,OAAOV,GAAG,CAACiB,GAAG,CAACb,EAAE,IAAI;MACjB,MAAM;QAAEA,EAAE,EAAEc;MAAQ,CAAC,GAAG,IAAAC,sBAAe,EAACf,EAAE,CAAC;MAC3C,OAAOS,KAAK,CAACO,MAAM,CAACC,IAAI,IAAI;QACxB,OAAOH,OAAO,KAAKG,IAAI,CAACH,OAAO;MACnC,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACII,eAAe,EAAE,IAAAC,4CAAqB,EAAC;EAC3C,CACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAhC,mCAAA,GAAAA,mCAAA","ignoreList":[]}
+{"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":[]}

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

@@ -1,4 +1,4 @@
 import DataLoader from "dataloader";
-import type { CmsStorageEntry } from "@webiny/api-headless-cms/types";
-import type { DataLoaderParams } from "./types";
-export declare const createGetRevisionById: (params: DataLoaderParams) => DataLoader<string, CmsStorageEntry[], string>;
+import type { CmsStorageEntry } from "@webiny/api-headless-cms/types/index.js";
+import type { IDataLoaderParams } from "./types.js";
+export declare const createGetRevisionById: (params: IDataLoaderParams) => DataLoader<string, CmsStorageEntry<import("@webiny/api-headless-cms/types/types.js").CmsEntryValues>[], string>;

package/operations/entry/dataLoader/getRevisionById.js

@@ -1,62 +1,52 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createGetRevisionById = void 0;
-var _dataloader = _interopRequireDefault(require("dataloader"));
-var _dbDynamodb = require("@webiny/db-dynamodb");
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-var _keys = require("../keys");
-var _utils = require("@webiny/utils");
-var _createBatchScheduleFn = require("./createBatchScheduleFn");
-const createGetRevisionById = params => {
+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,
-    locale,
     tenant
   } = params;
-  return new _dataloader.default(async ids => {
-    const queries = ids.reduce((collection, id) => {
-      const partitionKey = (0, _keys.createPartitionKey)({
+  return new DataLoader(async ids => {
+    const reader = entity.createEntityReader();
+    const keys = new Set();
+    for (const id of ids) {
+      const partitionKey = createPartitionKey({
         tenant,
-        locale,
         id
       });
       const {
         version
-      } = (0, _utils.parseIdentifier)(id);
+      } = parseIdentifier(id);
       if (version === null) {
-        return collection;
+        continue;
       }
-      const sortKey = (0, _keys.createRevisionSortKey)({
+      const sortKey = createRevisionSortKey({
         version
       });
-      const keys = `${partitionKey}__${sortKey}`;
-      if (collection[keys]) {
-        return collection;
+      const key = `${partitionKey}__${sortKey}`;
+      if (keys.has(key)) {
+        continue;
       }
-      collection[keys] = entity.getBatch({
+      keys.add(key);
+      reader.get({
         PK: partitionKey,
         SK: sortKey
       });
-      return collection;
-    }, {});
-    const records = await (0, _dbDynamodb.batchReadAll)({
-      table: entity.table,
-      items: Object.values(queries)
+    }
+    const records = await reader.execute();
+    const items = cleanupItems(entity.entity, records).map(item => {
+      return item.data;
     });
-    const items = (0, _cleanup.cleanupItems)(entity, records);
     return ids.map(id => {
       return items.filter(item => {
         return id === item.id;
       });
     });
   }, {
-    batchScheduleFn: (0, _createBatchScheduleFn.createBatchScheduleFn)()
+    batchScheduleFn: createBatchScheduleFn()
   });
 };
-exports.createGetRevisionById = createGetRevisionById;
 
 //# sourceMappingURL=getRevisionById.js.map