greyscript-interpreter 0.6.0 → 1.0.0

package/dist/bytecode-generator.d.ts

@@ -0,0 +1,8 @@
+import { BytecodeGenerator as GreybelBytecodeGenerator } from 'greybel-interpreter';
+import { ASTImportCodeExpression } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
+export declare class BytecodeGenerator extends GreybelBytecodeGenerator {
+    parse(code: string): ASTBase | import("greyscript-core").ASTChunkGreyScript;
+    protected processNode(node: ASTBase): Promise<void>;
+    protected processImportCodeExpression(node: ASTImportCodeExpression): Promise<void>;
+}

package/dist/bytecode-generator.js

@@ -0,0 +1,68 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BytecodeGenerator = void 0;
+const greybel_interpreter_1 = require("greybel-interpreter");
+const greyscript_core_1 = require("greyscript-core");
+const miniscript_core_1 = require("miniscript-core");
+class BytecodeGenerator extends greybel_interpreter_1.BytecodeGenerator {
+    parse(code) {
+        const parser = new greyscript_core_1.Parser(code);
+        return parser.parseChunk();
+    }
+    processNode(node) {
+        const _super = Object.create(null, {
+            processNode: { get: () => super.processNode }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            switch (node.type) {
+                case greyscript_core_1.ASTType.ImportCodeExpression:
+                    yield this.processImportCodeExpression(node);
+                    return;
+            }
+            return _super.processNode.call(this, node);
+        });
+    }
+    processImportCodeExpression(node) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const currentTarget = this.target.peek();
+            const importTarget = yield this.handler.resourceHandler.getTargetRelativeTo(currentTarget, node.directory);
+            if (this.target.includes(importTarget)) {
+                console.warn(`Found circular dependency between "${currentTarget}" and "${importTarget}" at line ${node.start.line}. Using noop instead to prevent overflow.`);
+                return;
+            }
+            const code = yield this.handler.resourceHandler.get(importTarget);
+            if (code == null) {
+                const range = new miniscript_core_1.ASTRange(node.start, node.end);
+                throw new greybel_interpreter_1.PrepareError(`Cannot find import "${currentTarget}"`, {
+                    target: currentTarget,
+                    range
+                });
+            }
+            try {
+                this.target.push(importTarget);
+                const childNodes = this.parse(code);
+                yield this.processNode(childNodes);
+                this.target.pop();
+            }
+            catch (err) {
+                if (err instanceof greybel_interpreter_1.PrepareError) {
+                    throw err;
+                }
+                throw new greybel_interpreter_1.PrepareError(err.message, {
+                    target: importTarget,
+                    range: new miniscript_core_1.ASTRange(node.start, node.end)
+                }, err);
+            }
+        });
+    }
+}
+exports.BytecodeGenerator = BytecodeGenerator;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { CPS, defaultCPSVisit } from './cps';
+import './overrides';
+export { BytecodeGenerator } from './bytecode-generator';
 export { Interpreter } from './interpreter';
-export { Import } from './operations/import';
-export { Include } from './operations/include';
+export { CLASS_ID_PROPERTY } from './overrides';

package/dist/index.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Include = exports.Import = exports.Interpreter = exports.defaultCPSVisit = exports.CPS = void 0;
-var cps_1 = require("./cps");
-Object.defineProperty(exports, "CPS", { enumerable: true, get: function () { return cps_1.CPS; } });
-Object.defineProperty(exports, "defaultCPSVisit", { enumerable: true, get: function () { return cps_1.defaultCPSVisit; } });
+exports.CLASS_ID_PROPERTY = exports.Interpreter = exports.BytecodeGenerator = void 0;
+require("./overrides");
+var bytecode_generator_1 = require("./bytecode-generator");
+Object.defineProperty(exports, "BytecodeGenerator", { enumerable: true, get: function () { return bytecode_generator_1.BytecodeGenerator; } });
 var interpreter_1 = require("./interpreter");
 Object.defineProperty(exports, "Interpreter", { enumerable: true, get: function () { return interpreter_1.Interpreter; } });
