@tscircuit/core 0.0.1155 → 0.0.1157

package/dist/index.js

@@ -2679,6 +2679,25 @@ function fillCircleWithRects(circle, options = {}) {
 
 // lib/utils/obstacles/getObstaclesFromCircuitJson.ts
 var EVERY_LAYER = ["top", "inner1", "inner2", "bottom"];
+var QUARTER_TURN_TOLERANCE_DEGREES = 0.01;
+var getAxisAlignedRectFromRotatedRect = (rotatedRect) => {
+  const normalizedRotation = (rotatedRect.rotation % 360 + 360) % 360;
+  const axisAlignedAngles = [0, 90, 180, 270];
+  for (const angle of axisAlignedAngles) {
+    const angularDistance = Math.min(
+      Math.abs(normalizedRotation - angle),
+      360 - Math.abs(normalizedRotation - angle)
+    );
+    if (angularDistance > QUARTER_TURN_TOLERANCE_DEGREES) continue;
+    const isVertical = angle === 90 || angle === 270;
+    return {
+      center: rotatedRect.center,
+      width: isVertical ? rotatedRect.height : rotatedRect.width,
+      height: isVertical ? rotatedRect.width : rotatedRect.height
+    };
+  }
+  return null;
+};
 var getObstaclesFromCircuitJson = (soup, connMap) => {
   const withNetId = (idList) => connMap ? idList.concat(
     idList.map((id) => connMap?.getNetConnectedToId(id)).filter(Boolean)
@@ -2718,8 +2737,9 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           height: element.height,
           rotation: element.ccw_rotation
         };
-        const approximatingRects = generateApproximatingRects(rotatedRect);
-        for (const rect of approximatingRects) {
+        const singleRect = getAxisAlignedRectFromRotatedRect(rotatedRect);
+        const rects = singleRect ? [singleRect] : generateApproximatingRects(rotatedRect);
+        for (const rect of rects) {
           obstacles.push({
             type: "rect",
             layers: [element.layer],
@@ -19276,7 +19296,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1154",
+  version: "0.0.1156",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23074,83 +23094,77 @@ import {
 } from "@tscircuit/props";
 import { unknown_error_finding_part as unknown_error_finding_part2 } from "circuit-json";
 
-// lib/utils/connectors/rewriteToStandardUsbCPortHints.ts
-var PIN_HINT_RE = /^(?:pin)?(\d+)$/i;
-var USB_C_STANDARD_PORT_HINT_ALIASES = {
-  GND1: [],
-  VBUS1: [],
-  SBU2: [],
-  CC1: [],
-  DM2: ["DN2"],
-  DP1: [],
-  DM1: ["DN1"],
-  DP2: [],
-  SBU1: [],
-  CC2: [],
-  VBUS2: [],
-  GND2: [],
-  SHELL1: [],
-  SHELL2: [],
-  SHELL3: [],
-  SHELL4: []
-};
-var unique = (hints) => Array.from(new Set(hints));
-var rewriteToStandardUsbCPortHints = (circuitJson) => {
-  const aliasToStandardHint = {};
-  for (const [standardHint, aliases] of Object.entries(
-    USB_C_STANDARD_PORT_HINT_ALIASES
-  )) {
-    aliasToStandardHint[standardHint] = standardHint;
-    for (const alias of aliases) {
-      aliasToStandardHint[alias] = standardHint;
-    }
-  }
-  const sourceAliasesByPin = /* @__PURE__ */ new Map();
-  for (const elm of circuitJson) {
-    if (elm && typeof elm === "object" && elm.type === "source_port" && typeof elm.pin_number === "number") {
-      const pin = elm.pin_number;
-      const hints = Array.isArray(elm.port_hints) ? elm.port_hints.filter((h) => typeof h === "string").map((h) => h.trim()).filter((h) => h.length > 0 && !PIN_HINT_RE.test(h)) : [];
-      if (hints.length > 0) sourceAliasesByPin.set(pin, unique(hints));
-    }
-  }
-  if (sourceAliasesByPin.size === 0) return circuitJson;
-  return circuitJson.map((elm) => {
-    if (!elm || typeof elm !== "object" || !("port_hints" in elm)) return elm;
-    if (!Array.isArray(elm.port_hints)) return elm;
+// lib/utils/connectors/convertCircuitJsonToUsbCStandardCircuitJson.ts
+var STANDARD_USB_C_PIN_LABELS = [
+  { label: "GND1", aliases: [] },
+  { label: "VBUS1", aliases: [] },
+  { label: "CC1", aliases: [] },
+  { label: "DP1", aliases: [] },
+  { label: "DM1", aliases: ["DN1"] },
+  { label: "SBU1", aliases: [] },
+  { label: "SBU2", aliases: [] },
+  { label: "DM2", aliases: ["DN2"] },
+  { label: "DP2", aliases: [] },
+  { label: "CC2", aliases: [] },
+  { label: "VBUS2", aliases: [] },
+  { label: "GND2", aliases: [] },
+  { label: "SHELL1", aliases: ["MH1", "EH1", "MOUNT1"] },
+  { label: "SHELL2", aliases: ["MH2", "EH2", "MOUNT2"] },
+  { label: "SHELL3", aliases: ["MH3", "EH3", "MOUNT3"] },
+  { label: "SHELL4", aliases: ["MH4", "EH4", "MOUNT4"] }
+];
+var PIN_NUMBER_HINT_PATTERN = /^(?:pin)?(\d+)$/i;
+var dedupeHintsPreservingOrder = (hints) => Array.from(new Set(hints));
+var convertCircuitJsonToUsbCStandardCircuitJson = (partCircuitJson) => {
+  const unassignedPorts = [];
+  for (const elm of partCircuitJson) {
+    if (elm.type !== "source_port") continue;
+    const pinNumber = elm.pin_number;
+    if (typeof pinNumber !== "number") continue;
+    const upperCaseHints = /* @__PURE__ */ new Set();
+    for (const hint of elm.port_hints ?? []) {
+      upperCaseHints.add(hint.trim().toUpperCase());
+    }
+    unassignedPorts.push({ pinKey: `pin${pinNumber}`, upperCaseHints });
+  }
+  const canonicalHintsByPin = {};
+  for (const { label, aliases } of STANDARD_USB_C_PIN_LABELS) {
+    const canonicalAndAliasHintsUpper = [label, ...aliases].map(
+      (s) => s.toUpperCase()
+    );
+    const matchIndex = unassignedPorts.findIndex(
+      (port) => canonicalAndAliasHintsUpper.some((hint) => port.upperCaseHints.has(hint))
+    );
+    if (matchIndex === -1) continue;
+    const { pinKey } = unassignedPorts[matchIndex];
+    canonicalHintsByPin[pinKey] = [label];
+    unassignedPorts.splice(matchIndex, 1);
+  }
+  if (Object.keys(canonicalHintsByPin).length === 0) return partCircuitJson;
+  return partCircuitJson.map((elm) => {
+    if (!("port_hints" in elm) || !Array.isArray(elm.port_hints)) return elm;
     const originalHints = elm.port_hints.filter((h) => typeof h === "string").map((h) => h.trim()).filter((h) => h.length > 0);
     if (originalHints.length === 0) return elm;
-    const pinNumbers = /* @__PURE__ */ new Set();
+    const pinKeys = /* @__PURE__ */ new Set();
     if (elm.type === "source_port" && typeof elm.pin_number === "number") {
-      pinNumbers.add(elm.pin_number);
+      pinKeys.add(`pin${elm.pin_number}`);
     }
     for (const hint of originalHints) {
-      const m = hint.match(PIN_HINT_RE);
-      if (m) pinNumbers.add(Number.parseInt(m[1], 10));
-    }
-    const sourceAliases = [];
-    for (const pin of pinNumbers) {
-      sourceAliases.push(...sourceAliasesByPin.get(pin) ?? []);
-    }
-    const standardHints = /* @__PURE__ */ new Set();
-    for (const hint of [...originalHints, ...sourceAliases]) {
-      const standard = aliasToStandardHint[hint.toUpperCase()];
-      if (standard) standardHints.add(standard);
-    }
-    const addedHints = [];
-    for (const standardHint of standardHints) {
-      addedHints.push(
-        standardHint,
-        ...USB_C_STANDARD_PORT_HINT_ALIASES[standardHint]
-      );
+      const matchedPin = hint.match(PIN_NUMBER_HINT_PATTERN);
+      if (!matchedPin) continue;
+      pinKeys.add(`pin${Number.parseInt(matchedPin[1], 10)}`);
     }
-    const rewrittenPortHints = unique([
-      ...originalHints,
-      ...sourceAliases,
-      ...addedHints
-    ]);
+    const canonicalHintsToAdd = [];
+    for (const pinKey of pinKeys) {
+      canonicalHintsToAdd.push(...canonicalHintsByPin[pinKey] ?? []);
+    }
+    if (canonicalHintsToAdd.length === 0) return elm;
     return {
       ...elm,
-      port_hints: rewrittenPortHints
+      port_hints: dedupeHintsPreservingOrder([
+        ...originalHints,
+        ...canonicalHintsToAdd
+      ])
     };
   });
 };
@@ -23296,8 +23310,8 @@ var Connector = class extends Chip {
     });
   }
   _addConnectorFootprintFromCircuitJson(standard, circuitJson) {
-    const rewrittenCircuitJson = standard === "usb_c" ? rewriteToStandardUsbCPortHints(circuitJson) : circuitJson;
     const props = this._getConnectorProps();
+    const standardizedCircuitJson = standard === "usb_c" ? convertCircuitJsonToUsbCStandardCircuitJson(circuitJson) : circuitJson;
     const fpComponents = createComponentsFromCircuitJson(
       {
         componentName: this.name,
@@ -23306,7 +23320,7 @@ var Connector = class extends Chip {
         pinLabels: props.pinLabels,
         pcbPinLabels: props.pcbPinLabels
       },
-      rewrittenCircuitJson
+      standardizedCircuitJson
     );
     this.addAll(fpComponents);
     this._markDirty("InitializePortsFromChildren");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1155",
+  "version": "0.0.1157",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",