@abaplint/core 2.95.34 → 2.95.36

package/build/src/abap/2_statements/expressions/type_table.js

@@ -10,13 +10,14 @@ class TypeTable extends combi_1.Expression {
     getRunnable() {
         const header = "WITH HEADER LINE";
         const initial = (0, combi_1.seq)("INITIAL SIZE", _1.Constant);
-        const normal1 = (0, combi_1.seq)((0, combi_1.opt)((0, combi_1.alt)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY")), "TABLE", (0, combi_1.opt)("OF"), (0, combi_1.opt)("REF TO"), (0, combi_1.opt)(_1.TypeName));
+        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 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));
         // 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.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))));
+        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)))));
         const occurs = (0, combi_1.seq)("OCCURS", _1.Integer);
         const derived = (0, combi_1.ver)(version_1.Version.v754, (0, combi_1.seq)("TABLE FOR", (0, combi_1.altPrio)("ACTION IMPORT", "ACTION RESULT", "CREATE", "FAILED", "LOCK", "READ RESULT", "UPDATE"), _1.TypeName));
         const oldType = (0, combi_1.seq)((0, combi_1.opt)("REF TO"), _1.TypeName, (0, combi_1.alt)((0, combi_1.seq)(occurs, (0, combi_1.opt)(header)), header));

package/build/src/abap/5_syntax/basic_types.js

@@ -691,6 +691,9 @@ class BasicTypes {
                 return new Types.UnknownType("Not a structured type");
             }
             foundType = foundType.getComponentByName(subs[0]);
+            if (foundType === undefined) {
+                return new Types.UnknownType(`Field "${subs[0]}" not found in structure`);
+            }
             subs.shift();
         }
         return foundType;

package/build/src/abap/5_syntax/expressions/component_chain.js

@@ -1,29 +1,81 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentChain = void 0;
+const Expressions = require("../../2_statements/expressions");
 const void_type_1 = require("../../types/basic/void_type");
 const structure_type_1 = require("../../types/basic/structure_type");
+const basic_1 = require("../../types/basic");
+const types_1 = require("../../types");
+const _reference_1 = require("../_reference");
 class ComponentChain {
-    runSyntax(context, node) {
-        if (context instanceof void_type_1.VoidType) {
-            return context;
-        }
-        const name = node.getFirstToken().getStr();
-        if (!(context instanceof structure_type_1.StructureType)) {
-            if (name.toUpperCase() === "TABLE_LINE") {
+    runSyntax(context, node, scope, filename) {
+        const children = node.getChildren();
+        for (let i = 0; i < children.length; i++) {
+            if (context instanceof void_type_1.VoidType || context instanceof basic_1.UnknownType) {
                 return context;
             }
-            throw new Error("ComponentChain, not a structure");
-        }
-        if (name.toUpperCase() === "TABLE_LINE") {
-            return context;
-        }
-        const ret = context.getComponentByName(name);
-        if (ret === undefined) {
-            throw new Error("Component \"" + name + "\" not found in structure");
+            const child = children[i];
+            if (i === 0 && child.concatTokens().toUpperCase() === "TABLE_LINE") {
+                continue;
+            }
+            else if (child.get() instanceof Expressions.ArrowOrDash) {
+                const concat = child.concatTokens();
+                if (concat === "-") {
+                    if (!(context instanceof structure_type_1.StructureType)) {
+                        throw new Error("ComponentChain, not a structure");
+                    }
+                }
+                else if (concat === "=>") {
+                    if (!(context instanceof basic_1.ObjectReferenceType)) {
+                        throw new Error("ComponentChain, not a reference");
+                    }
+                }
+                else if (concat === "->") {
+                    if (!(context instanceof basic_1.ObjectReferenceType) && !(context instanceof basic_1.DataReference)) {
+                        throw new Error("ComponentChain, not a reference");
+                    }
+                }
+            }
+            else if (child.get() instanceof Expressions.ComponentName) {
+                const name = child.concatTokens();
+                if (context instanceof basic_1.DataReference) {
+                    context = context.getType();
+                    if (name === "*") {
+                        continue;
+                    }
+                }
+                if (context instanceof structure_type_1.StructureType) {
+                    context = context.getComponentByName(name);
+                    if (context === undefined) {
+                        throw new Error("Component \"" + name + "\" not found in structure");
+                    }
+                }
+                else if (context instanceof basic_1.ObjectReferenceType) {
+                    const id = context.getIdentifier();
+                    if (id instanceof types_1.InterfaceDefinition || id instanceof types_1.ClassDefinition) {
+                        const found = id.getAttributes().findByName(name);
+                        context = found === null || found === void 0 ? void 0 : found.getType();
+                        if (context === undefined) {
+                            throw new Error("Attribute \"" + name + "\" not found");
+                        }
+                        else {
+                            const extra = {
+                                ooName: id.getName(),
+                                ooType: id instanceof types_1.ClassDefinition ? "CLAS" : "INTF"
+                            };
+                            scope.addReference(child.getFirstToken(), found, _reference_1.ReferenceType.DataWriteReference, filename, extra);
+                        }
+                    }
+                    else {
+                        throw new Error("ComponentChain, unexpected type2");
+                    }
+                }
+                else {
+                    throw new Error("ComponentChain, not a structure");
+                }
+            }
         }
-        // todo, add more here
-        return ret;
+        return context;
     }
 }
 exports.ComponentChain = ComponentChain;

package/build/src/abap/5_syntax/expressions/component_compare_simple.js

@@ -11,7 +11,7 @@ class ComponentCompareSimple {
         for (const c of node.getChildren()) {
             if (c instanceof nodes_1.ExpressionNode) {
                 if (c.get() instanceof Expressions.ComponentChainSimple) {
-                    targetType = new component_chain_1.ComponentChain().runSyntax(rowType, c);
+                    targetType = new component_chain_1.ComponentChain().runSyntax(rowType, c, scope, filename);
                 }
                 else if (c.get() instanceof Expressions.Dynamic) {
                     targetType = undefined;

package/build/src/abap/5_syntax/expressions/source.js

@@ -172,7 +172,7 @@ class Source {
                 //        console.dir("dash");
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.ComponentChain) {
-                context = new component_chain_1.ComponentChain().runSyntax(context, first);
+                context = new component_chain_1.ComponentChain().runSyntax(context, first, scope, filename);
             }
             else if (first instanceof nodes_1.ExpressionNode && first.get() instanceof Expressions.AttributeChain) {
                 context = new attribute_chain_1.AttributeChain().runSyntax(context, first, scope, filename, _reference_1.ReferenceType.DataReadReference);

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.34";
+        return "2.95.36";
     }
     getDDICReferences() {
         return this.references;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.34",
+    "version": "2.95.36",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@microsoft/api-extractor": "^7.34.4",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.14.6",
+        "@types/node": "^18.15.0",
         "chai": "^4.3.7",
         "eslint": "^8.35.0",
         "mocha": "^10.2.0",