@workos/oagen 0.19.4 → 0.19.6

package/dist/cli/index.mjs

@@ -3148,11 +3148,21 @@ function extractKotlinClassMembers(classBody, source) {
 		}
 		members.push({
 			key: memberName,
-			text: source.slice(startIdx, endIdx)
+			text: source.slice(startIdx, endIdx),
+			startIndex: startIdx,
+			endIndex: endIdx
 		});
 	}
 	return members;
 }
+/**
+* KDoc signature that identifies a generator-emitted service accessor inside
+* the WorkOS class. The Kotlin client emitter writes every accessor with this
+* exact doc preamble — when the existing file carries a member with this doc
+* but the regenerated content omits it, the member is stale (its mount target
+* was remapped or removed) and gets pruned.
+*/
+const KOTLIN_MANAGED_ACCESSOR_DOC = /\/\*\*[\s\S]*?Lazily-constructed \[[^\]]+\] accessor for this \[WorkOS\] client\.[\s\S]*?\*\//;
 const kotlinMergeAdapter = {
 	language: "kotlin",
 	grammarModule: "tree-sitter-kotlin",
@@ -3193,6 +3203,9 @@ const kotlinMergeAdapter = {
 	renderImports(imports) {
 		return imports.map((entry) => entry.text);
 	},
+	isManagedMember(member) {
+		return KOTLIN_MANAGED_ACCESSOR_DOC.test(member.text);
+	},
 	shouldSkipDeepMerge(_symbolName, existingMemberKeys, newMembers) {
 		const newText = newMembers.map((m) => m.text).join("\n");
 		for (const match of newText.matchAll(/this\.(\w+)/g)) {
@@ -4288,6 +4301,7 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 	let result = existingContent;
 	if (toAppend.length > 0) result = result.trimEnd() + "\n\n" + toAppend.join("\n\n") + "\n";
 	let deepAdded = 0;
+	let deepPruned = 0;
 	const insertions = [];
 	if (adapter.extractMembers) {
 		const parser = await getParser(language);
@@ -4297,6 +4311,37 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 		const generatedSymbols = adapter.extractMembers(generatedTree, generatedContent);
 		const existingTree = safeParse(parser, existingContent);
 		const deepIgnoredSymbols = buildIgnoredSymbolNames(adapter.extractDocstrings(existingTree, existingContent), findIgnoredRegions(existingContent));
+		if (adapter.isManagedMember) {
+			const pruneEdits = [];
+			for (const [symbolName, genSymbol] of generatedSymbols) {
+				if (deepIgnoredSymbols.has(symbolName)) continue;
+				const existSymbol = resultSymbols.get(symbolName);
+				if (!existSymbol) continue;
+				const genMemberKeys = new Set(genSymbol.members.map((m) => m.key));
+				for (const existMember of existSymbol.members) {
+					if (genMemberKeys.has(existMember.key)) continue;
+					if (existMember.startIndex === void 0 || existMember.endIndex === void 0) continue;
+					if (!adapter.isManagedMember(existMember)) continue;
+					pruneEdits.push({
+						start: existMember.startIndex,
+						end: existMember.endIndex
+					});
+				}
+			}
+			if (pruneEdits.length > 0) {
+				pruneEdits.sort((a, b) => b.start - a.start);
+				for (const edit of pruneEdits) {
+					let end = edit.end;
+					while (end < result.length && (result[end] === " " || result[end] === "	")) end++;
+					if (result[end] === "\n") end++;
+					result = result.slice(0, edit.start) + result.slice(end);
+				}
+				deepPruned = pruneEdits.length;
+				const reTree = safeParse(parser, result);
+				resultSymbols.clear();
+				for (const [k, v] of adapter.extractMembers(reTree, result)) resultSymbols.set(k, v);
+			}
+		}
 		for (const [symbolName, genSymbol] of generatedSymbols) {
 			if (deepIgnoredSymbols.has(symbolName)) continue;
 			const existSymbol = resultSymbols.get(symbolName);
@@ -4479,7 +4524,7 @@ async function mergeIntoExisting(existingContent, generatedContent, language, he
 		}
 	}
 	const totalAdded = (toAppend.length > 0 || deepAdded > 0 ? adapter.renderImports ? adapter.renderImports(newImports).length : newImports.length : 0) + toAppend.length + deepAdded;
-	if (totalAdded === 0 && docstringUpdates === 0) return {
+	if (totalAdded === 0 && docstringUpdates === 0 && deepPruned === 0) return {
 		content: existingContent,
 		added: 0,
 		preserved,
@@ -4904,10 +4949,26 @@ function spliceExtraImports(existingLines, resultLines) {
 	const existingPhpUse = new Set(existingLines.filter(isPhpUseImport).map((l) => l.trim()));
 	const generatedPhpUse = new Set(resultLines.filter(isPhpUseImport).map((l) => l.trim()));
 	const extraPhpUse = [...existingPhpUse].filter((l) => !generatedPhpUse.has(l));
-	const isRubyRequire = (l) => /^require(_relative)?\s+['"][^'"]+['"]\s*$/.test(l);
-	const existingRubyRequire = new Set(existingLines.filter(isRubyRequire).map((l) => l.trim()));
-	const generatedRubyRequire = new Set(resultLines.filter(isRubyRequire).map((l) => l.trim()));
-	const extraRubyRequire = [...existingRubyRequire].filter((l) => !generatedRubyRequire.has(l));
+	const rubyRequireRe = /^(require(?:_relative)?)\s+['"]([^'"]+)['"]\s*$/;
+	const rubyRequireKey = (l) => {
+		const m = l.trim().match(rubyRequireRe);
+		return m ? `${m[1]}\t${m[2]}` : void 0;
+	};
+	const generatedRubyRequireKeys = /* @__PURE__ */ new Set();
+	for (const l of resultLines) {
+		const key = rubyRequireKey(l);
+		if (key) generatedRubyRequireKeys.add(key);
+	}
+	const seenExistingKeys = /* @__PURE__ */ new Set();
+	const extraRubyRequire = [];
+	for (const l of existingLines) {
+		const key = rubyRequireKey(l);
+		if (!key) continue;
+		if (generatedRubyRequireKeys.has(key)) continue;
+		if (seenExistingKeys.has(key)) continue;
+		seenExistingKeys.add(key);
+		extraRubyRequire.push(l.trim());
+	}
 	const allExtra = [
 		...extraSimple,
 		...extraFromLines,