@workos/oagen 0.30.1 → 0.31.0

package/dist/{diff-DMFiDAI6.mjs → diff-CAsypxXV.mjs}

@@ -1,7 +1,6 @@
-import { A as validateModelHints, C as assertNever, f as toSnakeCase, i as normalizeJsExtension, j as walkTypeRef, t as safeParse, x as RegistryError } from "./tree-sitter-C6HB4OrC.mjs";
+import { C as assertNever, M as walkTypeRef, f as toSnakeCase, i as normalizeJsExtension, j as validateModelHints, k as collectResponseHeaders, t as safeParse, x as RegistryError } from "./tree-sitter-C7Hk-NDu.mjs";
 import * as fs from "node:fs/promises";
-import * as path$1 from "node:path";
-import path from "node:path";
+import path, * as path$1 from "node:path";
 import Parser from "tree-sitter";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
@@ -15,7 +14,7 @@ function toSnake(s) {
 * When a path ends with one of these, we use it as the verb instead of
 * deriving a CRUD verb from the HTTP method.
 */
-const ACTION_VERBS = new Set([
+const ACTION_VERBS = /* @__PURE__ */ new Set([
 	"accept",
 	"activate",
 	"authorize",
@@ -302,7 +301,7 @@ const DOTNET_URL_FINGERPRINT_CONFIG = {
 	contentNodeTypes: ["string_content", "string_literal_content"],
 	interpolationNodeTypes: ["interpolation"]
 };
-const DECLARATION_TYPES = new Set([
+const DECLARATION_TYPES = /* @__PURE__ */ new Set([
 	"class_declaration",
 	"struct_declaration",
 	"interface_declaration",
@@ -322,11 +321,12 @@ function collectPrecedingXmlDocComments(children, index, source) {
 	let firstIdx = -1;
 	for (let k = index - 1; k >= 0; k--) {
 		const prev = children[k];
-		if (prev.type === "comment") if (source.slice(prev.startIndex, prev.endIndex).startsWith("///")) {
-			if (lastIdx === -1) lastIdx = k;
-			firstIdx = k;
+		if (prev.type === "comment") {
+			if (source.slice(prev.startIndex, prev.endIndex).startsWith("///")) {
+				if (lastIdx === -1) lastIdx = k;
+				firstIdx = k;
+			} else break;
 		} else break;
-		else break;
 	}
 	if (firstIdx === -1) return null;
 	const first = children[firstIdx];
@@ -641,11 +641,12 @@ function collectPrecedingGoComments(children, index, source) {
 	let firstIdx = -1;
 	for (let k = index - 1; k >= 0; k--) {
 		const prev = children[k];
-		if (prev.type === "comment") if (source.slice(prev.startIndex, prev.endIndex).startsWith("//")) {
-			if (lastIdx === -1) lastIdx = k;
-			firstIdx = k;
+		if (prev.type === "comment") {
+			if (source.slice(prev.startIndex, prev.endIndex).startsWith("//")) {
+				if (lastIdx === -1) lastIdx = k;
+				firstIdx = k;
+			} else break;
 		} else break;
-		else break;
 	}
 	if (firstIdx === -1) return null;
 	const first = children[firstIdx];
@@ -1009,9 +1010,9 @@ function findPrecedingDocstring(children, index, source) {
 	}
 	return null;
 }
-const CLASS_MEMBER_TYPES = new Set(["method_definition", "public_field_definition"]);
-const INTERFACE_MEMBER_TYPES = new Set(["property_signature", "method_signature"]);
-const ENUM_MEMBER_TYPES = new Set(["enum_assignment", "property_identifier"]);
+const CLASS_MEMBER_TYPES = /* @__PURE__ */ new Set(["method_definition", "public_field_definition"]);
+const INTERFACE_MEMBER_TYPES = /* @__PURE__ */ new Set(["property_signature", "method_signature"]);
+const ENUM_MEMBER_TYPES = /* @__PURE__ */ new Set(["enum_assignment", "property_identifier"]);
 const NODE_URL_FINGERPRINT_CONFIG = {
 	stringNodeTypes: ["string", "template_string"],
 	contentNodeTypes: ["string_fragment"],
@@ -1423,11 +1424,12 @@ function collectPrecedingRubyComments(children, index, source) {
 	let firstIdx = -1;
 	for (let k = index - 1; k >= 0; k--) {
 		const prev = children[k];
-		if ((prev.grammarType ?? prev.type) === "comment") if (source.slice(prev.startIndex, prev.endIndex).startsWith("#")) {
-			if (lastIdx === -1) lastIdx = k;
-			firstIdx = k;
+		if ((prev.grammarType ?? prev.type) === "comment") {
+			if (source.slice(prev.startIndex, prev.endIndex).startsWith("#")) {
+				if (lastIdx === -1) lastIdx = k;
+				firstIdx = k;
+			} else break;
 		} else break;
-		else break;
 	}
 	if (firstIdx === -1) return null;
 	const first = children[firstIdx];
@@ -1555,11 +1557,12 @@ function collectPrecedingRustDocComments(children, index, source) {
 	let firstIdx = -1;
 	for (let k = index - 1; k >= 0; k--) {
 		const prev = children[k];
-		if (prev.type === "line_comment") if (source.slice(prev.startIndex, prev.endIndex).startsWith("///")) {
-			if (lastIdx === -1) lastIdx = k;
-			firstIdx = k;
+		if (prev.type === "line_comment") {
+			if (source.slice(prev.startIndex, prev.endIndex).startsWith("///")) {
+				if (lastIdx === -1) lastIdx = k;
+				firstIdx = k;
+			} else break;
 		} else break;
-		else break;
 	}
 	if (firstIdx === -1) return null;
 	const first = children[firstIdx];
@@ -1572,7 +1575,7 @@ function collectPrecedingRustDocComments(children, index, source) {
 }
 //#endregion
 //#region src/engine/merge-adapters/index.ts
-const adapters = new Map([
+const adapters = /* @__PURE__ */ new Map([
 	["dotnet", dotnetMergeAdapter],
 	["elixir", elixirMergeAdapter],
 	["go", goMergeAdapter],
@@ -1881,7 +1884,8 @@ async function extractStatements(source, language) {
 * it points one past the last line of the class body.
 */
 async function extractClassEndLines(source, language) {
-	const tree = safeParse(await getParser(language), source);
+	const parser = await getParser(language);
+	const tree = safeParse(parser, source);
 	const map = /* @__PURE__ */ new Map();
 	function processClassNode(node) {
 		const nameNode = node.childForFieldName("name") ?? node.children.find((c) => c.type === "type_identifier" || c.type === "identifier");
@@ -2139,14 +2143,15 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 	}
 	if (prunedTexts.length > 0 && adapter.importedNames) {
 		const prunedText = prunedTexts.join("\n");
-		const codeOnly = maskNonCode(safeParse(await getParser(language), result), result, adapter.urlFingerprintConfig);
+		const parser = await getParser(language);
+		const codeOnly = maskNonCode(safeParse(parser, result), result, adapter.urlFingerprintConfig);
 		const orphaned = /* @__PURE__ */ new Set();
 		for (const imp of existingStatements.imports) {
 			const names = adapter.importedNames(imp);
 			if (names.length === 0) continue;
 			if (!names.some((n) => referencesIdentifier(prunedText, n))) continue;
 			const line = imp.text.trim();
-			const withoutImport = removeLines(codeOnly, new Set([line]));
+			const withoutImport = removeLines(codeOnly, /* @__PURE__ */ new Set([line]));
 			if (names.some((n) => referencesIdentifier(withoutImport, n))) continue;
 			orphaned.add(line);
 		}
@@ -2166,26 +2171,28 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 			if (!existInfo) continue;
 			if (docIgnoredSymbols.has(symbolName)) continue;
 			const genDoc = genInfo.docstring && genInfo.docstring.text.trim() !== headerLine ? genInfo.docstring : null;
-			if (genDoc) if (existInfo.docstring) {
-				if (!existInfo.docstring.text.includes("@oagen-ignore") && existInfo.docstring.text !== genDoc.text) {
-					const newText = preserveDeprecatedTags(existInfo.docstring.text, genDoc.text);
-					const range = resolveDocRange(result, existInfo.docstring.text, existInfo.declStartIndex, existInfo.docstring.startIndex, existInfo.docstring.endIndex);
+			if (genDoc) {
+				if (existInfo.docstring) {
+					if (!existInfo.docstring.text.includes("@oagen-ignore") && existInfo.docstring.text !== genDoc.text) {
+						const newText = preserveDeprecatedTags(existInfo.docstring.text, genDoc.text);
+						const range = resolveDocRange(result, existInfo.docstring.text, existInfo.declStartIndex, existInfo.docstring.startIndex, existInfo.docstring.endIndex);
+						edits.push({
+							start: range.start,
+							end: range.end,
+							newText
+						});
+						docstringUpdates++;
+					}
+				} else {
+					const lineStart = declarationLineStart(result, existInfo.declStartIndex);
+					const indent = " ".repeat(existInfo.declColumn);
 					edits.push({
-						start: range.start,
-						end: range.end,
-						newText
+						start: lineStart,
+						end: lineStart,
+						newText: indent + genDoc.text + "\n"
 					});
 					docstringUpdates++;
 				}
-			} else {
-				const lineStart = declarationLineStart(result, existInfo.declStartIndex);
-				const indent = " ".repeat(existInfo.declColumn);
-				edits.push({
-					start: lineStart,
-					end: lineStart,
-					newText: indent + genDoc.text + "\n"
-				});
-				docstringUpdates++;
 			}
 			const matchedExistMembers = /* @__PURE__ */ new Set();
 			for (const [memberName, genMember] of genInfo.members) {
@@ -2525,8 +2532,10 @@ async function overwriteWithPreservedRegions(existingContent, generatedContent,
 				if (outcome.edited) regionDeclarationEdits++;
 				if (!alreadyPlaced && !outcome.placed) remaining.push(entry);
 			}
-			if (!alreadyPlaced) if (remaining.length === 0) blocksByClass.delete("");
-			else blocksByClass.set("", remaining);
+			if (!alreadyPlaced) {
+				if (remaining.length === 0) blocksByClass.delete("");
+				else blocksByClass.set("", remaining);
+			}
 		}
 	}
 	let effectiveClassEndLines = classEndLines;
@@ -2545,19 +2554,21 @@ async function overwriteWithPreservedRegions(existingContent, generatedContent,
 					break;
 				}
 			}
-			if (insertLine === void 0) if (info) insertLine = info.bodyEndLine;
-			else {
-				const scopeEndLine = entry.containingScope ? findDescribeScopeEndLine(result, entry.containingScope) : void 0;
-				const blockHasImportsFallback = entry.lines.some((l) => /^\s*(import|from)\s/.test(l));
-				if (scopeEndLine !== void 0) insertLine = scopeEndLine;
-				else if (blockHasImportsFallback || hasTopLevelDeclaration(entry.lines)) {
-					let lastImportLine = 0;
-					for (let li = 0; li < result.length; li++) {
-						const trimmed = result[li].trimStart();
-						if (/^(import|from)\s/.test(trimmed)) lastImportLine = li + 1;
-					}
-					insertLine = lastImportLine;
-				} else insertLine = result.length;
+			if (insertLine === void 0) {
+				if (info) insertLine = info.bodyEndLine;
+				else {
+					const scopeEndLine = entry.containingScope ? findDescribeScopeEndLine(result, entry.containingScope) : void 0;
+					const blockHasImportsFallback = entry.lines.some((l) => /^\s*(import|from)\s/.test(l));
+					if (scopeEndLine !== void 0) insertLine = scopeEndLine;
+					else if (blockHasImportsFallback || hasTopLevelDeclaration(entry.lines)) {
+						let lastImportLine = 0;
+						for (let li = 0; li < result.length; li++) {
+							const trimmed = result[li].trimStart();
+							if (/^(import|from)\s/.test(trimmed)) lastImportLine = li + 1;
+						}
+						insertLine = lastImportLine;
+					} else insertLine = result.length;
+				}
 			}
 			if (entry.lines.some((l) => /^\s*import\s/.test(l))) while (insertLine >= 2 && result[insertLine - 1]?.trim() === "" && /^\s*(import|using|from)\s/.test(result[insertLine - 2] ?? "")) insertLine--;
 			const prevLine = insertLine > 0 ? result[insertLine - 1]?.trimStart() ?? "" : "";
@@ -3272,7 +3283,7 @@ function aggregateSurfaceServices(spec, ctx) {
 /**
 * Collect model and enum names transitively referenced by service operations.
 * Walks operation parameters, request bodies, responses, and pagination item
-* types, then chases model field references until the set stabilizes.
+* and envelope types, then chases model field references until the set stabilizes.
 */
 function collectReferencedNames(services, models, opts = {}) {
 	const preserveAllDiscriminated = opts.preserveAllDiscriminated !== false;
@@ -3288,12 +3299,17 @@ function collectReferencedNames(services, models, opts = {}) {
 		for (const p of [
 			...op.pathParams,
 			...op.queryParams,
+			...op.bodyOwnedQueryParams ?? [],
 			...op.headerParams,
 			...op.cookieParams ?? []
 		]) collectFromTypeRef(p.type);
 		if (op.requestBody) collectFromTypeRef(op.requestBody);
 		collectFromTypeRef(op.response);
-		if (op.pagination) collectFromTypeRef(op.pagination.itemType);
+		if (op.pagination) {
+			collectFromTypeRef(op.pagination.itemType);
+			for (const field of op.pagination.envelopeFields ?? []) collectFromTypeRef(field.type);
+		}
+		for (const header of collectResponseHeaders(op)) collectFromTypeRef(header.type);
 		for (const err of op.errors) if (err.type) collectFromTypeRef(err.type);
 		if (op.successResponses) for (const sr of op.successResponses) collectFromTypeRef(sr.type);
 	}
@@ -3455,7 +3471,7 @@ async function treeShakeFiles(files, language) {
 		}
 		deps.set(file.path, fileDeps);
 	}
-	const codeExtensions = new Set([
+	const codeExtensions = /* @__PURE__ */ new Set([
 		".ts",
 		".js",
 		".tsx",
@@ -3537,11 +3553,10 @@ async function resolveFileToDirectoryConflicts(files, targetDir) {
 			content: moduleContent,
 			overwriteExisting: true
 		});
-		const compatImport = "from ._compat import *  # noqa: F401,F403  # pyright: ignore[reportUnusedImport]";
 		const existingContent = file.content.endsWith("\n") ? file.content : file.content + "\n";
 		result[i] = {
 			...file,
-			content: existingContent + compatImport + "\n"
+			content: existingContent + "from ._compat import *  # noqa: F401,F403  # pyright: ignore[reportUnusedImport]\n"
 		};
 		removals.push(fullModulePath);
 	}
@@ -3592,7 +3607,7 @@ async function formatTargetFiles(emitter, targetDir, filePaths) {
 		try {
 			await execFileAsync(formatCmd.cmd, [...formatCmd.args, ...batch], {
 				cwd: targetDir,
-				maxBuffer: 10 * 1024 * 1024,
+				maxBuffer: 10485760,
 				timeout: 12e4
 			});
 		} catch (err) {
@@ -3688,7 +3703,7 @@ function mergeScopedManifestRecords(prev, scopedFiles, scopedOperations) {
 		files: scopedFileList,
 		operations: scopedOperations
 	};
-	const files = [...new Set([...prev.files, ...scopedFileList])].sort();
+	const files = [.../* @__PURE__ */ new Set([...prev.files, ...scopedFileList])].sort();
 	const priorOps = prev.operations;
 	return {
 		files,
@@ -3913,7 +3928,10 @@ function registerEmitter(emitter) {
 }
 function getEmitter(language) {
 	const emitter = emitters.get(language);
-	if (!emitter) throw new RegistryError(`Unknown language: ${language}. Available: ${[...emitters.keys()].join(", ") || "(none)"}`, `Register an emitter for "${language}" via registerEmitter() or check your oagen.config.ts plugin configuration.`);
+	if (!emitter) {
+		const available = [...emitters.keys()].join(", ") || "(none)";
+		throw new RegistryError(`Unknown language: ${language}. Available: ${available}`, `Register an emitter for "${language}" via registerEmitter() or check your oagen.config.ts plugin configuration.`);
+	}
 	return emitter;
 }
 //#endregion
@@ -3941,10 +3959,13 @@ function buildDirectionIndex(...specs) {
 		for (const param of [
 			...op.pathParams,
 			...op.queryParams,
+			...op.bodyOwnedQueryParams ?? [],
 			...op.headerParams,
 			...op.cookieParams ?? []
 		]) requestSeeds.push(param.type);
 		responseSeeds.push(op.response);
+		for (const field of op.pagination?.envelopeFields ?? []) responseSeeds.push(field.type);
+		for (const header of collectResponseHeaders(op)) responseSeeds.push(header.type);
 		for (const success of op.successResponses ?? []) responseSeeds.push(success.type);
 		for (const error of op.errors) if (error.type) responseSeeds.push(error.type);
 	}
@@ -3992,12 +4013,7 @@ function reachableModels(seeds, models) {
 			case "map":
 				queue.push(ref.valueType);
 				break;
-			case "union":
-				queue.push(...ref.variants);
-				break;
-			case "primitive":
-			case "enum":
-			case "literal": break;
+			case "union": queue.push(...ref.variants);
 		}
 	}
 	return found;
@@ -4126,16 +4142,18 @@ function diffFields(oldModel, newModel, direction = "unknown") {
 	for (const [name, newField] of newByName) {
 		const oldField = oldByName.get(name);
 		if (!oldField) continue;
-		if (!typeRefsEqual(oldField.type, newField.type)) if (primitivesDifferOnlyByFormat(oldField.type, newField.type)) changes.push({
-			...classifyFieldChange("field-format-changed", name),
-			details: formatChangeDetails(oldField.type, newField.type)
-		});
-		else changes.push({
-			kind: "field-type-changed",
-			fieldName: name,
-			classification: "breaking",
-			details: `type changed`
-		});
+		if (!typeRefsEqual(oldField.type, newField.type)) {
+			if (primitivesDifferOnlyByFormat(oldField.type, newField.type)) changes.push({
+				...classifyFieldChange("field-format-changed", name),
+				details: formatChangeDetails(oldField.type, newField.type)
+			});
+			else changes.push({
+				kind: "field-type-changed",
+				fieldName: name,
+				classification: "breaking",
+				details: `type changed`
+			});
+		}
 		if (oldField.required !== newField.required) changes.push(classifyFieldChange("field-required-changed", name, newField.required));
 		if (!!oldField.readOnly !== !!newField.readOnly || !!oldField.writeOnly !== !!newField.writeOnly) changes.push(classifyFieldChange("field-access-changed", name));
 	}
@@ -4280,11 +4298,13 @@ function diffParams(oldOp, newOp) {
 	for (const [name, newEntry] of newByName) {
 		const oldEntry = oldByName.get(name);
 		if (!oldEntry) continue;
-		if (!typeRefsEqual(oldEntry.p.type, newEntry.p.type)) if (primitivesDifferOnlyByFormat(oldEntry.p.type, newEntry.p.type)) {
-			const change = classifyParamChange("param-format-changed", name);
-			change.details = formatChangeDetails(oldEntry.p.type, newEntry.p.type);
-			changes.push(change);
-		} else changes.push(classifyParamChange("param-type-changed", name));
+		if (!typeRefsEqual(oldEntry.p.type, newEntry.p.type)) {
+			if (primitivesDifferOnlyByFormat(oldEntry.p.type, newEntry.p.type)) {
+				const change = classifyParamChange("param-format-changed", name);
+				change.details = formatChangeDetails(oldEntry.p.type, newEntry.p.type);
+				changes.push(change);
+			} else changes.push(classifyParamChange("param-type-changed", name));
+		}
 		if (oldEntry.p.required !== newEntry.p.required) changes.push(classifyParamChange("param-required-changed", name, newEntry.p.required));
 		const oldDefault = serializeDefault(oldEntry.p.default);
 		const newDefault = serializeDefault(newEntry.p.default);
@@ -4454,4 +4474,4 @@ function summarize(changes) {
 //#endregion
 export { findResolvedMethodCollisions as _, registerEmitter as a, integrateGeneratedFiles as c, applyFileHeaders as d, buildEmitterContext as f, deriveMethodName as g, generateFiles as h, getEmitter as i, mapFilesForTargetIntegration as l, generateAllFiles as m, buildDirectionIndex as n, generate as o, collectReferencedNames as p, directionOf as r, MANIFEST_FILENAME as s, diffSpecs as t, treeShakeFiles as u, resolveMountTarget as v, resolveOperations as y };
 
-//# sourceMappingURL=diff-DMFiDAI6.mjs.map
+//# sourceMappingURL=diff-CAsypxXV.mjs.map