@abaplint/cli 2.106.2 → 2.106.4

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)))));
@@ -15789,9 +15789,11 @@ exports.Retry = Retry;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Return = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
+const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class Return {
     getMatcher() {
-        return (0, combi_1.str)("RETURN");
+        return (0, combi_1.seq)((0, combi_1.str)("RETURN"), (0, combi_1.optPrio)((0, combi_1.ver)(version_1.Version.v758, expressions_1.Source)));
     }
 }
 exports.Return = Return;
@@ -22425,6 +22427,10 @@ class TypeUtils {
         if (tname === sname) {
             return true;
         }
+        /*
+            console.dir(sid);
+            console.dir(tid);
+        */
         if (!(sid instanceof types_1.ClassDefinition || sid instanceof types_1.InterfaceDefinition)) {
             const found = this.scope.findObjectDefinition(sid.getName());
             if (found) {
@@ -22644,7 +22650,11 @@ class TypeUtils {
             }
         }
         else if (source instanceof basic_1.GenericObjectReferenceType) {
-            if (target instanceof basic_1.ObjectReferenceType) {
+            if (target instanceof basic_1.ObjectReferenceType
+                || target instanceof basic_1.StringType
+                || target instanceof basic_1.CharacterType
+                || target instanceof basic_1.TableType
+                || target instanceof basic_1.CLikeType) {
                 return false;
             }
         }
@@ -24122,6 +24132,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ComponentCompareSimple = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_chain.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 class ComponentCompareSimple {
@@ -24136,7 +24147,10 @@ class ComponentCompareSimple {
                     targetType = undefined;
                 }
                 else if (c.get() instanceof Expressions.Source) {
-                    new source_1.Source().runSyntax(c, scope, filename, targetType);
+                    const sourceType = new source_1.Source().runSyntax(c, scope, filename, targetType);
+                    if (targetType && new _type_utils_1.TypeUtils(scope).isAssignable(sourceType, targetType) === false) {
+                        throw new Error("ComponentCompareSimple, incompatible types");
+                    }
                 }
                 else {
                     throw "ComponentCompareSimple, unexpected node";
@@ -25898,6 +25912,9 @@ class MethodParameters {
     checkChanging(node, scope, method, filename) {
         var _a;
         for (const item of this.parameterListT(node, scope, filename)) {
+            if (item.target.findFirstExpression(Expressions.InlineData) !== undefined) {
+                throw new Error("CHANGING cannot be inlined");
+            }
             let parameterType = undefined;
             if (method instanceof basic_1.VoidType) {
                 parameterType = method;
@@ -27684,6 +27701,7 @@ const field_assignment_1 = __webpack_require__(/*! ./field_assignment */ "./node
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 class ValueBody {
     runSyntax(node, scope, filename, targetType) {
+        var _a;
         if (node === undefined) {
             return targetType;
         }
@@ -27699,8 +27717,16 @@ class ValueBody {
                 forScopes++;
             }
         }
+        const fields = new Set();
         for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
             new field_assignment_1.FieldAssignment().runSyntax(s, scope, filename, targetType);
+            const fieldname = (_a = s.findDirectExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+            if (fieldname) {
+                if (fields.has(fieldname)) {
+                    throw new Error("Duplicate field assignment");
+                }
+                fields.add(fieldname);
+            }
         }
         let type = undefined; // todo, this is only correct if there is a single source in the body
         for (const s of node.findDirectExpressions(Expressions.Source)) {
@@ -29833,11 +29859,21 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Do = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
+const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/target.js");
+const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 class Do {
     runSyntax(node, scope, filename) {
-        // just recurse
+        const afterDo = node.findExpressionAfterToken("DO");
         for (const s of node.findDirectExpressions(Expressions.Source)) {
-            new source_1.Source().runSyntax(s, scope, filename);
+            const type = new source_1.Source().runSyntax(s, scope, filename);
+            if (s === afterDo
+                && new _type_utils_1.TypeUtils(scope).isAssignable(type, basic_1.IntegerType.get()) === false) {
+                throw new Error("DO TIMES must be numeric");
+            }
+        }
+        for (const t of node.findDirectExpressions(Expressions.Target)) {
+            new target_1.Target().runSyntax(t, scope, filename);
         }
     }
 }
@@ -30599,7 +30635,13 @@ class InsertInternal {
         if (t) {
             targetType = new target_1.Target().runSyntax(t, scope, filename);
         }
-        if (targetType instanceof basic_1.TableType
+        if (!(targetType instanceof basic_1.TableType)
+            && !(targetType instanceof basic_1.VoidType)
+            && !(targetType instanceof basic_1.AnyType)
+            && !(targetType instanceof basic_1.UnknownType)) {
+            throw new Error("INSERT target must be a table");
+        }
+        else if (targetType instanceof basic_1.TableType
             && node.findDirectTokenByText("LINES") === undefined) {
             targetType = targetType.getRowType();
         }
@@ -30618,9 +30660,14 @@ class InsertInternal {
                 new fstarget_1.FSTarget().runSyntax(afterAssigning, scope, filename, sourceType);
             }
         }
-        if (node.findDirectTokenByText("INITIAL") === undefined
-            && new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, targetType) === false) {
-            throw new Error("Types not compatible");
+        if (node.findDirectTokenByText("INITIAL") === undefined) {
+            if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, targetType) === false) {
+                throw new Error("Types not compatible");
+            }
+            else if (sourceType instanceof basic_1.CharacterType && targetType instanceof basic_1.StringType) {
+                // yea, well, INSERT doesnt convert the values automatically, like everything else?
+                throw new Error("Types not compatible");
+            }
         }
         const afterInto = node.findExpressionAfterToken("INTO");
         if ((afterInto === null || afterInto === void 0 ? void 0 : afterInto.get()) instanceof Expressions.Target && sourceType) {
@@ -31722,11 +31769,17 @@ class ReadTable {
                 throw new Error("READ TABLE, FROM must be compatible");
             }
         }
+        const afterKey = node.findExpressionAfterToken("KEY");
         for (const s of sources) {
             if (s === firstSource || s === indexSource || s === fromSource) {
                 continue;
             }
-            new source_1.Source().runSyntax(s, scope, filename);
+            const type = new source_1.Source().runSyntax(s, scope, filename);
+            if (s === afterKey) {
+                if (type instanceof basic_1.StringType || type instanceof basic_1.TableType || type instanceof basic_1.ObjectReferenceType) {
+                    throw new Error("Key cannot be string or table or reference");
+                }
+            }
         }
         const target = node.findDirectExpression(Expressions.ReadTableTarget);
         if (target) {
@@ -51381,7 +51434,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.106.2";
+        return "2.106.4";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -52800,6 +52853,7 @@ const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./
 const Structures = __webpack_require__(/*! ../abap/3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 class BeginEndNamesConf extends _basic_rule_config_1.BasicRuleConfig {
@@ -52836,6 +52890,10 @@ class BeginEndNames extends _abap_rule_1.ABAPRule {
         if (struc === undefined) {
             return [];
         }
+        const containsUnknown = file.getStatements().some(s => s.get() instanceof _statement_1.Unknown);
+        if (containsUnknown === true) {
+            return [];
+        }
         output.push(...this.test(struc, Structures.Data, Statements.DataBegin, Statements.DataEnd, file));
         output.push(...this.test(struc, Structures.ClassData, Statements.ClassDataBegin, Statements.ClassDataEnd, file));
         output.push(...this.test(struc, Structures.Constants, Statements.ConstantBegin, Statements.ConstantEnd, file));
@@ -65091,17 +65149,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 = "";
@@ -71037,6 +71095,7 @@ const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@ab
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
+const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 class UnnecessaryPragmaConf extends _basic_rule_config_1.BasicRuleConfig {
     constructor() {
         super(...arguments);
@@ -71151,7 +71210,8 @@ DATA: BEGIN OF blah ##NEEDED,
         if (statement.findFirstExpression(Expressions.ConstantString) === undefined
             && statement.findFirstExpression(Expressions.StringTemplate) === undefined) {
             const message = "There is no text, NO_TEXT can be removed";
-            return [issue_1.Issue.atToken(file, p, message, this.getMetadata().key, this.getConfig().severity)];
+            const fix = edit_helper_1.EditHelper.deleteToken(file, p);
+            return [issue_1.Issue.atToken(file, p, message, this.getMetadata().key, this.getConfig().severity, fix)];
         }
         return [];
     }
@@ -71163,7 +71223,8 @@ DATA: BEGIN OF blah ##NEEDED,
         const concat = next.concatTokens().toUpperCase();
         if (concat.includes(" SY-SUBRC")) {
             const message = "SUBRC_OK can be removed as sy-subrc is checked";
-            return [issue_1.Issue.atToken(file, p, message, this.getMetadata().key, this.getConfig().severity)];
+            const fix = edit_helper_1.EditHelper.deleteToken(file, p);
+            return [issue_1.Issue.atToken(file, p, message, this.getMetadata().key, this.getConfig().severity, fix)];
         }
         return [];
     }
@@ -71190,7 +71251,8 @@ DATA: BEGIN OF blah ##NEEDED,
             && !(statement.get() instanceof Statements.MethodDef)
             && statement.findFirstExpression(Expressions.InlineFS) === undefined) {
             const message = "There is no data definition, NEEDED can be removed";
-            return [issue_1.Issue.atToken(file, p, message, this.getMetadata().key, this.getConfig().severity)];
+            const fix = edit_helper_1.EditHelper.deleteToken(file, p);
+            return [issue_1.Issue.atToken(file, p, message, this.getMetadata().key, this.getConfig().severity, fix)];
         }
         return [];
     }
@@ -72720,16 +72782,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() {
@@ -72737,7 +72798,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() {
@@ -72749,17 +72813,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;
@@ -73648,9 +73720,10 @@ var Version;
     Version["v755"] = "v755";
     Version["v756"] = "v756";
     Version["v757"] = "v757";
+    Version["v758"] = "v758";
     Version["Cloud"] = "Cloud";
 })(Version || (exports.Version = Version = {}));
-exports.defaultVersion = Version.v757;
+exports.defaultVersion = Version.v758;
 function getPreviousVersion(v) {
     if (v === Version.OpenABAP) {
         return Version.v702;
@@ -75275,6 +75348,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.2",
+    "version": "2.106.4",
     "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.2",
-        "@types/chai": "^4.3.12",
+        "@abaplint/core": "^2.106.4",
+        "@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"
     },