@abaplint/transpiler-cli 2.4.17 → 2.4.18

package/build/bundle.js

@@ -44709,6 +44709,7 @@ const _abstract_object_1 = __webpack_require__(/*! ./_abstract_object */ "./node
 const Types = __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");
 const basic_1 = __webpack_require__(/*! ../abap/types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const xml_utils_1 = __webpack_require__(/*! ../xml_utils */ "./node_modules/@abaplint/core/build/src/xml_utils.js");
 class TableType extends _abstract_object_1.AbstractObject {
     constructor() {
         super(...arguments);
@@ -44731,44 +44732,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 });
             }
@@ -44779,7 +44814,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 {
@@ -44790,20 +44825,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;
@@ -45859,7 +45913,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.15";
+        return "2.95.16";
     }
     getDDICReferences() {
         return this.references;
@@ -67054,6 +67108,14 @@ class ComponentCompareTranspiler {
         else if (concat.endsWith("IS INITIAL")) {
             return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component});}`);
         }
+        if (concat.startsWith(component.toUpperCase() + " IN ")) {
+            const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Source)).getCode();
+            return new chunk_1.Chunk(`(I) => {return ${pre}abap.compare.in(I.${component}, ${source});}`);
+        }
+        else if (concat.startsWith(component.toUpperCase() + " NOT IN ")) {
+            const source = traversal.traverse(node.findDirectExpression(core_1.Expressions.Source)).getCode();
+            return new chunk_1.Chunk(`(I) => {return !abap.compare.in(I.${component}, ${source});}`);
+        }
         if ((concat.startsWith("NOT") && concat.endsWith("IS BOUND"))
             || concat.endsWith("IS NOT BOUND")) {
             return new chunk_1.Chunk(`(I) => {return abap.compare.initial(I.${component});}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.4.17",
+  "version": "2.4.18",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.4.17",
+    "@abaplint/transpiler": "^2.4.18",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.15",
+    "@abaplint/core": "^2.95.16",
     "progress": "^2.0.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",