@workos/oagen 0.6.0 → 0.8.0

package/dist/{diff-CltJMcwG.mjs → diff-BaH9qa8k.mjs}

@@ -960,6 +960,7 @@ const nodeMergeAdapter = {
 		const newText = newMembers.map((m) => m.text).join("\n");
 		for (const match of newText.matchAll(/this\.(\w+)/g)) {
 			const propName = match[1];
+			if (propName === "workos") continue;
 			if (propName && !existingMemberKeys.has(propName)) return true;
 		}
 		return false;
@@ -1609,6 +1610,40 @@ function buildIgnoredSymbolNames(docstrings, regions) {
 	for (const [name, info] of docstrings) if (regions.some((r) => info.declStartIndex >= r.startIndex && info.declStartIndex <= r.endIndex)) ignored.add(name);
 	return ignored;
 }
+function clampIndex(value, contentLength) {
+	if (!Number.isFinite(value)) return 0;
+	if (value < 0) return 0;
+	if (value > contentLength) return contentLength;
+	return value;
+}
+/**
+* Resolve the declaration line start for insertion using the current content,
+* instead of relying on parser column arithmetic. This avoids misplaced inserts
+* when parser columns/offsets drift.
+*/
+function declarationLineStart(content, declStartIndex) {
+	const idx = clampIndex(declStartIndex, content.length);
+	const prevNewline = content.lastIndexOf("\n", Math.max(0, idx - 1));
+	return prevNewline === -1 ? 0 : prevNewline + 1;
+}
+/**
+* Resolve a docstring range by searching for the nearest matching text before
+* the declaration start. Falls back to parser-provided offsets when search fails.
+*/
+function resolveDocRange(content, docText, declStartIndex, fallbackStart, fallbackEnd) {
+	const safeDecl = clampIndex(declStartIndex, content.length);
+	const safeFallbackStart = clampIndex(fallbackStart, content.length);
+	const safeFallbackEnd = clampIndex(fallbackEnd, content.length);
+	const found = content.lastIndexOf(docText, safeDecl);
+	if (found !== -1) return {
+		start: found,
+		end: found + docText.length
+	};
+	return {
+		start: safeFallbackStart,
+		end: safeFallbackEnd
+	};
+}
 /**
 * Check if a tree-sitter grammar is configured for the given language.
 */
@@ -1657,15 +1692,17 @@ async function extractClassEndLines(source, language) {
 		if (source[body ? body.endIndex - 1 : node.endIndex - 1] === "}") map.set(name, { bodyEndLine: endRow });
 		else map.set(name, { bodyEndLine: endRow + 1 });
 	}
-	for (const child of tree.rootNode.children) {
-		if (child.type === "class_definition" || child.type === "class_declaration") processClassNode(child);
-		if (child.type === "decorated_definition") {
-			for (const inner of child.namedChildren) if (inner.type === "class_definition") processClassNode(inner);
+	function walk(node) {
+		if (node.type === "class" || node.type === "class_definition" || node.type === "class_declaration") processClassNode(node);
+		if (node.type === "decorated_definition") {
+			for (const inner of node.namedChildren) if (inner.type === "class_definition") processClassNode(inner);
 		}
-		if (child.type === "export_statement") {
-			for (const inner of child.namedChildren) if (inner.type === "class_declaration") processClassNode(inner);
+		if (node.type === "export_statement") {
+			for (const inner of node.namedChildren) if (inner.type === "class_declaration") processClassNode(inner);
 		}
+		for (const child of node.namedChildren) walk(child);
 	}
+	for (const child of tree.rootNode.children) walk(child);
 	return map;
 }
 /**
@@ -1885,15 +1922,16 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 			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: existInfo.docstring.startIndex,
-						end: existInfo.docstring.endIndex,
+						start: range.start,
+						end: range.end,
 						newText
 					});
 					docstringUpdates++;
 				}
 			} else {
-				const lineStart = existInfo.declStartIndex - existInfo.declColumn;
+				const lineStart = declarationLineStart(result, existInfo.declStartIndex);
 				const indent = " ".repeat(existInfo.declColumn);
 				edits.push({
 					start: lineStart,
@@ -1911,15 +1949,16 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 				if (existMember.docstring) {
 					if (!existMember.docstring.text.includes("@oagen-ignore") && existMember.docstring.text !== genMember.docstring.text) {
 						const newText = preserveDeprecatedTags(existMember.docstring.text, genMember.docstring.text);
+						const range = resolveDocRange(result, existMember.docstring.text, existMember.declStartIndex, existMember.docstring.startIndex, existMember.docstring.endIndex);
 						edits.push({
-							start: existMember.docstring.startIndex,
-							end: existMember.docstring.endIndex,
+							start: range.start,
+							end: range.end,
 							newText
 						});
 						docstringUpdates++;
 					}
 				} else {
-					const lineStart = existMember.declStartIndex - existMember.declColumn;
+					const lineStart = declarationLineStart(result, existMember.declStartIndex);
 					const indent = " ".repeat(existMember.declColumn);
 					edits.push({
 						start: lineStart,
@@ -1964,15 +2003,16 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 					if (existMember.docstring.text.includes("@oagen-ignore")) continue;
 					if (existMember.docstring.text !== genMember.docstring.text) {
 						const newText = preserveDeprecatedTags(existMember.docstring.text, genMember.docstring.text);
+						const range = resolveDocRange(result, existMember.docstring.text, existMember.declStartIndex, existMember.docstring.startIndex, existMember.docstring.endIndex);
 						edits.push({
-							start: existMember.docstring.startIndex,
-							end: existMember.docstring.endIndex,
+							start: range.start,
+							end: range.end,
 							newText
 						});
 						docstringUpdates++;
 					}
 				} else {
-					const lineStart = existMember.declStartIndex - existMember.declColumn;
+					const lineStart = declarationLineStart(result, existMember.declStartIndex);
 					const indent = " ".repeat(existMember.declColumn);
 					edits.push({
 						start: lineStart,
@@ -2145,7 +2185,7 @@ async function overwriteWithPreservedRegions(existingContent, generatedContent,
 		});
 	}
 	if (blocks.length === 0) return generatedContent;
-	const result = [...generatedLines];
+	const result = stripIgnoreRegions(generatedLines);
 	spliceExtraImports(existingLines, result);
 	const classEndLines = await extractClassEndLines(result.join("\n"), language);
 	const blocksByClass = /* @__PURE__ */ new Map();
@@ -2212,10 +2252,33 @@ async function overwriteWithPreservedRegions(existingContent, generatedContent,
 	for (const ins of insertions) result.splice(ins.line, 0, ...ins.content);
 	return result.join("\n");
 }
+/**
+* Remove every `@oagen-ignore-start`..`@oagen-ignore-end` region from the
+* supplied lines, collapsing stretches of blank lines that get left behind.
+* Used to drop generator-emitted seed blocks before splicing the on-disk
+* versions back in — otherwise every regen doubles up.
+*/
+function stripIgnoreRegions(lines) {
+	const out = [];
+	let skipping = false;
+	for (const line of lines) {
+		if (!skipping && line.includes("@oagen-ignore-start")) {
+			skipping = true;
+			while (out.length > 0 && out[out.length - 1].trim() === "") out.pop();
+			continue;
+		}
+		if (skipping) {
+			if (line.includes("@oagen-ignore-end")) skipping = false;
+			continue;
+		}
+		out.push(line);
+	}
+	return out;
+}
 /** Scan backwards from `lineIdx` to find the nearest class declaration name. */
 function findContainingClass(lines, lineIdx) {
 	for (let j = lineIdx - 1; j >= 0; j--) {
-		const m = lines[j].match(/^(?:export\s+)?class\s+(\w+)/);
+		const m = lines[j].match(/^\s*(?:export\s+)?class\s+(\w+)/);
 		if (m) return m[1];
 	}
 	return "";
@@ -2225,7 +2288,7 @@ function findContainingClass(lines, lineIdx) {
 * by scanning backwards from `beforeLine`.
 */
 function findClassDeclarationStart(lines, className, beforeLine) {
-	const classPattern = new RegExp(`^(?:export\\s+)?class\\s+${className}\\b`);
+	const classPattern = new RegExp(`^\\s*(?:export\\s+)?class\\s+${className}\\b`);
 	for (let i = beforeLine - 1; i >= 0; i--) {
 		if (!classPattern.test(lines[i])) continue;
 		let start = i;
@@ -2554,7 +2617,8 @@ async function resolveFileToDirectoryConflicts(files, targetDir) {
 	};
 }
 async function integrateGeneratedFiles(opts) {
-	const { files: resolved, removals } = await resolveFileToDirectoryConflicts(await treeShakeFiles(mapFilesForTargetIntegration(opts.files, opts.language), opts.language), opts.targetDir);
+	const mapped = mapFilesForTargetIntegration(opts.files, opts.language);
+	const { files: resolved, removals } = await resolveFileToDirectoryConflicts(await treeShakeFiles(mapped, opts.language), opts.targetDir);
 	const result = await writeFiles(resolved, opts.targetDir, {
 		language: opts.language,
 		header: opts.header
@@ -2564,7 +2628,7 @@ async function integrateGeneratedFiles(opts) {
 	} catch {}
 	return {
 		...result,
-		emittedPaths: resolved.map((f) => f.path)
+		emittedPaths: mapped.map((f) => f.path)
 	};
 }
 //#endregion
@@ -2588,6 +2652,7 @@ async function formatTargetFiles(emitter, targetDir, filePaths) {
 	if (!formatCmd) return;
 	const absolutePaths = filePaths.map((f) => path$1.resolve(targetDir, f));
 	const batchSize = formatCmd.batchSize ?? 100;
+	process.stderr.write(`[oagen] formatting ${absolutePaths.length} file(s) with ${formatCmd.cmd} (batch ${batchSize})\n`);
 	for (let i = 0; i < absolutePaths.length; i += batchSize) {
 		const batch = absolutePaths.slice(i, i + batchSize);
 		try {
@@ -2596,7 +2661,10 @@ async function formatTargetFiles(emitter, targetDir, filePaths) {
 				maxBuffer: 10 * 1024 * 1024,
 				timeout: 12e4
 			});
-		} catch {}
+		} catch (err) {
+			const msg = err instanceof Error ? err.message : String(err);
+			process.stderr.write(`[oagen] formatter batch failed: ${msg}\n`);
+		}
 	}
 }
 //#endregion
@@ -2621,7 +2689,7 @@ async function formatTargetFiles(emitter, targetDir, filePaths) {
 *    one-line notice is printed — no surprise deletions.
 */
 const MANIFEST_FILENAME = ".oagen-manifest.json";
-const MANIFEST_VERSION = 1;
+const MANIFEST_VERSION = 2;
 /** Read `.oagen-manifest.json` from a directory.  Returns null if absent or malformed. */
 async function readManifest(dir) {
 	const manifestPath = path$1.join(dir, MANIFEST_FILENAME);
@@ -2648,7 +2716,14 @@ async function writeManifest(dir, opts) {
 	const manifest = {
 		version: MANIFEST_VERSION,
 		language: opts.language,
+		...opts.sdkName !== void 0 ? { sdkName: opts.sdkName } : {},
 		generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		...opts.specSha !== void 0 ? { specSha: opts.specSha } : {},
+		...opts.specPath !== void 0 ? { specPath: opts.specPath } : {},
+		...opts.emitterSha !== void 0 ? { emitterSha: opts.emitterSha } : {},
+		...opts.emitterVersion !== void 0 ? { emitterVersion: opts.emitterVersion } : {},
+		...opts.configSha !== void 0 ? { configSha: opts.configSha } : {},
+		...opts.compatSchemaVersion !== void 0 ? { compatSchemaVersion: opts.compatSchemaVersion } : {},
 		files: [...new Set(opts.files)].sort()
 	};
 	const manifestPath = path$1.join(dir, MANIFEST_FILENAME);
@@ -2759,6 +2834,8 @@ async function generate(spec, emitter, options) {
 		header,
 		noPrune: options.noPrune
 	});
+	const allOutputFiles = [...writeResult.written, ...writeResult.merged];
+	if (allOutputFiles.length > 0) await formatTargetFiles(emitter, options.outputDir, allOutputFiles);
 	if (options.target) {
 		const targetPrevManifest = targetManifestForCtx;
 		const targetResult = await integrateGeneratedFiles({
@@ -3182,4 +3259,4 @@ function summarize(changes) {
 //#endregion
 export { integrateGeneratedFiles as a, applyFileHeaders as c, generateAllFiles as d, generateFiles as f, generate as i, buildEmitterContext as l, resolveOperations as m, getEmitter as n, mapFilesForTargetIntegration as o, deriveMethodName as p, registerEmitter as r, treeShakeFiles as s, diffSpecs as t, collectReferencedNames as u };
 
-//# sourceMappingURL=diff-CltJMcwG.mjs.map
+//# sourceMappingURL=diff-BaH9qa8k.mjs.map