@abaplint/core 2.120.28 → 2.120.29

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

@@ -171,6 +171,31 @@ class ObjectOriented {
         }
         return ret;
     }
+    // does the supplied class have friendship with "friendName"?
+    // note that interfaces of the friend, and subclasses of the friend also have friendship
+    hasFriendship(cd, friendName) {
+        var _a;
+        const friends = cd.getFriends().map(f => f.toUpperCase());
+        const isFriend = (name) => friends.includes(name.toUpperCase()) || this.scope.isLocalFriend(cd.getName(), name);
+        if (isFriend(friendName)) {
+            return true;
+        }
+        const friendDefinition = this.scope.findClassDefinition(friendName);
+        if (friendDefinition === undefined) {
+            return false;
+        }
+        if (this.findInterfaces(friendDefinition).some(i => friends.includes(i.name.toUpperCase()))) {
+            return true;
+        }
+        let sup = friendDefinition.getSuperClass();
+        while (sup !== undefined) {
+            if (isFriend(sup)) {
+                return true;
+            }
+            sup = (_a = this.scope.findClassDefinition(sup)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
+        }
+        return false;
+    }
     searchEvent(def, name) {
         if (def === undefined || name === undefined) {
             return undefined;

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

@@ -567,6 +567,9 @@ class TypeUtils {
             console.dir(source);
             console.dir(target);
         */
+        if (source instanceof basic_1.UTCLongType || target instanceof basic_1.UTCLongType) {
+            return this.isUTCLongAssignable(source, target);
+        }
         if (target instanceof basic_1.TableType) {
             if (target.isWithHeader()) {
                 return this.isAssignable(source, target.getRowType());
@@ -718,6 +721,33 @@ class TypeUtils {
         }
         return true;
     }
+    // utclong can only be converted to and from character like types
+    isUTCLongAssignable(source, target) {
+        if (this.isGenericOrVoid(source) || this.isGenericOrVoid(target)) {
+            return true;
+        }
+        else if (source instanceof basic_1.UTCLongType && target instanceof basic_1.UTCLongType) {
+            return true;
+        }
+        else if (source instanceof basic_1.UTCLongType) {
+            return this.isTextLike(target);
+        }
+        return this.isTextLike(source);
+    }
+    isGenericOrVoid(type) {
+        return type instanceof basic_1.VoidType
+            || type instanceof basic_1.AnyType
+            || type instanceof basic_1.DataType
+            || type instanceof basic_1.UnknownType;
+    }
+    isTextLike(type) {
+        return type instanceof basic_1.CharacterType
+            || type instanceof basic_1.StringType
+            || type instanceof basic_1.CLikeType
+            || type instanceof basic_1.CSequenceType
+            || type instanceof cgeneric_type_1.CGenericType
+            || type instanceof basic_1.SimpleType;
+    }
 }
 exports.TypeUtils = TypeUtils;
 //# sourceMappingURL=_type_utils.js.map

package/build/src/abap/5_syntax/expressions/method_call_chain.js

@@ -47,6 +47,8 @@ const _reference_1 = require("../_reference");
 const component_name_1 = require("./component_name");
 const attribute_name_1 = require("./attribute_name");
 const _syntax_input_1 = require("../_syntax_input");
+const visibility_1 = require("../../4_file_information/visibility");
+const class_definition_1 = require("../../types/class_definition");
 class MethodCallChain {
     static runSyntax(node, input, targetType) {
         var _a, _b;
@@ -95,6 +97,12 @@ class MethodCallChain {
                         input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
                         return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
                     }
+                    const notVisible = method ? this.checkVisibility(method, def, foundDef, input) : undefined;
+                    if (notVisible !== undefined) {
+                        const message = `Method "${methodName}" is ${notVisible} and cannot be accessed`;
+                        input.issues.push((0, _syntax_input_1.syntaxIssue)(input, methodToken, message));
+                        return basic_1.VoidType.get(_syntax_input_1.CheckSyntaxKey);
+                    }
                     const voidedName = context instanceof basic_1.VoidType ? context.getVoided() : undefined;
                     const extra = helper.methodReferenceExtras(foundDef, className || voidedName);
                     input.scope.addReference(methodToken, method, _reference_1.ReferenceType.MethodReference, input.filename, extra);
@@ -137,6 +145,47 @@ class MethodCallChain {
         return context;
     }
     //////////////////////////////////////
+    // returns the visibility as text if the method cannot be accessed from the current scope
+    static checkVisibility(method, def, foundDef, input) {
+        var _a, _b, _c;
+        const visibility = method.getVisibility();
+        if (visibility === visibility_1.Visibility.Public || foundDef === undefined) {
+            return undefined;
+        }
+        else if (!(foundDef instanceof class_definition_1.ClassDefinition)) {
+            // interface members are always public
+            return undefined;
+        }
+        const name = foundDef.getName().toUpperCase();
+        const enclosing = (_a = input.scope.getEnclosingClassName()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
+        if (enclosing === undefined || enclosing === name) {
+            return undefined;
+        }
+        // friendship with the class used at the call site also gives access to inherited members
+        const helper = new _object_oriented_1.ObjectOriented(input.scope);
+        const visited = [];
+        let current = def instanceof class_definition_1.ClassDefinition ? def : foundDef;
+        while (current !== undefined && visited.includes(current.getName().toUpperCase()) === false) {
+            visited.push(current.getName().toUpperCase());
+            if (helper.hasFriendship(current, enclosing)) {
+                return undefined;
+            }
+            const sup = current.getSuperClass();
+            current = sup === undefined ? undefined : input.scope.findClassDefinition(sup);
+        }
+        if (visibility === visibility_1.Visibility.Protected) {
+            // subclasses can access protected members
+            let sup = (_b = input.scope.findClassDefinition(enclosing)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+            while (sup !== undefined) {
+                if (sup.toUpperCase() === name) {
+                    return undefined;
+                }
+                sup = (_c = input.scope.findClassDefinition(sup)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
+            }
+            return "protected";
+        }
+        return "private";
+    }
     static findTop(first, input, targetType) {
         var _a;
         if (first.get() instanceof Expressions.ClassName) {

package/build/src/abap/5_syntax/expressions/sql_in.js

@@ -39,6 +39,7 @@ const basic_1 = require("../../types/basic");
 const _syntax_input_1 = require("../_syntax_input");
 const sql_set_op_group_1 = require("./sql_set_op_group");
 const sql_source_1 = require("./sql_source");
+const RANGE_COMPONENTS = ["SIGN", "OPTION", "LOW", "HIGH"];
 class SQLIn {
     static runSyntax(node, input) {
         const setop = node.findDirectExpression(Expressions.SQLSetOpGroup);
@@ -58,6 +59,12 @@ class SQLIn {
                     input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
                     return;
                 }
+                if (intype instanceof basic_1.TableType && this.isRangeRow(intype.getRowType()) === false) {
+                    const name = insource.concatTokens().replace(/^@/, "").replace(/\[\]$/, "");
+                    const message = `row structure of ${name} is not correct`;
+                    input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+                    return;
+                }
             }
             return;
         }
@@ -68,6 +75,16 @@ class SQLIn {
             sql_source_1.SQLSource.runSyntax(s, input);
         }
     }
+    // "IN itab" expects a ranges table, ie. the row must have SIGN, OPTION, LOW and HIGH
+    static isRangeRow(rowType) {
+        if (rowType instanceof basic_1.VoidType || rowType instanceof basic_1.UnknownType || rowType instanceof basic_1.AnyType) {
+            return true;
+        }
+        else if (!(rowType instanceof basic_1.StructureType)) {
+            return false;
+        }
+        return RANGE_COMPONENTS.every(c => rowType.getComponentByName(c) !== undefined);
+    }
 }
 exports.SQLIn = SQLIn;
 //# sourceMappingURL=sql_in.js.map

package/build/src/abap/5_syntax/statements/create_object.js

@@ -151,7 +151,7 @@ class CreateObject {
         this.validateParameters(cdef, node, input);
     }
     static checkInstantiationAllowed(cdef, input) {
-        var _a, _b, _c;
+        var _a, _b;
         const createVis = cdef.getCreateVisibility();
         if (createVis === visibility_1.Visibility.Public) {
             return undefined;
@@ -164,34 +164,17 @@ class CreateObject {
         if (enclosingClass.toUpperCase() === cdef.getName().toUpperCase()) {
             return undefined;
         }
-        if (cdef.getFriends().some(f => f.toUpperCase() === enclosingClass.toUpperCase()) ||
-            input.scope.isLocalFriend(cdef.getName(), enclosingClass)) {
+        if (new _object_oriented_1.ObjectOriented(input.scope).hasFriendship(cdef, enclosingClass)) {
             return undefined;
         }
-        const enclosingDefinition = input.scope.findClassDefinition(enclosingClass);
-        if (enclosingDefinition !== undefined) {
-            const implementedInterfaces = new _object_oriented_1.ObjectOriented(input.scope).findInterfaces(enclosingDefinition);
-            if (cdef.getFriends().some(friend => implementedInterfaces.some(implemented => implemented.name.toUpperCase() === friend.toUpperCase()))) {
-                return undefined;
-            }
-        }
-        // subclasses of friends also have friendship
-        let enclosingSup = enclosingDefinition === null || enclosingDefinition === void 0 ? void 0 : enclosingDefinition.getSuperClass();
-        while (enclosingSup !== undefined) {
-            if (cdef.getFriends().some(f => f.toUpperCase() === enclosingSup.toUpperCase()) ||
-                input.scope.isLocalFriend(cdef.getName(), enclosingSup)) {
-                return undefined;
-            }
-            enclosingSup = (_a = input.scope.findClassDefinition(enclosingSup)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
-        }
         if (createVis === visibility_1.Visibility.Protected) {
             // subclasses are also allowed
-            let sup = (_b = input.scope.findClassDefinition(enclosingClass)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+            let sup = (_a = input.scope.findClassDefinition(enclosingClass)) === null || _a === void 0 ? void 0 : _a.getSuperClass();
             while (sup !== undefined) {
                 if (sup.toUpperCase() === cdef.getName().toUpperCase()) {
                     return undefined;
                 }
-                sup = (_c = input.scope.findClassDefinition(sup)) === null || _c === void 0 ? void 0 : _c.getSuperClass();
+                sup = (_b = input.scope.findClassDefinition(sup)) === null || _b === void 0 ? void 0 : _b.getSuperClass();
             }
         }
         return cdef.getName() + " cannot be instantiated, class is defined as " +

package/build/src/abap/5_syntax/statements/delete_database.js

@@ -39,6 +39,7 @@ const source_1 = require("../expressions/source");
 const dynamic_1 = require("../expressions/dynamic");
 const database_table_1 = require("../expressions/database_table");
 const _check_database_fields_1 = require("../expressions/_check_database_fields");
+const sql_in_1 = require("../expressions/sql_in");
 class DeleteDatabase {
     runSyntax(node, input) {
         for (const s of node.findAllExpressions(Expressions.Source)) {
@@ -50,6 +51,12 @@ class DeleteDatabase {
         for (const d of node.findAllExpressions(Expressions.Dynamic)) {
             dynamic_1.Dynamic.runSyntax(d, input);
         }
+        for (const compare of node.findAllExpressions(Expressions.SQLCompare)) {
+            const sqlin = compare.findDirectExpression(Expressions.SQLIn);
+            if (sqlin !== undefined) {
+                sql_in_1.SQLIn.runSyntax(sqlin, input);
+            }
+        }
         const dbtab = node.findFirstExpression(Expressions.DatabaseTable);
         if (dbtab !== undefined) {
             const dbSource = database_table_1.DatabaseTable.runSyntax(dbtab, input);

package/build/src/registry.js

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

package/build/src/rules/cds_check_syntax.js

@@ -14,6 +14,11 @@ class CDSCheckSyntaxConf extends _basic_rule_config_1.BasicRuleConfig {
 exports.CDSCheckSyntaxConf = CDSCheckSyntaxConf;
 const KNOWN_QUAN_DATA_ELEMENTS = ["MENGE_D"];
 const KNOWN_CURR_DATA_ELEMENTS = ["BWERT", "DZWERT"];
+// Reserved names, cannot be used as element names, see DDIC table TRESE
+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"];
 class CDSCheckSyntax {
     constructor() {
         this.conf = new CDSCheckSyntaxConf();
@@ -55,6 +60,9 @@ Missing objects are only reported when their names match the configured errorNam
         this.checkTypes(tree, ddic, issues, file);
         this.checkRootProjection(tree, ddic, issues, file);
         this.checkFieldAnnotations(tree, ddic, issues, file);
+        this.checkLabels(tree, issues, file);
+        this.checkViewEntityAnnotations(tree, issues, file);
+        this.checkReservedNames(tree, issues, file);
         this.checkFields(tree, sources, object, issues, file);
         return issues;
     }
@@ -239,6 +247,62 @@ Missing objects are only reported when their names match the configured errorNam
                 || a.toUpperCase().includes("@SEMANTICS:{CURRENCYCODE:TRUE"));
         }
     }
+    checkLabels(tree, issues, file) {
+        for (const annotation of tree.findAllExpressionsRecursive(expressions_1.CDSAnnotation)) {
+            const concatenated = annotation.concatTokens();
+            if (/@\s*<?\s*EndUserText/i.test(concatenated) === false) {
+                continue;
+            }
+            const expression = /label\s*:\s*'((?:[^']|'')*)'/gi;
+            let match = expression.exec(concatenated);
+            while (match !== null) {
+                const label = match[1].replace(/''/g, "'");
+                if (label.length > MAX_LABEL_LENGTH) {
+                    const message = `CDS label is ${label.length} characters, maximum is ${MAX_LABEL_LENGTH}`;
+                    issues.push(issue_1.Issue.atToken(file, annotation.getFirstToken(), message, this.getMetadata().key, this.conf.severity));
+                }
+                match = expression.exec(concatenated);
+            }
+        }
+    }
+    checkViewEntityAnnotations(tree, issues, file) {
+        const view = tree.findFirstExpression(expressions_1.CDSDefineView);
+        if (view === undefined || view.findDirectTokenByText("ENTITY") === undefined) {
+            return;
+        }
+        for (const annotation of tree.findAllExpressionsRecursive(expressions_1.CDSAnnotation)) {
+            const normalized = annotation.concatTokens().replace(/\s/g, "").toUpperCase().replace(/^@</, "@");
+            for (const forbidden of VIEW_ENTITY_FORBIDDEN_ANNOTATIONS) {
+                const upper = forbidden.toUpperCase();
+                if (normalized.startsWith("@" + upper) === false
+                    && normalized.startsWith("@" + upper.replace(".", ":{")) === false) {
+                    continue;
+                }
+                const message = `Annotation ${forbidden} is not allowed in view entities`;
+                issues.push(issue_1.Issue.atToken(file, annotation.getFirstToken(), message, this.getMetadata().key, this.conf.severity));
+            }
+        }
+    }
+    checkReservedNames(tree, issues, file) {
+        var _a, _b;
+        for (const element of tree.findAllExpressionsRecursive(expressions_1.CDSElement)) {
+            if (element.findDirectTokenByText("INCLUDE") !== undefined) {
+                continue;
+            }
+            let nameNode = (_a = element.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
+            if (nameNode === undefined) {
+                const names = ((_b = element.findDirectExpression(expressions_1.CDSPrefixedName)) === null || _b === void 0 ? void 0 : _b.findDirectExpressions(expressions_1.CDSName)) || [];
+                nameNode = names[names.length - 1];
+            }
+            if (nameNode === undefined) {
+                continue;
+            }
+            const name = this.name(nameNode);
+            if (RESERVED_ELEMENT_NAMES.includes(name.toUpperCase())) {
+                issues.push(issue_1.Issue.atToken(file, nameNode.getFirstToken(), `CDS element name "${name}" is reserved`, this.getMetadata().key, this.conf.severity));
+            }
+        }
+    }
     checkFields(tree, sources, object, issues, file) {
         var _a;
         const associationNames = new Set();

package/package.json

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