@abaplint/core 2.95.49 → 2.95.51

package/build/src/abap/2_statements/expressions/sql_function.js

@@ -28,9 +28,10 @@ class SQLFunction extends combi_1.Expression {
         const lower = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("lower", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const mod = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("mod", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const replace = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("replace", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const round = (0, combi_1.ver)(version_1.Version.v750, (0, combi_1.seq)("round", (0, combi_1.tok)(tokens_1.ParenLeftW), param, ",", param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const upper = (0, combi_1.ver)(version_1.Version.v751, (0, combi_1.seq)("upper", (0, combi_1.tok)(tokens_1.ParenLeftW), param, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const uuid = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("uuid", (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
-        return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length, lower, upper);
+        return (0, combi_1.altPrio)(uuid, abs, ceil, floor, cast, div, mod, coalesce, concat, replace, length, lower, upper, round);
     }
 }
 exports.SQLFunction = SQLFunction;

package/build/src/abap/2_statements/statements/authority_check.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorityCheck = void 0;
 const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
-const version_1 = require("../../../version");
 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;

package/build/src/abap/2_statements/statements/method_def.js

@@ -16,8 +16,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)));

package/build/src/abap/types/method_parameters.js

@@ -177,6 +177,7 @@ class MethodParameters {
             }
             if (node.concatTokens().toUpperCase().includes(" FOR VALIDATE ")
                 || node.concatTokens().toUpperCase().includes(" FOR BEHAVIOR ")
+                || node.concatTokens().toUpperCase().includes(" FOR FEATURES ")
                 || node.concatTokens().toUpperCase().includes(" FOR MODIFY ")) {
                 const token = isRap.getFirstToken();
                 this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "failed"), filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));

package/build/src/cds/expressions/cds_function.js

@@ -27,7 +27,8 @@ class CDSFunction extends combi_1.Expression {
         const tstmp_add_seconds = (0, combi_1.seq)("TSTMP_ADD_SECONDS", "(", input, ",", input, ",", input, ")");
         const abap_system_timezone = (0, combi_1.seq)("ABAP_SYSTEM_TIMEZONE", "(", input, ",", input, ")");
         const abap_user_timezone = (0, combi_1.seq)("ABAP_USER_TIMEZONE", "(", input, ",", input, ",", input, ")");
-        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, concat_with_space, dats_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp);
+        const mod = (0, combi_1.seq)("MOD", "(", input, ",", input, ")");
+        return (0, combi_1.altPrio)(substring, coalesce, tstmp_to_dats, concat, tstmp_to_tims, concat_with_space, dats_is_valid, dats_days_between, tstmp_add_seconds, tstmp_seconds_between, tstmp_current_utctimestamp, tstmp_is_valid, abap_system_timezone, abap_user_timezone, bintohex, hextobin, dats_add_days, dats_add_months, tstmp_to_dst, dats_tims_to_tstmp, mod);
     }
 }
 exports.CDSFunction = CDSFunction;

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.49";
+        return "2.95.51";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/abapdoc.js

@@ -44,6 +44,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) {
@@ -77,22 +80,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;
     }

package/build/src/rules/function_module_recommendations.js

@@ -24,6 +24,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()" },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.49",
+    "version": "2.95.51",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,14 +50,14 @@
         "@microsoft/api-extractor": "^7.34.4",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.15.5",
+        "@types/node": "^18.15.11",
         "chai": "^4.3.7",
-        "eslint": "^8.36.0",
+        "eslint": "^8.37.0",
         "mocha": "^10.2.0",
         "c8": "^7.13.0",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.2.0",
-        "typescript": "^5.0.2"
+        "typescript": "^5.0.3"
     },
     "dependencies": {
         "fast-xml-parser": "^4.1.3",