greybel-interpreter 0.5.4 → 0.5.8

package/dist/context.d.ts

@@ -18,7 +18,6 @@ export declare enum ContextState {
 export declare class Scope extends CustomMap {
     context: OperationContext;
     constructor(context: OperationContext);
-    set(path: string[], value: any): Promise<void>;
     get(path: string[]): Promise<any>;
     getCallable(path: string[]): Promise<Callable>;
 }
@@ -70,9 +69,9 @@ export declare class OperationContext {
     processState: OperationContextProcessState;
     isProtected: boolean;
     injected: boolean;
-    api: Scope | null;
-    locals: Scope | null;
-    globals: Scope | null;
+    api: OperationContext | null;
+    locals: OperationContext | null;
+    globals: OperationContext | null;
     constructor(options: OperationContextOptions);
     step(item: ASTBase): Promise<void>;
     setLastActive(opc: OperationContext): OperationContext;
@@ -81,10 +80,12 @@ export declare class OperationContext {
     exit(): Promise<OperationContext>;
     isPending(): boolean;
     setPending(pending: boolean): OperationContext;
-    lookupType(validate: (type: ContextType) => boolean): Scope;
-    lookupAPI(): Scope;
-    lookupGlobals(): Scope;
-    lookupLocals(): Scope;
+    lookupAllOfType(validate: (type: ContextType) => boolean): OperationContext[];
+    lookupType(validate: (type: ContextType) => boolean): OperationContext;
+    lookupAllScopes(): OperationContext[];
+    lookupAPI(): OperationContext;
+    lookupGlobals(): OperationContext;
+    lookupLocals(): OperationContext;
     valueOf(): CustomMap;
     extend(map: Map<string, any>): OperationContext;
     set(path: any[], value: any): Promise<void>;

package/dist/context.js

@@ -14,6 +14,42 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -67,87 +103,81 @@ var Scope = /** @class */ (function (_super) {
         _this.context = context;
         return _this;
     }
-    Scope.prototype.set = function (path, value) {
-        var me = this;
-        var traversalPath = [].concat(path);
-        var current = traversalPath.shift();
-        if (current != null) {
-            if (current === 'locals') {
-                return me.context.locals.set(traversalPath, value);
-            }
-            else if (current === 'globals') {
-                return me.context.globals.set(traversalPath, value);
-            }
-            else if (me.context.locals != null) {
-                return map_1.default.prototype.set.call(me.context.locals, path, value);
-            }
-            else {
-                throw new Error("Cannot set path ".concat(path.join('.')));
-            }
-        }
-    };
     Scope.prototype.get = function (path) {
-        var _a, _b, _c;
-        var me = this;
-        var traversalPath = [].concat(path);
-        var current = traversalPath.shift();
-        if (current != null) {
-            if (current === 'locals') {
-                return traversalPath.length === 0
-                    ? Promise.resolve(me.context.locals)
-                    : me.context.locals.get(traversalPath);
-            }
-            else if (current === 'globals') {
-                return traversalPath.length === 0
-                    ? Promise.resolve(me.context.globals)
-                    : me.context.globals.get(traversalPath);
-            }
-            else if ((_a = me.context.locals) === null || _a === void 0 ? void 0 : _a.value.has(current)) {
-                return map_1.default.prototype.get.call(me.context.locals, path);
-            }
-            else if ((_b = me.context.globals) === null || _b === void 0 ? void 0 : _b.value.has(current)) {
-                return map_1.default.prototype.get.call(me.context.globals, path);
-            }
-            else if ((_c = me.context.api) === null || _c === void 0 ? void 0 : _c.value.has(current)) {
-                return map_1.default.prototype.get.call(me.context.api, path);
-            }
-            else if (me.value.has(current)) {
-                return _super.prototype.get.call(this, path);
-            }
-            else {
-                throw new Error("Cannot get path ".concat(path.join('.')));
-            }
-        }
-        return null;
+        return __awaiter(this, void 0, void 0, function () {
+            var me, traversalPath, current;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        me = this;
+                        traversalPath = [].concat(path);
+                        current = traversalPath.shift();
+                        if (path.length === 0) {
+                            return [2 /*return*/, Promise.resolve(me)];
+                        }
+                        if (!(current === 'locals' || current === 'globals')) return [3 /*break*/, 1];
+                        return [2 /*return*/, me.context.get(path)];
+                    case 1: return [4 /*yield*/, me.has(path)];
+                    case 2:
+                        if (!_a.sent()) return [3 /*break*/, 3];
+                        return [2 /*return*/, _super.prototype.get.call(this, path)];
+                    case 3: return [4 /*yield*/, me.context.api.scope.has(path)];
+                    case 4:
+                        if (_a.sent()) {
+                            return [2 /*return*/, me.context.api.get(path)];
+                        }
+                        else if (path.length === 1 && map_1.default.intrinsics.has(current)) {
+                            return [2 /*return*/, Promise.resolve(map_1.default.intrinsics.get(current).bind(null, me))];
+                        }
+                        else if (me.context.previous) {
+                            return [2 /*return*/, me.context.previous.get(path)];
+                        }
+                        else {
+                            throw new Error("Cannot get path ".concat(path.join('.')));
+                        }
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
     };
     Scope.prototype.getCallable = function (path) {
-        var _a, _b, _c;
-        var me = this;
-        var traversalPath = [].concat(path);
-        var current = traversalPath.shift();
-        if (current != null) {
-            if (current === 'locals') {
-                return me.context.locals.getCallable(traversalPath);
-            }
-            else if (current === 'globals') {
-                return me.context.globals.getCallable(traversalPath);
-            }
-            else if ((_a = me.context.locals) === null || _a === void 0 ? void 0 : _a.value.has(current)) {
-                return map_1.default.prototype.getCallable.call(me.context.locals, path);
-            }
-            else if ((_b = me.context.globals) === null || _b === void 0 ? void 0 : _b.value.has(current)) {
-                return map_1.default.prototype.getCallable.call(me.context.globals, path);
-            }
-            else if ((_c = me.context.api) === null || _c === void 0 ? void 0 : _c.value.has(current)) {
-                return map_1.default.prototype.getCallable.call(me.context.api, path);
-            }
-            else {
-                return _super.prototype.getCallable.call(this, path);
-            }
-        }
-        return Promise.resolve({
-            origin: me,
-            context: null
+        return __awaiter(this, void 0, void 0, function () {
+            var me, traversalPath, current;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        me = this;
+                        traversalPath = [].concat(path);
+                        current = traversalPath.shift();
+                        if (current === 'locals' || current === 'globals') {
+                            return [2 /*return*/, me.context.getCallable(path)];
+                        }
+                        return [4 /*yield*/, me.has(path)];
+                    case 1:
+                        if (!_a.sent()) return [3 /*break*/, 2];
+                        return [2 /*return*/, _super.prototype.getCallable.call(this, path)];
+                    case 2: return [4 /*yield*/, me.context.api.scope.has(path)];
+                    case 3:
+                        if (_a.sent()) {
+                            return [2 /*return*/, me.context.api.getCallable(path)];
+                        }
+                        else if (path.length === 1 && map_1.default.intrinsics.has(current)) {
+                            return [2 /*return*/, Promise.resolve({
+                                    origin: map_1.default.intrinsics.get(current).bind(null, me),
+                                    context: me
+                                })];
+                        }
+                        else if (me.context.previous) {
+                            return [2 /*return*/, me.context.previous.getCallable(path)];
+                        }
+                        else {
+                            throw new Error("Cannot get callable path ".concat(path.join('.')));
+                        }
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
+                }
+            });
         });
     };
     return Scope;
@@ -238,7 +268,7 @@ var OperationContext = /** @class */ (function () {
         };
         me.api = me.lookupAPI();
         me.globals = me.lookupGlobals();
-        me.locals = me.lookupLocals();
+        me.locals = me.lookupLocals() || me;
     }
     OperationContext.prototype.step = function (item) {
         var me = this;
@@ -294,20 +324,38 @@ var OperationContext = /** @class */ (function () {
         me.processState.pending = pending;
         return me;
     };
+    OperationContext.prototype.lookupAllOfType = function (validate) {
+        var me = this;
+        var result = [];
+        if (validate(me.type)) {
+            result.push(me);
+        }
+        var current = me.previous;
+        while (current) {
+            if (validate(current.type)) {
+                result.push(current);
+            }
+            current = current.previous;
+        }
+        return result;
+    };
     OperationContext.prototype.lookupType = function (validate) {
         var me = this;
         if (validate(me.type)) {
-            return me.scope;
+            return me;
         }
         var current = me.previous;
         while (current) {
             if (validate(current.type)) {
-                return current.scope;
+                return current;
             }
             current = current.previous;
         }
         return null;
     };
+    OperationContext.prototype.lookupAllScopes = function () {
+        return this.lookupAllOfType(function (type) { return [ContextType.GLOBAL, ContextType.FUNCTION].includes(type); });
+    };
     OperationContext.prototype.lookupAPI = function () {
         return this.lookupType(function (type) { return [ContextType.API].includes(type); });
     };
@@ -318,7 +366,7 @@ var OperationContext = /** @class */ (function () {
         return this.lookupType(function (type) { return [ContextType.GLOBAL, ContextType.FUNCTION].includes(type); });
     };
     OperationContext.prototype.valueOf = function () {
-        return this.scope.valueOf();
+        return this.scope;
     };
     OperationContext.prototype.extend = function (map) {
         var _a;
@@ -334,28 +382,46 @@ var OperationContext = /** @class */ (function () {
     OperationContext.prototype.set = function (path, value) {
         var _a;
         var me = this;
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current === 'locals') {
+            return me.locals.set(traversalPath, value);
+        }
+        else if (current === 'globals') {
+            return me.globals.set(traversalPath, value);
+        }
         if (me.state === ContextState.TEMPORARY) {
             return (_a = me.previous) === null || _a === void 0 ? void 0 : _a.set(path, value);
         }
-        else {
-            return me.scope.set(path, value);
-        }
+        return me.locals.scope.set(path, value);
     };
     OperationContext.prototype.get = function (path) {
         var _a;
         var me = this;
-        if (me.state === ContextState.TEMPORARY) {
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current === 'locals') {
+            return me.locals.get(traversalPath);
+        }
+        else if (current === 'globals') {
+            return me.globals.get(traversalPath);
+        }
+        else if (me.state === ContextState.TEMPORARY) {
             return (_a = me.previous) === null || _a === void 0 ? void 0 : _a.get(path);
         }
-        return me.scope.get(path);
+        return me.locals.scope.get(path);
     };
     OperationContext.prototype.getCallable = function (path) {
-        var _a;
         var me = this;
-        if (me.state === ContextState.TEMPORARY) {
-            return (_a = me.previous) === null || _a === void 0 ? void 0 : _a.getCallable(path);
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current === 'locals') {
+            return me.locals.getCallable(traversalPath);
+        }
+        else if (current === 'globals') {
+            return me.globals.getCallable(traversalPath);
         }
-        return me.scope.getCallable(path);
+        return me.locals.scope.getCallable(path);
     };
     OperationContext.prototype.setMemory = function (key, value) {
         var me = this;

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

@@ -5,6 +5,7 @@ export declare class CustomListIterator implements Iterator<any> {
     constructor(value: any);
     next(): IteratorResult<any>;
 }
+export declare function itemAtIndex(list: any[], n: number): number;
 export default class CustomList extends CustomObjectType {
     static intrinsics: Map<string, Function>;
     value: any[];
@@ -13,7 +14,6 @@ export default class CustomList extends CustomObjectType {
     [Symbol.iterator](): CustomListIterator;
     concat(list: CustomList): CustomList;
     slice: (a: CustomLiteralType, b: CustomLiteralType) => CustomList;
-    toIndex(value: string): number | null;
     set(path: any[], value: any): Promise<void>;
     get(path: any[]): Promise<any>;
     getCallable(path: any[]): Promise<Callable>;

package/dist/custom-types/list.js

@@ -76,7 +76,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomListIterator = void 0;
+exports.itemAtIndex = exports.CustomListIterator = void 0;
 var operation_1 = require("../types/operation");
 var custom_type_1 = require("../types/custom-type");
 var CustomListIterator = /** @class */ (function () {
@@ -101,6 +101,15 @@ var CustomListIterator = /** @class */ (function () {
     return CustomListIterator;
 }());
 exports.CustomListIterator = CustomListIterator;
+function itemAtIndex(list, n) {
+    n = Math.trunc(n) || 0;
+    if (n < 0)
+        n += list.length;
+    if (n < 0 || n >= list.length)
+        return -1;
+    return n;
+}
+exports.itemAtIndex = itemAtIndex;
 var CustomList = /** @class */ (function (_super) {
     __extends(CustomList, _super);
     function CustomList(value) {
@@ -120,51 +129,34 @@ var CustomList = /** @class */ (function (_super) {
     CustomList.prototype.concat = function (list) {
         return new CustomList(this.value.concat(list.value));
     };
-    CustomList.prototype.toIndex = function (value) {
-        var me = this;
-        var casted = Number(value);
-        var result = casted < 0 ? me.value.length + casted : casted;
-        if (result < 0) {
-            return null;
-        }
-        return result;
-    };
     CustomList.prototype.set = function (path, value) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, last, current, origin, index, setterIndex;
+            var me, traversalPath, refs, last, current, indexResult, sub, lastIndex;
             return __generator(this, function (_a) {
                 me = this;
                 traversalPath = [].concat(path);
                 refs = me.value;
                 last = traversalPath.pop();
                 current = traversalPath.shift();
-                origin = refs;
                 if (current != null) {
-                    index = me.toIndex(current);
-                    if (origin.hasOwnProperty(index)) {
-                        origin = origin[index];
-                        if (origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.set(traversalPath.concat([last]), value)];
+                    indexResult = itemAtIndex(refs, Number(current));
+                    if (refs.hasOwnProperty(indexResult)) {
+                        sub = refs[indexResult];
+                        if (sub instanceof custom_type_1.CustomObjectType) {
+                            return [2 /*return*/, sub.set(traversalPath.concat([last]), value)];
                         }
                     }
-                    else {
-                        throw new Error("Cannot set path ".concat(path.join('.')));
-                    }
+                    throw new Error("Cannot set path ".concat(path.join('.')));
                 }
-                if (origin) {
-                    setterIndex = me.toIndex(last);
-                    if (!origin.hasOwnProperty(setterIndex)) {
-                        throw new Error("Index error (list index ".concat(setterIndex, " out of range)"));
-                    }
-                    if (value instanceof operation_1.FunctionOperationBase) {
-                        origin[setterIndex] = value.fork(me);
-                    }
-                    else {
-                        origin[setterIndex] = value;
-                    }
+                lastIndex = itemAtIndex(refs, Number(last));
+                if (!refs.hasOwnProperty(lastIndex)) {
+                    throw new Error("Index error (list index ".concat(lastIndex, " out of range)"));
+                }
+                if (value instanceof operation_1.FunctionOperationBase) {
+                    refs[lastIndex] = value.fork(me);
                 }
                 else {
-                    throw new Error("Cannot set path ".concat(path.join('.')));
+                    refs[lastIndex] = value;
                 }
                 return [2 /*return*/];
             });
@@ -172,7 +164,7 @@ var CustomList = /** @class */ (function (_super) {
     };
     CustomList.prototype.get = function (path) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, currentValue, origin, index;
+            var me, traversalPath, refs, current, currentIndex, sub;
             return __generator(this, function (_a) {
                 me = this;
                 if (path.length === 0) {
@@ -181,46 +173,45 @@ var CustomList = /** @class */ (function (_super) {
                 traversalPath = [].concat(path);
                 refs = me.value;
                 current = traversalPath.shift();
-                currentValue = current.valueOf();
-                origin = refs;
-                if (currentValue != null) {
-                    index = me.toIndex(current);
-                    if (origin.hasOwnProperty(index)) {
-                        origin = origin[index];
-                        if (traversalPath.length > 0 && origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.get(traversalPath)];
+                if (current != null) {
+                    currentIndex = itemAtIndex(refs, Number(current));
+                    if (refs.hasOwnProperty(currentIndex)) {
+                        sub = refs[currentIndex];
+                        if (traversalPath.length > 0 && sub instanceof custom_type_1.CustomObjectType) {
+                            return [2 /*return*/, sub.get(traversalPath)];
+                        }
+                        if (traversalPath.length === 0) {
+                            return [2 /*return*/, sub];
                         }
                     }
-                    else if (path.length === 1 && CustomList.intrinsics.has(currentValue)) {
-                        return [2 /*return*/, CustomList.intrinsics.get(currentValue).bind(null, me)];
-                    }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
+                    else if (path.length === 1 && CustomList.intrinsics.has(current)) {
+                        return [2 /*return*/, CustomList.intrinsics.get(current).bind(null, me)];
                     }
                 }
-                else {
-                    return [2 /*return*/, null];
-                }
-                return [2 /*return*/, origin];
+                return [2 /*return*/, null];
             });
         });
     };
     CustomList.prototype.getCallable = function (path) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, origin, context, index;
+            var me, traversalPath, refs, current, currentIndex, sub;
             return __generator(this, function (_a) {
                 me = this;
                 traversalPath = [].concat(path);
                 refs = me.value;
                 current = traversalPath.shift();
-                origin = refs;
                 if (current != null) {
-                    index = me.toIndex(current);
-                    if (origin.hasOwnProperty(index)) {
-                        context = origin;
-                        origin = origin[index];
-                        if (origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.getCallable(traversalPath)];
+                    currentIndex = itemAtIndex(refs, Number(current));
+                    if (refs.hasOwnProperty(currentIndex)) {
+                        sub = refs[currentIndex];
+                        if (sub instanceof custom_type_1.CustomObjectType) {
+                            return [2 /*return*/, sub.getCallable(traversalPath)];
+                        }
+                        if (traversalPath.length === 0) {
+                            return [2 /*return*/, Promise.resolve({
+                                    origin: sub,
+                                    context: me
+                                })];
                         }
                     }
                     else if (path.length === 1 && CustomList.intrinsics.has(current)) {
@@ -229,19 +220,17 @@ var CustomList = /** @class */ (function (_super) {
                                 context: me
                             }];
                     }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
                 }
                 return [2 /*return*/, {
-                        origin: origin,
-                        context: context
+                        origin: null,
+                        context: me
                     }];
             });
         });
     };
     CustomList.prototype.callMethod = function (method) {
         var _a;
+        var _b;
         var args = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             args[_i - 1] = arguments[_i];
@@ -250,16 +239,16 @@ var CustomList = /** @class */ (function (_super) {
             throw new Error('Unexpected method length');
         }
         var me = this;
-        var member = method[0].valueOf();
+        var member = (_b = method[0]) === null || _b === void 0 ? void 0 : _b.toString();
         if (CustomList.isNumber(member)) {
-            var index = me.toIndex(member);
-            if (!me.value.hasOwnProperty(index)) {
+            var memberIndex = itemAtIndex(me.value, Number(member));
+            if (!me.value.hasOwnProperty(memberIndex)) {
                 return null;
             }
             if (method.length > 1) {
-                return (_a = me.value[index]).callMethod.apply(_a, __spreadArray([method.slice(1)], __read(args), false));
+                return (_a = me.value[memberIndex]).callMethod.apply(_a, __spreadArray([method.slice(1)], __read(args), false));
             }
-            return me.value[index];
+            return me.value[memberIndex];
         }
         if (!CustomList.intrinsics.has(member)) {
             throw new Error("Cannot access ".concat(member, " in list"));

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

@@ -16,6 +16,7 @@ export default class CustomMap extends CustomObjectType implements Iterable<Cust
     constructor(value?: Map<string, any>);
     [Symbol.iterator](): CustomMapIterator;
     extend(value: Map<string, any>): CustomMap;
+    has(path: string[]): Promise<boolean>;
     set(path: string[], value: any): Promise<void>;
     get(path: string[]): Promise<any>;
     getCallable(path: string[]): Promise<Callable>;

package/dist/custom-types/map.js

@@ -87,34 +87,52 @@ var CustomMap = /** @class */ (function (_super) {
         me.value = new Map(__spreadArray(__spreadArray([], __read(me.value.entries()), false), __read(value.entries()), false));
         return me;
     };
+    CustomMap.prototype.has = function (path) {
+        var me = this;
+        if (path.length === 0) {
+            return Promise.resolve(true);
+        }
+        var traversalPath = [].concat(path);
+        var refs = me.value;
+        var current = traversalPath.shift();
+        if (current != null) {
+            if (refs.has(current)) {
+                var sub = refs.get(current);
+                if (traversalPath.length > 0 && sub instanceof custom_type_1.CustomObjectType) {
+                    return sub.has(traversalPath);
+                }
+                if (traversalPath.length === 0) {
+                    return Promise.resolve(true);
+                }
+            }
+        }
+        return Promise.resolve(false);
+    };
     CustomMap.prototype.set = function (path, value) {
         var me = this;
+        if (!path) {
+            console.warn('Cannot set empty path for ', me);
+            return;
+        }
         var traversalPath = [].concat(path);
         var refs = me.value;
         var last = traversalPath.pop();
         var current = traversalPath.shift();
-        var origin = refs;
         if (current != null) {
-            if (origin.has(current)) {
-                origin = origin.get(current);
-                if (origin instanceof custom_type_1.CustomObjectType) {
-                    return origin.set(traversalPath.concat(last), value);
+            if (refs.has(current)) {
+                var sub = refs.get(current);
+                if (sub instanceof custom_type_1.CustomObjectType) {
+                    return sub.set(traversalPath.concat(last), value);
                 }
             }
-            else {
-                throw new Error("Cannot set path ".concat(path.join('.')));
-            }
+            console.warn("Cannot set path ".concat(path === null || path === void 0 ? void 0 : path.join('.')));
+            return;
         }
-        if (origin) {
-            if (value instanceof operation_1.FunctionOperationBase) {
-                origin.set(last, value.fork(me));
-            }
-            else {
-                origin.set(last, value);
-            }
+        if (value instanceof operation_1.FunctionOperationBase) {
+            refs.set(last, value.fork(me));
         }
         else {
-            throw new Error("Cannot set path ".concat(path.join('.')));
+            refs.set(last, value);
         }
     };
     CustomMap.prototype.get = function (path) {
@@ -125,40 +143,41 @@ var CustomMap = /** @class */ (function (_super) {
         var traversalPath = [].concat(path);
         var refs = me.value;
         var current = traversalPath.shift();
-        var currentValue = current.valueOf();
-        var origin = refs;
-        if (currentValue != null) {
-            if (origin.has(currentValue)) {
-                origin = origin.get(currentValue);
-                if (traversalPath.length > 0 && origin instanceof custom_type_1.CustomObjectType) {
-                    return origin.get(traversalPath);
+        if (current != null) {
+            if (refs.has(current)) {
+                var sub = refs.get(current);
+                if (traversalPath.length > 0 && sub instanceof custom_type_1.CustomObjectType) {
+                    return sub.get(traversalPath);
+                }
+                if (traversalPath.length === 0) {
+                    return sub;
                 }
             }
-            else if (path.length === 1 && CustomMap.intrinsics.has(currentValue)) {
-                return Promise.resolve(CustomMap.intrinsics.get(currentValue).bind(null, me));
+            else if (path.length === 1 && CustomMap.intrinsics.has(current)) {
+                return Promise.resolve(CustomMap.intrinsics.get(current).bind(null, me));
             }
             else {
                 throw new Error("Cannot get path ".concat(path.join('.')));
             }
         }
-        else {
-            return null;
-        }
-        return Promise.resolve(origin);
+        return Promise.resolve(null);
     };
     CustomMap.prototype.getCallable = function (path) {
         var me = this;
         var traversalPath = [].concat(path);
         var refs = me.value;
         var current = traversalPath.shift();
-        var origin = refs;
-        var context;
         if (current != null) {
-            if (origin.has(current)) {
-                context = origin;
-                origin = origin.get(current);
-                if (origin instanceof custom_type_1.CustomObjectType) {
-                    return origin.getCallable(traversalPath);
+            if (refs.has(current)) {
+                var sub = refs.get(current);
+                if (sub instanceof custom_type_1.CustomObjectType) {
+                    return sub.getCallable(traversalPath);
+                }
+                if (traversalPath.length === 0) {
+                    return Promise.resolve({
+                        origin: sub,
+                        context: me
+                    });
                 }
             }
             else if (path.length === 1 && CustomMap.intrinsics.has(current)) {
@@ -168,16 +187,17 @@ var CustomMap = /** @class */ (function (_super) {
                 });
             }
             else {
-                throw new Error("Cannot get path ".concat(path.join('.')));
+                throw new Error("Cannot get callable path ".concat(path.join('.')));
             }
         }
         return Promise.resolve({
-            origin: origin,
-            context: context
+            origin: null,
+            context: me
         });
     };
     CustomMap.prototype.callMethod = function (method) {
         var _a;
+        var _b;
         var args = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             args[_i - 1] = arguments[_i];
@@ -186,7 +206,7 @@ var CustomMap = /** @class */ (function (_super) {
             throw new Error('Unexpected method length');
         }
         var me = this;
-        var key = method[0].valueOf();
+        var key = (_b = method[0]) === null || _b === void 0 ? void 0 : _b.toString();
         if (method.length > 1) {
             if (me.value.has(key)) {
                 return (_a = me.value.get(key)).callMethod.apply(_a, __spreadArray([method.slice(1)], __read(args), false));

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

@@ -162,7 +162,7 @@ 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, logicalResult, _e, _f, _g;
+                            var expr, _a, binaryResult, _b, _c, _d, logicalLeft, logicalResult, _e, _f, _g;
                             return __generator(this, function (_h) {
                                 switch (_h.label) {
                                     case 0:
@@ -189,11 +189,20 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                                     case 4:
                                         binaryResult = _c.apply(_b, _d.concat([_h.sent()]));
                                         return [2 /*return*/, Number.isNaN(binaryResult) ? null : binaryResult];
-                                    case 5:
-                                        _f = (_e = exports.OPERATIONS)[expr.operator];
-                                        return [4 /*yield*/, evaluate(expr.left)];
+                                    case 5: return [4 /*yield*/, evaluate(expr.left)];
                                     case 6:
-                                        _g = [_h.sent()];
+                                        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)) {
+                                            return [2 /*return*/, false];
+                                        }
+                                        else if (expr.operator === greybel_core_1.Operator.Or && (0, exports.toPrimitive)(logicalLeft)) {
+                                            return [2 /*return*/, true];
+                                        }
+                                        _f = (_e = exports.OPERATIONS)[expr.operator];
+                                        _g = [logicalLeft];
                                         return [4 /*yield*/, evaluate(expr.right)];
                                     case 7:
                                         logicalResult = _f.apply(_e, _g.concat([_h.sent()]));

package/dist/expressions/map.js

@@ -67,6 +67,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressionSegment = exports.ValuesSegment = void 0;
 var expression_1 = require("../types/expression");
+var operation_1 = require("../types/operation");
 var map_1 = __importDefault(require("../custom-types/map"));
 var typer_1 = require("../typer");
 var ValuesSegment = /** @class */ (function () {
@@ -138,46 +139,52 @@ var MapExpression = /** @class */ (function (_super) {
                             map = new Map();
                             _b.label = 1;
                         case 1:
-                            _b.trys.push([1, 9, 10, 11]);
+                            _b.trys.push([1, 11, 12, 13]);
                             values_1 = __values(values), values_1_1 = values_1.next();
                             _b.label = 2;
                         case 2:
-                            if (!!values_1_1.done) return [3 /*break*/, 8];
+                            if (!!values_1_1.done) return [3 /*break*/, 10];
                             current = values_1_1.value;
                             key = void 0;
                             value = void 0;
                             key = current.key;
                             if (!(0, typer_1.isCustomValue)(current.value)) return [3 /*break*/, 3];
                             value = current.value;
-                            return [3 /*break*/, 6];
+                            return [3 /*break*/, 8];
                         case 3:
                             if (!(current.value instanceof expression_1.Expression)) return [3 /*break*/, 5];
                             return [4 /*yield*/, current.value.get(operationContext)];
                         case 4:
                             value = _b.sent();
-                            return [3 /*break*/, 6];
+                            return [3 /*break*/, 8];
                         case 5:
-                            operationContext.debugger.raise('Unexpected value', me, current.value);
-                            _b.label = 6;
+                            if (!(current.value instanceof operation_1.Operation)) return [3 /*break*/, 7];
+                            return [4 /*yield*/, current.value.get(operationContext)];
                         case 6:
+                            value = _b.sent();
+                            return [3 /*break*/, 8];
+                        case 7:
+                            operationContext.debugger.raise('Unexpected value', me, current.value);
+                            _b.label = 8;
+                        case 8:
                             // @ts-ignore: Key is always a literal
                             map.set(key, value);
-                            _b.label = 7;
-                        case 7:
+                            _b.label = 9;
+                        case 9:
                             values_1_1 = values_1.next();
                             return [3 /*break*/, 2];
-                        case 8: return [3 /*break*/, 11];
-                        case 9:
+                        case 10: return [3 /*break*/, 13];
+                        case 11:
                             e_1_1 = _b.sent();
                             e_1 = { error: e_1_1 };
-                            return [3 /*break*/, 11];
-                        case 10:
+                            return [3 /*break*/, 13];
+                        case 12:
                             try {
                                 if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
                             }
                             finally { if (e_1) throw e_1.error; }
                             return [7 /*endfinally*/];
-                        case 11: return [2 /*return*/, new map_1.default(map)];
+                        case 13: return [2 /*return*/, new map_1.default(map)];
                     }
                 });
             });

package/dist/operations/argument.js

@@ -81,19 +81,19 @@ var ArgumentOperation = /** @class */ (function (_super) {
     }
     ArgumentOperation.prototype.get = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, stack, args, stack_1, stack_1_1, entity, _a, _b, arg, e_1_1;
-            var e_1, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var me, stack, args, stack_1, stack_1_1, entity, arg, arg, e_1_1;
+            var e_1, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         me = this;
                         stack = me.stack;
                         args = [];
-                        _d.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _d.trys.push([1, 11, 12, 13]);
+                        _b.trys.push([1, 11, 12, 13]);
                         stack_1 = __values(stack), stack_1_1 = stack_1.next();
-                        _d.label = 2;
+                        _b.label = 2;
                     case 2:
                         if (!!stack_1_1.done) return [3 /*break*/, 10];
                         entity = stack_1_1.value;
@@ -104,34 +104,34 @@ var ArgumentOperation = /** @class */ (function (_super) {
                         if (!(entity instanceof assign_1.default)) return [3 /*break*/, 6];
                         return [4 /*yield*/, entity.get(operationContext, me)];
                     case 4:
-                        _d.sent();
-                        _b = (_a = args).push;
-                        return [4 /*yield*/, entity.expr.left.get(operationContext)];
+                        _b.sent();
+                        return [4 /*yield*/, entity.expr.left.get(operationContext, me)];
                     case 5:
-                        _b.apply(_a, [_d.sent()]);
+                        arg = _b.sent();
+                        args.push(arg);
                         return [3 /*break*/, 9];
                     case 6:
                         if (!(entity instanceof path_1.default)) return [3 /*break*/, 8];
                         return [4 /*yield*/, entity.get(operationContext, me)];
                     case 7:
-                        arg = _d.sent();
+                        arg = _b.sent();
                         operationContext.set(arg.path, new nil_1.default());
                         args.push(arg);
                         return [3 /*break*/, 9];
                     case 8:
                         operationContext.debugger.raise('Unexpected argument', me, entity);
-                        _d.label = 9;
+                        _b.label = 9;
                     case 9:
                         stack_1_1 = stack_1.next();
                         return [3 /*break*/, 2];
                     case 10: return [3 /*break*/, 13];
                     case 11:
-                        e_1_1 = _d.sent();
+                        e_1_1 = _b.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 13];
                     case 12:
                         try {
-                            if (stack_1_1 && !stack_1_1.done && (_c = stack_1.return)) _c.call(stack_1);
+                            if (stack_1_1 && !stack_1_1.done && (_a = stack_1.return)) _a.call(stack_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];

package/dist/operations/return.js

@@ -50,10 +50,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var operation_1 = require("../types/operation");
 var expression_1 = require("../types/expression");
 var typer_1 = require("../typer");
+var nil_1 = __importDefault(require("../custom-types/nil"));
 var ReturnOperation = /** @class */ (function (_super) {
     __extends(ReturnOperation, _super);
     function ReturnOperation(ast, options) {
@@ -87,7 +91,7 @@ var ReturnOperation = /** @class */ (function (_super) {
                         arg = _a.sent();
                         return [3 /*break*/, 6];
                     case 5:
-                        operationContext.debugger.raise('Unexpected return value', me, me.arg);
+                        arg = new nil_1.default();
                         _a.label = 6;
                     case 6:
                         functionContext.value = arg;

package/dist/operations/while.js

@@ -82,7 +82,7 @@ var WhileOperation = /** @class */ (function (_super) {
                         };
                         resolveCondition = function () {
                             return __awaiter(this, void 0, void 0, function () {
-                                var value;
+                                var value, value;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
@@ -90,13 +90,19 @@ var WhileOperation = /** @class */ (function (_super) {
                                             return [4 /*yield*/, me.condition.get(opc)];
                                         case 1:
                                             value = _a.sent();
-                                            return [2 /*return*/, value.valueOf()];
+                                            return [2 /*return*/, !!(value === null || value === void 0 ? void 0 : value.valueOf())];
                                         case 2:
+                                            if (!(me.condition instanceof operation_1.Operation)) return [3 /*break*/, 4];
+                                            return [4 /*yield*/, me.condition.get(opc)];
+                                        case 3:
+                                            value = _a.sent();
+                                            return [2 /*return*/, !!(value === null || value === void 0 ? void 0 : value.valueOf())];
+                                        case 4:
                                             if ((0, typer_1.isCustomValue)(me.condition)) {
                                                 return [2 /*return*/, me.condition.valueOf()];
                                             }
-                                            _a.label = 3;
-                                        case 3:
+                                            _a.label = 5;
+                                        case 5:
                                             operationContext.debugger.raise('Unexpected condition', me, me.condition);
                                             return [2 /*return*/];
                                     }

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

@@ -9,6 +9,7 @@ export declare abstract class CustomLiteralType extends CustomType {
 }
 export declare abstract class CustomObjectType extends CustomType {
     value: any;
+    has(path: any[]): Promise<boolean>;
     set(path: any[], value: any): Promise<void>;
     get(path: any[]): Promise<any>;
     getCallable(path: any[]): Promise<Callable>;

package/dist/types/custom-type.js

@@ -44,6 +44,9 @@ var CustomObjectType = /** @class */ (function (_super) {
     function CustomObjectType() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    CustomObjectType.prototype.has = function (path) {
+        throw new Error('Implentation of "has" missing');
+    };
     CustomObjectType.prototype.set = function (path, value) {
         throw new Error('Implentation of "set" missing');
     };

package/package.json

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