@drax/crud-back 0.51.0 → 1.1.0

package/dist/builders/CrudSchemaBuilder.js

@@ -1,9 +1,8 @@
 import z from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
 import { IdParamSchema, DeleteBodyResponseSchema, PaginateQuerySchema, PaginateBodyResponseSchema, FindQuerySchema, SearchQuerySchema, FindByParamSchema, ErrorBodyResponseSchema, ValidationErrorBodyResponseSchema, ExportBodyResponseSchema, GroupByQuerySchema } from '../index.js';
 export class CrudSchemaBuilder {
-    constructor(entitySchema, entityCreateSchema, entityUpdateSchema, entityName, target = 'openApi3', tags = []) {
-        this.target = 'openApi3'; //"jsonSchema7" | "jsonSchema2019-09" | "openApi3" | "openAi"
+    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.entityCreateSchema = entityCreateSchema;
         this.entityUpdateSchema = entityUpdateSchema;
@@ -18,56 +17,56 @@ export class CrudSchemaBuilder {
         return [];
     }
     get jsonEntityCreateSchema() {
-        return zodToJsonSchema(this.entityCreateSchema, { target: this.target });
+        return z.toJSONSchema(this.entityCreateSchema, { target: this.target });
     }
     get jsonEntityUpdateSchema() {
-        return zodToJsonSchema(this.entityUpdateSchema, { target: this.target });
+        return z.toJSONSchema(this.entityUpdateSchema, { target: this.target });
     }
     get jsonEntitySchema() {
-        return zodToJsonSchema(this.entitySchema, { target: this.target });
+        return z.toJSONSchema(this.entitySchema, { target: this.target });
     }
     get jsonEntityArraySchema() {
-        return zodToJsonSchema(z.array(this.entitySchema), { target: this.target });
+        return z.toJSONSchema(z.array(this.entitySchema), { target: this.target });
     }
     get jsonEntityGroupBySchema() {
-        return zodToJsonSchema(z.array(z.object({
+        return z.toJSONSchema(z.array(z.object({
             count: z.number()
         }).catchall(z.any())), { target: this.target });
     }
     get jsonExportBodyResponse() {
-        return zodToJsonSchema(ExportBodyResponseSchema, { target: this.target });
+        return z.toJSONSchema(ExportBodyResponseSchema, { target: this.target });
     }
     get jsonErrorBodyResponse() {
-        return zodToJsonSchema(ErrorBodyResponseSchema, { target: this.target });
+        return z.toJSONSchema(ErrorBodyResponseSchema, { target: this.target });
     }
     get jsonValidationErrorBodyResponse() {
-        return zodToJsonSchema(ValidationErrorBodyResponseSchema, { target: this.target });
+        return z.toJSONSchema(ValidationErrorBodyResponseSchema, { target: this.target });
     }
     get jsonFindQuerySchema() {
-        return zodToJsonSchema(FindQuerySchema, { target: this.target });
+        return z.toJSONSchema(FindQuerySchema, { target: this.target });
     }
     get jsonGroupByQuerySchema() {
-        return zodToJsonSchema(GroupByQuerySchema, { target: this.target });
+        return z.toJSONSchema(GroupByQuerySchema, { target: this.target });
     }
     get jsonSearchQuerySchema() {
-        return zodToJsonSchema(SearchQuerySchema, { target: this.target });
+        return z.toJSONSchema(SearchQuerySchema, { target: this.target });
     }
     get jsonPaginateQuerySchema() {
-        return zodToJsonSchema(PaginateQuerySchema, { target: this.target });
+        return z.toJSONSchema(PaginateQuerySchema, { target: this.target });
     }
     get jsonDeleteBodyResponseSchema() {
-        return zodToJsonSchema(DeleteBodyResponseSchema, { target: this.target });
+        return z.toJSONSchema(DeleteBodyResponseSchema, { target: this.target });
     }
     get jsonFindByParamSchema() {
-        return zodToJsonSchema(FindByParamSchema, { target: this.target });
+        return z.toJSONSchema(FindByParamSchema, { target: this.target });
     }
     get jsonPaginateBodyResponseSchema() {
-        return zodToJsonSchema(PaginateBodyResponseSchema.extend({
+        return z.toJSONSchema(PaginateBodyResponseSchema.extend({
             items: z.array(this.entitySchema)
         }), { target: this.target });
     }
     get jsonIdParamSchema() {
-        return zodToJsonSchema(IdParamSchema, { target: this.target });
+        return z.toJSONSchema(IdParamSchema, { target: this.target });
     }
     /**
      * Get JSON schema for export
@@ -107,7 +106,7 @@ export class CrudSchemaBuilder {
     get findByIdsSchema() {
         return {
             ...(this.getTags),
-            params: zodToJsonSchema(z.object({
+            params: z.toJSONSchema(z.object({
                 ids: z.string().regex(/^[^,]+(,[^,]+)*$/, "Debe ser una lista de valores separados por coma sin comas consecutivas")
             }), { target: this.target }),
             response: {
@@ -283,7 +282,7 @@ export class CrudSchemaBuilder {
         return {
             ...(this.getTags),
             params: this.jsonIdParamSchema,
-            body: zodToJsonSchema(this.entityUpdateSchema.partial(), { target: this.target }),
+            body: z.toJSONSchema(this.entityUpdateSchema.partial(), { target: this.target }),
             response: {
                 200: this.jsonEntitySchema,
                 401: this.jsonErrorBodyResponse,

package/dist/controllers/AbstractFastifyController.js

@@ -178,6 +178,9 @@ class AbstractFastifyController extends CommonController {
     async preCreate(request, payload) {
         return payload;
     }
+    async postCreate(request, item) {
+        return item;
+    }
     async create(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Create);
@@ -186,6 +189,7 @@ class AbstractFastifyController extends CommonController {
             await this.preCreate(request, payload);
             let item = await this.service.create(payload);
             this.onCreated(request, item);
+            await this.postCreate(request, item);
             return item;
         }
         catch (e) {
@@ -195,6 +199,9 @@ class AbstractFastifyController extends CommonController {
     async preUpdate(request, payload) {
         return payload;
     }
+    async postUpdate(request, item) {
+        return item;
+    }
     async update(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Update);
@@ -221,6 +228,7 @@ class AbstractFastifyController extends CommonController {
                 throw new NotFoundError();
             }
             this.onUpdated(request, preItem, item);
+            await this.postUpdate(request, item);
             return item;
         }
         catch (e) {
@@ -230,6 +238,9 @@ class AbstractFastifyController extends CommonController {
     async preUpdatePartial(request, payload) {
         return payload;
     }
+    async postUpdatePartial(request, item) {
+        return item;
+    }
     async updatePartial(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Update);
@@ -256,6 +267,7 @@ class AbstractFastifyController extends CommonController {
                 throw new NotFoundError();
             }
             this.onUpdated(request, preItem, item);
+            await this.postUpdatePartial(request, item);
             return item;
         }
         catch (e) {
@@ -265,6 +277,9 @@ class AbstractFastifyController extends CommonController {
     async preDelete(request, item) {
         return item;
     }
+    async postDelete(request, item) {
+        return item;
+    }
     async delete(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Delete);
@@ -285,6 +300,7 @@ class AbstractFastifyController extends CommonController {
             await this.preDelete(request, item);
             await this.service.delete(id);
             this.onDeleted(request, item);
+            await this.postDelete(request, item);
             reply.send({
                 id: id,
                 message: 'Item deleted successfully',

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.51.0",
+  "version": "1.1.0",
   "description": "Crud utils across modules",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -22,10 +22,10 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.51.0",
-    "@drax/common-share": "^0.51.0",
-    "@drax/identity-share": "^0.51.0",
-    "@drax/media-back": "^0.51.0",
+    "@drax/common-back": "^1.0.0",
+    "@drax/common-share": "^1.0.0",
+    "@drax/identity-share": "^1.0.0",
+    "@drax/media-back": "^1.1.0",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/merge": "^9.0.4",
     "mongoose": "^8.21.0",
@@ -35,8 +35,7 @@
   "peerDependencies": {
     "dayjs": "^1.11.19",
     "mongoose-paginate-v2": "^1.8.3",
-    "zod": "^3.25.76",
-    "zod-to-json-schema": "3.24.6"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/node": "^20.12.10",
@@ -47,5 +46,5 @@
     "tsc-alias": "^1.8.10",
     "typescript": "^5.6.2"
   },
-  "gitHead": "a8fe4fe11637e3b899686b8dd8d658d62933ea5a"
+  "gitHead": "dbbb8bf014f02236b5a8597c592b0382372eb00f"
 }

package/src/builders/CrudSchemaBuilder.ts

@@ -1,6 +1,5 @@
 import z from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import type { Targets } from 'zod-to-json-schema';
+
 import {
   IdParamSchema,
   DeleteBodyResponseSchema,
@@ -21,9 +20,9 @@ export class CrudSchemaBuilder<T extends z.ZodObject<z.ZodRawShape>, TCreate ext
   private entityUpdateSchema: TUpdate;
   private entityName: string;
   private tags: string[];
-  private target: Targets = 'openApi3'; //"jsonSchema7" | "jsonSchema2019-09" | "openApi3" | "openAi"
+  private target: string = 'openapi-3.0'; //"jsonSchema7" | "jsonSchema2019-09" | "openapi-3.0" | "openAi"
 
-  constructor(entitySchema: T, entityCreateSchema: TCreate, entityUpdateSchema: TUpdate, entityName: string, target:Targets = 'openApi3', tags: string[] = []) {
+  constructor(entitySchema: T, entityCreateSchema: TCreate, entityUpdateSchema: TUpdate, entityName: string, target:string = 'openapi-3.0', tags: string[] = []) {
     this.entitySchema = entitySchema;
     this.entityCreateSchema = entityCreateSchema;
     this.entityUpdateSchema = entityUpdateSchema;
@@ -40,23 +39,23 @@ export class CrudSchemaBuilder<T extends z.ZodObject<z.ZodRawShape>, TCreate ext
   }
 
   get jsonEntityCreateSchema(){
-    return zodToJsonSchema(this.entityCreateSchema, {target: this.target})
+    return z.toJSONSchema(this.entityCreateSchema, {target: this.target})
   }
 
   get jsonEntityUpdateSchema(){
-    return zodToJsonSchema(this.entityUpdateSchema, {target: this.target})
+    return z.toJSONSchema(this.entityUpdateSchema, {target: this.target})
   }
 
   get jsonEntitySchema() {
-    return zodToJsonSchema(this.entitySchema, {target: this.target})
+    return z.toJSONSchema(this.entitySchema, {target: this.target})
   }
 
   get jsonEntityArraySchema() {
-    return zodToJsonSchema(z.array(this.entitySchema), {target: this.target})
+    return z.toJSONSchema(z.array(this.entitySchema), {target: this.target})
   }
 
   get jsonEntityGroupBySchema() {
-    return zodToJsonSchema(
+    return z.toJSONSchema(
       z.array(
         z.object({
           count: z.number()
@@ -67,49 +66,49 @@ export class CrudSchemaBuilder<T extends z.ZodObject<z.ZodRawShape>, TCreate ext
   }
 
   get jsonExportBodyResponse() {
-    return zodToJsonSchema(ExportBodyResponseSchema, {target: this.target})
+    return z.toJSONSchema(ExportBodyResponseSchema, {target: this.target})
   }
 
   get jsonErrorBodyResponse() {
-    return zodToJsonSchema(ErrorBodyResponseSchema, {target: this.target})
+    return z.toJSONSchema(ErrorBodyResponseSchema, {target: this.target})
   }
 
   get jsonValidationErrorBodyResponse() {
-    return zodToJsonSchema(ValidationErrorBodyResponseSchema, {target: this.target})
+    return z.toJSONSchema(ValidationErrorBodyResponseSchema, {target: this.target})
   }
 
   get jsonFindQuerySchema(){
-    return zodToJsonSchema(FindQuerySchema, {target: this.target})
+    return z.toJSONSchema(FindQuerySchema, {target: this.target})
   }
 
   get jsonGroupByQuerySchema(){
-    return zodToJsonSchema(GroupByQuerySchema, {target: this.target})
+    return z.toJSONSchema(GroupByQuerySchema, {target: this.target})
   }
 
   get jsonSearchQuerySchema(){
-    return zodToJsonSchema(SearchQuerySchema, {target: this.target})
+    return z.toJSONSchema(SearchQuerySchema, {target: this.target})
   }
 
   get jsonPaginateQuerySchema(){
-    return zodToJsonSchema(PaginateQuerySchema, {target: this.target})
+    return z.toJSONSchema(PaginateQuerySchema, {target: this.target})
   }
 
   get jsonDeleteBodyResponseSchema(){
-    return zodToJsonSchema(DeleteBodyResponseSchema, {target: this.target})
+    return z.toJSONSchema(DeleteBodyResponseSchema, {target: this.target})
   }
 
   get jsonFindByParamSchema(){
-    return zodToJsonSchema(FindByParamSchema, {target: this.target})
+    return z.toJSONSchema(FindByParamSchema, {target: this.target})
   }
 
   get jsonPaginateBodyResponseSchema(){
-    return zodToJsonSchema(PaginateBodyResponseSchema.extend({
+    return z.toJSONSchema(PaginateBodyResponseSchema.extend({
       items: z.array(this.entitySchema)
     }), {target: this.target})
   }
 
   get jsonIdParamSchema(){
-    return zodToJsonSchema(IdParamSchema, {target: this.target})
+    return z.toJSONSchema(IdParamSchema, {target: this.target})
   }
 
   /**
@@ -152,7 +151,7 @@ export class CrudSchemaBuilder<T extends z.ZodObject<z.ZodRawShape>, TCreate ext
   get findByIdsSchema() {
     return {
       ...(this.getTags),
-      params: zodToJsonSchema(z.object({
+      params: z.toJSONSchema(z.object({
         ids: z.string().regex(/^[^,]+(,[^,]+)*$/, "Debe ser una lista de valores separados por coma sin comas consecutivas")
       }), {target: this.target}),
       response: {
@@ -339,7 +338,7 @@ export class CrudSchemaBuilder<T extends z.ZodObject<z.ZodRawShape>, TCreate ext
     return {
       ...(this.getTags),
       params: this.jsonIdParamSchema,
-      body: zodToJsonSchema(this.entityUpdateSchema.partial(), {target: this.target}),
+      body: z.toJSONSchema(this.entityUpdateSchema.partial(), {target: this.target}),
       response: {
         200: this.jsonEntitySchema,
         401: this.jsonErrorBodyResponse,

package/src/controllers/AbstractFastifyController.ts

@@ -270,6 +270,10 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         return payload
     }
 
+    async postCreate(request: CustomRequest, item:T){
+        return item
+    }
+
     async create(request: CustomRequest, reply: FastifyReply) {
         try {
             request.rbac.assertPermission(this.permission.Create)
@@ -278,6 +282,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             await this.preCreate(request, payload as C)
             let item = await this.service.create(payload as C)
             this.onCreated(request, item)
+            await this.postCreate(request, item as T)
             return item
         } catch (e) {
             this.handleError(e, reply)
@@ -288,6 +293,10 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         return payload
     }
 
+    async postUpdate(request: CustomRequest, item:T){
+        return item
+    }
+
     async update(request: CustomRequest, reply: FastifyReply) {
         try {
             request.rbac.assertPermission(this.permission.Update)
@@ -323,6 +332,8 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
             this.onUpdated(request, preItem, item)
 
+            await this.postUpdate(request, item as T)
+
             return item
         } catch (e) {
             this.handleError(e, reply)
@@ -333,6 +344,10 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         return payload
     }
 
+    async postUpdatePartial(request: CustomRequest, item:T){
+        return item
+    }
+
     async updatePartial(request: CustomRequest, reply: FastifyReply) {
         try {
             request.rbac.assertPermission(this.permission.Update)
@@ -364,7 +379,11 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             if (!item) {
                 throw new NotFoundError()
             }
+
             this.onUpdated(request, preItem, item)
+
+            await this.postUpdatePartial(request, item as T)
+
             return item
         } catch (e) {
             this.handleError(e, reply)
@@ -375,6 +394,9 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         return item
     }
 
+    async postDelete(request: CustomRequest, item:T){
+        return item
+    }
 
     async delete(request: CustomRequest, reply: FastifyReply) {
         try {
@@ -400,10 +422,13 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             this.assertTenant(item, request.rbac)
 
             await this.preDelete(request, item)
+
             await this.service.delete(id)
 
             this.onDeleted(request, item)
 
+            await this.postDelete(request, item)
+
             reply.send({
                 id: id,
                 message: 'Item deleted successfully',