@klerick/json-api-nestjs 10.0.0-beta.8 → 10.0.0

package/src/lib/modules/mixin/swagger/method/post-one.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postOne = postOne;
 const swagger_1 = require("@nestjs/swagger");
-const zod_1 = require("zod");
 const utils_1 = require("../utils");
-const zod_2 = require("../../zod");
+const zod_1 = require("../../zod");
 const decorators_1 = require("../../decorators");
+const error_response_model_1 = require("../error-response-model");
 function postOne(controller, descriptor, entity, mapEntity, methodName) {
     const entityName = entity.name;
     const readOnlyProps = (0, decorators_1.getJsonApiReadOnlyFields)(entity);
@@ -16,7 +16,7 @@ function postOne(controller, descriptor, entity, mapEntity, methodName) {
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiBody)({
         description: `Json api schema for new "${entityName}" item`,
-        schema: zod_1.z.toJSONSchema((0, zod_2.zodPost)(mapEntity, readOnlyProps, immutableProps), utils_1.zodToJSONSchemaParams),
+        schema: (0, utils_1.zodToOpenApiSchema)((0, zod_1.zodPost)(mapEntity, readOnlyProps, immutableProps)),
         required: true,
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiResponse)({
@@ -27,12 +27,12 @@ function postOne(controller, descriptor, entity, mapEntity, methodName) {
     (0, swagger_1.ApiResponse)({
         status: 400,
         description: 'Wrong body parameters',
-        schema: utils_1.errorSchema,
+        schema: { $ref: (0, swagger_1.getSchemaPath)(error_response_model_1.JsonApiErrorResponseModel) },
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiResponse)({
         status: 422,
         description: 'Unprocessable data',
-        schema: utils_1.errorSchema,
+        schema: { $ref: (0, swagger_1.getSchemaPath)(error_response_model_1.JsonApiErrorResponseModel) },
     })(controller, methodName, descriptor);
 }
 //# sourceMappingURL=post-one.js.map

package/src/lib/modules/mixin/swagger/method/post-one.js.map

@@ -1 +1 @@
-{"version":3,"file":"post-one.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/method/post-one.ts"],"names":[],"mappings":";;AAmBA,0BA+CC;AAlED,6CAAqE;AACrE,6BAAwB;AAQxB,oCAIkB;AAClB,mCAAoC;AAEpC,iDAAuF;AAGvF,SAAgB,OAAO,CACrB,UAAqB,EACrB,UAA8B,EAC9B,MAAsB,EACtB,SAA0C,EAC1C,UAAkB;IAElB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;IAE/B,MAAM,aAAa,GAAG,IAAA,qCAAwB,EAC5C,MAAM,CAC4B,CAAC;IACrC,MAAM,cAAc,GAAG,IAAA,sCAAyB,EAC9C,MAAM,CAC6B,CAAC;IAEtC,IAAA,sBAAY,EAAC;QACX,OAAO,EAAE,4BAA4B,UAAU,GAAG;QAClD,WAAW,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,UAAU,EAAE;KAC5D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,iBAAO,EAAC;QACN,WAAW,EAAE,4BAA4B,UAAU,QAAQ;QAC3D,MAAM,EAAE,OAAC,CAAC,YAAY,CACpB,IAAA,aAAO,EAAC,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,EACjD,6BAAqB,CACY;QACnC,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,qBAAqB,UAAU,oBAAoB;QAChE,MAAM,EAAE,IAAA,0BAAkB,EAAC,MAAM,EAAE,SAAS,CAAC;KAC9C,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,uBAAuB;QACpC,MAAM,EAAE,mBAAW;KACpB,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,mBAAW;KACpB,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"post-one.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/method/post-one.ts"],"names":[],"mappings":";;AAmBA,0BA4CC;AA/DD,6CAKyB;AAIzB,oCAGkB;AAClB,mCAAoC;AAEpC,iDAAuF;AAEvF,kEAAoE;AAEpE,SAAgB,OAAO,CACrB,UAAqB,EACrB,UAA8B,EAC9B,MAAsB,EACtB,SAA0C,EAC1C,UAAkB;IAElB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;IAE/B,MAAM,aAAa,GAAG,IAAA,qCAAwB,EAC5C,MAAM,CAC4B,CAAC;IACrC,MAAM,cAAc,GAAG,IAAA,sCAAyB,EAC9C,MAAM,CAC6B,CAAC;IAEtC,IAAA,sBAAY,EAAC;QACX,OAAO,EAAE,4BAA4B,UAAU,GAAG;QAClD,WAAW,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,UAAU,EAAE;KAC5D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,iBAAO,EAAC;QACN,WAAW,EAAE,4BAA4B,UAAU,QAAQ;QAC3D,MAAM,EAAE,IAAA,0BAAkB,EAAC,IAAA,aAAO,EAAC,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;QAC7E,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,qBAAqB,UAAU,oBAAoB;QAChE,MAAM,EAAE,IAAA,0BAAkB,EAAC,MAAM,EAAE,SAAS,CAAC;KAC9C,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,uBAAuB;QACpC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,gDAAyB,CAAC,EAAE;KAC3D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,oBAAoB;QACjC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,gDAAyB,CAAC,EAAE;KAC3D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC"}

package/src/lib/modules/mixin/swagger/method/post-relationship.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postRelationship = postRelationship;
-const zod_1 = require("zod");
 const swagger_1 = require("@nestjs/swagger");
 const utils_1 = require("../utils");
-const zod_2 = require("../../zod");
+const zod_1 = require("../../zod");
 const types_1 = require("../../../../types");
+const error_response_model_1 = require("../error-response-model");
 function postRelationship(controller, descriptor, entity, mapEntity, methodName) {
     const entityName = entity.name;
     const { relations, primaryColumnType } = mapEntity.getParamMap(entity);
@@ -24,7 +24,7 @@ function postRelationship(controller, descriptor, entity, mapEntity, methodName)
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiBody)({
         description: `Json api schema for update "${entityName}" item`,
-        schema: zod_1.z.toJSONSchema(zod_2.zodPatchRelationship),
+        schema: (0, utils_1.zodToOpenApiSchema)(zod_1.zodPatchRelationship),
         required: true,
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiOperation)({
@@ -33,23 +33,23 @@ function postRelationship(controller, descriptor, entity, mapEntity, methodName)
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiResponse)({
         status: 200,
-        schema: utils_1.schemaTypeForRelation,
+        schema: utils_1.schemaTypeForRelationRef,
         description: `Item/s of relation for "${entityName}" has been created`,
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiResponse)({
         status: 400,
         description: 'Wrong url parameters',
-        schema: utils_1.errorSchema,
+        schema: { $ref: (0, swagger_1.getSchemaPath)(error_response_model_1.JsonApiErrorResponseModel) },
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiResponse)({
         status: 422,
         description: 'Incorrect type for relation',
-        schema: utils_1.errorSchema,
+        schema: { $ref: (0, swagger_1.getSchemaPath)(error_response_model_1.JsonApiErrorResponseModel) },
     })(controller, methodName, descriptor);
     (0, swagger_1.ApiResponse)({
         status: 404,
         description: 'Resource not found ',
-        schema: utils_1.errorSchema,
+        schema: { $ref: (0, swagger_1.getSchemaPath)(error_response_model_1.JsonApiErrorResponseModel) },
     })(controller, methodName, descriptor);
 }
 //# sourceMappingURL=post-relationship.js.map

package/src/lib/modules/mixin/swagger/method/post-relationship.js.map

@@ -1 +1 @@
-{"version":3,"file":"post-relationship.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/method/post-relationship.ts"],"names":[],"mappings":";;AAcA,4CA8DC;AA3ED,6BAAwB;AAKxB,6CAA+E;AAG/E,oCAA8D;AAC9D,mCAAiD;AACjD,6CAA8C;AAG9C,SAAgB,gBAAgB,CAC9B,UAAqB,EACrB,UAA8B,EAC9B,MAAsB,EACtB,SAA0C,EAC1C,UAAkB;IAElB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;IAE/B,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAEvE,IAAA,kBAAQ,EAAC;QACP,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,iBAAiB,KAAK,iBAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;QACnE,WAAW,EAAE,mBAAmB,UAAU,GAAG;KAC9C,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,kBAAQ,EAAC;QACP,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,SAAgB;QACtB,WAAW,EAAE,8BAA8B,UAAU,GAAG;KACzD,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,iBAAO,EAAC;QACN,WAAW,EAAE,+BAA+B,UAAU,QAAQ;QAC9D,MAAM,EAAE,OAAC,CAAC,YAAY,CAAC,0BAAoB,CAExB;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,sBAAY,EAAC;QACX,OAAO,EAAE,yCAAyC,UAAU,GAAG;QAC/D,WAAW,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,UAAU,EAAE;KAC5D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,6BAAqB;QAC7B,WAAW,EAAE,2BAA2B,UAAU,oBAAoB;KACvE,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,sBAAsB;QACnC,MAAM,EAAE,mBAAW;KACpB,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,mBAAW;KACpB,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,qBAAqB;QAClC,MAAM,EAAE,mBAAW;KACpB,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"post-relationship.js","sourceRoot":"","sources":["../../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/method/post-relationship.ts"],"names":[],"mappings":";;AAgBA,4CA4DC;AA3ED,6CAMyB;AAGzB,oCAAwE;AACxE,mCAAiD;AACjD,6CAA8C;AAE9C,kEAAoE;AAEpE,SAAgB,gBAAgB,CAC9B,UAAqB,EACrB,UAA8B,EAC9B,MAAsB,EACtB,SAA0C,EAC1C,UAAkB;IAElB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;IAE/B,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAEvE,IAAA,kBAAQ,EAAC;QACP,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,iBAAiB,KAAK,iBAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;QACnE,WAAW,EAAE,mBAAmB,UAAU,GAAG;KAC9C,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,kBAAQ,EAAC;QACP,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,SAAgB;QACtB,WAAW,EAAE,8BAA8B,UAAU,GAAG;KACzD,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,iBAAO,EAAC;QACN,WAAW,EAAE,+BAA+B,UAAU,QAAQ;QAC9D,MAAM,EAAE,IAAA,0BAAkB,EAAC,0BAAoB,CAAC;QAChD,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,sBAAY,EAAC;QACX,OAAO,EAAE,yCAAyC,UAAU,GAAG;QAC/D,WAAW,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,IAAI,UAAU,EAAE;KAC5D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,gCAAwB;QAChC,WAAW,EAAE,2BAA2B,UAAU,oBAAoB;KACvE,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,sBAAsB;QACnC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,gDAAyB,CAAC,EAAE;KAC3D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,6BAA6B;QAC1C,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,gDAAyB,CAAC,EAAE;KAC3D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAEvC,IAAA,qBAAW,EAAC;QACV,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,qBAAqB;QAClC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,uBAAa,EAAC,gDAAyB,CAAC,EAAE;KAC3D,CAAC,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AACzC,CAAC"}

package/src/lib/modules/mixin/swagger/open-api-types.d.ts

@@ -0,0 +1,18 @@
+import { OpenAPIObject } from '@nestjs/swagger';
+/**
+ * @nestjs/swagger exposes only `.`, `./plugin` and `./package.json` through its
+ * exports map, and its root barrel re-exports just `ApiTagOptions` and
+ * `OpenAPIObject` out of the OpenAPI spec interfaces. The schema types are
+ * therefore derived from `OpenAPIObject` rather than reached for through a deep
+ * import, which stops resolving the moment the package tightens its exports.
+ *
+ * `components.schemas` is typed as `Record<string, SchemaObject |
+ * ReferenceObject>`, and a reference is the only member carrying `$ref`, so the
+ * union splits cleanly.
+ */
+type SchemaOrReference = NonNullable<NonNullable<OpenAPIObject['components']>['schemas']>[string];
+export type ReferenceObject = Extract<SchemaOrReference, {
+    $ref: string;
+}>;
+export type SchemaObject = Exclude<SchemaOrReference, ReferenceObject>;
+export {};

package/src/lib/modules/mixin/swagger/open-api-types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=open-api-types.js.map

package/src/lib/modules/mixin/swagger/open-api-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"open-api-types.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/open-api-types.ts"],"names":[],"mappings":""}

package/src/lib/modules/mixin/swagger/swagger-bind.service.d.ts

@@ -6,4 +6,5 @@ export declare class SwaggerBindService<E extends object, IdKey extends string =
     private mapEntity;
     onModuleInit(): void;
     initSwagger(): void;
+    private processJsonApiResponseFrom;
 }

package/src/lib/modules/mixin/swagger/swagger-bind.service.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwaggerBindService = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
-const constants_1 = require("@nestjs/swagger/dist/constants");
 const swagger_1 = require("@nestjs/swagger");
+const swagger_2 = require("@nestjs/swagger");
 const core_1 = require("@nestjs/core");
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
-const constants_2 = require("@nestjs/common/constants");
-const constants_3 = require("../../../constants");
+const constants_1 = require("@nestjs/common/constants");
+const constants_2 = require("../../../constants");
 const helpers_1 = require("../helpers");
 const controllers_1 = require("../controllers");
 const filter_operand_model_1 = require("./filter-operand-model");
@@ -16,6 +16,8 @@ const utils_1 = require("./utils");
 const bindings_1 = require("../config/bindings");
 const method_1 = require("./method");
 const service_1 = require("../service");
+const error_response_model_1 = require("./error-response-model");
+const decorators_1 = require("../decorators");
 let SwaggerBindService = class SwaggerBindService {
     entity;
     discoveryService;
@@ -25,25 +27,27 @@ let SwaggerBindService = class SwaggerBindService {
         this.initSwagger();
     }
     initSwagger() {
-        const controllerName = (0, helpers_1.nameIt)((0, helpers_1.getProviderName)(this.entity, constants_3.JSON_API_CONTROLLER_POSTFIX), controllers_1.JsonBaseController).name;
+        const controllerName = (0, helpers_1.nameIt)((0, helpers_1.getProviderName)(this.entity, constants_2.JSON_API_CONTROLLER_POSTFIX), controllers_1.JsonBaseController).name;
         const controllerInst = this.discoveryService
             .getControllers()
             .find((i) => i.name === controllerName ||
             this.entity ===
-                Reflect.getMetadata(constants_3.JSON_API_DECORATOR_ENTITY, i.instance.constructor));
+                Reflect.getMetadata(constants_2.JSON_API_DECORATOR_ENTITY, i.instance.constructor));
         if (!controllerInst)
             throw new Error(`Controller for ${this.entity.name} is empty`);
         const mapProps = this.mapEntity.getParamMap(this.entity);
         if (!mapProps)
             throw new Error(`ZodEntityProps for ${this.entity.name} is empty`);
         const controller = controllerInst.instance.constructor;
-        const apiTag = Reflect.getMetadata(constants_1.DECORATORS.API_TAGS, controller);
+        const apiTag = Reflect.getMetadata(swagger_1.DECORATORS.API_TAGS, controller);
         if (!apiTag) {
-            (0, swagger_1.ApiTags)(this.config['overrideRoute'] || this.entity.name)(controller);
+            (0, swagger_2.ApiTags)(this.config['overrideRoute'] || this.entity.name)(controller);
         }
-        (0, swagger_1.ApiTags)(this.entity.name)(controller);
-        (0, swagger_1.ApiExtraModels)(filter_operand_model_1.FilterOperand)(controller);
-        (0, swagger_1.ApiExtraModels)((0, utils_1.createApiModels)(this.entity, mapProps))(controller);
+        (0, swagger_2.ApiExtraModels)(filter_operand_model_1.FilterOperand)(controller);
+        (0, swagger_2.ApiExtraModels)(error_response_model_1.JsonApiErrorResponseModel)(controller);
+        (0, swagger_2.ApiExtraModels)((0, utils_1.createApiModels)(this.entity, mapProps))(controller);
+        (0, utils_1.ensureZodSchemasRegistered)();
+        (0, swagger_2.ApiExtraModels)(utils_1.ZodSchemaRef)(controller);
         const { allowMethod = json_api_nestjs_shared_1.ObjectTyped.keys(bindings_1.Bindings) } = this.config;
         for (const method of json_api_nestjs_shared_1.ObjectTyped.keys(bindings_1.Bindings)) {
             if (!allowMethod.includes(method))
@@ -54,13 +58,48 @@ let SwaggerBindService = class SwaggerBindService {
             if (!descriptor)
                 throw new Error(`Descriptor for entity controller ${this.entity.name} is empty`);
             method_1.swaggerMethod[method](controller.prototype, descriptor, this.entity, this.mapEntity, method);
-            Reflect.defineMetadata(constants_2.PARAMTYPES_METADATA, [Object], controller.prototype, method);
+            Reflect.defineMetadata(constants_1.PARAMTYPES_METADATA, [Object], controller.prototype, method);
+        }
+        // Process JsonApiResponseFrom decorators on custom methods
+        this.processJsonApiResponseFrom(controller);
+    }
+    processJsonApiResponseFrom(controller) {
+        const responseMeta = Reflect.getMetadata(decorators_1.JSON_API_RESPONSE_FROM, controller);
+        if (!responseMeta)
+            return;
+        const prototype = controller.prototype;
+        for (const [targetMethod, sourceMapping] of Object.entries(responseMeta)) {
+            const descriptor = Reflect.getOwnPropertyDescriptor(prototype, targetMethod);
+            if (!descriptor)
+                continue;
+            const targetResponses = Reflect.getMetadata(swagger_1.DECORATORS.API_RESPONSE, descriptor.value);
+            if (!targetResponses)
+                continue;
+            for (const [sourceMethod, mappings] of Object.entries(sourceMapping)) {
+                const sourceDescriptor = Reflect.getOwnPropertyDescriptor(prototype, sourceMethod);
+                if (!sourceDescriptor)
+                    continue;
+                const sourceResponses = Reflect.getMetadata(swagger_1.DECORATORS.API_RESPONSE, sourceDescriptor.value);
+                if (!sourceResponses || !mappings)
+                    continue;
+                for (const { fromStatus, toStatus } of [...mappings]) {
+                    const sourceResponse = sourceResponses[fromStatus];
+                    if (!sourceResponse?.schema)
+                        continue;
+                    const existingTarget = targetResponses[toStatus] || {};
+                    (0, swagger_2.ApiResponse)({
+                        status: toStatus,
+                        ...existingTarget,
+                        schema: sourceResponse.schema,
+                    })(prototype, targetMethod, descriptor);
+                }
+            }
         }
     }
 };
 exports.SwaggerBindService = SwaggerBindService;
 tslib_1.__decorate([
-    (0, common_1.Inject)(constants_3.CURRENT_ENTITY),
+    (0, common_1.Inject)(constants_2.CURRENT_ENTITY),
     tslib_1.__metadata("design:type", Object)
 ], SwaggerBindService.prototype, "entity", void 0);
 tslib_1.__decorate([
@@ -68,7 +107,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", core_1.DiscoveryService)
 ], SwaggerBindService.prototype, "discoveryService", void 0);
 tslib_1.__decorate([
-    (0, common_1.Inject)(constants_3.CONTROLLER_OPTIONS_TOKEN),
+    (0, common_1.Inject)(constants_2.CONTROLLER_OPTIONS_TOKEN),
     tslib_1.__metadata("design:type", Object)
 ], SwaggerBindService.prototype, "config", void 0);
 tslib_1.__decorate([

package/src/lib/modules/mixin/swagger/swagger-bind.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-bind.service.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/swagger-bind.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swagger-bind.service.js","sourceRoot":"","sources":["../../../../../../../../../libs/json-api/json-api-nestjs/src/lib/modules/mixin/swagger/swagger-bind.service.ts"],"names":[],"mappings":"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"}

package/src/lib/modules/mixin/swagger/utils.d.ts

@@ -1,49 +1,10 @@
-import { SchemaObject } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface';
-import { AnyEntity, EntityClass, PropertyKeys } from '@klerick/json-api-nestjs-shared';
+import type { SchemaObject, ReferenceObject } from './open-api-types';
+import { EntityClass, AttrKeys } from '@klerick/json-api-nestjs-shared';
 import { EntityParam } from '../../../types';
-import { EntityParamMap } from '../types';
 import { EntityParamMapService } from '../service';
-import { toJSONSchema } from 'zod';
+import { toJSONSchema, ZodType } from 'zod';
 export declare function assertIsKeysOfObject<E extends object>(object: EntityClass<E>, element: any): asserts element is readonly [keyof E];
-export declare function assertIsKeyOfObject<E extends object>(object: EntityClass<E>, element: unknown): asserts element is PropertyKeys<E>;
-export declare const errorSchema: {
-    type: string;
-    properties: {
-        statusCode: {
-            type: string;
-        };
-        error: {
-            type: string;
-        };
-        message: {
-            type: string;
-            items: {
-                type: string;
-                properties: {
-                    code: {
-                        type: string;
-                    };
-                    message: {
-                        type: string;
-                    };
-                    path: {
-                        type: string;
-                        items: {
-                            type: string;
-                        };
-                    };
-                    keys: {
-                        type: string;
-                        items: {
-                            type: string;
-                        };
-                    };
-                };
-                required: string[];
-            };
-        };
-    };
-};
+export declare function assertIsKeyOfObject<E extends object>(object: EntityClass<E>, element: unknown): asserts element is AttrKeys<E>;
 export declare function jsonSchemaResponse<E extends object, IdKey extends string = 'id'>(entity: EntityClass<E>, mapEntity: EntityParamMapService<E, IdKey>, array?: boolean): {
     type: string;
     properties: {
@@ -51,110 +12,15 @@ export declare function jsonSchemaResponse<E extends object, IdKey extends strin
             type: string;
         };
         data: {
-            type: string;
-            properties: {
-                type: {
-                    type: string;
-                    const: string;
-                };
-                id: {
-                    type: string;
-                };
-                attributes: {
-                    type: string;
-                    properties: Record<string, SchemaObject>;
-                };
-                relationships: {
-                    type: string;
-                    properties: Record<string, SchemaObject>;
-                };
-                links: {
-                    type: string;
-                    properties: {
-                        self: {
-                            type: string;
-                        };
-                    };
-                    required: string[];
-                };
-            };
+            $ref: string;
         } | {
             type: string;
             items: {
-                type: string;
-                properties: {
-                    type: {
-                        type: string;
-                        const: string;
-                    };
-                    id: {
-                        type: string;
-                    };
-                    attributes: {
-                        type: string;
-                        properties: Record<string, SchemaObject>;
-                    };
-                    relationships: {
-                        type: string;
-                        properties: Record<string, SchemaObject>;
-                    };
-                    links: {
-                        type: string;
-                        properties: {
-                            self: {
-                                type: string;
-                            };
-                        };
-                        required: string[];
-                    };
-                };
+                $ref: string;
             };
         };
         includes: {
-            type: string;
-            items: {
-                type: string;
-                properties: {
-                    type: {
-                        type: string;
-                    };
-                    id: {
-                        type: string;
-                    };
-                    attributes: {
-                        type: string;
-                    };
-                    relationships: {
-                        type: string;
-                        properties: {
-                            relationName: {
-                                properties: {
-                                    links: {
-                                        type: string;
-                                        properties: {
-                                            self: {
-                                                type: string;
-                                            };
-                                        };
-                                        required: string[];
-                                    };
-                                };
-                                required: string[];
-                            };
-                        };
-                    };
-                    links: {
-                        type: string;
-                        properties: {
-                            self: {
-                                type: string;
-                            };
-                        };
-                        required: string[];
-                    };
-                };
-                required: string[];
-            };
+            $ref: string;
         };
     };
     required: string[];
@@ -194,5 +60,14 @@ export declare const schemaTypeForRelation: {
         };
     };
 };
-export declare function getEntityMapProps<E extends object>(mapEntity: EntityParamMap<EntityClass<AnyEntity>>, entity: EntityClass<E>): EntityParam<EntityClass<object>>;
 export declare const zodToJSONSchemaParams: Parameters<typeof toJSONSchema>[1];
+export declare class ZodSchemaRef {
+    JsonApiLinks: unknown;
+    JsonApiIncludes: unknown;
+    RelationshipResponse: unknown;
+}
+export declare const schemaTypeForRelationRef: {
+    $ref: string;
+};
+export declare function ensureZodSchemasRegistered(): void;
+export declare function zodToOpenApiSchema<T extends ZodType>(schema: T, params?: Parameters<typeof toJSONSchema>[1]): SchemaObject | ReferenceObject;