zod-nest 1.3.0 → 1.3.1

package/dist/index.js

@@ -1199,6 +1199,25 @@ var HTTP_METHODS = [
   "patch",
   "trace"
 ];
+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/collect-usage.ts
 var isPlainRecord2 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object" && !Array.isArray(value), "isPlainRecord");
@@ -1441,41 +1460,39 @@ var hintFor = /* @__PURE__ */ __name((ref, collected) => {
 var isPlainRecord3 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object" && !Array.isArray(value), "isPlainRecord");
 var expandParamMarkers = /* @__PURE__ */ __name((params) => {
   const { doc, inputSchemas, outputSchemas } = params;
-  const paths = doc.paths;
-  if (!isPlainRecord3(paths)) {
-    return;
-  }
-  for (const pathItem of Object.values(paths)) {
-    if (!isPlainRecord3(pathItem)) {
-      continue;
+  let expandedAny = false;
+  forEachOperation(doc, (op) => {
+    const parameters = op.parameters;
+    if (!Array.isArray(parameters)) {
+      return;
     }
-    for (const method of HTTP_METHODS) {
-      const op = pathItem[method];
-      if (!isPlainRecord3(op)) {
-        continue;
-      }
-      const parameters = op.parameters;
-      if (!Array.isArray(parameters)) {
-        continue;
-      }
-      op.parameters = expandParameterList(parameters, inputSchemas, outputSchemas);
+    const next = expandParameterList(parameters, inputSchemas, outputSchemas);
+    if (next !== parameters) {
+      op.parameters = next;
+      expandedAny = true;
     }
+  });
+  if (expandedAny) {
+    pruneOrphanObjectSchema(doc);
   }
-  pruneOrphanObjectSchema(doc);
 }, "expandParamMarkers");
 var expandParameterList = /* @__PURE__ */ __name((parameters, inputSchemas, outputSchemas) => {
-  const result = [];
-  for (const param of parameters) {
+  let result;
+  for (let i = 0; i < parameters.length; i++) {
+    const param = parameters[i];
     const marker = readMarker2(param);
     if (marker === void 0) {
-      result.push(param);
+      result?.push(param);
       continue;
     }
+    if (result === void 0) {
+      result = parameters.slice(0, i);
+    }
     const map = marker.io === "output" ? outputSchemas : inputSchemas;
     const body = map.get(marker.dtoId);
     result.push(...expandOne(marker, body));
   }
-  return result;
+  return result ?? parameters;
 }, "expandParameterList");
 var readMarker2 = /* @__PURE__ */ __name((value) => {
   if (!isPlainRecord3(value)) {
@@ -1532,16 +1549,12 @@ var buildParameter = /* @__PURE__ */ __name((marker, name, schema, required) =>
     console.warn(`[zod-nest] Path parameter \`${name}\` on DTO \`${marker.dtoId}\` is marked optional in the Zod schema; OpenAPI 3.1 requires path parameters to be required. Coercing \`required: true\` so the emitted document is spec-valid. Fix by removing \`.optional()\` / \`.nullish()\` from the field, or by switching the decorator to @Query() / @Headers() if the field is genuinely optional.`);
     effectiveRequired = true;
   }
-  const entry = {
+  return {
     name,
     in: marker.in,
     required: effectiveRequired,
     schema
   };
-  if (typeof schema.description === "string") {
-    entry.description = schema.description;
-  }
-  return entry;
 }, "buildParameter");
 var capitalize = /* @__PURE__ */ __name((value) => value.charAt(0).toUpperCase() + value.slice(1), "capitalize");
 var pruneOrphanObjectSchema = /* @__PURE__ */ __name((doc) => {
@@ -1755,40 +1768,28 @@ var stripMarkers = /* @__PURE__ */ __name((doc) => {
   if (schemas !== void 0) {
     for (const schema of Object.values(schemas)) {
       stripMarkerFromSchema(schema);
+      dropJsonSchemaMetadata(schema);
     }
   }
   stripMarkerParameters(doc);
 }, "stripMarkers");
-var stripMarkerParameters = /* @__PURE__ */ __name((doc) => {
-  const paths = doc.paths;
-  if (paths === null || typeof paths !== "object") {
+var dropJsonSchemaMetadata = /* @__PURE__ */ __name((schema) => {
+  if (schema === null || typeof schema !== "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;
-      }
-      const opRecord = op;
-      const parameters = opRecord.parameters;
-      if (!Array.isArray(parameters)) {
-        continue;
-      }
-      opRecord.parameters = parameters.filter((param) => !isMarkerParam(param));
+  const body = schema;
+  delete body.$schema;
+  delete body.$id;
+}, "dropJsonSchemaMetadata");
+var stripMarkerParameters = /* @__PURE__ */ __name((doc) => {
+  forEachOperation(doc, (op) => {
+    const parameters = op.parameters;
+    if (!Array.isArray(parameters)) {
+      return;
     }
-  }
+    op.parameters = parameters.filter((param) => !isZodDtoMarker(param));
+  });
 }, "stripMarkerParameters");
-var isMarkerParam = /* @__PURE__ */ __name((value) => {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  return value.__zodNestDto === true;
-}, "isMarkerParam");
 var stripMarkerFromSchema = /* @__PURE__ */ __name((schema) => {
   if (schema === null || typeof schema !== "object") {
     return;