circuit-json-to-tscircuit 0.0.71 → 0.0.73

package/dist/{chunk-3CHC36FN.js → chunk-5YQBNWPZ.js}

@@ -571,6 +571,19 @@ var convertSymbolPrimitives = ({
 // lib/generate-board-schematic-tsx/convert-box-components.ts
 import { su as su2 } from "@tscircuit/soup-util";
 import "circuit-json";
+
+// lib/generate-board-schematic-tsx/get-box-pin-display-label.ts
+var getBoxPinDisplayLabel = ({
+  schematicPort,
+  sourcePort
+}) => {
+  if (schematicPort.display_pin_label !== void 0)
+    return schematicPort.display_pin_label;
+  const sourceName = sourcePort?.name;
+  return sourceName && !/^\d+$/.test(sourceName) ? sourceName : void 0;
+};
+
+// lib/generate-board-schematic-tsx/convert-box-components.ts
 var DEFAULT_BOX_BODY_STROKE_WIDTH = 0.02;
 var DEFAULT_BOX_BODY_STROKE_COLOR = "#840000";
 var DEFAULT_BOX_BODY_FILL_COLOR = "#ffffc2";
@@ -655,7 +668,10 @@ var convertBoxComponent = ({
         rotation = -90;
         break;
     }
-    const displayPinLabel = schematicPort.display_pin_label ?? sourcePort?.name;
+    const displayPinLabel = getBoxPinDisplayLabel({
+      schematicPort,
+      sourcePort
+    });
     if (displayPinLabel)
       primitives.push(
         formatElement("schematictext", {
@@ -728,7 +744,7 @@ var convertNetLabels = (circuitJson) => su4(circuitJson).schematic_net_label.lis
           anchorPosition.x,
           anchorPosition.y
         ),
-        reference: "",
+        reference: schematicNetLabel.text,
         displayText: schematicNetLabel.text
       });
   }

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-3CHC36FN.js";
+} from "../chunk-5YQBNWPZ.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.70",
+  version: "0.0.72",
   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-3CHC36FN.js";
+} from "../chunk-5YQBNWPZ.js";
 export {
   convertCircuitJsonToTscircuit
 };

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

@@ -2,6 +2,7 @@ import { su } from "@tscircuit/soup-util"
 import { type AnyCircuitElement, type SchematicComponent } from "circuit-json"
 import { convertRect } from "./convert-rect"
 import { formatElement } from "./format-attributes"
+import { getBoxPinDisplayLabel } from "./get-box-pin-display-label"
 
 // Circuit JSON does not encode box body styling. These values mirror the
 // circuit-to-svg defaults so reconstructed boxes keep the compiled view.
@@ -98,7 +99,10 @@ export const convertBoxComponent = ({
         rotation = -90
         break
     }
-    const displayPinLabel = schematicPort.display_pin_label ?? sourcePort?.name
+    const displayPinLabel = getBoxPinDisplayLabel({
+      schematicPort,
+      sourcePort,
+    })
     if (displayPinLabel)
       primitives.push(
         formatElement("schematictext", {

package/lib/generate-board-schematic-tsx/convert-net-labels.ts

@@ -22,7 +22,7 @@ export const convertNetLabels: SchematicElementConverter = (circuitJson) =>
               anchorPosition.x,
               anchorPosition.y,
             ),
-            reference: "",
+            reference: schematicNetLabel.text,
             displayText: schematicNetLabel.text,
           })
       }

package/lib/generate-board-schematic-tsx/get-box-pin-display-label.ts

@@ -0,0 +1,15 @@
+import type { SchematicPort, SourcePort } from "circuit-json"
+
+export const getBoxPinDisplayLabel = ({
+  schematicPort,
+  sourcePort,
+}: {
+  schematicPort: SchematicPort
+  sourcePort: SourcePort | null
+}): string | undefined => {
+  if (schematicPort.display_pin_label !== undefined)
+    return schematicPort.display_pin_label
+
+  const sourceName = sourcePort?.name
+  return sourceName && !/^\d+$/.test(sourceName) ? sourceName : undefined
+}

package/package.json

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

package/tests/board-schematic-net-label-text.test.tsx

@@ -0,0 +1,47 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("preserves text for imported symbolic net labels", 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: "source_net",
+      source_net_id: "power_good_net",
+      name: "PGOOD",
+      member_source_group_ids: [],
+    },
+    {
+      type: "schematic_net_label",
+      schematic_net_label_id: "power_good_label",
+      source_net_id: "power_good_net",
+      text: "PGOOD",
+      center: { x: 1, y: 2 },
+      anchor_position: { x: 1, y: 2 },
+      anchor_side: "left",
+      symbol_name: "vcc_right",
+    },
+  ]
+  const renderedCircuitJson = await runTscircuitCode(
+    convertCircuitJsonToTscircuit(circuitJson, {
+      componentName: "NetLabelBoard",
+    }),
+  )
+
+  expect(
+    renderedCircuitJson.some(
+      (element) =>
+        element.type === "schematic_text" && element.text === "PGOOD",
+    ),
+  ).toBe(true)
+})

package/tests/board-schematic-numeric-pin-name.test.tsx

@@ -0,0 +1,72 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("does not duplicate numeric box pin names", 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_component",
+      schematic_component_id: "net_tie",
+      center: { x: 0, y: 0 },
+      size: { width: 0.4, height: 0.4 },
+      is_box_with_pins: true,
+    },
+    {
+      type: "source_port",
+      source_port_id: "net_tie_left_source",
+      name: "1",
+      pin_number: 1,
+    },
+    {
+      type: "source_port",
+      source_port_id: "net_tie_right_source",
+      name: "2",
+      pin_number: 2,
+    },
+    {
+      type: "schematic_port",
+      schematic_port_id: "net_tie_left",
+      source_port_id: "net_tie_left_source",
+      schematic_component_id: "net_tie",
+      center: { x: -0.4, y: 0 },
+      side_of_component: "left",
+      facing_direction: "left",
+      pin_number: 1,
+    },
+    {
+      type: "schematic_port",
+      schematic_port_id: "net_tie_right",
+      source_port_id: "net_tie_right_source",
+      schematic_component_id: "net_tie",
+      center: { x: 0.4, y: 0 },
+      side_of_component: "right",
+      facing_direction: "right",
+      pin_number: 2,
+    },
+  ]
+  const renderedCircuitJson = await runTscircuitCode(
+    convertCircuitJsonToTscircuit(circuitJson, {
+      componentName: "NetTieBoard",
+    }),
+  )
+  const numericTexts = renderedCircuitJson
+    .flatMap((element) =>
+      element.type === "schematic_text" && /^[12]$/.test(element.text)
+        ? [element.text]
+        : [],
+    )
+    .sort()
+
+  expect(numericTexts).toEqual(["1", "2"])
+})