circuit-to-svg 0.0.159 → 0.0.161

package/dist/index.js

@@ -3622,6 +3622,18 @@ var createSvgSchErrorText = ({
   };
 };
 
+// lib/utils/is-source-port-connected.ts
+var isSourcePortConnected = (circuitJson, sourcePortId) => {
+  for (const elm of circuitJson) {
+    if (elm.type !== "source_trace") continue;
+    const trace = elm;
+    if (Array.isArray(trace.connected_source_port_ids) && trace.connected_source_port_ids.includes(sourcePortId)) {
+      return true;
+    }
+  }
+  return false;
+};
+
 // lib/sch/svg-object-fns/create-svg-objects-from-sch-component-with-symbol.ts
 var ninePointAnchorToTextAnchor2 = {
   top_left: "start",
@@ -3681,6 +3693,12 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
   const texts = symbol.primitives.filter((p) => p.type === "text");
   const circles = symbol.primitives.filter((p) => p.type === "circle");
   const boxes = symbol.primitives.filter((p) => p.type === "box");
+  const connectedSymbolPorts = /* @__PURE__ */ new Set();
+  for (const match of schPortsWithSymbolPorts) {
+    if (isSourcePortConnected(circuitJson, match.schPort.source_port_id)) {
+      connectedSymbolPorts.add(match.symbolPort);
+    }
+  }
   const bounds = {
     minX: Math.min(...paths.flatMap((p) => p.points.map((pt) => pt.x))),
     maxX: Math.max(...paths.flatMap((p) => p.points.map((pt) => pt.x))),
@@ -3805,6 +3823,7 @@ var createSvgObjectsFromSchematicComponentWithSymbol = ({
     });
   }
   for (const port of symbol.ports) {
+    if (connectedSymbolPorts.has(port)) continue;
     const screenPortPos = applyToPoint26(
       compose7(realToScreenTransform, transformFromSymbolToReal),
       port
@@ -3921,19 +3940,22 @@ var createSvgObjectsForSchPortBoxLine = ({
     value: "",
     children: []
   });
-  svgObjects.push({
-    name: "circle",
-    type: "element",
-    attributes: {
-      class: "component-pin",
-      cx: screenSchPortPos.x.toString(),
-      cy: screenSchPortPos.y.toString(),
-      r: (Math.abs(transform.a) * PIN_CIRCLE_RADIUS_MM).toString(),
-      "stroke-width": `${getSchStrokeSize(transform)}px`
-    },
-    value: "",
-    children: []
-  });
+  const isConnected = isSourcePortConnected(circuitJson, schPort.source_port_id);
+  if (!isConnected) {
+    svgObjects.push({
+      name: "circle",
+      type: "element",
+      attributes: {
+        class: "component-pin",
+        cx: screenSchPortPos.x.toString(),
+        cy: screenSchPortPos.y.toString(),
+        r: (Math.abs(transform.a) * PIN_CIRCLE_RADIUS_MM).toString(),
+        "stroke-width": `${getSchStrokeSize(transform)}px`
+      },
+      value: "",
+      children: []
+    });
+  }
   return svgObjects;
 };
 
@@ -4003,6 +4025,8 @@ var createSvgObjectsForSchPortPinLabel = (params) => {
   const screenPinNumberTextPos = applyToPoint29(transform, realPinNumberPos);
   const label = schPort.display_pin_label ?? schComponent.port_labels?.[`${schPort.pin_number}`];
   if (!label) return [];
+  const isNegated = label.startsWith("N_");
+  const displayLabel = isNegated ? label.slice(2) : label;
   svgObjects.push({
     name: "text",
     type: "element",
@@ -4010,7 +4034,7 @@ var createSvgObjectsForSchPortPinLabel = (params) => {
       class: "pin-number",
       x: screenPinNumberTextPos.x.toString(),
       y: screenPinNumberTextPos.y.toString(),
-      style: "font-family: sans-serif;",
+      style: `font-family: sans-serif;${isNegated ? " text-decoration: overline;" : ""}`,
       fill: colorMap.schematic.pin_number,
       "text-anchor": schPort.side_of_component === "left" || schPort.side_of_component === "bottom" ? "start" : "end",
       "dominant-baseline": "middle",
@@ -4020,7 +4044,7 @@ var createSvgObjectsForSchPortPinLabel = (params) => {
     children: [
       {
         type: "text",
-        value: label || "",
+        value: displayLabel || "",
         name: "",
         attributes: {},
         children: []
@@ -4572,6 +4596,8 @@ var createSvgObjectsForSchNetLabelWithSymbol = ({
   colorMap: colorMap2
 }) => {
   if (!schNetLabel.text) return [];
+  const isNegated = schNetLabel.text.startsWith("N_");
+  const labelText = isNegated ? schNetLabel.text.slice(2) : schNetLabel.text;
   const svgObjects = [];
   const symbol = symbols3[schNetLabel.symbol_name];
   if (!symbol) {
@@ -4595,8 +4621,8 @@ var createSvgObjectsForSchNetLabelWithSymbol = ({
     maxY: Math.max(...symbolPaths.flatMap((p) => p.points.map((pt) => pt.y)))
   };
   const fontSizeMm = getSchMmFontSize("net_label");
-  const textWidthFSR = estimateTextWidth(schNetLabel.text || "");
-  const fullWidthFsr = textWidthFSR + ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_EXTRA_PER_CHARACTER_FSR * schNetLabel.text.length + END_PADDING_FSR;
+  const textWidthFSR = estimateTextWidth(labelText || "");
+  const fullWidthFsr = textWidthFSR + ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_EXTRA_PER_CHARACTER_FSR * labelText.length + END_PADDING_FSR;
   const realTextGrowthVec = getUnitVectorFromOutsideToEdge(
     schNetLabel.anchor_side
   );
@@ -4697,7 +4723,7 @@ var createSvgObjectsForSchNetLabelWithSymbol = ({
     );
     let textValue = text.text;
     if (textValue === "{REF}") {
-      textValue = schNetLabel.text || "";
+      textValue = labelText || "";
     } else if (textValue === "{VAL}") {
       textValue = "";
     }
@@ -4717,7 +4743,8 @@ var createSvgObjectsForSchNetLabelWithSymbol = ({
         "font-family": "sans-serif",
         "text-anchor": ninePointAnchorToTextAnchor[text.anchor],
         "dominant-baseline": ninePointAnchorToDominantBaseline[text.anchor],
-        "font-size": `${getSchScreenFontSize(realToScreenTransform, "reference_designator")}px`
+        "font-size": `${getSchScreenFontSize(realToScreenTransform, "reference_designator")}px`,
+        ...isNegated && textValue === labelText ? { style: "text-decoration: overline;" } : {}
       },
       children: [
         {
@@ -4788,6 +4815,8 @@ var createSvgObjectsForSchNetLabel = ({
   colorMap: colorMap2
 }) => {
   if (!schNetLabel.text) return [];
+  const isNegated = schNetLabel.text.startsWith("N_");
+  const labelText = isNegated ? schNetLabel.text.slice(2) : schNetLabel.text;
   if (schNetLabel.symbol_name) {
     return createSvgObjectsForSchNetLabelWithSymbol({
       schNetLabel,
@@ -4798,14 +4827,14 @@ var createSvgObjectsForSchNetLabel = ({
   const svgObjects = [];
   const fontSizePx = getSchScreenFontSize(realToScreenTransform, "net_label");
   const fontSizeMm = getSchMmFontSize("net_label");
-  const textWidthFSR = estimateTextWidth(schNetLabel.text || "");
+  const textWidthFSR = estimateTextWidth(labelText || "");
   const screenCenter = applyToPoint37(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 fullWidthFsr = textWidthFSR + ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_EXTRA_PER_CHARACTER_FSR * labelText.length + END_PADDING_FSR;
   const screenAnchorPosition = schNetLabel.anchor_position ? applyToPoint37(realToScreenTransform, schNetLabel.anchor_position) : {
     x: screenCenter.x - screenTextGrowthVec.x * fullWidthFsr * fontSizePx / 2,
     y: screenCenter.y - screenTextGrowthVec.y * fullWidthFsr * fontSizePx / 2
@@ -4833,12 +4862,12 @@ var createSvgObjectsForSchNetLabel = ({
     },
     // Top right corner in font-relative coordinates
     {
-      x: ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_FSR + END_PADDING_EXTRA_PER_CHARACTER_FSR * schNetLabel.text.length + textWidthFSR,
+      x: ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_FSR + END_PADDING_EXTRA_PER_CHARACTER_FSR * labelText.length + textWidthFSR,
       y: 0.6
     },
     // Bottom right corner in font-relative coordinates
     {
-      x: ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_FSR + END_PADDING_EXTRA_PER_CHARACTER_FSR * schNetLabel.text.length + textWidthFSR,
+      x: ARROW_POINT_WIDTH_FSR * 2 + END_PADDING_FSR + END_PADDING_EXTRA_PER_CHARACTER_FSR * labelText.length + textWidthFSR,
       y: -0.6
     },
     // Bottom left corner in font-relative coordinates
@@ -4907,12 +4936,13 @@ var createSvgObjectsForSchNetLabel = ({
       "font-family": "sans-serif",
       "font-variant-numeric": "tabular-nums",
       "font-size": `${fontSizePx}px`,
-      transform: textTransformString
+      transform: textTransformString,
+      ...isNegated ? { style: "text-decoration: overline;" } : {}
     },
     children: [
       {
         type: "text",
-        value: schNetLabel.text || "",
+        value: labelText || "",
         name: "",
         attributes: {},
         children: []