@abaplint/cli 2.110.0 → 2.110.2

package/build/cli.js

@@ -824,7 +824,8 @@ exports.Total = Total;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.run = exports.GENERIC_ERROR = void 0;
+exports.GENERIC_ERROR = void 0;
+exports.run = run;
 const fs = __webpack_require__(/*! fs */ "fs");
 const os = __webpack_require__(/*! os */ "os");
 const path = __webpack_require__(/*! path */ "path");
@@ -1033,7 +1034,6 @@ async function run(arg) {
     }
     return { output, issues, reg };
 }
-exports.run = run;
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -2711,7 +2711,24 @@ exports.WStaticArrowW = WStaticArrowW;
 "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 = __webpack_require__(/*! ../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const nodes_1 = __webpack_require__(/*! ../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const version_1 = __webpack_require__(/*! ../../version */ "./node_modules/@abaplint/core/build/src/version.js");
@@ -3524,15 +3541,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) {
@@ -3561,65 +3575,51 @@ 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
 
 /***/ }),
@@ -3708,6 +3708,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);
@@ -17974,7 +17975,13 @@ StructureParser.singletons = {};
 "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 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const _statement_1 = __webpack_require__(/*! ../../2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 class Sequence {
@@ -18282,27 +18289,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) {
@@ -18310,7 +18311,6 @@ function sub(s) {
     }
     return singletons[s.name];
 }
-exports.sub = sub;
 //# sourceMappingURL=_combi.js.map
 
 /***/ }),
@@ -18561,10 +18561,9 @@ const _combi_1 = __webpack_require__(/*! ./_combi */ "./node_modules/@abaplint/c
 const private_section_1 = __webpack_require__(/*! ./private_section */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/private_section.js");
 const protected_section_1 = __webpack_require__(/*! ./protected_section */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/protected_section.js");
 const public_section_1 = __webpack_require__(/*! ./public_section */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/public_section.js");
-const statements_1 = __webpack_require__(/*! ../../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
 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));
     }
 }
@@ -39843,7 +39842,10 @@ const cds_association_1 = __webpack_require__(/*! ./cds_association */ "./node_m
 const cds_join_1 = __webpack_require__(/*! ./cds_join */ "./node_modules/@abaplint/core/build/src/cds/expressions/cds_join.js");
 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;
@@ -41000,7 +41002,9 @@ __exportStar(__webpack_require__(/*! ./ddl_type */ "./node_modules/@abaplint/cor
 "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 = __webpack_require__(/*! ./position */ "./node_modules/@abaplint/core/build/src/position.js");
 const memory_file_1 = __webpack_require__(/*! ./files/memory_file */ "./node_modules/@abaplint/core/build/src/files/memory_file.js");
 class EditDraft {
@@ -41218,7 +41222,6 @@ function applyEditSingle(reg, edit) {
         reg.updateFile(result);
     }
 }
-exports.applyEditSingle = applyEditSingle;
 /** returns list of filenames which were changed */
 function applyEditList(reg, edits) {
     const ret = [];
@@ -41248,7 +41251,6 @@ function applyEditList(reg, edits) {
     }
     return ret;
 }
-exports.applyEditList = applyEditList;
 //# sourceMappingURL=edit_helper.js.map
 
 /***/ }),
@@ -51774,7 +51776,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.110.0";
+        return "2.110.2";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -66984,7 +66986,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 = " = ";
             }
@@ -74692,7 +74694,8 @@ exports.NameValidator = NameValidator;
 "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";
@@ -74727,7 +74730,6 @@ function getPreviousVersion(v) {
     }
     return all[found - 1];
 }
-exports.getPreviousVersion = getPreviousVersion;
 //# sourceMappingURL=version.js.map
 
 /***/ }),
@@ -74772,7 +74774,8 @@ exports.VirtualPosition = VirtualPosition;
 "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 [];
@@ -74784,7 +74787,6 @@ function xmlToArray(data) {
         return [data];
     }
 }
-exports.xmlToArray = xmlToArray;
 function unescape(str) {
     if (str === undefined) {
         return "";
@@ -74796,7 +74798,6 @@ 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/cli",
-    "version": "2.110.0",
+    "version": "2.110.2",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,24 +38,24 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.110.0",
+        "@abaplint/core": "^2.110.2",
         "@types/chai": "^4.3.16",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
-        "@types/mocha": "^10.0.6",
-        "@types/node": "^20.14.2",
+        "@types/mocha": "^10.0.7",
+        "@types/node": "^20.14.9",
         "@types/progress": "^2.0.7",
         "chai": "^4.4.1",
         "chalk": "^5.3.0",
         "eslint": "^8.57.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
-        "memfs": "^4.9.2",
+        "memfs": "^4.9.3",
         "minimist": "^1.2.8",
-        "mocha": "^10.4.0",
+        "mocha": "^10.5.2",
         "progress": "^2.0.3",
-        "typescript": "^5.4.5",
-        "webpack": "^5.92.0",
+        "typescript": "^5.5.2",
+        "webpack": "^5.92.1",
         "webpack-cli": "^5.1.4",
         "xml-js": "^1.6.11"
     },