@tscircuit/cli 0.0.125 → 0.0.127

package/example-project/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.2.26",
       "dependencies": {
         "@tscircuit/builder": "^1.5.134",
-        "@tscircuit/layout": "^0.0.24",
+        "@tscircuit/layout": "^0.0.25",
         "@tscircuit/react-fiber": "^1.1.29"
       }
     },
@@ -30,14 +30,14 @@
       "integrity": "sha512-iB+oaYyaVK1hQ0cODubnoSDg4gGYL9cp/4ad7G1b9Z0/IqehPztp5qE3KP2mV9Ns0UYmzwvtkEhTCmKUuhorbg=="
     },
     "node_modules/@tscircuit/builder": {
-      "version": "1.5.136",
-      "resolved": "https://registry.npmjs.org/@tscircuit/builder/-/builder-1.5.136.tgz",
-      "integrity": "sha512-+8lIDhr/shUdyUra9KT3XwY/kBoUDc8h19DjWzAi+Pfo8L+QRZ2aNfz0HOvuF6gLA2Yh1z3liFi8ITV5UUsG6Q==",
+      "version": "1.5.138",
+      "resolved": "https://registry.npmjs.org/@tscircuit/builder/-/builder-1.5.138.tgz",
+      "integrity": "sha512-zfn08ASPQzKf9YtSytEgNzOGKu9OeVKurCyOyHxBbQMRZkqTSSQElfb1rGWz+uZI9gkhqyZq30989sS9qtOgvQ==",
       "license": "MIT",
       "dependencies": {
         "@lume/kiwi": "^0.1.0",
         "@tscircuit/footprinter": "^0.0.43",
-        "@tscircuit/layout": "0.0.24",
+        "@tscircuit/layout": "^0.0.25",
         "@tscircuit/routing": "1.3.1",
         "@tscircuit/schematic-autolayout": "^0.0.5",
         "convert-units": "^2.3.4",
@@ -64,15 +64,14 @@
       }
     },
     "node_modules/@tscircuit/layout": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/@tscircuit/layout/-/layout-0.0.24.tgz",
-      "integrity": "sha512-RrmKgkKoPDyNpBnJAEWEletoR/ys4PyM/MQ567e9WwHZTa8mkHulN/J5PSC5YRIzLNt+AWifJBuyxarrmPAdtQ==",
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/@tscircuit/layout/-/layout-0.0.25.tgz",
+      "integrity": "sha512-Mk7LveFUkvV7X5+DjX3aAKClkvPOcIEiPz6knIxay3VZCMJw7sSX1QJVa6VJiUiaV51uFohqvwymLhYOaW/kAg==",
       "license": "ISC",
       "dependencies": {
         "transformation-matrix": "^2.16.1"
       },
       "peerDependencies": {
-        "@tscircuit/builder": "*",
         "@tscircuit/manual-edit-events": "*",
         "@tscircuit/schematic-autolayout": "*",
         "@tscircuit/soup": "*",

package/example-project/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@tscircuit/builder": "^1.5.134",
-    "@tscircuit/layout": "^0.0.24",
+    "@tscircuit/layout": "^0.0.25",
     "@tscircuit/react-fiber": "^1.1.29"
   }
 }

package/lib/cmd-fns/dev/find-available-port.ts

@@ -0,0 +1,30 @@
+import net from 'net'
+
+const MAX_PORT = 65535 // Maximum valid port number
+
+export const findAvailablePort = async (startPort: number): Promise<number> => {
+  let port = startPort
+
+  while (port <= MAX_PORT) {
+    if (!(await isPortInUse(port))) {
+      return port
+    }
+    port++
+  }
+
+  throw new Error(`Unable to find an available port in range ${startPort}-${MAX_PORT}`)
+}
+
+const isPortInUse = (port: number): Promise<boolean> => {
+  return new Promise((resolve) => {
+    const server = net.createServer()
+    server.once('error', () => {
+      resolve(true)
+    })
+    server.once('listening', () => {
+      server.close()
+      resolve(false)
+    })
+    server.listen(port)
+  })
+}

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

@@ -16,6 +16,9 @@ import { startEditEventWatcher } from "./start-edit-event-watcher"
 import { startExportRequestWatcher } from "./start-export-request-watcher"
 import { startFsWatcher } from "./start-fs-watcher"
 import { uploadExamplesFromDirectory } from "./upload-examples-from-directory"
+import posthog from "lib/posthog"
+import crypto from 'crypto'
+import { findAvailablePort } from "./find-available-port"
 
 export const devCmd = async (ctx: AppContext, args: any) => {
   const params = z
@@ -24,9 +27,22 @@ export const devCmd = async (ctx: AppContext, args: any) => {
     })
     .parse(args)
 
-  const { port } = params
+  let { port } = params
   const { cwd } = ctx
 
