circuitscript 0.5.3 → 0.5.5

package/dist/cjs/pipeline.js

@@ -20,6 +20,8 @@ const render_js_1 = require("./render/render.js");
 const rules_js_1 = require("./rules-check/rules.js");
 const utils_js_1 = require("./utils.js");
 const visitor_js_1 = require("./visitor.js");
+const styles_js_1 = require("./styles.js");
+const errors_js_1 = require("./errors.js");
 async function renderScript(scriptData, outputPath, options) {
     const parseHandlers = [
         new KiCadNetListOutputHandler_js_1.KiCadNetListOutputHandler(),
@@ -31,28 +33,28 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
     const { dumpNets = false, dumpData = false, showStats = false, enableErc = false, enableBom = false, lexerDiagnostics = false, lexerVerbose = false, lexerTokens = false, lexerMapping = false, lexerSummary = false, inputPath = '', bomOutputPath = undefined, environment } = options;
     const errors = [];
     const onErrorHandler = (message, context, error) => {
-        if (error && error instanceof utils_js_1.RuntimeExecutionError) {
+        if (error && error instanceof errors_js_1.RuntimeExecutionError) {
             errors.push(error);
         }
         else if (error && error instanceof antlr4ng_1.RecognitionException) {
             if (context !== null) {
-                errors.push(new utils_js_1.ParseSyntaxError(message, context.start, context.stop));
+                errors.push(new errors_js_1.ParseSyntaxError(message, context.start, context.stop));
             }
             else {
                 if (error.recognizer) {
                     const recognizer = error.recognizer;
-                    errors.push(new utils_js_1.ParseSyntaxError(message, {
+                    errors.push(new errors_js_1.ParseSyntaxError(message, {
                         line: recognizer.currentTokenStartLine,
                         column: recognizer.currentTokenColumn
                     }));
                 }
                 else {
-                    errors.push(new utils_js_1.ParseSyntaxError(message));
+                    errors.push(new errors_js_1.ParseSyntaxError(message));
                 }
             }
         }
         else {
-            errors.push(new utils_js_1.ParseError(message, context.start, context.stop));
+            errors.push(new errors_js_1.ParseError(message, context.start, context.stop));
         }
     };
     const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, environment);
@@ -78,7 +80,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
             if (throwError) {
                 importErrorMsg = ": " + throwError.message;
             }
-            throw new utils_js_1.ParseError(`Error parsing imported file: ${filePath}${importErrorMsg}`, undefined, undefined, filePath);
+            throw new errors_js_1.ParseError(`Error parsing imported file: ${filePath}${importErrorMsg}`, undefined, undefined, filePath);
         }
         return { hasError, hasParseError, tree, tokens };
     };
@@ -140,7 +142,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
         visitor.annotateComponents();
     }
     catch (err) {
-        throw new utils_js_1.RenderError(`Error during component annotation: ${err}`, 'annotation');
+        throw new errors_js_1.RenderError(`Error during component annotation: ${err}`, 'annotation');
     }
     const componentLinks = visitor.getComponentCtxLinks();
     const importedLibraries = Array.from(visitor.getScope().libraries.values());
@@ -194,8 +196,10 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
             const graphEngine = new graph_js_1.NetGraph(logger);
             const layoutEngine = new layout_js_1.LayoutEngine(logger);
             const layoutTimer = new utils_js_1.SimpleStopwatch();
+            const styles = (0, styles_js_1.getStylesFromDocument)(documentVariable);
             let sheetFrames;
             try {
+                graphEngine.setStyles(styles);
                 const { graph, containerFrames } = graphEngine.generateLayoutGraph(sequence, nets);
                 sheetFrames = layoutEngine.runLayout(graph, containerFrames, nets);
                 if (enableErc) {
@@ -212,7 +216,13 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
                 }
             }
             catch (err) {
-                throw new utils_js_1.RenderError(`Error during layout generation: ${err}`, 'layout');
+                let useErr = err;
+                if (err instanceof errors_js_1.AutoWireFailedError_) {
+                    const errCtx = visitor.wireCtxLinks.get(err.wire);
+                    useErr = new errors_js_1.AutoWireFailedError(err.message, errCtx.start, errCtx.stop);
+                }
+                dumpData && environment.writeFileSync(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
+                throw new errors_js_1.RenderError(`Error during layout generation`, 'layout', { cause: useErr });
             }
             layoutEngine.printWarnings();
             showStats && console.log('Layout took:', layoutTimer.lap());
@@ -221,10 +231,10 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
             const renderLogger = new logger_js_1.Logger();
             let svgCanvas;
             try {
-                svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger, documentVariable);
+                svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger, documentVariable, styles);
             }
             catch (err) {
-                throw new utils_js_1.RenderError(`Error during SVG generation: ${err}`, 'svg_generation');
+                throw new errors_js_1.RenderError(`Error during SVG generation: ${err}`, 'svg_generation');
             }
             showStats && console.log('Render took:', generateSvgTimer.lap());
             dumpData && environment.writeFileSync(dumpDirectory + 'raw-render.txt', renderLogger.dump());
@@ -235,7 +245,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
                 svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
             }
             catch (err) {
-                throw new utils_js_1.RenderError(`Error generating SVG output: ${err}`, 'svg_output');
+                throw new errors_js_1.RenderError(`Error generating SVG output: ${err}`, 'svg_output');
             }
             if (outputPath) {
                 if (fileExtension === 'svg') {
@@ -243,7 +253,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
                         environment.writeFileSync(outputPath, svgOutput);
                     }
                     catch (err) {
-                        throw new utils_js_1.RenderError(`Error writing SVG file: ${err}`, 'file_output');
+                        throw new errors_js_1.RenderError(`Error writing SVG file: ${err}`, 'file_output');
                     }
                 }
                 else if (fileExtension === 'pdf') {
@@ -264,17 +274,17 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
                         doc.end();
                     }
                     catch (err) {
-                        throw new utils_js_1.RenderError(`Error generating PDF file: ${err}`, 'pdf_output');
+                        throw new errors_js_1.RenderError(`Error generating PDF file: ${err}`, 'pdf_output');
                     }
                 }
                 else {
-                    throw new utils_js_1.RenderError(`Invalid output format: ${fileExtension}`, 'file_output');
+                    throw new errors_js_1.RenderError(`Invalid output format: ${fileExtension}`, 'file_output');
                 }
                 console.log('Generated file', outputPath);
             }
         }
         catch (err) {
-            throw new utils_js_1.RenderError(`Error during rendering: ${err}`, 'output_generation');
+            throw new errors_js_1.RenderError(`Error during rendering: ${err}`, 'output_generation', { cause: err });
         }
     }
     return {

package/dist/cjs/regenerate-tests.js

@@ -45,14 +45,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/cjs/render/draw_symbols.js

@@ -5,7 +5,7 @@ const helpers_js_1 = require("../helpers.js");
 const globals_js_1 = require("../globals.js");
 const geometry_js_1 = require("./geometry.js");
 const PinTypes_js_1 = require("../objects/PinTypes.js");
-const utils_js_1 = require("../utils.js");
+const errors_js_1 = require("../errors.js");
 const types_js_1 = require("../objects/types.js");
 const NumericValue_js_1 = require("../objects/NumericValue.js");
 const PinDefinition_js_1 = require("../objects/PinDefinition.js");
@@ -54,6 +54,9 @@ class SymbolGraphic {
             height: this.height
         };
     }
