@abaplint/cli 2.113.32 → 2.113.34

package/build/cli.js

@@ -39722,20 +39722,71 @@ exports.ArtifactsRules = ArtifactsRules;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CDSDetermineTypes = void 0;
 const basic_1 = __webpack_require__(/*! ../abap/types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const ddic_1 = __webpack_require__(/*! ../ddic */ "./node_modules/@abaplint/core/build/src/ddic.js");
 class CDSDetermineTypes {
-    parseType(_reg, parsedData) {
+    parseType(reg, parsedData) {
+        const ddic = new ddic_1.DDIC(reg);
         if ((parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields.length) === 0) {
             return new basic_1.VoidType("DDLS:todo");
         }
         else {
             const components = [];
             for (const f of (parsedData === null || parsedData === void 0 ? void 0 : parsedData.fields) || []) {
-                components.push({
-                    name: f.name,
-                    type: new basic_1.VoidType("DDLS:fieldname"),
-                });
+                if (f.prefix !== "") {
+                    const source = parsedData.sources.find((s) => { var _a; return ((_a = s.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === f.prefix.toUpperCase(); });
+                    if ((source === null || source === void 0 ? void 0 : source.name) === undefined) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.UnknownType("CDS parser error, unknown source"),
+                        });
+                        continue;
+                    }
+                    const lookup = ddic.lookupTableOrView(source.name);
+                    if (lookup.type) {
+                        if (lookup.type instanceof basic_1.StructureType) {
+                            const type = lookup.type.getComponentByName(f.name);
+                            if (type) {
+                                components.push({
+                                    name: f.name,
+                                    type: type,
+                                });
+                            }
+                            else {
+                                components.push({
+                                    name: f.name,
+                                    type: new basic_1.UnknownType(f.name + " not found in " + source.name + ", CDSDetermineTypes"),
+                                });
+                            }
+                        }
+                        else {
+                            // its void or unknown
+                            components.push({
+                                name: f.name,
+                                type: lookup.type,
+                            });
+                        }
+                    }
+                    else if (reg.inErrorNamespace(source.name)) {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.UnknownType(source.name + " not found, CDSDetermineTypes"),
+                        });
+                    }
+                    else {
+                        components.push({
+                            name: f.name,
+                            type: new basic_1.VoidType(source.name),
+                        });
+                    }
+                }
+                else {
+                    components.push({
+                        name: f.name,
+                        type: new basic_1.VoidType("DDLS:fieldname"),
+                    });
+                }
             }
-            return new basic_1.StructureType(components);
+            return new basic_1.StructureType(components, parsedData.definitionName, parsedData.definitionName, parsedData.description);
         }
     }
 }
@@ -41282,10 +41333,10 @@ class DDIC {
             return { type: new Types.VoidType(name) };
         }
     }
-    lookupDomain(name, dataElement) {
+    lookupDomain(name, dataElement, description) {
         const found = this.reg.getObject("DOMA", name);
         if (found) {
-            return { type: found.parseType(this.reg, dataElement), object: found };
+            return { type: found.parseType(this.reg, dataElement, description), object: found };
         }
         else if (this.reg.inErrorNamespace(name)) {
             return { type: new Types.UnknownType(name + ", lookupDomain"), object: undefined };
@@ -46696,6 +46747,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             expr = tree.findFirstExpression(expressions_1.CDSDefineProjection);
         }
         for (const e of (expr === null || expr === void 0 ? void 0 : expr.findDirectExpressions(expressions_1.CDSElement)) || []) {
+            let prefix = "";
             let found = (_a = e.findDirectExpression(expressions_1.CDSAs)) === null || _a === void 0 ? void 0 : _a.findDirectExpression(expressions_1.CDSName);
             if (found === undefined) {
                 const list = e.findAllExpressions(expressions_1.CDSName);
@@ -46704,6 +46756,9 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
                 }
                 else {
                     found = list[list.length - 1];
+                    if (list.length > 1) {
+                        prefix = list[0].concatTokens();
+                    }
                 }
             }
             if (found === undefined) {
@@ -46720,6 +46775,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             this.parsedData.fields.push({
                 name: name,
                 annotations: annotations,
+                prefix: prefix,
                 key: e.findDirectTokenByText("KEY") !== undefined,
             });
         }
@@ -46815,7 +46871,7 @@ class DataElement extends _abstract_object_1.AbstractObject {
                     lookup = { type: new Types.UnknownType("DOMNAME unexpectely empty in " + this.getName()) };
                 }
                 else {
-                    lookup = ddic.lookupDomain(this.parsedXML.domname, this.getName());
+                    lookup = ddic.lookupDomain(this.parsedXML.domname, this.getName(), this.getDescription());
                 }
             }
             else if (this.parsedXML.refkind === "R") {
@@ -46983,7 +47039,7 @@ class Domain extends _abstract_object_1.AbstractObject {
         this.parsedXML = undefined;
         super.setDirty();
     }
-    parseType(reg, dataElement) {
+    parseType(reg, dataElement, description) {
         // dont cache the DOMA parsed type, they are cached on DTEL level
         // also note that the type carries the name of the DTEL
         if (this.parsedXML === undefined) {
@@ -47001,6 +47057,7 @@ class Domain extends _abstract_object_1.AbstractObject {
             qualifiedName: dataElement,
             conversionExit: this.parsedXML.conversionExit,
             ddicName: dataElement,
+            description: description,
         });
     }
     parse() {
@@ -52893,7 +52950,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.32";
+        return "2.113.34";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.32",
+    "version": "2.113.34",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,12 +38,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.32",
+        "@abaplint/core": "^2.113.34",
         "@types/chai": "^4.3.20",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.9",
-        "@types/node": "^22.8.2",
+        "@types/node": "^22.8.4",
         "@types/progress": "^2.0.7",
         "chai": "^4.5.0",
         "chalk": "^5.3.0",
@@ -52,7 +52,7 @@
         "json5": "^2.2.3",
         "memfs": "^4.14.0",
         "minimist": "^1.2.8",
-        "mocha": "^10.7.3",
+        "mocha": "^10.8.1",
         "progress": "^2.0.3",
         "typescript": "^5.6.3",
         "webpack": "^5.95.0",