@tscircuit/cli 0.0.144 → 0.0.161

package/.github/workflows/formatbot.yml

@@ -0,0 +1,41 @@
+name: Format PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  format:
+    name: Format code
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.TSCIRCUIT_BOT_GITHUB_TOKEN }}
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '20'
+
+    - name: Get @biomejs/biome version
+      id: get-biome-version
+      run: echo "BIOME_VERSION=$(node -p "require('./package.json').devDependencies['@biomejs/biome']")" >> $GITHUB_OUTPUT
+
+    - name: Install @biomejs/biome
+      run: npm install @biomejs/biome@${{ steps.get-biome-version.outputs.BIOME_VERSION }}
+
+    - name: Run formatter
+      run: npx @biomejs/biome format . --write
+
+    - name: Commit changes
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: "formatbot: Automatically format code"
+        branch: ${{ github.head_ref }}
+        commit_user_name: tscircuitbot
+        commit_user_email: tscircuitbot@users.noreply.github.com
+        commit_author: tscircuitbot <tscircuitbot@users.noreply.github.com>

package/.github/workflows/release.yml

@@ -24,7 +24,12 @@ jobs:
           bun-version: latest
 
       - name: Install project dependencies
-        run: bun run bootstrap:ci
+        run: |
+          bun install
+
+          # Undo changes to the lockfile that might block release
+          # when this project is more mature use "bun install --frozen-lockfile"
+          git checkout -- bun.lockb
 
       - name: Build project
         run: bun run build

package/.github/workflows/test.yml

@@ -9,7 +9,7 @@ on:
       - main
 
 jobs:
-  build:
+  tests:
     runs-on: ubuntu-latest
 
     steps:
@@ -22,7 +22,7 @@ jobs:
           bun-version: latest
 
       - name: Install dependencies
-        run: bun run bootstrap
+        run: bun install
 
       - name: Install dependencies
         run: bun run build

package/.github/workflows/typecheck.yml

@@ -0,0 +1,29 @@
+# Created using @tscircuit/plop (npm install -g @tscircuit/plop)
+name: Type Check
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  type-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      - name: Install dependencies
+        run: bun i
+
+      - name: Build (required for dist imports)
+        run: bun run build
+
+      - name: Run format check
+        run: bunx tsc --noEmit

package/DEVELOPMENT.md

@@ -1,4 +1,7 @@
 # Getting Started with Development for @tscircuit/cli
 
 1. Run `bun install`
-2. Run `bun bootstrap`
+2. Run `bun run dev`
+
+You now have a development server running on http://localhost:5173 (don't use
+the one on port 3020, it won't auto-reload frontend changes)

package/README.md

@@ -1,4 +1,4 @@
-# `tsci` - The TSCircuit Command Line Tool
+# `tsci` - The TSCircuit Command Line & Development Tools
 
 Command line tool for developing tscircuit projects and interacting with the
 tscircuit registry.
