greybel-interpreter 0.2.3 → 0.2.4

package/dist/context.d.ts

@@ -1,3 +1,4 @@
+import CustomMap from './custom-types/map';
 import { Operation } from './types/operation';
 import { Expression } from './types/expression';
 import { Callable } from './types/custom-type';
@@ -16,12 +17,9 @@ export declare enum ContextState {
     TEMPORARY = "TEMPORARY",
     DEFAULT = "DEFAULT"
 }
-export declare class Scope {
+export declare class Scope extends CustomMap {
     context: OperationContext;
-    refs: Map<string, any>;
     constructor(context: OperationContext);
-    valueOf(): Map<string, any>;
-    extend(map?: Map<string, any>): Scope;
     set(path: string[], value: any): Promise<void>;
     get(path: string[]): Promise<any>;
     getCallable(path: string[]): Promise<Callable>;
@@ -71,12 +69,12 @@ export declare class OperationContext {
     cps: CPS | null;
     processState: OperationContextProcessState;
     constructor(options: OperationContextOptions);
-    valueOf(): Map<string, any>;
+    valueOf(): CustomMap;
     extend(map: Map<string, any>): OperationContext;
-    set(path: any[], value: any): Promise<OperationContext>;
-    get(path: any[]): any;
+    set(path: any[], value: any): Promise<void>;
+    get(path: any[]): Promise<any>;
+    getCallable(path: string[]): Promise<Callable>;
     setMemory(key: string, value: any): OperationContext;
     getMemory(key: string): any;
-    getCallable(path: string[]): Promise<Callable>;
     fork({ type, state, target }: OperationContextForkOptions): OperationContext;
 }

package/dist/context.js

@@ -1,4 +1,19 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        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) {
@@ -65,11 +80,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationContext = exports.Debugger = exports.Scope = exports.ContextState = exports.ContextType = void 0;
-var boolean_1 = __importDefault(require("./custom-types/boolean"));
-var number_1 = __importDefault(require("./custom-types/number"));
-var string_1 = __importDefault(require("./custom-types/string"));
-var nil_1 = __importDefault(require("./custom-types/nil"));
-var custom_type_1 = require("./types/custom-type");
+var map_1 = __importDefault(require("./custom-types/map"));
 var greybel_core_1 = require("greybel-core");
 var ContextType;
 (function (ContextType) {
@@ -87,128 +98,158 @@ var ContextState;
     ContextState["TEMPORARY"] = "TEMPORARY";
     ContextState["DEFAULT"] = "DEFAULT";
 })(ContextState = exports.ContextState || (exports.ContextState = {}));
-var Scope = /** @class */ (function () {
+var Scope = /** @class */ (function (_super) {
+    __extends(Scope, _super);
     function Scope(context) {
-        var me = this;
-        me.context = context;
-        me.refs = new Map();
+        var _this = _super.call(this) || this;
+        _this.context = context;
+        return _this;
     }
-    Scope.prototype.valueOf = function () {
-        return this.refs;
-    };
-    Scope.prototype.extend = function (map) {
-        if (map === void 0) { map = new Map(); }
-        var me = this;
-        me.refs = new Map(__spreadArray(__spreadArray([], __read(me.refs.entries()), false), __read(map.entries()), false));
-        return me;
-    };
     Scope.prototype.set = function (path, value) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, last, current, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.refs;
-                last = traversalPath.pop();
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType ||
-                            origin instanceof Scope) {
-                            return [2 /*return*/, origin.set(traversalPath.concat([last]), value)];
-                        }
-                    }
-                    else if (me.context.previous && !me.context.previous.isProtected) {
-                        me.context.previous.set(path, value);
-                        return [2 /*return*/];
-                    }
-                    else if (traversalPath.length > 0) {
-                        throw new Error("Cannot set path ".concat(path.join('.')));
-                    }
+        var me = this;
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current != null) {
+            if (current === 'globals') {
+                if (me.context.type === ContextType.GLOBAL) {
+                    return me.set(traversalPath, value);
                 }
-                if (origin &&
-                    !(origin instanceof boolean_1.default) &&
-                    !(origin instanceof string_1.default) &&
-                    !(origin instanceof number_1.default) &&
-                    !(origin instanceof nil_1.default)) {
-                    origin.set(last, value);
+                else if (me.context.previous && !me.context.previous.isProtected) {
+                    return me.context.previous.set(traversalPath, value);
                 }
                 else {
-                    throw new Error("Cannot set path ".concat(path.join('.')));
+                    throw new Error("Cannot set globals scope for ".concat(path.join('.')));
                 }
-                return [2 /*return*/];
-            });
-        });
+            }
+            else if (current === 'locals') {
+                if (me.context.type === ContextType.GLOBAL ||
+                    me.context.type === ContextType.FUNCTION) {
+                    return me.set(traversalPath, value);
+                }
+                else if (me.context.previous && !me.context.previous.isProtected) {
+                    return me.context.previous.set(traversalPath, value);
+                }
+                else {
+                    throw new Error("Cannot set locals scope for ".concat(path.join('.')));
+                }
+            }
+            else {
+                return _super.prototype.set.call(this, path, value);
+            }
+        }
     };
     Scope.prototype.get = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, context, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.refs;
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        context = origin;
-                        origin = origin.get(current);
-                        if (traversalPath.length > 0 &&
-                            (origin instanceof custom_type_1.CustomObjectType ||
-                                origin instanceof Scope)) {
-                            return [2 /*return*/, origin.get(traversalPath)];
-                        }
-                    }
-                    else if (me.context.previous) {
-                        return [2 /*return*/, me.context.previous.get(path)];
+        var me = this;
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current != null) {
+            if (me.value.has(current)) {
+                return _super.prototype.get.call(this, path);
+            }
+            else if (path.length === 1 && map_1.default.intrinsics.has(current)) {
+                return map_1.default.intrinsics.get(current).bind(null, me);
+            }
+            else if (current === 'globals') {
+                if (me.context.type === ContextType.GLOBAL) {
+                    if (path.length === 1) {
+                        return Promise.resolve(me);
                     }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
+                    return me.get(traversalPath);
+                }
+                else if (me.context.previous) {
+                    return me.context.previous.get(traversalPath);
+                }
+                else {
+                    throw new Error("Cannot find globals scope for ".concat(path.join('.')));
+                }
+            }
+            else if (current === 'locals') {
+                if (me.context.type === ContextType.GLOBAL ||
+                    me.context.type === ContextType.FUNCTION) {
+                    if (path.length === 1) {
+                        return Promise.resolve(me);
                     }
+                    return me.get(traversalPath);
+                }
+                else if (me.context.previous) {
+                    return me.context.previous.get(traversalPath);
                 }
                 else {
-                    return [2 /*return*/, null];
+                    throw new Error("Cannot find locals scope for ".concat(path.join('.')));
                 }
-                return [2 /*return*/, origin];
-            });
-        });
+            }
+            else if (me.context.previous) {
+                return me.context.previous.get(path);
+            }
+            else {
+                throw new Error("Cannot get path ".concat(path.join('.')));
+            }
+        }
+        return null;
     };
     Scope.prototype.getCallable = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, origin, context;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.refs;
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        context = origin;
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType ||
-                            origin instanceof Scope) {
-                            return [2 /*return*/, origin.getCallable(traversalPath)];
-                        }
-                    }
-                    else if (me.context.previous) {
-                        return [2 /*return*/, me.context.previous.getCallable(path)];
+        var me = this;
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current != null) {
+            if (me.value.has(current)) {
+                return _super.prototype.getCallable.call(this, path);
+            }
+            else if (path.length === 1 && map_1.default.intrinsics.has(current)) {
+                return Promise.resolve({
+                    origin: map_1.default.intrinsics.get(current).bind(null, me),
+                    context: me
+                });
+            }
+            else if (current === 'globals') {
+                if (me.context.type === ContextType.GLOBAL) {
+                    if (path.length === 1) {
+                        return Promise.resolve({
+                            origin: me,
+                            context: null
+                        });
                     }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
+                    return me.getCallable(traversalPath);
+                }
+                else if (me.context.previous) {
+                    return me.context.previous.getCallable(traversalPath);
+                }
+                else {
+                    throw new Error("Cannot find callable in globals scope for ".concat(path.join('.')));
+                }
+            }
+            else if (current === 'locals') {
+                if (me.context.type === ContextType.GLOBAL ||
+                    me.context.type === ContextType.FUNCTION) {
+                    if (path.length === 1) {
+                        return Promise.resolve({
+                            origin: me,
+                            context: null
+                        });
                     }
+                    return me.getCallable(traversalPath);
                 }
-                return [2 /*return*/, {
-                        origin: origin,
-                        context: context
-                    }];
-            });
+                else if (me.context.previous) {
+                    return me.context.previous.getCallable(traversalPath);
+                }
+                else {
+                    throw new Error("Cannot find callable in locals scope for ".concat(path.join('.')));
+                }
+            }
+            else if (me.context.previous) {
+                return me.context.previous.getCallable(path);
+            }
+            else {
+                throw new Error("Cannot get callable path ".concat(path.join('.')));
+            }
+        }
+        return Promise.resolve({
+            origin: me,
+            context: null
         });
     };
     return Scope;
