@abaplint/transpiler-cli 2.5.74 → 2.5.76

package/build/bundle.js

@@ -8582,7 +8582,7 @@ const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@a
 class CallFunction {
     getMatcher() {
         const starting = (0, combi_1.seq)("STARTING NEW TASK", expressions_1.SimpleSource2);
-        const update = (0, combi_1.str)("IN UPDATE TASK");
+        const update = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.str)("IN UPDATE TASK"));
         const unit = (0, combi_1.seq)("UNIT", expressions_1.Source);
         const background = (0, combi_1.verNot)(version_1.Version.Cloud, (0, combi_1.seq)("IN BACKGROUND", (0, combi_1.altPrio)("TASK", unit)));
         const calling = (0, combi_1.seq)("CALLING", expressions_1.MethodName, "ON END OF TASK");
@@ -46251,7 +46251,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.97.2";
+        return "2.97.4";
     }
     getDDICReferences() {
         return this.references;
@@ -63084,7 +63084,7 @@ class SQLEscapeHostVariables extends _abap_rule_1.ABAPRule {
                 || s.get() instanceof Statements.SelectLoop
                 || s.get() instanceof Statements.InsertDatabase
                 || s.get() instanceof Statements.DeleteDatabase) {
-                for (const o of s.findAllExpressions(Expressions.SQLSource)) {
+                for (const o of s.findAllExpressionsMulti([Expressions.SQLSource, Expressions.SQLSourceSimple])) {
                     const first = o.getFirstChild();
                     if (((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.Source && first.getChildren()[0].get() instanceof Expressions.FieldChain)
                         || ((first === null || first === void 0 ? void 0 : first.get()) instanceof Expressions.SimpleSource3 && first.getChildren()[0].get() instanceof Expressions.FieldChain)) {
@@ -63310,6 +63310,7 @@ const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@ab
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
 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");
 class StrictSQLConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.StrictSQLConf = StrictSQLConf;
@@ -63327,8 +63328,10 @@ class StrictSQL extends _abap_rule_1.ABAPRule {
 
 https://help.sap.com/doc/abapdocu_751_index_htm/7.51/en-us/abenopensql_strict_mode_750.htm
 
-Also see separate rule sql_escape_host_variables`,
-            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Syntax],
+Also see separate rule sql_escape_host_variables
+
+Activates from v750 and up`,
+            tags: [_irule_1.RuleTag.Upport, _irule_1.RuleTag.Syntax, _irule_1.RuleTag.Quickfix],
         };
     }
     getConfig() {
@@ -63343,7 +63346,7 @@ Also see separate rule sql_escape_host_variables`,
         if (type === "INTF" || type === "TYPE") {
             return [];
         }
-        if (this.reg.getConfig().getVersion() < version_1.Version.v740sp02
+        if (this.reg.getConfig().getVersion() < version_1.Version.v750
             && this.reg.getConfig().getVersion() !== version_1.Version.Cloud) {
             return [];
         }
@@ -63352,16 +63355,24 @@ Also see separate rule sql_escape_host_variables`,
                 || s.get() instanceof Statements.SelectLoop) {
                 const expr = s.findDirectExpression(Expressions.Select);
                 const where = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLCond);
+                const order = expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLOrderBy);
                 const into = (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoStructure))
                     || (expr === null || expr === void 0 ? void 0 : expr.findDirectExpression(Expressions.SQLIntoTable));
                 if (into === undefined || where === undefined) {
                     continue;
                 }
-                if (where.getFirstToken().getStart().isBefore(into.getFirstToken().getStart())) {
+                else if (where.getFirstToken().getStart().isBefore(into.getFirstToken().getStart())) {
                     continue;
                 }
+                const fix1 = edit_helper_1.EditHelper.deleteRange(file, into.getFirstToken().getStart(), into.getLastToken().getEnd());
+                let last = where.getLastToken();
+                if (order && order.getLastToken().getEnd().isAfter(last.getEnd())) {
+                    last = order.getLastToken();
+                }
+                const fix2 = edit_helper_1.EditHelper.insertAt(file, last.getEnd(), " " + into.concatTokens());
+                const fix = edit_helper_1.EditHelper.merge(fix2, fix1);
                 const message = "INTO/APPENDING must be last in strict SQL";
-                const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity);
+                const issue = issue_1.Issue.atToken(file, s.getFirstToken(), message, this.getMetadata().key, this.conf.severity, fix);
                 issues.push(issue);
                 break;
             }
@@ -68837,17 +68848,24 @@ class MethodSourceTranspiler {
             }
             else if (child.get() instanceof core_1.Expressions.Dynamic && (nextChild === null || nextChild === void 0 ? void 0 : nextChild.concatTokens()) === "=>") {
                 const second = child.getChildren()[1];
-                const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_CLASS'", child.getFirstToken(), true);
+                const illegalClass = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_CLASS'", child.getFirstToken(), true);
+                const illegalMethod = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_METHOD'", child.getFirstToken(), true);
                 if (second.get() instanceof core_1.Expressions.FieldChain && second instanceof core_1.Nodes.ExpressionNode) {
                     const t = new _1.FieldChainTranspiler(true).transpile(second, traversal).getCode();
                     call = traversal.lookupClassOrInterface(t, child.getFirstToken(), true);
-                    ret.appendString(`if (${call} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
-                    ret.appendString(`if (${call} === undefined) { throw new ${lookupException}(); }\n`);
+                    ret.appendString(`if (${call} === undefined && ${illegalClass} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
+                    ret.appendString(`if (${call} === undefined) { throw new ${illegalClass}(); }\n`);
                 }
                 else if (second.get() instanceof core_1.Expressions.Constant) {
                     call = traversal.lookupClassOrInterface(second.getFirstToken().getStr(), child.getFirstToken(), true);
-                    ret.appendString(`if (${call} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
-                    ret.appendString(`if (${call} === undefined) { throw new ${lookupException}(); }\n`);
+                    ret.appendString(`if (${call} === undefined && ${illegalClass} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
+                    ret.appendString(`if (${call} === undefined) { throw new ${illegalClass}(); }\n`);
+                    const name = children[i + 2];
+                    if (name.get() instanceof core_1.Expressions.AttributeName) {
+                        const suffix = "." + name.concatTokens().toLowerCase();
+                        ret.appendString(`if (${call + suffix} === undefined && ${illegalMethod} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_METHOD not found"; }\n`);
+                        ret.appendString(`if (${call + suffix} === undefined) { throw new ${illegalMethod}(); }\n`);
+                    }
                 }
                 else {
                     ret.appendString("MethodSourceTranspiler-Unexpected");
@@ -91346,7 +91364,7 @@ function loadLib(config) {
                 count++;
             }
         }
-        console.log(count + " files added from lib");
+        console.log("\t" + count + " files added from lib");
         if (cleanupFolder === true) {
             file_operations_1.FileOperations.deleteFolderRecursive(dir);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.74",
+  "version": "2.5.76",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,12 +25,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.74",
+    "@abaplint/transpiler": "^2.5.76",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
     "@types/node": "^18.15.11",
-    "@abaplint/core": "^2.97.2",
+    "@abaplint/core": "^2.97.4",
     "progress": "^2.0.3",
     "webpack": "^5.77.0",
     "webpack-cli": "^5.0.1",