@abaplint/core 2.95.15 → 2.95.17

package/build/abaplint.d.ts

@@ -5927,6 +5927,7 @@ declare class TableType extends AbstractObject {
     };
     getDescription(): string | undefined;
     setDirty(): void;
+    private buildTableOptions;
     parseType(reg: IRegistry): AbstractType;
     private parseXML;
 }

package/build/src/abap/5_syntax/structures/class_data.js

@@ -10,6 +10,7 @@ const class_data_1 = require("../statements/class_data");
 class ClassData {
     runSyntax(node, scope, filename) {
         const name = node.findFirstExpression(Expressions.NamespaceSimpleName).getFirstToken();
+        const values = {};
         const components = [];
         for (const c of node.getChildren()) {
             const ctyp = c.get();
@@ -17,11 +18,12 @@ class ClassData {
                 const found = new class_data_1.ClassData().runSyntax(c, scope, filename);
                 if (found) {
                     components.push({ name: found.getName(), type: found.getType() });
+                    values[found.getName()] = found.getValue();
                 }
             }
             // todo, nested structures and INCLUDES
         }
-        return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.StructureType(components), ["static" /* IdentifierMeta.Static */]);
+        return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.StructureType(components), ["static" /* IdentifierMeta.Static */], values);
     }
 }
 exports.ClassData = ClassData;

package/build/src/abap/5_syntax/structures/data.js

@@ -14,6 +14,7 @@ class Data {
         var _a;
         const name = node.findFirstExpression(Expressions.DefinitionName).getFirstToken();
         let table = false;
+        const values = {};
         const components = [];
         for (const c of node.getChildren()) {
             const ctyp = c.get();
@@ -21,6 +22,7 @@ class Data {
                 const found = new data_1.Data().runSyntax(c, scope, filename);
                 if (found) {
                     components.push({ name: found.getName(), type: found.getType() });
+                    values[found.getName()] = found.getValue();
                 }
             }
             else if (c instanceof nodes_1.StructureNode && ctyp instanceof Structures.Data) {
@@ -75,7 +77,7 @@ class Data {
             return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.TableType(new Basic.StructureType(components), { withHeader: true }));
         }
         else {
-            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.StructureType(components));
+            return new _typed_identifier_1.TypedIdentifier(name, filename, new Basic.StructureType(components), undefined, values);
         }
     }
 }

package/build/src/objects/table_type.js

@@ -5,6 +5,7 @@ const _abstract_object_1 = require("./_abstract_object");
 const Types = require("../abap/types/basic");
 const ddic_1 = require("../ddic");
 const basic_1 = require("../abap/types/basic");
