rads-db 3.0.19 → 3.0.21

package/dist/index.cjs

@@ -133,20 +133,37 @@ const operatorFns = {
   }
 };
 const memory = (options) => (schema, entity) => {
-  let itemsById = {};
+  const itemsById = {};
   function getItemById(id) {
     return itemsById[id] ?? null;
   }
   function getItemByIds(ids) {
     return ids.map((id) => itemsById[id]);
   }
+  function getMany(args) {
+    args = args || {};
+    const where = args.where || {};
+    const whereKeys = ___default.keys(where);
+    if (whereKeys.length === 1) {
+      if (whereKeys[0] === "id")
+        return { nodes: ___default.cloneDeep([getItemById(where.id)].filter((x) => x)), cursor: null };
+      if (whereKeys[0] === "id_in")
+        return { nodes: ___default.cloneDeep(getItemByIds(where.id_in).filter((x) => x)), cursor: null };
+    }
+    return queryArray(Object.values(itemsById), args);
+  }
   const instance = {
     driverName: "memory",
     get itemsById() {
       return itemsById;
     },
-    clear() {
-      itemsById = {};
+    getMany,
+    deleteMany(args) {
+      const { nodes, cursor } = getMany(args);
+      for (const node of nodes) {
+        delete itemsById[node.id];
+      }
+      return { nodes, cursor };
     },
     putMany(items) {
       for (const item of items) {
@@ -154,18 +171,6 @@ const memory = (options) => (schema, entity) => {
           throw new Error(`You must provide an id`);
         itemsById[item.id] = item;
       }
-    },
-    getMany(args) {
-      args = args || {};
-      const where = args.where || {};
-      const whereKeys = ___default.keys(where);
-      if (whereKeys.length === 1) {
-        if (whereKeys[0] === "id")
-          return { nodes: ___default.cloneDeep([getItemById(where.id)].filter((x) => x)), cursor: null };
-        if (whereKeys[0] === "id_in")
-          return { nodes: ___default.cloneDeep(getItemByIds(where.id_in).filter((x) => x)), cursor: null };
-      }
-      return queryArray(Object.values(itemsById), args);
     }
   };
   return instance;
@@ -760,6 +765,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     return docsToSave;
   }
   const result = {
+    // No deleteMany / deleteAll on purpose - it's a dangerous operation, let them use driver instead
     createObject() {
       throw new Error("Not implemented");
     },
@@ -887,10 +893,6 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
       await afterPut(docArgsToSave, ctx, computedContext);
       return { _logs, cursor, correctCount, incorrectCount, incorrectDocs };
-    },
-    clear: (ctx) => {
-      ctx = { ...options.context, ...ctx };
-      return driverInstance.clear(ctx);
     }
   };
   for (const f of options.features) {
@@ -1044,7 +1046,7 @@ function getDriverInstance(schema, key, driverConstructor, driverInstances) {
 function getDriverInstanceInner(schema, key, driverConstructor) {
   const driverInstance = driverConstructor(schema, key);
   addDryRunSupport(driverInstance, key);
-  async function getAll(args, ctx) {
+  async function followCursors(callback, args, ctx) {
     const result = [];
     args = args || {};
     let cursor = args.cursor;
@@ -1052,7 +1054,7 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
     if (maxItemCount < 1e3)
       maxItemCount = 1e3;
     for (let i = 0; i < 1e3; i++) {
-      const response = await driverInstance.getMany({ ...args, cursor, maxItemCount }, ctx);
+      const response = await callback({ ...args, cursor, maxItemCount }, ctx);
       result.push(...response.nodes);
       if (cursor && cursor === response.cursor) {
         throw new Error(
@@ -1065,12 +1067,21 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
     }
     return result;
   }
+  async function getAll(args, ctx) {
+    const result = await followCursors(driverInstance.getMany, args, ctx);
+    return result;
+  }
+  async function deleteAll(args, ctx) {
+    const result = await followCursors(driverInstance.deleteMany, args, ctx);
+    return result;
+  }
   return {
+    getAll,
+    deleteAll,
     async getAgg(args, ctx) {
       const result = await getAll(args, ctx);
       return getAggFromArray(result, args);
     },
-    getAll,
     async get(args, ctx) {
       args = { ...args, maxItemCount: 1 };
       const result = (await driverInstance.getMany(args, ctx))?.nodes[0];
@@ -1081,45 +1092,28 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
         throw new Error("Data is required");
       await driverInstance.putMany([data], ctx);
     },
-    async clear() {
-      console.error(`"clear" not supported for driver "${driverInstance.driverName}"`);
+    deleteMany(args, ctx) {
+      throw new Error(`"deleteMany" not supported for driver "${driverInstance.driverName}"`);
     },
     ...driverInstance
   };
 }
 function addDryRunSupport(driverInstance, entity) {
-  const { clear, put, putMany } = driverInstance;
-  if (clear) {
-    driverInstance.clear = (ctx) => {
-      if (ctx?.dryRun) {
-        if (!ctx._logs)
-          ctx._logs = [];
-        ctx._logs.push({ method: "clear", entity });
-        return;
-      }
-      return clear(ctx);
-    };
-  }
-  if (put) {
-    driverInstance.put = (data, ctx) => {
-      if (ctx?.dryRun) {
-        if (!ctx._logs)
-          ctx._logs = [];
-        ctx._logs.push({ method: "put", entity, data });
-        return;
-      }
-      return put(data, ctx);
-    };
-  }
-  driverInstance.putMany = (data, ctx) => {
-    if (ctx?.dryRun) {
-      if (!ctx._logs)
-        ctx._logs = [];
-      ctx._logs.push({ method: "putMany", entity, data });
-      return;
+  const methods = ["deleteMany", "deleteAll", "put", "putMany"];
+  for (const method of methods) {
+    const originalMethod = driverInstance[method];
+    if (originalMethod) {
+      driverInstance[method] = (args, ctx) => {
+        if (ctx?.dryRun) {
+          if (!ctx._logs)
+            ctx._logs = [];
+          ctx._logs.push({ method, entity, args });
+          return;
+        }
+        return originalMethod(args, ctx);
+      };
     }
-    return putMany(data, ctx);
-  };
+  }
 }
 function getRadsUiSlots(features) {
   const result = {};

package/dist/index.d.ts

@@ -206,6 +206,7 @@ interface TypeDefinition {
     enumValues?: Record<string, EnumDefinition>;
     handle?: string;
     handlePlural?: string;
+    isExtending?: string;
 }
 interface FileUploadResult {
     url: string;
@@ -247,7 +248,11 @@ interface MinimalDriver {
     get?: (args: GetArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any> | null>;
     getAll?: (args: GetManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any>[]>;
     getAgg?: (args: GetAggArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any>>;
-    clear?: (ctx?: RadsRequestContext) => MaybePromise<void>;
+    deleteMany?: (args: GetManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<{
+        nodes: Record<string, any>[];
+        cursor: string | null;
+    }>;
+    deleteAll?: (args: GetManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any>[]>;
     put?: (data: Record<string, any>, ctx?: RadsRequestContext) => MaybePromise<void>;
     verifyMany?: (args?: VerifyManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<VerifyManyResponse>;
 }
@@ -256,6 +261,7 @@ interface FieldDefinition {
     name: string;
     type: string;
     defaultValue?: any;
+    defaultValueClass?: string;
     defaultValueCopyFrom?: string;
     isRequired?: boolean;
     isArray?: boolean;

package/dist/index.mjs

@@ -125,20 +125,37 @@ const operatorFns = {
   }
 };
 const memory = (options) => (schema, entity) => {
-  let itemsById = {};
+  const itemsById = {};
   function getItemById(id) {
     return itemsById[id] ?? null;
   }
   function getItemByIds(ids) {
     return ids.map((id) => itemsById[id]);
   }
+  function getMany(args) {
+    args = args || {};
+    const where = args.where || {};
+    const whereKeys = _.keys(where);
+    if (whereKeys.length === 1) {
+      if (whereKeys[0] === "id")
+        return { nodes: _.cloneDeep([getItemById(where.id)].filter((x) => x)), cursor: null };
+      if (whereKeys[0] === "id_in")
+        return { nodes: _.cloneDeep(getItemByIds(where.id_in).filter((x) => x)), cursor: null };
+    }
+    return queryArray(Object.values(itemsById), args);
+  }
   const instance = {
     driverName: "memory",
     get itemsById() {
       return itemsById;
     },
-    clear() {
-      itemsById = {};
+    getMany,
+    deleteMany(args) {
+      const { nodes, cursor } = getMany(args);
+      for (const node of nodes) {
+        delete itemsById[node.id];
+      }
+      return { nodes, cursor };
     },
     putMany(items) {
       for (const item of items) {
@@ -146,18 +163,6 @@ const memory = (options) => (schema, entity) => {
           throw new Error(`You must provide an id`);
         itemsById[item.id] = item;
       }
-    },
-    getMany(args) {
-      args = args || {};
-      const where = args.where || {};
-      const whereKeys = _.keys(where);
-      if (whereKeys.length === 1) {
-        if (whereKeys[0] === "id")
-          return { nodes: _.cloneDeep([getItemById(where.id)].filter((x) => x)), cursor: null };
-        if (whereKeys[0] === "id_in")
-          return { nodes: _.cloneDeep(getItemByIds(where.id_in).filter((x) => x)), cursor: null };
-      }
-      return queryArray(Object.values(itemsById), args);
     }
   };
   return instance;
@@ -752,6 +757,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     return docsToSave;
   }
   const result = {
+    // No deleteMany / deleteAll on purpose - it's a dangerous operation, let them use driver instead
     createObject() {
       throw new Error("Not implemented");
     },
@@ -879,10 +885,6 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
       await handleEffectsAfterPut(computedContext, docArgsToSave, beforePutResults, ctx);
       await afterPut(docArgsToSave, ctx, computedContext);
       return { _logs, cursor, correctCount, incorrectCount, incorrectDocs };
-    },
-    clear: (ctx) => {
-      ctx = { ...options.context, ...ctx };
-      return driverInstance.clear(ctx);
     }
   };
   for (const f of options.features) {
@@ -1036,7 +1038,7 @@ function getDriverInstance(schema, key, driverConstructor, driverInstances) {
 function getDriverInstanceInner(schema, key, driverConstructor) {
   const driverInstance = driverConstructor(schema, key);
   addDryRunSupport(driverInstance, key);
-  async function getAll(args, ctx) {
+  async function followCursors(callback, args, ctx) {
     const result = [];
     args = args || {};
     let cursor = args.cursor;
@@ -1044,7 +1046,7 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
     if (maxItemCount < 1e3)
       maxItemCount = 1e3;
     for (let i = 0; i < 1e3; i++) {
-      const response = await driverInstance.getMany({ ...args, cursor, maxItemCount }, ctx);
+      const response = await callback({ ...args, cursor, maxItemCount }, ctx);
       result.push(...response.nodes);
       if (cursor && cursor === response.cursor) {
         throw new Error(
@@ -1057,12 +1059,21 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
     }
     return result;
   }
+  async function getAll(args, ctx) {
+    const result = await followCursors(driverInstance.getMany, args, ctx);
+    return result;
+  }
+  async function deleteAll(args, ctx) {
+    const result = await followCursors(driverInstance.deleteMany, args, ctx);
+    return result;
+  }
   return {
+    getAll,
+    deleteAll,
     async getAgg(args, ctx) {
       const result = await getAll(args, ctx);
       return getAggFromArray(result, args);
     },
-    getAll,
     async get(args, ctx) {
       args = { ...args, maxItemCount: 1 };
       const result = (await driverInstance.getMany(args, ctx))?.nodes[0];
@@ -1073,45 +1084,28 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
         throw new Error("Data is required");
       await driverInstance.putMany([data], ctx);
     },
-    async clear() {
-      console.error(`"clear" not supported for driver "${driverInstance.driverName}"`);
+    deleteMany(args, ctx) {
+      throw new Error(`"deleteMany" not supported for driver "${driverInstance.driverName}"`);
     },
     ...driverInstance
   };
 }
 function addDryRunSupport(driverInstance, entity) {
-  const { clear, put, putMany } = driverInstance;
-  if (clear) {
-    driverInstance.clear = (ctx) => {
-      if (ctx?.dryRun) {
-        if (!ctx._logs)
-          ctx._logs = [];
-        ctx._logs.push({ method: "clear", entity });
-        return;
-      }
-      return clear(ctx);
-    };
-  }
-  if (put) {
-    driverInstance.put = (data, ctx) => {
-      if (ctx?.dryRun) {
-        if (!ctx._logs)
-          ctx._logs = [];
-        ctx._logs.push({ method: "put", entity, data });
-        return;
-      }
-      return put(data, ctx);
-    };
-  }
-  driverInstance.putMany = (data, ctx) => {
-    if (ctx?.dryRun) {
-      if (!ctx._logs)
-        ctx._logs = [];
-      ctx._logs.push({ method: "putMany", entity, data });
-      return;
+  const methods = ["deleteMany", "deleteAll", "put", "putMany"];
+  for (const method of methods) {
+    const originalMethod = driverInstance[method];
+    if (originalMethod) {
+      driverInstance[method] = (args, ctx) => {
+        if (ctx?.dryRun) {
+          if (!ctx._logs)
+            ctx._logs = [];
+          ctx._logs.push({ method, entity, args });
+          return;
+        }
+        return originalMethod(args, ctx);
+      };
     }
-    return putMany(data, ctx);
-  };
+  }
 }
 function getRadsUiSlots(features) {
   const result = {};

package/drivers/azureCosmos.cjs

@@ -95,24 +95,22 @@ var _default = options => (schema, entity) => {
     driverName: "azureCosmos",
     client,
     getMany,
-    async clear(ctx) {
-      let currentCursor = null;
-      do {
-        const {
-          nodes,
-          cursor
-        } = await getMany({
-          cursor: currentCursor
+    async deleteMany(args, ctx) {
+      const {
+        nodes,
+        cursor
+      } = await getMany(args, ctx);
+      for (const r of nodes) {
+        const resp = await client.item(r.id, r._partition).delete();
+        ctx?.log?.({
+          charge: resp.requestCharge,
+          request: `delete#${r._partition}|${r.id}`
         });
-        for (const r of nodes) {
-          const resp = await client.item(r.id, r._partition).delete();
-          ctx?.log?.({
-            charge: resp.requestCharge,
-            request: `delete#${r._partition}|${r.id}`
-          });
-        }
-        currentCursor = cursor;
-      } while (currentCursor);
+      }
+      return {
+        nodes,
+        cursor
+      };
     },
     async putMany(items, ctx) {
       for (const item of items) {

package/drivers/azureCosmos.mjs

@@ -63,16 +63,13 @@ export default (options) => (schema, entity) => {
     driverName: "azureCosmos",
     client,
     getMany,
-    async clear(ctx) {
-      let currentCursor = null;
-      do {
-        const { nodes, cursor } = await getMany({ cursor: currentCursor });
-        for (const r of nodes) {
-          const resp = await client.item(r.id, r._partition).delete();
-          ctx?.log?.({ charge: resp.requestCharge, request: `delete#${r._partition}|${r.id}` });
-        }
-        currentCursor = cursor;
-      } while (currentCursor);
+    async deleteMany(args, ctx) {
+      const { nodes, cursor } = await getMany(args, ctx);
+      for (const r of nodes) {
+        const resp = await client.item(r.id, r._partition).delete();
+        ctx?.log?.({ charge: resp.requestCharge, request: `delete#${r._partition}|${r.id}` });
+      }
+      return { nodes, cursor };
     },
     async putMany(items, ctx) {
       for (const item of items) {

package/drivers/azureStorageBlob.cjs

@@ -81,32 +81,27 @@ var _default = options => (schema, entity) => {
     driverName: "azureStorageBlob",
     client: containerClient,
     getMany,
-    async clear(ctx) {
-      let currentCursor = null;
-      const iterator = containerClient.listBlobsFlat({}).byPage({
-        maxPageSize: 100,
-        continuationToken: currentCursor || void 0
+    async deleteMany(args, ctx) {
+      const {
+        nodes,
+        cursor
+      } = await getMany(args, ctx);
+      const responses = await Promise.all(nodes.map(x => containerClient.getBlobClient(getBlobName(entity, x)).delete()));
+      ctx?.log?.({
+        requestId: responses.map(x => x.requestId || "").join(";"),
+        charge: responses.length,
+        request: `deleteBlobs ${entity}`
       });
-      for await (const page of iterator) {
-        ctx?.log?.({
-          requestId: page.requestId,
-          charge: page.segment.blobItems.length,
-          request: `listBlobsFlat ${entity}`
-        });
-        const responses = await Promise.all(page.segment.blobItems.map(x => containerClient.getBlobClient(x.name).delete()));
-        ctx?.log?.({
-          requestId: responses.map(x => x.requestId || "").join(";"),
-          charge: responses.length,
-          request: `deleteBlobs ${entity}`
-        });
-        currentCursor = page.continuationToken || null;
-      }
+      return {
+        nodes,
+        cursor
+      };
     },
     async putMany(items, ctx) {
       for (const item of items) {
         const id = item?.id;
         if (!id) throw new Error(`You must provide an id`);
-        const blobName = `${entity}/${id}.json`;
+        const blobName = getBlobName(entity, item);
         const itemToPut = item;
         const blobClient = containerClient.getBlockBlobClient(blobName);
         const str = JSON.stringify(itemToPut);
@@ -122,6 +117,10 @@ var _default = options => (schema, entity) => {
   return instance;
 };
 module.exports = _default;
+function getBlobName(entity, item) {
+  if (!item.id) throw new Error("Item must have an id");
+  return `${entity}/${item.id}.json`;
+}
 async function blobOrStreamToString(response) {
   if (response.blobBody) {
     return await (await response.blobBody).text();

package/drivers/azureStorageBlob.mjs

@@ -66,32 +66,24 @@ export default (options) => (schema, entity) => {
     driverName: "azureStorageBlob",
     client: containerClient,
     getMany,
-    async clear(ctx) {
-      let currentCursor = null;
-      const iterator = containerClient.listBlobsFlat({}).byPage({ maxPageSize: 100, continuationToken: currentCursor || void 0 });
-      for await (const page of iterator) {
-        ctx?.log?.({
-          requestId: page.requestId,
-          charge: page.segment.blobItems.length,
-          request: `listBlobsFlat ${entity}`
-        });
-        const responses = await Promise.all(
-          page.segment.blobItems.map((x) => containerClient.getBlobClient(x.name).delete())
-        );
-        ctx?.log?.({
-          requestId: responses.map((x) => x.requestId || "").join(";"),
-          charge: responses.length,
-          request: `deleteBlobs ${entity}`
-        });
-        currentCursor = page.continuationToken || null;
-      }
+    async deleteMany(args, ctx) {
+      const { nodes, cursor } = await getMany(args, ctx);
+      const responses = await Promise.all(
+        nodes.map((x) => containerClient.getBlobClient(getBlobName(entity, x)).delete())
+      );
+      ctx?.log?.({
+        requestId: responses.map((x) => x.requestId || "").join(";"),
+        charge: responses.length,
+        request: `deleteBlobs ${entity}`
+      });
+      return { nodes, cursor };
     },
     async putMany(items, ctx) {
       for (const item of items) {
         const id = item?.id;
         if (!id)
           throw new Error(`You must provide an id`);
-        const blobName = `${entity}/${id}.json`;
+        const blobName = getBlobName(entity, item);
         const itemToPut = item;
         const blobClient = containerClient.getBlockBlobClient(blobName);
         const str = JSON.stringify(itemToPut);
@@ -102,6 +94,11 @@ export default (options) => (schema, entity) => {
   };
   return instance;
 };
+function getBlobName(entity, item) {
+  if (!item.id)
+    throw new Error("Item must have an id");
+  return `${entity}/${item.id}.json`;
+}
 async function blobOrStreamToString(response) {
   if (response.blobBody) {
     return await (await response.blobBody).text();

package/drivers/memory.cjs

@@ -40,42 +40,53 @@ const operatorFns = {
   }
 };
 var _default = options => (schema, entity) => {
-  let itemsById = {};
+  const itemsById = {};
   function getItemById(id) {
     return itemsById[id] ?? null;
   }
   function getItemByIds(ids) {
     return ids.map(id => itemsById[id]);
   }
+  function getMany(args) {
+    args = args || {};
+    const where = args.where || {};
+    const whereKeys = _lodash.default.keys(where);
+    if (whereKeys.length === 1) {
+      if (whereKeys[0] === "id") return {
+        nodes: _lodash.default.cloneDeep([getItemById(where.id)].filter(x => x)),
+        cursor: null
+      };
+      if (whereKeys[0] === "id_in") return {
+        nodes: _lodash.default.cloneDeep(getItemByIds(where.id_in).filter(x => x)),
+        cursor: null
+      };
+    }
+    return queryArray(Object.values(itemsById), args);
+  }
   const instance = {
     driverName: "memory",
     get itemsById() {
       return itemsById;
     },
-    clear() {
-      itemsById = {};
+    getMany,
+    deleteMany(args) {
+      const {
+        nodes,
+        cursor
+      } = getMany(args);
+      for (const node of nodes) {
+        delete itemsById[node.id];
+      }
+      return {
+        nodes,
+        cursor
+      };
     },
     putMany(items) {
       for (const item of items) {
         if (!item?.id) throw new Error(`You must provide an id`);
         itemsById[item.id] = item;
       }
-    },
-    getMany(args) {
-      args = args || {};
-      const where = args.where || {};
-      const whereKeys = _lodash.default.keys(where);
-      if (whereKeys.length === 1) {
-        if (whereKeys[0] === "id") return {
-          nodes: _lodash.default.cloneDeep([getItemById(where.id)].filter(x => x)),
-          cursor: null
-        };
-        if (whereKeys[0] === "id_in") return {
-          nodes: _lodash.default.cloneDeep(getItemByIds(where.id_in).filter(x => x)),
-          cursor: null
-        };
-      }
-      return queryArray(Object.values(itemsById), args);
     }
   };
   return instance;