zod-nest 2.1.4 → 3.0.0

package/dist/index.mjs

@@ -2351,11 +2351,24 @@ var inlineAnonymousBodies = /* @__PURE__ */ __name(({ doc, registry }) => {
   if (bodyByRef.size === 0) {
     return;
   }
+  for (const ref of refsWithin(schemas, bodyByRef)) {
+    bodyByRef.delete(ref);
+  }
   inlineRefs(doc.paths, bodyByRef);
   for (const ref of bodyByRef.keys()) {
     delete schemas[ref.slice(COMPONENTS_SCHEMAS_PREFIX.length)];
   }
 }, "inlineAnonymousBodies");
+var refsWithin = /* @__PURE__ */ __name((schemas, bodyByRef) => {
+  const found = /* @__PURE__ */ new Set();
+  walkRefs(schemas, (ref) => {
+    if (bodyByRef.has(ref)) {
+      found.add(ref);
+    }
+    return void 0;
+  });
+  return found;
+}, "refsWithin");
 var isPlainRecord4 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object" && !Array.isArray(value), "isPlainRecord");
 var inlineRefs = /* @__PURE__ */ __name((node, bodyByRef) => {
   if (Array.isArray(node)) {
@@ -2391,8 +2404,18 @@ var mergeSchemas = /* @__PURE__ */ __name((params) => {
     ...collected.inputExposedIds,
     ...collected.outputExposedIds
   ]);
+  const foreignKeys = collectForeignKeys(schemas);
   for (const id of exposedIds) {
-    applyTruthTable(schemas, id, collected.inputExposedIds.has(id), collected.outputExposedIds.has(id), inputSchemas.get(id), outputSchemas.get(id), divergentOutputIds);
+    applyTruthTable({
+      schemas,
+      id,
+      inputExposed: collected.inputExposedIds.has(id),
+      outputExposed: collected.outputExposedIds.has(id),
+      inputBody: inputSchemas.get(id),
+      outputBody: outputSchemas.get(id),
+      divergentOutputIds,
+      foreignKeys
+    });
   }
   for (const [className, dtoId] of collected.classToDtoId) {
     if (className === dtoId) {
@@ -2414,24 +2437,35 @@ var ensureComponentsSchemas = /* @__PURE__ */ __name((doc) => {
   components.schemas = schemas;
   return schemas;
 }, "ensureComponentsSchemas");
-var applyTruthTable = /* @__PURE__ */ __name((schemas, id, inputExposed, outputExposed, inputBody, outputBody, divergentOutputIds) => {
+var applyTruthTable = /* @__PURE__ */ __name((params) => {
+  const { schemas, id, inputExposed, outputExposed, inputBody, outputBody } = params;
+  const { divergentOutputIds, foreignKeys } = params;
   if (inputExposed && !outputExposed) {
-    writeOrThrowAmbiguous(schemas, id, inputBody);
+    writeOrThrowAmbiguous(schemas, id, inputBody, foreignKeys);
     return;
   }
   if (!inputExposed && outputExposed) {
-    writeOrThrowAmbiguous(schemas, id, outputBody);
+    writeOrThrowAmbiguous(schemas, id, outputBody, foreignKeys);
     return;
   }
   if (canonicalEqual(inputBody, outputBody)) {
-    writeOrThrowAmbiguous(schemas, id, inputBody);
+    writeOrThrowAmbiguous(schemas, id, inputBody, foreignKeys);
     return;
   }
-  writeOrThrowAmbiguous(schemas, id, inputBody);
-  writeOrThrowAmbiguous(schemas, `${id}${OUTPUT_SUFFIX}`, outputBody);
+  writeOrThrowAmbiguous(schemas, id, inputBody, foreignKeys);
+  writeOrThrowAmbiguous(schemas, `${id}${OUTPUT_SUFFIX}`, outputBody, foreignKeys);
   divergentOutputIds.add(id);
 }, "applyTruthTable");
-var writeOrThrowAmbiguous = /* @__PURE__ */ __name((schemas, key, body) => {
+var collectForeignKeys = /* @__PURE__ */ __name((schemas) => {
+  const foreign = /* @__PURE__ */ new Set();
+  for (const [key, body] of Object.entries(schemas)) {
+    if (!isMarkerPlaceholder(body)) {
+      foreign.add(key);
+    }
+  }
+  return foreign;
+}, "collectForeignKeys");
+var writeOrThrowAmbiguous = /* @__PURE__ */ __name((schemas, key, body, foreignKeys) => {
   if (body === void 0) {
     return;
   }
@@ -2440,10 +2474,18 @@ var writeOrThrowAmbiguous = /* @__PURE__ */ __name((schemas, key, body) => {
     schemas[key] = body;
     return;
   }
-  throw new ZodNestDocumentError("AMBIGUOUS_RENAME", `Two distinct schemas target \`components.schemas[${key}]\` with differing bodies \u2014 multiple createZodDto classes likely share the same dtoId. Set distinct \`options.id\` values, or align the class names so renames are unambiguous.`, {
-    key
+  const preexisting = foreignKeys.has(key);
+  throw new ZodNestDocumentError("AMBIGUOUS_RENAME", `Two distinct schemas target \`components.schemas[${key}]\` with differing bodies \u2014 ` + ambiguousRenameHint(key, preexisting), {
+    key,
+    preexisting
   });
 }, "writeOrThrowAmbiguous");
+var ambiguousRenameHint = /* @__PURE__ */ __name((key, preexisting) => {
+  if (preexisting) {
+    return `\`${key}\` was already populated before zod-nest emitted anything. On NestJS 12+ the usual cause is the native Standard Schema path \u2014 \`@Body({ schema })\`, \`@Query({ schema })\` or \`@ApiResponse({ standardSchema })\` \u2014 which makes @nestjs/swagger emit the component itself, in its OpenAPI 3.0 shape. Route the schema through \`createZodDto\` / \`@ZodBody\` / \`@ZodResponse\` instead, or drop \`applyZodNest\` and let Nest own the whole document. A hand-authored component or a doc pre-pass under the same name does this too.`;
+  }
+  return "Two registered ids resolved to the same key \u2014 most often an `<Id>Output` sibling from a diverging input/output schema colliding with a DTO explicitly registered as `<Id>Output`. Rename one of them, or set a distinct `options.id`.";
+}, "ambiguousRenameHint");
 var isMarkerPlaceholder = /* @__PURE__ */ __name((value) => {
   if (value === null || typeof value !== "object") {
     return false;