@tscircuit/core 0.0.1480 → 0.0.1482

package/dist/index.js

@@ -5145,6 +5145,14 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   const hasSheetLocalSchematicPortRepresentation = portsWithPosition.some(
     ({ port, schematic_port_id }) => port.schematic_port_id !== schematic_port_id
   );
+  const connectedSchematicPorts = portsWithPosition.map(({ schematic_port_id }) => db.schematic_port.get(schematic_port_id)).filter((port) => Boolean(port));
+  const [firstSchematicPort, secondSchematicPort] = connectedSchematicPorts;
+  const firstIsInternalAndSecondOverlaps = firstSchematicPort?.is_internal_circuit_port && secondSchematicPort?.is_overlapping_internal_circuit_port;
+  const secondIsInternalAndFirstOverlaps = secondSchematicPort?.is_internal_circuit_port && firstSchematicPort?.is_overlapping_internal_circuit_port;
+  const isInternalCircuitPortMapping = connectedSchematicPorts.length === 2 && (firstIsInternalAndSecondOverlaps || secondIsInternalAndFirstOverlaps);
+  if (isInternalCircuitPortMapping) {
+    return;
+  }
   const portPairKey = portIds.join(",");
   const board = trace.root?._getBoard();
   if (board?._connectedSchematicPortPairs) {
@@ -9716,6 +9724,62 @@ var getNetNameFromSourcePorts = (db, sourcePortIds) => {
   return [...new Set(portNames)].join("/");
 };
 
+// lib/components/primitive-components/Port/internalCircuitPortMapping.ts
+var getInternalCircuitAncestor = (port) => {
+  let ancestor = port.parent;
+  while (ancestor) {
+    if (ancestor.componentName === "InternalCircuit") return ancestor;
+    ancestor = ancestor.parent;
+  }
+  return null;
+};
+var isInternalCircuitPort = (port) => getInternalCircuitAncestor(port) !== null;
+var getConnectionTargets2 = (target) => {
+  if (!target) return [];
+  return typeof target === "string" ? [target] : [...target];
+};
+var getChipPortsMappedToInternalCircuitPort = (internalCircuitPort) => {
+  const internalCircuit = getInternalCircuitAncestor(internalCircuitPort);
+  const containingChip = internalCircuit?.parent;
+  if (!internalCircuit || !containingChip) return [];
+  const internalComponent = internalCircuitPort.getParentNormalComponent();
+  const connections = internalComponent?._parsedProps?.connections;
+  if (!connections) return [];
+  const mappedChipPorts = [];
+  for (const [portName, target] of Object.entries(connections)) {
+    if (!internalCircuitPort.isMatchingAnyOf([portName])) continue;
+    for (const targetSelector of getConnectionTargets2(target)) {
+      const targetPort = internalCircuitPort.getSubcircuit().selectOne(targetSelector, { type: "port" });
+      if (!targetPort) continue;
+      if (targetPort.getParentNormalComponent() !== containingChip) continue;
+      if (!mappedChipPorts.includes(targetPort)) {
+        mappedChipPorts.push(targetPort);
+      }
+    }
+  }
+  return mappedChipPorts;
+};
+var isInternalCircuitPortMappedToChipPort = (port) => getChipPortsMappedToInternalCircuitPort(port).length > 0;
+var getInternalCircuitPortMappedToChipPort = (chipPort) => {
+  const chipComponent = chipPort.getParentNormalComponent();
+  if (!chipComponent) return null;
+  const internalCircuit = chipComponent.children.find(
+    (child) => child.componentName === "InternalCircuit"
+  );
+  if (!internalCircuit) return null;
+  const mappedInternalCircuitPorts = internalCircuit.getDescendants().filter((component) => component.componentName === "Port").map((component) => component).filter(
+    (internalCircuitPort) => getChipPortsMappedToInternalCircuitPort(internalCircuitPort).includes(
+      chipPort
+    )
+  );
+  if (mappedInternalCircuitPorts.length > 1) {
+    throw new Error(
+      `${chipPort.getString()} is mapped to multiple internal circuit ports: ${mappedInternalCircuitPorts.map((port) => port.getString()).join(", ")}. A chip port can overlap only one internal circuit port.`
+    );
+  }
+  return mappedInternalCircuitPorts[0] ?? null;
+};
+
 // lib/components/primitive-components/Port/Port.ts
 var Port = class extends PrimitiveComponent2 {
   source_port_id = null;
@@ -9835,6 +9899,10 @@ var Port = class extends PrimitiveComponent2 {
    * are rendered properly.
    */
   _hasSchematicPort() {
+    const mappedInternalPort = getInternalCircuitPortMappedToChipPort(this);
+    if (mappedInternalPort) {
+      return mappedInternalPort._hasSchematicPort();
+    }
     const { schX, schY } = this._parsedProps;
     if (schX !== void 0 && schY !== void 0) {
       return true;
@@ -9858,6 +9926,10 @@ var Port = class extends PrimitiveComponent2 {
     return false;
   }
   _getGlobalSchematicPositionBeforeLayout() {
+    const mappedInternalPort = getInternalCircuitPortMappedToChipPort(this);
+    if (mappedInternalPort) {
+      return mappedInternalPort._getGlobalSchematicPositionBeforeLayout();
+    }
     const { schX, schY } = this._parsedProps;
     if (schX !== void 0 && schY !== void 0) {
       return { x: schX, y: schY };
@@ -10164,16 +10236,21 @@ var Port = class extends PrimitiveComponent2 {
     if (collapsedAncestor && this.parent !== collapsedAncestor) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const { schX, schY } = props;
-    const container = schX !== void 0 && schY !== void 0 ? this.getParentNormalComponent() : this.getPrimitiveContainer();
+    const mappedInternalPort = getInternalCircuitPortMappedToChipPort(this);
+    const schematicPlacementPort = mappedInternalPort ?? this;
+    const schematicPlacementProps = schematicPlacementPort._parsedProps;
+    const { schX, schY } = schematicPlacementProps;
+    const container = schX !== void 0 && schY !== void 0 ? schematicPlacementPort.getParentNormalComponent() : schematicPlacementPort.getPrimitiveContainer();
     if (!container) return;
     if (!this._hasSchematicPort()) return;
     const containerCenter = container._getGlobalSchematicPositionBeforeLayout();
-    const portCenter = this._getGlobalSchematicPositionBeforeLayout();
+    const portCenter = schematicPlacementPort._getGlobalSchematicPositionBeforeLayout();
     let localPortInfo = null;
     const containerDims = container._getSchematicBoxDimensions();
-    if (containerDims && props.pinNumber !== void 0) {
-      localPortInfo = containerDims.getPortPositionByPinNumber(props.pinNumber);
+    if (containerDims && schematicPlacementProps.pinNumber !== void 0) {
+      localPortInfo = containerDims.getPortPositionByPinNumber(
+        schematicPlacementProps.pinNumber
+      );
     }
     if (this.getSubcircuit().props._schDebugObjectsEnabled) {
       db.schematic_debug_object.insert({
@@ -10186,11 +10263,11 @@ var Port = class extends PrimitiveComponent2 {
         label: "obstacle"
       });
     }
-    const isExplicitCustomSymbolPort = schX !== void 0 && schY !== void 0 && !!this._getSymbolAncestor();
+    const isExplicitCustomSymbolPort = schX !== void 0 && schY !== void 0 && !!schematicPlacementPort._getSymbolAncestor();
     if (!localPortInfo?.side) {
       this.facingDirection = getRelativeDirection(containerCenter, portCenter);
-      if (isExplicitCustomSymbolPort && props.direction) {
-        this.facingDirection = props.direction;
+      if (isExplicitCustomSymbolPort && schematicPlacementProps.direction) {
+        this.facingDirection = schematicPlacementProps.direction;
       }
     } else {
       this.facingDirection = {
@@ -10201,20 +10278,24 @@ var Port = class extends PrimitiveComponent2 {
       }[localPortInfo.side];
     }
     const bestDisplayPinLabel = this._getBestDisplayPinLabel();
-    const parentNormalComponent = this.getParentNormalComponent();
-    const sideOfComponent = localPortInfo?.side ?? (props.direction === "up" ? "top" : props.direction === "down" ? "bottom" : props.direction);
+    const parentNormalComponent = schematicPlacementPort.getParentNormalComponent();
+    const sideOfComponent = localPortInfo?.side ?? (schematicPlacementProps.direction === "up" ? "top" : schematicPlacementProps.direction === "down" ? "bottom" : schematicPlacementProps.direction);
+    const isInternalPort = isInternalCircuitPort(this);
+    const isMappedInternalPort = isInternalPort && isInternalCircuitPortMappedToChipPort(this);
     const schematicPortInsertProps = {
       type: "schematic_port",
       schematic_component_id: parentNormalComponent?.schematic_component_id,
       center: portCenter,
       source_port_id: this.source_port_id,
       facing_direction: this.facingDirection,
-      distance_from_component_edge: props.schStemLength ?? 0.4,
+      distance_from_component_edge: schematicPlacementProps.schStemLength ?? 0.4,
       side_of_component: sideOfComponent,
       pin_number: props.pinNumber,
       true_ccw_index: localPortInfo?.trueIndex,
       display_pin_label: bestDisplayPinLabel,
-      is_connected: false,
+      is_connected: mappedInternalPort !== null || isMappedInternalPort,
+      is_internal_circuit_port: isInternalPort ? true : void 0,
+      is_overlapping_internal_circuit_port: mappedInternalPort !== null ? true : void 0,
       schematic_sheet_id: this._resolveSchematicSheetId()
     };
     for (const attributes of this._getMatchingPinAttributes()) {
@@ -10227,8 +10308,8 @@ var Port = class extends PrimitiveComponent2 {
     }
     const schematic_port = db.schematic_port.insert(schematicPortInsertProps);
     this.schematic_port_id = schematic_port.schematic_port_id;
-    if (props.schStemLength !== void 0 && props.schStemLength !== 0) {
-      const { schStemLength, direction } = props;
+    if (!mappedInternalPort && schematicPlacementProps.schStemLength !== void 0 && schematicPlacementProps.schStemLength !== 0) {
+      const { schStemLength, direction } = schematicPlacementProps;
       let x2 = portCenter.x;
       let y2 = portCenter.y;
       if (direction === "right") x2 -= schStemLength;
@@ -10252,7 +10333,9 @@ var Port = class extends PrimitiveComponent2 {
   doInitialSchematicSymbolResize() {
     if (this.root?.schematicDisabled) return;
     if (!this.schematic_port_id) return;
-    const symbol = this._getSymbolAncestor();
+    const mappedInternalPort = getInternalCircuitPortMappedToChipPort(this);
+    const schematicPlacementPort = mappedInternalPort ?? this;
+    const symbol = schematicPlacementPort._getSymbolAncestor();
     const transform = symbol?.getUserCoordinateToResizedSymbolTransform();
     if (!transform) return;
     const { db } = this.root;
@@ -19738,9 +19821,9 @@ function convertTreeToMatchPackInputProblem(tree, db, group, opts = {}) {
       const component = group.children.find(
         (groupChild) => groupChild.source_component_id === child.sourceComponent?.source_component_id
       );
-      const ports = db.schematic_port.list({
+      const portsDefiningLayout = db.schematic_port.list({
         schematic_component_id: schematicComponent.schematic_component_id
-      });
+      }).filter((port) => !port.is_overlapping_internal_circuit_port);
       let availableRotations = [
         ...DEFAULT_AVAILABLE_ROTATIONS
       ];
@@ -19760,7 +19843,10 @@ function convertTreeToMatchPackInputProblem(tree, db, group, opts = {}) {
         availableRotations = [0];
       }
       if (availableRotations.length === DEFAULT_AVAILABLE_ROTATIONS.length) {
-        const forcedRotation = getPowerGroundForcedRotation(db, ports);
+        const forcedRotation = getPowerGroundForcedRotation(
+          db,
+          portsDefiningLayout
+        );
         if (forcedRotation !== null) availableRotations = [forcedRotation];
       }
       const ccwRotationDegrees = availableRotations.length === 1 ? availableRotations[0] : 0;
@@ -19783,7 +19869,7 @@ function convertTreeToMatchPackInputProblem(tree, db, group, opts = {}) {
           }
         }
       };
-      for (const port of ports) {
+      for (const port of portsDefiningLayout) {
         const sourcePort = db.source_port.get(port.source_port_id);
         if (!sourcePort) continue;
         const pinId = `${chipId}.${sourcePort.pin_number || sourcePort.name || port.schematic_port_id}`;
@@ -19832,10 +19918,10 @@ function convertTreeToMatchPackInputProblem(tree, db, group, opts = {}) {
         );
         const groupPins = [];
         for (const comp of groupComponents) {
-          const ports = db.schematic_port.list({
+          const portsDefiningLayout = db.schematic_port.list({
             schematic_component_id: comp.schematic_component_id
-          });
-          for (const port of ports) {
+          }).filter((port) => !port.is_overlapping_internal_circuit_port);
+          for (const port of portsDefiningLayout) {
             const sourcePort = db.source_port.get(port.source_port_id);
             if (!sourcePort) continue;
             const pinId = `${groupId}.${sourcePort.pin_number || sourcePort.name || port.schematic_port_id}`;
@@ -20751,8 +20837,9 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     });
     for (const schematicPort of schematicPorts) {
       const sourcePort = db.source_port.get(schematicPort.source_port_id);
+      const portSourceComponent = sourcePort?.source_component_id ? db.source_component.get(sourcePort.source_component_id) : void 0;
       const selector = getSchematicPortSelector({
-        componentName: sourceComponent?.name ?? schematicComponent.schematic_component_id,
+        componentName: portSourceComponent?.name ?? sourceComponent?.name ?? schematicComponent.schematic_component_id,
         schematicPort,
         sourcePort
       });
@@ -20833,6 +20920,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
   }
   const directConnections = [];
   const connectedPairKeys = /* @__PURE__ */ new Set();
+  const internalCircuitPortIdsRepresentedByChipPorts = /* @__PURE__ */ new Set();
   const connKeysWithExplicitPortNetTraces = /* @__PURE__ */ new Set();
   for (const sourceTrace of tracesInScope) {
     if (sourceTrace?.subcircuit_connectivity_map_key && (sourceTrace.connected_source_port_ids?.length ?? 0) > 0 && (sourceTrace.connected_source_net_ids?.length ?? 0) > 0) {
@@ -20860,6 +20948,16 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
         }
         const portA = db.schematic_port.get(a);
         const portB = db.schematic_port.get(b);
+        const portAIsInternalAndPortBOverlaps = portA?.is_internal_circuit_port && portB?.is_overlapping_internal_circuit_port;
+        const portBIsInternalAndPortAOverlaps = portB?.is_internal_circuit_port && portA?.is_overlapping_internal_circuit_port;
+        const isInternalCircuitPortMapping = portAIsInternalAndPortBOverlaps || portBIsInternalAndPortAOverlaps;
+        if (portA && portB && isInternalCircuitPortMapping) {
+          const internalCircuitPort = portA.is_internal_circuit_port ? portA : portB;
+          internalCircuitPortIdsRepresentedByChipPorts.add(
+            internalCircuitPort.schematic_port_id
+          );
+          continue;
+        }
         let portDistance = 0;
         if (portA && portB) {
           portDistance = Math.sqrt(
@@ -20894,6 +20992,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
   }
   const connKeyToPinIds = /* @__PURE__ */ new Map();
   for (const [schId, srcPortId] of schPortIdToSourcePortId) {
+    if (internalCircuitPortIdsRepresentedByChipPorts.has(schId)) continue;
     const sp = db.source_port.get(srcPortId);
     if (!sp?.subcircuit_connectivity_map_key) continue;
     const connKey = sp.subcircuit_connectivity_map_key;
@@ -22978,7 +23077,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1479",
+  version: "0.0.1481",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23011,7 +23110,7 @@ var package_default = {
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
-    "@tscircuit/capacity-autorouter": "^0.0.696",
+    "@tscircuit/capacity-autorouter": "^0.0.710",
     "@tscircuit/checks": "0.0.145",
     "@tscircuit/circuit-json-util": "^0.0.97",
     "@tscircuit/common": "^0.0.20",
@@ -23042,7 +23141,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.450",
+    "circuit-json": "^0.0.451",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.107",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1480",
+  "version": "0.0.1482",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -34,7 +34,7 @@
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "0.0.25",
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
-    "@tscircuit/capacity-autorouter": "^0.0.696",
+    "@tscircuit/capacity-autorouter": "^0.0.710",
     "@tscircuit/checks": "0.0.145",
     "@tscircuit/circuit-json-util": "^0.0.97",
     "@tscircuit/common": "^0.0.20",
@@ -65,7 +65,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.450",
+    "circuit-json": "^0.0.451",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.107",