@abaplint/core 2.120.40 → 2.120.42

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

@@ -347,21 +347,21 @@ class SQLFunction extends combi_1.Expression {
         const fn = (name, params, v) => {
             const nameReg = (0, combi_1.regex)(new RegExp("^" + name + "$", "i"));
             if (params === 0) {
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
             else if (params === VARIADIC) {
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.starPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.starPrio)(commaParam), (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
             else {
                 const extra = [];
                 for (let i = 1; i < params; i++) {
                     extra.push(commaParam);
                 }
-                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, ...extra, (0, combi_1.tok)(tokens_1.WParenRightW)));
+                return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, ...extra, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
             }
         };
         const castInput = (0, combi_1.altPrio)(sql_case_1.SQLCase, sql_function_input_1.SQLFunctionInput);
-        const cast = (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), castInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)));
+        const cast = (0, combi_1.ver)(version_1.Release.v750, (0, combi_1.seq)((0, combi_1.regex)(/^cast$/i), (0, combi_1.tok)(tokens_1.ParenLeftW), castInput, "AS", castTypes, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
         const hostParen = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.ParenLeftW), sql_function_input_1.SQLFunctionInput, (0, combi_1.tok)(tokens_1.WParenRightW));
         const hostVar = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WAt), (0, combi_1.altPrio)(simple_source3_1.SimpleSource3, hostParen));
         const abapOnly = (0, combi_1.altPrio)(constant_1.Constant, hostVar);
@@ -371,7 +371,7 @@ class SQLFunction extends combi_1.Expression {
             const kvs = params.map(p => (0, combi_1.seq)((0, combi_1.regex)(new RegExp("^" + p.name + "$", "i")), "=", valueFor(p)));
             const anyKv = kvs.length === 1 ? kvs[0] : (0, combi_1.altPrio)(kvs[0], kvs[1], ...kvs.slice(2));
             const body = (0, combi_1.optPrio)((0, combi_1.seq)(anyKv, (0, combi_1.starPrio)((0, combi_1.seq)(",", anyKv))));
-            return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), body, (0, combi_1.tok)(tokens_1.WParenRightW)));
+            return (0, combi_1.ver)(v, (0, combi_1.seq)(nameReg, (0, combi_1.tok)(tokens_1.ParenLeftW), body, (0, combi_1.tok)(tokens_1.WParenRightW)), { also: combi_1.AlsoIn.OpenABAP });
         };
         return (0, combi_1.altPrio)(cast, sql_replace_regexpr_1.SQLReplaceRegexpr, sql_occurrences_regexpr_1.SQLOccurrencesRegexpr, sql_substring_regexpr_1.SQLSubstringRegexpr, sql_locate_regexpr_1.SQLLocateRegexpr, ...exports.sqlFunctionDefs.map(([name, params, v]) => fn(name, params, v)), ...exports.sqlNamedFunctionDefs.map(([name, v, params]) => namedFn(name, v, params)), ...exports.sqlSpatialFunctionDefs.map(([name, params, v]) => fn(name, params, v)), ...exports.sqlSpatialAggregateDefs.map(([name, params, v]) => fn(name, params, v)));
     }

package/build/src/registry.js

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

package/build/src/rules/cds_check_syntax.js

@@ -18,7 +18,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();
@@ -62,6 +62,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;
@@ -283,6 +284,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/core",
-    "version": "2.120.40",
+    "version": "2.120.42",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",