@tscircuit/cli 0.0.211 → 0.0.212

package/cli/lib/cmd-fns/dev/soupify-and-upload-example-file.ts

@@ -30,7 +30,6 @@ export const soupifyAndUploadExampleFile = async (
       {
         filePath: examplePath,
         exportName,
-        useCore: ctx.params.noCore,
       },
       ctx,
     )

package/cli/lib/cmd-fns/dev/start-edit-event-watcher.ts

@@ -6,15 +6,20 @@ import fg from "fast-glob"
 import fs from "fs"
 import { Project, ts } from "ts-morph"
 import * as Path from "path"
-import type { ManualPcbPosition } from "@tscircuit/builder"
 import { deriveSelectorFromPcbComponentId } from "./derive-selector-from-pcb-component-id"
 import type { EditEvent } from "@tscircuit/manual-edit-events"
-import { getManualTraceHintFromEvent, ManualTraceHint } from "@tscircuit/layout"
+import {
+  getManualTraceHintFromEvent,
+  ManualTraceHint,
+  ManualEditFile,
+} from "@tscircuit/layout"
 import JSON5 from "json5"
 import Debug from "debug"
 
 const debug = Debug("tscircuit:cli:edit-event-watcher")
 
+type ManualPcbPosition = Required<ManualEditFile>["pcb_placements"][number]
+
 export const startEditEventWatcher = async (
   {
     devServerAxios,

package/cli/lib/cmd-fns/soupify.ts

@@ -19,7 +19,6 @@ export const soupifyCmd = async (ctx: AppContext, args: any) => {
     {
       filePath: params.file,
       exportName: params.export,
-      useCore: !params.noCore,
     },
     ctx,
   )

package/cli/lib/cmd-fns/version.ts

@@ -22,10 +22,6 @@ export const versionCmd = async (ctx: AppContext, args: any) => {
     name: "@tscircuit/pcb-viewer",
     current: cliPackageJson.devDependencies["@tscircuit/pcb-viewer"],
   })
-  table.push({
-    name: "@tscircuit/builder",
-    current: cliPackageJson.dependencies["@tscircuit/builder"],
-  })
 
   if (args.showLatest) {
     // Get the latest version for each package

package/cli/lib/export-fns/export-bom-csv.ts

@@ -1,7 +1,10 @@
 import { AppContext } from "../util/app-context"
 import { soupify } from "cli/lib/soupify"
-import { convertSoupToBomRows, convertBomRowsToCsv } from "@tscircuit/builder"
 import kleur from "kleur"
+import {
+  convertCircuitJsonToBomRows,
+  convertBomRowsToCsv,
+} from "circuit-json-to-bom-csv"
 
 export const exportBomCsvToBuffer = async (
   params: {
@@ -20,8 +23,7 @@ export const exportBomCsvToBuffer = async (
   )
 
   console.log(kleur.gray("[soup to bom rows]..."))
-  // @ts-ignore
-  const bom_rows = await convertSoupToBomRows({ soup })
+  const bom_rows = await convertCircuitJsonToBomRows({ circuitJson: soup })
 
   console.log(kleur.gray("[bom rows to csv]..."))
   const bom_csv = await convertBomRowsToCsv(bom_rows)

package/cli/lib/export-fns/export-pnp-csv.ts

@@ -3,8 +3,8 @@ import { z } from "zod"
 import * as Path from "path"
 import { unlink } from "node:fs/promises"
 import { soupify } from "cli/lib/soupify"
+import { convertCircuitJsonToPickAndPlaceCsv } from "circuit-json-to-pnp-csv"
 import * as fs from "fs"
-import { convertSoupToPickAndPlaceCsv } from "@tscircuit/builder"
 import kleur from "kleur"
 import archiver from "archiver"
 
@@ -25,7 +25,7 @@ export const exportPnpCsvToBuffer = async (
   )
 
   console.log(kleur.gray("[soup to pnp csv string]..."))
-  const pnp_csv = await convertSoupToPickAndPlaceCsv(soup)
+  const pnp_csv = await convertCircuitJsonToPickAndPlaceCsv(soup)
 
   return Buffer.from(pnp_csv, "utf-8")
 }

package/cli/lib/soupify/soupify.ts

@@ -1,77 +1,6 @@
-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"
 import { soupifyWithCore } from "./soupify-with-core"
-import { getExportNameFromFile } from "./get-export-name-from-file"
-import { getTmpEntrypointFilePath } from "./get-tmp-entrpoint-filepath"
-import { runEntrypointFile } from "./run-entrypoint-file"
 
 const debug = Debug("tscircuit:soupify")
 
-export const soupifyWithBuilder = async (
-  params: {
-    filePath: string
-    exportName?: string
-    /**
-     * Use @tscircuit/core instead of @tscircuit/builder, this will be the
-     * default eventually
-     */
-    useCore?: boolean
-  },
-  ctx: Pick<AppContext, "runtime" | "params">,
-) => {
-  let { filePath, exportName, useCore = true } = params
-  if (useCore) return soupifyWithCore(params, ctx)
-
-  exportName ??= await getExportNameFromFile(filePath)
-
-  const { tmpEntrypointPath, tmpOutputPath } =
-    await getTmpEntrypointFilePath(filePath)
-
-  debug(`writing to ${tmpEntrypointPath}`)
-  writeFileSync(
-    tmpEntrypointPath,
-    `
-import React from "react"
-import { createRoot } from "@tscircuit/react-fiber"
-import { createProjectBuilder } from "@tscircuit/builder"
-import { writeFileSync } from "node:fs"
-
-let Component
-try {
-  const EXPORTS = await import("./${Path.basename(filePath)}")
-  Component = EXPORTS["${exportName}"]
-} catch (e) {
-  writeFileSync("${tmpOutputPath}", JSON.stringify({
-    COMPILE_ERROR: e.message + "\\n\\n" + e.stack,
-  }))
-}
-
-if (!Component) {
-  console.log(JSON.stringify({
-    COMPILE_ERROR: 'Failed to find "${exportName}" export in "${filePath}"'
-  }))
-  writeFileSync("${tmpOutputPath}", JSON.stringify({
-    COMPILE_ERROR: e.message + "\\n\\n" + e.stack,
-  }))
-  process.exit(0)
-}
-
-const projectBuilder = createProjectBuilder()
-const elements = await createRoot().render(<Component />, projectBuilder)
-
-writeFileSync("${tmpOutputPath}", JSON.stringify(elements))
-
-`.trim(),
-  )
-
-  return await runEntrypointFile({ tmpEntrypointPath, tmpOutputPath }, ctx)
-}
-
-export const soupify = soupifyWithBuilder
+export const soupify = soupifyWithCore