@tscircuit/cli 0.1.356 → 0.1.358

package/dist/main.js

@@ -71530,7 +71530,8 @@ import { z } from "zod";
 var projectConfigSchema = z.object({
   mainEntrypoint: z.string().optional(),
   ignoredFiles: z.array(z.string()).optional(),
-  includeBoardFiles: z.array(z.string()).optional()
+  includeBoardFiles: z.array(z.string()).optional(),
+  snapshotsDir: z.string().optional()
 });
 
 // lib/project-config/index.ts
@@ -71561,6 +71562,10 @@ var getBoardFilePatterns = (projectDir = process.cwd()) => {
   }
   return DEFAULT_BOARD_FILE_PATTERNS;
 };
+var getSnapshotsDir = (projectDir = process.cwd()) => {
+  const config = loadProjectConfig(projectDir);
+  return config?.snapshotsDir;
+};
 var saveProjectConfig = (config, projectDir = process.cwd()) => {
   const configPath = path9.join(projectDir, CONFIG_FILENAME);
   try {
@@ -72193,7 +72198,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.355";
+var version = "0.1.357";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -72205,7 +72210,7 @@ var package_default = {
     "@tscircuit/fake-snippets": "^0.0.110",
     "@tscircuit/file-server": "^0.0.32",
     "@tscircuit/math-utils": "0.0.21",
-    "@tscircuit/props": "^0.0.356",
+    "@tscircuit/props": "^0.0.371",
     "@tscircuit/runframe": "^0.0.1123",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@types/bun": "^1.2.2",
@@ -195611,21 +195616,26 @@ var buildFile = async (input, output, projectDir, options) => {
 // cli/build/get-build-entrypoints.ts
 import fs29 from "node:fs";
 import path28 from "node:path";
+var isSubPath2 = (maybeChild, maybeParent) => {
+  const relative9 = path28.relative(maybeParent, maybeChild);
+  return relative9 === "" || !relative9.startsWith("..") && !path28.isAbsolute(relative9);
+};
 async function getBuildEntrypoints({
   fileOrDir,
   rootDir = process.cwd()
 }) {
   const resolvedRoot = path28.resolve(rootDir);
-  const buildFromProjectDir = async (projectDir2) => {
-    const files = findBoardFiles({ projectDir: projectDir2 });
+  const includeBoardFiles = getBoardFilePatterns(resolvedRoot);
+  const buildFromProjectDir = async () => {
+    const files = findBoardFiles({ projectDir: resolvedRoot });
     if (files.length > 0) {
       return {
-        projectDir: projectDir2,
+        projectDir: resolvedRoot,
         circuitFiles: files
       };
     }
     const mainEntrypoint = await getEntrypoint({
-      projectDir: projectDir2,
+      projectDir: resolvedRoot,
       onSuccess: () => {
         return;
       },
@@ -195635,26 +195645,34 @@ async function getBuildEntrypoints({
     });
     if (mainEntrypoint) {
       return {
-        projectDir: projectDir2,
+        projectDir: resolvedRoot,
         mainEntrypoint,
         circuitFiles: [mainEntrypoint]
       };
     }
     return {
-      projectDir: projectDir2,
+      projectDir: resolvedRoot,
       circuitFiles: []
     };
   };
   if (fileOrDir) {
     const resolved = path28.resolve(resolvedRoot, fileOrDir);
     if (fs29.existsSync(resolved) && fs29.statSync(resolved).isDirectory()) {
-      const projectDir2 = resolved;
-      return buildFromProjectDir(projectDir2);
+      const circuitFiles = findBoardFiles({
+        projectDir: resolvedRoot,
+        filePaths: [resolved]
+      }).filter((file) => isSubPath2(file, resolved));
+      if (circuitFiles.length === 0) {
+        throw new Error(`There were no files to build found matching the includeBoardFiles globs: ${JSON.stringify(includeBoardFiles)}`);
+      }
+      return {
+        projectDir: resolvedRoot,
+        circuitFiles
+      };
     }
     return { projectDir: path28.dirname(resolved), circuitFiles: [resolved] };
   }
-  const projectDir = resolvedRoot;
-  return buildFromProjectDir(projectDir);
+  return buildFromProjectDir();
 }
 
 // lib/site/getStaticIndexHtmlFile.ts
@@ -195807,77 +195825,83 @@ var buildPreviewImages = async ({
 // cli/build/register.ts
 var registerBuild = (program3) => {
   program3.command("build").description("Run tscircuit eval and output circuit json").argument("[file]", "Path to the entry file").option("--ignore-errors", "Do not exit with code 1 on errors").option("--ignore-warnings", "Do not log warnings").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("--preview-images", "Generate preview images in the dist directory").option("--all-images", "Generate preview images for every successful build output").action(async (file, options) => {
-    const { projectDir, circuitFiles, mainEntrypoint } = await getBuildEntrypoints({
-      fileOrDir: file
-    });
-    const platformConfig2 = (() => {
-      if (!options?.disablePcb && !options?.disablePartsEngine)
-        return;
-      const config = {};
-      if (options?.disablePcb) {
-        config.pcbDisabled = true;
+    try {
+      const { projectDir, circuitFiles, mainEntrypoint } = await getBuildEntrypoints({
+        fileOrDir: file
+      });
+      const platformConfig2 = (() => {
+        if (!options?.disablePcb && !options?.disablePartsEngine)
+          return;
+        const config = {};
+        if (options?.disablePcb) {
+          config.pcbDisabled = true;
+        }
+        if (options?.disablePartsEngine) {
+          config.partsEngineDisabled = true;
+        }
+        return config;
+      })();
+      const distDir = path30.join(projectDir, "dist");
+      fs31.mkdirSync(distDir, { recursive: true });
+      console.log(`Building ${circuitFiles.length} file(s)...`);
+      let hasErrors = false;
+      const staticFileReferences = [];
+      const builtFiles = [];
+      for (const filePath of circuitFiles) {
+        const relative9 = path30.relative(projectDir, filePath);
+        console.log(`Building ${relative9}...`);
+        const outputDirName = relative9.replace(/(\.board|\.circuit)?\.tsx$/, "");
+        const outputPath = path30.join(distDir, outputDirName, "circuit.json");
+        const ok = await buildFile(filePath, outputPath, projectDir, {
+          ignoreErrors: options?.ignoreErrors,
+          ignoreWarnings: options?.ignoreWarnings,
+          platformConfig: platformConfig2
+        });
+        builtFiles.push({
+          sourcePath: filePath,
+          outputPath,
+          ok
+        });
+        if (!ok) {
+          hasErrors = true;
+        } else if (options?.site) {
+          const normalizedSourcePath = relative9.split(path30.sep).join("/");
+          const relativeOutputPath = path30.join(outputDirName, "circuit.json");
+          const normalizedOutputPath = relativeOutputPath.split(path30.sep).join("/");
+          staticFileReferences.push({
+            filePath: normalizedSourcePath,
+            fileStaticAssetUrl: `./${normalizedOutputPath}`
+          });
+        }
       }
-      if (options?.disablePartsEngine) {
-        config.partsEngineDisabled = true;
+      if (hasErrors && !options?.ignoreErrors) {
+        process.exit(1);
       }
-      return config;
-    })();
-    const distDir = path30.join(projectDir, "dist");
-    fs31.mkdirSync(distDir, { recursive: true });
-    console.log(`Building ${circuitFiles.length} file(s)...`);
-    let hasErrors = false;
-    const staticFileReferences = [];
-    const builtFiles = [];
-    for (const filePath of circuitFiles) {
-      const relative9 = path30.relative(projectDir, filePath);
-      console.log(`Building ${relative9}...`);
-      const outputDirName = relative9.replace(/(\.board|\.circuit)?\.tsx$/, "");
-      const outputPath = path30.join(distDir, outputDirName, "circuit.json");
-      const ok = await buildFile(filePath, outputPath, projectDir, {
-        ignoreErrors: options?.ignoreErrors,
-        ignoreWarnings: options?.ignoreWarnings,
-        platformConfig: platformConfig2
-      });
-      builtFiles.push({
-        sourcePath: filePath,
-        outputPath,
-        ok
-      });
-      if (!ok) {
-        hasErrors = true;
-      } else if (options?.site) {
-        const normalizedSourcePath = relative9.split(path30.sep).join("/");
-        const relativeOutputPath = path30.join(outputDirName, "circuit.json");
-        const normalizedOutputPath = relativeOutputPath.split(path30.sep).join("/");
-        staticFileReferences.push({
-          filePath: normalizedSourcePath,
-          fileStaticAssetUrl: `./${normalizedOutputPath}`
+      const shouldGeneratePreviewImages = options?.previewImages || options?.allImages;
+      if (shouldGeneratePreviewImages) {
+        console.log(options?.allImages ? "Generating preview images for all builds..." : "Generating preview images...");
+        await buildPreviewImages({
+          builtFiles,
+          distDir,
+          mainEntrypoint,
+          allImages: options?.allImages
         });
       }
-    }
-    if (hasErrors && !options?.ignoreErrors) {
+      if (options?.site) {
+        const indexHtml = getStaticIndexHtmlFile({
+          files: staticFileReferences,
+          standaloneScriptSrc: "./standalone.min.js"
+        });
+        fs31.writeFileSync(path30.join(distDir, "index.html"), indexHtml);
+        fs31.writeFileSync(path30.join(distDir, "standalone.min.js"), standalone_min_default);
+      }
+      console.log("Build complete!");
+      process.exit(0);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(message);
       process.exit(1);
     }
-    const shouldGeneratePreviewImages = options?.previewImages || options?.allImages;
-    if (shouldGeneratePreviewImages) {
-      console.log(options?.allImages ? "Generating preview images for all builds..." : "Generating preview images...");
-      await buildPreviewImages({
-        builtFiles,
-        distDir,
-        mainEntrypoint,
-        allImages: options?.allImages
-      });
-    }
-    if (options?.site) {
-      const indexHtml = getStaticIndexHtmlFile({
-        files: staticFileReferences,
-        standaloneScriptSrc: "./standalone.min.js"
-      });
-      fs31.writeFileSync(path30.join(distDir, "index.html"), indexHtml);
-      fs31.writeFileSync(path30.join(distDir, "standalone.min.js"), standalone_min_default);
-    }
-    console.log("Build complete!");
-    process.exit(0);
   });
 };
 
@@ -195945,6 +195969,7 @@ var snapshotProject = async ({
     console.log("No entrypoint found. Run 'tsci init' to bootstrap a project or specify a file with 'tsci snapshot <file>'");
     return onExit(0);
   }
+  const snapshotsDirName = getSnapshotsDir(projectDir);
   const mismatches = [];
   let didUpdate = false;
   for (const file of boardFiles) {
@@ -196002,7 +196027,9 @@ var snapshotProject = async ({
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         if (errorMessage.includes("No pcb_board found in circuit JSON")) {
-          const snapDir2 = path31.join(path31.dirname(file), "__snapshots__");
+          const fileDir = path31.dirname(file);
+          const relativeDir = path31.relative(projectDir, fileDir);
+          const snapDir2 = snapshotsDirName ? path31.join(projectDir, snapshotsDirName, relativeDir) : path31.join(fileDir, "__snapshots__");
           const base2 = path31.basename(file).replace(/\.tsx$/, "");
           const snap3dPath = path31.join(snapDir2, `${base2}-3d.snap.png`);
           const existing3dSnapshot = fs33.existsSync(snap3dPath);
@@ -196026,7 +196053,7 @@ var snapshotProject = async ({
         }
       }
     }
-    const snapDir = path31.join(path31.dirname(file), "__snapshots__");
+    const snapDir = snapshotsDirName ? path31.join(projectDir, snapshotsDirName, path31.relative(projectDir, path31.dirname(file))) : path31.join(path31.dirname(file), "__snapshots__");
     fs33.mkdirSync(snapDir, { recursive: true });
     const base = path31.basename(file).replace(/\.tsx$/, "");
     const snapshots = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.356",
+  "version": "0.1.358",
   "main": "dist/main.js",
   "devDependencies": {
     "@babel/standalone": "^7.26.9",
@@ -9,7 +9,7 @@
     "@tscircuit/fake-snippets": "^0.0.110",
     "@tscircuit/file-server": "^0.0.32",
     "@tscircuit/math-utils": "0.0.21",
-    "@tscircuit/props": "^0.0.356",
+    "@tscircuit/props": "^0.0.371",
     "@tscircuit/runframe": "^0.0.1123",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@types/bun": "^1.2.2",