@abaplint/runtime 2.10.80 → 2.10.82

package/build/src/abap_regex.js

@@ -28,7 +28,7 @@ class ABAPRegExp {
                 throw new Error("FIND, runtime, no input, regex empty");
             }
         }
-        const ignoreCase = options.ignoringCase === true ? "i" : "";
+        let ignoreCase = options.ignoringCase === true ? "i" : "";
         const allOccurrences = options.all === true ? "g" : "";
         let r = options.regex;
         if (r === undefined) {
@@ -47,7 +47,7 @@ class ABAPRegExp {
             r = obj.mv_pattern.get();
             // @ts-ignore
             if (obj.mv_ignore_case.get() === "X") {
-                options.ignoringCase = true;
+                ignoreCase = 'i';
             }
         }
         else {

package/build/src/expand_dynamic.d.ts

@@ -1,2 +1,2 @@
 import { FieldSymbol } from "./types";
-export declare function expandDynamic(code: string, ev: (name: string) => FieldSymbol | undefined): string;
+export declare function expandDynamic(code: string, evaluate: (name: string) => FieldSymbol | undefined): string;

package/build/src/expand_dynamic.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandDynamic = expandDynamic;
 const expand_in_1 = require("./expand_in");
 const types_1 = require("./types");
-function expandDynamic(code, ev) {
+function expandDynamic(code, evaluate) {
     //  console.dir(code);
     if (code === "") {
         return "1 = 1";
@@ -18,7 +18,7 @@ function expandDynamic(code, ev) {
             if (match && match[1] && match[2] && match[3]) {
                 let name = "fs_" + match[2] + "_";
                 name = name.toLowerCase();
-                let found = ev(name);
+                let found = evaluate(name);
                 if (found instanceof types_1.FieldSymbol) {
                     found = found.get()[match[3].toLowerCase()];
                     if (found === undefined) {
@@ -38,7 +38,7 @@ function expandDynamic(code, ev) {
             if (match && match[1] && match[2]) {
                 let name = "fs_" + match[1] + "_";
                 name = name.toLowerCase();
-                let found = ev(name);
+                let found = evaluate(name);
                 if (found instanceof types_1.FieldSymbol) {
                     found = found.get()[match[2].toLowerCase()];
                     if (found === undefined) {
@@ -58,7 +58,7 @@ function expandDynamic(code, ev) {
             if (match && match[1]) {
                 let name = "fs_" + match[1] + "_";
                 name = name.toLowerCase();
-                const found = ev(name);
+                const found = evaluate(name);
                 if (found instanceof types_1.FieldSymbol) {
                     code = code.replace(regex, " '" + found.get() + "'");
                 }

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

@@ -10,6 +10,10 @@ export interface ILoopOptions {
     from?: Integer;
     to?: Integer;
     topEquals?: topType;
+    dynamicWhere?: {
+        condition: string;
+        evaluate: (name: string) => FieldSymbol | undefined;
+    };
 }
 export declare function loop(table: Table | HashedTable | FieldSymbol | undefined, options?: ILoopOptions): AsyncGenerator<any, void, unknown>;
 export {};

package/build/src/statements/loop.js

@@ -23,6 +23,38 @@ function determineFromTo(array, topEquals, key) {
         to: to,
     };
 }
+// todo: rewrite, this is a mess & hack & slow
+function dynamicToWhere(condition, evaluate) {
+    //  console.dir(condition);
+    let text = condition.replace(/ AND /gi, " && ").replace(/ OR /gi, " || ").replace(/ = /gi, " EQ ").replace(/ <> /gi, " NE ");
+    //  console.dir(text);
+    let regex = /([\w-]+)\s+(\w+)\s+([<>\w-]+)/gi;
+    let matches = text.matchAll(regex);
+    for (const match of matches) {
+        const left = match[1];
+        const comparator = match[2].toLowerCase();
+        const right = match[3];
+        //    console.dir({left, right});
+        const cleft = "i." + left.toLowerCase().replace(/-/g, ".get().");
+        const cright = right;
+        const cnew = `abap.compare.${comparator}(${cleft}, ${cright})`;
+        text = text.replace(match[0], cnew);
+    }
+    regex = / <(\w+)>-(\w+)/gi;
+    matches = text.matchAll(regex);
+    for (const match of matches) {
+        const name = "fs_" + match[1].toLowerCase() + "_";
+        const value = evaluate(name)?.get()?.[match[2].toLowerCase()]?.get();
+        text = text.replace(match[0], " '" + value + "'");
+    }
+    //  console.dir(text);
+    // @ts-ignore
+    return async (i) => {
+        //    console.dir(i);
+        // eslint-disable-next-line no-eval
+        return eval(text);
+    };
+}
 async function* loop(table, options) {
     if (table === undefined) {
         throw new Error("LOOP at undefined");
@@ -35,6 +67,14 @@ async function* loop(table, options) {
         yield* loop(pnt, options);
         return;
     }
+    if (options?.dynamicWhere) {
+        const dynamicWhere = options.dynamicWhere;
+        const newOptions = { ...options };
+        delete newOptions.dynamicWhere;
+        newOptions.where = dynamicToWhere(dynamicWhere.condition, dynamicWhere.evaluate);
+        yield* loop(table, newOptions);
+        return;
+    }
     const length = table.getArrayLength();
     if (length === 0) {
         // @ts-ignore

package/package.json

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