rads-db 0.1.65 → 0.1.67

package/dist/index.cjs

@@ -642,7 +642,8 @@ async function fillDenormFieldsBeforePut(computedContext, docUpdates, ctx) {
 
 function generateMethods(schema, validators, options) {
   const drivers = {};
-  const opts = { computed: {}, driver: memory(), ...options };
+  const opts = { computed: {}, driver: memory(), beforeGet: () => {
+  }, ...options };
   const db = {
     _schema: schema,
     uploadFile(args) {
@@ -682,15 +683,18 @@ function generateMethods(schema, validators, options) {
     const { precomputedFields } = schema[key];
     db[handle] = {
       getAgg: async (args, ctx) => {
-        if (!args?.agg)
+        args = { ...args, where: { ...args?.where } };
+        if (!args.agg)
           throw new Error(`Please provide 'agg' argument`);
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.getAgg(args, ctx);
         return result;
       },
       get: async (args, ctx) => {
-        args = args || {};
+        args = { ...args, where: { ...args?.where } };
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.get(args, ctx);
         if (result && args.include)
           await handleInclude(computedContext, args.include, [result], ctx);
@@ -699,8 +703,9 @@ function generateMethods(schema, validators, options) {
         return result;
       },
       getMany: async (args, ctx) => {
-        args = args || {};
+        args = { ...args, where: { ...args?.where } };
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.getMany(args, ctx);
         if (args.include)
           await handleInclude(computedContext, args.include, result.nodes, ctx);
@@ -708,8 +713,9 @@ function generateMethods(schema, validators, options) {
         return result;
       },
       getAll: async (args, ctx) => {
-        args = args || {};
+        args = { ...args, where: { ...args?.where } };
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.getAll(args, ctx);
         if (args.include)
           await handleInclude(computedContext, args.include, result, ctx);

package/dist/index.d.ts

@@ -141,6 +141,7 @@ interface CreateRadsArgs {
     fileUploadDriver?: FileUploadDriver;
     skipComputed?: boolean;
     computed?: Record<string, Record<string, Function>>;
+    beforeGet?: (args: GetArgsAny, ctx: RadsRequestContext, context: ComputedContext) => MaybePromise<void>;
     context?: Record<string, any> & RadsRequestContext;
 }
 type Schema = Record<string, TypeDefinition>;

package/dist/index.mjs

@@ -635,7 +635,8 @@ async function fillDenormFieldsBeforePut(computedContext, docUpdates, ctx) {
 
 function generateMethods(schema, validators, options) {
   const drivers = {};
-  const opts = { computed: {}, driver: memory(), ...options };
+  const opts = { computed: {}, driver: memory(), beforeGet: () => {
+  }, ...options };
   const db = {
     _schema: schema,
     uploadFile(args) {
@@ -675,15 +676,18 @@ function generateMethods(schema, validators, options) {
     const { precomputedFields } = schema[key];
     db[handle] = {
       getAgg: async (args, ctx) => {
-        if (!args?.agg)
+        args = { ...args, where: { ...args?.where } };
+        if (!args.agg)
           throw new Error(`Please provide 'agg' argument`);
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.getAgg(args, ctx);
         return result;
       },
       get: async (args, ctx) => {
-        args = args || {};
+        args = { ...args, where: { ...args?.where } };
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.get(args, ctx);
         if (result && args.include)
           await handleInclude(computedContext, args.include, [result], ctx);
@@ -692,8 +696,9 @@ function generateMethods(schema, validators, options) {
         return result;
       },
       getMany: async (args, ctx) => {
-        args = args || {};
+        args = { ...args, where: { ...args?.where } };
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.getMany(args, ctx);
         if (args.include)
           await handleInclude(computedContext, args.include, result.nodes, ctx);
@@ -701,8 +706,9 @@ function generateMethods(schema, validators, options) {
         return result;
       },
       getAll: async (args, ctx) => {
-        args = args || {};
+        args = { ...args, where: { ...args?.where } };
         ctx = { ...opts.context, ...ctx };
+        await opts.beforeGet(args, ctx, computedContext);
         const result = await driverInstance.getAll(args, ctx);
         if (args.include)
           await handleInclude(computedContext, args.include, result, ctx);

package/drivers/azureCosmos.cjs

@@ -128,7 +128,9 @@ function getCosmosQuery(schema, entity, args) {
   }, parameters, where)].filter(x => x);
   let orderByClause = "";
   if (args.orderBy) {
-    const [orderPropFromOrderBy, orderDirection] = args.orderBy.split("_") || [];
+    const orderByParts = args.orderBy.split("_");
+    const orderPropFromOrderBy = orderByParts.slice(0, -1).join(".");
+    const orderDirection = orderByParts.at(-1);
     const orderProp = orderPropFromOrderBy === "value" ? `r["value"]` : `r.${orderPropFromOrderBy}`;
     orderByClause = `order by ${orderProp} ${orderDirection}`;
   }

package/drivers/azureCosmos.mjs

@@ -83,7 +83,9 @@ function getCosmosQuery(schema, entity, args) {
   ].filter((x) => x);
   let orderByClause = "";
   if (args.orderBy) {
-    const [orderPropFromOrderBy, orderDirection] = args.orderBy.split("_") || [];
+    const orderByParts = args.orderBy.split("_");
+    const orderPropFromOrderBy = orderByParts.slice(0, -1).join(".");
+    const orderDirection = orderByParts.at(-1);
     const orderProp = orderPropFromOrderBy === "value" ? `r["value"]` : `r.${orderPropFromOrderBy}`;
     orderByClause = `order by ${orderProp} ${orderDirection}`;
   }

package/package.json

@@ -34,7 +34,7 @@
       "require": "./integrations/*.cjs"
     }
   },
-  "version": "0.1.65",
+  "version": "0.1.67",
   "description": "Say goodbye to boilerplate code and hello to efficient and elegant syntax.",
   "keywords": [],
   "author": "",