circuit-json-to-tscircuit 0.0.96 → 0.0.98

package/dist/{chunk-ULPDKPX5.js → chunk-3EOKTYYU.js}

@@ -168,7 +168,7 @@ var createBoardConversionContext = ({
   }
   return {
     pcbChipName,
-    pcbPortIdsWithUnambiguousComponentSelectors: /* @__PURE__ */ new Set(),
+    pcbPortIdsWithSafeOriginalHints: /* @__PURE__ */ new Set(),
     portHintByPcbPortId,
     runtimeNetNameBySourceNetId,
     pcbPortSelectorsBySourcePortId,
@@ -218,6 +218,59 @@ var getRuntimeNetNamesBySourcePortId = ({
   return result;
 };
 
+// lib/board-converter/get-pcb-port-ids-with-safe-original-hints.ts
+function getPcbPortIdsWithSafeOriginalHints({
+  circuitJson,
+  pcbComponentRuntimeNameByPcbComponentId
+}) {
+  const sourcePortById = /* @__PURE__ */ new Map();
+  const sourcePortsByComponentId = /* @__PURE__ */ new Map();
+  const originalHintSetsByPcbPortId = /* @__PURE__ */ new Map();
+  for (const element of circuitJson) {
+    if (element.type !== "source_port") continue;
+    sourcePortById.set(element.source_port_id, element);
+    if (!element.source_component_id) continue;
+    const componentPorts = sourcePortsByComponentId.get(element.source_component_id) ?? [];
+    componentPorts.push(element);
+    sourcePortsByComponentId.set(element.source_component_id, componentPorts);
+  }
+  for (const element of circuitJson) {
+    if (element.type !== "pcb_plated_hole" && element.type !== "pcb_smtpad" || !element.pcb_port_id || !element.port_hints) {
+      continue;
+    }
+    const originalHintSets = originalHintSetsByPcbPortId.get(element.pcb_port_id) ?? [];
+    originalHintSets.push(element.port_hints);
+    originalHintSetsByPcbPortId.set(element.pcb_port_id, originalHintSets);
+  }
+  const safePcbPortIds = /* @__PURE__ */ new Set();
+  for (const element of circuitJson) {
+    if (element.type !== "pcb_port" || !element.pcb_component_id || !pcbComponentRuntimeNameByPcbComponentId.has(element.pcb_component_id)) {
+      continue;
+    }
+    const sourcePort = sourcePortById.get(element.source_port_id);
+    const originalHintSets = originalHintSetsByPcbPortId.get(
+      element.pcb_port_id
+    );
+    if (!sourcePort?.source_component_id || !originalHintSets) continue;
+    const aliasesOnOtherPorts = /* @__PURE__ */ new Set();
+    for (const siblingPort of sourcePortsByComponentId.get(
+      sourcePort.source_component_id
+    ) ?? []) {
+      if (siblingPort.source_port_id === sourcePort.source_port_id) continue;
+      aliasesOnOtherPorts.add(siblingPort.name);
+      for (const portHint of siblingPort.port_hints ?? []) {
+        aliasesOnOtherPorts.add(portHint);
+      }
+    }
+    if (originalHintSets.every(
+      (originalHints) => originalHints.some((portHint) => /^(?:pin)?\d+$/u.test(portHint)) || originalHints.every((portHint) => !aliasesOnOtherPorts.has(portHint))
+    )) {
+      safePcbPortIds.add(element.pcb_port_id);
+    }
+  }
+  return safePcbPortIds;
+}
+
 // lib/board-converter/create-component-preserving-board-conversion-context.ts
 function createComponentPreservingBoardConversionContext({
   circuitJson,
@@ -232,15 +285,6 @@ function createComponentPreservingBoardConversionContext({
     }
   }
   const pcbPortSelectorsBySourcePortId = /* @__PURE__ */ new Map();
-  const pcbPortIdsWithUnambiguousComponentSelectors = new Set(
-    circuitJson.flatMap((element) => {
-      if (element.type !== "pcb_port") return [];
-      const pcbComponent = element.pcb_component_id ? pcbComponentsById.get(element.pcb_component_id) : void 0;
-      return pcbComponent && pcbComponentRuntimeNameByPcbComponentId.has(
-        pcbComponent.pcb_component_id
-      ) ? [element.pcb_port_id] : [];
-    })
-  );
   for (const element of circuitJson) {
     if (element.type !== "pcb_port") continue;
     const pcbComponent = element.pcb_component_id ? pcbComponentsById.get(element.pcb_component_id) : void 0;
@@ -272,7 +316,10 @@ function createComponentPreservingBoardConversionContext({
   }
   return {
     ...context,
-    pcbPortIdsWithUnambiguousComponentSelectors,
+    pcbPortIdsWithSafeOriginalHints: getPcbPortIdsWithSafeOriginalHints({
+      circuitJson,
+      pcbComponentRuntimeNameByPcbComponentId
+    }),
     pcbPortSelectorsBySourcePortId,
     pcbPortSelectorsByRuntimeNetName
   };
@@ -3656,9 +3703,7 @@ var getImportedPortHints = (primitive, context) => {
   if (!primitive.pcb_port_id || !context) return primitive.port_hints;
   const importedHint = context.portHintByPcbPortId.get(primitive.pcb_port_id);
   if (!importedHint) return primitive.port_hints;
-  if (!context.pcbPortIdsWithUnambiguousComponentSelectors.has(
-    primitive.pcb_port_id
-  )) {
+  if (!context.pcbPortIdsWithSafeOriginalHints.has(primitive.pcb_port_id)) {
     return [importedHint];
   }
   return [.../* @__PURE__ */ new Set([importedHint, ...primitive.port_hints ?? []])];
@@ -3927,10 +3972,10 @@ var convertSmtPads = (circuitJson, context) => {
     if (portHints !== void 0) {
       commonAttrs.push(`portHints={${JSON.stringify(portHints)}}`);
     }
-    if ("x" in smtPad && smtPad.x !== void 0) {
+    if (smtPad.shape !== "polygon" && "x" in smtPad && smtPad.x !== void 0) {
       commonAttrs.push(`pcbX="${mmStr8(smtPad.x)}"`);
     }
-    if ("y" in smtPad && smtPad.y !== void 0) {
+    if (smtPad.shape !== "polygon" && "y" in smtPad && smtPad.y !== void 0) {
       commonAttrs.push(`pcbY="${mmStr8(smtPad.y)}"`);
     }
     if (smtPad.layer !== void 0) {
@@ -4034,6 +4079,65 @@ var getPcbComponentRenderPlacement = ({
   };
 };
 
+// lib/board-converter/merge-overlapping-source-port-groups.ts
+function mergeOverlappingSourcePortGroups(sourcePortGroups) {
+  const groupBySourcePortId = /* @__PURE__ */ new Map();
+  for (const sourcePortIds of sourcePortGroups) {
+    const mergedGroup = new Set(sourcePortIds);
+    for (const sourcePortId of sourcePortIds) {
+      for (const connectedSourcePortId of groupBySourcePortId.get(
+        sourcePortId
+      ) ?? []) {
+        mergedGroup.add(connectedSourcePortId);
+      }
+    }
+    for (const sourcePortId of mergedGroup) {
+      groupBySourcePortId.set(sourcePortId, mergedGroup);
+    }
+  }
+  return [...new Set(groupBySourcePortId.values())].map((group) => [...group]);
+}
+
+// lib/board-converter/get-internally-connected-source-port-ids.ts
+function getInternallyConnectedSourcePortIds({
+  circuitJson,
+  sourceComponent
+}) {
+  const internallyConnectedSourcePortIds = [];
+  if ("internally_connected_source_port_ids" in sourceComponent) {
+    internallyConnectedSourcePortIds.push(
+      ...sourceComponent.internally_connected_source_port_ids ?? []
+    );
+  }
+  for (const element of circuitJson) {
+    if (element.type === "source_component_internal_connection" && element.source_component_id === sourceComponent.source_component_id) {
+      internallyConnectedSourcePortIds.push(element.source_port_ids);
+    }
+  }
+  return mergeOverlappingSourcePortGroups(internallyConnectedSourcePortIds);
+}
+
+// lib/board-converter/get-unambiguous-source-port-aliases.ts
+function getUnambiguousSourcePortAliases({
+  sourcePort,
+  sourcePorts,
+  internallyConnectedSourcePortIds = []
+}) {
+  return (sourcePort.port_hints ?? []).filter((alias) => {
+    if (alias === sourcePort.name) return true;
+    for (const canonicalPort of sourcePorts) {
+      if (canonicalPort.name !== alias || canonicalPort.source_port_id === sourcePort.source_port_id) {
+        continue;
+      }
+      const isDeclaredInternalConnection = internallyConnectedSourcePortIds.some(
+        (group) => group.includes(sourcePort.source_port_id) && group.includes(canonicalPort.source_port_id)
+      );
+      if (!isDeclaredInternalConnection) return false;
+    }
+    return true;
+  });
+}
+
 // lib/board-converter/get-pin-labels.ts
 var getCompoundPinNumber = (sourcePort) => {
   if (sourcePort.pin_number !== void 0) {
@@ -4071,9 +4175,17 @@ var getPinLabels = ({
       const importedPortHint = footprintConversionContext.portHintByPcbPortId.get(element.pcb_port_id);
       return importedPortHint ? [importedPortHint] : [];
     });
+    const sourceComponent = sourceComponents.find(
+      (component) => component.source_component_id === sourcePort.source_component_id
+    );
+    const internallyConnectedSourcePortIds = sourceComponent ? getInternallyConnectedSourcePortIds({ circuitJson, sourceComponent }) : void 0;
     const aliases = [
       sourcePort.name,
-      ...sourcePort.port_hints ?? [],
+      ...getUnambiguousSourcePortAliases({
+        sourcePort,
+        sourcePorts,
+        internallyConnectedSourcePortIds
+      }),
       ...importedPortHints
     ].filter(
       (alias, aliasIndex, allAliases) => alias.length > 0 && allAliases.indexOf(alias) === aliasIndex

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-ULPDKPX5.js";
+} from "../chunk-3EOKTYYU.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.95",
+  version: "0.0.97",
   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-ULPDKPX5.js";
+} from "../chunk-3EOKTYYU.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/board-conversion-context.ts

@@ -69,7 +69,7 @@ export const createBoardConversionContext = ({
 
   return {
     pcbChipName,
-    pcbPortIdsWithUnambiguousComponentSelectors: new Set<PcbPortId>(),
+    pcbPortIdsWithSafeOriginalHints: new Set<PcbPortId>(),
     portHintByPcbPortId,
     runtimeNetNameBySourceNetId,
     pcbPortSelectorsBySourcePortId,

package/lib/board-conversion-types.ts

@@ -10,7 +10,7 @@ export type PcbPortSelector = string
 
 export interface BoardConversionContext {
   pcbChipName: string
-  pcbPortIdsWithUnambiguousComponentSelectors: Set<PcbPortId>
+  pcbPortIdsWithSafeOriginalHints: Set<PcbPortId>
   portHintByPcbPortId: Map<PcbPortId, ImportedPortHint>
   runtimeNetNameBySourceNetId: Map<SourceNetId, RuntimeNetName>
   pcbPortSelectorsBySourcePortId: Map<SourcePortId, PcbPortSelector[]>

package/lib/board-converter/create-component-preserving-board-conversion-context.ts

@@ -9,6 +9,7 @@ import type {
   SourcePortId,
 } from "../board-conversion-types"
 import type { PcbComponentRuntimeNameByPcbComponentId } from "./get-board-child-runtime-names"
+import { getPcbPortIdsWithSafeOriginalHints } from "./get-pcb-port-ids-with-safe-original-hints"
 
 type PcbComponentId = PcbComponent["pcb_component_id"]
 export function createComponentPreservingBoardConversionContext({
@@ -32,20 +33,6 @@ export function createComponentPreservingBoardConversionContext({
     SourcePortId,
     PcbPortSelector[]
   >()
-  const pcbPortIdsWithUnambiguousComponentSelectors = new Set(
-    circuitJson.flatMap((element) => {
-      if (element.type !== "pcb_port") return []
-      const pcbComponent = element.pcb_component_id
-        ? pcbComponentsById.get(element.pcb_component_id)
-        : undefined
-      return pcbComponent &&
-        pcbComponentRuntimeNameByPcbComponentId.has(
-          pcbComponent.pcb_component_id,
-        )
-        ? [element.pcb_port_id]
-        : []
-    }),
-  )
   for (const element of circuitJson) {
     if (element.type !== "pcb_port") continue
     const pcbComponent = element.pcb_component_id
@@ -91,7 +78,10 @@ export function createComponentPreservingBoardConversionContext({
 
   return {
     ...context,
-    pcbPortIdsWithUnambiguousComponentSelectors,
+    pcbPortIdsWithSafeOriginalHints: getPcbPortIdsWithSafeOriginalHints({
+      circuitJson,
+      pcbComponentRuntimeNameByPcbComponentId,
+    }),
     pcbPortSelectorsBySourcePortId,
     pcbPortSelectorsByRuntimeNetName,
   }

package/lib/board-converter/get-internally-connected-source-port-ids.ts

@@ -0,0 +1,29 @@
+import type { AnyCircuitElement } from "circuit-json"
+import type { SourcePortId } from "../board-conversion-types"
+import { mergeOverlappingSourcePortGroups } from "./merge-overlapping-source-port-groups"
+
+type SourceComponent = Extract<AnyCircuitElement, { type: "source_component" }>
+
+export function getInternallyConnectedSourcePortIds({
+  circuitJson,
+  sourceComponent,
+}: {
+  circuitJson: AnyCircuitElement[]
+  sourceComponent: SourceComponent
+}): SourcePortId[][] {
+  const internallyConnectedSourcePortIds: SourcePortId[][] = []
+  if ("internally_connected_source_port_ids" in sourceComponent) {
+    internallyConnectedSourcePortIds.push(
+      ...(sourceComponent.internally_connected_source_port_ids ?? []),
+    )
+  }
+  for (const element of circuitJson) {
+    if (
+      element.type === "source_component_internal_connection" &&
+      element.source_component_id === sourceComponent.source_component_id
+    ) {
+      internallyConnectedSourcePortIds.push(element.source_port_ids)
+    }
+  }
+  return mergeOverlappingSourcePortGroups(internallyConnectedSourcePortIds)
+}

package/lib/board-converter/get-pcb-port-ids-with-safe-original-hints.ts

@@ -0,0 +1,82 @@
+import type { AnyCircuitElement } from "circuit-json"
+import type { PcbPortId, SourcePortId } from "../board-conversion-types"
+import type { PcbComponentRuntimeNameByPcbComponentId } from "./get-board-child-runtime-names"
+
+type PortHint = string
+type SourceComponentId = string
+type SourcePort = Extract<AnyCircuitElement, { type: "source_port" }>
+
+export function getPcbPortIdsWithSafeOriginalHints({
+  circuitJson,
+  pcbComponentRuntimeNameByPcbComponentId,
+}: {
+  circuitJson: AnyCircuitElement[]
+  pcbComponentRuntimeNameByPcbComponentId: PcbComponentRuntimeNameByPcbComponentId
+}): Set<PcbPortId> {
+  const sourcePortById = new Map<SourcePortId, SourcePort>()
+  const sourcePortsByComponentId = new Map<SourceComponentId, SourcePort[]>()
+  const originalHintSetsByPcbPortId = new Map<PcbPortId, PortHint[][]>()
+
+  for (const element of circuitJson) {
+    if (element.type !== "source_port") continue
+    sourcePortById.set(element.source_port_id, element)
+    if (!element.source_component_id) continue
+    const componentPorts =
+      sourcePortsByComponentId.get(element.source_component_id) ?? []
+    componentPorts.push(element)
+    sourcePortsByComponentId.set(element.source_component_id, componentPorts)
+  }
+
+  for (const element of circuitJson) {
+    if (
+      (element.type !== "pcb_plated_hole" && element.type !== "pcb_smtpad") ||
+      !element.pcb_port_id ||
+      !element.port_hints
+    ) {
+      continue
+    }
+    const originalHintSets =
+      originalHintSetsByPcbPortId.get(element.pcb_port_id) ?? []
+    originalHintSets.push(element.port_hints)
+    originalHintSetsByPcbPortId.set(element.pcb_port_id, originalHintSets)
+  }
+
+  const safePcbPortIds = new Set<PcbPortId>()
+  for (const element of circuitJson) {
+    if (
+      element.type !== "pcb_port" ||
+      !element.pcb_component_id ||
+      !pcbComponentRuntimeNameByPcbComponentId.has(element.pcb_component_id)
+    ) {
+      continue
+    }
+    const sourcePort = sourcePortById.get(element.source_port_id)
+    const originalHintSets = originalHintSetsByPcbPortId.get(
+      element.pcb_port_id,
+    )
+    if (!sourcePort?.source_component_id || !originalHintSets) continue
+
+    const aliasesOnOtherPorts = new Set<PortHint>()
+    for (const siblingPort of sourcePortsByComponentId.get(
+      sourcePort.source_component_id,
+    ) ?? []) {
+      if (siblingPort.source_port_id === sourcePort.source_port_id) continue
+      aliasesOnOtherPorts.add(siblingPort.name)
+      for (const portHint of siblingPort.port_hints ?? []) {
+        aliasesOnOtherPorts.add(portHint)
+      }
+    }
+    // A numbered hint only disambiguates the primitive carrying it.
+    if (
+      originalHintSets.every(
+        (originalHints) =>
+          originalHints.some((portHint) => /^(?:pin)?\d+$/u.test(portHint)) ||
+          originalHints.every((portHint) => !aliasesOnOtherPorts.has(portHint)),
+      )
+    ) {
+      safePcbPortIds.add(element.pcb_port_id)
+    }
+  }
+
+  return safePcbPortIds
+}

package/lib/board-converter/get-pin-labels.ts

@@ -1,5 +1,7 @@
 import type { AnyCircuitElement, PcbComponent } from "circuit-json"
 import type { BoardConversionContext as FootprintConversionContext } from "../board-conversion-context"
+import { getInternallyConnectedSourcePortIds } from "./get-internally-connected-source-port-ids"
+import { getUnambiguousSourcePortAliases } from "./get-unambiguous-source-port-aliases"
 
 type PinLabelKey = `pin${number}`
 type PinLabels = Partial<Record<PinLabelKey, string[]>>
@@ -71,9 +73,20 @@ export const getPinLabels = ({
         footprintConversionContext.portHintByPcbPortId.get(element.pcb_port_id)
       return importedPortHint ? [importedPortHint] : []
     })
+    const sourceComponent = sourceComponents.find(
+      (component) =>
+        component.source_component_id === sourcePort.source_component_id,
+    )
+    const internallyConnectedSourcePortIds = sourceComponent
+      ? getInternallyConnectedSourcePortIds({ circuitJson, sourceComponent })
+      : undefined
     const aliases = [
       sourcePort.name,
-      ...(sourcePort.port_hints ?? []),
+      ...getUnambiguousSourcePortAliases({
+        sourcePort,
+        sourcePorts,
+        internallyConnectedSourcePortIds,
+      }),
       ...importedPortHints,
     ].filter(
       (alias, aliasIndex, allAliases) =>

package/lib/board-converter/get-unambiguous-source-port-aliases.ts

@@ -0,0 +1,35 @@
+import type { AnyCircuitElement } from "circuit-json"
+import type { SourcePortId } from "../board-conversion-types"
+
+type SourcePort = Extract<AnyCircuitElement, { type: "source_port" }>
+
+export function getUnambiguousSourcePortAliases({
+  sourcePort,
+  sourcePorts,
+  internallyConnectedSourcePortIds = [],
+}: {
+  sourcePort: SourcePort
+  sourcePorts: SourcePort[]
+  internallyConnectedSourcePortIds?: SourcePortId[][]
+}): string[] {
+  return (sourcePort.port_hints ?? []).filter((alias) => {
+    if (alias === sourcePort.name) return true
+
+    for (const canonicalPort of sourcePorts) {
+      if (
+        canonicalPort.name !== alias ||
+        canonicalPort.source_port_id === sourcePort.source_port_id
+      ) {
+        continue
+      }
+      const isDeclaredInternalConnection =
+        internallyConnectedSourcePortIds.some(
+          (group) =>
+            group.includes(sourcePort.source_port_id) &&
+            group.includes(canonicalPort.source_port_id),
+        )
+      if (!isDeclaredInternalConnection) return false
+    }
+    return true
+  })
+}

package/lib/board-converter/merge-overlapping-source-port-groups.ts

@@ -0,0 +1,22 @@
+import type { SourcePortId } from "../board-conversion-types"
+
+export function mergeOverlappingSourcePortGroups(
+  sourcePortGroups: readonly (readonly SourcePortId[])[],
+): SourcePortId[][] {
+  const groupBySourcePortId = new Map<SourcePortId, Set<SourcePortId>>()
+  for (const sourcePortIds of sourcePortGroups) {
+    const mergedGroup = new Set<SourcePortId>(sourcePortIds)
+    for (const sourcePortId of sourcePortIds) {
+      for (const connectedSourcePortId of groupBySourcePortId.get(
+        sourcePortId,
+      ) ?? []) {
+        mergedGroup.add(connectedSourcePortId)
+      }
+    }
+    // Later declarations must see the whole group through any of its members.
+    for (const sourcePortId of mergedGroup) {
+      groupBySourcePortId.set(sourcePortId, mergedGroup)
+    }
+  }
+  return [...new Set(groupBySourcePortId.values())].map((group) => [...group])
+}

package/lib/generate-footprint-tsx/convert-smt-pads.ts

@@ -21,10 +21,11 @@ export const convertSmtPads: FootprintElementConverter = (
     if (portHints !== undefined) {
       commonAttrs.push(`portHints={${JSON.stringify(portHints)}}`)
     }
-    if ("x" in smtPad && smtPad.x !== undefined) {
+    // Polygon vertices already carry their position in the footprint frame.
+    if (smtPad.shape !== "polygon" && "x" in smtPad && smtPad.x !== undefined) {
       commonAttrs.push(`pcbX="${mmStr(smtPad.x)}"`)
     }
-    if ("y" in smtPad && smtPad.y !== undefined) {
+    if (smtPad.shape !== "polygon" && "y" in smtPad && smtPad.y !== undefined) {
       commonAttrs.push(`pcbY="${mmStr(smtPad.y)}"`)
     }
     if (smtPad.layer !== undefined) {

package/lib/generate-footprint-tsx/get-imported-port-hints.ts

@@ -8,13 +8,8 @@ export const getImportedPortHints = (
   if (!primitive.pcb_port_id || !context) return primitive.port_hints
   const importedHint = context.portHintByPcbPortId.get(primitive.pcb_port_id)
   if (!importedHint) return primitive.port_hints
-  if (
-    !context.pcbPortIdsWithUnambiguousComponentSelectors.has(
-      primitive.pcb_port_id,
-    )
-  ) {
+  if (!context.pcbPortIdsWithSafeOriginalHints.has(primitive.pcb_port_id)) {
     return [importedHint]
   }
-
   return [...new Set([importedHint, ...(primitive.port_hints ?? [])])]
 }

package/package.json

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