@tscircuit/core 0.0.1370 → 0.0.1372

package/dist/index.js

@@ -16044,8 +16044,24 @@ var getSimpleRouteJsonFromCircuitJson = ({
   }).filter((c) => c !== null);
   const source_nets = db.source_net.list().filter((e) => !subcircuit_id || e.subcircuit_id === subcircuit_id);
   const connectionsFromNets = [];
+  const connectionFromNetId = /* @__PURE__ */ new Map();
+  const handledNetConnectivityKeys = /* @__PURE__ */ new Set();
+  const sourceTraces = db.source_trace.list();
+  const getSourceConnectivityKey = (id) => id ? connMap.getNetConnectedToId(id) ?? id : null;
   for (const net of source_nets) {
-    const connectedSourceTraces = db.source_trace.list().filter((st) => st.connected_source_net_ids?.includes(net.source_net_id));
+    const netConnectivityKey = getSourceConnectivityKey(net.source_net_id);
+    if (!netConnectivityKey || handledNetConnectivityKeys.has(netConnectivityKey)) {
+      continue;
+    }
+    handledNetConnectivityKeys.add(netConnectivityKey);
+    const connectedSourceNetIds = source_nets.filter(
+      (sourceNet) => getSourceConnectivityKey(sourceNet.source_net_id) === netConnectivityKey
+    ).map((sourceNet) => sourceNet.source_net_id);
+    const connectedSourceTraces = sourceTraces.filter(
+      (st) => [st.source_trace_id, ...st.connected_source_net_ids ?? []].some(
+        (id) => getSourceConnectivityKey(id) === netConnectivityKey
+      )
+    );
     let nominalTraceWidthFromConnectedTraces;
     for (const sourceTrace of connectedSourceTraces) {
       if (sourceTrace.min_trace_thickness === void 0) continue;
@@ -16070,12 +16086,16 @@ var getSimpleRouteJsonFromCircuitJson = ({
         });
       }
     }
-    connectionsFromNets.push({
+    const connection = {
       name: net.source_net_id ?? connMap.getNetConnectedToId(net.source_net_id),
       nominalTraceWidth: nominalTraceWidthFromConnectedTraces,
       width: nominalTraceWidthFromConnectedTraces,
       pointsToConnect
-    });
+    };
+    connectionsFromNets.push(connection);
+    for (const sourceNetId of connectedSourceNetIds) {
+      connectionFromNetId.set(sourceNetId, connection);
+    }
   }
   const connectionsFromBreakoutPoints = [];
   for (const bp of breakoutPoints) {
@@ -16110,7 +16130,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       continue;
     }
     if (bp.source_net_id) {
-      const conn = connectionsFromNets.find((c) => c.name === bp.source_net_id);
+      const conn = connectionFromNetId.get(bp.source_net_id);
       if (conn) {
         conn.pointsToConnect.push(pt);
       } else {
@@ -18192,9 +18212,6 @@ function Group_doInitialSchematicLayoutMatchAdapt(group) {
   }
 }
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchPack.ts
-import { getCircuitJsonTree as getCircuitJsonTree2 } from "@tscircuit/circuit-json-util";
-
 // lib/components/primitive-components/Group/applySchematicMatchPackLayoutToTree.ts
 import "@tscircuit/circuit-json-util";
 import { LayoutPipelineSolver } from "@tscircuit/matchpack";
@@ -19040,13 +19057,101 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
   debug6("Matchpack layout completed successfully");
 }
 