+  // Find an available port
+  port = await findAvailablePort(port)
+
+  const projectHash = crypto.createHash('md5').update(cwd).digest('hex')
+
+  posthog.capture({
+    distinctId: projectHash,
+    event: 'tsci_dev_started',
+    properties: {
+      port: port,
+    }
+  })
+
   // 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
   const isInitialized = await checkIfInitialized(ctx)
@@ -120,14 +136,32 @@ export const devCmd = async (ctx: AppContext, args: any) => {
     })
     if (action === "open-in-browser") {
       open(serverUrl)
+      posthog.capture({
+        distinctId: projectHash,
+        event: 'tsci_dev_open_browser'
+      })
     } else if (action === "open-in-vs-code") {
       await $`code ${cwd}`
+      posthog.capture({
+        distinctId: projectHash,
+        event: 'tsci_dev_open_vscode'
+      })
     } else if (!action || action === "stop") {
       if (server.stop) server.stop()
       if (server.close) server.close()
       fs_watcher.stop()
       er_watcher.stop()
       ee_watcher.stop()
+      
+      posthog.capture({
+        distinctId: projectHash,
+        event: 'tsci_dev_stopped'
+      })
+      
+      if (posthog.shutdown) {
+        await posthog.shutdown()
+      }
+      
       break
     }
   }

package/lib/cmd-fns/index.ts

@@ -38,3 +38,4 @@ export { openCmd as open } from "./open"
 export { versionCmd as version } from "./version"
 export { exportGerbersCmd as exportGerbers } from "./export-gerbers"
 export { devServerFulfillExportRequests } from "./dev-server-fulfill-export-requests"
+export { lintCmd as lint } from "./lint"

package/lib/cmd-fns/lint.ts

@@ -0,0 +1,37 @@
+import { AppContext } from "lib/util/app-context"
+import { z } from "zod"
+import kleur from "kleur"
+import { lintProject } from "../util/lint-project"
+
+export const lintCmd = async (ctx: AppContext, args: any) => {
+  const params = z
+    .object({
+      fix: z.boolean().optional().default(false),
+    })
+    .parse(args)
+
+  const { cwd } = ctx
+  const { fix } = params
+
+  console.log(kleur.blue("Running tscircuit linter..."))
+
+  const results = lintProject(cwd, fix);
+
+  let errorCount = 0;
+  for (const result of results) {
+    if (result.messages.length > 0) {
+      console.log(kleur.yellow(`\nFile: ${result.filePath}`));
+      for (const message of result.messages) {
+        console.log(`  Line ${message.line}, Column ${message.column}: ${message.message}`);
+        errorCount++;
+      }
+    }
+  }
+
+  if (errorCount > 0) {
+    console.log(kleur.yellow(`\nFound ${errorCount} issue${errorCount === 1 ? '' : 's'} in your tscircuit code.`));
+    process.exit(1);
+  } else {
+    console.log(kleur.green("\nNo tscircuit-specific issues found!"));
+  }
+}

package/lib/get-program.ts

