@tscircuit/cli 0.0.143 → 0.0.145

package/lib/soupify.ts

@@ -18,7 +18,7 @@ export const soupify = async (
     filePath: string
     exportName?: string
   },
-  ctx: Pick<AppContext, "runtime" | "params">
+  ctx: Pick<AppContext, "runtime" | "params">,
 ) => {
   debug(`reading ${filePath}`)
   const targetFileContent = await readFile(filePath, "utf-8")
@@ -38,13 +38,13 @@ export const soupify = async (
 
   if (!exportName) {
     throw new Error(
-      `Couldn't derive an export name and didn't find default export in "${filePath}"`
+      `Couldn't derive an export name and didn't find default export in "${filePath}"`,
     )
   }
 
   const tmpFilePath = Path.join(
     Path.dirname(filePath),
-    Path.basename(filePath).replace(/\.[^\.]+$/, "") + ".__tmp_entrypoint.tsx"
+    Path.basename(filePath).replace(/\.[^\.]+$/, "") + ".__tmp_entrypoint.tsx",
   )
 
   debug(`writing to ${tmpFilePath}`)
@@ -71,7 +71,7 @@ const elements = await createRoot().render(<Component />, projectBuilder)
 
 console.log(JSON.stringify(elements))
 
-`.trim()
+`.trim(),
   )
 
   debug(`using runtime ${ctx.runtime}`)

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

@@ -62,8 +62,8 @@ export const createContextAndRunProgram = async (process_args: any) => {
         kleur.grey(
           `[RES] ${res.status} ${res.config.method?.toUpperCase()} ${
             res.config.url
-          }`
-        )
+          }`,
+        ),
       )
       return res
     })
@@ -82,7 +82,11 @@ export const createContextAndRunProgram = async (process_args: any) => {
       // end ignores ---
 
       if (err.response?.status === 401) {
-        console.log(kleur.red("Authentication failed. Please run 'tsci login' to authenticate yourself."))
+        console.log(
+          kleur.red(
+            "Authentication failed. Please run 'tsci login' to authenticate yourself.",
+          ),
+        )
         process.exit(1)
       }
 
@@ -92,12 +96,12 @@ export const createContextAndRunProgram = async (process_args: any) => {
             err.config.url
           }\n\n${JSON.stringify(err.response?.data, null, "  ")}`
             .replace(/\\n/g, "\n")
-            .replace(/\\"/g, '"')
-        )
+            .replace(/\\"/g, '"'),
+        ),
       )
       console.log(kleur.yellow("[Request Body]:"), err.config.data)
       return Promise.reject(err)
