@abaplint/runtime 2.5.62 → 2.5.64

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

@@ -1,4 +1,4 @@
-import { FieldSymbol, Table } from "../types";
+import { FieldSymbol, HashedTable, Table } from "../types";
 import { INumeric } from "../types/_numeric";
 export interface IDeleteInternalOptions {
     where?: (i: any) => boolean;
@@ -9,4 +9,4 @@ export interface IDeleteInternalOptions {
     from?: any;
     to?: any;
 }
-export declare function deleteInternal(target: Table | FieldSymbol, options?: IDeleteInternalOptions): Promise<void>;
+export declare function deleteInternal(target: Table | HashedTable | FieldSymbol, options?: IDeleteInternalOptions): Promise<void>;

package/build/src/statements/delete_internal.js

@@ -17,7 +17,7 @@ async function deleteInternal(target, options) {
     if (target instanceof types_1.FieldSymbol) {
         target = target.getPointer();
         if (target === undefined) {
-            throw "FS not assigned";
+            throw new Error("deleteInternal, FS not assigned");
         }
     }
     if ((options === null || options === void 0 ? void 0 : options.index)
@@ -84,7 +84,12 @@ async function deleteInternal(target, options) {
                 if (options === null || options === void 0 ? void 0 : options.where) {
                     const row = i instanceof types_1.Structure ? i.get() : { table_line: i };
                     if (options.where(row) === true) {
-                        target.deleteIndex(index);
+                        if (target instanceof types_1.HashedTable) {
+                            target.deleteFrom(i);
+                        }
+                        else {
+                            target.deleteIndex(index);
+                        }
                     }
                 }
                 else if ((options === null || options === void 0 ? void 0 : options.index) && options.index.get() === index) {

package/build/src/statements/describe.js

@@ -82,8 +82,8 @@ function describe(input) {
     }
     if (input.table) {
         // @ts-ignore
-        abap.builtin.sy.get().tfill.set(input.table.array().length);
-        (_a = input.lines) === null || _a === void 0 ? void 0 : _a.set(input.table.array().length);
+        abap.builtin.sy.get().tfill.set(input.table.getArrayLength());
+        (_a = input.lines) === null || _a === void 0 ? void 0 : _a.set(input.table.getArrayLength());
     }
 }
 exports.describe = describe;

package/build/src/statements/insert_internal.js

@@ -96,7 +96,7 @@ function insertInternal(options) {
         }
     }
     else if (options.initial === true) {
-        let index = options.table.array().length;
+        let index = options.table.getArrayLength();
         if (options.index) {
             index = options.index.get() - 1;
         }
@@ -122,7 +122,7 @@ function insertInternal(options) {
     }
     else if (data) {
         // todo, for now it just appends, this is not correct, but currently the table type is not known
-        const val = options.table.insertIndex(data, options.table.array().length);
+        const val = options.table.insertIndex(data, options.table.getArrayLength());
         if (options.assigning) {
             options.assigning.assign(val);
         }

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

@@ -1,4 +1,4 @@
-import { FieldSymbol, Integer, Table } from "../types";
+import { FieldSymbol, HashedTable, Integer, Table } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
 type topType = {
@@ -11,5 +11,5 @@ export interface ILoopOptions {
     to?: Integer;
     topEquals?: topType;
 }
-export declare function loop(table: Table | FieldSymbol | undefined, options?: ILoopOptions): AsyncGenerator<any, void, unknown>;
+export declare function loop(table: Table | HashedTable | FieldSymbol | undefined, options?: ILoopOptions): AsyncGenerator<any, void, unknown>;
 export {};

package/build/src/statements/loop.js

@@ -78,35 +78,35 @@ function loop(table, options) {
         else {
             array = table.array();
         }
-        const loopIndex = table.startLoop(loopFrom);
+        const loopController = table.startLoop(loopFrom, loopTo, array);
         let entered = false;
         try {
             const isStructured = array[0] instanceof types_1.Structure;
-            while (loopIndex.index < loopTo) {
-                if (loopIndex.index > array.length) {
+            while (loopController.index < loopController.loopTo) {
+                if (loopController.index > array.length) {
                     break;
                 }
-                const current = array[loopIndex.index];
+                const current = array[loopController.index];
                 if (options === null || options === void 0 ? void 0 : options.where) {
                     const row = isStructured ? current.get() : { table_line: current };
                     if ((yield __await(options.where(row))) === false) {
-                        loopIndex.index++;
+                        loopController.index++;
                         continue;
                     }
                 }
                 // @ts-ignore
-                abap.builtin.sy.get().tabix.set(loopIndex.index + 1);
+                abap.builtin.sy.get().tabix.set(loopController.index + 1);
                 entered = true;
                 yield yield __await(current);
-                loopIndex.index++;
+                loopController.index++;
                 if ((options === null || options === void 0 ? void 0 : options.to) === undefined && (options === null || options === void 0 ? void 0 : options.usingKey) === undefined) {
                     // extra rows might have been inserted inside the loop
-                    loopTo = array.length;
+                    loopController.loopTo = array.length;
                 }
             }
         }
         finally {
-            table.unregisterLoop(loopIndex);
+            table.unregisterLoop(loopController);
             // @ts-ignore
             abap.builtin.sy.get().subrc.set(entered ? 0 : 4);
         }

package/build/src/statements/sort.js

@@ -51,6 +51,9 @@ function sort(input, options) {
         sort(pnt, options);
         return;
     }
+    if (input instanceof types_1.HashedTable) {
+        throw new Error("Sort hashed table, ugh?");
+    }
     if (options === null || options === void 0 ? void 0 : options.by) {
         if (options.by.length === 0) {
             throw "SortByLengthZero";

package/build/src/types/character.js

@@ -5,8 +5,6 @@ const _parse_1 = require("../operators/_parse");
 const throw_error_1 = require("../throw_error");
 const field_symbol_1 = require("./field_symbol");
 const structure_1 = require("./structure");
-// eslint-disable-next-line prefer-const
-let featureFixLength = true;
 class Character {
     constructor(length, extra) {
         this.constant = false;
@@ -48,7 +46,7 @@ class Character {
         if (this.value.length > this.length) {
             this.value = this.value.substr(0, this.length);
         }
-        else if (featureFixLength && this.value.length < this.length) {
+        else if (this.value.length < this.length) {
             this.value.padEnd(this.length, " ");
         }
         return this;
@@ -69,12 +67,7 @@ class Character {
         return this.length;
     }
     clear() {
-        if (featureFixLength) {
-            this.value = " ".repeat(this.length);
-        }
-        else {
-            this.value = "";
-        }
+        this.value = " ".repeat(this.length);
     }
     get() {
         return this.value;

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

@@ -9,9 +9,11 @@ export declare enum TableAccessType {
     index = "INDEX",
     any = "ANY"
 }
-export declare class LoopIndex {
+export declare class LoopController {
     index: number;
-    constructor(start: number);
+    loopTo: number;
+    array: any[];
+    constructor(from: number, loopTo: number, array: any[]);
 }
 export type ITableKey = {
     name: string;
@@ -34,6 +36,7 @@ interface ITable {
     set(tab: Table | HashedTable | TableRowType): ITable;
     getHeader(): TableRowType;
 }
+export declare let featureHashedTables: boolean;
 export declare class TableFactory {
     static construct(rowType: TableRowType, options?: ITableOptions, qualifiedName?: string): Table | HashedTable;
 }
@@ -52,6 +55,8 @@ export declare class HashedTable implements ITable {
     getKeyByName(name: string): ITableKey | undefined;
     getSecondaryIndex(name: string): any[];
     buildHashFromData(data: TableRowType): string;
+    deleteIndex(_index: number): void;
+    deleteFrom(row: TableRowType): void;
     buildHashFromSimple(data: {
         [key: string]: any;
     }): string;
@@ -60,9 +65,9 @@ export declare class HashedTable implements ITable {
         value: TableRowType | undefined;
         subrc: number;
     };
-    array(): readonly any[];
-    startLoop(start?: number): LoopIndex;
-    unregisterLoop(loop: LoopIndex): void;
+    array(): any[];
+    startLoop(from: number, to: number, array: any[]): LoopController;
+    unregisterLoop(loop: LoopController): void;
     insertIndex(_item: TableRowType, _index: number): void;
     append(_item: TableRowType): void;
     getQualifiedName(): string | undefined;
@@ -88,10 +93,10 @@ export declare class Table implements ITable {
     getSecondaryIndex(name: string): TableRowType[];
     getQualifiedName(): string | undefined;
     getOptions(): ITableOptions;
-    startLoop(start?: number): LoopIndex;
-    unregisterLoop(loop: LoopIndex): void;
+    startLoop(from: number, to: number, array: any[]): LoopController;
+    unregisterLoop(loop: LoopController): void;
     getRowType(): TableRowType;
-    array(): readonly any[];
+    array(): any[];
     clear(): void;
     set(tab: Table | TableRowType): this;
     getHeader(): TableRowType;

package/build/src/types/table.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Table = exports.HashedTable = exports.SortedTable = exports.TableFactory = exports.LoopIndex = exports.TableAccessType = void 0;
+exports.Table = exports.HashedTable = exports.SortedTable = exports.TableFactory = exports.featureHashedTables = exports.LoopController = exports.TableAccessType = void 0;
 const integer_1 = require("./integer");
 const string_1 = require("./string");
 const clone_1 = require("../clone");
@@ -17,14 +17,16 @@ var TableAccessType;
     TableAccessType["index"] = "INDEX";
     TableAccessType["any"] = "ANY";
 })(TableAccessType = exports.TableAccessType || (exports.TableAccessType = {}));
-class LoopIndex {
-    constructor(start) {
-        this.index = start;
+class LoopController {
+    constructor(from, loopTo, array) {
+        this.index = from;
+        this.loopTo = loopTo;
+        this.array = array;
     }
 }
-exports.LoopIndex = LoopIndex;
+exports.LoopController = LoopController;
 // eslint-disable-next-line prefer-const
-let featureHashedTables = false;
+exports.featureHashedTables = true;
 class TableFactory {
     static construct(rowType, options, qualifiedName) {
         var _a;
@@ -39,7 +41,7 @@ class TableFactory {
                 withHeader: false,
             };
         }
-        if (featureHashedTables === true && ((_a = options.primaryKey) === null || _a === void 0 ? void 0 : _a.type) === TableAccessType.hashed) {
+        if (exports.featureHashedTables === true && ((_a = options.primaryKey) === null || _a === void 0 ? void 0 : _a.type) === TableAccessType.hashed) {
             return new HashedTable(rowType, options, qualifiedName);
         }
         else {
@@ -99,15 +101,36 @@ class HashedTable {
             }
             else {
                 // @ts-ignore
-                hash += k + ":" + data.get()[k.toLowerCase()].get() + "|";
+                let val = data.get()[k.toLowerCase()];
+                if (val instanceof structure_1.Structure) {
+                    val = val.getCharacter();
+                }
+                else {
+                    val = val.get();
+                }
+                hash += k + ":" + val + "|";
             }
         }
         return hash;
     }
+    deleteIndex(_index) {
+        throw new Error("HashedTable, deleteIndex");
+    }
+    deleteFrom(row) {
+        const hash = this.buildHashFromData(row);
+        delete this.value[hash];
+    }
     buildHashFromSimple(data) {
         let hash = "";
         for (const k of this.options.primaryKey.keyFields) {
-            hash += k + ":" + data[k.toLowerCase()].get() + "|";
+            let val = data[k.toLowerCase()];
+            if (val instanceof structure_1.Structure) {
+                val = val.getCharacter();
+            }
+            else {
+                val = val.get();
+            }
+            hash += k + ":" + val + "|";
         }
         return hash;
     }
@@ -115,15 +138,15 @@ class HashedTable {
         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 };
         }
         else {
             const val = this.getValue(data);
+            for (const loopController of this.loops.values()) {
+                loopController.array.push(val);
+            }
             this.value[hash] = val;
             return { value: val, subrc: 0 };
         }
@@ -136,8 +159,8 @@ class HashedTable {
         }
         return ret;
     }
-    startLoop(start = 0) {
-        const l = new LoopIndex(start);
+    startLoop(from, to, array) {
+        const l = new LoopController(from, to, array);
         this.loops.add(l);
         return l;
     }
@@ -247,8 +270,8 @@ class Table {
     getOptions() {
         return this.options;
     }
-    startLoop(start = 0) {
-        const l = new LoopIndex(start);
+    startLoop(from, to, array) {
+        const l = new LoopController(from, to, array);
         this.loops.add(l);
         return l;
     }
@@ -305,12 +328,15 @@ class Table {
         if (index === 0) {
             this.value.unshift(val);
         }
+        else if (index === this.value.length) {
+            this.value.push(val);
+        }
         else {
             this.value.splice(index, 0, val);
         }
-        for (const l of this.loops.values()) {
-            if (l.index <= index) {
-                l.index++;
+        for (const loopController of this.loops.values()) {
+            if (index <= loopController.index) {
+                loopController.index++;
             }
         }
         return val;

package/package.json

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