@tscircuit/core 0.0.1476 → 0.0.1477

package/dist/index.d.ts

@@ -153330,6 +153330,7 @@ declare class SchematicBox extends PrimitiveComponent<typeof schematicBoxProps>
         }>;
         shouldRenderAsSchematicBox: boolean;
     };
+    doInitialSchematicComponentRender(): void;
     doInitialSchematicPrimitiveRender(): void;
 }
 

package/dist/index.js

@@ -5118,7 +5118,33 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   }
   const { netsWithSelectors } = trace._findConnectedNets();
   if (!allPortsFound) return;
-  const portIds = connectedPorts.map((p) => p.port.schematic_port_id).sort();
+  const resolveSchematicPortForSheet = (port) => {
+    if (schematicSheetId && port.source_port_id) {
+      const sheetSchematicPort = db.schematic_port.getWhere({
+        source_port_id: port.source_port_id,
+        schematic_sheet_id: schematicSheetId
+      });
+      if (sheetSchematicPort) return sheetSchematicPort;
+    }
+    if (!port.schematic_port_id) return null;
+    return db.schematic_port.get(port.schematic_port_id) ?? null;
+  };
+  const portsWithPosition = connectedPorts.flatMap(({ port }) => {
+    const schematicPort = resolveSchematicPortForSheet(port);
+    if (!schematicPort) return [];
+    return [
+      {
+        port,
+        position: schematicPort.center,
+        schematic_port_id: schematicPort.schematic_port_id,
+        facingDirection: schematicPort.facing_direction ?? null
+      }
+    ];
+  });
+  const portIds = portsWithPosition.map(({ schematic_port_id }) => schematic_port_id).sort();
+  const hasSheetLocalSchematicPortRepresentation = portsWithPosition.some(
+    ({ port, schematic_port_id }) => port.schematic_port_id !== schematic_port_id
+  );
   const portPairKey = portIds.join(",");
   const board = trace.root?._getBoard();
   if (board?._connectedSchematicPortPairs) {
@@ -5131,12 +5157,6 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     pointsToConnect: []
   };
   const obstacles = getSchematicObstaclesForTrace(trace);
-  const portsWithPosition = connectedPorts.filter(({ port }) => port.schematic_port_id !== null).map(({ port }) => ({
-    port,
-    position: port._getGlobalSchematicPositionAfterLayout(),
-    schematic_port_id: port.schematic_port_id ?? void 0,
-    facingDirection: port.facingDirection
-  }));
   const isPortAndNetConnection = portsWithPosition.length === 1 && netsWithSelectors.length === 1;
   if (isPortAndNetConnection) {
     const net = netsWithSelectors[0].net;
@@ -5221,7 +5241,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     });
     return;
   }
