greybel-interpreter 0.5.8 → 0.6.2

package/dist/expressions/call.js

@@ -152,25 +152,27 @@ var CallExpression = /** @class */ (function (_super) {
         var evaluate = function (node) {
             return __awaiter(this, void 0, void 0, function () {
                 var args, pathExpr, callable_1, _a, callable, _b;
-                var _c, _d, _e;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                var _c, _d;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (node instanceof expression_1.Expression) {
                                 return [2 /*return*/, node.get(opc)];
                             }
                             return [4 /*yield*/, node.resolveArgs(operationContext)];
                         case 1:
-                            args = _f.sent();
+                            args = _e.sent();
                             return [4 /*yield*/, node.path.get(opc, me.expr)];
                         case 2:
-                            pathExpr = _f.sent();
+                            pathExpr = _e.sent();
                             operationContext.debugger.debug('Line', me.ast.start.line, 'CallExpression', 'pathExpr', pathExpr);
-                            if (!pathExpr.handle) return [3 /*break*/, 8];
-                            if (!(0, typer_1.isCustomMap)(pathExpr.handle)) return [3 /*break*/, 7];
+                            if (!pathExpr.handle) return [3 /*break*/, 7];
+                            if (!((0, typer_1.isCustomMap)(pathExpr.handle) ||
+                                (0, typer_1.isCustomList)(pathExpr.handle) ||
+                                (0, typer_1.isCustomString)(pathExpr.handle))) return [3 /*break*/, 6];
                             return [4 /*yield*/, pathExpr.handle.getCallable(pathExpr.path)];
                         case 3:
-                            callable_1 = _f.sent();
+                            callable_1 = _e.sent();
                             if (!(callable_1.origin instanceof operation_1.Operation)) return [3 /*break*/, 4];
                             opc.setMemory('args', args);
                             return [2 /*return*/, callable_1.origin.run(opc)];
@@ -178,23 +180,22 @@ var CallExpression = /** @class */ (function (_super) {
                             if (!(callable_1.origin instanceof Function)) return [3 /*break*/, 6];
                             _a = typer_1.cast;
                             return [4 /*yield*/, (_c = callable_1.origin).call.apply(_c, __spreadArray([pathExpr.handle], __read(args), false))];
-                        case 5: return [2 /*return*/, _a.apply(void 0, [_f.sent()])];
+                        case 5: return [2 /*return*/, _a.apply(void 0, [_e.sent()])];
                         case 6:
-                            operationContext.debugger.raise('Unexpected handle call', me, callable_1);
-                            _f.label = 7;
-                        case 7: return [2 /*return*/, (0, typer_1.cast)((_d = pathExpr.handle).callMethod.apply(_d, __spreadArray([pathExpr.path], __read(args), false)))];
-                        case 8: return [4 /*yield*/, opc.getCallable(pathExpr.path)];
-                        case 9:
-                            callable = _f.sent();
+                            operationContext.debugger.raise('Unexpected handle call', me, pathExpr);
+                            _e.label = 7;
+                        case 7: return [4 /*yield*/, opc.getCallable(pathExpr.path)];
+                        case 8:
+                            callable = _e.sent();
                             opc.setMemory('args', args);
-                            if (!(callable.origin instanceof operation_1.Operation)) return [3 /*break*/, 10];
+                            if (!(callable.origin instanceof operation_1.Operation)) return [3 /*break*/, 9];
                             return [2 /*return*/, callable.origin.run(opc)];
-                        case 10:
-                            if (!(callable.origin instanceof Function)) return [3 /*break*/, 12];
+                        case 9:
+                            if (!(callable.origin instanceof Function)) return [3 /*break*/, 11];
                             _b = typer_1.cast;
-                            return [4 /*yield*/, (_e = callable.origin).call.apply(_e, __spreadArray([callable.context], __read(args), false))];
-                        case 11: return [2 /*return*/, _b.apply(void 0, [_f.sent()])];
-                        case 12: return [2 /*return*/, (0, typer_1.cast)(callable.origin)];
+                            return [4 /*yield*/, (_d = callable.origin).call.apply(_d, __spreadArray([callable.context], __read(args), false))];
+                        case 10: return [2 /*return*/, _b.apply(void 0, [_e.sent()])];
+                        case 11: return [2 /*return*/, (0, typer_1.cast)(callable.origin)];
                     }
                 });
             });

package/dist/expressions/logical-and-binary.d.ts

@@ -2,7 +2,6 @@ import { ASTEvaluationExpression } from 'greybel-core';
 import { Expression } from '../types/expression';
 import { OperationContext } from '../context';
 import { CustomType } from '../types/custom-type';
-export declare const toPrimitive: (v: CustomType | any) => any;
 export declare const multiplyString: (a: CustomType, b: CustomType) => string;
 export declare type OperationMap = {
     [key: string]: (a: CustomType, b: CustomType) => any;

package/dist/expressions/logical-and-binary.js

@@ -52,18 +52,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressionSegment = exports.OPERATIONS = exports.multiplyString = exports.toPrimitive = void 0;
+exports.ExpressionSegment = exports.OPERATIONS = exports.multiplyString = void 0;
 var greybel_core_1 = require("greybel-core");
 var greyscript_core_1 = require("greyscript-core");
 var expression_1 = require("../types/expression");
 var typer_1 = require("../typer");
-var toPrimitive = function (v) {
-    return (0, typer_1.isCustomValue)(v) ? v.valueOf() : v;
-};
-exports.toPrimitive = toPrimitive;
 var multiplyString = function (a, b) {
-    var aVal = a.valueOf() || '';
-    var bVal = b.valueOf();
+    var aVal = a.toString();
+    var bVal = b.toNumber();
     return new Array(bVal)
         .fill(aVal)
         .join('');
@@ -77,12 +73,13 @@ exports.OPERATIONS = (_a = {},
         else if ((0, typer_1.isCustomList)(a) && (0, typer_1.isCustomList)(b)) {
             return a.concat(b);
         }
-        var aVal = (0, typer_1.isCustomString)(a) ? (a.valueOf() || '') : (0, exports.toPrimitive)(a);
-        var bVal = (0, typer_1.isCustomString)(b) ? (b.valueOf() || '') : (0, exports.toPrimitive)(b);
-        return aVal + bVal;
+        else if ((0, typer_1.isCustomString)(a) || (0, typer_1.isCustomString)(b)) {
+            return a.toString() + b.toString();
+        }
+        return a.toNumber() + b.toNumber();
     },
-    _a[greybel_core_1.Operator.Minus] = function (a, b) { return (0, exports.toPrimitive)(a) - (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.Slash] = function (a, b) { return (0, exports.toPrimitive)(a) / (0, exports.toPrimitive)(b); },
+    _a[greybel_core_1.Operator.Minus] = function (a, b) { return a.toNumber() - b.toNumber(); },
+    _a[greybel_core_1.Operator.Slash] = function (a, b) { return a.toNumber() / b.toNumber(); },
     _a[greybel_core_1.Operator.Asterik] = function (a, b) {
         if ((0, typer_1.isCustomString)(a) && (0, typer_1.isCustomNumber)(b)) {
             return (0, exports.multiplyString)(a, b);
@@ -90,25 +87,23 @@ exports.OPERATIONS = (_a = {},
         else if ((0, typer_1.isCustomString)(b) && (0, typer_1.isCustomNumber)(a)) {
             return (0, exports.multiplyString)(b, a);
         }
-        var aVal = (0, exports.toPrimitive)(a);
-        var bVal = (0, exports.toPrimitive)(b);
-        return aVal * bVal;
+        return a.toNumber() * b.toNumber();
     },
-    _a[greybel_core_1.Operator.Xor] = function (a, b) { return (0, exports.toPrimitive)(a) ^ (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.BitwiseOr] = function (a, b) { return (0, exports.toPrimitive)(a) | (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.LessThan] = function (a, b) { return (0, exports.toPrimitive)(a) < (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.GreaterThan] = function (a, b) { return (0, exports.toPrimitive)(a) > (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.LeftShift] = function (a, b) { return (0, exports.toPrimitive)(a) << (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.RightShift] = function (a, b) { return (0, exports.toPrimitive)(a) >> (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.UnsignedRightShift] = function (a, b) { return (0, exports.toPrimitive)(a) >>> (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.BitwiseAnd] = function (a, b) { return (0, exports.toPrimitive)(a) & (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.PercentSign] = function (a, b) { return (0, exports.toPrimitive)(a) % (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.GreaterThanOrEqual] = function (a, b) { return (0, exports.toPrimitive)(a) >= (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.Equal] = function (a, b) { return (0, exports.toPrimitive)(a) == (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.LessThanOrEqual] = function (a, b) { return (0, exports.toPrimitive)(a) <= (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.NotEqual] = function (a, b) { return (0, exports.toPrimitive)(a) != (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.And] = function (a, b) { return (0, exports.toPrimitive)(a) && (0, exports.toPrimitive)(b); },
-    _a[greybel_core_1.Operator.Or] = function (a, b) { return (0, exports.toPrimitive)(a) || (0, exports.toPrimitive)(b); },
+    _a[greybel_core_1.Operator.Xor] = function (a, b) { return a.toNumber() ^ b.toNumber(); },
+    _a[greybel_core_1.Operator.BitwiseOr] = function (a, b) { return a.toNumber() | b.toNumber(); },
+    _a[greybel_core_1.Operator.LessThan] = function (a, b) { return a.toNumber() < b.toNumber(); },
+    _a[greybel_core_1.Operator.GreaterThan] = function (a, b) { return a.toNumber() > b.toNumber(); },
+    _a[greybel_core_1.Operator.LeftShift] = function (a, b) { return a.toNumber() << b.toNumber(); },
+    _a[greybel_core_1.Operator.RightShift] = function (a, b) { return a.toNumber() >> b.toNumber(); },
+    _a[greybel_core_1.Operator.UnsignedRightShift] = function (a, b) { return a.toNumber() >>> b.toNumber(); },
+    _a[greybel_core_1.Operator.BitwiseAnd] = function (a, b) { return a.toNumber() & b.toNumber(); },
+    _a[greybel_core_1.Operator.PercentSign] = function (a, b) { return a.toNumber() % b.toNumber(); },
+    _a[greybel_core_1.Operator.GreaterThanOrEqual] = function (a, b) { return a.valueOf() >= b.valueOf(); },
+    _a[greybel_core_1.Operator.Equal] = function (a, b) { return a.valueOf() == b.valueOf(); },
+    _a[greybel_core_1.Operator.LessThanOrEqual] = function (a, b) { return a.valueOf() <= b.valueOf(); },
+    _a[greybel_core_1.Operator.NotEqual] = function (a, b) { return a.valueOf() != b.valueOf(); },
+    _a[greybel_core_1.Operator.And] = function (a, b) { return a.toTruthy() && b.toTruthy(); },
+    _a[greybel_core_1.Operator.Or] = function (a, b) { return a.toTruthy() || b.toTruthy(); },
     _a);
 var ExpressionSegment = /** @class */ (function () {
     function ExpressionSegment(type, operator, left, right) {
@@ -162,9 +157,9 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                     case 0:
                         me = this;
                         evaluate = function (node) { return __awaiter(_this, void 0, void 0, function () {
-                            var expr, _a, binaryResult, _b, _c, _d, logicalLeft, logicalResult, _e, _f, _g;
-                            return __generator(this, function (_h) {
-                                switch (_h.label) {
+                            var expr, _a, binaryResult, _b, _c, _d, _e, _f, logicalLeft, _g, logicalResult, _h, _j, _k, _l;
+                            return __generator(this, function (_m) {
+                                switch (_m.label) {
                                     case 0:
                                         if (!(0, typer_1.isCustomValue)(node)) return [3 /*break*/, 1];
                                         return [2 /*return*/, node];
@@ -182,30 +177,32 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                                         return [3 /*break*/, 8];
                                     case 2:
                                         _c = (_b = exports.OPERATIONS)[expr.operator];
+                                        _d = typer_1.cast;
                                         return [4 /*yield*/, evaluate(expr.left)];
                                     case 3:
-                                        _d = [_h.sent()];
+                                        _e = [_d.apply(void 0, [_m.sent()])];
+                                        _f = typer_1.cast;
                                         return [4 /*yield*/, evaluate(expr.right)];
                                     case 4:
-                                        binaryResult = _c.apply(_b, _d.concat([_h.sent()]));
-                                        return [2 /*return*/, Number.isNaN(binaryResult) ? null : binaryResult];
-                                    case 5: return [4 /*yield*/, evaluate(expr.left)];
+                                        binaryResult = _c.apply(_b, _e.concat([_f.apply(void 0, [_m.sent()])]));
+                                        return [2 /*return*/, binaryResult];
+                                    case 5:
+                                        _g = typer_1.cast;
+                                        return [4 /*yield*/, evaluate(expr.left)];
                                     case 6:
-                                        logicalLeft = _h.sent();
-                                        if ((0, typer_1.isCustomList)(logicalLeft) && !logicalLeft.valueOf()) {
-                                            logicalLeft = false;
-                                        }
-                                        if (expr.operator === greybel_core_1.Operator.And && !(0, exports.toPrimitive)(logicalLeft)) {
+                                        logicalLeft = _g.apply(void 0, [_m.sent()]);
+                                        if (expr.operator === greybel_core_1.Operator.And && !logicalLeft.toTruthy()) {
                                             return [2 /*return*/, false];
                                         }
-                                        else if (expr.operator === greybel_core_1.Operator.Or && (0, exports.toPrimitive)(logicalLeft)) {
+                                        else if (expr.operator === greybel_core_1.Operator.Or && logicalLeft.toTruthy()) {
                                             return [2 /*return*/, true];
                                         }
-                                        _f = (_e = exports.OPERATIONS)[expr.operator];
-                                        _g = [logicalLeft];
+                                        _j = (_h = exports.OPERATIONS)[expr.operator];
+                                        _k = [logicalLeft];
+                                        _l = typer_1.cast;
                                         return [4 /*yield*/, evaluate(expr.right)];
                                     case 7:
-                                        logicalResult = _f.apply(_e, _g.concat([_h.sent()]));
+                                        logicalResult = _j.apply(_h, _k.concat([_l.apply(void 0, [_m.sent()])]));
                                         return [2 /*return*/, logicalResult];
                                     case 8: return [2 /*return*/, node.get(operationContext)];
                                 }

package/dist/expressions/path.js

@@ -198,14 +198,14 @@ var PathExpression = /** @class */ (function (_super) {
                         me = this;
                         evaluate = function (node) {
                             return __awaiter(this, void 0, void 0, function () {
-                                var traverselPath, traversedPath, position, handle, current, functionContext, origin, value, origin, left, right;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
+                                var traverselPath, traversedPath, position, handle, current, functionContext, origin, _a, value, origin, left, right;
+                                return __generator(this, function (_b) {
+                                    switch (_b.label) {
                                         case 0:
                                             traverselPath = [].concat(node.value);
                                             traversedPath = [];
                                             position = 0;
-                                            _a.label = 1;
+                                            _b.label = 1;
                                         case 1:
                                             if (!(current = traverselPath.shift())) return [3 /*break*/, 30];
                                             if (!(0, typer_1.isCustomValue)(current)) return [3 /*break*/, 2];
@@ -215,13 +215,13 @@ var PathExpression = /** @class */ (function (_super) {
                                             if (!(current instanceof expression_1.Expression)) return [3 /*break*/, 4];
                                             return [4 /*yield*/, current.get(operationContext, me.expr)];
                                         case 3:
-                                            handle = _a.sent();
+                                            handle = _b.sent();
                                             return [3 /*break*/, 29];
                                         case 4:
                                             if (!(current instanceof operation_1.Operation)) return [3 /*break*/, 6];
                                             return [4 /*yield*/, current.get(operationContext)];
                                         case 5:
-                                            handle = _a.sent();
+                                            handle = _b.sent();
                                             return [3 /*break*/, 29];
                                         case 6:
                                             if (!(current instanceof PathSegment)) return [3 /*break*/, 12];
@@ -239,18 +239,19 @@ var PathExpression = /** @class */ (function (_super) {
                                             if (!(traverselPath.length > 0)) return [3 /*break*/, 11];
                                             return [4 /*yield*/, (handle || operationContext).get(traversedPath)];
                                         case 8:
-                                            origin = _a.sent();
+                                            origin = _b.sent();
                                             if (!(0, typer_1.isCustomValue)(origin)) return [3 /*break*/, 9];
                                             handle = origin;
                                             traversedPath = [];
                                             return [3 /*break*/, 11];
                                         case 9:
                                             if (!(origin instanceof Function)) return [3 /*break*/, 11];
+                                            _a = typer_1.cast;
                                             return [4 /*yield*/, origin.call(handle)];
                                         case 10:
-                                            handle = _a.sent();
+                                            handle = _a.apply(void 0, [_b.sent()]);
                                             traversedPath = [];
-                                            _a.label = 11;
+                                            _b.label = 11;
                                         case 11: return [3 /*break*/, 29];
                                         case 12:
                                             if (!(current instanceof IndexSegment)) return [3 /*break*/, 19];
@@ -262,31 +263,31 @@ var PathExpression = /** @class */ (function (_super) {
                                             if (!(current instanceof expression_1.Expression)) return [3 /*break*/, 15];
                                             return [4 /*yield*/, current.get(operationContext)];
                                         case 14:
-                                            value = _a.sent();
+                                            value = _b.sent();
                                             traversedPath.push(value.toString());
                                             return [3 /*break*/, 16];
                                         case 15:
                                             operationContext.debugger.raise('Unexpected index', me, current);
-                                            _a.label = 16;
+                                            _b.label = 16;
                                         case 16:
                                             if (!(handle && !parentExpr)) return [3 /*break*/, 18];
                                             return [4 /*yield*/, handle.get(traversedPath, me.expr)];
                                         case 17:
-                                            origin = _a.sent();
+                                            origin = _b.sent();
                                             if (origin instanceof Function || origin instanceof function_1.default) {
                                                 handle = origin;
                                                 traversedPath = [];
                                             }
-                                            _a.label = 18;
+                                            _b.label = 18;
                                         case 18: return [3 /*break*/, 29];
                                         case 19:
                                             if (!(current instanceof SliceSegment)) return [3 /*break*/, 28];
                                             if (!!handle) return [3 /*break*/, 21];
                                             return [4 /*yield*/, operationContext.get(traversedPath)];
                                         case 20:
-                                            handle = _a.sent();
+                                            handle = _b.sent();
                                             traversedPath = [];
-                                            _a.label = 21;
+                                            _b.label = 21;
                                         case 21:
                                             if (!(0, typer_1.isCustomList)(handle) && !(0, typer_1.isCustomString)(handle)) {
                                                 operationContext.debugger.raise('Invalid type for slice', me, handle);
@@ -299,8 +300,8 @@ var PathExpression = /** @class */ (function (_super) {
                                             if (!(left instanceof expression_1.Expression)) return [3 /*break*/, 24];
                                             return [4 /*yield*/, left.get(operationContext)];
                                         case 23:
-                                            left = _a.sent();
-                                            _a.label = 24;
+                                            left = _b.sent();
+                                            _b.label = 24;
                                         case 24:
                                             right = current.right;
                                             if (!(0, typer_1.isCustomValue)(right)) return [3 /*break*/, 25];
@@ -310,14 +311,14 @@ var PathExpression = /** @class */ (function (_super) {
                                             if (!(right instanceof expression_1.Expression)) return [3 /*break*/, 27];
                                             return [4 /*yield*/, right.get(operationContext)];
                                         case 26:
-                                            right = _a.sent();
-                                            _a.label = 27;
+                                            right = _b.sent();
+                                            _b.label = 27;
                                         case 27:
                                             handle = handle.slice(left, right);
                                             return [3 /*break*/, 29];
                                         case 28:
                                             operationContext.debugger.raise('Unexpected handle', me, current);
-                                            _a.label = 29;
+                                            _b.label = 29;
                                         case 29:
                                             position++;
                                             return [3 /*break*/, 1];
@@ -338,7 +339,9 @@ var PathExpression = /** @class */ (function (_super) {
                         if (!(resultExpr.path.length === 0)) return [3 /*break*/, 2];
                         return [2 /*return*/, resultExpr.handle];
                     case 2:
-                        if (!(0, typer_1.isCustomMap)(resultExpr.handle)) return [3 /*break*/, 7];
+                        if (!((0, typer_1.isCustomMap)(resultExpr.handle) ||
+                            (0, typer_1.isCustomList)(resultExpr.handle) ||
+                            (0, typer_1.isCustomString)(resultExpr.handle))) return [3 /*break*/, 7];
                         context = resultExpr.handle;
                         return [4 /*yield*/, context.get(resultExpr.path)];
                     case 3:
@@ -351,7 +354,9 @@ var PathExpression = /** @class */ (function (_super) {
                         return [4 /*yield*/, value_1.call(context)];
                     case 5: return [2 /*return*/, _a.apply(void 0, [_c.sent()])];
                     case 6: return [2 /*return*/, value_1];
-                    case 7: return [2 /*return*/, (0, typer_1.cast)(resultExpr.handle.callMethod(resultExpr.path))];
+                    case 7:
+                        operationContext.debugger.raise('Unexpected handle get', me, resultExpr);
+                        _c.label = 8;
                     case 8: return [4 /*yield*/, operationContext.get(resultExpr.path)];
                     case 9:
                         value = _c.sent();

package/dist/operations/function.d.ts

@@ -17,5 +17,8 @@ export default class FunctionOperation extends FunctionOperationBase {
     fork(context: any): FunctionOperation;
     get(operationContext: OperationContext): FunctionOperation;
     toString(): string;
+    toTruthy(): boolean;
+    toNumber(): number;
+    valueOf(): FunctionOperation;
     run(operationContext: OperationContext): Promise<any>;
 }

package/dist/operations/function.js

@@ -85,6 +85,15 @@ var FunctionOperation = /** @class */ (function (_super) {
     FunctionOperation.prototype.toString = function () {
         return 'Function';
     };
+    FunctionOperation.prototype.toTruthy = function () {
+        return true;
+    };
+    FunctionOperation.prototype.toNumber = function () {
+        return Number.NaN;
+    };
+    FunctionOperation.prototype.valueOf = function () {
+        return this;
+    };
     FunctionOperation.prototype.run = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {
             var me, opc, incArgs, args, argMap, functionContext, index, max;

package/dist/operations/if-statement.js

@@ -82,7 +82,7 @@ var IfStatementOperation = /** @class */ (function (_super) {
     }
     IfStatementOperation.prototype.run = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, clauses, clauses_1, clauses_1_1, clause, condition, isValid, e_1_1;
+            var me, clauses, clauses_1, clauses_1_1, clause, condition, resolveCondition, e_1_1;
             var e_1, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -91,59 +91,75 @@ var IfStatementOperation = /** @class */ (function (_super) {
                         clauses = me.clauses;
                         _b.label = 1;
                     case 1:
-                        _b.trys.push([1, 14, 15, 16]);
+                        _b.trys.push([1, 11, 12, 13]);
                         clauses_1 = __values(clauses), clauses_1_1 = clauses_1.next();
                         _b.label = 2;
                     case 2:
-                        if (!!clauses_1_1.done) return [3 /*break*/, 13];
+                        if (!!clauses_1_1.done) return [3 /*break*/, 10];
                         clause = clauses_1_1.value;
-                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 9];
+                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 6];
                         condition = clause.condition;
-                        isValid = void 0;
-                        if (!(0, typer_1.isCustomValue)(condition)) return [3 /*break*/, 3];
-                        isValid = condition.valueOf();
-                        return [3 /*break*/, 6];
+                        resolveCondition = function (item) {
+                            return __awaiter(this, void 0, void 0, function () {
+                                var value, value;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            if (!(item instanceof expression_1.Expression)) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, item.get(operationContext)];
+                                        case 1:
+                                            value = _a.sent();
+                                            return [2 /*return*/, value.toTruthy()];
+                                        case 2:
+                                            if (!(item instanceof operation_1.Operation)) return [3 /*break*/, 4];
+                                            return [4 /*yield*/, item.get(operationContext)];
+                                        case 3:
+                                            value = _a.sent();
+                                            return [2 /*return*/, value.toTruthy()];
+                                        case 4:
+                                            if ((0, typer_1.isCustomValue)(item)) {
+                                                return [2 /*return*/, item.toTruthy()];
+                                            }
+                                            _a.label = 5;
+                                        case 5:
+                                            operationContext.debugger.raise('Unexpected condition', me, item);
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            });
+                        };
+                        return [4 /*yield*/, resolveCondition(condition)];
                     case 3:
-                        if (!(condition instanceof expression_1.Expression ||
-                            condition instanceof operation_1.Operation)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, condition.get(operationContext)];
+                        if (!_b.sent()) return [3 /*break*/, 5];
+                        return [4 /*yield*/, clause.body.run(operationContext)];
                     case 4:
-                        isValid = _b.sent();
-                        return [3 /*break*/, 6];
-                    case 5:
-                        operationContext.debugger.raise('Unexpected condition in clause', me, clause.condition);
-                        _b.label = 6;
+                        _b.sent();
+                        return [3 /*break*/, 10];
+                    case 5: return [3 /*break*/, 9];
                     case 6:
-                        if (!isValid.valueOf()) return [3 /*break*/, 8];
+                        if (!(clause instanceof else_1.default)) return [3 /*break*/, 8];
                         return [4 /*yield*/, clause.body.run(operationContext)];
                     case 7:
                         _b.sent();
-                        return [3 /*break*/, 13];
-                    case 8: return [3 /*break*/, 12];
-                    case 9:
-                        if (!(clause instanceof else_1.default)) return [3 /*break*/, 11];
-                        return [4 /*yield*/, clause.body.run(operationContext)];
-                    case 10:
-                        _b.sent();
-                        return [3 /*break*/, 13];
-                    case 11:
+                        return [3 /*break*/, 10];
+                    case 8:
                         operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
-                        _b.label = 12;
-                    case 12:
+                        _b.label = 9;
+                    case 9:
                         clauses_1_1 = clauses_1.next();
                         return [3 /*break*/, 2];
-                    case 13: return [3 /*break*/, 16];
-                    case 14:
+                    case 10: return [3 /*break*/, 13];
+                    case 11:
                         e_1_1 = _b.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 16];
-                    case 15:
+                        return [3 /*break*/, 13];
+                    case 12:
                         try {
                             if (clauses_1_1 && !clauses_1_1.done && (_a = clauses_1.return)) _a.call(clauses_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 16: return [2 /*return*/];
+                    case 13: return [2 /*return*/];
                 }
             });
         });

package/dist/operations/not.js

@@ -71,7 +71,7 @@ var NotOperation = /** @class */ (function (_super) {
                     case 0:
                         me = this;
                         if (!(0, typer_1.isCustomValue)(me.arg)) return [3 /*break*/, 1];
-                        arg = me.arg.valueOf();
+                        arg = me.arg.toTruthy();
                         return [3 /*break*/, 4];
                     case 1:
                         if (!(me.arg instanceof expression_1.Expression)) return [3 /*break*/, 3];
@@ -79,13 +79,13 @@ var NotOperation = /** @class */ (function (_super) {
                     case 2:
                         arg = _a.sent();
                         if ((0, typer_1.isCustomValue)(arg)) {
-                            arg = arg.valueOf();
+                            arg = arg.toTruthy();
                         }
                         return [3 /*break*/, 4];
                     case 3:
                         operationContext.debugger.raise('Unexpected not operation', me, me.arg);
                         _a.label = 4;
-                    case 4: return [2 /*return*/, !arg];
+                    case 4: return [2 /*return*/, (0, typer_1.cast)(!arg)];
                 }
             });
         });

package/dist/operations/while.js

@@ -80,30 +80,30 @@ var WhileOperation = /** @class */ (function (_super) {
                             isBreak: false,
                             isContinue: false
                         };
-                        resolveCondition = function () {
+                        resolveCondition = function (item) {
                             return __awaiter(this, void 0, void 0, function () {
                                 var value, value;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            if (!(me.condition instanceof expression_1.Expression)) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, me.condition.get(opc)];
+                                            if (!(item instanceof expression_1.Expression)) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, item.get(opc)];
                                         case 1:
                                             value = _a.sent();
-                                            return [2 /*return*/, !!(value === null || value === void 0 ? void 0 : value.valueOf())];
+                                            return [2 /*return*/, value.toTruthy()];
                                         case 2:
-                                            if (!(me.condition instanceof operation_1.Operation)) return [3 /*break*/, 4];
-                                            return [4 /*yield*/, me.condition.get(opc)];
+                                            if (!(item instanceof operation_1.Operation)) return [3 /*break*/, 4];
+                                            return [4 /*yield*/, item.get(opc)];
                                         case 3:
                                             value = _a.sent();
-                                            return [2 /*return*/, !!(value === null || value === void 0 ? void 0 : value.valueOf())];
+                                            return [2 /*return*/, value.toTruthy()];
                                         case 4:
-                                            if ((0, typer_1.isCustomValue)(me.condition)) {
-                                                return [2 /*return*/, me.condition.valueOf()];
+                                            if ((0, typer_1.isCustomValue)(item)) {
+                                                return [2 /*return*/, item.toTruthy()];
                                             }
                                             _a.label = 5;
                                         case 5:
-                                            operationContext.debugger.raise('Unexpected condition', me, me.condition);
+                                            operationContext.debugger.raise('Unexpected condition', me, item);
                                             return [2 /*return*/];
                                     }
                                 });
@@ -111,7 +111,7 @@ var WhileOperation = /** @class */ (function (_super) {
                         };
                         opc.setMemory('loopContext', loopContext);
                         _a.label = 1;
-                    case 1: return [4 /*yield*/, resolveCondition()];
+                    case 1: return [4 /*yield*/, resolveCondition(me.condition)];
                     case 2:
                         if (!_a.sent()) return [3 /*break*/, 4];
                         loopContext.isContinue = false;

package/dist/types/custom-type.d.ts

@@ -1,8 +1,10 @@
 export declare abstract class CustomType {
     static intrinsics: Map<string, Function>;
     getType(): string;
-    valueOf(): any;
+    toNumber(): number;
     toString(): string;
+    toTruthy(): boolean;
+    valueOf(): any;
 }
 export declare abstract class CustomLiteralType extends CustomType {
     value: any;