@abaplint/transpiler 2.5.57 → 2.5.59

package/build/src/statements/read_table.js

@@ -25,11 +25,14 @@ class ReadTableTranspiler {
         if (keyName && node.findDirectTokenByText("COMPONENTS")) {
             extra.push("keyName: \"" + keyName.concatTokens() + "\"");
         }
-        const withTableKey = node.findTokenSequencePosition("WITH", "TABLE");
         const binary = node.findTokenSequencePosition("BINARY", "SEARCH");
-        if (binary || withTableKey) {
+        if (binary) {
             extra.push("binarySearch: true");
         }
+        const withTableKey = node.findTokenSequencePosition("WITH", "TABLE");
+        if (withTableKey) {
+            extra.push("withTableKey: true");
+        }
         const rt = node.findDirectExpression(abaplint.Expressions.ReadTableTarget);
         const target = rt === null || rt === void 0 ? void 0 : rt.findDirectExpression(abaplint.Expressions.Target);
         const fs = rt === null || rt === void 0 ? void 0 : rt.findDirectExpression(abaplint.Expressions.FSTarget);
@@ -48,9 +51,12 @@ class ReadTableTranspiler {
         }
         const compare = node.findDirectExpression(abaplint.Expressions.ComponentCompareSimple);
         if (compare) {
-            const conds = [];
-            const blah = [];
+            const withKey = [];
+            const withKeyValue = [];
+            const withKeySimple = [];
             const count = compare.getChildren().length / 3;
+            let skipSimple = false;
+            let usesTableLine = false;
             for (let i = 0; i < count; i++) {
                 const left = compare.getChildren()[i * 3];
                 const source = compare.getChildren()[(i * 3) + 2];
@@ -64,23 +70,36 @@ class ReadTableTranspiler {
                 else {
                     field = traversal.traverse(left).getCode();
                 }
+                if (field.includes(".")) {
+                    skipSimple = true;
+                }
+                if (field === "table_line") {
+                    skipSimple = true;
+                    usesTableLine = true;
+                }
                 if (s.includes("await")) {
                     const id = unique_identifier_1.UniqueIdentifier.get();
                     prefix += "const " + id + " = " + s + ";\n";
-                    conds.push("abap.compare.eq(i." + field + ", " + id + ")");
-                    blah.push(`{key: (i) => {return i.${field}}, value: ${id}}`);
+                    withKey.push("abap.compare.eq(i." + field + ", " + id + ")");
+                    withKeyValue.push(`{key: (i) => {return i.${field}}, value: ${id}}`);
+                    withKeySimple.push(`"${field}": ${id}`);
                 }
                 else {
-                    conds.push("abap.compare.eq(i." + field + ", " + s + ")");
-                    blah.push(`{key: (i) => {return i.${field}}, value: ${s}}`);
+                    withKey.push("abap.compare.eq(i." + field + ", " + s + ")");
+                    withKeyValue.push(`{key: (i) => {return i.${field}}, value: ${s}}`);
+                    withKeySimple.push(`"${field}": ${s}`);
                 }
             }
-            extra.push("withKey: (i) => {return " + conds.join(" && ") + ";}");
-            extra.push(`withKeyValue: [${blah.join(",")}]`);
+            extra.push("withKey: (i) => {return " + withKey.join(" && ") + ";}");
+            extra.push(`withKeyValue: [${withKeyValue.join(",")}]`);
+            extra.push(`usesTableLine: ${usesTableLine}`);
+            if (skipSimple !== true) {
+                extra.push(`withKeySimple: {${withKeySimple.join(",")}}`);
+            }
         }
         let concat = "";
         if (extra.length > 0) {
-            concat = ",{" + extra.join(",") + "}";
+            concat = ",{" + extra.join(",\n  ") + "}";
         }
         return new chunk_1.Chunk()
             .append(prefix + "abap.statements.readTable(", node, traversal)

package/build/src/transpile_types.js

@@ -34,6 +34,7 @@ class TranspileTypes {
             if (type.getQualifiedName() !== undefined) {
                 extra += ", \"" + type.getQualifiedName() + "\"";
             }
+            return "abap.types.TableFactory.construct(" + extra + ")";
         }
         else if (type instanceof abaplint.BasicTypes.IntegerType) {
             resolved = "Integer";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.5.57",
+  "version": "2.5.59",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.95.49",
+    "@abaplint/core": "^2.95.50",
     "source-map": "^0.7.4"
   },
   "devDependencies": {