@abaplint/cli 2.106.1 → 2.106.3

package/build/cli.js

@@ -9233,10 +9233,10 @@ class TypeTable extends combi_1.Expression {
         const header = "WITH HEADER LINE";
         const initial = (0, combi_1.seq)("INITIAL SIZE", _1.Constant);
         const generic = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE");
-        const normal1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.opt)("REF TO"), (0, combi_1.opt)(_1.TypeName));
+        const normal1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.optPrio)("REF TO"), _1.TypeName);
         const likeType = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE OF", (0, combi_1.optPrio)("REF TO"), (0, combi_1.opt)(field_chain_1.FieldChain), (0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))));
-        const rangeType = (0, combi_1.seq)("RANGE OF", _1.TypeName, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
-        const rangeLike = (0, combi_1.seq)("RANGE OF", _1.SimpleFieldChain, (0, combi_1.opt)(header), (0, combi_1.opt)(initial));
+        const rangeType = (0, combi_1.seq)("RANGE OF", _1.TypeName, (0, combi_1.optPrio)(header), (0, combi_1.optPrio)(initial));
+        const rangeLike = (0, combi_1.seq)("RANGE OF", _1.SimpleFieldChain, (0, combi_1.optPrio)(header), (0, combi_1.optPrio)(initial));
         // a maximum of 15 secondary table keys can be defined
         // "WITH" is not allowed as a field name in keys
         const typetable = (0, combi_1.alt)(generic, (0, combi_1.seq)(normal1, (0, combi_1.alt)((0, combi_1.opt)((0, combi_1.per)(header, initial, (0, combi_1.plusPrio)(type_table_key_1.TypeTableKey))), (0, combi_1.seq)((0, combi_1.plus)(type_table_key_1.TypeTableKey), (0, combi_1.optPrio)(initial)))));
@@ -29167,13 +29167,11 @@ class Concatenate {
                 }
             }
         }
