depyo 1.2.3 → 1.2.5

package/lib/ast/ast_node.js

@@ -1120,10 +1120,30 @@ class ASTStore extends ASTNode {
                 }
             }
             
-            let methodBody = codeObject.SourceCode.codeFragment();
             if (inLambda) {
-                result.lastLineAppend(methodBody);
+                // issue #12: lambda body must render as an expression. Going
+                // through ASTNodeList.codeFragment would emit "pass" for a single
+                // `return None` (emptyBlock heuristic) and crash on a truly empty
+                // body (3.12/3.13 RETURN_CONST None). Render the single ASTReturn
+                // directly via its inLambda path; fall back to "None".
+                const stmts = (codeObject.SourceCode?.list || []).filter(n => n);
+                if (stmts.length === 1 && stmts[0] instanceof ASTReturn) {
+                    stmts[0].inLambda = true;
+                    const frag = stmts[0].codeFragment();
+                    const body = (frag && frag.toString().trim()) || "None";
+                    result.lastLineAppend(body);
+                } else if (stmts.length > 0) {
+                    const methodBody = codeObject.SourceCode.codeFragment();
+                    if (methodBody && methodBody.toString().trim()) {
+                        result.lastLineAppend(methodBody);
+                    } else {
+                        result.lastLineAppend("None");
+                    }
+                } else {
+                    result.lastLineAppend("None");
+                }
             } else {
+                let methodBody = codeObject.SourceCode.codeFragment();
                 const bodyHasContent = methodBody && methodBody.toString().trim().length;
                 const hasGlobals = codeObject.Globals && codeObject.Globals.size > 0;
                 if (bodyHasContent) {

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.3",
+  "version": "1.2.5",
   "description": "Python bytecode decompiler (Python 1.0–3.15) implemented in Node.js",
   "bin": {
     "depyo": "./depyo.js"