greybel-interpreter 1.6.6 → 1.6.8

package/dist/cps.js

@@ -21,6 +21,7 @@ const call_1 = __importDefault(require("./operations/call"));
 const chunk_1 = __importDefault(require("./operations/chunk"));
 const continue_1 = __importDefault(require("./operations/continue"));
 const debugger_statement_1 = __importDefault(require("./operations/debugger-statement"));
+const envar_1 = __importDefault(require("./operations/envar"));
 const evaluate_1 = __importDefault(require("./operations/evaluate"));
 const for_1 = __importDefault(require("./operations/for"));
 const function_1 = __importDefault(require("./operations/function"));
@@ -38,7 +39,6 @@ const not_1 = __importDefault(require("./operations/not"));
 const resolve_1 = __importDefault(require("./operations/resolve"));
 const return_1 = __importDefault(require("./operations/return"));
 const while_1 = __importDefault(require("./operations/while"));
-const envar_1 = __importDefault(require("./operations/envar"));
 class CPSContext {
     constructor(target, handler) {
         this.target = target;
@@ -88,14 +88,12 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 console.warn('Found circluar dependency. Using noop operation.');
                 return new noop_1.default(item, target);
             }
-            stack.push(target);
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
                 throw new Error(`Cannot find import ${currentTarget}.`);
             }
-            const subVisit = visit.bind(null, context, stack);
+            const subVisit = visit.bind(null, context, [...stack, target]);
             const importStatement = yield new import_1.default(importExpr, target, code).build(subVisit);
-            stack.pop();
             return importStatement;
         }
         case greybel_core_1.ASTType.FeatureIncludeExpression: {
@@ -105,14 +103,12 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 console.warn('Found circluar dependency. Using noop operation.');
                 return new noop_1.default(item, target);
             }
-            stack.push(target);
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
                 throw new Error(`Cannot find include ${currentTarget}.`);
             }
-            const subVisit = visit.bind(null, context, stack);
+            const subVisit = visit.bind(null, context, [...stack, target]);
             const importStatement = yield new include_1.default(includeExpr, target, code).build(subVisit);
-            stack.pop();
             return importStatement;
         }
         case greyscript_core_1.ASTType.ImportCodeExpression: {
@@ -122,14 +118,12 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
                 console.warn('Found circluar dependency. Using noop operation.');
                 return new noop_1.default(item, target);
             }
-            stack.push(target);
             const code = yield context.handler.resourceHandler.get(target);
             if (code == null) {
                 throw new Error(`Cannot find native import ${currentTarget}.`);
             }
-            const subVisit = visit.bind(null, context, stack);
+            const subVisit = visit.bind(null, context, [...stack, target]);
             const importStatement = yield new include_1.default(importExpr, target, code).build(subVisit);
-            stack.pop();
             return importStatement;
         }
         case greybel_core_1.ASTType.FeatureDebuggerExpression:

package/dist/handler/output.d.ts

@@ -1,18 +1,19 @@
+import { CancelablePromise } from 'cancelable-promise';
 export interface KeyEvent {
     keyCode: number;
     code: string;
 }
 export declare abstract class OutputHandler {
-    abstract print(message: string): void;
-    abstract progress(timeout: number): Promise<void>;
-    abstract waitForInput(isPassword: boolean): Promise<string>;
-    abstract waitForKeyPress(): Promise<KeyEvent>;
+    abstract print(message: string, appendNewLine: boolean): void;
+    abstract progress(timeout: number): CancelablePromise<void>;
+    abstract waitForInput(isPassword: boolean): CancelablePromise<string>;
+    abstract waitForKeyPress(): CancelablePromise<KeyEvent>;
     abstract clear(): void;
 }
 export declare class DefaultOutputHandler extends OutputHandler {
-    print(message: string): void;
-    progress(timeout: number): Promise<void>;
-    waitForInput(_isPassword: boolean): Promise<string>;
-    waitForKeyPress(): Promise<KeyEvent>;
+    print(message: string, appendNewLine?: boolean): void;
+    progress(timeout: number): CancelablePromise<void>;
+    waitForInput(_isPassword: boolean): CancelablePromise<string>;
+    waitForKeyPress(): CancelablePromise<KeyEvent>;
     clear(): void;
 }

package/dist/handler/output.js

@@ -1,23 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultOutputHandler = exports.OutputHandler = void 0;
+const cancelable_promise_1 = require("cancelable-promise");
 class OutputHandler {
 }
 exports.OutputHandler = OutputHandler;
 class DefaultOutputHandler extends OutputHandler {
-    print(message) {
-        console.log(message);
+    print(message, appendNewLine = true) {
+        if (appendNewLine) {
+            process.stdout.write(message + '\n');
+        }
+        else {
+            process.stdout.write(message);
+        }
     }
     progress(timeout) {
-        return new Promise((resolve, _reject) => {
-            setTimeout(resolve, timeout);
+        return new cancelable_promise_1.CancelablePromise((resolve, _reject, onCancel) => {
+            const timer = setTimeout(resolve, timeout);
+            onCancel(() => {
+                clearTimeout(timer);
+                resolve();
+            });
         });
     }
     waitForInput(_isPassword) {
-        return Promise.resolve('test');
+        return cancelable_promise_1.CancelablePromise.resolve('test');
     }
     waitForKeyPress() {
-        return Promise.resolve({
+        return cancelable_promise_1.CancelablePromise.resolve({
             keyCode: 13,
             code: 'Enter'
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "1.6.6",
+    "version": "1.6.8",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,6 +48,7 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
+        "cancelable-promise": "^4.3.1",
         "greybel-core": "^0.6.7",
         "greyscript-core": "^0.6.2"
     },