@tscircuit/cli 0.1.1467 → 0.1.1468

package/dist/cli/snapshot/snapshot.worker.js

@@ -9967,6 +9967,18 @@ var require_semver = __commonJS((exports, module) => {
   var { safeRe: re, t } = require_re();
   var parseOptions = require_parse_options();
   var { compareIdentifiers } = require_identifiers();
+  var isPrereleaseIdentifier = (prerelease, identifier) => {
+    const identifiers = identifier.split(".");
+    if (identifiers.length > prerelease.length) {
+      return false;
+    }
+    for (let i = 0;i < identifiers.length; i++) {
+      if (compareIdentifiers(prerelease[i], identifiers[i]) !== 0) {
+        return false;
+      }
+    }
+    return true;
+  };
 
   class SemVer {
     constructor(version, options) {
@@ -10206,8 +10218,9 @@ var require_semver = __commonJS((exports, module) => {
             if (identifierBase === false) {
               prerelease = [identifier];
             }
-            if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
-              if (isNaN(this.prerelease[1])) {
+            if (isPrereleaseIdentifier(this.prerelease, identifier)) {
+              const prereleaseBase = this.prerelease[identifier.split(".").length];
+              if (isNaN(prereleaseBase)) {
                 this.prerelease = prerelease;
               }
             } else {
@@ -10678,6 +10691,7 @@ var require_range = __commonJS((exports, module) => {
       return this.range;
     }
     parseRange(range) {
+      range = range.replace(BUILDSTRIPRE, "");
       const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
       const memoKey = memoOpts + ":" + range;
       const cached = cache.get(memoKey);
@@ -10759,12 +10773,14 @@ var require_range = __commonJS((exports, module) => {
   var SemVer = require_semver();
   var {
     safeRe: re,
+    src,
     t,
     comparatorTrimReplace,
     tildeTrimReplace,
     caretTrimReplace
   } = require_re();
   var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+  var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
   var isNullSet = (c) => c.value === "<0.0.0-0";
   var isAny = (c) => c.value === "";
   var isSatisfiable = (comparators, options) => {
@@ -10793,6 +10809,7 @@ var require_range = __commonJS((exports, module) => {
     return comp;
   };
   var isX = (id) => !id || id.toLowerCase() === "x" || id === "*";
+  var invalidXRangeOrder = (M, m, p) => isX(M) && !isX(m) || isX(m) && p && !isX(p);
   var replaceTildes = (comp, options) => {
     return comp.trim().split(/\s+/).map((c) => replaceTilde(c, options)).join(" ");
   };
@@ -10852,9 +10869,9 @@ var require_range = __commonJS((exports, module) => {
         debug2("no pr");
         if (M === "0") {
           if (m === "0") {
-            ret = `>=${M}.${m}.${p}${z} <${M}.${m}.${+p + 1}-0`;
+            ret = `>=${M}.${m}.${p} <${M}.${m}.${+p + 1}-0`;
           } else {
-            ret = `>=${M}.${m}.${p}${z} <${M}.${+m + 1}.0-0`;
+            ret = `>=${M}.${m}.${p} <${M}.${+m + 1}.0-0`;
           }
         } else {
           ret = `>=${M}.${m}.${p} <${+M + 1}.0.0-0`;
@@ -10873,6 +10890,9 @@ var require_range = __commonJS((exports, module) => {
     const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
     return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
       debug2("xRange", comp, ret, gtlt, M, m, p, pr);
+      if (invalidXRangeOrder(M, m, p)) {
+        return comp;
+      }
       const xM = isX(M);
       const xm = xM || isX(m);
       const xp = xm || isX(p);
@@ -11481,7 +11501,7 @@ var require_subset = __commonJS((exports, module) => {
           if (higher === c && higher !== gt) {
             return false;
           }
-        } else if (gt.operator === ">=" && !satisfies(gt.semver, String(c), options)) {
+        } else if (gt.operator === ">=" && !c.test(gt.semver)) {
           return false;
         }
       }
@@ -11496,7 +11516,7 @@ var require_subset = __commonJS((exports, module) => {
           if (lower === c && lower !== lt) {
             return false;
           }
-        } else if (lt.operator === "<=" && !satisfies(lt.semver, String(c), options)) {
+        } else if (lt.operator === "<=" && !c.test(lt.semver)) {
           return false;
         }
       }
@@ -16425,10 +16445,226 @@ var processSnapshotFile = async ({
   };
 };
 
+// lib/project-config/index.ts
+import * as fs11 from "node:fs";
+import * as path12 from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
+
+// lib/project-config/project-config-schema.ts
+import { z } from "zod";
+var pcbSnapshotSettingsSchema = z.object({
+  showCourtyards: z.boolean().optional(),
+  showPcbNotes: z.boolean().optional(),
+  showFabricationNotes: z.boolean().optional()
+});
+var projectConfigSchema = z.object({
+  mainEntrypoint: z.string().optional(),
+  libraryEntrypoint: z.string().optional(),
+  previewComponentPath: z.string().optional(),
+  siteDefaultComponentPath: z.string().optional(),
+  ignoredFiles: z.array(z.string()).optional(),
+  includeBoardFiles: z.array(z.string()).optional(),
+  snapshotsDir: z.string().optional(),
+  pcbSnapshotSettings: pcbSnapshotSettingsSchema.optional(),
+  prebuildCommand: z.string().optional(),
+  buildCommand: z.string().optional(),
+  kicadProjectEntrypointPath: z.string().optional(),
+  kicadLibraryEntrypointPath: z.string().optional(),
+  kicadLibraryName: z.string().optional(),
+  alwaysUseLatestTscircuitOnCloud: z.boolean().optional(),
+  build: z.object({
+    circuitJson: z.boolean().optional(),
+    kicadProject: z.boolean().optional(),
+    kicadLibrary: z.boolean().optional(),
+    kicadPcm: z.boolean().optional(),
+    previewImages: z.boolean().optional(),
+    glbs: z.boolean().optional(),
+    step: z.boolean().optional(),
+    workerTimeoutMs: z.number().int().positive().optional(),
+    routingDisabled: z.boolean().optional(),
+    typescriptLibrary: z.boolean().optional()
+  }).optional()
+});
+
+// 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 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 = path12.join(projectDir, envFileName);
+    if (!fs11.existsSync(envPath))
+      continue;
+    const envContent = fs11.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 = path12.join(projectDir, CONFIG_FILENAME);
+  if (!fs11.existsSync(configPath)) {
+    return null;
+  }
+  try {
+    const configContent = fs11.readFileSync(configPath, "utf8");
+    const parsedConfig = JSON.parse(configContent);
+    return projectConfigSchema.parse(parsedConfig);
+  } catch (error) {
+    console.error(`Error loading tscircuit config: ${error}`);
+    return null;
+  }
+};
+var loadProjectConfigModule = async (projectDir) => {
+  loadProjectEnv(projectDir);
+  for (const configFileName of CONFIG_MODULE_FILENAMES) {
+    const configPath = path12.join(projectDir, configFileName);
+    if (!fs11.existsSync(configPath))
+      continue;
+    try {
+      const moduleUrl = pathToFileURL2(configPath);
+      const stat = fs11.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 = loadProjectConfigSync(projectDir);
+  const patterns = config?.includeBoardFiles?.filter((pattern) => pattern.trim());
+  if (patterns && patterns.length > 0) {
+    return patterns;
+  }
+  return DEFAULT_BOARD_FILE_PATTERNS;
+};
+var getSnapshotsDir = (projectDir = process.cwd()) => {
+  const config = loadProjectConfigSync(projectDir);
+  return config?.snapshotsDir;
+};
+var saveProjectConfig = (config, projectDir = process.cwd()) => {
+  const configPath = path12.join(projectDir, CONFIG_FILENAME);
+  try {
+    const configWithSchema = {
+      $schema: CONFIG_SCHEMA_URL,
+      ...config ?? {}
+    };
+    fs11.writeFileSync(configPath, JSON.stringify(configWithSchema, null, 2));
+    return true;
+  } catch (error) {
+    console.error(`Error saving tscircuit config: ${error}`);
+    return false;
+  }
+};
+
+// 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
+      }
+    };
+  }, {});
+};
+
 // cli/snapshot/worker-snapshot-handlers.ts
 var handleSnapshotFile = async (filePath, projectDir, snapshotsDirName, options) => {
   process.chdir(projectDir);
   await registerStaticAssetLoaders();
+  const projectConfig = await loadRuntimeProjectConfig(projectDir);
+  const platformConfig = mergePlatformConfigs(projectConfig?.platformConfig, options.platformConfig);
   const result = await processSnapshotFile({
     file: filePath,
     projectDir,
@@ -16438,7 +16674,7 @@ var handleSnapshotFile = async (filePath, projectDir, snapshotsDirName, options)
     pcbOnly: options.pcbOnly,
     schematicOnly: options.schematicOnly,
     forceUpdate: options.forceUpdate,
-    platformConfig: options.platformConfig,
+    platformConfig,
     pcbSnapshotSettings: options.pcbSnapshotSettings,
     createDiff: options.createDiff,
     cameraPreset: options.cameraPreset

package/dist/lib/index.js

@@ -43606,6 +43606,18 @@ var require_semver = __commonJS((exports2, module2) => {
   var { safeRe: re, t } = require_re();
   var parseOptions = require_parse_options();
   var { compareIdentifiers } = require_identifiers();
+  var isPrereleaseIdentifier = (prerelease, identifier) => {
+    const identifiers = identifier.split(".");
+    if (identifiers.length > prerelease.length) {
+      return false;
+    }
+    for (let i = 0;i < identifiers.length; i++) {
+      if (compareIdentifiers(prerelease[i], identifiers[i]) !== 0) {
+        return false;
+      }
+    }
+    return true;
+  };
 
   class SemVer {
     constructor(version2, options) {
@@ -43845,8 +43857,9 @@ var require_semver = __commonJS((exports2, module2) => {
             if (identifierBase === false) {
               prerelease = [identifier];
             }
-            if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
-              if (isNaN(this.prerelease[1])) {
+            if (isPrereleaseIdentifier(this.prerelease, identifier)) {
+              const prereleaseBase = this.prerelease[identifier.split(".").length];
+              if (isNaN(prereleaseBase)) {
                 this.prerelease = prerelease;
               }
             } else {
@@ -44317,6 +44330,7 @@ var require_range = __commonJS((exports2, module2) => {
       return this.range;
     }
     parseRange(range) {
+      range = range.replace(BUILDSTRIPRE, "");
       const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
       const memoKey = memoOpts + ":" + range;
       const cached = cache.get(memoKey);
@@ -44398,12 +44412,14 @@ var require_range = __commonJS((exports2, module2) => {
   var SemVer = require_semver();
   var {
     safeRe: re,
+    src,
     t,
     comparatorTrimReplace,
     tildeTrimReplace,
     caretTrimReplace
   } = require_re();
   var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+  var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
   var isNullSet = (c) => c.value === "<0.0.0-0";
   var isAny = (c) => c.value === "";
   var isSatisfiable = (comparators, options) => {
@@ -44432,6 +44448,7 @@ var require_range = __commonJS((exports2, module2) => {
     return comp;
   };
   var isX = (id) => !id || id.toLowerCase() === "x" || id === "*";
+  var invalidXRangeOrder = (M, m, p) => isX(M) && !isX(m) || isX(m) && p && !isX(p);
   var replaceTildes = (comp, options) => {
     return comp.trim().split(/\s+/).map((c) => replaceTilde(c, options)).join(" ");
   };
@@ -44491,9 +44508,9 @@ var require_range = __commonJS((exports2, module2) => {
         debug("no pr");
         if (M === "0") {
           if (m === "0") {
-            ret = `>=${M}.${m}.${p}${z21} <${M}.${m}.${+p + 1}-0`;
+            ret = `>=${M}.${m}.${p} <${M}.${m}.${+p + 1}-0`;
           } else {
-            ret = `>=${M}.${m}.${p}${z21} <${M}.${+m + 1}.0-0`;
+            ret = `>=${M}.${m}.${p} <${M}.${+m + 1}.0-0`;
           }
         } else {
           ret = `>=${M}.${m}.${p} <${+M + 1}.0.0-0`;
@@ -44512,6 +44529,9 @@ var require_range = __commonJS((exports2, module2) => {
     const r = options.loose ? re[t.XRANGELOOSE] : re[t.XRANGE];
     return comp.replace(r, (ret, gtlt, M, m, p, pr) => {
       debug("xRange", comp, ret, gtlt, M, m, p, pr);
+      if (invalidXRangeOrder(M, m, p)) {
+        return comp;
+      }
       const xM = isX(M);
       const xm = xM || isX(m);
       const xp = xm || isX(p);
@@ -45120,7 +45140,7 @@ var require_subset = __commonJS((exports2, module2) => {
           if (higher === c && higher !== gt) {
             return false;
           }
-        } else if (gt.operator === ">=" && !satisfies(gt.semver, String(c), options)) {
+        } else if (gt.operator === ">=" && !c.test(gt.semver)) {
           return false;
         }
       }
@@ -45135,7 +45155,7 @@ var require_subset = __commonJS((exports2, module2) => {
           if (lower === c && lower !== lt) {
             return false;
           }
-        } else if (lt.operator === "<=" && !satisfies(lt.semver, String(c), options)) {
+        } else if (lt.operator === "<=" && !c.test(lt.semver)) {
           return false;
         }
       }
@@ -45315,7 +45335,7 @@ var require_isarray = __commonJS((exports2, module2) => {
   };
 });
 
-// node_modules/safe-buffer/index.js
+// node_modules/readable-stream/node_modules/safe-buffer/index.js
 var require_safe_buffer = __commonJS((exports2, module2) => {
   var buffer = __require("buffer");
   var Buffer3 = buffer.Buffer;
@@ -46169,9 +46189,64 @@ var require__stream_duplex = __commonJS((exports2, module2) => {
   };
 });
 
+// node_modules/string_decoder/node_modules/safe-buffer/index.js
+var require_safe_buffer2 = __commonJS((exports2, module2) => {
+  var buffer = __require("buffer");
+  var Buffer3 = buffer.Buffer;
+  function copyProps(src, dst) {
+    for (var key in src) {
+      dst[key] = src[key];
+    }
+  }
+  if (Buffer3.from && Buffer3.alloc && Buffer3.allocUnsafe && Buffer3.allocUnsafeSlow) {
+    module2.exports = buffer;
+  } else {
+    copyProps(buffer, exports2);
+    exports2.Buffer = SafeBuffer;
+  }
+  function SafeBuffer(arg, encodingOrOffset, length) {
+    return Buffer3(arg, encodingOrOffset, length);
+  }
+  copyProps(Buffer3, SafeBuffer);
+  SafeBuffer.from = function(arg, encodingOrOffset, length) {
+    if (typeof arg === "number") {
+      throw new TypeError("Argument must not be a number");
+    }
+    return Buffer3(arg, encodingOrOffset, length);
+  };
+  SafeBuffer.alloc = function(size, fill, encoding) {
+    if (typeof size !== "number") {
+      throw new TypeError("Argument must be a number");
+    }
+    var buf = Buffer3(size);
+    if (fill !== undefined) {
+      if (typeof encoding === "string") {
+        buf.fill(fill, encoding);
+      } else {
+        buf.fill(fill);
+      }
+    } else {
+      buf.fill(0);
+    }
+    return buf;
+  };
+  SafeBuffer.allocUnsafe = function(size) {
+    if (typeof size !== "number") {
+      throw new TypeError("Argument must be a number");
+    }
+    return Buffer3(size);
+  };
+  SafeBuffer.allocUnsafeSlow = function(size) {
+    if (typeof size !== "number") {
+      throw new TypeError("Argument must be a number");
+    }
+    return buffer.SlowBuffer(size);
+  };
+});
+
 // node_modules/string_decoder/lib/string_decoder.js
 var require_string_decoder = __commonJS((exports2) => {
-  var Buffer3 = require_safe_buffer().Buffer;
+  var Buffer3 = require_safe_buffer2().Buffer;
   var isEncoding = Buffer3.isEncoding || function(encoding) {
     encoding = "" + encoding;
     switch (encoding && encoding.toLowerCase()) {
@@ -65733,7 +65808,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1466";
+var version = "0.1.1467";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65754,7 +65829,7 @@ var package_default = {
     "@tscircuit/image-utils": "^0.0.3",
     "@tscircuit/krt-wasm": "^0.1.0",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.536",
+    "@tscircuit/props": "^0.0.546",
     "@tscircuit/runframe": "^0.0.2057",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@types/bun": "^1.2.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1467",
+  "version": "0.1.1468",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -18,7 +18,7 @@
     "@tscircuit/image-utils": "^0.0.3",
     "@tscircuit/krt-wasm": "^0.1.0",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.536",
+    "@tscircuit/props": "^0.0.546",
     "@tscircuit/runframe": "^0.0.2057",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@types/bun": "^1.2.2",