@tscircuit/core 0.0.1356 → 0.0.1358

package/dist/index.d.ts

@@ -478,6 +478,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
      * Get the explicit trace thickness, supporting 'width' as an alias for 'thickness'
      */
     _getExplicitTraceThickness(): number | undefined;
+    _getSchematicNetLabelText(): string | undefined;
     get config(): {
         zodProps: z.ZodUnion<[z.ZodObject<{
             key: z.ZodOptional<z.ZodString>;
@@ -88591,6 +88592,7 @@ declare const pcbViaProps: z.ZodObject<{
     }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     }>>;
+    name: z.ZodOptional<z.ZodString>;
     layers: z.ZodOptional<z.ZodArray<z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
         name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
     }, "strip", z.ZodTypeAny, {
@@ -88600,7 +88602,6 @@ declare const pcbViaProps: z.ZodObject<{
     }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     }>, "many">>;
-    name: z.ZodOptional<z.ZodString>;
     schX: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     schY: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pcbX: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>]>>;
@@ -88703,8 +88704,8 @@ declare const pcbViaProps: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     symbol?: _tscircuit_props.SymbolProp | undefined;
     layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
-    layers?: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[] | undefined;
     name?: string | undefined;
+    layers?: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[] | undefined;
     schX?: number | undefined;
     schY?: number | undefined;
     pcbX?: string | number | undefined;
@@ -88763,10 +88764,10 @@ declare const pcbViaProps: z.ZodObject<{
     layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     } | undefined;
+    name?: string | undefined;
     layers?: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[] | undefined;
-    name?: string | undefined;
     schX?: string | number | undefined;
     schY?: string | number | undefined;
     pcbX?: string | number | undefined;
@@ -88842,6 +88843,7 @@ declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
             }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             }>>;
+            name: z.ZodOptional<z.ZodString>;
             layers: z.ZodOptional<z.ZodArray<z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
                 name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
             }, "strip", z.ZodTypeAny, {
@@ -88851,7 +88853,6 @@ declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
             }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             }>, "many">>;
-            name: z.ZodOptional<z.ZodString>;
             schX: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             schY: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             pcbX: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>]>>;
@@ -88954,8 +88955,8 @@ declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
         }, "strip", z.ZodTypeAny, {
             symbol?: _tscircuit_props.SymbolProp | undefined;
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
-            layers?: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[] | undefined;
             name?: string | undefined;
+            layers?: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[] | undefined;
             schX?: number | undefined;
             schY?: number | undefined;
             pcbX?: string | number | undefined;
@@ -89014,10 +89015,10 @@ declare class PcbVia extends PrimitiveComponent<typeof pcbViaProps> {
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             } | undefined;
+            name?: string | undefined;
             layers?: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             })[] | undefined;
-            name?: string | undefined;
             schX?: string | number | undefined;
             schY?: string | number | undefined;
             pcbX?: string | number | undefined;

package/dist/index.js

@@ -3723,6 +3723,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   if (trace.getCollapsedSchematicBoxAncestor()) return;
   const { db } = trace.root;
   const { _parsedProps: props, parent } = trace;
+  const schematicNetLabelText = trace._getSchematicNetLabelText();
   if (!parent) throw new Error("Trace has no parent");
   let allPortsFound;
   let connectedPorts;
@@ -3812,16 +3813,16 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
       trace.schematic_trace_id = dbTrace2.schematic_trace_id;
       return;
     }
-    if (trace.props.schDisplayLabel) {
+    if (schematicNetLabelText) {
       const side2 = getEnteringEdgeFromDirection(port.facingDirection) ?? "bottom";
       db.schematic_net_label.insert({
-        text: trace.props.schDisplayLabel,
+        text: schematicNetLabelText,
         source_net_id: net.source_net_id,
         anchor_position: anchorPos,
         center: computeSchematicNetLabelCenter({
           anchor_position: anchorPos,
           anchor_side: side2,
-          text: trace.props.schDisplayLabel
+          text: schematicNetLabelText
         }),
         anchor_side: side2
       });
@@ -3841,7 +3842,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
     });
     return;
   }