+const xml_utils_1 = require("../xml_utils");
 class TableType extends _abstract_object_1.AbstractObject {
     constructor() {
         super(...arguments);
@@ -27,44 +28,78 @@ class TableType extends _abstract_object_1.AbstractObject {
         this.parsedXML = undefined;
         super.setDirty();
     }
+    buildTableOptions() {
+        var _a, _b, _c;
+        const tableOptions = {
+            withHeader: false,
+            secondary: [],
+        };
+        for (const k of ((_a = this.parsedXML) === null || _a === void 0 ? void 0 : _a.dd43v) || []) {
+            const fields = [];
+            for (const f of ((_b = this.parsedXML) === null || _b === void 0 ? void 0 : _b.dd42v) || []) {
+                if (f.keyname === k.keyname) {
+                    fields.push(f.keyfield);
+                }
+            }
+            let accessType = basic_1.TableAccessType.standard;
+            switch (k.accessmode) {
+                case "S":
+                    accessType = basic_1.TableAccessType.sorted;
+                    break;
+                case "H":
+                    accessType = basic_1.TableAccessType.hashed;
+                    break;
+                default:
+                    break;
+            }
+            (_c = tableOptions.secondary) === null || _c === void 0 ? void 0 : _c.push({
+                name: k.keyname,
+                type: accessType,
+                keyFields: fields,
+                isUnique: k.unique,
+            });
+        }
+        return tableOptions;
+    }
     parseType(reg) {
         this.parseXML();
         const ddic = new ddic_1.DDIC(reg);
         const references = [];
         let type;
+        const tableOptions = this.buildTableOptions();
         if (this.parsedXML === undefined) {
             type = new Types.UnknownType("Table Type, parser error", this.getName());
         }
         else if (this.parsedXML.rowkind === "S") {
             const lookup = ddic.lookupTableOrView(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "E") {
             const lookup = ddic.lookupDataElement(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "L") {
             const lookup = ddic.lookupTableType(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype === "OBJECT") {
-            type = new Types.TableType(new basic_1.GenericObjectReferenceType(), { withHeader: false }, this.getName());
+            type = new Types.TableType(new basic_1.GenericObjectReferenceType(), tableOptions, this.getName());
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype === "DATA") {
-            type = new Types.TableType(new basic_1.DataReference(new basic_1.AnyType()), { withHeader: false }, this.getName());
+            type = new Types.TableType(new basic_1.DataReference(new basic_1.AnyType()), tableOptions, this.getName());
         }
         else if (this.parsedXML.rowkind === "R" && this.parsedXML.rowtype !== undefined) {
             const lookup = ddic.lookupObject(this.parsedXML.rowtype);
-            type = new Types.TableType(lookup.type, { withHeader: false }, this.getName());
+            type = new Types.TableType(lookup.type, tableOptions, this.getName());
             if (lookup.object) {
                 references.push({ object: lookup.object });
             }
@@ -75,7 +110,7 @@ class TableType extends _abstract_object_1.AbstractObject {
             }
             else {
                 const row = ddic.textToType(this.parsedXML.datatype, this.parsedXML.leng, this.parsedXML.decimals, this.getName());
-                type = new Types.TableType(row, { withHeader: false }, this.getName());
+                type = new Types.TableType(row, tableOptions, this.getName());
             }
         }
         else {
@@ -86,20 +121,39 @@ class TableType extends _abstract_object_1.AbstractObject {
     }
     ////////////////////
     parseXML() {
+        var _a, _b;
         if (this.parsedXML !== undefined) {
             return;
         }
-        this.parsedXML = {};
+        this.parsedXML = {
+            dd42v: [],
+            dd43v: [],
+        };
         const parsed = super.parseRaw2();
         if (parsed === undefined || parsed.abapGit === undefined) {
             return;
         }
-        const dd40v = parsed.abapGit["asx:abap"]["asx:values"].DD40V;
+        const values = parsed.abapGit["asx:abap"]["asx:values"];
+        const dd40v = values.DD40V;
         this.parsedXML.rowtype = dd40v.ROWTYPE ? dd40v.ROWTYPE : "";
         this.parsedXML.rowkind = dd40v.ROWKIND ? dd40v.ROWKIND : "";
         this.parsedXML.datatype = dd40v.DATATYPE;
         this.parsedXML.leng = dd40v.LENG;
         this.parsedXML.decimals = dd40v.DECIMALS;
+        for (const x of (0, xml_utils_1.xmlToArray)((_a = values.DD42V) === null || _a === void 0 ? void 0 : _a.DD42V)) {
+            this.parsedXML.dd42v.push({
+                keyname: x.SECKEYNAME || "",
+                keyfield: x.KEYFIELD || "",
+            });
+        }
+        for (const x of (0, xml_utils_1.xmlToArray)((_b = values.DD43V) === null || _b === void 0 ? void 0 : _b.DD43V)) {
+            this.parsedXML.dd43v.push({
+                keyname: x.SECKEYNAME || "",
+                accessmode: x.ACCESSMODE || "",
+                kind: x.KIND || "",
+                unique: x.SECKEYUNIQUE === "X",
+            });
+        }
     }
 }
 exports.TableType = TableType;

package/build/src/registry.js

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

package/build/src/rules/abapdoc.js

@@ -28,8 +28,10 @@ class Abapdoc extends _abap_rule_1.ABAPRule {
             shortDescription: `Various checks regarding abapdoc.
 Base rule checks for existence of abapdoc for public class methods and all interface methods.
 
-Plus class and interface definitions.`,
-            tags: [_irule_1.RuleTag.SingleFile],
+Plus class and interface definitions.
+
+https://github.com/SAP/styleguides/blob/main/clean-abap/CleanABAP.md#abap-doc-only-for-public-apis`,
+            tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Styleguide],
         };
     }
     getConfig() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.95.15",
+    "version": "2.95.17",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,7 +50,7 @@
         "@microsoft/api-extractor": "^7.34.4",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.13.0",
+        "@types/node": "^18.14.0",
         "chai": "^4.3.7",
         "eslint": "^8.34.0",
         "mocha": "^10.2.0",
@@ -62,6 +62,6 @@
     "dependencies": {
         "fast-xml-parser": "^4.1.2",
         "json5": "^2.2.3",
-        "vscode-languageserver-types": "^3.17.2"
+        "vscode-languageserver-types": "^3.17.3"
     }
 }