greybel-interpreter 1.5.8 → 1.6.0

package/dist/operations/import.d.ts

@@ -3,10 +3,12 @@ import { ASTBase } from 'greyscript-core';
 import context from '../context';
 import CustomValue from '../types/base';
 import CustomString from '../types/string';
+import Path from '../utils/path';
 import Operation, { CPSVisit } from './operation';
 export declare const MODULE_PROPERTY: CustomString;
 export declare const EXPORTS_PROPERTY: CustomString;
-export default class Include extends Operation {
+export declare const EXPORTS_PATH: Path<CustomString>;
+export default class Import extends Operation {
     readonly item: ASTFeatureImportExpression;
     code: string;
     chunk: ASTBase;

package/dist/operations/import.js

@@ -12,16 +12,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXPORTS_PROPERTY = exports.MODULE_PROPERTY = void 0;
+exports.EXPORTS_PATH = exports.EXPORTS_PROPERTY = exports.MODULE_PROPERTY = void 0;
 const greybel_core_1 = require("greybel-core");
 const context_1 = require("../context");
 const default_1 = __importDefault(require("../types/default"));
 const map_1 = __importDefault(require("../types/map"));
 const string_1 = __importDefault(require("../types/string"));
+const path_1 = __importDefault(require("../utils/path"));
 const operation_1 = __importDefault(require("./operation"));
 exports.MODULE_PROPERTY = new string_1.default('module');
 exports.EXPORTS_PROPERTY = new string_1.default('exports');
-class Include extends operation_1.default {
+exports.EXPORTS_PATH = new path_1.default([exports.MODULE_PROPERTY, exports.EXPORTS_PROPERTY]);
+class Import extends operation_1.default {
     constructor(item, target, code) {
         super(null, target);
         this.item = item;
@@ -39,14 +41,13 @@ class Include extends operation_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const importCtx = ctx.fork({
                 type: context_1.ContextType.External,
-                state: context_1.ContextState.Temporary,
+                state: context_1.ContextState.Default,
                 target: this.target
             });
-            const moduleMap = new map_1.default();
-            importCtx.set(exports.MODULE_PROPERTY, moduleMap);
+            importCtx.locals.scope.set(exports.MODULE_PROPERTY, new map_1.default());
             yield this.top.handle(importCtx);
-            const item = moduleMap.has(exports.EXPORTS_PROPERTY)
-                ? moduleMap.get(exports.EXPORTS_PROPERTY)
+            const item = importCtx.locals.scope.has(exports.EXPORTS_PATH)
+                ? importCtx.scope.get(exports.EXPORTS_PATH)
                 : default_1.default.Void;
             const identifier = this.item.name;
             ctx.set(new string_1.default(identifier.name), item);
@@ -54,4 +55,4 @@ class Include extends operation_1.default {
         });
     }
 }
-exports.default = Include;
+exports.default = Import;

package/dist/types/base.d.ts

@@ -3,6 +3,7 @@ export default abstract class CustomValue {
     abstract getCustomType(): string;
     abstract toNumber(): number;
     abstract toInt(): number;
+    abstract toJSON(depth?: number): string;
     abstract toString(): string;
     abstract toTruthy(): boolean;
     abstract fork(): CustomValue;

package/dist/types/boolean.d.ts

@@ -3,6 +3,7 @@ export default class CustomBoolean extends CustomValue {
     readonly value: boolean;
     constructor(value: boolean);
     getCustomType(): string;
+    toJSON(): string;
     toString(): string;
     fork(): CustomBoolean;
     toNumber(): number;

package/dist/types/boolean.js

@@ -13,6 +13,9 @@ class CustomBoolean extends base_1.default {
     getCustomType() {
         return 'boolean';
     }
+    toJSON() {
+        return this.toNumber().toString();
+    }
     toString() {
         return this.value.toString();
     }

package/dist/types/function.d.ts

@@ -27,6 +27,7 @@ export default class CustomFunction extends CustomValue {
     getCustomType(): string;
     toNumber(): number;
     toInt(): number;
+    toJSON(): string;
     toString(): string;
     toTruthy(): boolean;
     instanceOf(v: CustomValue): boolean;

package/dist/types/function.js

@@ -76,9 +76,12 @@ class CustomFunction extends base_1.default {
     toInt() {
         return 0;
     }
+    toJSON() {
+        return this.toString();
+    }
     toString() {
         const args = this.argumentDefs.map((item) => item.name);
-        return `function ${this.name}(${args.join(', ')})`;
+        return `"function ${this.name}(${args.join(', ')})"`;
     }
     toTruthy() {
         return true;

package/dist/types/interface.d.ts

@@ -11,6 +11,7 @@ export default class CustomInterface extends CustomObject {
     readonly value: Object;
     constructor(type: string);
     getCustomType(): string;
+    toJSON(): string;
     toString(): string;
     fork(): CustomInterface;
     toNumber(): number;

package/dist/types/interface.js

@@ -27,6 +27,9 @@ class CustomInterface extends with_intrinsics_1.CustomObject {
     getCustomType() {
         return this.type;
     }
+    toJSON() {
+        return this.toString();
+    }
     toString() {
         return this.type;
     }

package/dist/types/list.d.ts

@@ -14,7 +14,8 @@ export default class CustomList extends CustomObject {
     readonly value: Array<CustomValue>;
     constructor(value?: Array<CustomValue>);
     getCustomType(): string;
-    toString(): string;
+    toJSON(depth?: number): string;
+    toString(depth?: number): string;
     fork(): CustomList;
     toNumber(): number;
     toInt(): number;

package/dist/types/list.js

@@ -46,8 +46,11 @@ class CustomList extends with_intrinsics_1.CustomObject {
     getCustomType() {
         return 'list';
     }
-    toString() {
-        return `[ ${this.value.join(', ')} ]`;
+    toJSON(depth = 0) {
+        return this.toString(depth);
+    }
+    toString(depth = 0) {
+        return `[${this.value.map((item) => item.toJSON(depth)).join(', ')}]`;
     }
     fork() {
         return new CustomList(this.value);

package/dist/types/map.d.ts

@@ -21,6 +21,7 @@ export default class CustomMap extends CustomObject {
     static createWithInitialValue(value: ObjectValue): CustomMap;
     constructor(value?: ObjectValue, isa?: CustomMap);
     getCustomType(): string;
+    toJSON(depth?: number): string;
     toString(depth?: number): string;
     fork(): CustomMap;
     toNumber(): number;

package/dist/types/map.js

@@ -58,21 +58,23 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         }
         return 'map';
     }
+    toJSON(depth = 0) {
+        return this.toString(depth);
+    }
     toString(depth = 0) {
-        const json = {};
+        const fields = [];
         if (exports.CUSTOM_MAP_MAX_DEPTH < depth) {
             return exports.CUSTOM_MAP_MAX_DEPTH_VALUE;
         }
         if (this.isa) {
-            json[exports.ISA_PROPERTY.toString()] = this.isa.toString(depth + 1);
+            fields.push(`${exports.ISA_PROPERTY.toJSON()}:${this.isa.toJSON(depth + 1)}`);
         }
         for (const [key, value] of this.value.entries()) {
-            json[key.toString()] =
-                value instanceof CustomMap
-                    ? value.toString(depth + 1)
-                    : value.toString();
+            fields.push(`${key instanceof CustomMap ? key.toJSON(depth + 1) : key.toJSON(depth)}:${value instanceof CustomMap
+                ? value.toJSON(depth + 1)
+                : value.toJSON(depth)}`);
         }
-        return JSON.stringify(json);
+        return `{${fields.join(',')}}`;
     }
     fork() {
         return new CustomMap(this.value);

package/dist/types/nil.d.ts

@@ -2,6 +2,7 @@ import CustomValue from './base';
 export default class CustomNil extends CustomValue {
     value: null;
     getCustomType(): string;
+    toJSON(): string;
     toString(): string;
     fork(): CustomNil;
     toNumber(): number;

package/dist/types/nil.js

@@ -13,6 +13,9 @@ class CustomNil extends base_1.default {
     getCustomType() {
         return 'null';
     }
+    toJSON() {
+        return this.toString();
+    }
     toString() {
         return 'null';
     }

package/dist/types/number.d.ts

@@ -10,6 +10,7 @@ export default class CustomNumber extends CustomValueWithIntrinsics {
     readonly value: number;
     constructor(value: number);
     getCustomType(): string;
+    toJSON(): string;
     toString(): string;
     fork(): CustomNumber;
     toInt(): number;

package/dist/types/number.js

@@ -26,6 +26,9 @@ class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
     getCustomType() {
         return 'number';
     }
+    toJSON() {
+        return this.value.toString();
+    }
     toString() {
         return this.value.toString();
     }

package/dist/types/string.d.ts

@@ -14,6 +14,7 @@ export default class CustomString extends CustomValueWithIntrinsics {
     readonly value: string;
     constructor(value: string);
     getCustomType(): string;
+    toJSON(): string;
     toString(): string;
     fork(): CustomString;
     isNumber(): boolean;

package/dist/types/string.js

@@ -47,6 +47,9 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
     getCustomType() {
         return 'string';
     }
+    toJSON() {
+        return `"${this.value}"`;
+    }
     toString() {
         return this.value;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "1.5.8",
+    "version": "1.6.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "greybel-core": "^0.6.5",
-        "greyscript-core": "^0.6.0"
+        "greybel-core": "^0.6.6",
+        "greyscript-core": "^0.6.1"
     },
     "keywords": [
         "greyscript",