@drax/crud-back 1.4.0 → 2.0.0

package/dist/builders/CrudSchemaBuilder.js

@@ -1,15 +1,53 @@
-import z from 'zod';
+import { z } from 'zod';
 import { IdParamSchema, DeleteBodyResponseSchema, PaginateQuerySchema, PaginateBodyResponseSchema, FindQuerySchema, SearchQuerySchema, FindByParamSchema, ErrorBodyResponseSchema, ValidationErrorBodyResponseSchema, ExportBodyResponseSchema, GroupByQuerySchema } from '../index.js';
 export class CrudSchemaBuilder {
     constructor(entitySchema, entityCreateSchema, entityUpdateSchema, entityName, target = 'openapi-3.0', tags = []) {
         this.target = 'openapi-3.0'; //"jsonSchema7" | "jsonSchema2019-09" | "openapi-3.0" | "openAi"
-        this.entitySchema = entitySchema;
+        this.entitySchema = this.schemaAdapter(entitySchema);
         this.entityCreateSchema = entityCreateSchema;
         this.entityUpdateSchema = entityUpdateSchema;
         this.entityName = entityName;
         this.tags = tags;
         this.target = target;
     }
+    getTypeName(field) {
+        // Zod v4 suele tener constructor.name útil en runtime
+        return field?.constructor?.name;
+    }
+    fieldAdapter(field) {
+        const f = field;
+        const typeName = this.getTypeName(f);
+        // 1) Desenrollar wrappers por "duck typing" (evita líos de tipos en Zod 4)
+        if (typeof f?.unwrap === 'function' && typeName === 'ZodOptional') {
+            return this.fieldAdapter(f.unwrap()).optional();
+        }
+        if (typeof f?.unwrap === 'function' && typeName === 'ZodNullable') {
+            return this.fieldAdapter(f.unwrap()).nullable();
+        }
+        // 2) Tipos compuestos
+        if (typeName === 'ZodArray' && f?.element) {
+            return z.array(this.fieldAdapter(f.element));
+        }
+        if (typeName === 'ZodObject' && f?.shape) {
+            return this.schemaAdapter(f);
+        }
+        // 3) Date -> ISO datetime (string)
+        if (typeName === 'ZodDate') {
+            return z.iso.datetime();
+        }
+        // 4) Fallback: dejar tal cual
+        return f;
+    }
+    schemaAdapter(entitySchema) {
+        const shape = entitySchema.shape;
+        const newShape = {};
+        for (const key of Object.keys(shape)) {
+            newShape[key] = this.fieldAdapter(shape[key]);
+        }
+        // Re-creamos el objeto con el nuevo shape.
+        // Tipamos como TObj para mantener la firma genérica del builder.
+        return z.object(newShape);
+    }
     get getTags() {
         if (this.tags.length > 0) {
             return { tags: this.tags };
@@ -29,9 +67,11 @@ export class CrudSchemaBuilder {
         return z.toJSONSchema(z.array(this.entitySchema), { target: this.target });
     }
     get jsonEntityGroupBySchema() {
-        return z.toJSONSchema(z.array(z.object({
+        return z.toJSONSchema(z.array(z
+            .object({
             count: z.number()
-        }).catchall(z.any())), { target: this.target });
+        })
+            .catchall(z.any())), { target: this.target });
     }
     get jsonExportBodyResponse() {
         return z.toJSONSchema(ExportBodyResponseSchema, { target: this.target });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.4.0",
+  "version": "2.0.0",
   "description": "Crud utils across modules",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -22,13 +22,13 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^1.1.1",
-    "@drax/common-share": "^1.0.0",
-    "@drax/identity-share": "^1.0.0",
-    "@drax/media-back": "^1.4.0",
+    "@drax/common-back": "^2.0.0",
+    "@drax/common-share": "^2.0.0",
+    "@drax/identity-share": "^2.0.0",
+    "@drax/media-back": "^2.0.0",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/merge": "^9.0.4",
-    "mongoose": "^8.21.0",
+    "mongoose": "^8.23.0",
     "mongoose-lean-virtuals": "^1.1.0",
     "mongoose-paginate-v2": "^1.8.3"
   },
@@ -38,13 +38,13 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@types/node": "^20.12.10",
+    "@types/node": "^25.2.3",
     "copyfiles": "^2.4.1",
     "mongoose-paginate-v2": "^1.8.3",
     "nodemon": "^3.1.0",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.10",
-    "typescript": "^5.6.2"
+    "typescript": "^5.9.3"
   },
-  "gitHead": "b957d2b908e730535cf9fb628f0c57e20c007d0f"
+  "gitHead": "2713061af9f137c81afe01e36350f6a10dd0ad1d"
 }

package/src/builders/CrudSchemaBuilder.ts

@@ -1,4 +1,4 @@
-import z from 'zod';
+import { z, type ZodTypeAny } from 'zod';
 
 import {
   IdParamSchema,
@@ -14,7 +14,11 @@ import {
   GroupByQuerySchema
 } from '../index.js';
 
-export class CrudSchemaBuilder<T extends z.ZodObject<z.ZodRawShape>, TCreate extends z.ZodObject<z.ZodRawShape>, TUpdate extends z.ZodObject<z.ZodRawShape>> {
+export class CrudSchemaBuilder<
+  T extends z.ZodObject<z.ZodRawShape>,
+  TCreate extends z.ZodObject<z.ZodRawShape>,
+  TUpdate extends z.ZodObject<z.ZodRawShape>
+> {
   private entitySchema: T;
   private entityCreateSchema: TCreate;
   private entityUpdateSchema: TUpdate;
@@ -23,94 +27,150 @@ export class CrudSchemaBuilder<T extends z.ZodObject<z.ZodRawShape>, TCreate ext
   private target: string = 'openapi-3.0'; //"jsonSchema7" | "jsonSchema2019-09" | "openapi-3.0" | "openAi"
 
   constructor(entitySchema: T, entityCreateSchema: TCreate, entityUpdateSchema: TUpdate, entityName: string, target:string = 'openapi-3.0', tags: string[] = []) {
-    this.entitySchema = entitySchema;
+    this.entitySchema = this.schemaAdapter(entitySchema);
     this.entityCreateSchema = entityCreateSchema;
     this.entityUpdateSchema = entityUpdateSchema;
     this.entityName = entityName;
     this.tags = tags
-    this.target = target
+    this.target = target;
   }
 
-  get getTags(){
-    if(this.tags.length > 0){
-      return {tags: this.tags}
+  private getTypeName(field: any): string | undefined {
+    // Zod v4 suele tener constructor.name útil en runtime
+    return field?.constructor?.name;
+  }
+
+  fieldAdapter(field: unknown): ZodTypeAny {
+    const f: any = field;
+
+    const typeName = this.getTypeName(f);
+
+    // 1) Desenrollar wrappers por "duck typing" (evita líos de tipos en Zod 4)
+    if (typeof f?.unwrap === 'function' && typeName === 'ZodOptional') {
+      return this.fieldAdapter(f.unwrap()).optional();
+    }
+
+    if (typeof f?.unwrap === 'function' && typeName === 'ZodNullable') {
+      return this.fieldAdapter(f.unwrap()).nullable();
+    }
+
+    // 2) Tipos compuestos
+    if (typeName === 'ZodArray' && f?.element) {
+      return z.array(this.fieldAdapter(f.element));
+    }
+
+    if (typeName === 'ZodObject' && f?.shape) {
+      return this.schemaAdapter(f);
+    }
+
+    // 3) Date -> ISO datetime (string)
+    if (typeName === 'ZodDate') {
+      return z.iso.datetime();
     }
-    return []
+
+    // 4) Fallback: dejar tal cual
+    return f as ZodTypeAny;
   }
 
-  get jsonEntityCreateSchema(){
-    return z.toJSONSchema(this.entityCreateSchema, {target: this.target})
+  schemaAdapter<TObj extends z.ZodObject<z.ZodRawShape>>(entitySchema: TObj): TObj {
+    const shape = (entitySchema as any).shape as Record<string, unknown>;
+    const newShape: Record<string, ZodTypeAny> = {};
+
+    for (const key of Object.keys(shape)) {
+      newShape[key] = this.fieldAdapter(shape[key]);
+    }
+
+    // Re-creamos el objeto con el nuevo shape.
+    // Tipamos como TObj para mantener la firma genérica del builder.
+    return z.object(newShape) as unknown as TObj;
   }
 
-  get jsonEntityUpdateSchema(){
-    return z.toJSONSchema(this.entityUpdateSchema, {target: this.target})
+  get getTags() {
+    if (this.tags.length > 0) {
+      return { tags: this.tags };
+    }
+    return [];
+  }
+
+  get jsonEntityCreateSchema() {
+    return z.toJSONSchema(this.entityCreateSchema, { target: this.target });
+  }
+
+  get jsonEntityUpdateSchema() {
+    return z.toJSONSchema(this.entityUpdateSchema, { target: this.target });
   }
 
   get jsonEntitySchema() {
-    return z.toJSONSchema(this.entitySchema, {target: this.target})
+    return z.toJSONSchema(this.entitySchema, { target: this.target });
   }
 
   get jsonEntityArraySchema() {
-    return z.toJSONSchema(z.array(this.entitySchema), {target: this.target})
+    return z.toJSONSchema(z.array(this.entitySchema), { target: this.target });
   }
 
   get jsonEntityGroupBySchema() {
     return z.toJSONSchema(
       z.array(
-        z.object({
-          count: z.number()
-        }).catchall(z.any())
+        z
+          .object({
+            count: z.number()
+          })
+          .catchall(z.any())
       ),
-      {target: this.target}
-    )
+      { target: this.target }
+    );
   }
 
   get jsonExportBodyResponse() {
-    return z.toJSONSchema(ExportBodyResponseSchema, {target: this.target})
+    return z.toJSONSchema(ExportBodyResponseSchema, { target: this.target });
   }
 
   get jsonErrorBodyResponse() {
-    return z.toJSONSchema(ErrorBodyResponseSchema, {target: this.target})
+    return z.toJSONSchema(ErrorBodyResponseSchema, { target: this.target });
   }
 
   get jsonValidationErrorBodyResponse() {
-    return z.toJSONSchema(ValidationErrorBodyResponseSchema, {target: this.target})
+    return z.toJSONSchema(ValidationErrorBodyResponseSchema, { target: this.target });
   }
 
-  get jsonFindQuerySchema(){
-    return z.toJSONSchema(FindQuerySchema, {target: this.target})
+  get jsonFindQuerySchema() {
+    return z.toJSONSchema(FindQuerySchema, { target: this.target });
   }
 
-  get jsonGroupByQuerySchema(){
-    return z.toJSONSchema(GroupByQuerySchema, {target: this.target})
+  get jsonGroupByQuerySchema() {
+    return z.toJSONSchema(GroupByQuerySchema, { target: this.target });
   }
 
-  get jsonSearchQuerySchema(){
-    return z.toJSONSchema(SearchQuerySchema, {target: this.target})
+  get jsonSearchQuerySchema() {
+    return z.toJSONSchema(SearchQuerySchema, { target: this.target });
   }
 
-  get jsonPaginateQuerySchema(){
-    return z.toJSONSchema(PaginateQuerySchema, {target: this.target})
+  get jsonPaginateQuerySchema() {
+    return z.toJSONSchema(PaginateQuerySchema, { target: this.target });
   }
 
-  get jsonDeleteBodyResponseSchema(){
-    return z.toJSONSchema(DeleteBodyResponseSchema, {target: this.target})
+  get jsonDeleteBodyResponseSchema() {
+    return z.toJSONSchema(DeleteBodyResponseSchema, { target: this.target });
   }
 
-  get jsonFindByParamSchema(){
-    return z.toJSONSchema(FindByParamSchema, {target: this.target})
+  get jsonFindByParamSchema() {
+    return z.toJSONSchema(FindByParamSchema, { target: this.target });
   }
 
-  get jsonPaginateBodyResponseSchema(){
-    return z.toJSONSchema(PaginateBodyResponseSchema.extend({
-      items: z.array(this.entitySchema)
-    }), {target: this.target})
+  get jsonPaginateBodyResponseSchema() {
+    return z.toJSONSchema(
+      PaginateBodyResponseSchema.extend({
+        items: z.array(this.entitySchema)
+      }),
+      { target: this.target }
+    );
   }
 
-  get jsonIdParamSchema(){
-    return z.toJSONSchema(IdParamSchema, {target: this.target})
+  get jsonIdParamSchema() {
+    return z.toJSONSchema(IdParamSchema, { target: this.target });
   }
 
+
   /**
    * Get JSON schema for export
    */