@tscircuit/cli 0.1.1425 → 0.1.1426

package/dist/cli/main.js

@@ -100688,7 +100688,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1424";
+var version = "0.1.1425";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -110190,6 +110190,40 @@ var getEntrypoint = async ({
   }
 };
 
+// lib/shared/platform-config-utils.ts
+var mergePlatformConfigs = (...configs) => {
+  const definedConfigs = configs.filter(Boolean);
+  if (definedConfigs.length === 0) {
+    return;
+  }
+  return definedConfigs.reduce((mergedConfig, config) => {
+    return {
+      ...mergedConfig,
+      ...config,
+      footprintLibraryMap: {
+        ...mergedConfig.footprintLibraryMap,
+        ...config.footprintLibraryMap
+      },
+      footprintFileParserMap: {
+        ...mergedConfig.footprintFileParserMap,
+        ...config.footprintFileParserMap
+      },
+      staticFileLoaderMap: {
+        ...mergedConfig.staticFileLoaderMap,
+        ...config.staticFileLoaderMap
+      },
+      autorouterMap: {
+        ...mergedConfig.autorouterMap,
+        ...config.autorouterMap
+      },
+      spiceEngineMap: {
+        ...mergedConfig.spiceEngineMap,
+        ...config.spiceEngineMap
+      }
+    };
+  }, {});
+};
+
 // lib/site/loadingStateUi.ts
 var loadingStateUi = `
   <div id="loader" class="loading-overlay">
@@ -110509,7 +110543,7 @@ var applyCiBuildOptions = async ({
   if (!options?.ci) {
     return { resolvedOptions: options, handled: false };
   }
-  const projectConfig = loadProjectConfig(projectDir);
+  const projectConfig = await loadRuntimeProjectConfig(projectDir);
   const insideBuildCommand = process.env.TSCIRCUIT_INSIDE_BUILD_COMMAND === "1";
   await installProjectDependencies({
     cwd: projectDir,
@@ -113959,17 +113993,45 @@ var findBoardFiles = ({
 } = {}) => {
   const resolvedProjectDir = path37.resolve(projectDir);
   const boardFilePatterns = getBoardFilePatterns(resolvedProjectDir);
+  return findBoardFilesFromPatterns({
+    boardFilePatterns,
+    projectDir: resolvedProjectDir,
+    ignore,
+    filePaths
+  });
+};
+var findBoardFilesAsync = async ({
+  projectDir = process.cwd(),
+  ignore = DEFAULT_IGNORED_PATTERNS,
+  filePaths = []
+} = {}) => {
+  const resolvedProjectDir = path37.resolve(projectDir);
+  const projectConfig = await loadRuntimeProjectConfig(resolvedProjectDir);
+  const boardFilePatterns = projectConfig?.includeBoardFiles?.filter((pattern) => pattern.trim()) ?? [];
+  return findBoardFilesFromPatterns({
+    boardFilePatterns: boardFilePatterns.length > 0 ? boardFilePatterns : DEFAULT_BOARD_FILE_PATTERNS,
+    projectDir: resolvedProjectDir,
+    ignore,
+    filePaths
+  });
+};
+var findBoardFilesFromPatterns = ({
+  boardFilePatterns,
+  projectDir,
+  ignore,
+  filePaths
+}) => {
   const relativeBoardFiles = globbySync(boardFilePatterns, {
-    cwd: resolvedProjectDir,
+    cwd: projectDir,
     ignore
   });
-  const absoluteBoardFiles = relativeBoardFiles.map((f) => path37.join(resolvedProjectDir, f));
+  const absoluteBoardFiles = relativeBoardFiles.map((f) => path37.join(projectDir, f));
   const boardFileSet = new Set;
   if (filePaths.length > 0) {
     for (const inputPath of filePaths) {
       if (isGlobPattern(inputPath)) {
         const matches = globbySync(inputPath, {
-          cwd: resolvedProjectDir,
+          cwd: projectDir,
           ignore,
           absolute: true
         });
@@ -113977,14 +114039,14 @@ var findBoardFiles = ({
           boardFileSet.add(match);
         }
       } else {
-        const targetPath = path37.resolve(resolvedProjectDir, inputPath);
+        const targetPath = path37.resolve(projectDir, inputPath);
         if (!fs34.existsSync(targetPath)) {
           continue;
         }
         const stat = fs34.statSync(targetPath);
         if (stat.isDirectory()) {
           const resolvedDir = path37.resolve(targetPath);
-          if (isSubPath(resolvedDir, resolvedProjectDir)) {
+          if (isSubPath(resolvedDir, projectDir)) {
             for (const boardFile of absoluteBoardFiles) {
               if (isSubPath(boardFile, resolvedDir)) {
                 boardFileSet.add(boardFile);
@@ -114055,14 +114117,15 @@ async function getBuildEntrypoints({
   includeBoardFiles = true
 }) {
   const resolvedRoot = path38.resolve(rootDir);
-  const includeBoardFilePatterns = includeBoardFiles ? getBoardFilePatterns(resolvedRoot) : [];
+  const rootProjectConfig = await loadRuntimeProjectConfig(resolvedRoot);
+  const includeBoardFilePatterns = includeBoardFiles ? rootProjectConfig?.includeBoardFiles?.filter((pattern) => pattern.trim()) ?? DEFAULT_BOARD_FILE_PATTERNS : [];
   const buildFromProjectDir = async () => {
-    const projectConfig = loadProjectConfig(resolvedRoot);
+    const projectConfig = rootProjectConfig;
     const hasConfiguredIncludeBoardFiles = Boolean(projectConfig?.includeBoardFiles?.some((pattern) => pattern.trim()));
     const resolvedPreviewComponentPath = projectConfig?.previewComponentPath ? path38.resolve(resolvedRoot, projectConfig.previewComponentPath) : undefined;
     const resolvedSiteDefaultComponentPath = projectConfig?.siteDefaultComponentPath ? path38.resolve(resolvedRoot, projectConfig.siteDefaultComponentPath) : undefined;
     if (includeBoardFiles) {
-      const files = findBoardFiles({ projectDir: resolvedRoot });
+      const files = await findBoardFilesAsync({ projectDir: resolvedRoot });
       if (files.length > 0) {
         return {
           projectDir: resolvedRoot,
@@ -114108,12 +114171,12 @@ async function getBuildEntrypoints({
   if (fileOrDir) {
     const resolved = path38.resolve(resolvedRoot, fileOrDir);
     if (fs35.existsSync(resolved) && fs35.statSync(resolved).isDirectory()) {
-      const projectConfig2 = loadProjectConfig(resolvedRoot);
+      const projectConfig2 = rootProjectConfig;
       const resolvedPreviewComponentPath2 = projectConfig2?.previewComponentPath ? path38.resolve(resolvedRoot, projectConfig2.previewComponentPath) : undefined;
       const resolvedSiteDefaultComponentPath2 = projectConfig2?.siteDefaultComponentPath ? path38.resolve(resolvedRoot, projectConfig2.siteDefaultComponentPath) : undefined;
       if (includeBoardFiles) {
         const hasConfiguredIncludeBoardFiles = Boolean(projectConfig2?.includeBoardFiles?.some((pattern) => pattern.trim()));
-        const matchedFiles = findBoardFiles({
+        const matchedFiles = await findBoardFilesAsync({
           projectDir: resolvedRoot
         });
         const circuitFiles = matchedFiles.filter((file) => isSubPath2(file, resolved));
@@ -114152,7 +114215,7 @@ async function getBuildEntrypoints({
     }
     const fileDir = path38.dirname(resolved);
     const projectDir = findProjectRoot(fileDir);
-    const projectConfig = loadProjectConfig(projectDir);
+    const projectConfig = await loadRuntimeProjectConfig(projectDir);
     const resolvedPreviewComponentPath = projectConfig?.previewComponentPath ? path38.resolve(projectDir, projectConfig.previewComponentPath) : undefined;
     const resolvedSiteDefaultComponentPath = projectConfig?.siteDefaultComponentPath ? path38.resolve(projectDir, projectConfig.siteDefaultComponentPath) : undefined;
     return {
@@ -115018,7 +115081,7 @@ var registerBuild = (program2) => {
       } else {
         projectDir = resolvedRoot;
       }
-      const projectConfig = loadProjectConfig(projectDir);
+      const projectConfig = await loadRuntimeProjectConfig(projectDir);
       const { options: optionsWithConfig, configAppliedOpts } = resolveBuildOptions({
         cliOptions: options,
         projectConfig
@@ -115042,7 +115105,7 @@ var registerBuild = (program2) => {
       } = await getBuildEntrypoints({
         fileOrDir: fileOrDirForBuild
       });
-      const platformConfig = (() => {
+      const commandPlatformConfig = (() => {
         if (!resolvedOptions?.disablePcb && !resolvedOptions?.routingDisabled && !resolvedOptions?.disablePartsEngine) {
           return;
         }
@@ -115058,6 +115121,7 @@ var registerBuild = (program2) => {
         }
         return config;
       })();
+      const platformConfig = mergePlatformConfigs(projectConfig?.platformConfig, commandPlatformConfig);
       const distDir = path42.join(projectDir, "dist");
       fs39.mkdirSync(distDir, { recursive: true });
       const concurrencyValue = Math.max(1, Number.parseInt(resolvedOptions?.concurrency || "1", 10));
@@ -115399,9 +115463,8 @@ var registerBuild = (program2) => {
           fileOrDir: file,
           includeBoardFiles: false
         });
-        const projectConfig2 = loadProjectConfig(projectDir);
-        const entryFile = projectConfig2?.kicadLibraryEntrypointPath != null ? await getEntrypoint({
-          filePath: projectConfig2.kicadLibraryEntrypointPath,
+        const entryFile = projectConfig?.kicadLibraryEntrypointPath != null ? await getEntrypoint({
+          filePath: projectConfig.kicadLibraryEntrypointPath,
           projectDir
         }) : kicadEntrypoint;
         if (!entryFile) {
@@ -115433,9 +115496,8 @@ var registerBuild = (program2) => {
           fileOrDir: file,
           includeBoardFiles: false
         });
-        const projectConfig2 = loadProjectConfig(projectDir);
-        const entryFile = projectConfig2?.kicadLibraryEntrypointPath != null ? await getEntrypoint({
-          filePath: projectConfig2.kicadLibraryEntrypointPath,
+        const entryFile = projectConfig?.kicadLibraryEntrypointPath != null ? await getEntrypoint({
+          filePath: projectConfig.kicadLibraryEntrypointPath,
           projectDir
         }) : kicadEntrypoint;
         if (!entryFile) {
@@ -254841,7 +254903,9 @@ import { promises as fs57 } from "node:fs";
 var registerExport = (program2) => {
   program2.command("export").description("Export tscircuit code to various formats").argument("<file>", "Path to the package file").option("-f, --format <format>", `Output format (${ALLOWED_EXPORT_FORMATS.join(", ")})`).option("-o, --output <path>", "Output file path").option("--disable-parts-engine", "Disable the parts engine").option("--show-courtyards", "Show courtyard outlines in PCB SVG output").action(async (file, options) => {
     const formatOption = options.format ?? "json";
-    const platformConfig2 = options.disablePartsEngine === true ? { partsEngineDisabled: true } : undefined;
+    const projectConfig2 = await loadRuntimeProjectConfig(process.cwd());
+    const commandPlatformConfig = options.disablePartsEngine === true ? { partsEngineDisabled: true } : undefined;
+    const platformConfig2 = mergePlatformConfigs(projectConfig2?.platformConfig, commandPlatformConfig);
     if (formatOption === "spice") {
       const { circuitJson } = await generateCircuitJson({
         filePath: file,
@@ -275795,7 +275859,9 @@ var resultToTable = (result) => {
 var registerSimulate = (program3) => {
   const simulateCommand = program3.command("simulate").description("Run a simulation");
   simulateCommand.command("analog").description("Run an analog SPICE simulation").argument("<file>", "Path to tscircuit tsx or circuit json file").option("--disable-parts-engine", "Disable the parts engine").action(async (file, options) => {
-    const platformConfig2 = options.disablePartsEngine === true ? { partsEngineDisabled: true } : undefined;
+    const projectConfig2 = await loadRuntimeProjectConfig(process.cwd());
+    const commandPlatformConfig = options.disablePartsEngine === true ? { partsEngineDisabled: true } : undefined;
+    const platformConfig2 = mergePlatformConfigs(projectConfig2?.platformConfig, commandPlatformConfig);
     const { circuitJson } = await generateCircuitJson({
       filePath: file,
       saveToFile: false,

package/dist/lib/index.js

@@ -65733,7 +65733,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1424";
+var version = "0.1.1425";
 var package_default = {
   name: "@tscircuit/cli",
   version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1425",
+  "version": "0.1.1426",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -19,7 +19,7 @@
     "@tscircuit/krt-wasm": "^0.1.0",
     "@tscircuit/math-utils": "0.0.36",
     "@tscircuit/props": "^0.0.536",
-    "@tscircuit/runframe": "^0.0.2021",
+    "@tscircuit/runframe": "^0.0.2022",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@types/bun": "^1.2.2",
     "@types/configstore": "^6.0.2",