@@ -41,17 +41,13 @@ tsci publish
 This project is developed with [bun](https://bun.sh/), make sure you have
 that installed.
 
-Run `bun bootstrap` to install dependencies and `bun cli.ts` to run test the cli in development.
+Run `bun install` to install dependencies and `bun cli/cli.ts` to run test the cli in development, or `bun run dev` to run the dev server.
 
 To run tests, run `bun test`
 
 If you want to test developing, run `bun dev` and visit http://127.0.0.1:5173. The project being
 loaded is inside `example-project`
 
-![image](https://github.com/tscircuit/cli/assets/1910070/cabb180d-a64f-4fe5-a6af-26f990af39b3)
-
-![image](https://github.com/tscircuit/cli/assets/1910070/9350c52c-4263-4ba2-b06b-61130b1aab3b)
-
 ![image](https://github.com/tscircuit/cli/assets/1910070/d6facd4d-0887-4871-8aa1-e525c519c50d)
 
 ## Features Coming Soon

package/{dev-server-api/src → api}/db/generic-json-level.ts

@@ -57,7 +57,7 @@ class GenericJsonLevel extends AbstractLevel<string, any> {
   }
 
   async _batch(
-    operations: Array<{ type: "put" | "del"; key: string; value?: any }>
+    operations: Array<{ type: "put" | "del"; key: string; value?: any }>,
   ): Promise<void> {
     for (const op of operations) {
       if (op.type === "put") {
@@ -99,7 +99,7 @@ class GenericJsonLevel extends AbstractLevel<string, any> {
       async next() {
         if (files.length === 0) {
           files = (await fs.readdir(this.db.location)).filter((file) =>
-            file.endsWith(".json")
+            file.endsWith(".json"),
           )
         }
 
@@ -108,7 +108,7 @@ class GenericJsonLevel extends AbstractLevel<string, any> {
           return undefined
         }
 
-        return [entry.key, entry.value]
+        return [entry.key, entry.value] as [string, any]
       },
       async seek(target: string) {
         index = files.findIndex((file) => file.startsWith(target))
@@ -116,10 +116,7 @@ class GenericJsonLevel extends AbstractLevel<string, any> {
           index = files.length
         }
       },
-      async end() {
-        // No resources to clean up
-      },
-    }
+    } as any
   }
 }
 

package/{dev-server-api/src → api}/db/zod-level-db.ts

@@ -22,7 +22,7 @@ export class ZodLevelDatabase {
 
   async get<K extends keyof DBSchemaType>(
     collection: K,
-    id: string | number
+    id: string | number,
   ): Promise<DBSchemaType[K] | null> {
     const key = `${collection}:${id}`
     const data = await this.db.get(key).catch((e) => null)
@@ -32,7 +32,7 @@ export class ZodLevelDatabase {
 
   async put<K extends keyof DBSchemaType>(
     collection: K,
-    value: DBInputSchemaType[K]
+    value: DBInputSchemaType[K],
   ): Promise<DBSchemaType[K]> {
     const idkey = `${collection}_id`
     const valueLoose: any = value
@@ -51,7 +51,7 @@ export class ZodLevelDatabase {
 
   async del<K extends keyof DBSchemaType>(
     collection: K,
-    id: string
+    id: string,
   ): Promise<void> {
     const key = `${collection}:${id}`
     await this.db.del(key)
@@ -59,7 +59,7 @@ export class ZodLevelDatabase {
 
   async find<K extends keyof DBSchemaType>(
     collection: K,
-    partialObject: Partial<DBSchemaType[K]>
+    partialObject: Partial<DBSchemaType[K]>,
   ): Promise<DBSchemaType[K] | null> {
     const schema = DBSchema.shape[collection]
 
@@ -82,14 +82,14 @@ export class ZodLevelDatabase {
 
   async findOrThrow<K extends keyof DBSchemaType>(
     collection: K,
-    partialObject: Partial<DBSchemaType[K]>
+    partialObject: Partial<DBSchemaType[K]>,
   ): Promise<DBSchemaType[K]> {
     const result = await this.find(collection, partialObject)
     if (!result) {
       throw new Error(
         `No record in "${collection}" matches query ${JSON.stringify(
-          partialObject
-        )}`
+          partialObject,
+        )}`,
       )
     }
     return result
@@ -97,7 +97,7 @@ export class ZodLevelDatabase {
 
   private matchesPartialObject<T>(
     fullObject: T,
-    partialObject: Partial<T>
+    partialObject: Partial<T>,
   ): boolean {
     for (const [key, value] of Object.entries(partialObject)) {
       if (fullObject[key as keyof T] !== value) {
@@ -121,7 +121,7 @@ export class ZodLevelDatabase {
   }
 
   async list<K extends keyof DBSchemaType>(
-    collection: K
+    collection: K,
   ): Promise<DBSchemaType[K][]> {
     const schema = DBSchema.shape[collection]
     const results: DBSchemaType[K][] = []

package/{dev-server-api/src → api/lib}/middlewares/with-db.ts

@@ -1,6 +1,6 @@
 import type { Middleware } from "winterspec"
-import { getDb } from "../db/get-db"
-import type { ZodLevelDatabase } from "src/db/zod-level-db"
+import { getDb } from "api/db/get-db"
+import type { ZodLevelDatabase } from "api/db/zod-level-db"
 
 export const withDb: Middleware<
   {},

package/{dev-server-api/src → api/lib}/middlewares/with-debug-request-logging.ts

@@ -6,7 +6,7 @@ const debug = Debug("tscircuit:cli:api")
 export const withDebugRequestLogging: Middleware<{}, {}> = async (
   req,
   ctx,
-  next
+  next,
 ) => {
   debug(`[REQ] ${req.method?.toUpperCase()} ${req.url}`)
   return next(req, ctx)

package/{dev-server-api/src → api/lib}/middlewares/with-error-response.ts

@@ -18,7 +18,7 @@ export const withErrorResponse: Middleware<{}, {}> = async (req, ctx, next) => {
             error_code: "not_found",
           },
         },
-        { status: error?.status || 404 }
+        { status: error?.status || 404 },
       )
     }
 
@@ -31,7 +31,7 @@ export const withErrorResponse: Middleware<{}, {}> = async (req, ctx, next) => {
           error_code: error?.error_code ?? "internal_server_error",
         },
       },
-      { status: error?.status || 500 }
+      { status: error?.status || 500 },
     )
   }
 }

package/{dev-server-api → api}/routes/api/db/download.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
@@ -14,12 +14,12 @@ export default withWinterSpec({
         dev_server_database_dump: await ctx.db.dump(),
       },
       null,
-      "  "
+      "  ",
     ),
     {
       headers: {
         "content-type": "application/json",
       },
-    }
+    },
   )
 })

package/{dev-server-api → api}/routes/api/dev_package_examples/create.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({

package/{dev-server-api → api}/routes/api/dev_package_examples/get.ts

@@ -1,5 +1,5 @@
-import { withWinterSpec } from "src/with-winter-spec"
-import { NotFoundError } from "edgespec/middleware"
+import { withWinterSpec } from "api/lib/with-winter-spec"
+import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
 
 export default withWinterSpec({
@@ -33,7 +33,7 @@ export default withWinterSpec({
 })(async (req, ctx) => {
   const dev_package_example = await ctx.db.get(
     "dev_package_example",
-    req.commonParams.dev_package_example_id
+    req.commonParams.dev_package_example_id,
   )
 
   if (!dev_package_example) {

package/{dev-server-api → api}/routes/api/dev_package_examples/list.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
@@ -13,7 +13,7 @@ export default withWinterSpec({
         edit_events_last_updated_at: z.string().datetime().nullable(),
         soup_last_updated_at: z.string().datetime().nullable(),
         last_updated_at: z.string().datetime().nullable(),
-      })
+      }),
     ),
   }),
   auth: "none",
@@ -27,7 +27,7 @@ export default withWinterSpec({
       edit_events_last_updated_at: dpe.edit_events_last_updated_at,
       soup_last_updated_at: dpe.soup_last_updated_at,
       last_updated_at: dpe.last_updated_at,
-    })
+    }),
   )
 
   return ctx.json({

package/{dev-server-api → api}/routes/api/dev_package_examples/update.ts

@@ -1,7 +1,7 @@
-import { withWinterSpec } from "src/with-winter-spec"
-import { NotFoundError } from "edgespec/middleware"
+import { withWinterSpec } from "api/lib/with-winter-spec"
+import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
-import { DevPackageExampleSchema } from "src/db/schema"
+import { DevPackageExampleSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["POST"],
@@ -19,7 +19,7 @@ export default withWinterSpec({
 })(async (req, ctx) => {
   const dev_package_example = await ctx.db.get(
     "dev_package_example",
-    req.jsonBody.dev_package_example_id
+    req.jsonBody.dev_package_example_id,
   )
 
   if (!dev_package_example) {

package/{dev-server-api → api}/routes/api/dev_server/reset.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 
 export default withWinterSpec({
   methods: ["GET", "POST"],

package/{dev-server-api → api}/routes/api/export_files/create.ts

@@ -1,7 +1,5 @@
-import { ExportFileSchema } from "src/db/schema"
-import { publicMapExportFile } from "src/lib/public-mapping/public-map-export-file"
-import { export_file } from "src/lib/zod/export_file"
-import { withWinterSpec } from "src/with-winter-spec"
+import { ExportFileSchema } from "api/db/schema"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
@@ -16,7 +14,6 @@ export default withWinterSpec({
   }),
   auth: "none",
 })(async (req, ctx) => {
-  console.log("putting file")
   const export_file = await ctx.db.put("export_file", {
     export_request_id: req.jsonBody.export_request_id,
     file_name: req.jsonBody.file_name,
@@ -24,7 +21,6 @@ export default withWinterSpec({
     created_at: new Date().toISOString(),
   })
   console.log("done putting file")
-
   return ctx.json({
     export_file,
   })

package/{dev-server-api → api}/routes/api/export_files/download.ts

@@ -1,6 +1,4 @@
-import { publicMapExportFile } from "src/lib/public-mapping/public-map-export-file"
-import { export_file } from "src/lib/zod/export_file"
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
 

package/{dev-server-api → api}/routes/api/export_requests/create.ts

@@ -1,8 +1,7 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
-import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"
-import { export_parameters } from "../../../src/lib/zod/export_parameters"
-import { ExportRequestSchema } from "src/db/schema"
+import { export_parameters } from "api/lib/zod/export_parameters"
+import { ExportRequestSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["POST"],

package/{dev-server-api → api}/routes/api/export_requests/get.ts

@@ -1,10 +1,7 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
-import { export_request } from "src/lib/zod/export_request"
-import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"
-import { NotFoundError } from "edgespec/middleware"
-import { ExportRequestSchema } from "src/db/schema"
-import { file } from "bun"
+import { NotFoundError } from "winterspec/middleware"
+import { ExportRequestSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["GET", "POST"],
@@ -14,7 +11,7 @@ export default withWinterSpec({
   jsonResponse: z.object({
     export_request: ExportRequestSchema.extend({
       file_summary: z.array(
-        z.object({ file_name: z.string(), export_file_id: z.coerce.number() })
+        z.object({ file_name: z.string(), export_file_id: z.coerce.number() }),
       ),
     }),
   }),
@@ -33,7 +30,7 @@ export default withWinterSpec({
   }
 
   const export_files = (await ctx.db.list("export_file")).filter(
-    (ef) => ef.export_request_id === export_request_id
+    (ef) => ef.export_request_id === export_request_id,
   )
   ext_export_request.file_summary = export_files.map((ef) => ({
     file_name: ef.file_name!,

package/{dev-server-api → api}/routes/api/export_requests/list.ts

@@ -1,7 +1,6 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
-import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"
-import { ExportRequestSchema } from "src/db/schema"
+import { ExportRequestSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["GET", "POST"],

package/{dev-server-api → api}/routes/api/export_requests/update.ts

@@ -1,9 +1,7 @@
-import { withWinterSpec } from "src/with-winter-spec"
-import { NotFoundError } from "edgespec/middleware"
+import { withWinterSpec } from "api/lib/with-winter-spec"
+import { NotFoundError } from "winterspec/middleware"
 import { z } from "zod"
-import { export_request } from "src/lib/zod/export_request"
-import { publicMapExportRequest } from "src/lib/public-mapping/public-map-export-request"
-import { ExportRequestSchema } from "src/db/schema"
+import { ExportRequestSchema } from "api/db/schema"
 
 export default withWinterSpec({
   methods: ["POST"],

package/{dev-server-api/routes → api/routes/api}/health.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({

package/{dev-server-api → api}/routes/api/package_info/create.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({

package/{dev-server-api → api}/routes/api/package_info/get.ts

@@ -1,5 +1,6 @@
-import { PackageInfoSchema } from "src/db/schema"
-import { withWinterSpec } from "src/with-winter-spec"
+import { PackageInfoSchema } from "api/db/schema"
+
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({

package/{dev-server-api/routes/api → api/routes}/health.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "../../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({

package/{dev-server-api → api}/routes/index.ts

@@ -1,4 +1,4 @@
-import { withWinterSpec } from "../src/with-winter-spec"
+import { withWinterSpec } from "api/lib/with-winter-spec"
 import { z } from "zod"
 
 export default withWinterSpec({
@@ -11,6 +11,6 @@ export default withWinterSpec({
       headers: {
         "content-type": "text/html",
       },
-    }
+    },
   )
 })

package/{dev-server-api → api}/server.ts

@@ -3,10 +3,10 @@ import { Request as EdgeRuntimeRequest } from "@edge-runtime/primitives"
 import { join } from "node:path"
 
 const serverFetch = await createFetchHandlerFromDir(
-  join(import.meta.dir, "./routes")
+  join(import.meta.dir, "./routes"),
 )
 
-console.log("starting dev-server-api on http://127.0.0.1:3021")
+console.log("starting dev server api on http://127.0.0.1:3021")
 Bun.serve({
   fetch: (bunReq) => {
     const req = new EdgeRuntimeRequest(bunReq.url, {

package/api/static-routes.ts

@@ -0,0 +1,24 @@
+
+// import { WinterSpecRouteMap } from "@winterspec/types"
+
+const routeMap = {
+  "/api/db/download": (await import('./routes/api/db/download.ts')).default,
+  "/api/dev_package_examples/create": (await import('./routes/api/dev_package_examples/create.ts')).default,
+  "/api/dev_package_examples/get": (await import('./routes/api/dev_package_examples/get.ts')).default,
+  "/api/dev_package_examples/list": (await import('./routes/api/dev_package_examples/list.ts')).default,
+  "/api/dev_package_examples/update": (await import('./routes/api/dev_package_examples/update.ts')).default,
+  "/api/dev_server/reset": (await import('./routes/api/dev_server/reset.ts')).default,
+  "/api/export_files/create": (await import('./routes/api/export_files/create.ts')).default,
+  "/api/export_files/download": (await import('./routes/api/export_files/download.ts')).default,
+  "/api/export_requests/create": (await import('./routes/api/export_requests/create.ts')).default,
+  "/api/export_requests/get": (await import('./routes/api/export_requests/get.ts')).default,
+  "/api/export_requests/list": (await import('./routes/api/export_requests/list.ts')).default,
+  "/api/export_requests/update": (await import('./routes/api/export_requests/update.ts')).default,
+  "/api/health": (await import('./routes/api/health.ts')).default,
+  "/api/package_info/create": (await import('./routes/api/package_info/create.ts')).default,
+  "/api/package_info/get": (await import('./routes/api/package_info/get.ts')).default,
+  "/health": (await import('./routes/health.ts')).default,
+  "/": (await import('./routes/index.ts')).default
+}
+
+export default routeMap

package/{dev-server-api → api}/tests/fixtures/get-test-server.ts

@@ -12,7 +12,8 @@ interface TestFixture {
 export const getTestFixture = async (): Promise<TestFixture> => {
   process.env.TSCI_DEV_SERVER_DB = tmpdir() + `/${Math.random()}` + "/devdb"
   const port = 3001 + Math.floor(Math.random() * 999)
-  const server = startServer({ port })
+  const testInstanceId = Math.random().toString(36).substring(2, 15)
+  const server = await startServer({ port })
   const url = `http://127.0.0.1:${port}`
   const axios = defaultAxios.create({
     baseURL: url,

package/api/tests/fixtures/start-server.ts

@@ -0,0 +1,41 @@
+import {
+  createFetchHandlerFromDir,
+  createWinterSpecBundleFromDir,
+} from "winterspec/adapters/node"
+import { Request as EdgeRuntimeRequest } from "@edge-runtime/primitives"
+import { join } from "node:path"
+import { ZodLevelDatabase } from "api/db/zod-level-db"
+import os from "node:os"
+import { Middleware } from "winterspec"
+
+export const startServer = async ({ port }: { port: number }) => {
+  const db = new ZodLevelDatabase(os.tmpdir() + "/devdb")
+
+  const winterspecBundle = await createWinterSpecBundleFromDir(
+    join(import.meta.dir, "../../routes"),
+  )
+
+  const middleware: Middleware[] = [
+    async (req: any, ctx: any, next: any) => {
+      ;(ctx as any).db = db
+
+      return next(req, ctx)
+    },
+  ]
+
+  const server = Bun.serve({
+    fetch: (bunReq) => {
+      const req = new EdgeRuntimeRequest(bunReq.url, {
+        headers: bunReq.headers,
+        method: bunReq.method,
+        body: bunReq.body,
+      })
+      return winterspecBundle.makeRequest(req as any, {
+        middleware,
+      })
+    },
+    port,
+  })
+
+  return server
+}

package/{dev-server-api → api}/tests/routes/dev_package_examples/create.test.ts

@@ -1,5 +1,5 @@
 import { it, expect } from "bun:test"
-import { getTestFixture } from "tests/fixtures/get-test-server"
+import { getTestFixture } from "api/tests/fixtures/get-test-server"
 
 it("POST /api/dev_package_examples/create", async () => {
   const { axios } = await getTestFixture()
@@ -14,6 +14,6 @@ it("POST /api/dev_package_examples/create", async () => {
     .then((r) => r.data)
 
   expect(res.dev_package_example.file_path).toEqual(
-    "examples/basic-resistor.tsx"
+    "examples/basic-resistor.tsx",
   )
 })