circuit-to-svg 0.0.259 → 0.0.261

package/dist/index.d.ts

@@ -46,6 +46,7 @@ interface Options$4 {
     width?: number;
     height?: number;
     shouldDrawErrors?: boolean;
+    showErrorsInTextOverlay?: boolean;
     shouldDrawRatsNest?: boolean;
     showCourtyards?: boolean;
     showPcbGroups?: boolean;
@@ -77,6 +78,7 @@ interface Options$3 {
     width?: number;
     height?: number;
     includeVersion?: boolean;
+    showErrorsInTextOverlay?: boolean;
 }
 interface AssemblySvgContext {
     transform: Matrix;
@@ -101,6 +103,7 @@ interface Options$2 {
     width?: number;
     height?: number;
     includeVersion?: boolean;
+    showErrorsInTextOverlay?: boolean;
 }
 interface PinoutLabel {
     pcb_port: PcbPort;
@@ -301,6 +304,7 @@ interface Options$1 {
         label: string;
     }>;
     includeVersion?: boolean;
+    showErrorsInTextOverlay?: boolean;
 }
 declare function convertCircuitJsonToSchematicSvg(circuitJson: AnyCircuitElement[], options?: Options$1): string;
 /**
@@ -322,14 +326,16 @@ interface ConvertSchematicSimulationParams {
     schematicHeightRatio?: number;
     schematicOptions?: Omit<Parameters<typeof convertCircuitJsonToSchematicSvg>[1], "width" | "height" | "includeVersion">;
     includeVersion?: boolean;
+    showErrorsInTextOverlay?: boolean;
 }
-declare function convertCircuitJsonToSchematicSimulationSvg({ circuitJson, simulation_experiment_id, simulation_transient_voltage_graph_ids, width, height, schematicHeightRatio, schematicOptions, includeVersion, }: ConvertSchematicSimulationParams): string;
+declare function convertCircuitJsonToSchematicSimulationSvg({ circuitJson, simulation_experiment_id, simulation_transient_voltage_graph_ids, width, height, schematicHeightRatio, schematicOptions, includeVersion, showErrorsInTextOverlay, }: ConvertSchematicSimulationParams): string;
 
 interface Options {
     layer: "top" | "bottom";
     width?: number;
     height?: number;
     includeVersion?: boolean;
+    showErrorsInTextOverlay?: boolean;
 }
 declare function convertCircuitJsonToSolderPasteMask(circuitJson: AnyCircuitElement[], options: Options): string;
 
@@ -353,4 +359,6 @@ declare const createSvgObjectsForSchComponentPortHovers: ({ component, transform
     circuitJson: AnyCircuitElement[];
 }) => INode[];
 
-export { type AssemblySvgContext, CIRCUIT_TO_SVG_VERSION, type CircuitJsonWithSimulation, type ColorMap, type ColorOverrides, type PcbColorMap, type PcbColorOverrides, type PcbContext, type PinoutLabel, type PinoutSvgContext, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToPinoutSvg, convertCircuitJsonToSchematicSimulationSvg, convertCircuitJsonToSchematicSvg, convertCircuitJsonToSimulationGraphSvg, convertCircuitJsonToSolderPasteMask, createSvgObjectsForSchComponentPortHovers, getSoftwareUsedString, isSimulationExperiment, isSimulationTransientVoltageGraph, isSimulationVoltageProbe };
+declare function createErrorTextOverlay(circuitJson: AnyCircuitElement[], dataType?: string): INode | null;
+
+export { type AssemblySvgContext, CIRCUIT_TO_SVG_VERSION, type CircuitJsonWithSimulation, type ColorMap, type ColorOverrides, type PcbColorMap, type PcbColorOverrides, type PcbContext, type PinoutLabel, type PinoutSvgContext, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToPinoutSvg, convertCircuitJsonToSchematicSimulationSvg, convertCircuitJsonToSchematicSvg, convertCircuitJsonToSimulationGraphSvg, convertCircuitJsonToSolderPasteMask, createErrorTextOverlay, createSvgObjectsForSchComponentPortHovers, getSoftwareUsedString, isSimulationExperiment, isSimulationTransientVoltageGraph, isSimulationVoltageProbe };

package/dist/index.js

@@ -538,7 +538,8 @@ function createSvgObjectsFromPcbFabricationNoteRect(fabricationNoteRect, ctx) {
     color,
     layer = "top",
     pcb_component_id,
-    pcb_fabrication_note_rect_id
+    pcb_fabrication_note_rect_id,
+    corner_radius
   } = fabricationNoteRect;
   if (layerFilter && layer !== layerFilter) return [];
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
@@ -566,6 +567,9 @@ function createSvgObjectsFromPcbFabricationNoteRect(fabricationNoteRect, ctx) {
   const baseStrokeWidth = typeof stroke_width === "number" ? stroke_width : 0;
   const transformedStrokeWidth = baseStrokeWidth * Math.abs(transform.a);
   const overlayStrokeColor = color ?? DEFAULT_OVERLAY_STROKE_COLOR;
+  const baseCornerRadius = typeof corner_radius === "number" && corner_radius > 0 ? corner_radius : 0;
+  const transformedCornerRadiusX = baseCornerRadius * Math.abs(transform.a);
+  const transformedCornerRadiusY = baseCornerRadius * Math.abs(transform.d);
   const attributes = {
     x: rectX.toString(),
     y: rectY.toString(),
@@ -579,6 +583,12 @@ function createSvgObjectsFromPcbFabricationNoteRect(fabricationNoteRect, ctx) {
   if (pcb_component_id !== void 0) {
     attributes["data-pcb-component-id"] = pcb_component_id;
   }
+  if (transformedCornerRadiusX > 0) {
+    attributes.rx = transformedCornerRadiusX.toString();
+  }
+  if (transformedCornerRadiusY > 0) {
+    attributes.ry = transformedCornerRadiusY.toString();
+  }
   if (is_filled) {
     attributes.fill = color ?? DEFAULT_OVERLAY_FILL_COLOR;
   } else {
@@ -1411,7 +1421,8 @@ function createSvgObjectsFromPcbNoteRect(noteRect, ctx) {
     is_filled,
     has_stroke,
     is_stroke_dashed,
-    color
+    color,
+    corner_radius
   } = noteRect;
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
     console.error("Invalid pcb_note_rect data", { center, width, height });
@@ -1433,6 +1444,9 @@ function createSvgObjectsFromPcbNoteRect(noteRect, ctx) {
   const rectHeight = Math.abs(bottomRightY - topLeftY);
   const baseStrokeWidth = typeof stroke_width === "number" ? stroke_width : 0;
   const transformedStrokeWidth = baseStrokeWidth * Math.abs(transform.a);
+  const baseCornerRadius = typeof corner_radius === "number" && corner_radius > 0 ? corner_radius : 0;
+  const transformedCornerRadiusX = baseCornerRadius * Math.abs(transform.a);
+  const transformedCornerRadiusY = baseCornerRadius * Math.abs(transform.d);
   const overlayColor = color ?? DEFAULT_OVERLAY_COLOR2;
   const attributes = {
     x: rectX.toString(),
@@ -1444,6 +1458,12 @@ function createSvgObjectsFromPcbNoteRect(noteRect, ctx) {
     "data-pcb-note-rect-id": noteRect.pcb_note_rect_id,
     "data-pcb-layer": "overlay"
   };
+  if (transformedCornerRadiusX > 0) {
+    attributes.rx = transformedCornerRadiusX.toString();
+  }
+  if (transformedCornerRadiusY > 0) {
+    attributes.ry = transformedCornerRadiusY.toString();
+  }
   if (is_filled) {
     attributes.fill = color ?? DEFAULT_FILL_COLOR;
   } else {
@@ -2067,7 +2087,8 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     stroke_width,
     is_filled,
     has_stroke,
-    is_stroke_dashed
+    is_stroke_dashed,
+    corner_radius
   } = pcbSilkscreenRect;
   if (layerFilter && layer !== layerFilter) return [];
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
@@ -2078,6 +2099,9 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     center.x,
     center.y
   ]);
+  const baseCornerRadius = typeof corner_radius === "number" && corner_radius > 0 ? corner_radius : 0;
+  const transformedCornerRadiusX = baseCornerRadius * Math.abs(transform.a);
+  const transformedCornerRadiusY = baseCornerRadius * Math.abs(transform.d);
   const transformedWidth = width * Math.abs(transform.a);
   const transformedHeight = height * Math.abs(transform.d);
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
@@ -2092,6 +2116,12 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     "data-type": "pcb_silkscreen_rect",
     "data-pcb-layer": layer
   };
+  if (transformedCornerRadiusX > 0) {
+    attributes.rx = transformedCornerRadiusX.toString();
+  }
+  if (transformedCornerRadiusY > 0) {
+    attributes.ry = transformedCornerRadiusY.toString();
+  }
   attributes.fill = is_filled ? color : "none";
   let actualHasStroke;
   if (has_stroke === void 0) {
@@ -3472,7 +3502,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.258",
+  version: "0.0.260",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -3496,7 +3526,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
-    "circuit-json": "^0.0.296",
+    "circuit-json": "^0.0.297",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",
@@ -3595,6 +3625,53 @@ function getTypePriority(type) {
   return TYPE_PRIORITY[type] ?? DEFAULT_TYPE_PRIORITY;
 }
 
+// lib/utils/create-error-text-overlay.ts
+function createErrorTextOverlay(circuitJson, dataType = "error_text_overlay") {
+  const errorElms = circuitJson.filter(
+    (elm) => elm.type.endsWith("_error")
+  );
+  if (errorElms.length === 0) {
+    return null;
+  }
+  const errorMessages = errorElms.map((e) => e.message).filter((m) => !!m);
+  if (errorMessages.length === 0) {
+    return null;
+  }
+  const textBlock = {
+    name: "text",
+    type: "element",
+    value: "",
+    attributes: {
+      x: "10",
+      y: "20",
+      fill: "red",
+      "font-family": "monospace",
+      "font-size": "12px",
+      "data-type": dataType,
+      "data-layer": "global"
+    },
+    children: errorMessages.map((msg, i) => ({
+      name: "tspan",
+      type: "element",
+      value: "",
+      attributes: {
+        x: "10",
+        dy: i === 0 ? "0" : "1.2em"
+      },
+      children: [
+        {
+          type: "text",
+          value: msg,
+          name: "",
+          attributes: {},
+          children: []
+        }
+      ]
+    }))
+  };
+  return textBlock;
+}
+
 // lib/pcb/convert-circuit-json-to-pcb-svg.ts
 function convertCircuitJsonToPcbSvg(circuitJson, options) {
   const drawPaddingOutsideBoard = options?.drawPaddingOutsideBoard ?? true;
@@ -3829,6 +3906,15 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   if (gridObjects.rect) {
     children.push(gridObjects.rect);
   }
+  if (options?.showErrorsInTextOverlay) {
+    const errorOverlay = createErrorTextOverlay(
+      circuitJson,
+      "pcb_error_text_overlay"
+    );
+    if (errorOverlay) {
+      children.push(errorOverlay);
+    }
+  }
   const softwareUsedString = getSoftwareUsedString(circuitJson);
   const version = CIRCUIT_TO_SVG_VERSION;
   const svgObject = {
@@ -4835,29 +4921,14 @@ function convertCircuitJsonToAssemblySvg(soup, options) {
   ).flatMap((item) => createSvgObjects2(item, ctx, soup));
   const softwareUsedString = getSoftwareUsedString(soup);
   const version = CIRCUIT_TO_SVG_VERSION;
-  const svgObject = {
-    name: "svg",
-    type: "element",
-    attributes: {
-      xmlns: "http://www.w3.org/2000/svg",
-      width: svgWidth.toString(),
-      height: svgHeight.toString(),
-      ...softwareUsedString && {
-        "data-software-used-string": softwareUsedString
-      },
-      ...options?.includeVersion && {
-        "data-circuit-to-svg-version": version
-      }
-    },
-    value: "",
-    children: [
-      {
-        name: "style",
-        type: "element",
-        children: [
-          {
-            type: "text",
-            value: `
+  const children = [
+    {
+      name: "style",
+      type: "element",
+      children: [
+        {
+          type: "text",
+          value: `
               .assembly-component { 
                 fill: none; 
                 stroke: #000; 
@@ -4880,30 +4951,52 @@ function convertCircuitJsonToAssemblySvg(soup, options) {
                 stroke-width: 0.2; 
               }
             `,
-            name: "",
-            attributes: {},
-            children: []
-          }
-        ],
-        value: "",
-        attributes: {}
+          name: "",
+          attributes: {},
+          children: []
+        }
+      ],
+      value: "",
+      attributes: {}
+    },
+    {
+      name: "rect",
+      type: "element",
+      attributes: {
+        fill: "#fff",
+        x: "0",
+        y: "0",
+        width: svgWidth.toString(),
+        height: svgHeight.toString()
       },
-      {
-        name: "rect",
-        type: "element",
-        attributes: {
-          fill: "#fff",
-          x: "0",
-          y: "0",
-          width: svgWidth.toString(),
-          height: svgHeight.toString()
-        },
-        value: "",
-        children: []
+      value: "",
+      children: []
+    },
+    createSvgObjectFromAssemblyBoundary(transform, minX, minY, maxX, maxY),
+    ...svgObjects
+  ].filter((child) => child !== null);
+  if (options?.showErrorsInTextOverlay) {
+    const errorOverlay = createErrorTextOverlay(soup);
+    if (errorOverlay) {
+      children.push(errorOverlay);
+    }
+  }
+  const svgObject = {
+    name: "svg",
+    type: "element",
+    attributes: {
+      xmlns: "http://www.w3.org/2000/svg",
+      width: svgWidth.toString(),
+      height: svgHeight.toString(),
+      ...softwareUsedString && {
+        "data-software-used-string": softwareUsedString
       },
-      createSvgObjectFromAssemblyBoundary(transform, minX, minY, maxX, maxY),
-      ...svgObjects
-    ].filter((child) => child !== null)
+      ...options?.includeVersion && {
+        "data-circuit-to-svg-version": version
+      }
+    },
+    value: "",
+    children
   };
   return stringify2(svgObject);
 }
@@ -6200,6 +6293,28 @@ function convertCircuitJsonToPinoutSvg(soup, options) {
   ).flatMap((item) => createSvgObjects3(item, ctx, soup));
   const softwareUsedString = getSoftwareUsedString(soup);
   const version = CIRCUIT_TO_SVG_VERSION;
+  const children = [
+    {
+      name: "rect",
+      type: "element",
+      attributes: {
+        fill: "rgb(255, 255, 255)",
+        x: "0",
+        y: "0",
+        width: svgWidth.toString(),
+        height: svgHeight.toString()
+      },
+      value: "",
+      children: []
+    },
+    ...svgObjects
+  ].filter((child) => child !== null);
+  if (options?.showErrorsInTextOverlay) {
+    const errorOverlay = createErrorTextOverlay(soup);
+    if (errorOverlay) {
+      children.push(errorOverlay);
+    }
+  }
   const svgObject = {
     name: "svg",
     type: "element",
@@ -6215,22 +6330,7 @@ function convertCircuitJsonToPinoutSvg(soup, options) {
       }
     },
     value: "",
-    children: [
-      {
-        name: "rect",
-        type: "element",
-        attributes: {
-          fill: "rgb(255, 255, 255)",
-          x: "0",
-          y: "0",
-          width: svgWidth.toString(),
-          height: svgHeight.toString()
-        },
-        value: "",
-        children: []
-      },
-      ...svgObjects
-    ].filter((child) => child !== null)
+    children
   };
   return stringify3(svgObject);
 }
@@ -9751,6 +9851,12 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
   }
   const softwareUsedString = getSoftwareUsedString(circuitJson);
   const version = CIRCUIT_TO_SVG_VERSION;
+  if (options?.showErrorsInTextOverlay) {
+    const errorOverlay = createErrorTextOverlay(circuitJson);
+    if (errorOverlay) {
+      svgChildren.push(errorOverlay);
+    }
+  }
   const svgObject = {
     name: "svg",
     type: "element",
@@ -10446,7 +10552,8 @@ function convertCircuitJsonToSchematicSimulationSvg({
   height = DEFAULT_HEIGHT2,
   schematicHeightRatio = DEFAULT_SCHEMATIC_RATIO,
   schematicOptions,
-  includeVersion
+  includeVersion,
+  showErrorsInTextOverlay
 }) {
   const schematicElements = circuitJson.filter(
     (element) => !isSimulationExperiment(element) && !isSimulationTransientVoltageGraph(element)
@@ -10462,7 +10569,8 @@ function convertCircuitJsonToSchematicSimulationSvg({
     ...schematicOptions,
     width,
     height: schematicHeight,
-    includeVersion: false
+    includeVersion: false,
+    showErrorsInTextOverlay
   });
   const simulationSvg = convertCircuitJsonToSimulationGraphSvg({
     circuitJson,
@@ -10703,6 +10811,38 @@ function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
   ).flatMap((item) => createSvgObjects4({ elm: item, ctx }));
   const softwareUsedString = getSoftwareUsedString(circuitJson);
   const version = CIRCUIT_TO_SVG_VERSION;
+  const children = [
+    {
+      name: "style",
+      type: "element",
+      children: [
+        {
+          type: "text",
+          value: ""
+        }
+      ]
+    },
+    {
+      name: "rect",
+      type: "element",
+      attributes: {
+        class: "boundary",
+        x: "0",
+        y: "0",
+        fill: "#000",
+        width: svgWidth.toString(),
+        height: svgHeight.toString()
+      }
+    },
+    createSvgObjectFromPcbBoundary2(transform, minX, minY, maxX, maxY),
+    ...svgObjects
+  ].filter((child) => child !== null);
+  if (options?.showErrorsInTextOverlay) {
+    const errorOverlay = createErrorTextOverlay(circuitJson);
+    if (errorOverlay) {
+      children.push(errorOverlay);
+    }
+  }
   const svgObject = {
     name: "svg",
     type: "element",
@@ -10718,32 +10858,7 @@ function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
       }
     },
     value: "",
-    children: [
-      {
-        name: "style",
-        type: "element",
-        children: [
-          {
-            type: "text",
-            value: ""
-          }
-        ]
-      },
-      {
-        name: "rect",
-        type: "element",
-        attributes: {
-          class: "boundary",
-          x: "0",
-          y: "0",
-          fill: "#000",
-          width: svgWidth.toString(),
-          height: svgHeight.toString()
-        }
-      },
-      createSvgObjectFromPcbBoundary2(transform, minX, minY, maxX, maxY),
-      ...svgObjects
-    ].filter((child) => child !== null)
+    children
   };
   try {
     return stringify7(svgObject);
@@ -10814,6 +10929,7 @@ export {
   convertCircuitJsonToSchematicSvg,
   convertCircuitJsonToSimulationGraphSvg,
   convertCircuitJsonToSolderPasteMask,
+  createErrorTextOverlay,
   createSvgObjectsForSchComponentPortHovers,
   getSoftwareUsedString,
   isSimulationExperiment,