@abaplint/core 2.83.9 → 2.83.13

package/build/abaplint.d.ts

@@ -1242,6 +1242,7 @@ declare class DataDefinition extends AbstractObject {
         allowNamespace: boolean;
     };
     getSQLViewName(): string | undefined;
+    getDefinitionName(): string | undefined;
     getDescription(): string | undefined;
     parseType(reg: IRegistry): AbstractType;
     getParsedData(): ParsedDataDefinition | undefined;
@@ -4079,7 +4080,9 @@ declare class ParenRightW extends Token {
 
 declare type ParsedDataDefinition = {
     sqlViewName: string | undefined;
+    definitionName: string | undefined;
     fields: {
+        key: boolean;
         name: string;
         annotations: string[];
     }[];

package/build/src/abap/types/basic/decfloat16_type.js

@@ -16,7 +16,7 @@ class DecFloat16Type extends _abstract_type_1.AbstractType {
         return false;
     }
     toCDS() {
-        return "abap.TODO_DECFLOAT16";
+        return "abap.d16n";
     }
 }
 exports.DecFloat16Type = DecFloat16Type;

package/build/src/abap/types/basic/decfloat34_type.js

@@ -16,7 +16,7 @@ class DecFloat34Type extends _abstract_type_1.AbstractType {
         return false;
     }
     toCDS() {
-        return "abap.TODO_DECFLOAT34";
+        return "abap.d34n";
     }
 }
 exports.DecFloat34Type = DecFloat34Type;

package/build/src/abap/types/basic/string_type.js

@@ -16,7 +16,7 @@ class StringType extends _abstract_type_1.AbstractType {
         return false;
     }
     toCDS() {
-        return "abap.TODO_STRING";
+        return "abap.string";
     }
 }
 exports.StringType = StringType;

package/build/src/abap/types/basic/utc_long_type.js

@@ -16,7 +16,7 @@ class UTCLongType extends _abstract_type_1.AbstractType {
         return false;
     }
     toCDS() {
-        return "abap.TODO_UTCLONG";
+        return "abap.utcl";
     }
 }
 exports.UTCLongType = UTCLongType;

package/build/src/abap/types/basic/xstring_type.js

@@ -16,7 +16,7 @@ class XStringType extends _abstract_type_1.AbstractType {
         return false;
     }
     toCDS() {
-        return "abap.TODO_XSTRING";
+        return "abap.rawstring";
     }
 }
 exports.XStringType = XStringType;

package/build/src/cds/cds_lexer.js

