@abaplint/cli 2.112.4 → 2.112.5

package/build/cli.js

@@ -21426,6 +21426,7 @@ class CurrentScope {
         }
         const upper = name.toUpperCase();
         if (this.current.getData().vars[upper] !== undefined) {
+            // console.dir(new Error().stack);
             throw new Error(`Variable name "${name}" already defined`);
         }
         else if (this.isOO() && this.current.getData().types[upper] !== undefined) {
@@ -21815,7 +21816,7 @@ class ObjectOriented {
         return ret;
     }
     addAliasedAttributes(classDefinition) {
-        for (const alias of classDefinition.getAliases().getAll()) {
+        for (const alias of classDefinition.getAliases()) {
             const comp = alias.getComponent();
             const idef = this.scope.findInterfaceDefinition(comp.split("~")[0]);
             if (idef) {
@@ -21833,18 +21834,6 @@ class ObjectOriented {
             }
         }
     }
-    addAliasedTypes(aliases) {
-        for (const alias of aliases.getAll()) {
-            const comp = alias.getComponent();
-            const idef = this.scope.findInterfaceDefinition(comp.split("~")[0]);
-            if (idef) {
-                const found = idef.getTypeDefinitions().getByName(comp.split("~")[1]);
-                if (found) {
-                    this.scope.addTypeNamed(alias.getName(), found);
-                }
-            }
-        }
-    }
     findMethodInInterface(interfaceName, methodName) {
         const idef = this.scope.findInterfaceDefinition(interfaceName);
         if (idef) {
@@ -21859,7 +21848,7 @@ class ObjectOriented {
         return undefined;
     }
     findMethodViaAlias(methodName, def) {
-        for (const a of def.getAliases().getAll()) {
+        for (const a of def.getAliases()) {
             if (a.getName().toUpperCase() === methodName.toUpperCase()) {
                 const comp = a.getComponent();
                 const res = this.findMethodInInterface(comp.split("~")[0], comp.split("~")[1]);
@@ -21902,7 +21891,6 @@ class ObjectOriented {
         return ret;
     }
     searchEvent(def, name) {
-        var _a;
         if (def === undefined || name === undefined) {
             return undefined;
         }
@@ -21910,7 +21898,7 @@ class ObjectOriented {
         if (found) {
             return found;
         }
-        for (const a of ((_a = def.getAliases()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+        for (const a of def.getAliases() || []) {
             if (a.getName().toUpperCase() === name.toUpperCase()) {
                 const comp = a.getComponent();
                 const res = this.searchEvent(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);
@@ -21927,7 +21915,6 @@ class ObjectOriented {
     }
     // search in via super class, interfaces and aliases
     searchAttributeName(def, name) {
-        var _a;
         if (def === undefined || name === undefined) {
             return undefined;
         }
@@ -21937,7 +21924,7 @@ class ObjectOriented {
                 return a;
             }
         }
-        for (const a of ((_a = def.getAliases()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+        for (const a of def.getAliases() || []) {
             if (a.getName().toUpperCase() === upper) {
                 const comp = a.getComponent();
                 const res = this.searchAttributeName(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);
@@ -21990,7 +21977,7 @@ class ObjectOriented {
                 return a;
             }
         }
-        for (const a of def.getAliases().getAll()) {
+        for (const a of def.getAliases()) {
             if (a.getName().toUpperCase() === upper) {
                 const comp = a.getComponent();
                 const res = this.searchConstantName(this.scope.findObjectDefinition(comp.split("~")[0]), comp.split("~")[1]);
@@ -36479,77 +36466,6 @@ exports.Alias = Alias;
 
 /***/ }),
 
-/***/ "./node_modules/@abaplint/core/build/src/abap/types/aliases.js":
-/*!*********************************************************************!*\
-  !*** ./node_modules/@abaplint/core/build/src/abap/types/aliases.js ***!
-  \*********************************************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Aliases = void 0;
-const alias_1 = __webpack_require__(/*! ./alias */ "./node_modules/@abaplint/core/build/src/abap/types/alias.js");
-const Structures = __webpack_require__(/*! ../3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
-const Statements = __webpack_require__(/*! ../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
-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");
-const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
-class Aliases {
-    constructor(node, filename, scope) {
-        this.aliases = [];
-        this.filename = filename;
-        this.parse(node, scope, filename);
-    }
-    getAll() {
-        return this.aliases;
-    }
-    getByName(name) {
-        for (const a of this.aliases) {
-            if (a.getName().toLowerCase() === name.toLowerCase()) {
-                return a;
-            }
-        }
-        return undefined;
-    }
-    /////////////////////////
-    parse(node, scope, filename) {
-        const cdef = node.findFirstStructure(Structures.ClassDefinition);
-        if (cdef) {
-            this.parseSection(cdef.findFirstStructure(Structures.PublicSection), visibility_1.Visibility.Public, scope, filename);
-            this.parseSection(cdef.findFirstStructure(Structures.PrivateSection), visibility_1.Visibility.Private, scope, filename);
-            this.parseSection(cdef.findFirstStructure(Structures.ProtectedSection), visibility_1.Visibility.Protected, scope, filename);
-        }
-        const idef = node.findFirstStructure(Structures.Interface);
-        if (idef) {
-            this.parseSection(idef, visibility_1.Visibility.Public, scope, filename);
-        }
-    }
-    parseSection(node, visibility, scope, filename) {
-        if (!node) {
-            return;
-        }
-        const list = node.findAllStatements(Statements.Aliases);
-        for (const a of list) {
-            const name = a.findFirstExpression(Expressions.SimpleName).getFirstToken();
-            const compToken = a.findFirstExpression(Expressions.Field).getFirstToken();
-            const compName = compToken.getStr();
-            this.aliases.push(new alias_1.Alias(name, visibility, compName, this.filename));
-            if (compName.includes("~")) {
-                const name = compName.split("~")[0];
-                const idef = scope.findInterfaceDefinition(name);
-                if (idef) {
-                    scope.addReference(compToken, idef, _reference_1.ReferenceType.ObjectOrientedReference, filename, { ooName: name.toUpperCase(), ooType: "INTF" });
-                }
-            }
-        }
-    }
-}
-exports.Aliases = Aliases;
-//# sourceMappingURL=aliases.js.map
-
-/***/ }),
-
 /***/ "./node_modules/@abaplint/core/build/src/abap/types/basic/_abstract_type.js":
 /*!**********************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/types/basic/_abstract_type.js ***!
@@ -38019,6 +37935,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Attributes = void 0;
 const Structures = __webpack_require__(/*! ../3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 const Statements = __webpack_require__(/*! ../2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
+const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const class_attribute_1 = __webpack_require__(/*! ./class_attribute */ "./node_modules/@abaplint/core/build/src/abap/types/class_attribute.js");
 const class_constant_1 = __webpack_require__(/*! ./class_constant */ "./node_modules/@abaplint/core/build/src/abap/types/class_constant.js");
 const nodes_1 = __webpack_require__(/*! ../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
@@ -38033,13 +37950,16 @@ const constants_1 = __webpack_require__(/*! ../5_syntax/structures/constants */
 const type_definitions_1 = __webpack_require__(/*! ./type_definitions */ "./node_modules/@abaplint/core/build/src/abap/types/type_definitions.js");
 const types_1 = __webpack_require__(/*! ../5_syntax/structures/types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/structures/types.js");
 const type_1 = __webpack_require__(/*! ../5_syntax/statements/type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/statements/type.js");
+const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const alias_1 = __webpack_require__(/*! ./alias */ "./node_modules/@abaplint/core/build/src/abap/types/alias.js");
 class Attributes {
     constructor(node, input) {
         this.static = [];
         this.instance = [];
         this.constants = [];
-        this.filename = input.filename;
+        this.aliases = [];
         this.tlist = [];
+        this.filename = input.filename;
         this.parse(node, input);
         this.types = new type_definitions_1.TypeDefinitions(this.tlist);
     }
@@ -38049,6 +37969,9 @@ class Attributes {
     getStatic() {
         return this.static;
     }
+    getAliases() {
+        return this.aliases;
+    }
     getAll() {
         let res = [];
         res = res.concat(this.static);
@@ -38187,6 +38110,9 @@ class Attributes {
                 else if (ctyp instanceof Statements.ClassData) {
                     this.static.push(this.parseAttribute(c, visibility, input));
                 }
+                else if (ctyp instanceof Statements.Aliases) {
+                    this.parseAlias(c, visibility, input);
+                }
                 else if (ctyp instanceof Statements.Constant) {
                     const found = new constant_1.Constant().runSyntax(c, input);
                     if (found) {
@@ -38205,6 +38131,27 @@ class Attributes {
             }
         }
     }
+    parseAlias(node, visibility, input) {
+        const aliasName = node.findFirstExpression(Expressions.SimpleName).getFirstToken();
+        const compToken = node.findFirstExpression(Expressions.Field).getFirstToken();
+        const compName = compToken.getStr();
+        this.aliases.push(new alias_1.Alias(aliasName, visibility, compName, this.filename));
+        if (compName.includes("~")) {
+            const name = compName.split("~")[0];
+            const idef = input.scope.findInterfaceDefinition(name);
+            if (idef) {
+                input.scope.addReference(compToken, idef, _reference_1.ReferenceType.ObjectOrientedReference, input.filename, { ooName: name.toUpperCase(), ooType: "INTF" });
+                const foundType = idef.getTypeDefinitions().getByName(compName.split("~")[1]);
+                if (foundType) {
+                    input.scope.addTypeNamed(aliasName.getStr(), foundType);
+                }
+                const foundAttribute = idef.getAttributes().findByName(compName.split("~")[1]);
+                if (foundAttribute) {
+                    input.scope.addNamedIdentifier(aliasName.getStr(), foundAttribute);
+                }
+            }
+        }
+    }
     parseAttribute(node, visibility, input) {
         let found = undefined;
         const s = node.get();
@@ -38271,7 +38218,6 @@ const Structures = __webpack_require__(/*! ../3_structures/structures */ "./node
 const Expressions = __webpack_require__(/*! ../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const class_attributes_1 = __webpack_require__(/*! ./class_attributes */ "./node_modules/@abaplint/core/build/src/abap/types/class_attributes.js");
 const _identifier_1 = __webpack_require__(/*! ../4_file_information/_identifier */ "./node_modules/@abaplint/core/build/src/abap/4_file_information/_identifier.js");
-const aliases_1 = __webpack_require__(/*! ./aliases */ "./node_modules/@abaplint/core/build/src/abap/types/aliases.js");
 const _scope_type_1 = __webpack_require__(/*! ../5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 const event_definition_1 = __webpack_require__(/*! ./event_definition */ "./node_modules/@abaplint/core/build/src/abap/types/event_definition.js");
 const visibility_1 = __webpack_require__(/*! ../4_file_information/visibility */ "./node_modules/@abaplint/core/build/src/abap/4_file_information/visibility.js");
@@ -38296,9 +38242,9 @@ class ClassDefinition extends _identifier_1.Identifier {
         this.parse(input, node);
         const helper = new _object_oriented_1.ObjectOriented(input.scope);
         helper.fromSuperClassesAndInterfaces(this);
-        helper.addAliasedTypes(this.aliases);
         this.attributes = new class_attributes_1.Attributes(node, input);
         this.types = this.attributes.getTypes();
+        this.aliases = this.attributes.getAliases();
         const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input)); // todo, all these are not Public
@@ -38379,7 +38325,7 @@ class ClassDefinition extends _identifier_1.Identifier {
                 }
                 names.add(name);
             }
-            for (const a of (cdef === null || cdef === void 0 ? void 0 : cdef.getAliases().getAll()) || []) {
+            for (const a of (cdef === null || cdef === void 0 ? void 0 : cdef.getAliases()) || []) {
                 names.add(a.getName().toUpperCase());
             }
             sup = cdef === null || cdef === void 0 ? void 0 : cdef.getSuperClass();
@@ -38434,7 +38380,6 @@ class ClassDefinition extends _identifier_1.Identifier {
                 input.scope.addReference(token, undefined, _reference_1.ReferenceType.ObjectOrientedUnknownReference, input.filename, { ooName: name.toUpperCase(), ooType: "INTF" });
             }
         }
-        this.aliases = new aliases_1.Aliases(inputNode, this.filename, input.scope);
     }
 }
 exports.ClassDefinition = ClassDefinition;
@@ -38784,11 +38729,7 @@ const visibility_1 = __webpack_require__(/*! ../4_file_information/visibility */
 const _scope_type_1 = __webpack_require__(/*! ../5_syntax/_scope_type */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_scope_type.js");
 const event_definition_1 = __webpack_require__(/*! ./event_definition */ "./node_modules/@abaplint/core/build/src/abap/types/event_definition.js");
 const method_definitions_1 = __webpack_require__(/*! ./method_definitions */ "./node_modules/@abaplint/core/build/src/abap/types/method_definitions.js");
-const aliases_1 = __webpack_require__(/*! ./aliases */ "./node_modules/@abaplint/core/build/src/abap/types/aliases.js");
 const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
-const class_constant_1 = __webpack_require__(/*! ./class_constant */ "./node_modules/@abaplint/core/build/src/abap/types/class_constant.js");
-const _typed_identifier_1 = __webpack_require__(/*! ./_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
-const tokens_1 = __webpack_require__(/*! ../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 class InterfaceDefinition extends _identifier_1.Identifier {
     constructor(node, input) {
         if (!(node.get() instanceof Structures.Interface)) {
@@ -38832,37 +38773,8 @@ class InterfaceDefinition extends _identifier_1.Identifier {
         return this.methodDefinitions;
     }
     /////////////////
-    parse(input, node) {
+    checkInterfacesExists(input, node) {
         var _a;
-        // todo, proper sequencing, the statements should be processed line by line
-        this.attributes = new class_attributes_1.Attributes(node, input);
-        this.typeDefinitions = this.attributes.getTypes();
-        this.aliases = new aliases_1.Aliases(node, this.filename, input.scope);
-        // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
-        // this adds the aliased types to scope?
-        for (const a of this.aliases.getAll()) {
-            const [objName, fieldName] = a.getComponent().split("~");
-            const idef = input.scope.findInterfaceDefinition(objName);
-            if (idef) {
-                const foundType = idef.getTypeDefinitions().getByName(fieldName);
-                if (foundType) {
-                    input.scope.addTypeNamed(a.getName(), foundType);
-                }
-                else {
-                    const foundField = idef.getAttributes().findByName(fieldName);
-                    if (foundField && foundField instanceof class_constant_1.ClassConstant) {
-                        const token = new tokens_1.Identifier(a.getStart(), a.getName());
-                        const id = new _typed_identifier_1.TypedIdentifier(token, input.filename, foundField.getType());
-                        const constant = new class_constant_1.ClassConstant(id, visibility_1.Visibility.Public, foundField.getValue());
-                        input.scope.addIdentifier(constant);
-                    }
-                }
-            }
-        }
-        const events = node.findAllStatements(Statements.Events);
-        for (const e of events) {
-            this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));
-        }
         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();
@@ -38880,6 +38792,39 @@ class InterfaceDefinition extends _identifier_1.Identifier {
                 }
             }
         }
+    }
+    parse(input, node) {
+        this.checkInterfacesExists(input, node);
+        // todo, proper sequencing, the statements should be processed line by line
+        this.attributes = new class_attributes_1.Attributes(node, input);
+        this.typeDefinitions = this.attributes.getTypes();
+        this.aliases = this.attributes.getAliases();
+        // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
+        // this adds the aliased types to scope?
+        /*
+        for (const a of this.aliases) {
+          const [objName, fieldName] = a.getComponent().split("~");
+          const idef = input.scope.findInterfaceDefinition(objName);
+          if (idef) {
+            const foundType = idef.getTypeDefinitions().getByName(fieldName);
+            if (foundType) {
+              input.scope.addTypeNamed(a.getName(), foundType);
+            } else {
+              const foundField = idef.getAttributes().findByName(fieldName);
+              if (foundField && foundField instanceof ClassConstant) {
+                const token = new TokenIdentifier(a.getStart(), a.getName());
+                const id = new TypedIdentifier(token, input.filename, foundField.getType());
+                const constant = new ClassConstant(id, Visibility.Public, foundField.getValue());
+                input.scope.addIdentifier(constant);
+              }
+            }
+          }
+        }
+        */
+        const events = node.findAllStatements(Statements.Events);
+        for (const e of events) {
+            this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));
+        }
         this.methodDefinitions = new method_definitions_1.MethodDefinitions(node, input);
         if (this.methodDefinitions.getByName("CONSTRUCTOR") !== undefined) {
             throw new Error("Interfaces cannot have constructor methods");
@@ -52405,7 +52350,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.112.4";
+        return "2.112.5";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.112.4",
+    "version": "2.112.5",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.112.4",
+        "@abaplint/core": "^2.112.5",
         "@types/chai": "^4.3.16",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",