rads-db 3.0.33 → 3.0.36

package/dist/index.cjs

@@ -22,7 +22,14 @@ function generateValidators(schema) {
   const result = {};
   for (const key in zodSchemas) {
     result[key] = (value) => {
-      value = zodSchemas[key].parse(value);
+      try {
+        value = zodSchemas[key].parse(value);
+      } catch (error) {
+        if (error instanceof zod.ZodError)
+          throw new ValidationError(error);
+        else
+          throw error;
+      }
       fillDefaultValues(schema, key, value);
       return value;
     };
@@ -100,6 +107,13 @@ function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
   }
   throw new Error(`Unknown type: ${field.type}`);
 }
+class ValidationError extends Error {
+  constructor(error) {
+    super(error.errors[0].message);
+    this.message = error.errors[0].message;
+    this.issues = error.errors;
+  }
+}
 
 const operatorFns = {
   eq: (x, w) => x === w,

package/dist/index.d.ts

@@ -209,7 +209,7 @@ interface TypeDefinition {
     handle?: string;
     handlePlural?: string;
     isExtending?: string;
-    keepHistoryFields: string[];
+    keepHistoryFields?: string[];
 }
 interface FileUploadResult {
     url: string;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z, ZodError } from 'zod';
 import _ from 'lodash';
 import { v4 } from 'uuid';
 import createMerge from '@fastify/deepmerge';
@@ -14,7 +14,14 @@ function generateValidators(schema) {
   const result = {};
   for (const key in zodSchemas) {
     result[key] = (value) => {
-      value = zodSchemas[key].parse(value);
+      try {
+        value = zodSchemas[key].parse(value);
+      } catch (error) {
+        if (error instanceof ZodError)
+          throw new ValidationError(error);
+        else
+          throw error;
+      }
       fillDefaultValues(schema, key, value);
       return value;
     };
@@ -92,6 +99,13 @@ function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
   }
   throw new Error(`Unknown type: ${field.type}`);
 }
+class ValidationError extends Error {
+  constructor(error) {
+    super(error.errors[0].message);
+    this.message = error.errors[0].message;
+    this.issues = error.errors;
+  }
+}
 
 const operatorFns = {
   eq: (x, w) => x === w,

package/features/eventSourcing.cjs

@@ -68,8 +68,9 @@ function verifyEventSourcingSetup(schema, effects) {
               id: aggId
             }, ev.change));
             ev.beforeChange = aggDoc;
+            const originalChange = ev.change;
             ev.change = (0, _radsDb.diff)(newAggDoc, aggDoc);
-            keepHistory(schema[entityName].keepHistoryFields, newAggDoc, ev);
+            keepHistory(schema[entityName].keepHistoryFields, originalChange, ev);
             aggDoc = newAggDoc;
             if (!context.options.keepNulls) (0, _radsDb.cleanUndefinedAndNull)(aggDoc);
           }
@@ -97,11 +98,11 @@ function verifyEventSourcingSetup(schema, effects) {
     });
   }
 }
