greyscript-interpreter 1.6.6 → 1.7.1

package/dist/bytecode-generator/context.d.ts

@@ -0,0 +1,6 @@
+import { BytecodeGeneratorContext as GreybelBytecodeGeneratorContext, BytecodeGeneratorContextOptions as GreybelBytecodeGeneratorContextOptions } from 'greybel-interpreter';
+export declare class Context extends GreybelBytecodeGeneratorContext {
+    protected _evaluatedImportCodes: Set<string>;
+    constructor(options: GreybelBytecodeGeneratorContextOptions);
+    get evaluatedImportCodes(): Set<string>;
+}

package/dist/bytecode-generator/context.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Context = void 0;
+const greybel_interpreter_1 = require("greybel-interpreter");
+class Context extends greybel_interpreter_1.BytecodeGeneratorContext {
+    constructor(options) {
+        super(options);
+        this._evaluatedImportCodes = new Set();
+    }
+    get evaluatedImportCodes() {
+        return this._evaluatedImportCodes;
+    }
+}
+exports.Context = Context;

package/dist/bytecode-generator/statement.d.ts

@@ -0,0 +1,9 @@
+import { BytecodeStatementGenerator as GreybelBytecodeStatementGenerator } from 'greybel-interpreter';
+import { ASTImportCodeExpression } from 'greyscript-core';
+import { ASTBase } from 'miniscript-core';
+import { Context } from './context';
+export declare class BytecodeStatementGenerator extends GreybelBytecodeStatementGenerator {
+    protected context: Context;
+    process(node: ASTBase): Promise<void>;
+    protected processImportCodeExpression(node: ASTImportCodeExpression): Promise<void>;
+}

package/dist/bytecode-generator/statement.js

