circuitscript 0.5.3 → 0.5.5

package/dist/esm/render/render.js

@@ -1,8 +1,8 @@
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
 import { ExtractDrawingRects, RenderFrameType, getBounds } from "./layout.js";
 import { applyFontsToSVG } from '../sizing.js';
-import { ColorScheme, ComponentTypes, FrameType, MMToPt, MMToPx, MilsToMM, ParamKeys, RenderFlags, defaultGridSizeUnits, defaultPageSpacingMM, defaultWireLineWidth, fontDisplayScale, junctionSize } from '../globals.js';
-import { NumericValue, numeric } from '../objects/NumericValue.js';
+import { ColorScheme, ComponentTypes, FrameType, MMToPt, MMToPx, MilsToMM, ParamKeys, RenderFlags, defaultGridSizeUnits, defaultPageSpacingMM, fontDisplayScale, junctionSize } from '../globals.js';
+import { NumericValue, numeric, roundValue } from '../objects/NumericValue.js';
 import { combineMaps, getBoundsSize } from '../utils.js';
 import { milsToMM } from '../helpers.js';
 import { getPaperSize } from "./PaperSizes.js";
@@ -19,7 +19,7 @@ function createSvgCanvas() {
     applyFontsToSVG(canvas);
     return canvas;
 }
-export function renderSheetsToSVG(sheetFrames, logger, documentVariable) {
+export function renderSheetsToSVG(sheetFrames, logger, documentVariable, styles) {
     const canvas = createSvgCanvas();
     sheetFrames.forEach((sheet, index) => {
         const sheetGroup = canvas.group();
@@ -81,8 +81,9 @@ export function renderSheetsToSVG(sheetFrames, logger, documentVariable) {
             extendGrid,
             style: documentVariable[FrameParamKeys.GridStyle],
             color: documentVariable[FrameParamKeys.GridColor],
+            backgroundColor: documentVariable[FrameParamKeys.BackgroundColor],
         };
-        generateSVGChild(sheetElements, components, wires, junctions, mergedWires, allFrames, textObjects, gridProperties, logger);
+        generateSVGChild(sheetElements, components, wires, junctions, mergedWires, allFrames, textObjects, gridProperties, styles, logger);
         sheetElements.translate(xOffset, yOffset);
         sheetGroup.translate(0, sheetYOffset.toNumber());
     });
@@ -126,7 +127,7 @@ export function generatePdfOutput(doc, canvas, sheetSize, sheetSizeDefined, zoom
         }
     });
 }
