@abaplint/runtime 2.0.12 → 2.0.15

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

@@ -1,2 +1,4 @@
-import { String } from "../types";
-export declare function boolc(input: boolean | undefined): String;
+import { Character, String } from "../types";
+export declare function boolc(input: boolean | undefined | {
+    val: Character;
+}): String;

package/build/src/builtin/boolc.js

@@ -7,7 +7,10 @@ function boolc(input) {
         return new types_1.String().set("X");
     }
     else if (input === false || input === undefined) {
-        return new types_1.String().set("");
+        return new types_1.String().set(" ");
+    }
+    else if (input.val instanceof types_1.Character && input.val.get().trim() === "") {
+        return new types_1.String().set(" ");
     }
     else {
         return new types_1.String().set("X");

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

@@ -12,6 +12,8 @@ export * from "./floor";
 export * from "./frac";
 export * from "./insert";
 export * from "./lines";
+export * from "./match";
+export * from "./matches";
 export * from "./nmax";
 export * from "./nmin";
 export * from "./repeat";
@@ -29,6 +31,7 @@ export * from "./substring";
 export * from "./sy";
 export * from "./tan";
 export * from "./to_lower";
+export * from "./to_mixed";
 export * from "./to_upper";
 export * from "./trunc";
 export * from "./xstrlen";

package/build/src/builtin/index.js

@@ -29,6 +29,8 @@ __exportStar(require("./floor"), exports);
 __exportStar(require("./frac"), exports);
 __exportStar(require("./insert"), exports);
 __exportStar(require("./lines"), exports);
+__exportStar(require("./match"), exports);
+__exportStar(require("./matches"), exports);
 __exportStar(require("./nmax"), exports);
 __exportStar(require("./nmin"), exports);
 __exportStar(require("./repeat"), exports);
@@ -46,6 +48,7 @@ __exportStar(require("./substring"), exports);
 __exportStar(require("./sy"), exports);
 __exportStar(require("./tan"), exports);
 __exportStar(require("./to_lower"), exports);
+__exportStar(require("./to_mixed"), exports);
 __exportStar(require("./to_upper"), exports);
 __exportStar(require("./trunc"), exports);
 __exportStar(require("./xstrlen"), exports);

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

@@ -0,0 +1,5 @@
+import { ICharacter } from "../types/_character";
+export declare function match(input: {
+    val: ICharacter | string;
+    regex: ICharacter | string;
+}): ICharacter;

package/build/src/builtin/match.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.match = void 0;
+const string_1 = require("../types/string");
+function match(input) {
+    const val = typeof input.val === "string" ? input.val : input.val.get();
+    let reg = "";
+    if (typeof input.regex === "string") {
+        reg = input.regex;
+    }
+    else {
+        reg = input.regex.get();
+    }
+    const r = new RegExp(reg);
+    const res = val.match(r);
+    let ret = "";
+    if (res && res[0]) {
+        ret = res[0];
+    }
+    return new string_1.String().set(ret);
+}
+exports.match = match;
+//# sourceMappingURL=match.js.map

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

@@ -0,0 +1,5 @@
+import { ICharacter } from "../types/_character";
+export declare function matches(input: {
+    val: ICharacter | string;
+    regex: ICharacter | string;
+}): ICharacter;

package/build/src/builtin/matches.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matches = void 0;
+const types_1 = require("../types");
+function matches(input) {
+    const val = typeof input.val === "string" ? input.val : input.val.get();
+    let reg = "";
+    if (typeof input.regex === "string") {
+        reg = input.regex;
+    }
+    else {
+        reg = input.regex.get();
+    }
+    const r = new RegExp("^" + reg + "$");
+    const res = val.match(r);
+    if (res !== null) {
+        return new types_1.Character().set("X");
+    }
+    else {
+        return new types_1.Character().set(" ");
+    }
+}
+exports.matches = matches;
+//# sourceMappingURL=matches.js.map

package/build/src/builtin/sy.js

@@ -13,6 +13,7 @@ exports.sy = new types_1.Structure({
     mandt: new types_1.Character({ length: 3 }).set("123"),
     msgid: new types_1.Character({ length: 20 }),
     msgno: new types_1.Numc({ length: 3 }),
+    msgty: new types_1.Character({ length: 1 }),
     msgv1: new types_1.Character({ length: 50 }),
     msgv2: new types_1.Character({ length: 50 }),
     msgv3: new types_1.Character({ length: 50 }),
@@ -20,8 +21,8 @@ exports.sy = new types_1.Structure({
     subrc: new types_1.Integer(),
     sysid: new types_1.Character({ length: 3 }).set("ABC"),
     tabix: new types_1.Integer(),
-    tzone: new types_1.Integer(),
     timlo: new types_1.Time(),
+    tzone: new types_1.Integer(),
     uname: new types_1.Character({ length: 12 }).set("USERNAME"),
     uzeit: new types_1.Time(),
 });

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

@@ -0,0 +1,9 @@
+import { String } from "../types";
+import { ICharacter } from "../types/_character";
+import { INumeric } from "../types/_numeric";
+export declare function to_mixed(input: {
+    val: ICharacter | string;
+    sep?: ICharacter | string;
+    case?: ICharacter | string;
+    min?: INumeric | number;
+}): String;

package/build/src/builtin/to_mixed.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.to_mixed = void 0;
+/* eslint-disable @typescript-eslint/ban-types */
+const types_1 = require("../types");
+function to_mixed(input) {
+    let sep = input.sep;
+    if (sep === undefined) {
+        sep = "_";
+    }
+    if (typeof sep !== "string") {
+        sep = sep.get();
+    }
+    if (sep.length === 0) {
+        throw "CX_SY_STRG_PAR_VAL";
+    }
+    const min = 1;
+    if (min < 0) {
+        throw "CX_SY_STRG_PAR_VAL";
+    }
+    let val = input.val;
+    if (typeof val !== "string") {
+        val = val.get();
+    }
+    val = val.substring(0, min) + val.substring(min).toLowerCase();
+    if (input.case) {
+        if (typeof input.case === "string") {
+            if (input.case === input.case.toLowerCase()) {
+                val = val.substring(0, 1).toLowerCase() + val.substring(1);
+            }
+        }
+        else {
+            if (input.case.get() === input.case.get().toLowerCase()) {
+                val = val.substring(0, 1).toLowerCase() + val.substring(1);
+            }
+        }
+    }
+    const length = sep.length;
+    const regex = new RegExp(sep + "\\w");
+    while (val.match(regex)) {
+        val = val.replace(regex, (x) => {
+            return x.substring(length).toUpperCase();
+        });
+    }
+    return new types_1.String().set(val);
+}
+exports.to_mixed = to_mixed;
+//# sourceMappingURL=to_mixed.js.map

package/build/src/compare/eq.js

@@ -80,7 +80,11 @@ function eq(left, right) {
     else if (left instanceof types_1.Hex && typeof r === "number") {
         l = parseInt(left.get(), 16);
     }
-    if (right instanceof types_1.Float && typeof l === "number") {
+    if (right instanceof types_1.Float && left instanceof types_1.Float) {
+        r = right.getRaw();
+        l = left.getRaw();
+    }
+    else if (right instanceof types_1.Float && typeof l === "number") {
         r = right.getRaw();
     }
     else if (left instanceof types_1.Float) {

package/build/src/statements/cast.js

@@ -5,28 +5,28 @@ const compare_1 = require("../compare");
 // todo, field symbols as input?
 // todo, local classes?
 async function cast(target, source) {
-    var _a;
     if ((0, compare_1.initial)(source)) {
         target.clear();
         return;
     }
-    const targetName = (_a = target.getQualifiedName()) === null || _a === void 0 ? void 0 : _a.toUpperCase();
-    if ((targetName === null || targetName === void 0 ? void 0 : targetName.startsWith("IF_")) === false
-        && (targetName === null || targetName === void 0 ? void 0 : targetName.startsWith("ZIF_")) === false) { // todo, interfaces are also classes but not inherited
-        // using "instanceof" is probably wrong in some cases,
-        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/instanceof
+    /*
+    const targetName = target.getQualifiedName()?.toUpperCase();
+    if (targetName?.startsWith("IF_") === false
+        && targetName?.startsWith("ZIF_") === false) { // todo, interfaces are also classes but not inherited
+      // using "instanceof" is probably wrong in some cases,
+      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/instanceof
+      // @ts-ignore
+      if (abap.Classes[targetName] && source instanceof abap.Classes[targetName] === false) {
         // @ts-ignore
-        if (abap.Classes[targetName] && source instanceof abap.Classes[targetName] === false) {
-            // @ts-ignore
-            if (abap.Classes["CX_SY_MOVE_CAST_ERROR"] !== undefined) {
-                // @ts-ignore
-                throw new abap.Classes["CX_SY_MOVE_CAST_ERROR"]();
-            }
-            else {
-                throw "Global class CX_SY_MOVE_CAST_ERROR not found";
-            }
+        if (abap.Classes["CX_SY_MOVE_CAST_ERROR"] !== undefined) {
+          // @ts-ignore
+          throw new abap.Classes["CX_SY_MOVE_CAST_ERROR"]();
+        } else {
+          throw "Global class CX_SY_MOVE_CAST_ERROR not found";
         }
+      }
     }
+    */
     // throw cx_sy_move_cast_error if incompatible
     // check with javascript instanceof?
     // handling interfaces?

package/build/src/statements/message.js

@@ -54,6 +54,11 @@ class MessageStatement {
             arbgb = arbgb.get();
         }
         arbgb = arbgb === null || arbgb === void 0 ? void 0 : arbgb.toUpperCase();
+        let msgty = options.type;
+        if (msgty !== undefined && typeof msgty !== "string") {
+            msgty = msgty.get();
+        }
+        msgty = msgty === null || msgty === void 0 ? void 0 : msgty.toUpperCase();
         // @ts-ignore
         abap.builtin.sy.get().msgid.set(arbgb);
         let msgnr = options.number;
@@ -62,6 +67,8 @@ class MessageStatement {
         }
         // @ts-ignore
         abap.builtin.sy.get().msgno.set(msgnr);
+        // @ts-ignore
+        abap.builtin.sy.get().msgty.set(msgty);
         const text = await findText(this.context, arbgb, msgnr);
         const replaced = replace(text, options.with);
         if (options.into) {

package/build/src/template_formatting.d.ts

@@ -7,6 +7,7 @@ declare type options = {
     pad?: string;
     width?: number;
     decimals?: number;
+    currency?: any;
     align?: "left" | "right";
 };
 export declare function templateFormatting(source: ICharacter | INumeric, options: options): string;

package/build/src/template_formatting.js

@@ -4,6 +4,9 @@ exports.templateFormatting = void 0;
 const types_1 = require("./types");
 function templateFormatting(source, options) {
     let text = source.get() + "";
+    if (options.currency !== undefined) {
+        throw "template formatting with currency not supported";
+    }
     if (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);
     }

package/package.json

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