python2ts 1.3.1 → 1.3.3

package/dist/{chunk-LNOL3BMB.js → chunk-TBFKEIAB.js}

@@ -262,6 +262,71 @@ function toJsName(pythonName) {
 }
 
 // src/transformer/index.ts
+var JS_RESERVED_KEYWORDS = /* @__PURE__ */ new Set([
+  // ECMAScript reserved words
+  "break",
+  "case",
+  "catch",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "in",
+  "instanceof",
+  "new",
+  "return",
+  "switch",
+  "this",
+  "throw",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  // ECMAScript 6+ reserved words
+  "class",
+  "const",
+  "enum",
+  "export",
+  "extends",
+  "import",
+  // Note: 'super' is intentionally NOT in this list as it's valid in JS class contexts
+  // Strict mode reserved words
+  "implements",
+  "interface",
+  "let",
+  "package",
+  "private",
+  "protected",
+  "public",
+  "static",
+  "yield",
+  // TypeScript reserved words
+  "abstract",
+  "as",
+  "async",
+  "await",
+  "declare",
+  "from",
+  "get",
+  "is",
+  "module",
+  "namespace",
+  "of",
+  "require",
+  "set",
+  "type"
+]);
+function escapeReservedKeyword(name) {
+  return JS_RESERVED_KEYWORDS.has(name) ? `_${name}` : name;
+}
 function createContext(source) {
   return {
     source,
@@ -521,13 +586,23 @@ function isDocstringNode(node, ctx) {
   const firstChild = children[0];
   if (firstChild?.name !== "String") return false;
   const text = getNodeText(firstChild, ctx.source);
-  return text.startsWith('"""') || text.startsWith("'''");
+  return isTripleQuotedString(text);
+}
+function isTripleQuotedString(text) {
+  let stripped = text;
+  if (/^[rRuU]/.test(text)) {
+    stripped = text.slice(1);
+  }
+  return stripped.startsWith('"""') || stripped.startsWith("'''");
 }
 function extractDocstringContent(node, ctx) {
   const children = getChildren(node);
   const stringNode = children[0];
   if (!stringNode) return "";
-  const text = getNodeText(stringNode, ctx.source);
+  let text = getNodeText(stringNode, ctx.source);
+  if (/^[rRuU]/.test(text)) {
+    text = text.slice(1);
+  }
   let content = text;
   if (content.startsWith('"""')) {
     content = content.slice(3, -3);
@@ -737,7 +812,7 @@ function transformNode(node, ctx) {
     case "None":
       return "null";
     case "VariableName":
-      return getNodeText(node, ctx.source);
+      return escapeReservedKeyword(getNodeText(node, ctx.source));
     case "CallExpression":
       return transformCallExpression(node, ctx);
     case "MemberExpression":
@@ -802,6 +877,9 @@ function transformNode(node, ctx) {
       return transformAssertStatement(node, ctx);
     case "YieldStatement":
       return transformYieldStatement(node, ctx);
+    case "Ellipsis":
+      ctx.usesRuntime.add("Ellipsis");
+      return "Ellipsis";
     /* v8 ignore next 2 -- fallback for unknown AST nodes @preserve */
     default:
       return getNodeText(node, ctx.source);
@@ -809,7 +887,22 @@ function transformNode(node, ctx) {
 }
 function transformScript(node, ctx) {
   const children = getChildren(node);
-  const statements = children.filter((child) => child.name !== "Comment" || getNodeText(child, ctx.source).trim() !== "").map((child) => {
+  let moduleDocstring = "";
+  let startIndex = 0;
+  const filteredChildren = children.filter(
+    (child) => child.name !== "Comment" || getNodeText(child, ctx.source).trim() !== ""
+  );
+  if (filteredChildren.length > 1) {
+    const firstChild = filteredChildren[0];
+    if (firstChild && isDocstringNode(firstChild, ctx)) {
+      const content = extractDocstringContent(firstChild, ctx);
+      const parsed = parseDocstring(content);
+      const jsdoc = toJSDoc(parsed, "");
+      moduleDocstring = jsdoc.replace(" */", " * @module\n */");
+      startIndex = 1;
+    }
+  }
+  const statements = filteredChildren.slice(startIndex).map((child) => {
     const transformed = transformNode(child, ctx);
     if (transformed === "") {
       return "";
@@ -819,6 +912,9 @@ function transformScript(node, ctx) {
     }
     return transformed;
   }).filter((s) => s.trim() !== "");
+  if (moduleDocstring) {
+    return moduleDocstring + "\n" + statements.join("\n");
+  }
   return statements.join("\n");
 }
 function transformExpressionStatement(node, ctx) {
@@ -1302,9 +1398,26 @@ function transformCallExpression(node, ctx) {
     case "reversed":
       ctx.usesRuntime.add("reversed");
       return `reversed(${args})`;
-    case "isinstance":
+    case "isinstance": {
       ctx.usesRuntime.add("isinstance");
+      if (argList) {
+        const argChildren = getChildren(argList).filter(
+          (c) => c.name !== "(" && c.name !== ")" && c.name !== ","
+        );
+        if (argChildren.length >= 2) {
+          const firstArg = argChildren[0];
+          const secondArg = argChildren[1];
+          if (firstArg && secondArg?.name === "TupleExpression") {
+            const tupleChildren = getChildren(secondArg).filter(
+              (c) => c.name !== "(" && c.name !== ")" && c.name !== ","
+            );
+            const typesCodes = tupleChildren.map((el) => transformNode(el, ctx));
+            return `isinstance(${transformNode(firstArg, ctx)}, [${typesCodes.join(", ")}])`;
+          }
+        }
+      }
       return `isinstance(${args})`;
+    }
     case "type":
       ctx.usesRuntime.add("type");
       return `type(${args})`;
@@ -1804,7 +1917,11 @@ function transformMethodCall(callee, args, ctx) {
     case "rjust":
       return `${objCode}.padStart(${args})`;
     // String split/join - join is special: "sep".join(arr) -> arr.join("sep")
+    // If the argument is a generator expression, convert to array with spread
     case "join":
+      if (args.includes("function*")) {
+        return `[...${args}].join(${objCode})`;
+      }
       return `(${args}).join(${objCode})`;
     case "split":
       return args ? `${objCode}.split(${args})` : `${objCode}.split(/\\s+/)`;
@@ -2005,15 +2122,23 @@ function transformMemberExpression(node, ctx) {
     if (text.includes(":")) {
       return transformSliceFromMember(obj, children, ctx);
     }
-    const indexElements = children.filter((c) => c.name !== "[" && c.name !== "]" && c !== obj);
-    const index = indexElements[0];
-    if (!index) return `${objCode}[]`;
-    const indexCode = transformNode(index, ctx);
-    if (isNegativeIndexLiteral(index, ctx)) {
-      ctx.usesRuntime.add("at");
-      return `at(${objCode}, ${indexCode})`;
+    const indexElements = children.filter(
+      (c) => c.name !== "[" && c.name !== "]" && c.name !== "," && c !== obj
+    );
+    if (indexElements.length === 0) return `${objCode}[]`;
+    if (indexElements.length === 1) {
+      const index = indexElements[0];
+      if (!index) return `${objCode}[]`;
+      const indexCode = transformNode(index, ctx);
+      if (isNegativeIndexLiteral(index, ctx)) {
+        ctx.usesRuntime.add("at");
+        return `at(${objCode}, ${indexCode})`;
+      }
+      return `${objCode}[${indexCode}]`;
     }
-    return `${objCode}[${indexCode}]`;
+    ctx.usesRuntime.add("tuple");
+    const indices = indexElements.map((el) => transformNode(el, ctx));
+    return `${objCode}[tuple(${indices.join(", ")})]`;
   } else {
     const prop = children[children.length - 1];
     if (!prop) return getNodeText(node, ctx.source);
@@ -3095,7 +3220,7 @@ function extractParamNames(node, source) {
     if (child.name === "*" || getNodeText(child, source) === "*") {
       const nextChild = children[i + 1];
       if (nextChild?.name === "VariableName") {
-        names.push(getNodeText(nextChild, source));
+        names.push(escapeReservedKeyword(getNodeText(nextChild, source)));
         i += 2;
         continue;
       }
@@ -3105,7 +3230,7 @@ function extractParamNames(node, source) {
     if (child.name === "**" || getNodeText(child, source) === "**") {
       const nextChild = children[i + 1];
       if (nextChild?.name === "VariableName") {
-        names.push(getNodeText(nextChild, source));
+        names.push(escapeReservedKeyword(getNodeText(nextChild, source)));
         i += 2;
         continue;
       }
@@ -3113,7 +3238,7 @@ function extractParamNames(node, source) {
       continue;
     }
     if (child.name === "VariableName") {
-      names.push(getNodeText(child, source));
+      names.push(escapeReservedKeyword(getNodeText(child, source)));
       i++;
       continue;
     }
@@ -3121,7 +3246,7 @@ function extractParamNames(node, source) {
       const paramChildren = getChildren(child);
       const name = paramChildren.find((c) => c.name === "VariableName");
       if (name) {
-        names.push(getNodeText(name, source));
+        names.push(escapeReservedKeyword(getNodeText(name, source)));
       }
       i++;
       continue;
@@ -3673,8 +3798,10 @@ function transformDecoratedStatement(node, ctx) {
     const returnTypeStr = returnType ? `: ${returnType === "null" ? "void" : returnType}` : "";
     return `function ${funcName}(${params})${returnTypeStr}`;
   }
+  const indent = "  ".repeat(ctx.indentLevel);
+  const { jsdoc, skipFirstStatement } = body ? extractDocstringFromBody(body, ctx, indent) : { jsdoc: null, skipFirstStatement: false };
   ctx.insideFunctionBody++;
-  const bodyCode = body ? transformBody(body, ctx, false, paramNames) : "";
+  const bodyCode = body ? transformBody(body, ctx, skipFirstStatement, paramNames) : "";
   ctx.insideFunctionBody--;
   let funcExpr = `function ${funcName}(${params}) {
 ${bodyCode}
@@ -3688,7 +3815,9 @@ ${bodyCode}
       funcExpr = `${dec.name}(${funcExpr})`;
     }
   }
-  return `const ${funcName} = ${funcExpr}`;
+  const declaration = `const ${funcName} = ${funcExpr}`;
+  return jsdoc ? `${jsdoc}
+${declaration}` : declaration;
 }
 function transformDecoratedClass(classDef, decorators, ctx) {
   const dataclassDecorator = decorators.find(
@@ -4239,7 +4368,7 @@ function transformParamList(node, ctx) {
   const parseParam = (startIndex) => {
     const child = children[startIndex];
     if (child?.name !== "VariableName") return null;
-    const nameCode = getNodeText(child, ctx.source);
+    const nameCode = escapeReservedKeyword(getNodeText(child, ctx.source));
     let tsType = null;
     let defaultValue = null;
     let offset = 1;
@@ -4281,7 +4410,7 @@ function transformParamList(node, ctx) {
     if (child.name === "*" || getNodeText(child, ctx.source) === "*") {
       const nextChild = children[i + 1];
       if (nextChild?.name === "VariableName") {
-        const name = getNodeText(nextChild, ctx.source);
+        const name = escapeReservedKeyword(getNodeText(nextChild, ctx.source));
         const typeChild = children[i + 2];
         if (typeChild?.name === "TypeDef") {
           const tsType = extractTypeAnnotation(typeChild, ctx);
@@ -4301,7 +4430,7 @@ function transformParamList(node, ctx) {
     if (child.name === "**" || getNodeText(child, ctx.source) === "**") {
       const nextChild = children[i + 1];
       if (nextChild?.name === "VariableName") {
-        kwargsParam = getNodeText(nextChild, ctx.source);
+        kwargsParam = escapeReservedKeyword(getNodeText(nextChild, ctx.source));
         i += 2;
         continue;
       }
@@ -4326,7 +4455,7 @@ function transformParamList(node, ctx) {
       const typeDef = paramChildren.find((c) => c.name === "TypeDef");
       const defaultVal = paramChildren[paramChildren.length - 1];
       if (name) {
-        const nameCode = getNodeText(name, ctx.source);
+        const nameCode = escapeReservedKeyword(getNodeText(name, ctx.source));
         const tsType = extractTypeAnnotation(typeDef, ctx);
         let defaultValue = null;
         if (defaultVal && name !== defaultVal && defaultVal.name !== "TypeDef") {

package/dist/cli/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   transpileAsync
-} from "../chunk-LNOL3BMB.js";
+} from "../chunk-TBFKEIAB.js";
 
 // src/cli/index.ts
 import { parseArgs } from "util";

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   transpile,
   transpileAsync,
   walkTree
-} from "./chunk-LNOL3BMB.js";
+} from "./chunk-TBFKEIAB.js";
 export {
   debugTree,
   formatCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "python2ts",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "AST-based Python to TypeScript transpiler. Convert Python code to clean, idiomatic TypeScript with full type preservation.",
   "homepage": "https://sebastian-software.github.io/python2ts/",
   "repository": {
@@ -53,7 +53,7 @@
     "eslint": "^9.39.2",
     "prettier": "^3.8.0",
     "typescript-eslint": "^8.53.1",
-    "pythonlib": "2.0.1"
+    "pythonlib": "2.0.3"
   },
   "devDependencies": {
     "tsup": "^8.5.1",