@tscircuit/core 0.0.1134 → 0.0.1136

package/dist/index.d.ts

@@ -12,7 +12,7 @@ import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
 import { CircuitJsonUtilObjects } from '@tscircuit/circuit-json-util';
 import { Matrix } from 'transformation-matrix';
 import { PackSolver2 } from 'calculate-packing';
-import { AutoroutingPipelineSolver, AssignableAutoroutingPipeline2, AssignableAutoroutingPipeline3, AutoroutingPipeline1_OriginalUnravel, AutoroutingPipelineSolver3_HgPortPointPathing } from '@tscircuit/capacity-autorouter';
+import { AutoroutingPipelineSolver, AssignableAutoroutingPipeline2, AssignableAutoroutingPipeline3, AutoroutingPipeline1_OriginalUnravel, AutoroutingPipelineSolver3_HgPortPointPathing, AutoroutingPipelineSolver5 } from '@tscircuit/capacity-autorouter';
 import { CopperPourPipelineSolver } from '@tscircuit/copper-pour-solver';
 import { ConnectivityMap } from 'circuit-json-to-connectivity-map';
 import { GraphicsObject } from 'graphics-debug';
@@ -25,6 +25,7 @@ declare const SOLVERS: {
     AutoroutingPipeline1_OriginalUnravel: typeof AutoroutingPipeline1_OriginalUnravel;
     AutoroutingPipelineSolver3_HgPortPointPathing: typeof AutoroutingPipelineSolver3_HgPortPointPathing;
     AutoroutingPipelineSolver4: typeof AutoroutingPipelineSolver;
+    AutoroutingPipelineSolver5: typeof AutoroutingPipelineSolver5;
     CopperPourPipelineSolver: typeof CopperPourPipelineSolver;
 };
 type SolverName = keyof typeof SOLVERS;
@@ -2619,7 +2620,7 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
             pcbRouteCache: zod.ZodOptional<zod.ZodType<_tscircuit_props.PcbRouteCache, zod.ZodTypeDef, _tscircuit_props.PcbRouteCache>>;
             autorouter: zod.ZodOptional<zod.ZodType<_tscircuit_props.AutorouterProp, zod.ZodTypeDef, _tscircuit_props.AutorouterProp>>;
             autorouterEffortLevel: zod.ZodOptional<zod.ZodEnum<["1x", "2x", "5x", "10x", "100x"]>>;
-            autorouterVersion: zod.ZodOptional<zod.ZodEnum<["v1", "v2", "v3", "v4", "latest"]>>;
+            autorouterVersion: zod.ZodOptional<zod.ZodEnum<["v1", "v2", "v3", "v4", "v5", "latest"]>>;
             square: zod.ZodOptional<zod.ZodBoolean>;
             emptyArea: zod.ZodOptional<zod.ZodString>;
             filledArea: zod.ZodOptional<zod.ZodString>;
@@ -2963,7 +2964,7 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
             pcbRouteCache?: _tscircuit_props.PcbRouteCache | undefined;
             autorouter?: _tscircuit_props.AutorouterProp | undefined;
             autorouterEffortLevel?: "2x" | "1x" | "5x" | "10x" | "100x" | undefined;
-            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "latest" | undefined;
+            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "latest" | undefined;
             square?: boolean | undefined;
             emptyArea?: string | undefined;
             filledArea?: string | undefined;
@@ -3290,7 +3291,7 @@ declare class Board extends Group<typeof boardProps> implements BoardI, Subcircu
             pcbRouteCache?: _tscircuit_props.PcbRouteCache | undefined;
             autorouter?: _tscircuit_props.AutorouterProp | undefined;
             autorouterEffortLevel?: "2x" | "1x" | "5x" | "10x" | "100x" | undefined;
-            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "latest" | undefined;
+            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "latest" | undefined;
             square?: boolean | undefined;
             emptyArea?: string | undefined;
             filledArea?: string | undefined;
@@ -4129,7 +4130,7 @@ declare class MountedBoard extends Subcircuit implements BoardI {
             pcbRouteCache: zod.ZodOptional<zod.ZodType<_tscircuit_props.PcbRouteCache, zod.ZodTypeDef, _tscircuit_props.PcbRouteCache>>;
             autorouter: zod.ZodOptional<zod.ZodType<_tscircuit_props.AutorouterProp, zod.ZodTypeDef, _tscircuit_props.AutorouterProp>>;
             autorouterEffortLevel: zod.ZodOptional<zod.ZodEnum<["1x", "2x", "5x", "10x", "100x"]>>;
-            autorouterVersion: zod.ZodOptional<zod.ZodEnum<["v1", "v2", "v3", "v4", "latest"]>>;
+            autorouterVersion: zod.ZodOptional<zod.ZodEnum<["v1", "v2", "v3", "v4", "v5", "latest"]>>;
             square: zod.ZodOptional<zod.ZodBoolean>;
             emptyArea: zod.ZodOptional<zod.ZodString>;
             filledArea: zod.ZodOptional<zod.ZodString>;
@@ -4589,7 +4590,7 @@ declare class MountedBoard extends Subcircuit implements BoardI {
             pcbRouteCache?: _tscircuit_props.PcbRouteCache | undefined;
             autorouter?: _tscircuit_props.AutorouterProp | undefined;
             autorouterEffortLevel?: "2x" | "1x" | "5x" | "10x" | "100x" | undefined;
-            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "latest" | undefined;
+            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "latest" | undefined;
             square?: boolean | undefined;
             emptyArea?: string | undefined;
             filledArea?: string | undefined;
@@ -4939,7 +4940,7 @@ declare class MountedBoard extends Subcircuit implements BoardI {
             pcbRouteCache?: _tscircuit_props.PcbRouteCache | undefined;
             autorouter?: _tscircuit_props.AutorouterProp | undefined;
             autorouterEffortLevel?: "2x" | "1x" | "5x" | "10x" | "100x" | undefined;
-            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "latest" | undefined;
+            autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "v5" | "latest" | undefined;
             square?: boolean | undefined;
             emptyArea?: string | undefined;
             filledArea?: string | undefined;

package/dist/index.js

@@ -10540,13 +10540,17 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         const portsFromFootprint = this.getPortsFromFootprint(opts);
         const existingPorts = this._getAllPortsFromChildren();
         for (const port of portsFromFootprint) {
-          const alreadyInPortsToCreate = portsToCreate.some(
+          const matchingPort = existingPorts.find(
             (p) => p.isMatchingAnyOf(port.getNameAndAliases())
-          );
-          const alreadyInExistingPorts = existingPorts.some(
+          ) ?? portsToCreate.find(
             (p) => p.isMatchingAnyOf(port.getNameAndAliases())
           );
-          if (!alreadyInPortsToCreate && !alreadyInExistingPorts) {
+          if (matchingPort) {
+            const mergedAliases = port.getNameAndAliases().filter(
+              (alias) => !matchingPort.getNameAndAliases().includes(alias)
+            );
+            matchingPort.externallyAddedAliases.push(...mergedAliases);
+          } else {
             portsToCreate.push(port);
           }
         }
@@ -10677,16 +10681,20 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
    */
   doInitialSourceParentAttachment() {
     const { db } = this.root;
-    const internallyConnectedPorts = this._getInternallyConnectedPins();
-    for (const ports of internallyConnectedPorts) {
-      const sourcePortIds = ports.map((port) => port.source_port_id).filter((id) => id !== null);
-      if (sourcePortIds.length >= 2) {
-        db.source_component_internal_connection.insert({
-          source_component_id: this.source_component_id,
-          subcircuit_id: this.getSubcircuit()?.subcircuit_id,
-          source_port_ids: sourcePortIds
-        });
-      }
+    const internallyConnectedSourcePortIds = this._getInternallyConnectedPins().map(
+      (ports) => ports.map((port) => port.source_port_id).filter((id) => id !== null)
+    ).filter((sourcePortIds) => sourcePortIds.length >= 2);
+    if (this.source_component_id && internallyConnectedSourcePortIds.length > 0) {
+      db.source_component.update(this.source_component_id, {
+        internally_connected_source_port_ids: internallyConnectedSourcePortIds
+      });
+    }
+    for (const sourcePortIds of internallyConnectedSourcePortIds) {
+      db.source_component_internal_connection.insert({
+        source_component_id: this.source_component_id,
+        subcircuit_id: this.getSubcircuit()?.subcircuit_id,
+        source_port_ids: sourcePortIds
+      });
     }
   }
   /**
@@ -11160,10 +11168,10 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         );
         if (filteredPortHints.length === 0) continue;
         let portHintsList = filteredPortHints;
-        const hasPinPrefix = portHintsList.some(
-          (hint) => hint.startsWith("pin")
+        const hasPinIdentifier = portHintsList.some(
+          (hint) => hint.startsWith("pin") || /^(?:pin)?\d+$/.test(hint)
         );
-        if (!hasPinPrefix) {
+        if (!hasPinIdentifier) {
           portHintsList = [...portHintsList, `pin${pinNumber}`];
         }
         pinNumber++;
@@ -12283,7 +12291,8 @@ import {
   AutoroutingPipeline1_OriginalUnravel,
   AssignableAutoroutingPipeline3,
   AutoroutingPipelineSolver3_HgPortPointPathing,
-  AutoroutingPipelineSolver4
+  AutoroutingPipelineSolver4,
+  AutoroutingPipelineSolver5
 } from "@tscircuit/capacity-autorouter";
 import { CopperPourPipelineSolver } from "@tscircuit/copper-pour-solver";
 var SOLVERS = {
@@ -12294,6 +12303,7 @@ var SOLVERS = {
   AutoroutingPipeline1_OriginalUnravel,
   AutoroutingPipelineSolver3_HgPortPointPathing,
   AutoroutingPipelineSolver4,
+  AutoroutingPipelineSolver5,
   CopperPourPipelineSolver
 };
 
@@ -12329,6 +12339,8 @@ var TscircuitAutorouter = class {
       solverName = "AutoroutingPipelineSolver3_HgPortPointPathing";
     } else if (autorouterVersion2 === "v4" || autorouterVersion2 === "latest") {
       solverName = "AutoroutingPipelineSolver4";
+    } else if (autorouterVersion2 === "v5") {
+      solverName = "AutoroutingPipelineSolver5";
     } else if (useAutoJumperSolver) {
       solverName = "AssignableAutoroutingPipeline3";
     } else if (useAssignableSolver) {
@@ -18726,7 +18738,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1125",
+  version: "0.0.1135",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -18771,7 +18783,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.501",
+    "@tscircuit/props": "^0.0.502",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1134",
+  "version": "0.0.1136",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -46,7 +46,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.8",
-    "@tscircuit/props": "^0.0.501",
+    "@tscircuit/props": "^0.0.502",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^v0.0.45",
     "@tscircuit/solver-utils": "^0.0.3",