@tscircuit/core 0.0.1354 → 0.0.1356

package/dist/index.d.ts

@@ -481,6 +481,8 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
     get config(): {
         zodProps: z.ZodUnion<[z.ZodObject<{
             key: z.ZodOptional<z.ZodString>;
+            name: z.ZodOptional<z.ZodString>;
+            displayName: z.ZodOptional<z.ZodString>;
             thickness: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             width: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             schematicRouteHints: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -654,7 +656,9 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             })[];
             key?: string | undefined;
             thickness?: number | undefined;
+            name?: string | undefined;
             highlightColor?: string | undefined;
+            displayName?: string | undefined;
             width?: number | undefined;
             maxLength?: number | undefined;
             connectsTo?: string | string[] | undefined;
@@ -694,7 +698,9 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             })[];
             key?: string | undefined;
             thickness?: string | number | undefined;
+            name?: string | undefined;
             highlightColor?: string | undefined;
+            displayName?: string | undefined;
             width?: string | number | undefined;
             maxLength?: string | number | undefined;
             connectsTo?: string | string[] | undefined;
@@ -740,6 +746,8 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             schStroke?: string | undefined;
         }>, z.ZodObject<{
             key: z.ZodOptional<z.ZodString>;
+            name: z.ZodOptional<z.ZodString>;
+            displayName: z.ZodOptional<z.ZodString>;
             thickness: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             width: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             schematicRouteHints: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -921,7 +929,9 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             };
             key?: string | undefined;
             thickness?: number | undefined;
+            name?: string | undefined;
             highlightColor?: string | undefined;
+            displayName?: string | undefined;
             width?: number | undefined;
             maxLength?: number | undefined;
             connectsTo?: string | string[] | undefined;
@@ -964,7 +974,9 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             };
             key?: string | undefined;
             thickness?: string | number | undefined;
+            name?: string | undefined;
             highlightColor?: string | undefined;
+            displayName?: string | undefined;
             width?: string | number | undefined;
             maxLength?: string | number | undefined;
             connectsTo?: string | string[] | undefined;
@@ -1010,6 +1022,8 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             schStroke?: string | undefined;
         }>, z.ZodObject<{
             key: z.ZodOptional<z.ZodString>;
+            name: z.ZodOptional<z.ZodString>;
+            displayName: z.ZodOptional<z.ZodString>;
             thickness: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             width: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             schematicRouteHints: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -1191,7 +1205,9 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             };
             key?: string | undefined;
             thickness?: number | undefined;
+            name?: string | undefined;
             highlightColor?: string | undefined;
+            displayName?: string | undefined;
             width?: number | undefined;
             maxLength?: number | undefined;
             connectsTo?: string | string[] | undefined;
@@ -1234,7 +1250,9 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> implements Tra
             };
             key?: string | undefined;
             thickness?: string | number | undefined;
+            name?: string | undefined;
             highlightColor?: string | undefined;
+            displayName?: string | undefined;
             width?: string | number | undefined;
             maxLength?: string | number | undefined;
             connectsTo?: string | string[] | undefined;
@@ -70018,22 +70036,10 @@ declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"
         } & {
             connections: zod.ZodEffects<zod.ZodRecord<zod.ZodEnum<["pin1", "pin2", "pos", "neg"]>, zod.ZodUnion<[zod.ZodUnion<[zod.ZodString, zod.ZodReadonly<zod.ZodArray<zod.ZodString, "many">>]>, zod.ZodArray<zod.ZodString, "many">]>>, Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>>, Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>>>;
             color: zod.ZodOptional<zod.ZodString>;
-            display: zod.ZodOptional<zod.ZodObject<{
-                label: zod.ZodOptional<zod.ZodString>;
-                center: zod.ZodOptional<zod.ZodNumber>;
-                offsetDivs: zod.ZodOptional<zod.ZodNumber>;
-                unitsPerDiv: zod.ZodOptional<zod.ZodNumber>;
-            }, "strip", zod.ZodTypeAny, {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            }, {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            }>>;
+            graphDisplayName: zod.ZodOptional<zod.ZodString>;
+            graphCenter: zod.ZodOptional<zod.ZodNumber>;
+            graphOffsetDivs: zod.ZodOptional<zod.ZodNumber>;
+            graphUnitsPerDiv: zod.ZodOptional<zod.ZodNumber>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
             connections: Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>>;
@@ -70613,12 +70619,10 @@ declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
             color?: string | undefined;
-            display?: {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            } | undefined;
+            graphDisplayName?: string | undefined;
+            graphCenter?: number | undefined;
+            graphOffsetDivs?: number | undefined;
+            graphUnitsPerDiv?: number | undefined;
         }, {
             name: string;
             connections: Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>>;
@@ -71200,12 +71204,10 @@ declare class Ammeter extends NormalComponent<typeof ammeterProps, "pos" | "neg"
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
             color?: string | undefined;
-            display?: {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            } | undefined;
+            graphDisplayName?: string | undefined;
+            graphCenter?: number | undefined;
+            graphOffsetDivs?: number | undefined;
+            graphUnitsPerDiv?: number | undefined;
         }>;
         sourceFtype: Ftype;
     };
