@abaplint/core 2.119.37 → 2.119.38

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

@@ -480,16 +480,16 @@ class BasicTypes {
             options.primaryKey.type = basic_1.TableAccessType.standard;
             return new Types.TableType(structure, options);
         }
-        else if (typename && (text.startsWith("TYPE TABLE FOR CREATE ")
-            || text.startsWith("TYPE TABLE FOR READ ")
-            || text.startsWith("TYPE TABLE FOR DELETE ")
-            || text.startsWith("TYPE TABLE FOR UPDATE "))) {
+        else if (typename && this.isRAPTableFor(text)) {
             const name = typename.concatTokens();
             const ddlsName = this.getRAPBaseEntityName(name);
             const type = (_d = this.input.scope.getDDIC().lookupDDLS(ddlsName)) === null || _d === void 0 ? void 0 : _d.type;
             if (type) {
                 return new Types.TableType(basic_1.VoidType.get("RAP-TODO"), options);
             }
+            else if (this.isRAPDerivedEntityName(name)) {
+                return Types.VoidType.get(name);
+            }
             else if (this.input.scope.getDDIC().inErrorNamespace(ddlsName)) {
                 return new Types.UnknownType(`DDLS ${ddlsName} not found`);
             }
@@ -501,7 +501,7 @@ class BasicTypes {
         return this.parseType(node, name);
     }
     parseType(node, qualifiedName) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const typeName = node.findFirstExpression(Expressions.TypeName);
         let text = (_a = node.findFirstExpression(Expressions.Type)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (text === undefined) {
@@ -514,7 +514,10 @@ class BasicTypes {
             }
         }
         if (text === undefined) {
-            text = (_d = node.findFirstExpression(Expressions.FormParamType)) === null || _d === void 0 ? void 0 : _d.concatTokens().toUpperCase();
+            text = (_d = node.findFirstExpression(Expressions.TypeStructure)) === null || _d === void 0 ? void 0 : _d.concatTokens().toUpperCase();
+        }
+        if (text === undefined) {
+            text = (_e = node.findFirstExpression(Expressions.FormParamType)) === null || _e === void 0 ? void 0 : _e.concatTokens().toUpperCase();
         }
         if (text === undefined
             && node.get() instanceof Statements.Parameter
@@ -525,8 +528,11 @@ class BasicTypes {
             text = "TYPE";
         }
         let found = undefined;
-        if (text.startsWith("LIKE LINE OF ")) {
-            const name = (_e = node.findFirstExpression(Expressions.FieldChain)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+        if (this.isRAPTypeStructure(text)) {
+            return Types.VoidType.get((_f = node.findFirstExpression(Expressions.TypeStructure)) === null || _f === void 0 ? void 0 : _f.concatTokens());
+        }
+        else if (text.startsWith("LIKE LINE OF ")) {
+            const name = (_g = node.findFirstExpression(Expressions.FieldChain)) === null || _g === void 0 ? void 0 : _g.concatTokens();
             let e = node.findFirstExpression(Expressions.Type);
             if (e === undefined) {
                 e = node.findFirstExpression(Expressions.FormParamType);
@@ -549,7 +555,7 @@ class BasicTypes {
             }
         }
         else if (text.startsWith("LIKE REF TO ")) {
-            const name = (_f = node.findFirstExpression(Expressions.FieldChain)) === null || _f === void 0 ? void 0 : _f.concatTokens();
+            const name = (_h = node.findFirstExpression(Expressions.FieldChain)) === null || _h === void 0 ? void 0 : _h.concatTokens();
             const type = this.resolveLikeName(node.findFirstExpression(Expressions.Type), false);
             if (type === undefined) {
                 return new Types.UnknownType("Type error, could not resolve \"" + name + "\", parseType");
@@ -640,7 +646,7 @@ class BasicTypes {
             }
         }
         if (text.includes(" WITH INDICATORS ")) {
-            const componentName = (_h = (_g = node.findFirstExpression(Expressions.Type)) === null || _g === void 0 ? void 0 : _g.findDirectExpression(Expressions.ComponentName)) === null || _h === void 0 ? void 0 : _h.concatTokens().toUpperCase();
+            const componentName = (_k = (_j = node.findFirstExpression(Expressions.Type)) === null || _j === void 0 ? void 0 : _j.findDirectExpression(Expressions.ComponentName)) === null || _k === void 0 ? void 0 : _k.concatTokens().toUpperCase();
             if (componentName === undefined) {
                 throw new Error("parseType, componentName expected");
             }
@@ -666,12 +672,38 @@ class BasicTypes {
     getRAPBaseEntityName(name) {
         const association = name.indexOf("\\_");
         const path = name.indexOf("\\\\");
-        if (association === -1 && path === -1) {
+        const action = name.indexOf("~");
+        if (association === -1 && path === -1 && action === -1) {
             return name;
         }
-        const splitAt = association === -1 ? path : path === -1 ? association : Math.min(association, path);
+        const candidates = [association, path, action].filter(i => i !== -1);
+        const splitAt = Math.min(...candidates);
         return name.substring(0, splitAt);
     }
+    isRAPDerivedEntityName(name) {
+        return name.includes("\\") || name.includes("~");
+    }
+    isRAPTableFor(text) {
+        return text.startsWith("TYPE TABLE FOR ACTION IMPORT ")
+            || text.startsWith("TYPE TABLE FOR ACTION RESULT ")
+            || text.startsWith("TYPE TABLE FOR CREATE ")
+            || text.startsWith("TYPE TABLE FOR DELETE ")
+            || text.startsWith("TYPE TABLE FOR DETERMINATION ")
+            || text.startsWith("TYPE TABLE FOR EVENT ")
+            || text.startsWith("TYPE TABLE FOR FAILED ")
+            || text.startsWith("TYPE TABLE FOR FAILED EARLY ")
+            || text.startsWith("TYPE TABLE FOR LOCK ")
+            || text.startsWith("TYPE TABLE FOR READ ")
+            || text.startsWith("TYPE TABLE FOR READ IMPORT ")
+            || text.startsWith("TYPE TABLE FOR READ RESULT ")
+            || text.startsWith("TYPE TABLE FOR REPORTED EARLY ")
+            || text.startsWith("TYPE TABLE FOR UPDATE ");
+    }
+    isRAPTypeStructure(text) {
+        return text.startsWith("TYPE STRUCTURE FOR ")
+            || text.startsWith("TYPE RESPONSE FOR ")
+            || text.startsWith("TYPE REQUEST FOR CHANGE ");
+    }
     // todo, rewrite this method
     resolveTypeChain(expr) {
         var _a, _b, _c, _d;

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

@@ -480,6 +480,10 @@ class SyntaxLogic {
             this.scope.addList(values);
             return true;
         }
+        else if (stru instanceof Structures.TestInjection) {
+            // todo: skipped for now
+            return true;
+        }
         return false;
     }
     updateScopeStatement(node) {

package/build/src/registry.js

@@ -74,7 +74,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.119.37";
+        return "2.119.38";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.119.37",
+    "version": "2.119.38",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",