@abaplint/runtime 2.7.46 → 2.7.48

package/build/src/binary_search.d.ts

@@ -1,5 +1,7 @@
 import { ICharacter } from "./types/_character";
 import { INumeric } from "./types/_numeric";
+/** input indexes = javascript indexes,
+    output index = javascript index */
 export declare function binarySearchFromRow(array: readonly any[], left: number, right: number, keyField: (i: any) => any, keyValue: INumeric | ICharacter, usesTableLine: boolean | undefined): number;
 export declare function binarySearchFrom(array: readonly any[], left: number, right: number, keyField: string, keyValue: INumeric | ICharacter): number;
 export declare function binarySearchTo(array: readonly any[], left: number, right: number, keyField: string, keyValue: INumeric | ICharacter): number;

package/build/src/binary_search.js

@@ -4,10 +4,17 @@ exports.binarySearchTo = exports.binarySearchFrom = exports.binarySearchFromRow
 /* eslint-disable max-len */
 const compare_1 = require("./compare");
 const types_1 = require("./types");
+/** input indexes = javascript indexes,
+    output index = javascript index */
 function binarySearchFromRow(array, left, right, keyField, keyValue, usesTableLine) {
+    if (right <= 0) {
+        return 0;
+    }
+    //  console.dir("start: " + left + ", " + right);
     const isStructured = array[0] instanceof types_1.Structure;
     while (right - left > 1) {
         const middle = Math.floor(((right - left) / 2) + left);
+        //    console.dir(left + ", " + right + ", " + middle);
         const a = array[middle];
         let row = undefined;
         if (usesTableLine === false && isStructured === true) {
@@ -22,6 +29,19 @@ function binarySearchFromRow(array, left, right, keyField, keyValue, usesTableLi
         else {
             left = middle;
         }
+        //    console.dir(left + ", " + right);
+    }
+    const a = array[left];
+    let row = undefined;
+    if (usesTableLine === false && isStructured === true) {
+        row = a.get();
+    }
+    else {
+        row = isStructured ? Object.assign({ table_line: a }, a.get()) : { table_line: a };
+    }
+    if ((0, compare_1.le)(keyValue, keyField(row))) {
+        //    console.dir("choose left");
+        return left;
     }
     return right;
 }

package/build/src/statements/read_table.js

@@ -4,6 +4,7 @@ exports.readTable = void 0;
 const binary_search_1 = require("../binary_search");
 const compare_1 = require("../compare");
 const types_1 = require("../types");
+/** startIndex = javascript index, return ABAP index */
 function searchWithKey(arr, withKey, startIndex = 0, usesTableLine) {
     const isStructured = arr[0] instanceof types_1.Structure;
     for (let index = startIndex; index < arr.length; index++) {
@@ -110,7 +111,7 @@ function readTable(table, options) {
         // note: it currently only uses the first key field for binary search, todo
         const first = options.withKeyValue[0];
         const arr = table.array();
-        const startIndex = (0, binary_search_1.binarySearchFromRow)(arr, 0, arr.length, first.key, first.value, options.usesTableLine) - 1;
+        const startIndex = (0, binary_search_1.binarySearchFromRow)(arr, 0, arr.length - 1, first.key, first.value, options.usesTableLine);
         const searchResult = searchWithKey(arr, options.withKey, startIndex, options.usesTableLine);
         found = searchResult.found;
         foundIndex = searchResult.foundIndex;

package/package.json

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