@@ -156239,22 +156241,10 @@ declare class VoltageProbe extends PrimitiveComponent<typeof voltageProbeProps>
             connectsTo: z.ZodString;
             referenceTo: z.ZodOptional<z.ZodString>;
             color: z.ZodOptional<z.ZodString>;
-            display: z.ZodOptional<z.ZodObject<{
-                label: z.ZodOptional<z.ZodString>;
-                center: z.ZodOptional<z.ZodNumber>;
-                offsetDivs: z.ZodOptional<z.ZodNumber>;
-                unitsPerDiv: z.ZodOptional<z.ZodNumber>;
-            }, "strip", z.ZodTypeAny, {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            }, {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            }>>;
+            graphDisplayName: z.ZodOptional<z.ZodString>;
+            graphCenter: z.ZodOptional<z.ZodNumber>;
+            graphOffsetDivs: z.ZodOptional<z.ZodNumber>;
+            graphUnitsPerDiv: z.ZodOptional<z.ZodNumber>;
         }, "strip", z.ZodTypeAny, {
             connectsTo: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -156835,12 +156825,10 @@ declare class VoltageProbe extends PrimitiveComponent<typeof voltageProbeProps>
             schSectionName?: string | undefined;
             color?: string | undefined;
             referenceTo?: string | undefined;
-            display?: {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            } | undefined;
+            graphDisplayName?: string | undefined;
+            graphCenter?: number | undefined;
+            graphOffsetDivs?: number | undefined;
+            graphUnitsPerDiv?: number | undefined;
         }, {
             connectsTo: string;
             symbol?: _tscircuit_props.SymbolProp | undefined;
@@ -157423,12 +157411,10 @@ declare class VoltageProbe extends PrimitiveComponent<typeof voltageProbeProps>
             schSectionName?: string | undefined;
             color?: string | undefined;
             referenceTo?: string | undefined;
-            display?: {
-                center?: number | undefined;
-                label?: string | undefined;
-                offsetDivs?: number | undefined;
-                unitsPerDiv?: number | undefined;
-            } | undefined;
+            graphDisplayName?: string | undefined;
+            graphCenter?: number | undefined;
+            graphOffsetDivs?: number | undefined;
+            graphUnitsPerDiv?: number | undefined;
         }>;
     };
     doInitialSimulationRender(): void;

package/dist/index.js

@@ -18096,7 +18096,15 @@ import Debug8 from "debug";
 import { getBoundFromCenteredRect } from "@tscircuit/math-utils";
 import { symbols as symbols3 } from "schematic-symbols";
 var SYMBOL_TEXT_FONT_SIZE = 0.18;
