@webiny/db-dynamodb 6.3.0 → 6.4.0-beta.0

package/utils/entity/EntityWriteBatchBuilder.js

@@ -1,20 +1,19 @@
 import { getEntity } from "./getEntity.js";
-export class EntityWriteBatchBuilder {
-  constructor(entity) {
-    this.entity = getEntity(entity);
-  }
-  put(item) {
-    return this.entity.putBatch(item, {
-      execute: true,
-      strictSchemaCheck: false
-    });
-  }
-  delete(item) {
-    return this.entity.deleteBatch(item);
-  }
+class EntityWriteBatchBuilder {
+    constructor(entity){
+        this.entity = getEntity(entity);
+    }
+    put(item) {
+        return this.entity.putBatch(item, {
+            execute: true,
+            strictSchemaCheck: false
+        });
+    }
+    delete(item) {
+        return this.entity.deleteBatch(item);
+    }
 }
-export const createEntityWriteBatchBuilder = entity => {
-  return new EntityWriteBatchBuilder(entity);
-};
+const createEntityWriteBatchBuilder = (entity)=>new EntityWriteBatchBuilder(entity);
+export { EntityWriteBatchBuilder, createEntityWriteBatchBuilder };
 
 //# sourceMappingURL=EntityWriteBatchBuilder.js.map

package/utils/entity/EntityWriteBatchBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["getEntity","EntityWriteBatchBuilder","constructor","entity","put","item","putBatch","execute","strictSchemaCheck","delete","deleteBatch","createEntityWriteBatchBuilder"],"sources":["EntityWriteBatchBuilder.ts"],"sourcesContent":["import type { Entity } from \"~/toolbox.js\";\nimport type { BatchWriteItem, IDeleteBatchItem, IPutBatchItem } from \"~/utils/batch/types.js\";\nimport type { IEntityWriteBatchBuilder } from \"./types.js\";\nimport type { EntityOption } from \"./getEntity.js\";\nimport { getEntity } from \"./getEntity.js\";\n\nexport class EntityWriteBatchBuilder implements IEntityWriteBatchBuilder {\n    private readonly entity: Entity;\n\n    public constructor(entity: EntityOption) {\n        this.entity = getEntity(entity);\n    }\n\n    public put<T extends Record<string, any>>(item: IPutBatchItem<T>): BatchWriteItem {\n        return this.entity.putBatch(item, {\n            execute: true,\n            strictSchemaCheck: false\n        });\n    }\n\n    public delete(item: IDeleteBatchItem): BatchWriteItem {\n        return this.entity.deleteBatch(item);\n    }\n}\n\nexport const createEntityWriteBatchBuilder = (entity: Entity): IEntityWriteBatchBuilder => {\n    return new EntityWriteBatchBuilder(entity);\n};\n"],"mappings":"AAIA,SAASA,SAAS;AAElB,OAAO,MAAMC,uBAAuB,CAAqC;EAG9DC,WAAWA,CAACC,MAAoB,EAAE;IACrC,IAAI,CAACA,MAAM,GAAGH,SAAS,CAACG,MAAM,CAAC;EACnC;EAEOC,GAAGA,CAAgCC,IAAsB,EAAkB;IAC9E,OAAO,IAAI,CAACF,MAAM,CAACG,QAAQ,CAACD,IAAI,EAAE;MAC9BE,OAAO,EAAE,IAAI;MACbC,iBAAiB,EAAE;IACvB,CAAC,CAAC;EACN;EAEOC,MAAMA,CAACJ,IAAsB,EAAkB;IAClD,OAAO,IAAI,CAACF,MAAM,CAACO,WAAW,CAACL,IAAI,CAAC;EACxC;AACJ;AAEA,OAAO,MAAMM,6BAA6B,GAAIR,MAAc,IAA+B;EACvF,OAAO,IAAIF,uBAAuB,CAACE,MAAM,CAAC;AAC9C,CAAC","ignoreList":[]}
+{"version":3,"file":"utils/entity/EntityWriteBatchBuilder.js","sources":["../../../src/utils/entity/EntityWriteBatchBuilder.ts"],"sourcesContent":["import type { Entity } from \"~/toolbox.js\";\nimport type { BatchWriteItem, IDeleteBatchItem, IPutBatchItem } from \"~/utils/batch/types.js\";\nimport type { IEntityWriteBatchBuilder } from \"./types.js\";\nimport type { EntityOption } from \"./getEntity.js\";\nimport { getEntity } from \"./getEntity.js\";\n\nexport class EntityWriteBatchBuilder implements IEntityWriteBatchBuilder {\n    private readonly entity: Entity;\n\n    public constructor(entity: EntityOption) {\n        this.entity = getEntity(entity);\n    }\n\n    public put<T extends Record<string, any>>(item: IPutBatchItem<T>): BatchWriteItem {\n        return this.entity.putBatch(item, {\n            execute: true,\n            strictSchemaCheck: false\n        });\n    }\n\n    public delete(item: IDeleteBatchItem): BatchWriteItem {\n        return this.entity.deleteBatch(item);\n    }\n}\n\nexport const createEntityWriteBatchBuilder = (entity: Entity): IEntityWriteBatchBuilder => {\n    return new EntityWriteBatchBuilder(entity);\n};\n"],"names":["EntityWriteBatchBuilder","entity","getEntity","item","createEntityWriteBatchBuilder"],"mappings":";AAMO,MAAMA;IAGT,YAAmBC,MAAoB,CAAE;QACrC,IAAI,CAAC,MAAM,GAAGC,UAAUD;IAC5B;IAEO,IAAmCE,IAAsB,EAAkB;QAC9E,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAACA,MAAM;YAC9B,SAAS;YACT,mBAAmB;QACvB;IACJ;IAEO,OAAOA,IAAsB,EAAkB;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAACA;IACnC;AACJ;AAEO,MAAMC,gCAAgC,CAACH,SACnC,IAAID,wBAAwBC"}

