@abaplint/runtime 1.8.22 → 1.8.25

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/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") {
@@ -13,7 +14,10 @@ function templateFormatting(source, options) {
         text = text.substr(0, 2) + ":" + text.substr(2, 2) + ":" + text.substr(4, 2);
     }
     if (options.width) {
-        text = text.padEnd(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;
 }

package/build/src/types/table.js

@@ -120,14 +120,24 @@ class Table {
     }
     ///////////////////////////
     getValue(item, cloneRow = true) {
+        // make sure to do conversion if needed
         if (typeof item === "number") {
-            return new integer_1.Integer().set(item);
+            const tmp = (0, clone_1.clone)(this.getRowType());
+            tmp.set(new integer_1.Integer().set(item));
+            return tmp;
         }
         else if (typeof item === "string") {
-            return new string_1.String().set(item);
+            const tmp = (0, clone_1.clone)(this.getRowType());
+            tmp.set(new string_1.String().set(item));
+            return tmp;
+        }
+        else if (cloneRow === true) {
+            const tmp = (0, clone_1.clone)(this.getRowType());
+            tmp.set(item);
+            return tmp;
         }
         else {
-            return cloneRow === true ? (0, clone_1.clone)(item) : item;
+            return item;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "1.8.22",
+  "version": "1.8.25",
   "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"
   }
 }