greybel-interpreter 1.6.4 → 1.6.6

package/dist/context.d.ts

@@ -63,6 +63,7 @@ export interface ContextOptions {
     handler?: HandlerContainer;
     cps?: CPS;
     processState?: ProcessState;
+    environmentVariables?: Map<string, string>;
 }
 export interface ContextForkOptions {
     type: ContextType;
@@ -74,6 +75,7 @@ export default class OperationContext {
     target: string;
     stackItem: ASTBase;
     debugger: Debugger;
+    environmentVariables: Map<string, string>;
     handler: HandlerContainer;
     previous: OperationContext;
     readonly type: ContextType;

package/dist/context.js

@@ -146,6 +146,7 @@ class OperationContext {
         this.handler = options.handler || new handler_container_1.default();
         this.cps = options.cps || null;
         this.processState = options.processState || new ProcessState();
+        this.environmentVariables = options.environmentVariables || new Map();
         this.api = this.lookupApi();
         this.globals = this.lookupGlobals();
         this.locals = this.lookupLocals() || this;
@@ -286,7 +287,8 @@ class OperationContext {
             debugger: this.debugger,
             handler: this.handler,
             cps: this.cps,
-            processState: this.processState
+            processState: this.processState,
+            environmentVariables: this.environmentVariables
         });
         if (options.type !== ContextType.Function) {
             if (options.type !== ContextType.Loop) {

package/dist/cps.js

@@ -38,6 +38,7 @@ 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;
@@ -45,8 +46,9 @@ class CPSContext {
     }
 }
 exports.CPSContext = CPSContext;
-const visit = (context, currentTarget, item) => __awaiter(void 0, void 0, void 0, function* () {
-    const defaultVisit = visit.bind(null, context, currentTarget);
+const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, function* () {
+    const currentTarget = stack[stack.length - 1];
+    const defaultVisit = visit.bind(null, context, stack);
     switch (item.type) {
         case greyscript_core_1.ASTType.MapConstructorExpression:
             return new map_1.default(item, currentTarget).build(defaultVisit);
@@ -82,38 +84,58 @@ const visit = (context, currentTarget, item) => __awaiter(void 0, void 0, void 0
         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 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, target);
+            const subVisit = visit.bind(null, context, stack);
             const importStatement = yield new import_1.default(importExpr, target, code).build(subVisit);
+            stack.pop();
             return importStatement;
         }
         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 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, target);
+            const subVisit = visit.bind(null, context, stack);
             const importStatement = yield new include_1.default(includeExpr, target, code).build(subVisit);
+            stack.pop();
             return importStatement;
         }
         case greyscript_core_1.ASTType.ImportCodeExpression: {
             const importExpr = item;
             const target = yield context.handler.resourceHandler.getTargetRelativeTo(currentTarget, importExpr.fileSystemDirectory);
+            if (stack.includes(target)) {
+                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, target);
+            const subVisit = visit.bind(null, context, stack);
             const importStatement = yield new include_1.default(importExpr, target, code).build(subVisit);
+            stack.pop();
             return importStatement;
         }
         case greybel_core_1.ASTType.FeatureDebuggerExpression:
             return new debugger_statement_1.default(item, currentTarget);
+        case greybel_core_1.ASTType.FeatureEnvarExpression:
+            return new envar_1.default(item, currentTarget);
         case greyscript_core_1.ASTType.BooleanLiteral:
         case greyscript_core_1.ASTType.StringLiteral:
         case greyscript_core_1.ASTType.NumericLiteral:
@@ -152,7 +174,7 @@ const visit = (context, currentTarget, item) => __awaiter(void 0, void 0, void 0
 class CPS {
     constructor(context) {
         this.context = context;
-        this.__visit = visit.bind(null, context, context.target);
+        this.__visit = visit.bind(null, context, [context.target]);
     }
     visit(item) {
         return this.__visit(item);

package/dist/interpreter.d.ts

@@ -14,11 +14,13 @@ export interface InterpreterOptions {
     params?: Array<string>;
     handler?: HandlerContainer;
     debugger?: Debugger;
+    environmentVariables?: Map<string, string>;
 }
 export default class Interpreter extends EventEmitter {
     target: string;
     api: ObjectValue;
     params: Array<string>;
+    environmentVariables: Map<string, string>;
     handler: HandlerContainer;
     debugger: Debugger;
     apiContext: OperationContext;

package/dist/interpreter.js

@@ -56,6 +56,7 @@ class Interpreter extends events_1.default {
         this.debugger = options.debugger || new context_1.Debugger();
         this.api = options.api || new object_value_1.default();
         this.params = options.params || [];
+        this.environmentVariables = options.environmentVariables || new Map();
         this.apiContext = null;
         this.globalContext = null;
         this.setTarget(options.target || 'unknown');
@@ -72,7 +73,8 @@ class Interpreter extends events_1.default {
             isProtected: true,
             debugger: this.debugger,
             handler: this.handler,
-            cps: this.cps
+            cps: this.cps,
+            environmentVariables: this.environmentVariables
         });
         this.globalContext = this.apiContext.fork({
             type: context_1.ContextType.Global,

package/dist/operations/envar.d.ts

@@ -0,0 +1,10 @@
+import { ASTFeatureEnvarExpression } from 'greybel-core';
+import context from '../context';
+import CustomValue from '../types/base';
+import Operation, { CPSVisit } from './operation';
+export default class EnvarExpression extends Operation {
+    readonly item: ASTFeatureEnvarExpression;
+    constructor(item: ASTFeatureEnvarExpression, target?: string);
+    build(_visit: CPSVisit): Promise<Operation>;
+    handle(ctx: context): Promise<CustomValue>;
+}

package/dist/operations/envar.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const string_1 = __importDefault(require("../types/string"));
+const operation_1 = __importDefault(require("./operation"));
+class EnvarExpression extends operation_1.default {
+    constructor(item, target) {
+        super(null, target);
+        this.item = item;
+    }
+    build(_visit) {
+        return Promise.resolve(this);
+    }
+    handle(ctx) {
+        if (ctx.environmentVariables.has(this.item.name)) {
+            return Promise.resolve(new string_1.default(ctx.environmentVariables.get(this.item.name)));
+        }
+        throw new Error('Unknown environment variable.');
+    }
+}
+exports.default = EnvarExpression;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "1.6.4",
+    "version": "1.6.6",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",