@tscircuit/cli 0.0.8 → 0.0.14

package/lib/cmd-fns/auth-logout.ts

@@ -1,3 +1,7 @@
+import kleur from "kleur"
 import { AppContext } from "../util/app-context"
 
-export const authLogout = async (ctx: AppContext, args: any) => {}
+export const authLogout = async (ctx: AppContext, args: any) => {
+  ctx.profile_config.delete("session_token")
+  console.log(kleur.green("Logged out!"))
+}

package/lib/cmd-fns/config-clear.ts

@@ -0,0 +1,5 @@
+import { AppContext } from "../util/app-context"
+
+export const configClear = async (ctx: AppContext, args: any) => {
+  ctx.global_config.clear()
+}

package/lib/cmd-fns/index.ts

@@ -31,3 +31,5 @@ export { removeCmd as remove } from "./remove"
 export { installCmd as install } from "./install"
 export { uninstallCmd as uninstall } from "./uninstall"
 export { devServerUpload } from "./dev-server-upload"
+export { configClear } from "./config-clear"
+export { openCmd as open } from "./open"

package/lib/cmd-fns/open.ts

@@ -0,0 +1,19 @@
+import { existsSync, readFileSync } from "fs"
+import kleur from "kleur"
+import { AppContext } from "lib/util/app-context"
+import * as Path from "path"
+import open from "open"
+
+export const openCmd = async (ctx: AppContext, args: any) => {
+  const packageJsonPath = Path.join(ctx.cwd, "package.json")
+  if (!existsSync(packageJsonPath)) {
+    console.log(kleur.red("No package.json found in current directory"))
+    process.exit(1)
+  }
+  const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"))
+
+  const registryUrl = `${ctx.registry_url}/${packageJson.name.replace("@", "")}`
+
+  console.log(`Opening ${registryUrl} in your browser...`)
+  await open(registryUrl)
+}

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

@@ -12,6 +12,7 @@ import { inferExportNameFromSource } from "../dev/infer-export-name-from-source"
 import $ from "dax-sh"
 import semver from "semver"
 import { unlink } from "fs/promises"