-function keepHistory(keepHistoryFields, newAggDoc, eventChange) {
-  if (keepHistoryFields && newAggDoc) {
+function keepHistory(keepHistoryFields, originalChange, changeEvent) {
+  if (keepHistoryFields && originalChange) {
     keepHistoryFields.forEach(prop => {
-      if (!eventChange.change[prop]) {
-        eventChange.change[prop] = newAggDoc[prop];
+      if (!changeEvent.change[prop] && originalChange[prop] !== void 0) {
+        changeEvent.change[prop] = originalChange[prop];
       }
     });
   }

package/features/eventSourcing.mjs

@@ -62,8 +62,9 @@ function verifyEventSourcingSetup(schema, effects) {
           for (const ev of events) {
             const newAggDoc = context.validators[entityName](merge(aggDoc || { id: aggId }, ev.change));
             ev.beforeChange = aggDoc;
+            const originalChange = ev.change;
             ev.change = diff(newAggDoc, aggDoc);
-            keepHistory(schema[entityName].keepHistoryFields, newAggDoc, ev);
+            keepHistory(schema[entityName].keepHistoryFields, originalChange, ev);
             aggDoc = newAggDoc;
             if (!context.options.keepNulls)
               cleanUndefinedAndNull(aggDoc);
@@ -85,11 +86,11 @@ function verifyEventSourcingSetup(schema, effects) {
     });
   }
 }
-function keepHistory(keepHistoryFields, newAggDoc, eventChange) {
-  if (keepHistoryFields && newAggDoc) {
+function keepHistory(keepHistoryFields, originalChange, changeEvent) {
+  if (keepHistoryFields && originalChange) {
     keepHistoryFields.forEach((prop) => {
-      if (!eventChange.change[prop]) {
-        eventChange.change[prop] = newAggDoc[prop];
+      if (!changeEvent.change[prop] && originalChange[prop] !== void 0) {
+        changeEvent.change[prop] = originalChange[prop];
       }
     });
   }

package/integrations/node.cjs

@@ -52,7 +52,9 @@ async function getSchema(normalizedOptions) {
   } = normalizedOptions;
   let schema;
   if (entitiesDir) {
-    if (!_nodeFs.default.existsSync(entitiesDir)) await _promises.default.mkdir(entitiesDir);
+    if (!_nodeFs.default.existsSync(entitiesDir)) await _promises.default.mkdir(entitiesDir, {
+      recursive: true
+    });
     const response = await _promises.default.readdir(entitiesDir, {
       withFileTypes: true
     });

package/integrations/node.mjs

@@ -49,7 +49,7 @@ export async function getSchema(normalizedOptions) {
   let schema;
   if (entitiesDir) {
     if (!fs2.existsSync(entitiesDir))
-      await fs.mkdir(entitiesDir);
+      await fs.mkdir(entitiesDir, { recursive: true });
     const response = await fs.readdir(entitiesDir, { withFileTypes: true });
     const entities = {};
     for (const file of response) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.33",
+  "version": "3.0.36",
   "files": [
     "dist",
     "drivers",
@@ -46,9 +46,9 @@
   "author": "",
   "license": "ISC",
   "peerDependencies": {
-    "@supabase/supabase-js": ">=2",
     "@azure/cosmos": ">=3",
     "@azure/storage-blob": ">=12",
+    "@supabase/supabase-js": ">=2",
     "dexie": ">=3",
     "h3": ">=1.6.0",
     "typescript": ">=5.0.0"
@@ -72,8 +72,8 @@
   },
   "packageManager": "pnpm@8.6.1",
   "devDependencies": {
-    "@supabase/supabase-js": "^2.39.0",
     "@azure/cosmos": "^3.17.3",
+    "@supabase/supabase-js": "^2.39.0",
     "@types/eslint": "^8.44.8",
     "@types/klaw": "^3.0.3",
     "@types/lodash": "4.14.191",
@@ -87,6 +87,7 @@
     "rads-db": "link:.",
     "simple-git-hooks": "^2.8.1",
     "symlink-dir": "^5.1.1",
+    "ts-node": "^10.9.2",
     "tsup": "^6.7.0",
     "unbuild": "^1.2.1",
     "vite": "^4.0.0",
@@ -105,7 +106,7 @@
   "scripts": {
     "test": "vitest --run && vitest typecheck --run",
     "link-rads-db": "symlink-dir ./test/_rads-db ./node_modules/_rads-db",
-    "generate-test-schema": "rads-db -d './test/entities'",
+    "generate-test-schema": "ts-node ./src/integrations/cli -d './test/entities'",
     "dev": "pnpm install && pnpm link-rads-db && pnpm build && pnpm generate-test-schema && vitest --ui --test-timeout 300000",
     "lint": "cross-env NODE_ENV=production eslint src/**/*.* test/**/*.*",
     "dev-typecheck": "pnpm install && pnpm build && pnpm generate-test-schema && pnpm link-rads-db && vitest typecheck --ui",