@abaplint/runtime 2.2.17 → 2.2.19

package/build/src/offset_length.d.ts

@@ -1,4 +1,4 @@
-import { Character } from "./types";
+import { Character, Hex, Structure, XString } from "./types";
 import { ICharacter } from "./types/_character";
 import { INumeric } from "./types/_numeric";
 export interface IOffsetLengthOptions {
@@ -10,7 +10,7 @@ export declare class OffsetLength {
     private readonly offset?;
     private readonly length?;
     private readonly isHex;
-    constructor(obj: Character, options: IOffsetLengthOptions);
+    constructor(obj: Character | Hex | XString | Structure, options: IOffsetLengthOptions);
     get(): string;
     set(value: ICharacter | string): void;
 }

package/build/src/offset_length.js

@@ -49,7 +49,7 @@ class OffsetLength {
         else {
             val = value.get() + "";
         }
-        let old = this.obj.get();
+        let old = this.obj instanceof types_1.Structure ? this.obj.getCharacter() : this.obj.get();
         if (this.obj instanceof types_1.Character) {
             old = old.padEnd(this.obj.getLength(), " ");
         }

package/build/src/statements/concatenate.js

@@ -14,15 +14,23 @@ function concatenate(input) {
     }
     else {
         for (const source of input.source) {
-            if (typeof source === "string" || typeof source === "number") {
-                list.push(source.toString());
-            }
-            else if (source instanceof types_1.Table) {
+            let val = "";
+            if (source instanceof types_1.Table) {
                 throw new Error("concatenate, error input is table");
             }
+            else if (typeof source === "string" || typeof source === "number") {
+                val = source.toString();
+            }
+            else if (source instanceof types_1.Character) {
+                val = source.get().toString();
+                if (input.respectingBlanks !== true) {
+                    val = val.replace(/ +$/, "");
+                }
+            }
             else {
-                list.push(source.get().toString());
+                val = source.get().toString();
             }
+            list.push(val);
         }
     }
     let sep = "";

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

@@ -10,6 +10,7 @@ import { createData } from "./create_data";
 import { deleteInternal } from "./delete_internal";
 import { describe } from "./describe";
 import { find } from "./find";
+import { overlay } from "./overlay";
 import { cast } from "./cast";
 import { getBit } from "./get_bit";
 import { getLocale } from "./get_locale";
@@ -55,6 +56,7 @@ export declare class Statements {
     deleteInternal: typeof deleteInternal;
     describe: typeof describe;
     find: typeof find;
+    overlay: typeof overlay;
     getParameter: typeof getParameter;
     getBit: typeof getBit;
     getLocale: typeof getLocale;

package/build/src/statements/index.js

@@ -13,6 +13,7 @@ const create_data_1 = require("./create_data");
 const delete_internal_1 = require("./delete_internal");
 const describe_1 = require("./describe");
 const find_1 = require("./find");
+const overlay_1 = require("./overlay");
 const cast_1 = require("./cast");
 const get_bit_1 = require("./get_bit");
 const get_locale_1 = require("./get_locale");
@@ -57,6 +58,7 @@ class Statements {
         this.deleteInternal = delete_internal_1.deleteInternal;
         this.describe = describe_1.describe;
         this.find = find_1.find;
+        this.overlay = overlay_1.overlay;
         this.getParameter = get_parameter_1.getParameter;
         this.getBit = get_bit_1.getBit;
         this.getLocale = get_locale_1.getLocale;

package/build/src/statements/message.js

@@ -40,7 +40,7 @@ async function findText(context, arbgb, msgnr, msgty) {
     }
     if (text === undefined) {
         // fallback
-        text = msgty + ":" + arbgb + ":" + msgnr + " &1 &2 &3 &4";
+        text = msgty + ":" + (arbgb === null || arbgb === void 0 ? void 0 : arbgb.trim()) + ":" + msgnr + " &1 &2 &3 &4";
     }
     return text;
 }

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

@@ -0,0 +1,3 @@
+import { Character, Structure } from "../types";
+import { ICharacter } from "../types/_character";
+export declare function overlay(value: Character | Structure, withh: ICharacter, _only?: ICharacter): void;

package/build/src/statements/overlay.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.overlay = void 0;
+const offset_length_1 = require("../offset_length");
+const types_1 = require("../types");
+function overlay(value, withh, _only) {
+    const set = value instanceof types_1.Structure ? value.getCharacter() : value.get();
+    const w = withh.get();
+    const len = set.length;
+    for (let i = 0; i < len; i++) {
+        if (set.substring(i, i + 1) === " ") {
+            new offset_length_1.OffsetLength(value, { offset: i, length: 1 }).set(w.substring(i, i + 1));
+        }
+    }
+}
+exports.overlay = overlay;
+//# sourceMappingURL=overlay.js.map

package/build/src/statements/write.js

@@ -20,10 +20,8 @@ class WriteStatement {
                 result = source.toString();
             }
             else if (source instanceof types_1.Structure) {
-                const obj = source.get();
-                for (const f in obj) {
-                    this.write(obj[f], Object.assign({}, options));
-                }
+                const obj = source.getCharacter();
+                this.write(obj, Object.assign({}, options));
             }
             else if (source instanceof types_1.Float) {
                 if (((_a = options === null || options === void 0 ? void 0 : options.exponent) === null || _a === void 0 ? void 0 : _a.get()) === 0) {

package/build/src/template_formatting.js

@@ -43,11 +43,23 @@ function templateFormatting(source, options) {
         text = text.trimEnd().padEnd(options.width, " ");
     }
     else if ((options === null || options === void 0 ? void 0 : options.decimals) && source instanceof types_1.Integer) {
-        text = source.get() + "." + "".padEnd(options.decimals, "0");
+        text = source.get().toFixed(options.decimals);
     }
     else if ((options === null || options === void 0 ? void 0 : options.decimals) && source instanceof types_1.Packed) {
         text = source.get().toFixed(options.decimals);
     }
+    else if ((options === null || options === void 0 ? void 0 : options.decimals) && source instanceof types_1.Float) {
+        text = source.getRaw().toFixed(options.decimals);
+    }
+    else if (source instanceof types_1.Float) {
+        const raw = source.getRaw();
+        if (Number.isInteger(raw)) {
+            text = raw.toFixed(0);
+        }
+        else {
+            text = raw.toFixed(16);
+        }
+    }
     return text;
 }
 exports.templateFormatting = templateFormatting;

package/build/src/types/character.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Character = void 0;
 const _parse_1 = require("../operators/_parse");
+// eslint-disable-next-line prefer-const
+let featureFixLength = true;
 class Character {
     constructor(input) {
         this.length = (input === null || input === void 0 ? void 0 : input.length) ? input === null || input === void 0 ? void 0 : input.length : 1;
@@ -20,9 +22,9 @@ class Character {
         }
         if (this.value.length > this.length) {
             this.value = this.value.substr(0, this.length);
-            // todo, maintain consistent length
-            //    } else if (this.value.length < this.length) {
-            //      this.value.padEnd(this.length, " ");
+        }
+        else if (featureFixLength && this.value.length < this.length) {
+            this.value.padEnd(this.length, " ");
         }
         return this;
     }
@@ -33,9 +35,12 @@ class Character {
         return this.length;
     }
     clear() {
-        // todo, maintain consistent length
-        //    this.value = " ".repeat(this.length);
-        this.value = "";
+        if (featureFixLength) {
+            this.value = " ".repeat(this.length);
+        }
+        else {
+            this.value = "";
+        }
     }
     get() {
         return this.value;

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

@@ -2,6 +2,8 @@ import { FieldSymbol } from "./field_symbol";
 import { Table } from "./table";
 import { ICharacter } from "./_character";
 import { INumeric } from "./_numeric";
+import { Hex } from "./hex";
+import { Character } from "./character";
 export declare class Structure {
     private readonly value;
     private readonly qualifiedName;
@@ -11,4 +13,9 @@ export declare class Structure {
     set(input: Structure | string | INumeric | Table | ICharacter | FieldSymbol | undefined): this | undefined;
     private setCharacter;
     get(): any;
+    getCharacter(): string;
+    getOffset(input: {
+        offset?: number | INumeric | Hex;
+        length?: number | INumeric | Hex;
+    }): Character;
 }

package/build/src/types/structure.js

@@ -4,6 +4,8 @@ exports.Structure = void 0;
 const clone_1 = require("../clone");
 const field_symbol_1 = require("./field_symbol");
 const table_1 = require("./table");
+const _parse_1 = require("../operators/_parse");
+const character_1 = require("./character");
 class Structure {
     constructor(fields, qualifiedName) {
         this.value = fields;
@@ -69,6 +71,46 @@ class Structure {
     get() {
         return this.value;
     }
+    getCharacter() {
+        let val = "";
+        for (const v in this.value) {
+            val += this.value[v].get();
+        }
+        return val;
+    }
+    getOffset(input) {
+        if (input === null || input === void 0 ? void 0 : input.offset) {
+            input.offset = (0, _parse_1.parse)(input.offset);
+        }
+        if (input === null || input === void 0 ? void 0 : input.length) {
+            input.length = (0, _parse_1.parse)(input.length);
+        }
+        const val = this.getCharacter();
+        if ((input.offset && input.offset >= val.length)
+            || (input.offset && input.offset < 0)
+            || (input.length && input.length < 0)) {
+            // @ts-ignore
+            if (abap.Classes["CX_SY_RANGE_OUT_OF_BOUNDS"] !== undefined) {
+                // @ts-ignore
+                throw new abap.Classes["CX_SY_RANGE_OUT_OF_BOUNDS"]();
+            }
+            else {
+                throw "Global class CX_SY_RANGE_OUT_OF_BOUNDS not found";
+            }
+        }
+        let ret = val;
+        if (input === null || input === void 0 ? void 0 : input.offset) {
+            // @ts-ignore
+            ret = ret.substr(input.offset);
+        }
+        if ((input === null || input === void 0 ? void 0 : input.length) !== undefined) {
+            // @ts-ignore
+            ret = ret.substr(0, input.length);
+        }
+        const r = new character_1.Character({ length: ret.length });
+        r.set(ret);
+        return r;
+    }
 }
 exports.Structure = Structure;
 //# sourceMappingURL=structure.js.map

package/package.json

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