@@ -0,0 +1,66 @@
+"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.BytecodeStatementGenerator = void 0;
+const greybel_interpreter_1 = require("greybel-interpreter");
+const miniscript_core_1 = require("miniscript-core");
+class BytecodeStatementGenerator extends greybel_interpreter_1.BytecodeStatementGenerator {
+    process(node) {
+        const _super = Object.create(null, {
+            process: { get: () => super.process }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            switch (node.type) {
+                case miniscript_core_1.ASTType.ImportCodeExpression:
+                    yield this.processImportCodeExpression(node);
+                    return;
+            }
+            return _super.process.call(this, node);
+        });
+    }
+    processImportCodeExpression(node) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const currentTarget = this.context.target.peek();
+            const importTarget = yield this.context.handler.resourceHandler.getTargetRelativeTo(currentTarget, node.directory);
+            if (this.context.evaluatedImportCodes.has(importTarget)) {
+                return;
+            }
+            if (this.context.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.context.handler.resourceHandler.get(importTarget);
+            if (code == null) {
+                throw new greybel_interpreter_1.PrepareError(`Cannot find import "${currentTarget}"`, {
+                    target: currentTarget,
+                    range: new miniscript_core_1.ASTRange(node.start, node.end)
+                });
+            }
+            try {
+                this.context.target.push(importTarget);
+                const childNodes = this.parseCode(code);
+                yield this.process(childNodes);
+                this.context.target.pop();
+                this.context.evaluatedImportCodes.add(importTarget);
+            }
+            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.BytecodeStatementGenerator = BytecodeStatementGenerator;

package/dist/bytecode-generator.d.ts

@@ -1,10 +1,6 @@
-import { BytecodeConverterOptions, BytecodeGenerator as GreybelBytecodeGenerator } from 'greybel-interpreter';
-import { ASTImportCodeExpression } from 'greyscript-core';
-import { ASTBase } from 'miniscript-core';
+import { BytecodeCompileResult, BytecodeConverterOptions, BytecodeGenerator as GreybelBytecodeGenerator } from 'greybel-interpreter';
 export declare class BytecodeGenerator extends GreybelBytecodeGenerator {
     protected evaluatedImportCodes: Set<string>;
     constructor(options: BytecodeConverterOptions);
-    parse(code: string): ASTBase | import("greyscript-core").ASTChunkGreyScript;
-    protected processNode(node: ASTBase): Promise<void>;
-    protected processImportCodeExpression(node: ASTImportCodeExpression): Promise<void>;
+    compile(code: string): Promise<BytecodeCompileResult>;
 }

package/dist/bytecode-generator.js

@@ -11,77 +11,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BytecodeGenerator = void 0;
 const greybel_interpreter_1 = require("greybel-interpreter");
+const context_1 = require("./bytecode-generator/context");
 const greyscript_core_1 = require("greyscript-core");
-const miniscript_core_1 = require("miniscript-core");
-class BytecodeGenerator extends greybel_interpreter_1.BytecodeGenerator {
-    constructor(options) {
-        super(options);
-        this.evaluatedImportCodes = new Set();
+const statement_1 = require("./bytecode-generator/statement");
+const parse = function (code) {
+    try {
+        const parser = new greyscript_core_1.Parser(code);
+        return parser.parseChunk();
     }
-    parse(code) {
-        try {
-            const parser = new greyscript_core_1.Parser(code);
-            return parser.parseChunk();
+    catch (err) {
+        if (err instanceof greybel_interpreter_1.PrepareError) {
+            this.context.handler.errorHandler.raise(err);
         }
-        catch (err) {
-            if (err instanceof greybel_interpreter_1.PrepareError) {
-                this.handler.errorHandler.raise(err);
-            }
-            else {
-                this.handler.errorHandler.raise(new greybel_interpreter_1.PrepareError(err.message, {
-                    range: err.range,
-                    target: this.target.peek()
-                }));
-            }
+        else {
+            this.context.handler.errorHandler.raise(new greybel_interpreter_1.PrepareError(err.message, {
+                range: err.range,
+                target: this.context.target.peek()
+            }));
         }
     }
-    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);
-        });
+};
+class BytecodeGenerator extends greybel_interpreter_1.BytecodeGenerator {
+    constructor(options) {
+        super(Object.assign({ context: new context_1.Context(options) }, options));
     }
-    processImportCodeExpression(node) {
+    compile(code) {
         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.evaluatedImportCodes.has(importTarget)) {
-                return;
-            }
-            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) {
-                throw new greybel_interpreter_1.PrepareError(`Cannot find import "${currentTarget}"`, {
-                    target: currentTarget,
-                    range: new miniscript_core_1.ASTRange(node.start, node.end)
-                });
-            }
-            try {
-                this.target.push(importTarget);
-                const childNodes = this.parse(code);
-                yield this.processNode(childNodes);
-                this.target.pop();
-                this.evaluatedImportCodes.add(importTarget);
-            }
-            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);
-            }
+            const statementGenerator = new statement_1.BytecodeStatementGenerator(this.context, parse.bind(this));
+            const node = parse.call(this, code);
+            yield statementGenerator.process(node);
+            const mod = this.context.module.peek();
+            mod.pushCode({
+                op: greybel_interpreter_1.OpCode.HALT,
+                source: mod.getSourceLocation(node)
+            });
+            return {
+                code: mod.getCode(),
+                imports: this.context.imports
+            };
         });
     }
 }

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 import './overrides';
+export { Context as BytecodeGeneratorContext } from './bytecode-generator/context';
+export { BytecodeStatementGenerator } from './bytecode-generator/statement';
 export { BytecodeGenerator } from './bytecode-generator';
 export { Interpreter } from './interpreter';
 export { CLASS_ID_PROPERTY } from './overrides';

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLASS_ID_PROPERTY = exports.Interpreter = exports.BytecodeGenerator = void 0;
+exports.CLASS_ID_PROPERTY = exports.Interpreter = exports.BytecodeGenerator = exports.BytecodeStatementGenerator = exports.BytecodeGeneratorContext = void 0;
 require("./overrides");
+var context_1 = require("./bytecode-generator/context");
+Object.defineProperty(exports, "BytecodeGeneratorContext", { enumerable: true, get: function () { return context_1.Context; } });
+var statement_1 = require("./bytecode-generator/statement");
+Object.defineProperty(exports, "BytecodeStatementGenerator", { enumerable: true, get: function () { return statement_1.BytecodeStatementGenerator; } });
 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");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greyscript-interpreter",
-    "version": "1.6.6",
+    "version": "1.7.1",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "greyscript-core": "~1.5.13",
-        "greybel-interpreter": "~4.5.13"
+        "greyscript-core": "~1.6.0",
+        "greybel-interpreter": "~4.6.3"
     },
     "keywords": [
         "greyscript",