rads-db 3.1.15 → 3.2.0

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { g as RadsConfig, T as TypeDefinition } from './types-9cb9d6e7.js';
+import { g as RadsConfig, T as TypeDefinition } from './types-dd50fa7e.js';
 import '_rads-db';
 
 declare function defineRadsConfig(config: RadsConfig): RadsConfig;

package/dist/index.cjs

@@ -1195,7 +1195,10 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
     deleteMany(args, ctx) {
       throw new Error(`"deleteMany" not supported for driver "${driverInstance.driverName}"`);
     },
-    ...driverInstance
+    ...driverInstance,
+    get client() {
+      return driverInstance.client;
+    }
   };
 }
 function addDryRunSupport(driverInstance, entity) {
@@ -1275,10 +1278,21 @@ const restApi = (options) => (schema, entity) => {
     }
     return responseJson;
   }
-  const { handlePlural } = schema[entity] || {};
-  if (!handlePlural) throw new Error(`Entity ${entity} was not found in schema`);
+  const { handlePlural, handle } = schema[entity] || {};
+  if (!handlePlural || !handle) throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
+    async getAgg(args, ctx) {
+      args = args || {};
+      const url = `${opts.baseUrl}/${handle}/agg`;
+      const fetchOptions = {
+        method: "POST",
+        body: JSON.stringify(args),
+        headers: { "Content-Type": "application/json" }
+      };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args, context: ctx }) };
+      return await fetchInner(url, fetchOptions);
+    },
     async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-9cb9d6e7.js';
-export { N as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, aj as DeepKeys, ae as DeepPartial, ac as DeepPartialWithNulls, ad as DeepPartialWithNullsItem, ak as EntityMethods, w as EnumDefinition, v as FieldDefinition, I as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, B as GenerateClientNormalizedOptions, A as GenerateClientOptions, a8 as Get, _ as GetAggArgs, $ as GetAggArgsAgg, a2 as GetAggArgsAny, a5 as GetAggResponse, Z as GetArgs, a1 as GetArgsAny, a4 as GetArgsInclude, O as GetManyArgs, a0 as GetManyArgsAny, a6 as GetManyResponse, a7 as GetResponse, a9 as GetResponseInclude, aa as GetResponseIncludeSelect, ab as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ag as InverseRelation, M as MinimalDriver, ai as Put, ah as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, L as RadsFeature, y as RadsHookDoc, K as RadsUiSlotDefinition, J as RadsUiSlotName, H as RadsVitePluginOptions, af as Relation, i as RequiredFields, l as RestDriverOptions, z as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, T as TypeDefinition, j as ValidateStringDecoratorArgs, Q as VerifyManyArgs, a3 as VerifyManyArgsAny, X as VerifyManyResponse, Y as Where, W as WhereJsonContains } from './types-9cb9d6e7.js';
+import { E as EntityDecoratorArgs, U as UiDecoratorArgs, a as UiFieldDecoratorArgs, V as ValidateEntityDecoratorArgs, b as ValidateFieldDecoratorArgs, F as FieldDecoratorArgs, C as ComputedDecoratorArgs, S as Schema, D as DriverConstructor, c as Driver, d as ComputedContext, R as RadsRequestContext, e as CreateRadsDbArgs, f as CreateRadsDbClientArgs } from './types-dd50fa7e.js';
+export { N as Change, x as ComputedContextGlobal, k as CreateRadsArgsDrivers, m as CreateRadsDbArgsNormalized, aj as DeepKeys, ae as DeepPartial, ac as DeepPartialWithNulls, ad as DeepPartialWithNullsItem, ak as EntityMethods, w as EnumDefinition, v as FieldDefinition, I as FileSystemNode, u as FileUploadArgs, q as FileUploadDriver, p as FileUploadResult, B as GenerateClientNormalizedOptions, A as GenerateClientOptions, a8 as Get, _ as GetAggArgs, $ as GetAggArgsAgg, a2 as GetAggArgsAny, a5 as GetAggResponse, Z as GetArgs, a1 as GetArgsAny, a4 as GetArgsInclude, O as GetManyArgs, a0 as GetManyArgsAny, a6 as GetManyResponse, a7 as GetResponse, a9 as GetResponseInclude, aa as GetResponseIncludeSelect, ab as GetResponseNoInclude, s as GetRestRoutesArgs, G as GetRestRoutesOptions, t as GetRestRoutesResponse, ag as InverseRelation, M as MinimalDriver, ai as Put, ah as PutArgs, P as PutEffect, g as RadsConfig, h as RadsConfigDataSource, r as RadsDbInstance, L as RadsFeature, y as RadsHookDoc, K as RadsUiSlotDefinition, J as RadsUiSlotName, H as RadsVitePluginOptions, af as Relation, i as RequiredFields, l as RestDriverOptions, z as RestFileUploadDriverOptions, n as SchemaLoadResult, o as SchemaValidators, T as TypeDefinition, j as ValidateStringDecoratorArgs, Q as VerifyManyArgs, a3 as VerifyManyArgsAny, X as VerifyManyResponse, Y as Where, W as WhereJsonContains } from './types-dd50fa7e.js';
 import { RadsDb } from '_rads-db';
 export { RadsDb } from '_rads-db';
 

