@tscircuit/cli 0.0.108 → 0.0.110

package/dev-server-api/package.json

@@ -3,8 +3,8 @@
   "main": "dist/bundle.ts",
   "type": "module",
   "scripts": {
-    "start": "edgespec dev --port 3021",
-    "build": "edgespec bundle -o dist/bundle.ts"
+    "start": "bun server.ts",
+    "build": "echo 'nothing to do'"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.9",
@@ -18,7 +18,7 @@
     "better-sqlite3": "^11.0.0",
     "kysely": "^0.27.3",
     "kysely-bun-sqlite": "^0.3.2",
-    "winterspec": "0.0.79",
+    "winterspec": "^0.0.80",
     "zod": "^3.22.4"
   }
 }

package/dev-server-api/server.ts

@@ -1,9 +1,17 @@
 import { createFetchHandlerFromDir } from "winterspec/adapters/node"
+import { Request as EdgeRuntimeRequest } from "@edge-runtime/primitives"
 
 const serverFetch = await createFetchHandlerFromDir("./routes")
 
 console.log("starting dev-server-api on localhost:3021")
 Bun.serve({
-  fetch: (req) => serverFetch(req),
+  fetch: (bunReq) => {
+    const req = new EdgeRuntimeRequest(bunReq.url, {
+      headers: bunReq.headers,
+      method: bunReq.method,
+      body: bunReq.body,
+    })
+    return serverFetch(req as any)
+  },
   port: 3021,
 })

package/dev-server-frontend/package.json

@@ -13,7 +13,7 @@
     "build": "tsc && vite build --base /preview && rm -f dist/bundle* && make-vfs --dir dist --outfile ./dist/bundle.ts",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 10",
     "preview": "vite preview",
