@abaplint/core 2.110.0 → 2.110.2

package/build/src/abap/2_statements/combi.js

@@ -1,6 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.failStar = exports.failCombinator = exports.verNot = exports.ver = exports.plusPrio = exports.plus = exports.starPrio = exports.star = exports.per = exports.optPrio = exports.opt = exports.altPrio = exports.alt = exports.seq = exports.tok = exports.regex = exports.str = exports.Combi = exports.Expression = void 0;
+exports.Combi = exports.Expression = void 0;
+exports.str = str;
+exports.regex = regex;
+exports.tok = tok;
+exports.seq = seq;
+exports.alt = alt;
+exports.altPrio = altPrio;
+exports.opt = opt;
+exports.optPrio = optPrio;
+exports.per = per;
+exports.star = star;
+exports.starPrio = starPrio;
+exports.plus = plus;
+exports.plusPrio = plusPrio;
+exports.ver = ver;
+exports.verNot = verNot;
+exports.failCombinator = failCombinator;
+exports.failStar = failStar;
 const Tokens = require("../1_lexer/tokens");
 const nodes_1 = require("../nodes");
 const version_1 = require("../../version");
@@ -813,15 +830,12 @@ function str(s) {
         return new Word(s);
     }
 }
-exports.str = str;
 function regex(r) {
     return new Regex(r);
 }
-exports.regex = regex;
 function tok(t) {
     return new Token(t.name);
 }
