@abaplint/runtime 2.5.59 → 2.5.60

package/build/src/compare/eq.d.ts

@@ -1,4 +1,4 @@
-import { ABAPObject, FieldSymbol, Float, Hex, Structure, Table } from "../types";
+import { ABAPObject, FieldSymbol, Float, HashedTable, Hex, Structure, Table } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function eq(left: number | string | ICharacter | INumeric | Float | ABAPObject | Structure | Hex | Table | FieldSymbol, right: number | string | ICharacter | INumeric | Float | ABAPObject | Structure | Hex | Table | FieldSymbol): boolean;
+export declare function eq(left: number | string | ICharacter | INumeric | Float | ABAPObject | Structure | Hex | HashedTable | Table | FieldSymbol, right: number | string | ICharacter | INumeric | Float | ABAPObject | Structure | Hex | HashedTable | Table | FieldSymbol): boolean;

package/build/src/compare/eq.js

@@ -27,8 +27,9 @@ function eq(left, right) {
     else if (left instanceof types_1.FieldSymbol) {
         return eq(left.getPointer(), right);
     }
-    if (left instanceof types_1.Table || right instanceof types_1.Table) {
-        if (left instanceof types_1.Table && right instanceof types_1.Table) {
+    if (left instanceof types_1.Table || right instanceof types_1.Table || left instanceof types_1.HashedTable || right instanceof types_1.HashedTable) {
+        if ((left instanceof types_1.Table || left instanceof types_1.HashedTable)
+            && (right instanceof types_1.Table || right instanceof types_1.HashedTable)) {
             return compareTables(left, right);
         }
         else {

package/build/src/compare/initial.js

@@ -4,7 +4,7 @@ exports.initial = void 0;
 const types_1 = require("../types");
 function initial(val) {
     // todo, refactor? add as method in each type instead?
-    if (val instanceof types_1.Table) {
+    if (val instanceof types_1.Table || val instanceof types_1.HashedTable) {
         return val.array().length === 0;
     }
     else if (val instanceof types_1.DataReference) {

package/build/src/statements/describe.js

@@ -10,7 +10,7 @@ function describe(input) {
             describe({ field: input.field.getPointer(), type: input.type, length: input.length, mode: input.mode });
             return;
         }
-        if (input.field instanceof types_1.Table) {
+        if (input.field instanceof types_1.Table || input.field instanceof types_1.HashedTable) {
             input.type.set("h");
         }
         else if (input.field instanceof types_1.Character || typeof input.field === "string") {

package/build/src/statements/insert_internal.js

@@ -78,9 +78,21 @@ function insertInternal(options) {
             options.assigning.assign(val);
         }
     }
-    else if (options.lines && options.data instanceof types_1.Table) {
-        for (const i of options.data.array()) {
-            options.table.append(i);
+    else if (options.lines
+        && (options.data instanceof types_1.Table
+            || options.data instanceof types_1.HashedTable)) {
+        if (options.table instanceof types_1.HashedTable) {
+            for (const source of options.data.array()) {
+                const result = options.table.insert(source);
+                if (result.subrc !== 0) {
+                    throw new Error("ITAB_DUPLICATE_KEY");
+                }
+            }
+        }
+        else {
+            for (const i of options.data.array()) {
+                options.table.append(i);
+            }
         }
     }
     else if (options.initial === true) {

package/build/src/statements/read_table.d.ts

@@ -1,4 +1,4 @@
-import { DataReference, FieldSymbol, Structure, Table } from "../types";
+import { DataReference, FieldSymbol, HashedTable, Structure, Table } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
 export interface IReadTableOptions {
@@ -24,4 +24,4 @@ export type ReadTableReturn = {
     subrc: number;
     foundIndex: number;
 };
-export declare function readTable(table: Table | FieldSymbol, options?: IReadTableOptions): ReadTableReturn;
+export declare function readTable(table: Table | HashedTable | FieldSymbol, options?: IReadTableOptions): ReadTableReturn;

package/build/src/statements/read_table.js

@@ -29,10 +29,31 @@ function searchWithKey(arr, withKey, startIndex = 0, usesTableLine) {
 }
 /////////////////
 function readTable(table, options) {
-    var _a, _b;
+    var _a, _b, _c;
     let found = undefined;
     let foundIndex = 0;
+    if (table instanceof types_1.FieldSymbol) {
+        if (table.getPointer() === undefined) {
+            throw new Error("GETWA_NOT_ASSIGNED");
+        }
+        return readTable(table.getPointer(), options);
+    }
+    // check if it is a primary index read specified with WITH KEY instead of WITH TABLE KEY
+    if ((options === null || options === void 0 ? void 0 : options.withTableKey) === undefined
+        && (options === null || options === void 0 ? void 0 : options.withKeySimple)
+        && (((_a = table.getOptions().primaryKey) === null || _a === void 0 ? void 0 : _a.keyFields) || []).length > 0) {
+        const fields = new Set(table.getOptions().primaryKey.keyFields);
+        for (const name in options.withKeySimple) {
+            fields.delete(name.toUpperCase());
+        }
+        if (fields.size === 0) {
+            options.withTableKey = true;
+        }
+    }
     if (options === null || options === void 0 ? void 0 : options.index) {
+        if (table instanceof types_1.HashedTable) {
+            throw new Error("Hashed table, READ INDEX not possible");
+        }
         const arr = table.array();
         let index = options.index;
         if (typeof index !== "number") {
@@ -54,6 +75,17 @@ function readTable(table, options) {
             foundIndex = index;
         }
     }
+    else if (table instanceof types_1.HashedTable && (options === null || options === void 0 ? void 0 : options.withTableKey) === true && options.withKeySimple) {
+        const hash = table.buildHashFromSimple(options.withKeySimple);
+        found = table.read(hash);
+        foundIndex = 0;
+    }
+    else if (table instanceof types_1.HashedTable && (options === null || options === void 0 ? void 0 : options.withKey)) {
+        // this is slow..
+        const searchResult = searchWithKey(table.array(), options.withKey, 0, options === null || options === void 0 ? void 0 : options.usesTableLine);
+        found = searchResult.found;
+        foundIndex = 0;
+    }
     else if (((options === null || options === void 0 ? void 0 : options.binarySearch) === true || (options === null || options === void 0 ? void 0 : options.withTableKey) === true)
         && options.withKeyValue
         && options.withKey) {
@@ -75,12 +107,12 @@ function readTable(table, options) {
         if (options.from instanceof types_1.FieldSymbol) {
             options.from = options.from.getPointer();
         }
-        if (table instanceof types_1.FieldSymbol) {
-            table = table.getPointer();
+        if (table instanceof types_1.HashedTable) {
+            throw new Error("runtime, todo readTable Hashed FROM");
         }
         if (table instanceof types_1.Table && options.from instanceof types_1.Structure) {
             const arr = table.array();
-            const keys = (_b = (_a = table.getOptions()) === null || _a === void 0 ? void 0 : _a.primaryKey) === null || _b === void 0 ? void 0 : _b.keyFields;
+            const keys = (_c = (_b = table.getOptions()) === null || _b === void 0 ? void 0 : _b.primaryKey) === null || _c === void 0 ? void 0 : _c.keyFields;
             const isStructured = arr[0] instanceof types_1.Structure;
             if (keys !== undefined && isStructured === true) {
                 //        console.dir(keys);

package/build/src/types/table.d.ts

@@ -51,6 +51,11 @@ export declare class HashedTable implements ITable {
     getLength(): number;
     getKeyByName(name: string): ITableKey | undefined;
     getSecondaryIndex(name: string): any[];
+    buildHashFromData(data: TableRowType): string;
+    buildHashFromSimple(data: {
+        [key: string]: any;
+    }): string;
+    read(hash: string): TableRowType | undefined;
     insert(data: TableRowType): {
         value: TableRowType | undefined;
         subrc: number;

package/build/src/types/table.js

@@ -85,26 +85,40 @@ class HashedTable {
         this.secondaryIndexes[name.toUpperCase()] = copy;
         return copy;
     }
-    insert(data) {
-        if (this.loops.size !== 0) {
-            throw new Error("Hash table insert inside LOOP");
-        }
+    buildHashFromData(data) {
         let hash = "";
         for (const k of this.options.primaryKey.keyFields) {
             if (k === "TABLE_LINE") {
                 if (data instanceof structure_1.Structure) {
-                    hash += k + ":" + data.getCharacter();
+                    hash += k + ":" + data.getCharacter() + "|";
                 }
                 else {
                     // @ts-ignore
-                    hash += k + ":" + data.get();
+                    hash += k + ":" + data.get() + "|";
                 }
             }
             else {
                 // @ts-ignore
-                hash += k + ":" + data.get()[k.toLowerCase()].get();
+                hash += k + ":" + data.get()[k.toLowerCase()].get() + "|";
             }
         }
+        return hash;
+    }
+    buildHashFromSimple(data) {
+        let hash = "";
+        for (const k of this.options.primaryKey.keyFields) {
+            hash += k + ":" + data[k.toLowerCase()].get() + "|";
+        }
+        return hash;
+    }
+    read(hash) {
+        return this.value[hash];
+    }
+    insert(data) {
+        if (this.loops.size !== 0) {
+            throw new Error("Hash table insert inside LOOP");
+        }
+        const hash = this.buildHashFromData(data);
         if (this.value[hash] !== undefined) {
             return { value: undefined, subrc: 4 };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.5.59",
+  "version": "2.5.60",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",