circuitscript 0.1.14 → 0.1.15

package/dist/cjs/geometry.js

@@ -416,9 +416,28 @@ class Geometry {
                 [segment.end.x, segment.end.y]
             ];
         });
+        const lines = [];
+        let prevPoint;
+        let currentLine = [];
+        segments.forEach((segment, index) => {
+            const [pt1, pt2] = segment;
+            if (index === 0 || (prevPoint[0] !== pt1[0] || prevPoint[1] !== pt1[1])) {
+                if (currentLine.length > 0) {
+                    lines.push(currentLine);
+                    currentLine = [];
+                }
+                currentLine.push([pt1[0], pt1[1]]);
+            }
+            currentLine.push(pt2);
+            prevPoint = pt2;
+        });
+        if (currentLine.length > 0) {
+            lines.push(currentLine);
+        }
         return {
             intersectPoints,
             segments,
+            lines,
         };
     }
 }

package/dist/cjs/globals.js

@@ -106,8 +106,10 @@ var BlockTypes;
 var NetGraphicsParams;
 (function (NetGraphicsParams) {
     NetGraphicsParams["Color"] = "color";
-    NetGraphicsParams["Highight"] = "highlight";
     NetGraphicsParams["LineWidth"] = "lineWidth";
+    NetGraphicsParams["Highlight"] = "highlight";
+    NetGraphicsParams["HighlightWidth"] = "highlightWidth";
+    NetGraphicsParams["HighlightOpacity"] = "highlightOpacity";
 })(NetGraphicsParams || (exports.NetGraphicsParams = NetGraphicsParams = {}));
 var FrameType;
 (function (FrameType) {

package/dist/cjs/layout.js

@@ -137,8 +137,19 @@ class LayoutEngine {
                 const value = net.params.get(globals_js_1.NetGraphicsParams.LineWidth);
                 renderNet.lineWidth = (0, helpers_js_1.milsToMM)(value).toNumber();
             }
-            if (net.params.has(globals_js_1.NetGraphicsParams.Highight)) {
-                renderNet.highlight = net.params.get(globals_js_1.NetGraphicsParams.Highight);
+            if (net.params.has(globals_js_1.NetGraphicsParams.Highlight)) {
+                renderNet.highlight =
+                    net.params.get(globals_js_1.NetGraphicsParams.Highlight);
+            }
+            if (net.params.has(globals_js_1.NetGraphicsParams.HighlightWidth)) {
+                renderNet.highlightWidth =
+                    (0, helpers_js_1.milsToMM)(net.params.get(globals_js_1.NetGraphicsParams.HighlightWidth))
+                        .toNumber();
+            }
+            if (net.params.has(globals_js_1.NetGraphicsParams.HighlightOpacity)) {
+                renderNet.highlightOpacity =
+                    net.params.get(globals_js_1.NetGraphicsParams.HighlightOpacity)
+                        .toNumber();
             }
             renderNets.set(net.toString(), renderNet);
         });
@@ -192,12 +203,13 @@ class LayoutEngine {
                 });
             }
             else {
-                const { intersectPoints, segments } = geometry_js_1.Geometry.mergeWires(allLines);
+                const { intersectPoints, segments, lines } = geometry_js_1.Geometry.mergeWires(allLines);
                 mergedWires.push({
                     netName: netName,
                     segments,
                     intersectPoints,
                     net: renderNet,
+                    lines,
                 });
                 intersectPoints.forEach(([x, y]) => {
                     junctions.push(new RenderJunction((0, ParamDefinition_js_1.numeric)(x), (0, ParamDefinition_js_1.numeric)(y), renderNet));

package/dist/cjs/render.js

@@ -181,12 +181,14 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
     const mergedWireHighlightGroup = canvas.group();
     const mergedWireGroup = canvas.group();
     mergedWires.forEach(tmpItem => {
-        const { segments, intersectPoints, net = null } = 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 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;
             useJunctionColor = net.color ?? globals_js_1.ColorScheme.JunctionColor;
@@ -194,25 +196,29 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             if (net.highlight !== null) {
                 displayHighlight = true;
                 displayHighlightColor = net.highlight ?? null;
+                if (net.highlightOpacity !== undefined) {
+                    displayHighlightOpacity = net.highlightOpacity;
+                }
+                if (net.highlightWidth !== undefined) {
+                    displayHighlightWidth = net.highlightWidth;
+                }
             }
         }
         const pathItems = [];
-        const highlightExtraSize = 5 * globals_js_1.MilsToMM;
-        segments.forEach(segment => {
-            const pt1 = segment[0];
-            const pt2 = segment[1];
-            pathItems.push(...[
-                'M', pt1[0], pt1[1],
-                'L', pt2[0], pt2[1]
-            ]);
+        const useLines = lines ?? [];
+        useLines.forEach(line => {
+            line.forEach((point, index) => {
+                const commandType = (index === 0) ? 'M' : 'L';
+                pathItems.push(...[commandType, point[0], point[1]]);
+            });
         });
         if (displayHighlight) {
             mergedWireHighlightGroup.path(pathItems)
                 .stroke({
-                width: useLineWidth + highlightExtraSize,
+                width: useLineWidth + displayHighlightWidth,
                 color: displayHighlightColor,
-                opacity: 0.3,
-                linecap: 'square'
+                opacity: displayHighlightOpacity,
+                linecap: 'butt'
             })
                 .fill('none');
         }
@@ -220,11 +226,11 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             .stroke({
             width: useLineWidth,
             color: useColor,
-            linecap: 'square'
+            linecap: 'butt'
         })
             .fill('none');
         const halfJunctionSize = globals_js_1.junctionSize.half();
-        const highlightJunctionSize = (0, ParamDefinition_js_1.numeric)(globals_js_1.junctionSize.toNumber() + highlightExtraSize);
+        const highlightJunctionSize = (0, ParamDefinition_js_1.numeric)(globals_js_1.junctionSize.toNumber() + displayHighlightWidth);
         const tmpHighlightExtraSize = highlightJunctionSize.half();
         intersectPoints.forEach(point => {
             const [x, y,] = point;

package/dist/esm/geometry.js

@@ -416,9 +416,28 @@ export class Geometry {
                 [segment.end.x, segment.end.y]
             ];
         });
+        const lines = [];
+        let prevPoint;
+        let currentLine = [];
+        segments.forEach((segment, index) => {
+            const [pt1, pt2] = segment;
+            if (index === 0 || (prevPoint[0] !== pt1[0] || prevPoint[1] !== pt1[1])) {
+                if (currentLine.length > 0) {
+                    lines.push(currentLine);
+                    currentLine = [];
+                }
+                currentLine.push([pt1[0], pt1[1]]);
+            }
+            currentLine.push(pt2);
+            prevPoint = pt2;
+        });
+        if (currentLine.length > 0) {
+            lines.push(currentLine);
+        }
         return {
             intersectPoints,
             segments,
+            lines,
         };
     }
 }

package/dist/esm/globals.js

@@ -103,8 +103,10 @@ export var BlockTypes;
 export var NetGraphicsParams;
 (function (NetGraphicsParams) {
     NetGraphicsParams["Color"] = "color";
-    NetGraphicsParams["Highight"] = "highlight";
     NetGraphicsParams["LineWidth"] = "lineWidth";
+    NetGraphicsParams["Highlight"] = "highlight";
+    NetGraphicsParams["HighlightWidth"] = "highlightWidth";
+    NetGraphicsParams["HighlightOpacity"] = "highlightOpacity";
 })(NetGraphicsParams || (NetGraphicsParams = {}));
 export var FrameType;
 (function (FrameType) {

package/dist/esm/layout.js

@@ -112,8 +112,19 @@ export class LayoutEngine {
                 const value = net.params.get(NetGraphicsParams.LineWidth);
                 renderNet.lineWidth = milsToMM(value).toNumber();
             }
-            if (net.params.has(NetGraphicsParams.Highight)) {
-                renderNet.highlight = net.params.get(NetGraphicsParams.Highight);
+            if (net.params.has(NetGraphicsParams.Highlight)) {
+                renderNet.highlight =
+                    net.params.get(NetGraphicsParams.Highlight);
+            }
+            if (net.params.has(NetGraphicsParams.HighlightWidth)) {
+                renderNet.highlightWidth =
+                    milsToMM(net.params.get(NetGraphicsParams.HighlightWidth))
+                        .toNumber();
+            }
+            if (net.params.has(NetGraphicsParams.HighlightOpacity)) {
+                renderNet.highlightOpacity =
+                    net.params.get(NetGraphicsParams.HighlightOpacity)
+                        .toNumber();
             }
             renderNets.set(net.toString(), renderNet);
         });
@@ -167,12 +178,13 @@ export class LayoutEngine {
                 });
             }
             else {
-                const { intersectPoints, segments } = Geometry.mergeWires(allLines);
+                const { intersectPoints, segments, lines } = Geometry.mergeWires(allLines);
                 mergedWires.push({
                     netName: netName,
                     segments,
                     intersectPoints,
                     net: renderNet,
+                    lines,
                 });
                 intersectPoints.forEach(([x, y]) => {
                     junctions.push(new RenderJunction(numeric(x), numeric(y), renderNet));

package/dist/esm/render.js

@@ -172,12 +172,14 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
     const mergedWireHighlightGroup = canvas.group();
     const mergedWireGroup = canvas.group();
     mergedWires.forEach(tmpItem => {
-        const { segments, intersectPoints, net = null } = tmpItem;
+        const { intersectPoints, net = null, lines = null } = tmpItem;
         let useJunctionColor = ColorScheme.JunctionColor;
         let useColor = ColorScheme.WireColor;
         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;
             useJunctionColor = net.color ?? ColorScheme.JunctionColor;
@@ -185,25 +187,29 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             if (net.highlight !== null) {
                 displayHighlight = true;
                 displayHighlightColor = net.highlight ?? null;
+                if (net.highlightOpacity !== undefined) {
+                    displayHighlightOpacity = net.highlightOpacity;
+                }
+                if (net.highlightWidth !== undefined) {
+                    displayHighlightWidth = net.highlightWidth;
+                }
             }
         }
         const pathItems = [];
-        const highlightExtraSize = 5 * MilsToMM;
-        segments.forEach(segment => {
-            const pt1 = segment[0];
-            const pt2 = segment[1];
-            pathItems.push(...[
-                'M', pt1[0], pt1[1],
-                'L', pt2[0], pt2[1]
-            ]);
+        const useLines = lines ?? [];
+        useLines.forEach(line => {
+            line.forEach((point, index) => {
+                const commandType = (index === 0) ? 'M' : 'L';
+                pathItems.push(...[commandType, point[0], point[1]]);
+            });
         });
         if (displayHighlight) {
             mergedWireHighlightGroup.path(pathItems)
                 .stroke({
-                width: useLineWidth + highlightExtraSize,
+                width: useLineWidth + displayHighlightWidth,
                 color: displayHighlightColor,
-                opacity: 0.3,
-                linecap: 'square'
+                opacity: displayHighlightOpacity,
+                linecap: 'butt'
             })
                 .fill('none');
         }
@@ -211,11 +217,11 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
             .stroke({
             width: useLineWidth,
             color: useColor,
-            linecap: 'square'
+            linecap: 'butt'
         })
             .fill('none');
         const halfJunctionSize = junctionSize.half();
-        const highlightJunctionSize = numeric(junctionSize.toNumber() + highlightExtraSize);
+        const highlightJunctionSize = numeric(junctionSize.toNumber() + displayHighlightWidth);
         const tmpHighlightExtraSize = highlightJunctionSize.half();
         intersectPoints.forEach(point => {
             const [x, y,] = point;

package/dist/types/draw_symbols.d.ts

@@ -200,7 +200,7 @@ export declare class SymbolDrawingCommands extends SymbolDrawing {
     clone(): SymbolDrawingCommands;
     eq(other: SymbolDrawingCommands): boolean;
 }
-type SimplePoint = [x: number, y: number];
+export type SimplePoint = [x: number, y: number];
 type SymbolPinLayout = {
     pinId: number;
     angle: number;

package/dist/types/geometry.d.ts

@@ -2,6 +2,7 @@ import Flatten from '@flatten-js/core';
 import { Box } from '@svgdotjs/svg.js';
 import { NumericValue } from './objects/ParamDefinition.js';
 import { PinTypes } from './objects/PinTypes.js';
+import { SimplePoint } from './draw_symbols.js';
 export type Segment = Flatten.Segment;
 export type Polygon = Flatten.Polygon;
 export type Multiline = Flatten.Multiline;
@@ -76,7 +77,8 @@ export declare class Geometry {
         y: NumericValue;
     }[][]): {
         intersectPoints: WirePointCount[];
-        segments: [x: number, y: number][][];
+        segments: SimplePoint[][];
+        lines: SimplePoint[][];
     };
 }
 type WirePointCount = [x: number, y: number, count: number];

package/dist/types/globals.d.ts

@@ -90,8 +90,10 @@ export declare enum BlockTypes {
 }
 export declare enum NetGraphicsParams {
     Color = "color",
-    Highight = "highlight",
-    LineWidth = "lineWidth"
+    LineWidth = "lineWidth",
+    Highlight = "highlight",
+    HighlightWidth = "highlightWidth",
+    HighlightOpacity = "highlightOpacity"
 }
 export declare enum FrameType {
     Frame = 1,

package/dist/types/layout.d.ts

@@ -1,5 +1,5 @@
 import { Graph } from '@dagrejs/graphlib';
-import { SymbolGraphic, SymbolText, SymbolDrawingCommands } from "./draw_symbols.js";
+import { SymbolGraphic, SymbolText, SymbolDrawingCommands, SimplePoint } from "./draw_symbols.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { SequenceItem } from "./objects/ExecutionScope.js";
 import { WireAutoDirection } from './globals.js';
@@ -61,6 +61,7 @@ export type RenderNet = {
     lineWidth?: number;
     highlight?: string;
     highlightOpacity?: number;
+    highlightWidth?: number;
 };
 export declare class RenderWire extends RenderObject {
     id: number;
@@ -85,9 +86,10 @@ export declare class RenderWire extends RenderObject {
 }
 export type MergedWire = {
     netName: string;
-    segments: [x: number, y: number][][];
+    segments: SimplePoint[][];
     intersectPoints: [x: number, y: number, count: number][];
     net: RenderNet;
+    lines?: SimplePoint[][];
 };
 export declare class RenderComponent extends RenderObject {
     component: ClassComponent;

package/package.json

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