-var import_1 = require("./operations/import");
-Object.defineProperty(exports, "Import", { enumerable: true, get: function () { return import_1.Import; } });
-var include_1 = require("./operations/include");
-Object.defineProperty(exports, "Include", { enumerable: true, get: function () { return include_1.Include; } });
+var overrides_1 = require("./overrides");
+Object.defineProperty(exports, "CLASS_ID_PROPERTY", { enumerable: true, get: function () { return overrides_1.CLASS_ID_PROPERTY; } });

package/dist/interpreter.d.ts

@@ -1,6 +1,7 @@
-import { Interpreter as GreybelInterpreter } from 'greybel-interpreter';
-import { CPS } from './cps';
+import { Interpreter as GreybelInterpreter, OperationContext } from 'greybel-interpreter';
+import { InterpreterRunOptions } from 'greybel-interpreter/dist/interpreter';
 export declare class Interpreter extends GreybelInterpreter {
-    createCPS(): CPS;
     parse(code: string): import("miniscript-core").ASTBase | import("greyscript-core").ASTChunkGreyScript;
+    inject(code: string, context?: OperationContext): Promise<Interpreter>;
+    run({ customCode }?: InterpreterRunOptions): Promise<Interpreter>;
 }

package/dist/interpreter.js

@@ -1,17 +1,69 @@
 "use strict";
+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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Interpreter = void 0;
 const greybel_interpreter_1 = require("greybel-interpreter");
-const cps_1 = require("./cps");
 const greyscript_core_1 = require("greyscript-core");
+const bytecode_generator_1 = require("./bytecode-generator");
 class Interpreter extends greybel_interpreter_1.Interpreter {
-    createCPS() {
-        const cpsCtx = new greybel_interpreter_1.CPSContext(this.target, this.handler);
-        return new cps_1.CPS(cpsCtx);
-    }
     parse(code) {
         const parser = new greyscript_core_1.Parser(code);
         return parser.parseChunk();
     }
+    inject(code, context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bytecodeGenerator = new bytecode_generator_1.BytecodeGenerator({
+                target: 'injected',
+                handler: this.handler
+            });
+            const result = yield bytecodeGenerator.compile(code);
+            const vm = new greybel_interpreter_1.VM({
+                target: this.target,
+                debugger: this.debugger,
+                handler: this.handler,
+                environmentVariables: this.environmentVariables,
+                contextTypeIntrinsics: this.vm.contextTypeIntrinsics,
+                globals: (context !== null && context !== void 0 ? context : this.globalContext).fork({
+                    code: result.code,
+                    type: greybel_interpreter_1.ContextType.Injected
+                }),
+                imports: result.imports
+            });
+            try {
+                yield vm.exec();
+            }
+            catch (err) {
+                if (err instanceof greybel_interpreter_1.PrepareError || err instanceof greybel_interpreter_1.RuntimeError) {
+                    this.handler.errorHandler.raise(err);
+                }
+                else {
+                    this.handler.errorHandler.raise(new greybel_interpreter_1.RuntimeError(err.message, vm, err));
+                }
+            }
+            return this;
+        });
+    }
+    run({ customCode } = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const code = customCode !== null && customCode !== void 0 ? customCode : (yield this.handler.resourceHandler.get(this.target));
+            const bytecodeConverter = new bytecode_generator_1.BytecodeGenerator({
+                target: this.target,
+                handler: this.handler,
+                debugMode: this.debugMode
+            });
+            const bytecode = yield bytecodeConverter.compile(code);
+            this.initVM(bytecode);
+            yield this.start();
+            return this;
+        });
+    }
 }
 exports.Interpreter = Interpreter;

package/dist/overrides.d.ts

@@ -0,0 +1,2 @@
+import { CustomString } from 'greybel-interpreter';
+export declare const CLASS_ID_PROPERTY: CustomString;

