@abaplint/transpiler 2.13.21 → 2.13.22

package/build/src/statements/assign.d.ts

@@ -3,5 +3,6 @@ import { IStatementTranspiler } from "./_statement_transpiler";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class AssignTranspiler implements IStatementTranspiler {
+    private tableExpressionSafeSource;
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
 }

package/build/src/statements/assign.js

@@ -6,9 +6,25 @@ const abaplint = require("@abaplint/core");
 const expressions_1 = require("../expressions");
 const chunk_1 = require("../chunk");
 class AssignTranspiler {
+    tableExpressionSafeSource(node, code) {
+        if (node?.findFirstExpression(abaplint.Expressions.TableExpression) === undefined) {
+            return code;
+        }
+        return `(await (async () => {
+  try {
+    return ${code};
+  } catch (error) {
+    if (abap.isLineNotFound(error)) {
+      return undefined;
+    }
+    throw error;
+  }
+})())`;
+    }
     transpile(node, traversal) {
         const assignSource = node.findDirectExpression(abaplint.Expressions.AssignSource);
-        const sources = assignSource?.findDirectExpressionsMulti([abaplint.Expressions.Source, abaplint.Expressions.SimpleSource3]).map(e => new expressions_1.SourceTranspiler(false).transpile(e, traversal).getCode()) || [];
+        const sourceExpressions = assignSource?.findDirectExpressionsMulti([abaplint.Expressions.Source, abaplint.Expressions.SimpleSource3]) || [];
+        const sources = sourceExpressions.map(e => this.tableExpressionSafeSource(e, new expressions_1.SourceTranspiler(false).transpile(e, traversal).getCode()));
         let fsTarget = node.findDirectExpression(abaplint.Expressions.FSTarget);
         if (fsTarget?.getFirstChild()?.get() instanceof abaplint.Expressions.InlineFS) {
             fsTarget = fsTarget.findFirstExpression(abaplint.Expressions.TargetFieldSymbol);
@@ -23,7 +39,7 @@ class AssignTranspiler {
         if (sources.length !== 0
             && assignSource?.findDirectExpression(abaplint.Expressions.Dynamic) === undefined) {
             // Check for struct-(var) pattern: dynamic component access via FieldLength after -
-            const sourceExprForCheck = assignSource?.findDirectExpressionsMulti([abaplint.Expressions.Source, abaplint.Expressions.SimpleSource3])[0];
+            const sourceExprForCheck = sourceExpressions[0];
             const fieldChainForCheck = sourceExprForCheck?.findFirstExpression(abaplint.Expressions.FieldChain);
             const fcChildren = fieldChainForCheck?.getChildren() ?? [];
             const lastFC = fcChildren[fcChildren.length - 1];
@@ -85,26 +101,26 @@ class AssignTranspiler {
                 const firstFirst = first.getChildren()[1];
                 if (firstFirst?.get() instanceof abaplint.Expressions.Constant) {
                     const s = firstFirst.getFirstToken().getStr().toLowerCase().match(/\w+/)?.toString();
-                    options.push(`dynamicSource: (() => {
-  try { return ${s}; } catch {}
-  try { return this.${s}; } catch {}
+                    options.push(`dynamicSource: (() => {
+  try { return ${s}; } catch {}
+  try { return this.${s}; } catch {}
 })()`);
                 }
                 else if (firstFirst?.get() instanceof abaplint.Expressions.FieldChain && firstFirst instanceof abaplint.Nodes.ExpressionNode) {
                     const code = new expressions_1.FieldChainTranspiler(true).transpile(firstFirst, traversal).getCode();
-                    options.push(`dynamicSource: (() => {
-  const name = ${code}.toLowerCase().replace(/[~\\/]/g, "$").match(/[\\w\\$\\/]+/)[0];
-  try { return eval(name); } catch {}
-  try { return eval("this." + name); } catch {}
+                    options.push(`dynamicSource: (() => {
+  const name = ${code}.toLowerCase().replace(/[~\\/]/g, "$").match(/[\\w\\$\\/]+/)[0];
+  try { return eval(name); } catch {}
+  try { return eval("this." + name); } catch {}
 })()`);
                 }
             }
             else if (first?.get() instanceof abaplint.Expressions.Source && first instanceof abaplint.Nodes.ExpressionNode) {
                 //        const name = first.concatTokens().toLowerCase();
                 const name = new expressions_1.SourceTranspiler().transpile(first, traversal).getCode();
-                options.push(`dynamicSource: (() => {
-  try { return ${name}; } catch {}
-  try { return this.${name}; } catch {}
+                options.push(`dynamicSource: (() => {
+  try { return ${name}; } catch {}
+  try { return this.${name}; } catch {}
 })()`);
             }
         }

package/build/src/statements/return.js

@@ -7,6 +7,7 @@ const chunk_1 = require("../chunk");
 const unique_identifier_1 = require("../unique_identifier");
 class ReturnTranspiler {
     transpile(node, traversal) {
+        const source = node.findDirectExpression(abaplint.Expressions.Source);
         let extra = "";
         const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
         const vars = scope?.getData().vars;
@@ -24,6 +25,14 @@ class ReturnTranspiler {
             && scope?.getIdentifier().sname.toLowerCase() === "constructor") {
             extra = " this";
         }
+        // RETURN <source> assigns to the RETURNING parameter and exits immediately.
+        if (source && extra !== " this") {
+            return new chunk_1.Chunk().append(pre
+                + extra.trimStart()
+                + `.set(${traversal.traverse(source).getCode()});\nreturn`
+                + extra
+                + ";", node, traversal);
+        }
         return new chunk_1.Chunk().append(pre + "return" + extra + ";", node, traversal);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.21",
+  "version": "2.13.22",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,7 +29,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.119.12",
+    "@abaplint/core": "^2.119.13",
     "source-map": "^0.7.6"
   },
   "devDependencies": {