-}());
+}(map_1.default));
 exports.Scope = Scope;
 var Debugger = /** @class */ (function () {
     function Debugger() {
@@ -340,25 +381,13 @@ var OperationContext = /** @class */ (function () {
     };
     OperationContext.prototype.set = function (path, value) {
         var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var me;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        me = this;
-                        if (!(me.state === ContextState.TEMPORARY)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, ((_a = me.previous) === null || _a === void 0 ? void 0 : _a.set(path, value))];
-                    case 1:
-                        _b.sent();
-                        return [3 /*break*/, 4];
-                    case 2: return [4 /*yield*/, me.scope.set(path, value)];
-                    case 3:
-                        _b.sent();
-                        _b.label = 4;
-                    case 4: return [2 /*return*/, me];
-                }
-            });
-        });
+        var me = this;
+        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);
+        }
     };
     OperationContext.prototype.get = function (path) {
         var _a;
@@ -368,6 +397,14 @@ var OperationContext = /** @class */ (function () {
         }
         return me.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);
+        }
+        return me.scope.getCallable(path);
+    };
     OperationContext.prototype.setMemory = function (key, value) {
         var me = this;
         me.memory.set(key, value);
@@ -377,14 +414,6 @@ var OperationContext = /** @class */ (function () {
         var me = this;
         return me.memory.get(key);
     };
-    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);
-        }
-        return me.scope.getCallable(path);
-    };
     OperationContext.prototype.fork = function (_a) {
         var type = _a.type, state = _a.state, target = _a.target;
         var me = this;
@@ -397,9 +426,6 @@ var OperationContext = /** @class */ (function () {
             cps: me.cps,
             processState: me.processState
         });
-        if (me.type === ContextType.FUNCTION || me.type === ContextType.GLOBAL) {
-            opc.scope.refs.set('locals', opc.scope);
-        }
         if (type !== ContextType.FUNCTION) {
             if (type !== ContextType.LOOP) {
                 opc.setMemory('loopContext', me.getMemory('loopContext'));

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

@@ -13,14 +13,14 @@ export default class CustomMap extends CustomObjectType implements Iterable<Cust
     static intrinsics: Map<string, Function>;
     value: Map<string, any>;
     isInstance: boolean;
-    constructor(value: Map<string, any>);
+    constructor(value?: Map<string, any>);
     [Symbol.iterator](): CustomMapIterator;
     extend(value: Map<string, any>): CustomMap;
     set(path: string[], value: any): Promise<void>;
     get(path: string[]): Promise<any>;
     getCallable(path: string[]): Promise<Callable>;
     callMethod(method: string[], ...args: any[]): any;
-    createInstancefunction(): CustomMap;
+    createInstance(): CustomMap;
     getType(): string;
     valueOf(): CustomMap | null;
     toString(): string;

package/dist/custom-types/map.js

@@ -14,42 +14,6 @@ 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;
@@ -111,7 +75,7 @@ var CustomMap = /** @class */ (function (_super) {
     function CustomMap(value) {
         var _this = _super.call(this) || this;
         var me = _this;
-        me.value = new Map(__spreadArray([], __read(value.entries()), false));
+        me.value = value || new Map();
         me.isInstance = false;
         return _this;
     }
@@ -124,107 +88,92 @@ var CustomMap = /** @class */ (function (_super) {
         return me;
     };
     CustomMap.prototype.set = function (path, value) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, last, current, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.value;
-                last = traversalPath.pop();
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.set(traversalPath.concat(last), value)];
-                        }
-                    }
-                    else {
-                        throw new Error("Cannot set path ".concat(path.join('.')));
-                    }
-                }
-                if (origin) {
-                    if (value instanceof operation_1.FunctionOperationBase) {
-                        origin.set(last, value.fork(me));
-                    }
-                    else {
-                        origin.set(last, value);
-                    }
-                }
-                else {
-                    throw new Error("Cannot set path ".concat(path.join('.')));
+        var me = this;
+        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);
                 }
-                return [2 /*return*/];
-            });
-        });
+            }
+            else {
+                throw new Error("Cannot set path ".concat(path.join('.')));
+            }
+        }
+        if (origin) {
+            if (value instanceof operation_1.FunctionOperationBase) {
+                origin.set(last, value.fork(me));
+            }
+            else {
+                origin.set(last, value);
+            }
+        }
+        else {
+            throw new Error("Cannot set path ".concat(path.join('.')));
+        }
     };
     CustomMap.prototype.get = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, currentValue, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                if (path.length === 0) {
-                    return [2 /*return*/, me];
-                }
-                traversalPath = [].concat(path);
-                refs = me.value;
-                current = traversalPath.shift();
-                currentValue = current.valueOf();
-                origin = refs;
-                if (currentValue != null) {
-                    if (origin.has(currentValue)) {
-                        origin = origin.get(currentValue);
-                        if (traversalPath.length > 0 && origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.get(traversalPath)];
-                        }
-                    }
-                    else if (path.length === 1 && CustomMap.intrinsics.has(currentValue)) {
-                        return [2 /*return*/, CustomMap.intrinsics.get(currentValue).bind(null, me)];
-                    }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
-                }
-                else {
-                    return [2 /*return*/, null];
+        var me = this;
+        if (path.length === 0) {
+            return Promise.resolve(me);
+        }
+        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);
                 }
