@abaplint/runtime 2.7.97 → 2.7.98

package/build/src/builtin/count.d.ts

@@ -5,6 +5,7 @@ export type countInput = {
     val: ICharacter;
     sub: ICharacter;
     regex?: ICharacter;
+    pcre?: ICharacter;
     case?: ICharacter;
     len?: INumeric;
     off?: INumeric;

package/build/src/builtin/count.js

@@ -22,6 +22,9 @@ function count(input) {
     else if (input.regex) {
         reg = input.regex.get();
     }
+    else if (input.pcre) {
+        reg = input.pcre.get();
+    }
     let options = "g";
     if (input.case && (0, compare_1.initial)(input.case)) {
         options += "i";

package/build/src/builtin/find.d.ts

@@ -8,6 +8,7 @@ export interface IFindInput {
     occ?: INumeric | number;
     len?: INumeric | number;
     regex?: ICharacter | string;
+    pcre?: ICharacter | string;
     case?: ICharacter | string;
 }
 export declare function find(input: IFindInput): Integer;

package/build/src/builtin/find.js

@@ -9,12 +9,18 @@ function find(input) {
     if (input.len !== undefined) {
         throw "transpiler find(), todo len";
     }
-    if (input.regex) {
+    if (input.regex || input.pcre) {
         if (input.off !== undefined) {
             throw "transpiler find(), todo off regex";
         }
         const caseInput = typeof input.case === "string" ? input.case : (_a = input.case) === null || _a === void 0 ? void 0 : _a.get();
-        const regex = typeof input.regex === "string" ? input.regex : input.regex.get();
+        let regex = "";
+        if (input.regex) {
+            regex = typeof input.regex === "string" ? input.regex : input.regex.get();
+        }
+        else if (input.pcre) {
+            regex = typeof input.pcre === "string" ? input.pcre : input.pcre.get();
+        }
         const flags = caseInput !== "X" ? "i" : "";
         const reg = new RegExp(regex, flags);
         const ret = (_b = val.match(reg)) === null || _b === void 0 ? void 0 : _b.index;

package/build/src/builtin/matches.js

@@ -3,19 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.matches = void 0;
 const types_1 = require("../types");
 function matches(input) {
-    if (input.pcre !== undefined) {
-        throw "matches(), todo, pcre";
-    }
-    else if (input.regex === undefined) {
-        throw "matches(), regex input expected";
+    if (input.pcre === undefined && input.regex === undefined) {
+        throw "matches(), todo";
     }
     const val = typeof input.val === "string" ? input.val : input.val.get();
     let reg = "";
-    if (typeof input.regex === "string") {
-        reg = input.regex;
+    if (input.regex) {
+        if (typeof input.regex === "string") {
+            reg = input.regex;
+        }
+        else {
+            reg = input.regex.get();
+        }
     }
-    else {
-        reg = input.regex.get();
+    else if (input.pcre) {
+        if (typeof input.pcre === "string") {
+            reg = input.pcre;
+        }
+        else {
+            reg = input.pcre.get();
+        }
     }
     const r = new RegExp("^" + reg + "$");
     const res = val.match(r);

package/build/src/builtin/substring_after.d.ts

@@ -1,6 +1,9 @@
 import { ICharacter } from "../types/_character";
-export declare function substring_after(input: {
+interface ISubstringAfterInput {
     val: ICharacter | string;
     sub?: ICharacter | string;
     regex?: ICharacter | string;
-}): ICharacter;
+    pcre?: ICharacter | string;
+}
+export declare function substring_after(input: ISubstringAfterInput): ICharacter;
+export {};

package/build/src/builtin/substring_after.js

@@ -13,9 +13,15 @@ function substring_after(input) {
     if (typeof input.regex === "string") {
         reg = input.regex;
     }
+    else if (typeof input.pcre === "string") {
+        reg = input.pcre;
+    }
     else if (input === null || input === void 0 ? void 0 : input.regex) {
         reg = input.regex.get();
     }
+    else if (input === null || input === void 0 ? void 0 : input.pcre) {
+        reg = input.pcre.get();
+    }
     else if (typeof input.sub === "string") {
         reg = abap_regex_1.ABAPRegExp.escapeRegExp(input.sub);
     }

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

@@ -11,6 +11,7 @@ export interface ICreateDataOptions {
     decimals?: INumeric;
     likeLineOf?: FieldSymbol | Table;
     typeLineOf?: boolean;
+    refTo?: boolean;
     like?: any;
 }
 export declare function createData(target: DataReference | FieldSymbol, options?: ICreateDataOptions): void;

package/build/src/statements/create_data.js

@@ -73,6 +73,14 @@ function createData(target, options) {
         else if (options.name.trimEnd() === "INT8") {
             target.assign(new types_1.Integer8());
         }
+        else if (options.refTo === true) {
+            // @ts-ignore
+            if (abap.Classes[options.name.toUpperCase()] === undefined) {
+                (0, throw_error_1.throwError)("CX_SY_CREATE_DATA_ERROR");
+            }
+            // @ts-ignore
+            target.assign(new abap.types.ABAPObject({ qualifiedName: options.name, RTTIName: options.name }));
+        }
         else {
             (0, throw_error_1.throwError)("CX_SY_CREATE_DATA_ERROR");
         }

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

@@ -5,6 +5,7 @@ export interface IFindOptions {
     find?: ICharacter | string;
     first?: boolean;
     regex?: string | ICharacter | ABAPObject;
+    pcre?: string | ICharacter;
     offset?: INumeric;
     sectionOffset?: INumeric;
     byteMode?: boolean;

package/build/src/statements/find.js

@@ -31,16 +31,21 @@ function find(input, options) {
         s = s.replace(/\+/g, "\\+");
         s = new RegExp(s, "g");
     }
-    else if (options.regex) {
-        if (typeof options.regex === "string") {
-            if (options.regex === "") {
+    else if (options.regex || options.pcre) {
+        if (options.regex) {
+            if (typeof options.regex === "string") {
+                if (options.regex === "") {
+                    throw new Error("FIND, runtime, no input, regex empty");
+                }
+            }
+            else if (options.regex.get() === "") {
                 throw new Error("FIND, runtime, no input, regex empty");
             }
         }
-        else if (options.regex.get() === "") {
-            throw new Error("FIND, runtime, no input, regex empty");
-        }
         let r = options.regex;
+        if (r === undefined) {
+            r = options.pcre;
+        }
         if (typeof r !== "string") {
             r = r.get();
         }

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

@@ -37,6 +37,7 @@ import { setBit } from "./set_bit";
 import { shift } from "./shift";
 import { sort } from "./sort";
 import { wait } from "./wait";
+import { IOpenCursorDatabaseOptions } from "./open_cursor";
 import { setHandler } from "./set_handler";
 import { split } from "./split";
 import { translate } from "./translate";
@@ -95,7 +96,7 @@ export declare class Statements {
     private _trace;
     private _traceAsync;
     _setTrace(min?: number, totals?: boolean): void;
-    openCursor(target: INumeric, select: string): Promise<void>;
+    openCursor(target: INumeric, select: string, options: IOpenCursorDatabaseOptions): Promise<void>;
     fetchNextCursor(cursor: INumeric, target: any, packageSize?: INumeric): Promise<void>;
     closeCursor(cursor: INumeric): Promise<void>;
     deleteDatabase(table: string | ICharacter, options: IDeleteDatabaseOptions): Promise<void>;

package/build/src/statements/index.js

@@ -157,8 +157,8 @@ class Statements {
             }
         }
     }
-    async openCursor(target, select) {
-        const num = await (0, open_cursor_1.openCursor)(this.context, select);
+    async openCursor(target, select, options) {
+        const num = await (0, open_cursor_1.openCursor)(this.context, select, options);
         target.set(num);
     }
     async fetchNextCursor(cursor, target, packageSize) {

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

@@ -1,2 +1,5 @@
 import { Context } from "../context";
-export declare function openCursor(context: Context, select: string): Promise<number>;
+export interface IOpenCursorDatabaseOptions {
+    connection?: string;
+}
+export declare function openCursor(context: Context, select: string, options: IOpenCursorDatabaseOptions): Promise<number>;

package/build/src/statements/open_cursor.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openCursor = void 0;
-async function openCursor(context, select) {
-    const callbacks = await context.defaultDB().openCursor({ select: select });
+async function openCursor(context, select, options) {
+    let db = context.defaultDB();
+    if (options === null || options === void 0 ? void 0 : options.connection) {
+        db = context.databaseConnections[options.connection];
+    }
+    const callbacks = await db.openCursor({ select: select });
     const num = context.cursorCounter++;
     context.cursors[num] = callbacks;
     return num;

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

@@ -6,6 +6,7 @@ export type replaceInput = {
     sectionLength?: INumeric;
     sectionOffset?: INumeric;
     regex?: ICharacter;
+    pcre?: ICharacter;
     all: boolean;
     with: ICharacter;
     of: ICharacter;

package/build/src/statements/replace.js

@@ -29,6 +29,7 @@ function replace(input) {
         search = new RegExp(inp, ignoreCase + allOccurrences);
     }
     else if (input.regex) {
+        // TODO: this is a bit wrong, ABAP regex is not like JS regex
         const regex = abap_regex_1.ABAPRegExp.convert(input.regex.get());
         if (regex.length === 0 && input.all === true) {
             throw "REPLACE, zero length input";
@@ -36,6 +37,14 @@ function replace(input) {
         found = temp.match(regex) !== null;
         search = new RegExp(regex, ignoreCase + allOccurrences);
     }
+    else if (input.pcre) {
+        const regex = abap_regex_1.ABAPRegExp.convert(input.pcre.get());
+        if (regex.length === 0 && input.all === true) {
+            throw "REPLACE, zero length input";
+        }
+        found = temp.match(regex) !== null;
+        search = new RegExp(regex, ignoreCase + allOccurrences);
+    }
     else if (input.sectionLength && input.sectionOffset) {
         const before = input.target.getOffset({ length: input.sectionOffset });
         const after = input.target.getOffset({ offset: input.sectionLength.get() + input.sectionOffset.get() });

package/package.json

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