@tscircuit/cli 0.0.168 → 0.0.170

package/example-project/examples/basic-chip.tsx

@@ -1,14 +1,15 @@
+import "@tscircuit/core"
 import { layout } from "@tscircuit/layout"
 import manual_edits from "../src/manual-edits"
 
-export const BasicBug = () => (
+export const BasicChip = () => (
   <board pcbCenterX={0} pcbCenterY={0} width="20mm" height="20mm">
     <group
       layout={layout()
         .autoLayoutSchematic()
         .manualPcbPlacement(manual_edits.pcb_placements)}
     >
-      <bug
+      <chip
         name="U2"
         schPortArrangement={{
           leftSize: 4,
@@ -23,7 +24,7 @@ export const BasicBug = () => (
         }}
       />
       <resistor name="R1" resistance="10kohm" footprint="0805" />
-      <trace from=".U2 > .1" to=".R1 > .left" />
+      <trace from=".U2 > .1" to=".R1 > port.1" />
     </group>
   </board>
 )

package/frontend/views/HeaderMenu.tsx

@@ -288,7 +288,7 @@ export const HeaderMenu = () => {
             </MenubarItem>
             <MenubarItem disabled>
               @tscircuit/react-fiber v
-              {cliPackageJson.devDependencies["@tscircuit/react-fiber"].replace(
+              {cliPackageJson.dependencies["@tscircuit/react-fiber"].replace(
                 /\^/g,
                 "",
               )}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.168",
+  "version": "0.0.170",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -35,6 +35,9 @@
   "dependencies": {
     "@edge-runtime/primitives": "^4.1.0",
     "@hono/node-server": "^1.8.2",
+    "@tscircuit/builder": "*",
+    "@tscircuit/core": "0.0.14",
+    "@tscircuit/react-fiber": "*",
     "archiver": "^7.0.1",
     "axios": "^1.6.7",
     "chokidar": "^3.6.0",
@@ -66,8 +69,7 @@
     "ts-morph": "^22.0.0",
     "tsup": "^8.0.2",
     "winterspec": "0.0.86",
-    "zod": "^3.22.4",
-    "@tscircuit/builder": "*"
+    "zod": "^3.22.4"
   },
   "peerDependencies": {
     "@tscircuit/builder": "*",
@@ -96,9 +98,8 @@
     "@tscircuit/layout": "^0.0.25",
     "@tscircuit/manual-edit-events": "^0.0.4",
     "@tscircuit/pcb-viewer": "^1.4.4",
-    "@tscircuit/react-fiber": "*",
     "@tscircuit/schematic-viewer": "^1.2.14",
-    "@tscircuit/soup-util": "^0.0.18",
+    "@tscircuit/soup-util": "^0.0.20",
     "@tscircuit/table-viewer": "0.0.8",
     "@types/archiver": "^6.0.2",
     "@types/bun": "^1.0.8",

package/tsconfig.json

@@ -13,8 +13,17 @@
     "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
     "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
+    "paths": {
+      "cli/*": ["cli/*"],
+      "frontend/*": ["frontend/*"],
+      "api/*": ["api/*"],
+      "scripts/*": ["scripts/*"],
+    },
+
     "strict": true /* Enable all strict type-checking options. */,
     "skipLibCheck": true, 
-    "verbatimModuleSyntax": false
+    "verbatimModuleSyntax": false,
   },
+  "include": ["src/**/*", "cli/**/*", "frontend/**/*", "api/**/*", "scripts/**/*", "example-project/**/*"],
+  "exclude": ["node_modules"]
 }

package/cli/lib/soupify.ts

@@ -1,115 +0,0 @@
-import { AppContext } from "./util/app-context"
-import { z } from "zod"
-import $ from "dax-sh"
-import * as Path from "path"
-import { unlink } from "node:fs/promises"
-import kleur from "kleur"
-import { writeFileSync } from "fs"
-import { readFile } from "fs/promises"
-import Debug from "debug"
-
-const debug = Debug("tscircuit:soupify")
-
-export const soupify = async (
-  {
-    filePath,
-    exportName,
-  }: {
-    filePath: string
-    exportName?: string
-  },
-  ctx: Pick<AppContext, "runtime" | "params">,
-) => {
-  debug(`reading ${filePath}`)
-  const targetFileContent = await readFile(filePath, "utf-8")
-
-  if (!exportName) {
-    if (targetFileContent.includes("export default")) {
-      exportName = "default"
-    } else {
-      // Look for "export const <name>" or "export function <name>"
-      const exportRegex = /export\s+(?:const|function)\s+(\w+)/g
-      const match = exportRegex.exec(targetFileContent)
-      if (match) {
-        exportName = match[1]
-      }
-    }
-  }
-
-  if (!exportName) {
-    throw new Error(
-      `Couldn't derive an export name and didn't find default export in "${filePath}"`,
-    )
-  }
-
-  const tmpFilePath = Path.join(
-    Path.dirname(filePath),
-    Path.basename(filePath).replace(/\.[^\.]+$/, "") + ".__tmp_entrypoint.tsx",
-  )
-
-  debug(`writing to ${tmpFilePath}`)
-  writeFileSync(
-    tmpFilePath,
-    `
-import React from "react"
-import { createRoot } from "@tscircuit/react-fiber"
-import { createProjectBuilder } from "@tscircuit/builder"
-
-import * as EXPORTS from "./${Path.basename(filePath)}"
-
-const Component = EXPORTS["${exportName}"]
-
-if (!Component) {
-  console.log(JSON.stringify({
-    COMPILE_ERROR: 'Failed to find "${exportName}" export in "${filePath}"'
-  }))
-  process.exit(0)
-}
-
-const projectBuilder = createProjectBuilder()
-const elements = await createRoot().render(<Component />, projectBuilder)
-
-console.log(JSON.stringify(elements))
-
-`.trim(),
-  )
-
-  debug(`using runtime ${ctx.runtime}`)
-  const processCmdPart1 =
-    ctx.runtime === "node" ? $`npx tsx ${tmpFilePath}` : $`bun ${tmpFilePath}`
-
-  debug(`starting process....`)
-  const processResult = await processCmdPart1
-    .stdout(debug.enabled ? "inheritPiped" : "piped")
-    .stderr(debug.enabled ? "inheritPiped" : "piped")
-    .noThrow()
-
-  // TODO we should send it to a temporarty file rather than rely on stdout
-  // which can easily be polluted
-  const rawSoup = processResult.stdout.replace(/^[^\[]*/, "")
-  const errText = processResult.stderr
-
-  if (ctx.params.cleanup !== false) {
-    debug(`deleting ${tmpFilePath}`)
-    await unlink(tmpFilePath)
-  }
-
-  try {
-    debug(`parsing result of soupify...`)
-    const soup = JSON.parse(rawSoup)
-
-    if (soup.COMPILE_ERROR) {
-      // console.log(kleur.red(`Failed to compile ${filePath}`))
-      console.log(kleur.red(soup.COMPILE_ERROR))
-      throw new Error(soup.COMPILE_ERROR)
-    }
-
-    return soup
-  } catch (e: any) {
-    // console.log(kleur.red(`Failed to parse result of soupify: ${e.toString()}`))
-    const t = Date.now()
-    console.log(`Dumping raw output to .tscircuit/err-${t}.log`)
-    writeFileSync(`.tscircuit/err-${t}.log`, rawSoup + "\n\n" + errText)
-    throw new Error(errText)
-  }
-}