package/dist/index.mjs

@@ -1188,7 +1188,10 @@ function getDriverInstanceInner(schema, key, driverConstructor) {
     deleteMany(args, ctx) {
       throw new Error(`"deleteMany" not supported for driver "${driverInstance.driverName}"`);
     },
-    ...driverInstance
+    ...driverInstance,
+    get client() {
+      return driverInstance.client;
+    }
   };
 }
 function addDryRunSupport(driverInstance, entity) {
@@ -1268,10 +1271,21 @@ const restApi = (options) => (schema, entity) => {
     }
     return responseJson;
   }
-  const { handlePlural } = schema[entity] || {};
-  if (!handlePlural) throw new Error(`Entity ${entity} was not found in schema`);
+  const { handlePlural, handle } = schema[entity] || {};
+  if (!handlePlural || !handle) throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
+    async getAgg(args, ctx) {
+      args = args || {};
+      const url = `${opts.baseUrl}/${handle}/agg`;
+      const fetchOptions = {
+        method: "POST",
+        body: JSON.stringify(args),
+        headers: { "Content-Type": "application/json" }
+      };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args, context: ctx }) };
+      return await fetchInner(url, fetchOptions);
+    },
     async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;

package/dist/{types-9cb9d6e7.d.ts → types-dd50fa7e.d.ts}