package/dist/overrides.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CLASS_ID_PROPERTY = void 0;
+const greybel_interpreter_1 = require("greybel-interpreter");
+exports.CLASS_ID_PROPERTY = new greybel_interpreter_1.CustomString('classID');
+const defaultCustomMapToString = greybel_interpreter_1.CustomMap.prototype.toString;
+greybel_interpreter_1.CustomMap.prototype.toString = function (depth = 0) {
+    if (this.value.has(exports.CLASS_ID_PROPERTY)) {
+        return this.value.get(exports.CLASS_ID_PROPERTY).toString();
+    }
+    return defaultCustomMapToString.call(this, depth);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greyscript-interpreter",
-    "version": "0.6.0",
+    "version": "1.0.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -49,7 +49,7 @@
     },
     "dependencies": {
         "greyscript-core": "~1.4.2",
-        "greybel-interpreter": "~3.5.0"
+        "greybel-interpreter": "~4.0.3"
     },
     "keywords": [
         "greyscript",

package/dist/cps.d.ts

@@ -1,5 +0,0 @@
-import { CPSContext, CPSVisitCallback, CPS as GreybelCPS } from 'greybel-interpreter';
-export declare const defaultCPSVisit: CPSVisitCallback;
-export declare class CPS extends GreybelCPS {
-    constructor(context: CPSContext, cpsVisit?: CPSVisitCallback);
-}

package/dist/cps.js

@@ -1,126 +0,0 @@
-"use strict";
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CPS = exports.defaultCPSVisit = void 0;
-const greybel_interpreter_1 = require("greybel-interpreter");
-const greybel_core_1 = require("greybel-core");
-const greyscript_core_1 = require("greyscript-core");
-const miniscript_core_1 = require("miniscript-core");
-const include_1 = require("./operations/include");
-const import_1 = require("./operations/import");
-const defaultCPSVisit = (cpsVisit, context, stack, item) => __awaiter(void 0, void 0, void 0, function* () {
-    const currentTarget = stack[stack.length - 1];
-    switch (item.type) {
-        case greyscript_core_1.ASTType.ImportCodeExpression: {
-            const importExpr = item;
-            const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, importExpr.directory);
-            if (stack.includes(target)) {
-                console.warn(`Found circular dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
-                return new greybel_interpreter_1.Noop(item, target);
-            }
-            const code = yield context.handler.resourceHandler.get(target);
-            if (code == null) {
-                const range = new miniscript_core_1.ASTRange(item.start, item.end);
-                throw new greybel_interpreter_1.PrepareError(`Cannot find native import "${currentTarget}"`, {
-                    target: currentTarget,
-                    range
-                });
-            }
-            try {
-                const subVisit = cpsVisit.bind(null, cpsVisit, context, [
-                    ...stack,
-                    target
-                ]);
-                const importStatement = yield new include_1.Include(importExpr, currentTarget, target, code).build(subVisit);
-                return importStatement;
-            }
-            catch (err) {
-                if (err instanceof greybel_interpreter_1.PrepareError) {
-                    throw err;
-                }
-                throw new greybel_interpreter_1.PrepareError(err.message, {
-                    target,
-                    range: new miniscript_core_1.ASTRange(item.start, item.end)
-                }, err);
-            }
-        }
-        case greybel_core_1.ASTType.FeatureImportExpression: {
-            const importExpr = item;
-            const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, importExpr.path);
-            if (stack.includes(target)) {
-                console.warn(`Found circular dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
-                return new greybel_interpreter_1.Noop(item, target);
-            }
-            const code = yield context.handler.resourceHandler.get(target);
-            if (code == null) {
-                const range = new miniscript_core_1.ASTRange(item.start, item.end);
-                throw new greybel_interpreter_1.PrepareError(`Cannot find import "${currentTarget}"`, {
-                    target: currentTarget,
-                    range
-                });
-            }
-            try {
-                const subVisit = cpsVisit.bind(null, cpsVisit, context, [...stack, target]);
-                const importStatement = yield new import_1.Import(importExpr, currentTarget, target, code).build(subVisit);
-                return importStatement;
-            }
-            catch (err) {
-                if (err instanceof greybel_interpreter_1.PrepareError) {
-                    throw err;
-                }
-                throw new greybel_interpreter_1.PrepareError(err.message, {
-                    target,
-                    range: new miniscript_core_1.ASTRange(item.start, item.end)
-                }, err);
-            }
-        }
-        case greybel_core_1.ASTType.FeatureIncludeExpression: {
-            const includeExpr = item;
-            const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, includeExpr.path);
-            if (stack.includes(target)) {
-                console.warn(`Found circular dependency between "${currentTarget}" and "${target}" at line ${item.start.line}. Using noop instead to prevent overflow.`);
-                return new greybel_interpreter_1.Noop(item, target);
-            }
-            const code = yield context.handler.resourceHandler.get(target);
-            if (code == null) {
-                const range = new miniscript_core_1.ASTRange(item.start, item.end);
-                throw new greybel_interpreter_1.PrepareError(`Cannot find include "${currentTarget}"`, {
-                    target: currentTarget,
-                    range
-                });
-            }
-            try {
-                const subVisit = cpsVisit.bind(null, cpsVisit, context, [...stack, target]);
-                const importStatement = yield new include_1.Include(includeExpr, currentTarget, target, code).build(subVisit);
-                return importStatement;
-            }
-            catch (err) {
-                if (err instanceof greybel_interpreter_1.PrepareError) {
-                    throw err;
-                }
-                throw new greybel_interpreter_1.PrepareError(err.message, {
-                    target,
-                    range: new miniscript_core_1.ASTRange(item.start, item.end)
-                }, err);
-            }
-        }
-        default: {
-            return (0, greybel_interpreter_1.defaultCPSVisit)(cpsVisit, context, stack, item);
-        }
-    }
-});
-exports.defaultCPSVisit = defaultCPSVisit;
-class CPS extends greybel_interpreter_1.CPS {
-    constructor(context, cpsVisit = exports.defaultCPSVisit) {
-        super(context, cpsVisit);
-    }
-}
-exports.CPS = CPS;