-var TEXT_BOX_ENABLED_FTYPES = /* @__PURE__ */ new Set(["simple_resistor", "simple_capacitor"]);
+var TEXT_BOX_ENABLED_FTYPES = /* @__PURE__ */ new Set([
+  "simple_resistor",
+  "simple_capacitor",
+  "simple_inductor",
+  "simple_crystal",
+  "simple_resonator",
+  "simple_potentiometer",
+  "simple_fuse"
+]);
 function getTextBounds({
   text,
   position,
@@ -18209,19 +18217,28 @@ function getSchematicComponentWithTextBounds(db, schematicComponent) {
   const boxBounds = getSymbolBoxBounds(schematicComponent);
   const isVertical = schematicComponent.size.height > schematicComponent.size.width;
   if (isVertical) return textBounds;
-  const padX = Math.max(
-    boxBounds.minX - textBounds.minX,
-    textBounds.maxX - boxBounds.maxX
-  );
-  const padY = Math.max(
-    textBounds.maxY - boxBounds.maxY,
-    boxBounds.minY - textBounds.minY
-  );
-  return getBoundFromCenteredRect({
-    center: schematicComponent.center,
-    width: schematicComponent.size.width + 2 * padX,
-    height: schematicComponent.size.height + 2 * padY
-  });
+  const padLeft = Math.max(0, boxBounds.minX - textBounds.minX);
+  const padRight = Math.max(0, textBounds.maxX - boxBounds.maxX);
+  const padTop = Math.max(0, textBounds.maxY - boxBounds.maxY);
+  const padBottom = Math.max(0, boxBounds.minY - textBounds.minY);
+  let left = padLeft;
+  let right = padRight;
+  if (padLeft > 0 && padRight > 0) {
+    left = Math.max(padLeft, padRight);
+    right = left;
+  }
+  let top = padTop;
+  let bottom = padBottom;
+  if (padTop > 0 && padBottom > 0) {
+    top = Math.max(padTop, padBottom);
+    bottom = top;
+  }
+  return {
+    minX: boxBounds.minX - left,
+    maxX: boxBounds.maxX + right,
+    minY: boxBounds.minY - bottom,
+    maxY: boxBounds.maxY + top
+  };
 }
 
 // lib/components/primitive-components/Group/applySchematicMatchPackLayoutToTree.ts
@@ -24214,7 +24231,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1353",
+  version: "0.0.1355",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24262,7 +24279,7 @@ var package_default = {
     "@tscircuit/matchpack": "",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "^0.0.553",
+    "@tscircuit/props": "^0.0.555",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -26948,7 +26965,7 @@ var Ammeter = class extends NormalComponent3 {
   }
   doInitialSourceRender() {
     const { db } = this.root;
-    const { supplierPartNumbers, displayName, color, display } = this._parsedProps;
+    const { supplierPartNumbers, displayName } = this._parsedProps;
     const source_component = db.source_component.insert({
       ftype: "simple_ammeter",
       name: this.name,
@@ -26959,7 +26976,13 @@ var Ammeter = class extends NormalComponent3 {
   }
   doInitialSimulationRender() {
     const { db } = this.root;
-    const { color, display } = this._parsedProps;
+    const {
+      color,
+      graphDisplayName,
+      graphCenter,
+      graphOffsetDivs,
+      graphUnitsPerDiv
+    } = this._parsedProps;
     const posPort = this.portMap.pos;
     const negPort = this.portMap.neg;
     const { simulation_current_probe_id } = db.simulation_current_probe.insert({
@@ -26971,14 +26994,15 @@ var Ammeter = class extends NormalComponent3 {
       subcircuit_id: this.getSubcircuit()?.subcircuit_id ?? void 0,
       color
     });
-    if (display) {
+    const hasGraphDisplayProps = graphDisplayName !== void 0 || graphCenter !== void 0 || graphOffsetDivs !== void 0 || graphUnitsPerDiv !== void 0;
+    if (hasGraphDisplayProps) {
       db.simulation_oscilloscope_trace.insert({
         simulation_current_probe_id,
-        display_name: display.label,
+        display_name: graphDisplayName,
         color,
-        display_center_value: display.center,
-        display_center_offset_divs: display.offsetDivs,
-        amps_per_div: display.unitsPerDiv
+        display_center_value: graphCenter,
+        display_center_offset_divs: graphOffsetDivs,
+        amps_per_div: graphUnitsPerDiv
       });
     }
   }
@@ -30879,7 +30903,16 @@ var VoltageProbe = class extends PrimitiveComponent2 {
   }
   doInitialSimulationRender() {
     const { db } = this.root;
-    const { connectsTo, name, referenceTo, color, display } = this._parsedProps;
+    const {
+      connectsTo,
+      name,
+      referenceTo,
+      color,
+      graphDisplayName,
+      graphCenter,
+      graphOffsetDivs,
+      graphUnitsPerDiv
+    } = this._parsedProps;
     const subcircuit = this.getSubcircuit();
     if (!subcircuit) {
       this.renderError("VoltageProbe must be inside a subcircuit");
@@ -30956,14 +30989,15 @@ var VoltageProbe = class extends PrimitiveComponent2 {
       color: this.color
     });
     this.simulation_voltage_probe_id = simulation_voltage_probe_id;
-    if (display) {
+    const hasGraphDisplayProps = graphDisplayName !== void 0 || graphCenter !== void 0 || graphOffsetDivs !== void 0 || graphUnitsPerDiv !== void 0;
+    if (hasGraphDisplayProps) {
       db.simulation_oscilloscope_trace.insert({
         simulation_voltage_probe_id,
-        display_name: display.label,
+        display_name: graphDisplayName,
         color: color ?? void 0,
-        display_center_value: display.center,
-        display_center_offset_divs: display.offsetDivs,
-        volts_per_div: display.unitsPerDiv
+        display_center_value: graphCenter,
+        display_center_offset_divs: graphOffsetDivs,
+        volts_per_div: graphUnitsPerDiv
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1354",
+  "version": "0.0.1356",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -49,7 +49,7 @@
     "@tscircuit/matchpack": "",
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "^0.0.553",
+    "@tscircuit/props": "^0.0.555",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/solver-utils": "^0.0.16",