circuit-json-to-tscircuit 0.0.95 → 0.0.96

package/dist/{chunk-KYTTH2AG.js → chunk-ULPDKPX5.js}

@@ -4019,30 +4019,8 @@ var generateFootprintTsx = (circuitJson, context) => {
 };
 
 // lib/board-converter/get-pcb-component-render-placement.ts
-import { getBoundsOfPcbElements } from "@tscircuit/circuit-json-util";
 import { applyToPoint as applyToPoint6, inverse, translate as translate5 } from "transformation-matrix";
-var physicalPcbElementTypes = /* @__PURE__ */ new Set([
-  "pcb_copper_text",
-  "pcb_cutout",
-  "pcb_hole",
-  "pcb_keepout",
-  "pcb_plated_hole",
-  "pcb_smtpad",
-  "pcb_trace",
-  "pcb_via"
-]);
-var isPhysicalPcbElement = (element) => physicalPcbElementTypes.has(element.type);
-var getElementsAsRenderedByGeneratedTsx = (elements) => elements.map((element) => {
-  if (element.type !== "pcb_plated_hole" || element.shape !== "rotated_pill_hole_with_rect_pad") {
-    return element;
-  }
-  return {
-    ...element,
-    rect_ccw_rotation: element.hole_ccw_rotation
-  };
-});
 var getPcbComponentRenderPlacement = ({
-  circuitJson,
   pcbBoard,
   pcbComponent
 }) => {
@@ -4050,25 +4028,8 @@ var getPcbComponentRenderPlacement = ({
     inverse(translate5(pcbBoard.center.x, pcbBoard.center.y)),
     pcbComponent.center
   );
-  const physicalElements = circuitJson.filter(
-    (element) => isPhysicalPcbElement(element) && "pcb_component_id" in element && element.pcb_component_id === pcbComponent.pcb_component_id
-  );
-  const physicalBounds = getBoundsOfPcbElements(
-    getElementsAsRenderedByGeneratedTsx(physicalElements)
-  );
-  const physicalWidth = physicalBounds.maxX - physicalBounds.minX;
-  const physicalHeight = physicalBounds.maxY - physicalBounds.minY;
-  if (Number.isFinite(physicalWidth) && Number.isFinite(physicalHeight) && physicalWidth > 0 && physicalHeight > 0) {
-    return {
-      cadModelParentCenter: {
-        x: (physicalBounds.minX + physicalBounds.maxX) / 2,
-        y: (physicalBounds.minY + physicalBounds.maxY) / 2
-      },
-      componentPosition
-    };
-  }
   return {
-    cadModelParentCenter: componentPosition,
+    cadModelParentCenter: pcbComponent.center,
     componentPosition
   };
 };
@@ -4265,6 +4226,7 @@ var getOppositeOuterLayer = (layer) => {
 };
 var localizeBottomComponentLayers = (localComponentElements) => {
   for (const localElement of localComponentElements) {
+    if (localElement.type === "pcb_stackup") continue;
     if ("layer" in localElement && (localElement.layer === "top" || localElement.layer === "bottom")) {
       localElement.layer = getOppositeOuterLayer(localElement.layer);
     }
@@ -4406,7 +4368,6 @@ var convertPcbComponents = ({
       (element) => element.type === "source_component" && (element.source_component_id === pcbComponent.source_component_id || element.source_component_id !== void 0 && schematicSourceComponentIds.has(element.source_component_id))
     );
     const { cadModelParentCenter, componentPosition } = getPcbComponentRenderPlacement({
-      circuitJson,
       pcbBoard,
       pcbComponent
     });

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-KYTTH2AG.js";
+} from "../chunk-ULPDKPX5.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.94",
+  version: "0.0.95",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/circuit-json-to-tscircuit.git"
@@ -38,7 +38,7 @@ var package_default = {
     "@types/react": "18",
     "@types/react-dom": "18",
     "bun-match-svg": "^0.0.15",
-    "circuit-json": "^0.0.521",
+    "circuit-json": "^0.0.539",
     "circuit-json-to-gltf": "0.0.151",
     "circuit-to-svg": "https://pkg.pr.new/tscircuit/circuit-to-svg@738ef1d",
     color: "^5.0.3",
@@ -52,7 +52,7 @@ var package_default = {
     shiki: "^4.3.1",
     "stack-svgs": "^0.0.1",
     "transformation-matrix": "3.1.0",
-    tscircuit: "0.0.2775-libonly",
+    tscircuit: "0.0.3043-libonly",
     tsup: "^8.3.5",
     zod: "^3.25.76"
   },

package/dist/lib/index.js

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

package/lib/board-converter/get-pcb-component-render-placement.ts

@@ -1,64 +1,15 @@
-import { getBoundsOfPcbElements } from "@tscircuit/circuit-json-util"
-import type { AnyCircuitElement, PcbBoard, PcbComponent } from "circuit-json"
+import type { PcbBoard, PcbComponent } from "circuit-json"
 import { applyToPoint, inverse, translate } from "transformation-matrix"
 
-type PhysicalPcbElementType =
-  | "pcb_copper_text"
-  | "pcb_cutout"
-  | "pcb_hole"
-  | "pcb_keepout"
-  | "pcb_plated_hole"
-  | "pcb_smtpad"
-  | "pcb_trace"
-  | "pcb_via"
-
-const physicalPcbElementTypes = new Set<PhysicalPcbElementType>([
-  "pcb_copper_text",
-  "pcb_cutout",
-  "pcb_hole",
-  "pcb_keepout",
-  "pcb_plated_hole",
-  "pcb_smtpad",
-  "pcb_trace",
-  "pcb_via",
-])
-
-const isPhysicalPcbElement = (
-  element: AnyCircuitElement,
-): element is AnyCircuitElement & { type: PhysicalPcbElementType } =>
-  physicalPcbElementTypes.has(element.type as PhysicalPcbElementType)
-
-const getElementsAsRenderedByGeneratedTsx = (
-  elements: AnyCircuitElement[],
-): AnyCircuitElement[] =>
-  elements.map((element) => {
-    if (
-      element.type !== "pcb_plated_hole" ||
-      element.shape !== "rotated_pill_hole_with_rect_pad"
-    ) {
-      return element
-    }
-
-    // The plated-hole component has one rotation for both the hole and its
-    // rectangular pad. The TSX converter uses the imported hole rotation, so
-    // calculate the parent bounds from that same rendered geometry.
-    return {
-      ...element,
-      rect_ccw_rotation: element.hole_ccw_rotation,
-    }
-  })
-
 export interface PcbComponentRenderPlacement {
   cadModelParentCenter: { x: number; y: number }
   componentPosition: { x: number; y: number }
 }
 
 export const getPcbComponentRenderPlacement = ({
-  circuitJson,
   pcbBoard,
   pcbComponent,
 }: {
-  circuitJson: AnyCircuitElement[]
   pcbBoard: PcbBoard
   pcbComponent: PcbComponent
 }): PcbComponentRenderPlacement => {
@@ -66,37 +17,11 @@ export const getPcbComponentRenderPlacement = ({
     inverse(translate(pcbBoard.center.x, pcbBoard.center.y)),
     pcbComponent.center,
   )
-  const physicalElements = circuitJson.filter(
-    (element) =>
-      isPhysicalPcbElement(element) &&
-      "pcb_component_id" in element &&
-      element.pcb_component_id === pcbComponent.pcb_component_id,
-  )
-  const physicalBounds = getBoundsOfPcbElements(
-    getElementsAsRenderedByGeneratedTsx(physicalElements),
-  )
-  const physicalWidth = physicalBounds.maxX - physicalBounds.minX
-  const physicalHeight = physicalBounds.maxY - physicalBounds.minY
-
-  if (
-    Number.isFinite(physicalWidth) &&
-    Number.isFinite(physicalHeight) &&
-    physicalWidth > 0 &&
-    physicalHeight > 0
-  ) {
-    return {
-      cadModelParentCenter: {
-        x: (physicalBounds.minX + physicalBounds.maxX) / 2,
-        y: (physicalBounds.minY + physicalBounds.maxY) / 2,
-      },
-      componentPosition,
-    }
-  }
-
-  // Core retains the board-local chip position when there are no physical
-  // footprint primitives, so use that position as the CAD model's parent.
+  // Core anchors cadModel.positionOffset at the chip's pre-layout footprint
+  // origin, not at its pad bounds. CAD offsets use absolute board XY axes;
+  // the chip's board-local position becomes pcbComponent.center after rendering.
   return {
-    cadModelParentCenter: componentPosition,
+    cadModelParentCenter: pcbComponent.center,
     componentPosition,
   }
 }

package/lib/board-converter/localize-pcb-component-elements.ts

@@ -155,6 +155,7 @@ const localizeBottomComponentLayers = (
   localComponentElements: AnyCircuitElement[],
 ): void => {
   for (const localElement of localComponentElements) {
+    if (localElement.type === "pcb_stackup") continue
     if (
       "layer" in localElement &&
       (localElement.layer === "top" || localElement.layer === "bottom")

package/lib/board-converter/stages/convert-pcb-components.ts

@@ -94,7 +94,6 @@ export const convertPcbComponents: BoardConverterStage = ({
     )
     const { cadModelParentCenter, componentPosition } =
       getPcbComponentRenderPlacement({
-        circuitJson,
         pcbBoard,
         pcbComponent,
       })

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/circuit-json-to-tscircuit.git"
@@ -28,7 +28,7 @@
     "@types/react": "18",
     "@types/react-dom": "18",
     "bun-match-svg": "^0.0.15",
-    "circuit-json": "^0.0.521",
+    "circuit-json": "^0.0.539",
     "circuit-json-to-gltf": "0.0.151",
     "circuit-to-svg": "https://pkg.pr.new/tscircuit/circuit-to-svg@738ef1d",
     "color": "^5.0.3",
@@ -42,7 +42,7 @@
     "shiki": "^4.3.1",
     "stack-svgs": "^0.0.1",
     "transformation-matrix": "3.1.0",
-    "tscircuit": "0.0.2775-libonly",
+    "tscircuit": "0.0.3043-libonly",
     "tsup": "^8.3.5",
     "zod": "^3.25.76"
   },

package/tests/beagleplay-usb-cad-origin.test.ts

@@ -0,0 +1,57 @@
+import { expect, test } from "bun:test"
+import type { CadComponent, CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+import { expectJscadCadModel3dSnapshots } from "./fixtures/expect-jscad-cad-model-3d-snapshots"
+
+test("preserves BeaglePlay J13 CAD placement when pad bounds differ from its footprint origin", async () => {
+  // J13, its native pads and its ComponentBody come from BEAGLEPLAYV020_220915.
+  const sourceCircuitJson: CircuitJson = await Bun.file(
+    new URL("./fixtures/beagleplay-j13-origin.circuit.json", import.meta.url),
+  ).json()
+  const sourceCadComponent = sourceCircuitJson.find(
+    (element): element is CadComponent => element.type === "cad_component",
+  )!
+  const generatedTsx = convertCircuitJsonToTscircuit(sourceCircuitJson, {
+    componentName: "BeaglePlayUsb",
+  })
+  expect(generatedTsx).toMatchInlineSnapshot(`
+    "export const BeaglePlayUsb = () => (
+      <board pcbX={-308.7624} pcbY={238.2139} width="24mm" height="20mm" thickness="1.6mm" layers={8} material="fr4">
+        <chip name="J13" pcbX={0} pcbY={0} pcbRotation="90deg" layer="top" noSchematicRepresentation cadModel={{ jscad: {"type":"colorize","color":[0.5019607843137255,0.5019607843137255,0.5019607843137255],"shape":{"type":"extrudeLinear","options":{"height":3.81},"shape":{"type":"fromPointsGeom2","points":[[-2.7939999999999827,-6.921500000000009],[2.7940000000000396,-6.921500000000009],[2.7940000000000396,6.921500000000009],[-2.7939999999999827,6.921500000000009]]}}}, positionOffset: { x: 0, y: 0, z: 0 }, rotationOffset: { x: 0, y: 0, z: -90 }, modelOriginPosition: { x: 0, y: 0, z: 0 }, modelUnitToMmScale: 1, modelBoardNormalDirection: "z+" }} obstructsWithinBounds={false} footprint={<footprint>
+                <platedhole portHints={["6"]} pcbX="4.032504mm" pcbY="3.080004mm" outerDiameter="2.199894mm" holeDiameter="1.400048mm" shape="circle" />
+        <platedhole portHints={["4"]} pcbX="6.0325mm" pcbY="2.100072mm" outerDiameter="1.199896mm" holeDiameter="0.649986mm" shape="circle" />
+        <platedhole portHints={["3"]} pcbX="6.0325mm" pcbY="0.700024mm" outerDiameter="1.199896mm" holeDiameter="0.649986mm" shape="circle" />
+        <platedhole portHints={["7"]} pcbX="-1.567434mm" pcbY="0mm" outerHeight="1.500124mm" outerWidth="2.9718mm" holeHeight="1.500124mm" holeWidth="2.9718mm" height="1.500124mm" shape="pill" pcbRotation="270deg" />
+        <platedhole portHints={["2"]} pcbX="6.0325mm" pcbY="-0.700024mm" outerDiameter="1.199896mm" holeDiameter="0.649986mm" shape="circle" />
+        <platedhole portHints={["1"]} pcbX="6.0325mm" pcbY="-2.100072mm" outerDiameter="1.199896mm" holeDiameter="0.649986mm" shape="circle" />
+        <platedhole portHints={["5"]} pcbX="4.032504mm" pcbY="-3.080004mm" outerDiameter="2.199894mm" holeDiameter="1.400048mm" shape="circle" />
+              </footprint>} />
+      </board>
+    )
+    export default BeaglePlayUsb"
+  `)
+  const renderedCircuitJson = (await runTscircuitCode(
+    generatedTsx,
+  )) as CircuitJson
+  const renderedCadComponent = renderedCircuitJson.find(
+    (element): element is CadComponent => element.type === "cad_component",
+  )
+
+  await expectJscadCadModel3dSnapshots({
+    sourceCircuitJson,
+    generatedCircuitJson: renderedCircuitJson,
+    testPath: import.meta.path,
+  })
+
+  for (const axis of ["x", "y", "z"] as const) {
+    expect(renderedCadComponent?.position[axis]).toBeCloseTo(
+      sourceCadComponent.position[axis],
+      8,
+    )
+  }
+  expect(renderedCadComponent?.rotation).toEqual(sourceCadComponent.rotation)
+  expect(renderedCadComponent?.model_jscad).toEqual(
+    sourceCadComponent.model_jscad,
+  )
+})

package/tests/dp83825-usb-cad-origin.test.ts

@@ -0,0 +1,82 @@
+import { expect, test } from "bun:test"
+import { gunzipSync } from "node:zlib"
+import type { CadComponent, CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+import { expectTiEvm3dSnapshot } from "./fixtures/expect-ti-evm-3d-snapshot"
+
+test("preserves the DP83825EVM Molex USB connector on its mounting pads", async () => {
+  const sourceCircuitJson: CircuitJson = JSON.parse(
+    gunzipSync(
+      await Bun.file(
+        new URL(
+          "./fixtures/ti-evms/dp83825-usb-cad-origin.circuit.json.gz",
+          import.meta.url,
+        ),
+      ).arrayBuffer(),
+    ).toString("utf8"),
+  )
+  const sourceCadComponent = sourceCircuitJson.find(
+    (element): element is CadComponent => element.type === "cad_component",
+  )!
+  const generatedTsx = convertCircuitJsonToTscircuit(sourceCircuitJson, {
+    componentName: "Dp83825Usb",
+  })
+  expect(generatedTsx).toMatchInlineSnapshot(`
+    "export const Dp83825Usb = () => (
+      <board pcbX={20.605798895} pcbY={73.2536} width="18mm" height="16mm" thickness="1.6mm" layers={4} material="fr4">
+        <chip name="J1" pcbX={-2.7749988949999995} pcbY={-1.4210854715202004e-14} pcbRotation="270deg" layer="top" noSchematicRepresentation cadModel={<cadmodel modelUrl={"/cad-models/dp83825evm/8.step"} positionOffset={{ x: 12.800022659999996, y: -0.00008128000000340307, z: 2.25000058 }} rotationOffset={{ x: 270, y: 90, z: -270 }} modelUnitToMmScale={1} modelBoardNormalDirection={"z+"} modelOriginPosition={{ x: 0, y: 0, z: 0 }} showAsTranslucentModel={false} />} obstructsWithinBounds={false} footprint={<footprint>
+                <platedhole portHints={["7"]} pcbX="4.17500054mm" pcbY="1.44999964mm" holeShape="pill" padShape="rect" holeWidth="1.29999994mm" holeHeight="0.5999987999999999mm" rectPadWidth="0.8000009399999999mm" rectPadHeight="2.00000108mm" rectBorderRadius="0.40000046999999994mm" holeOffsetX="0mm" holeOffsetY="0mm" pcbRotation="270deg" shape="pill_hole_with_rect_pad" />
+        <platedhole portHints={["10"]} pcbX="-4.17500054mm" pcbY="1.44999964mm" holeShape="pill" padShape="rect" holeWidth="1.29999994mm" holeHeight="0.5999987999999999mm" rectPadWidth="0.8000009399999999mm" rectPadHeight="2.00000108mm" rectBorderRadius="0.40000046999999994mm" holeOffsetX="0mm" holeOffsetY="0mm" pcbRotation="270deg" shape="pill_hole_with_rect_pad" />
+        <platedhole portHints={["6"]} pcbX="2.22499936mm" pcbY="4.44999872mm" holeShape="pill" padShape="rect" holeWidth="0.8500008399999999mm" holeHeight="0.70000114mm" rectPadWidth="1.05000044mm" rectPadHeight="1.29999994mm" rectBorderRadius="0.52500022mm" holeOffsetX="0mm" holeOffsetY="0mm" pcbRotation="270deg" shape="pill_hole_with_rect_pad" />
+        <platedhole portHints={["11"]} pcbX="-2.22499936mm" pcbY="4.44999872mm" holeShape="pill" padShape="rect" holeWidth="0.8500008399999999mm" holeHeight="0.70000114mm" rectPadWidth="1.05000044mm" rectPadHeight="1.29999994mm" rectBorderRadius="0.52500022mm" holeOffsetX="0mm" holeOffsetY="0mm" pcbRotation="270deg" shape="pill_hole_with_rect_pad" />
+        <smtpad portHints={["3"]} pcbX="0mm" pcbY="4.12500064mm" layer="top" solderMaskMargin="0.04999989999999999mm" cornerRadius="0.04999989999999999mm" width="0.39999919999999994mm" height="1.34999984mm" ccwRotation={0} shape="rotated_rect" />
+        <smtpad portHints={["2"]} pcbX="-0.65000124mm" pcbY="4.12500064mm" layer="top" solderMaskMargin="0.04999989999999999mm" cornerRadius="0.04999989999999999mm" width="0.39999919999999994mm" height="1.34999984mm" ccwRotation={0} shape="rotated_rect" />
+        <smtpad portHints={["8"]} pcbX="1.15000024mm" pcbY="1.44999964mm" layer="top" solderMaskMargin="0.04999989999999999mm" cornerRadius="0.05399996819999999mm" width="1.79999894mm" height="2.00000108mm" ccwRotation={180} shape="rotated_rect" />
+        <smtpad portHints={["9"]} pcbX="-1.15000024mm" pcbY="1.44999964mm" layer="top" solderMaskMargin="0.04999989999999999mm" cornerRadius="0.05399996819999999mm" width="1.79999894mm" height="2.00000108mm" ccwRotation={180} shape="rotated_rect" />
+        <smtpad portHints={["5"]} pcbX="1.29999994mm" pcbY="4.12500064mm" layer="top" solderMaskMargin="0.04999989999999999mm" cornerRadius="0.04999989999999999mm" width="0.39999919999999994mm" height="1.34999984mm" ccwRotation={0} shape="rotated_rect" />
+        <smtpad portHints={["4"]} pcbX="0.65000124mm" pcbY="4.12500064mm" layer="top" solderMaskMargin="0.04999989999999999mm" cornerRadius="0.04999989999999999mm" width="0.39999919999999994mm" height="1.34999984mm" ccwRotation={0} shape="rotated_rect" />
+        <smtpad portHints={["1"]} pcbX="-1.29999994mm" pcbY="4.12500064mm" layer="top" solderMaskMargin="0.04999989999999999mm" cornerRadius="0.04999989999999999mm" width="0.39999919999999994mm" height="1.34999984mm" ccwRotation={0} shape="rotated_rect" />
+        <silkscreenline x1={3.750015359999992} y1={2.84699964} x2={3.750015359999992} y2={4.29999394} strokeWidth={0.127} />
+        <silkscreenline x1={3.750015359999992} y1={4.29999394} x2={3.200003759999987} y2={4.29999394} strokeWidth={0.127} />
+        <silkscreenline x1={-3.7499950400000017} y1={2.84699964} x2={-3.7499950400000017} y2={4.29999394} strokeWidth={0.127} />
+        <silkscreenline x1={-3.199983440000011} y1={4.29999394} x2={-3.7499950400000017} y2={4.29999394} strokeWidth={0.127} />
+        <fabricationnotetext pcbX={-2.2644176200000032} pcbY={1.4476831600000004} anchorAlignment="center" text="J1" font="tscircuit2024" fontSize={1.016} color="#ec4899" pcbRotation="0deg" />
+        <silkscreentext pcbX={-5.334000000000003} pcbY={1.0159999999999982} anchorAlignment="bottom_left" fontSize={0.762} font="tscircuit2024" pcbRotation="360deg" mirrored={false} layer="top" text="J1" />
+              </footprint>} />
+      </board>
+    )
+    export default Dp83825Usb"
+  `)
+  const generatedCircuitJson = (await runTscircuitCode(
+    generatedTsx,
+  )) as CircuitJson
+
+  for (const [snapshotName, circuitJson] of [
+    ["source", sourceCircuitJson],
+    ["generated", generatedCircuitJson],
+  ] as const) {
+    await expectTiEvm3dSnapshot({
+      cameraReferenceCircuitJson: sourceCircuitJson,
+      circuitJson,
+      fixtureName: "dp83825evm",
+      snapshotName,
+      testPath: import.meta.path,
+    })
+  }
+
+  const generatedCadComponent = generatedCircuitJson.find(
+    (element): element is CadComponent => element.type === "cad_component",
+  )
+  for (const axis of ["x", "y", "z"] as const) {
+    expect(generatedCadComponent?.position[axis]).toBeCloseTo(
+      sourceCadComponent.position[axis],
+      8,
+    )
+  }
+  expect(generatedCadComponent).toMatchObject({
+    rotation: sourceCadComponent.rotation,
+    model_step_url: sourceCadComponent.model_step_url,
+    model_origin_position: sourceCadComponent.model_origin_position,
+  })
+}, 60_000)

package/tests/fixtures/beagleplay-j13-origin.circuit.json

@@ -0,0 +1,173 @@
+[
+  {
+    "type": "pcb_board",
+    "pcb_board_id": "pcb_pcb_board_altium",
+    "center": {
+      "x": -308.7624,
+      "y": 238.2139
+    },
+    "width": 24,
+    "height": 20,
+    "thickness": 1.6,
+    "num_layers": 8,
+    "material": "fr4",
+    "is_via_in_pad_allowed": true,
+    "min_trace_width": 0.254,
+    "min_via_hole_diameter": 0.7111999999999999,
+    "min_via_pad_diameter": 1.27
+  },
+  {
+    "type": "source_component",
+    "ftype": "simple_chip",
+    "source_component_id": "pcb_source_component_altium_633",
+    "name": "J13",
+    "display_name": "J13"
+  },
+  {
+    "type": "pcb_component",
+    "pcb_component_id": "pcb_pcb_component_altium_633",
+    "source_component_id": "pcb_source_component_altium_633",
+    "center": {
+      "x": -308.7624,
+      "y": 238.2139
+    },
+    "width": 8.359902000000025,
+    "height": 14.126972000000007,
+    "layer": "top",
+    "rotation": 90,
+    "position_mode": "none",
+    "obstructs_within_bounds": false
+  },
+  {
+    "type": "cad_component",
+    "cad_component_id": "pcb_cad_component_altium_primitive_227",
+    "pcb_component_id": "pcb_pcb_component_altium_633",
+    "source_component_id": "pcb_source_component_altium_633",
+    "position": {
+      "x": -308.7624,
+      "y": 238.2139,
+      "z": 0.8
+    },
+    "rotation": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "layer": "top",
+    "model_jscad": {
+      "type": "colorize",
+      "color": [0.5019607843137255, 0.5019607843137255, 0.5019607843137255],
+      "shape": {
+        "type": "extrudeLinear",
+        "options": {
+          "height": 3.81
+        },
+        "shape": {
+          "type": "fromPointsGeom2",
+          "points": [
+            [-2.7939999999999827, -6.921500000000009],
+            [2.7940000000000396, -6.921500000000009],
+            [2.7940000000000396, 6.921500000000009],
+            [-2.7939999999999827, 6.921500000000009]
+          ]
+        }
+      }
+    },
+    "model_unit_to_mm_scale_factor": 1,
+    "model_board_normal_direction": "z+",
+    "model_origin_position": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "model_object_fit": "contain_within_bounds",
+    "anchor_alignment": "center"
+  },
+  {
+    "type": "pcb_plated_hole",
+    "pcb_plated_hole_id": "pcb_pcb_plated_hole_altium_7085",
+    "shape": "circle",
+    "outer_diameter": 2.199894,
+    "hole_diameter": 1.400048,
+    "x": -311.842404,
+    "y": 242.24640399999998,
+    "layers": ["top", "bottom"],
+    "port_hints": ["6"],
+    "pcb_component_id": "pcb_pcb_component_altium_633"
+  },
+  {
+    "type": "pcb_plated_hole",
+    "pcb_plated_hole_id": "pcb_pcb_plated_hole_altium_7086",
+    "shape": "circle",
+    "outer_diameter": 1.199896,
+    "hole_diameter": 0.649986,
+    "x": -310.86247199999997,
+    "y": 244.2464,
+    "layers": ["top", "bottom"],
+    "port_hints": ["4"],
+    "pcb_component_id": "pcb_pcb_component_altium_633"
+  },
+  {
+    "type": "pcb_plated_hole",
+    "pcb_plated_hole_id": "pcb_pcb_plated_hole_altium_7087",
+    "shape": "circle",
+    "outer_diameter": 1.199896,
+    "hole_diameter": 0.649986,
+    "x": -309.462424,
+    "y": 244.2464,
+    "layers": ["top", "bottom"],
+    "port_hints": ["3"],
+    "pcb_component_id": "pcb_pcb_component_altium_633"
+  },
+  {
+    "type": "pcb_plated_hole",
+    "pcb_plated_hole_id": "pcb_pcb_plated_hole_altium_7088",
+    "shape": "pill",
+    "outer_width": 2.9718,
+    "outer_height": 1.500124,
+    "hole_width": 2.9718,
+    "hole_height": 1.500124,
+    "ccw_rotation": 0,
+    "x": -308.7624,
+    "y": 236.646466,
+    "layers": ["top", "bottom"],
+    "port_hints": ["7"],
+    "pcb_component_id": "pcb_pcb_component_altium_633"
+  },
+  {
+    "type": "pcb_plated_hole",
+    "pcb_plated_hole_id": "pcb_pcb_plated_hole_altium_7089",
+    "shape": "circle",
+    "outer_diameter": 1.199896,
+    "hole_diameter": 0.649986,
+    "x": -308.062376,
+    "y": 244.2464,
+    "layers": ["top", "bottom"],
+    "port_hints": ["2"],
+    "pcb_component_id": "pcb_pcb_component_altium_633"
+  },
+  {
+    "type": "pcb_plated_hole",
+    "pcb_plated_hole_id": "pcb_pcb_plated_hole_altium_7090",
+    "shape": "circle",
+    "outer_diameter": 1.199896,
+    "hole_diameter": 0.649986,
+    "x": -306.662328,
+    "y": 244.2464,
+    "layers": ["top", "bottom"],
+    "port_hints": ["1"],
+    "pcb_component_id": "pcb_pcb_component_altium_633"
+  },
+  {
+    "type": "pcb_plated_hole",
+    "pcb_plated_hole_id": "pcb_pcb_plated_hole_altium_7091",
+    "shape": "circle",
+    "outer_diameter": 2.199894,
+    "hole_diameter": 1.400048,
+    "x": -305.682396,
+    "y": 242.24640399999998,
+    "layers": ["top", "bottom"],
+    "port_hints": ["5"],
+    "pcb_component_id": "pcb_pcb_component_altium_633"
+  }
+]

package/tests/fixtures/expect-jscad-cad-model-3d-snapshots.ts

@@ -0,0 +1,66 @@
+import { expect } from "bun:test"
+import { basename, dirname, join } from "node:path"
+import type { CircuitJson, PcbBoard } from "circuit-json"
+import {
+  convertCircuitJsonToGltf,
+  getBestCameraPosition,
+} from "circuit-json-to-gltf"
+import { renderGLTFToPNGFromGLB } from "poppygl"
+import { expectPngSnapshot } from "./expect-png-snapshot"
+
+export async function expectJscadCadModel3dSnapshots({
+  sourceCircuitJson,
+  generatedCircuitJson,
+  testPath,
+}: {
+  sourceCircuitJson: CircuitJson
+  generatedCircuitJson: CircuitJson
+  testPath: string
+}): Promise<void> {
+  const cameraReferenceBoard = sourceCircuitJson.find(
+    (element): element is PcbBoard => element.type === "pcb_board",
+  )
+  if (!cameraReferenceBoard) throw new Error("Missing camera reference board")
+  const testName = basename(testPath).replace(/\.test\.tsx?$/u, "")
+  const cameraPosition = getBestCameraPosition([cameraReferenceBoard], {
+    aspectRatio: 4 / 3,
+    direction: [-0.7, 1.2, -0.8],
+  })
+  let sourcePng: Uint8Array | undefined
+
+  for (const [snapshotName, circuitJson] of [
+    ["source", sourceCircuitJson],
+    ["generated", generatedCircuitJson],
+  ] as const) {
+    const glb = await convertCircuitJsonToGltf(circuitJson, {
+      boardTextureResolution: 1024,
+      format: "glb",
+    })
+    if (!(glb instanceof ArrayBuffer)) {
+      throw new Error("3D conversion did not return a GLB")
+    }
+    const renderedPng = await renderGLTFToPNGFromGLB(glb, {
+      ...cameraPosition,
+      backgroundColor: "#07100c",
+      height: 750,
+      width: 1000,
+    })
+    await expectPngSnapshot({
+      renderedPng,
+      snapshotPath: join(
+        dirname(testPath),
+        "__snapshots__",
+        `${testName}-${snapshotName}-3d.snap.png`,
+      ),
+    })
+    if (snapshotName === "source") {
+      sourcePng = renderedPng
+      continue
+    }
+    if (!sourcePng) throw new Error("Missing source 3D render")
+    expect(
+      Buffer.from(renderedPng).equals(sourcePng),
+      "Converted 3D render must match the native source",
+    ).toBe(true)
+  }
+}

package/tests/fixtures/expect-png-snapshot.ts

@@ -0,0 +1,59 @@
+import { expect } from "bun:test"
+import { mkdir, readFile, writeFile } from "node:fs/promises"
+import { dirname } from "node:path"
+import { decode } from "fast-png"
+
+const MAX_SNAPSHOT_DIFFERENT_PIXEL_FRACTION = 0.06
+const MAX_CHANNEL_DIFFERENCE = 7
+
+export async function expectPngSnapshot({
+  renderedPng,
+  snapshotPath,
+}: {
+  renderedPng: Uint8Array
+  snapshotPath: string
+}): Promise<void> {
+  const shouldUpdate =
+    process.env.BUN_UPDATE_SNAPSHOTS === "1" ||
+    process.env.BUN_FORCE_UPDATE_SNAPSHOTS === "1"
+  if (shouldUpdate) {
+    await mkdir(dirname(snapshotPath), { recursive: true })
+    await writeFile(snapshotPath, renderedPng)
+  }
+  expect(await Bun.file(snapshotPath).exists()).toBe(true)
+
+  const renderedImage = decode(renderedPng)
+  const snapshotImage = decode(await readFile(snapshotPath))
+  expect(renderedImage.width).toBe(snapshotImage.width)
+  expect(renderedImage.height).toBe(snapshotImage.height)
+  expect(renderedImage.channels).toBe(snapshotImage.channels)
+
+  let differentPixelCount = 0
+  const pixelCount = renderedImage.width * renderedImage.height
+  for (let pixelIndex = 0; pixelIndex < pixelCount; pixelIndex += 1) {
+    const firstChannelIndex = pixelIndex * renderedImage.channels
+    let pixelIsDifferent = false
+    for (
+      let channelIndex = 0;
+      channelIndex < renderedImage.channels;
+      channelIndex += 1
+    ) {
+      const sampleIndex = firstChannelIndex + channelIndex
+      if (
+        Math.abs(
+          (renderedImage.data[sampleIndex] ?? 0) -
+            (snapshotImage.data[sampleIndex] ?? 0),
+        ) > MAX_CHANNEL_DIFFERENCE
+      ) {
+        pixelIsDifferent = true
+        break
+      }
+    }
+    if (pixelIsDifferent) differentPixelCount += 1
+  }
+
+  const differentPixelFraction = differentPixelCount / pixelCount
+  expect(differentPixelFraction).toBeLessThanOrEqual(
+    MAX_SNAPSHOT_DIFFERENT_PIXEL_FRACTION,
+  )
+}

package/tests/fixtures/expect-ti-evm-3d-snapshot.ts

@@ -1,5 +1,4 @@
-import { expect } from "bun:test"
-import { mkdir, readFile, writeFile } from "node:fs/promises"
+import { readFile } from "node:fs/promises"
 import { basename, dirname, join } from "node:path"
 import { gunzipSync } from "node:zlib"
 import type { CadComponent, CircuitJson, PcbBoard } from "circuit-json"
@@ -7,16 +6,14 @@ import {
   convertCircuitJsonToGltf,
   getBestCameraPosition,
 } from "circuit-json-to-gltf"
-import { decode } from "fast-png"
 import { renderGLTFToPNGFromGLB } from "poppygl"
+import { expectPngSnapshot } from "./expect-png-snapshot"
 
 type CadModelFileName = string
 type EmbeddedStepModelUrl = string
 type BoardViewName = "bottom" | "top"
 type SnapshotName = "generated" | "source"
 
-const MAX_SNAPSHOT_DIFFERENT_PIXEL_FRACTION = 0.06
-const MAX_CHANNEL_DIFFERENCE = 7
 const TOP_BOARD_CAMERA_DIRECTION = [-0.7, 1.2, -0.8] as const
 const BOTTOM_BOARD_CAMERA_DIRECTION = [-0.7, -1.2, -0.8] as const
 
@@ -118,58 +115,6 @@ async function renderBoardView({
   })
 }
 
-async function expectPngSnapshot({
-  renderedPng,
-  snapshotPath,
-}: {
-  renderedPng: Uint8Array
-  snapshotPath: string
-}): Promise<void> {
-  const shouldUpdate =
-    process.env.BUN_UPDATE_SNAPSHOTS === "1" ||
-    process.env.BUN_FORCE_UPDATE_SNAPSHOTS === "1"
-  if (shouldUpdate) {
-    await mkdir(dirname(snapshotPath), { recursive: true })
-    await writeFile(snapshotPath, renderedPng)
-  }
-  expect(await Bun.file(snapshotPath).exists()).toBe(true)
-
-  const renderedImage = decode(renderedPng)
-  const snapshotImage = decode(await readFile(snapshotPath))
-  expect(renderedImage.width).toBe(snapshotImage.width)
-  expect(renderedImage.height).toBe(snapshotImage.height)
-  expect(renderedImage.channels).toBe(snapshotImage.channels)
-
-  let differentPixelCount = 0
-  const pixelCount = renderedImage.width * renderedImage.height
-  for (let pixelIndex = 0; pixelIndex < pixelCount; pixelIndex += 1) {
-    const firstChannelIndex = pixelIndex * renderedImage.channels
-    let pixelIsDifferent = false
-    for (
-      let channelIndex = 0;
-      channelIndex < renderedImage.channels;
-      channelIndex += 1
-    ) {
-      const sampleIndex = firstChannelIndex + channelIndex
-      if (
-        Math.abs(
-          (renderedImage.data[sampleIndex] ?? 0) -
-            (snapshotImage.data[sampleIndex] ?? 0),
-        ) > MAX_CHANNEL_DIFFERENCE
-      ) {
-        pixelIsDifferent = true
-        break
-      }
-    }
-    if (pixelIsDifferent) differentPixelCount += 1
-  }
-
-  const differentPixelFraction = differentPixelCount / pixelCount
-  expect(differentPixelFraction).toBeLessThanOrEqual(
-    MAX_SNAPSHOT_DIFFERENT_PIXEL_FRACTION,
-  )
-}
-
 export async function expectTiEvm3dSnapshot({
   cameraReferenceCircuitJson,
   circuitJson,

package/tests/fixtures/ti-evms/README.md

@@ -24,3 +24,11 @@ the same five TI EVMs. Their `cad-models` directories contain the referenced
 STEP files in gzip form. The tests embed those models before rendering top and
 bottom 3D snapshots, so the complete Circuit JSON to TSX round trip is visible
 without network access.
+
+`dp83825-usb-cad-origin.circuit.json.gz` isolates J1 (Molex 475890001), its
+native pads and silkscreen, and its embedded STEP placement from the same
+DP83825EVM PcbDoc, converted with `altium-to-circuit-json@0.0.114`. Only the
+surrounding board is cropped, and references to omitted electrical ports are
+removed. The model reuses `cad-models/dp83825evm/8.step.gz`, verified against
+the PcbDoc's embedded model bytes (SHA-256
+`5c5fe4d712828519a11d3421da933f5b610d55c80e6c82a976539dff61385191`).