@abaplint/core 2.93.83 → 2.93.85

package/build/src/abap/5_syntax/_current_scope.js

@@ -10,11 +10,6 @@ const _scope_type_1 = require("./_scope_type");
 const _reference_1 = require("./_reference");
 const syntax_1 = require("./syntax");
 class CurrentScope {
-    constructor(reg, obj) {
-        this.current = undefined;
-        this.parentObj = obj;
-        this.reg = reg;
-    }
     static buildDefault(reg, obj) {
         const s = new CurrentScope(reg, obj);
         s.push(_scope_type_1.ScopeType.BuiltIn, _scope_type_1.ScopeType.BuiltIn, new position_1.Position(1, 1), _builtin_1.BuiltIn.filename);
@@ -34,6 +29,11 @@ class CurrentScope {
             s.addType(t);
         }
     }
+    constructor(reg, obj) {
+        this.current = undefined;
+        this.parentObj = obj;
+        this.reg = reg;
+    }
     ///////////////////////////
     getVersion() {
         return this.reg.getConfig().getVersion();

package/build/src/abap/5_syntax/statements/loop.js

@@ -31,7 +31,6 @@ class Loop {
             throw new Error("No source type determined");
         }
         else if (sourceType instanceof basic_1.UnknownType) {
-            console.dir(sourceType);
             throw new Error("Loop, not a table type, " + sourceType.getError());
         }
         else if (sourceType instanceof basic_1.TableType

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

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypedIdentifier = void 0;
 const _identifier_1 = require("../4_file_information/_identifier");
 class TypedIdentifier extends _identifier_1.Identifier {
+    static from(id, type, meta) {
+        return new TypedIdentifier(id.getToken(), id.getFilename(), type, meta);
+    }
     constructor(token, filename, type, meta, value) {
         super(token, filename);
         if (type instanceof TypedIdentifier) {
@@ -17,9 +20,6 @@ class TypedIdentifier extends _identifier_1.Identifier {
             this.meta = meta;
         }
     }
-    static from(id, type, meta) {
-        return new TypedIdentifier(id.getToken(), id.getFilename(), type, meta);
-    }
     toText() {
         return "Identifier: ```" + this.getName() + "```";
     }

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

@@ -6,8 +6,8 @@ const combi_1 = require("../../abap/2_statements/combi");
 class CDSArithmetics extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        const val = (0, combi_1.alt)((0, combi_1.regex)(/\d+/), name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
-        const operator = (0, combi_1.alt)("+", "-", "*", "/");
+        const val = (0, combi_1.alt)((0, combi_1.regex)(/^\d+$/), name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
+        const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
         return (0, combi_1.seq)(val, operator, val);
     }
 }

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

@@ -5,11 +5,11 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSCase extends combi_1.Expression {
     getRunnable() {
-        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
+        const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
         const value = (0, combi_1.alt)(name, _1.CDSString, _1.CDSFunction, CDSCase, _1.CDSCast, _1.CDSArithmetics);
         const simple = (0, combi_1.seq)("CASE", (0, combi_1.alt)(name, _1.CDSFunction), (0, combi_1.plus)((0, combi_1.seq)("WHEN", value, "THEN", value)), "ELSE", value, "END");
         const complex = (0, combi_1.seq)("CASE", (0, combi_1.plus)((0, combi_1.seq)("WHEN", _1.CDSCondition, "THEN", value)), (0, combi_1.opt)((0, combi_1.seq)("ELSE", value)), "END");
-        return (0, combi_1.alt)(simple, complex);
+        return (0, combi_1.altPrio)(simple, complex);
     }
 }
 exports.CDSCase = CDSCase;

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

@@ -7,7 +7,7 @@ const cds_as_1 = require("./cds_as");
 const cds_cast_1 = require("./cds_cast");
 class CDSElement extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.star)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.alt)((0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), cds_cast_1.CDSCast, _1.CDSAggregate, _1.CDSString, _1.CDSFunction, (0, combi_1.regex)(/^\d+$/), _1.CDSArithmetics, _1.CDSCase), (0, combi_1.opt)(cds_as_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(cds_cast_1.CDSCast, _1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

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

@@ -5,8 +5,8 @@ const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
 class CDSFunction extends combi_1.Expression {
     getRunnable() {
-        const qualified = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters))));
-        const input = (0, combi_1.alt)(qualified, (0, combi_1.regex)(/^\d+$/), _1.CDSCast, CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString);
+        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.CDSCast, CDSFunction, _1.CDSArithmetics, _1.CDSCase, _1.CDSString, qualified, (0, combi_1.regex)(/^\d+$/));
         const coalesce = (0, combi_1.seq)("COALESCE", "(", input, ",", input, ")");
         const concat = (0, combi_1.seq)("CONCAT", "(", input, ",", input, ")");
         const concat_with_space = (0, combi_1.seq)("CONCAT_WITH_SPACE", "(", input, ",", input, ",", input, ")");
@@ -27,7 +27,7 @@ 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.alt)(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);
+        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);
     }
 }
 exports.CDSFunction = CDSFunction;

