@abaplint/cli 2.120.19 → 2.120.20

package/build/cli.js

@@ -26422,6 +26422,20 @@ class CurrentScope {
         }
         return false;
     }
+    isInStaticMethod() {
+        let curr = this.current;
+        while (curr !== undefined) {
+            const stype = curr.getIdentifier().stype;
+            if (stype === _scope_type_1.ScopeType.MethodInstance) {
+                return false;
+            }
+            else if (stype === _scope_type_1.ScopeType.ClassImplementation) {
+                return true;
+            }
+            curr = curr.getParent();
+        }
+        return false;
+    }
     addLocalFriend(className, friendName) {
         var _a;
         const key = className.toUpperCase();
@@ -27787,7 +27801,8 @@ class TypeUtils {
             }
         }
         else if (source instanceof basic_1.XStringType) {
-            if (target instanceof basic_1.CLikeType
+            if (target instanceof basic_1.CharacterType
+                || target instanceof basic_1.CLikeType
                 || target instanceof basic_1.IntegerType
                 || target instanceof basic_1.StringType
                 || target instanceof basic_1.ObjectReferenceType
@@ -29149,19 +29164,59 @@ function checkOffsetLength(source, sourceType, method, input) {
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AttributeChain = void 0;
+const nodes_1 = __webpack_require__(/*! ../../nodes */ "../core/build/src/abap/nodes/index.js");
+const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
 const void_type_1 = __webpack_require__(/*! ../../types/basic/void_type */ "../core/build/src/abap/types/basic/void_type.js");
-const object_reference_type_1 = __webpack_require__(/*! ../../types/basic/object_reference_type */ "../core/build/src/abap/types/basic/object_reference_type.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "../core/build/src/abap/types/basic/index.js");
 const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "../core/build/src/abap/5_syntax/_object_oriented.js");
 const expressions_1 = __webpack_require__(/*! ../../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "../core/build/src/abap/5_syntax/_syntax_input.js");
+const component_name_1 = __webpack_require__(/*! ./component_name */ "../core/build/src/abap/5_syntax/expressions/component_name.js");
+const attribute_name_1 = __webpack_require__(/*! ./attribute_name */ "../core/build/src/abap/5_syntax/expressions/attribute_name.js");
+const table_expression_1 = __webpack_require__(/*! ./table_expression */ "../core/build/src/abap/5_syntax/expressions/table_expression.js");
+const field_offset_1 = __webpack_require__(/*! ./field_offset */ "../core/build/src/abap/5_syntax/expressions/field_offset.js");
+const field_length_1 = __webpack_require__(/*! ./field_length */ "../core/build/src/abap/5_syntax/expressions/field_length.js");
 class AttributeChain {
     static runSyntax(inputContext, node, input, type) {
         if (inputContext instanceof void_type_1.VoidType) {
             return inputContext;
         }
-        else if (!(inputContext instanceof object_reference_type_1.ObjectReferenceType)) {
+        else if (!(inputContext instanceof basic_1.ObjectReferenceType)) {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), "Not an object reference(AttributeChain)"));
             return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
         }
@@ -29191,8 +29246,69 @@ class AttributeChain {
         for (const t of type) {
             input.scope.addReference(nameToken, context, t, input.filename);
         }
-        // todo, loop, handle ArrowOrDash, ComponentName, TableExpression
-        return context.getType();
+        let contextType = context.getType();
+        const children = node.getChildren();
+        for (let i = 1; i < children.length; i++) {
+            const child = children[i];
+            if (contextType instanceof void_type_1.VoidType || contextType instanceof basic_1.UnknownType) {
+                return contextType;
+            }
+            else if (child.get() instanceof Expressions.ArrowOrDash) {
+                const operator = child.getFirstToken().getStr();
+                if (operator === "-" && !(contextType instanceof basic_1.StructureType)) {
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), "AttributeChain, not a structure"));
+                    return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                else if ((operator === "->" || operator === "=>")
+                    && !(contextType instanceof basic_1.ObjectReferenceType)
+                    && !(contextType instanceof basic_1.DataReference)) {
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), "AttributeChain, not a reference"));
+                    return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+            }
+            else if (child.get() instanceof Expressions.ComponentName) {
+                if (contextType instanceof basic_1.ObjectReferenceType || contextType instanceof basic_1.DataReference) {
+                    contextType = attribute_name_1.AttributeName.runSyntax(contextType, child, input, type);
+                }
+                else {
+                    contextType = component_name_1.ComponentName.runSyntax(contextType, child, input);
+                }
+            }
+            else if (child.getFirstToken().getStr() === "*" && contextType instanceof basic_1.DataReference) {
+                contextType = contextType.getType();
+            }
+            else if (child instanceof nodes_1.ExpressionNode && child.get() instanceof Expressions.TableExpression) {
+                if (!(contextType instanceof basic_1.TableType)) {
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, child.getFirstToken(), "Table expression, expected table"));
+                    return void_type_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
+                table_expression_1.TableExpression.runSyntax(child, input, contextType);
+                contextType = contextType.getRowType();
+            }
+            else if (child instanceof nodes_1.ExpressionNode && child.get() instanceof Expressions.FieldOffset) {
+                const offset = field_offset_1.FieldOffset.runSyntax(child, input);
+                if (offset !== undefined) {
+                    if (contextType instanceof basic_1.CharacterType) {
+                        contextType = new basic_1.CharacterType(contextType.getLength() - offset);
+                    }
+                    else if (contextType instanceof basic_1.HexType) {
+                        contextType = new basic_1.HexType(contextType.getLength() - offset);
+                    }
+                }
+            }
+            else if (child instanceof nodes_1.ExpressionNode && child.get() instanceof Expressions.FieldLength) {
+                const length = field_length_1.FieldLength.runSyntax(child, input);
+                if (length !== undefined) {
+                    if (contextType instanceof basic_1.CharacterType) {
+                        contextType = new basic_1.CharacterType(length);
+                    }
+                    else if (contextType instanceof basic_1.HexType) {
+                        contextType = new basic_1.HexType(length);
+                    }
+                }
+            }
+        }
+        return contextType;
     }
 }
 exports.AttributeChain = AttributeChain;
