@abaplint/runtime 2.1.49 → 2.1.50

package/build/src/builtin/replace.js

@@ -17,7 +17,7 @@ function replace(input) {
         wi = input.with;
     }
     else if (input.with instanceof types_1.Character) {
-        wi = input.with.get().replace(/ *$/, "");
+        wi = input.with.getTrimEnd();
     }
     else if (input.with) {
         wi = input.with.get();

package/build/src/compare/eq.js

@@ -60,7 +60,7 @@ function eq(left, right) {
     }
     let l = undefined;
     if (left instanceof types_1.Character) {
-        l = left.get().replace(/ *$/, "");
+        l = left.getTrimEnd();
     }
     else if (typeof left === "object") {
         l = left.get();
@@ -70,7 +70,7 @@ function eq(left, right) {
     }
     let r = undefined;
     if (right instanceof types_1.Character) {
-        r = right.get().replace(/ *$/, "");
+        r = right.getTrimEnd();
     }
     else if (typeof right === "object") {
         r = right.get();

package/build/src/operators/concat.js

@@ -8,7 +8,7 @@ function concat(left, right) {
         val += left;
     }
     else if (left instanceof types_1.Character) {
-        val += left.get().replace(/( )*$/, "");
+        val += left.getTrimEnd();
     }
     else {
         val += left.get();
@@ -17,7 +17,7 @@ function concat(left, right) {
         val += right;
     }
     else if (right instanceof types_1.Character) {
-        val += right.get().replace(/( )*$/, "");
+        val += right.getTrimEnd();
     }
     else {
         val += right.get();

package/build/src/template_formatting.d.ts

@@ -10,5 +10,5 @@ declare type options = {
     currency?: any;
     align?: "left" | "right";
 };
-export declare function templateFormatting(source: ICharacter | INumeric, options: options): string;
+export declare function templateFormatting(source: ICharacter | INumeric, options?: options): string;
 export {};

package/build/src/template_formatting.js

@@ -3,23 +3,29 @@ 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.currency !== undefined) {
+    let text = "";
+    if (source instanceof types_1.Character) {
+        text = source.getTrimEnd();
+    }
+    else {
+        text = source.get() + "";
+    }
+    if ((options === null || options === void 0 ? void 0 : options.currency) !== undefined) {
         throw "template formatting with currency not supported";
     }
-    if (options.timestamp === "iso") {
+    if ((options === null || options === void 0 ? void 0 : options.timestamp) === "iso") {
         text = text.substr(0, 4) + "-" + text.substr(4, 2) + "-" + text.substr(6, 2) + "T" + text.substr(8, 2) + ":" + text.substr(10, 2) + ":" + text.substr(12, 2);
         if (text === "0--T::") {
             text = "0000-00-00T00:00:00";
         }
     }
-    if (options.date === "iso") {
+    if ((options === null || options === void 0 ? void 0 : options.date) === "iso") {
         text = text.substr(0, 4) + "-" + text.substr(4, 2) + "-" + text.substr(6, 2);
     }
-    if (options.time === "iso") {
+    if ((options === null || options === void 0 ? void 0 : options.time) === "iso") {
         text = text.substr(0, 2) + ":" + text.substr(2, 2) + ":" + text.substr(4, 2);
     }
-    if (options.width && options.pad) {
+    if ((options === null || options === void 0 ? void 0 : options.width) && options.pad) {
         if (options.align === "right") {
             text = text.trimEnd().padStart(options.width, options.pad);
         }
@@ -27,13 +33,13 @@ function templateFormatting(source, options) {
             text = text.trimEnd().padEnd(options.width, options.pad);
         }
     }
-    else if (options.width) {
+    else if (options === null || options === void 0 ? void 0 : options.width) {
         text = text.trimEnd().padEnd(options.width, " ");
     }
-    else if (options.decimals && source instanceof types_1.Integer) {
+    else if ((options === null || options === void 0 ? void 0 : options.decimals) && source instanceof types_1.Integer) {
         text = source.get() + "." + "".padEnd(options.decimals, "0");
     }
-    else if (options.decimals && source instanceof types_1.Packed) {
+    else if ((options === null || options === void 0 ? void 0 : options.decimals) && source instanceof types_1.Packed) {
         text = source.get().toFixed(options.decimals);
     }
     return text;

package/build/src/types/character.d.ts

@@ -14,6 +14,7 @@ export declare class Character implements ICharacter {
     getLength(): number;
     clear(): void;
     get(): string;
+    getTrimEnd(): string;
     getOffset(input: {
         offset?: number | INumeric | Hex;
         length?: number | INumeric | Hex;

package/build/src/types/character.js

@@ -40,6 +40,9 @@ class Character {
     get() {
         return this.value;
     }
+    getTrimEnd() {
+        return this.value.replace(/ *$/, "");
+    }
     getOffset(input) {
         if (input === null || input === void 0 ? void 0 : input.offset) {
             input.offset = (0, _parse_1.parse)(input.offset);

package/build/src/types/string.js

@@ -21,7 +21,7 @@ class String {
         }
         else if (value instanceof character_1.Character) {
             // replace trailing blanks if the source is a Character string
-            this.value = value.get().replace(/[ ]*$/g, "");
+            this.value = value.getTrimEnd();
         }
         else if (value instanceof integer_1.Integer) {
             const lv_sign = (parseInt(value.get(), 10) >= 0) ? " " : "-";

package/package.json

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