-  if (schematicNetLabelText) {
+  if (schematicNetLabelText && !hasSheetLocalSchematicPortRepresentation) {
     if ("from" in trace.props && "to" in trace.props || "path" in trace.props) {
       trace._doInitialSchematicTraceRenderWithDisplayLabel();
       return;
@@ -5355,7 +5375,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     });
     let results = autorouter.solveAndMapToTraces();
     if (results.length === 0) {
-      if (trace._isSymbolToChipConnection() || trace._isSymbolToSymbolConnection() || trace._isChipToChipConnection()) {
+      if (!hasSheetLocalSchematicPortRepresentation && (trace._isSymbolToChipConnection() || trace._isSymbolToSymbolConnection() || trace._isChipToChipConnection())) {
         trace._doInitialSchematicTraceRenderWithDisplayLabel();
         return;
       }
@@ -5420,7 +5440,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   if (!trace.source_trace_id) {
     throw new Error("Missing source_trace_id for schematic trace insertion.");
   }
-  if (trace.getSubcircuit()._parsedProps.schTraceAutoLabelEnabled && countComplexElements(junctions, edges) >= 5 && (trace._isSymbolToChipConnection() || trace._isSymbolToSymbolConnection() || trace._isChipToChipConnection())) {
+  if (!hasSheetLocalSchematicPortRepresentation && trace.getSubcircuit()._parsedProps.schTraceAutoLabelEnabled && countComplexElements(junctions, edges) >= 5 && (trace._isSymbolToChipConnection() || trace._isSymbolToSymbolConnection() || trace._isChipToChipConnection())) {
     trace._doInitialSchematicTraceRenderWithDisplayLabel();
     return;
   }
@@ -5432,10 +5452,8 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     schematic_sheet_id: schematicSheetId
   });
   trace.schematic_trace_id = dbTrace.schematic_trace_id;
-  for (const { port } of connectedPorts) {
-    if (port.schematic_port_id) {
-      db.schematic_port.update(port.schematic_port_id, { is_connected: true });
-    }
+  for (const { schematic_port_id } of portsWithPosition) {
+    db.schematic_port.update(schematic_port_id, { is_connected: true });
   }
   if (board?._connectedSchematicPortPairs)
     board._connectedSchematicPortPairs.add(portPairKey);
@@ -20244,9 +20262,9 @@ function applySchematicMatchPackLayoutToTree(group, tree, opts = {}) {
 import {
   getCircuitJsonTree as getCircuitJsonTree2
 } from "@tscircuit/circuit-json-util";
-function getSchematicSheetIdBySourceGroupId({
+function getSchematicSheetIdsBySourceGroupId({
   circuitJson,
-  schematicSheetIdBySourceComponentId
+  schematicSheetIdsBySourceComponentId
 }) {
   const parentBySourceGroupId = /* @__PURE__ */ new Map();
   for (const element of circuitJson) {
@@ -20257,36 +20275,45 @@ function getSchematicSheetIdBySourceGroupId({
       );
     }
   }
-  const schematicSheetIdBySourceGroupId = /* @__PURE__ */ new Map();
+  const schematicSheetIdsBySourceGroupId = /* @__PURE__ */ new Map();
   for (const element of circuitJson) {
     if (element.type !== "source_component") continue;
     if (!element.source_group_id) continue;
-    const schematicSheetId = schematicSheetIdBySourceComponentId.get(
+    const schematicSheetIds = schematicSheetIdsBySourceComponentId.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);
+    if (schematicSheetIds === void 0) continue;
+    for (const schematicSheetId of schematicSheetIds) {
+      let sourceGroupId = element.source_group_id;
+      const visitedSourceGroupIds = /* @__PURE__ */ new Set();
+      while (sourceGroupId && !visitedSourceGroupIds.has(sourceGroupId)) {
+        visitedSourceGroupIds.add(sourceGroupId);
+        const groupSchematicSheetIds = schematicSheetIdsBySourceGroupId.get(sourceGroupId) ?? /* @__PURE__ */ new Set();
+        groupSchematicSheetIds.add(schematicSheetId);
+        schematicSheetIdsBySourceGroupId.set(
+          sourceGroupId,
+          groupSchematicSheetIds
+        );
+        sourceGroupId = parentBySourceGroupId.get(sourceGroupId);
+      }
     }
   }
-  return schematicSheetIdBySourceGroupId;
+  return schematicSheetIdsBySourceGroupId;
 }
 function getCircuitJsonScopedToSchematicSheet({
   circuitJson,
   schematicSheetId,
   rootSourceGroupId,
-  schematicSheetIdBySourceComponentId,
-  schematicSheetIdBySourceGroupId
+  schematicSheetIdsBySourceComponentId,
+  schematicSheetIdsBySourceGroupId
 }) {
-  const isGroupOnSheet = (sourceGroupId) => sourceGroupId === rootSourceGroupId || schematicSheetIdBySourceGroupId.get(sourceGroupId) === schematicSheetId;
+  const isGroupOnSheet = (sourceGroupId) => sourceGroupId === rootSourceGroupId || schematicSheetIdsBySourceGroupId.get(sourceGroupId)?.has(schematicSheetId) === true;
   return circuitJson.filter((element) => {
     if (element.type === "source_group") {
       return isGroupOnSheet(element.source_group_id);
     }
     if (element.type === "source_component") {
-      if (schematicSheetIdBySourceComponentId.get(element.source_component_id) !== schematicSheetId) {
+      if (schematicSheetIdsBySourceComponentId.get(element.source_component_id)?.has(schematicSheetId) !== true) {
         return false;
       }
       return element.source_group_id ? isGroupOnSheet(element.source_group_id) : true;
@@ -20296,19 +20323,24 @@ function getCircuitJsonScopedToSchematicSheet({
 }
 function getSchematicCircuitJsonTrees(circuitJson, opts) {
   const { source_group_id } = opts;
-  const schematicSheetIdBySourceComponentId = /* @__PURE__ */ new Map();
+  const schematicSheetIdsBySourceComponentId = /* @__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;
-    schematicSheetIdBySourceComponentId.set(
+    const schematicSheetIds2 = schematicSheetIdsBySourceComponentId.get(element.source_component_id) ?? /* @__PURE__ */ new Set();
+    schematicSheetIds2.add(element.schematic_sheet_id);
+    schematicSheetIdsBySourceComponentId.set(
       element.source_component_id,
-      element.schematic_sheet_id
+      schematicSheetIds2
     );
   }
-  const schematicSheetIds = new Set(
-    schematicSheetIdBySourceComponentId.values()
-  );
+  const schematicSheetIds = /* @__PURE__ */ new Set();
+  for (const componentSchematicSheetIds of schematicSheetIdsBySourceComponentId.values()) {
+    for (const schematicSheetId of componentSchematicSheetIds) {
+      schematicSheetIds.add(schematicSheetId);
+    }
+  }
   if (schematicSheetIds.size <= 1) {
     return [
       {
@@ -20317,9 +20349,9 @@ function getSchematicCircuitJsonTrees(circuitJson, opts) {
       }
     ];
   }
-  const schematicSheetIdBySourceGroupId = getSchematicSheetIdBySourceGroupId({
+  const schematicSheetIdsBySourceGroupId = getSchematicSheetIdsBySourceGroupId({
     circuitJson,
-    schematicSheetIdBySourceComponentId
+    schematicSheetIdsBySourceComponentId
   });
   return Array.from(schematicSheetIds).map((schematicSheetId) => ({
     tree: getCircuitJsonTree2(
@@ -20327,8 +20359,8 @@ function getSchematicCircuitJsonTrees(circuitJson, opts) {
         circuitJson,
         schematicSheetId,
         rootSourceGroupId: source_group_id,
-        schematicSheetIdBySourceComponentId,
-        schematicSheetIdBySourceGroupId
+        schematicSheetIdsBySourceComponentId,
+        schematicSheetIdsBySourceGroupId
       }),
       { source_group_id }
     ),
@@ -20649,7 +20681,7 @@ var getSchematicPortSelector = ({
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/createSchematicTraceSolverInputProblem.ts
 var DEFAULT_MAX_MSP_PAIR_DISTANCE = 2.4;
 var SCHEMATIC_RAIL_NET_LABEL_HEIGHT = 0.42;
-function createSchematicTraceSolverInputProblem(group) {
+function createSchematicTraceSolverInputProblem(group, opts = {}) {
   const { db } = group.root;
   const connKeyToSourceNet = /* @__PURE__ */ new Map();
   const childGroups = [];
@@ -20669,7 +20701,9 @@ function createSchematicTraceSolverInputProblem(group) {
     group.schematic_group_id,
     ...childGroups.map((a) => a.schematic_group_id)
   ];
-  const schematicComponents = db.schematic_component.list().filter((a) => allSchematicGroupIds.includes(a.schematic_group_id));
+  const schematicComponents = db.schematic_component.list().filter((a) => allSchematicGroupIds.includes(a.schematic_group_id)).filter(
+    (schematicComponent) => opts.schematicSheetId === void 0 || schematicComponent.schematic_sheet_id === opts.schematicSheetId
+  );
   const schematicComponentIds = new Set(
     schematicComponents.map((component) => component.schematic_component_id)
   );
@@ -20811,8 +20845,8 @@ function createSchematicTraceSolverInputProblem(group) {
     if (st.subcircuit_id && !allowedSubcircuitIds.has(st.subcircuit_id)) {
       continue;
     }
-    const connected = (st.connected_source_port_ids ?? []).map((srcId) => sourcePortIdToSchPortId.get(srcId)).filter(
-      (sourcePortId) => Boolean(sourcePortId) && allSourceAndSchematicPortIdsInScope.has(sourcePortId)
+    const connected = (st.connected_source_port_ids ?? []).map((sourcePortId) => sourcePortIdToSchPortId.get(sourcePortId)).filter(
+      (schematicPortId) => Boolean(schematicPortId) && allSourceAndSchematicPortIdsInScope.has(schematicPortId)
     );
     if (connected.length >= 2) {
       const [a, b] = connected.slice(0, 2);
@@ -22086,10 +22120,10 @@ var getSchematicPortIdsWithRoutedTraces = ({
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/Group_doInitialSchematicTraceRender.ts
 var debug10 = Debug12("Group_doInitialSchematicTraceRender");
-var Group_doInitialSchematicTraceRender = (group) => {
-  if (!group.root?._featureMspSchematicTraceRouting) return;
-  if (!group.isSubcircuit) return;
-  if (group.root?.schematicDisabled) return;
+var renderSchematicTracesForSheet = ({
+  group,
+  schematicSheetId
+}) => {
   const {
     inputProblem,
     pinIdToSchematicPortId,
@@ -22098,7 +22132,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
     schPortIdToSourcePortId,
     userNetIdToConnKey,
     connKeysWithExplicitPortNetTraces
-  } = createSchematicTraceSolverInputProblem(group);
+  } = createSchematicTraceSolverInputProblem(group, { schematicSheetId });
   if (inputProblem.chips.length === 0) return;
   const schematicPortIdsWithPreExistingNetLabels = getSchematicPortIdsWithAssignedNetLabels(group);
   const hasRouteableSchematicConnections = inputProblem.directConnections.length > 0 || inputProblem.netConnections.length > 0;
@@ -22156,6 +22190,35 @@ var Group_doInitialSchematicTraceRender = (group) => {
     connKeyToSourceNet
   });
 };
+var Group_doInitialSchematicTraceRender = (group) => {
+  if (!group.root?._featureMspSchematicTraceRouting) return;
+  if (!group.isSubcircuit) return;
+  if (group.root?.schematicDisabled) return;
+  const schematicGroupIds = new Set(
+    [
+      group,
+      ...group.getDescendants().filter(
+        (component) => component instanceof Group
+      )
+    ].map((schematicGroup) => schematicGroup.schematic_group_id).filter(
+      (schematicGroupId) => Boolean(schematicGroupId)
+    )
+  );
+  const schematicSheetIds = new Set(
+    group.root.db.schematic_component.list().filter(
+      (schematicComponent) => schematicGroupIds.has(schematicComponent.schematic_group_id)
+    ).map((schematicComponent) => schematicComponent.schematic_sheet_id).filter(
+      (schematicSheetId) => Boolean(schematicSheetId)
+    )
+  );
+  if (schematicSheetIds.size === 0) {
+    renderSchematicTracesForSheet({ group });
+    return;
+  }
+  for (const schematicSheetId of schematicSheetIds) {
+    renderSchematicTracesForSheet({ group, schematicSheetId });
+  }
+};
 
 // lib/components/primitive-components/Group/Group_doInitialSimulationSpiceEngineRender.ts
 import { circuitJsonToSpice } from "circuit-json-to-spice";
@@ -22915,7 +22978,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1475",
+  version: "0.0.1476",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -33067,6 +33130,133 @@ function getTitleAnchorAndPosition({
   }
 }
 
+// lib/components/primitive-components/SchematicBox/SchematicBox_doInitialSchematicComponentRender.ts
+var getSchematicBoxPinLabels = (pinLabels) => {
+  if (!pinLabels) return [];
+  return Object.entries(pinLabels).map(([pinKey, pinLabel]) => {
+    const pinNumber = getPinNumberFromPinLabelsKey(pinKey);
+    if (pinNumber === null) {
+      throw new Error(
+        `Invalid schematicbox pinLabels key "${pinKey}". Expected pin<number>.`
+      );
+    }
+    const pinAliases = typeof pinLabel === "string" ? [pinLabel] : [...pinLabel];
+    return {
+      pinNumber,
+      displayPinLabel: pinAliases[0] ?? pinKey,
+      pinAliases
+    };
+  });
+};
+var SchematicBox_doInitialSchematicComponentRender = (schematicBox) => {
+  if (schematicBox.root?.schematicDisabled) return;
+  const { db } = schematicBox.root;
+  const props = schematicBox._parsedProps;
+  if (!props.chipRef) return;
+  const referencedChip = schematicBox.getSubcircuit().selectOne(props.chipRef);
+  if (!referencedChip?.source_component_id) {
+    throw new Error(
+      `Could not resolve chipRef "${props.chipRef}" for ${schematicBox.getString()}`
+    );
+  }
+  const schematicBoxPinLabels = getSchematicBoxPinLabels(props.pinLabels);
+  const pinLabelsByPinKey = Object.fromEntries(
+    schematicBoxPinLabels.map(({ pinNumber, displayPinLabel }) => [
+      `pin${pinNumber}`,
+      displayPinLabel
+    ])
+  );
+  const sourcePorts = db.source_port.list({
+    source_component_id: referencedChip.source_component_id
+  });
+  const dimensions = getAllDimensionsForSchematicBox({
+    schWidth: props.width,
+    schHeight: props.height,
+    schPinSpacing: 0.2,
+    pinCount: schematicBoxPinLabels.length,
+    schPortArrangement: props.schPinArrangement,
+    pinLabels: pinLabelsByPinKey
+  });
+  const center = schematicBox._getGlobalSchematicPositionBeforeLayout();
+  const size = dimensions.getSize();
+  const schematicSheetId = schematicBox._resolveSchematicSheetId();
+  const portLabels = Object.fromEntries(
+    schematicBoxPinLabels.map(({ pinNumber, displayPinLabel }) => [
+      String(pinNumber),
+      displayPinLabel
+    ])
+  );
+  const schematicComponent = db.schematic_component.insert({
+    center,
+    size,
+    source_component_id: referencedChip.source_component_id,
+    is_box_with_pins: true,
+    port_arrangement: underscorifyPortArrangement(props.schPinArrangement),
+    port_labels: portLabels,
+    pin_spacing: 0.2,
+    schematic_sheet_id: schematicSheetId
+  });
+  schematicBox.schematic_component_id = schematicComponent.schematic_component_id;
+  for (const {
+    pinNumber,
+    displayPinLabel,
+    pinAliases
+  } of schematicBoxPinLabels) {
+    const referencedSourcePort = sourcePorts.find(
+      (sourcePort) => pinAliases.some(
+        (pinAlias) => sourcePort.name === pinAlias || sourcePort.port_hints?.includes(pinAlias)
+      )
+    );
+    if (!referencedSourcePort) {
+      throw new Error(
+        `Could not find pin "${displayPinLabel}" on chipRef "${props.chipRef}"`
+      );
+    }
+    const portPosition = dimensions.getPortPositionByPinNumber(pinNumber);
+    if (!portPosition) {
+      throw new Error(
+        `Could not determine schematic position for ${schematicBox.getString()} pin${pinNumber}`
+      );
+    }
+    const facingDirection = {
+      left: "left",
+      right: "right",
+      top: "up",
+      bottom: "down"
+    }[portPosition.side];
+    db.schematic_port.insert({
+      schematic_component_id: schematicComponent.schematic_component_id,
+      center: {
+        x: center.x + portPosition.x,
+        y: center.y + portPosition.y
+      },
+      source_port_id: referencedSourcePort.source_port_id,
+      facing_direction: facingDirection,
+      distance_from_component_edge: 0.4,
+      side_of_component: portPosition.side,
+      pin_number: pinNumber,
+      true_ccw_index: portPosition.trueIndex,
+      display_pin_label: displayPinLabel,
+      is_connected: false,
+      schematic_sheet_id: schematicSheetId
+    });
+  }
+  const sectionName = props.name ?? props.chipRef;
+  db.schematic_text.insert({
+    text: sectionName,
+    schematic_component_id: schematicComponent.schematic_component_id,
+    anchor: "left",
+    rotation: 0,
+    position: {
+      x: center.x - size.width / 2,
+      y: center.y + size.height / 2 + 0.13
+    },
+    color: "#006464",
+    font_size: 0.18,
+    schematic_sheet_id: schematicSheetId
+  });
+};
+
 // lib/components/primitive-components/SchematicBox/SchematicBox.ts
 var SchematicBox = class extends PrimitiveComponent2 {
   isSchematicPrimitive = true;
@@ -33077,11 +33267,15 @@ var SchematicBox = class extends PrimitiveComponent2 {
       shouldRenderAsSchematicBox: true
     };
   }
+  doInitialSchematicComponentRender() {
+    SchematicBox_doInitialSchematicComponentRender(this);
+  }
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
     if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    if (props.chipRef) return;
     const basePadding = 0.6;
     const generalPadding = typeof props.padding === "number" ? props.padding : 0;
     const paddingTop = typeof props.paddingTop === "number" ? props.paddingTop : generalPadding;
@@ -33147,7 +33341,8 @@ var SchematicBox = class extends PrimitiveComponent2 {
       width,
       x,
       y,
-      is_dashed: props.strokeStyle === "dashed"
+      is_dashed: props.strokeStyle === "dashed",
+      schematic_sheet_id: this._resolveSchematicSheetId()
     });
     if (props.title) {
       const isInside = props.titleInside;

package/package.json

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