@@ -71,7 +71,9 @@ class CDSLexer {
                 if (next === "\n") {
                     mode = Mode.Default;
                 }
-                continue;
+                else {
+                    continue;
+                }
             }
             else if (mode === Mode.Default && next === "/" && nextNext === "/") {
                 mode = Mode.SingleLineComment;
@@ -80,7 +82,10 @@ class CDSLexer {
             }
             // multi line comment handling
             if (mode === Mode.MultiLineComment) {
-                if (prev === "*" && next === "/") {
+                if (next === "\n") {
+                    row++;
+                }
+                else if (prev === "*" && next === "/") {
                     mode = Mode.Default;
                 }
                 continue;

package/build/src/ddic.js

@@ -143,6 +143,7 @@ class DDIC {
         }
     }
     lookupNoVoid(name) {
+        var _a;
         const foundTABL = this.reg.getObject("TABL", name);
         if (foundTABL) {
             return { type: foundTABL.parseType(this.reg), object: foundTABL };
@@ -155,10 +156,6 @@ class DDIC {
         if (foundTTYP) {
             return { type: foundTTYP.parseType(this.reg), object: foundTTYP };
         }
-        const foundDDLS = this.reg.getObject("DDLS", name);
-        if (foundDDLS) {
-            return { type: foundDDLS.parseType(this.reg), object: foundDDLS };
-        }
         const foundDTEL = this.reg.getObject("DTEL", name);
         if (foundDTEL) {
             return { type: foundDTEL.parseType(this.reg), object: foundDTEL };
@@ -166,7 +163,7 @@ class DDIC {
         const upper = name.toUpperCase();
         for (const obj of this.reg.getObjectsByType("DDLS")) {
             const ddls = obj;
-            if (ddls.getSQLViewName() === upper) {
+            if (ddls.getSQLViewName() === upper || ((_a = ddls.getDefinitionName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === upper) {
                 return { type: ddls.parseType(this.reg), object: obj };
             }
         }
@@ -213,6 +210,7 @@ class DDIC {
         }
     }
     lookupTableOrView(name) {
+        var _a;
         if (name === undefined) {
             return { type: new Types.UnknownType("undefined, lookupTableOrView") };
         }
@@ -220,20 +218,17 @@ class DDIC {
         if (foundTABL) {
             return { type: foundTABL.parseType(this.reg), object: foundTABL };
         }
-        const foundDDLS = this.reg.getObject("DDLS", name);
-        if (foundDDLS) {
-            return { type: foundDDLS.parseType(this.reg), object: foundDDLS };
-        }
         const upper = name.toUpperCase();
         for (const obj of this.reg.getObjectsByType("DDLS")) {
             const ddls = obj;
-            if (ddls.getSQLViewName() === upper) {
+            if (ddls.getSQLViewName() === upper || ((_a = ddls.getDefinitionName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === upper) {
                 return { type: ddls.parseType(this.reg), object: ddls };
             }
         }
         return this.lookupView(name);
     }
     lookupTableOrView2(name) {
+        var _a;
         if (name === undefined) {
             return undefined;
         }
@@ -245,14 +240,10 @@ class DDIC {
         if (foundVIEW) {
             return foundVIEW;
         }
-        const foundDDLS = this.reg.getObject("DDLS", name);
-        if (foundDDLS) {
-            return foundDDLS;
-        }
         const upper = name.toUpperCase();
         for (const obj of this.reg.getObjectsByType("DDLS")) {
             const ddls = obj;
-            if (ddls.getSQLViewName() === upper) {
+            if (ddls.getSQLViewName() === upper || ((_a = ddls.getDefinitionName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === upper) {
                 return ddls;
             }
         }

package/build/src/objects/data_definition.js

@@ -25,6 +25,11 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         this.parse();
         return (_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.sqlViewName;
     }
+    getDefinitionName() {
+        var _a;
+        this.parse();
+        return (_a = this.parsedData) === null || _a === void 0 ? void 0 : _a.definitionName;
+    }
     getDescription() {
         // todo
         return undefined;
@@ -53,12 +58,14 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         return this.parserError;
     }
     parse() {
+        var _a, _b;
         if (this.isDirty() === false) {
             return { updated: false, runtime: 0 };
         }
         const start = Date.now();
         this.parsedData = {
             sqlViewName: undefined,
+            definitionName: undefined,
             fields: [],
             sources: [],
             relations: [],
@@ -68,6 +75,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         this.findSQLViewName();
         this.parsedData.tree = new cds_parser_1.CDSParser().parse(this.findSourceFile());
         if (this.parsedData.tree) {
+            this.parsedData.definitionName = (_b = (_a = this.parsedData.tree) === null || _a === void 0 ? void 0 : _a.findFirstExpression(expressions_1.CDSName)) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr();
             this.findSourcesAndRelations(this.parsedData.tree);
             this.findFieldNames(this.parsedData.tree);
         }
@@ -107,6 +115,7 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             this.parsedData.fields.push({
                 name: name,
                 annotations: annotations,
+                key: e.findDirectTokenByText("KEY") !== undefined,
             });
         }
     }

package/build/src/objects/table.js

@@ -90,8 +90,13 @@ class Table extends _abstract_object_1.AbstractObject {
                     found = found.getType();
                 }
                 if (found instanceof Types.StructureType) {
-                    for (const c of found.getComponents()) {
-                        components.push({ name: c.name, type: c.type });
+                    if (field.GROUPNAME !== undefined) {
+                        components.push({ name: field.GROUPNAME, type: found });
+                    }
+                    else {
+                        for (const c of found.getComponents()) {
+                            components.push({ name: c.name, type: c.type });
+                        }
                     }
                 }
                 else if ((((_a = field.PRECFIELD) === null || _a === void 0 ? void 0 : _a.startsWith("CI_")) || ((_b = field.PRECFIELD) === null || _b === void 0 ? void 0 : _b.startsWith("SI_")))
@@ -241,6 +246,7 @@ class Table extends _abstract_object_1.AbstractObject {
                 DATATYPE: field.DATATYPE,
                 DECIMALS: field.DECIMALS,
                 KEYFLAG: field.KEYFLAG,
+                GROUPNAME: field.GROUPNAME,
             });
         }
     }

package/build/src/registry.js

@@ -68,7 +68,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.83.9";
+        return "2.83.13";
     }
     getDDICReferences() {
         return this.references;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.83.9",
+    "version": "2.83.13",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -45,10 +45,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.19.2",
+        "@microsoft/api-extractor": "^7.19.3",
         "@types/chai": "^4.3.0",
         "@types/mocha": "^9.0.0",
-        "@types/node": "^17.0.4",
+        "@types/node": "^17.0.5",
         "chai": "^4.3.4",
         "eslint": "^8.5.0",
         "mocha": "^9.1.3",