circuit-to-svg 0.0.95 → 0.0.97

package/dist/index.js

@@ -1787,17 +1787,6 @@ var ninePointAnchorToTextAnchor = {
   middle_top: "middle",
   middle_bottom: "middle"
 };
-var ninePointAnchorToDominantBaseline = {
-  top_left: "auto",
-  top_right: "auto",
-  bottom_left: "hanging",
-  bottom_right: "hanging",
-  center: "auto",
-  middle_left: "middle",
-  middle_right: "middle",
-  middle_top: "auto",
-  middle_bottom: "hanging"
-};
 var createSvgObjectsFromSchematicComponentWithSymbol = ({
   component: schComponent,
   transform: realToScreenTransform,
@@ -1908,15 +1897,27 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
     } else if (text.text === "{VAL}") {
       textValue = schComponent.symbol_display_value ?? "";
     }
+    const symbolHeight = Math.abs(bounds.maxY - bounds.minY);
+    const offsetFactor = 0.1;
+    const baseOffset = symbolHeight * offsetFactor;
+    const transformScale = Math.abs(transformFromSymbolToReal.a);
+    let verticalOffset = 0;
+    if (text.anchor.includes("bottom")) {
+      verticalOffset = baseOffset * transformScale;
+    } else if (text.anchor.includes("top")) {
+      verticalOffset = -baseOffset * transformScale;
+    }
+    const dominantBaseline = text.anchor.includes("bottom") ? "auto" : text.anchor.includes("top") ? "hanging" : "middle";
     svgObjects.push({
       name: "text",
       type: "element",
       attributes: {
         x: screenTextPos.x.toString(),
-        y: screenTextPos.y.toString(),
-        "dominant-baseline": ninePointAnchorToDominantBaseline[text.anchor],
-        "text-anchor": ninePointAnchorToTextAnchor[text.anchor],
+        y: (screenTextPos.y + verticalOffset).toString(),
+        fill: colorMap.schematic.label_local,
         "font-family": "sans-serif",
+        "text-anchor": ninePointAnchorToTextAnchor[text.anchor],
+        "dominant-baseline": dominantBaseline,
         "font-size": `${getSchScreenFontSize(realToScreenTransform, "reference_designator")}px`
       },
       value: "",
@@ -1981,7 +1982,7 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
 import { su as su5 } from "@tscircuit/soup-util";
 import "schematic-symbols";
 import "svgson";
-import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+import { applyToPoint as applyToPoint26 } from "transformation-matrix";
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-port-on-box.ts
 import "transformation-matrix";
@@ -2185,6 +2186,50 @@ var createSvgObjectsFromSchPortOnBox = (params) => {
   return svgObjects;
 };
 
+// lib/sch/svg-object-fns/create-svg-objects-for-sch-text.ts
+import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+var createSvgSchText = (elm, transform) => {
+  const center = applyToPoint25(transform, elm.position);
+  const textAnchorMap = {
+    center: "middle",
+    left: "start",
+    right: "end",
+    top: "middle",
+    bottom: "middle"
+  };
+  const dominantBaselineMap = {
+    center: "middle",
+    left: "middle",
+    right: "middle",
+    top: "hanging",
+    bottom: "ideographic"
+  };
+  return {
+    type: "element",
+    name: "text",
+    value: "",
+    attributes: {
+      x: center.x.toString(),
+      y: center.y.toString(),
+      fill: elm.color ?? colorMap.schematic.sheet_label,
+      "text-anchor": textAnchorMap[elm.anchor],
+      "dominant-baseline": dominantBaselineMap[elm.anchor],
+      "font-family": "sans-serif",
+      "font-size": `${getSchScreenFontSize(transform, "reference_designator")}px`,
+      transform: `rotate(${elm.rotation}, ${center.x}, ${center.y})`
+    },
+    children: [
+      {
+        type: "text",
+        value: elm.text,
+        name: elm.schematic_text_id,
+        attributes: {},
+        children: []
+      }
+    ]
+  };
+};
+
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-component-with-box.ts
 var createSvgObjectsFromSchematicComponentWithBox = ({
   component: schComponent,
@@ -2192,11 +2237,11 @@ var createSvgObjectsFromSchematicComponentWithBox = ({
   circuitJson
 }) => {
   const svgObjects = [];
-  const componentScreenTopLeft = applyToPoint25(transform, {
+  const componentScreenTopLeft = applyToPoint26(transform, {
     x: schComponent.center.x - schComponent.size.width / 2,
     y: schComponent.center.y + schComponent.size.height / 2
   });
-  const componentScreenBottomRight = applyToPoint25(transform, {
+  const componentScreenBottomRight = applyToPoint26(transform, {
     x: schComponent.center.x + schComponent.size.width / 2,
     y: schComponent.center.y - schComponent.size.height / 2
   });
@@ -2232,6 +2277,12 @@ var createSvgObjectsFromSchematicComponentWithBox = ({
     },
     children: []
   });
+  const schTexts = su5(circuitJson).schematic_text.list();
+  for (const schText of schTexts) {
+    if (schText.schematic_component_id === schComponent.schematic_component_id) {
+      svgObjects.push(createSvgSchText(schText, transform));
+    }
+  }
   const schematicPorts = su5(circuitJson).schematic_port.list({
     schematic_component_id: schComponent.schematic_component_id
   });
@@ -2267,9 +2318,9 @@ function createSvgObjectsFromSchematicComponent(params) {
 }
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-voltage-probe.ts
-import { applyToPoint as applyToPoint26 } from "transformation-matrix";
+import { applyToPoint as applyToPoint27 } from "transformation-matrix";
 function createSvgObjectsFromSchVoltageProbe(probe, transform) {
-  const [screenX, screenY] = applyToPoint26(transform, [
+  const [screenX, screenY] = applyToPoint27(transform, [
     probe.position.x,
     probe.position.y
   ]);
@@ -2329,14 +2380,14 @@ function createSvgObjectsFromSchVoltageProbe(probe, transform) {
 }
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-debug-object.ts
-import { applyToPoint as applyToPoint27 } from "transformation-matrix";
+import { applyToPoint as applyToPoint28 } from "transformation-matrix";
 function createSvgObjectsFromSchDebugObject(debugObject, transform) {
   if (debugObject.shape === "rect") {
-    let [screenLeft, screenTop] = applyToPoint27(transform, [
+    let [screenLeft, screenTop] = applyToPoint28(transform, [
       debugObject.center.x - debugObject.size.width / 2,
       debugObject.center.y - debugObject.size.height / 2
     ]);
-    let [screenRight, screenBottom] = applyToPoint27(transform, [
+    let [screenRight, screenBottom] = applyToPoint28(transform, [
       debugObject.center.x + debugObject.size.width / 2,
       debugObject.center.y + debugObject.size.height / 2
     ]);
@@ -2346,7 +2397,7 @@ function createSvgObjectsFromSchDebugObject(debugObject, transform) {
     ];
     const width = Math.abs(screenRight - screenLeft);
     const height = Math.abs(screenBottom - screenTop);
-    const [screenCenterX, screenCenterY] = applyToPoint27(transform, [
+    const [screenCenterX, screenCenterY] = applyToPoint28(transform, [
       debugObject.center.x,
       debugObject.center.y
     ]);
@@ -2392,11 +2443,11 @@ function createSvgObjectsFromSchDebugObject(debugObject, transform) {
     ];
   }
   if (debugObject.shape === "line") {
-    const [screenStartX, screenStartY] = applyToPoint27(transform, [
+    const [screenStartX, screenStartY] = applyToPoint28(transform, [
       debugObject.start.x,
       debugObject.start.y
     ]);
-    const [screenEndX, screenEndY] = applyToPoint27(transform, [
+    const [screenEndX, screenEndY] = applyToPoint28(transform, [
       debugObject.end.x,
       debugObject.end.y
     ]);
@@ -2446,7 +2497,7 @@ function createSvgObjectsFromSchDebugObject(debugObject, transform) {
 }
 
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-trace.ts
-import { applyToPoint as applyToPoint28 } from "transformation-matrix";
+import { applyToPoint as applyToPoint29 } from "transformation-matrix";
 function createSchematicTrace(trace, transform) {
   const edges = trace.edges;
   if (edges.length === 0) return [];
@@ -2455,11 +2506,11 @@ function createSchematicTrace(trace, transform) {
   for (let edgeIndex = 0; edgeIndex < edges.length; edgeIndex++) {
     const edge = edges[edgeIndex];
     if (edge.is_crossing) continue;
-    const [screenFromX, screenFromY] = applyToPoint28(transform, [
+    const [screenFromX, screenFromY] = applyToPoint29(transform, [
       edge.from.x,
       edge.from.y
     ]);
-    const [screenToX, screenToY] = applyToPoint28(transform, [
+    const [screenToX, screenToY] = applyToPoint29(transform, [
       edge.to.x,
       edge.to.y
     ]);
@@ -2471,11 +2522,11 @@ function createSchematicTrace(trace, transform) {
   }
   for (const edge of edges) {
     if (!edge.is_crossing) continue;
-    const [screenFromX, screenFromY] = applyToPoint28(transform, [
+    const [screenFromX, screenFromY] = applyToPoint29(transform, [
       edge.from.x,
       edge.from.y
     ]);
-    const [screenToX, screenToY] = applyToPoint28(transform, [
+    const [screenToX, screenToY] = applyToPoint29(transform, [
       edge.to.x,
       edge.to.y
     ]);
@@ -2551,7 +2602,7 @@ function createSchematicTrace(trace, transform) {
   }
   if (trace.junctions) {
     for (const junction of trace.junctions) {
-      const [screenX, screenY] = applyToPoint28(transform, [
+      const [screenX, screenY] = applyToPoint29(transform, [
         junction.x,
         junction.y
       ]);
@@ -2586,7 +2637,7 @@ function createSchematicTrace(trace, transform) {
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-net-label.ts
 import {
-  applyToPoint as applyToPoint30,
+  applyToPoint as applyToPoint31,
   compose as compose8,
   rotate as rotate4,
   scale as scale5,
@@ -3374,7 +3425,7 @@ var estimateTextWidth = (text) => {
 
 // lib/sch/svg-object-fns/create-svg-objects-for-sch-net-label-with-symbol.ts
 import {
-  applyToPoint as applyToPoint29,
+  applyToPoint as applyToPoint30,
   compose as compose7,
   rotate as rotate3,
   scale as scale4,
@@ -3399,7 +3450,7 @@ var ninePointAnchorToTextAnchor2 = {
   middle_top: "middle",
   middle_bottom: "middle"
 };
-var ninePointAnchorToDominantBaseline2 = {
+var ninePointAnchorToDominantBaseline = {
   top_left: "auto",
   top_right: "auto",
   bottom_left: "hanging",
@@ -3494,7 +3545,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     x: symbolBounds.minX,
     y: (symbolBounds.minY + symbolBounds.maxY) / 2
   };
-  const rotatedSymbolEnd = applyToPoint29(rotationMatrix, symbolEndPoint);
+  const rotatedSymbolEnd = applyToPoint30(rotationMatrix, symbolEndPoint);
   const symbolToRealTransform = compose7(
     translate7(
       realAnchorPosition.x - rotatedSymbolEnd.x,
@@ -3504,11 +3555,11 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     scale4(1)
     // Use full symbol size
   );
-  const [screenMinX, screenMinY] = applyToPoint29(
+  const [screenMinX, screenMinY] = applyToPoint30(
     compose7(realToScreenTransform, symbolToRealTransform),
     [bounds.minX, bounds.minY]
   );
-  const [screenMaxX, screenMaxY] = applyToPoint29(
+  const [screenMaxX, screenMaxY] = applyToPoint30(
     compose7(realToScreenTransform, symbolToRealTransform),
     [bounds.maxX, bounds.maxY]
   );
@@ -3532,7 +3583,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
   });
   for (const path of symbolPaths) {
     const symbolPath = path.points.map((p, i) => {
-      const [x, y] = applyToPoint29(
+      const [x, y] = applyToPoint30(
         compose7(realToScreenTransform, symbolToRealTransform),
         [p.x, p.y]
       );
@@ -3552,7 +3603,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     });
   }
   for (const text of symbolTexts) {
-    const screenTextPos = applyToPoint29(
+    const screenTextPos = applyToPoint30(
       compose7(realToScreenTransform, symbolToRealTransform),
       text
     );
@@ -3578,7 +3629,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
         fill: colorMap.schematic.label_local,
         "font-family": "sans-serif",
         "text-anchor": ninePointAnchorToTextAnchor2[text.anchor],
-        "dominant-baseline": ninePointAnchorToDominantBaseline2[text.anchor],
+        "dominant-baseline": ninePointAnchorToDominantBaseline[text.anchor],
         "font-size": `${getSchScreenFontSize(realToScreenTransform, "reference_designator")}px`
       },
       children: [
@@ -3594,7 +3645,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     });
   }
   for (const box of symbolBoxes) {
-    const screenBoxPos = applyToPoint29(
+    const screenBoxPos = applyToPoint30(
       compose7(realToScreenTransform, symbolToRealTransform),
       box
     );
@@ -3617,7 +3668,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = (schNetLabel, realToScreenTransfo
     });
   }
   for (const circle of symbolCircles) {
-    const screenCirclePos = applyToPoint29(
+    const screenCirclePos = applyToPoint30(
       compose7(realToScreenTransform, symbolToRealTransform),
       circle
     );
@@ -3656,14 +3707,14 @@ var createSvgObjectsForSchNetLabel = (schNetLabel, realToScreenTransform) => {
   const fontSizePx = getSchScreenFontSize(realToScreenTransform, "net_label");
   const fontSizeMm = getSchMmFontSize("net_label");
   const textWidthFSR = estimateTextWidth(schNetLabel.text || "");
-  const screenCenter = applyToPoint30(realToScreenTransform, schNetLabel.center);
+  const screenCenter = applyToPoint31(realToScreenTransform, schNetLabel.center);
   const realTextGrowthVec = getUnitVectorFromOutsideToEdge(
     schNetLabel.anchor_side
   );
   const screenTextGrowthVec = { ...realTextGrowthVec };
   screenTextGrowthVec.y *= -1;
   const fullWidthFsr = textWidthFSR + ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_EXTRA_PER_CHARACTER_FSR * schNetLabel.text.length + END_PADDING_FSR;
-  const screenAnchorPosition = schNetLabel.anchor_position ? applyToPoint30(realToScreenTransform, schNetLabel.anchor_position) : {
+  const screenAnchorPosition = schNetLabel.anchor_position ? applyToPoint31(realToScreenTransform, schNetLabel.anchor_position) : {
     x: screenCenter.x - screenTextGrowthVec.x * fullWidthFsr * fontSizePx / 2,
     y: screenCenter.y - screenTextGrowthVec.y * fullWidthFsr * fontSizePx / 2
   };
@@ -3704,7 +3755,7 @@ var createSvgObjectsForSchNetLabel = (schNetLabel, realToScreenTransform) => {
       y: -0.6
     }
   ].map(
-    (fontRelativePoint) => applyToPoint30(
+    (fontRelativePoint) => applyToPoint31(
       compose8(
         realToScreenTransform,
         translate8(realAnchorPosition.x, realAnchorPosition.y),
@@ -3780,50 +3831,6 @@ var createSvgObjectsForSchNetLabel = (schNetLabel, realToScreenTransform) => {
   return svgObjects;
 };
 
-// lib/sch/svg-object-fns/create-svg-objects-for-sch-text.ts
-import { applyToPoint as applyToPoint31 } from "transformation-matrix";
-var createSvgSchText = (elm, transform) => {
-  const center = applyToPoint31(transform, elm.position);
-  const textAnchorMap = {
-    center: "middle",
-    left: "start",
-    right: "end",
-    top: "middle",
-    bottom: "middle"
-  };
-  const dominantBaselineMap = {
-    center: "middle",
-    left: "middle",
-    right: "middle",
-    top: "hanging",
-    bottom: "ideographic"
-  };
-  return {
-    type: "element",
-    name: "text",
-    value: "",
-    attributes: {
-      x: center.x.toString(),
-      y: center.y.toString(),
-      fill: elm.color ?? colorMap.schematic.sheet_label,
-      "text-anchor": textAnchorMap[elm.anchor],
-      "dominant-baseline": dominantBaselineMap[elm.anchor],
-      "font-family": "sans-serif",
-      "font-size": `${getSchScreenFontSize(transform, "reference_designator")}px`,
-      transform: `rotate(${elm.rotation}, ${center.x}, ${center.y})`
-    },
-    children: [
-      {
-        type: "text",
-        value: elm.text,
-        name: elm.schematic_text_id,
-        attributes: {},
-        children: []
-      }
-    ]
-  };
-};
-
 // lib/sch/convert-circuit-json-to-schematic-svg.ts
 function convertCircuitJsonToSchematicSvg(circuitJson, options) {
   const realBounds = getSchematicBoundsFromCircuitJson(circuitJson);
@@ -3902,7 +3909,7 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
       schTraceSvgs.push(...createSchematicTrace(elm, transform));
     } else if (elm.type === "schematic_net_label") {
       schNetLabel.push(...createSvgObjectsForSchNetLabel(elm, transform));
-    } else if (elm.type === "schematic_text") {
+    } else if (elm.type === "schematic_text" && !elm.schematic_component_id) {
       schText.push(createSvgSchText(elm, transform));
     } else if (elm.type === "schematic_voltage_probe") {
       voltageProbeSvgs.push(