@tscircuit/cli 0.0.63 → 0.0.65

package/lib/cmd-fns/dev/fulfill-export-requests.ts

@@ -1,7 +1,37 @@
 import { AppContext } from "../../util/app-context"
 import kleur from "kleur"
-import { exportGerbersToZipBuffer } from "lib/export-gerbers"
+import { exportGerbersToZipBuffer } from "lib/export-fns/export-gerbers"
 import { AxiosInstance } from "axios"
+import { ExportRequest } from "@server/lib/zod/export_request"
+import { exportPnpCsvToBuffer } from "lib/export-fns/export-pnp-csv"
+import { exportBomCsvToBuffer } from "lib/export-fns/export-bom-csv"
+
+export const uploadBufferToExportFile = async ({
+  dev_server_axios,
+  file_buffer,
+  file_name,
+  export_request_id,
+}: {
+  dev_server_axios: AxiosInstance
+  file_buffer: Buffer
+  file_name: string
+  export_request_id: number
+}) => {
+  await dev_server_axios.post("/api/export_files/create", {
+    file_content_base64: file_buffer.toString("base64"),
+    file_name: file_name,
+    export_request_id: export_request_id,
+  })
+
+  console.log(kleur.gray(`  marking export request as complete...`))
+
+  await dev_server_axios.post("/api/export_requests/update", {
+    export_request_id: export_request_id,
+    is_complete: true,
+  })
+
+  console.log(kleur.green(`  done`))
+}
 
 export const fulfillExportRequests = async (
   {
@@ -11,46 +41,80 @@ export const fulfillExportRequests = async (
   },
   ctx: AppContext
 ) => {
-  const export_requests = await dev_server_axios
+  const export_requests: ExportRequest[] = await dev_server_axios
     .post("/api/export_requests/list", {
       is_complete: false,
     })
     .then((r) => r.data.export_requests)
 
   for (const export_request of export_requests) {
-    console.log(kleur.gray(`Fulfilling export request ${export_request.id}`))
+    console.log(
+      kleur.gray(
+        `Fulfilling export request ${export_request.export_request_id}`
+      )
+    )
     console.log(
       kleur.gray(`  example_file_path: ${export_request.example_file_path}`)
     )
 
-    console.log(kleur.gray(`\n  exporting gerbers...`))
-    const zip_buffer = await exportGerbersToZipBuffer(
-      {
-        example_file_path: export_request.example_file_path,
-        export_name: export_request.export_name,
-      },
-      ctx
-    )
+    if (export_request.export_parameters.should_export_gerber_zip) {
+      console.log(kleur.gray(`\n  exporting gerbers...`))
+      const zip_buffer = await exportGerbersToZipBuffer(
+        {
+          example_file_path: export_request.example_file_path,
+          export_name: export_request.export_name,
+        },
+        ctx
+      )
 
-    console.log(
-      kleur.gray(
-        `  uploading zip "${export_request.export_parameters.gerbers_zip_file_name}" to dev server...`
+      console.log(
+        kleur.gray(
+          `  uploading zip "${export_request.export_parameters.gerbers_zip_file_name}" to dev server...`
+        )
       )
-    )
 
-    await dev_server_axios.post("/api/export_files/create", {
-      file_content_base64: zip_buffer.toString("base64"),
-      file_name: export_request.export_parameters.gerbers_zip_file_name,
-      export_request_id: export_request.export_request_id,
-    })
+      await uploadBufferToExportFile({
+        dev_server_axios,
+        file_buffer: zip_buffer,
+        file_name: export_request.export_parameters.gerbers_zip_file_name!,
+        export_request_id: export_request.export_request_id,
+      })
+    }
 
-    console.log(kleur.gray(`  marking export request as complete...`))
+    if (export_request.export_parameters.should_export_pnp_csv) {
+      console.log(kleur.gray(`\n  exporting pick'n'place...`))
+      const csv_buffer = await exportPnpCsvToBuffer(
+        {
+          example_file_path: export_request.example_file_path,
+          export_name: export_request.export_name,
+        },
+        ctx
+      )
 
-    await dev_server_axios.post("/api/export_requests/update", {
-      export_request_id: export_request.export_request_id,
-      is_complete: true,
-    })
+      await uploadBufferToExportFile({
+        dev_server_axios,
+        file_buffer: csv_buffer,
+        file_name: export_request.export_parameters.pnp_csv_file_name!,
+        export_request_id: export_request.export_request_id,
+      })
+    }
+
+    if (export_request.export_parameters.should_export_bom_csv) {
+      console.log(kleur.gray(`\n  exporting bill of materials...`))
+      const csv_buffer = await exportBomCsvToBuffer(
+        {
+          example_file_path: export_request.example_file_path,
+          export_name: export_request.export_name,
+        },
+        ctx
+      )
 
-    console.log(kleur.green(`  done`))
+      await uploadBufferToExportFile({
+        dev_server_axios,
+        file_buffer: csv_buffer,
+        file_name: export_request.export_parameters.bom_csv_file_name!,
+        export_request_id: export_request.export_request_id,
+      })
+    }
   }
 }

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

@@ -1,6 +1,6 @@
 import { AppContext } from "../util/app-context"
 import { z } from "zod"
-import { exportGerbersToFile } from "lib/export-gerbers"
+import { exportGerbersToFile } from "lib/export-fns/export-gerbers"
 
 export const exportGerbersCmd = async (ctx: AppContext, args: any) => {
   const params = z

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

@@ -0,0 +1,30 @@
+import { AppContext } from "../util/app-context"
+import { soupify } from "lib/soupify"
+import { convertSoupToBomRows, convertBomRowsToCsv } from "@tscircuit/builder"
+import kleur from "kleur"
+
+export const exportBomCsvToBuffer = async (
+  params: {
+    example_file_path: string
+    export_name?: 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 bom rows]..."))
+  // @ts-ignore
+  const bom_rows = await convertSoupToBomRows({ soup })
+
+  console.log(kleur.gray("[bom rows to csv]..."))
+  const bom_csv = await convertBomRowsToCsv(bom_rows)
+
+  return Buffer.from(bom_csv, "utf-8")
+}

package/lib/{export-gerbers.ts → export-fns/export-gerbers.ts}

@@ -1,4 +1,4 @@
-import { AppContext } from "./util/app-context"
+import { AppContext } from "../util/app-context"
 import { z } from "zod"
 import * as Path from "path"
 import { unlink } from "node:fs/promises"

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

@@ -0,0 +1,35 @@
+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,
+  convertSoupToPickAndPlaceCsv,
+} from "@tscircuit/builder"
+import kleur from "kleur"
+import archiver from "archiver"
+
+export const exportPnpCsvToBuffer = async (
+  params: {
+    example_file_path: string
+    export_name?: 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 pnp csv string]..."))
+  const pnp_csv = await convertSoupToPickAndPlaceCsv(soup)
+
+  return Buffer.from(pnp_csv, "utf-8")
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -35,8 +35,8 @@
   "dependencies": {
     "@edge-runtime/primitives": "^4.1.0",
     "@hono/node-server": "^1.8.2",
-    "@tscircuit/builder": "latest",
-    "@tscircuit/react-fiber": "latest",
+    "@tscircuit/builder": "^1.5.60",
+    "@tscircuit/react-fiber": "^1.0.34",
     "archiver": "^7.0.1",
     "axios": "^1.6.7",
     "better-sqlite3": "^9.4.3",