@abaplint/transpiler-cli 2.5.57 → 2.5.58

package/build/bundle.js

@@ -8376,13 +8376,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AuthorityCheck = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
-const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class AuthorityCheck {
     getMatcher() {
         const field = (0, combi_1.seq)("FIELD", expressions_1.Source);
         const id = (0, combi_1.seq)("ID", expressions_1.Source, (0, combi_1.alt)(field, "DUMMY"));
         const ret = (0, combi_1.seq)("AUTHORITY-CHECK OBJECT", expressions_1.Source, (0, combi_1.opt)((0, combi_1.seq)("FOR USER", expressions_1.Source)), (0, combi_1.plus)(id));
-        return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
+        return ret;
     }
 }
 exports.AuthorityCheck = AuthorityCheck;
@@ -12720,8 +12719,8 @@ class MethodDef {
         const result = (0, combi_1.seq)("RESULT", expressions_1.MethodParamName);
         const link = (0, combi_1.seq)("LINK", expressions_1.MethodParamName);
         const full = (0, combi_1.seq)("FULL", expressions_1.MethodParamName);
-        const modify = (0, combi_1.alt)((0, combi_1.seq)("FOR ACTION", expressions_1.TypeName, result), (0, combi_1.seq)("FOR CREATE", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation)), (0, combi_1.seq)("FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("FOR UPDATE", expressions_1.TypeName));
-        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, "FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName));
+        const modify = (0, combi_1.alt)((0, combi_1.seq)("FOR ACTION", expressions_1.TypeName, (0, combi_1.optPrio)(result)), (0, combi_1.seq)("FOR CREATE", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation)), (0, combi_1.seq)("FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("FOR UPDATE", expressions_1.TypeName));
+        const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, modify), (0, combi_1.seq)("READ IMPORTING", expressions_1.MethodParamName, "FOR READ", (0, combi_1.alt)(expressions_1.TypeName, expressions_1.EntityAssociation), (0, combi_1.optPrio)(full), result, (0, combi_1.optPrio)(link)), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, result), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR CREATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR UPDATE", expressions_1.TypeName, expressions_1.MethodParamName, "FOR DELETE", expressions_1.TypeName), (0, combi_1.seq)("BEHAVIOR IMPORTING", expressions_1.MethodParamName, "FOR READ", expressions_1.TypeName, result), (0, combi_1.seq)((0, combi_1.alt)("BEHAVIOR", "LOCK"), "IMPORTING", expressions_1.MethodParamName, "FOR LOCK", expressions_1.TypeName), (0, combi_1.seq)("DETERMINE", (0, combi_1.alt)("ON MODIFY", "ON SAVE"), "IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("GLOBAL AUTHORIZATION IMPORTING REQUEST", expressions_1.MethodParamName, "FOR", expressions_1.TypeName, result));
         // todo, this is only from version something
         const amdp = (0, combi_1.seq)("AMDP OPTIONS CDS SESSION CLIENT CURRENT", (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
         const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
@@ -46211,7 +46210,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.49";
+        return "2.95.50";
     }
     getDDICReferences() {
         return this.references;
@@ -46744,6 +46743,9 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#abap-doc-on
         var _a, _b;
         const issues = [];
         const rows = file.getRawRows();
+        const regexEmptyTags = '^\\"! .*<[^>]*><';
+        const regexEmptyAbapdoc = '^\\"!.+$';
+        const regexEmptyParameterName = '^\\"! @parameter .+\\|';
         let methods = [];
         for (const classDef of file.getInfo().listClassDefinitions()) {
             if (this.conf.checkLocal === false && classDef.isLocal === true) {
@@ -46777,22 +46779,50 @@ https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#abap-doc-on
             if (method.isRedefinition === true) {
                 continue;
             }
-            const previousRowText = this.getPreviousRow(rows, method.identifier.getStart());
-            if (!(previousRowText.substring(0, 2) === "\"!")) {
-                const message = "Missing ABAP Doc for method " + method.identifier.getToken().getStr();
-                const issue = issue_1.Issue.atIdentifier(method.identifier, message, this.getMetadata().key, this.conf.severity);
-                issues.push(issue);
+            const previousRowsTexts = this.getAbapdoc(rows, method.identifier.getStart());
+            if (previousRowsTexts === undefined) {
+                continue;
+            }
+            for (const rowText of previousRowsTexts) {
+                if (rowText.trim().match(regexEmptyTags) !== null) {
+                    const message = "Empty tag(s) in ABAP Doc for method " + method.identifier.getToken().getStr() + " (" + rowText + ")";
+                    const issue = issue_1.Issue.atIdentifier(method.identifier, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+                if (rowText.trim().match(regexEmptyAbapdoc) === null && previousRowsTexts.indexOf(rowText) === previousRowsTexts.length - 1) {
+                    const message = "Missing ABAP Doc for method " + method.identifier.getToken().getStr() + " (" + rowText + ")";
+                    const issue = issue_1.Issue.atIdentifier(method.identifier, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
+                if (rowText.trim().match(regexEmptyParameterName) !== null) {
+                    const message = "Missing ABAP Doc parameter name for method " + method.identifier.getToken().getStr() + " (" + rowText + ")";
+                    const issue = issue_1.Issue.atIdentifier(method.identifier, message, this.getMetadata().key, this.conf.severity);
+                    issues.push(issue);
+                }
             }
         }
         return issues;
     }
-    getPreviousRow(rows, pos) {
-        const previousRow = pos.getRow() - 2;
-        const text = rows[previousRow].trim().toUpperCase();
-        if (text === "METHODS" || text === "CLASS-METHODS") {
-            const previousRow = pos.getRow() - 3;
-            const text = rows[previousRow].trim().toUpperCase();
-            return text;
+    getAbapdoc(rows, pos) {
+        let previousRow = pos.getRow() - 2;
+        let rowText = rows[previousRow].trim().toUpperCase();
+        const text = [];
+        if (rowText === "METHODS" || rowText === "CLASS-METHODS") {
+            previousRow--;
+            rowText = rows[previousRow].trim().toUpperCase();
+        }
+        text.push(rowText);
+        //we need to push the first row despite if it is actually an abapdoc or not
+        //if the first row above a method is abapdoc then try to get the rest of the abapdoc block above
+        if (rowText.trim().substring(0, 2) === "\"!") {
+            while (previousRow >= 0) {
+                previousRow--;
+                rowText = rows[previousRow].trim().toUpperCase();
+                if (rowText.trim().substring(0, 2) !== "\"!") {
+                    break;
+                }
+                text.push(rowText);
+            }
         }
         return text;
     }
@@ -54533,6 +54563,7 @@ class FunctionModuleRecommendationsConf extends _basic_rule_config_1.BasicRuleCo
             { name: "JOB_CREATE", replace: "use CL_BP_ABAP_JOB" },
             { name: "JOB_SUBMIT", replace: "use CL_BP_ABAP_JOB" },
             { name: "POPUP_TO_DECIDE", replace: "use POPUP_TO_CONFIRM" },
+            { name: "POPUP_TO_CONFIRM_STEP", replace: "use POPUP_TO_CONFIRM" },
             { name: "POPUP_TO_GET_VALUE", replace: "use POPUP_GET_VALUES" },
             { name: "REUSE_ALV_GRID_DISPLAY", replace: "use CL_SALV_TABLE=>FACTORY or CL_GUI_ALV_GRID" },
             { name: "ROUND", replace: "use built in function: round()" },
@@ -74393,11 +74424,14 @@ class ReadTableTranspiler {
         if (keyName && node.findDirectTokenByText("COMPONENTS")) {
             extra.push("keyName: \"" + keyName.concatTokens() + "\"");
         }
-        const withTableKey = node.findTokenSequencePosition("WITH", "TABLE");
         const binary = node.findTokenSequencePosition("BINARY", "SEARCH");
-        if (binary || withTableKey) {
+        if (binary) {
             extra.push("binarySearch: true");
         }
+        const withTableKey = node.findTokenSequencePosition("WITH", "TABLE");
+        if (withTableKey) {
+            extra.push("withTableKey: true");
+        }
         const rt = node.findDirectExpression(abaplint.Expressions.ReadTableTarget);
         const target = rt === null || rt === void 0 ? void 0 : rt.findDirectExpression(abaplint.Expressions.Target);
         const fs = rt === null || rt === void 0 ? void 0 : rt.findDirectExpression(abaplint.Expressions.FSTarget);
@@ -74416,9 +74450,12 @@ class ReadTableTranspiler {
         }
         const compare = node.findDirectExpression(abaplint.Expressions.ComponentCompareSimple);
         if (compare) {
-            const conds = [];
-            const blah = [];
+            const withKey = [];
+            const withKeyValue = [];
+            const withKeySimple = [];
             const count = compare.getChildren().length / 3;
+            let skipSimple = false;
+            let usesTableLine = false;
             for (let i = 0; i < count; i++) {
                 const left = compare.getChildren()[i * 3];
                 const source = compare.getChildren()[(i * 3) + 2];
@@ -74432,23 +74469,36 @@ class ReadTableTranspiler {
                 else {
                     field = traversal.traverse(left).getCode();
                 }
+                if (field.includes(".")) {
+                    skipSimple = true;
+                }
+                if (field === "table_line") {
+                    skipSimple = true;
+                    usesTableLine = true;
+                }
                 if (s.includes("await")) {
                     const id = unique_identifier_1.UniqueIdentifier.get();
                     prefix += "const " + id + " = " + s + ";\n";
-                    conds.push("abap.compare.eq(i." + field + ", " + id + ")");
-                    blah.push(`{key: (i) => {return i.${field}}, value: ${id}}`);
+                    withKey.push("abap.compare.eq(i." + field + ", " + id + ")");
+                    withKeyValue.push(`{key: (i) => {return i.${field}}, value: ${id}}`);
+                    withKeySimple.push(`"${field}": ${id}`);
                 }
                 else {
-                    conds.push("abap.compare.eq(i." + field + ", " + s + ")");
-                    blah.push(`{key: (i) => {return i.${field}}, value: ${s}}`);
+                    withKey.push("abap.compare.eq(i." + field + ", " + s + ")");
+                    withKeyValue.push(`{key: (i) => {return i.${field}}, value: ${s}}`);
+                    withKeySimple.push(`"${field}": ${s}`);
                 }
             }
-            extra.push("withKey: (i) => {return " + conds.join(" && ") + ";}");
-            extra.push(`withKeyValue: [${blah.join(",")}]`);
+            extra.push("withKey: (i) => {return " + withKey.join(" && ") + ";}");
+            extra.push(`withKeyValue: [${withKeyValue.join(",")}]`);
+            extra.push(`usesTableLine: ${usesTableLine}`);
+            if (skipSimple !== true) {
+                extra.push(`withKeySimple: {${withKeySimple.join(",")}}`);
+            }
         }
         let concat = "";
         if (extra.length > 0) {
-            concat = ",{" + extra.join(",") + "}";
+            concat = ",{" + extra.join(",\n  ") + "}";
         }
         return new chunk_1.Chunk()
             .append(prefix + "abap.statements.readTable(", node, traversal)
@@ -76946,6 +76996,7 @@ class TranspileTypes {
             if (type.getQualifiedName() !== undefined) {
                 extra += ", \"" + type.getQualifiedName() + "\"";
             }
+            return "abap.types.TableFactory.construct(" + extra + ")";
         }
         else if (type instanceof abaplint.BasicTypes.IntegerType) {
             resolved = "Integer";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.57",
+  "version": "2.5.58",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,12 +25,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.57",
+    "@abaplint/transpiler": "^2.5.58",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^18.15.6",
-    "@abaplint/core": "^2.95.49",
+    "@types/node": "^18.15.10",
+    "@abaplint/core": "^2.95.50",
     "progress": "^2.0.3",
     "webpack": "^5.76.3",
     "webpack-cli": "^5.0.1",