rads-db 0.1.28 → 0.1.31

package/dist/index.cjs

@@ -17,10 +17,25 @@ function generateValidators(schema) {
   }
   const result = {};
   for (const key in zodSchemas) {
-    result[key] = (value) => zodSchemas[key].parse(value);
+    result[key] = (value) => {
+      value = zodSchemas[key].parse(value);
+      fillDefaultValues(schema, key, value);
+      return value;
+    };
   }
   return result;
 }
+function fillDefaultValues(schema, typeName, value) {
+  const type = schema[typeName];
+  if (!type)
+    return;
+  for (const fName in type.fields) {
+    const field = type.fields[fName];
+    if (field.defaultValueCopyFrom) {
+      value[fName] = ___default.cloneDeep(value[field.defaultValueCopyFrom]);
+    }
+  }
+}
 function getZodSchema(zodSchemas, schema, key) {
   if (zodSchemas[key])
     return zodSchemas[key];
@@ -32,7 +47,8 @@ function getZodSchema(zodSchemas, schema, key) {
   const objectSchema = {};
   for (const fieldName in type.fields) {
     const shouldBeLazy = type.fields[fieldName].type === type.name;
-    objectSchema[fieldName] = getFieldZodSchema(zodSchemas, schema, type.fields[fieldName], shouldBeLazy);
+    const f = type.fields[fieldName];
+    objectSchema[fieldName] = getFieldZodSchema(zodSchemas, schema, f, shouldBeLazy);
   }
   return zod.z.object(objectSchema);
 }
@@ -44,6 +60,8 @@ function getFieldZodSchema(zodSchemas, schema, field, shouldBeLazy) {
     fieldSchema = fieldSchema.optional();
   if (field.defaultValue !== void 0)
     fieldSchema = fieldSchema.default(field.defaultValue);
+  if (field.defaultValueCopyFrom !== void 0)
+    fieldSchema = fieldSchema.optional();
   return fieldSchema;
 }
 function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
@@ -65,8 +83,9 @@ function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
   if (schema[field.type]) {
     const getSchema = () => {
       let zodSchema = getZodSchema(zodSchemas, schema, field.type);
-      if (schema[field.type].decorators.entity)
+      if (schema[field.type].decorators.entity) {
         zodSchema = zodSchema.deepPartial().required({ id: true });
+      }
       return zodSchema;
     };
     return shouldBeLazy ? zod.z.lazy(getSchema) : getSchema();

package/dist/index.d.ts

@@ -113,6 +113,7 @@ interface FieldDefinition {
     name: string;
     type: string;
     defaultValue?: any;
+    defaultValueCopyFrom?: string;
     isRequired?: boolean;
     isArray?: boolean;
     comment?: string;
@@ -168,7 +169,7 @@ interface RadsRequestContext {
 declare function entity(meta?: EntityDecoratorArgs): (classConstructor: Function, _ctx?: ClassDecoratorContext<any>) => void;
 declare function field(meta?: FieldDecoratorArgs): (a: any, b?: ClassFieldDecoratorContext) => void;
 declare function precomputed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassFieldDecoratorContext | ClassDecoratorContext) => void;
-declare function computed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassFieldDecoratorContext) => void;
+declare function computed(meta?: ComputedDecoratorArgs): (a: any, b?: ClassFieldDecoratorContext | ClassDecoratorContext) => void;
 
 declare function createRads(args?: CreateRadsArgs): RadsDb;
 declare function getRestRoutes(db: RadsDb, prefix?: string): Record<string, Record<string, Function>>;

package/dist/index.mjs

@@ -11,10 +11,25 @@ function generateValidators(schema) {
   }
   const result = {};
   for (const key in zodSchemas) {
-    result[key] = (value) => zodSchemas[key].parse(value);
+    result[key] = (value) => {
+      value = zodSchemas[key].parse(value);
+      fillDefaultValues(schema, key, value);
+      return value;
+    };
   }
   return result;
 }
+function fillDefaultValues(schema, typeName, value) {
+  const type = schema[typeName];
+  if (!type)
+    return;
+  for (const fName in type.fields) {
+    const field = type.fields[fName];
+    if (field.defaultValueCopyFrom) {
+      value[fName] = _.cloneDeep(value[field.defaultValueCopyFrom]);
+    }
+  }
+}
 function getZodSchema(zodSchemas, schema, key) {
   if (zodSchemas[key])
     return zodSchemas[key];
@@ -26,7 +41,8 @@ function getZodSchema(zodSchemas, schema, key) {
   const objectSchema = {};
   for (const fieldName in type.fields) {
     const shouldBeLazy = type.fields[fieldName].type === type.name;
-    objectSchema[fieldName] = getFieldZodSchema(zodSchemas, schema, type.fields[fieldName], shouldBeLazy);
+    const f = type.fields[fieldName];
+    objectSchema[fieldName] = getFieldZodSchema(zodSchemas, schema, f, shouldBeLazy);
   }
   return z.object(objectSchema);
 }
@@ -38,6 +54,8 @@ function getFieldZodSchema(zodSchemas, schema, field, shouldBeLazy) {
     fieldSchema = fieldSchema.optional();
   if (field.defaultValue !== void 0)
     fieldSchema = fieldSchema.default(field.defaultValue);
+  if (field.defaultValueCopyFrom !== void 0)
+    fieldSchema = fieldSchema.optional();
   return fieldSchema;
 }
 function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
@@ -59,8 +77,9 @@ function getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy) {
   if (schema[field.type]) {
     const getSchema = () => {
       let zodSchema = getZodSchema(zodSchemas, schema, field.type);
-      if (schema[field.type].decorators.entity)
+      if (schema[field.type].decorators.entity) {
         zodSchema = zodSchema.deepPartial().required({ id: true });
+      }
       return zodSchema;
     };
     return shouldBeLazy ? z.lazy(getSchema) : getSchema();

package/integrations/lib.cjs

@@ -8,6 +8,7 @@ var _typescript = require("typescript");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _pluralize = _interopRequireDefault(require("pluralize"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const supportedPrimitiveTypes = ["string", "number", "boolean"];
 function parseSchema(typescriptFiles) {
   const result = {};
   const typesMap = {};
@@ -60,6 +61,37 @@ function parseSchema(typescriptFiles) {
       throw new Error(`Entity "${key}" must have an id`);
     }
   }
+  fillComputedDefinitionsForType(result);
+  processThisReferenceDefaultValues(result, typesMap);
+  return result;
+}
+function processThisReferenceDefaultValues(result, typesMap) {
+  for (const key in result) {
+    const type = result[key];
+    const fields = type.fields;
+    if (!fields) continue;
+    for (const fName in fields) {
+      const field = fields[fName];
+      if (field.defaultValueCopyFrom) {
+        const sourceField = fields[field.defaultValueCopyFrom];
+        if (!sourceField) throw new Error(`Cannot find field ${key}.${field.defaultValueCopyFrom}"`);
+        if (field.type === "thisReference") {
+          field.type = sourceField.type;
+          field.isArray = sourceField.isArray;
+        }
+        verifyDefaultValueType(field.isArray || false, {
+          type: sourceField.type,
+          value: sourceField.defaultValue
+        }, field.type, supportedPrimitiveTypes, {
+          typesMap,
+          result,
+          sourceFile: typesMap[key]?.sourceFile
+        });
+      }
+    }
+  }
+}
+function fillComputedDefinitionsForType(result) {
   for (const key in result) {
     const type = result[key];
     const fields = type.fields;
@@ -71,7 +103,6 @@ function parseSchema(typescriptFiles) {
     if (computedFields.length) type.computedFields = computedFields;
     if (nestedTypeFields.length) type.nestedTypeFields = nestedTypeFields;
   }
-  return result;
 }
 function getOrder(f) {
   const decorator = f.decorators.computed || f.decorators.precomputed;
@@ -160,7 +191,15 @@ function getEnumValues(node, parentNode, ctx) {
 function parseClassMember(node, parentName, ctx) {
   const name = node.name.getText(ctx.sourceFile);
   const defaultValueDescription = parseLiteralNode(node.initializer, ctx);
-  const defaultValue = defaultValueDescription?.value;
+  let defaultValue;
+  let defaultValueCopyFrom;
+  if (defaultValueDescription) {
+    if (defaultValueDescription.type === "thisReference") {
+      defaultValueCopyFrom = defaultValueDescription.value;
+    } else {
+      defaultValue = defaultValueDescription.value;
+    }
+  }
   const isRequired = !node.questionToken;
   const comment = node.jsDoc?.[0]?.comment;
   const decorators = parseDecorators(node.modifiers, ctx);
@@ -171,6 +210,7 @@ function parseClassMember(node, parentName, ctx) {
   const result = {
     type,
     defaultValue,
+    defaultValueCopyFrom,
     name,
     isRequired,
     isArray,
@@ -180,9 +220,8 @@ function parseClassMember(node, parentName, ctx) {
   return result;
 }
 function parseFieldType(ctx, parentName, fieldName, node, defaultValueDescription) {
-  const supportedPrimitiveTypes = ["string", "number", "boolean"];
   let isArray = false;
-  let nodeType = node.type;
+  let nodeType = node?.type;
   if (nodeType?.kind === _typescript.SyntaxKind.ArrayType) {
     isArray = true;
     nodeType = nodeType.elementType;
@@ -211,11 +250,11 @@ function parseFieldType(ctx, parentName, fieldName, node, defaultValueDescriptio
     const subType = type.slice(7, -1);
     if (!ctx.typesMap[subType]) throw new Error(`Unexpected property type: '${type}'`);
   } else {
-    if (!supportedPrimitiveTypes.includes(type) && !ctx.typesMap[type]) {
+    if (!supportedPrimitiveTypes.includes(type) && !ctx.typesMap[type] && type !== "thisReference") {
       throw new Error(`Unexpected property type: '${type}'`);
     }
   }
-  if (defaultValueDescription) {
+  if (defaultValueDescription && defaultValueDescription.type !== "thisReference") {
     verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, ctx);
   }
   return {
@@ -223,13 +262,13 @@ function parseFieldType(ctx, parentName, fieldName, node, defaultValueDescriptio
     type
   };
 }
-function verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, ctx) {
+function verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes2, ctx) {
   if (isArray) {
     if (defaultValueDescription.type !== "array") {
       throw new Error(`Default value type is different from field type: '${type}'`);
     }
   } else {
-    if (supportedPrimitiveTypes.includes(type) && defaultValueDescription.type !== type) {
+    if (supportedPrimitiveTypes2.includes(type) && defaultValueDescription.type !== type) {
       throw new Error(`Default value type is different from field type: '${type}'`);
     }
     const enumValues = ctx.result[type]?.enumValues;
@@ -291,6 +330,12 @@ function parseLiteralNode(expr, ctx) {
     type: "array",
     value: []
   };
+  if (expr.kind === _typescript.SyntaxKind.PropertyAccessExpression && expr.expression.kind === _typescript.SyntaxKind.ThisKeyword) {
+    return {
+      type: "thisReference",
+      value: expr.name?.text
+    };
+  }
   throw new Error(`Unexpected property expression: "${expr.getText(ctx.sourceFile)}"`);
 }
 function parseObjectLiteral(arg, ctx) {

package/integrations/lib.mjs

@@ -1,6 +1,7 @@
 import { ScriptTarget, SyntaxKind, createSourceFile } from "typescript";
 import _ from "lodash";
 import pluralize from "pluralize";
+const supportedPrimitiveTypes = ["string", "number", "boolean"];
 export function parseSchema(typescriptFiles) {
   const result = {};
   const typesMap = {};
@@ -40,6 +41,38 @@ export function parseSchema(typescriptFiles) {
       throw new Error(`Entity "${key}" must have an id`);
     }
   }
+  fillComputedDefinitionsForType(result);
+  processThisReferenceDefaultValues(result, typesMap);
+  return result;
+}
+function processThisReferenceDefaultValues(result, typesMap) {
+  for (const key in result) {
+    const type = result[key];
+    const fields = type.fields;
+    if (!fields)
+      continue;
+    for (const fName in fields) {
+      const field = fields[fName];
+      if (field.defaultValueCopyFrom) {
+        const sourceField = fields[field.defaultValueCopyFrom];
+        if (!sourceField)
+          throw new Error(`Cannot find field ${key}.${field.defaultValueCopyFrom}"`);
+        if (field.type === "thisReference") {
+          field.type = sourceField.type;
+          field.isArray = sourceField.isArray;
+        }
+        verifyDefaultValueType(
+          field.isArray || false,
+          { type: sourceField.type, value: sourceField.defaultValue },
+          field.type,
+          supportedPrimitiveTypes,
+          { typesMap, result, sourceFile: typesMap[key]?.sourceFile }
+        );
+      }
+    }
+  }
+}
+function fillComputedDefinitionsForType(result) {
   for (const key in result) {
     const type = result[key];
     const fields = type.fields;
@@ -55,7 +88,6 @@ export function parseSchema(typescriptFiles) {
     if (nestedTypeFields.length)
       type.nestedTypeFields = nestedTypeFields;
   }
-  return result;
 }
 function getOrder(f) {
   const decorator = f.decorators.computed || f.decorators.precomputed;
@@ -137,20 +169,27 @@ function getEnumValues(node, parentNode, ctx) {
 function parseClassMember(node, parentName, ctx) {
   const name = node.name.getText(ctx.sourceFile);
   const defaultValueDescription = parseLiteralNode(node.initializer, ctx);
-  const defaultValue = defaultValueDescription?.value;
+  let defaultValue;
+  let defaultValueCopyFrom;
+  if (defaultValueDescription) {
+    if (defaultValueDescription.type === "thisReference") {
+      defaultValueCopyFrom = defaultValueDescription.value;
+    } else {
+      defaultValue = defaultValueDescription.value;
+    }
+  }
   const isRequired = !node.questionToken;
   const comment = node.jsDoc?.[0]?.comment;
   const decorators = parseDecorators(node.modifiers, ctx);
   const { isArray, type } = parseFieldType(ctx, parentName, name, node, defaultValueDescription);
-  const result = { type, defaultValue, name, isRequired, isArray, comment };
+  const result = { type, defaultValue, defaultValueCopyFrom, name, isRequired, isArray, comment };
   if (!_.isEmpty(decorators))
     result.decorators = decorators;
   return result;
 }
 function parseFieldType(ctx, parentName, fieldName, node, defaultValueDescription) {
-  const supportedPrimitiveTypes = ["string", "number", "boolean"];
   let isArray = false;
-  let nodeType = node.type;
+  let nodeType = node?.type;
   if (nodeType?.kind === SyntaxKind.ArrayType) {
     isArray = true;
     nodeType = nodeType.elementType;
@@ -178,22 +217,22 @@ function parseFieldType(ctx, parentName, fieldName, node, defaultValueDescriptio
     if (!ctx.typesMap[subType])
       throw new Error(`Unexpected property type: '${type}'`);
   } else {
-    if (!supportedPrimitiveTypes.includes(type) && !ctx.typesMap[type]) {
+    if (!supportedPrimitiveTypes.includes(type) && !ctx.typesMap[type] && type !== "thisReference") {
       throw new Error(`Unexpected property type: '${type}'`);
     }
   }
-  if (defaultValueDescription) {
+  if (defaultValueDescription && defaultValueDescription.type !== "thisReference") {
     verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, ctx);
   }
   return { isArray, type };
 }
-function verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, ctx) {
+function verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes2, ctx) {
   if (isArray) {
     if (defaultValueDescription.type !== "array") {
       throw new Error(`Default value type is different from field type: '${type}'`);
     }
   } else {
-    if (supportedPrimitiveTypes.includes(type) && defaultValueDescription.type !== type) {
+    if (supportedPrimitiveTypes2.includes(type) && defaultValueDescription.type !== type) {
       throw new Error(`Default value type is different from field type: '${type}'`);
     }
     const enumValues = ctx.result[type]?.enumValues;
@@ -242,6 +281,9 @@ function parseLiteralNode(expr, ctx) {
     return { type: "object", value: parseObjectLiteral(expr, ctx) };
   if (expr.kind === SyntaxKind.ArrayLiteralExpression)
     return { type: "array", value: [] };
+  if (expr.kind === SyntaxKind.PropertyAccessExpression && expr.expression.kind === SyntaxKind.ThisKeyword) {
+    return { type: "thisReference", value: expr.name?.text };
+  }
   throw new Error(`Unexpected property expression: "${expr.getText(ctx.sourceFile)}"`);
 }
 function parseObjectLiteral(arg, ctx) {

package/package.json

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