rads-db 3.0.63 → 3.0.68

package/dist/index.cjs

@@ -235,6 +235,8 @@ function getAggFromArray(array, args) {
         result[key] = values.length ? ___default.mean(values) : void 0;
       else if (operator === "max")
         result[key] = values.length ? ___default.max(array.map((x) => x[field])) : void 0;
+      else if (operator === "sum")
+        result[key] = values.length ? ___default.sum(array.map((x) => x[field])) : void 0;
       else
         throw new Error(`Unknown operator: ${operator} (${key})`);
     }
@@ -1200,7 +1202,7 @@ const restApi = (options) => (schema, entity) => {
     throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
-    async getMany(args) {
+    async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
@@ -1208,17 +1210,17 @@ const restApi = (options) => (schema, entity) => {
         body: JSON.stringify(args),
         headers: { "Content-Type": "application/json" }
       };
-      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args, context: ctx }) };
       return await fetchInner(url, fetchOptions);
     },
-    async putMany(item) {
+    async putMany(item, ctx) {
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
         method: "PUT",
         body: JSON.stringify({ data: item }),
         headers: { "Content-Type": "application/json" }
       };
-      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args: item, context: ctx }) };
       return await fetchInner(url, fetchOptions);
     },
     async verifyMany(args, ctx) {

package/dist/index.d.ts

@@ -37,7 +37,7 @@ interface GetAggArgs<EN extends keyof EntityMeta> {
     where?: Where<EN>;
     agg: GetAggArgsAgg<EN>;
 }
-type GetAggArgsAgg<EN extends keyof EntityMeta, F extends string = EntityMeta[EN]['aggregates']> = ('_count' | `${F}_min` | `${F}_max`)[];
+type GetAggArgsAgg<EN extends keyof EntityMeta, F extends string = EntityMeta[EN]['aggregates']> = ('_count' | `${F}_min` | `${F}_max` | `${F}_sum`)[];
 type GetManyArgsAny = GetManyArgs<any>;
 type GetArgsAny = GetArgs<any>;
 type GetAggArgsAny = GetAggArgs<any>;
@@ -207,7 +207,10 @@ interface RestDriverOptions {
         headers?: any;
         method?: string;
     }) => any;
-    getHeaders?: (url: string, fetchOptions: RequestInit) => Record<string, string> | undefined;
+    getHeaders?: (radsDbRequest: {
+        args?: any;
+        context?: RadsRequestContext;
+    }) => Record<string, string> | undefined;
 }
 interface CreateRadsDbArgs {
     schema?: Schema;
@@ -382,8 +385,8 @@ interface RadsRequestContext {
     silent?: boolean;
     /** Mostly for internal use. When entity name is specified, indicates that calling put* on this entity is allowed, even if it's marked as @precomputed or @readonly */
     skipPrecomputedCheckFor?: string;
-    /** Mostly for internal use. Method that was called - get, getAll, getMany, getAgg, put, putMany, etc */
-    method?: string;
+    /** Method that was called - get, getAll, getMany, getAgg, put, putMany, etc */
+    method?: 'get' | 'getAll' | 'getMany' | 'getAgg' | 'put' | 'putMany' | 'deleteMany' | 'deleteAll';
     /** if true, all cache layers will be bypassed */
     noCache?: boolean;
     [key: string]: any;

package/dist/index.mjs

@@ -228,6 +228,8 @@ function getAggFromArray(array, args) {
         result[key] = values.length ? _.mean(values) : void 0;
       else if (operator === "max")
         result[key] = values.length ? _.max(array.map((x) => x[field])) : void 0;
+      else if (operator === "sum")
+        result[key] = values.length ? _.sum(array.map((x) => x[field])) : void 0;
       else
         throw new Error(`Unknown operator: ${operator} (${key})`);
     }
@@ -1193,7 +1195,7 @@ const restApi = (options) => (schema, entity) => {
     throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
-    async getMany(args) {
+    async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
@@ -1201,17 +1203,17 @@ const restApi = (options) => (schema, entity) => {
         body: JSON.stringify(args),
         headers: { "Content-Type": "application/json" }
       };
-      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args, context: ctx }) };
       return await fetchInner(url, fetchOptions);
     },