-exports.tok = tok;
 const expressionSingletons = {};
 const stringSingletons = {};
 function map(s) {
@@ -850,63 +864,49 @@ function seq(first, second, ...rest) {
     list.push(...rest.map(map));
     return new Sequence(list);
 }
-exports.seq = seq;
 function alt(first, second, ...rest) {
     const list = [map(first), map(second)];
     list.push(...rest.map(map));
     return new Alternative(list);
 }
-exports.alt = alt;
 function altPrio(first, second, ...rest) {
     const list = [map(first), map(second)];
     list.push(...rest.map(map));
     return new AlternativePriority(list);
 }
-exports.altPrio = altPrio;
 function opt(first) {
     return new Optional(map(first));
 }
-exports.opt = opt;
 function optPrio(first) {
     return new OptionalPriority(map(first));
 }
-exports.optPrio = optPrio;
 function per(first, second, ...rest) {
     const list = [map(first), map(second)];
     list.push(...rest.map(map));
     return new Permutation(list);
 }
-exports.per = per;
 function star(first) {
     return new Star(map(first));
 }
-exports.star = star;
 function starPrio(first) {
     return new StarPriority(map(first));
 }
-exports.starPrio = starPrio;
 function plus(first) {
     return new Plus(map(first));
 }
-exports.plus = plus;
 function plusPrio(first) {
     return new PlusPriority(map(first));
 }
-exports.plusPrio = plusPrio;
 function ver(version, first, or) {
     return new Vers(version, map(first), or);
 }
-exports.ver = ver;
 function verNot(version, first) {
     return new VersNot(version, map(first));
 }
-exports.verNot = verNot;
 function failCombinator() {
     return new FailCombinator();
 }
-exports.failCombinator = failCombinator;
 function failStar() {
     return new FailStar();
 }
-exports.failStar = failStar;
 //# sourceMappingURL=combi.js.map

package/build/src/abap/2_statements/expand_macros.js

@@ -75,6 +75,7 @@ class ExpandMacros {
             else if (type instanceof Statements.Include) {
                 const includeName = (_b = statement.findDirectExpression(Expressions.IncludeName)) === null || _b === void 0 ? void 0 : _b.concatTokens();
                 // todo, this does not take function module includes into account
+                // todo, workaround for cyclic includes?
                 const prog = (_c = this.reg) === null || _c === void 0 ? void 0 : _c.getObject("PROG", includeName);
                 if (prog) {
                     prog.parse(this.version, this.globalMacros, this.reg);

package/build/src/abap/3_structures/structures/_combi.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sub = exports.sta = exports.star = exports.opt = exports.beginEnd = exports.alt = exports.seq = void 0;
+exports.seq = seq;
+exports.alt = alt;
+exports.beginEnd = beginEnd;
+exports.opt = opt;
+exports.star = star;
+exports.sta = sta;
+exports.sub = sub;
 const nodes_1 = require("../../nodes");
 const _statement_1 = require("../../2_statements/statements/_statement");
 class Sequence {
@@ -308,27 +314,21 @@ class SubStatement {
 function seq(first, ...rest) {
     return new Sequence([first].concat(rest));
 }
-exports.seq = seq;
 function alt(first, ...rest) {
     return new Alternative([first].concat(rest));
 }
-exports.alt = alt;
 function beginEnd(begin, body, end) {
     return new Sequence([begin, body, end]);
 }
-exports.beginEnd = beginEnd;
 function opt(o) {
     return new Optional(o);
 }
-exports.opt = opt;
 function star(s) {
     return new Star(s);
 }
-exports.star = star;
 function sta(s) {
     return new SubStatement(s);
 }
-exports.sta = sta;
 const singletons = {};
 function sub(s) {
     if (singletons[s.name] === undefined) {
@@ -336,5 +336,4 @@ function sub(s) {
     }
     return singletons[s.name];
 }
-exports.sub = sub;
 //# sourceMappingURL=_combi.js.map

package/build/src/abap/3_structures/structures/class_definition.js

@@ -6,10 +6,9 @@ const _combi_1 = require("./_combi");
 const private_section_1 = require("./private_section");
 const protected_section_1 = require("./protected_section");
 const public_section_1 = require("./public_section");
-const statements_1 = require("../../2_statements/statements");
 class ClassDefinition {
     getMatcher() {
-        const body = (0, _combi_1.seq)((0, _combi_1.opt)((0, _combi_1.sta)(statements_1.SetExtendedCheck)), (0, _combi_1.star)((0, _combi_1.sta)(statements_1.TypePools)), (0, _combi_1.opt)((0, _combi_1.sub)(public_section_1.PublicSection)), (0, _combi_1.opt)((0, _combi_1.sub)(protected_section_1.ProtectedSection)), (0, _combi_1.opt)((0, _combi_1.sub)(private_section_1.PrivateSection)), (0, _combi_1.opt)((0, _combi_1.sta)(statements_1.SetExtendedCheck)));
+        const body = (0, _combi_1.seq)((0, _combi_1.opt)((0, _combi_1.sta)(Statements.SetExtendedCheck)), (0, _combi_1.star)((0, _combi_1.sta)(Statements.TypePools)), (0, _combi_1.opt)((0, _combi_1.sub)(public_section_1.PublicSection)), (0, _combi_1.star)((0, _combi_1.sta)(Statements.Include)), (0, _combi_1.opt)((0, _combi_1.sub)(protected_section_1.ProtectedSection)), (0, _combi_1.opt)((0, _combi_1.sub)(private_section_1.PrivateSection)), (0, _combi_1.opt)((0, _combi_1.sta)(Statements.SetExtendedCheck)));
         return (0, _combi_1.beginEnd)((0, _combi_1.sta)(Statements.ClassDefinition), body, (0, _combi_1.sta)(Statements.EndClass));
     }
 }

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

@@ -7,7 +7,10 @@ const cds_association_1 = require("./cds_association");
 const cds_join_1 = require("./cds_join");
 class CDSSelect extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)("DISTINCT"), "FROM", _1.CDSSource, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
+        const fields = (0, combi_1.opt)((0, combi_1.seq)((0, combi_1.star)((0, combi_1.seq)(_1.CDSElement, ",")), _1.CDSElement));
+        const distinct = (0, combi_1.str)("DISTINCT");
+        const elements = (0, combi_1.seq)((0, combi_1.str)("{"), (0, combi_1.plus)(_1.CDSElement), (0, combi_1.star)((0, combi_1.seq)(",", _1.CDSElement)), (0, combi_1.str)("}"));
+        return (0, combi_1.seq)("SELECT", (0, combi_1.opt)(distinct), (0, combi_1.opt)(fields), "FROM", _1.CDSSource, (0, combi_1.opt)(_1.CDSParametersSelect), (0, combi_1.opt)(_1.CDSAs), (0, combi_1.star)(cds_join_1.CDSJoin), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.star)(cds_association_1.CDSAssociation), (0, combi_1.star)(_1.CDSComposition), (0, combi_1.opt)(elements), (0, combi_1.opt)(_1.CDSGroupBy), (0, combi_1.opt)(_1.CDSWhere), (0, combi_1.opt)((0, combi_1.seq)("UNION", (0, combi_1.opt)("ALL"), CDSSelect)));
     }
 }
 exports.CDSSelect = CDSSelect;

package/build/src/edit_helper.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyEditList = exports.applyEditSingle = exports.EditHelper = exports.EditDraft = void 0;
+exports.EditHelper = exports.EditDraft = void 0;
+exports.applyEditSingle = applyEditSingle;
+exports.applyEditList = applyEditList;
 const position_1 = require("./position");
 const memory_file_1 = require("./files/memory_file");
 class EditDraft {
@@ -218,7 +220,6 @@ function applyEditSingle(reg, edit) {
         reg.updateFile(result);
     }
 }
-exports.applyEditSingle = applyEditSingle;
 /** returns list of filenames which were changed */
 function applyEditList(reg, edits) {
     const ret = [];
@@ -248,5 +249,4 @@ function applyEditList(reg, edits) {
     }
     return ret;
 }
-exports.applyEditList = applyEditList;
 //# sourceMappingURL=edit_helper.js.map

package/build/src/registry.js

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

package/build/src/rules/obsolete_statement.js

@@ -413,7 +413,7 @@ ENDIF.`,
             const children = statementNode.getChildren();
             const sourceString = children[1].concatTokens();
             const targetString = children[3].concatTokens();
-            let operator = children[2].concatTokens();
+            let operator = children[2].concatTokens().toUpperCase();
             if (operator === "TO") {
                 operator = " = ";
             }

package/build/src/version.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPreviousVersion = exports.defaultVersion = exports.Version = void 0;
+exports.defaultVersion = exports.Version = void 0;
+exports.getPreviousVersion = getPreviousVersion;
 var Version;
 (function (Version) {
     Version["OpenABAP"] = "open-abap";
@@ -35,5 +36,4 @@ function getPreviousVersion(v) {
     }
     return all[found - 1];
 }
-exports.getPreviousVersion = getPreviousVersion;
 //# sourceMappingURL=version.js.map

package/build/src/xml_utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unescape = exports.xmlToArray = void 0;
+exports.xmlToArray = xmlToArray;
+exports.unescape = unescape;
 function xmlToArray(data) {
     if (data === undefined) {
         return [];
@@ -12,7 +13,6 @@ function xmlToArray(data) {
         return [data];
     }
 }
-exports.xmlToArray = xmlToArray;
 function unescape(str) {
     if (str === undefined) {
         return "";
@@ -24,5 +24,4 @@ function unescape(str) {
     str = str.replace(/'/g, "'");
     return str;
 }
-exports.unescape = unescape;
 //# sourceMappingURL=xml_utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.110.0",
+    "version": "2.110.2",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -52,15 +52,15 @@
     "devDependencies": {
         "@microsoft/api-extractor": "^7.47.0",
         "@types/chai": "^4.3.16",
-        "@types/mocha": "^10.0.6",
-        "@types/node": "^20.14.2",
+        "@types/mocha": "^10.0.7",
+        "@types/node": "^20.14.9",
         "chai": "^4.4.1",
         "eslint": "^8.57.0",
-        "mocha": "^10.4.0",
+        "mocha": "^10.5.2",
         "c8": "^10.1.2",
         "source-map-support": "^0.5.21",
         "ts-json-schema-generator": "=2.0.1",
-        "typescript": "^5.4.5"
+        "typescript": "^5.5.2"
     },
     "dependencies": {
         "fast-xml-parser": "^4.4.0",