@tscircuit/cli 0.1.980 → 0.1.982

package/dist/cli/main.js

@@ -74395,7 +74395,7 @@ var getGlobalDepsInstallCommand = (packageManager, deps) => {
 import { execSync as execSync2 } from "node:child_process";
 var import_semver2 = __toESM2(require_semver2(), 1);
 // package.json
-var version = "0.1.978";
+var version = "0.1.981";
 var package_default = {
   name: "@tscircuit/cli",
   main: "dist/cli/main.js",
@@ -174707,8 +174707,8 @@ var applyCiBuildOptions = async ({
 };
 
 // cli/build/build-file.ts
-import path45 from "node:path";
 import fs45 from "node:fs";
+import path45 from "node:path";
 
 // lib/shared/circuit-json-diagnostics.ts
 function analyzeCircuitJson(circuitJson) {
@@ -174808,15 +174808,24 @@ function getCompletePlatformConfig(userConfig) {
 var buildFile = async (input, output, projectDir, options) => {
   try {
     console.log("Generating circuit JSON...");
+    const isPrebuiltCircuitJson = input.toLowerCase().endsWith(".circuit.json");
+    let circuitJson = [];
+    if (isPrebuiltCircuitJson) {
+      const parsed = JSON.parse(fs45.readFileSync(input, "utf-8"));
+      circuitJson = Array.isArray(parsed) ? parsed : [];
+    }
     const completePlatformConfig = getCompletePlatformConfig(options?.platformConfig);
-    const result = await generateCircuitJson({
-      filePath: input,
-      platformConfig: completePlatformConfig
-    });
+    if (!isPrebuiltCircuitJson) {
+      const result = await generateCircuitJson({
+        filePath: input,
+        platformConfig: completePlatformConfig
+      });
+      circuitJson = result.circuitJson;
+    }
     fs45.mkdirSync(path45.dirname(output), { recursive: true });
-    fs45.writeFileSync(output, JSON.stringify(result.circuitJson, null, 2));
+    fs45.writeFileSync(output, JSON.stringify(circuitJson, null, 2));
     console.log(`Circuit JSON written to ${path45.relative(projectDir, output)}`);
-    const { errors, warnings } = analyzeCircuitJson(result.circuitJson);
+    const { errors, warnings } = analyzeCircuitJson(circuitJson);
     if (!options?.ignoreWarnings) {
       for (const warn of warnings) {
         const msg = warn.message || JSON.stringify(warn);
@@ -174838,7 +174847,7 @@ var buildFile = async (input, output, projectDir, options) => {
     } else {
       return {
         ok: true,
-        circuitJson: result.circuitJson
+        circuitJson
       };
     }
   } catch (err) {
@@ -175165,6 +175174,17 @@ var buildPreviewImages = async ({
   });
 };
 
+// cli/build/utils/exit-build.ts
+var exitBuild = (code, reason) => {
+  const message = `Build exiting with code ${code}: ${reason}`;
+  if (code === 0) {
+    console.log(kleur_default.dim(message));
+  } else {
+    console.error(kleur_default.yellow(message));
+  }
+  process.exit(code);
+};
+
 // cli/build/generate-kicad-project.ts
 import fs49 from "node:fs";
 import path50 from "node:path";
@@ -175248,6 +175268,7 @@ async function getBuildEntrypoints({
   const includeBoardFilePatterns = includeBoardFiles ? getBoardFilePatterns(resolvedRoot) : [];
   const buildFromProjectDir = async () => {
     const projectConfig2 = loadProjectConfig(resolvedRoot);
+    const hasConfiguredIncludeBoardFiles = Boolean(projectConfig2?.includeBoardFiles?.some((pattern) => pattern.trim()));
     const resolvedPreviewComponentPath = projectConfig2?.previewComponentPath ? path51.resolve(resolvedRoot, projectConfig2.previewComponentPath) : undefined;
     const resolvedSiteDefaultComponentPath = projectConfig2?.siteDefaultComponentPath ? path51.resolve(resolvedRoot, projectConfig2.siteDefaultComponentPath) : undefined;
     if (includeBoardFiles) {
@@ -175260,6 +175281,14 @@ async function getBuildEntrypoints({
           circuitFiles: files
         };
       }
+      if (hasConfiguredIncludeBoardFiles) {
+        return {
+          projectDir: resolvedRoot,
+          previewComponentPath: resolvedPreviewComponentPath,
+          siteDefaultComponentPath: resolvedSiteDefaultComponentPath,
+          circuitFiles: []
+        };
+      }
     }
     const mainEntrypoint = await getEntrypoint({
       projectDir: resolvedRoot,
@@ -175711,10 +175740,14 @@ class WorkerPool {
   initialized = false;
   stopped = false;
   stopReason = null;
+  stopOnFatal = false;
+  cancellationError = null;
   constructor(options) {
     this.concurrency = options.concurrency;
     this.onLog = options.onLog;
     this.workerEntrypointPath = getWorkerEntrypointPath();
+    this.stopOnFatal = options.stopOnFatal ?? false;
+    this.cancellationError = options.cancellationError ?? null;
   }
   async initWorkers() {
     if (this.initialized)
@@ -175743,6 +175776,9 @@ class WorkerPool {
         const completedMsg = message;
         const job = threadWorker.currentJob;
         if (job) {
+          if (this.stopOnFatal && completedMsg.isFatalError && this.cancellationError) {
+            this.stop(this.cancellationError);
+          }
           job.resolve({
             filePath: completedMsg.file_path,
             outputPath: completedMsg.output_path,
@@ -175849,13 +175885,15 @@ class WorkerPool {
   }
 }
 async function buildFilesWithWorkerPool(options) {
+  const cancellationError = new Error("Build cancelled due fatal error");
   const pool = new WorkerPool({
     concurrency: options.concurrency,
-    onLog: options.onLog
+    onLog: options.onLog,
+    stopOnFatal: options.stopOnFatal,
+    cancellationError
   });
   const results = [];
   const promises = [];
-  const cancellationError = new Error("Build cancelled due fatal error");
   for (const file of options.files) {
     const promise = pool.queueJob({
       filePath: file.filePath,
@@ -175867,9 +175905,6 @@ async function buildFilesWithWorkerPool(options) {
       if (options.onJobComplete) {
         await options.onJobComplete(result);
       }
-      if (options.stopOnFatal && result.isFatalError) {
-        await pool.stop(cancellationError);
-      }
       return result;
     });
     promises.push(promise);
@@ -175886,9 +175921,11 @@ async function buildFilesWithWorkerPool(options) {
 
 // cli/build/register.ts
 var normalizeRelativePath = (projectDir, targetPath) => path55.relative(projectDir, targetPath).split(path55.sep).join("/");
+var getOutputDirName = (relativePath) => relativePath.replace(/(\.board|\.circuit)?\.tsx$/, "").replace(/\.circuit\.json$/, "");
 var registerBuild = (program3) => {
   program3.command("build").description("Run tscircuit eval and output circuit json").argument("[file]", "Path to the entry file").option("--ci", "Run install and optional prebuild/build commands (or default CI build)").option("--ignore-errors", "Do not exit with code 1 on errors").option("--ignore-warnings", "Do not log warnings").option("--ignore-config", "Ignore options from tscircuit.config.json").option("--disable-pcb", "Disable PCB outputs").option("--disable-parts-engine", "Disable the parts engine").option("--site", "Generate a static site in the dist directory").option("--transpile", "Transpile the entry file to JavaScript").option("--preview-images", "Generate preview images in the dist directory").option("--all-images", "Generate preview images for every successful build output").option("--kicad-project", "Generate KiCad project directories for each successful build output").option("--kicad-library", "Generate KiCad library in dist/kicad-library").option("--kicad-library-name <name>", "Specify the name of the KiCad library").option("--preview-gltf", "Generate a GLTF file from the preview entrypoint").option("--glbs", "Generate GLB 3D model files for every successful build").option("--profile", "Log per-circuit circuit.json generation time during build").option("--kicad-pcm", "Generate KiCad PCM (Plugin and Content Manager) assets in dist/pcm").option("--use-cdn-javascript", "Use CDN-hosted JavaScript instead of bundled standalone file for --site").option("--concurrency <number>", "Number of files to build in parallel (default: 1)", "1").action(async (file, options) => {
     try {
+      const transpileExplicitlyRequested = options?.transpile === true;
       const resolvedRoot = path55.resolve(process.cwd());
       let projectDir;
       if (file) {
@@ -175968,7 +176005,7 @@ var registerBuild = (program3) => {
       };
       const processBuildResult = async (filePath, outputPath, buildOutcome) => {
         const relative10 = path55.relative(projectDir, filePath);
-        const outputDirName = relative10.replace(/(\.board|\.circuit)?\.tsx$/, "");
+        const outputDirName = getOutputDirName(relative10);
         builtFiles.push({
           sourcePath: filePath,
           outputPath,
@@ -176014,7 +176051,7 @@ var registerBuild = (program3) => {
         for (const filePath of circuitFiles) {
           const relative10 = path55.relative(projectDir, filePath);
           console.log(`Building ${relative10}...`);
-          const outputDirName = relative10.replace(/(\.board|\.circuit)?\.tsx$/, "");
+          const outputDirName = getOutputDirName(relative10);
           const outputPath = path55.join(distDir, outputDirName, "circuit.json");
           const startedAt = resolvedOptions?.profile ? performance.now() : 0;
           const buildOutcome = await buildFile(filePath, outputPath, projectDir, buildOptions);
@@ -176032,7 +176069,7 @@ var registerBuild = (program3) => {
       const buildWithWorkers = async () => {
         const filesToBuild = circuitFiles.map((filePath) => {
           const relative10 = path55.relative(projectDir, filePath);
-          const outputDirName = relative10.replace(/(\.board|\.circuit)?\.tsx$/, "");
+          const outputDirName = getOutputDirName(relative10);
           const outputPath = path55.join(distDir, outputDirName, "circuit.json");
           return { filePath, outputPath };
         });
@@ -176068,9 +176105,6 @@ var registerBuild = (program3) => {
               ok: result.ok,
               isFatalError: result.isFatalError
             });
-            if (result.isFatalError) {
-              process.exit(1);
-            }
           }
         });
       };
@@ -176079,9 +176113,6 @@ var registerBuild = (program3) => {
       } else {
         await buildSequentially();
       }
-      if (hasFatalErrors || hasErrors && !resolvedOptions?.ignoreErrors) {
-        process.exit(1);
-      }
       const shouldGeneratePreviewImages = resolvedOptions?.previewImages || resolvedOptions?.allImages;
       if (shouldGeneratePreviewImages) {
         console.log(resolvedOptions?.allImages ? "Generating preview images for all builds..." : "Generating preview images...");
@@ -176110,25 +176141,34 @@ var registerBuild = (program3) => {
         });
       }
       if (resolvedOptions?.transpile) {
+        const includeBoardPatterns = projectConfig2?.includeBoardFiles?.filter((pattern) => pattern.trim()) ?? [];
+        const hasConfiguredIncludeBoardFiles = includeBoardPatterns.length > 0;
         validateMainInDist(projectDir, distDir);
         console.log("Transpiling entry file...");
         const { mainEntrypoint: transpileEntrypoint } = await getBuildEntrypoints({
           fileOrDir: file,
           includeBoardFiles: false
         });
-        const entryFile = transpileEntrypoint;
+        const resolvedFileArgPath = file ? path55.resolve(projectDir, file) : undefined;
+        const fileArgIsDirectFile = Boolean(resolvedFileArgPath && fs54.existsSync(resolvedFileArgPath) && fs54.statSync(resolvedFileArgPath).isFile());
+        const entryFile = fileArgIsDirectFile ? resolvedFileArgPath : transpileEntrypoint;
         if (!entryFile) {
-          console.error("No entry file found for transpilation. Make sure you have a lib/index.ts or set mainEntrypoint in tscircuit.config.json");
-          process.exit(1);
-        }
-        const transpileSuccess = await transpileFile({
-          input: entryFile,
-          outputDir: distDir,
-          projectDir
-        });
-        if (!transpileSuccess) {
-          console.error("Transpilation failed");
-          process.exit(1);
+          if (hasConfiguredIncludeBoardFiles && !transpileExplicitlyRequested) {
+            console.log("Skipping transpilation because includeBoardFiles is configured and no library entrypoint was found.");
+          } else {
+            console.error("No entry file found for transpilation. Make sure you have a lib/index.ts or set mainEntrypoint in tscircuit.config.json");
+            exitBuild(1, "transpile entry file not found");
+          }
+        } else {
+          const transpileSuccess = await transpileFile({
+            input: entryFile,
+            outputDir: distDir,
+            projectDir
+          });
+          if (!transpileSuccess) {
+            console.error("Transpilation failed");
+            exitBuild(1, "transpile command failed");
+          }
         }
       }
       if (resolvedOptions?.site) {
@@ -176162,7 +176202,7 @@ var registerBuild = (program3) => {
         if (!entryFile) {
           console.error("No entry file found for KiCad library generation. Make sure you have a lib/index.ts or set mainEntrypoint/kicadLibraryEntrypointPath in tscircuit.config.json");
           if (!resolvedOptions?.ignoreErrors) {
-            process.exit(1);
+            exitBuild(1, "kicad-library entry file not found");
           }
         } else {
           const libraryName = resolvedOptions?.kicadLibraryName || resolveKicadLibraryName({ projectDir });
@@ -176177,7 +176217,7 @@ var registerBuild = (program3) => {
           } catch (err) {
             console.error(`Error generating KiCad library: ${err instanceof Error ? err.message : err}`);
             if (!resolvedOptions?.ignoreErrors) {
-              process.exit(1);
+              exitBuild(1, "kicad-library generation failed");
             }
           }
         }
@@ -176196,7 +176236,7 @@ var registerBuild = (program3) => {
         if (!entryFile) {
           console.error("No entry file found for KiCad PCM generation. Make sure you have a lib/index.ts or set mainEntrypoint/kicadLibraryEntrypointPath in tscircuit.config.json");
           if (!resolvedOptions?.ignoreErrors) {
-            process.exit(1);
+            exitBuild(1, "kicad-pcm entry file not found");
           }
         } else {
           try {
@@ -176209,11 +176249,12 @@ var registerBuild = (program3) => {
           } catch (err) {
             console.error(`Error generating KiCad PCM assets: ${err instanceof Error ? err.message : err}`);
             if (!resolvedOptions?.ignoreErrors) {
-              process.exit(1);
+              exitBuild(1, "kicad-pcm generation failed");
             }
           }
         }
       }
+      const shouldExitNonZero = hasFatalErrors || hasErrors && !resolvedOptions?.ignoreErrors;
       const successCount = builtFiles.filter((f2) => f2.ok).length;
       const failCount = builtFiles.length - successCount;
       const enabledOpts = [
@@ -176233,7 +176274,7 @@ var registerBuild = (program3) => {
         console.log(kleur_default.bold("Profile Summary (slowest first)"));
         const sortedProfileEntries = [...profileEntries].sort((a3, b3) => b3.durationMs - a3.durationMs);
         for (const profileEntry of sortedProfileEntries) {
-          console.log(`  ${kleur_default.cyan(profileEntry.durationMs.toFixed(1) + "ms")} ${profileEntry.filePath}`);
+          console.log(`  ${kleur_default.cyan(`${profileEntry.durationMs.toFixed(1)}ms`)} ${profileEntry.filePath}`);
         }
       }
       console.log("");
@@ -176249,11 +176290,14 @@ var registerBuild = (program3) => {
       console.log(hasErrors ? kleur_default.yellow(`
 ⚠ Build completed with errors`) : kleur_default.green(`
 ✓ Done`));
-      process.exit(0);
+      if (shouldExitNonZero) {
+        exitBuild(1, hasFatalErrors ? "fatal circuit build errors occurred" : "build errors occurred and --ignore-errors was not enabled");
+      }
+      exitBuild(0, "build finished successfully");
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       console.error(message);
-      process.exit(1);
+      exitBuild(1, "unexpected exception");
     }
   });
 };

package/dist/lib/index.js

@@ -60414,7 +60414,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.978";
+var version = "0.1.981";
 var package_default = {
   name: "@tscircuit/cli",
   main: "dist/cli/main.js",

package/package.json

@@ -5,7 +5,7 @@
     ".": "./dist/cli/main.js",
     "./lib": "./dist/lib/index.js"
   },
-  "version": "0.1.980",
+  "version": "0.1.982",
   "devDependencies": {
     "@babel/standalone": "^7.26.9",
     "@biomejs/biome": "^1.9.4",