-  if (trace.props.schDisplayLabel) {
+  if (schematicNetLabelText) {
     if ("from" in trace.props && "to" in trace.props || "path" in trace.props) {
       trace._doInitialSchematicTraceRenderWithDisplayLabel();
       return;
@@ -5077,7 +5078,7 @@ function Trace__doInitialSchematicTraceRenderWithDisplayLabel(trace) {
   const [firstPort, secondPort] = connectedPorts.map(({ port }) => port);
   const isFirstPortSchematicBox = firstPort.parent?.config.shouldRenderAsSchematicBox;
   const pinFullName = isFirstPortSchematicBox ? `${firstPort?.parent?.props.name}_${firstPort?.props.name}` : `${secondPort?.parent?.props.name}_${secondPort?.props.name}`;
-  const netLabelText = trace.props.schDisplayLabel ?? pinFullName;
+  const netLabelText = trace._getSchematicNetLabelText() ?? pinFullName;
   if (existingFromNetLabel && existingFromNetLabel.text !== netLabelText) {
     existingFromNetLabel.text = `${netLabelText} / ${existingFromNetLabel.text}`;
   }
@@ -5087,13 +5088,13 @@ function Trace__doInitialSchematicTraceRenderWithDisplayLabel(trace) {
   if (!existingToNetLabel) {
     const toSide = getEnteringEdgeFromDirection(toPort.facingDirection) ?? "bottom";
     db.schematic_net_label.insert({
-      text: trace.props.schDisplayLabel ?? pinFullName,
+      text: netLabelText,
       source_net_id: toPort.source_port_id,
       anchor_position: toAnchorPos,
       center: computeSchematicNetLabelCenter({
         anchor_position: toAnchorPos,
         anchor_side: toSide,
-        text: trace.props.schDisplayLabel ?? pinFullName
+        text: netLabelText
       }),
       anchor_side: toSide
     });
@@ -5101,13 +5102,13 @@ function Trace__doInitialSchematicTraceRenderWithDisplayLabel(trace) {
   if (!existingFromNetLabel) {
     const fromSide = getEnteringEdgeFromDirection(fromPort.facingDirection) ?? "bottom";
     db.schematic_net_label.insert({
-      text: trace.props.schDisplayLabel ?? pinFullName,
+      text: netLabelText,
       source_net_id: fromPort.source_port_id,
       anchor_position: fromAnchorPos,
       center: computeSchematicNetLabelCenter({
         anchor_position: fromAnchorPos,
         anchor_side: fromSide,
-        text: trace.props.schDisplayLabel ?? pinFullName
+        text: netLabelText
       }),
       anchor_side: fromSide
     });
@@ -5225,6 +5226,9 @@ var Trace3 = class extends PrimitiveComponent2 {
   _getExplicitTraceThickness() {
     return this._parsedProps.thickness ?? this._parsedProps.width;
   }
+  _getSchematicNetLabelText() {
+    return this._parsedProps.schDisplayLabel ?? this._parsedProps.displayName ?? this._parsedProps.name;
+  }
   get config() {
     return {
       zodProps: traceProps,
@@ -5377,11 +5381,12 @@ var Trace3 = class extends PrimitiveComponent2 {
       connected_source_port_ids: ports.map((p) => p.port.source_port_id),
       connected_source_net_ids: nets.map((n) => n.source_net_id),
       subcircuit_id: this.getSubcircuit()?.subcircuit_id,
+      name: props.name,
       max_length: getMaxLengthFromConnectedCapacitors(
         ports.map((p) => p.port),
         { db }
       ) ?? props.maxLength,
-      display_name: displayName,
+      display_name: props.displayName ?? displayName,
       min_trace_thickness: this._getExplicitTraceThickness()
     });
     this.source_trace_id = trace.source_trace_id;
@@ -19369,7 +19374,8 @@ function createSchematicTraceSolverInputProblem(group) {
       const pairKey = [a, b].sort().join("::");
       if (!connectedPairKeys.has(pairKey)) {
         connectedPairKeys.add(pairKey);
-        const userNetId = st.display_name ?? st.source_trace_id;
+        const traceLabel = st.name ?? st.display_name;
+        const userNetId = traceLabel ?? st.source_trace_id;
         if (st.subcircuit_connectivity_map_key) {
           userNetIdToConnKey.set(userNetId, st.subcircuit_connectivity_map_key);
         }
@@ -19383,10 +19389,10 @@ function createSchematicTraceSolverInputProblem(group) {
         }
         const maxMspDist = group._parsedProps.schMaxTraceDistance ?? DEFAULT_MAX_MSP_PAIR_DISTANCE;
         let netLabelWidth;
-        if (st.display_name && !st.display_name.startsWith(".") && portDistance > maxMspDist) {
+        if (traceLabel && !traceLabel.startsWith(".") && portDistance > maxMspDist) {
           netLabelWidth = Number(
             getSchematicNetLabelTextWidth({
-              text: String(st.display_name),
+              text: String(traceLabel),
               font_size: 0.14
             }).toFixed(2)
           );
@@ -20144,7 +20150,7 @@ var getNetNameFromPorts = (ports) => {
   for (const port of ports) {
     const traces = port._getDirectlyConnectedTraces();
     for (const trace of traces) {
-      const displayLabel = trace._parsedProps.schDisplayLabel;
+      const displayLabel = trace._getSchematicNetLabelText();
       if (displayLabel) {
         return { name: displayLabel, wasAssignedDisplayLabel: true };
       }
@@ -24231,7 +24237,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1355",
+  version: "0.0.1357",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24294,12 +24300,12 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.438",
+    "circuit-json": "^0.0.439",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.39",
+    "circuit-json-to-spice": "^0.0.40",
     "circuit-to-svg": "^0.0.360",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1356",
+  "version": "0.0.1358",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -64,12 +64,12 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.438",
+    "circuit-json": "^0.0.439",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",
     "circuit-json-to-simple-3d": "^0.0.9",
-    "circuit-json-to-spice": "^0.0.39",
+    "circuit-json-to-spice": "^0.0.40",
     "circuit-to-svg": "^0.0.360",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",