greybel-interpreter 1.4.4 → 1.4.6

package/dist/operations/list.js

@@ -1,19 +1,4 @@
 "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) {
@@ -23,89 +8,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var list_1 = __importDefault(require("../types/list"));
-var operation_1 = __importDefault(require("./operation"));
-var List = /** @class */ (function (_super) {
-    __extends(List, _super);
-    function List(item, target) {
-        var _this = _super.call(this, null, target) || this;
-        _this.item = item;
-        return _this;
+const list_1 = __importDefault(require("../types/list"));
+const operation_1 = __importDefault(require("./operation"));
+class List extends operation_1.default {
+    constructor(item, target) {
+        super(null, target);
+        this.item = item;
     }
-    List.prototype.build = function (visit) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this;
-                        return [4 /*yield*/, Promise.all(this.item.fields.map(function (child) {
-                                var listValue = child;
-                                return visit(listValue.value);
-                            }))];
-                    case 1:
-                        _a.fields = _b.sent();
-                        return [2 /*return*/, this];
-                }
-            });
+    build(visit) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.fields = yield Promise.all(this.item.fields.map((child) => {
+                const listValue = child;
+                return visit(listValue.value);
+            }));
+            return this;
         });
-    };
-    List.prototype.handle = function (ctx) {
-        return __awaiter(this, void 0, void 0, function () {
-            var fields, index, child, _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        fields = [];
-                        index = 0;
-                        _c.label = 1;
-                    case 1:
-                        if (!(index < this.fields.length)) return [3 /*break*/, 4];
-                        child = this.fields[index];
-                        _b = (_a = fields).push;
-                        return [4 /*yield*/, child.handle(ctx)];
-                    case 2:
-                        _b.apply(_a, [_c.sent()]);
-                        _c.label = 3;
-                    case 3:
-                        index++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, new list_1.default(fields)];
-                }
-            });
+    }
+    handle(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fields = [];
+            for (let index = 0; index < this.fields.length; index++) {
+                const child = this.fields[index];
+                fields.push(yield child.handle(ctx));
+            }
+            return new list_1.default(fields);
         });
-    };
-    return List;
-}(operation_1.default));
+    }
+}
 exports.default = List;

package/dist/operations/literal.d.ts

@@ -1,6 +1,6 @@
 import { ASTLiteral } from 'greyscript-core';
 import context from '../context';
