@abaplint/core 2.102.52 → 2.102.54

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

@@ -5,7 +5,7 @@ const combi_1 = require("../combi");
 const _1 = require(".");
 class SQLFields extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("FIELDS", _1.SQLFieldList);
+        return (0, combi_1.seq)("FIELDS", (0, combi_1.opt)("DISTINCT"), _1.SQLFieldList);
     }
 }
 exports.SQLFields = SQLFields;

package/build/src/abap/5_syntax/expressions/field_chain.js

@@ -17,20 +17,30 @@ const source_field_symbol_1 = require("./source_field_symbol");
 const source_field_1 = require("./source_field");
 class FieldChain {
     runSyntax(node, scope, filename, refType) {
-        const concat = node.concatTokens();
-        if (concat.includes("-")) {
-            // workaround for names with dashes
-            const found = scope.findVariable(concat);
-            if (found) {
-                if (refType) {
-                    scope.addReference(node.getFirstToken(), found, refType, filename);
+        var _a, _b, _c, _d, _e;
+        const children = node.getChildren().slice();
+        let contextName = children[0].concatTokens();
+        let context = undefined;
+        try {
+            context = this.findTop(children.shift(), scope, filename, refType);
+        }
+        catch (error) {
+            const concat = node.concatTokens();
+            if (concat.includes("-") && ((_a = node.getFirstChild()) === null || _a === void 0 ? void 0 : _a.get()) instanceof Expressions.SourceField) {
+                // workaround for names with dashes, eg. "sy-repid"
+                const offset = ((_b = node.findDirectExpression(Expressions.FieldOffset)) === null || _b === void 0 ? void 0 : _b.concatTokens()) || "";
+                const length = ((_c = node.findDirectExpression(Expressions.FieldLength)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
+                const found = scope.findVariable(concat.replace(offset, "").replace(length, ""));
+                if (found) {
+                    if (refType) {
+                        scope.addReference(node.getFirstToken(), found, refType, filename);
+                    }
+                    // this is not completely correct, but will work, dashes in names is a mess anyhow
+                    return found.getType();
                 }
-                return found.getType();
             }
+            throw error;
         }
-        const children = node.getChildren().slice();
-        let contextName = children[0].concatTokens();
-        let context = this.findTop(children.shift(), scope, filename, refType);
         while (children.length > 0) {
             contextName += children[0].concatTokens();
             const current = children.shift();
@@ -78,7 +88,30 @@ class FieldChain {
                 if (context instanceof basic_1.TableType && context.isWithHeader()) {
                     context = context.getRowType();
                 }
-                context = new component_name_1.ComponentName().runSyntax(context, current);
+                try {
+                    context = new component_name_1.ComponentName().runSyntax(context, current);
+                }
+                catch (error) {
+                    const concat = node.concatTokens();
+                    if (concat.includes("-")) {
+                        // workaround for names with dashes, eg. "sy-repid"
+                        const offset = ((_d = node.findDirectExpression(Expressions.FieldOffset)) === null || _d === void 0 ? void 0 : _d.concatTokens()) || "";
+                        const length = ((_e = node.findDirectExpression(Expressions.FieldLength)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "";
+                        const found = scope.findVariable(concat.replace(offset, "").replace(length, ""));
+                        if (found) {
+                            if (refType) {
+                                scope.addReference(node.getFirstToken(), found, refType, filename);
+                            }
+                            context = found.getType();
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
+                    else {
+                        throw error;
+                    }
+                }
             }
             else if (current instanceof nodes_1.ExpressionNode
                 && current.get() instanceof Expressions.TableExpression) {

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.52",
+    "version": "2.102.54",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -53,7 +53,7 @@
         "@microsoft/api-extractor": "^7.38.0",
         "@types/chai": "^4.3.6",
         "@types/mocha": "^10.0.2",
-        "@types/node": "^20.8.0",
+        "@types/node": "^20.8.2",
         "chai": "^4.3.10",
         "eslint": "^8.50.0",
         "mocha": "^10.2.0",
@@ -63,7 +63,7 @@
         "typescript": "^5.2.2"
     },
     "dependencies": {
-        "fast-xml-parser": "^4.3.1",
+        "fast-xml-parser": "^4.3.2",
         "json5": "^2.2.3",
         "vscode-languageserver-types": "^3.17.5"
     }