+import esbuild from "esbuild"
 
 export const publish = async (ctx: AppContext, args: any) => {
   const params = z
@@ -42,24 +43,31 @@ export const publish = async (ctx: AppContext, args: any) => {
   )
 
   // TODO possibly use esbuild here, it's got stuff like packages: "external"
-  await Bun.build({
-    root: ctx.cwd,
-    // TODO determine entrypoint in a more clever way e.g.
-    // - package.json "main"
-    entrypoints: ["index.ts"],
+  // await Bun.build({
+  //   root: ctx.cwd,
+  //   // TODO determine entrypoint in a more clever way e.g.
+  //   // - package.json "main"
+  //   entrypoints: ["index.ts"],
 
-    // Everything should be external since it's a node module, esbuild has a
-    // packages: "external" option for this
-    external: [
-      ...Object.keys(packageJson.dependencies || {}),
-      ...Object.keys(packageJson.devDependencies || {}),
-      ...Object.keys(packageJson.peerDependencies || {}),
-      ...Object.keys(packageJson.trustedDependencies || {}),
-    ],
+  //   // Everything should be external since it's a node module, esbuild has a
+  //   // packages: "external" option for this
+  //   external: [
+  //     ...Object.keys(packageJson.dependencies || {}),
+  //     ...Object.keys(packageJson.devDependencies || {}),
+  //     ...Object.keys(packageJson.peerDependencies || {}),
+  //     ...Object.keys(packageJson.trustedDependencies || {}),
+  //   ],
 
-    outdir: "dist",
+  //   outdir: "dist",
 
-    target: "node",
+  //   target: "node",
+  // })
+  await esbuild.build({
+    entryPoints: ["index.ts"], // TODO dynamically determine entrypoint
+    bundle: true,
+    platform: "node",
+    packages: "external",
+    outdir: "dist",
   })
 
   // Publish to npm??

package/lib/cmd-fns/version.ts

@@ -0,0 +1,6 @@
+import { AppContext } from "lib/util/app-context"
+import packageJson from "./../../package.json"
+
+export const versionCmd = async (ctx: AppContext, args: any) => {
+  console.log(`tsci v${packageJson.version}`)
+}

package/lib/create-config-manager.ts

@@ -0,0 +1,89 @@
+import Configstore from "configstore"
+
+interface ProfileConfigProps {
+  session_token?: string
+  registry_url?: string
+}
+
+interface GlobalConfigProps {
+  current_profile?: string
+  log_requests?: boolean
+}
+
+interface TypedConfigstore<T extends Record<string, any>> {
+  /**
+   * Get the path to the config file. Can be used to show the user
+   * where it is, or better, open it for them.
+   */
+  path: string
+
+  /**
+   * Get all items as an object or replace the current config with an object.
+   */
+  all: any
+
+  /**
+   * Get the item count
+   */
+  size: number
+
+  /**
+   * Get an item
+   * @param key The string key to get
+   * @return The contents of the config from key $key
+   */
+  get(key: keyof T): any
+
+  /**
+   * Set an item
+   * @param key The string key
+   * @param val The value to set
+   */
+  set<K extends keyof T>(key: K, val: T[K]): void
+
+  /**
+   * Determines if a key is present in the config
+   * @param key The string key to test for
+   * @return True if the key is present
+   */
+  has(key: keyof T): boolean
+
+  /**
+   * Delete an item.
+   * @param key The key to delete
+   */
+  delete(key: keyof T): void
+
+  /**
+   * Clear the config.
+   * Equivalent to <code>Configstore.all = {};</code>
+   */
+  clear(): void
+}
+
+export interface ContextConfigProps {
+  profile_config: TypedConfigstore<ProfileConfigProps>
+  global_config: TypedConfigstore<GlobalConfigProps>
+  current_profile: string
+}
+
+export const createConfigHandler = ({
+  profile,
+}: {
+  profile?: string
+}): ContextConfigProps => {
+  const global_config: TypedConfigstore<GlobalConfigProps> = new Configstore(
+    "tsci"
+  )
+  const current_profile =
+    profile ?? global_config.get("current_profile") ?? "default"
+
+  const profile_config: TypedConfigstore<ProfileConfigProps> = {
+    get: (key: string) =>
+      (global_config as any).get(`profiles.${current_profile}.${key}`),
+    set: (key: string, value: any) =>
+      (global_config as any).set(`profiles.${current_profile}.${key}`, value),
+  } as any
+
+  return { profile_config, global_config, current_profile }
+}

package/lib/get-program.ts

@@ -166,9 +166,7 @@ export const getProgram = (ctx: AppContext) => {
     .option("--lock", "Lock the release after publishing to prevent changes")
     .action((args) => CMDFN.publish(ctx, args))
 
-  cmd
-    .command("version")
-    .action(() => console.log(`tsci v${packageJson.version}`))
+  cmd.command("version").action(() => CMDFN.version(ctx, args))
 
   cmd.command("login").action((args) => CMDFN.authLogin(ctx, args))
   cmd.command("logout").action((args) => CMDFN.authLogout(ctx, args))
@@ -241,5 +239,7 @@ export const getProgram = (ctx: AppContext) => {
     .option("-p, --port", "Port dev server is running on (default: 3020)")
     .action((args) => CMDFN.devServerUpload(ctx, args))
 
+  cmd.command("open").action((args) => CMDFN.open(ctx, args))
+
   return cmd
 }

package/lib/util/app-context.ts

@@ -1,5 +1,6 @@
 import { AxiosInstance } from "axios"
 import Configstore from "configstore"
+import { ContextConfigProps } from "lib/create-config-manager"
 
 export type AppContext = {
   args: any
@@ -8,7 +9,5 @@ export type AppContext = {
   params: Record<string, any>
   registry_url: string
   axios: AxiosInstance
-  profile: string
-  profile_config: Configstore
-  global_config: Configstore
-}
+  current_profile: string
+} & ContextConfigProps

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

@@ -8,6 +8,9 @@ import { getProgram } from "../get-program"
 import defaultAxios from "axios"
 import kleur from "kleur"
 import { PARAM_HANDLERS_BY_PARAM_NAME } from "lib/param-handlers"
+import { createConfigHandler } from "lib/create-config-manager"
+import dargs from "dargs"
+import { versionCmd } from "lib/cmd-fns/version"
 
 export type CliArgs = {
   cmd: string[]
@@ -18,15 +21,10 @@ export type CliArgs = {
 export const createContextAndRunProgram = async (process_args: any) => {
   const args = minimist(process_args)
 
-  const global_config = new Configstore("tsci")
-  const current_profile =
-    args.profile ?? global_config.get("current_profile") ?? "default"
-  const profile_config: typeof global_config = {
-    get: (key: string) =>
-      global_config.get(`profiles.${current_profile}.${key}`),
-    set: (key: string, value: any) =>
-      global_config.set(`profiles.${current_profile}.${key}`, value),
-  } as any
+  const { global_config, profile_config, current_profile } =
+    createConfigHandler({
+      profile: args.profile,
+    })
 
   // Load registry commands
   const registry_url =
@@ -71,6 +69,15 @@ export const createContextAndRunProgram = async (process_args: any) => {
   axios.interceptors.response.use(
     (res) => res,
     (err) => {
+      // ---- IGNORE LOGGING *_not_found --------
+      if (
+        err.config.data?.error?.error_code === "package_not_found" ||
+        err.config.data?.error?.error_code === "package_release_not_found"
+      ) {
+        return Promise.reject(err)
+      }
+      // end ignores ---
+
       console.log(
         kleur.red(
           `[ERR] ${err.response?.status} ${err.config.method?.toUpperCase()} ${
@@ -88,7 +95,7 @@ export const createContextAndRunProgram = async (process_args: any) => {
   const ctx: AppContext = {
     cmd: args._,
     cwd: args.cwd ?? process.cwd(),
-    profile: current_profile,
+    current_profile,
     registry_url,
     axios,
     global_config,
@@ -101,7 +108,17 @@ export const createContextAndRunProgram = async (process_args: any) => {
     params: args,
   }
 
-  await perfectCli(getProgram(ctx), process.argv, {
+  delete args["cwd"]
+
+  const { _: positional, ...flagsAndParams } = args
+  const args_without_globals = positional.concat(dargs(flagsAndParams))
+
+  if (args["version"] && args._.length === 2) {
+    await versionCmd(ctx, {})
+    process.exit(0)
+  }
+
+  await perfectCli(getProgram(ctx), args_without_globals, {
     async customParamHandler({ commandPath, optionName }, { prompts }) {
       const optionNameHandler =
         PARAM_HANDLERS_BY_PARAM_NAME[_.snakeCase(optionName)]

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.8",
+  "version": "0.0.14",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
   "main": "./dist/cli.js",
   "scripts": {
-    "bootstrap": "bun i && cd dev-server-api && bun i && cd ../dev-server-frontend && bun i",
+    "bootstrap": "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": "bun build:dev-server && bun cli.ts dev -y --cwd ./tests/assets/example-project",
@@ -19,7 +19,13 @@
     "tscircuit": "./dist/cli.js",
     "tsci": "./dist/cli.js"
   },
-  "keywords": [],
+  "keywords": [
+    "circuit",
+    "react",
+    "electronics",
+    "pcb",
+    "schematic"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {
@@ -32,9 +38,11 @@
     "chokidar": "^3.6.0",
     "commander": "^12.0.0",
     "configstore": "^6.0.0",
+    "dargs": "^8.1.0",
     "dax-sh": "^0.39.2",
     "delay": "^6.0.0",
     "edgespec": "^0.0.69",
+    "esbuild": "^0.20.2",
     "glob": "^10.3.10",
     "hono": "^4.1.0",
     "ignore": "^5.3.1",

package/tests/open.test.ts

@@ -0,0 +1,9 @@
+import { test, expect } from "bun:test"
+import { $ } from "bun"
+
+test("tsci open", async () => {
+  const result =
+    await $`bun cli.ts open -y --cwd ./tests/assets/example-project`.text()
+  expect(result).toContain("http")
+  expect(result).toContain("example-project")
+})