-    async putMany(item) {
+    async putMany(item, ctx) {
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
         method: "PUT",
         body: JSON.stringify({ data: item }),
         headers: { "Content-Type": "application/json" }
       };
-      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args: item, context: ctx }) };
       return await fetchInner(url, fetchOptions);
     },
     async verifyMany(args, ctx) {

package/drivers/memory.cjs

@@ -115,7 +115,7 @@ function getAggFromArray(array, args) {
     const [field, operator] = key.split("_");
     if (operator === "count") result[key] = array.length;else {
       const values = array.map(x => x[field]).filter(x => x != null);
-      if (operator === "min") result[key] = values.length ? _lodash.default.min(values) : void 0;else if (operator === "avg") result[key] = values.length ? _lodash.default.mean(values) : void 0;else if (operator === "max") result[key] = values.length ? _lodash.default.max(array.map(x => x[field])) : void 0;else throw new Error(`Unknown operator: ${operator} (${key})`);
+      if (operator === "min") result[key] = values.length ? _lodash.default.min(values) : void 0;else if (operator === "avg") result[key] = values.length ? _lodash.default.mean(values) : void 0;else if (operator === "max") result[key] = values.length ? _lodash.default.max(array.map(x => x[field])) : void 0;else if (operator === "sum") result[key] = values.length ? _lodash.default.sum(array.map(x => x[field])) : void 0;else throw new Error(`Unknown operator: ${operator} (${key})`);
     }
   }
   return result;

package/drivers/memory.mjs

@@ -102,6 +102,8 @@ export function getAggFromArray(array, args) {
         result[key] = values.length ? _.mean(values) : void 0;
       else if (operator === "max")
         result[key] = values.length ? _.max(array.map((x) => x[field])) : void 0;
+      else if (operator === "sum")
+        result[key] = values.length ? _.sum(array.map((x) => x[field])) : void 0;
       else
         throw new Error(`Unknown operator: ${operator} (${key})`);
     }

package/drivers/restApi.cjs

@@ -33,7 +33,7 @@ var _default = options => (schema, entity) => {
   if (!handlePlural) throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
-    async getMany(args) {
+    async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
@@ -45,11 +45,14 @@ var _default = options => (schema, entity) => {
       };
       fetchOptions.headers = {
         ...fetchOptions.headers,
-        ...opts.getHeaders(url, fetchOptions)
+        ...opts.getHeaders({
+          args,
+          context: ctx
+        })
       };
       return await fetchInner(url, fetchOptions);
     },
-    async putMany(item) {
+    async putMany(item, ctx) {
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
         method: "PUT",
@@ -62,7 +65,10 @@ var _default = options => (schema, entity) => {
       };
       fetchOptions.headers = {
         ...fetchOptions.headers,
-        ...opts.getHeaders(url, fetchOptions)
+        ...opts.getHeaders({
+          args: item,
+          context: ctx
+        })
       };
       return await fetchInner(url, fetchOptions);
     },

package/drivers/restApi.mjs

@@ -27,7 +27,7 @@ export default (options) => (schema, entity) => {
     throw new Error(`Entity ${entity} was not found in schema`);
   const instance = {
     driverName: "restApi",
-    async getMany(args) {
+    async getMany(args, ctx) {
       args = args || {};
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
@@ -35,17 +35,17 @@ export default (options) => (schema, entity) => {
         body: JSON.stringify(args),
         headers: { "Content-Type": "application/json" }
       };
-      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args, context: ctx }) };
       return await fetchInner(url, fetchOptions);
     },
-    async putMany(item) {
+    async putMany(item, ctx) {
       const url = `${opts.baseUrl}/${handlePlural}`;
       const fetchOptions = {
         method: "PUT",
         body: JSON.stringify({ data: item }),
         headers: { "Content-Type": "application/json" }
       };
-      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders(url, fetchOptions) };
+      fetchOptions.headers = { ...fetchOptions.headers, ...opts.getHeaders({ args: item, context: ctx }) };
       return await fetchInner(url, fetchOptions);
     },
     async verifyMany(args, ctx) {

package/integrations/node.cjs

@@ -139,7 +139,7 @@ ${whereFields.join("\n")}
   }
       `.trim()).join("\n");
   return `
-import type { EntityMethods, FileUploadArgs, RadsRequestContext, WhereJsonContains } from 'rads-db'
+import type { EntityMethods, FileUploadArgs, RadsRequestContext, WhereJsonContains, Relation, Change } from 'rads-db'
 ${imports.join("\n")}
 ${schemaTypesStr}
 
@@ -175,7 +175,7 @@ function getEntityTypesStrFromSchema(schema) {
         if (f.isChange) fieldTypeStr = `Change<${fieldTypeStr}>`;
         if (f.isRelation) fieldTypeStr = `Relation<${fieldTypeStr}>`;
         if (f.isArray) fieldTypeStr = `${fieldTypeStr}[]`;
-        const fieldStr = `  ${f.name}${f.isRequired ? "!" : "?"}: ${fieldTypeStr}`;
+        const fieldStr = `  ${f.name}${f.isRequired ? "" : "?"}: ${fieldTypeStr}`;
         const commentStr2 = f.comment ? `  /** ${f.comment} */` : "";
         return [fieldStr, commentStr2].filter(x => x).join("\n");
       }).filter(x => x).join("\n");

package/integrations/node.mjs

@@ -139,7 +139,7 @@ ${whereFields.join("\n")}
       `.trim()
   ).join("\n");
   return `
-import type { EntityMethods, FileUploadArgs, RadsRequestContext, WhereJsonContains } from 'rads-db'
+import type { EntityMethods, FileUploadArgs, RadsRequestContext, WhereJsonContains, Relation, Change } from 'rads-db'
 ${imports.join("\n")}
 ${schemaTypesStr}
 
@@ -181,7 +181,7 @@ export function getEntityTypesStrFromSchema(schema) {
           fieldTypeStr = `Relation<${fieldTypeStr}>`;
         if (f.isArray)
           fieldTypeStr = `${fieldTypeStr}[]`;
-        const fieldStr = `  ${f.name}${f.isRequired ? "!" : "?"}: ${fieldTypeStr}`;
+        const fieldStr = `  ${f.name}${f.isRequired ? "" : "?"}: ${fieldTypeStr}`;
         const commentStr2 = f.comment ? `  /** ${f.comment} */` : "";
         return [fieldStr, commentStr2].filter((x) => x).join("\n");
       }).filter((x) => x).join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.63",
+  "version": "3.0.68",
   "packageManager": "pnpm@8.6.1",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "author": "",