circuit-json-to-tscircuit 0.0.74 → 0.0.76

package/dist/{chunk-KDQXBFSE.js → chunk-NQTXLCEN.js}

@@ -672,14 +672,9 @@ var convertBoxPortMarkers = ({
 
 // 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;
-};
+  schematicComponent,
+  schematicPort
+}) => schematicPort.display_pin_label ?? schematicComponent.port_labels?.[String(schematicPort.pin_number)];
 
 // lib/generate-board-schematic-tsx/convert-box-components.ts
 var DEFAULT_BOX_BODY_STROKE_WIDTH = 0.02;
@@ -737,9 +732,6 @@ var convertBoxComponent = ({
       })
     );
     primitives.push(...markers);
-    const sourcePort = su2(circuitJson).source_port.get(
-      schematicPort.source_port_id
-    );
     const labelPosition = { ...edge };
     const pinNumberPosition = {
       x: (edge.x + schematicPort.center.x) / 2,
@@ -772,8 +764,8 @@ var convertBoxComponent = ({
         break;
     }
     const displayPinLabel = getBoxPinDisplayLabel({
-      schematicPort,
-      sourcePort
+      schematicComponent,
+      schematicPort
     });
     if (displayPinLabel)
       primitives.push(
@@ -835,6 +827,13 @@ import { su as su4 } from "@tscircuit/soup-util";
 import { schematic_text as schematic_text3 } from "circuit-json";
 import { symbols as symbols2 } from "schematic-symbols";
 import { translate as translate3 } from "transformation-matrix";
+function canRenderNativeNetLabel(name) {
+  const selector = `net.${name}`;
+  if (/net\.[^\s>]*\./.test(selector) || /net\.[^\s>]*[+-]/.test(selector) || /net\.[0-9]/.test(selector)) {
+    return false;
+  }
+  return /^\/?[A-Za-z0-9_]+$/.test(name);
+}
 var convertNetLabels = (circuitJson) => su4(circuitJson).schematic_net_label.list().flatMap((schematicNetLabel) => {
   const anchorPosition = schematicNetLabel.anchor_position ?? schematicNetLabel.center;
   const symbolName = schematicNetLabel.symbol_name;
@@ -851,6 +850,16 @@ var convertNetLabels = (circuitJson) => su4(circuitJson).schematic_net_label.lis
         displayText: schematicNetLabel.text
       });
   }
+  if (!symbolName && schematicNetLabel.anchor_position && canRenderNativeNetLabel(schematicNetLabel.text)) {
+    return [
+      formatElement("netlabel", {
+        net: schematicNetLabel.text,
+        schX: anchorPosition.x,
+        schY: anchorPosition.y,
+        anchorSide: schematicNetLabel.anchor_side
+      })
+    ];
+  }
   return [
     formatElement("schematictext", {
       text: schematicNetLabel.text,

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-KDQXBFSE.js";
+} from "../chunk-NQTXLCEN.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.73",
+  version: "0.0.75",
   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-KDQXBFSE.js";
+} from "../chunk-NQTXLCEN.js";
 export {
   convertCircuitJsonToTscircuit
 };

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

@@ -71,9 +71,6 @@ export const convertBoxComponent = ({
       }),
     )
     primitives.push(...markers)
-    const sourcePort = su(circuitJson).source_port.get(
-      schematicPort.source_port_id,
-    )
     const labelPosition = { ...edge }
     const pinNumberPosition = {
       x: (edge.x + schematicPort.center.x) / 2,
@@ -106,8 +103,8 @@ export const convertBoxComponent = ({
         break
     }
     const displayPinLabel = getBoxPinDisplayLabel({
+      schematicComponent,
       schematicPort,
-      sourcePort,
     })
     if (displayPinLabel)
       primitives.push(

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

@@ -6,6 +6,23 @@ import type { SchematicElementConverter } from "./converter-types"
 import { convertSymbolPrimitives } from "./convert-symbol-primitives"
 import { formatElement } from "./format-attributes"
 
+// Match core's preprocessSelector checks for net names. The validator is not
+// exported by @tscircuit/core; runtime regression tests keep these in sync.
+// https://github.com/tscircuit/core/blob/main/lib/components/base-components/PrimitiveComponent/preprocessSelector.ts
+function canRenderNativeNetLabel(name: string): boolean {
+  const selector = `net.${name}`
+  if (
+    /net\.[^\s>]*\./.test(selector) ||
+    /net\.[^\s>]*[+-]/.test(selector) ||
+    /net\.[0-9]/.test(selector)
+  ) {
+    return false
+  }
+  // A label is one literal name, not a selector expression. Whitespace and CSS
+  // punctuation can parse as a different selection even when core accepts it.
+  return /^\/?[A-Za-z0-9_]+$/.test(name)
+}
+
 export const convertNetLabels: SchematicElementConverter = (circuitJson) =>
   su(circuitJson)
     .schematic_net_label.list()
@@ -26,6 +43,23 @@ export const convertNetLabels: SchematicElementConverter = (circuitJson) =>
             displayText: schematicNetLabel.text,
           })
       }
+      // Native labels own their outline, typography and anchor-side layout.
+      // Core resolves net names through selectors; retain the text fallback
+      // for names that cannot safely be used by that runtime path.
+      if (
+        !symbolName &&
+        schematicNetLabel.anchor_position &&
+        canRenderNativeNetLabel(schematicNetLabel.text)
+      ) {
+        return [
+          formatElement("netlabel", {
+            net: schematicNetLabel.text,
+            schX: anchorPosition.x,
+            schY: anchorPosition.y,
+            anchorSide: schematicNetLabel.anchor_side,
+          }),
+        ]
+      }
       return [
         formatElement("schematictext", {
           text: schematicNetLabel.text,

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

@@ -1,15 +1,11 @@
-import type { SchematicPort, SourcePort } from "circuit-json"
+import type { SchematicComponent, SchematicPort } from "circuit-json"
 
 export const getBoxPinDisplayLabel = ({
+  schematicComponent,
   schematicPort,
-  sourcePort,
 }: {
+  schematicComponent: SchematicComponent
   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
-}
+}): string | undefined =>
+  schematicPort.display_pin_label ??
+  schematicComponent.port_labels?.[String(schematicPort.pin_number)]

package/package.json

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

package/tests/board-net-label-name-validation.test.ts

@@ -0,0 +1,86 @@
+import { expect, test } from "bun:test"
+import { convertNetLabels } from "../lib/generate-board-schematic-tsx/convert-net-labels"
+import { runTscircuitCode } from "tscircuit"
+
+function convertPlainNetLabel(text: string) {
+  return convertNetLabels([
+    {
+      type: "schematic_net_label",
+      schematic_net_label_id: "label",
+      source_net_id: "net",
+      text,
+      center: { x: 2, y: 3 },
+      anchor_position: { x: 2, y: 3 },
+      anchor_side: "left",
+    },
+  ]).join("\n")
+}
+
+for (const name of ["VCC-P", "VCC+P", "3V3", "1", "-VCC", "net.name"]) {
+  test(`conversion preserves text when core rejects ${name}`, async () => {
+    await expect(
+      runTscircuitCode(
+        `export default () => <board><netlabel net={${JSON.stringify(name)}} /></board>`,
+      ),
+    ).rejects.toThrow(/Net name/)
+    const generated = convertPlainNetLabel(name)
+    expect(generated).not.toContain("<netlabel")
+    const output = await runTscircuitCode(
+      `export default () => <board><symbol>${generated}</symbol></board>`,
+    )
+    expect(output).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ type: "schematic_text", text: name }),
+      ]),
+    )
+  })
+}
+
+for (const name of ["SDA", "V3_3", "_RESET", "/RESET", "/3V3", "A1"]) {
+  test(`conversion preserves native labels accepted by core: ${name}`, async () => {
+    const source = await runTscircuitCode(
+      `export default () => <board><netlabel net={${JSON.stringify(name)}} schX={2} schY={3} anchorSide="left" /></board>`,
+    )
+    const generated = convertNetLabels(source).join("\n")
+    expect(generated).toContain("<netlabel")
+    const output = await runTscircuitCode(
+      `export default () => <board><symbol>${generated}</symbol></board>`,
+    )
+    expect(output).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "schematic_net_label",
+          text: name,
+          anchor_position: { x: 2, y: 3 },
+          anchor_side: "left",
+        }),
+      ]),
+    )
+  })
+}
+
+for (const name of [
+  "BUS/DATA",
+  "//RESET",
+  "HV VSYS",
+  "A>B",
+  "A,B",
+  "A[1]",
+  "A:B",
+  'A"B',
+  "",
+  "電源",
+]) {
+  test(`conversion preserves selector-unsafe label text: ${name}`, async () => {
+    const generated = convertPlainNetLabel(name)
+    expect(generated).not.toContain("<netlabel")
+    const output = await runTscircuitCode(
+      `export default () => <board><symbol>${generated}</symbol></board>`,
+    )
+    expect(output).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ type: "schematic_text", text: name }),
+      ]),
+    )
+  })
+}