-    }
+    },
   )
 
   const ctx: AppContext = {

package/lib/util/get-all-package-files.ts

@@ -13,22 +13,25 @@ import ignore from "ignore"
  * Returns an array of files paths.
  */
 export const getAllPackageFiles = async (
-  ctx: AppContext
+  ctx: AppContext,
 ): Promise<Array<string>> => {
-  await ensureNodeModulesIgnored();
-  
-  const gitignore = await fs
-    .readFile("./.gitignore")
-    .then((b) => b.toString().split("\n").filter(Boolean))
-    .catch((e) => null)
+  await ensureNodeModulesIgnored()
 
-  const npmignore = await fs
-    .readFile("./.promptignore")
-    .then((b) => b.toString().split("\n").filter(Boolean))
-    .catch((e) => null)
+  const [gitIgnore, promptIgnore, npmIgnore] = await Promise.all([
+    readIgnoreFile("./.gitignore"),
+    readIgnoreFile("./.promptignore"),
+    readIgnoreFile("./.npmignore"),
+  ])
+
+  const npmAndPromptIgnoreFiles = [
+    ...(promptIgnore ?? []),
+    ...(npmIgnore ?? []),
+  ]
 
   const ig = ignore().add([
-    ...(npmignore ?? gitignore ?? []),
+    ...(npmAndPromptIgnoreFiles.length > 0
+      ? npmAndPromptIgnoreFiles
+      : gitIgnore ?? []),
     ".tscircuit",
     "node_modules/*",
   ])
@@ -36,22 +39,28 @@ export const getAllPackageFiles = async (
   return Glob.globSync("**/*.{ts,tsx,md}", {}).filter((fp) => !ig.ignores(fp))
 }
 
+const readIgnoreFile = async (filePath: string): Promise<string[] | null> =>
+  await fs
+    .readFile(filePath)
+    .then((b) => b.toString().split("\n").filter(Boolean))
+    .catch((e) => null)
+
 /**
  * Ensure 'node_modules/' is in .gitignore
  */
 const ensureNodeModulesIgnored = async () => {
-  const gitignorePath = './.gitignore';
-  
+  const gitignorePath = "./.gitignore"
+
   try {
-    const gitignore = await fs.readFile(gitignorePath, 'utf8');
-    if (!gitignore.includes('node_modules/')) {
-      await fs.appendFile(gitignorePath, '\nnode_modules/\n');
+    const gitignore = await fs.readFile(gitignorePath, "utf8")
+    if (!gitignore.includes("node_modules/")) {
+      await fs.appendFile(gitignorePath, "\nnode_modules/\n")
     }
   } catch (err) {
-    if (err.code === 'ENOENT') {
-      await fs.writeFile(gitignorePath, 'node_modules/\n');
+    if (err.code === "ENOENT") {
+      await fs.writeFile(gitignorePath, "node_modules/\n")
     } else {
-      console.error('Error while updating .gitignore:', err);
+      console.error("Error while updating .gitignore:", err)
     }
   }
-}
+}

package/lib/util/lint-project.ts

@@ -1,112 +1,137 @@
-import * as ts from 'typescript';
-import * as fs from 'fs';
-import * as path from 'path';
+import * as ts from "typescript"
+import * as fs from "fs"
+import * as path from "path"
 
 interface LintResult {
-  filePath: string;
-  messages: LintMessage[];
+  filePath: string
+  messages: LintMessage[]
 }
 
 interface LintMessage {
-  line: number;
-  column: number;
-  message: string;
+  line: number
+  column: number
+  message: string
   fix?: {
-    range: [number, number];
-    text: string;
-  };
+    range: [number, number]
+    text: string
+  }
 }
 
-export function lintProject(projectPath: string, fix: boolean = false): LintResult[] {
-  const results: LintResult[] = [];
-  const files = getTypeScriptFiles(projectPath);
+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'),
+      fs.readFileSync(file, "utf8"),
       ts.ScriptTarget.Latest,
-      true
-    );
+      true,
+    )
 
-    const result = lintFile(sourceFile, fix);
+    const result = lintFile(sourceFile, fix)
     if (result.messages.length > 0) {
-      results.push({ filePath: file, messages: result.messages });
+      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);
+    if (fix && result.messages.some((m) => m.fix)) {
+      const newContent = applyFixes(sourceFile.text, result.messages)
+      fs.writeFileSync(file, newContent)
     }
   }
 
-  return results;
+  return results
 }
 
-function lintFile(sourceFile: ts.SourceFile, fix: boolean): { messages: LintMessage[] } {
-  const messages: LintMessage[] = [];
+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 (
+      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;
+          (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());
+            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
-            });
+              fix: fix
+                ? {
+                    range: [
+                      valueProp.initializer.getStart(),
+                      valueProp.initializer.getEnd(),
+                    ],
+                    text: `"${value}F"`,
+                  }
+                : undefined,
+            })
           }
         }
       }
     }
 
-    ts.forEachChild(node, visit);
+    ts.forEachChild(node, visit)
   }
 
-  visit(sourceFile);
+  visit(sourceFile)
 
