zod-nest 3.3.0 → 3.5.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { isZodDto, ZodNestError, ZodValidationException, defaultRegistry, ZOD_DTO_SYMBOL, ZOD_NEST_DTO_EXTENSION, flattenObjectIntersection, resolveSchemaRef, isZodObject, registerSchema, expandObjectSchema, paramSchemaBody, COMPONENTS_SCHEMAS_PREFIX, isZodSchema, buildToJsonSchemaOptions, resolveAnonId, ANON_RESPONSE_PREFIX, ZOD_NEST_ERROR_DUPLICATE_ID, ZOD_NEST_ERROR_EXTENSION } from './chunk-YRTGPVSJ.mjs';
-export { COMPONENTS_SCHEMAS_PREFIX, ZOD_DTO_SYMBOL, ZOD_NEST_DTO_EXTENSION, ZOD_NEST_ERROR_DUPLICATE_ID, ZOD_NEST_ERROR_EXTENSION, ZodNestError, ZodNestUnrepresentableError, ZodValidationException, createRegistry, defaultRegistry, extend, getLineage, isZodDto, isZodSchema, registerSchema, toOpenApi } from './chunk-YRTGPVSJ.mjs';
+import { isZodDto, ZodNestError, ZodValidationException, defaultRegistry, ZOD_DTO_SYMBOL, ZOD_NEST_DTO_EXTENSION, flattenObjectIntersection, resolveSchemaRef, isZodObject, registerSchema, expandObjectSchema, paramSchemaBody, COMPONENTS_SCHEMAS_PREFIX, isZodSchema, buildToJsonSchemaOptions, resolveAnonId, ANON_RESPONSE_PREFIX, ZOD_NEST_ERROR_DUPLICATE_ID, ZOD_NEST_ERROR_EXTENSION, ZOD_NEST_ITEM_STREAM_EXTENSION } from './chunk-6HU5TMFO.mjs';
+export { COMPONENTS_SCHEMAS_PREFIX, ZOD_DTO_SYMBOL, ZOD_NEST_DTO_EXTENSION, ZOD_NEST_ERROR_DUPLICATE_ID, ZOD_NEST_ERROR_EXTENSION, ZodNestError, ZodNestUnrepresentableError, ZodValidationException, createRegistry, defaultRegistry, extend, getLineage, isZodDto, isZodSchema, registerSchema, toOpenApi } from './chunk-6HU5TMFO.mjs';
 import { singleton, __name } from './chunk-MPNAA53V.mjs';
 export { overrideJSONSchema } from './chunk-MPNAA53V.mjs';
 import { InternalServerErrorException, HttpStatus, Injectable, Optional, Inject, Logger, RequestMethod, applyDecorators } from '@nestjs/common';
@@ -243,15 +243,28 @@ var createValidationLogger = /* @__PURE__ */ __name((opts) => {
   };
 }, "createValidationLogger");
 var DEFAULT_CONTENT_TYPE = "application/json";
