@tscircuit/cli 0.1.142 → 0.1.144

package/README.md

@@ -54,7 +54,7 @@ Commands:
   add <component>            Add a tscircuit component package to your project
   remove <component>         Remove a tscircuit component package from your
                              project
-  snapshot [options]         Generate schematic and PCB snapshots (add --3d for
+  snapshot [options] [file]  Generate schematic and PCB snapshots (add --3d for
                              3d preview)
   setup                      Setup utilities like GitHub Actions
   upgrade                    Upgrade CLI to the latest version

package/dist/main.js

@@ -442238,7 +442238,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.141";
+var version = "0.1.143";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -442286,7 +442286,7 @@ var package_default = {
     redaxios: "^0.5.1",
     semver: "^7.6.3",
     tempy: "^3.1.0",
-    tscircuit: "^0.0.500",
+    tscircuit: "^0.0.502",
     "typed-ky": "^0.0.4"
   },
   peerDependencies: {
@@ -481147,7 +481147,7 @@ var CapacityMeshSolver = AutoroutingPipelineSolver;
 var package_default2 = {
   name: "@tscircuit/capacity-autorouter",
   main: "./dist/index.js",
-  version: "0.0.75",
+  version: "0.0.76",
   type: "module",
   files: [
     "dist"
@@ -486745,6 +486745,7 @@ var orderedRenderPhases = [
   "CreateTracesFromProps",
   "CreateTracesFromNetLabels",
   "CreateTraceHintsFromProps",
+  "SourceGroupRender",
   "SourceRender",
   "SourceParentAttachment",
   "PortMatching",
@@ -490664,13 +490665,42 @@ var Trace2 = class extends PrimitiveComponent2 {
     }));
     for (const { selector, port } of portsWithSelectors) {
       if (!port) {
-        const parentSelector = selector.replace(/(\> )?[^ ]+$/, "");
-        const targetComponent = this.getSubcircuit().selectOne(parentSelector);
+        let parentSelector;
+        let portToken;
+        const dotIndex = selector.lastIndexOf(".");
+        if (dotIndex !== -1 && dotIndex > selector.lastIndexOf(" ")) {
+          parentSelector = selector.slice(0, dotIndex);
+          portToken = selector.slice(dotIndex + 1);
+        } else {
+          const match = selector.match(/^(.*[ >])?([^ >]+)$/);
+          parentSelector = match?.[1]?.trim() ?? "";
+          portToken = match?.[2] ?? selector;
+        }
+        let targetComponent = parentSelector ? this.getSubcircuit().selectOne(parentSelector) : null;
+        if (!targetComponent && parentSelector && !/[.#\[]/.test(parentSelector)) {
+          targetComponent = this.getSubcircuit().selectOne(`.${parentSelector}`);
+        }
         if (!targetComponent) {
-          this.renderError(`Could not find port for selector "${selector}"`);
+          if (parentSelector) {
+            this.renderError(`Could not find port for selector "${selector}". Component "${parentSelector}" not found`);
+          } else {
+            this.renderError(`Could not find port for selector "${selector}"`);
+          }
         } else {
-          this.renderError(`Could not find port for selector "${selector}" (did you forget to include the pin name?)
-searched component ${targetComponent.getString()}, which has ports: ${targetComponent.children.filter((c) => c.componentName === "Port").map((c) => `${c.getString()}(${c.getNameAndAliases().join(",")})`).join(" & ")}`);
+          const ports = targetComponent.children.filter((c) => c.componentName === "Port");
+          const portLabel = portToken.includes(".") ? portToken.split(".").pop() ?? "" : portToken;
+          const portNames = ports.map((c) => c.getNameAndAliases()).flat();
+          const hasCustomLabels = portNames.some((n2) => !/^(pin\d+|\d+)$/.test(n2));
+          const labelList = Array.from(new Set(portNames)).join(", ");
+          let detail;
+          if (ports.length === 0) {
+            detail = "It has no ports";
+          } else if (!hasCustomLabels) {
+            detail = `It has ${ports.length} pins and no pinLabels (consider adding pinLabels)`;
+          } else {
+            detail = `It has [${labelList}]`;
+          }
+          this.renderError(`Could not find port for selector "${selector}". Component "${targetComponent.props.name ?? parentSelector}" found, but does not have pin "${portLabel}". ${detail}`);
         }
       }
     }
@@ -491178,6 +491208,14 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         const conn = nl._parsedProps.connection ?? nl._parsedProps.connectsTo;
         if (!conn)
           return false;
+        if (Array.isArray(conn)) {
+          return conn.some((selector) => {
+            const targetPort2 = this.getSubcircuit().selectOne(selector, {
+              port: true
+            });
+            return targetPort2 === port;
+          });
+        }
         const targetPort = this.getSubcircuit().selectOne(conn, {
           port: true
         });
@@ -492501,6 +492539,23 @@ var getSimpleRouteJsonFromCircuitJson = ({
       maxY: Math.max(...allPoints.map((p) => p.y)) + 1
     };
   }
+  if (subcircuit_id) {
+    const group = db.pcb_group.getWhere({ subcircuit_id });
+    if (group) {
+      const groupBounds = {
+        minX: group.center.x - group.width / 2,
+        maxX: group.center.x + group.width / 2,
+        minY: group.center.y - group.height / 2,
+        maxY: group.center.y + group.height / 2
+      };
+      bounds6 = {
+        minX: Math.min(bounds6.minX, groupBounds.minX),
+        maxX: Math.max(bounds6.maxX, groupBounds.maxX),
+        minY: Math.min(bounds6.minY, groupBounds.minY),
+        maxY: Math.max(bounds6.maxY, groupBounds.maxY)
+      };
+    }
+  }
   const directTraceConnections = db.source_trace.list().map((trace) => {
     const connectedPorts = trace.connected_source_port_ids.map((id) => {
       const source_port3 = db.source_port.get(id);
@@ -493218,17 +493273,22 @@ var Group = class extends NormalComponent {
       componentName: "Group"
     };
   }
-  doInitialSourceRender() {
+  doInitialSourceGroupRender() {
     const { db } = this.root;
     const source_group3 = db.source_group.insert({
       name: this._parsedProps.name,
       is_subcircuit: this.isSubcircuit
     });
-    this.subcircuit_id = `subcircuit_${source_group3.source_group_id}`;
     this.source_group_id = source_group3.source_group_id;
-    db.source_group.update(source_group3.source_group_id, {
-      subcircuit_id: this.subcircuit_id
-    });
+    if (this.isSubcircuit) {
+      this.subcircuit_id = `subcircuit_${source_group3.source_group_id}`;
+      db.source_group.update(source_group3.source_group_id, {
+        subcircuit_id: this.subcircuit_id
+      });
+    }
+  }
+  doInitialSourceRender() {
+    const { db } = this.root;
     for (const child of this.children) {
       db.source_component.update(child.source_component_id, {
         source_group_id: this.source_group_id
@@ -494306,30 +494366,38 @@ var Jumper = class extends NormalComponent {
 };
 var SolderJumper = class extends NormalComponent {
   schematicDimensions = null;
+  _getPinNumberFromBridgedPinName(pinName) {
+    const port = this.selectOne(`port.${pinName}`, {
+      type: "port"
+    });
+    return port?._parsedProps.pinNumber ?? null;
+  }
   get defaultInternallyConnectedPinNames() {
     return this._parsedProps.bridgedPins ?? [];
   }
   get config() {
-    let resolvedPinCount = this.props.pinCount;
+    const props = this._parsedProps ?? this.props;
+    let resolvedPinCount = props.pinCount;
     if (!resolvedPinCount) {
-      const nums = (this.props.bridgedPins ?? []).flat().map((p) => {
-        if (typeof p === "number")
-          return p;
-        if (p.startsWith("pin"))
-          return Number(p.slice(3));
-        return Number(p);
-      }).filter((n2) => !Number.isNaN(n2));
-      const maxPin = nums.length > 0 ? Math.max(...nums) : 0;
-      if (maxPin === 2 || maxPin === 3) {
-        resolvedPinCount = maxPin;
+      const nums = (props.bridgedPins ?? []).flat().map((p_str) => this._getPinNumberFromBridgedPinName(p_str)).filter((n2) => n2 !== null);
+      const maxPinFromBridged = nums.length > 0 ? Math.max(...nums) : 0;
+      const pinCountFromLabels = props.pinLabels ? Object.keys(props.pinLabels).length : 0;
+      const finalPinCount = Math.max(maxPinFromBridged, pinCountFromLabels);
+      if (finalPinCount === 2 || finalPinCount === 3) {
+        resolvedPinCount = finalPinCount;
       }
     }
     let symbolName = "";
-    if (resolvedPinCount)
+    if (resolvedPinCount) {
       symbolName += `solderjumper${resolvedPinCount}`;
-    if (Array.isArray(this.props.bridgedPins) && this.props.bridgedPins.length > 0) {
-      const pins = Array.from(new Set(this.props.bridgedPins.flat())).sort().join("");
-      symbolName += `_bridged${pins}`;
+    } else {
+      symbolName = "solderjumper";
+    }
+    if (Array.isArray(props.bridgedPins) && props.bridgedPins.length > 0) {
+      const pinNumbers = Array.from(new Set(props.bridgedPins.flat().map((pinName) => this._getPinNumberFromBridgedPinName(pinName)).filter((n2) => n2 !== null))).sort((a, b) => a - b);
+      if (pinNumbers.length > 0) {
+        symbolName += `_bridged${pinNumbers.join("")}`;
+      }
     }
     return {
       schematicSymbolName: symbolName,
@@ -495694,8 +495762,8 @@ var SchematicText = class extends PrimitiveComponent2 {
       font_size: props.fontSize,
       color: props.color || "#000000",
       position: {
-        x: props.schX,
-        y: props.schY
+        x: props.schX ?? 0,
+        y: props.schY ?? 0
       },
       rotation: props.schRotation ?? 0
     });
@@ -495895,7 +495963,7 @@ var SchematicBox = class extends PrimitiveComponent2 {
 var package_default3 = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.490",
+  version: "0.0.503",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -495927,7 +495995,7 @@ var package_default3 = {
     "@tscircuit/layout": "^0.0.28",
     "@tscircuit/log-soup": "^1.0.2",
     "@tscircuit/math-utils": "^0.0.18",
-    "@tscircuit/props": "^0.0.234",
+    "@tscircuit/props": "^0.0.238",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/simple-3d-svg": "^0.0.6",
@@ -496203,7 +496271,9 @@ var useChip = (pinLabels) => createUseComponent((props) => /* @__PURE__ */ impor
 var useDiode = createUseComponent((props) => /* @__PURE__ */ import_jsx_runtime4.jsx("diode", { ...props }), diodePins);
 var useLed = createUseComponent((props) => /* @__PURE__ */ import_jsx_runtime5.jsx("led", { ...props }), ledPins);
 var useResistor = createUseComponent((props) => /* @__PURE__ */ import_jsx_runtime6.jsx("resistor", { ...props }), resistorPins);
-var sel = new Proxy({}, {
+var sel = new Proxy((refdes) => new Proxy({}, {
+  get: (_, pin) => `.${refdes} > .${pin}`
+}), {
   get: (_, prop1) => {
     const fn = (...args) => {
       const chipFnOrPinType = args[0];
@@ -496240,7 +496310,8 @@ var sel = new Proxy({}, {
         return new Proxy({}, {
           get: (_3, pinOrSubComponentName) => {
             const pinResult = `.${prop1} > .${pinOrSubComponentName}`;
-            if (prop1.startsWith("U")) {
+            const chipPrefixes = ["U", "J", "CN"];
+            if (chipPrefixes.some((p) => prop1.startsWith(p))) {
               return pinResult;
             }
             return new Proxy(new String(pinResult), {
@@ -497486,15 +497557,15 @@ var setupDefaultEntrypointIfNeeded = (opts) => {
       opts.mainComponentPath = "index.ts";
     } else if (Object.keys(opts.fsMap).filter((k) => k.endsWith(".tsx")).length === 1) {
       opts.mainComponentPath = Object.keys(opts.fsMap)[0];
-    } else if ("tscircuit.config.js" in opts.fsMap) {
-      const configContent = opts.fsMap["tscircuit.config.js"];
+    } else if ("tscircuit.config.json" in opts.fsMap) {
+      const configContent = opts.fsMap["tscircuit.config.json"];
       try {
         const config = JSON.parse(configContent);
         if (config.mainEntrypoint) {
-          opts.mainComponentPath = config.mainEntrypoint;
+          opts.entrypoint = config.mainEntrypoint;
         }
       } catch (e) {
-        console.warn("Failed to parse tscircuit.config.js:", e);
+        console.warn("Failed to parse tscircuit.config.json:", e);
       }
     } else {
       throw new Error("Either entrypoint or mainComponentPath must be provided (no index file, could not infer entrypoint)");
@@ -498761,20 +498832,10 @@ var snapshotProject = async ({
       ignore
     });
     files = boardFiles.map((f) => path26.join(projectDir, f));
-    const entry = await getEntrypoint({
-      projectDir,
-      onError,
-      onSuccess: () => {}
-    });
-    if (entry) {
-      const resolved = path26.resolve(projectDir, entry);
-      if (!files.includes(resolved)) {
-        files.unshift(resolved);
-      }
-    }
   }
   if (files.length === 0) {
-    return onExit(1);
+    console.log("No entrypoint found. Run 'tsci init' to bootstrap a basic project or specify a file with 'tsci snapshot <file>'");
+    return onExit(0);
   }
   const mismatches = [];
   for (const file of files) {
@@ -498814,7 +498875,9 @@ var snapshotProject = async ({
   if (mismatches.length > 0) {
     onError(`Snapshot mismatch:
 ${mismatches.join(`
-`)}`);
+`)}
+
+Run with --update to fix.`);
     return onExit(1);
   }
   onSuccess("All snapshots match");
@@ -498875,6 +498938,7 @@ jobs:
 on:
   push:
     branches: [main]
+  pull_request:
 
 jobs:
   snapshot:
@@ -498883,14 +498947,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
       - run: bun install
-      - run: bunx tsci snapshot --update
-      - name: Commit snapshots
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add .
-          git commit -m "Update snapshots" || echo "No changes to commit"
-          git push
+      - run: bunx tsci snapshot
 `;
   writeFileIfNotExists(path27.join(workflowsDir, "tscircuit-build.yml"), buildWorkflow);
   writeFileIfNotExists(path27.join(workflowsDir, "tscircuit-snapshot.yml"), snapshotWorkflow);
@@ -498907,7 +498964,7 @@ var registerSetup = (program3) => {
         {
           title: "GitHub Action",
           value: "github-action",
-          description: "Automatically build, check and commit snapshots to the main branch",
+          description: "Automatically build and check snapshots on push/pull-request",
           selected: true
         }
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.142",
+  "version": "0.1.144",
   "main": "dist/main.js",
   "devDependencies": {
     "@babel/standalone": "^7.26.9",
@@ -45,7 +45,7 @@
     "redaxios": "^0.5.1",
     "semver": "^7.6.3",
     "tempy": "^3.1.0",
-    "tscircuit": "^0.0.500",
+    "tscircuit": "^0.0.502",
     "typed-ky": "^0.0.4"
   },
   "peerDependencies": {