@abaplint/cli 2.120.47 → 2.120.49

package/build/cli.js

@@ -27471,6 +27471,13 @@ class TypeUtils {
             || type instanceof basic_1.UnknownType
             || type instanceof basic_1.VoidType;
     }
+    isCharLikeForCompare(type) {
+        return type === undefined
+            || type instanceof basic_1.StringType
+            || type instanceof basic_1.CLikeType
+            || type instanceof basic_1.CSequenceType
+            || this.isCharLikeField(type);
+    }
     isCharLike(type) {
         if (type === undefined) {
             return false;
@@ -29812,6 +29819,7 @@ const basic_1 = __webpack_require__(/*! ../../types/basic */ "../core/build/src/
 const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "../core/build/src/abap/5_syntax/_type_utils.js");
 class Compare {
     static runSyntax(node, input) {
+        var _a;
         const sourceTypes = [];
         const sources = node.findDirectExpressions(Expressions.Source);
         for (const t of sources) {
@@ -29823,8 +29831,16 @@ class Compare {
         for (const t of node.findDirectExpressions(Expressions.MethodCallChain)) {
             method_call_chain_1.MethodCallChain.runSyntax(t, input);
         }
-        if (node.findDirectExpression(Expressions.CompareOperator)
-            && new _type_utils_1.TypeUtils(input.scope).isCompareable(sourceTypes[0], sourceTypes[1], sources[0], sources[1]) === false
+        const typeUtils = new _type_utils_1.TypeUtils(input.scope);
+        const compareOperator = (_a = node.findDirectExpression(Expressions.CompareOperator)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
+        if (compareOperator === "CS"
+            && sourceTypes.length === 2
+            && sourceTypes.some((type) => typeUtils.isCharLikeForCompare(type) === false)) {
+            const message = "CS operands must be character-like (data type C, N, D, T, or STRING)";
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
+        }
+        else if (node.findDirectExpression(Expressions.CompareOperator)
+            && typeUtils.isCompareable(sourceTypes[0], sourceTypes[1], sources[0], sources[1]) === false
             && sourceTypes.length === 2) {
             let message = "Incompatible types for comparison";
             if ((sourceTypes[0] instanceof basic_1.DateType
@@ -63093,6 +63109,9 @@ const ddic_1 = __webpack_require__(/*! ../ddic */ "../core/build/src/ddic.js");
 const Types = __importStar(__webpack_require__(/*! ../abap/types/basic */ "../core/build/src/abap/types/basic/index.js"));
 const xml_utils_1 = __webpack_require__(/*! ../xml_utils */ "../core/build/src/xml_utils.js");
 const domain_1 = __webpack_require__(/*! ./domain */ "../core/build/src/objects/domain.js");
+const _identifier_1 = __webpack_require__(/*! ../abap/4_file_information/_identifier */ "../core/build/src/abap/4_file_information/_identifier.js");
+const identifier_1 = __webpack_require__(/*! ../abap/1_lexer/tokens/identifier */ "../core/build/src/abap/1_lexer/tokens/identifier.js");
+const position_1 = __webpack_require__(/*! ../position */ "../core/build/src/position.js");
 class DataElement extends _abstract_object_1.AbstractObject {
     constructor() {
         super(...arguments);
@@ -63113,6 +63132,17 @@ class DataElement extends _abstract_object_1.AbstractObject {
             allowNamespace: true,
         };
     }
+    getIdentifier() {
+        const xmlIdentifier = super.getIdentifier();
+        if (xmlIdentifier) {
+            return xmlIdentifier;
+        }
+        const file = this.getAFFFile();
+        if (file === undefined) {
+            return undefined;
+        }
+        return new _identifier_1.Identifier(new identifier_1.Identifier(new position_1.Position(1, 1), this.getName()), file.getFilename());
+    }
     setDirty() {
         this.parsedXML = undefined;
         this.parsedType = undefined;
@@ -63160,7 +63190,6 @@ class DataElement extends _abstract_object_1.AbstractObject {
         return (_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.dtelmaster;
     }
     parseType(reg) {
-        var _a;
         const references = [];
         let lookup = undefined;
         this.parse();
@@ -63172,7 +63201,53 @@ class DataElement extends _abstract_object_1.AbstractObject {
                 return this.parsedType;
             }
             const ddic = new ddic_1.DDIC(reg);
-            if (this.parsedXML.refkind === "D") {
+            const lookupPredefinedType = () => {
+                var _a, _b;
+                if (((_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.datatype) === undefined || this.parsedXML.datatype === "") {
+                    return { type: new Types.UnknownType("DATATYPE unexpectely empty in " + this.getName()) };
+                }
+                return { type: ddic.textToType({
+                        text: this.parsedXML.datatype,
+                        length: this.parsedXML.leng,
+                        decimals: this.parsedXML.decimals,
+                        infoText: this.getName(),
+                        qualifiedName: this.getName(),
+                        conversionExit: undefined,
+                        ddicName: this.getName(),
+                        description: (_b = this.parsedXML.texts) === null || _b === void 0 ? void 0 : _b.heading,
+                    }) };
+            };
+            if (this.parsedXML.affCategory === "referenceToPredefinedType") {
+                const predefined = lookupPredefinedType();
+                lookup = predefined.type instanceof Types.UnknownType
+                    ? predefined
+                    : { type: new Types.DataReference(predefined.type, this.getName()) };
+            }
+            else if (this.parsedXML.affCategory === "referenceDictionaryType") {
+                if (this.parsedXML.domname === undefined || this.parsedXML.domname === "") {
+                    lookup = { type: new Types.UnknownType("Type name unexpectely empty in " + this.getName()) };
+                }
+                else {
+                    const referenced = ddic.lookup(this.parsedXML.domname);
+                    lookup = referenced.type instanceof Types.UnknownType
+                        ? referenced
+                        : Object.assign(Object.assign({}, referenced), { type: new Types.DataReference(referenced.type, this.getName()) });
+                }
+            }
+            else if (this.parsedXML.affCategory === "referenceClasIntType") {
+                if (this.parsedXML.domname === undefined || this.parsedXML.domname === "") {
+                    lookup = { type: new Types.UnknownType("Type name unexpectely empty in " + this.getName()) };
+                }
+                else {
+                    lookup = ddic.lookupObject(this.parsedXML.domname);
+                }
+            }
+            else if (this.parsedXML.affCategory !== undefined
+                && this.parsedXML.affCategory !== "domain"
+                && this.parsedXML.affCategory !== "predefinedType") {
+                lookup = { type: new Types.UnknownType("Unknown AFF data type category " + this.parsedXML.affCategory + " in " + this.getName()) };
+            }
+            else if (this.parsedXML.refkind === "D") {
                 if (this.parsedXML.domname === undefined || this.parsedXML.domname === "") {
                     lookup = { type: new Types.UnknownType("DOMNAME unexpectely empty in " + this.getName()) };
                 }
@@ -63189,21 +63264,7 @@ class DataElement extends _abstract_object_1.AbstractObject {
                 }
             }
             else {
-                if (this.parsedXML.datatype === undefined || this.parsedXML.datatype === "") {
-                    lookup = { type: new Types.UnknownType("DATATYPE unexpectely empty in " + this.getName()) };
-                }
-                else {
-                    lookup = { type: ddic.textToType({
-                            text: this.parsedXML.datatype,
-                            length: this.parsedXML.leng,
-                            decimals: this.parsedXML.decimals,
-                            infoText: this.getName(),
-                            qualifiedName: this.getName(),
-                            conversionExit: undefined,
-                            ddicName: this.getName(),
-                            description: (_a = this.parsedXML.texts) === null || _a === void 0 ? void 0 : _a.heading,
-                        }) };
-                }
+                lookup = lookupPredefinedType();
             }
         }
         if (lookup.object) {
@@ -63218,17 +63279,52 @@ class DataElement extends _abstract_object_1.AbstractObject {
         return lookup.type;
     }
     parse() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         if (this.parsedXML !== undefined) {
             return { updated: false, runtime: 0 };
         }
         const start = Date.now();
         this.parsedXML = {};
+        const jsonFile = this.getAFFFile();
+        if (jsonFile) {
+            try {
+                const parsed = JSON.parse(jsonFile.getRaw());
+                const typeInformation = parsed.dataTypeInformation;
+                const predefinedType = typeInformation === null || typeInformation === void 0 ? void 0 : typeInformation.predefinedType;
+                const fieldLabels = parsed.fieldLabels;
+                this.parsedXML = {
+                    description: (_a = parsed.header) === null || _a === void 0 ? void 0 : _a.description,
+                    affCategory: typeInformation === null || typeInformation === void 0 ? void 0 : typeInformation.category,
+                    refkind: (typeInformation === null || typeInformation === void 0 ? void 0 : typeInformation.category) === "domain" ? "D" : undefined,
+                    domname: typeInformation === null || typeInformation === void 0 ? void 0 : typeInformation.typeName,
+                    datatype: predefinedType === null || predefinedType === void 0 ? void 0 : predefinedType.dataType,
+                    leng: (_b = predefinedType === null || predefinedType === void 0 ? void 0 : predefinedType.length) === null || _b === void 0 ? void 0 : _b.toString(),
+                    decimals: (_c = predefinedType === null || predefinedType === void 0 ? void 0 : predefinedType.decimals) === null || _c === void 0 ? void 0 : _c.toString(),
+                    texts: {
+                        short: fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.short,
+                        medium: fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.medium,
+                        long: fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.long,
+                        heading: fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.heading,
+                    },
+                    textMaxLengths: {
+                        short: (_d = fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.shortLength) === null || _d === void 0 ? void 0 : _d.toString(),
+                        medium: (_e = fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.mediumLength) === null || _e === void 0 ? void 0 : _e.toString(),
+                        long: (_f = fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.longLength) === null || _f === void 0 ? void 0 : _f.toString(),
+                        heading: (_g = fieldLabels === null || fieldLabels === void 0 ? void 0 : fieldLabels.headingLength) === null || _g === void 0 ? void 0 : _g.toString(),
+                    },
+                };
+            }
+            catch (_q) {
+                // handled by parseType()
+            }
+            const end = Date.now();
+            return { updated: true, runtime: end - start };
+        }
         const parsed = super.parseRaw2();
         if (parsed === undefined) {
             return { updated: false, runtime: 0 };
         }
-        const dd04v = (_c = (_b = (_a = parsed.abapGit) === null || _a === void 0 ? void 0 : _a["asx:abap"]) === null || _b === void 0 ? void 0 : _b["asx:values"]) === null || _c === void 0 ? void 0 : _c.DD04V;
+        const dd04v = (_k = (_j = (_h = parsed.abapGit) === null || _h === void 0 ? void 0 : _h["asx:abap"]) === null || _j === void 0 ? void 0 : _j["asx:values"]) === null || _k === void 0 ? void 0 : _k.DD04V;
         this.parsedXML = {
             description: dd04v === null || dd04v === void 0 ? void 0 : dd04v.DDTEXT,
             refkind: dd04v === null || dd04v === void 0 ? void 0 : dd04v.REFKIND,
@@ -63251,7 +63347,7 @@ class DataElement extends _abstract_object_1.AbstractObject {
             },
         };
         this.parsedXML.textsTranslations = [];
-        for (const item of (0, xml_utils_1.xmlToArray)((_g = (_f = (_e = (_d = parsed.abapGit) === null || _d === void 0 ? void 0 : _d["asx:abap"]) === null || _e === void 0 ? void 0 : _e["asx:values"]) === null || _f === void 0 ? void 0 : _f.DD04_TEXTS) === null || _g === void 0 ? void 0 : _g.item)) {
+        for (const item of (0, xml_utils_1.xmlToArray)((_p = (_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.DD04_TEXTS) === null || _p === void 0 ? void 0 : _p.item)) {
             this.parsedXML.textsTranslations.push({
                 language: item.DDLANGUAGE,
                 description: item.DDTEXT,
@@ -63264,6 +63360,9 @@ class DataElement extends _abstract_object_1.AbstractObject {
         const end = Date.now();
         return { updated: true, runtime: end - start };
     }
+    getAFFFile() {
+        return this.getFiles().find(file => file.getFilename().toLowerCase().endsWith(".dtel.json"));
+    }
 }
 exports.DataElement = DataElement;
 //# sourceMappingURL=data_element.js.map
@@ -70392,7 +70491,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.47";
+        return "2.120.49";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

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