@abaplint/transpiler-cli 2.13.21 → 2.13.22

package/build/bundle.js

@@ -15511,7 +15511,7 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class Return {
     getMatcher() {
-        return (0, combi_1.seq)((0, combi_1.str)("RETURN"), (0, combi_1.optPrio)((0, combi_1.ver)(version_1.Version.v758, expressions_1.Source)));
+        return (0, combi_1.seq)((0, combi_1.str)("RETURN"), (0, combi_1.optPrio)((0, combi_1.ver)(version_1.Version.v758, expressions_1.Source, version_1.Version.OpenABAP)));
     }
 }
 exports.Return = Return;
@@ -55154,7 +55154,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.119.12";
+        return "2.119.13";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -77223,10 +77223,14 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
+const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
+const ddic_1 = __webpack_require__(/*! ../ddic */ "./node_modules/@abaplint/core/build/src/ddic.js");
 class UnnecessaryChainingConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
         this.maxIssuesPerFile = 10;
+        /** Ignore global exception classes */
+        this.ignoreExceptions = true;
     }
 }
 exports.UnnecessaryChainingConf = UnnecessaryChainingConf;
@@ -77252,8 +77256,15 @@ class UnnecessaryChaining extends _abap_rule_1.ABAPRule {
     setConfig(conf) {
         this.conf = conf;
     }
-    runParsed(file) {
+    runParsed(file, obj) {
         const issues = [];
+        if (obj instanceof objects_1.Class) {
+            const definition = obj.getClassDefinition();
+            const ddic = new ddic_1.DDIC(this.reg);
+            if (this.conf.ignoreExceptions === true && ddic.isException(definition, obj)) {
+                return issues;
+            }
+        }
         let max = this.getConfig().maxIssuesPerFile;
         if (max === undefined || max < 1) {
             max = 10;
@@ -87032,9 +87043,25 @@ const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abap
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 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);
@@ -87049,7 +87076,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];
@@ -87111,26 +87138,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 {}
 })()`);
             }
         }
@@ -91796,6 +91823,7 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
 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;
@@ -91813,6 +91841,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-cli",
-  "version": "2.13.21",
+  "version": "2.13.22",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.119.12",
-    "@abaplint/transpiler": "^2.13.21",
+    "@abaplint/core": "^2.119.13",
+    "@abaplint/transpiler": "^2.13.22",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.12.2",
     "@types/progress": "^2.0.7",