@abaplint/runtime 1.8.24 → 1.8.27

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

@@ -1,6 +1,9 @@
 import { Integer } from "../types";
 import { ICharacter } from "../types/_character";
-export declare function count(input: {
-    val: ICharacter | string;
-    sub: ICharacter | string;
-}): Integer;
+export declare type countInput = {
+    val: ICharacter;
+    sub: ICharacter;
+    regex?: ICharacter;
+    case?: ICharacter;
+};
+export declare function count(input: countInput): Integer;

package/build/src/builtin/count.js

@@ -1,14 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.count = void 0;
+const compare_1 = require("../compare");
 const types_1 = require("../types");
 function count(input) {
     let found = 0;
-    const val = typeof input.val === "string" ? input.val : input.val.get();
-    let sub = typeof input.sub === "string" ? input.sub : input.sub.get();
-    sub = sub.replace(/\*/g, "\\*");
+    const val = input.val.get();
+    let reg = "";
+    if (input.sub) {
+        reg = input.sub.get();
+        reg = reg.replace(/\*/g, "\\*");
+    }
+    else if (input.regex) {
+        reg = input.regex.get();
+    }
+    let options = "g";
+    if (input.case && (0, compare_1.initial)(input.case)) {
+        options += "i";
+    }
     if (val !== "") {
-        const res = val.match(new RegExp(sub, "g"));
+        const res = val.match(new RegExp(reg, options));
         if (res) {
             found = res.length;
         }

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

@@ -14,4 +14,4 @@ export interface IFindOptions {
     ignoringCase?: boolean;
     submatches?: ICharacter[];
 }
-export declare function find(input: ICharacter | string, options: IFindOptions): void;
+export declare function find(input: ICharacter | Table, options: IFindOptions): void;

package/build/src/statements/find.js

@@ -4,10 +4,6 @@ exports.find = void 0;
 const types_1 = require("../types");
 function find(input, options) {
     var _a, _b, _c, _d, _e, _f, _g;
-    let i = input;
-    if (typeof i !== "string") {
-        i = i.get();
-    }
     let sectionOffset = (_a = options.sectionOffset) === null || _a === void 0 ? void 0 : _a.get();
     if (sectionOffset && options.byteMode) {
         sectionOffset = sectionOffset * 2;
@@ -49,16 +45,31 @@ function find(input, options) {
     else {
         throw "FIND, runtime, no input";
     }
-    if (sectionOffset) {
-        i = i.substr(sectionOffset);
-    }
-    let temp;
     const matches = [];
-    // eslint-disable-next-line no-cond-assign
-    while (temp = s.exec(i)) {
-        matches.push(temp);
-        if (options.first === true) {
-            break;
+    if (input instanceof types_1.Table) {
+        for (const blah of input.array()) {
+            let temp;
+            // eslint-disable-next-line no-cond-assign
+            while (temp = s.exec(blah.get())) {
+                matches.push(temp);
+                if (options.first === true) {
+                    break;
+                }
+            }
+        }
+    }
+    else {
+        let blah = input.get();
+        if (sectionOffset) {
+            blah = blah.substr(sectionOffset);
+        }
+        let temp;
+        // eslint-disable-next-line no-cond-assign
+        while (temp = s.exec(blah)) {
+            matches.push(temp);
+            if (options.first === true) {
+                break;
+            }
         }
     }
     if (options.submatches) {

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

@@ -1,2 +1,10 @@
 import { ICharacter } from "../types/_character";
-export declare function replace(input: ICharacter, all: boolean, s: ICharacter | string, r: ICharacter | string): void;
+export declare type replaceInput = {
+    target: ICharacter;
+    sectionLength?: ICharacter;
+    regex?: ICharacter;
+    all: boolean;
+    with: ICharacter;
+    of: ICharacter;
+};
+export declare function replace(input: replaceInput): void;

package/build/src/statements/replace.js

@@ -1,27 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replace = void 0;
-function replace(input, all, s, r) {
-    let temp = input.get();
+function replace(input) {
+    let temp = input.target.get();
     let search = "";
-    if (typeof s === "string") {
-        search = s;
+    let found = false;
+    if (input.of) {
+        search = input.of.get();
+        if (search.length === 0 && input.all === true) {
+            throw "REPLACE, zero length input";
+        }
+        found = temp.indexOf(search) >= 0;
     }
-    else {
-        search = s.get();
+    else if (input.regex) {
+        if (input.regex.get().length === 0 && input.all === true) {
+            throw "REPLACE, zero length input";
+        }
+        found = temp.match(search) !== null;
+        search = new RegExp(input.regex.get());
     }
     let replace = "";
-    if (typeof r === "string") {
-        replace = r;
+    if (typeof input.with === "string") {
+        replace = input.with;
     }
     else {
-        replace = r.get();
+        replace = input.with.get();
     }
-    const found = temp.indexOf(search) >= 0;
-    if (all === true) {
-        if (search.length === 0) {
-            throw "REPLACE, zero length input";
-        }
+    if (input.all === true) {
         while (temp.replace(search, replace) !== temp) {
             temp = temp.replace(search, replace);
         }
@@ -32,7 +37,7 @@ function replace(input, all, s, r) {
     const subrc = found ? 0 : 4;
     // @ts-ignore
     abap.builtin.sy.get().subrc.set(subrc);
-    input.set(temp);
+    input.target.set(temp);
 }
 exports.replace = replace;
 //# sourceMappingURL=replace.js.map

package/build/src/template_formatting.d.ts

@@ -5,6 +5,7 @@ declare type options = {
     date?: string;
     time?: string;
     width?: number;
+    decimals?: number;
 };
 export declare function templateFormatting(source: ICharacter | INumeric, options: options): string;
 export {};

package/build/src/template_formatting.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.templateFormatting = void 0;
+const types_1 = require("./types");
 function templateFormatting(source, options) {
     let text = source.get() + "";
     if (options.timestamp === "iso") {
@@ -15,6 +16,9 @@ function templateFormatting(source, options) {
     if (options.width) {
         text = text.trimEnd().padEnd(options.width, " ");
     }
+    else if (options.decimals && source instanceof types_1.Integer) {
+        text = source.get() + "." + "".padEnd(options.decimals, "0");
+    }
     return text;
 }
 exports.templateFormatting = templateFormatting;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "1.8.24",
+  "version": "1.8.27",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -37,6 +37,6 @@
     "chai": "^4.3.6",
     "mocha": "^9.2.2",
     "source-map-support": "^0.5.21",
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.3"
   }
 }