@abaplint/core 2.93.86 → 2.93.88

package/build/abaplint.d.ts

@@ -359,6 +359,7 @@ declare namespace BasicTypes {
         IStructureComponent,
         StructureType,
         TableAccessType,
+        ITableKey,
         ITableOptions,
         TableType_2 as TableType,
         TimeType,
@@ -670,6 +671,10 @@ declare class CDSGroupBy extends Expression {
     getRunnable(): IStatementRunnable;
 }
 
+declare class CDSInteger extends Expression {
+    getRunnable(): IStatementRunnable;
+}
+
 declare class CDSJoin extends Expression {
     getRunnable(): IStatementRunnable;
 }
@@ -2095,6 +2100,7 @@ declare namespace ExpressionsCDS {
         CDSElement,
         CDSFunction,
         CDSGroupBy,
+        CDSInteger,
         CDSJoin,
         CDSName,
         CDSParametersSelect,
@@ -3551,11 +3557,17 @@ declare interface ISyntaxSettings {
     globalMacros?: string[];
 }
 
-declare type ITableOptions = {
+declare type ITableKey = {
+    name: string;
     type?: TableAccessType;
-    keyFields?: string[];
-    isUnique?: boolean;
+    keyFields: string[];
+    isUnique: boolean;
+};
+
+declare type ITableOptions = {
     withHeader: boolean;
+    primaryKey?: ITableKey;
+    secondary?: ITableKey[];
 };
 
 declare interface ITextDocumentPositionParams {

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

@@ -262,34 +262,55 @@ class BasicTypes {
         return undefined;
     }
     parseTable(node, name) {
-        var _a, _b;
+        var _a, _b, _c;
         const typename = node.findFirstExpression(Expressions.TypeName);
         const text = (_a = node.findFirstExpression(Expressions.TypeTable)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (text === undefined) {
             return undefined;
         }
         let type = undefined;
-        if (text.includes(" STANDARD TABLE ")) {
+        if (text.startsWith("TYPE STANDARD TABLE ") || text.startsWith("LIKE STANDARD TABLE ")) {
             type = basic_1.TableAccessType.standard;
         }
-        else if (text.includes(" SORTED TABLE ")) {
+        else if (text.startsWith("TYPE SORTED TABLE ") || text.startsWith("LIKE SORTED TABLE ")) {
             type = basic_1.TableAccessType.sorted;
         }
-        else if (text.includes(" HASHED TABLE ")) {
+        else if (text.startsWith("TYPE HASHED TABLE ") || text.startsWith("LIKE HASHED TABLE ")) {
             type = basic_1.TableAccessType.hashed;
         }
-        const keyFields = [];
-        if (type) {
-            const keys = node.findFirstExpression(expressions_1.TypeTableKey);
-            for (const k of (keys === null || keys === void 0 ? void 0 : keys.findDirectExpressions(expressions_1.FieldSub)) || []) {
-                keyFields.push(k.concatTokens().toUpperCase());
-            }
+        const typeTableKeys = node.findAllExpressions(expressions_1.TypeTableKey);
+        const firstKey = typeTableKeys[0];
+        const primaryKey = {
+            name: "primary_key",
+            type: type,
+            isUnique: (firstKey === null || firstKey === void 0 ? void 0 : firstKey.concatTokens().toUpperCase().includes("WITH UNIQUE ")) === true,
+            keyFields: [],
+        };
+        for (const k of (firstKey === null || firstKey === void 0 ? void 0 : firstKey.findDirectExpressions(expressions_1.FieldSub)) || []) {
+            primaryKey.keyFields.push(k.concatTokens().toUpperCase());
+        }
+        const secondaryKeys = [];
+        for (let i = 1; i < typeTableKeys.length; i++) {
+            const row = typeTableKeys[i];
+            const name = (_b = row.findDirectExpression(expressions_1.Field)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+            if (name === undefined) {
+                continue;
+            }
+            const secondary = {
+                name: name,
+                type: row.findDirectTokenByText("SORTED") ? basic_1.TableAccessType.sorted : basic_1.TableAccessType.hashed,
+                isUnique: (row === null || row === void 0 ? void 0 : row.concatTokens().toUpperCase().includes("WITH UNIQUE ")) === true,
+                keyFields: [],
+            };
+            for (const k of (row === null || row === void 0 ? void 0 : row.findDirectExpressions(expressions_1.FieldSub)) || []) {
+                secondary.keyFields.push(k.concatTokens().toUpperCase());
+            }
+            secondaryKeys.push(secondary);
         }
         const options = {
             withHeader: text.includes(" WITH HEADER LINE"),
-            type: type,
-            isUnique: text.includes(" WITH UNIQUE"),
-            keyFields: keyFields,
+            primaryKey: primaryKey,
+            secondary: secondaryKeys,
         };
         let found = undefined;
         if (text.startsWith("TYPE TABLE OF REF TO ")
@@ -357,7 +378,7 @@ class BasicTypes {
         else if (typename && (text.startsWith("TYPE TABLE FOR CREATE ")
             || text.startsWith("TYPE TABLE FOR UPDATE "))) {
             const name = typename.concatTokens();
-            const type = (_b = this.scope.getDDIC().lookupDDLS(name)) === null || _b === void 0 ? void 0 : _b.type;
+            const type = (_c = this.scope.getDDIC().lookupDDLS(name)) === null || _c === void 0 ? void 0 : _c.type;
             if (type) {
                 return new Types.TableType(new basic_1.VoidType("RapTodo"), options);
             }

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

@@ -23,13 +23,14 @@ class TableType extends _abstract_type_1.AbstractType {
         return this.options.withHeader;
     }
     getAccessType() {
-        return this.options.type;
+        var _a;
+        return (_a = this.options.primaryKey) === null || _a === void 0 ? void 0 : _a.type;
     }
     getRowType() {
         return this.rowType;
     }
     toABAP() {
-        // this is used for downport, so use default key for now
+        // todo, this is used for downport, so use default key for now
         return "STANDARD TABLE OF " + this.rowType.toABAP() + " WITH DEFAULT KEY";
     }
     toText(level) {

package/build/src/cds/expressions/cds_arithmetics.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSArithmetics = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_integer_1 = require("./cds_integer");
 class CDSArithmetics extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", _1.CDSName)));
-        const val = (0, combi_1.alt)((0, combi_1.regex)(/^\d+$/), name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
+        const val = (0, combi_1.alt)(cds_integer_1.CDSInteger, name, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString);
         const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
         return (0, combi_1.seq)(val, operator, val);
     }

package/build/src/cds/expressions/cds_condition.js

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDSCondition = void 0;
 const _1 = require(".");
 const combi_1 = require("../../abap/2_statements/combi");
+const cds_integer_1 = require("./cds_integer");
 class CDSCondition extends combi_1.Expression {
     getRunnable() {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)((0, combi_1.seq)(".", (0, combi_1.alt)(_1.CDSName, _1.CDSString))));
-        const eq = (0, combi_1.seq)(name, (0, combi_1.alt)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), "<", ">", (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "LIKE", "NOT LIKE"), (0, combi_1.alt)(name, _1.CDSFunction, _1.CDSString));
-        const isInitial = (0, combi_1.seq)(name, "IS INITIAL");
-        const isNotInitial = (0, combi_1.seq)(name, "IS NOT INITIAL");
-        const isNull = (0, combi_1.seq)(name, "IS NULL");
-        const isNotNull = (0, combi_1.seq)(name, "IS NOT NULL");
-        const condition = (0, combi_1.alt)(eq, isNull, isNotNull, isInitial, isNotInitial);
+        const left = (0, combi_1.alt)(name, _1.CDSFunction);
+        const compare = (0, combi_1.seq)(left, (0, combi_1.alt)("=", (0, combi_1.seq)("!", "="), (0, combi_1.seq)("<", ">"), "<", ">", (0, combi_1.seq)(">", "="), (0, combi_1.seq)("<", "="), "LIKE", "NOT LIKE"), (0, combi_1.alt)(left, cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSString));
+        const is = (0, combi_1.seq)(left, "IS", (0, combi_1.optPrio)("NOT"), (0, combi_1.altPrio)("INITIAL", "NULL"));
+        const condition = (0, combi_1.alt)(compare, is);
         const paren = (0, combi_1.seq)("(", CDSCondition, ")");
         return (0, combi_1.seq)((0, combi_1.alt)(condition, paren), (0, combi_1.star)((0, combi_1.seq)((0, combi_1.alt)("AND", "OR"), (0, combi_1.alt)(condition, paren))));
     }

package/build/src/cds/expressions/cds_element.js

@@ -7,7 +7,7 @@ const cds_as_1 = require("./cds_as");
 const cds_cast_1 = require("./cds_cast");
 class CDSElement extends combi_1.Expression {
     getRunnable() {
-        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(cds_cast_1.CDSCast, _1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
+        return (0, combi_1.seq)((0, combi_1.starPrio)(_1.CDSAnnotation), (0, combi_1.optPrio)("KEY"), (0, combi_1.altPrio)(_1.CDSAggregate, _1.CDSString, _1.CDSFunction, _1.CDSArithmetics, cds_cast_1.CDSCast, _1.CDSCase, (0, combi_1.seq)(_1.CDSName, (0, combi_1.opt)(_1.CDSParameters), (0, combi_1.star)((0, combi_1.seq)(".", _1.CDSName, (0, combi_1.opt)(_1.CDSParameters)))), (0, combi_1.regex)(/^\d+$/)), (0, combi_1.opt)(cds_as_1.CDSAs));
     }
 }
 exports.CDSElement = CDSElement;

package/build/src/cds/expressions/cds_integer.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CDSInteger = void 0;
+const combi_1 = require("../../abap/2_statements/combi");
+class CDSInteger extends combi_1.Expression {
+    getRunnable() {
+        return (0, combi_1.regex)(/^\d+$/);
+    }
+}
+exports.CDSInteger = CDSInteger;
+//# sourceMappingURL=cds_integer.js.map

package/build/src/cds/expressions/index.js

@@ -35,6 +35,7 @@ __exportStar(require("./cds_define_view"), exports);
 __exportStar(require("./cds_element"), exports);
 __exportStar(require("./cds_function"), exports);
 __exportStar(require("./cds_group_by"), exports);
+__exportStar(require("./cds_integer"), exports);
 __exportStar(require("./cds_join"), exports);
 __exportStar(require("./cds_name"), exports);
 __exportStar(require("./cds_parameters_select"), exports);

package/build/src/registry.js

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

package/package.json

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