package/utils/entity/getEntity.js

@@ -1,12 +1,11 @@
-import { Entity as ToolboxEntity } from "../../toolbox.js";
-export const getEntity = entity => {
-  const result = entity instanceof ToolboxEntity ? entity : entity.entity;
-  if (!result.name) {
-    throw new Error(`No name provided for entity.`);
-  } else if (!result.table) {
-    throw new Error(`No table provided for entity ${result.name}.`);
-  }
-  return result;
+import { Entity } from "../../toolbox.js";
+const getEntity = (entity)=>{
+    const result = entity instanceof Entity ? entity : entity.entity;
+    if (result.name) {
+        if (!result.table) throw new Error(`No table provided for entity ${result.name}.`);
+    } else throw new Error("No name provided for entity.");
+    return result;
 };
+export { getEntity };
 
 //# sourceMappingURL=getEntity.js.map

package/utils/entity/getEntity.js.map

@@ -1 +1 @@
-{"version":3,"names":["Entity","ToolboxEntity","getEntity","entity","result","name","Error","table"],"sources":["getEntity.ts"],"sourcesContent":["import { Entity as ToolboxEntity } from \"~/toolbox.js\";\nimport type { Entity } from \"./Entity.js\";\n\nexport type EntityOption = ToolboxEntity | Entity;\n\nexport const getEntity = (entity: EntityOption): ToolboxEntity => {\n    const result = entity instanceof ToolboxEntity ? entity : entity.entity;\n    if (!result.name) {\n        throw new Error(`No name provided for entity.`);\n    } else if (!result.table) {\n        throw new Error(`No table provided for entity ${result.name}.`);\n    }\n    return result;\n};\n"],"mappings":"AAAA,SAASA,MAAM,IAAIC,aAAa;AAKhC,OAAO,MAAMC,SAAS,GAAIC,MAAoB,IAAoB;EAC9D,MAAMC,MAAM,GAAGD,MAAM,YAAYF,aAAa,GAAGE,MAAM,GAAGA,MAAM,CAACA,MAAM;EACvE,IAAI,CAACC,MAAM,CAACC,IAAI,EAAE;IACd,MAAM,IAAIC,KAAK,CAAC,8BAA8B,CAAC;EACnD,CAAC,MAAM,IAAI,CAACF,MAAM,CAACG,KAAK,EAAE;IACtB,MAAM,IAAID,KAAK,CAAC,gCAAgCF,MAAM,CAACC,IAAI,GAAG,CAAC;EACnE;EACA,OAAOD,MAAM;AACjB,CAAC","ignoreList":[]}
+{"version":3,"file":"utils/entity/getEntity.js","sources":["../../../src/utils/entity/getEntity.ts"],"sourcesContent":["import { Entity as ToolboxEntity } from \"~/toolbox.js\";\nimport type { Entity } from \"./Entity.js\";\n\nexport type EntityOption = ToolboxEntity | Entity;\n\nexport const getEntity = (entity: EntityOption): ToolboxEntity => {\n    const result = entity instanceof ToolboxEntity ? entity : entity.entity;\n    if (!result.name) {\n        throw new Error(`No name provided for entity.`);\n    } else if (!result.table) {\n        throw new Error(`No table provided for entity ${result.name}.`);\n    }\n    return result;\n};\n"],"names":["getEntity","entity","result","ToolboxEntity","Error"],"mappings":";AAKO,MAAMA,YAAY,CAACC;IACtB,MAAMC,SAASD,kBAAkBE,SAAgBF,SAASA,OAAO,MAAM;IACvE,IAAKC,OAAO,IAAI,EAET;QAAA,IAAI,CAACA,OAAO,KAAK,EACpB,MAAM,IAAIE,MAAM,CAAC,6BAA6B,EAAEF,OAAO,IAAI,CAAC,CAAC,CAAC;IAClE,OAHI,MAAM,IAAIE,MAAM;IAIpB,OAAOF;AACX"}

package/utils/entity/index.js

@@ -5,5 +5,3 @@ export * from "./EntityWriteBatch.js";
 export * from "./EntityWriteBatchBuilder.js";
 export * from "./getEntity.js";
 export * from "./types.js";
-
-//# sourceMappingURL=index.js.map

package/utils/entity/types.js

@@ -1,4 +0,0 @@
-import { queryAll, queryAllClean, queryOne, queryOneClean } from "../query.js";
-import { queryPerPage } from "../index.js";
-
-//# sourceMappingURL=types.js.map

package/utils/get.js

@@ -1,31 +1,17 @@
 import { cleanupItem } from "./cleanup.js";
-/**
- * Gets a single record from the DynamoDB table.
- * Returns either record or null.
- *
- * Be aware to wrap in try/catch to avoid the error killing your app.
- *
- * @throws
- */
-export const get = async params => {
-  const {
-    entity,
-    keys
-  } = params;
-  const result = await entity.get(keys, {
-    execute: true
-  });
-  if (!result?.Item) {
-    return null;
-  }
-  return result.Item;
+const get = async (params)=>{
+    const { entity, keys } = params;
+    const result = await entity.get(keys, {
+        execute: true
+    });
+    if (!result?.Item) return null;
+    return result.Item;
 };
-export const getClean = async params => {
-  const result = await get(params);
-  if (!result) {
-    return null;
-  }
-  return cleanupItem(params.entity, result);
+const getClean = async (params)=>{
+    const result = await get(params);
+    if (!result) return null;
+    return cleanupItem(params.entity, result);
 };
+export { get, getClean };
 
 //# sourceMappingURL=get.js.map

package/utils/get.js.map

@@ -1 +1 @@
-{"version":3,"names":["cleanupItem","get","params","entity","keys","result","execute","Item","getClean"],"sources":["get.ts"],"sourcesContent":["import type { Entity } from \"~/toolbox.js\";\nimport { cleanupItem } from \"~/utils/cleanup.js\";\n\nexport interface GetRecordParamsKeys {\n    PK: string;\n    SK: string;\n}\n\nexport interface GetRecordParams {\n    entity: Entity;\n    keys: GetRecordParamsKeys;\n}\n\n/**\n * Gets a single record from the DynamoDB table.\n * Returns either record or null.\n *\n * Be aware to wrap in try/catch to avoid the error killing your app.\n *\n * @throws\n */\nexport const get = async <T>(params: GetRecordParams): Promise<T | null> => {\n    const { entity, keys } = params;\n\n    const result = await entity.get(keys, {\n        execute: true\n    });\n\n    if (!result?.Item) {\n        return null;\n    }\n    return result.Item as T;\n};\n\nexport const getClean = async <T>(params: GetRecordParams): Promise<T | null> => {\n    const result = await get<T>(params);\n    if (!result) {\n        return null;\n    }\n    return cleanupItem<T>(params.entity, result);\n};\n"],"mappings":"AACA,SAASA,WAAW;AAYpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,GAAG,GAAG,MAAUC,MAAuB,IAAwB;EACxE,MAAM;IAAEC,MAAM;IAAEC;EAAK,CAAC,GAAGF,MAAM;EAE/B,MAAMG,MAAM,GAAG,MAAMF,MAAM,CAACF,GAAG,CAACG,IAAI,EAAE;IAClCE,OAAO,EAAE;EACb,CAAC,CAAC;EAEF,IAAI,CAACD,MAAM,EAAEE,IAAI,EAAE;IACf,OAAO,IAAI;EACf;EACA,OAAOF,MAAM,CAACE,IAAI;AACtB,CAAC;AAED,OAAO,MAAMC,QAAQ,GAAG,MAAUN,MAAuB,IAAwB;EAC7E,MAAMG,MAAM,GAAG,MAAMJ,GAAG,CAAIC,MAAM,CAAC;EACnC,IAAI,CAACG,MAAM,EAAE;IACT,OAAO,IAAI;EACf;EACA,OAAOL,WAAW,CAAIE,MAAM,CAACC,MAAM,EAAEE,MAAM,CAAC;AAChD,CAAC","ignoreList":[]}
+{"version":3,"file":"utils/get.js","sources":["../../src/utils/get.ts"],"sourcesContent":["import type { Entity } from \"~/toolbox.js\";\nimport { cleanupItem } from \"~/utils/cleanup.js\";\n\nexport interface GetRecordParamsKeys {\n    PK: string;\n    SK: string;\n}\n\nexport interface GetRecordParams {\n    entity: Entity;\n    keys: GetRecordParamsKeys;\n}\n\n/**\n * Gets a single record from the DynamoDB table.\n * Returns either record or null.\n *\n * Be aware to wrap in try/catch to avoid the error killing your app.\n *\n * @throws\n */\nexport const get = async <T>(params: GetRecordParams): Promise<T | null> => {\n    const { entity, keys } = params;\n\n    const result = await entity.get(keys, {\n        execute: true\n    });\n\n    if (!result?.Item) {\n        return null;\n    }\n    return result.Item as T;\n};\n\nexport const getClean = async <T>(params: GetRecordParams): Promise<T | null> => {\n    const result = await get<T>(params);\n    if (!result) {\n        return null;\n    }\n    return cleanupItem<T>(params.entity, result);\n};\n"],"names":["get","params","entity","keys","result","getClean","cleanupItem"],"mappings":";AAqBO,MAAMA,MAAM,OAAUC;IACzB,MAAM,EAAEC,MAAM,EAAEC,IAAI,EAAE,GAAGF;IAEzB,MAAMG,SAAS,MAAMF,OAAO,GAAG,CAACC,MAAM;QAClC,SAAS;IACb;IAEA,IAAI,CAACC,QAAQ,MACT,OAAO;IAEX,OAAOA,OAAO,IAAI;AACtB;AAEO,MAAMC,WAAW,OAAUJ;IAC9B,MAAMG,SAAS,MAAMJ,IAAOC;IAC5B,IAAI,CAACG,QACD,OAAO;IAEX,OAAOE,YAAeL,OAAO,MAAM,EAAEG;AACzC"}

package/utils/index.js

@@ -1,7 +1,6 @@
 export * from "./cleanup.js";
 export * from "./createEntity.js";
 export * from "./createTable.js";
-export { decodeCursor, encodeCursor } from "./cursor.js";
 export * from "./get.js";
 export * from "./delete.js";
 export * from "./put.js";
@@ -11,5 +10,4 @@ export * from "./sort.js";
 export * from "./batch/index.js";
 export * from "./entity/index.js";
 export * from "./table/index.js";
-
-//# sourceMappingURL=index.js.map
+export { decodeCursor, encodeCursor } from "./cursor.js";

package/utils/put.js

@@ -1,12 +1,10 @@
-export const put = async params => {
-  const {
-    entity,
-    item
-  } = params;
-  return await entity.put(item, {
-    execute: true,
-    strictSchemaCheck: false
-  });
+const put = async (params)=>{
+    const { entity, item } = params;
+    return await entity.put(item, {
+        execute: true,
+        strictSchemaCheck: false
+    });
 };
+export { put };
 
 //# sourceMappingURL=put.js.map

package/utils/put.js.map

@@ -1 +1 @@
-{"version":3,"names":["put","params","entity","item","execute","strictSchemaCheck"],"sources":["put.ts"],"sourcesContent":["import type { Entity } from \"~/toolbox.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport type IPutParamsItem<T extends GenericRecord = GenericRecord> = {\n    PK: string;\n    SK: string;\n    [key: string]: any;\n} & T;\n\nexport interface IPutParams<T extends GenericRecord = GenericRecord> {\n    entity: Entity;\n    item: IPutParamsItem<T>;\n}\n\nexport const put = async <T extends GenericRecord = GenericRecord>(params: IPutParams<T>) => {\n    const { entity, item } = params;\n\n    return await entity.put(item, {\n        execute: true,\n        strictSchemaCheck: false\n    });\n};\n"],"mappings":"AAcA,OAAO,MAAMA,GAAG,GAAG,MAAgDC,MAAqB,IAAK;EACzF,MAAM;IAAEC,MAAM;IAAEC;EAAK,CAAC,GAAGF,MAAM;EAE/B,OAAO,MAAMC,MAAM,CAACF,GAAG,CAACG,IAAI,EAAE;IAC1BC,OAAO,EAAE,IAAI;IACbC,iBAAiB,EAAE;EACvB,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"file":"utils/put.js","sources":["../../src/utils/put.ts"],"sourcesContent":["import type { Entity } from \"~/toolbox.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport type IPutParamsItem<T extends GenericRecord = GenericRecord> = {\n    PK: string;\n    SK: string;\n    [key: string]: any;\n} & T;\n\nexport interface IPutParams<T extends GenericRecord = GenericRecord> {\n    entity: Entity;\n    item: IPutParamsItem<T>;\n}\n\nexport const put = async <T extends GenericRecord = GenericRecord>(params: IPutParams<T>) => {\n    const { entity, item } = params;\n\n    return await entity.put(item, {\n        execute: true,\n        strictSchemaCheck: false\n    });\n};\n"],"names":["put","params","entity","item"],"mappings":"AAcO,MAAMA,MAAM,OAAgDC;IAC/D,MAAM,EAAEC,MAAM,EAAEC,IAAI,EAAE,GAAGF;IAEzB,OAAO,MAAMC,OAAO,GAAG,CAACC,MAAM;QAC1B,SAAS;QACT,mBAAmB;IACvB;AACJ"}

package/utils/query.js

@@ -1,147 +1,95 @@
-import WebinyError from "@webiny/error";
+import error from "@webiny/error";
 import { cleanupItem, cleanupItems } from "./cleanup.js";
-/**
- * Will run query only once. Pass the previous to run the query again to fetch new data.
- * It returns the result and the items it found.
- * Result is required to fetch the items that were not fetched in the previous run.
- */
-const query = async params => {
-  const {
-    entity,
-    previous,
-    partitionKey,
-    options
-  } = params;
-  let result;
-  /**
-   * In case there is no previous result we must make a new query.
-   * This is the first query on the given partition key.
-   */
-  if (!previous) {
-    // @ts-expect-error
-    result = await entity.query(partitionKey, options);
-  } else if (typeof previous.next === "function") {
-    /**
-     * In case we have a previous result and it has a next method, we run it.
-     * In case result of the next method is false, it means it has nothing else to read
-     * and we return a null to keep the query from repeating.
-     */
-    result = await previous.next();
-    if (result === false) {
-      return {
+const query = async (params)=>{
+    const { entity, previous, partitionKey, options } = params;
+    let result;
+    if (previous) if ("function" != typeof previous.next) return {
         result: null,
         items: []
-      };
+    };
+    else {
+        result = await previous.next();
+        if (false === result) return {
+            result: null,
+            items: []
+        };
     }
-  } else {
-    /**
-     * This could probably never happen but keep it here just in case to break the query loop.
-     * Basically, either previous does not exist or it exists and it does not have the next method
-     * and at that point a result returned will be null and loop should not start again.
-     */
+    else result = await entity.query(partitionKey, options);
+    if (!result || !result.Items || !Array.isArray(result.Items)) throw new error("Error when querying for content entries - no result.", "QUERY_ERROR", {
+        partitionKey,
+        options
+    });
     return {
-      result: null,
-      items: []
+        result,
+        items: result.Items
     };
-  }
-  /**
-   * We expect the result to contain an Items array and if not, something went wrong, very wrong.
-   */
-  if (!result || !result.Items || !Array.isArray(result.Items)) {
-    throw new WebinyError("Error when querying for content entries - no result.", "QUERY_ERROR", {
-      partitionKey,
-      options
-    });
-  }
-  return {
-    result,
-    items: result.Items
-  };
 };
-/**
- * Will run the query to fetch the first possible item from the database.
- */
-export const queryOne = async params => {
-  const {
-    items
-  } = await query({
-    ...params,
-    options: {
-      ...(params.options || {}),
-      limit: 1
-    }
-  });
-  const item = items.shift();
-  return item ? item : null;
+const queryOne = async (params)=>{
+    const { items } = await query({
+        ...params,
+        options: {
+            ...params.options || {},
+            limit: 1
+        }
+    });
+    const item = items.shift();
+    return item ? item : null;
 };
-export const queryOneClean = async params => {
-  const result = await queryOne(params);
-  if (!result) {
-    return null;
-  }
-  return cleanupItem(params.entity, result);
+const queryOneClean = async (params)=>{
+    const result = await queryOne(params);
+    if (!result) return null;
+    return cleanupItem(params.entity, result);
 };
-/**
- * Will run the query to fetch the results no matter how many iterations it needs to go through.
- */
-export const queryAll = async params => {
-  const items = [];
-  let results;
-  let previousResult = undefined;
-  while (results = await query({
-    ...params,
-    previous: previousResult
-  })) {
-    items.push(...results.items);
-    if (!results.result) {
-      return items;
+const queryAll = async (params)=>{
+    const items = [];
+    let results;
+    let previousResult;
+    while(results = await query({
+        ...params,
+        previous: previousResult
+    })){
+        items.push(...results.items);
+        if (!results.result) break;
+        previousResult = results.result;
     }
-    previousResult = results.result;
-  }
-  return items;
+    return items;
 };
-export const queryAllClean = async params => {
-  const results = await queryAll(params);
-  return cleanupItems(params.entity, results);
+const queryAllClean = async (params)=>{
+    const results = await queryAll(params);
+    return cleanupItems(params.entity, results);
 };
-export const queryPerPage = async params => {
-  const result = await query({
-    ...params,
-    options: {
-      ...params.options,
-      limit: params.options?.limit || 50
-    }
-  });
-  return {
-    items: result.items,
-    lastEvaluatedKey: result.result?.LastEvaluatedKey
-  };
+const queryPerPage = async (params)=>{
+    const result = await query({
+        ...params,
+        options: {
+            ...params.options,
+            limit: params.options?.limit || 50
+        }
+    });
+    return {
+        items: result.items,
+        lastEvaluatedKey: result.result?.LastEvaluatedKey
+    };
 };
-export const queryPerPageClean = async params => {
-  const result = await queryPerPage(params);
-  return {
-    items: cleanupItems(params.entity, result.items),
-    lastEvaluatedKey: result.lastEvaluatedKey
-  };
+const queryPerPageClean = async (params)=>{
+    const result = await queryPerPage(params);
+    return {
+        items: cleanupItems(params.entity, result.items),
+        lastEvaluatedKey: result.lastEvaluatedKey
+    };
 };
-
-/**
- * Will run the query to fetch the results no matter how many iterations it needs to go through.
- * Results of each iteration will be passed to the provided callback
- */
-export const queryAllWithCallback = async (params, callback) => {
-  let results;
-  let previousResult = undefined;
-  while (results = await query({
-    ...params,
-    previous: previousResult
-  })) {
-    if (!results.result) {
-      break;
+const queryAllWithCallback = async (params, callback)=>{
+    let results;
+    let previousResult;
+    while(results = await query({
+        ...params,
+        previous: previousResult
+    })){
+        if (!results.result) break;
+        await callback(results.items);
+        previousResult = results.result;
     }
-    await callback(results.items);
-    previousResult = results.result;
-  }
 };
+export { queryAll, queryAllClean, queryAllWithCallback, queryOne, queryOneClean, queryPerPage, queryPerPageClean };
 
 //# sourceMappingURL=query.js.map

package/utils/query.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","cleanupItem","cleanupItems","query","params","entity","previous","partitionKey","options","result","next","items","Items","Array","isArray","queryOne","limit","item","shift","queryOneClean","queryAll","results","previousResult","undefined","push","queryAllClean","queryPerPage","lastEvaluatedKey","LastEvaluatedKey","queryPerPageClean","queryAllWithCallback","callback"],"sources":["query.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { Entity, EntityQueryOptions } from \"~/toolbox.js\";\nimport { cleanupItem, cleanupItems } from \"~/utils/cleanup.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport interface QueryAllParams {\n    entity: Entity<any>;\n    partitionKey: string;\n    options?: EntityQueryOptions;\n}\n\nexport interface QueryOneParams extends QueryAllParams {\n    options?: Omit<EntityQueryOptions, \"limit\">;\n}\n\nexport interface QueryParams extends QueryAllParams {\n    previous?: any;\n}\n\nexport interface QueryResult<T> {\n    result: any | null;\n    items: T[];\n}\n\n/**\n * Will run query only once. Pass the previous to run the query again to fetch new data.\n * It returns the result and the items it found.\n * Result is required to fetch the items that were not fetched in the previous run.\n */\nconst query = async <T>(params: QueryParams): Promise<QueryResult<T>> => {\n    const { entity, previous, partitionKey, options } = params;\n    let result;\n    /**\n     * In case there is no previous result we must make a new query.\n     * This is the first query on the given partition key.\n     */\n    if (!previous) {\n        // @ts-expect-error\n        result = await entity.query(partitionKey, options);\n    } else if (typeof previous.next === \"function\") {\n        /**\n         * In case we have a previous result and it has a next method, we run it.\n         * In case result of the next method is false, it means it has nothing else to read\n         * and we return a null to keep the query from repeating.\n         */\n        result = await previous.next();\n        if (result === false) {\n            return {\n                result: null,\n                items: []\n            };\n        }\n    } else {\n        /**\n         * This could probably never happen but keep it here just in case to break the query loop.\n         * Basically, either previous does not exist or it exists and it does not have the next method\n         * and at that point a result returned will be null and loop should not start again.\n         */\n        return {\n            result: null,\n            items: []\n        };\n    }\n    /**\n     * We expect the result to contain an Items array and if not, something went wrong, very wrong.\n     */\n    if (!result || !result.Items || !Array.isArray(result.Items)) {\n        throw new WebinyError(\n            \"Error when querying for content entries - no result.\",\n            \"QUERY_ERROR\",\n            {\n                partitionKey,\n                options\n            }\n        );\n    }\n    return {\n        result,\n        items: result.Items\n    };\n};\n/**\n * Will run the query to fetch the first possible item from the database.\n */\nexport const queryOne = async <T>(params: QueryOneParams): Promise<T | null> => {\n    const { items } = await query<T>({\n        ...params,\n        options: {\n            ...(params.options || {}),\n            limit: 1\n        }\n    });\n    const item = items.shift();\n    return item ? item : null;\n};\n\nexport const queryOneClean = async <T>(params: QueryOneParams): Promise<T | null> => {\n    const result = await queryOne<T>(params);\n    if (!result) {\n        return null;\n    }\n    return cleanupItem(params.entity, result);\n};\n/**\n * Will run the query to fetch the results no matter how many iterations it needs to go through.\n */\nexport const queryAll = async <T>(params: QueryAllParams): Promise<T[]> => {\n    const items: T[] = [];\n    let results: QueryResult<T>;\n    let previousResult: any = undefined;\n    while ((results = await query({ ...params, previous: previousResult }))) {\n        items.push(...results.items);\n        if (!results.result) {\n            return items;\n        }\n        previousResult = results.result;\n    }\n    return items;\n};\n\nexport const queryAllClean = async <T>(params: QueryAllParams): Promise<T[]> => {\n    const results = await queryAll<T>(params);\n    return cleanupItems(params.entity, results);\n};\n\nexport interface IQueryPageResponse<T> {\n    items: T[];\n    lastEvaluatedKey: GenericRecord;\n}\n\nexport const queryPerPage = async <T>(params: QueryAllParams): Promise<IQueryPageResponse<T>> => {\n    const result = await query<T>({\n        ...params,\n        options: {\n            ...params.options,\n            limit: params.options?.limit || 50\n        }\n    });\n\n    return {\n        items: result.items,\n        lastEvaluatedKey: result.result?.LastEvaluatedKey\n    };\n};\n\nexport const queryPerPageClean = async <T>(\n    params: QueryAllParams\n): Promise<IQueryPageResponse<T>> => {\n    const result = await queryPerPage<T>(params);\n    return {\n        items: cleanupItems<T>(params.entity, result.items),\n        lastEvaluatedKey: result.lastEvaluatedKey\n    };\n};\n\n/**\n * Will run the query to fetch the results no matter how many iterations it needs to go through.\n * Results of each iteration will be passed to the provided callback\n */\nexport const queryAllWithCallback = async <T>(\n    params: QueryAllParams,\n    callback: (items: T[]) => Promise<void>\n): Promise<void> => {\n    let results: QueryResult<T>;\n    let previousResult: any = undefined;\n    while ((results = await query({ ...params, previous: previousResult }))) {\n        if (!results.result) {\n            break;\n        }\n        await callback(results.items);\n        previousResult = results.result;\n    }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"utils/query.js","sources":["../../src/utils/query.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { Entity, EntityQueryOptions } from \"~/toolbox.js\";\nimport { cleanupItem, cleanupItems } from \"~/utils/cleanup.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport interface QueryAllParams {\n    entity: Entity<any>;\n    partitionKey: string;\n    options?: EntityQueryOptions;\n}\n\nexport interface QueryOneParams extends QueryAllParams {\n    options?: Omit<EntityQueryOptions, \"limit\">;\n}\n\nexport interface QueryParams extends QueryAllParams {\n    previous?: any;\n}\n\nexport interface QueryResult<T> {\n    result: any | null;\n    items: T[];\n}\n\n/**\n * Will run query only once. Pass the previous to run the query again to fetch new data.\n * It returns the result and the items it found.\n * Result is required to fetch the items that were not fetched in the previous run.\n */\nconst query = async <T>(params: QueryParams): Promise<QueryResult<T>> => {\n    const { entity, previous, partitionKey, options } = params;\n    let result;\n    /**\n     * In case there is no previous result we must make a new query.\n     * This is the first query on the given partition key.\n     */\n    if (!previous) {\n        // @ts-expect-error\n        result = await entity.query(partitionKey, options);\n    } else if (typeof previous.next === \"function\") {\n        /**\n         * In case we have a previous result and it has a next method, we run it.\n         * In case result of the next method is false, it means it has nothing else to read\n         * and we return a null to keep the query from repeating.\n         */\n        result = await previous.next();\n        if (result === false) {\n            return {\n                result: null,\n                items: []\n            };\n        }\n    } else {\n        /**\n         * This could probably never happen but keep it here just in case to break the query loop.\n         * Basically, either previous does not exist or it exists and it does not have the next method\n         * and at that point a result returned will be null and loop should not start again.\n         */\n        return {\n            result: null,\n            items: []\n        };\n    }\n    /**\n     * We expect the result to contain an Items array and if not, something went wrong, very wrong.\n     */\n    if (!result || !result.Items || !Array.isArray(result.Items)) {\n        throw new WebinyError(\n            \"Error when querying for content entries - no result.\",\n            \"QUERY_ERROR\",\n            {\n                partitionKey,\n                options\n            }\n        );\n    }\n    return {\n        result,\n        items: result.Items\n    };\n};\n/**\n * Will run the query to fetch the first possible item from the database.\n */\nexport const queryOne = async <T>(params: QueryOneParams): Promise<T | null> => {\n    const { items } = await query<T>({\n        ...params,\n        options: {\n            ...(params.options || {}),\n            limit: 1\n        }\n    });\n    const item = items.shift();\n    return item ? item : null;\n};\n\nexport const queryOneClean = async <T>(params: QueryOneParams): Promise<T | null> => {\n    const result = await queryOne<T>(params);\n    if (!result) {\n        return null;\n    }\n    return cleanupItem(params.entity, result);\n};\n/**\n * Will run the query to fetch the results no matter how many iterations it needs to go through.\n */\nexport const queryAll = async <T>(params: QueryAllParams): Promise<T[]> => {\n    const items: T[] = [];\n    let results: QueryResult<T>;\n    let previousResult: any = undefined;\n    while ((results = await query({ ...params, previous: previousResult }))) {\n        items.push(...results.items);\n        if (!results.result) {\n            return items;\n        }\n        previousResult = results.result;\n    }\n    return items;\n};\n\nexport const queryAllClean = async <T>(params: QueryAllParams): Promise<T[]> => {\n    const results = await queryAll<T>(params);\n    return cleanupItems(params.entity, results);\n};\n\nexport interface IQueryPageResponse<T> {\n    items: T[];\n    lastEvaluatedKey: GenericRecord;\n}\n\nexport const queryPerPage = async <T>(params: QueryAllParams): Promise<IQueryPageResponse<T>> => {\n    const result = await query<T>({\n        ...params,\n        options: {\n            ...params.options,\n            limit: params.options?.limit || 50\n        }\n    });\n\n    return {\n        items: result.items,\n        lastEvaluatedKey: result.result?.LastEvaluatedKey\n    };\n};\n\nexport const queryPerPageClean = async <T>(\n    params: QueryAllParams\n): Promise<IQueryPageResponse<T>> => {\n    const result = await queryPerPage<T>(params);\n    return {\n        items: cleanupItems<T>(params.entity, result.items),\n        lastEvaluatedKey: result.lastEvaluatedKey\n    };\n};\n\n/**\n * Will run the query to fetch the results no matter how many iterations it needs to go through.\n * Results of each iteration will be passed to the provided callback\n */\nexport const queryAllWithCallback = async <T>(\n    params: QueryAllParams,\n    callback: (items: T[]) => Promise<void>\n): Promise<void> => {\n    let results: QueryResult<T>;\n    let previousResult: any = undefined;\n    while ((results = await query({ ...params, previous: previousResult }))) {\n        if (!results.result) {\n            break;\n        }\n        await callback(results.items);\n        previousResult = results.result;\n    }\n};\n"],"names":["query","params","entity","previous","partitionKey","options","result","Array","WebinyError","queryOne","items","item","queryOneClean","cleanupItem","queryAll","results","previousResult","queryAllClean","cleanupItems","queryPerPage","queryPerPageClean","queryAllWithCallback","callback"],"mappings":";;AA6BA,MAAMA,QAAQ,OAAUC;IACpB,MAAM,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,OAAO,EAAE,GAAGJ;IACpD,IAAIK;IAKJ,IAAKH,UAGE,IAAI,AAAyB,cAAzB,OAAOA,SAAS,IAAI,EAmB3B,OAAO;QACH,QAAQ;QACR,OAAO,EAAE;IACb;SAtB4C;QAM5CG,SAAS,MAAMH,SAAS,IAAI;QAC5B,IAAIG,AAAW,UAAXA,QACA,OAAO;YACH,QAAQ;YACR,OAAO,EAAE;QACb;IAER;SAdIA,SAAS,MAAMJ,OAAO,KAAK,CAACE,cAAcC;IA4B9C,IAAI,CAACC,UAAU,CAACA,OAAO,KAAK,IAAI,CAACC,MAAM,OAAO,CAACD,OAAO,KAAK,GACvD,MAAM,IAAIE,MACN,wDACA,eACA;QACIJ;QACAC;IACJ;IAGR,OAAO;QACHC;QACA,OAAOA,OAAO,KAAK;IACvB;AACJ;AAIO,MAAMG,WAAW,OAAUR;IAC9B,MAAM,EAAES,KAAK,EAAE,GAAG,MAAMV,MAAS;QAC7B,GAAGC,MAAM;QACT,SAAS;YACL,GAAIA,OAAO,OAAO,IAAI,CAAC,CAAC;YACxB,OAAO;QACX;IACJ;IACA,MAAMU,OAAOD,MAAM,KAAK;IACxB,OAAOC,OAAOA,OAAO;AACzB;AAEO,MAAMC,gBAAgB,OAAUX;IACnC,MAAMK,SAAS,MAAMG,SAAYR;IACjC,IAAI,CAACK,QACD,OAAO;IAEX,OAAOO,YAAYZ,OAAO,MAAM,EAAEK;AACtC;AAIO,MAAMQ,WAAW,OAAUb;IAC9B,MAAMS,QAAa,EAAE;IACrB,IAAIK;IACJ,IAAIC;IACJ,MAAQD,UAAU,MAAMf,MAAM;QAAE,GAAGC,MAAM;QAAE,UAAUe;IAAe,GAAK;QACrEN,MAAM,IAAI,IAAIK,QAAQ,KAAK;QAC3B,IAAI,CAACA,QAAQ,MAAM,EACf;QAEJC,iBAAiBD,QAAQ,MAAM;IACnC;IACA,OAAOL;AACX;AAEO,MAAMO,gBAAgB,OAAUhB;IACnC,MAAMc,UAAU,MAAMD,SAAYb;IAClC,OAAOiB,aAAajB,OAAO,MAAM,EAAEc;AACvC;AAOO,MAAMI,eAAe,OAAUlB;IAClC,MAAMK,SAAS,MAAMN,MAAS;QAC1B,GAAGC,MAAM;QACT,SAAS;YACL,GAAGA,OAAO,OAAO;YACjB,OAAOA,OAAO,OAAO,EAAE,SAAS;QACpC;IACJ;IAEA,OAAO;QACH,OAAOK,OAAO,KAAK;QACnB,kBAAkBA,OAAO,MAAM,EAAE;IACrC;AACJ;AAEO,MAAMc,oBAAoB,OAC7BnB;IAEA,MAAMK,SAAS,MAAMa,aAAgBlB;IACrC,OAAO;QACH,OAAOiB,aAAgBjB,OAAO,MAAM,EAAEK,OAAO,KAAK;QAClD,kBAAkBA,OAAO,gBAAgB;IAC7C;AACJ;AAMO,MAAMe,uBAAuB,OAChCpB,QACAqB;IAEA,IAAIP;IACJ,IAAIC;IACJ,MAAQD,UAAU,MAAMf,MAAM;QAAE,GAAGC,MAAM;QAAE,UAAUe;IAAe,GAAK;QACrE,IAAI,CAACD,QAAQ,MAAM,EACf;QAEJ,MAAMO,SAASP,QAAQ,KAAK;QAC5BC,iBAAiBD,QAAQ,MAAM;IACnC;AACJ"}

package/utils/scan.js

@@ -1,82 +1,56 @@
 import { executeWithRetry } from "@webiny/utils";
-const createNext = result => {
-  if (!result?.LastEvaluatedKey || !result.next) {
-    return undefined;
-  }
-  return async () => {
-    const response = await result.next();
-    return convertResult(response);
-  };
-};
-const convertResult = result => {
-  return {
-    items: result.Items || [],
-    count: result.Count,
-    scannedCount: result.ScannedCount,
-    lastEvaluatedKey: result.LastEvaluatedKey || undefined,
-    next: createNext(result),
-    error: result.error,
-    requestId: result.$response?.requestId || ""
-  };
+const createNext = (result)=>{
+    if (!result?.LastEvaluatedKey || !result.next) return;
+    return async ()=>{
+        const response = await result.next();
+        return convertResult(response);
+    };
 };
-export const scan = async params => {
-  const {
-    options
-  } = params;
-  const table = params.table ? params.table : params.entity.table;
-  if (!table) {
-    throw new Error(`Missing table for scan: ${JSON.stringify(options)}`);
-  }
-  const result = await table.scan({
-    ...options,
-    execute: true
-  }, params.params);
-  return convertResult(result);
+const convertResult = (result)=>({
+        items: result.Items || [],
+        count: result.Count,
+        scannedCount: result.ScannedCount,
+        lastEvaluatedKey: result.LastEvaluatedKey || void 0,
+        next: createNext(result),
+        error: result.error,
+        requestId: result.$response?.requestId || ""
+    });
+const scan = async (params)=>{
+    const { options } = params;
+    const table = params.table ? params.table : params.entity.table;
+    if (!table) throw new Error(`Missing table for scan: ${JSON.stringify(options)}`);
+    const result = await table.scan({
+        ...options,
+        execute: true
+    }, params.params);
+    return convertResult(result);
 };
-export const scanWithCallback = async (params, callback, options) => {
-  // For backwards compatibility, we still allow for executing the scan without retries.
-  const usingRetry = Boolean(options?.retry);
-  const retryOptions = options?.retry === true ? {} : options?.retry;
-  const executeScan = () => scan(params);
-  const getInitialResult = () => {
-    if (usingRetry) {
-      return executeWithRetry(executeScan, retryOptions);
-    }
-    return executeScan();
-  };
-  let result = await getInitialResult();
-  if (!result.items?.length && !result.lastEvaluatedKey) {
-    return;
-  }
-
-  // If the result of the callback was `false`, that means the
-  // user's intention was to stop further table scanning.
-  const callbackResult = await callback(result);
-  const mustBreak = callbackResult === false;
-  if (mustBreak) {
-    return;
-  }
-  while (result.next) {
-    const executeNext = () => result.next();
-    const getNextResult = () => {
-      if (usingRetry) {
-        return executeWithRetry(executeNext, retryOptions);
-      }
-      return executeNext();
+const scanWithCallback = async (params, callback, options)=>{
+    const usingRetry = Boolean(options?.retry);
+    const retryOptions = options?.retry === true ? {} : options?.retry;
+    const executeScan = ()=>scan(params);
+    const getInitialResult = ()=>{
+        if (usingRetry) return executeWithRetry(executeScan, retryOptions);
+        return executeScan();
     };
-    result = await getNextResult();
-
-    // If the result of the callback was `false`, that means the
-    // user's intention was to stop further table scanning.
+    let result = await getInitialResult();
+    if (!result.items?.length && !result.lastEvaluatedKey) return;
     const callbackResult = await callback(result);
-    const mustBreak = callbackResult === false;
-    if (mustBreak) {
-      break;
-    }
-    if (!result.next) {
-      return;
+    const mustBreak = false === callbackResult;
+    if (mustBreak) return;
+    while(result.next){
+        const executeNext = ()=>result.next();
+        const getNextResult = ()=>{
+            if (usingRetry) return executeWithRetry(executeNext, retryOptions);
+            return executeNext();
+        };
+        result = await getNextResult();
+        const callbackResult = await callback(result);
+        const mustBreak = false === callbackResult;
+        if (mustBreak) break;
+        if (!result.next) return;
     }
-  }
 };
+export { scan, scanWithCallback };
 
 //# sourceMappingURL=scan.js.map