-function generateSVGChild(canvas, components, wires, junctions, mergedWires, frameObjects, textObjects, gridProperties, logger) {
+function generateSVGChild(canvas, components, wires, junctions, mergedWires, frameObjects, textObjects, gridProperties, styles, logger) {
     const displayWireId = false;
     if (gridProperties.gridBounds === null) {
         logger.add('get grid bounds');
@@ -180,17 +181,20 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
     }
     const mergedWireHighlightGroup = canvas.group();
     const mergedWireGroup = canvas.group();
+    styles = styles ?? {};
+    const defaultWireColor = styles.wireColor;
+    const defaultWireLineWidth = milsToMM(styles.wireWidth).toNumber();
     mergedWires.forEach(tmpItem => {
         const { intersectPoints, net = null, lines = null } = tmpItem;
         let useJunctionColor = ColorScheme.JunctionColor;
-        let useColor = ColorScheme.WireColor;
+        let useColor = defaultWireColor;
         let useLineWidth = defaultWireLineWidth;
         let displayHighlight = false;
         let displayHighlightColor = null;
         let displayHighlightOpacity = 0.3;
         let displayHighlightWidth = 5 * MilsToMM;
         if (net !== null) {
-            useColor = net.color ?? ColorScheme.WireColor;
+            useColor = net.color ?? defaultWireColor;
             useJunctionColor = net.color ?? ColorScheme.JunctionColor;
             useLineWidth = net.lineWidth ?? defaultWireLineWidth;
             if (net.highlight !== null) {
@@ -255,25 +259,25 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
     frameObjects.forEach(item => {
         const { bounds, borderWidth } = item;
         const { width, height } = getBoundsSize(bounds);
-        let strokeColor = '#111';
+        const useWidth = roundValue(width).toNumber();
+        const useHeight = roundValue(height).toNumber();
+        const useBorderWidth = roundValue(borderWidth).toNumber();
+        let strokeColor = item.borderColor ?? '#111';
         if (item.frame.frameType === FrameType.Sheet) {
             drawSheetFrameBorder(frameGroup, item);
         }
         else {
-            if (borderWidth.toNumber() > 0) {
-                if (item.renderType === RenderFrameType.Container) {
-                    strokeColor = '#111';
-                }
-                else if (item.renderType === RenderFrameType.Elements) {
+            if (useBorderWidth > 0) {
+                if (item.renderType === RenderFrameType.Elements) {
                     strokeColor = '#aaa';
                     if (!RenderFlags.ShowElementFrames) {
                         return;
                     }
                 }
-                const tmpRect = frameGroup.rect(width, height)
+                const tmpRect = frameGroup.rect(useWidth, useHeight)
                     .fill('none')
                     .stroke({
-                    width: milsToMM(borderWidth).toNumber(),
+                    width: milsToMM(useBorderWidth).toNumber(),
                     color: strokeColor
                 });
                 tmpRect.translate(item.x.toNumber(), item.y.toNumber());
@@ -293,19 +297,22 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         .stroke('none').fill('red');
 }
 function drawGrid(group, gridProperties, logger) {
-    const { gridBounds: canvasSize, extendGrid, style: gridStyle = "dots", color: gridColor = "#000" } = gridProperties;
+    const { gridBounds: canvasSize, extendGrid, style: gridStyle = "dots", color: gridColor = "#000", backgroundColor = "", } = gridProperties;
     const gridSize = defaultGridSizeUnits;
-    const { xmin, ymin, xmax, ymax } = canvasSize;
     const extraValue = extendGrid ? 1 : 0;
-    const gridStartX = (numeric(Math.floor(xmin / gridSize)).sub(extraValue)).mul(gridSize);
-    const gridStartY = (numeric(Math.floor(ymin / gridSize)).sub(extraValue)).mul(gridSize);
+    const xmin = roundValue(canvasSize.xmin);
+    const ymin = roundValue(canvasSize.ymin);
+    const xmax = roundValue(canvasSize.xmax);
+    const ymax = 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
-        ? (numeric(Math.ceil(xmax / gridSize)).add(extraValue)).mul(gridSize)
-        : (numeric(xmax).sub(xmin));
+        ? xmax.div(gridSize).ceil().add(extraValue).mul(gridSize)
+        : xmax;
     const gridEndY = extendGrid
-        ? (numeric(Math.ceil(ymax / gridSize)).add(extraValue)).mul(gridSize)
-        : (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 = milsToMM(10).toNumber();
     RenderFlags.ShowGridOrigin && group.circle(originSize)
@@ -321,6 +328,13 @@ function drawGrid(group, gridProperties, logger) {
         const startX = gridStartX.add(numericGridSize.mul(i)).toNumber();
         lines.push(`M ${startX} ${startY.toNumber()} L ${startX} ${endY.toNumber()}`);
     }
+    if (backgroundColor !== "") {
+        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());
+    }
     const strokeSize = milsToMM(3);
     group.addClass('grid')
         .path(lines.join(" "))

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

@@ -1,6 +1,6 @@
 import { prepareFile } from "../helpers.js";
 import { prepareTokens, SemanticTokensVisitor } from "./SemanticTokenVisitor.js";
-import { ParseError } from "../utils.js";
+import { ParseError } from "../errors.js";
 export async function getSemanticTokens(filePath, scriptData, options) {
     const { parser, lexer, tokens } = prepareFile(scriptData);
     const tree = parser.script();

package/dist/esm/sizing.js

@@ -16,7 +16,7 @@ export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regul
             case VerticalAlign.Top:
                 dominantBaseline = VerticalAlignProp.Hanging;
                 break;
-            case VerticalAlign.Middle:
+            case VerticalAlign.Center:
                 dominantBaseline = VerticalAlignProp.Central;
                 break;
             case VerticalAlign.Bottom:
@@ -28,7 +28,7 @@ export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regul
             case HorizontalAlign.Left:
                 useAnchor = HorizontalAlignProp.Start;
                 break;
-            case HorizontalAlign.Middle:
+            case HorizontalAlign.Center:
                 useAnchor = HorizontalAlignProp.Middle;
                 break;
             case HorizontalAlign.Right:

package/dist/esm/styles.js

@@ -0,0 +1,20 @@
+import { ColorScheme, Defaults } from "./globals.js";
+import { FrameParamKeys } from "./objects/Frame.js";
+export class Styles {
+    lineColor;
+    lineWidth;
+    fillColor;
+    textColor;
+    wireColor;
+    wireWidth;
+}
+export function getStylesFromDocument(document) {
+    const styles = new Styles();
+    styles.lineColor = document[FrameParamKeys.LineColor] ?? ColorScheme.PinLineColor;
+    styles.lineWidth = document[FrameParamKeys.LineWidth] ?? Defaults.LineWidth;
+    styles.fillColor = document[FrameParamKeys.FillColor];
+    styles.textColor = document[FrameParamKeys.TextColor] ?? ColorScheme.PinNameColor;
+    styles.wireColor = document[FrameParamKeys.WireColor] ?? ColorScheme.WireColor;
+    styles.wireWidth = document[FrameParamKeys.WireWidth] ?? Defaults.WireLineWidth;
+    return styles;
+}

package/dist/esm/utils.js

@@ -1,8 +1,9 @@
-import { ParserRuleContext } from "antlr4ng";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { SequenceAction } from './objects/ExecutionScope.js';
 import { BlockTypes } from "./objects/BlockTypes.js";
 import { DeclaredReference, AnyReference } from './objects/types.js';
+import { getLinePositionAsString } from "./errors.js";
+import { roundValue } from "./objects/NumericValue.js";
 export class SimpleStopwatch {
     startTime;
     constructor() {
@@ -40,14 +41,17 @@ export 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: roundValue(Math.floor((bounds.xmin + addXMin) / gridSize) * gridSize).toNumber(),
+        ymin: roundValue(Math.floor((bounds.ymin + addYMin) / gridSize) * gridSize).toNumber(),
+        xmax: roundValue(Math.ceil((bounds.xmax + addXMax) / gridSize) * gridSize).toNumber(),
+        ymax: roundValue(Math.ceil((bounds.ymax + addYMax) / gridSize) * gridSize).toNumber(),
     };
 }
 export function toNearestGrid(value, gridSize) {
-    return Math.floor(value / gridSize) * gridSize;
+    return roundValue(value / gridSize).floor().mul(gridSize).toNumber();
+}
+export function toNearestGrid2(value, gridSize) {
+    return roundValue(value / gridSize).ceil().mul(gridSize).toNumber();
 }
 export function getBoundsSize(bounds) {
     return {
@@ -69,18 +73,6 @@ export function getPortType(component) {
     });
     return foundPinType;
 }
-export function throwWithContext(context, messageOrError) {
-    if (messageOrError instanceof BaseError) {
-        throw messageOrError;
-    }
-    throwWithTokenRange(messageOrError, context.start, context.stop);
-}
-export function throwWithToken(message, token) {
-    throw new ParseError(message, token);
-}
-export function throwWithTokenRange(message, startToken, endToken) {
-    throw new ParseError(message, startToken, endToken);
-}
 export function combineMaps(map1, map2) {
     const newMap = new Map(map1);
     map2.forEach((value, key) => {
@@ -174,83 +166,6 @@ export function getBlockTypeString(type) {
     }
     return returnValue;
 }
-export class BaseError extends Error {
-    name = 'BaseError';
-    message;
-    startToken;
-    endToken;
-    filePath;
-    constructor(message, startTokenOrCtx, endToken, filePath) {
-        super(message);
-        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 class ParseSyntaxError extends BaseError {
-    name = 'ParseSyntaxError';
-}
-export class ParseError extends ParseSyntaxError {
-    name = 'ParseError';
-}
-export class RuntimeExecutionError extends BaseError {
-    name = 'RuntimeExecutionError';
-}
-export class RenderError extends Error {
-    stage;
-    constructor(message, stage) {
-        super(message);
-        this.name = 'RenderError';
-        this.stage = stage;
-    }
-}
 export function printWarnings(warnings) {
     const warningMessages = [];
     warnings.forEach(item => {

package/dist/esm/validate/validateScript.js

@@ -1,5 +1,5 @@
 import { prepareFile, ParseErrorStrategy, TokenErrorListener } from "../helpers.js";
-import { ParseError } from "../utils.js";
+import { ParseError } from "../errors.js";
 import { SymbolValidatorResolveVisitor } from "./SymbolValidatorResolveVisitor.js";
 import { SymbolValidatorVisitor } from "./SymbolValidatorVisitor.js";
 export async function validateScript(filePath, scriptData, options) {

package/dist/esm/visitor.js

@@ -10,7 +10,8 @@ import { BlockTypes } from "./objects/BlockTypes.js";
 import { unwrapValue } from "./utils.js";
 import { PlaceHolderCommands, SymbolDrawingCommands } from './render/draw_symbols.js';
 import { BaseVisitor } from './BaseVisitor.js';
-import { getPortType, RuntimeExecutionError } from './utils.js';
+import { getPortType } from './utils.js';
+import { RuntimeExecutionError } from './errors.js';
 import { UnitDimension } from './helpers.js';
 import { FrameParamKeys } from './objects/Frame.js';
 import { ComponentAnnotater } from './annotate/ComponentAnnotater.js';
@@ -1024,8 +1025,9 @@ export class ParserVisitor extends 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);
     };
     visitPoint_expr = (ctx) => {
         const ctxDataExpr = ctx.data_expr();

package/dist/libs/std.cst

@@ -7,7 +7,7 @@ def net(net_name, net_type = "any"):
         display: create graphic (params):
             hline: -50, 0, 100
             vpin: 1, 0, 50, -50, display_id=false
-            label: params.net_name, 0, -15, fontSize=50, anchor="middle"
+            label: params.net_name, 0, -15, fontSize=50, anchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -24,7 +24,7 @@ def label(value, anchor="left"):
         copy: true
         followWireOrientation: false
         display: create graphic (params):
-            textColor: "#222"
+            text_color: "#222"
             label: params.value, 0, -10, fontSize=50, anchor=anchor
             pin: 1, 0, 0, 0, 0, display_id=false
         type: "net"
@@ -38,8 +38,8 @@ def port(value, portType="input"):
         pins: 1
         copy: true
         display: create graphic (params):
-            textColor: "#222"
-            label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
+            text_color: "#222"
+            label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="center", portType=portType
             pin: 1, 0, 0, 0, 0, display_id=false
         type: "port"
         params:
@@ -58,7 +58,7 @@ def res(value):
             hpin: 1, -width/2 - 30, 0, 30, display_id=false
             hpin: 2, width/2 + 30, 0, -30, display_id=false
             label: params.refdes, -width/2, -height/2 - 20, fontSize=50, anchor="left"
-            label: params.value, 0, 0, fontSize=30, anchor="middle", vanchor="middle"
+            label: params.value, 0, 0, fontSize=30, anchor="center", vanchor="center"
         type: "res"
         params:
             value: value
@@ -73,13 +73,13 @@ def cap(value):
     return create component:
         pins: 2
         display: create graphic (params):
-            lineWidth: 13
+            line_width: 13
             hline: -width/2, 20, width
             hline: -width/2, -20, width
             vpin: 1, 0, -100, 80, display_id=false
             vpin: 2, 0, 100, -80, display_id=false
-            label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="middle"
-            label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="middle"
+            label: params.refdes, 80, -30, fontSize=50, anchor="left", vanchor="center"
+            label: params.value, 80, 30, fontSize=50, anchor = "left", vanchor="center"
         type: "cap"
         params:
             value: value
@@ -101,7 +101,7 @@ def ind(value):
             hpin: 1, -width/2 - 100, 0, 100, display_id=false
             hpin: 2, width/2 + 100, 0, -100, display_id=false
             label: (params.refdes, -width/2, -height/2 - 25 , fontSize=50, anchor="left")
-            label: (params.value, 0, 50, fontSize=50, anchor="middle", vanchor="middle")
+            label: (params.value, 0, 50, fontSize=50, anchor="center", vanchor="center")
         params:
             value: value
 
@@ -119,7 +119,7 @@ def diode():
             vline: width/2, -height/2, height
             hpin: 1, -width/2-100, 0, 100    # cathode
             hpin: 2, width/2 + 100, 0, -100  # anode
-            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
+            label: params.refdes, 0, -100, fontSize=50, anchor="center", vanchor="top"
 
 def led(color):
     width = 100
@@ -140,8 +140,8 @@ def led(color):
                     "M", 180, 60, "L", 180, 90, "L", 150, 90)
             hpin: 1, width/2 + 100, 0, -100  # cathode
             hpin: 2, -width/2-100, 0, 100    # anode
-            label: params.refdes, 0, -100, fontSize=50, anchor="middle", vanchor="top"
-            label: params.color, 0, 100, fontSize=40, anchor="middle", vanchor="bottom"
+            label: params.refdes, 0, -100, fontSize=50, anchor="center", vanchor="top"
+            label: params.color, 0, 100, fontSize=40, anchor="center", vanchor="bottom"
         params:
             size: "0603"
             color: color
@@ -159,7 +159,7 @@ def cgnd():
             hline: -10, 5, 20
             hline: -5, 10, 10
             vpin: 1, 0, -10, 10, display_id=false
-            label: params.net_name, 0, 22, fontSize=50, anchor="middle"
+            label: params.net_name, 0, 22, fontSize=50, anchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -175,7 +175,7 @@ def dgnd(net_name="GND"):
         display: create graphic (params):
             triangle: 0, 0, 0, height, width
             vpin: 1, 0, -50, 50, display_id=false
-            label: params.net_name, 0, height + 50, fontSize=50, anchor="middle", vanchor="middle"
+            label: params.net_name, 0, height + 50, fontSize=50, anchor="center", vanchor="center"
         type: "net"
         params:
             net_name: net_name
@@ -208,7 +208,7 @@ def arrow_point():
         pins: 1
         followWireOrientation: false
         display: create graphic:
-            lineWidth: 2
+            line_width: 2
             path: ("M", -10, -5, "L", -5, 0, "L", -10, 5)
             path: ("M", -5, 0, "L", -20, 0)
             hpin: 1, 0, 0, 0, display_id=false
@@ -269,12 +269,12 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
             fill: "none"
 
             # outer rect 
-            lineColor: "#cccccc"
+            line_color: "#cccccc"
             crect: (paper_width/2, paper_height/2, 
                 paper_width, paper_height, class="paper-area")
 
             # inner rect
-            lineColor: "#111111"
+            line_color: "#111111"
             crect: (paper_width/2, paper_height/2, 
                     inner_width, inner_height, class="plot-area")
 
@@ -296,30 +296,30 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
                     content: i
                     offset: tmp_x + tmp_width * ratio_x * (0.5 + (i-1)), tmp_y + inner_frame_margin * 0.5 + 2
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
                 text: 
                     content: i
                     offset: tmp_x + tmp_width * ratio_x * (0.5 + (i-1)), tmp_y + tmp_height - inner_frame_margin * 0.5 + 2
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
             for index, val in enumerate(row_display_value):
                 text: 
                     content: val
                     offset: tmp_x + inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * (0.5 + index)
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
                 text: 
                     content: val
                     offset: tmp_x + tmp_width - inner_frame_margin * 0.5, tmp_y + tmp_height * ratio_y * (0.5 + index)
                     fontSize: fontSize
-                    anchor: "middle"
-                    vanchor: "middle"
+                    anchor: "center"
+                    vanchor: "center"
 
             # Draw title frame
             text: 
@@ -375,47 +375,47 @@ def sheet_generator(paper_size_name, paper_width, paper_height, margin_x, margin
             grid_height: paper_height - 2 * margin_y
 
 def sheet_A1():
-    paper_width = toMils(841)
-    paper_height = toMils(594)
+    paper_width = to_mils(841)
+    paper_height = to_mils(594)
     margin = 400
 
     return sheet_generator("A1", paper_width, paper_height, margin, margin, 
         range(1, 17), ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L"])
 
 def sheet_A2():
-    paper_width = toMils(594)
-    paper_height = toMils(420)
+    paper_width = to_mils(594)
+    paper_height = to_mils(420)
     margin = 400
 
     return sheet_generator("A2", paper_width, paper_height, margin, margin, 
         range(1, 13), ["A", "B", "C", "D", "E", "F", "G", "H"])
 
 def sheet_A3():
-    paper_width = toMils(420)
-    paper_height = toMils(297)
+    paper_width = to_mils(420)
+    paper_height = to_mils(297)
     margin = 400
 
     return sheet_generator("A3", paper_width, paper_height, margin, margin, 
         range(1, 9), ["A", "B", "C", "D", "E", "F"])
 
 def sheet_A4():
-    paper_width = toMils(297)
-    paper_height = toMils(210)
+    paper_width = to_mils(297)
+    paper_height = to_mils(210)
     margin = 400
 
     return sheet_generator("A4", paper_width, paper_height, margin, margin, 
         range(1, 7), ["A", "B", "C", "D"])
 
 def sheet_A5():
-    paper_width = toMils(210)
-    paper_height = toMils(148)
+    paper_width = to_mils(210)
+    paper_height = to_mils(148)
     margin = 400
 
     return sheet_generator("A5", paper_width, paper_height, margin, margin, range(1, 5), ["A", "B", "C"])
 
 def sheet_A6(revision="V1"):
-    paper_width = toMils(148)
-    paper_height = toMils(105)
+    paper_width = to_mils(148)
+    paper_height = to_mils(105)
     margin = 400
 
     tmp_sheet = sheet_generator("A6", paper_width, paper_height, margin, margin, range(1, 4), ["A", "B"])

package/dist/types/BaseVisitor.d.ts

@@ -7,10 +7,11 @@ import { Net } from "./objects/Net.js";
 import { CallableParameter, ComplexType, Direction, FunctionDefinedParameter, AnyReference, ImportedLibrary, NewContextOptions, ImportFunctionHandling as ImportFunctionHandling } from "./objects/types.js";
 import { CommonTokenStream, ParserRuleContext } from 'antlr4ng';
 import { ExecutionWarning } from "./utils.js";
-import { BaseError } from './utils.js';
+import { BaseError } from './errors.js';
 import { ExecutionScope } from './objects/ExecutionScope.js';
 import { NodeScriptEnvironment } from "./environment/environment.js";
 import { PinId } from './objects/PinDefinition.js';
+import { Wire } from './objects/Wire.js';
 export declare class BaseVisitor extends CircuitScriptParserVisitor<ComplexType | AnyReference | any> {
     startingContext: ExecutionContext;
     executionStack: ExecutionContext[];
@@ -23,6 +24,7 @@ export declare class BaseVisitor extends CircuitScriptParserVisitor<ComplexType
     acceptedDirections: Direction[];
     protected resultData: Map<ParserRuleContext, any>;
     protected componentCtxLinks: Map<ParserRuleContext, ClassComponent>;
+    wireCtxLinks: Map<Wire, ParserRuleContext>;
     onErrorHandler: OnErrorHandler | null;
     environment: NodeScriptEnvironment;
     protected importedFiles: ImportLibraryFile[];

package/dist/types/errors.d.ts

@@ -0,0 +1,37 @@
+import { Token, ParserRuleContext } from "antlr4ng";
+import { Wire } from "./objects/Wire.js";
+export declare class BaseError extends Error {
+    name: string;
+    message: string;
+    startToken?: Token;
+    endToken?: Token;
+    filePath?: string;
+    constructor(message: string, startTokenOrCtx?: Token | ParserRuleContext, endToken?: Token, filePath?: string, options?: ErrorOptions);
+    toString(): string;
+}
+export declare function getLinePositionAsString(ctx: ParserRuleContext): string | null;
+export declare function throwWithContext(context: ParserRuleContext, messageOrError: string | BaseError): void;
+export declare function throwWithTokenRange(message: string, startToken: Token, endToken?: Token): void;
+export declare class RenderError extends Error {
+    stage?: string;
+    constructor(message: string, stage?: string, options?: ErrorOptions);
+}
+export declare class AutoWireFailedError_ extends Error {
+    name: string;
+    wire: Wire;
+    constructor(message: string, wire: Wire);
+}
+export declare class AutoWireFailedError extends BaseError {
+    name: string;
+}
+export declare class RuntimeExecutionError extends BaseError {
+    name: string;
+}
+export declare class ParseSyntaxError extends BaseError {
+    name: string;
+}
+export declare class ParseError extends ParseSyntaxError {
+    name: string;
+}
+export declare function collectErrorChain(error: Error): Error[];
+export declare function printErrorChain(error: Error): void;

package/dist/types/execute.d.ts

@@ -92,7 +92,7 @@ export declare class ExecutionContext {
     resolveTrailers(type: ReferenceTypes, item: any, trailers?: string[]): AnyReference;
     callFunction(functionReference: AnyReference, functionParams: CallableParameter[], executionStack: ExecutionContext[], netNamespace: string): CFunctionResult;
     mergeScope(childScope: ExecutionScope, namespace: string): ClassComponent[];
-    addWire(segments: [string, (number | UnitDimension)?][]): Wire;
+    addWire(segments: [string, (number | UnitDimension)?][], ctx: ParserRuleContext): Wire;
     addPoint(pointId: string, userDefined?: boolean): ComponentPin;
     private getPointSymbol;
     applyComponentAngleFromWire(component: ClassComponent, pin: number, opposite?: boolean): void;