@workos/oagen 0.19.1 → 0.19.3

package/dist/cli/index.mjs

@@ -4794,14 +4794,75 @@ function collectFromImports(lines) {
 	return byModule;
 }
 /**
+* Collect TypeScript imports, grouped by form. Handles single-line and
+* multi-line `{ … }` named imports. Disjoint from Python's `from X import Y`
+* syntax so this can be called in parallel with `collectFromImports`.
+*/
+function collectTsImports(lines) {
+	const out = {
+		named: /* @__PURE__ */ new Map(),
+		typeOnly: /* @__PURE__ */ new Map(),
+		defaults: /* @__PURE__ */ new Map(),
+		namespaces: /* @__PURE__ */ new Map(),
+		sideEffects: /* @__PURE__ */ new Set()
+	};
+	for (let i = 0; i < lines.length; i++) {
+		const trimmed = lines[i].trim();
+		if (!/^import(\s|$)/.test(trimmed)) continue;
+		let fullText = lines[i];
+		if (fullText.includes("{") && !fullText.includes("}")) while (i + 1 < lines.length) {
+			i++;
+			fullText += " " + lines[i].trim();
+			if (lines[i].includes("}")) break;
+		}
+		const normalized = fullText.replace(/\s+/g, " ").trim().replace(/;\s*$/, "");
+		let m = normalized.match(/^import\s+['"]([^'"]+)['"]$/);
+		if (m) {
+			out.sideEffects.add(m[1]);
+			continue;
+		}
+		m = normalized.match(/^import\s+\*\s+as\s+(\w+)\s+from\s+['"]([^'"]+)['"]$/);
+		if (m) {
+			out.namespaces.set(m[2], m[1]);
+			continue;
+		}
+		m = normalized.match(/^import\s+(type\s+)?(?:(\w+)\s*,\s*)?\{\s*([^}]*)\s*\}\s+from\s+['"]([^'"]+)['"]$/);
+		if (m) {
+			const isTypeOnly = !!m[1];
+			const defaultName = m[2];
+			const namesRaw = m[3];
+			const mod = m[4];
+			if (defaultName) out.defaults.set(mod, defaultName);
+			const names = namesRaw.split(",").map((s) => s.trim().replace(/\s+as\s+\w+$/, "")).filter(Boolean);
+			const target = isTypeOnly ? out.typeOnly : out.named;
+			if (!target.has(mod)) target.set(mod, /* @__PURE__ */ new Set());
+			for (const n of names) target.get(mod).add(n);
+			continue;
+		}
+		m = normalized.match(/^import\s+(?:type\s+)?(\w+)\s+from\s+['"]([^'"]+)['"]$/);
+		if (m) {
+			out.defaults.set(m[2], m[1]);
+			continue;
+		}
+	}
+	return out;
+}
+/**
 * Add imports from the existing file that are absent from the generated
-* result. Handles both `import X` and `from X import Y` forms.
+* result. Handles:
+*
+* - Python: `import X` and `from X import Y`
+* - TypeScript: `import { X } from 'module'`, `import type { X } from 'module'`,
+*   `import X from 'module'`, `import * as X from 'module'`, `import 'module'`
+* - PHP: `use Foo\Bar;` and `use Foo\Bar as Baz;` (namespace-qualified only)
+* - Ruby: `require '…'` and `require_relative '…'`
+*
 * Mutates `resultLines` in place.
 */
 function spliceExtraImports(existingLines, resultLines) {
-	const isSimpleImport = (l) => /^import\s+\w/.test(l);
-	const existingSimple = new Set(existingLines.filter(isSimpleImport).map((l) => l.trim()));
-	const generatedSimple = new Set(resultLines.filter(isSimpleImport).map((l) => l.trim()));
+	const isPythonSimpleImport = (l) => /^import\s+\w/.test(l) && !/\sfrom\s/.test(l);
+	const existingSimple = new Set(existingLines.filter(isPythonSimpleImport).map((l) => l.trim()));
+	const generatedSimple = new Set(resultLines.filter(isPythonSimpleImport).map((l) => l.trim()));
 	const extraSimple = [...existingSimple].filter((l) => !generatedSimple.has(l));
 	const existingFrom = collectFromImports(existingLines);
 	const generatedFrom = collectFromImports(resultLines);
@@ -4818,15 +4879,52 @@ function spliceExtraImports(existingLines, resultLines) {
 			if (extra.length > 0) extraFromLines.push(`from ${mod} import ${extra.join(", ")}`);
 		}
 	}
