circuitscript 0.5.3 → 0.5.4

package/dist/cjs/annotate/ComponentAnnotater.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentAnnotater = void 0;
 const visitor_js_1 = require("./../visitor.js");
+const globals_js_1 = require("../globals.js");
 class ComponentAnnotater {
     constructor() {
         this.counter = {};
@@ -14,8 +15,8 @@ class ComponentAnnotater {
     getAnnotation(instance) {
         let usePrefix;
         let useCounterKey;
-        if (instance.hasParam('refdesPrefix')) {
-            const prefix = instance.getParam('refdesPrefix');
+        if (instance.hasParam(globals_js_1.KeywordRefdesPrefix)) {
+            const prefix = instance.getParam(globals_js_1.KeywordRefdesPrefix);
             if (this.counter[prefix] === undefined) {
                 this.counter[prefix] = 1;
             }

package/dist/cjs/globals.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SymbolValidatorContext = exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.NetGraphicsParams = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.PortPaddingVertical = exports.PortPaddingHorizontal = exports.PortArrowSize = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.displayUnits = exports.defaultFrameTitleTextSize = exports.CustomSymbolParamTextSize = exports.CustomSymbolRefDesSize = exports.CustomSymbolPinIdSize = exports.CustomSymbolPinTextSize = exports.defaultPageSpacingMM = exports.defaultPageMarginMM = exports.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultWireLineWidth = exports.defaultSymbolLineWidth = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPt = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.ValidPinSides = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = exports.RefdesFileSuffix = exports.BaseNamespace = exports.DoubleDelimiter1 = exports.Delimiter1 = exports.TOOL_VERSION = void 0;
-exports.PinTypesList = exports.DefaultComponentUnit = exports.TrailerArrayIndex = void 0;
+exports.RenderFlags = exports.KeywordRefdesPrefix = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.NetGraphicsParams = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.PortPaddingVertical = exports.PortPaddingHorizontal = exports.PortArrowSize = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.displayUnits = exports.defaultFrameTitleTextSize = exports.CustomSymbolParamTextSize = exports.CustomSymbolRefDesSize = exports.CustomSymbolPinIdSize = exports.CustomSymbolPinTextSize = exports.defaultPageSpacingMM = exports.defaultPageMarginMM = exports.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultSymbolLineWidth = exports.Defaults = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPt = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.ValidPinSides = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = exports.RefdesFileSuffix = exports.BaseNamespace = exports.DoubleDelimiter1 = exports.Delimiter1 = exports.TOOL_VERSION = void 0;
+exports.PinTypesList = exports.DefaultComponentUnit = exports.TrailerArrayIndex = exports.SymbolValidatorContext = void 0;
 const NumericValue_js_1 = require("./objects/NumericValue.js");
 const PinTypes_js_1 = require("./objects/PinTypes.js");
 exports.TOOL_VERSION = '0.1.5';
@@ -60,8 +60,11 @@ exports.portHeight = 2;
 exports.defaultGridSizeUnits = (0, NumericValue_js_1.numeric)(exports.MilsToMM).mul(100).toNumber();
 exports.defaultZoomScale = 2.5;
 exports.fontDisplayScale = 0.032;
+exports.Defaults = {
+    WireLineWidth: (0, NumericValue_js_1.numeric)(6),
+    LineWidth: (0, NumericValue_js_1.numeric)(5),
+};
 exports.defaultSymbolLineWidth = (0, NumericValue_js_1.numeric)(exports.MilsToMM).mul(6).toNumber();
-exports.defaultWireLineWidth = (0, NumericValue_js_1.numeric)(exports.MilsToMM).mul(6).toNumber();
 exports.defaultPinNameTextSize = 40;
 exports.defaultPinIdTextSize = 30;
 exports.defaultPageMarginMM = 10;
@@ -107,10 +110,10 @@ var ReferenceTypes;
 var NetGraphicsParams;
 (function (NetGraphicsParams) {
     NetGraphicsParams["Color"] = "color";
-    NetGraphicsParams["LineWidth"] = "lineWidth";
+    NetGraphicsParams["LineWidth"] = "line_width";
     NetGraphicsParams["Highlight"] = "highlight";
-    NetGraphicsParams["HighlightWidth"] = "highlightWidth";
-    NetGraphicsParams["HighlightOpacity"] = "highlightOpacity";
+    NetGraphicsParams["HighlightWidth"] = "highlight_width";
+    NetGraphicsParams["HighlightOpacity"] = "highlight_opacity";
 })(NetGraphicsParams || (exports.NetGraphicsParams = NetGraphicsParams = {}));
 var FrameType;
 (function (FrameType) {
@@ -119,6 +122,7 @@ var FrameType;
 })(FrameType || (exports.FrameType = FrameType = {}));
 exports.ModuleContainsKeyword = 'contains';
 exports.GlobalDocumentName = 'document';
+exports.KeywordRefdesPrefix = 'refdes_prefix';
 exports.RenderFlags = {
     ShowElementFrames: false,
     ShowOrigin: false,

package/dist/cjs/objects/Frame.js

@@ -27,6 +27,13 @@ var FrameParamKeys;
     FrameParamKeys["SheetType"] = "sheet_type";
     FrameParamKeys["GridStyle"] = "grid_style";
     FrameParamKeys["GridColor"] = "grid_color";
+    FrameParamKeys["BackgroundColor"] = "background_color";
+    FrameParamKeys["LineColor"] = "line_color";
+    FrameParamKeys["LineWidth"] = "line_width";
+    FrameParamKeys["FillColor"] = "fill_color";
+    FrameParamKeys["TextColor"] = "text_color";
+    FrameParamKeys["WireColor"] = "wire_color";
+    FrameParamKeys["WireWidth"] = "wire_width";
     FrameParamKeys["TitleAlign"] = "title_align";
     FrameParamKeys["HorizontalAlign"] = "align";
     FrameParamKeys["VerticalAlign"] = "valign";

package/dist/cjs/pipeline.js

@@ -20,6 +20,7 @@ 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");
 async function renderScript(scriptData, outputPath, options) {
     const parseHandlers = [
         new KiCadNetListOutputHandler_js_1.KiCadNetListOutputHandler(),
@@ -194,8 +195,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) {
@@ -221,7 +224,7 @@ 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');

package/dist/cjs/render/draw_symbols.js

@@ -54,6 +54,9 @@ class SymbolGraphic {
             height: this.height
         };
     }
+    setStyles(styles) {
+        this.styles = styles;
+    }
     size() {
         return {
             width: this.width.toNumber(),
@@ -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);
@@ -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";

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 {

package/dist/cjs/render/render.js

@@ -25,7 +25,7 @@ function createSvgCanvas() {
     (0, sizing_js_1.applyFontsToSVG)(canvas);
     return canvas;
 }
-function renderSheetsToSVG(sheetFrames, logger, documentVariable) {
+function renderSheetsToSVG(sheetFrames, logger, documentVariable, styles) {
     const canvas = createSvgCanvas();
     sheetFrames.forEach((sheet, index) => {
         const sheetGroup = canvas.group();
@@ -87,8 +87,9 @@ function renderSheetsToSVG(sheetFrames, logger, documentVariable) {
             extendGrid,
             style: documentVariable[Frame_js_1.FrameParamKeys.GridStyle],
             color: documentVariable[Frame_js_1.FrameParamKeys.GridColor],
+            backgroundColor: documentVariable[Frame_js_1.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());
     });
@@ -135,7 +136,7 @@ function generatePdfOutput(doc, canvas, sheetSize, sheetSizeDefined, zoomScale =
     });
 }
 exports.generatePdfOutput = generatePdfOutput;
-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');
@@ -189,19 +190,22 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
     }
     const mergedWireHighlightGroup = canvas.group();
     const mergedWireGroup = canvas.group();
+    styles = styles ?? {};
+    const defaultWireColor = styles.wireColor;
+    const defaultWireLineWidth = (0, helpers_js_1.milsToMM)(styles.wireWidth).toNumber();
     mergedWires.forEach(tmpItem => {
         const { intersectPoints, net = null, lines = null } = tmpItem;
         let useJunctionColor = globals_js_1.ColorScheme.JunctionColor;
-        let useColor = globals_js_1.ColorScheme.WireColor;
-        let useLineWidth = globals_js_1.defaultWireLineWidth;
+        let useColor = defaultWireColor;
+        let useLineWidth = defaultWireLineWidth;
         let displayHighlight = false;
         let displayHighlightColor = null;
         let displayHighlightOpacity = 0.3;
         let displayHighlightWidth = 5 * globals_js_1.MilsToMM;
         if (net !== null) {
-            useColor = net.color ?? globals_js_1.ColorScheme.WireColor;
+            useColor = net.color ?? defaultWireColor;
             useJunctionColor = net.color ?? globals_js_1.ColorScheme.JunctionColor;
-            useLineWidth = net.lineWidth ?? globals_js_1.defaultWireLineWidth;
+            useLineWidth = net.lineWidth ?? defaultWireLineWidth;
             if (net.highlight !== null) {
                 displayHighlight = true;
                 displayHighlightColor = net.highlight ?? null;
@@ -302,7 +306,7 @@ 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 = globals_js_1.defaultGridSizeUnits;
     const { xmin, ymin, xmax, ymax } = canvasSize;
     const extraValue = extendGrid ? 1 : 0;
@@ -330,6 +334,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).toNumber();
+        const height = gridEndY.sub(gridStartY).toNumber();
+        group
+            .rect(width, height).fill(backgroundColor)
+            .translate(gridStartX.toNumber(), gridStartY.toNumber());
+    }
     const strokeSize = (0, helpers_js_1.milsToMM)(3);
     group.addClass('grid')
         .path(lines.join(" "))

package/dist/cjs/styles.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStylesFromDocument = exports.Styles = void 0;
+const globals_js_1 = require("./globals.js");
+const Frame_js_1 = require("./objects/Frame.js");
+class Styles {
+}
+exports.Styles = Styles;
+function getStylesFromDocument(document) {
+    const styles = new Styles();
+    styles.lineColor = document[Frame_js_1.FrameParamKeys.LineColor] ?? globals_js_1.ColorScheme.PinLineColor;
+    styles.lineWidth = document[Frame_js_1.FrameParamKeys.LineWidth] ?? globals_js_1.Defaults.LineWidth;
+    styles.fillColor = document[Frame_js_1.FrameParamKeys.FillColor];
+    styles.textColor = document[Frame_js_1.FrameParamKeys.TextColor] ?? globals_js_1.ColorScheme.PinNameColor;
+    styles.wireColor = document[Frame_js_1.FrameParamKeys.WireColor] ?? globals_js_1.ColorScheme.WireColor;
+    styles.wireWidth = document[Frame_js_1.FrameParamKeys.WireWidth] ?? globals_js_1.Defaults.WireLineWidth;
+    return styles;
+}
+exports.getStylesFromDocument = getStylesFromDocument;

package/dist/esm/annotate/ComponentAnnotater.js

@@ -1,4 +1,5 @@
 import { ComponentRefDesPrefixes } from './../visitor.js';
+import { KeywordRefdesPrefix } from '../globals.js';
 export class ComponentAnnotater {
     counter = {};
     indexedContextPrefix = new Map();
@@ -11,8 +12,8 @@ export class ComponentAnnotater {
     getAnnotation(instance) {
         let usePrefix;
         let useCounterKey;
-        if (instance.hasParam('refdesPrefix')) {
-            const prefix = instance.getParam('refdesPrefix');
+        if (instance.hasParam(KeywordRefdesPrefix)) {
+            const prefix = instance.getParam(KeywordRefdesPrefix);
             if (this.counter[prefix] === undefined) {
                 this.counter[prefix] = 1;
             }

package/dist/esm/globals.js

@@ -56,8 +56,11 @@ export const portHeight = 2;
 export const defaultGridSizeUnits = numeric(MilsToMM).mul(100).toNumber();
 export const defaultZoomScale = 2.5;
 export const fontDisplayScale = 0.032;
+export const Defaults = {
+    WireLineWidth: numeric(6),
+    LineWidth: numeric(5),
+};
 export const defaultSymbolLineWidth = numeric(MilsToMM).mul(6).toNumber();
-export const defaultWireLineWidth = numeric(MilsToMM).mul(6).toNumber();
 export const defaultPinNameTextSize = 40;
 export const defaultPinIdTextSize = 30;
 export const defaultPageMarginMM = 10;
@@ -103,10 +106,10 @@ export var ReferenceTypes;
 export var NetGraphicsParams;
 (function (NetGraphicsParams) {
     NetGraphicsParams["Color"] = "color";
-    NetGraphicsParams["LineWidth"] = "lineWidth";
+    NetGraphicsParams["LineWidth"] = "line_width";
     NetGraphicsParams["Highlight"] = "highlight";
-    NetGraphicsParams["HighlightWidth"] = "highlightWidth";
-    NetGraphicsParams["HighlightOpacity"] = "highlightOpacity";
+    NetGraphicsParams["HighlightWidth"] = "highlight_width";
+    NetGraphicsParams["HighlightOpacity"] = "highlight_opacity";
 })(NetGraphicsParams || (NetGraphicsParams = {}));
 export var FrameType;
 (function (FrameType) {
@@ -115,6 +118,7 @@ export var FrameType;
 })(FrameType || (FrameType = {}));
 export const ModuleContainsKeyword = 'contains';
 export const GlobalDocumentName = 'document';
+export const KeywordRefdesPrefix = 'refdes_prefix';
 export const RenderFlags = {
     ShowElementFrames: false,
     ShowOrigin: false,

package/dist/esm/objects/Frame.js

@@ -25,6 +25,13 @@ export var FrameParamKeys;
     FrameParamKeys["SheetType"] = "sheet_type";
     FrameParamKeys["GridStyle"] = "grid_style";
     FrameParamKeys["GridColor"] = "grid_color";
+    FrameParamKeys["BackgroundColor"] = "background_color";
+    FrameParamKeys["LineColor"] = "line_color";
+    FrameParamKeys["LineWidth"] = "line_width";
+    FrameParamKeys["FillColor"] = "fill_color";
+    FrameParamKeys["TextColor"] = "text_color";
+    FrameParamKeys["WireColor"] = "wire_color";
+    FrameParamKeys["WireWidth"] = "wire_width";
     FrameParamKeys["TitleAlign"] = "title_align";
     FrameParamKeys["HorizontalAlign"] = "align";
     FrameParamKeys["VerticalAlign"] = "valign";

package/dist/esm/pipeline.js

@@ -14,6 +14,7 @@ import { renderSheetsToSVG, generateSvgOutput, generatePdfOutput } from "./rende
 import { EvaluateERCRules } from "./rules-check/rules.js";
 import { RuntimeExecutionError, ParseSyntaxError, ParseError, printWarnings, RenderError, generateDebugSequenceAction, sequenceActionString, SimpleStopwatch } from "./utils.js";
 import { ParserVisitor } from "./visitor.js";
+import { getStylesFromDocument } from "./styles.js";
 export async function renderScript(scriptData, outputPath, options) {
     const parseHandlers = [
         new KiCadNetListOutputHandler(),
@@ -187,8 +188,10 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
             const graphEngine = new NetGraph(logger);
             const layoutEngine = new LayoutEngine(logger);
             const layoutTimer = new SimpleStopwatch();
+            const styles = getStylesFromDocument(documentVariable);
             let sheetFrames;
             try {
+                graphEngine.setStyles(styles);
                 const { graph, containerFrames } = graphEngine.generateLayoutGraph(sequence, nets);
                 sheetFrames = layoutEngine.runLayout(graph, containerFrames, nets);
                 if (enableErc) {
@@ -214,7 +217,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
             const renderLogger = new Logger();
             let svgCanvas;
             try {
-                svgCanvas = renderSheetsToSVG(sheetFrames, renderLogger, documentVariable);
+                svgCanvas = renderSheetsToSVG(sheetFrames, renderLogger, documentVariable, styles);
             }
             catch (err) {
                 throw new RenderError(`Error during SVG generation: ${err}`, 'svg_generation');

package/dist/esm/render/draw_symbols.js

@@ -1,5 +1,5 @@
 import { milsToMM } from "../helpers.js";
-import { ColorScheme, CustomSymbolParamTextSize, CustomSymbolPinIdSize, CustomSymbolPinTextSize, CustomSymbolRefDesSize, PinTypesList, PortArrowSize, PortPaddingHorizontal, PortPaddingVertical, ReferenceTypes, RenderFlags, SymbolPinSide, defaultFont, defaultPinIdTextSize, defaultPinNameTextSize, defaultSymbolLineWidth, fontDisplayScale } from "../globals.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";
@@ -16,6 +16,7 @@ export class SymbolGraphic {
     width = numeric(-1);
     height = numeric(-1);
     labelTexts = new Map();
+    styles;
     constructor() {
         this.drawing = new SymbolDrawing();
     }
@@ -52,6 +53,9 @@ export class SymbolGraphic {
             height: this.height
         };
     }
+    setStyles(styles) {
+        this.styles = styles;
+    }
     size() {
         return {
             width: this.width.toNumber(),
@@ -361,6 +365,7 @@ export class SymbolText extends SymbolGraphic {
     }
 }
 export class SymbolPlaceholder extends SymbolGraphic {
+    styles;
     generateDrawing() {
         const drawing = this.drawing;
         drawing.log("=== start generate drawing ===");
@@ -368,16 +373,25 @@ export class SymbolPlaceholder extends SymbolGraphic {
         drawing.angle = this._angle;
         drawing.flipX = this._flipX;
         drawing.flipY = this._flipY;
+        const styles = this.styles ?? {
+            lineColor: ColorScheme.PinLineColor,
+            textColor: ColorScheme.PinNameColor,
+            lineWidth: Defaults.LineWidth,
+        };
+        const defaultLineColor = styles.lineColor;
+        const defaultLineWidth = styles.lineWidth;
+        const defaultTextColor = styles.textColor;
         const commands = [
             [PlaceHolderCommands.units, ['mils'], {}],
-            [PlaceHolderCommands.lineColor, [ColorScheme.PinLineColor], {}],
-            [PlaceHolderCommands.textColor, [ColorScheme.PinNameColor], {}],
-            [PlaceHolderCommands.lineWidth, [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);
@@ -650,6 +664,9 @@ export class SymbolPlaceholder extends SymbolGraphic {
         super();
         this.drawing = drawing;
     }
+    setStyles(styles) {
+        this.styles = styles;
+    }
 }
 export var PlaceHolderCommands;
 (function (PlaceHolderCommands) {
@@ -666,10 +683,10 @@ export 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";

package/dist/esm/render/graph.js

@@ -11,9 +11,13 @@ import Matrix, { solve } from "ml-matrix";
 import { getPinDefinition, PinId } from "../objects/PinDefinition.js";
 export class NetGraph {
     logger;
+    styles;
     constructor(logger) {
         this.logger = logger;
     }
+    setStyles(styles) {
+        this.styles = styles;
+    }
     generateLayoutGraph(sequence, nets) {
         this.print('===== creating graph and populating with nodes =====');
         let previousNode = null;
@@ -47,6 +51,7 @@ export class NetGraph {
                         let tmpSymbol;
                         if (displayProp instanceof SymbolDrawing) {
                             tmpSymbol = new SymbolPlaceholder(displayProp);
+                            tmpSymbol.setStyles(this.styles);
                             tmpSymbol.drawing.logger = this.logger;
                         }
                         else {

package/dist/esm/render/render.js

@@ -1,7 +1,7 @@
 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 { ColorScheme, ComponentTypes, FrameType, MMToPt, MMToPx, MilsToMM, ParamKeys, RenderFlags, defaultGridSizeUnits, defaultPageSpacingMM, fontDisplayScale, junctionSize } from '../globals.js';
 import { NumericValue, numeric } from '../objects/NumericValue.js';
 import { combineMaps, getBoundsSize } from '../utils.js';
 import { milsToMM } from '../helpers.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) {
@@ -293,7 +297,7 @@ 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;
@@ -321,6 +325,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).toNumber();
+        const height = gridEndY.sub(gridStartY).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/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/libs/std.cst

@@ -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,7 +38,7 @@ def port(value, portType="input"):
         pins: 1
         copy: true
         display: create graphic (params):
-            textColor: "#222"
+            text_color: "#222"
             label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
             pin: 1, 0, 0, 0, 0, display_id=false
         type: "port"
@@ -73,7 +73,7 @@ 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
@@ -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")
 

package/dist/types/globals.d.ts

@@ -46,8 +46,11 @@ export declare const portHeight = 2;
 export declare const defaultGridSizeUnits: number;
 export declare const defaultZoomScale = 2.5;
 export declare const fontDisplayScale = 0.032;
+export declare const Defaults: {
+    WireLineWidth: import("./objects/NumericValue.js").NumericValue;
+    LineWidth: import("./objects/NumericValue.js").NumericValue;
+};
 export declare const defaultSymbolLineWidth: number;
-export declare const defaultWireLineWidth: number;
 export declare const defaultPinNameTextSize = 40;
 export declare const defaultPinIdTextSize = 30;
 export declare const defaultPageMarginMM = 10;
@@ -90,10 +93,10 @@ export declare enum ReferenceTypes {
 }
 export declare enum NetGraphicsParams {
     Color = "color",
-    LineWidth = "lineWidth",
+    LineWidth = "line_width",
     Highlight = "highlight",
-    HighlightWidth = "highlightWidth",
-    HighlightOpacity = "highlightOpacity"
+    HighlightWidth = "highlight_width",
+    HighlightOpacity = "highlight_opacity"
 }
 export declare enum FrameType {
     Frame = 1,
@@ -101,6 +104,7 @@ export declare enum FrameType {
 }
 export declare const ModuleContainsKeyword = "contains";
 export declare const GlobalDocumentName = "document";
+export declare const KeywordRefdesPrefix = "refdes_prefix";
 export declare const RenderFlags: {
     ShowElementFrames: boolean;
     ShowOrigin: boolean;

package/dist/types/objects/Frame.d.ts

@@ -20,6 +20,13 @@ export declare enum FrameParamKeys {
     SheetType = "sheet_type",
     GridStyle = "grid_style",
     GridColor = "grid_color",
+    BackgroundColor = "background_color",
+    LineColor = "line_color",
+    LineWidth = "line_width",
+    FillColor = "fill_color",
+    TextColor = "text_color",
+    WireColor = "wire_color",
+    WireWidth = "wire_width",
     TitleAlign = "title_align",
     HorizontalAlign = "align",
     VerticalAlign = "valign",

package/dist/types/render/draw_symbols.d.ts

@@ -5,6 +5,7 @@ import { PinTypes } from "../objects/PinTypes.js";
 import { ParserRuleContext } from "antlr4ng";
 import { NumericValue } from "../objects/NumericValue.js";
 import { PinId } from "../objects/PinDefinition.js";
+import { Styles } from "src/styles.js";
 export declare abstract class SymbolGraphic {
     drawPortsName: boolean;
     displayBounds: boolean;
@@ -15,6 +16,7 @@ export declare abstract class SymbolGraphic {
     width: NumericValue;
     height: NumericValue;
     labelTexts: Map<string, string>;
+    styles?: Styles;
     constructor();
     get angle(): number;
     set angle(value: number);
@@ -29,6 +31,7 @@ export declare abstract class SymbolGraphic {
         width: NumericValue;
         height: NumericValue;
     };
+    setStyles(styles: Styles): void;
     abstract generateDrawing(): void;
     size(): {
         width: number;
@@ -58,6 +61,7 @@ export declare class SymbolText extends SymbolGraphic {
     generateDrawing(): void;
 }
 export declare class SymbolPlaceholder extends SymbolGraphic {
+    styles: Styles;
     generateDrawing(): void;
     private resolveReference;
     parseLabelStyle(keywordParams: Map<string, any>): {
@@ -65,6 +69,7 @@ export declare class SymbolPlaceholder extends SymbolGraphic {
     };
     drawPinParams(drawing: SymbolDrawingCommands, commandName: string, keywordParams: Map<string, any>, positionParams: any[], lineColor: string, pinNameColor: string): void;
     constructor(drawing: SymbolDrawing);
+    setStyles(styles: Styles): void;
 }
 export declare enum PlaceHolderCommands {
     arc = "arc",
@@ -80,10 +85,10 @@ export declare enum PlaceHolderCommands {
     line = "line",
     label = "label",
     path = "path",
-    lineWidth = "lineWidth",
+    lineWidth = "line_width",
     fill = "fill",
-    lineColor = "lineColor",
-    textColor = "textColor",
+    lineColor = "line_color",
+    textColor = "text_color",
     text = "text",
     units = "units",
     for = "for"

package/dist/types/render/graph.d.ts

@@ -7,9 +7,12 @@ import { Net } from "../objects/Net.js";
 import { Logger } from "../logger.js";
 import { ComponentPinNetPair } from "../objects/types.js";
 import { PinId } from "../objects/PinDefinition.js";
+import { Styles } from "src/styles.js";
 export declare class NetGraph {
     logger: Logger;
+    styles: Styles;
     constructor(logger: Logger);
+    setStyles(styles: Styles): void;
     generateLayoutGraph(sequence: SequenceItem[], nets: [ClassComponent, pin: PinId, net: Net][]): {
         graph: Graph;
         containerFrames: RenderFrame[];

package/dist/types/render/render.d.ts

@@ -3,6 +3,7 @@ import { Svg } from '@svgdotjs/svg.js';
 import { SheetFrame } from "./layout.js";
 import { Logger } from '../logger.js';
 import { DocumentVariable } from 'src/objects/types.js';
-export declare function renderSheetsToSVG(sheetFrames: SheetFrame[], logger: Logger, documentVariable: DocumentVariable): Svg;
+import { Styles } from 'src/styles.js';
+export declare function renderSheetsToSVG(sheetFrames: SheetFrame[], logger: Logger, documentVariable: DocumentVariable, styles: Styles): Svg;
 export declare function generateSvgOutput(canvas: Svg, zoomScale?: number): string;
 export declare function generatePdfOutput(doc: PDFKit.PDFDocument, canvas: Svg, sheetSize: string, sheetSizeDefined: boolean, zoomScale?: number): void;

package/dist/types/styles.d.ts

@@ -0,0 +1,11 @@
+import { NumericValue } from "./objects/NumericValue.js";
+import { DocumentVariable } from "./objects/types.js";
+export declare class Styles {
+    lineColor?: string;
+    lineWidth?: NumericValue;
+    fillColor?: string;
+    textColor?: string;
+    wireColor?: string;
+    wireWidth?: NumericValue;
+}
+export declare function getStylesFromDocument(document: DocumentVariable): Styles;

package/libs/std.cst

@@ -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,7 +38,7 @@ def port(value, portType="input"):
         pins: 1
         copy: true
         display: create graphic (params):
-            textColor: "#222"
+            text_color: "#222"
             label: params.value, 0, 0, fontSize=40, anchor="left", vanchor="middle", portType=portType
             pin: 1, 0, 0, 0, 0, display_id=false
         type: "port"
@@ -73,7 +73,7 @@ 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
@@ -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")
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.5.3",
+    "version": "0.5.4",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {