@tscircuit/core 0.0.1841 → 0.0.1843

package/dist/index.d.ts

@@ -358,9 +358,9 @@ interface IIsolatedCircuit {
 interface IRootCircuit extends IIsolatedCircuit {
 }
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "RenderIsolatedSubcircuits", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "FetchPartFootprint", "ResolveFootprintPinLabels", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "CreateAutoplacedBreakoutPoints", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "CheckRefDesConvention", "SourceComponentPropertyValidation", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicSectionRender", "SchematicTraceRender", "SchematicSheetRender", "SchematicReplaceNetLabelsWithSymbols", "PanelBoardLayout", "ValidatePcbCoordinates", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbCalcPlacementResolution", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbAutoplaceBreakoutPoints", "PcbTraceHintRender", "PcbManualTraceRender", "PcbPlacementDesignRuleChecks", "PcbTraceRender", "PcbRouteNetIslands", "PcbImplicitCopperPourRender", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "PartOrientationAnalysis", "SupplierFootprintMismatchWarning", "SimulationSpiceEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "RenderIsolatedSubcircuits", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "FetchPartFootprint", "ResolveFootprintPinLabels", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "CreateAutoplacedBreakoutPoints", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "CheckRefDesConvention", "SourceComponentPropertyValidation", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicSectionRender", "SchematicTraceRender", "SchematicSheetRender", "SchematicReplaceNetLabelsWithSymbols", "SchematicLabelNetsWithConflictingNames", "PanelBoardLayout", "ValidatePcbCoordinates", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbCalcPlacementResolution", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbAutoplaceBreakoutPoints", "PcbTraceHintRender", "PcbManualTraceRender", "PcbPlacementDesignRuleChecks", "PcbTraceRender", "PcbRouteNetIslands", "PcbImplicitCopperPourRender", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "PartOrientationAnalysis", "SupplierFootprintMismatchWarning", "SimulationSpiceEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
-declare const renderPhaseIndexMap: Map<"ReactSubtreesRender" | "RenderIsolatedSubcircuits" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "FetchPartFootprint" | "ResolveFootprintPinLabels" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "CreateAutoplacedBreakoutPoints" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "CheckRefDesConvention" | "SourceComponentPropertyValidation" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicSectionRender" | "SchematicTraceRender" | "SchematicSheetRender" | "SchematicReplaceNetLabelsWithSymbols" | "PanelBoardLayout" | "ValidatePcbCoordinates" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbCalcPlacementResolution" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbAutoplaceBreakoutPoints" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbPlacementDesignRuleChecks" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbImplicitCopperPourRender" | "PcbCopperPourRender" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "PartOrientationAnalysis" | "SupplierFootprintMismatchWarning" | "SimulationSpiceEngineRender", number>;
+declare const renderPhaseIndexMap: Map<"ReactSubtreesRender" | "RenderIsolatedSubcircuits" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "FetchPartFootprint" | "ResolveFootprintPinLabels" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "CreateAutoplacedBreakoutPoints" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "CheckRefDesConvention" | "SourceComponentPropertyValidation" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicSectionRender" | "SchematicTraceRender" | "SchematicSheetRender" | "SchematicReplaceNetLabelsWithSymbols" | "SchematicLabelNetsWithConflictingNames" | "PanelBoardLayout" | "ValidatePcbCoordinates" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbCalcPlacementResolution" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbAutoplaceBreakoutPoints" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbPlacementDesignRuleChecks" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbImplicitCopperPourRender" | "PcbCopperPourRender" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "PartOrientationAnalysis" | "SupplierFootprintMismatchWarning" | "SimulationSpiceEngineRender", number>;
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
     initialized: boolean;
@@ -2696,6 +2696,8 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
      */
     _shouldUseTraceByTraceRouting(): boolean;
     doInitialPcbDesignRuleChecks(): void;
+    doInitialSchematicLabelNetsWithConflictingNames(): void;
+    updateSchematicLabelNetsWithConflictingNames(): void;
     doInitialSchematicReplaceNetLabelsWithSymbols(): void;
     doInitialSimulationSpiceEngineRender(): void;
     /**

package/dist/index.js

@@ -430,6 +430,7 @@ var orderedRenderPhases = [
   "SchematicTraceRender",
   "SchematicSheetRender",
   "SchematicReplaceNetLabelsWithSymbols",
+  "SchematicLabelNetsWithConflictingNames",
   "PanelBoardLayout",
   "ValidatePcbCoordinates",
   "PcbComponentRender",
@@ -482,6 +483,12 @@ var asyncPhaseDependencies = {
     "PcbFootprintStringRender",
     "FetchPartFootprint"
   ],
+  SchematicLabelNetsWithConflictingNames: [
+    "RenderIsolatedSubcircuits",
+    "PcbFootprintStringRender",
+    "FetchPartFootprint",
+    "SchematicTraceRender"
+  ],
   PcbFootprintLayout: ["PcbFootprintStringRender", "FetchPartFootprint"],
   PcbComponentSizeCalculation: [
     "PcbFootprintStringRender",
@@ -18100,6 +18107,59 @@ function inflateSourceFiducial(sourceElm, inflatorContext) {
   }
 }
 
+// lib/utils/schematic/assign-schematic-net-label-superscripts.ts
+import {
+  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson3
+} from "circuit-json-to-connectivity-map";
+function assignSchematicNetLabelSuperscripts(db) {
+  const labels = [
+    ...db.schematic_net_label.list(),
+    ...db.schematic_text.list().filter((text) => text.source_trace_id)
+  ];
+  if (labels.length === 0) return;
+  const connMap = getFullConnectivityMapFromCircuitJson3(
+    db.toArray().filter((element) => element.type.startsWith("source_"))
+  );
+  connMap.addConnections([
+    ...db.source_net.list().map((net) => [net.source_net_id]),
+    ...db.source_component_internal_connection.list().map((connection) => connection.source_port_ids)
+  ]);
+  const labelsWithNetworks = labels.map((label) => {
+    const isNetLabel = label.type === "schematic_net_label";
+    const sourceTraceId = label.source_trace_id ?? (isNetLabel && label.schematic_trace_id ? db.schematic_trace.get(label.schematic_trace_id)?.source_trace_id : void 0);
+    const network = (isNetLabel ? connMap.getNetConnectedToId(label.source_net_id) : void 0) ?? (sourceTraceId ? connMap.getNetConnectedToId(sourceTraceId) : void 0);
+    return { label, network };
+  });
+  const networksByName = /* @__PURE__ */ new Map();
+  const addName = (name, network) => {
+    if (!name.trim() || network === void 0) return;
+    const networks = networksByName.get(name) ?? [];
+    if (!networks.includes(network)) networks.push(network);
+    networksByName.set(name, networks);
+  };
+  for (const { label, network } of labelsWithNetworks) {
+    addName(label.text, network);
+  }
+  const firstSourceId = (network) => [...connMap.getIdsConnectedToNet(network)].sort()[0];
+  for (const networks of networksByName.values()) {
+    networks.sort(
+      (a, b) => firstSourceId(a).localeCompare(firstSourceId(b), "en", { numeric: true })
+    );
+  }
+  for (const { label, network } of labelsWithNetworks) {
+    const networks = networksByName.get(label.text) ?? [];
+    const display_superscript = network !== void 0 && networks.length > 1 ? String(networks.indexOf(network) + 1) : void 0;
+    if (label.display_superscript === display_superscript) continue;
+    if (label.type === "schematic_net_label") {
+      db.schematic_net_label.update(label.schematic_net_label_id, {
+        display_superscript
+      });
+    } else {
+      db.schematic_text.update(label.schematic_text_id, { display_superscript });
+    }
+  }
+}
+
 // lib/components/primitive-components/Group/Group.ts
 import {
   convertSrjToGraphicsObject,
@@ -36768,7 +36828,7 @@ var applyEditEvents = ({
 // lib/utils/autorouting/getSimpleRouteJsonFromCircuitJson.ts
 import { su as su4 } from "@tscircuit/circuit-json-util";
 import {
-  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson3
+  getFullConnectivityMapFromCircuitJson as getFullConnectivityMapFromCircuitJson4
 } from "circuit-json-to-connectivity-map";
 
 // lib/components/primitive-components/Bus.ts
@@ -37519,7 +37579,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
   if (activeRoutingPcbGroupId == null && !subcircuitIsBoard) {
     activeRoutingPcbGroupId = pcbGroup?.pcb_group_id;
   }
-  const sharedConnMap = getFullConnectivityMapFromCircuitJson3(subcircuitElements);
+  const sharedConnMap = getFullConnectivityMapFromCircuitJson4(subcircuitElements);
   const breakoutPoints = db.pcb_breakout_point.list().filter(
     (bp) => !subcircuit_id || relevantSubcircuitIds?.has(bp.subcircuit_id)
   );
@@ -46203,7 +46263,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1840",
+  version: "0.0.1842",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -46271,12 +46331,12 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.481",
+    "circuit-json": "^0.0.484",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.118",
     "circuit-json-to-spice": "^0.0.45",
-    "circuit-to-svg": "^0.0.410",
+    "circuit-to-svg": "^0.0.413",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
     debug: "^4.3.6",
@@ -46335,7 +46395,7 @@ var package_default = {
   overrides: {
     "@tscircuit/circuit-json-util": "^0.0.106",
     "@tscircuit/props": "^0.0.646",
-    "circuit-json": "^0.0.481"
+    "circuit-json": "^0.0.484"
   }
 };
 
@@ -49242,6 +49302,14 @@ var Group5 = class extends NormalComponent3 {
     }
     Group_doInitialStandaloneSubcircuitPcbDesignRuleChecks(this);
   }
+  doInitialSchematicLabelNetsWithConflictingNames() {
+    if (this.root?.schematicDisabled) return;
+    if (this.getTopLevelRenderable() !== this) return;
+    assignSchematicNetLabelSuperscripts(this.root.db);
+  }
+  updateSchematicLabelNetsWithConflictingNames() {
+    this.doInitialSchematicLabelNetsWithConflictingNames();
+  }
   doInitialSchematicReplaceNetLabelsWithSymbols() {
     if (this.root?.schematicDisabled) return;
     if (!this.isSubcircuit) return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1841",
+  "version": "0.0.1843",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -69,12 +69,12 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.481",
+    "circuit-json": "^0.0.484",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.118",
     "circuit-json-to-spice": "^0.0.45",
-    "circuit-to-svg": "^0.0.410",
+    "circuit-to-svg": "^0.0.413",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",
@@ -133,6 +133,6 @@
   "overrides": {
     "@tscircuit/circuit-json-util": "^0.0.106",
     "@tscircuit/props": "^0.0.646",
-    "circuit-json": "^0.0.481"
+    "circuit-json": "^0.0.484"
   }
 }