rads-db 3.1.0 → 3.1.4

package/dist/config.cjs

@@ -616,13 +616,14 @@ function schemaFromFiles(entitiesDir) {
 }
 function schemaFromRadsApi(radsApiUrl) {
   return async () => {
+    if (!radsApiUrl.endsWith("/"))
+      radsApiUrl += "/";
     const url = new URL("radsTunnel", radsApiUrl);
     const fetchResponse = await fetch(url.href, {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify({ method: "_schema" })
     });
-    console.log("loading", url.href);
     const schema = await fetchResponse.json();
     if (!schema) {
       throw new Error("Could not download schema from the server. Please check the server URL.");

package/dist/config.mjs

@@ -608,13 +608,14 @@ function schemaFromFiles(entitiesDir) {
 }
 function schemaFromRadsApi(radsApiUrl) {
   return async () => {
+    if (!radsApiUrl.endsWith("/"))
+      radsApiUrl += "/";
     const url = new URL("radsTunnel", radsApiUrl);
     const fetchResponse = await fetch(url.href, {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify({ method: "_schema" })
     });
-    console.log("loading", url.href);
     const schema = await fetchResponse.json();
     if (!schema) {
       throw new Error("Could not download schema from the server. Please check the server URL.");

package/dist/index.cjs

@@ -357,7 +357,9 @@ const computedPresets = {
       throw new Error('To use "updatedBy" preset, please, provide "context.getUser" to "createRads" call.');
     return ___default.pick(ctx.getUser(), "id");
   },
-  updatedAt: ({ doc, oldDoc }) => {
+  updatedAt: ({ doc, oldDoc, ctx }) => {
+    if (ctx.isVerifying && oldDoc.updatedAt)
+      return oldDoc.updatedAt;
     return (/* @__PURE__ */ new Date()).toISOString();
   },
   autoincrement: () => {
@@ -819,7 +821,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     if (driverInstance.verifyMany) {
       return driverInstance.verifyMany(args, ctx);
     }
-    ctx = { ...options.context, ...ctx };
+    ctx = { ...options.context, ...ctx, isVerifying: true };
     if (args?.dryRun) {
       ctx._logs = ctx._logs || [];
       ctx.dryRun = true;
@@ -1273,13 +1275,13 @@ function keepHistory() {
   };
 }
 
-function createRadsDb(args) {
+function createRadsDb(dataSourceKey, args) {
   args = { ...args };
-  const s = args.schema || _radsDb.schema;
+  const s = args.schema || _radsDb.schemas[dataSourceKey];
   const validators = generateValidators(s);
   return generateMethods(s, validators, args);
 }
-function createRadsDbClient(args) {
+function createRadsDbClient(dataSourceKey, args) {
   const radsDbArgs = {
     ...args,
     noComputed: true,
@@ -1287,7 +1289,7 @@ function createRadsDbClient(args) {
     keepNulls: true,
     driver: restApi(args?.driver)
   };
-  const s = radsDbArgs.schema || _radsDb.schema;
+  const s = radsDbArgs.schema || _radsDb.schemas[dataSourceKey];
   const validators = generateValidators(s);
   return generateMethods(s, validators, radsDbArgs);
 }

package/dist/index.d.ts

@@ -26,12 +26,12 @@ declare function cleanUndefinedAndNull(obj: Record<string, any>, isChange?: bool
  * Creates instance of rads db - object that provides access to all entities.
  * Intended to be used on the backend. On the client you may want to opt for "createRadsDbClient" instead.
  * */
-declare function createRadsDb(args?: CreateRadsDbArgs): RadsDb;
+declare function createRadsDb<T extends keyof RadsDb>(dataSourceKey: T, args?: CreateRadsDbArgs): RadsDb[T];
 /**
  * Creates instance of rads db client - object that provides access to all entities.
  * Intended to be used on the frontend. Uses "fetch" to communicate with the server's API.
- * It is a shortcut for `createRadsDb({ driver: radsRestApi(), noComputed: true, noCustomDrivers: true })`
+ * It is a shortcut for `createRadsDb('db', { driver: radsRestApi(), noComputed: true, noCustomDrivers: true })`
  */
-declare function createRadsDbClient(args?: CreateRadsDbClientArgs): RadsDb;
+declare function createRadsDbClient<T extends keyof RadsDb>(dataSourceKey: T, args?: CreateRadsDbClientArgs): RadsDb[T];
 
 export { ComputedContext, ComputedDecoratorArgs, CreateRadsDbArgs, CreateRadsDbClientArgs, Driver, DriverConstructor, EntityDecoratorArgs, FieldDecoratorArgs, RadsRequestContext, Schema, UiDecoratorArgs, UiFieldDecoratorArgs, ValidateEntityDecoratorArgs, ValidateFieldDecoratorArgs, cleanUndefinedAndNull, computed, createRadsDb, createRadsDbClient, diff, entity, field, getDriverInstance, handlePrecomputed, keepHistory, merge, precomputed, ui, validate };

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { z, ZodNullable, ZodOptional, ZodLazy, ZodObject, ZodError } from 'zod';
 import _ from 'lodash';
 import { v4 } from 'uuid';
 import createMerge from '@fastify/deepmerge';
-import { schema } from '_rads-db';
+import { schemas } from '_rads-db';
 
 function generateValidators(schema) {
   const zodSchemas = {};
@@ -350,7 +350,9 @@ const computedPresets = {
       throw new Error('To use "updatedBy" preset, please, provide "context.getUser" to "createRads" call.');
     return _.pick(ctx.getUser(), "id");
   },
-  updatedAt: ({ doc, oldDoc }) => {
+  updatedAt: ({ doc, oldDoc, ctx }) => {
+    if (ctx.isVerifying && oldDoc.updatedAt)
+      return oldDoc.updatedAt;
     return (/* @__PURE__ */ new Date()).toISOString();
   },
   autoincrement: () => {
@@ -812,7 +814,7 @@ function getRadsDbMethods(key, computedContext, driverInstance) {
     if (driverInstance.verifyMany) {
       return driverInstance.verifyMany(args, ctx);
     }
-    ctx = { ...options.context, ...ctx };
+    ctx = { ...options.context, ...ctx, isVerifying: true };
     if (args?.dryRun) {
       ctx._logs = ctx._logs || [];
       ctx.dryRun = true;
@@ -1266,13 +1268,13 @@ function keepHistory() {
   };
 }
 
-function createRadsDb(args) {
+function createRadsDb(dataSourceKey, args) {
   args = { ...args };
-  const s = args.schema || schema;
+  const s = args.schema || schemas[dataSourceKey];
   const validators = generateValidators(s);
   return generateMethods(s, validators, args);
 }
-function createRadsDbClient(args) {
+function createRadsDbClient(dataSourceKey, args) {
   const radsDbArgs = {
     ...args,
     noComputed: true,
@@ -1280,7 +1282,7 @@ function createRadsDbClient(args) {
     keepNulls: true,
     driver: restApi(args?.driver)
   };
-  const s = radsDbArgs.schema || schema;
+  const s = radsDbArgs.schema || schemas[dataSourceKey];
   const validators = generateValidators(s);
   return generateMethods(s, validators, radsDbArgs);
 }

package/integrations/vite.cjs

@@ -10,7 +10,7 @@ function radsDbVite(options) {
     name: "rads-db",
     config(config, env) {},
     async configResolved(config) {
-      await (0, _node.generateClient)(options);
+      await (0, _node.generateClient)();
     },
     configureServer(server) {
       server.middlewares.use((req, res, next) => {

package/integrations/vite.mjs

@@ -6,7 +6,7 @@ export function radsDbVite(options) {
       config(config, env) {
       },
       async configResolved(config) {
-        await generateClient(options);
+        await generateClient();
       },
       configureServer(server) {
         server.middlewares.use((req, res, next) => {

package/package.json

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