+// lib/components/primitive-components/Group/getSchematicCircuitJsonTrees.ts
+import {
+  getCircuitJsonTree as getCircuitJsonTree2
+} from "@tscircuit/circuit-json-util";
+function getSchematicSheetIdByGroupId({
+  circuitJson,
+  sheetIdBySourceComponentId
+}) {
+  const parentBySourceGroupId = /* @__PURE__ */ new Map();
+  for (const element of circuitJson) {
+    if (element.type === "source_group") {
+      parentBySourceGroupId.set(
+        element.source_group_id,
+        element.parent_source_group_id
+      );
+    }
+  }
+  const sheetIdByGroupId = /* @__PURE__ */ new Map();
+  for (const element of circuitJson) {
+    if (element.type !== "source_component") continue;
+    if (!element.source_group_id) continue;
+    const sheetId = sheetIdBySourceComponentId.get(element.source_component_id);
+    if (sheetId === void 0) continue;
+    let groupId = element.source_group_id;
+    while (groupId && !sheetIdByGroupId.has(groupId)) {
+      sheetIdByGroupId.set(groupId, sheetId);
+      groupId = parentBySourceGroupId.get(groupId);
+    }
+  }
+  return sheetIdByGroupId;
+}
+function getCircuitJsonScopedToSchematicSheet({
+  circuitJson,
+  sheetId,
+  rootSourceGroupId,
+  sheetIdBySourceComponentId,
+  sheetIdByGroupId
+}) {
+  const isGroupOnSheet = (sourceGroupId) => sourceGroupId === rootSourceGroupId || sheetIdByGroupId.get(sourceGroupId) === sheetId;
+  return circuitJson.filter((element) => {
+    if (element.type === "source_group") {
+      return isGroupOnSheet(element.source_group_id);
+    }
+    if (element.type === "source_component") {
+      if (sheetIdBySourceComponentId.get(element.source_component_id) !== sheetId) {
+        return false;
+      }
+      return element.source_group_id ? isGroupOnSheet(element.source_group_id) : true;
+    }
+    return true;
+  });
+}
+function getSchematicCircuitJsonTrees(circuitJson, opts) {
+  const { source_group_id } = opts;
+  const sheetIdBySourceComponentId = /* @__PURE__ */ new Map();
+  for (const element of circuitJson) {
+    if (element.type !== "schematic_component") continue;
+    if (!element.source_component_id) continue;
+    if (!element.schematic_sheet_id) continue;
+    sheetIdBySourceComponentId.set(
+      element.source_component_id,
+      element.schematic_sheet_id
+    );
+  }
+  const sheetIds = new Set(sheetIdBySourceComponentId.values());
+  if (sheetIds.size <= 1) {
+    return [getCircuitJsonTree2(circuitJson, { source_group_id })];
+  }
+  const sheetIdByGroupId = getSchematicSheetIdByGroupId({
+    circuitJson,
+    sheetIdBySourceComponentId
+  });
+  return Array.from(sheetIds).map(
+    (sheetId) => getCircuitJsonTree2(
+      getCircuitJsonScopedToSchematicSheet({
+        circuitJson,
+        sheetId,
+        rootSourceGroupId: source_group_id,
+        sheetIdBySourceComponentId,
+        sheetIdByGroupId
+      }),
+      { source_group_id }
+    )
+  );
+}
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchPack.ts
 function Group_doInitialSchematicLayoutMatchPack(group) {
   const { db } = group.root;
-  const tree = getCircuitJsonTree2(db.toArray(), {
+  const trees = getSchematicCircuitJsonTrees(db.toArray(), {
     source_group_id: group.source_group_id
   });
-  applySchematicMatchPackLayoutToTree(group, tree);
+  for (const tree of trees) {
+    applySchematicMatchPackLayoutToTree(group, tree);
+  }
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutSections.ts
@@ -23443,6 +23548,7 @@ var Group5 = class extends NormalComponent3 {
       const subcircuitComponentsByName = /* @__PURE__ */ new Map();
       for (const child of this.children) {
         if (child.isSubcircuit) continue;
+        if (child instanceof Trace3) continue;
         if (child._parsedProps.name) {
           const components = subcircuitComponentsByName.get(child._parsedProps.name) || [];
           components.push(child);
@@ -24575,7 +24681,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1369",
+  version: "0.0.1371",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -25682,15 +25788,17 @@ var Subcircuit = class extends Group5 {
       const parentNetSelector = `> net.${netName}`;
       const childNetSelector = `.${this.name} > net.${netName}`;
       const traceName = `exposed_net.${netName}`;
-      const parentHasDirectNet = parentSubcircuit.children.some(
+      const parentNet = parentSubcircuit.children.find(
         (child) => child instanceof Net && child._parsedProps.name === netName
       );
-      if (!parentHasDirectNet) {
+      if (!parentNet) {
         parentSubcircuit.add(new Net({ name: netName }));
       }
-      const existingTrace = parentSubcircuit.children.find(
-        (child) => child instanceof Trace3 && child._parsedProps.name === traceName
-      );
+      const existingTrace = parentSubcircuit.children.find((child) => {
+        if (!(child instanceof Trace3)) return false;
+        const childProps = child._parsedProps;
+        return childProps.name === traceName && childProps.from === childNetSelector && childProps.to === parentNetSelector;
+      });
       if (existingTrace) continue;
       parentSubcircuit.add(
         new Trace3({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1370",
+  "version": "0.0.1372",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",