depyo 1.2.2 → 1.2.4

package/lib/handlers/function_calls.js

@@ -26,10 +26,32 @@ const INTRINSIC_2 = Object.freeze({
 });
 
 function handleKwNamesA() {
-    let astNode = new AST.ASTKwNamesMap();
-    let keys = this.code.Current.ConstantObject;
-    for (let idx = keys.length - 1; idx >= 0; idx--) {
-        astNode.add(keys[idx], this.dataStack.pop());
+    // CPython 3.11/3.12: KW_NAMES(consti) stores a reference to co_consts[consti],
+    // which is guaranteed to be a tuple of strings. The following PRECALL/CALL pair
+    // pops that many trailing positional slots and rebinds them as kwargs.
+    //
+    // ConstantObject here is a PythonObject (Py_Tuple or Py_SmallTuple) — NOT a
+    // raw JS array — and each element is a PythonObject (Py_Unicode/Py_String).
+    // The original code did `keys.length - 1` (works via PythonObject.length) but
+    // then `keys[idx]` returned undefined because indexed access does not reach
+    // into `.Value`. The result was an ASTKwNamesMap with `undefined` keys and a
+    // shifted stack that mangled the next CALL into `##ERROR##(func, =val)`.
+    // GitHub depyo.js issue #11.
+    const constObj = this.code.Current.ConstantObject;
+    let keyObjs = [];
+    if (constObj && (constObj.ClassName === 'Py_Tuple' || constObj.ClassName === 'Py_SmallTuple') && Array.isArray(constObj.Value)) {
+        keyObjs = constObj.Value;
+    }
+
+    const toKwName = (v) => {
+        const raw = v?.Value ?? v?.name ?? v;
+        const name = typeof raw === 'string' ? raw : String(raw);
+        return new AST.ASTName(name.replace(/^['"]|['"]$/g, ''));
+    };
+
+    const astNode = new AST.ASTKwNamesMap();
+    for (let idx = keyObjs.length - 1; idx >= 0; idx--) {
+        astNode.add(toKwName(keyObjs[idx]), this.dataStack.pop());
     }
 
     astNode.line = this.code.Current.LineNo;
@@ -177,9 +199,16 @@ function handleInstrumentedCallA() {
         let kwparams_map = this.dataStack.top();
         if (kwparams_map instanceof AST.ASTKwNamesMap) {
             this.dataStack.pop();
+            // CPython 3.11/3.12: KW_NAMES sets the trailing-keyword count for the
+            // next CALL. CALL's oparg is the total positional+keyword count packed
+            // into the low byte (`pparams` here); the high byte (`kwparams`) is
+            // always zero for these versions. Each keyword consumed by KW_NAMES
+            // already popped its value from the stack, so the CALL must pop only
+            // (total - kwcount) positional slots — i.e. decrement `pparams`, not
+            // `kwparams`. depyo.js issue #11.
             for (let kwParam of kwparams_map.values) {
                 kwparamList.unshift(kwParam);
-                kwparams--;
+                pparams--;
             }
         }
     }

package/lib/handlers/misc_other.js

@@ -1116,17 +1116,14 @@ function handleReturnValue() {
 
     if (!this.currentCase && [AST.ASTBlock.BlockType.If, AST.ASTBlock.BlockType.Else].includes(this.curBlock.blockType)
         && (this.object.Reader.versionCompare(2, 6) >= 0)) {
-        let prev = this.curBlock;
+        // issue #3: do NOT fold `if cond: return x` into `return cond and x`.
+        // The closing jump for a real if-return is POP_JUMP_IF_FALSE (non-sticky)
+        // and the rewrite drops the `x` return path when x is falsy (e.g. 0, None, "").
+        // Legitimate short-circuit `cond and x` is already handled via JUMP_IF_FALSE_OR_POP
+        // in control_flow_jumps, so keeping the if-block here is always correct.
+        const prev = this.curBlock;
         this.blocks.pop();
         this.curBlock = this.blocks.top();
-        if (
-            prev instanceof AST.ASTCondBlock &&
-            prev.nodes.length == 1 &&
-            prev.line == value.line
-        ) {
-            prev = new AST.ASTReturn(new AST.ASTBinary(prev.condition, value, prev.negative ? AST.ASTBinary.BinOp.LogicalOr : AST.ASTBinary.BinOp.LogicalAnd));
-        }
-
         this.curBlock.append(prev);
 
         if ([this.OpCodes.JUMP_ABSOLUTE_A, this.OpCodes.JUMP_FORWARD_A].includes(this.code.Next?.OpCodeID)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depyo",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Python bytecode decompiler (Python 1.0–3.15) implemented in Node.js",
   "bin": {
     "depyo": "./depyo.js"