@abaplint/core 2.113.222 → 2.113.223

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

@@ -8,13 +8,13 @@ const loop_group_by_1 = require("../expressions/loop_group_by");
 class Loop {
     getMatcher() {
         const where = (0, combi_1.seq)("WHERE", (0, combi_1.alt)(expressions_1.ComponentCond, expressions_1.Dynamic));
-        const group = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("GROUP BY", loop_group_by_1.LoopGroupBy));
+        const group = (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.seq)("GROUP BY", loop_group_by_1.LoopGroupBy), version_1.Version.OpenABAP);
         const step = (0, combi_1.ver)(version_1.Version.v757, (0, combi_1.seq)("STEP", expressions_1.Source));
         const from = (0, combi_1.seq)("FROM", expressions_1.Source);
         const to = (0, combi_1.seq)("TO", expressions_1.Source);
         const usingKey = (0, combi_1.seq)("USING KEY", (0, combi_1.altPrio)(expressions_1.SimpleName, expressions_1.Dynamic));
         const options = (0, combi_1.per)(expressions_1.LoopTarget, from, to, where, usingKey, group, step);
-        const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.failCombinator)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP")), expressions_1.LoopSource, (0, combi_1.opt)(options));
+        const at = (0, combi_1.seq)("AT", (0, combi_1.opt)((0, combi_1.seq)("SCREEN", (0, combi_1.failCombinator)())), (0, combi_1.opt)((0, combi_1.ver)(version_1.Version.v740sp08, "GROUP", version_1.Version.OpenABAP)), expressions_1.LoopSource, (0, combi_1.opt)(options));
         return (0, combi_1.seq)("LOOP", (0, combi_1.opt)(at));
     }
 }

package/build/src/cds/cds_lexer.js

@@ -35,7 +35,8 @@ class Result {
     }
     add(text, row, col, mode) {
         if (text.length > 0) {
-            if (mode === Mode.SingleLineComment) {
+            if (mode === Mode.SingleLineComment
+                && (text.startsWith("--") || text.startsWith("//"))) {
                 this.result.push(new tokens_1.Comment(new position_1.Position(row, col - text.length), text));
             }
             else {

package/build/src/cds/cds_parser.js

@@ -15,7 +15,6 @@ class CDSParser {
         }
         let tokens = cds_lexer_1.CDSLexer.run(file);
         tokens = tokens.filter(t => !(t instanceof tokens_1.Comment));
-        // console.dir(tokens);
         let res = combi_1.Combi.run(new Expressions.CDSDefineView(), tokens, version_1.defaultVersion);
         if (res === undefined || !(res[0] instanceof nodes_1.ExpressionNode)) {
             res = combi_1.Combi.run(new Expressions.CDSDefineAbstract(), tokens, version_1.defaultVersion);

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

@@ -6,7 +6,7 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSFunctionInput extends combi_1.Expression {
     getRunnable() {
         const qualified = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.starPrio)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters))));
-        const input = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSCast, _1.CDSFunction, _1.CDSCase, _1.CDSString, qualified, _1.CDSInteger);
+        const input = (0, combi_1.altPrio)(_1.CDSArithmetics, _1.CDSAggregate, _1.CDSCast, _1.CDSFunction, _1.CDSCase, _1.CDSString, qualified, _1.CDSInteger);
         return input;
     }
 }

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

@@ -8,7 +8,7 @@ class CDSJoin extends combi_1.Expression {
     getRunnable() {
         const cond = (0, combi_1.seq)(_1.CDSSource, "ON", cds_condition_1.CDSCondition);
         const foo = (0, combi_1.altPrio)((0, combi_1.seq)("(", cond, ")"), cond);
-        return (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER TO ONE", "LEFT OUTER", "INNER", "CROSS", "RIGHT OUTER")), "JOIN", foo);
+        return (0, combi_1.seq)((0, combi_1.optPrio)((0, combi_1.altPrio)("LEFT OUTER TO ONE", "LEFT OUTER", "INNER", "CROSS", "RIGHT OUTER")), "JOIN", (0, combi_1.altPrio)(foo, _1.CDSSource));
     }
 }
 exports.CDSJoin = CDSJoin;

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

@@ -5,7 +5,7 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSSource extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.optPrio)(_1.CDSAs));
+        return (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)(_1.CDSParametersSelect), (0, combi_1.opt)((0, combi_1.altPrio)(_1.CDSAs, _1.CDSName)));
     }
 }
 exports.CDSSource = CDSSource;

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

@@ -4,8 +4,10 @@ exports.CDSString = void 0;
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSString extends combi_1.Expression {
     getRunnable() {
+        const abap = (0, combi_1.seq)("abap", ".", (0, combi_1.regex)(/^char'\w'$/));
         // https://stackoverflow.com/a/57754227
-        return (0, combi_1.regex)(/^'[A-Za-zÀ-ž\u0370-\u03FF\u0400-\u04FF:\| -_]*'$/);
+        const reg = (0, combi_1.regex)(/^'[A-Za-zÀ-ž\u0370-\u03FF\u0400-\u04FF:\| -_]*'$/);
+        return (0, combi_1.altPrio)(reg, abap);
     }
 }
 exports.CDSString = CDSString;

package/build/src/lsp/help.js

@@ -43,7 +43,7 @@ class Help {
             const tokens = cds_lexer_1.CDSLexer.run(file);
             content += `<h3>Tokens</h3>\n<pre>\n`;
             for (const t of tokens) {
-                content += JSON.stringify(t) + "\n";
+                content += JSON.stringify(t) + " " + t.constructor.name + "\n";
             }
             content += `</pre>\n`;
         }

package/build/src/registry.js

@@ -67,7 +67,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.222";
+        return "2.113.223";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.113.222",
+    "version": "2.113.223",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,12 +50,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.52.15",
+        "@microsoft/api-extractor": "^7.53.0",
         "@types/chai": "^4.3.20",
         "@types/mocha": "^10.0.10",
         "@types/node": "^24.6.2",
         "chai": "^4.5.0",
-        "eslint": "^9.36.0",
+        "eslint": "^9.37.0",
         "mocha": "^11.7.4",
         "c8": "^10.1.3",
         "source-map-support": "^0.5.21",
@@ -63,7 +63,7 @@
         "typescript": "^5.9.3"
     },
     "dependencies": {
-        "fast-xml-parser": "^5.2.5",
+        "fast-xml-parser": "^5.3.0",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }