circuitscript 0.0.38 → 0.1.0

package/dist/cjs/visitor.js

@@ -157,10 +157,32 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.setResult(ctx, createdComponent);
         };
         this.visitCreate_graphic_expr = (ctx) => {
-            const graphicsExpressionsCtx = ctx.graphic_expressions_block();
-            this.visit(graphicsExpressionsCtx);
-            const commands = this.getResult(graphicsExpressionsCtx);
-            const drawing = new draw_symbols_js_1.SymbolDrawingCommands(commands);
+            const ctxId = ctx.ID();
+            const paramIds = [];
+            if (ctxId !== null) {
+                const varName = ctxId.getText();
+                paramIds.push(varName);
+                this.getExecutor().scope.variables.set(varName, {});
+            }
+            const executor = this.getExecutor();
+            const stack = [...this.executionStack];
+            const drawing = new draw_symbols_js_1.SymbolDrawingCommands(variables => {
+                if (variables && paramIds.length > 0) {
+                    const obj = {};
+                    variables.forEach((value, key) => {
+                        obj[key] = value;
+                    });
+                    executor.scope.variables.set(paramIds[0], obj);
+                }
+                const currentStack = this.executionStack.splice(0);
+                this.executionStack.push(...stack);
+                const graphicsExpressionsCtx = ctx.graphic_expressions_block();
+                this.visit(graphicsExpressionsCtx);
+                const commands = this.getResult(graphicsExpressionsCtx);
+                this.executionStack.splice(0);
+                this.executionStack.push(...currentStack);
+                return commands;
+            });
             drawing.source = ctx.getText();
             this.setResult(ctx, drawing);
         };
@@ -182,7 +204,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         }
                         return accum;
                     }, []);
-                    accum.push([commandName, positionParams, keywordParams]);
+                    accum.push([commandName, positionParams, keywordParams, item]);
                 }
                 return accum;
             }, []);
@@ -302,7 +324,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 const [firstBlock] = ctxPropertyBlock;
                 this.visit(firstBlock);
                 const [keyName, expressionsBlock] = this.getResult(firstBlock);
