@abaplint/cli 2.113.72 → 2.113.74

package/build/cli.js

@@ -4346,7 +4346,7 @@ class Color extends combi_1.Expression {
         const texts = (0, combi_1.altPrio)("COL_BACKGROUND", "COL_HEADING", "COL_NORMAL", "COL_TOTAL", "COL_KEY", "COL_POSITIVE", "COL_NEGATIVE", "COL_GROUP");
         const value = (0, combi_1.alt)(eq, (0, combi_1.altPrio)("ON", "OFF", (0, combi_1.altPrio)(integers, texts)));
         const toggle = (0, combi_1.altPrio)("ON", "OFF");
-        return (0, combi_1.seq)("COLOR", value, (0, combi_1.opt)(toggle));
+        return (0, combi_1.seq)("COLOR", (0, combi_1.opt)((0, combi_1.seq)(value, (0, combi_1.opt)(toggle))));
     }
 }
 exports.Color = Color;
@@ -5312,7 +5312,7 @@ class FieldSymbol extends combi_1.Expression {
     getRunnable() {
         // todo, this only allows one dash in the name
         const dashes = (0, combi_1.seq)((0, combi_1.regex)(/^<[\w\/%$\*]+$/), (0, combi_1.tok)(tokens_1.Dash), (0, combi_1.regex)(/^[\w\/%$\*]+>$/));
-        return (0, combi_1.altPrio)((0, combi_1.regex)(/^<[\w\/%$\*]+>$/), dashes);
+        return (0, combi_1.altPrio)((0, combi_1.regex)(/^<[\w\/%$\*\?]+>$/), dashes);
     }
 }
 exports.FieldSymbol = FieldSymbol;
