@tscircuit/cli 0.0.58 → 0.0.60

package/lib/cmd-fns/dev/index.ts

@@ -8,7 +8,7 @@ import { getDevServerAxios } from "./get-dev-server-axios"
 import { uploadExamplesFromDirectory } from "./upload-examples-from-directory"
 import { unlink } from "fs/promises"
 import * as Path from "path"
-import { startWatcher } from "./start-watcher"
+import { startFsWatcher } from "./start-fs-watcher"
 import { createOrModifyNpmrc } from "../init/create-or-modify-npmrc"
 import { checkIfInitialized } from "./check-if-initialized"
 import { initCmd } from "../init"
@@ -74,7 +74,7 @@ export const devCmd = async (ctx: AppContext, args: any) => {
   await uploadExamplesFromDirectory({ devServerAxios, cwd }, ctx)
 
   // Start watcher
-  const watcher = await startWatcher({ cwd, devServerAxios }, ctx)
+  const watcher = await startFsWatcher({ cwd, devServerAxios }, ctx)
 
   while (true) {
     const { action } = await prompts({

package/lib/cmd-fns/dev/{start-watcher.ts → start-fs-watcher.ts}

@@ -3,7 +3,7 @@ import chokidar from "chokidar"
 import { uploadExamplesFromDirectory } from "./upload-examples-from-directory"
 import kleur from "kleur"
 
-export const startWatcher = async (
+export const startFsWatcher = async (
   {
     cwd,
     devServerAxios,

package/lib/cmd-fns/dev-server-upload.ts

@@ -2,25 +2,56 @@ import { AppContext } from "../util/app-context"
 import { z } from "zod"
 import { getDevServerAxios } from "./dev/get-dev-server-axios"
 import { uploadExamplesFromDirectory } from "./dev/upload-examples-from-directory"
-import { startWatcher } from "./dev/start-watcher"
+import { startFsWatcher } from "./dev/start-fs-watcher"
+import kleur from "kleur"
+import { AxiosInstance } from "axios"
 
 export const devServerUpload = async (ctx: AppContext, args: any) => {
   const params = z
     .object({
       dir: z.string().optional().default(ctx.cwd),
-      port: z.coerce.number().optional().default(3020),
+      port: z.coerce.number().optional().nullable().default(null),
       watch: z.boolean().optional().default(false),
     })
     .parse(args)
 
-  const serverUrl = `http://localhost:${params.port}`
-  const devServerAxios = getDevServerAxios({ serverUrl })
+  let serverUrl = `http://localhost:${params.port ?? 3020}`
+  let devServerAxios = getDevServerAxios({ serverUrl })
+
+  const checkHealth = () =>
+    devServerAxios
+      .get("/api/health")
+      .then(() => true)
+      .catch((e) => false)
+
+  let is_dev_server_healthy = await checkHealth()
+
+  if (!is_dev_server_healthy && !params.port) {
+    // attempt to use development-mode port, e.g. if someone ran
+    // npm run start:dev-server:dev
+    const devModeServerUrl = "http://localhost:3021"
+    devServerAxios = getDevServerAxios({ serverUrl: devModeServerUrl })
+    is_dev_server_healthy = await checkHealth()
+    if (is_dev_server_healthy) serverUrl = devModeServerUrl
+  }
+
+  if (!is_dev_server_healthy) {
+    console.log(
+      kleur.red(
+        `Dev server doesn't seem to be running at ${serverUrl}. (Could not ping health)`
+      )
+    )
+    process.exit(1)
+  }
 
   console.log(`Loading examples...`)
   await uploadExamplesFromDirectory({ devServerAxios, cwd: params.dir }, ctx)
 
   if (params.watch) {
     // Start watcher
-    const watcher = await startWatcher({ cwd: params.dir, devServerAxios }, ctx)
+    const watcher = await startFsWatcher(
+      { cwd: params.dir, devServerAxios },
+      ctx
+    )
   }
 }

package/lib/cmd-fns/export-gerbers.ts

@@ -1,16 +1,6 @@
 import { AppContext } from "../util/app-context"
 import { z } from "zod"
-import * as Path from "path"
-import { unlink } from "node:fs/promises"
-import { soupify } from "lib/soupify"
-import * as fs from "fs"
-import {
-  stringifyGerberCommandLayers,
-  convertSoupToGerberCommands,
-} from "@tscircuit/builder"
-import { zip } from "zip-a-folder"
-import kleur from "kleur"
-import archiver from "archiver"
+import { exportGerbersToFile } from "lib/export-gerbers"
 
 export const exportGerbersCmd = async (ctx: AppContext, args: any) => {
   const params = z
@@ -21,40 +11,12 @@ export const exportGerbersCmd = async (ctx: AppContext, args: any) => {
     })
     .parse(args)
 
-  console.log(kleur.gray("[soupifying]..."))
-  const soup = await soupify(
+  await exportGerbersToFile(
     {
-      filePath: params.file,
-      exportName: params.export,
+      example_file_path: params.file,
+      export_name: params.export,
+      output_zip_path: params.outputfile,
     },
     ctx
   )
-
-  console.log(kleur.gray("[soup to gerber json]..."))
-  const gerber_layer_cmds = convertSoupToGerberCommands(soup)
-
-  console.log(kleur.gray("[stringify gerber json]..."))
-  const gerber_file_contents = stringifyGerberCommandLayers(gerber_layer_cmds)
-
-  console.log(kleur.gray("[writing gerbers to tmp dir]..."))
-  const tempDir = Path.join(".tscircuit", "tmp-gerber-export")
-  await fs.mkdirSync(tempDir, { recursive: true })
-  for (const [fileName, fileContents] of Object.entries(gerber_file_contents)) {
-    const filePath = Path.join(tempDir, fileName)
-    await fs.writeFileSync(filePath, fileContents)
-  }
-
-  console.log(kleur.gray("[zipping tmp dir]..."))
-  const output = fs.createWriteStream(params.outputfile)
-  const archive = archiver("zip", {
-    zlib: { level: 9 },
-  })
-
-  archive.pipe(output)
-  archive.directory(tempDir, false)
-
-  await new Promise((resolve, reject) => {
-    output.on("close", resolve)
-    output.on("error", reject)
-  })
 }

package/lib/export-gerbers.ts

@@ -0,0 +1,84 @@
+import { AppContext } from "./util/app-context"
+import { z } from "zod"
+import * as Path from "path"
+import { unlink } from "node:fs/promises"
+import { soupify } from "lib/soupify"
+import * as fs from "fs"
+import {
+  stringifyGerberCommandLayers,
+  convertSoupToGerberCommands,
+} from "@tscircuit/builder"
+import kleur from "kleur"
+import archiver from "archiver"
+
+export const exportGerbersToFile = async (
+  params: {
+    example_file_path: string
+    export_name?: string
+    output_zip_path: string
+  },
+  ctx: AppContext
+) => {
+  console.log(kleur.gray("[soupifying]..."))
+  const soup = await soupify(
+    {
+      filePath: params.example_file_path,
+      exportName: params.export_name,
+    },
+    ctx
+  )
+
+  console.log(kleur.gray("[soup to gerber json]..."))
+  const gerber_layer_cmds = convertSoupToGerberCommands(soup)
+
+  console.log(kleur.gray("[stringify gerber json]..."))
+  const gerber_file_contents = stringifyGerberCommandLayers(gerber_layer_cmds)
+
+  console.log(kleur.gray("[writing gerbers to tmp dir]..."))
+  const tempDir = Path.join(".tscircuit", "tmp-gerber-export")
+  fs.mkdirSync(tempDir, { recursive: true })
+  for (const [fileName, fileContents] of Object.entries(gerber_file_contents)) {
+    const filePath = Path.join(tempDir, fileName)
+    await fs.writeFileSync(filePath, fileContents)
+  }
+
+  console.log(kleur.gray("[zipping tmp dir]..."))
+  const output = fs.createWriteStream(params.output_zip_path)
+  const archive = archiver("zip", {
+    zlib: { level: 9 },
+  })
+
+  archive.pipe(output)
+  archive.directory(tempDir, false)
+
+  await new Promise((resolve, reject) => {
+    output.on("close", resolve)
+    output.on("error", reject)
+  })
+}
+
+export const exportGerbersToZipBuffer = async (
+  params: {
+    example_file_path: string
+    export_name?: string
+  },
+  ctx: AppContext
+) => {
+  const tempDir = Path.join(".tscircuit", "tmp-gerber-zip")
+  fs.mkdirSync(tempDir, { recursive: true })
+
+  await exportGerbersToFile(
+    {
+      example_file_path: params.example_file_path,
+      export_name: params.export_name,
+      output_zip_path: Path.join(tempDir, "gerbers.zip"),
+    },
+    ctx
+  )
+
+  const buffer = fs.readFileSync(Path.join(tempDir, "gerbers.zip"))
+
+  fs.rmSync(tempDir, { recursive: true })
+
+  return buffer
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@edge-runtime/primitives": "^4.1.0",
     "@hono/node-server": "^1.8.2",
-    "@tscircuit/builder": "1.5.53",
+    "@tscircuit/builder": "latest",
     "@tscircuit/react-fiber": "latest",
     "archiver": "^7.0.1",
     "axios": "^1.6.7",
@@ -62,7 +62,6 @@
     "prompts": "^2.4.2",
     "react": "^18.2.0",
     "semver": "^7.6.0",
-    "zip-a-folder": "^3.1.6",
     "zod": "latest"
   },
   "devDependencies": {

package/tests/assets/example-project/src/MyCircuit.tsx

@@ -1,5 +1,5 @@
 import "@tscircuit/react-fiber"
 
 export const MyCircuit = () => (
-  <resistor name="R2" resistance="20kohm" footprint="0805" />
+  <resistor name="R2" resistance="20kohm" footprint="0402" />
 )