circuit-json-to-tscircuit 0.0.76 → 0.0.78

package/dist/{chunk-NQTXLCEN.js → chunk-35I53U4L.js}

@@ -493,7 +493,7 @@ var isNonCollinear = ({
 // lib/generate-board-schematic-tsx/convert-symbol-primitives.ts
 import { schematic_text as schematic_text2 } from "circuit-json";
 import { applyToPoint as applyToPoint4 } from "transformation-matrix";
-var DEFAULT_SYMBOL_CIRCLE_STROKE_WIDTH = 0.02;
+var SYMBOL_OUTLINE_STROKE_WIDTH = 0.02;
 var anchors = {
   middle_top: "top_center",
   middle_bottom: "bottom_center",
@@ -518,7 +518,7 @@ var convertSymbolPrimitives = ({
     if (primitive.closed && points[0]) points.push(points[0]);
     return formatElement("schematicpath", {
       points,
-      strokeWidth: primitive.strokeWidth,
+      strokeWidth: SYMBOL_OUTLINE_STROKE_WIDTH,
       isFilled: primitive.fill
     });
   }
@@ -546,7 +546,7 @@ var convertSymbolPrimitives = ({
     return formatElement("schematiccircle", {
       center,
       radius: Math.hypot(radiusVector.x, radiusVector.y),
-      strokeWidth: DEFAULT_SYMBOL_CIRCLE_STROKE_WIDTH,
+      strokeWidth: SYMBOL_OUTLINE_STROKE_WIDTH,
       isFilled: primitive.fill
     });
   }

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-NQTXLCEN.js";
+} from "../chunk-35I53U4L.js";
 
 // cli/main.ts
 import { Command } from "commander";
@@ -16,7 +16,7 @@ var package_default = {
     "./cli": "./dist/cli/main.js"
   },
   type: "module",
-  version: "0.0.75",
+  version: "0.0.77",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/circuit-json-to-tscircuit.git"

package/dist/lib/index.js

@@ -1,6 +1,6 @@
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-NQTXLCEN.js";
+} from "../chunk-35I53U4L.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-board-schematic-tsx/convert-symbol-primitives.ts

@@ -3,9 +3,9 @@ import type { SchSymbol } from "schematic-symbols"
 import { applyToPoint, type Matrix } from "transformation-matrix"
 import { formatElement } from "./format-attributes"
 
-// Circuit JSON symbol primitives do not encode a stroke width. This matches
-// the component outline width used by circuit-to-svg.
-const DEFAULT_SYMBOL_CIRCLE_STROKE_WIDTH = 0.02
+// circuit-to-svg renders library symbol paths and circles with a fixed
+// component outline width, independent of library strokeWidth and symbol scale.
+const SYMBOL_OUTLINE_STROKE_WIDTH = 0.02
 
 const anchors = {
   middle_top: "top_center",
@@ -38,7 +38,7 @@ export const convertSymbolPrimitives = ({
       if (primitive.closed && points[0]) points.push(points[0])
       return formatElement("schematicpath", {
         points,
-        strokeWidth: primitive.strokeWidth,
+        strokeWidth: SYMBOL_OUTLINE_STROKE_WIDTH,
         isFilled: primitive.fill,
       })
     }
@@ -72,7 +72,7 @@ export const convertSymbolPrimitives = ({
       return formatElement("schematiccircle", {
         center,
         radius: Math.hypot(radiusVector.x, radiusVector.y),
-        strokeWidth: DEFAULT_SYMBOL_CIRCLE_STROKE_WIDTH,
+        strokeWidth: SYMBOL_OUTLINE_STROKE_WIDTH,
         isFilled: primitive.fill,
       })
     }

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.76",
+  "version": "0.0.78",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/circuit-json-to-tscircuit.git"

package/tests/board-symbol-outline-width.test.ts

@@ -0,0 +1,91 @@
+import { expect, test } from "bun:test"
+import { readFileSync } from "node:fs"
+import { gunzipSync } from "node:zlib"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToSchematicSvg } from "circuit-to-svg"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+import { applyToPoint, compose, scale, translate } from "transformation-matrix"
+
+// Compare stroke/segment-length ratios so SVG auto-fit does not affect the test.
+const firstPathStrokeRatio = (svg: string) => {
+  const path = svg.match(/<path\b[^>]*\bd="M ([^\"]+)"[^>]*>/)?.[0]
+  if (!path) throw new Error("Missing rendered symbol path")
+  const coordinates = path
+    .match(/\bd="M ([^\"]+)"/)![1]!
+    .split(/[MLZ\s,]+/)
+    .filter(Boolean)
+    .map(Number)
+  const width = Number.parseFloat(path.match(/\bstroke-width="([^\"]+)"/)![1]!)
+  return (
+    width /
+    Math.hypot(
+      coordinates[2]! - coordinates[0]!,
+      coordinates[3]! - coordinates[1]!,
+    )
+  )
+}
+
+for (const [fixture, symbolName, scaleFactor] of [
+  ["drv8307evm", "boxresistor_up", 1],
+  ["lm251772evm-pd", "boxresistor_right", 2],
+  ["lm5155evm-fly", "capacitor_down", 0.5],
+  ["lmg342x-bb-evm", "capacitor_polarized_down", 1],
+  ["drv8307evm", "diode_down", 1],
+] as const) {
+  test(`${fixture} ${symbolName} keeps rendered outline width at scale ${scaleFactor}`, async () => {
+    const source = JSON.parse(
+      gunzipSync(
+        readFileSync(
+          new URL(
+            `./fixtures/ti-evms/${fixture}.circuit.json.gz`,
+            import.meta.url,
+          ),
+        ),
+      ).toString(),
+    ) as CircuitJson
+    const component = source.find(
+      (e) => e.type === "schematic_component" && e.symbol_name === symbolName,
+    )
+    if (component?.type !== "schematic_component")
+      throw new Error("Missing fixture symbol")
+    const subset = source.filter(
+      (e) =>
+        e.type === "pcb_board" ||
+        e === component ||
+        (e.type === "source_component" &&
+          e.source_component_id === component.source_component_id) ||
+        (e.type === "source_port" &&
+          e.source_component_id === component.source_component_id) ||
+        (e.type === "schematic_port" &&
+          e.schematic_component_id === component.schematic_component_id),
+    )
+    const schematicToScaledSchematicTransform = compose(
+      translate(component.center.x, component.center.y),
+      scale(scaleFactor),
+      translate(-component.center.x, -component.center.y),
+    )
+    const scaledSize = applyToPoint(scale(scaleFactor), {
+      x: component.size.width,
+      y: component.size.height,
+    })
+    component.size = { width: scaledSize.x, height: scaledSize.y }
+    for (const element of subset) {
+      if (element.type === "schematic_port") {
+        element.center = applyToPoint(
+          schematicToScaledSchematicTransform,
+          element.center,
+        )
+      }
+    }
+    const output = await runTscircuitCode(
+      convertCircuitJsonToTscircuit(subset, { componentName: "SymbolOutline" }),
+    )
+    expect(
+      firstPathStrokeRatio(convertCircuitJsonToSchematicSvg(output)),
+    ).toBeCloseTo(
+      firstPathStrokeRatio(convertCircuitJsonToSchematicSvg(subset)),
+      8,
+    )
+  })
+}

package/tests/fixtures/create-ti-evm-roundtrip.ts

@@ -58,6 +58,15 @@ export async function createTiEvmRoundtrip({
     sourceCircuitJson.filter((element) => element.type === "pcb_via").length,
   )
 
+  for (const circuitJson of [sourceCircuitJson, renderedCircuitJson]) {
+    const unresolvedProjectStrings = circuitJson.filter(
+      (element) =>
+        element.type === "pcb_silkscreen_text" &&
+        /\.(?:PRJ_[A-Za-z0-9_]+|PCB_Rev)\b/u.test(element.text),
+    )
+    expect(unresolvedProjectStrings).toEqual([])
+  }
+
   const sourcePcbSvg = convertCircuitJsonToPcbSvg(sourceCircuitJson, {
     matchBoardAspectRatio: true,
   })

package/tests/fixtures/ti-evms/README.md

@@ -5,6 +5,11 @@ Texas Instruments' published Altium design files. They were generated with
 `tscircuit/altium-to-circuit-json` at commit
 `9a578b5762e1dcca06e6d3f84f1d2950d0acc301`.
 
+Project special strings in the LM251772EVM-PD, LM5155EVM-FLY, and
+LMG342X-BB-EVM PCB fixtures were resolved from their matching `.PrjPcb` files using
+`tscircuit/altium-to-circuit-json` commit
+`c630289c2cae01c8a4d4dc9b896b33f8a3d90f34`.
+
 The upstream files and checksums are maintained in that repository's
 `scripts/references/reference-manifest.ts`. The gzip files only avoid committing
 several megabytes of repetitive JSON; tests expand them before conversion.