-                return [2 /*return*/, origin];
-            });
-        });
+            }
+            else if (path.length === 1 && CustomMap.intrinsics.has(currentValue)) {
+                return Promise.resolve(CustomMap.intrinsics.get(currentValue).bind(null, me));
+            }
+            else {
+                throw new Error("Cannot get path ".concat(path.join('.')));
+            }
+        }
+        else {
+            return null;
+        }
+        return Promise.resolve(origin);
     };
     CustomMap.prototype.getCallable = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, origin, context;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.value;
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        context = origin;
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.getCallable(traversalPath)];
-                        }
-                    }
-                    else if (path.length === 1 && CustomMap.intrinsics.has(current)) {
-                        return [2 /*return*/, {
-                                origin: CustomMap.intrinsics.get(current).bind(null, me),
-                                context: me
-                            }];
-                    }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
+        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);
                 }
-                return [2 /*return*/, {
-                        origin: origin,
-                        context: context
-                    }];
-            });
+            }
+            else if (path.length === 1 && CustomMap.intrinsics.has(current)) {
+                return Promise.resolve({
+                    origin: CustomMap.intrinsics.get(current).bind(null, me),
+                    context: me
+                });
+            }
+            else {
+                throw new Error("Cannot get path ".concat(path.join('.')));
+            }
+        }
+        return Promise.resolve({
+            origin: origin,
+            context: context
         });
     };
     CustomMap.prototype.callMethod = function (method) {
@@ -249,7 +198,7 @@ var CustomMap = /** @class */ (function (_super) {
         }
         return CustomMap.intrinsics.get(key).apply(void 0, __spreadArray([me], __read(args), false));
     };
-    CustomMap.prototype.createInstancefunction = function () {
+    CustomMap.prototype.createInstance = function () {
         var me = this;
         var value = new Map();
         var newInstance = new CustomMap(value);
@@ -262,8 +211,9 @@ var CustomMap = /** @class */ (function (_super) {
         return newInstance;
     };
     CustomMap.prototype.getType = function () {
+        var _a;
         var me = this;
-        return me.value.get('classID') || 'map';
+        return ((_a = me.value.get('classID')) === null || _a === void 0 ? void 0 : _a.toString()) || 'map';
     };
     CustomMap.prototype.valueOf = function () {
         var me = this;

package/dist/interpreter.js

@@ -99,7 +99,9 @@ var Interpreter = /** @class */ (function () {
                         topOperation = new (_b.apply(top_1.default, _c.concat([(_d.body = _e.sent(),
                                 _d)])))();
                         mainContext.extend(me.api);
-                        mainContext.scope.refs.set('params', (0, typer_1.cast)(me.params));
+                        return [4 /*yield*/, mainContext.set(['params'], (0, typer_1.cast)(me.params))];
+                    case 4:
+                        _e.sent();
                         me.context = mainContext;
                         return [2 /*return*/, topOperation.run(mainContext)
                                 .catch(function (err) {

package/dist/operations/top.js

@@ -73,7 +73,6 @@ var TopOperation = /** @class */ (function (_super) {
                             type: context_1.ContextType.GLOBAL,
                             state: context_1.ContextState.DEFAULT
                         });
-                        opc.scope.refs.set('globals', opc.scope);
                         return [4 /*yield*/, me.body.run(opc)];
                     case 1:
                         _a.sent();

package/package.json

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