@abaplint/core 2.83.8 → 2.83.12

package/build/abaplint.d.ts

@@ -551,6 +551,82 @@ declare class CatchSystemExceptions_2 implements IStatement {
     getMatcher(): IStatementRunnable;
 }
 
+declare class CDSAggregate extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSAnnotation extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSAnnotationArray extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSAnnotationObject extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSAnnotationSimple extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSArithmetics extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSAs extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSAssociation extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSCardinality extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSCase extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSCast extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSComposition extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSCondition extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSDefineAbstract extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSDefineView extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSElement extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSFunction extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSGroupBy extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSJoin extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSMetadataExtension extends AbstractObject {
     getType(): string;
     getAllowedNaming(): {
@@ -560,10 +636,46 @@ declare class CDSMetadataExtension extends AbstractObject {
     getDescription(): string | undefined;
 }
 
+declare class CDSName extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSParameters extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 export declare class CDSParser {
     parse(file: IFile | undefined): ExpressionNode | undefined;
 }
 
+declare class CDSRelation extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSSelect extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSSource extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSString extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSType extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSWhere extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
+declare class CDSWithParameters extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class ChangeDocument extends AbstractObject {
     getType(): string;
     getAllowedNaming(): {
@@ -1130,8 +1242,10 @@ declare class DataDefinition extends AbstractObject {
         allowNamespace: boolean;
     };
     getSQLViewName(): string | undefined;
+    getDefinitionName(): string | undefined;
     getDescription(): string | undefined;
     parseType(reg: IRegistry): AbstractType;
+    getParsedData(): ParsedDataDefinition | undefined;
     listSources(): {
         name: string;
         as: string | undefined;
@@ -1838,6 +1952,40 @@ declare namespace Expressions {
 }
 export { Expressions }
 
+declare namespace ExpressionsCDS {
+    export {
+        CDSAggregate,
+        CDSAnnotationArray,
+        CDSAnnotationObject,
+        CDSAnnotationSimple,
+        CDSAnnotation,
+        CDSArithmetics,
+        CDSAs,
+        CDSAssociation,
+        CDSCardinality,
+        CDSCase,
+        CDSCast,
+        CDSComposition,
+        CDSCondition,
+        CDSDefineAbstract,
+        CDSDefineView,
+        CDSElement,
+        CDSFunction,
+        CDSGroupBy,
+        CDSJoin,
+        CDSName,
+        CDSParameters,
+        CDSRelation,
+        CDSSelect,
+        CDSSource,
+        CDSString,
+        CDSType,
+        CDSWhere,
+        CDSWithParameters
+    }
+}
+export { ExpressionsCDS }
+
 declare class ExtensionIndex extends AbstractObject {
     getType(): string;
     getAllowedNaming(): {
@@ -3932,8 +4080,11 @@ declare class ParenRightW extends Token {
 
 declare type ParsedDataDefinition = {
     sqlViewName: string | undefined;
+    definitionName: string | undefined;
     fields: {
+        key: boolean;
         name: string;
+        annotations: string[];
     }[];
     sources: {
         name: 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

@@ -155,10 +155,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 +162,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 || ddls.getDefinitionName() === upper) {
                 return { type: ddls.parseType(this.reg), object: obj };
             }
         }
@@ -220,14 +216,10 @@ 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 || ddls.getDefinitionName() === upper) {
                 return { type: ddls.parseType(this.reg), object: ddls };
             }
         }
@@ -245,14 +237,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 || ddls.getDefinitionName() === upper) {
                 return ddls;
             }
         }

package/build/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
+exports.Severity = exports.Visibility = exports.Info = exports.Rename = exports.PrettyPrinter = exports.Position = exports.CurrentScope = exports.ABAPFile = exports.SpaghettiScope = exports.SyntaxLogic = exports.ABAPObject = exports.Tokens = exports.ExpressionsCDS = exports.CDSParser = exports.LanguageServerTypes = exports.DDLParser = exports.applyEditList = exports.applyEditSingle = exports.SpaghettiScopeNode = exports.AbstractFile = exports.Token = exports.ScopeType = exports.BasicTypes = exports.TypedIdentifier = exports.AbstractType = exports.VirtualPosition = exports.Comment = exports.Unknown = exports.Empty = exports.Identifier = exports.Nodes = exports.Types = exports.Expressions = exports.Statements = exports.Structures = exports.Objects = exports.ArtifactsRules = exports.ArtifactsObjects = exports.ArtifactsABAP = exports.BuiltIn = exports.MethodLengthStats = exports.LanguageServer = exports.Registry = exports.ReferenceType = exports.Version = exports.Config = exports.Issue = exports.MemoryFile = void 0;
 const issue_1 = require("./issue");
 Object.defineProperty(exports, "Issue", { enumerable: true, get: function () { return issue_1.Issue; } });
 const config_1 = require("./config");
@@ -44,6 +44,8 @@ const Statements = require("./abap/2_statements/statements");
 exports.Statements = Statements;
 const Expressions = require("./abap/2_statements/expressions");
 exports.Expressions = Expressions;
+const ExpressionsCDS = require("./cds/expressions");
+exports.ExpressionsCDS = ExpressionsCDS;
 const Structures = require("./abap/3_structures/structures");
 exports.Structures = Structures;
 const Nodes = require("./abap/nodes");

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;
@@ -33,6 +38,9 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
         this.parse();
         return new cds_determine_types_1.CDSDetermineTypes().parseType(reg, this.parsedData);
     }
+    getParsedData() {
+        return this.parsedData;
+    }
     listSources() {
         var _a;
         this.parse();
@@ -50,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: [],
@@ -65,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);
         }
@@ -97,7 +108,15 @@ class DataDefinition extends _abstract_object_1.AbstractObject {
             if ((_b = this.parsedData) === null || _b === void 0 ? void 0 : _b.associations.some(a => { var _a; return a.name.toUpperCase() === name.toUpperCase() || ((_a = a.as) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === name.toUpperCase(); })) {
                 continue;
             }
-            this.parsedData.fields.push({ name: name });
+            const annotations = [];
+            for (const a of e.findDirectExpressions(expressions_1.CDSAnnotation)) {
+                annotations.push(a.concatTokens());
+            }
+            this.parsedData.fields.push({
+                name: name,
+                annotations: annotations,
+                key: e.findDirectTokenByText("KEY") !== undefined,
+            });
         }
     }
     findSourcesAndRelations(tree) {

package/build/src/registry.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.83.8",
+    "version": "2.83.12",
     "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",