package/tests/board-plain-net-label-anchor.test.ts

@@ -0,0 +1,82 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToSchematicSvg } from "circuit-to-svg"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("native plain labels preserve rendering on every connection side", async () => {
+  for (const side of ["left", "right", "top", "bottom"] as const) {
+    const input = await runTscircuitCode(`export default () => (
+      <board width={10} height={10}>
+        <netlabel net="DATA" schX={2} schY={3} anchorSide="${side}" />
+      </board>
+    )`)
+    const output = await runTscircuitCode(
+      convertCircuitJsonToTscircuit(input, { componentName: "LabelBoard" }),
+    )
+    const sourceLabels = input.filter((e) => e.type === "schematic_net_label")
+    const renderedLabels = output.filter(
+      (e) => e.type === "schematic_net_label",
+    )
+    expect(renderedLabels).toHaveLength(1)
+    const original = sourceLabels[0]!
+    expect(renderedLabels[0]).toMatchObject({
+      text: original.text,
+      anchor_side: original.anchor_side,
+      anchor_position: original.anchor_position,
+      center: original.center,
+    })
+    expect(
+      convertCircuitJsonToSchematicSvg(renderedLabels, {
+        includeVersion: false,
+      }),
+    ).toBe(
+      convertCircuitJsonToSchematicSvg(sourceLabels, { includeVersion: false }),
+    )
+  }
+  for (const name of [
+    "HV VSYS",
+    "BUS/DATA",
+    "net.name",
+    "",
+    'A"B',
+    "CENTER_ONLY",
+    "VCC-P",
+    "VCC+P",
+    "3V3",
+    "1",
+    "-VCC",
+  ]) {
+    const input: 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_net_label",
+        schematic_net_label_id: "label",
+        text: name,
+        center: { x: 2, y: 3 },
+        anchor_position: name === "CENTER_ONLY" ? undefined : { x: 2, y: 3 },
+        anchor_side: "left",
+        source_net_id: "net",
+      },
+    ]
+    const tsx = convertCircuitJsonToTscircuit(input, {
+      componentName: "Fallback",
+    })
+    expect(tsx).not.toContain("<netlabel")
+    const fallback = await runTscircuitCode(tsx)
+    expect(fallback).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ type: "schematic_text", text: name }),
+      ]),
+    )
+  }
+})