+    setStyles(styles) {
+        this.styles = styles;
+    }
     size() {
         return {
             width: this.width.toNumber(),
@@ -85,7 +88,7 @@ class SymbolGraphic {
     pinPosition(id) {
         const pin = this.drawing.getPinPosition(id);
         if (pin === null) {
-            throw new utils_js_1.RuntimeExecutionError(`Could not determine pin ${id} position`);
+            throw new errors_js_1.RuntimeExecutionError(`Could not determine pin ${id} position`);
         }
         const [x, y] = pin.start;
         const useX = (0, NumericValue_js_1.roundValue)(x);
@@ -151,7 +154,7 @@ class SymbolGraphic {
             }
             const isHorizontalLabel = finalLabelAngle === 0 || finalLabelAngle === 180;
             const isVerticalLabel = finalLabelAngle === 90 || finalLabelAngle === -90;
-            if (useAnchor === geometry_js_1.HorizontalAlign.Middle) {
+            if (useAnchor === geometry_js_1.HorizontalAlign.Center) {
                 anchorStyle = geometry_js_1.HorizontalAlignProp.Middle;
             }
             else if (useAnchor === geometry_js_1.HorizontalAlign.Left) {
@@ -160,7 +163,7 @@ class SymbolGraphic {
             else if (useAnchor === geometry_js_1.HorizontalAlign.Right) {
                 anchorStyle = geometry_js_1.HorizontalAlignProp.End;
             }
-            if (useDominantBaseline === geometry_js_1.VerticalAlign.Middle) {
+            if (useDominantBaseline === geometry_js_1.VerticalAlign.Center) {
                 dominantBaseline = geometry_js_1.VerticalAlignProp.Central;
             }
             else if (useDominantBaseline === geometry_js_1.VerticalAlign.Top) {
@@ -328,7 +331,7 @@ class SymbolGraphic {
             return geometry_js_1.HorizontalAlign.Left;
         }
         else {
-            return geometry_js_1.HorizontalAlign.Middle;
+            return geometry_js_1.HorizontalAlign.Center;
         }
     }
     flipDominantBaseline(value) {
@@ -339,7 +342,7 @@ class SymbolGraphic {
             return geometry_js_1.VerticalAlign.Top;
         }
         else {
-            return geometry_js_1.VerticalAlign.Middle;
+            return geometry_js_1.VerticalAlign.Center;
         }
     }
 }
@@ -356,7 +359,7 @@ class SymbolText extends SymbolGraphic {
         drawing.clear();
         drawing.addTextbox((0, NumericValue_js_1.numeric)(0), (0, NumericValue_js_1.numeric)(0), this.text, {
             fontSize: this.fontSize,
-            anchor: geometry_js_1.HorizontalAlign.Middle,
+            anchor: geometry_js_1.HorizontalAlign.Center,
             fontWeight: this.fontWeight,
         });
         this.drawing = drawing;
@@ -371,16 +374,25 @@ class SymbolPlaceholder extends SymbolGraphic {
         drawing.angle = this._angle;
         drawing.flipX = this._flipX;
         drawing.flipY = this._flipY;
+        const styles = this.styles ?? {
+            lineColor: globals_js_1.ColorScheme.PinLineColor,
+            textColor: globals_js_1.ColorScheme.PinNameColor,
+            lineWidth: globals_js_1.Defaults.LineWidth,
+        };
+        const defaultLineColor = styles.lineColor;
+        const defaultLineWidth = styles.lineWidth;
+        const defaultTextColor = styles.textColor;
         const commands = [
             [PlaceHolderCommands.units, ['mils'], {}],
-            [PlaceHolderCommands.lineColor, [globals_js_1.ColorScheme.PinLineColor], {}],
-            [PlaceHolderCommands.textColor, [globals_js_1.ColorScheme.PinNameColor], {}],
-            [PlaceHolderCommands.lineWidth, [(0, NumericValue_js_1.numeric)(5)], {}],
+            [PlaceHolderCommands.lineColor, [defaultLineColor], {}],
+            [PlaceHolderCommands.textColor, [defaultTextColor], {}],
+            [PlaceHolderCommands.lineWidth, [defaultLineWidth], {}],
+            [PlaceHolderCommands.fill, ['none']],
             ...drawing.getCommands()
         ];
         drawing.log('id: ', drawing.id, 'angle: ', this._angle, "commands:", commands.length);
-        let lineColor = "#333";
-        let textColor = "#333";
+        let lineColor = defaultLineColor;
+        let textColor = defaultTextColor;
         commands.forEach(([commandName, positionParams, keywordParams, ctx]) => {
             positionParams = positionParams.map(param => {
                 return this.resolveReference(param);
@@ -457,7 +469,7 @@ class SymbolPlaceholder extends SymbolGraphic {
                         drawing.addLabelMils(...tmpPositionParams);
                     }
                     catch (err) {
-                        (0, utils_js_1.throwWithContext)(ctx, err);
+                        (0, errors_js_1.throwWithContext)(ctx, err);
                     }
                     break;
                 }
@@ -635,7 +647,7 @@ class SymbolPlaceholder extends SymbolGraphic {
             displayPinName && usePinName !== "" && drawing.addLabel(endX.add(pinNameOffsetX), endY.add(pinNameOffsetY), usePinName, {
                 fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.defaultPinNameTextSize),
                 anchor: pinNameAlignment,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: pinNameColor,
                 angle: (0, NumericValue_js_1.numeric)(usePinIdAngle)
             });
@@ -653,6 +665,9 @@ class SymbolPlaceholder extends SymbolGraphic {
         super();
         this.drawing = drawing;
     }
+    setStyles(styles) {
+        this.styles = styles;
+    }
 }
 exports.SymbolPlaceholder = SymbolPlaceholder;
 var PlaceHolderCommands;
@@ -670,10 +685,10 @@ var PlaceHolderCommands;
     PlaceHolderCommands["line"] = "line";
     PlaceHolderCommands["label"] = "label";
     PlaceHolderCommands["path"] = "path";
-    PlaceHolderCommands["lineWidth"] = "lineWidth";
+    PlaceHolderCommands["lineWidth"] = "line_width";
     PlaceHolderCommands["fill"] = "fill";
-    PlaceHolderCommands["lineColor"] = "lineColor";
-    PlaceHolderCommands["textColor"] = "textColor";
+    PlaceHolderCommands["lineColor"] = "line_color";
+    PlaceHolderCommands["textColor"] = "text_color";
     PlaceHolderCommands["text"] = "text";
     PlaceHolderCommands["units"] = "units";
     PlaceHolderCommands["for"] = "for";
@@ -745,7 +760,7 @@ class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(leftPinStart.add((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
             });
             drawing.addLabel(leftPinStart.sub((0, helpers_js_1.milsToMM)(10)), pinY.sub((0, helpers_js_1.milsToMM)(10)), pin.pinId.toString(), {
@@ -762,7 +777,7 @@ class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(rightPinStart.sub((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
             });
             drawing.addLabel(rightPinStart.add((0, helpers_js_1.milsToMM)(10)), pinY.sub((0, helpers_js_1.milsToMM)(10)), pin.pinId.toString(), {
@@ -779,7 +794,7 @@ class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(pinX, topPinStart.add((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Right,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
                 angle: (0, NumericValue_js_1.numeric)(-90),
             });
@@ -798,7 +813,7 @@ class SymbolCustom extends SymbolGraphic {
             drawing.addLabel(pinX, bottomPinStart.sub((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(globals_js_1.CustomSymbolPinTextSize),
                 anchor: geometry_js_1.HorizontalAlign.Left,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
                 angle: (0, NumericValue_js_1.numeric)(-90),
             });
@@ -885,7 +900,7 @@ class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(leftPinStart.add(this.portWidth).add((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Left,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
             });
         });
@@ -897,7 +912,7 @@ class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(rightPinStart.sub(this.portWidth).sub((0, helpers_js_1.milsToMM)(20)), pinY, pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Right,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
             });
         });
@@ -909,7 +924,7 @@ class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(pinX, topPinStart.add(this.portWidth).add((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Right,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
                 angle: (0, NumericValue_js_1.numeric)(-90),
             });
@@ -922,7 +937,7 @@ class SymbolCustomModule extends SymbolCustom {
             drawing.addLabel(pinX, bottomPinStart.sub(this.portWidth).sub((0, helpers_js_1.milsToMM)(20)), pin.text, {
                 fontSize: (0, NumericValue_js_1.numeric)(40),
                 anchor: geometry_js_1.HorizontalAlign.Left,
-                vanchor: geometry_js_1.VerticalAlign.Middle,
+                vanchor: geometry_js_1.VerticalAlign.Center,
                 textColor: globals_js_1.ColorScheme.PinNameColor,
                 angle: (0, NumericValue_js_1.numeric)(-90),
             });

package/dist/cjs/render/geometry.js

@@ -465,7 +465,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],
@@ -491,7 +491,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],
@@ -508,7 +508,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],
@@ -517,7 +517,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],
@@ -544,13 +544,13 @@ function labelPolygonForAnchors(x, y, width, height, hAnchor, vAnchor) {
 var HorizontalAlign;
 (function (HorizontalAlign) {
     HorizontalAlign["Left"] = "left";
-    HorizontalAlign["Middle"] = "middle";
+    HorizontalAlign["Center"] = "center";
     HorizontalAlign["Right"] = "right";
 })(HorizontalAlign || (exports.HorizontalAlign = HorizontalAlign = {}));
 var VerticalAlign;
 (function (VerticalAlign) {
     VerticalAlign["Top"] = "top";
-    VerticalAlign["Middle"] = "middle";
+    VerticalAlign["Center"] = "center";
     VerticalAlign["Bottom"] = "bottom";
 })(VerticalAlign || (exports.VerticalAlign = VerticalAlign = {}));
 var HorizontalAlignProp;

package/dist/cjs/render/graph.js

@@ -39,6 +39,9 @@ class NetGraph {
     constructor(logger) {
         this.logger = logger;
     }
+    setStyles(styles) {
+        this.styles = styles;
+    }
     generateLayoutGraph(sequence, nets) {
         this.print('===== creating graph and populating with nodes =====');
         let previousNode = null;
@@ -72,6 +75,7 @@ class NetGraph {
                         let tmpSymbol;
                         if (displayProp instanceof draw_symbols_js_1.SymbolDrawing) {
                             tmpSymbol = new draw_symbols_js_1.SymbolPlaceholder(displayProp);
+                            tmpSymbol.setStyles(this.styles);
                             tmpSymbol.drawing.logger = this.logger;
                         }
                         else {