-                if (keyName === 'contains') {
+                if (keyName === globals_js_1.ModuleContainsKeyword) {
                     createdComponent.moduleContainsExpressions = expressionsBlock;
                     this.expandModuleContains(createdComponent, this.getExecutor().netNamespace);
                 }
@@ -323,7 +345,8 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             this.visit(ctxPropertyValueExpr);
             const keyName = this.getResult(ctxPropertyKeyExpr);
             const value = this.getResult(ctxPropertyValueExpr);
-            if (value instanceof types_js_1.UndeclaredReference) {
+            if (value instanceof types_js_1.UndeclaredReference && (value.reference.parentValue === undefined
+                && value.reference.value === undefined)) {
                 throw value.throwMessage();
             }
             const map = new Map();
@@ -379,30 +402,34 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         };
         this.visitData_expr_with_assignment = (ctx) => {
             let component = null;
+            let componentCtx = null;
             const ctxDataExpr = ctx.data_expr();
             const ctxAssignmentExpr = ctx.assignment_expr();
             if (ctxDataExpr) {
                 this.visit(ctxDataExpr);
                 component = this.getResult(ctxDataExpr);
+                componentCtx = ctxDataExpr;
                 if (component === null || component === undefined) {
-                    throw "Could not find component: " + ctxDataExpr.getText();
+                    this.throwWithContext(ctxDataExpr, "Could not find component: " + ctxDataExpr.getText());
                 }
             }
             else if (ctxAssignmentExpr) {
                 this.visit(ctxAssignmentExpr);
                 component = this.getResult(ctxAssignmentExpr);
+                componentCtx = ctxAssignmentExpr;
             }
             if (component instanceof ClassComponent_js_1.ClassComponent
                 && component.copyProp) {
                 component = this.getExecutor().copyComponent(component);
             }
-            if (component instanceof types_js_1.DeclaredReference
-                && component.found
-                && component.trailers
-                && component.trailers.length > 0
-                && component.trailers[0] === 'contains') {
-                component = component.value;
-                this.placeModuleContains(component);
+            if (component instanceof types_js_1.UndeclaredReference) {
+                const { reference: { trailers = [], parentValue = null } } = component;
+                if (parentValue instanceof ClassComponent_js_1.ClassComponent
+                    && trailers.length > 0
+                    && trailers[0] === globals_js_1.ModuleContainsKeyword) {
+                    component = parentValue;
+                    this.placeModuleContains(component);
+                }
             }
             if (component && component instanceof ClassComponent_js_1.ClassComponent) {
                 const modifiers = ctx.component_modifier_expr();
@@ -436,19 +463,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         shouldIgnoreWireOrientation = true;
                     }
                     else if (modifierText === 'anchor') {
-                        if (component.displayProp
-                            && component.displayProp instanceof draw_symbols_js_1.SymbolDrawingCommands) {
-                            const commands = (component.displayProp)
-                                .getCommands();
-                            commands.forEach(command => {
-                                const positionParams = command[1];
-                                const keywordParams = command[2];
-                                if (command[0] === draw_symbols_js_1.PlaceHolderCommands.label
-                                    && positionParams[0] === 'value') {
-                                    keywordParams.set('anchor', result);
-                                }
-                            });
-                        }
+                        component.setParam('anchor', result);
                     }
                     if (shouldIgnoreWireOrientation) {
                         component.useWireOrientationAngle = false;
@@ -467,7 +482,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 }
                 else {
                     const undeclaredRef = component;
-                    throw 'Invalid component: ' + undeclaredRef.reference.name;
+                    this.throwWithContext(componentCtx, 'Invalid component: ' + undeclaredRef.reference.name);
                 }
             }
             this.setResult(ctx, [component, pinValue]);
@@ -781,7 +796,11 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             const ctxDataExpr = ctx.data_expr();
             this.visit(ctxDataExpr);
             const result = this.getResult(ctxDataExpr);
-            if (result) {
+            let resultValue = result;
+            if (result instanceof types_js_1.UndeclaredReference) {
+                resultValue = false;
+            }
+            if (resultValue) {
                 this.visit(ctx.expressions_block());
             }
             else {
@@ -944,10 +963,22 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         this.visit(data_expr);
         const value = this.getResult(data_expr);
         if (value instanceof types_js_1.UndeclaredReference) {
-            throw value.throwMessage();
+            this.throwWithContext(data_expr, value.throwMessage());
+        }
+        else if (value instanceof types_js_1.DeclaredReference) {
+            return this.resolveDataValue(value);
         }
         return value;
     }
+    resolveDataValue(reference) {
+        const { value } = reference;
+        if (value instanceof ParamDefinition_js_1.NumericValue) {
+            return value.toDisplayString();
+        }
+        else {
+            return value;
+        }
+    }
     parseCreateComponentPins(pinData) {
         const pins = [];
         if (typeof pinData === 'number') {
@@ -1140,10 +1171,14 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
         let frameComponent = null;
         if (document && document[Frame_js_1.FrameParamKeys.SheetType]) {
             frameComponent = document[Frame_js_1.FrameParamKeys.SheetType];
-            baseScope.frames.forEach(item => {
-                if (item.frameType === globals_js_1.FrameType.Sheet) {
-                    item.parameters.set(Frame_js_1.FrameParamKeys.SheetType, frameComponent);
-                }
+            const sheets = baseScope.frames.filter(item => {
+                return item.frameType === globals_js_1.FrameType.Sheet;
+            });
+            const totalSheets = sheets.length;
+            sheets.forEach((item, index) => {
+                item.parameters.set(Frame_js_1.FrameParamKeys.SheetType, frameComponent);
+                item.parameters.set(Frame_js_1.FrameParamKeys.SheetNumber, index + 1);
+                item.parameters.set(Frame_js_1.FrameParamKeys.SheetTotal, totalSheets);
             });
         }
         return {

package/dist/esm/BaseVisitor.mjs

@@ -10,6 +10,7 @@ import { PinTypes } from "./objects/PinTypes";
 import { Direction, UndeclaredReference } from "./objects/types";
 import { GlobalDocumentName, ReferenceTypes } from './globals';
 import { linkBuiltInMethods } from './builtinMethods';
+import { throwWithContext } from './utils';
 export class BaseVisitor extends CircuitScriptVisitor {
     indentLevel = 0;
     startingContext;
@@ -108,18 +109,21 @@ export class BaseVisitor extends CircuitScriptVisitor {
                 tmpComponent.instanceName = reference.name;
                 instances.delete(oldName);
                 instances.set(reference.name, tmpComponent);
-                this.getExecutor().log(`assigned '${reference.name}' to ClassComponent`);
+                this.log2(`assigned '${reference.name}' to ClassComponent`);
             }
             else {
                 this.getExecutor().scope.variables.set(reference.name, value);
+                this.log2(`assigned variable ${reference.name} to ${value}`);
             }
         }
         else {
-            if (reference.value instanceof ClassComponent) {
-                this.setInstanceParam(reference.value, trailers, value);
+            if (reference.parentValue instanceof ClassComponent) {
+                this.setInstanceParam(reference.parentValue, trailers, value);
+                this.log2(`assigned component param ${reference.parentValue} trailers: ${trailers} value: ${value}`);
             }
-            else if (reference.value instanceof Object) {
-                reference.value[trailers.join('.')] = value;
+            else if (reference.parentValue instanceof Object) {
+                reference.parentValue[trailers.join('.')] = value;
+                this.log2(`assigned object ${reference.parentValue} trailers: ${trailers} value: ${value}`);
             }
         }
         this.setResult(ctx, value);
@@ -130,7 +134,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         this.visit(ctxDataExpr);
         const value = this.getResult(ctxDataExpr);
         if (!reference.found) {
-            throw 'Undefined reference: ' + reference.name;
+            this.throwWithContext(ctx, 'Undefined reference: ' + reference.name);
         }
         const trailers = reference.trailers ?? [];
         let currentValue = null;
@@ -146,7 +150,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
             }
         }
         if (currentValue === null) {
-            throw 'Operator assignment failed: could not get value';
+            this.throwWithContext(ctx, 'Operator assignment failed: could not get value');
         }
         let newValue = 0;
         if (ctx.AdditionAssign()) {
@@ -165,7 +169,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
             newValue = currentValue % value;
         }
         else {
-            throw 'Operator assignment failed: could not perform operator';
+            this.throwWithContext(ctx, 'Operator assignment failed: could not perform operator');
         }
         if (trailers.length === 0) {
             this.getExecutor().scope.variables.set(reference.name, newValue);
@@ -183,12 +187,15 @@ export class BaseVisitor extends CircuitScriptVisitor {
     getReference(ctx) {
         const atomStr = ctx.getText();
         if (atomStr.indexOf('(') !== -1 || atomStr.indexOf(')') !== -1) {
-            throw "Invalid assignment expression!";
+            this.throwWithContext(ctx, "Invalid assignment expression!");
         }
         this.visit(ctx);
         const reference = this.getResult(ctx);
-        if (!reference.found && reference.trailers && reference.trailers.length > 0) {
-            throw 'Undefined reference: ' + reference.name + '.' + reference.trailers.join('.');
+        const { trailers = [] } = reference;
+        const undefinedParentWithTrailers = trailers.length > 0
+            && reference.parentValue === undefined;
+        if (undefinedParentWithTrailers) {
+            this.throwWithContext(ctx, 'Undefined reference: ' + reference.name + '.' + trailers.join('.'));
         }
         return reference;
     }
@@ -197,6 +204,14 @@ export class BaseVisitor extends CircuitScriptVisitor {
         const firstId = ctx.ID(0);
         const atomId = firstId.getText();
         let currentReference;
+        const idTrailers = [];
+        if (ctx.ID().length > 1) {
+            const idLength = ctx.ID().length;
+            for (let i = 1; i < idLength; i++) {
+                const tmpCtx = ctx.ID(i);
+                idTrailers.push(tmpCtx.getText());
+            }
+        }
         if (this.pinTypesList.indexOf(atomId) !== -1) {
             currentReference = {
                 found: true,
@@ -205,26 +220,17 @@ export class BaseVisitor extends CircuitScriptVisitor {
             };
         }
         else {
-            currentReference = executor.resolveVariable(this.executionStack, atomId);
-        }
-        const idTrailers = [];
-        if (ctx.ID().length > 1) {
-            const idLength = ctx.ID().length;
-            for (let i = 1; i < idLength; i++) {
-                const tmpCtx = ctx.ID(i);
-                idTrailers.push(tmpCtx.getText());
-            }
+            currentReference = executor.resolveVariable(this.executionStack, atomId, idTrailers);
         }
-        currentReference.trailers = idTrailers;
-        if (currentReference.found && currentReference.type === 'instance') {
+        if (currentReference.found && currentReference.type === 'instance' && idTrailers.length === 0) {
             const tmpComponent = currentReference.value;
             for (const [pinId, net] of tmpComponent.pinNets) {
                 executor.scope.setNet(tmpComponent, pinId, net);
             }
         }
-        this.getExecutor().log('atomId:', atomId, currentReference);
+        this.log2(`atomId: ${atomId} ${currentReference}`);
         if (ctx.parent instanceof ExpressionContext && !currentReference.found) {
-            throw "Unknown symbol: " + atomId;
+            this.throwWithContext(ctx, "Unknown symbol: " + atomId);
         }
         this.setResult(ctx, currentReference);
     };
@@ -246,7 +252,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         let currentReference = executor.resolveVariable(this.executionStack, atomId);
         if (ctx.trailer_expr().length > 0) {
             if (!currentReference.found) {
-                throw "Unknown function name: " + atomId;
+                this.throwWithContext(ctx, "Unknown function name: " + atomId);
             }
             currentReference.trailers = [];
             ctx.trailer_expr().forEach(item => {
@@ -259,13 +265,18 @@ export class BaseVisitor extends CircuitScriptVisitor {
                         parameters = this.getResult(ctxParameters);
                     }
                     const useNetNamespace = this.getNetNamespace(executor.netNamespace, passedNetNamespace);
-                    const [, functionResult] = executor.callFunction(currentReference.name, parameters, this.executionStack, useNetNamespace);
-                    currentReference = {
-                        found: true,
-                        value: functionResult,
-                        type: (functionResult instanceof ClassComponent) ?
-                            'instance' : 'value',
-                    };
+                    try {
+                        const [, functionResult] = executor.callFunction(currentReference.name, parameters, this.executionStack, useNetNamespace);
+                        currentReference = {
+                            found: true,
+                            value: functionResult,
+                            type: (functionResult instanceof ClassComponent) ?
+                                'instance' : 'value',
+                        };
+                    }
+                    catch (err) {
+                        this.throwWithContext(ctx, err);
+                    }
                 }
                 else {
                     currentReference.trailers.push(itemValue);
@@ -297,7 +308,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         }
         else {
             if (sign === -1) {
-                throw "Invalid value!";
+                this.throwWithContext(ctx, "Invalid value");
             }
         }
         if (ctxBooleanValue) {
@@ -384,7 +395,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
     visitImport_expr = (ctx) => {
         const ID = ctx.ID().toString();
         this.log('import', ID);
-        this.handleImportFile(ID, true);
+        this.handleImportFile(ID, true, ctx);
         this.log('done import', ID);
     };
     visitFunction_return_expr = (ctx) => {
@@ -431,7 +442,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
     getResult(ctx) {
         return this.resultData.get(ctx);
     }
-    handleImportFile(name, throwErrors = true) {
+    handleImportFile(name, throwErrors = true, ctx = null) {
         let hasError = false;
         let hasParseError = false;
         let pathExists = false;
@@ -466,14 +477,18 @@ export class BaseVisitor extends CircuitScriptVisitor {
         catch (err) {
             this.log('Failed to import file: ', err.message);
         }
+        let errorMessage = null;
         if (throwErrors && (hasError || hasParseError || !pathExists)) {
             if (!pathExists) {
-                throw `File does not exist: ${name}`;
+                errorMessage = `File does not exist: ${name}`;
             }
             else {
-                throw `Failed to import: ${name}`;
+                errorMessage = `Failed to import: ${name}`;
             }
         }
+        if (errorMessage !== null && ctx) {
+            this.throwWithContext(ctx, errorMessage);
+        }
         return {
             hasError,
             hasParseError,
@@ -561,7 +576,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
     setInstanceParam(object, trailers, value) {
         const paramName = trailers[0];
         object.setParam(paramName, value);
-        this.getExecutor().log(`set instance ${object.instanceName} param ${paramName} to ${value}`);
+        this.log2(`set instance ${object.instanceName} param ${paramName} to ${value}`);
     }
     getInstanceParam(object, trailers) {
         const paramName = trailers[0];
@@ -582,4 +597,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
     prepareStringValue(value) {
         return value.slice(1, value.length - 1);
     }
+    throwWithContext(context, message) {
+        throwWithContext(context, message);
+    }
 }

package/dist/esm/SymbolValidatorVisitor.mjs

@@ -37,7 +37,7 @@ export class SymbolValidatorVisitor extends BaseVisitor {
     }
     visitImport_expr = (ctx) => {
         const ID = ctx.ID().toString();
-        const { pathExists } = this.handleImportFile(ID, false);
+        const { pathExists } = this.handleImportFile(ID, false, ctx);
         if (!pathExists) {
             this.symbolTable.addUndefined(this.getExecutor(), ID, ctx.ID());
         }