-import { CustomValue } from '../types/generics';
+import CustomValue from '../types/base';
 import Operation, { CPSVisit } from './operation';
 export default class Literal extends Operation {
     readonly item: ASTLiteral;

package/dist/operations/literal.js

@@ -1,37 +1,20 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var greyscript_core_1 = require("greyscript-core");
-var boolean_1 = __importDefault(require("../types/boolean"));
-var default_1 = __importDefault(require("../types/default"));
-var number_1 = __importDefault(require("../types/number"));
-var string_1 = __importDefault(require("../types/string"));
-var operation_1 = __importDefault(require("./operation"));
-var Literal = /** @class */ (function (_super) {
-    __extends(Literal, _super);
-    function Literal(item, target) {
-        var _this = _super.call(this, null, target) || this;
-        _this.item = item;
-        return _this;
+const greyscript_core_1 = require("greyscript-core");
+const boolean_1 = __importDefault(require("../types/boolean"));
+const default_1 = __importDefault(require("../types/default"));
+const number_1 = __importDefault(require("../types/number"));
+const string_1 = __importDefault(require("../types/string"));
+const operation_1 = __importDefault(require("./operation"));
+class Literal extends operation_1.default {
+    constructor(item, target) {
+        super(null, target);
+        this.item = item;
     }
-    Literal.prototype.build = function (_visit) {
+    build(_visit) {
         switch (this.item.type) {
             case greyscript_core_1.ASTType.BooleanLiteral:
                 this.value = new boolean_1.default(this.item.value);
@@ -49,10 +32,9 @@ var Literal = /** @class */ (function (_super) {
                 throw new Error('Unexpected literal type.');
         }
         return Promise.resolve(this);
-    };
-    Literal.prototype.handle = function (_ctx) {
+    }
+    handle(_ctx) {
         return Promise.resolve(this.value);
-    };
-    return Literal;
-}(operation_1.default));
+    }
+}
 exports.default = Literal;

package/dist/operations/map.d.ts

@@ -1,6 +1,6 @@
 import { ASTMapConstructorExpression } from 'greyscript-core';
 import context from '../context';
-import { CustomValue } from '../types/generics';
+import CustomValue from '../types/base';
 import Operation, { CPSVisit } from './operation';
 export default class MapOperation extends Operation {
     readonly item: ASTMapConstructorExpression;

package/dist/operations/map.js

@@ -1,19 +1,4 @@
 "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) {
@@ -23,149 +8,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var map_1 = __importDefault(require("../types/map"));
-var operation_1 = __importDefault(require("./operation"));
-var MapOperation = /** @class */ (function (_super) {
-    __extends(MapOperation, _super);
-    function MapOperation(item, target) {
-        var _this = _super.call(this, null, target) || this;
-        _this.item = item;
-        return _this;
+const map_1 = __importDefault(require("../types/map"));
+const object_value_1 = __importDefault(require("../utils/object-value"));
+const operation_1 = __importDefault(require("./operation"));
+class MapOperation extends operation_1.default {
+    constructor(item, target) {
+        super(null, target);
+        this.item = item;
     }
-    MapOperation.prototype.build = function (visit) {
-        return __awaiter(this, void 0, void 0, function () {
-            var defers;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.fields = new Map();
-                        defers = this.item.fields.map(function (child) { return __awaiter(_this, void 0, void 0, function () {
-                            var mapKeyString, _a, _b, _c;
-                            return __generator(this, function (_d) {
-                                switch (_d.label) {
-                                    case 0:
-                                        mapKeyString = child;
-                                        _b = (_a = this.fields).set;
-                                        return [4 /*yield*/, visit(mapKeyString.key)];
-                                    case 1:
-                                        _c = [_d.sent()];
-                                        return [4 /*yield*/, visit(mapKeyString.value)];
-                                    case 2:
-                                        _b.apply(_a, _c.concat([_d.sent()]));
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); });
-                        return [4 /*yield*/, Promise.all(defers)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, this];
-                }
-            });
+    build(visit) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.fields = new Map();
+            const defers = this.item.fields.map((child) => __awaiter(this, void 0, void 0, function* () {
+                const mapKeyString = child;
+                this.fields.set(yield visit(mapKeyString.key), yield visit(mapKeyString.value));
+            }));
+            yield Promise.all(defers);
+            return this;
         });
-    };
-    MapOperation.prototype.handle = function (ctx) {
-        return __awaiter(this, void 0, void 0, function () {
-            var newMap, _a, _b, _c, key, value, _d, _e, _f, e_1_1;
-            var e_1, _g;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
-                    case 0:
-                        newMap = new Map();
-                        _h.label = 1;
-                    case 1:
-                        _h.trys.push([1, 7, 8, 9]);
-                        _a = __values(this.fields), _b = _a.next();
-                        _h.label = 2;
-                    case 2:
-                        if (!!_b.done) return [3 /*break*/, 6];
-                        _c = __read(_b.value, 2), key = _c[0], value = _c[1];
-                        _e = (_d = newMap).set;
-                        return [4 /*yield*/, key.handle(ctx)];
-                    case 3:
-                        _f = [_h.sent()];
-                        return [4 /*yield*/, value.handle(ctx)];
-                    case 4:
-                        _e.apply(_d, _f.concat([_h.sent()]));
-                        _h.label = 5;
-                    case 5:
-                        _b = _a.next();
-                        return [3 /*break*/, 2];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_1_1 = _h.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
-                        try {
-                            if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                        return [7 /*endfinally*/];
-                    case 9: return [2 /*return*/, new map_1.default(newMap)];
-                }
-            });
+    }
+    handle(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const newMap = new object_value_1.default();
+            for (const [key, value] of this.fields) {
+                newMap.set(yield key.handle(ctx), yield value.handle(ctx));
+            }
+            return new map_1.default(newMap);
         });
-    };
-    return MapOperation;
-}(operation_1.default));
+    }
+}
 exports.default = MapOperation;

package/dist/operations/negated-binary.d.ts

@@ -1,6 +1,6 @@
 import { ASTUnaryExpression } from 'greyscript-core';
 import context from '../context';
-import { CustomValue } from '../types/generics';
+import CustomValue from '../types/base';
 import Operation, { CPSVisit } from './operation';
 export default class NegatedBinary extends Operation {
     readonly item: ASTUnaryExpression;

package/dist/operations/negated-binary.js

@@ -1,19 +1,4 @@
 "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) {
@@ -23,87 +8,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var greyscript_core_1 = require("greyscript-core");
-var number_1 = __importDefault(require("../types/number"));
-var operation_1 = __importDefault(require("./operation"));
-var NegatedBinary = /** @class */ (function (_super) {
-    __extends(NegatedBinary, _super);
-    function NegatedBinary(item, target) {
-        var _this = _super.call(this, null, target) || this;
-        _this.item = item;
-        return _this;
+const greyscript_core_1 = require("greyscript-core");
+const number_1 = __importDefault(require("../types/number"));
+const operation_1 = __importDefault(require("./operation"));
+class NegatedBinary extends operation_1.default {
+    constructor(item, target) {
+        super(null, target);
+        this.item = item;
     }
-    NegatedBinary.prototype.build = function (visit) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this;
-                        return [4 /*yield*/, visit(this.item.argument)];
-                    case 1:
-                        _a.arg = _b.sent();
-                        return [2 /*return*/, this];
-                }
-            });
+    build(visit) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.arg = yield visit(this.item.argument);
+            return this;
         });
-    };
-    NegatedBinary.prototype.handle = function (ctx) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _a = this.item.operator;
-                        switch (_a) {
-                            case greyscript_core_1.Operator.Minus: return [3 /*break*/, 1];
-                            case greyscript_core_1.Operator.Plus: return [3 /*break*/, 3];
-                        }
-                        return [3 /*break*/, 5];
-                    case 1:
-                        _b = number_1.default.bind;
-                        return [4 /*yield*/, this.arg.handle(ctx)];
-                    case 2: return [2 /*return*/, new (_b.apply(number_1.default, [void 0, -(_d.sent()).toNumber()]))()];
-                    case 3:
-                        _c = number_1.default.bind;
-                        return [4 /*yield*/, this.arg.handle(ctx)];
-                    case 4: return [2 /*return*/, new (_c.apply(number_1.default, [void 0, +(_d.sent()).toNumber()]))()];
-                    case 5: throw new Error('Unexpected negation operator.');
-                }
-            });
+    }
+    handle(ctx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            switch (this.item.operator) {
+                case greyscript_core_1.Operator.Minus:
+                    return new number_1.default(-(yield this.arg.handle(ctx)).toNumber());
+                case greyscript_core_1.Operator.Plus:
+                    return new number_1.default(+(yield this.arg.handle(ctx)).toNumber());
+                default:
+                    throw new Error('Unexpected negation operator.');
+            }
         });
-    };
-    return NegatedBinary;
-}(operation_1.default));
+    }
+}
 exports.default = NegatedBinary;

package/dist/operations/new-instance.d.ts

@@ -1,6 +1,6 @@
 import { ASTUnaryExpression } from 'greyscript-core';
 import context from '../context';
-import { CustomValue } from '../types/generics';
+import CustomValue from '../types/base';
 import Operation, { CPSVisit } from './operation';
 export default class NewInstance extends Operation {
     readonly item: ASTUnaryExpression;