rads-db 3.0.32 → 3.0.34

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]) {
+        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]) {
+        changeEvent.change[prop] = originalChange[prop];
       }
     });
   }

package/integrations/node.cjs

@@ -158,7 +158,32 @@ export interface RadsDb {
   `.trim();
 }
 function getEntityTypesStrFromSchema(schema) {
-  return "";
+  const definitions = [];
+  for (const key in schema) {
+    const type = schema[key];
+    if (!type.fields) {
+      definitions.push(`export type ${type.name} = ${_lodash.default.keys(type.enumValues).map(x => `'${x}'`).join(" | ")}`);
+    } else {
+      const fields = Object.values(type.fields);
+      const fieldsStr = fields.map(f => {
+        if (type.isExtending && schema[type.isExtending]?.fields?.[f.name]) return "";
+        let fieldTypeStr = f.type;
+        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 commentStr2 = f.comment ? `  /** ${f.comment} */` : "";
+        return [fieldStr, commentStr2].filter(x => x).join("\n");
+      }).filter(x => x).join("\n");
+      const commentStr = type.comment ? `/** ${type.comment} */
+` : "";
+      definitions.push(`
+${commentStr}export class ${type.name}${type.isExtending ? ` extends ${type.isExtending}` : ""} {
+${fieldsStr}
+}`.trim());
+    }
+  }
+  return definitions.join("\n\n");
 }
 function getWhereFields(schema, type) {
   const result = [];

package/integrations/node.mjs

@@ -160,7 +160,40 @@ export interface RadsDb {
   `.trim();
 }
 export function getEntityTypesStrFromSchema(schema) {
-  return "";
+  const definitions = [];
+  for (const key in schema) {
+    const type = schema[key];
+    if (!type.fields) {
+      definitions.push(
+        `export type ${type.name} = ${_.keys(type.enumValues).map((x) => `'${x}'`).join(" | ")}`
+      );
+    } else {
+      const fields = Object.values(type.fields);
+      const fieldsStr = fields.map((f) => {
+        if (type.isExtending && schema[type.isExtending]?.fields?.[f.name])
+          return "";
+        let fieldTypeStr = f.type;
+        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 commentStr2 = f.comment ? `  /** ${f.comment} */` : "";
+        return [fieldStr, commentStr2].filter((x) => x).join("\n");
+      }).filter((x) => x).join("\n");
+      const commentStr = type.comment ? `/** ${type.comment} */
+` : "";
+      definitions.push(
+        `
+${commentStr}export class ${type.name}${type.isExtending ? ` extends ${type.isExtending}` : ""} {
+${fieldsStr}
+}`.trim()
+      );
+    }
+  }
+  return definitions.join("\n\n");
 }
 function getWhereFields(schema, type) {
   const result = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rads-db",
-  "version": "3.0.32",
+  "version": "3.0.34",
   "files": [
     "dist",
     "drivers",