rads-db 0.1.13 → 0.1.14

package/dist/index.cjs

@@ -39,6 +39,8 @@ function getZodSchema(zodSchemas, schema, key) {
 }
 function getFieldZodSchema(zodSchemas, schema, field, shouldBeLazy) {
   let fieldSchema = getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy);
+  if (field.isArray)
+    fieldSchema = fieldSchema.array();
   if (!field.isRequired)
     fieldSchema = fieldSchema.optional();
   if (field.defaultValue !== void 0)

package/dist/index.d.ts

@@ -85,6 +85,7 @@ interface FieldDefinition {
     type: string;
     defaultValue?: any;
     isRequired?: boolean;
+    isArray?: boolean;
     comment?: string;
     decorators?: Record<string, Record<string, any>>;
 }

package/dist/index.mjs

@@ -32,6 +32,8 @@ function getZodSchema(zodSchemas, schema, key) {
 }
 function getFieldZodSchema(zodSchemas, schema, field, shouldBeLazy) {
   let fieldSchema = getFieldZodSchemaBase(zodSchemas, schema, field, shouldBeLazy);
+  if (field.isArray)
+    fieldSchema = fieldSchema.array();
   if (!field.isRequired)
     fieldSchema = fieldSchema.optional();
   if (field.defaultValue !== void 0)

package/integrations/lib.cjs

@@ -130,26 +130,41 @@ function parseClassMember(node, ctx) {
   const defaultValue = defaultValueDescription?.value;
   const isRequired = !!node.exclamationToken || !!defaultValueDescription;
   const comment = node.jsDoc?.[0]?.comment;
-  const type = node.type?.getText(ctx.sourceFile) ?? defaultValueDescription?.type;
+  let type = node.type?.getText(ctx.sourceFile) ?? defaultValueDescription?.type;
+  let isArray = false;
+  if (type?.endsWith("[]")) {
+    type = type.slice(0, -2);
+    isArray = true;
+  }
   if (!type) throw new Error(`Cannot detect property type: '${node.getText(ctx.sourceFile)}'`);
   if (!supportedPrimitiveTypes.includes(type) && !ctx.typesMap[type]) throw new Error(`Unexpected property type: '${type}'`);
   if (defaultValueDescription) {
-    if (supportedPrimitiveTypes.includes(type) && defaultValueDescription.type !== type) {
-      throw new Error(`Default value type is different from field type: '${type}'`);
-    }
-    const enumValues = ctx.typesMap[type]?.enumValues;
-    if (enumValues && enumValues.includes(defaultValue)) {
-      throw new Error(`Default value type is different from field type: '${type}'`);
-    }
+    verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, ctx);
   }
   return {
     type,
     defaultValue,
     name,
     isRequired,
+    isArray,
     comment
   };
 }
+function verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, 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) {
+      throw new Error(`Default value type is different from field type: '${type}'`);
+    }
+    const enumValues = ctx.typesMap[type]?.enumValues;
+    if (enumValues && enumValues.includes(defaultValueDescription.value)) {
+      throw new Error(`Default value type is different from field type: '${type}'`);
+    }
+  }
+}
 function parseDecorator(decoratorNode, ctx) {
   const expr = decoratorNode.expression;
   if (expr.kind !== _typescript.SyntaxKind.CallExpression) throw new Error(`Unexpected decorator format: "${expr.getText(ctx.sourceFile)}"`);
@@ -189,6 +204,10 @@ function parseLiteralNode(expr, ctx) {
     type: "object",
     value: parseObjectLiteral(expr, ctx)
   };
+  if (expr.kind === _typescript.SyntaxKind.ArrayLiteralExpression) return {
+    type: "array",
+    value: []
+  };
   throw new Error(`Unexpected property expression: "${expr.getText(ctx.sourceFile)}"`);
 }
 function parseObjectLiteral(arg, ctx) {

package/integrations/lib.mjs

@@ -95,21 +95,35 @@ function parseClassMember(node, ctx) {
   const defaultValue = defaultValueDescription?.value;
   const isRequired = !!node.exclamationToken || !!defaultValueDescription;
   const comment = node.jsDoc?.[0]?.comment;
-  const type = node.type?.getText(ctx.sourceFile) ?? defaultValueDescription?.type;
+  let type = node.type?.getText(ctx.sourceFile) ?? defaultValueDescription?.type;
+  let isArray = false;
+  if (type?.endsWith("[]")) {
+    type = type.slice(0, -2);
+    isArray = true;
+  }
   if (!type)
     throw new Error(`Cannot detect property type: '${node.getText(ctx.sourceFile)}'`);
   if (!supportedPrimitiveTypes.includes(type) && !ctx.typesMap[type])
     throw new Error(`Unexpected property type: '${type}'`);
   if (defaultValueDescription) {
+    verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, ctx);
+  }
+  return { type, defaultValue, name, isRequired, isArray, comment };
+}
+function verifyDefaultValueType(isArray, defaultValueDescription, type, supportedPrimitiveTypes, 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) {
       throw new Error(`Default value type is different from field type: '${type}'`);
     }
     const enumValues = ctx.typesMap[type]?.enumValues;
