python2ts 1.1.0 → 1.2.0

package/dist/{chunk-65ZOMVMA.js → chunk-MEHQCUVO.js}

@@ -253,6 +253,23 @@ function declareVariable(ctx, name) {
     currentScope.add(name);
   }
 }
+function stripOuterParens(code) {
+  const trimmed = code.trim();
+  if (trimmed.startsWith("(") && trimmed.endsWith(")")) {
+    const inner = trimmed.slice(1, -1);
+    if (/(?<![!=<>])=(?!=)/.test(inner)) {
+      return code;
+    }
+    let depth = 0;
+    for (let i = 0; i < trimmed.length; i++) {
+      if (trimmed[i] === "(") depth++;
+      else if (trimmed[i] === ")") depth--;
+      if (depth === 0 && i < trimmed.length - 1) return code;
+    }
+    return inner;
+  }
+  return code;
+}
 function containsYield(node) {
   if (node.name === "YieldStatement" || node.name === "YieldExpression") {
     return true;
@@ -1076,7 +1093,7 @@ function transformConditionalExpression(node, ctx) {
     const condition = exprs[1];
     const falseExpr = exprs[2];
     if (trueExpr && condition && falseExpr) {
-      const condCode = transformNode(condition, ctx);
+      const condCode = stripOuterParens(transformNode(condition, ctx));
       const trueCode = transformNode(trueExpr, ctx);
       const falseCode = transformNode(falseExpr, ctx);
       return `(${condCode} ? ${trueCode} : ${falseCode})`;
@@ -1931,7 +1948,7 @@ function transformIfStatement(node, ctx) {
       const condition = children[i + 1];
       const body = children.find((c, idx) => idx > i && c.name === "Body");
       if (condition && body) {
-        const condCode = transformNode(condition, ctx);
+        const condCode = stripOuterParens(transformNode(condition, ctx));
         const bodyCode = transformBody(body, ctx);
         parts.push(`if (${condCode}) {
 ${bodyCode}
@@ -1941,7 +1958,7 @@ ${bodyCode}
       const condition = children[i + 1];
       const body = children.find((c, idx) => idx > i + 1 && c.name === "Body");
       if (condition && body) {
-        const condCode = transformNode(condition, ctx);
+        const condCode = stripOuterParens(transformNode(condition, ctx));
         const bodyCode = transformBody(body, ctx);
         parts.push(` else if (${condCode}) {
 ${bodyCode}
@@ -1967,7 +1984,7 @@ function transformWhileStatement(node, ctx) {
   );
   const body = children.find((c) => c.name === "Body");
   if (!condition || !body) return getNodeText(node, ctx.source);
-  const condCode = transformNode(condition, ctx);
+  const condCode = stripOuterParens(transformNode(condition, ctx));
   const bodyCode = transformBody(body, ctx);
   return `while (${condCode}) {
 ${bodyCode}
@@ -2437,13 +2454,20 @@ ${baseIndent}}`;
     const firstExcept = exceptBodies[0];
     if (firstExcept) {
       const catchVar = firstExcept.varName || "e";
-      const catchBody = transformBody(firstExcept.body, ctx);
+      let catchBody = transformBody(firstExcept.body, ctx);
+      const isEmpty = !catchBody.trim();
+      if (isEmpty) {
+        const innerIndent = "  ".repeat(ctx.indentLevel + 1);
+        const exceptionComment = firstExcept.type ? ` - ${firstExcept.type} expected` : "";
+        catchBody = `${innerIndent}// Intentionally empty${exceptionComment}`;
+      }
+      const catchClause = isEmpty && !firstExcept.varName ? "catch" : `catch (${catchVar})`;
       if (exceptBodies.length === 1 && !firstExcept.type) {
-        result += ` catch (${catchVar}) {
+        result += ` ${catchClause} {
 ${catchBody}
 ${baseIndent}}`;
       } else if (exceptBodies.length === 1) {
-        result += ` catch (${catchVar}) {
+        result += ` ${catchClause} {
 ${catchBody}
 ${baseIndent}}`;
       } else {
@@ -4511,6 +4535,11 @@ function transformYieldStatement(node, ctx) {
 
 // src/generator/index.ts
 import * as prettier from "prettier";
+import { ESLint } from "eslint";
+import tseslint from "typescript-eslint";
+import { writeFileSync, readFileSync, mkdtempSync, rmSync } from "fs";
+import { join } from "path";
+import { tmpdir } from "os";
 var defaultOptions = {
   includeRuntime: true,
   runtimeImportPath: "pythonlib"
@@ -4655,9 +4684,81 @@ function buildRuntimeImports(usedFunctions, basePath) {
 function transpile(python, options = {}) {
   return generate(python, options).code;
 }
+function createEslintConfig(tempDir) {
+  return {
+    cwd: tempDir,
+    fix: true,
+    overrideConfigFile: true,
+    overrideConfig: [
+      // TypeScript-ESLint strict + stylistic presets (type-checked)
+      ...tseslint.configs.strictTypeChecked,
+      ...tseslint.configs.stylisticTypeChecked,
+      // Custom configuration
+      {
+        files: ["**/*.ts"],
+        languageOptions: {
+          parserOptions: {
+            projectService: true,
+            tsconfigRootDir: tempDir
+          }
+        },
+        rules: {
+          // ESLint core rules (auto-fixable, not in typescript-eslint presets)
+          "prefer-const": "error",
+          "prefer-arrow-callback": "error",
+          "prefer-template": "error",
+          "prefer-rest-params": "error",
+          "prefer-spread": "error",
+          curly: "error",
+          "no-lonely-if": "error",
+          // Disable rules that don't make sense for generated code
+          "@typescript-eslint/explicit-function-return-type": "off",
+          "@typescript-eslint/explicit-module-boundary-types": "off",
+          "@typescript-eslint/no-explicit-any": "off",
+          "@typescript-eslint/no-unsafe-assignment": "off",
+          "@typescript-eslint/no-unsafe-member-access": "off",
+          "@typescript-eslint/no-unsafe-call": "off",
+          "@typescript-eslint/no-unsafe-return": "off",
+          "@typescript-eslint/no-unsafe-argument": "off"
+        }
+      }
+    ]
+  };
+}
+async function applyTypedEslintFixes(code) {
+  const tempDir = mkdtempSync(join(tmpdir(), "python2ts-"));
+  try {
+    const tsconfigPath = join(tempDir, "tsconfig.json");
+    writeFileSync(
+      tsconfigPath,
+      JSON.stringify({
+        compilerOptions: {
+          target: "ES2024",
+          module: "ESNext",
+          moduleResolution: "bundler",
+          strict: true,
+          skipLibCheck: true,
+          noEmit: true
+        },
+        include: ["*.ts"]
+      })
+    );
+    const tempFile = join(tempDir, "output.ts");
+    writeFileSync(tempFile, code);
+    const eslint = new ESLint(createEslintConfig(tempDir));
+    const results = await eslint.lintFiles(["output.ts"]);
+    if (results.length > 0 && results[0]?.output) {
+      return results[0].output;
+    }
+    return readFileSync(tempFile, "utf-8");
+  } finally {
+    rmSync(tempDir, { recursive: true, force: true });
+  }
+}
 async function formatCode(code) {
   try {
-    return await prettier.format(code, prettierOptions);
+    const eslintFixed = await applyTypedEslintFixes(code);
+    return await prettier.format(eslintFixed, prettierOptions);
   } catch {
     return code;
   }
@@ -4703,4 +4804,4 @@ export {
 /* v8 ignore next -- bare yield statement @preserve */
 /* v8 ignore next 2 -- fallback for future/unknown runtime functions @preserve */
 /* v8 ignore start -- async wrappers tested via CLI @preserve */
-//# sourceMappingURL=chunk-65ZOMVMA.js.map
+//# sourceMappingURL=chunk-MEHQCUVO.js.map