greybel-interpreter 2.7.2 → 2.8.0

package/dist/context/types.d.ts

@@ -0,0 +1,8 @@
+import { ObjectValue } from '../utils/object-value';
+export type ContextTypeIntrinsics = {
+    map: ObjectValue;
+    list: ObjectValue;
+    number: ObjectValue;
+    string: ObjectValue;
+    function: ObjectValue;
+};

package/dist/context/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/context.d.ts

@@ -9,6 +9,7 @@ import { CustomMap } from './types/map';
 import { CustomNil } from './types/nil';
 import { ObjectValue } from './utils/object-value';
 import { Path } from './utils/path';
+import { ContextTypeIntrinsics } from './context/types';
 export declare enum ContextType {
     Api = 0,
     Global = 1,
@@ -25,7 +26,7 @@ export declare enum ContextState {
 export declare class Scope extends CustomMap {
     private readonly context;
     constructor(context: OperationContext);
-    get(path: Path<CustomValue> | CustomValue): CustomValue;
+    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
 }
 export declare class Debugger {
     private breakpoint;
@@ -72,6 +73,7 @@ export interface ContextOptions {
     processState?: ProcessState;
     environmentVariables?: Map<string, string>;
     ignoreOuter?: boolean;
+    contextTypeIntrinsics?: ContextTypeIntrinsics;
 }
 export interface ContextForkOptions {
     type: ContextType;
@@ -87,6 +89,7 @@ export declare class OperationContext {
     debugger: Debugger;
     environmentVariables: Map<string, string>;
     handler: HandlerContainer;
+    contextTypeIntrinsics: ContextTypeIntrinsics;
     previous: OperationContext;
     readonly type: ContextType;
     readonly state: ContextState;

package/dist/context.js

@@ -39,10 +39,10 @@ class Scope extends map_1.CustomMap {
         super();
         this.context = context;
     }
-    get(path) {
-        var _a, _b, _c;
+    get(path, typeIntrinsics) {
+        var _a, _b, _c, _d;
         if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]));
+            return this.get(new path_1.Path([path]), typeIntrinsics);
         }
         if (path.count() === 0) {
             return this;
@@ -50,19 +50,20 @@ class Scope extends map_1.CustomMap {
         const traversalPath = path.clone();
         const current = traversalPath.next();
         if (this.has(path)) {
-            return super.get(path);
+            return super.get(path, typeIntrinsics);
         }
         else if ((_a = this.context.outer) === null || _a === void 0 ? void 0 : _a.scope.has(path)) {
-            return this.context.outer.scope.get(path);
+            return this.context.outer.scope.get(path, typeIntrinsics);
         }
         else if ((_b = this.context.globals) === null || _b === void 0 ? void 0 : _b.scope.has(path)) {
-            return this.context.globals.scope.get(path);
+            return this.context.globals.scope.get(path, typeIntrinsics);
         }
         else if ((_c = this.context.api) === null || _c === void 0 ? void 0 : _c.scope.has(path)) {
-            return this.context.api.scope.get(path);
+            return this.context.api.scope.get(path, typeIntrinsics);
         }
-        else if (traversalPath.count() === 0 && map_1.CustomMap.getIntrinsics().has(current)) {
-            return map_1.CustomMap.getIntrinsics().get(current);
+        const intrinsics = (_d = typeIntrinsics.map) !== null && _d !== void 0 ? _d : map_1.CustomMap.getIntrinsics();
+        if (traversalPath.count() === 0 && intrinsics.has(current)) {
+            return intrinsics.get(current);
         }
         throw new Error(`Unknown path ${path.toString()}.`);
     }
@@ -161,7 +162,7 @@ class FunctionState {
 exports.FunctionState = FunctionState;
 class OperationContext {
     constructor(options = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.target = (_a = options.target) !== null && _a !== void 0 ? _a : 'unknown';
         this.stackTrace = (_b = options.stackTrace) !== null && _b !== void 0 ? _b : [];
         this.previous = (_c = options.previous) !== null && _c !== void 0 ? _c : null;
@@ -172,15 +173,22 @@ class OperationContext {
         this.injected = (_g = options.injected) !== null && _g !== void 0 ? _g : false;
         this.debugger = (_h = options.debugger) !== null && _h !== void 0 ? _h : new Debugger();
         this.handler = (_j = options.handler) !== null && _j !== void 0 ? _j : new handler_container_1.HandlerContainer();
-        this.cps = (_k = options.cps) !== null && _k !== void 0 ? _k : null;
-        this.processState = (_l = options.processState) !== null && _l !== void 0 ? _l : new ProcessState();
-        this.environmentVariables = (_m = options.environmentVariables) !== null && _m !== void 0 ? _m : new Map();
+        this.contextTypeIntrinsics = (_k = options.contextTypeIntrinsics) !== null && _k !== void 0 ? _k : {
+            string: null,
+            number: null,
+            list: null,
+            map: null,
+            function: null
+        };
+        this.cps = (_l = options.cps) !== null && _l !== void 0 ? _l : null;
+        this.processState = (_m = options.processState) !== null && _m !== void 0 ? _m : new ProcessState();
+        this.environmentVariables = (_o = options.environmentVariables) !== null && _o !== void 0 ? _o : new Map();
         this.functionState = new FunctionState();
         this.loopState = new LoopState();
         this.api = this.lookupApi();
         this.globals = this.lookupGlobals();
-        this.locals = (_o = this.lookupLocals()) !== null && _o !== void 0 ? _o : this;
-        this.outer = (_p = (options.ignoreOuter ? null : this.lookupOuter())) !== null && _p !== void 0 ? _p : this.globals;
+        this.locals = (_p = this.lookupLocals()) !== null && _p !== void 0 ? _p : this;
+        this.outer = (_q = (options.ignoreOuter ? null : this.lookupOuter())) !== null && _q !== void 0 ? _q : this.globals;
     }
     isIgnoredInDebugging(op) {
         return op instanceof operation_1.OperationBlock || op instanceof noop_1.Noop;
@@ -317,7 +325,7 @@ class OperationContext {
         if (this.state === ContextState.Temporary) {
             return (_a = this.previous) === null || _a === void 0 ? void 0 : _a.get(path);
         }
-        return this.locals.scope.get(path);
+        return this.locals.scope.get(path, this.contextTypeIntrinsics);
     }
     fork(options) {
         var _a, _b;
@@ -334,7 +342,8 @@ class OperationContext {
             handler: this.handler,
             cps: this.cps,
             processState: (_b = options.processState) !== null && _b !== void 0 ? _b : this.processState,
-            environmentVariables: this.environmentVariables
+            environmentVariables: this.environmentVariables,
+            contextTypeIntrinsics: this.contextTypeIntrinsics
         });
         if (options.type !== ContextType.Function) {
             if (options.type !== ContextType.Loop) {

package/dist/interpreter.d.ts

@@ -18,7 +18,6 @@ export interface InterpreterOptions {
     environmentVariables?: Map<string, string>;
 }
 export declare class Interpreter extends EventEmitter {
-    static clearAllIntrinsics(): void;
     target: string;
     api: ObjectValue;
     params: Array<string>;
@@ -36,6 +35,7 @@ export declare class Interpreter extends EventEmitter {
     prepare(code: string): Promise<Operation>;
     inject(code: string, context?: OperationContext): Promise<Interpreter>;
     injectInLastContext(code: string): Promise<Interpreter>;
+    private initScopes;
     run(customCode?: string): Promise<Interpreter>;
     start(top: Operation): Promise<Interpreter>;
     resume(): Interpreter;

package/dist/interpreter.js

@@ -28,13 +28,6 @@ const boolean_1 = require("./types/boolean");
 exports.PARAMS_PROPERTY = new string_1.CustomString('params');
 exports.IS_GREYBEL_PROPERTY = new string_1.CustomString('IS_GREYBEL');
 class Interpreter extends events_1.EventEmitter {
-    static clearAllIntrinsics() {
-        number_1.CustomNumber.clearIntrinsics();
-        string_1.CustomString.clearIntrinsics();
-        function_1.CustomFunction.intrinsics.clear();
-        list_1.CustomList.clearIntrinsics();
-        map_1.CustomMap.clearIntrinsics();
-    }
     constructor(options) {
         var _a, _b, _c, _d, _e, _f;
         super();
@@ -52,25 +45,11 @@ class Interpreter extends events_1.EventEmitter {
             throw new Error('You cannot set a target while a process is running.');
         }
         this.target = target;
-        const cpsCtx = new cps_1.CPSContext(target, this.handler);
-        this.cps = new cps_1.CPS(cpsCtx);
-        this.apiContext = new context_1.OperationContext({
-            target,
-            isProtected: true,
-            debugger: this.debugger,
-            handler: this.handler,
-            cps: this.cps,
-            environmentVariables: this.environmentVariables
-        });
-        this.globalContext = this.apiContext.fork({
-            type: context_1.ContextType.Global,
-            state: context_1.ContextState.Default
-        });
         return this;
     }
     setDebugger(dbgr) {
         if (this.apiContext !== null && this.apiContext.isPending()) {
-            throw new Error('You cannot set a target while a process is running.');
+            throw new Error('You cannot set a debugger while a process is running.');
         }
         this.debugger = dbgr;
         this.apiContext.debugger = dbgr;
@@ -79,14 +58,14 @@ class Interpreter extends events_1.EventEmitter {
     }
     setApi(newApi) {
         if (this.apiContext !== null && this.apiContext.isPending()) {
-            throw new Error('You cannot set a target while a process is running.');
+            throw new Error('You cannot set an api object while a process is running.');
         }
         this.api = newApi;
         return this;
     }
     setHandler(handler) {
         if (this.apiContext !== null && this.apiContext.isPending()) {
-            throw new Error('You cannot set a target while a process is running.');
+            throw new Error('You cannot set a handler while a process is running.');
         }
         this.handler = handler;
         this.apiContext.handler = handler;
@@ -143,8 +122,46 @@ class Interpreter extends events_1.EventEmitter {
             throw new Error('Unable to inject into last context.');
         });
     }
+    initScopes() {
+        const cpsCtx = new cps_1.CPSContext(this.target, this.handler);
+        this.cps = new cps_1.CPS(cpsCtx);
+        const apiContext = new context_1.OperationContext({
+            target: this.target,
+            isProtected: true,
+            debugger: this.debugger,
+            handler: this.handler,
+            cps: this.cps,
+            environmentVariables: this.environmentVariables
+        });
+        const stringIntrinsics = new map_1.CustomMap(string_1.CustomString.intrinsics);
+        const numberIntrinsics = new map_1.CustomMap(number_1.CustomNumber.intrinsics);
+        const listIntrinsics = new map_1.CustomMap(list_1.CustomList.intrinsics);
+        const mapIntrinsics = new map_1.CustomMap(map_1.CustomMap.intrinsics);
+        const funcRefIntrinsics = new map_1.CustomMap(function_1.CustomFunction.intrinsics);
+        apiContext.contextTypeIntrinsics.string = stringIntrinsics.value;
+        apiContext.contextTypeIntrinsics.number = numberIntrinsics.value;
+        apiContext.contextTypeIntrinsics.list = listIntrinsics.value;
+        apiContext.contextTypeIntrinsics.map = mapIntrinsics.value;
+        apiContext.contextTypeIntrinsics.function = funcRefIntrinsics.value;
+        apiContext.scope.set(new string_1.CustomString('string'), stringIntrinsics);
+        apiContext.scope.set(new string_1.CustomString('number'), numberIntrinsics);
+        apiContext.scope.set(new string_1.CustomString('list'), listIntrinsics);
+        apiContext.scope.set(new string_1.CustomString('map'), mapIntrinsics);
+        apiContext.scope.set(new string_1.CustomString('funcRef'), funcRefIntrinsics);
+        apiContext.scope.extend(this.api);
+        const globalContext = apiContext.fork({
+            type: context_1.ContextType.Global,
+            state: context_1.ContextState.Default
+        });
+        const newParams = new list_1.CustomList(this.params.map((item) => new string_1.CustomString(item)));
+        globalContext.scope.set(exports.IS_GREYBEL_PROPERTY, new boolean_1.CustomBoolean(true));
+        globalContext.scope.set(exports.PARAMS_PROPERTY, newParams);
+        this.apiContext = apiContext;
+        this.globalContext = globalContext;
+    }
     run(customCode) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.initScopes();
             const code = customCode !== null && customCode !== void 0 ? customCode : (yield this.handler.resourceHandler.get(this.target));
             const top = yield this.prepare(code);
             return this.start(top);
@@ -155,20 +172,6 @@ class Interpreter extends events_1.EventEmitter {
             if (this.apiContext !== null && this.apiContext.isPending()) {
                 throw new Error('Process already running.');
             }
-            const stringIntrinsics = map_1.CustomMap.createWithInitialValue(string_1.CustomString.intrinsics);
-            const numberIntrinsics = map_1.CustomMap.createWithInitialValue(number_1.CustomNumber.intrinsics);
-            const listIntrinsics = map_1.CustomMap.createWithInitialValue(list_1.CustomList.intrinsics);
-            const mapIntrinsics = map_1.CustomMap.createWithInitialValue(map_1.CustomMap.intrinsics);
-            const funcRefIntrinsics = map_1.CustomMap.createWithInitialValue(function_1.CustomFunction.intrinsics);
-            this.apiContext.set(new string_1.CustomString('string'), stringIntrinsics);
-            this.apiContext.set(new string_1.CustomString('number'), numberIntrinsics);
-            this.apiContext.set(new string_1.CustomString('list'), listIntrinsics);
-            this.apiContext.set(new string_1.CustomString('map'), mapIntrinsics);
-            this.apiContext.set(new string_1.CustomString('funcRef'), funcRefIntrinsics);
-            this.apiContext.extend(this.api);
-            const newParams = new list_1.CustomList(this.params.map((item) => new string_1.CustomString(item)));
-            this.globalContext.scope.set(exports.IS_GREYBEL_PROPERTY, new boolean_1.CustomBoolean(true));
-            this.globalContext.scope.set(exports.PARAMS_PROPERTY, newParams);
             try {
                 this.apiContext.setPending(true);
                 const process = top.handle(this.globalContext);

package/dist/operations/call.js

@@ -43,8 +43,7 @@ class Call extends operation_1.Operation {
             }
             if (valueRef instanceof function_1.CustomFunction) {
                 const func = valueRef;
-                const next = func.getNextContext();
-                if (this.fnRef.path.isSuper() && ctx.functionState.context && next) {
+                if (this.fnRef.path.isSuper() && ctx.functionState.context) {
                     return func.run(ctx.functionState.context, fnArgs, ctx);
                 }
                 return func.run(resolveResult.handle, fnArgs, ctx);

package/dist/operations/evaluate.js

@@ -330,7 +330,7 @@ class Evaluate extends operation_1.Operation {
                     case greyscript_core_1.ASTType.IsaExpression: {
                         const left = yield this.resolve(ctx, expr.left);
                         const right = yield this.resolve(ctx, expr.right);
-                        return new boolean_1.CustomBoolean(left.instanceOf(right));
+                        return new boolean_1.CustomBoolean(left.instanceOf(right, ctx.contextTypeIntrinsics));
                     }
                     case greyscript_core_1.ASTType.BinaryExpression:
                         return this.resolveBinaryExpression(ctx, expr);

package/dist/operations/function-reference.js

@@ -39,7 +39,7 @@ class FunctionReference extends operation_1.Operation {
                     return refResult.handle;
                 }
                 const customValueCtx = refResult.handle;
-                return customValueCtx.get(refResult.path);
+                return customValueCtx.get(refResult.path, ctx.contextTypeIntrinsics);
             }
             return ctx.get(refResult.path);
         });

package/dist/operations/import.js

@@ -45,7 +45,7 @@ class Import extends operation_1.Operation {
             importCtx.locals.scope.set(exports.MODULE_PROPERTY, new map_1.CustomMap());
             yield this.top.handle(importCtx);
             const item = importCtx.locals.scope.has(exports.EXPORTS_PATH)
-                ? importCtx.scope.get(exports.EXPORTS_PATH)
+                ? importCtx.scope.get(exports.EXPORTS_PATH, ctx.contextTypeIntrinsics)
                 : default_1.DefaultType.Void;
             const identifier = this.item.name;
             ctx.set(new string_1.CustomString(identifier.name), item);

package/dist/operations/resolve.js

@@ -179,7 +179,7 @@ class Resolve extends operation_1.Operation {
                     if (!(handle instanceof ResolveNil)) {
                         if (handle instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
                             const customValueCtx = handle;
-                            handle = customValueCtx.get(traversedPath);
+                            handle = customValueCtx.get(traversedPath, ctx.contextTypeIntrinsics);
                         }
                         else {
                             throw new Error(`Unknown path ${traversedPath.toString()}.`);
@@ -237,7 +237,7 @@ class Resolve extends operation_1.Operation {
                 }
                 if (result.handle instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
                     const customValueCtx = result.handle;
-                    const { value: child, origin } = customValueCtx.getWithOrigin(result.path);
+                    const { value: child, origin } = customValueCtx.getWithOrigin(result.path, ctx.contextTypeIntrinsics);
                     const next = (0, get_super_1.getSuper)(origin);
                     if (child instanceof function_1.CustomFunction) {
                         child.setNextContext(next);

package/dist/types/base.d.ts

@@ -1,3 +1,4 @@
+import { ContextTypeIntrinsics } from '../context/types';
 export declare abstract class CustomValue {
     abstract value: any;
     abstract getCustomType(): string;
@@ -7,6 +8,6 @@ export declare abstract class CustomValue {
     abstract toString(): string;
     abstract toTruthy(): boolean;
     abstract fork(): CustomValue;
-    abstract instanceOf(value: CustomValue): boolean;
+    abstract instanceOf(value: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     abstract hash(recursionDepth?: number): number;
 }

package/dist/types/function.d.ts

@@ -1,4 +1,5 @@
 import { OperationContext } from '../context';
+import { ContextTypeIntrinsics } from '../context/types';
 import { Operation } from '../operations/operation';
 import { ObjectValue } from '../utils/object-value';
 import { CustomValue } from './base';
@@ -35,7 +36,7 @@ export declare class CustomFunction extends CustomValue {
     toJSON(): string;
     toString(): string;
     toTruthy(): boolean;
-    instanceOf(v: CustomValue): boolean;
+    instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     setNextContext(value: CustomValue): this;
     getNextContext(): CustomValue;
     run(self: CustomValue, args: Array<CustomValue>, callContext: OperationContext): Promise<CustomValue>;

package/dist/types/function.js

@@ -106,8 +106,9 @@ class CustomFunction extends base_1.CustomValue {
     toTruthy() {
         return true;
     }
-    instanceOf(v) {
-        return v.value === CustomFunction.intrinsics;
+    instanceOf(v, typeIntrinsics) {
+        var _a;
+        return v.value === ((_a = typeIntrinsics.function) !== null && _a !== void 0 ? _a : CustomFunction.intrinsics);
     }
     setNextContext(value) {
         this._nextContext = value;

package/dist/types/list.d.ts

@@ -1,3 +1,4 @@
+import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
 import { Path } from '../utils/path';
 import { CustomValue } from './base';
@@ -20,14 +21,14 @@ export declare class CustomList extends CustomObject {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
-    instanceOf(v: CustomValue): boolean;
+    instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     slice(a: CustomValue, b: CustomValue): CustomList;
     extend(list: CustomList | Array<CustomValue>): CustomList;
     [Symbol.iterator](): CustomListIterator;
     getItemIndex(index: number): number;
     has(path: Path<CustomValue> | CustomValue): boolean;
     set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue): CustomValueWithIntrinsicsResult;
+    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     hash(recursionDepth?: number): number;
 }

package/dist/types/list.js

@@ -62,8 +62,9 @@ class CustomList extends with_intrinsics_1.CustomObject {
     toTruthy() {
         return this.value.length > 0;
     }
-    instanceOf(v) {
-        return v.value === CustomList.intrinsics;
+    instanceOf(v, typeIntrinsics) {
+        var _a;
+        return v.value === ((_a = typeIntrinsics.list) !== null && _a !== void 0 ? _a : CustomList.intrinsics);
     }
     slice(a, b) {
         return new CustomList(this.value.slice(a.toNumber(), b.toNumber()));
@@ -131,9 +132,10 @@ class CustomList extends with_intrinsics_1.CustomObject {
         }
         throw new Error(`Index is not a number.`);
     }
-    get(path) {
+    get(path, typeIntrinsics) {
+        var _a;
         if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]));
+            return this.get(new path_1.Path([path]), typeIntrinsics);
         }
         const traversalPath = path.clone();
         const current = traversalPath.next();
@@ -143,7 +145,7 @@ class CustomList extends with_intrinsics_1.CustomObject {
                 const sub = this.value[currentIndex];
                 if (traversalPath.count() > 0) {
                     if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                        return sub.get(traversalPath);
+                        return sub.get(traversalPath, typeIntrinsics);
                     }
                 }
                 else if (traversalPath.count() === 0) {
@@ -152,14 +154,15 @@ class CustomList extends with_intrinsics_1.CustomObject {
             }
             throw new Error(`Index error (list index ${currentIndex} out of range).`);
         }
-        else if (path.count() === 1 && CustomList.getIntrinsics().has(current)) {
-            return CustomList.getIntrinsics().get(current);
+        const intrinsics = (_a = typeIntrinsics.list) !== null && _a !== void 0 ? _a : CustomList.getIntrinsics();
+        if (path.count() === 1 && intrinsics.has(current)) {
+            return intrinsics.get(current);
         }
         throw new Error(`Unknown path in list ${path.toString()}.`);
     }
-    getWithOrigin(path) {
+    getWithOrigin(path, typeIntrinsics) {
         return {
-            value: this.get(path),
+            value: this.get(path, typeIntrinsics),
             origin: null
         };
     }

package/dist/types/map.d.ts

@@ -1,3 +1,4 @@
+import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
 import { Path } from '../utils/path';
 import { CustomValue } from './base';
@@ -26,13 +27,13 @@ export declare class CustomMap extends CustomObject {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
-    instanceOf(v: CustomValue): boolean;
+    instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     [Symbol.iterator](): CustomMapIterator;
     extend(map: CustomMap | ObjectValue): CustomMap;
     has(path: Path<CustomValue> | CustomValue): boolean;
     set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue): CustomValueWithIntrinsicsResult;
+    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     createInstance(): CustomMap;
     getIsa(): CustomMap | null;
     hash(recursionDepth?: number): number;

package/dist/types/map.js

@@ -82,7 +82,8 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     toTruthy() {
         return this.value.size > 0;
     }
-    instanceOf(v) {
+    instanceOf(v, typeIntrinsics) {
+        var _a;
         if (v instanceof CustomMap) {
             let current = this;
             while ((current = current.getIsa())) {
@@ -90,7 +91,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                     return true;
                 }
             }
-            return v.value === CustomMap.intrinsics;
+            return v.value === ((_a = typeIntrinsics.map) !== null && _a !== void 0 ? _a : CustomMap.getIntrinsics());
         }
         return false;
     }
@@ -143,9 +144,10 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         }
         this.value.set(last, newValue);
     }
-    get(path) {
+    get(path, typeIntrinsics) {
+        var _a;
         if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]));
+            return this.get(new path_1.Path([path]), typeIntrinsics);
         }
         const traversalPath = path.clone();
         const current = traversalPath.next();
@@ -155,7 +157,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                 const sub = this.value.get(current);
                 if (traversalPath.count() > 0) {
                     if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                        return sub.get(traversalPath);
+                        return sub.get(traversalPath, typeIntrinsics);
                     }
                 }
                 else if (traversalPath.count() === 0) {
@@ -163,18 +165,19 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                 }
             }
             else if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
-                return isa.get(current);
+                return isa.get(current, typeIntrinsics);
             }
-            else if (traversalPath.count() === 0 &&
-                CustomMap.getIntrinsics().has(current)) {
-                return CustomMap.getIntrinsics().get(current);
+            const intrinsics = (_a = typeIntrinsics.map) !== null && _a !== void 0 ? _a : CustomMap.getIntrinsics();
+            if (traversalPath.count() === 0 && intrinsics.has(current)) {
+                return intrinsics.get(current);
             }
         }
         throw new Error(`Unknown path in map ${path.toString()}.`);
     }
-    getWithOrigin(path) {
+    getWithOrigin(path, typeIntrinsics) {
+        var _a;
         if (path instanceof base_1.CustomValue) {
-            return this.getWithOrigin(new path_1.Path([path]));
+            return this.getWithOrigin(new path_1.Path([path]), typeIntrinsics);
         }
         const traversalPath = path.clone();
         const current = traversalPath.next();
@@ -184,11 +187,11 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                 const sub = this.value.get(current);
                 if (traversalPath.count() > 0) {
                     if (sub instanceof CustomMap) {
-                        return sub.getWithOrigin(traversalPath);
+                        return sub.getWithOrigin(traversalPath, typeIntrinsics);
                     }
                     if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
                         return {
-                            value: sub.get(traversalPath),
+                            value: sub.get(traversalPath, typeIntrinsics),
                             origin: this
                         };
                     }
@@ -201,11 +204,10 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                 }
             }
             else if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
-                return isa.getWithOrigin(current);
+                return isa.getWithOrigin(current, typeIntrinsics);
             }
-            else if (traversalPath.count() === 0 &&
-                CustomMap.getIntrinsics().has(current)) {
-                const intrinsics = CustomMap.getIntrinsics();
+            const intrinsics = (_a = typeIntrinsics.map) !== null && _a !== void 0 ? _a : CustomMap.getIntrinsics();
+            if (traversalPath.count() === 0 && intrinsics.has(current)) {
                 return {
                     value: intrinsics.get(current),
                     origin: null

package/dist/types/number.d.ts

@@ -1,3 +1,4 @@
+import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
 import { Path } from '../utils/path';
 import { CustomValue } from './base';
@@ -17,12 +18,12 @@ export declare class CustomNumber extends CustomValueWithIntrinsics {
     toInt(): number;
     toNumber(): number;
     toTruthy(): boolean;
-    instanceOf(v: CustomValue): boolean;
+    instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     [Symbol.iterator](): CustomNumberIterator;
     has(_path: Path<CustomValue> | CustomValue): boolean;
     set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue): CustomValueWithIntrinsicsResult;
+    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     hash(): number;
 }
 export declare const NegativeOne: CustomNumber;

package/dist/types/number.js

@@ -44,8 +44,9 @@ class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
     toTruthy() {
         return !!this.value;
     }
-    instanceOf(v) {
-        return v.value === CustomNumber.intrinsics;
+    instanceOf(v, typeIntrinsics) {
+        var _a;
+        return v.value === ((_a = typeIntrinsics.number) !== null && _a !== void 0 ? _a : CustomNumber.intrinsics);
     }
     [Symbol.iterator]() {
         return new CustomNumberIterator();
@@ -56,21 +57,22 @@ class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
     set(_path, _newValue) {
         throw new Error('Mutable operations are not allowed on a number.');
     }
-    get(path) {
+    get(path, typeIntrinsics) {
+        var _a;
         if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]));
+            return this.get(new path_1.Path([path]), typeIntrinsics);
         }
         const traversalPath = path.clone();
         const current = traversalPath.next();
-        if (traversalPath.count() === 0 &&
-            CustomNumber.getIntrinsics().has(current)) {
-            return CustomNumber.intrinsics.get(current);
+        const intrinsics = (_a = typeIntrinsics.number) !== null && _a !== void 0 ? _a : CustomNumber.getIntrinsics();
+        if (traversalPath.count() === 0 && intrinsics.has(current)) {
+            return intrinsics.get(current);
         }
         throw new Error(`Unknown path in number ${path.toString()}.`);
     }
-    getWithOrigin(path) {
+    getWithOrigin(path, typeIntrinsics) {
         return {
-            value: this.get(path),
+            value: this.get(path, typeIntrinsics),
             origin: null
         };
     }

package/dist/types/string.d.ts

@@ -1,3 +1,4 @@
+import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
 import { Path } from '../utils/path';
 import { CustomValue } from './base';
@@ -23,13 +24,13 @@ export declare class CustomString extends CustomValueWithIntrinsics {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
-    instanceOf(v: CustomValue): boolean;
+    instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     slice(a: CustomValue, b: CustomValue): CustomString;
     [Symbol.iterator](): CustomStringIterator;
     getCharIndex(index: number): number;
     has(path: Path<CustomValue> | CustomValue): boolean;
     set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue): CustomValueWithIntrinsicsResult;
+    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     hash(): number;
 }

package/dist/types/string.js

@@ -72,8 +72,9 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
     toTruthy() {
         return this.value.length > 0;
     }
-    instanceOf(v) {
-        return v.value === CustomString.intrinsics;
+    instanceOf(v, typeIntrinsics) {
+        var _a;
+        return v.value === ((_a = typeIntrinsics.string) !== null && _a !== void 0 ? _a : CustomString.intrinsics);
     }
     slice(a, b) {
         return new CustomString(this.value.slice(a.toNumber(), b.toNumber()));
@@ -99,9 +100,10 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
     set(_path, _newValue) {
         throw new Error('Mutable operations are not allowed on a string.');
     }
-    get(path) {
+    get(path, typeIntrinsics) {
+        var _a;
         if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]));
+            return this.get(new path_1.Path([path]), typeIntrinsics);
         }
         const traversalPath = path.clone();
         const current = traversalPath.next();
@@ -113,15 +115,15 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
             }
             throw new Error(`Index error (string index ${currentIndex} out of range).`);
         }
-        else if (traversalPath.count() === 0 &&
-            CustomString.getIntrinsics().has(current)) {
-            return CustomString.intrinsics.get(current);
+        const intrinsics = (_a = typeIntrinsics.string) !== null && _a !== void 0 ? _a : CustomString.getIntrinsics();
+        if (traversalPath.count() === 0 && intrinsics.has(current)) {
+            return intrinsics.get(current);
         }
         throw new Error(`Unknown path in string ${path.toString()}.`);
     }
-    getWithOrigin(path) {
+    getWithOrigin(path, typeIntrinsics) {
         return {
-            value: this.get(path),
+            value: this.get(path, typeIntrinsics),
             origin: null
         };
     }

package/dist/types/with-intrinsics.d.ts

@@ -1,3 +1,4 @@
+import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
 import { Path } from '../utils/path';
 import { CustomValue } from './base';
@@ -9,8 +10,8 @@ export type CustomValueWithIntrinsicsResult = {
 export declare abstract class CustomValueWithIntrinsics extends CustomValue {
     abstract has(path: Path<CustomValue> | CustomValue): boolean;
     abstract set(path: Path<CustomValue> | CustomValue, value: CustomValue): void;
-    abstract get(path: Path<CustomValue> | CustomValue): CustomValue;
-    abstract getWithOrigin(path: Path<CustomValue> | CustomValue): CustomValueWithIntrinsicsResult;
+    abstract get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    abstract getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     abstract [Symbol.iterator](): Iterator<CustomValue> & {
         index: number;
     };

package/dist/utils/get-super.js

@@ -5,7 +5,7 @@ const map_1 = require("../types/map");
 function getSuper(item) {
     var _a;
     if (item instanceof map_1.CustomMap) {
-        return (_a = item.getIsa()) !== null && _a !== void 0 ? _a : new map_1.CustomMap(item.getIntrinsics());
+        return (_a = item.getIsa()) !== null && _a !== void 0 ? _a : new map_1.CustomMap();
     }
     return null;
 }

package/package.json

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