-        else {
-            for (const s of node.findDirectExpressions(Expressions.SimpleSource3)) {
-                const type = new source_1.Source().runSyntax(s, scope, filename);
-                const compatible = byteMode ? new _type_utils_1.TypeUtils(scope).isHexLike(type) : new _type_utils_1.TypeUtils(scope).isCharLikeStrict(type);
-                if (compatible === false) {
-                    throw new Error("Source type not compatible");
-                }
+        for (const s of node.findDirectExpressions(Expressions.SimpleSource3)) {
+            const type = new source_1.Source().runSyntax(s, scope, filename);
+            const compatible = byteMode ? new _type_utils_1.TypeUtils(scope).isHexLike(type) : new _type_utils_1.TypeUtils(scope).isCharLikeStrict(type);
+            if (compatible === false) {
+                throw new Error("Source type not compatible");
             }
         }
     }
@@ -51383,7 +51381,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.106.1";
+        return "2.106.3";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -65093,17 +65091,17 @@ class NoPrefixesConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
         /** DATA, CLASS-DATA, DATA BEGIN OF, CLASS-DATA BEGIN OF, FINAL(), DATA(), case insensitive regex */
-        this.data = "^[lg].?_";
+        this.data = "^[LGM].?_";
         /** STATICS, STATICS BEGIN OF, case insensitive regex */
-        this.statics = "";
+        this.statics = "^S.?_";
         /** FIELD-SYMBOLS and inline FIELD-SYMBOLS(), case insensitive regex */
-        this.fieldSymbols = "^<l.?_";
+        this.fieldSymbols = "^<[LGM].?_";
         /** CONSTANTS, CONSTANTS BEGIN OF, case insensitive regex */
-        this.constants = "^[lg]c_";
+        this.constants = "^[LGM]?C.?_";
         /** TYPES, ENUM, MESH, case insensitive regex */
-        this.types = "^ty_";
+        this.types = "^TY_";
         /** importing, exporting, returning and changing parameters, case insensitive regex */
-        this.methodParameters = "^[ierc].?_";
+        this.methodParameters = "^[ICER].?_";
         // todo, public localClass: string = "";
         // todo, public localInterface: string = "";
         // todo, public functionModuleParameters: string = "";
@@ -72722,16 +72720,15 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.WhitespaceEnd = exports.WhitespaceEndConf = void 0;
 const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
 const position_1 = __webpack_require__(/*! ../position */ "./node_modules/@abaplint/core/build/src/position.js");
-const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const objects_1 = __webpack_require__(/*! ../objects */ "./node_modules/@abaplint/core/build/src/objects/index.js");
 class WhitespaceEndConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.WhitespaceEndConf = WhitespaceEndConf;
-class WhitespaceEnd extends _abap_rule_1.ABAPRule {
+class WhitespaceEnd {
     constructor() {
-        super(...arguments);
         this.conf = new WhitespaceEndConf();
     }
     getMetadata() {
@@ -72739,7 +72736,10 @@ class WhitespaceEnd extends _abap_rule_1.ABAPRule {
             key: "whitespace_end",
             title: "Whitespace at end of line",
             shortDescription: `Checks for redundant whitespace at the end of each line.`,
+            extendedInformation: `SMIM and W3MI files are not checked.`,
             tags: [_irule_1.RuleTag.Whitespace, _irule_1.RuleTag.Quickfix, _irule_1.RuleTag.SingleFile],
+            badExample: `WRITE 'hello'.      `,
+            goodExample: `WRITE 'hello'.`,
         };
     }
     getMessage() {
@@ -72751,17 +72751,25 @@ class WhitespaceEnd extends _abap_rule_1.ABAPRule {
     setConfig(conf) {
         this.conf = conf;
     }
-    runParsed(file) {
+    initialize(_reg) {
+        return this;
+    }
+    run(obj) {
         const issues = [];
-        const rows = file.getRawRows();
-        for (let i = 0; i < rows.length; i++) {
-            if (rows[i].endsWith(" ") || rows[i].endsWith(" \r")) {
-                const match = / +\r?$/.exec(rows[i]);
-                const start = new position_1.Position(i + 1, match.index + 1);
-                const end = new position_1.Position(i + 1, rows[i].length + 1);
-                const fix = edit_helper_1.EditHelper.deleteRange(file, start, end);
-                const issue = issue_1.Issue.atRange(file, start, end, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
-                issues.push(issue);
+        for (const file of obj.getFiles()) {
+            if (obj instanceof objects_1.MIMEObject || obj instanceof objects_1.WebMIME) {
+                continue;
+            }
+            const rows = file.getRawRows();
+            for (let i = 0; i < rows.length; i++) {
+                if (rows[i].endsWith(" ") || rows[i].endsWith(" \r")) {
+                    const match = / +\r?$/.exec(rows[i]);
+                    const start = new position_1.Position(i + 1, match.index + 1);
+                    const end = new position_1.Position(i + 1, rows[i].length + 1);
+                    const fix = edit_helper_1.EditHelper.deleteRange(file, start, end);
+                    const issue = issue_1.Issue.atRange(file, start, end, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
+                    issues.push(issue);
+                }
             }
         }
         return issues;
@@ -75277,6 +75285,8 @@ class OrderedObjParser{
       "copyright" : { regex: /&(copy|#169);/g, val: "©" },
       "reg" : { regex: /&(reg|#174);/g, val: "®" },
       "inr" : { regex: /&(inr|#8377);/g, val: "₹" },
+      "num_dec": { regex: /&#([0-9]{1,7});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 10)) },
+      "num_hex": { regex: /&#x([0-9a-fA-F]{1,6});/g, val : (_, str) => String.fromCharCode(Number.parseInt(str, 16)) },
     };
     this.addExternalEntities = addExternalEntities;
     this.parseXml = parseXml;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.106.1",
+    "version": "2.106.3",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,24 +38,24 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.106.1",
-        "@types/chai": "^4.3.12",
+        "@abaplint/core": "^2.106.3",
+        "@types/chai": "^4.3.14",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.11.25",
+        "@types/node": "^20.11.30",
         "@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.7.7",
+        "memfs": "^4.8.0",
         "minimist": "^1.2.8",
         "mocha": "^10.3.0",
         "progress": "^2.0.3",
-        "typescript": "^5.4.2",
-        "webpack": "^5.90.3",
+        "typescript": "^5.4.3",
+        "webpack": "^5.91.0",
         "webpack-cli": "^5.1.4",
         "xml-js": "^1.6.11"
     },