-    "update-deps": "bun add @tscircuit/pcb-viewer@latest @tscircuit/builder@latest @tscircuit/schematic-viewer@latest"
+    "update-deps": "bun add @tscircuit/pcb-viewer@latest @tscircuit/builder@latest @tscircuit/schematic-viewer@latest @tscircuit/3d-viewer@latest"
   },
   "dependencies": {
     "@headlessui/react": "^1.7.18",
@@ -30,8 +30,9 @@
     "@radix-ui/react-toggle": "^1.0.3",
     "@radix-ui/react-toggle-group": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.7",
-    "@tscircuit/builder": "1.5.128",
-    "@tscircuit/pcb-viewer": "^1.3.14",
+    "@tscircuit/3d-viewer": "^0.0.6",
+    "@tscircuit/builder": "^1.5.134",
+    "@tscircuit/pcb-viewer": "^1.4.0",
     "@tscircuit/schematic-viewer": "^1.2.14",
     "@tscircuit/table-viewer": "0.0.8",
     "axios": "^1.6.7",

package/dev-server-frontend/src/ExampleContentView.tsx

@@ -9,10 +9,11 @@ import { SoupTableViewer } from "@tscircuit/table-viewer"
 import "react-data-grid/lib/styles.css"
 import { useEffect, useRef, useState } from "react"
 import type { EditEvent } from "@tscircuit/pcb-viewer"
+import { CadViewer } from "@tscircuit/3d-viewer"
 
 export const ExampleContentView = () => {
   const devExamplePackageId = useGlobalStore(
-    (s) => s.active_dev_example_package_id
+    (s) => s.active_dev_example_package_id,
   )
 
   const {
@@ -33,7 +34,7 @@ export const ExampleContentView = () => {
       refetchIntervalInBackground: true,
       refetchOnWindowFocus: true,
       retry: false,
-    }
+    },
   )
 
   const sentEditEvents = useRef<Record<string, boolean>>({})
@@ -46,7 +47,8 @@ export const ExampleContentView = () => {
   let [editEvents, setEditEvents] = useState<EditEvent[]>([])
 
   editEvents = editEvents.filter(
-    (ee) => ee.created_at > new Date(pkg?.edit_events_last_applied_at).valueOf()
+    (ee) =>
+      ee.created_at > new Date(pkg?.edit_events_last_applied_at).valueOf(),
   )
 
   const editorHeight = window.innerHeight - 52
@@ -64,7 +66,7 @@ export const ExampleContentView = () => {
         viewMode === "split" &&
           splitMode === "horizontal" &&
           "grid grid-cols-2",
-        viewMode === "split" && splitMode === "vertical" && "grid grid-rows-2"
+        viewMode === "split" && splitMode === "vertical" && "grid grid-rows-2",
       )}
     >
       {pkg && (viewMode === "schematic" || viewMode === "split") && (
@@ -101,7 +103,7 @@ export const ExampleContentView = () => {
                 axios.post(`/api/dev_package_examples/update`, {
                   dev_package_example_id: devExamplePackageId,
                   completed_edit_events: changedEditEvents.filter(
-                    (ee) => ee.in_progress === false
+                    (ee) => ee.in_progress === false,
                   ),
                 })
               }
@@ -111,6 +113,22 @@ export const ExampleContentView = () => {
           />
         </ErrorBoundary>
       )}
+      {pkg && viewMode === "3d" && (
+        <ErrorBoundary
+          fallbackRender={(props) => (
+            <div style={{ padding: 20 }}>
+              Failed to render 3d view
+              <div style={{ marginTop: 20, color: "red" }}>
+                {props.error.message}
+              </div>
+            </div>
+          )}
+        >
+          <div style={{ height: itemHeight }}>
+            <CadViewer soup={pkg.tscircuit_soup} />
+          </div>
+        </ErrorBoundary>
+      )}
       {pkg && viewMode === "soup" && (
         <ErrorBoundary fallback={<div>Failed to render Soup</div>}>
           <SoupTableViewer

package/dev-server-frontend/src/Header.tsx

@@ -34,10 +34,12 @@ export const Header = () => {
           <TabsList>
             <TabsTrigger value="schematic">Schematic</TabsTrigger>
             <TabsTrigger value="pcb">PCB</TabsTrigger>
-            <TabsTrigger value="split">Split</TabsTrigger>
+            {/* <TabsTrigger value="split">Split</TabsTrigger> */}
+            <TabsTrigger value="3d">3D</TabsTrigger>
           </TabsList>
         </Tabs>
-        <Button
+        {/* Button is only relevant when the "Split" button is available */}
+        {/* <Button
           variant="outline"
           disabled={viewMode !== "split"}
           className="ml-1 group"
@@ -46,7 +48,7 @@ export const Header = () => {
           }}
         >
           <RotateCounterClockwiseIcon className="scale-x-[-1] group-hover:rotate-[30deg] transition-transform" />
-        </Button>
+        </Button> */}
       </div>
     </div>
   )

package/dev-server-frontend/src/hooks/use-global-store.ts

@@ -4,7 +4,7 @@ import { persist } from "zustand/middleware"
 export interface GlobalState {
   active_dev_example_package_id: string | null
 
-  view_mode: "schematic" | "pcb" | "split" | "soup"
+  view_mode: "schematic" | "pcb" | "split" | "soup" | "3d"
   split_mode: "horizontal" | "vertical"
   in_debug_mode: boolean
 
@@ -37,6 +37,6 @@ export const useGlobalStore = create<GlobalState>()(
     }),
     {
       name: "global-store",
-    }
-  )
+    },
+  ),
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.108",
+  "version": "0.0.110",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -18,7 +18,7 @@
     "build": "bun build:dev-server && npm run build:cli",
     "dev-with-test-project": "bun cli.ts dev --cwd ./tests/assets/example-project",
     "test:init": "bun cli.ts init --dir ./tmp/test --name test",
-    "update-deps": "bun add @tscircuit/builder@latest @tscircuit/react-fiber@latest && cd dev-server-frontend && bun run update-deps && cd ../tests/assets/example-project && bun add @tscircuit/builder@latest @tscircuit/react-fiber@latest @tscircuit/layout@latest"
+    "update-deps": "bun add @tscircuit/builder@latest @tscircuit/react-fiber@latest && cd dev-server-frontend && bun run update-deps && cd ../tests/assets/example-project && bun run update-deps"
   },
   "bin": {
     "tsci": "./dist/cli.js"
@@ -37,7 +37,7 @@
     "@hono/node-server": "^1.8.2",
     "archiver": "^7.0.1",
     "axios": "^1.6.7",
-    "better-sqlite3": "^9.4.3",
+    "better-sqlite3": "^11.1.2",
     "chokidar": "^3.6.0",
     "commander": "^12.0.0",
     "configstore": "^6.0.0",
@@ -75,9 +75,9 @@
     "@tscircuit/manual-edit-events": "*"
   },
   "devDependencies": {
-    "@tscircuit/builder": "1.5.128",
+    "@tscircuit/builder": "*",
     "@tscircuit/layout": "^0.0.20",
-    "@tscircuit/react-fiber": "^1.1.29",
+    "@tscircuit/react-fiber": "*",
     "@tscircuit/soup-util": "^0.0.1",
     "@tscircuit/manual-edit-events": "^0.0.4",
     "@types/archiver": "^6.0.2",

package/tests/assets/example-project/examples/basic-bug.tsx

@@ -2,26 +2,28 @@ import { layout } from "@tscircuit/layout"
 import manual_edits from "../src/manual-edits"
 
 export const BasicBug = () => (
-  <group
-    layout={layout()
-      .autoLayoutSchematic()
-      .manualPcbPlacement(manual_edits.pcb_placements)}
-  >
-    <bug
-      name="U2"
-      schPortArrangement={{
-        leftSize: 4,
-        rightSize: 4,
-      }}
-      footprint="ssop16"
-      pinLabels={{
-        "1": "GND",
-        "2": "VBUS",
-        "3": "D-",
-        "4": "D+",
-      }}
-    />
-    <resistor name="R1" resistance="10kohm" footprint="0805" />
-    <trace from=".U2 > .1" to=".R1 > .left" />
-  </group>
+  <board pcbCenterX={0} pcbCenterY={0} width="20mm" height="20mm">
+    <group
+      layout={layout()
+        .autoLayoutSchematic()
+        .manualPcbPlacement(manual_edits.pcb_placements)}
+    >
+      <bug
+        name="U2"
+        schPortArrangement={{
+          leftSize: 4,
+          rightSize: 4,
+        }}
+        footprint="ssop16"
+        pinLabels={{
+          "1": "GND",
+          "2": "VBUS",
+          "3": "D-",
+          "4": "D+",
+        }}
+      />
+      <resistor name="R1" resistance="10kohm" footprint="0805" />
+      <trace from=".U2 > .1" to=".R1 > .left" />
+    </group>
+  </board>
 )

package/tests/assets/example-project/package.json

@@ -3,9 +3,12 @@
   "version": "1.2.26",
   "type": "module",
   "main": "dist/index.js",
+  "scripts": {
+    "update-deps": "bun add -f @tscircuit/builder@latest @tscircuit/react-fiber@latest @tscircuit/layout@latest"
+  },
   "dependencies": {
-    "@tscircuit/builder": "^1.5.126",
-    "@tscircuit/layout": "^0.0.21",
+    "@tscircuit/builder": "^1.5.134",
+    "@tscircuit/layout": "^0.0.24",
     "@tscircuit/react-fiber": "^1.1.29"
   }
 }

package/tests/assets/example-project/src/manual-edits.ts

@@ -14,7 +14,26 @@ export default {
   manual_edit_id: "abcdef",
 
   // Manual pcb placements, added when you drag a footprint
-  pcb_placements: [],
+  pcb_placements: [
+      {
+        "_edit_event_id": "0.6668756126702717",
+        "selector": ".U2",
+        "center": {
+          "x": -5.004250626566417,
+          "y": 0.13319298245614064
+        },
+        "relative_to": "group_center"
+      },
+      {
+        "_edit_event_id": "0.867524742177592",
+        "selector": ".R1",
+        "center": {
+          "x": 2.8351077694235585,
+          "y": 0
+        },
+        "relative_to": "group_center"
+      }
+    ],
   manual_trace_hints: [],
   edit_events: [],
 }