@abaplint/runtime 2.13.26 → 2.13.28

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

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

package/build/src/builtin/match.js

@@ -4,12 +4,16 @@ exports.match = match;
 const string_1 = require("../types/string");
 function match(input) {
     const val = typeof input.val === "string" ? input.val : input.val.get();
+    const regexInput = input.pcre || input.regex;
+    if (regexInput === undefined) {
+        throw "match() requires either regex or pcre parameter";
+    }
     let reg = "";
-    if (typeof input.regex === "string") {
-        reg = input.regex;
+    if (typeof regexInput === "string") {
+        reg = regexInput;
     }
     else {
-        reg = input.regex.get();
+        reg = regexInput.get();
     }
     const r = new RegExp(reg);
     const res = val.match(r);

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

@@ -6,6 +6,7 @@ export interface IReplaceInput {
     sub?: string | ICharacter;
     with?: string | ICharacter;
     regex?: string | ICharacter;
+    pcre?: string | ICharacter;
     off?: INumeric;
     len?: INumeric;
     occ?: INumeric;

package/build/src/builtin/replace.js

@@ -38,11 +38,12 @@ function replace(input) {
     if (sub !== undefined) {
         sub = abap_regex_1.ABAPRegExp.escapeRegExp(sub);
     }
-    if (typeof input.regex === "string") {
-        sub = new RegExp(abap_regex_1.ABAPRegExp.convert(input.regex), "g");
+    const regexInput = input.pcre || input.regex;
+    if (typeof regexInput === "string") {
+        sub = new RegExp(abap_regex_1.ABAPRegExp.convert(regexInput), "g");
     }
-    else if (input.regex) {
-        sub = new RegExp(abap_regex_1.ABAPRegExp.convert(input.regex.get()), "g");
+    else if (regexInput) {
+        sub = new RegExp(abap_regex_1.ABAPRegExp.convert(regexInput.get()), "g");
     }
     if (input.off && input.len && typeof input.val === "string") {
         const offset = input.off.get();

package/build/src/expand_dynamic.d.ts

@@ -1,2 +1,6 @@
-import { FieldSymbol } from "./types";
-export declare function expandDynamic(code: string, evaluate: (name: string) => FieldSymbol | undefined): string;
+import { FieldSymbol, HashedTable, Table } from "./types";
+type DynamicCondition = string | Table | HashedTable | {
+    get(): string;
+};
+export declare function expandDynamic(input: DynamicCondition, evaluate: (name: string) => FieldSymbol | undefined): string;
+export {};

package/build/src/expand_dynamic.js

@@ -3,8 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandDynamic = expandDynamic;
 const expand_in_1 = require("./expand_in");
 const types_1 = require("./types");
-function expandDynamic(code, evaluate) {
+function expandDynamic(input, evaluate) {
     //  console.dir(code);
+    let code;
+    if (input instanceof types_1.Table || input instanceof types_1.HashedTable) {
+        code = input.array().map(row => row.get()).join(" ");
+    }
+    else if (typeof input === "string") {
+        code = input;
+    }
+    else {
+        code = input.get();
+    }
     if (code === "") {
         return "1 = 1";
     }

package/package.json

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