@abaplint/runtime 2.10.26 → 2.10.27

package/build/src/abap_regex.d.ts

@@ -1,4 +1,6 @@
+import { IRegexOptions } from "./statements/find";
 export declare class ABAPRegExp {
     static convert(input: string): string;
     static escapeRegExp(text: string): string;
+    static getRegex(options: IRegexOptions): RegExp;
 }

package/build/src/abap_regex.js

@@ -17,6 +17,47 @@ class ABAPRegExp {
     static escapeRegExp(text) {
         return text.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");
     }
+    static getRegex(options) {
+        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");
+            }
+        }
+        const ignoreCase = options.ignoringCase === true ? "i" : "";
+        const allOccurrences = options.all === true ? "g" : "";
+        let r = options.regex;
+        if (r === undefined) {
+            r = options.pcre;
+        }
+        if (typeof r !== "string") {
+            r = r.get();
+        }
+        if (typeof r === "string") {
+            r = ABAPRegExp.convert(r);
+        }
+        else if (r.constructor.name === "cl_abap_regex") {
+            const obj = r;
+            // @ts-ignore
+            r = obj.mv_pattern.get();
+            // @ts-ignore
+            if (obj.mv_ignore_case.get() === "X") {
+                options.ignoringCase = true;
+            }
+        }
+        else {
+            throw "getRegex(), unexpected input";
+        }
+        r = r;
+        if (r.length === 0 && options.all === true) {
+            throw "getRegex(), zero length input";
+        }
+        return new RegExp(r, "m" + ignoreCase + allOccurrences);
+    }
 }
 exports.ABAPRegExp = ABAPRegExp;
 //# sourceMappingURL=abap_regex.js.map

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

@@ -1,18 +1,21 @@
 import { ABAPObject, Structure, Table } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export interface IFindOptions {
-    find?: ICharacter | string;
-    first?: boolean;
+export type IRegexOptions = {
     regex?: string | ICharacter | ABAPObject;
     pcre?: string | ICharacter;
+    all?: boolean;
+    ignoringCase?: boolean;
+};
+export type IFindOptions = IRegexOptions & {
+    find?: ICharacter | string;
+    first?: boolean;
     offset?: INumeric;
     sectionOffset?: INumeric;
     byteMode?: boolean;
     length?: INumeric;
     count?: INumeric;
     results?: Table | Structure;
-    ignoringCase?: boolean;
     submatches?: ICharacter[];
-}
+};
 export declare function find(input: ICharacter | Table, options: IFindOptions): void;

package/build/src/statements/find.js

@@ -31,39 +31,7 @@ function find(input, options) {
         s = new RegExp(s, "g");
     }
     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");
-            }
-        }
-        let r = options.regex;
-        if (r === undefined) {
-            r = options.pcre;
-        }
-        if (typeof r !== "string") {
-            r = r.get();
-        }
-        if (typeof r === "string") {
-            r = abap_regex_1.ABAPRegExp.convert(r);
-        }
-        else if (r.constructor.name === "cl_abap_regex") {
-            const obj = r;
-            // @ts-ignore
-            r = obj.mv_pattern.get();
-            // @ts-ignore
-            if (obj.mv_ignore_case.get() === "X") {
-                options.ignoringCase = true;
-            }
-        }
-        else {
-            throw "find(), unexpected input";
-        }
-        s = new RegExp(r, "gm" + (options.ignoringCase === true ? "i" : ""));
+        s = abap_regex_1.ABAPRegExp.getRegex({ all: true, ...options });
     }
     else {
         throw "FIND, runtime, no input";

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

@@ -1,17 +1,14 @@
 import { Table } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export type replaceInput = {
+import { IRegexOptions } from "./find";
+export type replaceInput = IRegexOptions & {
     target: ICharacter | Table;
     sectionLength?: INumeric;
     sectionOffset?: INumeric;
     replacementLength?: INumeric;
     replacementCount?: INumeric;
-    regex?: ICharacter;
-    pcre?: ICharacter;
-    all: boolean;
     with: ICharacter;
     of: ICharacter;
-    ignoringCase?: boolean;
 };
 export declare function replace(input: replaceInput): void;

package/build/src/statements/replace.js

@@ -28,22 +28,8 @@ function replace(input) {
         inp = abap_regex_1.ABAPRegExp.escapeRegExp(inp);
         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";
-        }
-        search = new RegExp(regex, ignoreCase + allOccurrences);
-        found = temp.match(search) !== null;
-    }
-    else if (input.pcre) {
-        const str = input.pcre.get();
-        const regex = abap_regex_1.ABAPRegExp.convert(str);
-        if (regex.length === 0 && input.all === true) {
-            throw "REPLACE, zero length input";
-        }
-        search = new RegExp(regex, ignoreCase + allOccurrences);
+    else if (input.regex || input.pcre) {
+        search = abap_regex_1.ABAPRegExp.getRegex(input);
         found = temp.match(search) !== null;
     }
     else if (input.sectionLength && input.sectionOffset) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.10.26",
+  "version": "2.10.27",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -34,7 +34,7 @@
     "chai": "^4.5.0",
     "mocha": "^11.1.0",
     "source-map-support": "^0.5.21",
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "dependencies": {
     "temporal-polyfill": "^0.2.5"