-  return { messages };
+  return { messages }
 }
 
 function getTypeScriptFiles(dir: string): string[] {
-  const files: string[] = [];
-  const entries = fs.readdirSync(dir, { withFileTypes: true });
+  const files: string[] = []
+  const entries = fs.readdirSync(dir, { withFileTypes: true })
 
   for (const entry of entries) {
-    const fullPath = path.join(dir, entry.name);
+    const fullPath = path.join(dir, entry.name)
     if (entry.isDirectory()) {
-      if (entry.name !== 'node_modules' && entry.name !== 'dist') {
-        files.push(...getTypeScriptFiles(fullPath));
+      if (entry.name !== "node_modules" && entry.name !== "dist") {
+        files.push(...getTypeScriptFiles(fullPath))
       }
     } else if (entry.isFile() && /\.tsx?$/.test(entry.name)) {
-      files.push(fullPath);
+      files.push(fullPath)
     }
   }
 
-  return files;
+  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]));
+    .filter((m) => m.fix)
+    .sort((a, b) => b.fix!.range[0] - a.fix!.range[0])
 
-  let result = source;
+  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);
+    const [start, end] = message.fix!.range
+    result = result.slice(0, start) + message.fix!.text + result.slice(end)
   }
 
-  return result;
-}
+  return result
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -18,7 +18,8 @@
     "build": "bun build:dev-server && npm run build:cli",
     "dev-with-test-project": "bun cli.ts dev --cwd ./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 && cd ../example-project && bun run update-deps"
+    "update-deps": "bun add @tscircuit/builder@latest @tscircuit/react-fiber@latest && cd dev-server-frontend && bun run update-deps && cd ../example-project && bun run update-deps",
+    "format": "biome format . --write"
   },
   "bin": {
     "tsci": "./dist/cli.js"
@@ -76,6 +77,7 @@
     "@tscircuit/soup-util": "*"
   },
   "devDependencies": {
+    "@biomejs/biome": "^1.8.3",
     "@tscircuit/builder": "*",
     "@tscircuit/layout": "^0.0.25",
     "@tscircuit/manual-edit-events": "^0.0.4",

package/renovate.json

@@ -1,8 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
+  "extends": ["config:base"],
   "packageRules": [
     {
       "packagePatterns": ["*"],
@@ -14,4 +12,4 @@
       "automerge": true
     }
   ]
-}
+}

package/tests/init.test.ts

@@ -4,6 +4,6 @@ import { $ } from "bun"
 test.skip("tsci init", async () => {
   await $`rm -rf ./tests/example-init`
   console.log(
-    await $`bun cli.ts init --name init-test --dir ./tests/example-init`.text()
+    await $`bun cli.ts init --name init-test --dir ./tests/example-init`.text(),
   )
 })

package/tsconfig.json

@@ -11,9 +11,9 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "ESNext",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ESNext" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-    "jsx": "react-jsx",                                /* Specify what JSX code is generated. */
+    "jsx": "react-jsx" /* Specify what JSX code is generated. */,
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
     // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
     // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
@@ -25,23 +25,23 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "ESNext",                                /* Specify what module code is generated. */
+    "module": "ESNext" /* Specify what module code is generated. */,
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "Bundler",                     /* Specify how TypeScript looks up a file from a given module specifier. */
-    "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    "moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
+    "baseUrl": "./" /* Specify the base directory to resolve non-relative module names. */,
     "paths": {
       "@server/*": ["./dev-server-api/src/*"]
-    },                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    } /* Specify a set of entries that re-map imports to additional lookup locations. */,
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
     // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-    "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
+    "allowImportingTsExtensions": true /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */,
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    "resolveJsonModule": true,                        /* Enable importing .json files. */
+    "resolveJsonModule": true /* Enable importing .json files. */,
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
 
@@ -59,7 +59,7 @@
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
     // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
     // "removeComments": true,                           /* Disable emitting comments. */
-    "noEmit": true,                                   /* Disable emitting files from a compilation. */
+    "noEmit": true /* Disable emitting files from a compilation. */,
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
@@ -79,12 +79,12 @@
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
     /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
+    "strict": true /* Enable all strict type-checking options. */,
     // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
     // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
@@ -106,6 +106,6 @@
 
     /* Completeness */
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   }
 }

package/tsup.config.ts

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