-var DEFAULT_STREAM_CONTENT_TYPES = [
+var SEQUENTIAL_DEFAULT_MEDIA_TYPES = [
   "text/event-stream",
-  "application/x-ndjson",
+  "application/x-ndjson"
+];
+var SEQUENTIAL_MEDIA_TYPES = [
+  ...SEQUENTIAL_DEFAULT_MEDIA_TYPES,
+  "application/jsonl",
+  "application/json-seq",
+  "application/geo+json-seq",
+  "multipart/mixed"
+];
+var OPAQUE_STREAM_MEDIA_TYPES = [
   "application/octet-stream",
   "application/pdf",
   "image/*",
   "audio/*",
   "video/*"
 ];
+var DEFAULT_STREAM_CONTENT_TYPES = [
+  ...SEQUENTIAL_DEFAULT_MEDIA_TYPES,
+  ...OPAQUE_STREAM_MEDIA_TYPES
+];
 var PREFIX_WILDCARD_SUFFIX = "/*";
 var normalizeContentType = /* @__PURE__ */ __name((contentType) => {
   const semicolonIndex = contentType.indexOf(";");
@@ -291,6 +304,18 @@ var matchesStream = /* @__PURE__ */ __name((contentType, matcher) => {
   }
   return false;
 }, "matchesStream");
+var SEQUENTIAL_MATCHER = normalizeStreamMatcher(SEQUENTIAL_MEDIA_TYPES);
+var OPAQUE_MATCHER = normalizeStreamMatcher(OPAQUE_STREAM_MEDIA_TYPES);
+var isSequentialMediaType = /* @__PURE__ */ __name((contentType) => matchesStream(contentType, SEQUENTIAL_MATCHER), "isSequentialMediaType");
+var isItemStreamVariant = /* @__PURE__ */ __name((variant, contentType) => {
+  if (variant.stream !== true) {
+    return false;
+  }
+  if (isSequentialMediaType(contentType)) {
+    return false;
+  }
+  return !matchesStream(contentType, OPAQUE_MATCHER);
+}, "isItemStreamVariant");
 var isHeaderEntry = /* @__PURE__ */ __name((value) => {
   if (value === null || typeof value !== "object") {
     return false;
@@ -617,24 +642,29 @@ var buildTupleSchema = /* @__PURE__ */ __name((dtos) => ({
   })),
   items: false
 }), "buildTupleSchema");
-var buildContentResponseOptions = /* @__PURE__ */ __name((base, contentType, schema) => {
+var buildContentResponseOptions = /* @__PURE__ */ __name((base, contentType, schema, markItemStream) => {
+  const mediaType = markItemStream ? {
+    schema,
+    [ZOD_NEST_ITEM_STREAM_EXTENSION]: true
+  } : {
+    schema
+  };
   return {
     ...base,
     content: {
-      [contentType]: {
-        schema
-      }
+      [contentType]: mediaType
     }
   };
 }, "buildContentResponseOptions");
 var applyCustomContentResponse = /* @__PURE__ */ __name((variant, base, contentType, target, propertyKey, descriptor) => {
+  const markItemStream = isItemStreamVariant(variant, contentType);
   if (variant.kind === "single") {
     const dto = variant.dto;
     ApiExtraModels(asDtoFunction(dto))(target, propertyKey, descriptor);
     const schema = {
       $ref: getSchemaPath(asDtoFunction(dto))
     };
-    ApiResponse(buildContentResponseOptions(base, contentType, schema))(target, propertyKey, descriptor);
+    ApiResponse(buildContentResponseOptions(base, contentType, schema, markItemStream))(target, propertyKey, descriptor);
     return;
   }
   const dtos = variant.dto;
@@ -647,10 +677,10 @@ var applyCustomContentResponse = /* @__PURE__ */ __name((variant, base, contentT
         $ref: getSchemaPath(asDtoFunction(dto))
       }
     };
-    ApiResponse(buildContentResponseOptions(base, contentType, schema))(target, propertyKey, descriptor);
+    ApiResponse(buildContentResponseOptions(base, contentType, schema, markItemStream))(target, propertyKey, descriptor);
     return;
   }
-  ApiResponse(buildContentResponseOptions(base, contentType, buildTupleSchema(dtos)))(target, propertyKey, descriptor);
+  ApiResponse(buildContentResponseOptions(base, contentType, buildTupleSchema(dtos), markItemStream))(target, propertyKey, descriptor);
 }, "applyCustomContentResponse");
 var applySwaggerResponseDecorator = /* @__PURE__ */ __name((variant, effectiveStatus, effectiveContentType, target, propertyKey, descriptor) => {
   const base = {
@@ -1037,6 +1067,101 @@ var ZodNestModule = class _ZodNestModule {
     };
   }
 };
+
+// src/document/http-methods.ts
+var OPENAPI_OPERATION_KEYS = [
+  "get",
+  "put",
+  "post",
+  "delete",
+  "options",
+  "head",
+  "patch",
+  "trace",
+  "query"
+];
+var EXTENSION_OPERATION_KEYS = [
+  "search",
+  "propfind",
+  "proppatch",
+  "mkcol",
+  "copy",
+  "move",
+  "lock",
+  "unlock"
+];
+var HTTP_METHODS = [
+  ...OPENAPI_OPERATION_KEYS,
+  ...EXTENSION_OPERATION_KEYS
+];
+var ADDITIONAL_OPERATIONS_KEY = "additionalOperations";
+var isRecord = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object", "isRecord");
+var operationsOfPathItem = /* @__PURE__ */ __name((pathItem) => {
+  const operations = [];
+  for (const method of HTTP_METHODS) {
+    const operation = pathItem[method];
+    if (isRecord(operation)) {
+      operations.push(operation);
+    }
+  }
+  const additional = pathItem[ADDITIONAL_OPERATIONS_KEY];
+  if (isRecord(additional)) {
+    for (const operation of Object.values(additional)) {
+      if (isRecord(operation)) {
+        operations.push(operation);
+      }
+    }
+  }
+  return operations;
+}, "operationsOfPathItem");
+var forEachOperation = /* @__PURE__ */ __name((doc, fn) => {
+  const paths = doc.paths;
+  if (!isRecord(paths)) {
+    return;
+  }
+  for (const pathItem of Object.values(paths)) {
+    if (!isRecord(pathItem)) {
+      continue;
+    }
+    for (const operation of operationsOfPathItem(pathItem)) {
+      fn(operation);
+    }
+  }
+}, "forEachOperation");
+
+// src/document/additional-operations.ts
+var isRecord2 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object", "isRecord");
+var relocateExtensionOperations = /* @__PURE__ */ __name((doc) => {
+  const paths = doc.paths;
+  if (!isRecord2(paths)) {
+    return;
+  }
+  for (const pathItem of Object.values(paths)) {
+    if (!isRecord2(pathItem)) {
+      continue;
+    }
+    relocateInPathItem(pathItem);
+  }
+}, "relocateExtensionOperations");
+var relocateInPathItem = /* @__PURE__ */ __name((pathItem) => {
+  const relocated = {};
+  for (const method of EXTENSION_OPERATION_KEYS) {
+    const operation = pathItem[method];
+    if (!isRecord2(operation)) {
+      continue;
+    }
+    relocated[method.toUpperCase()] = operation;
+    delete pathItem[method];
+  }
+  if (Object.keys(relocated).length === 0) {
+    return;
+  }
+  const existing = pathItem[ADDITIONAL_OPERATIONS_KEY];
+  pathItem[ADDITIONAL_OPERATIONS_KEY] = isRecord2(existing) ? {
+    ...relocated,
+    ...existing
+  } : relocated;
+}, "relocateInPathItem");
 var URI = /* @__PURE__ */ __name((id) => `#/components/schemas/${id}`, "URI");
 var bulkEmit = /* @__PURE__ */ __name((opts) => {
   const knownIds = new Set(opts.registry.ids());
@@ -1076,46 +1201,6 @@ var runPass = /* @__PURE__ */ __name((opts, io, knownIds) => {
   return filtered;
 }, "runPass");
 
-// src/document/http-methods.ts
-var HTTP_METHODS = [
-  "get",
-  "put",
-  "post",
-  "delete",
-  "options",
-  "head",
-  "patch",
-  "trace",
-  "query",
-  "search",
-  "propfind",
-  "proppatch",
-  "mkcol",
-  "copy",
-  "move",
-  "lock",
-  "unlock"
-];
-var forEachOperation = /* @__PURE__ */ __name((doc, fn) => {
-  const paths = doc.paths;
-  if (paths === null || typeof paths !== "object") {
-    return;
-  }
-  for (const pathItem of Object.values(paths)) {
-    if (pathItem === null || typeof pathItem !== "object") {
-      continue;
-    }
-    const pathRecord = pathItem;
-    for (const method of HTTP_METHODS) {
-      const op = pathRecord[method];
-      if (op === null || typeof op !== "object") {
-        continue;
-      }
-      fn(op);
-    }
-  }
-}, "forEachOperation");
-
 // src/document/walk-refs.ts
 var walkRefs = /* @__PURE__ */ __name((node, visit) => {
   if (node === null || typeof node !== "object") {
@@ -1188,22 +1273,12 @@ var collectInputExposedIds = /* @__PURE__ */ __name((doc, classToDtoId, knownIds
     if (!isPlainRecord2(pathItem)) {
       continue;
     }
-    for (const operation of operationsOf(pathItem)) {
+    for (const operation of operationsOfPathItem(pathItem)) {
       collectRefsFromOperation(operation, classToDtoId, knownIds, ids);
     }
   }
   return ids;
 }, "collectInputExposedIds");
-var operationsOf = /* @__PURE__ */ __name((pathItem) => {
-  const out = [];
-  for (const method of HTTP_METHODS) {
-    const op = pathItem[method];
-    if (isPlainRecord2(op)) {
-      out.push(op);
-    }
-  }
-  return out;
-}, "operationsOf");
 var collectRefsFromOperation = /* @__PURE__ */ __name((operation, classToDtoId, knownIds, ids) => {
   if (isPlainRecord2(operation.requestBody)) {
     collectRefsFromContent(operation.requestBody.content, classToDtoId, knownIds, ids);
@@ -1265,7 +1340,7 @@ var collectOutputExposedIds = /* @__PURE__ */ __name((doc, classToDtoId, knownId
     if (!isPlainRecord2(pathItem)) {
       continue;
     }
-    for (const operation of operationsOf(pathItem)) {
+    for (const operation of operationsOfPathItem(pathItem)) {
       collectRefsFromResponses(operation.responses, classToDtoId, knownIds, ids);
     }
   }
@@ -1595,6 +1670,64 @@ var inlineRefs = /* @__PURE__ */ __name((node, bodyByRef) => {
     inlineRefs(value, bodyByRef);
   }
 }, "inlineRefs");
+
+// src/document/item-schema.ts
+var isRecord3 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object", "isRecord");
+var applyItemSchema = /* @__PURE__ */ __name((doc, opts) => {
+  forEachOperation(doc, (operation) => {
+    visitContentHolder(operation.requestBody, opts.emit);
+    const responses = operation.responses;
+    if (!isRecord3(responses)) {
+      return;
+    }
+    for (const response of Object.values(responses)) {
+      visitContentHolder(response, opts.emit);
+    }
+  });
+}, "applyItemSchema");
+var visitContentHolder = /* @__PURE__ */ __name((holder, emit) => {
+  if (!isRecord3(holder)) {
+    return;
+  }
+  const content = holder.content;
+  if (!isRecord3(content)) {
+    return;
+  }
+  for (const [mediaTypeKey, mediaType] of Object.entries(content)) {
+    if (!isRecord3(mediaType)) {
+      continue;
+    }
+    rewriteMediaType(mediaTypeKey, mediaType, emit);
+  }
+}, "visitContentHolder");
+var rewriteMediaType = /* @__PURE__ */ __name((mediaTypeKey, mediaType, emit) => {
+  const marked = mediaType[ZOD_NEST_ITEM_STREAM_EXTENSION] === true;
+  delete mediaType[ZOD_NEST_ITEM_STREAM_EXTENSION];
+  if (!emit) {
+    return;
+  }
+  if (!marked && !isSequentialMediaType(mediaTypeKey)) {
+    return;
+  }
+  const itemSchema = itemSchemaOf(mediaType.schema);
+  if (itemSchema === void 0) {
+    return;
+  }
+  mediaType.itemSchema = itemSchema;
+  delete mediaType.schema;
+}, "rewriteMediaType");
+var itemSchemaOf = /* @__PURE__ */ __name((schema) => {
+  if (!isRecord3(schema)) {
+    return void 0;
+  }
+  if (schema.type !== "array") {
+    return schema;
+  }
+  if (Object.keys(schema).length !== 2 || !("items" in schema)) {
+    return void 0;
+  }
+  return isRecord3(schema.items) ? schema.items : void 0;
+}, "itemSchemaOf");
 var mergeSchemas = /* @__PURE__ */ __name((params) => {
   const { doc, inputSchemas, outputSchemas, collected, collisions } = params;
   const schemas = ensureComponentsSchemas(doc);
@@ -1812,11 +1945,7 @@ var rewriteRefs = /* @__PURE__ */ __name((params) => {
   }
 }, "rewriteRefs");
 var rewriteResponseSubtree = /* @__PURE__ */ __name((pathItem, divergentOutputIds) => {
-  for (const method of HTTP_METHODS) {
-    const op = pathItem[method];
-    if (op === null || typeof op !== "object") {
-      continue;
-    }
+  for (const op of operationsOfPathItem(pathItem)) {
     const responses = op.responses;
     if (responses === null || typeof responses !== "object") {
       continue;
@@ -1935,10 +2064,17 @@ var applyZodNest = /* @__PURE__ */ __name((doc, opts = {}) => {
     doc,
     collected: extended
   });
-  doc.openapi = resolveOpenApiVersion(doc);
+  const openApiVersion = resolveOpenApiVersion(doc);
+  if (openApiVersion.startsWith("3.2.")) {
+    relocateExtensionOperations(doc);
+  }
+  applyItemSchema(doc, {
+    emit: openApiVersion.startsWith("3.2.")
+  });
+  doc.openapi = openApiVersion;
   return doc;
 }, "applyZodNest");
 
-export { DEFAULT_MAX_LOGGED_VALUE_BYTES, DEFAULT_REDACT_KEYS, DEFAULT_STREAM_CONTENT_TYPES, ZOD_NEST_OPTIONS, ZOD_RESPONSES_METADATA_KEY, ZodBody, ZodCookies, ZodHeaders, ZodNestDocumentError, ZodNestModule, ZodQuery, ZodResponse, ZodSerializationException, ZodSerializerInterceptor, ZodValidationPipe, applyZodNest, createZodDto, defaultStatusFor, isZodDtoMarker, makeZodDtoMarker, resolveEffectiveStatus };
+export { DEFAULT_MAX_LOGGED_VALUE_BYTES, DEFAULT_REDACT_KEYS, DEFAULT_STREAM_CONTENT_TYPES, SEQUENTIAL_MEDIA_TYPES, ZOD_NEST_OPTIONS, ZOD_RESPONSES_METADATA_KEY, ZodBody, ZodCookies, ZodHeaders, ZodNestDocumentError, ZodNestModule, ZodQuery, ZodResponse, ZodSerializationException, ZodSerializerInterceptor, ZodValidationPipe, applyZodNest, createZodDto, defaultStatusFor, isZodDtoMarker, makeZodDtoMarker, resolveEffectiveStatus };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map