package/tests/board-schematic-box-pin-text-color.test.tsx

@@ -38,6 +38,7 @@ test("uses the compiled schematic color for box pin text", async () => {
       side_of_component: "left",
       facing_direction: "left",
       pin_number: 1,
+      display_pin_label: "FB",
     },
   ]
   const renderedCircuitJson = await runTscircuitCode(

package/tests/board-schematic-component-pin-labels.test.ts

@@ -0,0 +1,73 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("preserves component-level pin labels and explicit suppression", 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: "controller",
+      center: { x: 0, y: 0 },
+      size: { width: 2, height: 1 },
+      is_box_with_pins: true,
+      port_labels: { "1": "ENABLE", "2": "DISABLED" },
+    },
+    {
+      type: "source_port",
+      source_port_id: "enable_source",
+      name: "ENABLE",
+      pin_number: 1,
+    },
+    {
+      type: "source_port",
+      source_port_id: "disabled_source",
+      name: "DISABLED",
+      pin_number: 2,
+    },
+    {
+      type: "schematic_port",
+      schematic_port_id: "enable_pin",
+      source_port_id: "enable_source",
+      schematic_component_id: "controller",
+      center: { x: -1.4, y: 0.2 },
+      distance_from_component_edge: 0.4,
+      side_of_component: "left",
+      facing_direction: "left",
+      pin_number: 1,
+    },
+    {
+      type: "schematic_port",
+      schematic_port_id: "disabled_pin",
+      source_port_id: "disabled_source",
+      schematic_component_id: "controller",
+      center: { x: -1.4, y: -0.2 },
+      distance_from_component_edge: 0.4,
+      side_of_component: "left",
+      facing_direction: "left",
+      pin_number: 2,
+      display_pin_label: "",
+    },
+  ]
+  const renderedCircuitJson = await runTscircuitCode(
+    convertCircuitJsonToTscircuit(circuitJson, {
+      componentName: "ComponentPinLabelsBoard",
+    }),
+  )
+  const renderedTexts = renderedCircuitJson
+    .filter((element) => element.type === "schematic_text")
+    .map((element) => element.text)
+
+  expect(renderedTexts).toContain("ENABLE")
+  expect(renderedTexts).not.toContain("DISABLED")
+})

package/tests/board-schematic-hidden-pin-labels.test.ts

@@ -0,0 +1,37 @@
+import { expect, test } from "bun:test"
+import { readFile } from "node:fs/promises"
+import { join } from "node:path"
+import { gunzipSync } from "node:zlib"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+
+test("does not display hidden source port names on the LM5155 U3 symbol", async () => {
+  const fixturePath = join(
+    import.meta.dir,
+    "fixtures/ti-evms/lm5155evm-fly.circuit.json.gz",
+  )
+  const circuitJson = JSON.parse(
+    gunzipSync(await readFile(fixturePath)).toString("utf8"),
+  ) as CircuitJson
+  const refSourcePort = circuitJson.find(
+    (element) => element.type === "source_port" && element.name === "REF",
+  )
+  if (refSourcePort?.type !== "source_port") {
+    throw new Error("LM5155 fixture is missing the U3 REF source port")
+  }
+  const refSchematicPort = circuitJson.find(
+    (element) =>
+      element.type === "schematic_port" &&
+      element.source_port_id === refSourcePort.source_port_id,
+  )
+  if (refSchematicPort?.type !== "schematic_port") {
+    throw new Error("LM5155 fixture is missing the U3 REF schematic port")
+  }
+  expect(refSchematicPort.display_pin_label).toBeUndefined()
+
+  const generatedTscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+    componentName: "Lm5155EvmFly",
+  })
+
+  expect(generatedTscircuit).not.toContain('<schematictext text={"REF"}')
+})