package/build/src/config.js

@@ -6,30 +6,6 @@ const artifacts_rules_1 = require("./artifacts_rules");
 const JSON5 = require("json5");
 // assumption: this class is immutable
 class Config {
-    constructor(json) {
-        // huh, hack
-        if (JSON5.parse === undefined) {
-            // @ts-ignore
-            JSON5.parse = JSON5.default.parse;
-        }
-        this.config = JSON5.parse(json);
-        if (this.config.global === undefined) {
-            this.config.global = Config.getDefault().getGlobal();
-        }
-        if (this.config.syntax === undefined) {
-            this.config.syntax = Config.getDefault().getSyntaxSetttings();
-        }
-        if (this.config.syntax.globalMacros === undefined) {
-            this.config.syntax.globalMacros = [];
-        }
-        if (this.config.syntax.globalConstants === undefined) {
-            this.config.syntax.globalConstants = [];
-        }
-        if (this.config.global.skipIncludesWithoutMain === undefined) {
-            this.config.global.skipIncludesWithoutMain = false;
-        }
-        this.checkVersion();
-    }
     static getDefault(ver) {
         const rules = {};
         const sorted = artifacts_rules_1.ArtifactsRules.getRules().sort((a, b) => {
@@ -93,6 +69,30 @@ class Config {
         }
         return rules;
     }
+    constructor(json) {
+        // huh, hack
+        if (JSON5.parse === undefined) {
+            // @ts-ignore
+            JSON5.parse = JSON5.default.parse;
+        }
+        this.config = JSON5.parse(json);
+        if (this.config.global === undefined) {
+            this.config.global = Config.getDefault().getGlobal();
+        }
+        if (this.config.syntax === undefined) {
+            this.config.syntax = Config.getDefault().getSyntaxSetttings();
+        }
+        if (this.config.syntax.globalMacros === undefined) {
+            this.config.syntax.globalMacros = [];
+        }
+        if (this.config.syntax.globalConstants === undefined) {
+            this.config.syntax.globalConstants = [];
+        }
+        if (this.config.global.skipIncludesWithoutMain === undefined) {
+            this.config.global.skipIncludesWithoutMain = false;
+        }
+        this.checkVersion();
+    }
     get() {
         return this.config;
     }

package/build/src/issue.js

@@ -4,19 +4,6 @@ exports.Issue = void 0;
 const position_1 = require("./position");
 const severity_1 = require("./severity");
 class Issue {
-    constructor(data) {
-        this.data = data;
-        if (this.data.start instanceof position_1.VirtualPosition) {
-            // no quick fixes inside macros
-            this.data.fix = undefined;
-        }
-        if (this.data.start.getCol() < 1) {
-            throw new Error("issue, start col < 1");
-        }
-        else if (this.data.end.getCol() < 1) {
-            throw new Error("issue, end col < 1");
-        }
-    }
     //////////////////////////
     static atRow(file, row, message, key, severity) {
         const start = new position_1.Position(row, 1);
@@ -98,6 +85,19 @@ class Issue {
             fix,
         });
     }
+    constructor(data) {
+        this.data = data;
+        if (this.data.start instanceof position_1.VirtualPosition) {
+            // no quick fixes inside macros
+            this.data.fix = undefined;
+        }
+        if (this.data.start.getCol() < 1) {
+            throw new Error("issue, start col < 1");
+        }
+        else if (this.data.end.getCol() < 1) {
+            throw new Error("issue, end col < 1");
+        }
+    }
     getData() {
         return this.data;
     }

package/build/src/registry.js

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

package/build/src/rules/downport.js

@@ -1011,7 +1011,6 @@ ${indentation}RAISE EXCEPTION ${uniqueName2}.`;
         }
         const target = high.findDirectExpression(Expressions.Target);
         if (target === undefined) {
-            console.dir("sdf1");
             return undefined;
         }
         const sourceRef = (_a = high.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.findFirstExpression(Expressions.CorrespondingBody);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.83",
+    "version": "2.93.85",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -56,7 +56,7 @@
         "c8": "^7.12.0",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "^1.1.2",
-        "typescript": "^4.8.4"
+        "typescript": "^4.9.3"
     },
     "dependencies": {
         "fast-xml-parser": "^4.0.11",