@abaplint/cli 2.120.36 → 2.120.38

package/build/cli.js

@@ -10801,6 +10801,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TypeParam = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "../core/build/src/abap/2_statements/combi.js");
 const _1 = __webpack_require__(/*! . */ "../core/build/src/abap/2_statements/expressions/index.js");
+const version_1 = __webpack_require__(/*! ../../../version */ "../core/build/src/version.js");
+const _derived_types_1 = __webpack_require__(/*! ./_derived_types */ "../core/build/src/abap/2_statements/expressions/_derived_types.js");
 class TypeParam extends combi_1.Expression {
     getRunnable() {
         const table = (0, combi_1.seq)((0, combi_1.altPrio)("STANDARD", "HASHED", "INDEX", "SORTED", "ANY"), "TABLE");
@@ -10808,7 +10810,10 @@ class TypeParam extends combi_1.Expression {
         const typeLine = "LINE OF";
         const ret = (0, combi_1.seq)((0, combi_1.alt)(foo, typeLine), _1.TypeNameOrInfer, (0, combi_1.opt)(_1.Default));
         const like = (0, combi_1.seq)("LIKE", (0, combi_1.opt)("LINE OF"), _1.FieldChain, (0, combi_1.optPrio)(_1.Default));
-        return (0, combi_1.alt)((0, combi_1.seq)("TYPE", (0, combi_1.alt)(table, ret)), like);
+        const entity = (0, combi_1.alt)(_1.TypeName, _1.EntityAssociation);
+        const rapTable = (0, combi_1.ver)(version_1.Release.v770, (0, combi_1.seq)("TYPE", "TABLE FOR", (0, _derived_types_1.derivedTypesAlt)((0, combi_1.ver)(version_1.Release.v773, (0, combi_1.seq)("ACTION IMPORT", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v774, (0, combi_1.seq)("READ LINK", entity), { also: combi_1.AlsoIn.OpenABAP }), (0, combi_1.ver)(version_1.Release.v787, (0, combi_1.seq)("EVENT", entity), { also: combi_1.AlsoIn.OpenABAP })), (0, combi_1.optPrio)("VALUE IS INITIAL")), { also: combi_1.AlsoIn.OpenABAP });
+        // Method parameters also allow the RAP table and response type forms.
+        return (0, combi_1.altPrio)(rapTable, _1.TypeStructure, (0, combi_1.seq)("TYPE", (0, combi_1.alt)(table, ret)), like);
     }
 }
 exports.TypeParam = TypeParam;
@@ -27903,6 +27908,29 @@ class TypeUtils {
         }
         return this.isAssignable(source, target);
     }
+    // Typing with the classic STRUCTURE addition, ie. "FORM foo USING bar STRUCTURE zkey",
+    // is not a compatibility check: ABAP only checks the fragment view up to the end of the
+    // formal structure, so the actual parameter is allowed to be longer. For TABLES parameters
+    // the table key is not part of the check at all.
+    isAssignableStructureTyping(source, target, node) {
+        if (source instanceof basic_1.StructureType && target instanceof basic_1.StructureType) {
+            const sourceComponents = source.getComponents();
+            const targetComponents = target.getComponents();
+            if (sourceComponents.length < targetComponents.length) {
+                return false;
+            }
+            for (let i = 0; i < targetComponents.length; i++) {
+                if (this.isAssignableStrict(sourceComponents[i].type, targetComponents[i].type) === false) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        else if (source instanceof basic_1.TableType && target instanceof basic_1.TableType) {
+            return this.isAssignableStructureTyping(source.getRowType(), target.getRowType());
+        }
+        return this.isAssignableStrict(source, target, node);
+    }
     isAssignable(source, target) {
         if (source === undefined || target === undefined) {
             return true;
@@ -31505,7 +31533,7 @@ class FormParam {
             else {
                 type = new basic_1.UnknownType("todo, FORM STRUCTURES typing");
             }
-            return new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, type, ["form_parameter" /* IdentifierMeta.FormParameter */]);
+            return new _typed_identifier_1.TypedIdentifier(nameToken, input.filename, type, ["form_parameter" /* IdentifierMeta.FormParameter */, "form_parameter_structure" /* IdentifierMeta.FormParameterStructure */]);
         }
         if (node.getChildren().length === 1 && nameToken) {
             // untyped FORM parameter
@@ -43725,7 +43753,11 @@ class Perform {
                 continue;
             }
             const parameter = formal[i];
-            if (typeUtils.isAssignableStrict(type, parameter.getType(), source) === false) {
+            const structureTyping = parameter.getMeta().includes("form_parameter_structure" /* IdentifierMeta.FormParameterStructure */);
+            const assignable = structureTyping
+                ? typeUtils.isAssignableStructureTyping(type, parameter.getType(), source)
+                : typeUtils.isAssignableStrict(type, parameter.getType(), source);
+            if (assignable === false) {
                 const message = `PERFORM parameter type not compatible, ${parameter.getName()}`;
                 input.issues.push((0, _syntax_input_1.syntaxIssue)(input, source.getFirstToken(), message));
                 return false;
@@ -52608,7 +52640,8 @@ class FormDefinition extends _identifier_1.Identifier {
                 else if (!(type instanceof basic_1.UnknownType) && !(type instanceof basic_1.VoidType)) {
                     type = new basic_1.UnknownType("FORM TABLES type must be table type");
                 }
-                ret.push(new _typed_identifier_1.TypedIdentifier(p.getToken(), input.filename, type, ["form_parameter" /* IdentifierMeta.FormParameter */]));
+                // keep the meta from FormParam, so STRUCTURE typing can be recognized later
+                ret.push(new _typed_identifier_1.TypedIdentifier(p.getToken(), input.filename, type, p.getMeta()));
             }
         }
         return ret;
@@ -70119,7 +70152,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.36";
+        return "2.120.38";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -73766,6 +73799,7 @@ https://help.sap.com/doc/abapdocu_latest_index_htm/latest/en-US/abenchained_stat
                     || statement instanceof Statements.Ranges
                     || statement instanceof Statements.TypePools
                     || statement instanceof Statements.FieldSymbol
+                    || statement instanceof Statements.Nodes
                     || statement instanceof Statements.Data
                     || statement instanceof Statements.DataBegin
                     || statement instanceof Statements.DataEnd)) {
@@ -100662,6 +100696,7 @@ exports.DECLARATION_STUFF = exports.SELECTION_EVENTS = void 0;
 const Statements = __importStar(__webpack_require__(/*! ./abap/2_statements/statements */ "../core/build/src/abap/2_statements/statements/index.js"));
 exports.SELECTION_EVENTS = [
     Statements.StartOfSelection,
+    Statements.Get,
     Statements.AtSelectionScreen,
     Statements.AtLineSelection,
     Statements.AtPF,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.120.36",
+    "version": "2.120.38",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -39,7 +39,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.120.36",
+        "@abaplint/core": "^2.120.38",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",