@abaplint/runtime 1.8.40 → 2.0.2

package/build/src/statements/insert_database.js

@@ -1,34 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertDatabase = void 0;
-function insertDatabase(table, options) {
-    if (this.db === undefined) {
-        throw new Error("Runtime, database not initialized");
+exports.InsertDatabase = void 0;
+class InsertDatabase {
+    constructor(context) {
+        this.context = context;
     }
-    const columns = [];
-    const values = [];
-    const structure = options.values.get();
-    for (const k of Object.keys(structure)) {
-        columns.push(k);
-        // todo, integers should not be surrounded by '"'?
-        values.push('"' + structure[k].get() + '"');
+    async insertDatabase(table, options) {
+        const columns = [];
+        const values = [];
+        const structure = options.values.get();
+        for (const k of Object.keys(structure)) {
+            columns.push(k);
+            // todo, integers should not be surrounded by '"'?
+            values.push('"' + structure[k].get() + '"');
+        }
+        if (typeof table !== "string") {
+            table = table.get();
+        }
+        const { subrc, dbcnt } = await this.context.defaultDB().insert({ table, columns, values });
+        // @ts-ignore
+        abap.builtin.sy.get().subrc.set(subrc);
+        // @ts-ignore
+        abap.builtin.sy.get().dbcnt.set(dbcnt);
+        return subrc;
     }
-    if (typeof table !== "string") {
-        table = table.get();
-    }
-    const sql = `INSERT INTO ${table} (${columns.join(",")}) VALUES (${values.join(",")})`;
-    //  console.dir(sql);
-    let subrc = 0;
-    try {
-        this.db.exec(sql);
-    }
-    catch (error) {
-        // eg "UNIQUE constraint failed" errors
-        subrc = 4;
-    }
-    // @ts-ignore
-    abap.builtin.sy.get().subrc.set(subrc);
-    return subrc;
 }
-exports.insertDatabase = insertDatabase;
+exports.InsertDatabase = InsertDatabase;
 //# sourceMappingURL=insert_database.js.map

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

@@ -1,3 +1,4 @@
+import { Context } from "../context";
 import { ICharacter } from "../types/_character";
 export interface IMessageOptions {
     id?: ICharacter | string;
@@ -6,4 +7,8 @@ export interface IMessageOptions {
     with?: (ICharacter | string)[];
     into?: ICharacter;
 }
-export declare function message(options: IMessageOptions): void;
+export declare class MessageStatement {
+    private readonly context;
+    constructor(context: Context);
+    message(options: IMessageOptions): Promise<void>;
+}

package/build/src/statements/message.js

@@ -1,27 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.message = void 0;
-function message(options) {
-    let arbgb = options.id;
-    if (arbgb !== undefined && typeof arbgb !== "string") {
-        arbgb = arbgb.get();
-    }
-    arbgb = arbgb === null || arbgb === void 0 ? void 0 : arbgb.toUpperCase();
-    // @ts-ignore
-    abap.builtin.sy.get().msgid.set(arbgb);
-    let msgnr = options.number;
-    if (msgnr !== undefined && typeof msgnr !== "string") {
-        msgnr = msgnr.get();
-    }
-    // @ts-ignore
-    abap.builtin.sy.get().msgno.set(msgnr);
-    const text = findText.bind(this)(arbgb, msgnr);
-    const replaced = replace(text, options.with);
-    if (options.into) {
-        options.into.set(replaced);
-    }
-}
-exports.message = message;
+exports.MessageStatement = void 0;
 function replace(text, w) {
     for (let i = 0; i < 6; i++) {
         const search = "&" + (i + 1);
@@ -44,19 +23,15 @@ function replace(text, w) {
     }
     return text.trim();
 }
-function findText(arbgb, msgnr) {
+async function findText(context, arbgb, msgnr) {
     let text = undefined;
-    const db = this.db;
-    if (db && arbgb && msgnr) {
+    if (arbgb && msgnr) {
         try {
-            const stmt = db.prepare("SELECT * FROM t100 WHERE sprsl=:sprsl AND arbgb=:arbgb AND msgnr=:msgnr LIMIT 1");
-            const result = stmt.getAsObject({
-                ":sprsl": "E",
-                ":arbgb": arbgb,
-                ":msgnr": msgnr,
-            });
-            if (result.text) {
-                text = result.text;
+            // todo, sql injection?
+            const select = `SELECT * FROM t100 WHERE sprsl='E' AND arbgb='${arbgb}' AND msgnr='${msgnr}' LIMIT 1`;
+            const { rows: result } = await context.defaultDB().select({ select });
+            if (result[0]) {
+                text = result[0]["text"];
             }
         }
         catch (_a) {
@@ -69,4 +44,30 @@ function findText(arbgb, msgnr) {
     }
     return text;
 }
+class MessageStatement {
+    constructor(context) {
+        this.context = context;
+    }
+    async message(options) {
+        let arbgb = options.id;
+        if (arbgb !== undefined && typeof arbgb !== "string") {
+            arbgb = arbgb.get();
+        }
+        arbgb = arbgb === null || arbgb === void 0 ? void 0 : arbgb.toUpperCase();
+        // @ts-ignore
+        abap.builtin.sy.get().msgid.set(arbgb);
+        let msgnr = options.number;
+        if (msgnr !== undefined && typeof msgnr !== "string") {
+            msgnr = msgnr.get();
+        }
+        // @ts-ignore
+        abap.builtin.sy.get().msgno.set(msgnr);
+        const text = await findText(this.context, arbgb, msgnr);
+        const replaced = replace(text, options.with);
+        if (options.into) {
+            options.into.set(replaced);
+        }
+    }
+}
+exports.MessageStatement = MessageStatement;
 //# sourceMappingURL=message.js.map

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

@@ -1,7 +1,12 @@
+import { Context } from "../context";
 import { FieldSymbol, Structure, Table } from "../types";
 import { ICharacter } from "../types/_character";
-export interface IInsertDatabaseOptions {
+export interface IModifyDatabaseOptions {
     from?: Structure | FieldSymbol;
     table?: Table | FieldSymbol;
 }
-export declare function modifyDatabase(table: string | ICharacter, options: IInsertDatabaseOptions): void;
+export declare class ModifyDatabase {
+    private readonly context;
+    constructor(context: Context);
+    modifyDatabase(table: string | ICharacter, options: IModifyDatabaseOptions): Promise<void>;
+}

package/build/src/statements/modify_database.js

@@ -1,36 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.modifyDatabase = void 0;
+exports.ModifyDatabase = void 0;
 const types_1 = require("../types");
 const insert_database_1 = require("./insert_database");
 const update_database_1 = require("./update_database");
-function modifyDatabase(table, options) {
-    if (this.db === undefined) {
-        throw new Error("Runtime, database not initialized");
+class ModifyDatabase {
+    constructor(context) {
+        this.context = context;
     }
-    if (options.table instanceof types_1.FieldSymbol) {
-        options.table = options.table.getPointer();
-    }
-    if (options.from instanceof types_1.FieldSymbol) {
-        options.from = options.from.getPointer();
-    }
-    if (options.table) {
-        for (const row of options.table.array()) {
-            const subrc = insert_database_1.insertDatabase.bind(this)(table, { values: row });
+    async modifyDatabase(table, options) {
+        if (options.table instanceof types_1.FieldSymbol) {
+            options.table = options.table.getPointer();
+        }
+        if (options.from instanceof types_1.FieldSymbol) {
+            options.from = options.from.getPointer();
+        }
+        const insert = new insert_database_1.InsertDatabase(this.context);
+        const update = new update_database_1.UpdateDatabase(this.context);
+        if (options.table) {
+            for (const row of options.table.array()) {
+                const subrc = await insert.insertDatabase(table, { values: row });
+                if (subrc !== 0) {
+                    await update.updateDatabase(table, { from: row });
+                }
+            }
+        }
+        else if (options.from) {
+            const subrc = await insert.insertDatabase(table, { values: options.from });
             if (subrc !== 0) {
-                update_database_1.updateDatabase.bind(this)(table, { from: row });
+                await update.updateDatabase(table, { from: options.from });
             }
         }
-    }
-    else if (options.from) {
-        const subrc = insert_database_1.insertDatabase.bind(this)(table, { values: options.from });
-        if (subrc !== 0) {
-            update_database_1.updateDatabase.bind(this)(table, { from: options.from });
+        else {
+            throw "modifyDatabase todo";
         }
     }
-    else {
-        throw "modifyDatabase todo";
-    }
 }
-exports.modifyDatabase = modifyDatabase;
+exports.ModifyDatabase = ModifyDatabase;
 //# sourceMappingURL=modify_database.js.map

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

@@ -1,2 +1,7 @@
+import { Context } from "../context";
 import { FieldSymbol, Structure, Table } from "../types";
-export declare function select(target: Structure | Table | FieldSymbol, select: string): void;
+export declare class SelectDatabase {
+    private readonly context;
+    constructor(context: Context);
+    select(target: Structure | Table | FieldSymbol, select: string): Promise<void>;
+}

package/build/src/statements/select.js

@@ -1,70 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.select = void 0;
+exports.SelectDatabase = void 0;
 const clone_1 = require("../clone");
 const types_1 = require("../types");
-function select(target, select) {
-    var _a, _b, _c;
-    if (this.db === undefined) {
-        throw new Error("Runtime, database not initialized");
+class SelectDatabase {
+    constructor(context) {
+        this.context = context;
     }
-    let res = undefined;
-    try {
-        res = this.db.exec(select);
-    }
-    catch (error) {
-        // @ts-ignore
-        if (abap.Classes["CX_SY_DYNAMIC_OSQL_SEMANTICS"] !== undefined) {
+    async select(target, select) {
+        var _a;
+        const { rows: rows } = await this.context.defaultDB().select({ select });
+        if (target instanceof types_1.FieldSymbol) {
+            if (target.isAssigned() === false) {
+                throw "select, fs not assigned";
+            }
             // @ts-ignore
-            throw new abap.Classes["CX_SY_DYNAMIC_OSQL_SEMANTICS"]();
+            target = target.getPointer();
         }
-        throw error;
-    }
-    if (target instanceof types_1.FieldSymbol) {
-        // @ts-ignore
-        target = target.getPointer();
-    }
-    target.clear();
-    if (target instanceof types_1.Structure) {
-        if (((_a = res[0]) === null || _a === void 0 ? void 0 : _a.values[0]) === undefined) {
+        target.clear();
+        if (rows.length === 0) {
             // @ts-ignore
             abap.builtin.sy.get().subrc.set(4);
+            return;
         }
-        else {
-            const columns = res[0].columns;
-            const values = res[0].values[0];
+        if (target instanceof types_1.Structure) {
             const result = {};
-            for (const c of columns) {
-                result[c] = (0, clone_1.clone)(target.get()[c]).set(values.shift());
+            for (const column in rows[0]) {
+                result[column] = (0, clone_1.clone)(target.get()[column]).set(rows[0][column]);
             }
             target.set(new types_1.Structure(result));
-            // @ts-ignore
-            abap.builtin.sy.get().subrc.set(0);
-        }
-    }
-    else if (target instanceof types_1.Table) {
-        if (((_b = res[0]) === null || _b === void 0 ? void 0 : _b.values[0]) === undefined) {
-            // @ts-ignore
-            abap.builtin.sy.get().subrc.set(4);
         }
-        else {
-            for (const selectRow of res[0].values) {
+        else if (target instanceof types_1.Table) {
+            for (const row of rows) {
                 const targetRow = (0, clone_1.clone)(target.getRowType());
-                const values = selectRow;
-                for (const c of res[0].columns) {
+                for (const columnName in row) {
+                    // todo, non structured table = table with simple rows
                     // @ts-ignore
-                    (_c = targetRow.get()[c]) === null || _c === void 0 ? void 0 : _c.set(values.shift());
+                    (_a = targetRow.get()[columnName]) === null || _a === void 0 ? void 0 : _a.set(row[columnName]);
                 }
                 // @ts-ignore
                 abap.statements.insertInternal({ table: target, data: targetRow });
             }
-            // @ts-ignore
-            abap.builtin.sy.get().subrc.set(0);
         }
-    }
-    else {
-        throw new Error("Runtime, SELECT todo");
+        else {
+            throw new Error("Runtime, SELECT todo");
+        }
+        // @ts-ignore
+        abap.builtin.sy.get().subrc.set(0);
     }
 }
-exports.select = select;
+exports.SelectDatabase = SelectDatabase;
 //# sourceMappingURL=select.js.map

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

@@ -1,7 +1,12 @@
+import { Context } from "../context";
 import { FieldSymbol, Structure, Table } from "../types";
 import { ICharacter } from "../types/_character";
-export interface IInsertDatabaseOptions {
+export interface IUpdateDatabaseOptions {
     from?: Structure | FieldSymbol;
     table?: Table | FieldSymbol;
 }
-export declare function updateDatabase(table: string | ICharacter, options: IInsertDatabaseOptions): number;
+export declare class UpdateDatabase {
+    private readonly context;
+    constructor(context: Context);
+    updateDatabase(table: string | ICharacter, options: IUpdateDatabaseOptions): Promise<number>;
+}

package/build/src/statements/update_database.js

@@ -1,51 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDatabase = void 0;
+exports.UpdateDatabase = void 0;
 const types_1 = require("../types");
-function updateDatabase(table, options) {
-    if (this.db === undefined) {
-        throw new Error("Runtime, database not initialized");
+class UpdateDatabase {
+    constructor(context) {
+        this.context = context;
     }
-    if (options.table instanceof types_1.FieldSymbol) {
-        options.table = options.table.getPointer();
-    }
-    if (options.from instanceof types_1.FieldSymbol) {
-        options.from = options.from.getPointer();
-    }
-    if (typeof table !== "string") {
-        table = table.get();
-    }
-    // @ts-ignore
-    const keys = abap.DDIC[table.toUpperCase()].keyFields;
-    const where = [];
-    const set = [];
-    if (options.from) {
-        const structure = options.from.get();
-        for (const k of Object.keys(structure)) {
-            // todo, integers should not be surrounded by '"'?
-            const str = k + ' = "' + structure[k].get() + '"';
-            if (keys.includes(k.toUpperCase())) {
-                where.push(str);
-            }
-            else {
-                set.push(str);
+    async updateDatabase(table, options) {
+        if (options.table instanceof types_1.FieldSymbol) {
+            options.table = options.table.getPointer();
+        }
+        if (options.from instanceof types_1.FieldSymbol) {
+            options.from = options.from.getPointer();
+        }
+        if (typeof table !== "string") {
+            table = table.get();
+        }
+        // @ts-ignore
+        const keys = abap.DDIC[table.toUpperCase()].keyFields;
+        const where = [];
+        const set = [];
+        if (options.from) {
+            const structure = options.from.get();
+            for (const k of Object.keys(structure)) {
+                // todo, integers should not be surrounded by '"'?
+                const str = k + ' = "' + structure[k].get() + '"';
+                if (keys.includes(k.toUpperCase())) {
+                    where.push(str);
+                }
+                else {
+                    set.push(str);
+                }
             }
         }
+        else {
+            throw "updateDatabase, todo";
+        }
+        const { subrc, dbcnt } = await this.context.defaultDB().update({ table, where: where.join(" AND "), set });
+        // @ts-ignore
+        abap.builtin.sy.get().subrc.set(subrc);
+        // @ts-ignore
+        abap.builtin.sy.get().dbcnt.set(dbcnt);
+        return subrc;
     }
-    else {
-        throw "updateDatabase, todo";
-    }
-    const sql = `UPDATE ${table} SET ${set.join(", ")} WHERE ${where.join(" AND ")}`;
-    let subrc = 0;
-    try {
-        this.db.exec(sql);
-    }
-    catch (error) {
-        subrc = 4;
-    }
-    // @ts-ignore
-    abap.builtin.sy.get().subrc.set(subrc);
-    return subrc;
 }
-exports.updateDatabase = updateDatabase;
+exports.UpdateDatabase = UpdateDatabase;
 //# sourceMappingURL=update_database.js.map

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

@@ -1,10 +1,14 @@
+import { Context } from "../context";
 import { FieldSymbol } from "../types/field_symbol";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-interface IWriteOptions {
+export interface IWriteOptions {
     newLine?: boolean;
     skipLine?: boolean;
     target?: ICharacter;
 }
-export declare function write(source: INumeric | ICharacter | FieldSymbol | string | number, options?: IWriteOptions): void;
-export {};
+export declare class WriteStatement {
+    private readonly context;
+    constructor(context: Context);
+    write(source: INumeric | ICharacter | FieldSymbol | string | number, options?: IWriteOptions): void;
+}

package/build/src/statements/write.js

@@ -1,41 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.write = void 0;
+exports.WriteStatement = void 0;
 const types_1 = require("../types");
-function write(source, options) {
-    if ((options === null || options === void 0 ? void 0 : options.skipLine) === true) {
-        this.console.add("\n");
+class WriteStatement {
+    constructor(context) {
+        this.context = context;
     }
-    else {
-        if ((options === null || options === void 0 ? void 0 : options.newLine) === true && this.console.get().length > 0) {
-            this.console.add("\n");
-        }
-        if (typeof source === "string" || typeof source === "number") {
-            if (options === null || options === void 0 ? void 0 : options.target) {
-                options.target.set(source.toString());
-            }
-            else {
-                this.console.add(source.toString());
-            }
+    write(source, options) {
+        if ((options === null || options === void 0 ? void 0 : options.skipLine) === true) {
+            this.context.console.add("\n");
         }
         else {
-            if (source instanceof types_1.Structure) {
-                const obj = source.get();
-                for (const f in obj) {
-                    // @ts-ignore
-                    abap.statements.write(obj[f]);
+            if ((options === null || options === void 0 ? void 0 : options.newLine) === true && this.context.console.get().length > 0) {
+                this.context.console.add("\n");
+            }
+            if (typeof source === "string" || typeof source === "number") {
+                if (options === null || options === void 0 ? void 0 : options.target) {
+                    options.target.set(source.toString());
+                }
+                else {
+                    this.context.console.add(source.toString());
                 }
             }
             else {
-                if (options === null || options === void 0 ? void 0 : options.target) {
-                    options.target.set(source.get().toString());
+                if (source instanceof types_1.Structure) {
+                    const obj = source.get();
+                    for (const f in obj) {
+                        // @ts-ignore
+                        abap.statements.write(obj[f]);
+                    }
                 }
                 else {
-                    this.console.add(source.get().toString());
+                    if (options === null || options === void 0 ? void 0 : options.target) {
+                        options.target.set(source.get().toString());
+                    }
+                    else {
+                        this.context.console.add(source.get().toString());
+                    }
                 }
             }
         }
     }
 }
-exports.write = write;
+exports.WriteStatement = WriteStatement;
 //# sourceMappingURL=write.js.map

package/build/src/template_formatting.d.ts

@@ -7,6 +7,7 @@ declare type options = {
     pad?: string;
     width?: number;
     decimals?: number;
+    align?: "left" | "right";
 };
 export declare function templateFormatting(source: ICharacter | INumeric, options: options): string;
 export {};

package/build/src/template_formatting.js

@@ -14,7 +14,12 @@ function templateFormatting(source, options) {
         text = text.substr(0, 2) + ":" + text.substr(2, 2) + ":" + text.substr(4, 2);
     }
     if (options.width && options.pad) {
-        text = text.trimEnd().padEnd(options.width, options.pad);
+        if (options.align === "right") {
+            text = text.trimEnd().padStart(options.width, options.pad);
+        }
+        else {
+            text = text.trimEnd().padEnd(options.width, options.pad);
+        }
     }
     else if (options.width) {
         text = text.trimEnd().padEnd(options.width, " ");