greybel-interpreter 0.6.0 → 0.6.1

package/dist/context.d.ts

@@ -86,7 +86,6 @@ export declare class OperationContext {
     lookupAPI(): OperationContext;
     lookupGlobals(): OperationContext;
     lookupLocals(): OperationContext;
-    valueOf(): CustomMap;
     extend(map: Map<string, any>): OperationContext;
     set(path: any[], value: any): Promise<void>;
     get(path: any[]): Promise<any>;

package/dist/context.js

@@ -365,9 +365,6 @@ var OperationContext = /** @class */ (function () {
     OperationContext.prototype.lookupLocals = function () {
         return this.lookupType(function (type) { return [ContextType.GLOBAL, ContextType.FUNCTION].includes(type); });
     };
-    OperationContext.prototype.valueOf = function () {
-        return this.scope;
-    };
     OperationContext.prototype.extend = function (map) {
         var _a;
         var me = this;

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

@@ -4,7 +4,8 @@ export default class CustomBoolean extends CustomLiteralType {
     value: boolean;
     constructor(value: boolean);
     getType(): string;
-    valueOf(): boolean;
     toString(): string;
     fork(): CustomBoolean;
+    toNumber(): number;
+    toTruthy(): boolean;
 }

package/dist/custom-types/boolean.js

@@ -26,15 +26,18 @@ var CustomBoolean = /** @class */ (function (_super) {
     CustomBoolean.prototype.getType = function () {
         return 'boolean';
     };
-    CustomBoolean.prototype.valueOf = function () {
-        return this.value;
-    };
     CustomBoolean.prototype.toString = function () {
         return this.value.toString();
     };
     CustomBoolean.prototype.fork = function () {
         return new CustomBoolean(this.value);
     };
+    CustomBoolean.prototype.toNumber = function () {
+        return Number(this.value);
+    };
+    CustomBoolean.prototype.toTruthy = function () {
+        return this.value;
+    };
     CustomBoolean.intrinsics = new Map();
     return CustomBoolean;
 }(custom_type_1.CustomLiteralType));

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

@@ -18,7 +18,8 @@ export default class CustomList extends CustomObjectType {
     get(path: any[]): Promise<any>;
     getCallable(path: any[]): Promise<Callable>;
     getType(): string;
-    valueOf(): CustomList | null;
     toString(): string;
+    toNumber(): number;
+    toTruthy(): boolean;
     fork(): CustomList;
 }

package/dist/custom-types/list.js

@@ -96,7 +96,7 @@ var CustomList = /** @class */ (function (_super) {
     function CustomList(value) {
         var _this = _super.call(this) || this;
         _this.slice = function (a, b) {
-            return new CustomList(this.value.slice(a === null || a === void 0 ? void 0 : a.valueOf(), b === null || b === void 0 ? void 0 : b.valueOf()));
+            return new CustomList(this.value.slice(a.toNumber(), b.toNumber()));
         };
         _this.value = value;
         return _this;
@@ -213,16 +213,17 @@ var CustomList = /** @class */ (function (_super) {
     CustomList.prototype.getType = function () {
         return 'list';
     };
-    CustomList.prototype.valueOf = function () {
-        var me = this;
-        var value = me.value;
-        return value.length === 0 ? null : me;
-    };
     CustomList.prototype.toString = function () {
         var me = this;
-        var body = me.value.map(function (item) { var _a; return (_a = item === null || item === void 0 ? void 0 : item.valueOf()) === null || _a === void 0 ? void 0 : _a.toString(); });
+        var body = me.value.map(function (item) { return item === null || item === void 0 ? void 0 : item.toString(); });
         return "[".concat(body.join(','), "]");
     };
+    CustomList.prototype.toNumber = function () {
+        return 0;
+    };
+    CustomList.prototype.toTruthy = function () {
+        return this.value.length > 0;
+    };
     CustomList.prototype.fork = function () {
         return new CustomList(this.value);
     };

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

@@ -22,7 +22,8 @@ export default class CustomMap extends CustomObjectType implements Iterable<Cust
     getCallable(path: string[]): Promise<Callable>;
     createInstance(): CustomMap;
     getType(): string;
-    valueOf(): CustomMap | null;
+    toNumber(): number;
+    toTruthy(): boolean;
     toString(): string;
     fork(): CustomMap;
 }

package/dist/custom-types/map.js

@@ -216,10 +216,11 @@ var CustomMap = /** @class */ (function (_super) {
         var me = this;
         return ((_a = me.value.get('classID')) === null || _a === void 0 ? void 0 : _a.toString()) || 'map';
     };
-    CustomMap.prototype.valueOf = function () {
-        var me = this;
-        var value = me.value;
-        return value.size === 0 ? null : me;
+    CustomMap.prototype.toNumber = function () {
+        return Number.NaN;
+    };
+    CustomMap.prototype.toTruthy = function () {
+        return this.value.size > 0;
     };
     CustomMap.prototype.toString = function () {
         var me = this;
@@ -227,7 +228,7 @@ var CustomMap = /** @class */ (function (_super) {
             .entries(me.value)
             .map(function (_a) {
             var _b = __read(_a, 2), key = _b[0], value = _b[1];
-            return "\"".concat(key, "\": ").concat(value.valueOf().toString());
+            return "\"".concat(key, "\": ").concat(value === null || value === void 0 ? void 0 : value.toString());
         });
         return "{".concat(body.join(','), "}");
     };

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

@@ -3,6 +3,7 @@ export default class CustomNil extends CustomLiteralType {
     static intrinsics: Map<string, Function>;
     value: null;
     getType(): string;
-    valueOf(): null;
+    toNumber(): number;
+    toTruthy(): boolean;
     toString(): string;
 }

package/dist/custom-types/nil.js

@@ -26,8 +26,11 @@ var CustomNil = /** @class */ (function (_super) {
     CustomNil.prototype.getType = function () {
         return 'null';
     };
-    CustomNil.prototype.valueOf = function () {
-        return null;
+    CustomNil.prototype.toNumber = function () {
+        return Number.NaN;
+    };
+    CustomNil.prototype.toTruthy = function () {
+        return false;
     };
     CustomNil.prototype.toString = function () {
         return 'null';

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

@@ -4,7 +4,8 @@ export default class CustomNumber extends CustomLiteralType {
     value: number;
     constructor(value: number);
     getType(): string;
-    valueOf(): number;
     toString(): string;
+    toNumber(): number;
+    toTruthy(): boolean;
     fork(): CustomNumber;
 }

package/dist/custom-types/number.js

@@ -26,12 +26,15 @@ var CustomNumber = /** @class */ (function (_super) {
     CustomNumber.prototype.getType = function () {
         return 'number';
     };
-    CustomNumber.prototype.valueOf = function () {
-        return this.value;
-    };
     CustomNumber.prototype.toString = function () {
         return this.value.toString();
     };
+    CustomNumber.prototype.toNumber = function () {
+        return this.value;
+    };
+    CustomNumber.prototype.toTruthy = function () {
+        return Number.isNaN(this.value) ? false : !!this.value;
+    };
     CustomNumber.prototype.fork = function () {
         return new CustomNumber(this.value);
     };

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

@@ -17,7 +17,8 @@ export default class CustomString extends CustomLiteralType {
     get(path: any[]): Promise<any>;
     getCallable(path: any[]): Promise<Callable>;
     getType(): string;
-    valueOf(): string | null;
     toString(): string;
+    toNumber(): number;
+    toTruthy(): boolean;
     fork(): CustomString;
 }

package/dist/custom-types/string.js

@@ -97,7 +97,7 @@ var CustomString = /** @class */ (function (_super) {
         return !Number.isNaN(Number(value));
     };
     CustomString.prototype.slice = function (a, b) {
-        return new CustomString(this.value.slice(a === null || a === void 0 ? void 0 : a.valueOf(), b === null || b === void 0 ? void 0 : b.valueOf()));
+        return new CustomString(this.value.slice(a === null || a === void 0 ? void 0 : a.toNumber(), b === null || b === void 0 ? void 0 : b.toNumber()));
     };
     CustomString.prototype[Symbol.iterator] = function () {
         return new CustomStringIterator(this.value);
@@ -151,13 +151,15 @@ var CustomString = /** @class */ (function (_super) {
     CustomString.prototype.getType = function () {
         return 'string';
     };
-    CustomString.prototype.valueOf = function () {
-        var me = this;
-        return me.value.length === 0 ? null : me.value;
-    };
     CustomString.prototype.toString = function () {
         return this.value;
     };
+    CustomString.prototype.toNumber = function () {
+        return Number(this.value);
+    };
+    CustomString.prototype.toTruthy = function () {
+        return this.value.length > 0;
+    };
     CustomString.prototype.fork = function () {
         return new CustomString(this.value);
     };

package/dist/expressions/binary-negated-expression.d.ts

@@ -2,7 +2,6 @@ import { ASTUnaryExpression } 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 type OperationMap = {
     [key: string]: (a: CustomType) => any;
 };

package/dist/expressions/binary-negated-expression.js

@@ -52,17 +52,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressionSegment = exports.toPrimitive = void 0;
+exports.ExpressionSegment = void 0;
 var greybel_core_1 = require("greybel-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 OPERATIONS = (_a = {},
-    _a[greybel_core_1.Operator.Plus] = function (a) { return (0, exports.toPrimitive)(a); },
-    _a[greybel_core_1.Operator.Minus] = function (a) { return -(0, exports.toPrimitive)(a); },
+    _a[greybel_core_1.Operator.Plus] = function (a) { return a.toNumber(); },
+    _a[greybel_core_1.Operator.Minus] = function (a) { return -a.toNumber(); },
     _a);
 var ExpressionSegment = /** @class */ (function () {
     function ExpressionSegment(operator, arg) {

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.toNumber() >= b.toNumber(); },
+    _a[greybel_core_1.Operator.Equal] = function (a, b) { return a.toNumber() == b.toNumber(); },
+    _a[greybel_core_1.Operator.LessThanOrEqual] = function (a, b) { return a.toNumber() <= b.toNumber(); },
+    _a[greybel_core_1.Operator.NotEqual] = function (a, b) { return a.toNumber() != b.toNumber(); },
+    _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/operations/function.d.ts

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

package/dist/operations/function.js

@@ -85,6 +85,12 @@ var FunctionOperation = /** @class */ (function (_super) {
     FunctionOperation.prototype.toString = function () {
         return 'Function';
     };
+    FunctionOperation.prototype.toTruthy = function () {
+        return true;
+    };
+    FunctionOperation.prototype.toNumber = function () {
+        return 0;
+    };
     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,68 +82,102 @@ 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, _loop_1, clauses_1, clauses_1_1, clause, state_1, e_1_1;
             var e_1, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         me = this;
                         clauses = me.clauses;
+                        _loop_1 = function (clause) {
+                            var condition, resolveCondition_1;
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
+                                    case 0:
+                                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 4];
+                                        condition = clause.condition;
+                                        resolveCondition_1 = 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*/, resolveCondition_1(value)];
+                                                        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*/, resolveCondition_1(value)];
+                                                        case 4:
+                                                            if ((0, typer_1.isCustomValue)(item)) {
+                                                                return [2 /*return*/, item.toTruthy()];
+                                                            }
+                                                            else if (typeof item === 'boolean') {
+                                                                return [2 /*return*/, item];
+                                                            }
+                                                            _a.label = 5;
+                                                        case 5:
+                                                            operationContext.debugger.raise('Unexpected condition', me, item);
+                                                            return [2 /*return*/];
+                                                    }
+                                                });
+                                            });
+                                        };
+                                        return [4 /*yield*/, resolveCondition_1(condition)];
+                                    case 1:
+                                        if (!_c.sent()) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, clause.body.run(operationContext)];
+                                    case 2:
+                                        _c.sent();
+                                        return [2 /*return*/, "break"];
+                                    case 3: return [3 /*break*/, 7];
+                                    case 4:
+                                        if (!(clause instanceof else_1.default)) return [3 /*break*/, 6];
+                                        return [4 /*yield*/, clause.body.run(operationContext)];
+                                    case 5:
+                                        _c.sent();
+                                        return [2 /*return*/, "break"];
+                                    case 6:
+                                        operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
+                                        _c.label = 7;
+                                    case 7: return [2 /*return*/];
+                                }
+                            });
+                        };
                         _b.label = 1;
                     case 1:
-                        _b.trys.push([1, 14, 15, 16]);
+                        _b.trys.push([1, 6, 7, 8]);
                         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*/, 5];
                         clause = clauses_1_1.value;
-                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 9];
-                        condition = clause.condition;
-                        isValid = void 0;
-                        if (!(0, typer_1.isCustomValue)(condition)) return [3 /*break*/, 3];
-                        isValid = condition.valueOf();
-                        return [3 /*break*/, 6];
+                        return [5 /*yield**/, _loop_1(clause)];
                     case 3:
-                        if (!(condition instanceof expression_1.Expression ||
-                            condition instanceof operation_1.Operation)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, condition.get(operationContext)];
+                        state_1 = _b.sent();
+                        if (state_1 === "break")
+                            return [3 /*break*/, 5];
+                        _b.label = 4;
                     case 4:
-                        isValid = _b.sent();
-                        return [3 /*break*/, 6];
-                    case 5:
-                        operationContext.debugger.raise('Unexpected condition in clause', me, clause.condition);
-                        _b.label = 6;
-                    case 6:
-                        if (!isValid.valueOf()) 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:
-                        operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
-                        _b.label = 12;
-                    case 12:
                         clauses_1_1 = clauses_1.next();
                         return [3 /*break*/, 2];
-                    case 13: return [3 /*break*/, 16];
-                    case 14:
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
                         e_1_1 = _b.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 16];
-                    case 15:
+                        return [3 /*break*/, 8];
+                    case 7:
                         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 8: 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,7 +79,7 @@ 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:

package/dist/operations/while.js

@@ -80,30 +80,33 @@ 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*/, resolveCondition(value)];
                                         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*/, resolveCondition(value)];
                                         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()];
+                                            }
+                                            else if (typeof item === 'boolean') {
+                                                return [2 /*return*/, item];
                                             }
                                             _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 +114,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,9 @@
 export declare abstract class CustomType {
     static intrinsics: Map<string, Function>;
     getType(): string;
-    valueOf(): any;
+    toNumber(): number;
     toString(): string;
+    toTruthy(): boolean;
 }
 export declare abstract class CustomLiteralType extends CustomType {
     value: any;

package/dist/types/custom-type.js

@@ -22,12 +22,15 @@ var CustomType = /** @class */ (function () {
     CustomType.prototype.getType = function () {
         throw new Error('Implentation of "getType" missing');
     };
-    CustomType.prototype.valueOf = function () {
-        throw new Error('Implentation of "valueOf" missing');
+    CustomType.prototype.toNumber = function () {
+        throw new Error('Implentation of "toNumber" missing');
     };
     CustomType.prototype.toString = function () {
         throw new Error('Implentation of "toString" missing');
     };
+    CustomType.prototype.toTruthy = function () {
+        throw new Error('Implentation of "toTruthy" missing');
+    };
     return CustomType;
 }());
 exports.CustomType = CustomType;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",