@dronedeploy/rocos-js-sdk 3.0.11 → 3.0.12

package/cjs/api/StreamRegister.d.ts

@@ -6,8 +6,8 @@ export declare class StreamRegister {
     private constructor();
     static getInstance(): StreamRegister;
     static getIdentifier($identifier: string, scope?: string): string;
-    addStream(stream: IBaseStream): Promise<void>;
+    addStream(stream: IBaseStream): void;
     getStream(identifier: string): IBaseStream | undefined;
-    removeStream(stream: IBaseStream): Promise<void>;
-    removeAllStreams(): Promise<boolean>;
+    removeStream(stream: IBaseStream): void;
+    removeAllStreams(): boolean;
 }

package/cjs/api/StreamRegister.js

@@ -17,10 +17,10 @@ class StreamRegister {
     static getIdentifier($identifier, scope) {
         return `${$identifier}-${scope ?? ''}`;
     }
-    async addStream(stream) {
+    addStream(stream) {
         try {
             if (this.teleStreams.has(stream.identifier)) {
-                await this.removeStream(stream);
+                this.removeStream(stream);
             }
             this.teleStreams.set(stream.identifier, stream);
         }
@@ -37,9 +37,9 @@ class StreamRegister {
     getStream(identifier) {
         return this.teleStreams.get(identifier);
     }
-    async removeStream(stream) {
+    removeStream(stream) {
         try {
-            await stream.stopStream();
+            stream.stopStream();
             this.teleStreams.delete(stream.identifier);
         }
         catch (e) {
@@ -52,10 +52,10 @@ class StreamRegister {
             }
         }
     }
-    async removeAllStreams() {
+    removeAllStreams() {
         try {
             for (const [, stream] of this.teleStreams.entries()) {
-                await this.removeStream(stream);
+                this.removeStream(stream);
             }
         }
         catch (e) {

package/cjs/api/streams/telemetry/TelemetryStreamAbstract.js

@@ -103,6 +103,14 @@ class TelemetryStreamAbstract {
         const before = this.getSubscriptions();
         this.subscriptions.delete(params.uniqueId);
         const after = this.getSubscriptions();
+        // Do this before we send the telemetry request so that new subscriptions don't get this stream from the register while it is closing
+        if (!this.subscriptions.size) {
+            this.logger.info('No subscriptions remaining closing stream', params.uniqueId);
+            this.stopStream();
+            // self remove when no subscriptions are left
+            StreamRegister_1.StreamRegister.getInstance().removeStream(this);
+            this.logger.info('Stream closed');
+        }
         // assign the current values from state after change
         this.callsignsLookup = new models_1.CallsignsLookup(Object.keys(after));
         this.sources = (0, arrayUnique_1.arrayUnique)(Object.values(after).reduce((a, v) => a.concat(v), []));
@@ -116,13 +124,6 @@ class TelemetryStreamAbstract {
                 this.logger.error(`Failed to unsubscribe: ${err}`);
             }
         }
-        if (!this.subscriptions.size) {
-            this.logger.info('No subscriptions remaining closing stream', params.uniqueId);
-            this.stopStream();
-            // self remove when no subscriptions a re left
-            void StreamRegister_1.StreamRegister.getInstance().removeStream(this);
-            this.logger.info('Stream closed');
-        }
     }
     sendAcknowledgment(uid, status, noRetry) {
         return this.sendAcknowledgmentInternal(uid, status, noRetry);

package/cjs/helpers/kscript/Context.d.ts

@@ -7,19 +7,20 @@ import type { NodeType } from './nodes';
  * If the set is null, all properties are allowed.
  */
 export type PrototypeWhitelist = Map<unknown, Set<string> | null>;
-export type Scope = Map<string, unknown> | Record<string, unknown>;
+export type Scope = Record<string, unknown> | Map<string, unknown>;
 export interface ContextOptions {
     nodeBlacklist?: Set<NodeType>;
     prototypeWhitelist?: PrototypeWhitelist;
     functionCallsAllowed?: boolean;
 }
 export default class Context {
-    readonly scope: Map<string, unknown>;
-    readonly isFunctionCallAllowed: boolean;
-    private readonly options;
-    constructor(scope?: Scope, options?: ContextOptions);
-    isNodeAllowed(nodeType: AnyNode['type']): boolean;
-    newChildContext(scope: Scope): Context;
+    private readonly parent;
+    private readonly scope;
+    private readonly config;
+    static create(scope?: Scope, options?: ContextOptions): Context;
+    private static buildMap;
+    private constructor();
+    newChild(scope?: Scope): Context;
     /** Returns true if the property is allowed to be accessed on the prototype.
      *
      * - If the prototype is not in the whitelist, the property is allowed only if it is an own property.
@@ -30,5 +31,10 @@ export default class Context {
      * @param ownProperty Whether the property is owned by the object it is being accessed on.
      */
     isPrototypeAllowed(prototype: unknown, property: string, ownProperty: boolean): boolean;
-    private static buildMap;
+    isNodeAllowed(nodeType: AnyNode['type']): boolean;
+    get isFunctionCallAllowed(): boolean;
+    private getDescriptor;
+    get(key: string): unknown;
+    set(key: string, value: unknown): void;
+    declare(key: string, value: unknown, constant: boolean): void;
 }

package/cjs/helpers/kscript/Context.js

@@ -1,28 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class Context {
-    constructor(scope, options) {
+    static create(scope, options) {
+        return new Context(null, {
+            functionCallsAllowed: true,
+            nodeBlacklist: new Set(),
+            prototypeWhitelist: new Map(),
+            ...(options ?? {}),
+        }, scope);
+    }
+    static buildMap(obj) {
+        const entries = obj instanceof Map ? Array.from(obj.entries()) : Object.entries(obj);
+        return new Map(entries.map(([key, value]) => [key, { value, constant: false }]));
+    }
+    constructor(parent, config, scope) {
+        this.parent = parent;
         this.scope = scope ? Context.buildMap(scope) : new Map();
-        this.options = {
-            nodeBlacklist: options?.nodeBlacklist ?? new Set(),
-            prototypeWhitelist: options?.prototypeWhitelist ?? new Map(),
-            functionCallsAllowed: options?.functionCallsAllowed ?? true,
+        this.config = {
+            nodeBlacklist: config.nodeBlacklist ?? new Set(),
+            prototypeWhitelist: config.prototypeWhitelist ?? new Map(),
+            functionCallsAllowed: config.functionCallsAllowed ?? true,
         };
-        this.isFunctionCallAllowed = this.options.functionCallsAllowed;
-    }
-    isNodeAllowed(nodeType) {
-        return !this.options.nodeBlacklist.has(nodeType);
     }
-    newChildContext(scope) {
-        let newEntries;
-        if (scope instanceof Map) {
-            newEntries = [...scope.entries()];
-        }
-        else {
-            newEntries = Object.entries(scope);
-        }
-        const newScope = new Map([...this.scope.entries(), ...newEntries]);
-        return new Context(newScope, this.options);
+    newChild(scope) {
+        return new Context(this, this.config, scope);
     }
     /** Returns true if the property is allowed to be accessed on the prototype.
      *
@@ -34,7 +35,7 @@ class Context {
      * @param ownProperty Whether the property is owned by the object it is being accessed on.
      */
     isPrototypeAllowed(prototype, property, ownProperty) {
-        const whitelist = this.options.prototypeWhitelist.get(prototype);
+        const whitelist = this.config.prototypeWhitelist.get(prototype);
         // If the object owns the property, and it's not in the whitelist, it's allowed.
         // This prevents direct calls to non-whitelisted properties on allowed prototypes
         // e.g. Object.prototype.hasOwnProperty.call(obj, 'toString')
@@ -45,8 +46,44 @@ class Context {
             return true;
         return whitelist.has(property);
     }
-    static buildMap(obj) {
-        return obj instanceof Map ? obj : new Map(Object.entries(obj));
+    isNodeAllowed(nodeType) {
+        return !this.config.nodeBlacklist.has(nodeType);
+    }
+    get isFunctionCallAllowed() {
+        return this.config.functionCallsAllowed;
+    }
+    getDescriptor(key, searchParents = true) {
+        if (this.scope.has(key)) {
+            return this.scope.get(key);
+        }
+        if (searchParents && this.parent) {
+            return this.parent.getDescriptor(key);
+        }
+        return undefined;
+    }
+    get(key) {
+        const descriptor = this.getDescriptor(key);
+        if (descriptor) {
+            return descriptor.value;
+        }
+        return undefined;
+    }
+    set(key, value) {
+        const descriptor = this.getDescriptor(key);
+        if (!descriptor) {
+            throw new Error(`no variable with name ${key}`);
+        }
+        if (descriptor.constant) {
+            throw new Error(`cannot reassign to constant variable ${key}`);
+        }
+        descriptor.value = value;
+    }
+    declare(key, value, constant) {
+        const descriptor = this.getDescriptor(key, false);
+        if (descriptor) {
+            throw new Error(`variable ${key} already declared`);
+        }
+        this.scope.set(key, { value, constant });
     }
 }
 exports.default = Context;

package/cjs/helpers/kscript/kscript.js

@@ -24,7 +24,7 @@ const parse = (code) => {
 };
 const compile = (code, scope, options) => {
     const program = parse(code);
-    const context = new Context_1.default(scope ?? exports.SAFE_GLOBALS, {
+    const context = Context_1.default.create(scope ?? exports.SAFE_GLOBALS, {
         prototypeWhitelist: exports.SAFE_PROTOTYPES,
         ...options,
     });

package/cjs/helpers/kscript/nodes/Identifier.js

@@ -15,7 +15,7 @@ class IdentifierNode extends Node_1.default {
     }
     validate() { }
     run() {
-        return this.scope.get(this.node.name);
+        return this.context.get(this.node.name);
     }
 }
 exports.default = IdentifierNode;

package/cjs/helpers/kscript/nodes/Node.d.ts

@@ -3,7 +3,6 @@ import type Context from '../Context';
 export default abstract class Node<T extends AnyNode = AnyNode> {
     protected context: Context;
     protected node: T;
-    protected scope: Context['scope'];
     protected constructor(node: AnyNode, context: Context, expectedType: T['type'] | T['type'][]);
     /** Runs the node. */
     abstract run(): unknown;

package/cjs/helpers/kscript/nodes/Node.js

@@ -9,7 +9,6 @@ class Node {
             throw new Error(`Expected node type to be ${expectedTypes.join(' or ')}, but got ${node.type}`);
         }
         this.node = node;
-        this.scope = context.scope;
     }
 }
 exports.default = Node;

package/cjs/helpers/kscript/nodes/Program.js

@@ -14,17 +14,20 @@ class ProgramNode extends Node_1.default {
         super(node, scope, 'Program');
     }
     validate(validateChildren = false) {
-        if (this.node.body.length !== 1) {
-            throw new Error('Only a single statement is supported in the sandbox');
-        }
         if (!validateChildren) {
             return;
         }
-        (0, utils_1.construct)(this.node.body[0], this.context).validate(true);
+        for (const child of this.node.body) {
+            (0, utils_1.construct)(child, this.context).validate(true);
+        }
     }
     run() {
         this.validate();
-        return (0, utils_1.construct)(this.node.body[0], this.context).run();
+        let result;
+        for (const child of this.node.body) {
+            result = (0, utils_1.construct)(child, this.context).run();
+        }
+        return result;
     }
 }
 exports.default = ProgramNode;

package/cjs/helpers/kscript/nodes/VariableDeclaration.d.ts

@@ -0,0 +1,8 @@
+import { AnyNode, VariableDeclaration } from 'acorn';
+import Context from '../Context';
+import Node from './Node';
+export default class VariableDeclarationNode extends Node<VariableDeclaration> {
+    constructor(node: AnyNode, context: Context);
+    validate(validateChildren?: boolean): void;
+    run(): void;
+}

package/cjs/helpers/kscript/nodes/VariableDeclaration.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Node_1 = __importDefault(require("./Node"));
+const utils_1 = require("../utils");
+class VariableDeclarationNode extends Node_1.default {
+    constructor(node, context) {
+        super(node, context, 'VariableDeclaration');
+    }
+    validate(validateChildren = false) {
+        if (this.node.kind === 'var') {
+            throw new Error('var is not supported. use let or const instead');
+        }
+        for (const declaration of this.node.declarations) {
+            if (declaration.id.type !== 'Identifier') {
+                throw new Error('variable name must be an identifier');
+            }
+        }
+        if (!validateChildren) {
+            return;
+        }
+        for (const declaration of this.node.declarations) {
+            (0, utils_1.construct)(declaration.id, this.context).validate(true);
+            if (declaration.init) {
+                (0, utils_1.construct)(declaration.init, this.context).validate(true);
+            }
+        }
+    }
+    run() {
+        this.validate();
+        for (const declaration of this.node.declarations) {
+            const id = declaration.id.name;
+            let init;
+            if (declaration.init) {
+                init = (0, utils_1.construct)(declaration.init, this.context).run();
+            }
+            this.context.declare(id, init, this.node.kind === 'const');
+        }
+    }
+}
+exports.default = VariableDeclarationNode;

package/cjs/helpers/kscript/nodes/expressions/ArrowFunctionExpression.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Node_1 = __importDefault(require("../Node"));
+const ReturnStatement_1 = require("../statements/ReturnStatement");
 const utils_1 = require("../../utils");
 /** Represents an arrow function expression.
  *
@@ -22,8 +23,6 @@ class ArrowFunctionExpressionNode extends Node_1.default {
     validate(validateChildren = false) {
         if (!this.context.isFunctionCallAllowed)
             throw new Error('functions are not allowed');
-        if (!this.node.expression)
-            throw new Error('functions must be an expression');
         if (this.node.async)
             throw new Error('async functions are not supported');
         if (!validateChildren) {
@@ -39,8 +38,16 @@ class ArrowFunctionExpressionNode extends Node_1.default {
                 const index = this.params.indexOf(param);
                 scope.set(param.name, args?.[index]);
             }
-            const newContext = this.context.newChildContext(scope);
-            return (0, utils_1.construct)(this.node.body, newContext).run();
+            const newContext = this.context.newChild(scope);
+            try {
+                return (0, utils_1.construct)(this.node.body, newContext).run();
+            }
+            catch (e) {
+                if (e instanceof ReturnStatement_1.ReturnStatementError) {
+                    return e.value;
+                }
+                throw e;
+            }
         };
     }
 }

package/cjs/helpers/kscript/nodes/expressions/AssignmentExpression.d.ts

@@ -0,0 +1,8 @@
+import { AnyNode, AssignmentExpression } from 'acorn';
+import Context from '../../Context';
+import Node from '../Node';
+export default class AssignmentExpressionNode extends Node<AssignmentExpression> {
+    constructor(node: AnyNode, context: Context);
+    validate(validateChildren?: boolean): void;
+    run(): unknown;
+}

package/cjs/helpers/kscript/nodes/expressions/AssignmentExpression.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Node_1 = __importDefault(require("../Node"));
+const utils_1 = require("../../utils");
+class AssignmentExpressionNode extends Node_1.default {
+    constructor(node, context) {
+        super(node, context, 'AssignmentExpression');
+    }
+    validate(validateChildren = false) {
+        if (this.node.operator !== '=') {
+            throw new Error('Only = operator is supported');
+        }
+        if (this.node.left.type !== 'Identifier') {
+            throw new Error('Left side of assignment must be an identifier');
+        }
+        if (!validateChildren) {
+            return;
+        }
+        (0, utils_1.construct)(this.node.left, this.context).validate(true);
+        (0, utils_1.construct)(this.node.right, this.context).validate(true);
+    }
+    run() {
+        this.validate();
+        const identifier = this.node.left.name;
+        const right = (0, utils_1.construct)(this.node.right, this.context).run();
+        this.context.set(identifier, right);
+        return right;
+    }
+}
+exports.default = AssignmentExpressionNode;

package/cjs/helpers/kscript/nodes/expressions/BinaryExpression.d.ts

@@ -9,12 +9,14 @@ export default class BinaryExpressionNode extends Node<BinaryExpression> {
     private static readonly EQUALITY_OPERATORS;
     private static readonly COMPARISON_OPERATORS;
     private static readonly ARITHMETIC_OPERATORS;
+    private static readonly BITWISE_OPERATORS;
     private static readonly IN_OPERATOR;
     private static readonly SUPPORTED_OPERATORS;
     constructor(node: AnyNode, context: Context);
     validate(validateChildren?: boolean): void;
     run(): unknown;
     private operate;
+    private bitwise;
     private arithmetic;
     private comparison;
     private equality;

package/cjs/helpers/kscript/nodes/expressions/BinaryExpression.js

@@ -38,11 +38,25 @@ class BinaryExpressionNode extends Node_1.default {
         if (BinaryExpressionNode.ARITHMETIC_OPERATORS.has(this.node.operator)) {
             return this.arithmetic(this.node.operator, left, right);
         }
+        if (BinaryExpressionNode.BITWISE_OPERATORS.has(this.node.operator)) {
+            return this.bitwise(this.node.operator, left, right);
+        }
         if (this.node.operator === BinaryExpressionNode.IN_OPERATOR) {
             return this.checkIn(left, right);
         }
         throw new Error(`Unsupported operator: ${this.node.operator}`);
     }
+    bitwise(operator, left, right) {
+        if (typeof left !== 'number' || typeof right !== 'number') {
+            throw new Error('Bitwise operators are only supported for numbers');
+        }
+        switch (operator) {
+            case '<<':
+                return left << right;
+            case '>>':
+                return left >> right;
+        }
+    }
     arithmetic(operator, left, right) {
         if (operator === '+' && (typeof left === 'string' || typeof right === 'string')) {
             return `${left}${right}`;
@@ -111,11 +125,13 @@ BinaryExpressionNode.ARITHMETIC_OPERATORS = new Set([
     '%',
     '**',
 ]);
+BinaryExpressionNode.BITWISE_OPERATORS = new Set(['<<', '>>']);
 BinaryExpressionNode.IN_OPERATOR = 'in';
 BinaryExpressionNode.SUPPORTED_OPERATORS = new Set([
     ...BinaryExpressionNode.EQUALITY_OPERATORS,
     ...BinaryExpressionNode.COMPARISON_OPERATORS,
     ...BinaryExpressionNode.ARITHMETIC_OPERATORS,
+    ...BinaryExpressionNode.BITWISE_OPERATORS,
     BinaryExpressionNode.IN_OPERATOR,
 ]);
 exports.default = BinaryExpressionNode;

package/cjs/helpers/kscript/nodes/expressions/NewExpression.d.ts

@@ -0,0 +1,9 @@
+import { AnyNode, NewExpression } from 'acorn';
+import Context from '../../Context';
+import Node from '../Node';
+export default class NewExpressionNode extends Node<NewExpression> {
+    constructor(node: AnyNode, context: Context);
+    validate(validateChildren?: boolean): void;
+    run(): unknown;
+    private spreadArgs;
+}

package/cjs/helpers/kscript/nodes/expressions/NewExpression.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Node_1 = __importDefault(require("../Node"));
+const utils_1 = require("../../utils");
+class NewExpressionNode extends Node_1.default {
+    constructor(node, context) {
+        super(node, context, 'NewExpression');
+    }
+    validate(validateChildren = false) {
+        if (!this.context.isFunctionCallAllowed)
+            throw new Error('Constructors are not allowed');
+        if (!validateChildren) {
+            return;
+        }
+        (0, utils_1.construct)(this.node.callee, this.context).validate(true);
+        for (const arg of this.node.arguments) {
+            (0, utils_1.construct)(arg, this.context).validate(true);
+        }
+    }
+    run() {
+        this.validate();
+        const callee = (0, utils_1.construct)(this.node.callee, this.context).run();
+        if (typeof callee !== 'function') {
+            throw new Error('callee is not a function');
+        }
+        const args = this.spreadArgs(this.node.arguments);
+        return new (Function.prototype.bind.apply(callee, [null, ...args]))();
+    }
+    spreadArgs(args) {
+        return args.reduce((acc, arg) => {
+            if (arg.type === 'SpreadElement') {
+                acc.push(...(0, utils_1.construct)(arg.argument, this.context).run());
+            }
+            else {
+                acc.push((0, utils_1.construct)(arg, this.context).run());
+            }
+            return acc;
+        }, []);
+    }
+}
+exports.default = NewExpressionNode;

package/cjs/helpers/kscript/nodes/expressions/index.d.ts

@@ -1,4 +1,3 @@
-export { default as ExpressionStatement } from './ExpressionStatement';
 export { default as ArrayExpression } from './ArrayExpression';
 export { default as ObjectExpression } from './ObjectExpression';
 export { default as BinaryExpression } from './BinaryExpression';
@@ -9,3 +8,5 @@ export { default as CallExpression } from './CallExpression';
 export { default as ArrowFunctionExpression } from './ArrowFunctionExpression';
 export { default as MemberExpression } from './MemberExpression';
 export { default as ChainExpression } from './ChainExpression';
+export { default as NewExpression } from './NewExpression';
+export { default as AssignmentExpression } from './AssignmentExpression';

package/cjs/helpers/kscript/nodes/expressions/index.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChainExpression = exports.MemberExpression = exports.ArrowFunctionExpression = exports.CallExpression = exports.ConditionalExpression = exports.LogicalExpression = exports.UnaryExpression = exports.BinaryExpression = exports.ObjectExpression = exports.ArrayExpression = exports.ExpressionStatement = void 0;
-var ExpressionStatement_1 = require("./ExpressionStatement");
-Object.defineProperty(exports, "ExpressionStatement", { enumerable: true, get: function () { return __importDefault(ExpressionStatement_1).default; } });
+exports.AssignmentExpression = exports.NewExpression = exports.ChainExpression = exports.MemberExpression = exports.ArrowFunctionExpression = exports.CallExpression = exports.ConditionalExpression = exports.LogicalExpression = exports.UnaryExpression = exports.BinaryExpression = exports.ObjectExpression = exports.ArrayExpression = void 0;
 var ArrayExpression_1 = require("./ArrayExpression");
 Object.defineProperty(exports, "ArrayExpression", { enumerable: true, get: function () { return __importDefault(ArrayExpression_1).default; } });
 var ObjectExpression_1 = require("./ObjectExpression");
@@ -26,3 +24,7 @@ var MemberExpression_1 = require("./MemberExpression");
 Object.defineProperty(exports, "MemberExpression", { enumerable: true, get: function () { return __importDefault(MemberExpression_1).default; } });
 var ChainExpression_1 = require("./ChainExpression");
 Object.defineProperty(exports, "ChainExpression", { enumerable: true, get: function () { return __importDefault(ChainExpression_1).default; } });
+var NewExpression_1 = require("./NewExpression");
+Object.defineProperty(exports, "NewExpression", { enumerable: true, get: function () { return __importDefault(NewExpression_1).default; } });
+var AssignmentExpression_1 = require("./AssignmentExpression");
+Object.defineProperty(exports, "AssignmentExpression", { enumerable: true, get: function () { return __importDefault(AssignmentExpression_1).default; } });

package/cjs/helpers/kscript/nodes/nodeTypes.d.ts

@@ -1,4 +1,5 @@
-import { ArrayExpression, ArrowFunctionExpression, BinaryExpression, CallExpression, ChainExpression, ConditionalExpression, ExpressionStatement, LogicalExpression, MemberExpression, ObjectExpression, UnaryExpression } from './expressions';
+import { ArrayExpression, ArrowFunctionExpression, AssignmentExpression, BinaryExpression, CallExpression, ChainExpression, ConditionalExpression, LogicalExpression, MemberExpression, NewExpression, ObjectExpression, UnaryExpression } from './expressions';
+import { BlockStatement, ExpressionStatement, ReturnStatement, SwitchStatement } from './statements';
 import { AnyNode } from 'acorn';
 import type Context from '../Context';
 import Identifier from './Identifier';
@@ -6,6 +7,7 @@ import Literal from './Literal';
 import Node from './Node';
 import Program from './Program';
 import TemplateLiteral from './TemplateLiteral';
+import VariableDeclaration from './VariableDeclaration';
 type NodeConstructor = {
     new (node: AnyNode, scope: Context): Node<AnyNode>;
 };
@@ -27,6 +29,12 @@ declare const nodes: {
     readonly CallExpression: typeof CallExpression;
     readonly MemberExpression: typeof MemberExpression;
     readonly ChainExpression: typeof ChainExpression;
+    readonly NewExpression: typeof NewExpression;
+    readonly BlockStatement: typeof BlockStatement;
+    readonly ReturnStatement: typeof ReturnStatement;
+    readonly VariableDeclaration: typeof VariableDeclaration;
+    readonly AssignmentExpression: typeof AssignmentExpression;
+    readonly SwitchStatement: typeof SwitchStatement;
 };
 export type NodeType = keyof typeof nodes;
 declare const _default: NodeMap;

package/cjs/helpers/kscript/nodes/nodeTypes.js

@@ -4,14 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const expressions_1 = require("./expressions");
+const statements_1 = require("./statements");
 const Identifier_1 = __importDefault(require("./Identifier"));
 const Literal_1 = __importDefault(require("./Literal"));
 const Program_1 = __importDefault(require("./Program"));
 const TemplateLiteral_1 = __importDefault(require("./TemplateLiteral"));
+const VariableDeclaration_1 = __importDefault(require("./VariableDeclaration"));
 const nodes = {
     Program: Program_1.default,
     Literal: Literal_1.default,
-    ExpressionStatement: expressions_1.ExpressionStatement,
+    ExpressionStatement: statements_1.ExpressionStatement,
     ArrayExpression: expressions_1.ArrayExpression,
     ObjectExpression: expressions_1.ObjectExpression,
     Identifier: Identifier_1.default,
@@ -25,5 +27,11 @@ const nodes = {
     CallExpression: expressions_1.CallExpression,
     MemberExpression: expressions_1.MemberExpression,
     ChainExpression: expressions_1.ChainExpression,
+    NewExpression: expressions_1.NewExpression,
+    BlockStatement: statements_1.BlockStatement,
+    ReturnStatement: statements_1.ReturnStatement,
+    VariableDeclaration: VariableDeclaration_1.default,
+    AssignmentExpression: expressions_1.AssignmentExpression,
+    SwitchStatement: statements_1.SwitchStatement,
 };
 exports.default = new Map(Object.entries(nodes));

package/cjs/helpers/kscript/nodes/statements/BlockStatement.d.ts

@@ -0,0 +1,8 @@
+import { AnyNode, BlockStatement } from 'acorn';
+import Context from '../../Context';
+import Node from '../Node';
+export default class BlockStatementNode extends Node<BlockStatement> {
+    constructor(node: AnyNode, context: Context);
+    validate(validateChildren?: boolean): void;
+    run(): unknown;
+}