@abaplint/runtime 2.13.96 → 2.13.98

package/build/src/context.d.ts

@@ -14,9 +14,19 @@ export declare class Context {
     RFCDestinations: {
         [name: string]: RFC.RFCClient;
     };
+    updateTask: {
+        register(name: string, param: {
+            exporting?: any;
+            tables?: any;
+        }): Promise<void> | void;
+    } | undefined;
     dataset: DatasetHost | undefined;
     datasets: {
         [name: string]: OpenDataset;
     };
+    runTime: {
+        start: number;
+        last: number;
+    } | undefined;
     defaultDB(): DatabaseClient;
 }

package/build/src/context.js

@@ -8,10 +8,14 @@ class Context {
     // DEFAULT and secondary database connections
     databaseConnections = {};
     RFCDestinations = {};
+    // CALL FUNCTION IN UPDATE TASK hands the copied parameters to the host, if one is set
+    updateTask = undefined;
     // the file system OPEN DATASET and friends read and write; none by default,
     // and then every DATASET statement throws
     dataset = undefined;
     datasets = {};
+    // GET RUN TIME, the clock reading of the first call, and the last value returned
+    runTime = undefined;
     defaultDB() {
         if (this.databaseConnections["DEFAULT"] === undefined) {
             throw new Error("Runtime, database not initialized");

package/build/src/operators/divide.d.ts

@@ -2,3 +2,6 @@ import { Float, Integer, Integer8 } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
 export declare function divide(left: INumeric | ICharacter | Integer8 | string | number, right: INumeric | ICharacter | Integer8 | string | number): Float | Integer8 | Integer;
+/** "/" in calculation type int8, which the transpiler knows from an int8 target: the
+ * operands are int8 and the quotient is rounded half away from zero, 7 / 2 = 4, -7 / 2 = -4 */
+export declare function divideInt8(left: INumeric | ICharacter | Integer8 | string | number, right: INumeric | ICharacter | Integer8 | string | number): Integer8;

package/build/src/operators/divide.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.divide = divide;
+exports.divideInt8 = divideInt8;
 const throw_error_1 = require("../throw_error");
 const types_1 = require("../types");
 const _parse_1 = require("./_parse");
@@ -42,4 +43,22 @@ function isIntegerOperand(val) {
     }
     return val instanceof types_1.Integer8;
 }
+/** "/" in calculation type int8, which the transpiler knows from an int8 target: the
+ * operands are int8 and the quotient is rounded half away from zero, 7 / 2 = 4, -7 / 2 = -4 */
+function divideInt8(left, right) {
+    const l = left instanceof types_1.Integer8 ? left.get() : new types_1.Integer8().set(left).get();
+    const r = right instanceof types_1.Integer8 ? right.get() : new types_1.Integer8().set(right).get();
+    if (r === 0n) {
+        if (l === 0n) {
+            return new types_1.Integer8().set(0n);
+        }
+        (0, throw_error_1.throwError)("CX_SY_ZERODIVIDE");
+    }
+    let q = l / r;
+    const rem = l % r;
+    if ((rem < 0n ? -rem : rem) * 2n >= (r < 0n ? -r : r)) {
+        q = (l < 0n) === (r < 0n) ? q + 1n : q - 1n;
+    }
+    return new types_1.Integer8().set(q);
+}
 //# sourceMappingURL=divide.js.map

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

@@ -1,6 +1,7 @@
 import { Context } from "../context";
 export interface ICallFunctionOptions {
     name: string;
+    updateTask?: boolean;
     destination?: string;
     calling?: (INPUT: any) => any;
     exporting?: any;

package/build/src/statements/call_function.js

@@ -9,7 +9,7 @@ class CallFunction {
     constructor(context) {
         this.context = context;
     }
-    // note: this is only called if DESTINIATION is supplied
+    // called for DESTINATION, CALLING or IN UPDATE TASK
     async callFunction(options) {
         const param = {
             exporting: options.exporting,
@@ -20,7 +20,32 @@ class CallFunction {
         };
         options.name = options.name.trimEnd();
         const fm = abap.FunctionModules[options.name];
-        if (options.destination) {
+        if (options.updateTask) {
+            if (fm === undefined) {
+                (0, throw_error_1.throwError)("CX_SY_DYN_CALL_ILLEGAL_FUNC");
+            }
+            const copy = (values) => {
+                if (values === undefined) {
+                    return undefined;
+                }
+                const result = {};
+                for (const key of Object.keys(values)) {
+                    const value = values[key];
+                    result[key] = value instanceof types_1.FieldSymbol ? value.getPointer().clone() : value.clone();
+                }
+                return result;
+            };
+            // IMPORTING and CHANGING do not apply to update modules.
+            const copied = { exporting: copy(options.exporting), tables: copy(options.tables) };
+            if (this.context.updateTask) {
+                await this.context.updateTask.register(options.name, copied);
+            }
+            else {
+                await fm(copied);
+            }
+            return;
+        }
+        else if (options.destination) {
             if (options.destination.trim() === "") {
                 if (fm === undefined) {
                     (0, throw_error_1.throwError)("CX_SY_DYN_CALL_ILLEGAL_FUNC");

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

@@ -1,2 +1,3 @@
+import { Context } from "../context";
 import { INumeric } from "../types/_numeric";
-export declare function getRunTime(value: INumeric): void;
+export declare function getRunTime(context: Context, value: INumeric): void;

package/build/src/statements/get_run_time.js

@@ -1,16 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRunTime = getRunTime;
-let prev = undefined;
-function getRunTime(value) {
-    if (prev === undefined) {
-        value.set(0);
-        prev = new Date().getTime();
+// milliseconds with a fraction, from a monotonic clock where there is one:
+// performance.now() in Node, Bun and browsers, Date.now() otherwise
+function now() {
+    if (typeof performance === "object" && typeof performance?.now === "function") {
+        return performance.now();
     }
-    else {
-        const now = new Date().getTime();
-        value.set(now - prev);
-        prev = now;
+    return Date.now();
+}
+// GET RUN TIME FIELD: microseconds since the first call in the internal
+// session, which gives 0. The first call is per context, so per ABAP instance
+function getRunTime(context, value) {
+    const t = now();
+    if (context.runTime === undefined) {
+        context.runTime = { start: t, last: 0 };
+    }
+    let micro = Math.floor((t - context.runTime.start) * 1000);
+    // never backwards, also when the clock is Date.now()
+    if (micro < context.runTime.last) {
+        micro = context.runTime.last;
     }
+    context.runTime.last = micro;
+    value.set(micro);
 }
 //# sourceMappingURL=get_run_time.js.map

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

@@ -23,7 +23,6 @@ import { getLocale } from "./get_locale";
 import { unpack } from "./unpack";
 import { getParameter } from "./get_parameter";
 import { setLocale } from "./set_locale";
-import { getRunTime } from "./get_run_time";
 import { getTime } from "./get_time";
 import { IInsertDatabaseOptions } from "./insert_database";
 import { insertInternal } from "./insert_internal";
@@ -73,7 +72,6 @@ export declare class Statements {
     getBit: typeof getBit;
     getLocale: typeof getLocale;
     getParameter: typeof getParameter;
-    getRunTime: typeof getRunTime;
     getTime: typeof getTime;
     insertInternal: typeof insertInternal;
     loop: typeof loop;
@@ -96,6 +94,7 @@ export declare class Statements {
     private readonly context;
     constructor(context: Context);
     _setTrace(min?: number, totals?: boolean): Trace;
+    getRunTime(value: INumeric): void;
     openCursor(target: INumeric, select: string, options: IOpenCursorDatabaseOptions): Promise<void>;
     fetchNextCursor(cursor: INumeric, target: any, packageSize?: INumeric): Promise<void>;
     closeCursor(cursor: INumeric): Promise<void>;

package/build/src/statements/index.js

@@ -76,7 +76,6 @@ class Statements {
     getBit = get_bit_1.getBit;
     getLocale = get_locale_1.getLocale;
     getParameter = get_parameter_1.getParameter;
-    getRunTime = get_run_time_1.getRunTime;
     getTime = get_time_1.getTime;
     insertInternal = insert_internal_1.insertInternal;
     loop = loop_1.loop;
@@ -103,6 +102,9 @@ class Statements {
     _setTrace(min = 10, totals = false) {
         return new trace_1.Trace().setTrace(min, totals, this);
     }
+    getRunTime(value) {
+        (0, get_run_time_1.getRunTime)(this.context, value);
+    }
     async openCursor(target, select, options) {
         const num = await (0, open_cursor_1.openCursor)(this.context, select, options);
         target.set(num);

package/build/src/statements/loop.js

@@ -152,11 +152,12 @@ async function* loop(table, options) {
     let loopTo = options?.to && options.to.get() < length ? options.to.get() : length;
     let array = [];
     let block = undefined;
-    // a dynamic key name may come in any case, USING KEY ('PRIMARY_KEY') is the primary key too
-    const isPrimaryKey = options?.usingKey === undefined || options.usingKey.toLowerCase() === "primary_key";
-    if (options?.usingKey && isPrimaryKey === false) {
-        array = table.getSecondaryIndex(options.usingKey);
-        const { from, to } = determineFromTo(array, options.topEquals, table.getKeyByName(options.usingKey));
+    // the secondary key the loop runs over; undefined is the primary key, also
+    // when it is named - USING KEY PRIMARY_KEY, or a dynamic name holding it
+    const usingKey = (0, types_1.secondaryKeyName)(options?.usingKey);
+    if (usingKey !== undefined) {
+        array = table.getSecondaryIndex(usingKey);
+        const { from, to } = determineFromTo(array, options?.topEquals, table.getKeyByName(usingKey));
         loopFrom = Math.max(loopFrom, from) - 1;
         loopTo = Math.min(loopTo, to);
     }
@@ -195,9 +196,7 @@ async function* loop(table, options) {
     // The same goes for a loop that reads an index table through a hash
     // secondary key. Handing out 1, 2, 3 there looks helpful and is a lie the
     // caller cannot tell from the truth.
-    const usedKey = options?.usingKey === undefined || isPrimaryKey
-        ? undefined
-        : table.getKeyByName(options.usingKey);
+    const usedKey = usingKey === undefined ? undefined : table.getKeyByName(usingKey);
     const hasRowNumber = usedKey !== undefined
         ? usedKey.type !== types_1.TableAccessType.hashed
         : !(table instanceof types_1.HashedTable);
@@ -226,7 +225,7 @@ async function* loop(table, options) {
             options?.atLast?.(loopController.index + 1 >= loopController.loopTo);
             yield current;
             loopController.index++;
-            if (options?.to === undefined && options?.usingKey === undefined) {
+            if (options?.to === undefined && usingKey === undefined) {
                 // extra rows might have been inserted inside the loop
                 loopController.loopTo = array.length;
             }

package/build/src/statements/read_table.js

@@ -169,6 +169,11 @@ function readTable(table, options) {
         // return readTable(table.getPointer(), options);
         table = table.getPointer();
     }
+    // WITH [TABLE] KEY primary_key COMPONENTS reads as the same READ without
+    // the key name; any other name, as ABAP reads it (secondaryKeyName)
+    if (options?.keyName !== undefined && (0, types_1.secondaryKeyName)(options.keyName) !== options.keyName) {
+        options = { ...options, keyName: (0, types_1.secondaryKeyName)(options.keyName) };
+    }
     // check if it is a primary index read specified with WITH KEY instead of WITH TABLE KEY
     if (options?.withTableKey === undefined
         && options?.withKeySimple

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

@@ -45,6 +45,11 @@ interface ITable {
 export declare class TableFactory {
     static construct(rowType: TableRowType, options?: ITableOptions, qualifiedName?: string): Table | HashedTable;
 }
+/** The secondary key a key name selects, as ABAP reads the name: without the
+ *  blanks a c field pads it with, in any case - and undefined for the primary
+ *  key, which primary_key names however it is written, and so does an initial
+ *  name (a dynamic USING KEY ( name ) that is empty). */
+export declare function secondaryKeyName(name: string | undefined): string | undefined;
 export declare class HashedTable implements ITable {
     private value;
     private readonly header;

package/build/src/types/table.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Table = exports.HashedTable = exports.TableFactory = exports.LoopController = exports.TableKeyType = exports.TableAccessType = void 0;
+exports.secondaryKeyName = secondaryKeyName;
 const integer_1 = require("./integer");
 const float_1 = require("./float");
 const abap_object_1 = require("./abap_object");
@@ -75,6 +76,14 @@ export class SortedTable {
   // todo
 }
 */
+/** The secondary key a key name selects, as ABAP reads the name: without the
+ *  blanks a c field pads it with, in any case - and undefined for the primary
+ *  key, which primary_key names however it is written, and so does an initial
+ *  name (a dynamic USING KEY ( name ) that is empty). */
+function secondaryKeyName(name) {
+    const trimmed = name?.trimEnd();
+    return trimmed === undefined || trimmed === "" || trimmed.toLowerCase() === "primary_key" ? undefined : trimmed;
+}
 class HashedTable {
     value;
     header;
@@ -107,11 +116,11 @@ class HashedTable {
         return Object.keys(this.value).length;
     }
     getKeyByName(name) {
-        return this.getOptions()?.secondary?.find(s => s.name.toUpperCase() === name.toUpperCase());
+        return this.getOptions()?.secondary?.find(s => s.name.toUpperCase() === name.trimEnd().toUpperCase());
     }
     getSecondaryIndex(name) {
-        if (this.secondaryIndexes[name.toUpperCase()]) {
-            return this.secondaryIndexes[name.toUpperCase()];
+        if (this.secondaryIndexes[name.trimEnd().toUpperCase()]) {
+            return this.secondaryIndexes[name.trimEnd().toUpperCase()];
         }
         const secondary = this.getKeyByName(name);
         if (secondary === undefined) {
@@ -120,7 +129,7 @@ class HashedTable {
         // note, array() already is a copy, so it can be used,
         const copy = secondaryDuplicatesFirst(this.array(), secondary);
         (0, sort_1.sort)(copy, { by: secondary.keyFields.map(k => { return { component: k.toLowerCase() }; }) });
-        this.secondaryIndexes[name.toUpperCase()] = copy;
+        this.secondaryIndexes[name.trimEnd().toUpperCase()] = copy;
         return copy;
     }
     buildHashFromData(data) {
@@ -364,11 +373,11 @@ class Table {
         return this.value.length;
     }
     getKeyByName(name) {
-        return this.getOptions()?.secondary?.find(s => s.name.toUpperCase() === name.toUpperCase());
+        return this.getOptions()?.secondary?.find(s => s.name.toUpperCase() === name.trimEnd().toUpperCase());
     }
     getSecondaryIndex(name) {
-        if (this.secondaryIndexes[name.toUpperCase()]) {
-            return this.secondaryIndexes[name.toUpperCase()];
+        if (this.secondaryIndexes[name.trimEnd().toUpperCase()]) {
+            return this.secondaryIndexes[name.trimEnd().toUpperCase()];
         }
         const secondary = this.getKeyByName(name);
         if (secondary === undefined) {
@@ -376,7 +385,7 @@ class Table {
         }
         const copy = secondaryDuplicatesFirst([...this.value], secondary);
         (0, sort_1.sort)(copy, { by: secondary.keyFields.map(k => { return { component: k.toLowerCase() }; }), skipSortedCheck: true });
-        this.secondaryIndexes[name.toUpperCase()] = copy;
+        this.secondaryIndexes[name.trimEnd().toUpperCase()] = copy;
         return copy;
     }
     getQualifiedName() {

package/package.json

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