@abaplint/cli 2.120.43 → 2.120.44

package/build/cli.js

@@ -24361,6 +24361,7 @@ exports.ABAPFileInformationParser = void 0;
 const Structures = __importStar(__webpack_require__(/*! ../3_structures/structures */ "../core/build/src/abap/3_structures/structures/index.js"));
 const Expressions = __importStar(__webpack_require__(/*! ../2_statements/expressions */ "../core/build/src/abap/2_statements/expressions/index.js"));
 const Statements = __importStar(__webpack_require__(/*! ../2_statements/statements */ "../core/build/src/abap/2_statements/statements/index.js"));
+const nodes_1 = __webpack_require__(/*! ../nodes */ "../core/build/src/abap/nodes/index.js");
 const _identifier_1 = __webpack_require__(/*! ./_identifier */ "../core/build/src/abap/4_file_information/_identifier.js");
 const Tokens = __importStar(__webpack_require__(/*! ../1_lexer/tokens */ "../core/build/src/abap/1_lexer/tokens/index.js"));
 const visibility_1 = __webpack_require__(/*! ./visibility */ "../core/build/src/abap/4_file_information/visibility.js");
@@ -24500,6 +24501,7 @@ class ABAPFileInformationParser {
                 riskLevel,
                 isAbstract: (cdef === null || cdef === void 0 ? void 0 : cdef.findDirectTokenByText("ABSTRACT")) !== undefined,
                 isSharedMemory: concat.includes(" SHARED MEMORY ENABLED"),
+                behaviorDefinitionName: this.findBehaviorDefinitionName(cdef),
                 isFinal: found.findFirstExpression(Expressions.ClassFinal) !== undefined,
                 aliases,
                 attributes,
@@ -24509,6 +24511,20 @@ class ABAPFileInformationParser {
         return classes;
     }
     ///////////////////
+    /** "FOR BEHAVIOR OF" and "FOR EVENTS OF" both use the BehaviorDefinitionName expression,
+     * so look at the token two positions before the expression to tell them apart */
+    findBehaviorDefinitionName(cdef) {
+        const children = (cdef === null || cdef === void 0 ? void 0 : cdef.getChildren()) || [];
+        for (let i = 2; i < children.length; i++) {
+            const child = children[i];
+            if (child instanceof nodes_1.ExpressionNode
+                && child.get() instanceof Expressions.BehaviorDefinitionName
+                && children[i - 2].concatTokens().toUpperCase() === "BEHAVIOR") {
+                return child.concatTokens();
+            }
+        }
+        return undefined;
+    }
     getImplementing(input) {
         const ret = [];
         for (const node of input.findAllStatements(Statements.InterfaceDef)) {
@@ -26204,6 +26220,18 @@ class CurrentScope {
         }
         return undefined;
     }
+    /** the BDEF from "FOR BEHAVIOR OF" of the enclosing global class, undefined if not a behavior pool */
+    findBehaviorDefinition() {
+        var _a;
+        if (this.parentObj.getType() !== "CLAS") {
+            return undefined;
+        }
+        const name = (_a = this.parentObj.getClassDefinition()) === null || _a === void 0 ? void 0 : _a.behaviorDefinitionName;
+        if (name === undefined) {
+            return undefined;
+        }
+        return this.reg.getObject("BDEF", name);
+    }
     isBadiDef(name) {
         const upper = name.toUpperCase();
         for (const enhs of this.reg.getObjectsByType("ENHS")) {
@@ -28513,7 +28541,7 @@ class BasicTypes {
         return undefined;
     }
     parseTable(node, name) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const typename = node.findFirstExpression(Expressions.TypeName) || node.findFirstExpression(Expressions.EntityAssociation);
         const text = (_a = node.findFirstExpression(Expressions.TypeTable)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (text === undefined) {
@@ -28650,25 +28678,31 @@ class BasicTypes {
             return new Types.TableType(structure, options);
         }
         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`);
-            }
-            else {
-                return Types.VoidType.get(name);
-            }
+            return this.rapTableFor(typename.concatTokens(), options);
         }
         // fallback to old style syntax, OCCURS etc
         return this.parseType(node, name);
     }
+    /** type of a RAP derived table type, ie the "TABLE FOR LOCK zentity" part of a type */
+    rapTableFor(entityName, options) {
+        var _a;
+        const ddlsName = this.resolveRAPAlias(this.getRAPBaseEntityName(entityName));
+        if ((_a = this.input.scope.getDDIC().lookupDDLS(ddlsName)) === null || _a === void 0 ? void 0 : _a.type) {
+            return new Types.TableType(basic_1.VoidType.get("RAP-TODO"), options !== null && options !== void 0 ? options : {
+                withHeader: false,
+                keyType: Types.TableKeyType.user,
+                primaryKey: { name: "primary_key", type: basic_1.TableAccessType.standard, isUnique: false, keyFields: [] },
+                secondary: [],
+            });
+        }
+        else if (this.isRAPDerivedEntityName(entityName)) {
+            return Types.VoidType.get(entityName);
+        }
+        else if (this.input.scope.getDDIC().inErrorNamespace(ddlsName)) {
+            return new Types.UnknownType(`DDLS ${ddlsName} not found`);
+        }
+        return Types.VoidType.get(entityName);
+    }
     parseType(node, qualifiedName) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const typeName = node.findFirstExpression(Expressions.TypeName);
@@ -28862,6 +28896,12 @@ class BasicTypes {
         const splitAt = Math.min(...candidates);
         return name.substring(0, splitAt);
     }
+    /** inside a behavior pool the entities are referenced via the aliases defined in the BDEF */
+    resolveRAPAlias(name) {
+        var _a;
+        var _b;
+        return (_b = (_a = this.input.scope.findBehaviorDefinition()) === null || _a === void 0 ? void 0 : _a.findEntityNameByAlias(name)) !== null && _b !== void 0 ? _b : name;
+    }
     isRAPDerivedEntityName(name) {
         return name.includes("\\") || name.includes("~");
     }
@@ -53432,6 +53472,7 @@ const _typed_identifier_1 = __webpack_require__(/*! ./_typed_identifier */ "../c
 const basic_1 = __webpack_require__(/*! ./basic */ "../core/build/src/abap/types/basic/index.js");
 const method_def_returning_1 = __webpack_require__(/*! ../5_syntax/expressions/method_def_returning */ "../core/build/src/abap/5_syntax/expressions/method_def_returning.js");
 const method_param_1 = __webpack_require__(/*! ../5_syntax/expressions/method_param */ "../core/build/src/abap/5_syntax/expressions/method_param.js");
+const basic_types_1 = __webpack_require__(/*! ../5_syntax/basic_types */ "../core/build/src/abap/5_syntax/basic_types.js");
 const _object_oriented_1 = __webpack_require__(/*! ../5_syntax/_object_oriented */ "../core/build/src/abap/5_syntax/_object_oriented.js");
 const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "../core/build/src/abap/5_syntax/_reference.js");
 const identifier_1 = __webpack_require__(/*! ../1_lexer/tokens/identifier */ "../core/build/src/abap/1_lexer/tokens/identifier.js");
@@ -53619,24 +53660,37 @@ class MethodParameters {
         }
     }
     workaroundRAP(node, input, parentName) {
+        var _a;
         const resultName = node.findExpressionAfterToken("RESULT");
         const concat = node.concatTokens().toUpperCase();
         const isRap = node.findExpressionAfterToken("IMPORTING")
             || (concat.includes(" IMPORTING REQUEST ") ? node.findExpressionAfterToken("REQUEST") : undefined);
         if (isRap) {
+            // "FOR LOCK" handlers have a well defined signature, so the types can be derived
+            const lockEntity = concat.includes(" FOR LOCK ")
+                ? (_a = node.findExpressionAfterToken("LOCK")) === null || _a === void 0 ? void 0 : _a.concatTokens()
+                : undefined;
             for (const foo of node.findDirectExpressions(Expressions.MethodParamName)) {
                 if (foo === resultName) {
                     continue;
                 }
-                this.importing.push(new _typed_identifier_1.TypedIdentifier(foo.getFirstToken(), input.filename, basic_1.VoidType.get("RapMethodParameter"), ["importing" /* IdentifierMeta.MethodImporting */]));
+                const type = lockEntity === undefined
+                    ? basic_1.VoidType.get("RapMethodParameter")
+                    : new basic_types_1.BasicTypes(input).rapTableFor(lockEntity);
+                this.importing.push(new _typed_identifier_1.TypedIdentifier(foo.getFirstToken(), input.filename, type, ["importing" /* IdentifierMeta.MethodImporting */]));
             }
-            if (concat.includes(" FOR VALIDATE ")
+            if (lockEntity !== undefined) {
+                // note: "mapped" is not part of the signature for "FOR LOCK"
+                const token = isRap.getFirstToken();
+                this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "failed"), input.filename, basic_1.VoidType.get(`RESPONSE FOR FAILED EARLY ${lockEntity}`), ["exporting" /* IdentifierMeta.MethodExporting */]));
+                this.exporting.push(new _typed_identifier_1.TypedIdentifier(new identifier_1.Identifier(token.getStart(), "reported"), input.filename, basic_1.VoidType.get(`RESPONSE FOR REPORTED EARLY ${lockEntity}`), ["exporting" /* IdentifierMeta.MethodExporting */]));
+            }
+            else if (concat.includes(" FOR VALIDATE ")
                 || concat.includes(" FOR BEHAVIOR ")
                 || concat.includes(" FOR DETERMINE ")
                 || concat.includes(" FOR FEATURES ")
                 || concat.includes(" FOR INSTANCE FEATURES ")
                 || concat.includes(" FOR GLOBAL AUTHORIZATION ")
-                || concat.includes(" FOR LOCK ")
                 || concat.includes(" FOR PRECHECK ")
                 || concat.includes(" FOR NUMBERING ")
                 || concat.includes(" FOR READ ")
@@ -61595,6 +61649,10 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.BehaviorDefinition = void 0;
 const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "../core/build/src/objects/_abstract_object.js");
 class BehaviorDefinition extends _abstract_object_1.AbstractObject {
+    constructor() {
+        super(...arguments);
+        this.parsedData = undefined;
+    }
     getType() {
         return "BDEF";
     }
@@ -61608,6 +61666,49 @@ class BehaviorDefinition extends _abstract_object_1.AbstractObject {
         // todo
         return undefined;
     }
+    setDirty() {
+        this.parsedData = undefined;
+        super.setDirty();
+    }
+    findSourceFile() {
+        return this.getFiles().find(f => f.getFilename().endsWith(".asbdef"));
+    }
+    listEntities() {
+        return this.parseSource().entities;
+    }
+    /** finds the entity name for a given alias, undefined if the alias is not defined */
+    findEntityNameByAlias(alias) {
+        var _a;
+        const upper = alias.toUpperCase();
+        for (const entity of this.listEntities()) {
+            if (((_a = entity.alias) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === upper) {
+                return entity.name;
+            }
+        }
+        return undefined;
+    }
+    /////////////////////////
+    parseSource() {
+        var _a;
+        if (this.parsedData !== undefined) {
+            return this.parsedData;
+        }
+        this.parsedData = { entities: [] };
+        const raw = (_a = this.findSourceFile()) === null || _a === void 0 ? void 0 : _a.getRaw();
+        if (raw === undefined) {
+            return this.parsedData;
+        }
+        // BDEF uses "//" for line comments
+        const stripped = raw.replace(/\/\/.*$/gm, "");
+        // eg. "define behavior for ZI_Booking alias Booking", also "define abstract behavior for ..."
+        const regex = /\bdefine\s+(?:\w+\s+)*?behavior\s+for\s+([\w/]+)(?:\s+alias\s+(\w+))?/gi;
+        let match = regex.exec(stripped);
+        while (match !== null) {
+            this.parsedData.entities.push({ name: match[1], alias: match[2] });
+            match = regex.exec(stripped);
+        }
+        return this.parsedData;
+    }
 }
 exports.BehaviorDefinition = BehaviorDefinition;
 //# sourceMappingURL=behavior_definition.js.map
@@ -65112,6 +65213,7 @@ exports.LockObject = void 0;
 const basic_1 = __webpack_require__(/*! ../abap/types/basic */ "../core/build/src/abap/types/basic/index.js");
 const ddic_1 = __webpack_require__(/*! ../ddic */ "../core/build/src/ddic.js");
 const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "../core/build/src/objects/_abstract_object.js");
+const xml_utils_1 = __webpack_require__(/*! ../xml_utils */ "../core/build/src/xml_utils.js");
 class LockObject extends _abstract_object_1.AbstractObject {
     getType() {
         return "ENQU";
@@ -65132,6 +65234,11 @@ class LockObject extends _abstract_object_1.AbstractObject {
         this.parse();
         return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.primaryTable;
     }
+    getParameters() {
+        var _a;
+        this.parse();
+        return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.parameters;
+    }
     parseType(reg) {
         var _a;
         this.parse();
@@ -65156,7 +65263,7 @@ class LockObject extends _abstract_object_1.AbstractObject {
         }
     }
     parse() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         if (this.parsedXML) {
             return { updated: false, runtime: 0 };
         }
@@ -65170,6 +65277,18 @@ class LockObject extends _abstract_object_1.AbstractObject {
         }
         this.parsedXML.primaryTable = (_f = (_e = (_d = (_c = parsed.abapGit) === null || _c === void 0 ? void 0 : _c["asx:abap"]) === null || _d === void 0 ? void 0 : _d["asx:values"]) === null || _e === void 0 ? void 0 : _e.DD25V) === null || _f === void 0 ? void 0 : _f.ROOTTAB;
         this.parsedXML.description = (_k = (_j = (_h = (_g = parsed.abapGit) === null || _g === void 0 ? void 0 : _g["asx:abap"]) === null || _h === void 0 ? void 0 : _h["asx:values"]) === null || _j === void 0 ? void 0 : _j.DD25V) === null || _k === void 0 ? void 0 : _k.DDTEXT;
+        this.parsedXML.parameters = [];
+        const parameters = (_o = (_m = (_l = parsed.abapGit) === null || _l === void 0 ? void 0 : _l["asx:abap"]) === null || _m === void 0 ? void 0 : _m["asx:values"]) === null || _o === void 0 ? void 0 : _o.DD27P_TABLE;
+        for (const parameter of (0, xml_utils_1.xmlToArray)(parameters === null || parameters === void 0 ? void 0 : parameters.DD27P)) {
+            if (typeof (parameter === null || parameter === void 0 ? void 0 : parameter.VIEWFIELD) !== "string") {
+                continue;
+            }
+            this.parsedXML.parameters.push({
+                VIEWFIELD: parameter.VIEWFIELD,
+                TABNAME: parameter.TABNAME,
+                FIELDNAME: parameter.FIELDNAME,
+            });
+        }
         const end = Date.now();
         return { updated: true, runtime: end - start };
     }
@@ -70176,7 +70295,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.43";
+        return "2.120.44";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -100104,6 +100223,7 @@ class XMLConsistency {
 * XML is well-formed and parseable
 * Naming for CLAS and INTF objects
 * QUAN fields in TABL objects have reference table and field values
+* Lock parameter names in ENQU objects are max 16 characters
 * Texts and translations do not exceed maximum allowed length.`,
             tags: [_irule_1.RuleTag.Naming, _irule_1.RuleTag.Syntax],
         };
@@ -100161,6 +100281,9 @@ class XMLConsistency {
         else if (obj instanceof Objects.Table) {
             issues.push(...this.runTable(obj, file));
         }
+        else if (obj instanceof Objects.LockObject) {
+            issues.push(...this.runLockObject(obj, file));
+        }
         if (obj instanceof _abap_object_1.ABAPObject) {
             issues.push(...this.runTextPool(obj, file));
         }
@@ -100344,6 +100467,19 @@ class XMLConsistency {
         }
         return issues;
     }
+    runLockObject(obj, file) {
+        var _a;
+        const maxParameterLength = 16;
+        const issues = [];
+        for (const parameter of (_a = obj.getParameters()) !== null && _a !== void 0 ? _a : []) {
+            if (parameter.VIEWFIELD.length > maxParameterLength) {
+                const message = `Lock parameter ${parameter.VIEWFIELD} exceeds maximum length of ` +
+                    `${maxParameterLength} characters (actual: ${parameter.VIEWFIELD.length})`;
+                issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+        return issues;
+    }
     runTable(obj, file) {
         var _a, _b;
         var _c;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.120.43",
+    "version": "2.120.44",
     "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.43",
+        "@abaplint/core": "^2.120.44",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",