@abaplint/cli 2.120.39 → 2.120.41

package/build/cli.js

@@ -26079,6 +26079,21 @@ class CurrentScope {
         }
         this.current.getData().forms.push(...f);
     }
+    /** The FORM definitions are built up front, at that point the program level types are not known.
+     * When the FORM statement is traversed it is replaced with one resolved in the scope of the FORM */
+    updateFormDefinition(f) {
+        let search = this.current;
+        while (search !== undefined) {
+            const forms = search.getData().forms;
+            for (let i = 0; i < forms.length; i++) {
+                if (forms[i].equals(f)) {
+                    forms[i] = f;
+                    return;
+                }
+            }
+            search = search.getParent();
+        }
+    }
     addInterfaceDefinition(i) {
         if (this.current === undefined) {
             return;
@@ -27025,6 +27040,7 @@ class Procedural {
                 scope: _current_scope_1.CurrentScope.buildDefault(this.reg, obj),
                 filename: file.getFilename(),
                 issues: [],
+                deferred: [],
             };
             for (const found of structure.findAllStructures(Structures.Form)) {
                 this.scope.addFormDefinitions([new types_1.FormDefinition(found, input)]);
@@ -36470,6 +36486,7 @@ class FindGlobalDefinitions {
             filename: file.getFilename(),
             scope: _current_scope_1.CurrentScope.buildDefault(this.reg, obj),
             issues: [],
+            deferred: [],
         };
         if (obj instanceof interface_1.Interface) {
             const found = struc.findFirstStructure(Structures.Interface);
@@ -40698,6 +40715,9 @@ class Form {
         }
         input.scope.push(_scope_type_1.ScopeType.Form, name, node.getFirstToken().getStart(), input.filename);
         const form = new form_definition_1.FormDefinition(node, input);
+        // the definitions are built up front, before the program level types are known, replace it
+        // with this one, which is resolved in the scope of the FORM
+        input.scope.updateFormDefinition(form);
         input.scope.addList(form.getUsingParameters());
         input.scope.addList(form.getChangingParameters());
         input.scope.addList(form.getTablesParameters());
@@ -43732,12 +43752,19 @@ class Perform {
         input.scope.addReference(expr.getFirstToken(), found, _reference_1.ReferenceType.FormReference, input.filename);
         ////////////////////////////
         // check parameters match
-        // USING and CHANGING are interchangeable, the actual parameters form a single positional list
-        if (this.checkParameters(node, tables, found.getTablesParameters(), "TABLES", input) === false) {
-            return;
-        }
-        const formal = found.getUsingParameters().concat(found.getChangingParameters());
-        this.checkParameters(node, using.concat(changing), formal, "USING/CHANGING", input);
+        // deferred, the FORM might be defined after the PERFORM, its parameters are only typed
+        // once the FORM statement itself has been traversed
+        input.deferred.push(() => {
+            var _a;
+            // look up again, the definition is replaced when the FORM statement is traversed
+            const def = (_a = input.scope.findFormDefinition(name)) !== null && _a !== void 0 ? _a : found;
+            if (this.checkParameters(node, tables, def.getTablesParameters(), "TABLES", input) === false) {
+                return;
+            }
+            // USING and CHANGING are interchangeable, the actual parameters form a single positional list
+            const formal = def.getUsingParameters().concat(def.getChangingParameters());
+            this.checkParameters(node, using.concat(changing), formal, "USING/CHANGING", input);
+        });
     }
     // returns false if an issue was reported
     checkParameters(node, actual, formal, kind, input) {
@@ -48388,6 +48415,7 @@ class SyntaxLogic {
     constructor(reg, object) {
         this.reg = reg;
         this.issues = [];
+        this.deferred = [];
         this.object = object;
     }
     run() {
@@ -48401,6 +48429,7 @@ class SyntaxLogic {
             proc: new _procedural_1.Procedural(this.reg, this.scope),
         };
         this.issues = [];
+        this.deferred = [];
         this.reg.getDDICReferences().clear(this.object);
         this.reg.getMSAGReferences().clear(this.object);
         if (this.object instanceof objects_1.Program && this.object.isInclude()) {
@@ -48408,6 +48437,11 @@ class SyntaxLogic {
             return { issues: [], spaghetti: this.scope.pop(new position_1.Position(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)) };
         }
         this.traverseObject();
+        // the FORM definitions are now all traversed, ie. their parameters are typed
+        for (const d of this.deferred) {
+            d();
+        }
+        this.deferred = [];
         for (;;) {
             const spaghetti = this.scope.pop(new position_1.Position(Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)); // pop built-in scopes
             if (spaghetti.getTop().getIdentifier().stype === _scope_type_1.ScopeType.BuiltIn) {
@@ -48507,6 +48541,7 @@ class SyntaxLogic {
             scope: this.scope,
             filename,
             issues: this.issues,
+            deferred: this.deferred,
         };
         if (stru instanceof Structures.ClassDefinition) {
             new class_definition_1.ClassDefinition(node, input);
@@ -48558,6 +48593,7 @@ class SyntaxLogic {
             scope: this.scope,
             filename,
             issues: this.issues,
+            deferred: this.deferred,
         };
         // todo, refactor
         if (s instanceof Statements.Type) {
@@ -70138,7 +70174,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.39";
+        return "2.120.41";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -72829,7 +72865,7 @@ const KNOWN_CURR_DATA_ELEMENTS = ["BWERT", "DZWERT"];
 const RESERVED_ELEMENT_NAMES = ["BEGIN", "NUMBER", "POSITION"];
 const MAX_LABEL_LENGTH = 40;
 // Annotations which are not supported in CDS view entities
-const VIEW_ENTITY_FORBIDDEN_ANNOTATIONS = ["Semantics.unitOfMeasure"];
+const VIEW_ENTITY_FORBIDDEN_ANNOTATIONS = ["Semantics.unitOfMeasure", "Semantics.currencyCode"];
 class CDSCheckSyntax {
     constructor() {
         this.conf = new CDSCheckSyntaxConf();
@@ -72873,6 +72909,7 @@ Missing objects are only reported when their names match the configured errorNam
         this.checkFieldAnnotations(tree, ddic, issues, file);
         this.checkLabels(tree, issues, file);
         this.checkViewEntityAnnotations(tree, issues, file);
+        this.checkSearchable(tree, issues, file);
         this.checkReservedNames(tree, issues, file);
         this.checkFields(tree, sources, object, issues, file);
         return issues;
@@ -73094,6 +73131,29 @@ Missing objects are only reported when their names match the configured errorNam
             }
         }
     }
+    checkSearchable(tree, issues, file) {
+        let searchable;
+        for (const annotation of tree.findAllExpressionsRecursive(expressions_1.CDSAnnotation)) {
+            const normalized = annotation.concatTokens().replace(/\s/g, "").toUpperCase().replace(/^@</, "@");
+            if (this.hasSearchAnnotation(normalized, "defaultSearchElement")) {
+                return;
+            }
+            else if (searchable === undefined && this.hasSearchAnnotation(normalized, "searchable")) {
+                searchable = annotation;
+            }
+        }
+        if (searchable !== undefined) {
+            const message = "@Search.defaultSearchElement: true required on at least one element " +
+                "when @Search.searchable: true";
+            issues.push(issue_1.Issue.atToken(file, searchable.getFirstToken(), message, this.getMetadata().key, this.conf.severity));
+        }
+    }
+    hasSearchAnnotation(normalized, name) {
+        if (normalized.startsWith("@SEARCH") === false) {
+            return false;
+        }
+        return new RegExp("[.{,]" + name.toUpperCase() + ":TRUE").test(normalized);
+    }
     checkReservedNames(tree, issues, file) {
         var _a, _b;
         for (const element of tree.findAllExpressionsRecursive(expressions_1.CDSElement)) {

package/package.json

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