circuitscript 0.5.4 → 0.5.5

package/dist/esm/objects/NumericValue.js

@@ -27,6 +27,9 @@ export class NumericValue {
     toString() {
         return 'numeric:' + this.value;
     }
+    copy() {
+        return this.add(0);
+    }
     toDisplayString() {
         if (typeof this.value === 'number') {
             return this.value.toString();
@@ -81,6 +84,15 @@ export class NumericValue {
     eq(value) {
         return this.toBigNumber().eq(value.toBigNumber());
     }
+    floor() {
+        return numeric(Math.floor(this.toNumber()));
+    }
+    ceil() {
+        return numeric(Math.ceil(this.toNumber()));
+    }
+    roundDp() {
+        return roundValue(this.toNumber());
+    }
 }
 export class NumberOperator {
     prepare(value) {
@@ -185,5 +197,8 @@ export function resolveToNumericValue(value) {
     return new NumericValue(useValue, prefixPart * 3);
 }
 export function roundValue(value) {
+    if (typeof value === "number") {
+        value = numeric(value);
+    }
     return resolveToNumericValue(new Big(value.toBigNumber().toFixed(7)));
 }

package/dist/esm/objects/PinDefinition.js

@@ -1,4 +1,4 @@
-import { RuntimeExecutionError } from '../utils.js';
+import { RuntimeExecutionError } from "../errors.js";
 import { NumericValue } from './NumericValue.js';
 import { PinTypes } from './PinTypes.js';
 export class PinId {

package/dist/esm/objects/types.js

@@ -1,5 +1,5 @@
 import { ReferenceTypes } from '../globals.js';
-import { RuntimeExecutionError } from '../utils.js';
+import { RuntimeExecutionError } from "../errors.js";
 export class CFunctionEntry {
     name;
     namespace;

package/dist/esm/parser.js

@@ -1,6 +1,7 @@
 import { CircuitScriptParser } from './antlr/CircuitScriptParser.js';
 import { MainLexer } from './lexer.js';
-import { ParseSyntaxError, RuntimeExecutionError, SimpleStopwatch } from './utils.js';
+import { SimpleStopwatch } from './utils.js';
+import { ParseSyntaxError, RuntimeExecutionError } from "./errors.js";
 import { CharStream, CommonTokenStream, PredictionMode } from 'antlr4ng';
 export function parseFileWithVisitor(visitor, data, options) {
     const lexerErrorListener = new CircuitscriptParserErrorListener(visitor.onErrorHandler);

package/dist/esm/pipeline.js

@@ -12,9 +12,10 @@ import { parseFileWithVisitor } from "./parser.js";
 import { KiCadNetListOutputHandler } from "./render/KiCadNetListOutputHandler.js";
 import { renderSheetsToSVG, generateSvgOutput, generatePdfOutput } from "./render/render.js";
 import { EvaluateERCRules } from "./rules-check/rules.js";
-import { RuntimeExecutionError, ParseSyntaxError, ParseError, printWarnings, RenderError, generateDebugSequenceAction, sequenceActionString, SimpleStopwatch } from "./utils.js";
+import { printWarnings, generateDebugSequenceAction, sequenceActionString, SimpleStopwatch } from "./utils.js";
 import { ParserVisitor } from "./visitor.js";
 import { getStylesFromDocument } from "./styles.js";
+import { RuntimeExecutionError, ParseSyntaxError, ParseError, RenderError, AutoWireFailedError, AutoWireFailedError_ } from "./errors.js";
 export async function renderScript(scriptData, outputPath, options) {
     const parseHandlers = [
         new KiCadNetListOutputHandler(),
@@ -208,7 +209,13 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
                 }
             }
             catch (err) {
-                throw new RenderError(`Error during layout generation: ${err}`, 'layout');
+                let useErr = err;
+                if (err instanceof AutoWireFailedError_) {
+                    const errCtx = visitor.wireCtxLinks.get(err.wire);
+                    useErr = new AutoWireFailedError(err.message, errCtx.start, errCtx.stop);
+                }
+                dumpData && environment.writeFileSync(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
+                throw new RenderError(`Error during layout generation`, 'layout', { cause: useErr });
             }
             layoutEngine.printWarnings();
             showStats && console.log('Layout took:', layoutTimer.lap());
@@ -270,7 +277,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
             }
         }
         catch (err) {
-            throw new RenderError(`Error during rendering: ${err}`, 'output_generation');
+            throw new RenderError(`Error during rendering: ${err}`, 'output_generation', { cause: err });
         }
     }
     return {

package/dist/esm/regenerate-tests.js

@@ -40,14 +40,14 @@ async function regenerateTests(extra = "") {
         cstFiles.forEach(file => {
             const svg1 = 'svgs/' + file + '.svg';
             const svg2 = 'svgs/' + file + '.next.svg';
-            const cleanedName = file.replace('script', '').replace('.cst', '');
-            allFiles.push([file, svg1, svg2, cleanedName]);
+            const cleanedName = file.replace('script', '')
+                .replace('.cst', '')
+                .replace('.annotated', '');
+            allFiles.push([file, svg1, svg2, Number(cleanedName)]);
         });
         const sortedFiles = allFiles.sort((a, b) => {
-            const nameA = a[3];
-            const nameB = b[3];
-            const indexA = Number(nameA);
-            const indexB = Number(nameB);
+            const indexA = a[3];
+            const indexB = b[3];
             if (indexA > indexB) {
                 return 1;
             }

package/dist/esm/render/draw_symbols.js

@@ -2,7 +2,7 @@ import { milsToMM } from "../helpers.js";
 import { ColorScheme, CustomSymbolParamTextSize, CustomSymbolPinIdSize, CustomSymbolPinTextSize, CustomSymbolRefDesSize, Defaults, PinTypesList, PortArrowSize, PortPaddingHorizontal, PortPaddingVertical, ReferenceTypes, RenderFlags, SymbolPinSide, defaultFont, defaultPinIdTextSize, defaultPinNameTextSize, defaultSymbolLineWidth, fontDisplayScale } from "../globals.js";
 import { Geometry, GeometryProp, HorizontalAlign, HorizontalAlignProp, Textbox, VerticalAlign, VerticalAlignProp } from "./geometry.js";
 import { PinTypes } from "../objects/PinTypes.js";
-import { RuntimeExecutionError, throwWithContext } from "../utils.js";
+import { RuntimeExecutionError, throwWithContext } from "../errors.js";
 import { DeclaredReference, UndeclaredReference } from "../objects/types.js";
 import { NumericValue, numeric, roundValue } from "../objects/NumericValue.js";
 import { PinId } from "../objects/PinDefinition.js";
@@ -153,7 +153,7 @@ export class SymbolGraphic {
             }
             const isHorizontalLabel = finalLabelAngle === 0 || finalLabelAngle === 180;
             const isVerticalLabel = finalLabelAngle === 90 || finalLabelAngle === -90;
-            if (useAnchor === HorizontalAlign.Middle) {
+            if (useAnchor === HorizontalAlign.Center) {
                 anchorStyle = HorizontalAlignProp.Middle;
             }
             else if (useAnchor === HorizontalAlign.Left) {
@@ -162,7 +162,7 @@ export class SymbolGraphic {
             else if (useAnchor === HorizontalAlign.Right) {
                 anchorStyle = HorizontalAlignProp.End;
             }
-            if (useDominantBaseline === VerticalAlign.Middle) {
+            if (useDominantBaseline === VerticalAlign.Center) {
                 dominantBaseline = VerticalAlignProp.Central;
             }
             else if (useDominantBaseline === VerticalAlign.Top) {
@@ -330,7 +330,7 @@ export class SymbolGraphic {
             return HorizontalAlign.Left;
         }
         else {
-            return HorizontalAlign.Middle;
+            return HorizontalAlign.Center;
         }
     }
     flipDominantBaseline(value) {
@@ -341,7 +341,7 @@ export class SymbolGraphic {
             return VerticalAlign.Top;
         }
         else {
-            return VerticalAlign.Middle;
+            return VerticalAlign.Center;
         }
     }
 }
@@ -358,7 +358,7 @@ export class SymbolText extends SymbolGraphic {
         drawing.clear();
         drawing.addTextbox(numeric(0), numeric(0), this.text, {
             fontSize: this.fontSize,
-            anchor: HorizontalAlign.Middle,
+            anchor: HorizontalAlign.Center,
             fontWeight: this.fontWeight,
         });
         this.drawing = drawing;
@@ -646,7 +646,7 @@ export class SymbolPlaceholder extends SymbolGraphic {
             displayPinName && usePinName !== "" && drawing.addLabel(endX.add(pinNameOffsetX), endY.add(pinNameOffsetY), usePinName, {
                 fontSize: numeric(defaultPinNameTextSize),
                 anchor: pinNameAlignment,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: pinNameColor,
                 angle: numeric(usePinIdAngle)
             });
@@ -759,7 +759,7 @@ export class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(leftPinStart.add(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Left,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
             });
             drawing.addLabel(leftPinStart.sub(milsToMM(10)), pinY.sub(milsToMM(10)), pin.pinId.toString(), {
@@ -776,7 +776,7 @@ export class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(rightPinStart.sub(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Right,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
             });
             drawing.addLabel(rightPinStart.add(milsToMM(10)), pinY.sub(milsToMM(10)), pin.pinId.toString(), {
@@ -793,7 +793,7 @@ export class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(pinX, topPinStart.add(milsToMM(20)), pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Right,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
                 angle: numeric(-90),
             });
@@ -812,7 +812,7 @@ export class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(pinX, bottomPinStart.sub(milsToMM(20)), pin.text, {
                 fontSize: numeric(CustomSymbolPinTextSize),
                 anchor: HorizontalAlign.Left,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
                 angle: numeric(-90),
             });
@@ -895,7 +895,7 @@ export class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(leftPinStart.add(this.portWidth).add(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(40),
                 anchor: HorizontalAlign.Left,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
             });
         });
@@ -907,7 +907,7 @@ export class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(rightPinStart.sub(this.portWidth).sub(milsToMM(20)), pinY, pin.text, {
                 fontSize: numeric(40),
                 anchor: HorizontalAlign.Right,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
             });
         });
@@ -919,7 +919,7 @@ export class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(pinX, topPinStart.add(this.portWidth).add(milsToMM(20)), pin.text, {
                 fontSize: numeric(40),
                 anchor: HorizontalAlign.Right,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
                 angle: numeric(-90),
             });
@@ -932,7 +932,7 @@ export class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(pinX, bottomPinStart.sub(this.portWidth).sub(milsToMM(20)), pin.text, {
                 fontSize: numeric(40),
                 anchor: HorizontalAlign.Left,
-                vanchor: VerticalAlign.Middle,
+                vanchor: VerticalAlign.Center,
                 textColor: ColorScheme.PinNameColor,
                 angle: numeric(-90),
             });

package/dist/esm/render/geometry.js

@@ -464,7 +464,7 @@ function labelPolygonForAnchors(x, y, width, height, hAnchor, vAnchor) {
                 [1, 1],
             ];
         }
-        else if (vAnchor === VerticalAlign.Middle) {
+        else if (vAnchor === VerticalAlign.Center) {
             coordVectors = [
                 [0, -0.5],
                 [0, 0.5],
@@ -490,7 +490,7 @@ function labelPolygonForAnchors(x, y, width, height, hAnchor, vAnchor) {
                 [0, -1],
             ];
         }
-        else if (vAnchor === VerticalAlign.Middle) {
+        else if (vAnchor === VerticalAlign.Center) {
             coordVectors = [
                 [0, -0.5],
                 [0, 0.5],
@@ -507,7 +507,7 @@ function labelPolygonForAnchors(x, y, width, height, hAnchor, vAnchor) {
             ];
         }
     }
-    else if (hAnchor === HorizontalAlign.Middle) {
+    else if (hAnchor === HorizontalAlign.Center) {
         if (vAnchor === VerticalAlign.Bottom) {
             coordVectors = [
                 [-0.5, 0],
@@ -516,7 +516,7 @@ function labelPolygonForAnchors(x, y, width, height, hAnchor, vAnchor) {
                 [0.5, 0]
             ];
         }
-        else if (vAnchor === VerticalAlign.Middle) {
+        else if (vAnchor === VerticalAlign.Center) {
             coordVectors = [
                 [-0.5, 0.5],
                 [-0.5, -0.5],
@@ -543,13 +543,13 @@ function labelPolygonForAnchors(x, y, width, height, hAnchor, vAnchor) {
 export var HorizontalAlign;
 (function (HorizontalAlign) {
     HorizontalAlign["Left"] = "left";
-    HorizontalAlign["Middle"] = "middle";
+    HorizontalAlign["Center"] = "center";
     HorizontalAlign["Right"] = "right";
 })(HorizontalAlign || (HorizontalAlign = {}));
 export var VerticalAlign;
 (function (VerticalAlign) {
     VerticalAlign["Top"] = "top";
-    VerticalAlign["Middle"] = "middle";
+    VerticalAlign["Center"] = "center";
     VerticalAlign["Bottom"] = "bottom";
 })(VerticalAlign || (VerticalAlign = {}));
 export var HorizontalAlignProp;