@abaplint/cli 2.105.13 → 2.105.14

package/build/cli.js

@@ -21374,11 +21374,10 @@ class CurrentScope {
         this.addNamedIdentifier(identifier.getName(), identifier);
     }
     addDeferred(token) {
-        var _a;
         if (token === undefined) {
             return;
         }
-        (_a = this.current) === null || _a === void 0 ? void 0 : _a.getData().deferred.push(token);
+        this.current.getData().deferred[token.getStr().toUpperCase()] = token;
     }
     addListPrefix(identifiers, prefix) {
         for (const id of identifiers) {
@@ -21683,6 +21682,7 @@ const Statements = __webpack_require__(/*! ../2_statements/statements */ "./node
 const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const visibility_1 = __webpack_require__(/*! ../4_file_information/visibility */ "./node_modules/@abaplint/core/build/src/abap/4_file_information/visibility.js");
 // todo, think some of the public methods can be made private
+// todo: changet this class to static? for performance
 class ObjectOriented {
     constructor(scope) {
         this.scope = scope;
@@ -23347,7 +23347,7 @@ class BasicTypes {
     }
     // todo, rewrite this method
     resolveTypeChain(expr) {
-        var _a;
+        var _a, _b, _c, _d;
         const chainText = expr.concatTokens().toUpperCase();
         if (chainText.includes("-")) {
             // workaround for stuff like "sy-repid"
@@ -23386,7 +23386,10 @@ class BasicTypes {
                 if (foundType === undefined) {
                     return new Types.UnknownType("Could not resolve type " + chainText);
                 }
-                this.scope.addReference(expr.getTokens()[2], foundId, _reference_1.ReferenceType.TypeReference, this.filename);
+                const token = (_a = expr.getChildren()[2]) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+                if (token) {
+                    this.scope.addReference(token, foundId, _reference_1.ReferenceType.TypeReference, this.filename);
+                }
             }
             else {
                 // lookup in local and global scope
@@ -23405,7 +23408,10 @@ class BasicTypes {
                 if (byName === undefined || foundType === undefined) {
                     return new Types.UnknownType(subs[0] + " not found in class or interface");
                 }
-                this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
+                const token = (_b = expr.getChildren()[2]) === null || _b === void 0 ? void 0 : _b.getFirstToken();
+                if (token) {
+                    this.scope.addReference(token, byName, _reference_1.ReferenceType.TypeReference, this.filename);
+                }
             }
         }
         else if (className && chainText.includes("->")) {
@@ -23431,7 +23437,10 @@ class BasicTypes {
                     if (byName === undefined || foundType === undefined) {
                         return new Types.UnknownType(typeName + " not found in class or interface");
                     }
-                    this.scope.addReference(expr.getTokens()[2], byName, _reference_1.ReferenceType.TypeReference, this.filename);
+                    const token = (_c = expr.getChildren()[2]) === null || _c === void 0 ? void 0 : _c.getFirstToken();
+                    if (token) {
+                        this.scope.addReference(token, byName, _reference_1.ReferenceType.TypeReference, this.filename);
+                    }
                 }
                 else {
                     return new Types.UnknownType("Not an object reference, " + className + ", " + id.constructor.name);
@@ -23448,7 +23457,7 @@ class BasicTypes {
             const found = this.scope.findType(subs[0]);
             foundType = found === null || found === void 0 ? void 0 : found.getType();
             if (foundType === undefined) {
-                const typePoolType = (_a = this.scope.findTypePoolType(subs[0])) === null || _a === void 0 ? void 0 : _a.getType();
+                const typePoolType = (_d = this.scope.findTypePoolType(subs[0])) === null || _d === void 0 ? void 0 : _d.getType();
                 if (typePoolType) {
                     //          this.scope.addReference(typeName.getFirstToken(), typePoolType, ReferenceType.TypeReference, this.filename);
                     foundType = typePoolType;
@@ -23576,7 +23585,7 @@ class BasicTypes {
             return undefined;
         }
         const name = chain.getFirstToken().getStr();
-        if (chain.getAllTokens().length === 1) {
+        if (chain.getChildren().length === 1) {
             if (name.toUpperCase() === "OBJECT") {
                 return new Types.GenericObjectReferenceType();
             }
@@ -24267,14 +24276,15 @@ class Constant {
         if (node.findDirectExpression(expressions_1.Integer)) {
             return basic_1.IntegerType.get({ derivedFromConstant: true });
         }
-        else if (node.getFirstToken().getStr().startsWith("'")) {
-            let len = node.getFirstToken().getStr().length - 2;
+        const first = node.getFirstToken().getStr();
+        if (first.startsWith("'")) {
+            let len = first.length - 2;
             if (len <= 0) {
                 len = 1;
             }
             return new basic_1.CharacterType(len, { derivedFromConstant: true });
         }
-        else if (node.getFirstToken().getStr().startsWith("`")) {
+        else if (first.startsWith("`")) {
             return basic_1.StringType.get({ derivedFromConstant: true });
         }
         else {
@@ -24604,11 +24614,10 @@ const source_field_1 = __webpack_require__(/*! ./source_field */ "./node_modules
 class FieldChain {
     runSyntax(node, scope, filename, refType) {
         var _a, _b, _c, _d, _e;
-        const children = node.getChildren().slice();
-        let contextName = children[0].concatTokens();
+        const children = node.getChildren();
         let context = undefined;
         try {
-            context = this.findTop(children.shift(), scope, filename, refType);
+            context = this.findTop(children[0], scope, filename, refType);
         }
         catch (error) {
             const concat = node.concatTokens();
@@ -24627,9 +24636,8 @@ class FieldChain {
             }
             throw error;
         }
-        while (children.length > 0) {
-            contextName += children[0].concatTokens();
-            const current = children.shift();
+        for (let i = 1; i < children.length; i++) {
+            const current = children[i];
             if (current === undefined) {
                 break;
             }
@@ -24644,7 +24652,11 @@ class FieldChain {
                     && !(context instanceof basic_1.TableType && context.isWithHeader())
                     && !(context instanceof basic_1.VoidType)) {
                     if (context instanceof basic_1.TableType && context.isWithHeader() === false) {
-                        if (scope.isAllowHeaderUse(contextName.substring(0, contextName.length - 1))) {
+                        let contextName = "";
+                        for (let j = 0; j < i; j++) {
+                            contextName += children[j].concatTokens();
+                        }
+                        if (scope.isAllowHeaderUse(contextName)) {
                             // FOR ALL ENTRIES workaround
                             context = context.getRowType();
                             if (!(context instanceof basic_1.StructureType) && !(context instanceof basic_1.VoidType)) {
@@ -25429,7 +25441,7 @@ class MethodCallChain {
         if (first.get() instanceof Expressions.MethodCall) {
             children.unshift(first);
         }
-        let previous = "";
+        let previous = undefined;
         while (children.length > 0) {
             const current = children.shift();
             if (current === undefined) {
@@ -25450,7 +25462,7 @@ class MethodCallChain {
                     }
                 }
                 else {
-                    if (previous === "=>" && (method === null || method === void 0 ? void 0 : method.isStatic()) === false) {
+                    if (previous && previous.getFirstToken().getStr() === "=>" && (method === null || method === void 0 ? void 0 : method.isStatic()) === false) {
                         throw new Error("Method \"" + methodName + "\" not static");
                     }
                     const extra = {
@@ -25490,7 +25502,7 @@ class MethodCallChain {
             else if (current instanceof nodes_1.ExpressionNode && current.get() instanceof Expressions.AttributeName) {
                 context = new attribute_name_1.AttributeName().runSyntax(context, current, scope, filename);
             }
-            previous = current.concatTokens();
+            previous = current;
         }
         return context;
     }
@@ -27820,7 +27832,7 @@ class ScopeData {
             forms: [], // todo, refactor to object
             types: {},
             extraLikeTypes: {},
-            deferred: [],
+            deferred: {},
             references: [],
             sqlConversion: [],
         };
@@ -27866,10 +27878,9 @@ class SpaghettiScopeNode extends ScopeData {
     findDeferred(name) {
         let search = this;
         while (search !== undefined) {
-            for (const d of search.getData().deferred) {
-                if (d.getStr().toUpperCase() === name.toUpperCase()) {
-                    return new _identifier_1.Identifier(d, search.identifier.filename);
-                }
+            const found = search.getData().deferred[name.toUpperCase()];
+            if (found) {
+                return new _identifier_1.Identifier(found, search.identifier.filename);
             }
             search = search.getParent();
         }
@@ -28364,25 +28375,26 @@ exports.AuthorityCheck = AuthorityCheck;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Call = 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 method_call_chain_1 = __webpack_require__(/*! ../expressions/method_call_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/method_call_chain.js");
 const method_source_1 = __webpack_require__(/*! ../expressions/method_source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/method_source.js");
 const method_call_body_1 = __webpack_require__(/*! ../expressions/method_call_body */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/method_call_body.js");
 const void_type_1 = __webpack_require__(/*! ../../types/basic/void_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/void_type.js");
 class Call {
     runSyntax(node, scope, filename) {
-        const chain = node.findDirectExpression(Expressions.MethodCallChain);
-        if (chain) {
-            new method_call_chain_1.MethodCallChain().runSyntax(chain, scope, filename);
+        const children = node.getChildren();
+        if (children.length === 2) {
+            const first = children[0];
+            new method_call_chain_1.MethodCallChain().runSyntax(first, scope, filename);
             return;
         }
-        const methodSource = node.findDirectExpression(Expressions.MethodSource);
+        const methodSource = children[2];
         if (methodSource === undefined) {
             throw new Error("Call, child MethodSource not found");
         }
         const methodDef = new method_source_1.MethodSource().runSyntax(methodSource, scope, filename);
-        const body = node.findDirectExpression(Expressions.MethodCallBody);
-        if (body) {
+        const body = children[3];
+        if (body instanceof nodes_1.ExpressionNode) {
             // todo, resolve the method definition above and pass, if possible, in case of dynamic pass void
             new method_call_body_1.MethodCallBody().runSyntax(body, scope, filename, methodDef || new void_type_1.VoidType("CallTODO"));
         }
@@ -34554,6 +34566,7 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
         }
         return str;
     }
+    // todo: delete this method?, its slow
     getTokens() {
         const tokens = [];
         for (const c of this.getChildren()) {
@@ -34650,8 +34663,9 @@ class ExpressionNode extends _abstract_node_1.AbstractNode {
         return ret;
     }
     findDirectTokenByText(text) {
+        const search = text.toUpperCase();
         for (const child of this.getChildren()) {
-            if (child instanceof token_node_1.TokenNode && child.get().getStr().toUpperCase() === text.toUpperCase()) {
+            if (child instanceof token_node_1.TokenNode && child.get().getStr().toUpperCase() === search) {
                 return child.get();
             }
         }
@@ -37279,29 +37293,29 @@ class ClassDefinition extends _identifier_1.Identifier {
         const name = def.findDirectExpression(Expressions.ClassName).getFirstToken();
         super(name, filename);
         scope.addClassDefinition(this);
-        this.node = node;
         this.events = [];
         this.implementing = [];
+        this.globalValue = def.findFirstExpression(Expressions.ClassGlobal) !== undefined;
+        this.finalValue = def.findFirstExpression(Expressions.ClassFinal) !== undefined;
         scope.push(_scope_type_1.ScopeType.ClassDefinition, name.getStr(), name.getStart(), filename);
         this.superClass = this.findSuper(def, filename, scope);
         this.friends = this.findFriends(def, filename, scope);
-        this.parse(filename, scope);
+        this.parse(filename, scope, node);
         const helper = new _object_oriented_1.ObjectOriented(scope);
         helper.fromSuperClassesAndInterfaces(this);
         helper.addAliasedTypes(this.aliases);
-        this.attributes = new class_attributes_1.Attributes(this.node, this.filename, scope);
+        this.attributes = new class_attributes_1.Attributes(node, this.filename, scope);
         this.types = this.attributes.getTypes();
-        const events = this.node.findAllStatements(Statements.Events);
+        const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, this.filename, scope)); // todo, all these are not Public
         }
-        this.methodDefs = new method_definitions_1.MethodDefinitions(this.node, this.filename, scope);
+        this.methodDefs = new method_definitions_1.MethodDefinitions(node, this.filename, scope);
         scope.pop(node.getLastToken().getEnd());
-        const cdef = this.node.findFirstStatement(Statements.ClassDefinition);
-        const concat = cdef.concatTokens().toUpperCase();
+        const concat = def.concatTokens().toUpperCase();
         this.testing = concat.includes(" FOR TESTING");
         this.sharedMemory = concat.includes(" SHARED MEMORY ENABLED");
-        this.abstract = (cdef === null || cdef === void 0 ? void 0 : cdef.findDirectTokenByText("ABSTRACT")) !== undefined;
+        this.abstract = (def === null || def === void 0 ? void 0 : def.findDirectTokenByText("ABSTRACT")) !== undefined;
         // perform checks after everything has been initialized
         this.checkMethodsFromSuperClasses(scope);
     }
@@ -37324,10 +37338,10 @@ class ClassDefinition extends _identifier_1.Identifier {
         return this.attributes;
     }
     isGlobal() {
-        return this.node.findFirstExpression(Expressions.ClassGlobal) !== undefined;
+        return this.globalValue;
     }
     isFinal() {
-        return this.node.findFirstExpression(Expressions.ClassFinal) !== undefined;
+        return this.finalValue;
     }
     getImplementing() {
         return this.implementing;
@@ -37406,10 +37420,10 @@ class ClassDefinition extends _identifier_1.Identifier {
             }
         }
     }
-    parse(filename, scope) {
+    parse(filename, scope, inputNode) {
         var _a;
-        for (const node of this.node.findAllStatements(Statements.InterfaceDef)) {
-            const partial = node.concatTokens().toUpperCase().includes(" PARTIALLY IMPLEMENTED");
+        for (const node of inputNode.findAllStatements(Statements.InterfaceDef)) {
+            const partial = node.findDirectTokenByText("PARTIALLY") !== undefined;
             const token = (_a = node.findFirstExpression(Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
             if (token === undefined) {
                 throw new Error("ClassDefinition, unable to find interface token");
@@ -37427,7 +37441,7 @@ class ClassDefinition extends _identifier_1.Identifier {
                 scope.addReference(token, undefined, _reference_1.ReferenceType.ObjectOrientedUnknownReference, filename, { ooName: name.toUpperCase(), ooType: "INTF" });
             }
         }
-        this.aliases = new aliases_1.Aliases(this.node, this.filename, scope);
+        this.aliases = new aliases_1.Aliases(inputNode, this.filename, scope);
     }
 }
 exports.ClassDefinition = ClassDefinition;
@@ -37790,11 +37804,11 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         const name = node.findFirstStatement(Statements.Interface).findFirstExpression(Expressions.InterfaceName).getFirstToken();
         super(name, filename);
         scope.addInterfaceDefinition(this);
-        this.node = node;
         this.events = [];
         this.implementing = [];
+        this.globalValue = node.findFirstExpression(Expressions.ClassGlobal) !== undefined;
         scope.push(_scope_type_1.ScopeType.Interface, name.getStr(), node.getFirstToken().getStart(), filename);
-        this.parse(scope, filename);
+        this.parse(scope, filename, node);
         scope.pop(node.getLastToken().getEnd());
     }
     getSuperClass() {
@@ -37816,21 +37830,21 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         return this.typeDefinitions;
     }
     isLocal() {
-        return !this.isGlobal();
+        return !this.globalValue;
     }
     isGlobal() {
-        return this.node.findFirstExpression(Expressions.ClassGlobal) !== undefined;
+        return this.globalValue;
     }
     getMethodDefinitions() {
         return this.methodDefinitions;
     }
     /////////////////
-    parse(scope, filename) {
+    parse(scope, filename, node) {
         var _a;
         // todo, proper sequencing, the statements should be processed line by line
-        this.attributes = new class_attributes_1.Attributes(this.node, this.filename, scope);
+        this.attributes = new class_attributes_1.Attributes(node, this.filename, scope);
         this.typeDefinitions = this.attributes.getTypes();
-        this.aliases = new aliases_1.Aliases(this.node, this.filename, scope);
+        this.aliases = new aliases_1.Aliases(node, this.filename, scope);
         // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
         for (const a of this.aliases.getAll()) {
             const [objName, fieldName] = a.getComponent().split("~");
@@ -37851,15 +37865,15 @@ class InterfaceDefinition extends _identifier_1.Identifier {
                 }
             }
         }
-        this.methodDefinitions = new method_definitions_1.MethodDefinitions(this.node, this.filename, scope);
+        this.methodDefinitions = new method_definitions_1.MethodDefinitions(node, this.filename, scope);
         if (this.methodDefinitions.getByName("CONSTRUCTOR") !== undefined) {
             throw new Error("Interfaces cannot have constructor methods");
         }
-        const events = this.node.findAllStatements(Statements.Events);
+        const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, this.filename, scope));
         }
-        for (const i of this.node.findAllStatements(Statements.InterfaceDef)) {
+        for (const i of node.findAllStatements(Statements.InterfaceDef)) {
             const token = (_a = i.findDirectExpression(Expressions.InterfaceName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
             const name = token === null || token === void 0 ? void 0 : token.getStr();
             if (name) {
@@ -38285,7 +38299,7 @@ class MethodParameters {
         const importing = node.findFirstExpression(Expressions.MethodDefImporting);
         if (importing) {
             this.add(this.importing, importing, scope, ["importing" /* IdentifierMeta.MethodImporting */], abstractMethod);
-            if (importing.concatTokens().toUpperCase().includes(" PREFERRED PARAMETER")) {
+            if (importing.findDirectTokenByText("PREFERRED")) {
                 this.preferred = importing.getLastToken().getStr().toUpperCase();
                 if (this.preferred.startsWith("!")) {
                     this.preferred = this.preferred.substring(1);
@@ -38316,10 +38330,11 @@ class MethodParameters {
                 }
                 this.importing.push(new _typed_identifier_1.TypedIdentifier(foo.getFirstToken(), filename, new basic_1.VoidType("RapMethodParameter"), ["importing" /* IdentifierMeta.MethodImporting */]));
             }
-            if (node.concatTokens().toUpperCase().includes(" FOR VALIDATE ")
-                || node.concatTokens().toUpperCase().includes(" FOR BEHAVIOR ")
-                || node.concatTokens().toUpperCase().includes(" FOR FEATURES ")
-                || node.concatTokens().toUpperCase().includes(" FOR MODIFY ")) {
+            const concat = node.concatTokens().toUpperCase();
+            if (concat.includes(" FOR VALIDATE ")
+                || concat.includes(" FOR BEHAVIOR ")
+                || concat.includes(" FOR FEATURES ")
+                || concat.includes(" FOR MODIFY ")) {
                 const token = isRap.getFirstToken();
                 this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "failed"), filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
                 this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "mapped"), filename, new basic_1.VoidType("RapMethodParameter"), ["exporting" /* IdentifierMeta.MethodExporting */]));
@@ -38345,14 +38360,14 @@ class MethodParameters {
         }
     }
     add(target, source, scope, meta, abstractMethod) {
-        var _a;
+        var _a, _b;
         for (const opt of source.findAllExpressions(Expressions.MethodParamOptional)) {
             const p = opt.findDirectExpression(Expressions.MethodParam);
             if (p === undefined) {
                 continue;
             }
             const extraMeta = [];
-            if (opt.concatTokens().toUpperCase().startsWith("VALUE(")) {
+            if (p.getFirstToken().getStr().toUpperCase() === "VALUE" && ((_a = p.getChildren()[1]) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr()) === "(") {
                 extraMeta.push("pass_by_value" /* IdentifierMeta.PassByValue */);
             }
             else if (meta.includes("importing" /* IdentifierMeta.MethodImporting */)) {
@@ -38364,14 +38379,14 @@ class MethodParameters {
             const id = new method_param_1.MethodParam().runSyntax(p, scope, this.filename, [...meta, ...extraMeta]);
             scope.addIdentifier(id);
             target.push(id);
-            if (opt.getLastToken().getStr().toUpperCase() === "OPTIONAL") {
+            if (opt.findDirectTokenByText("OPTIONAL")) {
                 const name = target[target.length - 1].getName().toUpperCase();
                 this.optional.push(name);
             }
             else if (opt.findFirstExpression(Expressions.Default)) {
                 const name = target[target.length - 1].getName().toUpperCase();
                 this.optional.push(name);
-                const val = (_a = opt.findFirstExpression(Expressions.Default)) === null || _a === void 0 ? void 0 : _a.getLastChild();
+                const val = (_b = opt.findFirstExpression(Expressions.Default)) === null || _b === void 0 ? void 0 : _b.getLastChild();
                 if (val && val instanceof nodes_1.ExpressionNode) {
                     this.defaults[name] = val;
                 }
@@ -51147,7 +51162,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.105.13";
+        return "2.105.14";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.105.13",
+    "version": "2.105.14",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.105.13",
+        "@abaplint/core": "^2.105.14",
         "@types/chai": "^4.3.11",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.6",
-        "@types/node": "^20.11.6",
+        "@types/node": "^20.11.9",
         "@types/progress": "^2.0.7",
         "chai": "^4.4.1",
         "chalk": "^5.3.0",