circuit-json-to-tscircuit 0.0.78 → 0.0.79

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

@@ -826,7 +826,24 @@ var convertComponents = (circuitJson) => su3(circuitJson).schematic_component.li
 import { su as su4 } from "@tscircuit/soup-util";
 import { schematic_text as schematic_text3 } from "circuit-json";
 import { symbols as symbols2 } from "schematic-symbols";
-import { translate as translate3 } from "transformation-matrix";
+
+// lib/generate-board-schematic-tsx/get-net-label-symbol-to-schematic-transform.ts
+import {
+  fromOneMovingPoint,
+  translate as translate3
+} from "transformation-matrix";
+var getNetLabelSymbolToSchematicTransform = ({
+  symbol,
+  schematicAnchorPosition
+}) => {
+  const symbolPort = symbol.ports[0];
+  if (!symbolPort) {
+    return translate3(schematicAnchorPosition.x, schematicAnchorPosition.y);
+  }
+  return fromOneMovingPoint(symbolPort, schematicAnchorPosition);
+};
+
+// lib/generate-board-schematic-tsx/convert-net-labels.ts
 function canRenderNativeNetLabel(name) {
   const selector = `net.${name}`;
   if (/net\.[^\s>]*\./.test(selector) || /net\.[^\s>]*[+-]/.test(selector) || /net\.[0-9]/.test(selector)) {
@@ -842,10 +859,10 @@ var convertNetLabels = (circuitJson) => su4(circuitJson).schematic_net_label.lis
     if (symbol)
       return convertSymbolPrimitives({
         symbol,
-        symbolToSchematicTransform: translate3(
-          anchorPosition.x,
-          anchorPosition.y
-        ),
+        symbolToSchematicTransform: getNetLabelSymbolToSchematicTransform({
+          symbol,
+          schematicAnchorPosition: anchorPosition
+        }),
         reference: schematicNetLabel.text,
         displayText: schematicNetLabel.text
       });

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-35I53U4L.js";
+} from "../chunk-43HJS53G.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.77",
+  version: "0.0.78",
   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-35I53U4L.js";
+} from "../chunk-43HJS53G.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-board-schematic-tsx/convert-net-labels.ts

@@ -1,10 +1,10 @@
 import { su } from "@tscircuit/soup-util"
 import { schematic_text } from "circuit-json"
 import { symbols } from "schematic-symbols"
-import { translate } from "transformation-matrix"
 import type { SchematicElementConverter } from "./converter-types"
 import { convertSymbolPrimitives } from "./convert-symbol-primitives"
 import { formatElement } from "./format-attributes"
+import { getNetLabelSymbolToSchematicTransform } from "./get-net-label-symbol-to-schematic-transform"
 
 // Match core's preprocessSelector checks for net names. The validator is not
 // exported by @tscircuit/core; runtime regression tests keep these in sync.
@@ -35,10 +35,10 @@ export const convertNetLabels: SchematicElementConverter = (circuitJson) =>
         if (symbol)
           return convertSymbolPrimitives({
             symbol,
-            symbolToSchematicTransform: translate(
-              anchorPosition.x,
-              anchorPosition.y,
-            ),
+            symbolToSchematicTransform: getNetLabelSymbolToSchematicTransform({
+              symbol,
+              schematicAnchorPosition: anchorPosition,
+            }),
             reference: schematicNetLabel.text,
             displayText: schematicNetLabel.text,
           })

package/lib/generate-board-schematic-tsx/get-net-label-symbol-to-schematic-transform.ts

@@ -0,0 +1,20 @@
+import type { SchSymbol } from "schematic-symbols"
+import {
+  fromOneMovingPoint,
+  type Matrix,
+  translate,
+} from "transformation-matrix"
+
+export const getNetLabelSymbolToSchematicTransform = ({
+  symbol,
+  schematicAnchorPosition,
+}: {
+  symbol: SchSymbol
+  schematicAnchorPosition: { x: number; y: number }
+}): Matrix => {
+  const symbolPort = symbol.ports[0]
+  if (!symbolPort) {
+    return translate(schematicAnchorPosition.x, schematicAnchorPosition.y)
+  }
+  return fromOneMovingPoint(symbolPort, schematicAnchorPosition)
+}

package/package.json

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

package/tests/board-power-symbol-anchor.test.ts

@@ -0,0 +1,73 @@
+import { expect, test } from "bun:test"
+import { readFileSync } from "node:fs"
+import { gunzipSync } from "node:zlib"
+import type { CircuitJson, SchematicNetLabel } from "circuit-json"
+import { convertNetLabels } from "lib/generate-board-schematic-tsx/convert-net-labels"
+import { runTscircuitCode } from "tscircuit"
+
+const fixtureNames = [
+  "drv8307evm",
+  "lm251772evm-pd",
+  "lm5155evm-fly",
+  "lmg342x-bb-evm",
+]
+
+const sourceCircuitJson = fixtureNames.flatMap((fixtureName) =>
+  JSON.parse(
+    gunzipSync(
+      readFileSync(
+        new URL(
+          `./fixtures/ti-evms/${fixtureName}.circuit.json.gz`,
+          import.meta.url,
+        ),
+      ),
+    ).toString(),
+  ),
+) as CircuitJson
+
+const symbolicNetLabels = sourceCircuitJson.filter(
+  (
+    element,
+  ): element is SchematicNetLabel & {
+    symbol_name: string
+  } => element.type === "schematic_net_label" && Boolean(element.symbol_name),
+)
+const representativeNetLabels = symbolicNetLabels.filter(
+  (label, index, labels) =>
+    labels.findIndex(
+      (candidate) => candidate.symbol_name === label.symbol_name,
+    ) === index,
+)
+
+test("TI power symbols connect their library port at the net label anchor", async () => {
+  expect(
+    representativeNetLabels.map((label) => label.symbol_name).sort(),
+  ).toEqual([
+    "ground_down",
+    "ground_left",
+    "ground_right",
+    "ground_up",
+    "vcc_down",
+    "vcc_left",
+    "vcc_right",
+    "vcc_up",
+  ])
+
+  for (const label of representativeNetLabels) {
+    const generatedElements = convertNetLabels([label])
+    const renderedCircuitJson = await runTscircuitCode(
+      `export default () => <board><symbol>${generatedElements.join("\n")}</symbol></board>`,
+    )
+    const renderedPoints = renderedCircuitJson.flatMap((element) =>
+      element.type === "schematic_path" ? element.points : [],
+    )
+    const anchorPosition = label.anchor_position ?? label.center
+    expect(
+      renderedPoints.some(
+        (point) =>
+          Math.hypot(point.x - anchorPosition.x, point.y - anchorPosition.y) <
+          0.000001,
+      ),
+    ).toBe(true)
+  }
+})