greybel-interpreter 0.5.7 → 0.6.1

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,11 +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;
-    valueOf(): CustomMap;
+    lookupAllOfType(validate: (type: ContextType) => boolean): OperationContext[];
+    lookupType(validate: (type: ContextType) => boolean): OperationContext;
+    lookupAllScopes(): OperationContext[];
+    lookupAPI(): OperationContext;
+    lookupGlobals(): OperationContext;
+    lookupLocals(): OperationContext;
     extend(map: Map<string, any>): OperationContext;
     set(path: any[], value: any): Promise<void>;
     get(path: any[]): Promise<any>;

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,96 +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 if (me.context.previous) {
-                return map_1.default.prototype.get.call(me.context.previous.scope, 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 if (me.value.has(current)) {
-                return _super.prototype.getCallable.call(this, path);
-            }
-            else if (me.context.previous) {
-                return map_1.default.prototype.getCallable.call(me.context.previous.scope, path);
-            }
-            else {
-                throw new Error("Cannot get callable path ".concat(path.join('.')));
-            }
-        }
-        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;
@@ -247,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;
@@ -303,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); });
     };
@@ -326,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.valueOf();
-    };
     OperationContext.prototype.extend = function (map) {
         var _a;
         var me = this;
@@ -343,28 +379,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/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

@@ -5,7 +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 declare function itemAtIndex(list: any[], n: number): number | null;
 export default class CustomList extends CustomObjectType {
     static intrinsics: Map<string, Function>;
     value: any[];
@@ -17,9 +17,9 @@ export default class CustomList extends CustomObjectType {
     set(path: any[], value: any): Promise<void>;
     get(path: any[]): Promise<any>;
     getCallable(path: any[]): Promise<Callable>;
-    callMethod(method: string[], ...args: any[]): any;
     getType(): string;
-    valueOf(): CustomList | null;
     toString(): string;
+    toNumber(): number;
+    toTruthy(): boolean;
     fork(): CustomList;
 }

package/dist/custom-types/list.js

@@ -50,35 +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 __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.itemAtIndex = exports.CustomListIterator = void 0;
 var operation_1 = require("../types/operation");
 var custom_type_1 = require("../types/custom-type");
+var string_1 = __importDefault(require("./string"));
 var CustomListIterator = /** @class */ (function () {
     function CustomListIterator(value) {
         var me = this;
@@ -102,6 +81,8 @@ var CustomListIterator = /** @class */ (function () {
 }());
 exports.CustomListIterator = CustomListIterator;
 function itemAtIndex(list, n) {
+    if (Number.isNaN(n))
+        return null;
     n = Math.trunc(n) || 0;
     if (n < 0)
         n += list.length;
@@ -115,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;
@@ -177,7 +158,8 @@ var CustomList = /** @class */ (function (_super) {
                     currentIndex = itemAtIndex(refs, Number(current));
                     if (refs.hasOwnProperty(currentIndex)) {
                         sub = refs[currentIndex];
-                        if (traversalPath.length > 0 && sub instanceof custom_type_1.CustomObjectType) {
+                        if (traversalPath.length > 0 &&
+                            (sub instanceof custom_type_1.CustomObjectType || sub instanceof string_1.default)) {
                             return [2 /*return*/, sub.get(traversalPath)];
                         }
                         if (traversalPath.length === 0) {
@@ -187,9 +169,6 @@ var CustomList = /** @class */ (function (_super) {
                     else if (path.length === 1 && CustomList.intrinsics.has(current)) {
                         return [2 /*return*/, CustomList.intrinsics.get(current).bind(null, me)];
                     }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
                 }
                 return [2 /*return*/, null];
             });
@@ -207,7 +186,7 @@ var CustomList = /** @class */ (function (_super) {
                     currentIndex = itemAtIndex(refs, Number(current));
                     if (refs.hasOwnProperty(currentIndex)) {
                         sub = refs[currentIndex];
-                        if (sub instanceof custom_type_1.CustomObjectType) {
+                        if (sub instanceof custom_type_1.CustomObjectType || sub instanceof string_1.default) {
                             return [2 /*return*/, sub.getCallable(traversalPath)];
                         }
                         if (traversalPath.length === 0) {
@@ -223,57 +202,28 @@ var CustomList = /** @class */ (function (_super) {
                                 context: me
                             }];
                     }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
                 }
                 return [2 /*return*/, {
-                        origin: refs,
+                        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];
-        }
-        if (method.length === 0) {
-            throw new Error('Unexpected method length');
-        }
-        var me = this;
-        var member = (_b = method[0]) === null || _b === void 0 ? void 0 : _b.toString();
-        if (CustomList.isNumber(member)) {
-            var memberIndex = itemAtIndex(me.value, Number(member));
-            if (!me.value.hasOwnProperty(memberIndex)) {
-                return null;
-            }
-            if (method.length > 1) {
-                return (_a = me.value[memberIndex]).callMethod.apply(_a, __spreadArray([method.slice(1)], __read(args), false));
-            }
-            return me.value[memberIndex];
-        }
-        if (!CustomList.intrinsics.has(member)) {
-            throw new Error("Cannot access ".concat(member, " in list"));
-        }
-        return CustomList.intrinsics.get(member).apply(void 0, __spreadArray([me], __read(args), false));
-    };
     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

@@ -16,13 +16,14 @@ 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>;
-    callMethod(method: string[], ...args: any[]): any;
     createInstance(): CustomMap;
     getType(): string;
-    valueOf(): CustomMap | null;
+    toNumber(): number;
+    toTruthy(): boolean;
     toString(): string;
     fork(): CustomMap;
 }