@@ -5,7 +5,7 @@ type Change<T> = {
     [K in keyof T]?: T[K] extends any[] ? T[K] : T[K] extends {} ? Change<T[K]> : T[K];
 };
 interface GetManyArgs<EN extends keyof EntityMeta> extends GetArgs<EN> {
-    cursor?: string | null;
+    cursor?: string | undefined;
     maxItemCount?: number;
     orderBy?: string;
     orderByArray?: OrderBy<EntityMeta[EN]>;
@@ -15,7 +15,7 @@ interface VerifyManyArgs<EN extends keyof EntityMeta> extends GetManyArgs<EN> {
     dryRun?: boolean;
 }
 interface VerifyManyResponse {
-    cursor: string | null;
+    cursor: string | undefined;
     correctCount: number;
     incorrectCount: number;
     incorrectDocs: {
@@ -55,7 +55,7 @@ type GetAggResponse<EN extends keyof EntityMeta, A extends GetAggArgs<EN>> = {
 };
 interface GetManyResponse<EN extends keyof EntityMeta, A extends GetArgs<EN>> {
     nodes: GetResponse<EN, A>[];
-    cursor: string | null;
+    cursor: string | undefined;
 }
 type GetResponse<EN extends keyof EntityMeta, A extends GetArgs<EN>> = A extends {
     include: any;
@@ -309,23 +309,24 @@ interface MinimalDriver {
     driverName: string;
     /** raw underlying data access service - e.g. sql client or azure storage client */
     client?: any;
-    putMany: (item: Record<string, any>[], ctx?: RadsRequestContext) => MaybePromise<void>;
+    putMany: (items: Record<string, any>[], ctx?: RadsRequestContext) => MaybePromise<void>;
     getMany: (args?: GetManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<{
         nodes: Record<string, any>[];
-        cursor: string | null;
+        cursor: string | undefined;
     }>;
-    get?: (args: GetArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any> | null>;
+    get?: (args: GetArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any> | undefined>;
     getAll?: (args: GetManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any>[]>;
     getAgg?: (args: GetAggArgsAny, ctx?: RadsRequestContext) => MaybePromise<Record<string, any>>;
     deleteMany?: (args: GetManyArgsAny, ctx?: RadsRequestContext) => MaybePromise<{
         nodes: Record<string, any>[];
-        cursor: string | null;
+        cursor: string | undefined;
     }>;
     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>;
+    generateMigrationScript?: () => MaybePromise<string | undefined>;
 }
-type Driver = Required<Omit<MinimalDriver, 'verifyMany' | 'client'>> & Pick<MinimalDriver, 'verifyMany' | 'client'>;
+type Driver = Required<Omit<MinimalDriver, 'verifyMany' | 'client' | 'generateMigrationScript'>> & Pick<MinimalDriver, 'verifyMany' | 'client' | 'generateMigrationScript'>;
 interface FieldDefinition {
     name: string;
     type: string;

package/drivers/azureCosmos.cjs

@@ -57,14 +57,14 @@ var _default = options => (schema, entity) => {
         const items = await getItemByIds([where.id], ctx, args.include);
         return {
           nodes: [items[0]].filter(x => x),
-          cursor: null
+          cursor: void 0
         };
       }
       if (whereKeys[0] === "id_in" && where.id_in != null) {
         const items = await getItemByIds(where.id_in, ctx, args.include);
         return {
           nodes: items.filter(x => x),
-          cursor: null
+          cursor: void 0
         };
       }
     }
@@ -90,13 +90,47 @@ var _default = options => (schema, entity) => {
     });
     return {
       nodes: page.resources,
-      cursor: page.continuationToken || null
+      cursor: page.continuationToken || void 0
     };
   }
   const instance = {
     driverName: "azureCosmos",
     client,
     getMany,
+    async getAgg(args, ctx) {
+      args = args || {};
+      const where = args.where || {};
+      const {
+        query,
+        parameters
+      } = getCosmosQuery(schema, entity, args);
+      let cursor;
+      const response = client.items.query({
+        query,
+        parameters: Object.keys(parameters).map(k => ({
+          name: `@${k}`,
+          value: parameters[k]
+        }))
+      }, {
+        continuationToken: args.cursor || void 0,
+        continuationTokenLimitInKB: 4,
+        maxItemCount: args.maxItemCount
+      });
+      const page = await response.fetchNext();
+      let result = {};
+      for (const r of page.resources) {
+        result = {
+          ...result,
+          ...r
+        };
+      }
+      ctx?.log?.({
+        charge: page.requestCharge,
+        request: query
+      });
+      if (page.continuationToken) result.cursor = page.continuationToken;
+      return result;
+    },
     async deleteMany(args, ctx) {
       const {
         nodes,
@@ -155,11 +189,32 @@ function getCosmosQuery(schema, entity, args) {
     entity
   }, parameters, where)].filter(x => x);
   const orderByClause = getCosmosOrderBy(args);
-  let colums = "*";
+  let columns = "*";
   if (args.include?._pick) {
-    colums = getCosmosSelectValue(args.include);
+    columns = getCosmosSelectValue(args.include);
+  }
+  if (args.agg) {
+    const columnsArray = [];
+    for (const key of args.agg) {
+      const [field, aggOp] = key.split("_");
+      if (aggOp === "count") {
+        columnsArray.push("COUNT(1) AS _count");
+      }
+      if (aggOp === "max" && field) {
+        columnsArray.push(`MAX(r["${field}"]) AS ${field}_max`);
+      }
+      if (aggOp === "min" && field) {
+        columnsArray.push(`MIN(r["${field}"]) AS ${field}_min`);
+      }
+      if (aggOp === "sum" && field) {
+        columnsArray.push(`SUM(r["${field}"]) AS ${field}_sum`);
+      }
+    }
+    if (columnsArray.length) {
+      columns = columnsArray.join(", ");
+    }
   }
-  const query = `select ${colums} from r where ${whereClauses.join(" AND ")} ${orderByClause}`;
+  const query = `select ${columns} from r where ${whereClauses.join(" AND ")} ${orderByClause}`;
   return {
     query,
     parameters
@@ -588,7 +643,20 @@ async function createDatabaseIfNotExists(options, client) {
 async function bulkSendWithRetry(client, chunkToSend) {
   const responses = [];
   for (let i = 0; i < 20; i++) {
-    const response = await client.items.bulk(chunkToSend);
+    let response;
+    try {
+      response = await client.items.bulk(chunkToSend);
+    } catch (e) {
+      const is429 = e?.message?.includes("cosmosdb-error-429");
+      if (is429) {
+        const delay2 = 50 + i * 100;
+        console.warn(`Db overloaded. Retrying after ${delay2}ms...`);
+        await new Promise(resolve => setTimeout(resolve, delay2));
+        continue;
+      } else {
+        throw e;
+      }
+    }
     const newChunkToSend = [];
     for (let i2 = 0; i2 < chunkToSend.length; i2++) {
       if (response[i2].statusCode !== 429) {

package/drivers/azureCosmos.mjs

@@ -34,11 +34,11 @@ export default (options) => (schema, entity) => {
     if (whereKeys.length === 1) {
       if (whereKeys[0] === "id" && where.id != null) {
         const items = await getItemByIds([where.id], ctx, args.include);
-        return { nodes: [items[0]].filter((x) => x), cursor: null };
+        return { nodes: [items[0]].filter((x) => x), cursor: void 0 };
       }
       if (whereKeys[0] === "id_in" && where.id_in != null) {
         const items = await getItemByIds(where.id_in, ctx, args.include);
-        return { nodes: items.filter((x) => x), cursor: null };
+        return { nodes: items.filter((x) => x), cursor: void 0 };
       }
     }
     const { query, parameters } = getCosmosQuery(schema, entity, args);
@@ -57,13 +57,38 @@ export default (options) => (schema, entity) => {
     ctx?.log?.({ charge: page.requestCharge, request: query });
     return {
       nodes: page.resources,
-      cursor: page.continuationToken || null
+      cursor: page.continuationToken || void 0
     };
   }
   const instance = {
     driverName: "azureCosmos",
     client,
     getMany,
+    async getAgg(args, ctx) {
+      args = args || {};
+      const where = args.where || {};
+      const { query, parameters } = getCosmosQuery(schema, entity, args);
+      let cursor;
+      const response = client.items.query(
+        {
+          query,
+          parameters: Object.keys(parameters).map((k) => ({ name: `@${k}`, value: parameters[k] }))
+        },
+        {
+          continuationToken: args.cursor || void 0,
+          continuationTokenLimitInKB: 4,
+          maxItemCount: args.maxItemCount
+        }
+      );
+      const page = await response.fetchNext();
+      let result = {};
+      for (const r of page.resources) {
+        result = { ...result, ...r };
+      }
+      ctx?.log?.({ charge: page.requestCharge, request: query });
+      if (page.continuationToken) result.cursor = page.continuationToken;
+      return result;
+    },
     async deleteMany(args, ctx) {
       const { nodes, cursor } = await getMany(args, ctx);
       for (const chunk of _.chunk(nodes, 100)) {
@@ -111,11 +136,32 @@ function getCosmosQuery(schema, entity, args) {
     getCosmosQueryWhere({ schema, entity }, parameters, where)
   ].filter((x) => x);
   const orderByClause = getCosmosOrderBy(args);
-  let colums = "*";
+  let columns = "*";
   if (args.include?._pick) {
-    colums = getCosmosSelectValue(args.include);
+    columns = getCosmosSelectValue(args.include);
+  }
+  if (args.agg) {
+    const columnsArray = [];
+    for (const key of args.agg) {
+      const [field, aggOp] = key.split("_");
+      if (aggOp === "count") {
+        columnsArray.push("COUNT(1) AS _count");
+      }
+      if (aggOp === "max" && field) {
+        columnsArray.push(`MAX(r["${field}"]) AS ${field}_max`);
+      }
+      if (aggOp === "min" && field) {
+        columnsArray.push(`MIN(r["${field}"]) AS ${field}_min`);
+      }
+      if (aggOp === "sum" && field) {
+        columnsArray.push(`SUM(r["${field}"]) AS ${field}_sum`);
+      }
+    }
+    if (columnsArray.length) {
+      columns = columnsArray.join(", ");
+    }
   }
-  const query = `select ${colums} from r where ${whereClauses.join(" AND ")} ${orderByClause}`;
+  const query = `select ${columns} from r where ${whereClauses.join(" AND ")} ${orderByClause}`;
   return { query, parameters };
 }
 const operatorHandlers = {
@@ -385,7 +431,20 @@ async function createDatabaseIfNotExists(options, client) {
 async function bulkSendWithRetry(client, chunkToSend) {
   const responses = [];
   for (let i = 0; i < 20; i++) {
-    const response = await client.items.bulk(chunkToSend);
+    let response;
+    try {
+      response = await client.items.bulk(chunkToSend);
+    } catch (e) {
+      const is429 = e?.message?.includes("cosmosdb-error-429");
+      if (is429) {
+        const delay2 = 50 + i * 100;
+        console.warn(`Db overloaded. Retrying after ${delay2}ms...`);
+        await new Promise((resolve) => setTimeout(resolve, delay2));
+        continue;
+      } else {
+        throw e;
+      }
+    }
     const newChunkToSend = [];
     for (let i2 = 0; i2 < chunkToSend.length; i2++) {
       if (response[i2].statusCode !== 429) {

package/drivers/azureStorageBlob.cjs

@@ -43,14 +43,14 @@ var _default = options => (schema, entity) => {
         const items = await getItemByIds([where.id], ctx);
         return {
           nodes: [items[0]].filter(x => x),
-          cursor: null
+          cursor: void 0
         };
       }
       if (whereKeys[0] === "id_in" && where.id_in != null) {
         const items = await getItemByIds(where.id_in, ctx);
         return {
           nodes: items.filter(x => x),
-          cursor: null
+          cursor: void 0
         };
       }
     }
@@ -69,12 +69,12 @@ var _default = options => (schema, entity) => {
       const nodes = await getBlobsByNames(ids, ctx);
       return {
         nodes,
-        cursor: page.continuationToken || null
+        cursor: page.continuationToken || void 0
       };
     }
     return {
       nodes: [],
-      cursor: null
+      cursor: void 0
     };
   }
   const instance = {

package/drivers/azureStorageBlob.mjs

@@ -33,11 +33,11 @@ export default (options) => (schema, entity) => {
     if (whereKeys.length === 1) {
       if (whereKeys[0] === "id" && where.id != null) {
         const items = await getItemByIds([where.id], ctx);
-        return { nodes: [items[0]].filter((x) => x), cursor: null };
+        return { nodes: [items[0]].filter((x) => x), cursor: void 0 };
       }
       if (whereKeys[0] === "id_in" && where.id_in != null) {
         const items = await getItemByIds(where.id_in, ctx);
-        return { nodes: items.filter((x) => x), cursor: null };
+        return { nodes: items.filter((x) => x), cursor: void 0 };
       }
     }
     if (whereKeys.length > 1) throw new Error("Complex queries are not supported by azureStorageBlob");
@@ -52,12 +52,12 @@ export default (options) => (schema, entity) => {
       const nodes = await getBlobsByNames(ids, ctx);
       return {
         nodes,
-        cursor: page.continuationToken || null
+        cursor: page.continuationToken || void 0
       };
     }
     return {
       nodes: [],
-      cursor: null
+      cursor: void 0
     };
   }
   const instance = {

package/drivers/restApi.cjs

@@ -28,11 +28,31 @@ var _default = options => (schema, entity) => {
     return responseJson;
   }
   const {
-    handlePlural
+    handlePlural,
+    handle
   } = schema[entity] || {};
-  if (!handlePlural) throw new Error(`Entity ${entity} was not found in schema`);
+  if (!handlePlural || !handle) throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
+    async getAgg(args, ctx) {
+      args = args || {};
+      const url = `${opts.baseUrl}/${handle}/agg`;
+      const fetchOptions = {
+        method: "POST",
+        body: JSON.stringify(args),
+        headers: {
+          "Content-Type": "application/json"
+        }
+      };
+      fetchOptions.headers = {
+        ...fetchOptions.headers,
+        ...opts.getHeaders({
+          args,
+          context: ctx
+        })
+      };
+      return await fetchInner(url, fetchOptions);
+    },
     async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;

package/drivers/restApi.mjs

@@ -21,10 +21,21 @@ export default (options) => (schema, entity) => {
     }
     return responseJson;
   }
-  const { handlePlural } = schema[entity] || {};
-  if (!handlePlural) throw new Error(`Entity ${entity} was not found in schema`);
+  const { handlePlural, handle } = schema[entity] || {};
+  if (!handlePlural || !handle) throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
+    async getAgg(args, ctx) {
+      args = args || {};
+      const url = `${opts.baseUrl}/${handle}/agg`;
+      const fetchOptions = {
+        method: "POST",
+        body: JSON.stringify(args),
+        headers: { "Content-Type": "application/json" }
+      };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args, context: ctx }) };
+      return await fetchInner(url, fetchOptions);
+    },
     async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;