package/dist/operations/import.d.ts

@@ -1,4 +0,0 @@
-import { CPSVisit, Import as GreybelImport, Operation } from 'greybel-interpreter';
-export declare class Import extends GreybelImport {
-    build(visit: CPSVisit): Promise<Operation>;
-}

package/dist/operations/import.js

@@ -1,25 +0,0 @@
-"use strict";
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Import = void 0;
-const greybel_interpreter_1 = require("greybel-interpreter");
-const greyscript_core_1 = require("greyscript-core");
-class Import extends greybel_interpreter_1.Import {
-    build(visit) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const parser = new greyscript_core_1.Parser(this.code);
-            this.chunk = parser.parseChunk();
-            this.top = yield visit(this.chunk);
-            return this;
-        });
-    }
-}
-exports.Import = Import;

package/dist/operations/include.d.ts

@@ -1,4 +0,0 @@
-import { CPSVisit, Include as GreybelInclude, Operation } from 'greybel-interpreter';
-export declare class Include extends GreybelInclude {
-    build(visit: CPSVisit): Promise<Operation>;
-}

package/dist/operations/include.js

@@ -1,25 +0,0 @@
-"use strict";
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Include = void 0;
-const greybel_interpreter_1 = require("greybel-interpreter");
-const greyscript_core_1 = require("greyscript-core");
-class Include extends greybel_interpreter_1.Include {
-    build(visit) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const parser = new greyscript_core_1.Parser(this.code);
-            this.chunk = parser.parseChunk();
-            this.top = yield visit(this.chunk);
-            return this;
-        });
-    }
-}
-exports.Include = Include;