greyscript-interpreter 0.1.0 → 0.3.0

package/dist/cps.d.ts

@@ -1,2 +1,5 @@
-import { CPSVisitCallback } from 'greybel-interpreter';
-export declare const cpsVisit: CPSVisitCallback;
+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

@@ -9,12 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cpsVisit = void 0;
+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 cpsVisit = (internalCPSVisit, context, stack, item) => __awaiter(void 0, void 0, void 0, function* () {
+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: {
@@ -33,7 +35,7 @@ const cpsVisit = (internalCPSVisit, context, stack, item) => __awaiter(void 0, v
                 });
             }
             try {
-                const subVisit = internalCPSVisit.bind(null, internalCPSVisit, context, [
+                const subVisit = cpsVisit.bind(null, cpsVisit, context, [
                     ...stack,
                     target
                 ]);
@@ -50,9 +52,75 @@ const cpsVisit = (internalCPSVisit, context, stack, item) => __awaiter(void 0, v
                 }, 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)(internalCPSVisit, context, stack, item);
+            return (0, greybel_interpreter_1.defaultCPSVisit)(cpsVisit, context, stack, item);
         }
     }
 });
-exports.cpsVisit = cpsVisit;
+exports.defaultCPSVisit = defaultCPSVisit;
+class CPS extends greybel_interpreter_1.CPS {
+    constructor(context, cpsVisit = exports.defaultCPSVisit) {
+        super(context, cpsVisit);
+    }
+}
+exports.CPS = CPS;

package/dist/index.d.ts

@@ -1,2 +1,4 @@
-export { cpsVisit } from './cps';
+export { CPS, defaultCPSVisit } from './cps';
 export { Interpreter } from './interpreter';
+export { Import } from './operations/import';
+export { Include } from './operations/include';

package/dist/index.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Interpreter = exports.cpsVisit = void 0;
+exports.Include = exports.Import = exports.Interpreter = exports.defaultCPSVisit = exports.CPS = void 0;
 var cps_1 = require("./cps");
-Object.defineProperty(exports, "cpsVisit", { enumerable: true, get: function () { return cps_1.cpsVisit; } });
+Object.defineProperty(exports, "CPS", { enumerable: true, get: function () { return cps_1.CPS; } });
+Object.defineProperty(exports, "defaultCPSVisit", { enumerable: true, get: function () { return cps_1.defaultCPSVisit; } });
 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; } });

package/dist/interpreter.d.ts

@@ -1,5 +1,6 @@
-import { Interpreter as GreybelInterpreter, Operation } from 'greybel-interpreter';
+import { Interpreter as GreybelInterpreter } from 'greybel-interpreter';
+import { CPS } from './cps';
 export declare class Interpreter extends GreybelInterpreter {
-    setTarget(target: string): Interpreter;
-    prepare(code: string): Promise<Operation>;
+    createCPS(): CPS;
+    parse(code: string): import("miniscript-core").ASTBase | import("greyscript-core").ASTChunkGreyScript;
 }

package/dist/interpreter.js

@@ -2,48 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Interpreter = void 0;
 const greybel_interpreter_1 = require("greybel-interpreter");
-const greyscript_core_1 = require("greyscript-core");
 const cps_1 = require("./cps");
+const greyscript_core_1 = require("greyscript-core");
 class Interpreter extends greybel_interpreter_1.Interpreter {
-    setTarget(target) {
-        if (this.apiContext !== null && this.apiContext.isPending()) {
-            throw new Error('You cannot set a target while a process is running.');
-        }
-        this.target = target;
-        const cpsCtx = new greybel_interpreter_1.CPSContext(target, this.handler);
-        this.cps = new greybel_interpreter_1.CPS(cpsCtx, cps_1.cpsVisit);
-        this.apiContext = new greybel_interpreter_1.OperationContext({
-            target,
-            isProtected: true,
-            debugger: this.debugger,
-            handler: this.handler,
-            cps: this.cps,
-            environmentVariables: this.environmentVariables
-        });
-        this.globalContext = this.apiContext.fork({
-            type: greybel_interpreter_1.ContextType.Global,
-            state: greybel_interpreter_1.ContextState.Default
-        });
-        return this;
+    createCPS() {
+        const cpsCtx = new greybel_interpreter_1.CPSContext(this.target, this.handler);
+        return new cps_1.CPS(cpsCtx);
     }
-    prepare(code) {
-        try {
-            const parser = new greyscript_core_1.Parser(code);
-            const chunk = parser.parseChunk();
-            return this.cps.visit(chunk);
-        }
-        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
-                }));
-            }
-        }
-        return Promise.resolve(new greybel_interpreter_1.Noop(null));
+    parse(code) {
+        const parser = new greyscript_core_1.Parser(code);
+        return parser.parseChunk();
     }
 }
 exports.Interpreter = Interpreter;

package/dist/operations/import.d.ts

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,25 @@
+"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,12 +1,4 @@
-import { CPSVisit, CustomValue, Operation, OperationContext } from 'greybel-interpreter';
-import { ASTBase } from 'miniscript-core';
-export declare class Include extends Operation {
-    readonly item: ASTBase;
-    newTarget: string;
-    code: string;
-    chunk: ASTBase;
-    top: Operation;
-    constructor(item: ASTBase, target: string, newTarget: string, code: string);
+import { CPSVisit, Include as GreybelInclude, Operation } from 'greybel-interpreter';
+export declare class Include extends GreybelInclude {
     build(visit: CPSVisit): Promise<Operation>;
-    handle(ctx: OperationContext): Promise<CustomValue>;
 }

package/dist/operations/include.js

@@ -12,13 +12,7 @@ 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.Operation {
-    constructor(item, target, newTarget, code) {
-        super(null, target);
-        this.newTarget = newTarget;
-        this.item = item;
-        this.code = code;
-    }
+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);
@@ -27,13 +21,5 @@ class Include extends greybel_interpreter_1.Operation {
             return this;
         });
     }
-    handle(ctx) {
-        const importCtx = ctx.fork({
-            type: greybel_interpreter_1.ContextType.External,
-            state: greybel_interpreter_1.ContextState.Temporary,
-            target: this.newTarget
-        });
-        return this.top.handle(importCtx);
-    }
 }
 exports.Include = Include;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greyscript-interpreter",
-    "version": "0.1.0",
+    "version": "0.3.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "greyscript-core": "^1.0.1",
-        "greybel-interpreter": "^3.0.4"
+        "greyscript-core": "^1.2.0",
+        "greybel-interpreter": "^3.2.0"
     },
     "keywords": [
         "greyscript",