@abaplint/runtime 2.13.84 → 2.13.85

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

@@ -37,7 +37,7 @@ import { IRollbackOptions } from "./rollback";
 import { setBit } from "./set_bit";
 import { shift } from "./shift";
 import { sort } from "./sort";
-import { wait } from "./wait";
+import { IWaitOptions } from "./wait";
 import { IOpenCursorDatabaseOptions } from "./open_cursor";
 import { setHandler } from "./set_handler";
 import { split } from "./split";
@@ -88,7 +88,6 @@ export declare class Statements {
     sort: typeof sort;
     split: typeof split;
     translate: typeof translate;
-    wait: typeof wait;
     receive: typeof receive;
     callTransaction: typeof callTransaction;
     private readonly context;
@@ -99,6 +98,7 @@ export declare class Statements {
     closeCursor(cursor: INumeric): Promise<void>;
     commit(options?: ICommitOptions): Promise<void>;
     rollback(options?: IRollbackOptions): Promise<void>;
+    wait(options: IWaitOptions): Promise<void>;
     deleteDatabase(table: string | ICharacter, options: IDeleteDatabaseOptions): Promise<void>;
     insertDatabase(table: string | ICharacter, options: IInsertDatabaseOptions): Promise<number | undefined>;
     modifyDatabase(table: string | ICharacter, options: IModifyDatabaseOptions): Promise<void>;

package/build/src/statements/index.js

@@ -91,7 +91,6 @@ class Statements {
     sort = sort_1.sort;
     split = split_1.split;
     translate = translate_1.translate;
-    wait = wait_1.wait;
     receive = receive_1.receive;
     callTransaction = call_transaction_1.callTransaction;
     context;
@@ -117,6 +116,9 @@ class Statements {
     async rollback(options) {
         return (0, rollback_1.rollback)(this.context, options);
     }
+    async wait(options) {
+        return (0, wait_1.wait)(this.context, options);
+    }
     async deleteDatabase(table, options) {
         await (0, delete_database_1.deleteDatabase)(table, options, this.context);
     }

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

@@ -1,5 +1,9 @@
 import { INumeric } from "../types/_numeric";
-export declare function wait(options: {
-    cond: () => any;
+import { Context } from "../context";
+export interface IWaitOptions {
+    /** UNTIL, the logical expression, if not supplied its the simple "WAIT UP TO" variant */
+    cond?: () => any;
+    /** UP TO sec SECONDS */
     seconds?: INumeric;
-}): Promise<void>;
+}
+export declare function wait(context: Context, options: IWaitOptions): Promise<void>;

package/build/src/statements/wait.js

@@ -1,9 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wait = wait;
-async function wait(options) {
+// WAIT ends the current database LUW when it interrupts the execution of the program,
+// ie. all open database connections are committed, note that this is not a full COMMIT WORK,
+// sy-subrc is owned by the WAIT statement itself
+async function implicitCommit(context) {
+    for (const name of Object.keys(context.databaseConnections)) {
+        await context.databaseConnections[name].commit();
+    }
+}
+async function wait(context, options) {
     const timeout = options.seconds === undefined ? undefined : options.seconds.get() * 1000;
     const deadline = timeout === undefined ? undefined : Date.now() + timeout;
+    if (options.cond === undefined) {
+        // "WAIT UP TO sec SECONDS", the execution is always interrupted and sy-subrc is always zero
+        await implicitCommit(context);
+        await new Promise(r => setTimeout(r, timeout));
+        abap.builtin.sy.get().subrc.set(0);
+        return;
+    }
+    let interrupted = false;
     while (true) {
         if (options.cond() === true) {
             abap.builtin.sy.get().subrc.set(0);
@@ -14,6 +30,12 @@ async function wait(options) {
             abap.builtin.sy.get().subrc.set(8);
             return;
         }
+        if (interrupted === false) {
+            // the condition is not true, so the execution is about to be interrupted,
+            // commit before sleeping so the changes are visible to other sessions during the wait
+            interrupted = true;
+            await implicitCommit(context);
+        }
         await new Promise(r => setTimeout(r, Math.min(500, remaining)));
     }
 }

package/package.json

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