greybel-interpreter 1.3.5 → 1.3.7

package/dist/types/function.d.ts

@@ -2,7 +2,7 @@ import OperationContext from '../context';
 import Operation from '../operations/operation';
 import { CustomValue } from './generics';
 export interface Callback {
-    (ctx: OperationContext, self: CustomValue, args: Map<string, CustomValue>): Promise<CustomValue>;
+    (ctx: OperationContext, self: CustomValue, args: Map<string, CustomValue>): Promise<NonNullable<CustomValue>>;
 }
 export declare class Argument {
     readonly name: string;

package/dist/types/map.d.ts

@@ -4,9 +4,10 @@ import CustomFunction from './function';
 import { CustomObject, CustomValue } from './generics';
 import CustomString from './string';
 export declare const CLASS_ID_PROPERTY: CustomString;
-export declare const getValue: (map: CustomMap, mapKey: CustomValue) => CustomValue;
-export declare const hasValue: (map: CustomMap, mapKey: CustomValue) => boolean;
-export declare const setValue: (map: CustomMap, mapKey: CustomValue, mapValue: CustomValue) => void;
+export declare const ISA_PROPERTY: CustomString;
+export declare const getValue: (map: Map<CustomValue, CustomValue>, mapKey: CustomValue) => CustomValue;
+export declare const hasValue: (map: Map<CustomValue, CustomValue>, mapKey: CustomValue) => boolean;
+export declare const setValue: (map: Map<CustomValue, CustomValue>, mapKey: CustomValue, mapValue: CustomValue) => void;
 export declare class CustomMapIterator implements Iterator<CustomValue> {
     value: Map<CustomValue, CustomValue>;
     index: number;
@@ -18,8 +19,9 @@ export default class CustomMap extends CustomObject {
     static getIntrinsics(): IntrinsicsContainer;
     static addIntrinsic(name: string, fn: CustomFunction): void;
     readonly value: Map<CustomValue, CustomValue>;
+    readonly isa: Map<CustomValue, CustomValue>;
     private isInstance;
-    constructor(value?: Map<CustomValue, CustomValue>);
+    constructor(value?: Map<CustomValue, CustomValue>, isa?: Map<CustomValue, CustomValue>);
     getCustomType(): string;
     toString(): string;
     fork(): CustomMap;

package/dist/types/map.js

@@ -41,23 +41,33 @@ var __read = (this && this.__read) || function (o, n) {
     }
     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.CustomMapIterator = exports.setValue = exports.hasValue = exports.getValue = exports.CLASS_ID_PROPERTY = void 0;
+exports.CustomMapIterator = exports.setValue = exports.hasValue = exports.getValue = exports.ISA_PROPERTY = exports.CLASS_ID_PROPERTY = void 0;
 var intrinsics_container_1 = __importDefault(require("../intrinsics-container"));
+var deep_equal_1 = __importDefault(require("../utils/deep-equal"));
 var path_1 = __importDefault(require("../utils/path"));
 var default_1 = __importDefault(require("./default"));
 var generics_1 = require("./generics");
 var nil_1 = __importDefault(require("./nil"));
 var string_1 = __importDefault(require("./string"));
-var deep_equal_1 = __importDefault(require("../utils/deep-equal"));
 exports.CLASS_ID_PROPERTY = new string_1.default('classID');
+exports.ISA_PROPERTY = new string_1.default('__isa');
 var getValue = function (map, mapKey) {
     var e_1, _a;
     try {
-        for (var _b = __values(map.value.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(map.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
             var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
             if ((0, deep_equal_1.default)(key, mapKey)) {
                 return value;
@@ -77,7 +87,7 @@ exports.getValue = getValue;
 var hasValue = function (map, mapKey) {
     var e_2, _a;
     try {
-        for (var _b = __values(map.value.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(map.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
             if ((0, deep_equal_1.default)(key, mapKey)) {
                 return true;
@@ -97,10 +107,10 @@ exports.hasValue = hasValue;
 var setValue = function (map, mapKey, mapValue) {
     var e_3, _a;
     try {
-        for (var _b = __values(map.value.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(map.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
             if ((0, deep_equal_1.default)(key, mapKey)) {
-                map.value.set(key, mapValue);
+                map.set(key, mapValue);
                 return;
             }
         }
@@ -112,7 +122,7 @@ var setValue = function (map, mapKey, mapValue) {
         }
         finally { if (e_3) throw e_3.error; }
     }
-    map.value.set(mapKey, mapValue);
+    map.set(mapKey, mapValue);
 };
 exports.setValue = setValue;
 var CustomMapIterator = /** @class */ (function () {
@@ -144,11 +154,13 @@ var CustomMapIterator = /** @class */ (function () {
 exports.CustomMapIterator = CustomMapIterator;
 var CustomMap = /** @class */ (function (_super) {
     __extends(CustomMap, _super);
-    function CustomMap(value) {
+    function CustomMap(value, isa) {
         if (value === void 0) { value = new Map(); }
+        if (isa === void 0) { isa = new Map(); }
         var _this = _super.call(this) || this;
         _this.isInstance = false;
         _this.value = new Map(value);
+        _this.isa = isa;
         return _this;
     }
     CustomMap.getIntrinsics = function () {
@@ -158,28 +170,41 @@ var CustomMap = /** @class */ (function (_super) {
         this.intrinsics.add(name, fn);
     };
     CustomMap.prototype.getCustomType = function () {
-        if ((0, exports.hasValue)(this, exports.CLASS_ID_PROPERTY)) {
-            return (0, exports.getValue)(this, exports.CLASS_ID_PROPERTY).toString();
+        if ((0, exports.hasValue)(this.value, exports.CLASS_ID_PROPERTY)) {
+            return (0, exports.getValue)(this.value, exports.CLASS_ID_PROPERTY).toString();
         }
         return 'map';
     };
     CustomMap.prototype.toString = function () {
-        var e_4, _a;
-        var values = [];
+        var _a, e_4, _b, e_5, _c;
+        var json = (_a = {}, _a[exports.ISA_PROPERTY.toString()] = {}, _a);
         try {
-            for (var _b = __values(this.value), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
-                values.push("".concat(key, ": ").concat(value.toString()));
+            for (var _d = __values(this.isa.entries()), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var _f = __read(_e.value, 2), key = _f[0], value = _f[1];
+                json.__isa[key.toString()] = value.toString();
             }
         }
         catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
             }
             finally { if (e_4) throw e_4.error; }
         }
-        return "{ ".concat(values.join(', '), " }");
+        try {
+            for (var _g = __values(this.value.entries()), _h = _g.next(); !_h.done; _h = _g.next()) {
+                var _j = __read(_h.value, 2), key = _j[0], value = _j[1];
+                json[key.toString()] = value.toString();
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (_h && !_h.done && (_c = _g.return)) _c.call(_g);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        return JSON.stringify(json);
     };
     CustomMap.prototype.fork = function () {
         return new CustomMap(this.value);
@@ -197,22 +222,22 @@ var CustomMap = /** @class */ (function (_super) {
         return new CustomMapIterator(this.value);
     };
     CustomMap.prototype.extend = function (map) {
-        var e_5, _a;
+        var e_6, _a;
         if (map instanceof CustomMap) {
             map = map.value;
         }
         try {
             for (var map_1 = __values(map), map_1_1 = map_1.next(); !map_1_1.done; map_1_1 = map_1.next()) {
                 var _b = __read(map_1_1.value, 2), key = _b[0], value = _b[1];
-                (0, exports.setValue)(this, key, value);
+                (0, exports.setValue)(this.value, key, value);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (map_1_1 && !map_1_1.done && (_a = map_1.return)) _a.call(map_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         return this;
     };
@@ -223,8 +248,16 @@ var CustomMap = /** @class */ (function (_super) {
         var traversalPath = path.clone();
         var current = traversalPath.next();
         if (current !== null) {
-            if ((0, exports.hasValue)(this, current)) {
-                var sub = (0, exports.getValue)(this, current);
+            if ((0, exports.hasValue)(this.value, current)) {
+                var sub = (0, exports.getValue)(this.value, current);
+                if (traversalPath.count() > 0 &&
+                    sub instanceof generics_1.CustomValueWithIntrinsics) {
+                    return sub.has(traversalPath);
+                }
+                return traversalPath.count() === 0;
+            }
+            else if ((0, exports.hasValue)(this.isa, current)) {
+                var sub = (0, exports.getValue)(this.isa, current);
                 if (traversalPath.count() > 0 &&
                     sub instanceof generics_1.CustomValueWithIntrinsics) {
                     return sub.has(traversalPath);
@@ -242,8 +275,8 @@ var CustomMap = /** @class */ (function (_super) {
         var last = traversalPath.last();
         var current = traversalPath.next();
         if (current !== null) {
-            if ((0, exports.hasValue)(this, current)) {
-                var sub = (0, exports.getValue)(this, current);
+            if ((0, exports.hasValue)(this.value, current)) {
+                var sub = (0, exports.getValue)(this.value, current);
                 if (sub instanceof generics_1.CustomValueWithIntrinsics) {
                     sub.set(traversalPath, newValue);
                     return;
@@ -251,7 +284,7 @@ var CustomMap = /** @class */ (function (_super) {
             }
             throw new Error("Cannot set path ".concat(path.toString(), "."));
         }
-        (0, exports.setValue)(this, last, newValue);
+        (0, exports.setValue)(this.value, last, newValue);
     };
     CustomMap.prototype.get = function (path) {
         if (path instanceof generics_1.CustomValue) {
@@ -260,8 +293,8 @@ var CustomMap = /** @class */ (function (_super) {
         var traversalPath = path.clone();
         var current = traversalPath.next();
         if (current !== null) {
-            if ((0, exports.hasValue)(this, current)) {
-                var sub = (0, exports.getValue)(this, current);
+            if ((0, exports.hasValue)(this.value, current)) {
+                var sub = (0, exports.getValue)(this.value, current);
                 if (traversalPath.count() > 0) {
                     if (sub instanceof generics_1.CustomValueWithIntrinsics) {
                         return sub.get(traversalPath);
@@ -271,6 +304,36 @@ var CustomMap = /** @class */ (function (_super) {
                     return sub;
                 }
             }
+            else if ((0, exports.hasValue)(this.isa, current)) {
+                var sub = (0, exports.getValue)(this.isa, current);
+                if (traversalPath.count() > 0) {
+                    if (sub instanceof generics_1.CustomValueWithIntrinsics) {
+                        return sub.get(traversalPath);
+                    }
+                }
+                else if (traversalPath.count() === 0) {
+                    return sub;
+                }
+            }
+            else if (current.toString() === exports.ISA_PROPERTY.toString()) {
+                if (path.count() === 1) {
+                    return new CustomMap(this.isa);
+                }
+                else {
+                    var ahead = traversalPath.next();
+                    if ((0, exports.hasValue)(this.isa, ahead)) {
+                        var sub = (0, exports.getValue)(this.isa, ahead);
+                        if (traversalPath.count() > 0) {
+                            if (sub instanceof generics_1.CustomValueWithIntrinsics) {
+                                return sub.get(traversalPath);
+                            }
+                        }
+                        else if (traversalPath.count() === 0) {
+                            return sub;
+                        }
+                    }
+                }
+            }
             else if (path.count() === 1 &&
                 CustomMap.getIntrinsics().has(current.toString())) {
                 return CustomMap.getIntrinsics().get(current.toString());
@@ -279,7 +342,21 @@ var CustomMap = /** @class */ (function (_super) {
         throw new Error("Unknown path in map ".concat(path.toString(), "."));
     };
     CustomMap.prototype.createInstance = function () {
-        var newInstance = new CustomMap(this.value);
+        var e_7, _a;
+        var newInstance = new CustomMap(new Map(), new Map(__spreadArray([], __read(this.isa), false)));
+        try {
+            for (var _b = __values(this.value.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = __read(_c.value, 2), k = _d[0], v = _d[1];
+                (0, exports.setValue)(newInstance.isa, k, v);
+            }
+        }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_7) throw e_7.error; }
+        }
         newInstance.isInstance = true;
         return newInstance;
     };

package/package.json

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