@tscircuit/cli 0.1.1422 → 0.1.1423

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.1421";
+var version = "0.1.1422";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -104485,6 +104485,7 @@ import path42 from "node:path";
 // lib/project-config/index.ts
 import * as fs15 from "node:fs";
 import * as path15 from "node:path";
+import { pathToFileURL } from "node:url";
 
 // lib/project-config/project-config-schema.ts
 import { z } from "zod";
@@ -104524,13 +104525,61 @@ var projectConfigSchema = z.object({
 
 // lib/project-config/index.ts
 var CONFIG_FILENAME = "tscircuit.config.json";
+var CONFIG_MODULE_FILENAMES = [
+  "tscircuit.config.ts",
+  "tscircuit.config.js"
+];
+var ENV_FILENAMES = [".env", ".env.local"];
 var CONFIG_SCHEMA_URL = "https://cdn.jsdelivr.net/npm/@tscircuit/cli/types/tscircuit.config.schema.json";
 var DEFAULT_BOARD_FILE_PATTERNS = [
   "**/*.board.tsx",
   "**/*.circuit.tsx",
   "**/*.circuit.json"
 ];
-var loadProjectConfig = (projectDir = process.cwd()) => {
+var parseProjectConfigObject = (config) => {
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    throw new Error("tscircuit config must export an object");
+  }
+  const { platformConfig, ...serializableConfig } = config;
+  const parsedConfig = projectConfigSchema.parse(serializableConfig);
+  if (platformConfig === undefined) {
+    return parsedConfig;
+  }
+  return {
+    ...parsedConfig,
+    platformConfig
+  };
+};
+var stripWrappingQuotes = (value) => {
+  if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+    return value.slice(1, -1);
+  }
+  return value;
+};
+var loadProjectEnv = (projectDir) => {
+  const initialEnvKeys = new Set(Object.keys(process.env));
+  for (const envFileName of ENV_FILENAMES) {
+    const envPath = path15.join(projectDir, envFileName);
+    if (!fs15.existsSync(envPath))
+      continue;
+    const envContent = fs15.readFileSync(envPath, "utf8");
+    for (const rawLine of envContent.split(/\r?\n/)) {
+      const line = rawLine.trim();
+      if (!line || line.startsWith("#"))
+        continue;
+      const lineWithoutExport = line.startsWith("export ") ? line.slice("export ".length) : line;
+      const separatorIndex = lineWithoutExport.indexOf("=");
+      if (separatorIndex <= 0)
+        continue;
+      const key = lineWithoutExport.slice(0, separatorIndex).trim();
+      if (!key || initialEnvKeys.has(key))
+        continue;
+      const value = stripWrappingQuotes(lineWithoutExport.slice(separatorIndex + 1).trim());
+      process.env[key] = value;
+    }
+  }
+};
+var loadProjectConfigSync = (projectDir = process.cwd()) => {
   const configPath = path15.join(projectDir, CONFIG_FILENAME);
   if (!fs15.existsSync(configPath)) {
     return null;
@@ -104544,8 +104593,50 @@ var loadProjectConfig = (projectDir = process.cwd()) => {
     return null;
   }
 };
+var loadProjectConfigModule = async (projectDir) => {
+  loadProjectEnv(projectDir);
+  for (const configFileName of CONFIG_MODULE_FILENAMES) {
+    const configPath = path15.join(projectDir, configFileName);
+    if (!fs15.existsSync(configPath))
+      continue;
+    try {
+      const moduleUrl = pathToFileURL(configPath);
+      const stat = fs15.statSync(configPath);
+      moduleUrl.searchParams.set("tsci", String(stat.mtimeMs));
+      const importedModule = await import(moduleUrl.href);
+      const exportedConfig = importedModule.default ?? importedModule.config ?? importedModule;
+      return parseProjectConfigObject(exportedConfig);
+    } catch (error) {
+      console.error(`Error loading ${configFileName}: ${error}`);
+      return null;
+    }
+  }
+  return null;
+};
+var loadRuntimeProjectConfig = async (projectDir = process.cwd()) => {
+  const jsonConfig = loadProjectConfigSync(projectDir);
+  const moduleConfig = await loadProjectConfigModule(projectDir);
+  if (!jsonConfig && !moduleConfig) {
+    return null;
+  }
+  return {
+    ...jsonConfig ?? {},
+    ...moduleConfig ?? {},
+    build: {
+      ...jsonConfig?.build,
+      ...moduleConfig?.build
+    },
+    pcbSnapshotSettings: {
+      ...jsonConfig?.pcbSnapshotSettings,
+      ...moduleConfig?.pcbSnapshotSettings
+    }
+  };
+};
+var loadProjectConfig = (projectDir = process.cwd()) => {
+  return loadProjectConfigSync(projectDir);
+};
 var getBoardFilePatterns = (projectDir = process.cwd()) => {
-  const config = loadProjectConfig(projectDir);
+  const config = loadProjectConfigSync(projectDir);
   const patterns = config?.includeBoardFiles?.filter((pattern) => pattern.trim());
   if (patterns && patterns.length > 0) {
     return patterns;
@@ -104553,7 +104644,7 @@ var getBoardFilePatterns = (projectDir = process.cwd()) => {
   return DEFAULT_BOARD_FILE_PATTERNS;
 };
 var getSnapshotsDir = (projectDir = process.cwd()) => {
-  const config = loadProjectConfig(projectDir);
+  const config = loadProjectConfigSync(projectDir);
   return config?.snapshotsDir;
 };
 var saveProjectConfig = (config, projectDir = process.cwd()) => {
@@ -104574,7 +104665,7 @@ var saveProjectConfig = (config, projectDir = process.cwd()) => {
 // lib/shared/convert-to-kicad-library.tsx
 import fs18 from "node:fs";
 import path18 from "node:path";
-import { pathToFileURL } from "node:url";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 
 // node_modules/circuit-json-to-kicad/dist/index.js
 var exports_dist = {};
@@ -109909,7 +110000,7 @@ async function convertToKicadLibrary({
     entrypoint: absoluteFilePath,
     buildFileToCircuitJson: async (filePath2, componentName) => {
       try {
-        const module2 = await import(pathToFileURL(filePath2).href);
+        const module2 = await import(pathToFileURL2(filePath2).href);
         const Component = module2[componentName];
         if (!Component || typeof Component !== "function") {
           return null;
@@ -109924,7 +110015,7 @@ async function convertToKicadLibrary({
       }
     },
     getExportsFromTsxFile: async (filePath2) => {
-      const module2 = await import(pathToFileURL(filePath2).href);
+      const module2 = await import(pathToFileURL2(filePath2).href);
       return Object.keys(module2);
     },
     includeBuiltins: true,
@@ -110049,13 +110140,13 @@ var getEntrypoint = async ({
       onError(kleur_default.red(`File not found or invalid: '${filePath}'`));
       return null;
     }
-    const projectConfig = loadProjectConfig(validatedProjectDir);
+    const projectConfig = await loadRuntimeProjectConfig(validatedProjectDir);
     const configEntrypoint = projectConfig?.mainEntrypoint ?? projectConfig?.libraryEntrypoint;
     if (configEntrypoint && typeof configEntrypoint === "string") {
       const validatedConfigPath = validateFilePath(configEntrypoint, validatedProjectDir);
       if (validatedConfigPath) {
         const relativePath = path19.relative(validatedProjectDir, validatedConfigPath);
-        onSuccess(`Using entrypoint from tscircuit.config.json: '${relativePath}'`);
+        onSuccess(`Using entrypoint from tscircuit config: '${relativePath}'`);
         return validatedConfigPath;
       }
     }
@@ -110480,7 +110571,7 @@ function analyzeCircuitJson(circuitJson) {
 // lib/shared/generate-circuit-json.tsx
 import fs24 from "node:fs";
 import path25 from "node:path";
-import { pathToFileURL as pathToFileURL2 } from "node:url";
+import { pathToFileURL as pathToFileURL3 } from "node:url";
 import Debug from "debug";
 
 // lib/utils/abbreviate-stringify-object.ts
@@ -110565,7 +110656,7 @@ async function generateCircuitJson({
     })
   };
   debug(`fsMap: ${abbreviateStringifyObject(fsMap)}`);
-  const MainComponent = await import(pathToFileURL2(absoluteFilePath).href);
+  const MainComponent = await import(pathToFileURL3(absoluteFilePath).href);
   const Component = MainComponent.default || (Object.keys(MainComponent).find((k) => k[0] === k[0].toUpperCase()) !== undefined ? MainComponent[Object.keys(MainComponent).find((k) => k[0] === k[0].toUpperCase())] : undefined);
   if (!Component) {
     throw new Error(`No component found in "${absoluteFilePath}". Make sure you export a component.`);
@@ -110793,7 +110884,7 @@ var getCircuitJsonToGltfOptions = ({
 
 // cli/build/convert-model-urls-to-file-urls.ts
 import path27 from "node:path";
-import { pathToFileURL as pathToFileURL3 } from "node:url";
+import { pathToFileURL as pathToFileURL4 } from "node:url";
 var convertModelUrlsToFileUrls = (circuitJson) => {
   const modelUrlKeys = [
     "model_glb_url",
@@ -110817,9 +110908,9 @@ var convertModelUrlsToFileUrls = (circuitJson) => {
         if (value.match(/^[a-zA-Z]+:\/\//))
           continue;
         if (value.startsWith("/") || value.match(/^[a-zA-Z]:\\/)) {
-          updated[key] = pathToFileURL3(value).href;
+          updated[key] = pathToFileURL4(value).href;
         } else if (value.startsWith(".")) {
-          updated[key] = pathToFileURL3(path27.resolve(process.cwd(), value)).href;
+          updated[key] = pathToFileURL4(path27.resolve(process.cwd(), value)).href;
         }
       }
     }
@@ -245976,7 +246067,7 @@ var registerConfigSet = (program2) => {
     } else if (availableProjectConfigKeys.some((k4) => k4 === key)) {
       const projectDir = process.cwd();
       if (key === "mainEntrypoint" || key === "kicadLibraryEntrypointPath" || key === "previewComponentPath" || key === "siteDefaultComponentPath" || key === "prebuildCommand" || key === "buildCommand") {
-        const projectConfig2 = loadProjectConfig(projectDir) ?? {};
+        const projectConfig2 = loadProjectConfigSync(projectDir) ?? {};
         projectConfig2[key] = value;
         if (saveProjectConfig(projectConfig2, projectDir)) {
           console.log(kleur_default.cyan(`Set project config ${kleur_default.yellow(key)} to ${kleur_default.yellow(value)} successfully in ${kleur_default.bold(CONFIG_FILENAME)}.`));

package/dist/lib/index.js

@@ -58040,11 +58040,11 @@ var require_out = __commonJS((exports2) => {
     async.read(path14, getSettings(optionsOrSettingsOrCallback), callback);
   }
   exports2.stat = stat;
-  function statSync(path14, optionsOrSettings) {
+  function statSync2(path14, optionsOrSettings) {
     const settings = getSettings(optionsOrSettings);
     return sync.read(path14, settings);
   }
-  exports2.statSync = statSync;
+  exports2.statSync = statSync2;
   function getSettings(settingsOrOptions = {}) {
     if (settingsOrOptions instanceof settings_1.default) {
       return settingsOrOptions;
@@ -65733,7 +65733,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1421";
+var version = "0.1.1422";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -73875,6 +73875,7 @@ var getPackageAuthor = (packageName) => {
 // lib/project-config/index.ts
 import * as fs9 from "node:fs";
 import * as path11 from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 
 // lib/project-config/project-config-schema.ts
 import { z as z21 } from "zod";
@@ -73914,13 +73915,61 @@ var projectConfigSchema = z21.object({
 
 // lib/project-config/index.ts
 var CONFIG_FILENAME = "tscircuit.config.json";
+var CONFIG_MODULE_FILENAMES = [
+  "tscircuit.config.ts",
+  "tscircuit.config.js"
+];
+var ENV_FILENAMES = [".env", ".env.local"];
 var CONFIG_SCHEMA_URL = "https://cdn.jsdelivr.net/npm/@tscircuit/cli/types/tscircuit.config.schema.json";
 var DEFAULT_BOARD_FILE_PATTERNS = [
   "**/*.board.tsx",
   "**/*.circuit.tsx",
   "**/*.circuit.json"
 ];
-var loadProjectConfig = (projectDir = process.cwd()) => {
+var parseProjectConfigObject = (config) => {
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    throw new Error("tscircuit config must export an object");
+  }
+  const { platformConfig, ...serializableConfig } = config;
+  const parsedConfig = projectConfigSchema.parse(serializableConfig);
+  if (platformConfig === undefined) {
+    return parsedConfig;
+  }
+  return {
+    ...parsedConfig,
+    platformConfig
+  };
+};
+var stripWrappingQuotes = (value) => {
+  if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+    return value.slice(1, -1);
+  }
+  return value;
+};
+var loadProjectEnv = (projectDir) => {
+  const initialEnvKeys = new Set(Object.keys(process.env));
+  for (const envFileName of ENV_FILENAMES) {
+    const envPath = path11.join(projectDir, envFileName);
+    if (!fs9.existsSync(envPath))
+      continue;
+    const envContent = fs9.readFileSync(envPath, "utf8");
+    for (const rawLine of envContent.split(/\r?\n/)) {
+      const line = rawLine.trim();
+      if (!line || line.startsWith("#"))
+        continue;
+      const lineWithoutExport = line.startsWith("export ") ? line.slice("export ".length) : line;
+      const separatorIndex = lineWithoutExport.indexOf("=");
+      if (separatorIndex <= 0)
+        continue;
+      const key = lineWithoutExport.slice(0, separatorIndex).trim();
+      if (!key || initialEnvKeys.has(key))
+        continue;
+      const value = stripWrappingQuotes(lineWithoutExport.slice(separatorIndex + 1).trim());
+      process.env[key] = value;
+    }
+  }
+};
+var loadProjectConfigSync = (projectDir = process.cwd()) => {
   const configPath = path11.join(projectDir, CONFIG_FILENAME);
   if (!fs9.existsSync(configPath)) {
     return null;
@@ -73934,8 +73983,50 @@ var loadProjectConfig = (projectDir = process.cwd()) => {
     return null;
   }
 };
+var loadProjectConfigModule = async (projectDir) => {
+  loadProjectEnv(projectDir);
+  for (const configFileName of CONFIG_MODULE_FILENAMES) {
+    const configPath = path11.join(projectDir, configFileName);
+    if (!fs9.existsSync(configPath))
+      continue;
+    try {
+      const moduleUrl = pathToFileURL2(configPath);
+      const stat = fs9.statSync(configPath);
+      moduleUrl.searchParams.set("tsci", String(stat.mtimeMs));
+      const importedModule = await import(moduleUrl.href);
+      const exportedConfig = importedModule.default ?? importedModule.config ?? importedModule;
+      return parseProjectConfigObject(exportedConfig);
+    } catch (error) {
+      console.error(`Error loading ${configFileName}: ${error}`);
+      return null;
+    }
+  }
+  return null;
+};
+var loadRuntimeProjectConfig = async (projectDir = process.cwd()) => {
+  const jsonConfig = loadProjectConfigSync(projectDir);
+  const moduleConfig = await loadProjectConfigModule(projectDir);
+  if (!jsonConfig && !moduleConfig) {
+    return null;
+  }
+  return {
+    ...jsonConfig ?? {},
+    ...moduleConfig ?? {},
+    build: {
+      ...jsonConfig?.build,
+      ...moduleConfig?.build
+    },
+    pcbSnapshotSettings: {
+      ...jsonConfig?.pcbSnapshotSettings,
+      ...moduleConfig?.pcbSnapshotSettings
+    }
+  };
+};
+var loadProjectConfig = (projectDir = process.cwd()) => {
+  return loadProjectConfigSync(projectDir);
+};
 var getBoardFilePatterns = (projectDir = process.cwd()) => {
-  const config = loadProjectConfig(projectDir);
+  const config = loadProjectConfigSync(projectDir);
   const patterns = config?.includeBoardFiles?.filter((pattern) => pattern.trim());
   if (patterns && patterns.length > 0) {
     return patterns;
@@ -73943,7 +74034,7 @@ var getBoardFilePatterns = (projectDir = process.cwd()) => {
   return DEFAULT_BOARD_FILE_PATTERNS;
 };
 var getSnapshotsDir = (projectDir = process.cwd()) => {
-  const config = loadProjectConfig(projectDir);
+  const config = loadProjectConfigSync(projectDir);
   return config?.snapshotsDir;
 };
 var saveProjectConfig = (config, projectDir = process.cwd()) => {
@@ -78217,13 +78308,13 @@ var getEntrypoint = async ({
       onError(kleur_default.red(`File not found or invalid: '${filePath}'`));
       return null;
     }
-    const projectConfig = loadProjectConfig(validatedProjectDir);
+    const projectConfig = await loadRuntimeProjectConfig(validatedProjectDir);
     const configEntrypoint = projectConfig?.mainEntrypoint ?? projectConfig?.libraryEntrypoint;
     if (configEntrypoint && typeof configEntrypoint === "string") {
       const validatedConfigPath = validateFilePath(configEntrypoint, validatedProjectDir);
       if (validatedConfigPath) {
         const relativePath = path22.relative(validatedProjectDir, validatedConfigPath);
-        onSuccess(`Using entrypoint from tscircuit.config.json: '${relativePath}'`);
+        onSuccess(`Using entrypoint from tscircuit config: '${relativePath}'`);
         return validatedConfigPath;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1422",
+  "version": "0.1.1423",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",