@@ -32168,6 +32284,11 @@ class MethodCallChain {
                         input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                         return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                     }
+                    if (current === first && (method === null || method === void 0 ? void 0 : method.isStatic()) === false && input.scope.isInStaticMethod() === true) {
+                        const message = "Method \"" + methodName + "\" not static";
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
                     const voidedName = context instanceof basic_1.VoidType ? context.getVoided() : undefined;
                     const extra = helper.methodReferenceExtras(foundDef, className || voidedName);
                     input.scope.addReference(methodToken, method, _reference_1.ReferenceType.MethodReference, input.filename, extra);
@@ -32958,9 +33079,11 @@ class MethodSource {
             throw new assert_error_1.AssertError("MethodSource, first child expected");
         }
         let context = this.findTop(first, input, children);
+        let implicitMe = false;
         if (context === undefined) {
             context = (_a = input.scope.findVariable("me")) === null || _a === void 0 ? void 0 : _a.getType();
             children.unshift(first);
+            implicitMe = true;
         }
         if (input.scope.getLanguageVersion() === version_1.LanguageVersion.Cloud
             && first.get() instanceof Expressions.Dynamic
@@ -33020,6 +33143,11 @@ class MethodSource {
                 const def = input.scope.findObjectDefinition(className);
                 // eslint-disable-next-line prefer-const
                 let { method, def: foundDef } = helper.searchMethodName(def, methodName);
+                if (implicitMe && current === first && (method === null || method === void 0 ? void 0 : method.isStatic()) === false && input.scope.isInStaticMethod() === true) {
+                    const message = "Method \"" + methodName + "\" not static";
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
+                    return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                }
                 if (method === undefined && (methodName === null || methodName === void 0 ? void 0 : methodName.toUpperCase()) === "CONSTRUCTOR") {
                     context = basic_1.VoidType.get("CONSTRUCTOR"); // todo, this is a workaround, constructors always exists
                 }
@@ -51582,6 +51710,7 @@ class ClassDefinition extends _identifier_1.Identifier {
         // perform checks after everything has been initialized
         this.checkInterfaceVisibility(input, node);
         this.checkMethodsFromSuperClasses(input);
+        this.checkMethodNameConflicts(input);
         this.checkClassNameLength(input);
         this.checkMethodNameLength(input);
         this.checkClassConstructorStatic(input);
@@ -51713,6 +51842,14 @@ class ClassDefinition extends _identifier_1.Identifier {
             }
         }
     }
+    checkMethodNameConflicts(input) {
+        for (const m of this.methodDefs.getAll()) {
+            if (this.attributes.findByName(m.getName()) !== undefined
+                || this.types.getByName(m.getName()) !== undefined) {
+                input.issues.push((0, _syntax_input_1.syntaxIssue)(input, m.getToken(), `"${m.getName()}" already defined`));
+            }
+        }
+    }
     findFriends(def, input) {
         var _a;
         const result = [];
@@ -69513,7 +69650,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.19";
+        return "2.120.20";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.120.19",
+    "version": "2.120.20",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -8,7 +8,7 @@
     },
     "scripts": {
         "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
-        "clean": "rm -rf build",
+        "clean": "rimraf build",
         "compile": "npm run clean && tsc",
         "test": "npm run compile && mocha && npm run lint && npm run webpack",
         "webpack": "webpack --progress",
@@ -26,7 +26,7 @@
         "url": "git+https://github.com/abaplint/abaplint.git"
     },
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=22.0.0"
     },
     "keywords": [
         "ABAP",
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.120.19",
+        "@abaplint/core": "^2.120.20",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
@@ -55,6 +55,7 @@
         "mocha": "^11.7.6",
         "p-limit": "^3.1.0",
         "progress": "^2.0.3",
+        "rimraf": "^6.1.3",
         "typescript": "^7.0.2",
         "webpack": "^5.107.2",
         "webpack-cli": "^7.0.3",