greybel-interpreter 0.5.8 → 0.5.9

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,7 +17,6 @@ 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;

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;
@@ -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) {
@@ -204,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) {
@@ -228,33 +210,6 @@ var CustomList = /** @class */ (function (_super) {
             });
         });
     };
-    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';
     };

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

@@ -20,7 +20,6 @@ export default class CustomMap extends CustomObjectType implements Iterable<Cust
     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;

package/dist/custom-types/map.js

@@ -39,10 +39,14 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     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.CustomMapIterator = void 0;
 var custom_type_1 = require("../types/custom-type");
 var operation_1 = require("../types/operation");
+var string_1 = __importDefault(require("./string"));
 var CustomMapIterator = /** @class */ (function () {
     function CustomMapIterator(value) {
         var me = this;
@@ -146,7 +150,8 @@ var CustomMap = /** @class */ (function (_super) {
         if (current != null) {
             if (refs.has(current)) {
                 var sub = refs.get(current);
-                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 sub.get(traversalPath);
                 }
                 if (traversalPath.length === 0) {
@@ -170,7 +175,7 @@ var CustomMap = /** @class */ (function (_super) {
         if (current != null) {
             if (refs.has(current)) {
                 var sub = refs.get(current);
-                if (sub instanceof custom_type_1.CustomObjectType) {
+                if (sub instanceof custom_type_1.CustomObjectType || sub instanceof string_1.default) {
                     return sub.getCallable(traversalPath);
                 }
                 if (traversalPath.length === 0) {
@@ -195,29 +200,6 @@ var CustomMap = /** @class */ (function (_super) {
             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];
-        }
-        if (method.length === 0) {
-            throw new Error('Unexpected method length');
-        }
-        var me = this;
-        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));
-            }
-            throw new Error("Unexpected method path");
-        }
-        if (!CustomMap.intrinsics.has(key)) {
-            throw new Error("Cannot access ".concat(key, " in map"));
-        }
-        return CustomMap.intrinsics.get(key).apply(void 0, __spreadArray([me], __read(args), false));
-    };
     CustomMap.prototype.createInstance = function () {
         var me = this;
         var newInstance = new CustomMap();

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

@@ -1,3 +1,4 @@
+import { Callable } from '../types/custom-type';
 import { CustomLiteralType } from '../types/custom-type';
 export declare class CustomStringIterator implements Iterator<string> {
     value: string;
@@ -5,6 +6,7 @@ export declare class CustomStringIterator implements Iterator<string> {
     constructor(value: string);
     next(): IteratorResult<string>;
 }
+export declare function itemAtIndex(str: any, n: number): number | null;
 export default class CustomString extends CustomLiteralType {
     static intrinsics: Map<string, Function>;
     value: string;
@@ -12,8 +14,8 @@ export default class CustomString extends CustomLiteralType {
     constructor(value: string);
     slice(a: CustomLiteralType, b: CustomLiteralType): CustomString;
     [Symbol.iterator](): CustomStringIterator;
-    toIndex(value: string): number;
-    callMethod(method: string[], ...args: any[]): any;
+    get(path: any[]): Promise<any>;
+    getCallable(path: any[]): Promise<Callable>;
     getType(): string;
     valueOf(): string | null;
     toString(): string;

package/dist/custom-types/string.js

@@ -14,33 +14,44 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-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 __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 __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];
-        }
+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 };
     }
-    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomStringIterator = void 0;
+exports.itemAtIndex = exports.CustomStringIterator = void 0;
 var custom_type_1 = require("../types/custom-type");
 var CustomStringIterator = /** @class */ (function () {
     function CustomStringIterator(value) {
@@ -64,6 +75,17 @@ var CustomStringIterator = /** @class */ (function () {
     return CustomStringIterator;
 }());
 exports.CustomStringIterator = CustomStringIterator;
+function itemAtIndex(str, n) {
+    if (Number.isNaN(n))
+        return null;
+    n = Math.trunc(n) || 0;
+    if (n < 0)
+        n += str.length;
+    if (n < 0 || n >= str.length)
+        return -1;
+    return n;
+}
+exports.itemAtIndex = itemAtIndex;
 var CustomString = /** @class */ (function (_super) {
     __extends(CustomString, _super);
     function CustomString(value) {
@@ -80,37 +102,51 @@ var CustomString = /** @class */ (function (_super) {
     CustomString.prototype[Symbol.iterator] = function () {
         return new CustomStringIterator(this.value);
     };
-    CustomString.prototype.toIndex = function (value) {
-        var me = this;
-        var casted = Number(value);
-        return casted < 0 ? me.value.length + casted : casted;
+    CustomString.prototype.get = function (path) {
+        return __awaiter(this, void 0, void 0, function () {
+            var me, traversalPath, str, current, currentIndex;
+            return __generator(this, function (_a) {
+                me = this;
+                if (path.length === 0) {
+                    return [2 /*return*/, me];
+                }
+                traversalPath = [].concat(path);
+                str = me.value;
+                current = traversalPath.shift();
+                if (current != null) {
+                    currentIndex = itemAtIndex(str, Number(current));
+                    if (currentIndex != null && str.charAt(currentIndex) != null) {
+                        return [2 /*return*/, new CustomString(str.charAt(currentIndex))];
+                    }
+                    else if (path.length === 1 && CustomString.intrinsics.has(current)) {
+                        return [2 /*return*/, CustomString.intrinsics.get(current).bind(null, me)];
+                    }
+                }
+                return [2 /*return*/, null];
+            });
+        });
     };
-    CustomString.prototype.callMethod = function (method) {
-        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 = method[0].valueOf();
-        if (CustomString.isNumber(member)) {
-            var index = me.toIndex(member);
-            if (!me.value[index]) {
-                console.error(method, member, args);
-                throw new Error("Unexpected index ".concat(index));
-            }
-            var value = new CustomString(me.value[index]);
-            if (method.length > 1) {
-                return value.callMethod.apply(value, __spreadArray([method.slice(1)], __read(args), false));
-            }
-            return value;
-        }
-        if (!CustomString.intrinsics.has(member)) {
-            throw new Error("Cannot access ".concat(member, " in string"));
-        }
-        return CustomString.intrinsics.get(member).apply(void 0, __spreadArray([me], __read(args), false));
+    CustomString.prototype.getCallable = function (path) {
+        return __awaiter(this, void 0, void 0, function () {
+            var me, traversalPath, current;
+            return __generator(this, function (_a) {
+                me = this;
+                traversalPath = [].concat(path);
+                current = traversalPath.shift();
+                if (current != null) {
+                    if (path.length === 1 && CustomString.intrinsics.has(current)) {
+                        return [2 /*return*/, {
+                                origin: CustomString.intrinsics.get(current).bind(null, me),
+                                context: me
+                            }];
+                    }
+                }
+                return [2 /*return*/, {
+                        origin: null,
+                        context: me
+                    }];
+            });
+        });
     };
     CustomString.prototype.getType = function () {
         return 'string';

package/dist/expressions/call.js

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

package/dist/expressions/path.js

@@ -338,7 +338,9 @@ var PathExpression = /** @class */ (function (_super) {
                         if (!(resultExpr.path.length === 0)) return [3 /*break*/, 2];
                         return [2 /*return*/, resultExpr.handle];
                     case 2:
-                        if (!(0, typer_1.isCustomMap)(resultExpr.handle)) return [3 /*break*/, 7];
+                        if (!((0, typer_1.isCustomMap)(resultExpr.handle) ||
+                            (0, typer_1.isCustomList)(resultExpr.handle) ||
+                            (0, typer_1.isCustomString)(resultExpr.handle))) return [3 /*break*/, 7];
                         context = resultExpr.handle;
                         return [4 /*yield*/, context.get(resultExpr.path)];
                     case 3:
@@ -351,7 +353,9 @@ var PathExpression = /** @class */ (function (_super) {
                         return [4 /*yield*/, value_1.call(context)];
                     case 5: return [2 /*return*/, _a.apply(void 0, [_c.sent()])];
                     case 6: return [2 /*return*/, value_1];
-                    case 7: return [2 /*return*/, (0, typer_1.cast)(resultExpr.handle.callMethod(resultExpr.path))];
+                    case 7:
+                        operationContext.debugger.raise('Unexpected handle get', me, resultExpr);
+                        _c.label = 8;
                     case 8: return [4 /*yield*/, operationContext.get(resultExpr.path)];
                     case 9:
                         value = _c.sent();

package/package.json

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