-    if (enumValues && enumValues.includes(defaultValue)) {
+    if (enumValues && enumValues.includes(defaultValueDescription.value)) {
       throw new Error(`Default value type is different from field type: '${type}'`);
     }
   }
-  return { type, defaultValue, name, isRequired, comment };
 }
 function parseDecorator(decoratorNode, ctx) {
   const expr = decoratorNode.expression;
@@ -142,6 +156,8 @@ function parseLiteralNode(expr, ctx) {
     return { type: "number", value: Number.parseFloat(expr.text) };
   if (expr.kind === SyntaxKind.ObjectLiteralExpression)
     return { type: "object", value: parseObjectLiteral(expr, ctx) };
+  if (expr.kind === SyntaxKind.ArrayLiteralExpression)
+    return { type: "array", value: [] };
   throw new Error(`Unexpected property expression: "${expr.getText(ctx.sourceFile)}"`);
 }
 function parseObjectLiteral(arg, ctx) {

package/integrations/node.cjs

@@ -123,7 +123,7 @@ function getWhereFieldsFor(schema, type, fieldKey) {
   const fieldTypeName = field.type;
   let whereTypeName = fieldTypeName;
   const fieldType = schema[fieldTypeName];
-  const result = getWhereFieldsForInner(schema, type, fieldKey);
+  let result = getWhereFieldsForInner(schema, type, fieldKey);
   if (fieldType) {
     if (fieldType?.decorators?.entity) {
       whereTypeName = `{ id?: string, id_in?: string[] }`;
@@ -132,6 +132,11 @@ function getWhereFieldsFor(schema, type, fieldKey) {
   } else {
     result.unshift(`${name}_in?: ${whereTypeName}[]`);
   }
+  if (field.isArray) {
+    result = [];
+    result.unshift(`${name}_contains?: ${whereTypeName}`);
+    result.unshift(`${name}_isEmpty?: boolean`);
+  }
   if (!field.isRequired) {
     result.unshift(`${name}_isNull?: boolean`);
   }

package/integrations/node.mjs

@@ -124,7 +124,7 @@ function getWhereFieldsFor(schema, type, fieldKey) {
   const fieldTypeName = field.type;
   let whereTypeName = fieldTypeName;
   const fieldType = schema[fieldTypeName];
-  const result = getWhereFieldsForInner(schema, type, fieldKey);
+  let result = getWhereFieldsForInner(schema, type, fieldKey);
   if (fieldType) {
     if (fieldType?.decorators?.entity) {
       whereTypeName = `{ id?: string, id_in?: string[] }`;
@@ -134,6 +134,11 @@ function getWhereFieldsFor(schema, type, fieldKey) {
   } else {
     result.unshift(`${name}_in?: ${whereTypeName}[]`);
   }
+  if (field.isArray) {
+    result = [];
+    result.unshift(`${name}_contains?: ${whereTypeName}`);
+    result.unshift(`${name}_isEmpty?: boolean`);
+  }
   if (!field.isRequired) {
     result.unshift(`${name}_isNull?: boolean`);
   }

package/package.json

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