@@ -45,6 +45,12 @@ export const getProgram = (ctx: AppContext) => {
     .argument("<packages...>", "Packages to remove")
     .action((packages, flags) => CMDFN.remove(ctx, { packages, flags }))
 
+  cmd
+    .command("lint")
+    .description("Lint all TypeScript files in the project")
+    .option("--fix", "Automatically fix problems")
+    .action((args) => CMDFN.lint(ctx, args))
+
   const authCmd = cmd.command("auth").description("Login/logout")
   authCmd
     .command("login")

package/lib/posthog.ts

@@ -0,0 +1,24 @@
+import { PostHog } from 'posthog-node'
+
+const POSTHOG_API_KEY: string | undefined = process.env.POSTHOG_API_KEY
+
+let posthogInstance: PostHog | null = null
+
+if (POSTHOG_API_KEY) {
+  posthogInstance = new PostHog(
+    POSTHOG_API_KEY,
+    { host: 'https://us.i.posthog.com' }
+  )
+}
+
+const posthogProxy = new Proxy<PostHog>({} as PostHog, {
+  get(target, prop) {
+    if (posthogInstance) {
+      return Reflect.get(posthogInstance, prop)
+    }
+    // Return a no-op function for any method call if PostHog is not initialized
+    return () => {}
+  }
+})
+
+export default posthogProxy

package/lib/util/lint-project.ts

@@ -0,0 +1,112 @@
+import * as ts from 'typescript';
+import * as fs from 'fs';
+import * as path from 'path';
+
+interface LintResult {
+  filePath: string;
+  messages: LintMessage[];
+}
+
+interface LintMessage {
+  line: number;
+  column: number;
+  message: string;
+  fix?: {
+    range: [number, number];
+    text: string;
+  };
+}
+
+export function lintProject(projectPath: string, fix: boolean = false): LintResult[] {
+  const results: LintResult[] = [];
+  const files = getTypeScriptFiles(projectPath);
+
+  for (const file of files) {
+    const sourceFile = ts.createSourceFile(
+      file,
+      fs.readFileSync(file, 'utf8'),
+      ts.ScriptTarget.Latest,
+      true
+    );
+
+    const result = lintFile(sourceFile, fix);
+    if (result.messages.length > 0) {
+      results.push({ filePath: file, messages: result.messages });
+    }
+
+    if (fix && result.messages.some(m => m.fix)) {
+      const newContent = applyFixes(sourceFile.text, result.messages);
+      fs.writeFileSync(file, newContent);
+    }
+  }
+
+  return results;
+}
+
+function lintFile(sourceFile: ts.SourceFile, fix: boolean): { messages: LintMessage[] } {
+  const messages: LintMessage[] = [];
+
+  function visit(node: ts.Node) {
+    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === 'capacitor') {
+      const valueArg = node.arguments.find(arg => ts.isObjectLiteralExpression(arg));
+      if (valueArg && ts.isObjectLiteralExpression(valueArg)) {
+        const valueProp = valueArg.properties.find(
+          prop => ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.name) && prop.name.text === 'value'
+        );
+        if (valueProp && ts.isPropertyAssignment(valueProp) && ts.isStringLiteral(valueProp.initializer)) {
+          const value = valueProp.initializer.text;
+          if (!value.match(/[µuμ]F$/)) {
+            const { line, character } = sourceFile.getLineAndCharacterOfPosition(valueProp.getStart());
+            messages.push({
+              line: line + 1,
+              column: character + 1,
+              message: 'Capacitor value should include units (e.g., "100F")',
+              fix: fix ? {
+                range: [valueProp.initializer.getStart(), valueProp.initializer.getEnd()],
+                text: `"${value}F"`
+              } : undefined
+            });
+          }
+        }
+      }
+    }
+
+    ts.forEachChild(node, visit);
+  }
+
+  visit(sourceFile);
+
+  return { messages };
+}
+
+function getTypeScriptFiles(dir: string): string[] {
+  const files: string[] = [];
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name !== 'node_modules' && entry.name !== 'dist') {
+        files.push(...getTypeScriptFiles(fullPath));
+      }
+    } else if (entry.isFile() && /\.tsx?$/.test(entry.name)) {
+      files.push(fullPath);
+    }
+  }
+
+  return files;
+}
+
+function applyFixes(source: string, messages: LintMessage[]): string {
+  const fixes = messages
+    .filter(m => m.fix)
+    .sort((a, b) => (b.fix!.range[0] - a.fix!.range[0]));
+
+  let result = source;
+  for (const message of fixes) {
+    const [start, end] = message.fix!.range;
+    result = result.slice(0, start) + message.fix!.text + result.slice(end);
+  }
+
+  return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.125",
+  "version": "0.0.127",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -47,7 +47,7 @@
     "edgespec": "^0.0.69",
     "esbuild": "^0.20.2",
     "fast-glob": "^3.3.2",
-    "glob": "^10.3.10",
+    "glob": "^10.4.5",
     "hono": "^4.1.0",
     "ignore": "^5.3.1",
     "json5": "^2.2.3",
@@ -59,6 +59,7 @@
     "node-persist": "^4.0.1",
     "open": "^10.1.0",
     "perfect-cli": "^1.0.20",
+    "posthog-node": "^4.0.1",
     "prompts": "^2.4.2",
     "react": "^18.2.0",
     "semver": "^7.6.0",
@@ -70,16 +71,16 @@
   "peerDependencies": {
     "@tscircuit/builder": "*",
     "@tscircuit/layout": "*",
+    "@tscircuit/manual-edit-events": "*",
     "@tscircuit/react-fiber": "*",
-    "@tscircuit/soup-util": "*",
-    "@tscircuit/manual-edit-events": "*"
+    "@tscircuit/soup-util": "*"
   },
   "devDependencies": {
     "@tscircuit/builder": "*",
-    "@tscircuit/layout": "^0.0.24",
+    "@tscircuit/layout": "^0.0.25",
+    "@tscircuit/manual-edit-events": "^0.0.4",
     "@tscircuit/react-fiber": "*",
     "@tscircuit/soup-util": "^0.0.11",
-    "@tscircuit/manual-edit-events": "^0.0.4",
     "@types/archiver": "^6.0.2",
     "@types/bun": "^1.0.8",
     "@types/chokidar": "^2.1.3",

package/tsup.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+  env: {
+    POSTHOG_API_KEY: JSON.stringify(process.env.POSTHOG_API_KEY || ''),
+  },
+})