-	const allExtra = [...extraSimple, ...extraFromLines];
+	const existingTs = collectTsImports(existingLines);
+	const generatedTs = collectTsImports(resultLines);
+	const extraTsLines = [];
+	for (const mod of existingTs.sideEffects) if (!generatedTs.sideEffects.has(mod)) extraTsLines.push(`import '${mod}';`);
+	for (const [mod, name] of existingTs.defaults) {
+		if (generatedTs.defaults.has(mod)) continue;
+		extraTsLines.push(`import ${name} from '${mod}';`);
+	}
+	for (const [mod, name] of existingTs.namespaces) if (!generatedTs.namespaces.has(mod)) extraTsLines.push(`import * as ${name} from '${mod}';`);
+	for (const [mod, existIds] of existingTs.named) {
+		const genIds = generatedTs.named.get(mod) ?? /* @__PURE__ */ new Set();
+		const genTypeIds = generatedTs.typeOnly.get(mod) ?? /* @__PURE__ */ new Set();
+		const extra = [...existIds].filter((id) => !genIds.has(id) && !genTypeIds.has(id));
+		if (extra.length > 0) extraTsLines.push(`import { ${extra.join(", ")} } from '${mod}';`);
+	}
+	for (const [mod, existIds] of existingTs.typeOnly) {
+		const genIds = generatedTs.typeOnly.get(mod) ?? /* @__PURE__ */ new Set();
+		const genNamedIds = generatedTs.named.get(mod) ?? /* @__PURE__ */ new Set();
+		const extra = [...existIds].filter((id) => !genIds.has(id) && !genNamedIds.has(id));
+		if (extra.length > 0) extraTsLines.push(`import type { ${extra.join(", ")} } from '${mod}';`);
+	}
+	const isPhpUseImport = (l) => /^use\s+[\w\\]+\\[\w\\]*(\s+as\s+\w+)?\s*;?$/.test(l);
+	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 allExtra = [
+		...extraSimple,
+		...extraFromLines,
+		...extraTsLines,
+		...extraPhpUse,
+		...extraRubyRequire
+	];
 	if (allExtra.length === 0) return;
+	const isImportStart = (l) => /^\s*import(\s|$)/.test(l) || /^from\s+/.test(l) || /^\s*use\s+[\w\\]/.test(l) || /^\s*require(_relative)?\s+['"]/.test(l);
 	let lastImportIdx = -1;
-	for (let i = 0; i < resultLines.length; i++) if (isSimpleImport(resultLines[i]) || /^from\s+/.test(resultLines[i])) {
+	for (let i = 0; i < resultLines.length; i++) {
+		if (!isImportStart(resultLines[i])) continue;
 		lastImportIdx = i;
-		if (resultLines[i].includes("(") && !resultLines[i].includes(")")) while (i + 1 < resultLines.length) {
+		if ((resultLines[i].match(/[({]/g) ?? []).length > (resultLines[i].match(/[)}]/g) ?? []).length) while (i + 1 < resultLines.length) {
 			i++;
 			lastImportIdx = i;
-			if (resultLines[i].includes(")")) break;
+			if ((resultLines[i].match(/[)}]/g) ?? []).length > 0) break;
 		}
 	}
 	if (lastImportIdx >= 0) resultLines.splice(lastImportIdx + 1, 0, ...allExtra);