@tscircuit/3d-viewer 0.0.121 → 0.0.122

package/README.md

@@ -59,15 +59,15 @@ const MyPCBViewer = () => {
 export default MyPCBViewer
 ```
 
-### Using with Soup Data
+### Using with circuitJson Data
 
 ```jsx
 import React from "react"
 import { CadViewer } from "@tscircuit/3d-viewer"
-import mySoupData from "./mySoupData.json"
+import mycircuitJsonData from "./mycircuitJsonpData.json"
 
 const MyPCBViewer = () => {
-  return <CadViewer soup={mySoupData} />
+  return <CadViewer circuitJson={mycircuitJsonData} />
 }
 
 export default MyPCBViewer
@@ -120,8 +120,8 @@ Main component for rendering the 3D PCB viewer.
 
 Props:
 
-- `soup`: (optional) An array of AnySoupElement objects representing the PCB layout.
-- `children`: (optional) React children elements describing the PCB layout (alternative to using `soup`).
+- `circuit-json`: (optional) An array of AnyCircuitElement objects representing the PCB layout.
+- `children`: (optional) React children elements describing the PCB layout (alternative to using `circuit-json`).
 
 ### `<board>`
 

package/dist/index.d.ts

@@ -1,11 +1,15 @@
-import { AnySoupElement } from '@tscircuit/soup';
+import { AnyCircuitElement } from 'circuit-json';
 import * as React from 'react';
 import * as THREE from 'three';
 import { GLTFExporterOptions } from 'three-stdlib';
 import { JSDOM } from 'jsdom';
 
 interface Props {
-    soup?: AnySoupElement[];
+    /**
+     * @deprecated Use circuitJson instead.
+     */
+    soup?: AnyCircuitElement[];
+    circuitJson?: AnyCircuitElement[];
     autoRotateDisabled?: boolean;
 }
 declare const CadViewer: React.ForwardRefExoticComponent<Props & {
@@ -32,7 +36,7 @@ interface CircuitToSvgOptions {
         };
     };
 }
-declare function convertCircuitJsonTo3dSvg(circuitJson: AnySoupElement[], options?: CircuitToSvgOptions): Promise<string>;
+declare function convertCircuitJsonTo3dSvg(circuitJson: AnyCircuitElement[], options?: CircuitToSvgOptions): Promise<string>;
 
 type Options = Omit<GLTFExporterOptions, "animations" | "includeCustomExtensions">;
 declare function useSaveGltfAs(options?: Options & {

package/dist/index.js

@@ -14220,17 +14220,20 @@ function createSilkscreenTextGeoms(silkscreenText) {
 }
 
 // src/soup-to-3d/index.ts
-var createBoardGeomFromSoup = (soup) => {
-  const board = su(soup).pcb_board.list()[0];
+var createBoardGeomFromSoup = (soup, circuitJson) => {
+  if (!circuitJson) {
+    throw new Error("circuitJson is required but was not provided");
+  }
+  const board = su(circuitJson).pcb_board.list()[0];
   if (!board) {
     throw new Error("No pcb_board found");
   }
-  const plated_holes = su(soup).pcb_plated_hole.list();
-  const holes = su(soup).pcb_hole.list();
-  const pads = su(soup).pcb_smtpad.list();
-  const traces = su(soup).pcb_trace.list();
-  const pcb_vias = su(soup).pcb_via.list();
-  const silkscreenTexts = su(soup).pcb_silkscreen_text.list();
+  const plated_holes = su(circuitJson).pcb_plated_hole.list();
+  const holes = su(circuitJson).pcb_hole.list();
+  const pads = su(circuitJson).pcb_smtpad.list();
+  const traces = su(circuitJson).pcb_trace.list();
+  const pcb_vias = su(circuitJson).pcb_via.list();
+  const silkscreenTexts = su(circuitJson).pcb_silkscreen_text.list();
   let boardGeom;
   if (board.outline && board.outline.length > 0)
     boardGeom = createBoardWithOutline(board.outline, 1.2);
@@ -17407,7 +17410,7 @@ import { Canvas, useFrame as useFrame2 } from "@react-three/fiber";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.120",
+  version: "0.0.121",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -17441,8 +17444,7 @@ var package_default = {
     "@tscircuit/core": "^0.0.299",
     "@tscircuit/props": "^0.0.138",
     "@tscircuit/react-fiber": "^1.2.0",
-    "@tscircuit/soup": "^0.0.69",
-    "@tscircuit/soup-util": "^0.0.26",
+    "@tscircuit/soup-util": "^0.0.41",
     "jscad-electronics": "^0.0.23",
     "jscad-fiber": "^0.0.77",
     "jscad-planner": "^0.0.12",
@@ -18069,16 +18071,17 @@ var Error3d = ({
 
 // src/CadViewer.tsx
 import { jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
-var CadViewer = forwardRef2(({ soup, children, autoRotateDisabled }, ref) => {
+var CadViewer = forwardRef2(({ soup, circuitJson, children, autoRotateDisabled }, ref) => {
+  circuitJson ??= soup;
   const [hoveredComponent, setHoveredComponent] = useState3(null);
-  soup ??= useConvertChildrenToSoup(children, soup);
-  if (!soup) return null;
+  circuitJson ??= useConvertChildrenToSoup(children, circuitJson);
+  if (!circuitJson) return null;
   const boardGeom = useMemo4(() => {
-    if (!soup.some((e) => e.type === "pcb_board")) return null;
-    return createBoardGeomFromSoup(soup);
-  }, [soup]);
+    if (!circuitJson.some((e) => e.type === "pcb_board")) return null;
+    return createBoardGeomFromSoup(circuitJson);
+  }, [circuitJson]);
   const { stls: boardStls, loading } = useStlsFromGeom(boardGeom);
-  const cad_components = su2(soup).cad_component.list();
+  const cad_components = su2(circuitJson).cad_component.list();
   return /* @__PURE__ */ jsxs6(
     CadViewerContainer,
     {
@@ -18107,7 +18110,9 @@ var CadViewer = forwardRef2(({ soup, children, autoRotateDisabled }, ref) => {
                     setHoveredComponent(null);
                   }
                   if (!e.mousePosition) return;
-                  const componentName = su2(soup).source_component.getUsing({
+                  const componentName = su2(
+                    circuitJson
+                  ).source_component.getUsing({
                     source_component_id: cad_component.source_component_id
                   })?.name;
                   setHoveredComponent({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",
@@ -34,8 +34,7 @@
     "@tscircuit/core": "^0.0.299",
     "@tscircuit/props": "^0.0.138",
     "@tscircuit/react-fiber": "^1.2.0",
-    "@tscircuit/soup": "^0.0.69",
-    "@tscircuit/soup-util": "^0.0.26",
+    "@tscircuit/soup-util": "^0.0.41",
     "jscad-electronics": "^0.0.23",
     "jscad-fiber": "^0.0.77",
     "jscad-planner": "^0.0.12",