circuitscript 0.0.27 → 0.0.29

package/dist/cjs/draw_symbols.js

@@ -106,17 +106,20 @@ class SymbolGraphic {
         });
     }
     drawPins(group) {
-        group.path(this.drawing.getPinsPath())
-            .stroke({
-            width: defaultSymbolLineWidth,
-            color: '#333',
+        const pinPaths = this.drawing.getPinsPath();
+        pinPaths.forEach(({ path, lineColor }) => {
+            group.path(path)
+                .stroke({
+                width: defaultSymbolLineWidth,
+                color: lineColor
+            });
         });
     }
     drawLabels(group) {
         const labels = this.drawing.getLabels();
         labels.forEach(label => {
             const tmpLabel = label;
-            const { fontSize = 10, anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', angle: labelAngle = 0, } = tmpLabel.style ?? {};
+            const { fontSize = 10, anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', angle: labelAngle = 0, textColor = "#333", } = tmpLabel.style ?? {};
             let anchorStyle = 'start';
             let dominantBaseline = 'auto';
             let useAnchor = anchor;
@@ -158,7 +161,7 @@ class SymbolGraphic {
             const useFont = globals_js_1.defaultFont;
             const textContainer = group.group();
             const text = textContainer.text(tmpLabel.text)
-                .fill('#333')
+                .fill(textColor)
                 .font({
                 family: useFont,
                 size: fontSize,
@@ -273,8 +276,14 @@ class SymbolPlaceholder extends SymbolGraphic {
         drawing.angle = this._angle;
         drawing.flipX = this._flipX;
         drawing.flipY = this._flipY;
-        const commands = drawing.getCommands();
+        const commands = [
+            [PlaceHolderCommands.lineColor, [globals_js_1.ColorScheme.PinLineColor], {}],
+            [PlaceHolderCommands.textColor, [globals_js_1.ColorScheme.PinNameColor], {}],
+            ...drawing.getCommands()
+        ];
         drawing.log('id: ', drawing.id, 'angle: ', this._angle, "commands:", commands.length);
+        let lineColor = "#333";
+        let textColor = "#333";
         commands.forEach(([commandName, positionParams, keywordParams]) => {
             switch (commandName) {
                 case PlaceHolderCommands.rect:
@@ -304,6 +313,11 @@ class SymbolPlaceholder extends SymbolGraphic {
                     break;
                 case PlaceHolderCommands.lineColor:
                     drawing.addSetLineColor(...positionParams);
+                    lineColor = positionParams[0];
+                    break;
+                case PlaceHolderCommands.textColor:
+                    drawing.addSetTextColor(...positionParams);
+                    textColor = positionParams[0];
                     break;
                 case PlaceHolderCommands.arc:
                     drawing.addArc(...positionParams);
@@ -318,11 +332,14 @@ class SymbolPlaceholder extends SymbolGraphic {
                 case PlaceHolderCommands.hpin:
                 case PlaceHolderCommands.vpin:
                     {
-                        this.drawPinParams(drawing, commandName, keywordParams, positionParams);
+                        this.drawPinParams(drawing, commandName, keywordParams, positionParams, lineColor, textColor);
                         break;
                     }
                 case PlaceHolderCommands.label: {
                     const style = this.parseLabelStyle(keywordParams);
+                    if (style['textColor'] === undefined) {
+                        style['textColor'] = textColor;
+                    }
                     positionParams = [...positionParams];
                     positionParams.push(style);
                     const labelId = positionParams[0];
@@ -353,7 +370,7 @@ class SymbolPlaceholder extends SymbolGraphic {
         drawing.log("=== end generate drawing ===");
     }
     parseLabelStyle(keywordParams) {
-        const keywords = ['fontSize', 'anchor', 'vanchor', 'angle'];
+        const keywords = ['fontSize', 'anchor', 'vanchor', 'angle', 'textColor'];
         const style = {};
         keywords.forEach(item => {
             if (keywordParams.has(item)) {
@@ -362,13 +379,15 @@ class SymbolPlaceholder extends SymbolGraphic {
         });
         return style;
     }
-    drawPinParams(drawing, commandName, keywordParams, positionParams) {
+    drawPinParams(drawing, commandName, keywordParams, positionParams, lineColor, pinNameColor) {
         drawing.log('add pin', ...positionParams);
         const keywordDisplayPinId = 'display_pin_id';
         let displayPinId = true;
-        if (keywordParams.has(keywordDisplayPinId)
-            && keywordParams.get(keywordDisplayPinId) === 0) {
-            displayPinId = false;
+        if (keywordParams.has(keywordDisplayPinId)) {
+            const value = keywordParams.get(keywordDisplayPinId);
+            if (value === 0 || value === false) {
+                displayPinId = false;
+            }
         }
         let pinNameParam = null;
         let pinType = PinTypes_js_1.PinTypes.Any;
@@ -402,7 +421,7 @@ class SymbolPlaceholder extends SymbolGraphic {
                 startY
             ];
         }
-        drawing.addPin(...positionParams);
+        drawing.addPin(...positionParams, lineColor);
         const lastAddedPin = this.drawing.pins[this.drawing.pins.length - 1];
         const [pinId, , angle] = lastAddedPin;
         const [, , , endX, endY] = positionParams;
@@ -441,11 +460,13 @@ class SymbolPlaceholder extends SymbolGraphic {
                 fontSize: 10,
                 anchor: pinNameAlignment,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
+                textColor: pinNameColor,
             });
             displayPinId && drawing.addLabel(endX + pinIdOffsetX, endY + pinIdOffsetY, pinId.toString(), {
                 fontSize: 8,
                 anchor: pinIdAlignment,
                 vanchor: pinIdVAlignment,
+                textColor: lineColor
             });
         }
     }
@@ -472,6 +493,7 @@ var PlaceHolderCommands;
     PlaceHolderCommands["lineWidth"] = "lineWidth";
     PlaceHolderCommands["fill"] = "fill";
     PlaceHolderCommands["lineColor"] = "lineColor";
+    PlaceHolderCommands["textColor"] = "textColor";
     PlaceHolderCommands["text"] = "text";
 })(PlaceHolderCommands || (exports.PlaceHolderCommands = PlaceHolderCommands = {}));
 class SymbolCustom extends SymbolGraphic {
@@ -502,6 +524,8 @@ class SymbolCustom extends SymbolGraphic {
         drawing.flipY = this._flipY;
         const bodyWidth = this.bodyWidth;
         const bodyHeight = (1 + Math.max(maxLeftPins, maxRightPins)) * this.pinSpacing;
+        const defaultLineColor = globals_js_1.ColorScheme.PinLineColor;
+        drawing.addSetLineColor(defaultLineColor);
         drawing.addRect(0, 0, bodyWidth, bodyHeight);
         const leftPinStart = -bodyWidth / 2;
         const rightPinStart = bodyWidth / 2;
@@ -509,31 +533,35 @@ class SymbolCustom extends SymbolGraphic {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY + (position + 1) * this.pinSpacing;
-            drawing.addPin(pin.pinId, leftPinStart - this.pinLength, pinY, leftPinStart, pinY);
+            drawing.addPin(pin.pinId, leftPinStart - this.pinLength, pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addLabel(leftPinStart + 4, pinY, pin.text, {
                 fontSize: 10,
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
+                textColor: globals_js_1.ColorScheme.PinNameColor,
             });
             drawing.addLabel(leftPinStart - 2, pinY - 2, pin.pinId.toString(), {
                 fontSize: 8,
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Bottom,
+                textColor: defaultLineColor
             });
         });
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY + (position + 1) * this.pinSpacing;
-            drawing.addPin(pin.pinId, rightPinStart + this.pinLength, pinY, rightPinStart, pinY);
+            drawing.addPin(pin.pinId, rightPinStart + this.pinLength, pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addLabel(rightPinStart - 4, pinY, pin.text, {
                 fontSize: 10,
                 anchor: geometry_js_1.HorizontalAlign.Right,
                 vanchor: geometry_js_1.VerticalAlign.Middle,
+                textColor: globals_js_1.ColorScheme.PinNameColor,
             });
             drawing.addLabel(rightPinStart + 2, pinY - 2, pin.pinId.toString(), {
                 fontSize: 8,
                 anchor: geometry_js_1.HorizontalAlign.Left,
                 vanchor: geometry_js_1.VerticalAlign.Bottom,
+                textColor: defaultLineColor
             });
         });
         const instanceName = this.getLabelValue("refdes");
@@ -583,7 +611,7 @@ class SymbolDrawing {
         this.items.push(geometry_js_1.Geometry.segment([startX, startY], [endX, endY]));
         return this;
     }
-    addPin(pinId, startX, startY, endX, endY) {
+    addPin(pinId, startX, startY, endX, endY, lineColor) {
         let angle = 0;
         if (startX === endX) {
             if (startY > endY) {
@@ -604,7 +632,8 @@ class SymbolDrawing {
         this.pins.push([
             pinId,
             geometry_js_1.Geometry.segment([startX, startY], [endX, endY]),
-            angle
+            angle,
+            lineColor
         ]);
         return this;
     }
@@ -723,6 +752,10 @@ class SymbolDrawing {
         this.items.push(new geometry_js_1.GeometryProp('lineColor', value));
         return this;
     }
+    addSetTextColor(value) {
+        this.items.push(new geometry_js_1.GeometryProp('textColor', value));
+        return this;
+    }
     addSetFillColor(value) {
         this.items.push(new geometry_js_1.GeometryProp('fillColor', value));
         return this;
@@ -767,11 +800,15 @@ class SymbolDrawing {
         return pathItems;
     }
     getPinsPath() {
-        let features = this.pins.map(item => item[1]);
-        features = geometry_js_1.Geometry.groupFlip(features, this.flipX, this.flipY);
-        features = geometry_js_1.Geometry.groupRotate(features, this.angle, this.mainOrigin);
-        const { path } = this.featuresToPath(features, this.flipX, this.flipY);
-        return path;
+        return this.pins.map(item => {
+            let features = geometry_js_1.Geometry.groupFlip([item[1]], this.flipX, this.flipY);
+            features = geometry_js_1.Geometry.groupRotate(features, this.angle, this.mainOrigin);
+            const { path } = this.featuresToPath(features, this.flipX, this.flipY);
+            return {
+                path,
+                lineColor: item[3],
+            };
+        });
     }
     getLabels() {
         return this.items.filter(item => item instanceof geometry_js_1.Textbox);
@@ -784,7 +821,7 @@ class SymbolDrawing {
             return pin[1];
         });
         const drawingFeatures = this.items.reduce((accum, item) => {
-            if (!excludeLabels || (excludeLabels && !(item instanceof geometry_js_1.Label))) {
+            if (!excludeLabels || (excludeLabels && !(item instanceof geometry_js_1.Textbox && item.label))) {
                 if (!(item instanceof geometry_js_1.GeometryProp)) {
                     accum.push(item);
                 }

package/dist/cjs/globals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.wireColor = exports.junctionColor = exports.junctionSize = exports.bodyColor = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.portHeight = exports.portWidth = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = void 0;
+exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.portHeight = exports.portWidth = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = void 0;
 var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
@@ -31,10 +31,14 @@ exports.portHeight = 2;
 exports.defaultFont = 'Open Sans-Regular, Arial';
 exports.defaultFontBold = 'Open Sans-Bold, Arial-Bold, Arial';
 exports.defaultFontSize = 10;
-exports.bodyColor = '#FFFEAF';
 exports.junctionSize = 5;
-exports.junctionColor = 'rgb(0, 132, 0)';
-exports.wireColor = 'rgb(0, 132, 0)';
+exports.ColorScheme = {
+    BodyColor: 'rgb(255, 255, 194)',
+    JunctionColor: 'rgba(0, 132, 0)',
+    WireColor: 'rgb(0, 132, 0)',
+    PinLineColor: 'rgb(132, 0, 0)',
+    PinNameColor: 'rgb(0, 132, 132)',
+};
 var ComponentTypes;
 (function (ComponentTypes) {
     ComponentTypes["gnd"] = "gnd";

package/dist/cjs/regenerate-tests.js

@@ -5,19 +5,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const helpers_js_1 = require("./helpers.js");
+const sizing_js_1 = require("./sizing.js");
 const mainDir = './__tests__/renderData/';
-const cstFiles = [];
-const files = fs_1.default.readdirSync(mainDir);
-files.forEach(file => {
-    if (file.endsWith('.cst')) {
-        cstFiles.push(file);
-    }
-});
-const useCurrentDir = './examples/';
-cstFiles.forEach(file => {
-    const inputPath = mainDir + file;
-    const scriptData = fs_1.default.readFileSync(inputPath, { encoding: 'utf-8' });
-    const outputPath = inputPath + '.svg';
-    (0, helpers_js_1.renderScript)(scriptData, outputPath, { currentDirectory: useCurrentDir });
-    console.log('generated ', outputPath);
-});
+const fontsPath = (0, helpers_js_1.getFontsPath)();
+const defaultLibsPath = (0, helpers_js_1.getDefaultLibsPath)();
+async function regenerateTests() {
+    await (0, sizing_js_1.prepareSVGEnvironment)(fontsPath);
+    const cstFiles = [];
+    const files = fs_1.default.readdirSync(mainDir);
+    files.forEach(file => {
+        if (file.endsWith('.cst')) {
+            cstFiles.push(file);
+        }
+    });
+    cstFiles.forEach(file => {
+        const inputPath = mainDir + file;
+        const scriptData = fs_1.default.readFileSync(inputPath, { encoding: 'utf-8' });
+        const outputPath = inputPath + '.svg';
+        (0, helpers_js_1.renderScript)(scriptData, outputPath, {
+            currentDirectory: mainDir,
+            defaultLibsPath,
+        });
+        console.log('generated ', outputPath);
+    });
+}
+regenerateTests();

package/dist/cjs/render.js

@@ -61,7 +61,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         }
         else {
             symbolGroup.rect(width, height)
-                .fill(globals_js_1.bodyColor)
+                .fill(globals_js_1.ColorScheme.BodyColor)
                 .stroke({ width: 1, color: '#333' });
         }
     });
@@ -83,14 +83,15 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             const pt1 = segment[0];
             const pt2 = segment[1];
             mergedWireGroup.line([pt1, pt2])
-                .stroke({ width: 1, color: globals_js_1.wireColor, linecap: 'square' })
+                .stroke({ width: 1, color: globals_js_1.ColorScheme.WireColor,
+                linecap: 'square' })
                 .fill('none');
         });
         intersectPoints.forEach(point => {
             const [x, y, count] = point;
             mergedWireGroup.circle(globals_js_1.junctionSize)
                 .translate(x - globals_js_1.junctionSize / 2, y - globals_js_1.junctionSize / 2)
-                .fill(globals_js_1.junctionColor)
+                .fill(globals_js_1.ColorScheme.JunctionColor)
                 .stroke('none');
         });
     });

package/dist/esm/draw_symbols.mjs

@@ -1,5 +1,5 @@
-import { ReferenceTypes, SymbolPinSide, defaultFont } from "./globals.mjs";
-import { Geometry, GeometryProp, HorizontalAlign, Label, Textbox, VerticalAlign } from "./geometry.mjs";
+import { ColorScheme, ReferenceTypes, SymbolPinSide, defaultFont } from "./globals.mjs";
+import { Geometry, GeometryProp, HorizontalAlign, Textbox, VerticalAlign } from "./geometry.mjs";
 import { PinTypes } from "./objects/PinTypes.mjs";
 const defaultSymbolLineWidth = 2;
 export class SymbolGraphic {
@@ -104,17 +104,20 @@ export class SymbolGraphic {
         });
     }
     drawPins(group) {
-        group.path(this.drawing.getPinsPath())
-            .stroke({
-            width: defaultSymbolLineWidth,
-            color: '#333',
+        const pinPaths = this.drawing.getPinsPath();
+        pinPaths.forEach(({ path, lineColor }) => {
+            group.path(path)
+                .stroke({
+                width: defaultSymbolLineWidth,
+                color: lineColor
+            });
         });
     }
     drawLabels(group) {
         const labels = this.drawing.getLabels();
         labels.forEach(label => {
             const tmpLabel = label;
-            const { fontSize = 10, anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', angle: labelAngle = 0, } = tmpLabel.style ?? {};
+            const { fontSize = 10, anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', angle: labelAngle = 0, textColor = "#333", } = tmpLabel.style ?? {};
             let anchorStyle = 'start';
             let dominantBaseline = 'auto';
             let useAnchor = anchor;
@@ -156,7 +159,7 @@ export class SymbolGraphic {
             const useFont = defaultFont;
             const textContainer = group.group();
             const text = textContainer.text(tmpLabel.text)
-                .fill('#333')
+                .fill(textColor)
                 .font({
                 family: useFont,
                 size: fontSize,
@@ -268,8 +271,14 @@ export class SymbolPlaceholder extends SymbolGraphic {
         drawing.angle = this._angle;
         drawing.flipX = this._flipX;
         drawing.flipY = this._flipY;
-        const commands = drawing.getCommands();
+        const commands = [
+            [PlaceHolderCommands.lineColor, [ColorScheme.PinLineColor], {}],
+            [PlaceHolderCommands.textColor, [ColorScheme.PinNameColor], {}],
+            ...drawing.getCommands()
+        ];
         drawing.log('id: ', drawing.id, 'angle: ', this._angle, "commands:", commands.length);
+        let lineColor = "#333";
+        let textColor = "#333";
         commands.forEach(([commandName, positionParams, keywordParams]) => {
             switch (commandName) {
                 case PlaceHolderCommands.rect:
@@ -299,6 +308,11 @@ export class SymbolPlaceholder extends SymbolGraphic {
                     break;
                 case PlaceHolderCommands.lineColor:
                     drawing.addSetLineColor(...positionParams);
+                    lineColor = positionParams[0];
+                    break;
+                case PlaceHolderCommands.textColor:
+                    drawing.addSetTextColor(...positionParams);
+                    textColor = positionParams[0];
                     break;
                 case PlaceHolderCommands.arc:
                     drawing.addArc(...positionParams);
@@ -313,11 +327,14 @@ export class SymbolPlaceholder extends SymbolGraphic {
                 case PlaceHolderCommands.hpin:
                 case PlaceHolderCommands.vpin:
                     {
-                        this.drawPinParams(drawing, commandName, keywordParams, positionParams);
+                        this.drawPinParams(drawing, commandName, keywordParams, positionParams, lineColor, textColor);
                         break;
                     }
                 case PlaceHolderCommands.label: {
                     const style = this.parseLabelStyle(keywordParams);
+                    if (style['textColor'] === undefined) {
+                        style['textColor'] = textColor;
+                    }
                     positionParams = [...positionParams];
                     positionParams.push(style);
                     const labelId = positionParams[0];
@@ -348,7 +365,7 @@ export class SymbolPlaceholder extends SymbolGraphic {
         drawing.log("=== end generate drawing ===");
     }
     parseLabelStyle(keywordParams) {
-        const keywords = ['fontSize', 'anchor', 'vanchor', 'angle'];
+        const keywords = ['fontSize', 'anchor', 'vanchor', 'angle', 'textColor'];
         const style = {};
         keywords.forEach(item => {
             if (keywordParams.has(item)) {
@@ -357,13 +374,15 @@ export class SymbolPlaceholder extends SymbolGraphic {
         });
         return style;
     }
-    drawPinParams(drawing, commandName, keywordParams, positionParams) {
+    drawPinParams(drawing, commandName, keywordParams, positionParams, lineColor, pinNameColor) {
         drawing.log('add pin', ...positionParams);
         const keywordDisplayPinId = 'display_pin_id';
         let displayPinId = true;
-        if (keywordParams.has(keywordDisplayPinId)
-            && keywordParams.get(keywordDisplayPinId) === 0) {
-            displayPinId = false;
+        if (keywordParams.has(keywordDisplayPinId)) {
+            const value = keywordParams.get(keywordDisplayPinId);
+            if (value === 0 || value === false) {
+                displayPinId = false;
+            }
         }
         let pinNameParam = null;
         let pinType = PinTypes.Any;
@@ -397,7 +416,7 @@ export class SymbolPlaceholder extends SymbolGraphic {
                 startY
             ];
         }
-        drawing.addPin(...positionParams);
+        drawing.addPin(...positionParams, lineColor);
         const lastAddedPin = this.drawing.pins[this.drawing.pins.length - 1];
         const [pinId, , angle] = lastAddedPin;
         const [, , , endX, endY] = positionParams;
@@ -436,11 +455,13 @@ export class SymbolPlaceholder extends SymbolGraphic {
                 fontSize: 10,
                 anchor: pinNameAlignment,
                 vanchor: VerticalAlign.Middle,
+                textColor: pinNameColor,
             });
             displayPinId && drawing.addLabel(endX + pinIdOffsetX, endY + pinIdOffsetY, pinId.toString(), {
                 fontSize: 8,
                 anchor: pinIdAlignment,
                 vanchor: pinIdVAlignment,
+                textColor: lineColor
             });
         }
     }
@@ -466,6 +487,7 @@ export var PlaceHolderCommands;
     PlaceHolderCommands["lineWidth"] = "lineWidth";
     PlaceHolderCommands["fill"] = "fill";
     PlaceHolderCommands["lineColor"] = "lineColor";
+    PlaceHolderCommands["textColor"] = "textColor";
     PlaceHolderCommands["text"] = "text";
 })(PlaceHolderCommands || (PlaceHolderCommands = {}));
 export class SymbolCustom extends SymbolGraphic {
@@ -498,6 +520,8 @@ export class SymbolCustom extends SymbolGraphic {
         drawing.flipY = this._flipY;
         const bodyWidth = this.bodyWidth;
         const bodyHeight = (1 + Math.max(maxLeftPins, maxRightPins)) * this.pinSpacing;
+        const defaultLineColor = ColorScheme.PinLineColor;
+        drawing.addSetLineColor(defaultLineColor);
         drawing.addRect(0, 0, bodyWidth, bodyHeight);
         const leftPinStart = -bodyWidth / 2;
         const rightPinStart = bodyWidth / 2;
@@ -505,31 +529,35 @@ export class SymbolCustom extends SymbolGraphic {
         leftPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY + (position + 1) * this.pinSpacing;
-            drawing.addPin(pin.pinId, leftPinStart - this.pinLength, pinY, leftPinStart, pinY);
+            drawing.addPin(pin.pinId, leftPinStart - this.pinLength, pinY, leftPinStart, pinY, defaultLineColor);
             drawing.addLabel(leftPinStart + 4, pinY, pin.text, {
                 fontSize: 10,
                 anchor: HorizontalAlign.Left,
                 vanchor: VerticalAlign.Middle,
+                textColor: ColorScheme.PinNameColor,
             });
             drawing.addLabel(leftPinStart - 2, pinY - 2, pin.pinId.toString(), {
                 fontSize: 8,
                 anchor: HorizontalAlign.Right,
                 vanchor: VerticalAlign.Bottom,
+                textColor: defaultLineColor
             });
         });
         rightPins.forEach(pin => {
             const position = pin.position;
             const pinY = pinStartY + (position + 1) * this.pinSpacing;
-            drawing.addPin(pin.pinId, rightPinStart + this.pinLength, pinY, rightPinStart, pinY);
+            drawing.addPin(pin.pinId, rightPinStart + this.pinLength, pinY, rightPinStart, pinY, defaultLineColor);
             drawing.addLabel(rightPinStart - 4, pinY, pin.text, {
                 fontSize: 10,
                 anchor: HorizontalAlign.Right,
                 vanchor: VerticalAlign.Middle,
+                textColor: ColorScheme.PinNameColor,
             });
             drawing.addLabel(rightPinStart + 2, pinY - 2, pin.pinId.toString(), {
                 fontSize: 8,
                 anchor: HorizontalAlign.Left,
                 vanchor: VerticalAlign.Bottom,
+                textColor: defaultLineColor
             });
         });
         const instanceName = this.getLabelValue("refdes");
@@ -576,7 +604,7 @@ export class SymbolDrawing {
         this.items.push(Geometry.segment([startX, startY], [endX, endY]));
         return this;
     }
-    addPin(pinId, startX, startY, endX, endY) {
+    addPin(pinId, startX, startY, endX, endY, lineColor) {
         let angle = 0;
         if (startX === endX) {
             if (startY > endY) {
@@ -597,7 +625,8 @@ export class SymbolDrawing {
         this.pins.push([
             pinId,
             Geometry.segment([startX, startY], [endX, endY]),
-            angle
+            angle,
+            lineColor
         ]);
         return this;
     }
@@ -716,6 +745,10 @@ export class SymbolDrawing {
         this.items.push(new GeometryProp('lineColor', value));
         return this;
     }
+    addSetTextColor(value) {
+        this.items.push(new GeometryProp('textColor', value));
+        return this;
+    }
     addSetFillColor(value) {
         this.items.push(new GeometryProp('fillColor', value));
         return this;
@@ -760,11 +793,15 @@ export class SymbolDrawing {
         return pathItems;
     }
     getPinsPath() {
-        let features = this.pins.map(item => item[1]);
-        features = Geometry.groupFlip(features, this.flipX, this.flipY);
-        features = Geometry.groupRotate(features, this.angle, this.mainOrigin);
-        const { path } = this.featuresToPath(features, this.flipX, this.flipY);
-        return path;
+        return this.pins.map(item => {
+            let features = Geometry.groupFlip([item[1]], this.flipX, this.flipY);
+            features = Geometry.groupRotate(features, this.angle, this.mainOrigin);
+            const { path } = this.featuresToPath(features, this.flipX, this.flipY);
+            return {
+                path,
+                lineColor: item[3],
+            };
+        });
     }
     getLabels() {
         return this.items.filter(item => item instanceof Textbox);
@@ -777,7 +814,7 @@ export class SymbolDrawing {
             return pin[1];
         });
         const drawingFeatures = this.items.reduce((accum, item) => {
-            if (!excludeLabels || (excludeLabels && !(item instanceof Label))) {
+            if (!excludeLabels || (excludeLabels && !(item instanceof Textbox && item.label))) {
                 if (!(item instanceof GeometryProp)) {
                     accum.push(item);
                 }

package/dist/esm/globals.mjs

@@ -28,10 +28,14 @@ export const portHeight = 2;
 export const defaultFont = 'Open Sans-Regular, Arial';
 export const defaultFontBold = 'Open Sans-Bold, Arial-Bold, Arial';
 export const defaultFontSize = 10;
-export const bodyColor = '#FFFEAF';
 export const junctionSize = 5;
-export const junctionColor = 'rgb(0, 132, 0)';
-export const wireColor = 'rgb(0, 132, 0)';
+export const ColorScheme = {
+    BodyColor: 'rgb(255, 255, 194)',
+    JunctionColor: 'rgba(0, 132, 0)',
+    WireColor: 'rgb(0, 132, 0)',
+    PinLineColor: 'rgb(132, 0, 0)',
+    PinNameColor: 'rgb(0, 132, 132)',
+};
 export var ComponentTypes;
 (function (ComponentTypes) {
     ComponentTypes["gnd"] = "gnd";

package/dist/esm/regenerate-tests.mjs

@@ -1,18 +1,27 @@
 import fs from 'fs';
-import { renderScript } from './helpers.mjs';
+import { getDefaultLibsPath, getFontsPath, renderScript } from './helpers.mjs';
+import { prepareSVGEnvironment } from './sizing.mjs';
 const mainDir = './__tests__/renderData/';
-const cstFiles = [];
-const files = fs.readdirSync(mainDir);
-files.forEach(file => {
-    if (file.endsWith('.cst')) {
-        cstFiles.push(file);
-    }
-});
-const useCurrentDir = './examples/';
-cstFiles.forEach(file => {
-    const inputPath = mainDir + file;
-    const scriptData = fs.readFileSync(inputPath, { encoding: 'utf-8' });
-    const outputPath = inputPath + '.svg';
-    renderScript(scriptData, outputPath, { currentDirectory: useCurrentDir });
-    console.log('generated ', outputPath);
-});
+const fontsPath = getFontsPath();
+const defaultLibsPath = getDefaultLibsPath();
+async function regenerateTests() {
+    await prepareSVGEnvironment(fontsPath);
+    const cstFiles = [];
+    const files = fs.readdirSync(mainDir);
+    files.forEach(file => {
+        if (file.endsWith('.cst')) {
+            cstFiles.push(file);
+        }
+    });
+    cstFiles.forEach(file => {
+        const inputPath = mainDir + file;
+        const scriptData = fs.readFileSync(inputPath, { encoding: 'utf-8' });
+        const outputPath = inputPath + '.svg';
+        renderScript(scriptData, outputPath, {
+            currentDirectory: mainDir,
+            defaultLibsPath,
+        });
+        console.log('generated ', outputPath);
+    });
+}
+regenerateTests();

package/dist/esm/render.mjs

@@ -1,7 +1,7 @@
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
 import { RenderFrameType, getBounds } from "./layout.mjs";
 import { applyFontsToSVG, getCreateSVGWindow } from './sizing.mjs';
-import { ComponentTypes, ParamKeys, bodyColor, junctionColor, junctionSize, wireColor } from './globals.mjs';
+import { ColorScheme, ComponentTypes, ParamKeys, junctionSize } from './globals.mjs';
 import { NumericValue } from './objects/ParamDefinition.mjs';
 import { getBoundsSize } from './utils.mjs';
 export function generateSVG2(graph) {
@@ -57,7 +57,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         }
         else {
             symbolGroup.rect(width, height)
-                .fill(bodyColor)
+                .fill(ColorScheme.BodyColor)
                 .stroke({ width: 1, color: '#333' });
         }
     });
@@ -79,14 +79,15 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             const pt1 = segment[0];
             const pt2 = segment[1];
             mergedWireGroup.line([pt1, pt2])
-                .stroke({ width: 1, color: wireColor, linecap: 'square' })
+                .stroke({ width: 1, color: ColorScheme.WireColor,
+                linecap: 'square' })
                 .fill('none');
         });
         intersectPoints.forEach(point => {
             const [x, y, count] = point;
             mergedWireGroup.circle(junctionSize)
                 .translate(x - junctionSize / 2, y - junctionSize / 2)
-                .fill(junctionColor)
+                .fill(ColorScheme.JunctionColor)
                 .stroke('none');
         });
     });

package/dist/types/draw_symbols.d.ts

@@ -59,7 +59,7 @@ export declare class SymbolPlaceholder extends SymbolGraphic {
     parseLabelStyle(keywordParams: Map<string, any>): {
         [key: string]: any;
     };
-    drawPinParams(drawing: SymbolDrawingCommands, commandName: string, keywordParams: Map<string, any>, positionParams: any[]): void;
+    drawPinParams(drawing: SymbolDrawingCommands, commandName: string, keywordParams: Map<string, any>, positionParams: any[], lineColor: string, pinNameColor: string): void;
     constructor(drawing: SymbolDrawing);
 }
 export declare enum PlaceHolderCommands {
@@ -78,6 +78,7 @@ export declare enum PlaceHolderCommands {
     lineWidth = "lineWidth",
     fill = "fill",
     lineColor = "lineColor",
+    textColor = "textColor",
     text = "text"
 }
 export declare class SymbolCustom extends SymbolGraphic {
@@ -97,7 +98,7 @@ export declare class SymbolCustom extends SymbolGraphic {
 }
 export declare class SymbolDrawing {
     items: (Feature | GeometryProp)[];
-    pins: [number, Feature, number][];
+    pins: [number, Feature, number, lineColor: string][];
     angle: number;
     flipX: number;
     flipY: number;
@@ -106,7 +107,7 @@ export declare class SymbolDrawing {
     clear(): void;
     log(...params: any[]): void;
     addLine(startX: number, startY: number, endX: number, endY: number): SymbolDrawing;
-    addPin(pinId: number, startX: number, startY: number, endX: number, endY: number): SymbolDrawing;
+    addPin(pinId: number, startX: number, startY: number, endX: number, endY: number, lineColor: string): SymbolDrawing;
     addVLine(startX: number, startY: number, value: number): SymbolDrawing;
     addHLine(startX: number, startY: number, value: number): SymbolDrawing;
     addRect(centerX: number, centerY: number, width: number, height: number): SymbolDrawing;
@@ -118,6 +119,7 @@ export declare class SymbolDrawing {
     addPath(...pathParts: any): SymbolDrawing;
     addSetLineWidth(value: number): SymbolDrawing;
     addSetLineColor(value: string): SymbolDrawing;
+    addSetTextColor(value: string): SymbolDrawing;
     addSetFillColor(value: string): SymbolDrawing;
     addArc(x: number, y: number, radius: number, startAngle: number, endAngle: number): SymbolDrawing;
     getPaths(): {
@@ -126,7 +128,10 @@ export declare class SymbolDrawing {
         lineColor: string;
         lineWidth: number;
     }[];
-    getPinsPath(): string;
+    getPinsPath(): {
+        path: string;
+        lineColor: string;
+    }[];
     getLabels(): Textbox[];
     private featuresToPath;
     getBoundingBox(excludeLabels?: boolean): {

package/dist/types/geometry.d.ts

@@ -13,6 +13,7 @@ export type LabelStyle = {
     angle?: number;
     anchor?: HorizontalAlign.Left | HorizontalAlign.Middle | HorizontalAlign.Right;
     vanchor?: VerticalAlign.Top | VerticalAlign.Middle | VerticalAlign.Bottom;
+    textColor?: string;
 };
 export declare class Textbox extends Flatten.Polygon {
     id: string;

package/dist/types/globals.d.ts

@@ -24,10 +24,14 @@ export declare const portHeight = 2;
 export declare const defaultFont = "Open Sans-Regular, Arial";
 export declare const defaultFontBold = "Open Sans-Bold, Arial-Bold, Arial";
 export declare const defaultFontSize = 10;
-export declare const bodyColor = "#FFFEAF";
 export declare const junctionSize = 5;
-export declare const junctionColor = "rgb(0, 132, 0)";
-export declare const wireColor = "rgb(0, 132, 0)";
+export declare const ColorScheme: {
+    BodyColor: string;
+    JunctionColor: string;
+    WireColor: string;
+    PinLineColor: string;
+    PinNameColor: string;
+};
 export declare enum ComponentTypes {
     gnd = "gnd",
     net = "net",

package/libs/lib.cst

@@ -7,7 +7,7 @@ def net(net_name):
         angle: -90
         display: create graphic:
             hline: -15, 0, 30
-            vpin: 1, 0, 10, -10, display_pin_id=0
+            vpin: 1, 0, 10, -10, display_pin_id=false
             label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
@@ -21,7 +21,7 @@ def supply(net_name):
         angle: -90
         display: create graphic:
             hline: -15, 0, 30
-            vpin: 1, 0, 10, -10, display_pin_id=0
+            vpin: 1, 0, 10, -10, display_pin_id=false
             label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
@@ -34,8 +34,9 @@ def label(value, anchor="left"):
         copy: true
         followWireOrientation: false
         display: create graphic:
+            textColor: "#222"
             label: "value", 0, -2, "?", fontSize=10, anchor=anchor
-            pin: 1, 0, 0, 0, 0, display_pin_id=0
+            pin: 1, 0, 0, 0, 0, display_pin_id=false
         type: "label"
         params:
             net_name: value
@@ -148,7 +149,7 @@ def cgnd():
             hline: -15, 0, 30
             hline: -10, 5, 20
             hline: -5, 10, 10
-            vpin: 1, 0, -10, 10, display_pin_id=0
+            vpin: 1, 0, -10, 10, display_pin_id=false
             label: "net_name", 0, 22, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
@@ -165,37 +166,40 @@ def dgnd(net_name="GND"):
         angle: 90
         display: create graphic:
             triangle: 0, 0, 0, height, width
-            vpin: 1, 0, -10, 10, display_pin_id=0
+            vpin: 1, 0, -10, 10, display_pin_id=false
             label: "net_name", 0, height + 10, net_name, fontSize=10, anchor="middle"
         type: "net"
         params:
             net_name: net_name
             priority: 100
 
-def marker_point():
+def text(value, offsetX = 0, offsetY = 0, fontSize = 12):
     return create component:
         pins: 1
+        followWireOrientation: false
         display: create graphic:
-            hline: -5, 0, 10
-            vline: 0, -5, 10
-            pin: 1, 0, 0, 0, 0, display_pin_id=0
-        type: "net"
+            pin: 1, 0, 0, 0, 0, display_pin_id=false
+            text:
+                content: value
+                offset: offsetX, offsetY
+                fontSize: fontSize
 
-def arrow_point():
+# Drawing markers
+
+def marker_point():
     return create component:
         pins: 1
         display: create graphic:
-            path: ("M", 15, -5, "L", 20, 0, "L", 15, 5)
-            hpin: 1, 0, 0, 20
-        type: "net"
+            hline: -5, 0, 10
+            vline: 0, -5, 10
+            pin: 1, 0, 0, 0, 0, display_pin_id=false
 
-def text(value, offsetX = 0, offsetY = 0, fontSize = 12):
+def arrow_point():
     return create component:
         pins: 1
         followWireOrientation: false
         display: create graphic:
-            pin: 1, 0, 0, 0, 0, display_pin_id=0
-            text:
-                content: value
-                offset: offsetX, offsetY
-                fontSize: fontSize
+            lineWidth: 2
+            path: ("M", -10, -5, "L", -5, 0, "L", -10, 5)
+            path: ("M", -5, 0, "L", -20, 0)
+            hpin: 1, 0, 0, 0, display_pin_id=false

package/package.json

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