@tscircuit/cli 0.0.38 → 0.0.40

package/lib/cmd-fns/config-set-runtime.ts

@@ -0,0 +1,7 @@
+import { AppContext } from "../util/app-context"
+import { z } from "zod"
+
+export const configSetRuntime = async (ctx: AppContext, args: any) => {
+  const params = z.object({ runtime: z.enum(["bun", "node"]) }).parse(args)
+  ctx.global_config.set("runtime", params.runtime)
+}

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

@@ -16,12 +16,12 @@ import { initCmd } from "../init"
 export const devCmd = async (ctx: AppContext, args: any) => {
   const params = z
     .object({
-      cwd: z.string().optional().default(process.cwd()),
       port: z.coerce.number().optional().default(3020),
     })
     .parse(args)
 
-  const { cwd, port } = params
+  const { port } = params
+  const { cwd } = ctx
 
   // In the future we should automatically run "tsci init" if the directory
   // isn't properly initialized, for now we're just going to do a spot check
@@ -53,8 +53,8 @@ export const devCmd = async (ctx: AppContext, args: any) => {
   // Add .tscircuit to .gitignore if it's not already there
   // TODO
 
-  // Delete old .tscircuit/dev-server.db
-  unlink(Path.join(cwd, ".tscircuit/dev-server.db")).catch(() => {})
+  // Delete old .tscircuit/dev-server.sqlite
+  unlink(Path.join(cwd, ".tscircuit/dev-server.sqlite")).catch(() => {})
 
   console.log(
     kleur.green(
@@ -66,12 +66,15 @@ export const devCmd = async (ctx: AppContext, args: any) => {
 
   const server = await startDevServer({ port, devServerAxios })
 
+  // Reset the database, allows migration to re-run
+  await devServerAxios.post("/api/dev_server/reset")
+
   // Soupify all examples
   console.log(`Loading examples...`)
-  await uploadExamplesFromDirectory({ devServerAxios, cwd })
+  await uploadExamplesFromDirectory({ devServerAxios, cwd }, ctx)
 
   // Start watcher
-  const watcher = await startWatcher({ cwd, devServerAxios })
+  const watcher = await startWatcher({ cwd, devServerAxios }, ctx)
 
   while (true) {
     const { action } = await prompts({

package/lib/cmd-fns/dev/mark-all-examples-loading.ts

@@ -0,0 +1,18 @@
+import { AxiosInstance } from "axios"
+
+export const markAllExamplesLoading = async ({
+  devServerAxios,
+}: {
+  devServerAxios: AxiosInstance
+}) => {
+  const examples = await devServerAxios
+    .post("/api/dev_package_examples/list")
+    .then((r) => r.data.dev_package_examples)
+
+  for (const example of examples) {
+    await devServerAxios.post("/api/dev_package_examples/update", {
+      dev_package_example_id: example.dev_package_example_id,
+      is_loading: true,
+    })
+  }
+}

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

@@ -5,26 +5,33 @@ import { readdirSync, readFileSync } from "fs"
 import { soupify } from "lib/soupify"
 import { inferExportNameFromSource } from "./infer-export-name-from-source"
 
-export const soupifyAndUploadExampleFile = async ({
-  examplesDir,
-  exampleFileName,
-  devServerAxios,
-}: {
-  examplesDir: string
-  exampleFileName: string
-  devServerAxios: AxiosInstance
-}) => {
+export const soupifyAndUploadExampleFile = async (
+  {
+    examplesDir,
+    exampleFileName,
+    devServerAxios,
+  }: {
+    examplesDir: string
+    exampleFileName: string
+    devServerAxios: AxiosInstance
+  },
+  ctx: { runtime: "node" | "bun" }
+) => {
   try {
+    const startTime = Date.now()
     const examplePath = joinPath(examplesDir, exampleFileName)
     const exampleContent = readFileSync(examplePath).toString()
 
     const exportName = inferExportNameFromSource(exampleContent)
 
     console.log(kleur.gray(`[soupifying] ${exampleFileName}...`))
-    const { soup, error } = await soupify({
-      filePath: examplePath,
-      exportName,
-    })
+    const { soup, error } = await soupify(
+      {
+        filePath: examplePath,
+        exportName,
+      },
+      ctx
+    )
       .then((soup) => ({ soup, error: null }))
       .catch((e) => ({ error: e, soup: undefined }))
 
@@ -38,8 +45,16 @@ export const soupifyAndUploadExampleFile = async ({
       error: error?.toString() || null,
       file_path: examplePath,
       export_name: exportName,
+      is_loading: false,
     })
-    console.log(kleur.gray(`[   done   ] ${exampleFileName}!`))
+    const timeTaken = Date.now() - startTime
+    console.log(
+      kleur.gray(
+        `[   done   ] [ ${Math.round(timeTaken)
+          .toString()
+          .padStart(5, " ")}ms ] ${exampleFileName}!`
+      )
+    )
   } catch (e: any) {
     console.log(kleur.red(`[   error  ] ${e.toString()}`))
   }

package/lib/cmd-fns/dev/start-watcher.ts

@@ -3,13 +3,16 @@ import chokidar from "chokidar"
 import { uploadExamplesFromDirectory } from "./upload-examples-from-directory"
 import kleur from "kleur"
 
-export const startWatcher = async ({
-  cwd,
-  devServerAxios,
-}: {
-  cwd: string
-  devServerAxios: AxiosInstance
-}) => {
+export const startWatcher = async (
+  {
+    cwd,
+    devServerAxios,
+  }: {
+    cwd: string
+    devServerAxios: AxiosInstance
+  },
+  ctx: { runtime: "node" | "bun" }
+) => {
   const watcher = chokidar.watch(`${cwd}/**/*.tsx`, {
     ignored: /node_modules/,
     persistent: true,
@@ -31,7 +34,7 @@ export const startWatcher = async ({
       if (upload_queue_state.dirty) {
         console.log(kleur.yellow("Changes detected, re-uploading examples..."))
         upload_queue_state.dirty = false
-        await uploadExamplesFromDirectory({ cwd, devServerAxios })
+        await uploadExamplesFromDirectory({ cwd, devServerAxios }, ctx)
       }
       await new Promise((resolve) => setTimeout(resolve, 100))
     }

package/lib/cmd-fns/dev/upload-examples-from-directory.ts

@@ -4,23 +4,34 @@ import { AxiosInstance } from "axios"
 import { readdirSync, readFileSync } from "fs"
 import { soupify } from "lib/soupify"
 import { soupifyAndUploadExampleFile } from "./soupify-and-upload-example-file"
+import { markAllExamplesLoading } from "./mark-all-examples-loading"
 
-export const uploadExamplesFromDirectory = async ({
-  cwd,
-  devServerAxios,
-}: {
-  cwd: string
-  devServerAxios: AxiosInstance
-}) => {
+export const uploadExamplesFromDirectory = async (
+  {
+    cwd,
+    devServerAxios,
+  }: {
+    cwd: string
+    devServerAxios: AxiosInstance
+  },
+  ctx: { runtime: "node" | "bun" }
+) => {
   const examplesDir = joinPath(cwd, "examples")
   const exampleFileNames = readdirSync(examplesDir)
+
+  // Mark all examples as being "reloaded" in the database
+  await markAllExamplesLoading({ devServerAxios })
+
   for (const exampleFileName of exampleFileNames) {
     if (exampleFileName.endsWith(".__tmp_entrypoint.tsx")) continue
     if (!exampleFileName.endsWith(".tsx")) continue
-    await soupifyAndUploadExampleFile({
-      devServerAxios,
-      examplesDir,
-      exampleFileName,
-    })
+    await soupifyAndUploadExampleFile(
+      {
+        devServerAxios,
+        examplesDir,
+        exampleFileName,
+      },
+      ctx
+    )
   }
 }

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

@@ -17,10 +17,10 @@ export const devServerUpload = async (ctx: AppContext, args: any) => {
   const devServerAxios = getDevServerAxios({ serverUrl })
 
   console.log(`Loading examples...`)
-  await uploadExamplesFromDirectory({ devServerAxios, cwd: params.dir })
+  await uploadExamplesFromDirectory({ devServerAxios, cwd: params.dir }, ctx)
 
   if (params.watch) {
     // Start watcher
-    const watcher = await startWatcher({ cwd: params.dir, devServerAxios })
+    const watcher = await startWatcher({ cwd: params.dir, devServerAxios }, ctx)
   }
 }

package/lib/cmd-fns/index.ts

@@ -1,6 +1,7 @@
 export { configRevealLocation } from "./config-reveal-location"
 export { configSetRegistry } from "./config-set-registry"
 export { configSetSession } from "./config-set-session"
+export { configSetRuntime } from "./config-set-runtime"
 export { configSetLogRequests } from "./config-set-log-requests"
 export { configPrintConfig } from "./config-print-config"
 export { authLogin } from "./auth-login"

package/lib/cmd-fns/package-examples-create.ts

@@ -12,10 +12,13 @@ export const packageExamplesCreate = async (ctx: AppContext, args: any) => {
     })
     .parse(args)
 
-  const tscircuit_soup = await soupify({
-    filePath: params.file,
-    exportName: params.export,
-  })
+  const tscircuit_soup = await soupify(
+    {
+      filePath: params.file,
+      exportName: params.export,
+    },
+    ctx
+  )
 
   const fileContent = await fs.promises.readFile(params.file, "utf8")
 

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

@@ -218,10 +218,13 @@ export const publish = async (ctx: AppContext, args: any) => {
 
     const exportName = inferExportNameFromSource(fileContent)
 
-    const tscircuit_soup = await soupify({
-      filePath,
-      exportName,
-    }).catch((e) => e)
+    const tscircuit_soup = await soupify(
+      {
+        filePath,
+        exportName,
+      },
+      ctx
+    ).catch((e) => e)
 
     if (tscircuit_soup instanceof Error) {
       console.log(

package/lib/cmd-fns/soupify.ts

@@ -14,10 +14,13 @@ export const soupifyCmd = async (ctx: AppContext, args: any) => {
     })
     .parse(args)
 
-  const soup = await soupify({
-    filePath: params.file,
-    exportName: params.export,
-  })
+  const soup = await soupify(
+    {
+      filePath: params.file,
+      exportName: params.export,
+    },
+    ctx
+  )
 
   if (params.output) {
     await writeFileSync(params.output, JSON.stringify(soup, null, 2))

package/lib/create-config-manager.ts

@@ -8,6 +8,7 @@ interface ProfileConfigProps {
 interface GlobalConfigProps {
   current_profile?: string
   log_requests?: boolean
+  runtime?: "bun" | "node"
 }
 
 interface TypedConfigstore<T extends Record<string, any>> {

package/lib/get-program.ts

@@ -40,6 +40,13 @@ export const getProgram = (ctx: AppContext) => {
     .command("set-session")
     .requiredOption("--session-token <session_token>", "Session Token")
     .action((args) => CMDFN.configSetSession(ctx, args))
+  configCmd
+    .command("set-runtime")
+    .requiredOption(
+      "--runtime <runtime>",
+      "Bun or node. Setting to bun generally doubles soupification speed."
+    )
+    .action((args) => CMDFN.configSetRuntime(ctx, args))
   configCmd
     .command("set-log-requests")
     .requiredOption("--log-requests", "Should log requests to registry")

package/lib/param-handlers/index.ts

@@ -5,6 +5,7 @@ import { interactForPackageName } from "./interact-for-package-name"
 import { interactForPackageNameWithVersion } from "./interact-for-package-name-with-version"
 import { interactForPackageReleaseId } from "./interact-for-package-release-id"
 import { interactForRegistryUrl } from "./interact-for-registry-url"
+import { interactForRuntime } from "./interact-for-runtime"
 import { ParamHandler } from "./param-handler-type"
 
 export const PARAM_HANDLERS_BY_PARAM_NAME: Record<string, ParamHandler> = {
@@ -12,6 +13,7 @@ export const PARAM_HANDLERS_BY_PARAM_NAME: Record<string, ParamHandler> = {
   cwd: interactForLocalDirectory,
   dir: interactForLocalDirectory,
   registry_url: interactForRegistryUrl,
+  runtime: interactForRuntime,
   package_release_id: interactForPackageReleaseId,
   package_name: interactForPackageName,
   package_name_with_version: interactForPackageNameWithVersion,

package/lib/param-handlers/interact-for-runtime.ts

@@ -0,0 +1,33 @@
+import kleur from "kleur"
+import { ParamHandler } from "./param-handler-type"
+import $ from "dax-sh"
+
+export const interactForRuntime: ParamHandler = async (params) => {
+  const { prompts, ctx } = params
+
+  const bunVersion = await $`bun --version`.text().catch((e) => null)
+
+  if (!bunVersion) {
+    console.log(
+      kleur.red(`BUN IS NOT INSTALLED! Install bun first https://bun.sh/`)
+    )
+  }
+
+  const { runtime } = await prompts({
+    type: "select",
+    name: "runtime",
+    message: "Select a runtime",
+    choices: [
+      {
+        title: "bun",
+        value: "bun",
+        description: bunVersion
+          ? `bun version: ${bunVersion}`
+          : "NOTE: bun not installed, install bun first!",
+      },
+      { title: "node", value: "node" },
+    ],
+  })
+
+  return runtime
+}

package/lib/soupify.ts

@@ -6,13 +6,16 @@ import { unlink } from "node:fs/promises"
 import kleur from "kleur"
 import { writeFileSync } from "fs"
 
-export const soupify = async ({
-  filePath,
-  exportName,
-}: {
-  filePath: string
-  exportName?: string
-}) => {
+export const soupify = async (
+  {
+    filePath,
+    exportName,
+  }: {
+    filePath: string
+    exportName?: string
+  },
+  ctx: { runtime: "node" | "bun" }
+) => {
   const tmpFilePath = Path.join(
     Path.dirname(filePath),
     Path.basename(filePath).replace(/\.[^\.]+$/, "") + ".__tmp_entrypoint.tsx"
@@ -44,7 +47,9 @@ console.log(JSON.stringify(elements))
 `.trim()
   )
 
-  const processResult = await $`npx tsx ${tmpFilePath}`
+  const runtime = ctx.runtime === "node" ? "npx tsx" : "bun"
+
+  const processResult = await $`${runtime} ${tmpFilePath}`
     .stdout("piped")
     .stderr("piped")
     .noThrow()

package/lib/util/app-context.ts

@@ -10,4 +10,5 @@ export type AppContext = {
   registry_url: string
   axios: AxiosInstance
   current_profile: string
+  runtime: "node" | "bun"
 } & ContextConfigProps

package/lib/util/create-context-and-run-program.ts

@@ -103,6 +103,7 @@ export const createContextAndRunProgram = async (process_args: any) => {
     axios,
     global_config,
     profile_config,
+    runtime: global_config.get("runtime") ?? "node",
     args: {
       cmd: args._,
       yes: args.y ?? args.yes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -9,12 +9,15 @@
     "bootstrap": "bun i && cd dev-server-api && bun i && cd ../dev-server-frontend && bun i",
     "bootstrap:ci": "bun i --frozen-lockfile && cd dev-server-api && bun i --frozen-lockfile && cd ../dev-server-frontend && bun i --frozen-lockfile",
     "start": "bun cli.ts",
-    "start:dev-server:dev": "TSCI_DEV_SERVER_DB=$(pwd)/.tscircuit/dev-server.db concurrently 'cd dev-server-api && bun start' 'cd dev-server-frontend && bun start'",
+    "start:dev-server:dev": "TSCI_DEV_SERVER_DB=$(pwd)/.tscircuit/dev-server.sqlite concurrently 'cd dev-server-api && bun start' 'cd dev-server-frontend && bun start'",
     "start:dev-server": "bun build:dev-server && bun cli.ts dev -y --cwd ./tests/assets/example-project",
     "build:dev-server": "cd dev-server-api && bun run build && cd ../dev-server-frontend && bun run build",
+    "build:dev-server:api": "cd dev-server-api && bun run build",
     "build:cli": "bun build-cli.ts",
     "build": "bun build:dev-server && npm run build:cli",
-    "test:init": "bun cli.ts init --dir ./tmp/test --name test"
+    "dev-with-test-project": "bun cli.ts dev --cwd ./tests/assets/example-project",
+    "test:init": "bun cli.ts init --dir ./tmp/test --name test",
+    "update-deps": "bun add @tscircuit/builder@latest @tscircuit/react-fiber@latest && cd dev-server-frontend && bun run update-deps"
   },
   "bin": {
     "tscircuit": "./dist/cli.js",
@@ -32,8 +35,8 @@
   "dependencies": {
     "@edge-runtime/primitives": "^4.1.0",
     "@hono/node-server": "^1.8.2",
-    "@tscircuit/builder": "^1.5.10",
-    "@tscircuit/react-fiber": "^1.0.9",
+    "@tscircuit/builder": "latest",
+    "@tscircuit/react-fiber": "latest",
     "axios": "^1.6.7",
     "better-sqlite3": "^9.4.3",
     "chokidar": "^3.6.0",
@@ -54,7 +57,7 @@
     "minimist": "^1.2.8",
     "node-persist": "^4.0.1",
     "open": "^10.1.0",
-    "perfect-cli": "^1.0.16",
+    "perfect-cli": "^1.0.19",
     "prompts": "^2.4.2",
     "react": "^18.2.0",
     "semver": "^7.6.0",