@tscircuit/core 0.0.1509 → 0.0.1511

package/dist/index.js

@@ -21074,6 +21074,10 @@ var oppositeSide = (input) => {
   }
 };
 
+// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/port-id-types.ts
+var asSchematicPortId = (id) => id;
+var asSourcePortId = (id) => id;
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyNetLabelPlacements.ts
 var debug8 = Debug10("Group_doInitialSchematicTraceRender");
 var isSameNet = (label, sourceNet) => label.source_net_id != null && label.source_net_id === sourceNet.source_net_id;
@@ -21098,7 +21102,6 @@ function applyNetLabelPlacements(args) {
     solver,
     connKeyToSourceNet,
     userNetIdToConnKey,
-    pinIdToSchematicPortId,
     connKeysWithExplicitPortNetTraces,
     schematicPortIdsWithPreExistingNetLabels,
     schematicPortIdsWithRoutedTraces
@@ -21157,9 +21160,7 @@ function applyNetLabelPlacements(args) {
     if (placementConnKey) {
       sourceNet = connKeyToSourceNet.get(placementConnKey);
     }
-    const schPortIds = placement.pinIds.map(
-      (pinId) => pinIdToSchematicPortId.get(pinId)
-    );
+    const schPortIds = placement.pinIds.map(asSchematicPortId);
     let schematicSheetId = group._resolveSchematicSheetId();
     const schematicPort = db.schematic_port.get(schPortIds[0]);
     if (schematicPort?.schematic_sheet_id) {
@@ -21618,10 +21619,6 @@ var getPortForSchematicSymbolPort = (port) => {
   ) ?? port;
 };
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/port-id-types.ts
-var asSchematicPortId = (id) => id;
-var asSourcePortId = (id) => id;
-
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/remove-overlapping-same-net-crossing-segments.ts
 var TOL3 = 1e-6;
 function isCollinear(a, b, tol = TOL3) {
@@ -21775,7 +21772,6 @@ function applyTracesFromSolverOutput(args) {
   const {
     group,
     solver,
-    pinIdToSchematicPortId,
     userNetIdToConnKey,
     schematicPortIdsWithPreExistingNetLabels
   } = args;
@@ -21810,7 +21806,7 @@ function applyTracesFromSolverOutput(args) {
   debug9(`Traces inside SchematicTraceSolver output: ${(traces ?? []).length}`);
   for (const solvedTracePath of traces ?? []) {
     const uniquePinIds = Array.from(new Set(solvedTracePath.pinIds ?? []));
-    const solvedTraceSchematicPortIds = uniquePinIds.map((pinId) => pinIdToSchematicPortId.get(pinId)).filter((id) => Boolean(id));
+    const solvedTraceSchematicPortIds = uniquePinIds.map(asSchematicPortId);
     const isNetLabelCoveredTrace = solvedTraceSchematicPortIds.length > 0 && solvedTraceSchematicPortIds.every(
       (id) => schematicPortIdsWithPreExistingNetLabels.has(id)
     );
@@ -21845,8 +21841,10 @@ function applyTracesFromSolverOutput(args) {
     const source_trace_id = String(solvedTracePath?.mspPairId);
     let subcircuit_connectivity_map_key;
     if (Array.isArray(solvedTracePath?.pins) && solvedTracePath.pins.length === 2) {
-      const pA = pinIdToSchematicPortId.get(solvedTracePath.pins[0]?.pinId);
-      const pB = pinIdToSchematicPortId.get(solvedTracePath.pins[1]?.pinId);
+      const firstPinId = solvedTracePath.pins[0]?.pinId;
+      const secondPinId = solvedTracePath.pins[1]?.pinId;
+      const pA = firstPinId ? asSchematicPortId(firstPinId) : void 0;
+      const pB = secondPinId ? asSchematicPortId(secondPinId) : void 0;
       if (pA && pB) {
         const routedSchematicPortIds = /* @__PURE__ */ new Set([pA, pB]);
         for (const routedSchematicPortId of routedSchematicPortIds) {
@@ -21970,16 +21968,6 @@ import {
 } from "@tscircuit/math-utils";
 import "@tscircuit/schematic-trace-solver";
 
-// lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortSelector.ts
-var getSchematicPortSelector = ({
-  componentName,
-  schematicPort,
-  sourcePort
-}) => {
-  const pinIdentifier = schematicPort.pin_number ?? sourcePort?.name ?? sourcePort?.port_hints?.[0];
-  return `${componentName}.${pinIdentifier ?? schematicPort.schematic_port_id}`;
-};
-
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/schematicTextToTextBounds.ts
 import {
   getBoundFromCenteredRect as getBoundFromCenteredRect3,
@@ -22128,34 +22116,16 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     }
   }
   const chips = [];
-  const pinIdToSchematicPortId = /* @__PURE__ */ new Map();
-  const schematicPortIdToPinId = /* @__PURE__ */ new Map();
   for (const schematicComponent of schematicComponents) {
     const chipId = schematicComponent.schematic_component_id;
     const pins = [];
-    const sourceComponent = db.source_component.getWhere({
-      source_component_id: schematicComponent.source_component_id
-    });
     const schematicPorts = db.schematic_port.list({
       schematic_component_id: schematicComponent.schematic_component_id
     });
     for (const schematicPort of schematicPorts) {
-      const sourcePort = db.source_port.get(schematicPort.source_port_id);
-      const selector = getSchematicPortSelector({
-        componentName: sourceComponent?.name ?? schematicComponent.schematic_component_id,
-        schematicPort,
-        sourcePort
-      });
       const schematicPortId = asSchematicPortId(schematicPort.schematic_port_id);
-      pinIdToSchematicPortId.set(selector, schematicPortId);
-      schematicPortIdToPinId.set(schematicPortId, selector);
-    }
-    for (const schematicPort of schematicPorts) {
-      const pinId = schematicPortIdToPinId.get(
-        asSchematicPortId(schematicPort.schematic_port_id)
-      );
       pins.push({
-        pinId,
+        pinId: schematicPortId,
         x: schematicPort.center.x,
         y: schematicPort.center.y,
         // Pass the port's true facing direction (known from the schematic
@@ -22190,8 +22160,8 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
   const schPortIdToSourcePortId = /* @__PURE__ */ new Map();
   const sourcePortIdToSchPortId = /* @__PURE__ */ new Map();
   const userNetIdToConnKey = /* @__PURE__ */ new Map();
-  const componentPortBySourcePortId = new Map(
-    group.selectAll("port").filter((port) => port.source_port_id).map((port) => [asSourcePortId(port.source_port_id), port])
+  const componentPortBySchematicPortId = new Map(
+    group.selectAll("port").filter((port) => port.schematic_port_id).map((port) => [asSchematicPortId(port.schematic_port_id), port])
   );
   for (const sc of schematicComponents) {
     const ports = db.schematic_port.list({
@@ -22278,7 +22248,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
           );
         }
         directConnections.push({
-          pinIds: [a, b].map((id) => schematicPortIdToPinId.get(id)),
+          schematicPortIds: [a, b],
           netId: userNetId,
           netLabelWidth
         });
@@ -22293,22 +22263,23 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
       connKeyToSourceNet.set(net.subcircuit_connectivity_map_key, net);
     }
   }
-  const connKeyToPinIds = /* @__PURE__ */ new Map();
+  const connKeyToSchematicPortIds = /* @__PURE__ */ new Map();
   for (const [schId, srcPortId] of schPortIdToSourcePortId) {
     const sp = db.source_port.get(srcPortId);
     if (!sp?.subcircuit_connectivity_map_key) continue;
     const connKey = sp.subcircuit_connectivity_map_key;
-    if (!connKeyToPinIds.has(connKey)) connKeyToPinIds.set(connKey, []);
-    connKeyToPinIds.get(connKey).push(schId);
+    if (!connKeyToSchematicPortIds.has(connKey)) {
+      connKeyToSchematicPortIds.set(connKey, []);
+    }
+    connKeyToSchematicPortIds.get(connKey).push(schId);
   }
-  for (const [connKey, schematicPortIds] of connKeyToPinIds) {
+  for (const [connKey, schematicPortIds] of connKeyToSchematicPortIds) {
     const sourceNet = connKeyToSourceNet.get(connKey);
     if (sourceNet && schematicPortIds.length >= 1) {
       const seenRoutedSchematicPortIds = /* @__PURE__ */ new Set();
       const uniqueSchematicPortIds = schematicPortIds.filter(
         (schematicPortId) => {
-          const sourcePortId = schPortIdToSourcePortId.get(schematicPortId);
-          const componentPort = sourcePortId ? componentPortBySourcePortId.get(sourcePortId) : void 0;
+          const componentPort = componentPortBySchematicPortId.get(schematicPortId);
           const routedSchematicPortIdValue = componentPort ? getPortForSchematicSymbolPort(componentPort).schematic_port_id : null;
           const routedSchematicPortId = routedSchematicPortIdValue ? asSchematicPortId(routedSchematicPortIdValue) : schematicPortId;
           if (seenRoutedSchematicPortIds.has(routedSchematicPortId)) {
@@ -22333,9 +22304,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
       }
       netConnections.push({
         netId: userNetId,
-        pinIds: uniqueSchematicPortIds.map(
-          (portId) => schematicPortIdToPinId.get(portId)
-        ),
+        schematicPortIds: uniqueSchematicPortIds,
         netLabelWidth,
         netLabelHeight
       });
@@ -22361,15 +22330,24 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
   })();
   const inputProblem = {
     chips,
-    directConnections,
-    netConnections,
+    directConnections: directConnections.map(
+      ({ schematicPortIds, ...connection }) => ({
+        ...connection,
+        pinIds: schematicPortIds
+      })
+    ),
+    netConnections: netConnections.map(
+      ({ schematicPortIds, ...connection }) => ({
+        ...connection,
+        pinIds: schematicPortIds
+      })
+    ),
     textBoxes,
     availableNetLabelOrientations,
     maxMspPairDistance: group._parsedProps.schMaxTraceDistance ?? DEFAULT_MAX_MSP_PAIR_DISTANCE
   };
   return {
     inputProblem,
-    pinIdToSchematicPortId,
     connKeyToSourceNet,
     userNetIdToConnKey,
     connKeysWithExplicitPortNetTraces,
@@ -22396,8 +22374,7 @@ var getSchematicPortIdsWithAssignedNetLabels = (group) => {
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getSchematicPortIdsWithRoutedTraces.ts
 var getSchematicPortIdsWithRoutedTraces = ({
-  solver,
-  pinIdToSchematicPortId
+  solver
 }) => {
   const solvedTraces = solver.traceCleanupSolver?.getOutput().traces ?? solver.traceLabelOverlapAvoidanceSolver?.getOutput().traces ?? solver.schematicTraceLinesSolver?.solvedTracePaths ?? [];
   const schematicPortIdsWithRoutedTraces = /* @__PURE__ */ new Set();
@@ -22406,7 +22383,7 @@ var getSchematicPortIdsWithRoutedTraces = ({
     if (!Array.isArray(points) || points.length < 2) continue;
     const pinIds = Array.isArray(solvedTrace.pins) ? solvedTrace.pins.map((pin) => pin.pinId) : solvedTrace.pinIds;
     for (const pinId of pinIds) {
-      const schPortId = pinIdToSchematicPortId.get(pinId);
+      const schPortId = asSchematicPortId(pinId);
       if (schPortId) {
         schematicPortIdsWithRoutedTraces.add(schPortId);
       }
@@ -22637,7 +22614,6 @@ var renderSchematicTracesForSheet = ({
 }) => {
   const {
     inputProblem,
-    pinIdToSchematicPortId,
     connKeyToSourceNet,
     schematicPortIdsInScope,
     schPortIdToSourcePortId,
@@ -22674,13 +22650,11 @@ var renderSchematicTracesForSheet = ({
   });
   solver.solve();
   const schematicPortIdsWithRoutedTraces = getSchematicPortIdsWithRoutedTraces({
-    solver,
-    pinIdToSchematicPortId
+    solver
   });
   applyTracesFromSolverOutput({
     group,
     solver,
-    pinIdToSchematicPortId,
     userNetIdToConnKey,
     schematicPortIdsWithPreExistingNetLabels
   });
@@ -22688,7 +22662,6 @@ var renderSchematicTracesForSheet = ({
     group,
     solver,
     connKeyToSourceNet,
-    pinIdToSchematicPortId,
     userNetIdToConnKey,
     connKeysWithExplicitPortNetTraces,
     schematicPortIdsWithPreExistingNetLabels,
@@ -23714,7 +23687,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1508",
+  version: "0.0.1510",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -26947,6 +26920,8 @@ var Transistor = class extends NormalComponent3 {
     const source_component = db.source_component.insert({
       ftype: "simple_transistor",
       name: this.name,
+      manufacturer_part_number: props.manufacturerPartNumber ?? props.mfn,
+      supplier_part_numbers: props.supplierPartNumbers,
       transistor_type: props.type,
       display_name: props.displayName
     });
@@ -29369,6 +29344,8 @@ var Fuse = class extends NormalComponent3 {
     const source_component = db.source_component.insert({
       name: this.name,
       ftype: FTYPE.simple_fuse,
+      manufacturer_part_number: props.manufacturerPartNumber ?? props.mfn,
+      supplier_part_numbers: props.supplierPartNumbers,
       current_rating_amps: currentRating,
       voltage_rating_volts: voltageRating,
       display_current_rating: `${formatSiUnit4(currentRating)}A`,
@@ -29525,11 +29502,14 @@ var Interconnect = class extends NormalComponent3 {
   }
   doInitialSourceRender() {
     const { db } = this.root;
+    const { _parsedProps: props } = this;
     const source_component = db.source_component.insert({
       ftype: "interconnect",
       name: this.name,
+      manufacturer_part_number: props.manufacturerPartNumber ?? props.mfn,
+      supplier_part_numbers: props.supplierPartNumbers,
       are_pins_interchangeable: true,
-      display_name: this._parsedProps.displayName
+      display_name: props.displayName
     });
     this.source_component_id = source_component.source_component_id;
   }
@@ -33459,6 +33439,8 @@ var Potentiometer = class extends NormalComponent3 {
     const source_component = db.source_component.insert({
       ftype: "simple_potentiometer",
       name: this.name,
+      manufacturer_part_number: props.manufacturerPartNumber ?? props.mfn,
+      supplier_part_numbers: props.supplierPartNumbers,
       max_resistance: props.maxResistance,
       pin_variant: pinVariant,
       are_pins_interchangeable: pinVariant === "two_pin",
@@ -33512,6 +33494,8 @@ var Crystal = class extends NormalComponent3 {
     const source_component = db.source_component.insert({
       name: this.name,
       ftype: "simple_crystal",
+      manufacturer_part_number: props.manufacturerPartNumber ?? props.mfn,
+      supplier_part_numbers: props.supplierPartNumbers,
       frequency: props.frequency,
       load_capacitance: props.loadCapacitance,
       pin_variant: props.pinVariant || "two_pin",

package/package.json

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