@@ -8578,7 +8578,7 @@ const _1 = __webpack_require__(/*! . */ "./node_modules/@abaplint/core/build/src
 class SQLHints extends combi_1.Expression {
     getRunnable() {
         const type = (0, combi_1.altPrio)("ORACLE", "ADABAS", "AS400", "DB2", "HDB", "MSSQLNT", "SYBASE", "DB6");
-        const ret = (0, combi_1.seq)("%_HINTS", (0, combi_1.plus)((0, combi_1.seq)(type, _1.Constant)));
+        const ret = (0, combi_1.seq)("%_HINTS", (0, combi_1.plus)((0, combi_1.seq)(type, (0, combi_1.alt)(_1.Constant, _1.FieldSub))));
         return ret;
     }
 }
@@ -14553,7 +14553,7 @@ class Leave {
     getMatcher() {
         const retu = (0, combi_1.seq)(expressions_1.AndReturn, "TO SCREEN", expressions_1.Source);
         const transaction = (0, combi_1.seq)("TO TRANSACTION", expressions_1.Source, (0, combi_1.opt)("AND SKIP FIRST SCREEN"));
-        const ret = (0, combi_1.seq)("LEAVE", (0, combi_1.opt)((0, combi_1.alt)("TO CURRENT TRANSACTION", (0, combi_1.seq)((0, combi_1.opt)("TO"), "LIST-PROCESSING", (0, combi_1.opt)(retu)), "LIST-PROCESSING", "SCREEN", transaction, "PROGRAM", (0, combi_1.seq)("TO SCREEN", expressions_1.Source))));
+        const ret = (0, combi_1.seq)("LEAVE", (0, combi_1.opt)((0, combi_1.alt)((0, combi_1.seq)("TO CURRENT TRANSACTION", (0, combi_1.opt)("AND SKIP FIRST SCREEN")), (0, combi_1.seq)((0, combi_1.opt)("TO"), "LIST-PROCESSING", (0, combi_1.opt)(retu)), "LIST-PROCESSING", "SCREEN", transaction, "PROGRAM", (0, combi_1.seq)("TO SCREEN", expressions_1.Source))));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -16208,7 +16208,7 @@ class ScrollList {
         const line = (0, combi_1.seq)("LINE", expressions_1.Source);
         const column = (0, combi_1.seq)("TO COLUMN", expressions_1.Source);
         const to = (0, combi_1.seq)("TO", (0, combi_1.alt)("FIRST PAGE", "LAST PAGE", (0, combi_1.seq)("PAGE", expressions_1.Source)));
-        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.alt)(to, "BACKWARD", "FORWARD"), (0, combi_1.alt)("LEFT", "RIGHT"), column, line));
+        const ret = (0, combi_1.seq)("SCROLL LIST", (0, combi_1.per)(index, (0, combi_1.alt)(to, "BACKWARD", "FORWARD"), (0, combi_1.seq)((0, combi_1.alt)("LEFT", "RIGHT"), (0, combi_1.opt)((0, combi_1.seq)("BY", expressions_1.Source, "PLACES"))), column, line));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -18050,7 +18050,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 class While {
     getMatcher() {
         const vary = (0, combi_1.seq)("VARY", expressions_1.Target, "FROM", expressions_1.Source, "NEXT", expressions_1.Source);
-        return (0, combi_1.seq)("WHILE", expressions_1.Cond, (0, combi_1.opt)(vary));
+        return (0, combi_1.seq)("WHILE", expressions_1.Cond, (0, combi_1.star)(vary));
     }
 }
 exports.While = While;
@@ -50464,6 +50464,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Program = void 0;
 const _abap_object_1 = __webpack_require__(/*! ./_abap_object */ "./node_modules/@abaplint/core/build/src/objects/_abap_object.js");
 const _dynpros_1 = __webpack_require__(/*! ./_dynpros */ "./node_modules/@abaplint/core/build/src/objects/_dynpros.js");
+const xml_utils_1 = __webpack_require__(/*! ../xml_utils */ "./node_modules/@abaplint/core/build/src/xml_utils.js");
 class Program extends _abap_object_1.ABAPObject {
     getType() {
         return "PROG";
@@ -50476,8 +50477,9 @@ class Program extends _abap_object_1.ABAPObject {
         return [main];
     }
     getDescription() {
-        // todo
-        return undefined;
+        var _a;
+        this.parseXML();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.description;
     }
     getAllowedNaming() {
         return {
@@ -50503,6 +50505,7 @@ class Program extends _abap_object_1.ABAPObject {
     }
     ////////////////////////////
     parseXML() {
+        var _a, _b, _c;
         if (this.parsedXML !== undefined) {
             return;
         }
@@ -50512,15 +50515,23 @@ class Program extends _abap_object_1.ABAPObject {
             this.parsedXML = {
                 isInclude: false,
                 isModulePool: false,
+                description: undefined,
                 dynpros: [],
             };
             return;
         }
+        let description = "";
+        for (const t of (0, xml_utils_1.xmlToArray)((_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]["asx:values"]) === null || _b === void 0 ? void 0 : _b.TPOOL) === null || _c === void 0 ? void 0 : _c.item)) {
+            if ((t === null || t === void 0 ? void 0 : t.ID) === "R") {
+                description = t.ENTRY ? (0, xml_utils_1.unescape)(t.ENTRY) : "";
+            }
+        }
         const dynpros = (0, _dynpros_1.parseDynpros)(parsed);
         this.parsedXML = {
             isInclude: file ? file.getRaw().includes("<SUBC>I</SUBC>") : false,
             isModulePool: file ? file.getRaw().includes("<SUBC>M</SUBC>") : false,
             dynpros: dynpros,
+            description: description,
         };
     }
 }
@@ -53331,7 +53342,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.72";
+        return "2.113.74";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.72",
+    "version": "2.113.74",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.72",
+        "@abaplint/core": "^2.113.74",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
@@ -50,7 +50,7 @@
         "eslint": "^9.16.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
-        "memfs": "^4.14.1",
+        "memfs": "^4.15.0",
         "minimist": "^1.2.8",
         "mocha": "^11.0.1",
         "progress": "^2.0.3",