@tscircuit/core 0.0.1474 → 0.0.1475

package/dist/index.js

@@ -19665,7 +19665,15 @@ function getTreeChildChipId(child, index) {
   }
   return null;
 }
-function convertTreeToMatchPackInputProblem(tree, db, group) {
+var getSchematicComponentForSourceComponent = ({
+  db,
+  sourceComponentId,
+  schematicSheetId
+}) => db.schematic_component.getWhere({
+  source_component_id: sourceComponentId,
+  ...schematicSheetId ? { schematic_sheet_id: schematicSheetId } : {}
+});
+function convertTreeToMatchPackInputProblem(tree, db, group, opts = {}) {
   const problem = {
     chipMap: {},
     chipPinMap: {},
@@ -19699,8 +19707,10 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
     }
     if (child.nodeType === "component" && child.sourceComponent) {
       const chipId = getTreeChildChipId(child, index);
-      const schematicComponent = db.schematic_component.getWhere({
-        source_component_id: child.sourceComponent.source_component_id
+      const schematicComponent = getSchematicComponentForSourceComponent({
+        db,
+        sourceComponentId: child.sourceComponent.source_component_id,
+        schematicSheetId: opts.schematicSheetId
       });
       if (!schematicComponent) return;
       const component = group.children.find(
@@ -19980,7 +19990,7 @@ function convertTreeToMatchPackInputProblem(tree, db, group) {
   }
   return { inputProblem: problem, nestedGroupMatchpackProxyMap };
 }
-function applySchematicMatchPackLayoutToTree(group, tree) {
+function applySchematicMatchPackLayoutToTree(group, tree, opts = {}) {
   const { db } = group.root;
   debug6(
     `[${group.name}] Starting matchpack layout with ${tree.childNodes.length} children`
@@ -19993,7 +20003,7 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
     return;
   }
   debug6("Converting circuit tree to InputProblem...");
-  const { inputProblem, nestedGroupMatchpackProxyMap } = convertTreeToMatchPackInputProblem(tree, db, group);
+  const { inputProblem, nestedGroupMatchpackProxyMap } = convertTreeToMatchPackInputProblem(tree, db, group, opts);
   if (debug6.enabled) {
     group.root?.emit("debug:logOutput", {
       type: "debug:logOutput",
@@ -20080,8 +20090,10 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
         debug6(`Skipping position update for fixed chip ${chipId}`);
         continue;
       }
-      const schematicComponent = db.schematic_component.getWhere({
-        source_component_id: treeNode.sourceComponent.source_component_id
+      const schematicComponent = getSchematicComponentForSourceComponent({
+        db,
+        sourceComponentId: treeNode.sourceComponent.source_component_id,
+        schematicSheetId: opts.schematicSheetId
       });
       if (schematicComponent) {
         debug6(`Moving component ${chipId} to (${newCenter.x}, ${newCenter.y})`);
@@ -20228,9 +20240,9 @@ function applySchematicMatchPackLayoutToTree(group, tree) {
 import {
   getCircuitJsonTree as getCircuitJsonTree2
 } from "@tscircuit/circuit-json-util";
-function getSchematicSheetIdByGroupId({
+function getSchematicSheetIdBySourceGroupId({
   circuitJson,
-  sheetIdBySourceComponentId
+  schematicSheetIdBySourceComponentId
 }) {
   const parentBySourceGroupId = /* @__PURE__ */ new Map();
   for (const element of circuitJson) {
@@ -20241,34 +20253,36 @@ function getSchematicSheetIdByGroupId({
       );
     }
   }
-  const sheetIdByGroupId = /* @__PURE__ */ new Map();
+  const schematicSheetIdBySourceGroupId = /* @__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);
+    const schematicSheetId = schematicSheetIdBySourceComponentId.get(
+      element.source_component_id
+    );
+    if (schematicSheetId === void 0) continue;
+    let sourceGroupId = element.source_group_id;
+    while (sourceGroupId && !schematicSheetIdBySourceGroupId.has(sourceGroupId)) {
+      schematicSheetIdBySourceGroupId.set(sourceGroupId, schematicSheetId);
+      sourceGroupId = parentBySourceGroupId.get(sourceGroupId);
     }
   }
-  return sheetIdByGroupId;
+  return schematicSheetIdBySourceGroupId;
 }
 function getCircuitJsonScopedToSchematicSheet({
   circuitJson,
-  sheetId,
+  schematicSheetId,
   rootSourceGroupId,
-  sheetIdBySourceComponentId,
-  sheetIdByGroupId
+  schematicSheetIdBySourceComponentId,
+  schematicSheetIdBySourceGroupId
 }) {
-  const isGroupOnSheet = (sourceGroupId) => sourceGroupId === rootSourceGroupId || sheetIdByGroupId.get(sourceGroupId) === sheetId;
+  const isGroupOnSheet = (sourceGroupId) => sourceGroupId === rootSourceGroupId || schematicSheetIdBySourceGroupId.get(sourceGroupId) === schematicSheetId;
   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) {
+      if (schematicSheetIdBySourceComponentId.get(element.source_component_id) !== schematicSheetId) {
         return false;
       }
       return element.source_group_id ? isGroupOnSheet(element.source_group_id) : true;
@@ -20278,36 +20292,44 @@ function getCircuitJsonScopedToSchematicSheet({
 }
 function getSchematicCircuitJsonTrees(circuitJson, opts) {
   const { source_group_id } = opts;
-  const sheetIdBySourceComponentId = /* @__PURE__ */ new Map();
+  const schematicSheetIdBySourceComponentId = /* @__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(
+    schematicSheetIdBySourceComponentId.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 schematicSheetIds = new Set(
+    schematicSheetIdBySourceComponentId.values()
+  );
+  if (schematicSheetIds.size <= 1) {
+    return [
+      {
+        tree: getCircuitJsonTree2(circuitJson, { source_group_id }),
+        schematicSheetId: schematicSheetIds.values().next().value
+      }
+    ];
   }
-  const sheetIdByGroupId = getSchematicSheetIdByGroupId({
+  const schematicSheetIdBySourceGroupId = getSchematicSheetIdBySourceGroupId({
     circuitJson,
-    sheetIdBySourceComponentId
+    schematicSheetIdBySourceComponentId
   });
-  return Array.from(sheetIds).map(
-    (sheetId) => getCircuitJsonTree2(
+  return Array.from(schematicSheetIds).map((schematicSheetId) => ({
+    tree: getCircuitJsonTree2(
       getCircuitJsonScopedToSchematicSheet({
         circuitJson,
-        sheetId,
+        schematicSheetId,
         rootSourceGroupId: source_group_id,
-        sheetIdBySourceComponentId,
-        sheetIdByGroupId
+        schematicSheetIdBySourceComponentId,
+        schematicSheetIdBySourceGroupId
       }),
       { source_group_id }
-    )
-  );
+    ),
+    schematicSheetId
+  }));
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutMatchPack.ts
@@ -20316,8 +20338,8 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
   const trees = getSchematicCircuitJsonTrees(db.toArray(), {
     source_group_id: group.source_group_id
   });
-  for (const tree of trees) {
-    applySchematicMatchPackLayoutToTree(group, tree);
+  for (const { tree, schematicSheetId } of trees) {
+    applySchematicMatchPackLayoutToTree(group, tree, { schematicSheetId });
   }
 }
 
@@ -22889,7 +22911,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1473",
+  version: "0.0.1474",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -32741,7 +32763,7 @@ var TestPoint = class extends NormalComponent3 {
   }
 };
 
-// lib/components/primitive-components/SchematicBox.ts
+// lib/components/primitive-components/SchematicBox/SchematicBox.ts
 import { schematicBoxProps } from "@tscircuit/props";
 
 // lib/components/primitive-components/getTitleAnchorAndPosition.ts
@@ -32817,7 +32839,7 @@ function getTitleAnchorAndPosition({
   }
 }
 
-// lib/components/primitive-components/SchematicBox.ts
+// lib/components/primitive-components/SchematicBox/SchematicBox.ts
 var SchematicBox = class extends PrimitiveComponent2 {
   isSchematicPrimitive = true;
   get config() {

package/package.json

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