circuitscript 0.5.4 → 0.5.6

package/dist/cjs/render/render.js

@@ -268,25 +268,25 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
     frameObjects.forEach(item => {
         const { bounds, borderWidth } = item;
         const { width, height } = (0, utils_js_1.getBoundsSize)(bounds);
-        let strokeColor = '#111';
+        const useWidth = (0, NumericValue_js_1.roundValue)(width).toNumber();
+        const useHeight = (0, NumericValue_js_1.roundValue)(height).toNumber();
+        const useBorderWidth = (0, NumericValue_js_1.roundValue)(borderWidth).toNumber();
+        let strokeColor = item.borderColor ?? '#111';
         if (item.frame.frameType === globals_js_1.FrameType.Sheet) {
             drawSheetFrameBorder(frameGroup, item);
         }
         else {
-            if (borderWidth.toNumber() > 0) {
-                if (item.renderType === layout_js_1.RenderFrameType.Container) {
-                    strokeColor = '#111';
-                }
-                else if (item.renderType === layout_js_1.RenderFrameType.Elements) {
+            if (useBorderWidth > 0) {
+                if (item.renderType === layout_js_1.RenderFrameType.Elements) {
                     strokeColor = '#aaa';
                     if (!globals_js_1.RenderFlags.ShowElementFrames) {
                         return;
                     }
                 }
-                const tmpRect = frameGroup.rect(width, height)
+                const tmpRect = frameGroup.rect(useWidth, useHeight)
                     .fill('none')
                     .stroke({
-                    width: (0, helpers_js_1.milsToMM)(borderWidth).toNumber(),
+                    width: (0, helpers_js_1.milsToMM)(useBorderWidth).toNumber(),
                     color: strokeColor
                 });
                 tmpRect.translate(item.x.toNumber(), item.y.toNumber());
@@ -308,17 +308,20 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
 function drawGrid(group, gridProperties, logger) {
     const { gridBounds: canvasSize, extendGrid, style: gridStyle = "dots", color: gridColor = "#000", backgroundColor = "", } = gridProperties;
     const gridSize = globals_js_1.defaultGridSizeUnits;
-    const { xmin, ymin, xmax, ymax } = canvasSize;
     const extraValue = extendGrid ? 1 : 0;
-    const gridStartX = ((0, NumericValue_js_1.numeric)(Math.floor(xmin / gridSize)).sub(extraValue)).mul(gridSize);
-    const gridStartY = ((0, NumericValue_js_1.numeric)(Math.floor(ymin / gridSize)).sub(extraValue)).mul(gridSize);
+    const xmin = (0, NumericValue_js_1.roundValue)(canvasSize.xmin);
+    const ymin = (0, NumericValue_js_1.roundValue)(canvasSize.ymin);
+    const xmax = (0, NumericValue_js_1.roundValue)(canvasSize.xmax);
+    const ymax = (0, NumericValue_js_1.roundValue)(canvasSize.ymax);
+    const gridStartX = xmin.div(gridSize).floor().sub(extraValue).mul(gridSize);
+    const gridStartY = ymin.div(gridSize).floor().sub(extraValue).mul(gridSize);
     const gridEndX = extendGrid
-        ? ((0, NumericValue_js_1.numeric)(Math.ceil(xmax / gridSize)).add(extraValue)).mul(gridSize)
-        : ((0, NumericValue_js_1.numeric)(xmax).sub(xmin));
+        ? xmax.div(gridSize).ceil().add(extraValue).mul(gridSize)
+        : xmax;
     const gridEndY = extendGrid
-        ? ((0, NumericValue_js_1.numeric)(Math.ceil(ymax / gridSize)).add(extraValue)).mul(gridSize)
-        : ((0, NumericValue_js_1.numeric)(ymax).sub(ymin));
-    const numCols = Math.floor(gridEndX.sub(gridStartX).div(gridSize).toNumber())
+        ? ymax.div(gridSize).ceil().add(extraValue).mul(gridSize)
+        : ymax;
+    const numCols = gridEndX.sub(gridStartX).div(gridSize).floor().toNumber()
         + (extendGrid ? 1 : 0);
     const originSize = (0, helpers_js_1.milsToMM)(10).toNumber();
     globals_js_1.RenderFlags.ShowGridOrigin && group.circle(originSize)
@@ -335,8 +338,8 @@ function drawGrid(group, gridProperties, logger) {
         lines.push(`M ${startX} ${startY.toNumber()} L ${startX} ${endY.toNumber()}`);
     }
     if (backgroundColor !== "") {
-        const width = gridEndX.sub(gridStartX).toNumber();
-        const height = gridEndY.sub(gridStartY).toNumber();
+        const width = gridEndX.sub(gridStartX).roundDp().toNumber();
+        const height = gridEndY.sub(gridStartY).roundDp().toNumber();
         group
             .rect(width, height).fill(backgroundColor)
             .translate(gridStartX.toNumber(), gridStartY.toNumber());

package/dist/cjs/semantic-tokens/getSemanticTokens.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSemanticTokens = void 0;
 const helpers_js_1 = require("../helpers.js");
 const SemanticTokenVisitor_js_1 = require("./SemanticTokenVisitor.js");
-const utils_js_1 = require("../utils.js");
+const errors_js_1 = require("../errors.js");
 async function getSemanticTokens(filePath, scriptData, options) {
     const { parser, lexer, tokens } = (0, helpers_js_1.prepareFile)(scriptData);
     const tree = parser.script();
@@ -22,7 +22,7 @@ async function getSemanticTokens(filePath, scriptData, options) {
                 console.log('Error while parsing: ', err);
                 hasParseError = true;
                 hasError = true;
-                throw new utils_js_1.ParseError(`Error parsing semantic tokens in imported file: ${err}`);
+                throw new errors_js_1.ParseError(`Error parsing semantic tokens in imported file: ${err}`);
             }
         }
         else {

package/dist/cjs/sizing.js

@@ -20,7 +20,7 @@ function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', an
             case geometry_js_1.VerticalAlign.Top:
                 dominantBaseline = geometry_js_1.VerticalAlignProp.Hanging;
                 break;
-            case geometry_js_1.VerticalAlign.Middle:
+            case geometry_js_1.VerticalAlign.Center:
                 dominantBaseline = geometry_js_1.VerticalAlignProp.Central;
                 break;
             case geometry_js_1.VerticalAlign.Bottom:
@@ -32,7 +32,7 @@ function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', an
             case geometry_js_1.HorizontalAlign.Left:
                 useAnchor = geometry_js_1.HorizontalAlignProp.Start;
                 break;
-            case geometry_js_1.HorizontalAlign.Middle:
+            case geometry_js_1.HorizontalAlign.Center:
                 useAnchor = geometry_js_1.HorizontalAlignProp.Middle;
                 break;
             case geometry_js_1.HorizontalAlign.Right:

package/dist/cjs/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isReference = exports.unwrapValue = exports.printWarnings = exports.RenderError = exports.RuntimeExecutionError = exports.ParseError = exports.ParseSyntaxError = exports.getLinePositionAsString = exports.BaseError = exports.getBlockTypeString = exports.generateDebugSequenceAction = exports.sequenceActionString = exports.areasOverlap = exports.isPointWithinArea = exports.combineMaps = exports.throwWithTokenRange = exports.throwWithToken = exports.throwWithContext = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
-const antlr4ng_1 = require("antlr4ng");
+exports.isReference = exports.unwrapValue = exports.printWarnings = exports.getBlockTypeString = exports.generateDebugSequenceAction = exports.sequenceActionString = exports.areasOverlap = exports.isPointWithinArea = exports.combineMaps = exports.getPortType = exports.getBoundsSize = exports.toNearestGrid2 = exports.toNearestGrid = exports.resizeToNearestGrid = exports.printBounds = exports.resizeBounds = exports.SimpleStopwatch = void 0;
 const ClassComponent_js_1 = require("./objects/ClassComponent.js");
 const ExecutionScope_js_1 = require("./objects/ExecutionScope.js");
 const BlockTypes_js_1 = require("./objects/BlockTypes.js");
 const types_js_1 = require("./objects/types.js");
+const errors_js_1 = require("./errors.js");
+const NumericValue_js_1 = require("./objects/NumericValue.js");
 class SimpleStopwatch {
     constructor() {
         this.startTime = performance.now();
@@ -45,17 +46,21 @@ function resizeToNearestGrid(bounds, gridSize = 20) {
     const addXMax = hasRemainder(bounds.xmax, gridSize) === 0 ? 1 : 0;
     const addYMax = hasRemainder(bounds.ymax, gridSize) === 0 ? 1 : 0;
     return {
-        xmin: Math.floor((bounds.xmin + addXMin) / gridSize) * gridSize,
-        ymin: Math.floor((bounds.ymin + addYMin) / gridSize) * gridSize,
-        xmax: Math.ceil((bounds.xmax + addXMax) / gridSize) * gridSize,
-        ymax: Math.ceil((bounds.ymax + addYMax) / gridSize) * gridSize,
+        xmin: (0, NumericValue_js_1.roundValue)(Math.floor((bounds.xmin + addXMin) / gridSize) * gridSize).toNumber(),
+        ymin: (0, NumericValue_js_1.roundValue)(Math.floor((bounds.ymin + addYMin) / gridSize) * gridSize).toNumber(),
+        xmax: (0, NumericValue_js_1.roundValue)(Math.ceil((bounds.xmax + addXMax) / gridSize) * gridSize).toNumber(),
+        ymax: (0, NumericValue_js_1.roundValue)(Math.ceil((bounds.ymax + addYMax) / gridSize) * gridSize).toNumber(),
     };
 }
 exports.resizeToNearestGrid = resizeToNearestGrid;
 function toNearestGrid(value, gridSize) {
-    return Math.floor(value / gridSize) * gridSize;
+    return (0, NumericValue_js_1.roundValue)(value / gridSize).floor().mul(gridSize).toNumber();
 }
 exports.toNearestGrid = toNearestGrid;
+function toNearestGrid2(value, gridSize) {
+    return (0, NumericValue_js_1.roundValue)(value / gridSize).ceil().mul(gridSize).toNumber();
+}
+exports.toNearestGrid2 = toNearestGrid2;
 function getBoundsSize(bounds) {
     return {
         width: bounds.xmax - bounds.xmin,
@@ -78,21 +83,6 @@ function getPortType(component) {
     return foundPinType;
 }
 exports.getPortType = getPortType;
-function throwWithContext(context, messageOrError) {
-    if (messageOrError instanceof BaseError) {
-        throw messageOrError;
-    }
-    throwWithTokenRange(messageOrError, context.start, context.stop);
-}
-exports.throwWithContext = throwWithContext;
-function throwWithToken(message, token) {
-    throw new ParseError(message, token);
-}
-exports.throwWithToken = throwWithToken;
-function throwWithTokenRange(message, startToken, endToken) {
-    throw new ParseError(message, startToken, endToken);
-}
-exports.throwWithTokenRange = throwWithTokenRange;
 function combineMaps(map1, map2) {
     const newMap = new Map(map1);
     map2.forEach((value, key) => {
@@ -192,98 +182,11 @@ function getBlockTypeString(type) {
     return returnValue;
 }
 exports.getBlockTypeString = getBlockTypeString;
-class BaseError extends Error {
-    constructor(message, startTokenOrCtx, endToken, filePath) {
-        super(message);
-        this.name = 'BaseError';
-        this.message = message;
-        if (startTokenOrCtx instanceof antlr4ng_1.ParserRuleContext) {
-            this.startToken = startTokenOrCtx.start;
-            this.endToken = startTokenOrCtx.stop;
-        }
-        else {
-            this.startToken = startTokenOrCtx;
-            this.endToken = endToken;
-        }
-        this.filePath = filePath;
-    }
-    toString() {
-        const parts = [this.name];
-        const linePosition = getLinePositionAsString({
-            start: this.startToken,
-            stop: this.endToken
-        });
-        if (linePosition !== null) {
-            parts.push(linePosition);
-        }
-        parts.push(`: ${this.message}`);
-        return parts.join('');
-    }
-}
-exports.BaseError = BaseError;
-function getLinePositionAsString(ctx) {
-    if (ctx === null || ctx === undefined) {
-        return null;
-    }
-    const { start: startToken, stop: stopToken } = ctx;
-    let result = null;
-    if (startToken) {
-        const { line, column } = startToken;
-        let stopLine = 0;
-        let stopCol = 0;
-        if (stopToken && (stopToken.line !== startToken.line || stopToken.column !== startToken.column)) {
-            stopLine = stopToken.line;
-            stopCol = stopToken.column + (stopToken.stop - stopToken.start);
-        }
-        else if (startToken === stopToken || startToken) {
-            stopLine = line;
-            stopCol = column + 1 + (startToken.stop - startToken.start);
-        }
-        else {
-            stopCol = -1;
-        }
-        result = ` at ${line}:${column + 1}`;
-        if (stopCol !== -1) {
-            result += `-${stopLine}:${stopCol + 1}`;
-        }
-    }
-    return result;
-}
-exports.getLinePositionAsString = getLinePositionAsString;
-class ParseSyntaxError extends BaseError {
-    constructor() {
-        super(...arguments);
-        this.name = 'ParseSyntaxError';
-    }
-}
-exports.ParseSyntaxError = ParseSyntaxError;
-class ParseError extends ParseSyntaxError {
-    constructor() {
-        super(...arguments);
-        this.name = 'ParseError';
-    }
-}
-exports.ParseError = ParseError;
-class RuntimeExecutionError extends BaseError {
-    constructor() {
-        super(...arguments);
-        this.name = 'RuntimeExecutionError';
-    }
-}
-exports.RuntimeExecutionError = RuntimeExecutionError;
-class RenderError extends Error {
-    constructor(message, stage) {
-        super(message);
-        this.name = 'RenderError';
-        this.stage = stage;
-    }
-}
-exports.RenderError = RenderError;
 function printWarnings(warnings) {
     const warningMessages = [];
     warnings.forEach(item => {
         const { message } = item;
-        const linePosition = getLinePositionAsString(item.ctx);
+        const linePosition = (0, errors_js_1.getLinePositionAsString)(item.ctx);
         const parts = [message];
         if (linePosition !== null) {
             parts.push(linePosition);

package/dist/cjs/validate/validateScript.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateScript = void 0;
 const helpers_js_1 = require("../helpers.js");
-const utils_js_1 = require("../utils.js");
+const errors_js_1 = require("../errors.js");
 const SymbolValidatorResolveVisitor_js_1 = require("./SymbolValidatorResolveVisitor.js");
 const SymbolValidatorVisitor_js_1 = require("./SymbolValidatorVisitor.js");
 async function validateScript(filePath, scriptData, options) {
@@ -29,7 +29,7 @@ async function validateScript(filePath, scriptData, options) {
                 console.log('got an error while parsing tree: ', err);
                 hasParseError = true;
                 hasError = true;
-                throw new utils_js_1.ParseError(`Error parsing validation in imported file: ${err}`);
+                throw new errors_js_1.ParseError(`Error parsing validation in imported file: ${err}`);
             }
         }
         else {

package/dist/cjs/visitor.js

@@ -14,6 +14,7 @@ const utils_js_1 = require("./utils.js");
 const draw_symbols_js_1 = require("./render/draw_symbols.js");
 const BaseVisitor_js_1 = require("./BaseVisitor.js");
 const utils_js_2 = require("./utils.js");
+const errors_js_1 = require("./errors.js");
 const helpers_js_1 = require("./helpers.js");
 const Frame_js_1 = require("./objects/Frame.js");
 const ComponentAnnotater_js_1 = require("./annotate/ComponentAnnotater.js");
@@ -35,7 +36,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 pinValue = result;
             }
             else {
-                throw new utils_js_2.RuntimeExecutionError("Invalid select pin: " + result, ctx);
+                throw new errors_js_1.RuntimeExecutionError("Invalid select pin: " + result, ctx);
             }
             if (pinValue !== undefined) {
                 pinId = new PinDefinition_js_1.PinId(pinValue);
@@ -85,7 +86,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         refComponent = component;
                     }
                     catch (err) {
-                        throw new utils_js_2.RuntimeExecutionError(err.message, ctx);
+                        throw new errors_js_1.RuntimeExecutionError(err.message, ctx);
                     }
                 });
                 this.linkComponentToCtx(item, refComponent, creationFlag);
@@ -785,8 +786,9 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
             if (segments.length === 0) {
                 this.throwWithContext(ctx, "Invalid wire expression");
             }
-            const newWire = this.getExecutor().addWire(segments);
+            const newWire = this.getExecutor().addWire(segments, ctx);
             this.creationCtx.set(newWire, ctx);
+            this.wireCtxLinks.set(newWire, ctx);
         };
         this.visitPoint_expr = (ctx) => {
             const ctxDataExpr = ctx.data_expr();
@@ -799,7 +801,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                     pointValue = resultValue;
                 }
                 else {
-                    throw new utils_js_2.RuntimeExecutionError('Invalid value for point');
+                    throw new errors_js_1.RuntimeExecutionError('Invalid value for point');
                 }
             }
             else {
@@ -1185,13 +1187,13 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         break;
                     case 'display':
                         if (didDefineArrangeProp) {
-                            throw new utils_js_2.RuntimeExecutionError("arrange property has already been defined", ctx);
+                            throw new errors_js_1.RuntimeExecutionError("arrange property has already been defined", ctx);
                         }
                         didDefineDisplayProp = true;
                         break;
                     case 'arrange':
                         if (didDefineDisplayProp) {
-                            throw new utils_js_2.RuntimeExecutionError("display property already defined", ctx);
+                            throw new errors_js_1.RuntimeExecutionError("display property already defined", ctx);
                         }
                         didDefineArrangeProp = true;
                         break;
@@ -1212,7 +1214,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                             this.validateBoolean(value, ctx);
                         }
                         else {
-                            throw new utils_js_2.RuntimeExecutionError("Invalid value for 'copy' property", ctx);
+                            throw new errors_js_1.RuntimeExecutionError("Invalid value for 'copy' property", ctx);
                         }
                         break;
                 }
@@ -1222,7 +1224,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 if (keyName === 'arrange') {
                     const [sideKeyCtx, sideKeyName] = path[1];
                     if (globals_js_1.ValidPinSides.indexOf(sideKeyName) === -1) {
-                        throw new utils_js_2.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx);
+                        throw new errors_js_1.RuntimeExecutionError(`Invalid side ${sideKeyName} in arrange`, sideKeyCtx);
                     }
                     else {
                         if (path.length === 2 && value instanceof NumericValue_js_1.NumericValue) {
@@ -1233,12 +1235,12 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                                 const goodBlank = value.length === 1 &&
                                     value[0] instanceof NumericValue_js_1.NumericValue;
                                 if (!goodBlank) {
-                                    throw new utils_js_2.RuntimeExecutionError(`Invalid blank specifier`, ctx);
+                                    throw new errors_js_1.RuntimeExecutionError(`Invalid blank specifier`, ctx);
                                 }
                             }
                             else {
                                 if (!(value instanceof NumericValue_js_1.NumericValue) && !(typeof value === 'string')) {
-                                    throw new utils_js_2.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
+                                    throw new errors_js_1.RuntimeExecutionError(`Invalid numeric value for arrange.${sideKeyName}`, ctx);
                                 }
                                 else {
                                     let useValue;
@@ -1274,7 +1276,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                         if (value.length === 2) {
                             const [pinType,] = value;
                             if (pinType instanceof types_js_1.UndeclaredReference) {
-                                throw new utils_js_2.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx);
+                                throw new errors_js_1.RuntimeExecutionError(`Invalid pin type: ${pinType.reference.name}`, ctx);
                             }
                         }
                     }
@@ -1631,7 +1633,7 @@ class ParserVisitor extends BaseVisitor_js_1.BaseVisitor {
                 net.name = net.baseName =
                     `NET-(${component.assignedRefDes}-${pin.toString()})`;
                 if (fullNetNames.indexOf(net.toString()) !== -1) {
-                    throw new utils_js_2.RuntimeExecutionError('Net renaming failed due to clash: ' + net);
+                    throw new errors_js_1.RuntimeExecutionError('Net renaming failed due to clash: ' + net);
                 }
                 seenNets.push(net);
             }

package/dist/esm/BaseVisitor.js

@@ -11,7 +11,7 @@ import { Direction, AnyReference, UndeclaredReference, ImportedLibrary, ImportFu
 import { BaseNamespace, DoubleDelimiter1, GlobalDocumentName, ParamKeys, PinTypesList, ReferenceTypes, TrailerArrayIndex } from './globals.js';
 import { isReference, unwrapValue as unwrapValue } from "./utils.js";
 import { linkBuiltInMethods } from './builtinMethods.js';
-import { RuntimeExecutionError, throwWithContext } from './utils.js';
+import { throwWithContext, RuntimeExecutionError } from './errors.js';
 import { SequenceAction } from './objects/ExecutionScope.js';
 import { computeContentHash } from './cache/hash.js';
 import { readCache, writeCache } from './cache/storage.js';
@@ -32,6 +32,7 @@ export class BaseVisitor extends CircuitScriptParserVisitor {
         Direction.Right, Direction.Left];
     resultData = new Map;
     componentCtxLinks = new Map;
+    wireCtxLinks = new Map;
     onErrorHandler = null;
     environment;
     importedFiles = [];

package/dist/esm/builtinMethods.js

@@ -1,18 +1,19 @@
 import Big from "big.js";
 import { NumericValue, numeric, resolveToNumericValue } from "./objects/NumericValue.js";
 import { CFunctionEntry, ImportedLibrary } from "./objects/types.js";
-import { unwrapValue, RuntimeExecutionError } from "./utils.js";
+import { unwrapValue } from "./utils.js";
+import { RuntimeExecutionError } from "./errors.js";
 import { BaseNamespace } from "./globals.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { Net } from "./objects/Net.js";
 const builtInMethods = [
     ['enumerate', enumerate],
-    ['toMils', toMils],
+    ['to_mils', toMils],
     ['range', range],
     ['len', objectLength],
-    ['arrayPush', arrayPush],
-    ['arrayGet', arrayGet],
-    ['arraySet', arraySet],
+    ['array_push', arrayPush],
+    ['array_get', arrayGet],
+    ['array_set', arraySet],
     ['print', null],
 ];
 export const buildInMethodNamesList = builtInMethods.map(item => item[0]);

package/dist/esm/environment/environment.js

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from "path";
 import CryptoJs from "crypto-js";
 import { TOOL_VERSION } from "../globals.js";
-import { RuntimeExecutionError } from "../utils.js";
+import { RuntimeExecutionError } from "../errors.js";
 export class NodeScriptEnvironment {
     existsSync(pathLike) {
         return fs.existsSync(pathLike);

package/dist/esm/errors.js

@@ -0,0 +1,119 @@
+import { ParserRuleContext } from "antlr4ng";
+export class BaseError extends Error {
+    name = 'BaseError';
+    message;
+    startToken;
+    endToken;
+    filePath;
+    constructor(message, startTokenOrCtx, endToken, filePath, options) {
+        super(message, options);
+        this.message = message;
+        if (startTokenOrCtx instanceof ParserRuleContext) {
+            this.startToken = startTokenOrCtx.start;
+            this.endToken = startTokenOrCtx.stop;
+        }
+        else {
+            this.startToken = startTokenOrCtx;
+            this.endToken = endToken;
+        }
+        this.filePath = filePath;
+    }
+    toString() {
+        const parts = [this.name];
+        const linePosition = getLinePositionAsString({
+            start: this.startToken,
+            stop: this.endToken
+        });
+        if (linePosition !== null) {
+            parts.push(linePosition);
+        }
+        parts.push(`: ${this.message}`);
+        return parts.join('');
+    }
+}
+export function getLinePositionAsString(ctx) {
+    if (ctx === null || ctx === undefined) {
+        return null;
+    }
+    const { start: startToken, stop: stopToken } = ctx;
+    let result = null;
+    if (startToken) {
+        const { line, column } = startToken;
+        let stopLine = 0;
+        let stopCol = 0;
+        if (stopToken && (stopToken.line !== startToken.line || stopToken.column !== startToken.column)) {
+            stopLine = stopToken.line;
+            stopCol = stopToken.column + (stopToken.stop - stopToken.start);
+        }
+        else if (startToken === stopToken || startToken) {
+            stopLine = line;
+            stopCol = column + 1 + (startToken.stop - startToken.start);
+        }
+        else {
+            stopCol = -1;
+        }
+        result = ` at ${line}:${column + 1}`;
+        if (stopCol !== -1) {
+            result += `-${stopLine}:${stopCol + 1}`;
+        }
+    }
+    return result;
+}
+export function throwWithContext(context, messageOrError) {
+    if (messageOrError instanceof BaseError) {
+        throw messageOrError;
+    }
+    throwWithTokenRange(messageOrError, context.start, context.stop);
+}
+export function throwWithTokenRange(message, startToken, endToken) {
+    throw new ParseError(message, startToken, endToken);
+}
+export class RenderError extends Error {
+    stage;
+    constructor(message, stage, options) {
+        super(message, options);
+        this.name = 'RenderError';
+        this.stage = stage;
+    }
+}
+export class AutoWireFailedError_ extends Error {
+    name = 'AutoWireFailedError_';
+    wire;
+    constructor(message, wire) {
+        super(message);
+        this.wire = wire;
+    }
+}
+export class AutoWireFailedError extends BaseError {
+    name = 'AutoWireFailedError';
+}
+export class RuntimeExecutionError extends BaseError {
+    name = 'RuntimeExecutionError';
+}
+export class ParseSyntaxError extends BaseError {
+    name = 'ParseSyntaxError';
+}
+export class ParseError extends ParseSyntaxError {
+    name = 'ParseError';
+}
+export function collectErrorChain(error) {
+    const items = [];
+    let currentError = error;
+    for (let i = 0; i < 100; i++) {
+        if (currentError.cause) {
+            items.push(currentError.cause);
+            currentError = currentError.cause;
+        }
+        else {
+            break;
+        }
+    }
+    return items;
+}
+export function printErrorChain(error) {
+    const errors = collectErrorChain(error);
+    errors.reverse();
+    for (const err of errors) {
+        console.log("  " + err.toString());
+    }
+}

package/dist/esm/execute.js

@@ -12,7 +12,8 @@ import { Frame } from './objects/Frame.js';
 import { CalculatePinPositions } from './render/layout.js';
 import { UnitDimension } from './helpers.js';
 import { PlaceHolderCommands, SymbolDrawingCommands } from './render/draw_symbols.js';
-import { getBlockTypeString, RuntimeExecutionError } from './utils.js';
+import { getBlockTypeString } from './utils.js';
+import { RuntimeExecutionError } from "./errors.js";
 export class ExecutionContext {
     name;
     namespace;
@@ -489,7 +490,13 @@ export class ExecutionContext {
             const { start_point: [component, pin,] } = stackRef;
             this.atComponent(component, pin, { addSequence: true });
         }
-        this.scope.blockStack.delete(scopeLevel);
+        const scopeLevels = Array.from(this.scope.blockStack.keys());
+        for (const level of scopeLevels) {
+            if (level >= scopeLevel) {
+                this.log(`blockstack delete level ${level}`);
+                this.scope.blockStack.delete(level);
+            }
+        }
         this.log('exit blocks');
     }
     closeOpenPathBlocks() {
@@ -906,7 +913,7 @@ export class ExecutionContext {
         this.log('-- done merging scope --');
         return mergedInstances;
     }
-    addWire(segments) {
+    addWire(segments, ctx) {
         if (this.scope.currentComponent === null) {
             throw "No current component";
         }

package/dist/esm/index.js

@@ -15,6 +15,7 @@ export * from './parser.js';
 export * from './utils.js';
 export * from './visitor.js';
 export * from './sizing.js';
+export * from './errors.js';
 export * from './objects/types.js';
 export * from './builtinMethods.js';
 export * from './validate/SymbolTable.js';

package/dist/esm/main.js

@@ -4,6 +4,7 @@ import figlet from 'figlet';
 import { watch } from 'fs';
 import { renderScript } from "./pipeline.js";
 import { NodeScriptEnvironment } from "./environment/environment.js";
+import { printErrorChain } from './errors.js';
 export default async function main() {
     const env = new NodeScriptEnvironment();
     NodeScriptEnvironment.setInstance(env);
@@ -133,8 +134,8 @@ async function parseFile(scriptData, outputPath, scriptOptions) {
         return output;
     }
     catch (error) {
-        console.error(`Unexpected Error: ${error}`);
-        console.log(error.stack);
+        console.error(`Unexpected Error:`);
+        printErrorChain(error);
     }
     return null;
 }

package/dist/esm/objects/ClassComponent.js

@@ -2,7 +2,7 @@ import { SymbolDrawingCommands } from '../render/draw_symbols.js';
 import { PinDefinition, PinId, PinIdType } from './PinDefinition.js';
 import { PinTypes } from './PinTypes.js';
 import { DefaultComponentUnit, ParamKeys } from '../globals.js';
-import { RuntimeExecutionError } from '../utils.js';
+import { RuntimeExecutionError } from "../errors.js";
 export class ComponentUnit {
     parent;
     unitId;

package/dist/esm/objects/ExecutionScope.js

@@ -1,6 +1,6 @@
 import { Property_key_exprContext } from '../antlr/CircuitScriptParser.js';
 import { PinId } from './PinDefinition.js';
-import { RuntimeExecutionError } from '../utils.js';
+import { RuntimeExecutionError } from "../errors.js";
 export class ExecutionScope {
     scopeId;
     nets = [];