@workos/oagen 0.19.3 → 0.19.5

package/dist/cli/index.mjs

@@ -4860,7 +4860,7 @@ function collectTsImports(lines) {
 * Mutates `resultLines` in place.
 */
 function spliceExtraImports(existingLines, resultLines) {
-	const isPythonSimpleImport = (l) => /^import\s+\w/.test(l) && !/\sfrom\s/.test(l);
+	const isPythonSimpleImport = (l) => /^import\s+\w/.test(l) && !/\sfrom\s/.test(l) && !/[{}]/.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));
@@ -4904,10 +4904,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,