circuit-json-to-tscircuit 0.0.63 → 0.0.65

package/dist/{chunk-MVPNWU4R.js → chunk-BEFEQ6FB.js}

@@ -568,12 +568,13 @@ var convertSymbolPrimitives = ({
 
 // lib/generate-board-schematic-tsx/convert-box-components.ts
 import { su as su2 } from "@tscircuit/soup-util";
-import {
-  schematic_text as schematic_text3
-} from "circuit-json";
+import "circuit-json";
 var DEFAULT_BOX_BODY_STROKE_WIDTH = 0.02;
 var DEFAULT_BOX_BODY_STROKE_COLOR = "#840000";
 var DEFAULT_BOX_BODY_FILL_COLOR = "#ffffc2";
+var DEFAULT_PIN_TEXT_FONT_SIZE = 0.15;
+var DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE = 0.1;
+var DEFAULT_PIN_NUMBER_BASELINE_OFFSET = 0.02;
 var convertBoxComponent = ({
   circuitJson,
   schematicComponent
@@ -618,25 +619,57 @@ var convertBoxComponent = ({
     const sourcePort = su2(circuitJson).source_port.get(
       schematicPort.source_port_id
     );
-    const anchor = schematicPort.side_of_component === "left" ? "center_left" : schematicPort.side_of_component === "right" ? "center_right" : "center";
+    const labelPosition = { ...edge };
+    const pinNumberPosition = {
+      x: (edge.x + schematicPort.center.x) / 2,
+      y: (edge.y + schematicPort.center.y) / 2
+    };
+    let anchor = "center";
+    let rotation = 0;
+    switch (schematicPort.side_of_component) {
+      case "left":
+        labelPosition.x += DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE;
+        pinNumberPosition.y += DEFAULT_PIN_NUMBER_BASELINE_OFFSET;
+        anchor = "center_left";
+        break;
+      case "right":
+        labelPosition.x -= DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE;
+        pinNumberPosition.y += DEFAULT_PIN_NUMBER_BASELINE_OFFSET;
+        anchor = "center_right";
+        break;
+      case "top":
+        labelPosition.y -= DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE;
+        pinNumberPosition.x -= DEFAULT_PIN_NUMBER_BASELINE_OFFSET;
+        anchor = "center_right";
+        rotation = -90;
+        break;
+      case "bottom":
+        labelPosition.y += DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE;
+        pinNumberPosition.x -= DEFAULT_PIN_NUMBER_BASELINE_OFFSET;
+        anchor = "center_left";
+        rotation = -90;
+        break;
+    }
     if (sourcePort?.name)
       primitives.push(
         formatElement("schematictext", {
           text: sourcePort.name,
-          schX: edge.x,
-          schY: edge.y,
+          schX: labelPosition.x,
+          schY: labelPosition.y,
           anchor,
-          fontSize: schematic_text3.shape.font_size.parse(void 0)
+          fontSize: DEFAULT_PIN_TEXT_FONT_SIZE,
+          schRotation: rotation || void 0
         })
       );
     if (schematicPort.pin_number !== void 0)
       primitives.push(
         formatElement("schematictext", {
           text: String(schematicPort.pin_number),
-          schX: (edge.x + schematicPort.center.x) / 2,
-          schY: (edge.y + schematicPort.center.y) / 2,
+          schX: pinNumberPosition.x,
+          schY: pinNumberPosition.y,
           anchor: "bottom_center",
-          fontSize: schematic_text3.shape.font_size.parse(void 0)
+          fontSize: DEFAULT_PIN_TEXT_FONT_SIZE,
+          schRotation: rotation || void 0
         })
       );
   }
@@ -672,7 +705,7 @@ var convertComponents = (circuitJson) => su3(circuitJson).schematic_component.li
 
 // lib/generate-board-schematic-tsx/convert-net-labels.ts
 import { su as su4 } from "@tscircuit/soup-util";
-import { schematic_text as schematic_text4 } from "circuit-json";
+import { schematic_text as schematic_text3 } from "circuit-json";
 import { symbols as symbols2 } from "schematic-symbols";
 import { translate as translate3 } from "transformation-matrix";
 var convertNetLabels = (circuitJson) => su4(circuitJson).schematic_net_label.list().flatMap((schematicNetLabel) => {
@@ -696,16 +729,20 @@ var convertNetLabels = (circuitJson) => su4(circuitJson).schematic_net_label.lis
       text: schematicNetLabel.text,
       schX: anchorPosition.x,
       schY: anchorPosition.y,
-      fontSize: schematic_text4.shape.font_size.parse(void 0)
+      fontSize: schematic_text3.shape.font_size.parse(void 0)
     })
   ];
 });
 
 // lib/generate-board-schematic-tsx/convert-traces.ts
 import { su as su5 } from "@tscircuit/soup-util";
+var SCHEMATIC_WIRE_COLOR = "#009600";
 var convertTraces = (circuitJson) => su5(circuitJson).schematic_trace.list().flatMap((schematicTrace) => [
   ...schematicTrace.edges.map(
-    (edge) => formatElement("schematicpath", { points: [edge.from, edge.to] })
+    (edge) => formatElement("schematicpath", {
+      points: [edge.from, edge.to],
+      strokeColor: SCHEMATIC_WIRE_COLOR
+    })
   ),
   ...schematicTrace.junctions.map(
     (center) => formatElement("schematiccircle", {

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-MVPNWU4R.js";
+} from "../chunk-BEFEQ6FB.js";
 
 // cli/main.ts
 import { Command } from "commander";
@@ -16,7 +16,7 @@ var package_default = {
     "./cli": "./dist/cli/main.js"
   },
   type: "module",
-  version: "0.0.62",
+  version: "0.0.64",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/circuit-json-to-tscircuit.git"

package/dist/lib/index.js

@@ -1,6 +1,6 @@
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-MVPNWU4R.js";
+} from "../chunk-BEFEQ6FB.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-board-schematic-tsx/convert-box-components.ts

@@ -1,9 +1,5 @@
 import { su } from "@tscircuit/soup-util"
-import {
-  schematic_text,
-  type AnyCircuitElement,
-  type SchematicComponent,
-} from "circuit-json"
+import { type AnyCircuitElement, type SchematicComponent } from "circuit-json"
 import { convertRect } from "./convert-rect"
 import { formatElement } from "./format-attributes"
 
@@ -13,6 +9,12 @@ const DEFAULT_BOX_BODY_STROKE_WIDTH = 0.02
 const DEFAULT_BOX_BODY_STROKE_COLOR = "#840000"
 const DEFAULT_BOX_BODY_FILL_COLOR = "#ffffc2"
 
+// Circuit JSON does not encode these presentation values. They mirror the
+// circuit-to-svg defaults so reconstructed box pins keep the compiled view.
+const DEFAULT_PIN_TEXT_FONT_SIZE = 0.15
+const DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE = 0.1
+const DEFAULT_PIN_NUMBER_BASELINE_OFFSET = 0.02
+
 export const convertBoxComponent = ({
   circuitJson,
   schematicComponent,
@@ -62,30 +64,57 @@ export const convertBoxComponent = ({
     const sourcePort = su(circuitJson).source_port.get(
       schematicPort.source_port_id,
     )
-    const anchor =
-      schematicPort.side_of_component === "left"
-        ? "center_left"
-        : schematicPort.side_of_component === "right"
-          ? "center_right"
-          : "center"
+    const labelPosition = { ...edge }
+    const pinNumberPosition = {
+      x: (edge.x + schematicPort.center.x) / 2,
+      y: (edge.y + schematicPort.center.y) / 2,
+    }
+    let anchor = "center"
+    let rotation = 0
+    switch (schematicPort.side_of_component) {
+      case "left":
+        labelPosition.x += DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE
+        pinNumberPosition.y += DEFAULT_PIN_NUMBER_BASELINE_OFFSET
+        anchor = "center_left"
+        break
+      case "right":
+        labelPosition.x -= DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE
+        pinNumberPosition.y += DEFAULT_PIN_NUMBER_BASELINE_OFFSET
+        anchor = "center_right"
+        break
+      case "top":
+        labelPosition.y -= DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE
+        pinNumberPosition.x -= DEFAULT_PIN_NUMBER_BASELINE_OFFSET
+        anchor = "center_right"
+        rotation = -90
+        break
+      case "bottom":
+        labelPosition.y += DEFAULT_PIN_LABEL_DISTANCE_FROM_EDGE
+        pinNumberPosition.x -= DEFAULT_PIN_NUMBER_BASELINE_OFFSET
+        anchor = "center_left"
+        rotation = -90
+        break
+    }
     if (sourcePort?.name)
       primitives.push(
         formatElement("schematictext", {
           text: sourcePort.name,
-          schX: edge.x,
-          schY: edge.y,
+          schX: labelPosition.x,
+          schY: labelPosition.y,
           anchor,
-          fontSize: schematic_text.shape.font_size.parse(undefined),
+          fontSize: DEFAULT_PIN_TEXT_FONT_SIZE,
+          schRotation: rotation || undefined,
         }),
       )
     if (schematicPort.pin_number !== undefined)
       primitives.push(
         formatElement("schematictext", {
           text: String(schematicPort.pin_number),
-          schX: (edge.x + schematicPort.center.x) / 2,
-          schY: (edge.y + schematicPort.center.y) / 2,
+          schX: pinNumberPosition.x,
+          schY: pinNumberPosition.y,
           anchor: "bottom_center",
-          fontSize: schematic_text.shape.font_size.parse(undefined),
+          fontSize: DEFAULT_PIN_TEXT_FONT_SIZE,
+          schRotation: rotation || undefined,
         }),
       )
   }

package/lib/generate-board-schematic-tsx/convert-traces.ts

@@ -2,12 +2,17 @@ import { su } from "@tscircuit/soup-util"
 import type { SchematicElementConverter } from "./converter-types"
 import { formatElement } from "./format-attributes"
 
+const SCHEMATIC_WIRE_COLOR = "#009600"
+
 export const convertTraces: SchematicElementConverter = (circuitJson) =>
   su(circuitJson)
     .schematic_trace.list()
     .flatMap((schematicTrace) => [
       ...schematicTrace.edges.map((edge) =>
-        formatElement("schematicpath", { points: [edge.from, edge.to] }),
+        formatElement("schematicpath", {
+          points: [edge.from, edge.to],
+          strokeColor: SCHEMATIC_WIRE_COLOR,
+        }),
       ),
       ...schematicTrace.junctions.map((center) =>
         formatElement("schematiccircle", {

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/circuit-json-to-tscircuit.git"

package/tests/__snapshots__/test22-preserve-board-schematic-schematic.snap.svg

@@ -22,4 +22,4 @@
               .pin-number { fill: rgb(169, 0, 0); }
               .port-label { fill: rgb(0, 100, 100); }
               .component-name { fill: rgb(0, 100, 100); }
-            </style><rect class="boundary" x="0" y="0" width="1200" height="600"/><circle cx="567.7065134203" cy="373.29972421080004" r="1.937609194779" fill="#008800" stroke="#008800" stroke-width="7.750436779116" data-schematic-circle-id="schematic_circle_0"/><path d="M 632.2934865796 405.59321079045003 L 761.4674328982001 405.59321079045003 L 761.4674328982001 211.83229131255 L 632.2934865796 211.83229131255 L 632.2934865796 405.59321079045003" stroke="#840000" stroke-width="1.291739463186" fill="#ffffc2" stroke-linecap="round" stroke-linejoin="round"/><path d="M 438.5325671017 373.29972421080004 L 567.7065134203 373.29972421080004" stroke="rgb(132, 0, 0)" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><path d="M 567.7065134203 373.29972421080004 L 567.7065134203 567.0606436887" stroke="rgb(132, 0, 0)" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><text x="632.2934865796" y="179.53880473290002" fill="#000000" text-anchor="start" dominant-baseline="ideographic" font-family="sans-serif" font-size="12.91739463186px" transform="rotate(90, 632.2934865796, 179.53880473290002)">U1 "controller" {flyback}</text></svg>
+            </style><rect class="boundary" x="0" y="0" width="1200" height="600"/><circle cx="567.7065134203" cy="373.29972421080004" r="1.937609194779" fill="#008800" stroke="#008800" stroke-width="7.750436779116" data-schematic-circle-id="schematic_circle_0"/><path d="M 632.2934865796 405.59321079045003 L 761.4674328982001 405.59321079045003 L 761.4674328982001 211.83229131255 L 632.2934865796 211.83229131255 L 632.2934865796 405.59321079045003" stroke="#840000" stroke-width="1.291739463186" fill="#ffffc2" stroke-linecap="round" stroke-linejoin="round"/><path d="M 438.5325671017 373.29972421080004 L 567.7065134203 373.29972421080004" stroke="#009600" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><path d="M 567.7065134203 373.29972421080004 L 567.7065134203 567.0606436887" stroke="#009600" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><text x="632.2934865796" y="179.53880473290002" fill="#000000" text-anchor="start" dominant-baseline="ideographic" font-family="sans-serif" font-size="12.91739463186px" transform="rotate(90, 632.2934865796, 179.53880473290002)">U1 "controller" {flyback}</text></svg>

package/tests/board-schematic-trace-color.test.tsx

@@ -0,0 +1,36 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("preserves the compiled schematic wire color", async () => {
+  const circuitJson: CircuitJson = [
+    {
+      type: "pcb_board",
+      pcb_board_id: "board",
+      center: { x: 0, y: 0 },
+      width: 10,
+      height: 10,
+      num_layers: 2,
+      thickness: 1.6,
+      material: "fr4",
+    },
+    {
+      type: "schematic_trace",
+      schematic_trace_id: "wire",
+      source_trace_id: "trace",
+      edges: [{ from: { x: -1, y: 0 }, to: { x: 1, y: 0 } }],
+      junctions: [],
+    },
+  ]
+  const renderedCircuitJson = await runTscircuitCode(
+    convertCircuitJsonToTscircuit(circuitJson, {
+      componentName: "WireColorBoard",
+    }),
+  )
+  const path = renderedCircuitJson.find(
+    (element) => element.type === "schematic_path",
+  )
+
+  expect(path).toMatchObject({ stroke_color: "#009600" })
+})