@tscircuit/cli 0.1.2229 → 0.1.2230

package/dist/cli/main.js

@@ -154298,7 +154298,7 @@ var import_perfect_cli = __toESM3(require_dist3(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.2228";
+var version = "0.1.2229";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -154326,7 +154326,7 @@ var package_default = {
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.657",
+    "@tscircuit/props": "^0.0.666",
     "@tscircuit/runframe": "^0.0.2884",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@tscircuit/schematic-trace-solver": "^0.0.204",
@@ -154367,7 +154367,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.357",
+    easyeda: "^0.0.366",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -365015,6 +365015,208 @@ var transformPCBElements2 = (elms, matrix) => {
   }
   return transformedElms;
 };
+var mergeBounds4 = (currentBounds, nextBounds) => ({
+  minX: Math.min(currentBounds.minX, nextBounds.minX),
+  minY: Math.min(currentBounds.minY, nextBounds.minY),
+  maxX: Math.max(currentBounds.maxX, nextBounds.maxX),
+  maxY: Math.max(currentBounds.maxY, nextBounds.maxY)
+});
+var getCircleBounds2 = (x, y, diameter) => {
+  const radius = diameter / 2;
+  return {
+    minX: x - radius,
+    minY: y - radius,
+    maxX: x + radius,
+    maxY: y + radius
+  };
+};
+var getRotatedRectBounds2 = (x, y, width, height, rotationDegrees) => {
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  const theta = rotationDegrees * Math.PI / 180;
+  const cosTheta = Math.cos(theta);
+  const sinTheta = Math.sin(theta);
+  const corners = [
+    { x: -halfWidth, y: -halfHeight },
+    { x: halfWidth, y: -halfHeight },
+    { x: halfWidth, y: halfHeight },
+    { x: -halfWidth, y: halfHeight }
+  ].map((corner) => ({
+    x: x + corner.x * cosTheta - corner.y * sinTheta,
+    y: y + corner.x * sinTheta + corner.y * cosTheta
+  }));
+  return {
+    minX: Math.min(...corners.map((corner) => corner.x)),
+    minY: Math.min(...corners.map((corner) => corner.y)),
+    maxX: Math.max(...corners.map((corner) => corner.x)),
+    maxY: Math.max(...corners.map((corner) => corner.y))
+  };
+};
+var getRotatedOvalBounds = (x, y, width, height, rotationDegrees) => {
+  const radiusX = width / 2;
+  const radiusY = height / 2;
+  const theta = rotationDegrees * Math.PI / 180;
+  const cosTheta = Math.cos(theta);
+  const sinTheta = Math.sin(theta);
+  const halfWidth = Math.hypot(radiusX * cosTheta, radiusY * sinTheta);
+  const halfHeight = Math.hypot(radiusX * sinTheta, radiusY * cosTheta);
+  return {
+    minX: x - halfWidth,
+    minY: y - halfHeight,
+    maxX: x + halfWidth,
+    maxY: y + halfHeight
+  };
+};
+var getRotatedPillBounds = (x, y, width, height, rotationDegrees) => {
+  const radius = Math.min(width, height) / 2;
+  const halfLineLength = Math.max(width, height) / 2 - radius;
+  const theta = rotationDegrees * Math.PI / 180;
+  const axis = width >= height ? { x: halfLineLength, y: 0 } : { x: 0, y: halfLineLength };
+  const rotatedAxis = {
+    x: axis.x * Math.cos(theta) - axis.y * Math.sin(theta),
+    y: axis.x * Math.sin(theta) + axis.y * Math.cos(theta)
+  };
+  const halfWidth = Math.abs(rotatedAxis.x) + radius;
+  const halfHeight = Math.abs(rotatedAxis.y) + radius;
+  return {
+    minX: x - halfWidth,
+    minY: y - halfHeight,
+    maxX: x + halfWidth,
+    maxY: y + halfHeight
+  };
+};
+var getBoundsFromPoints6 = (points) => {
+  if (points.length === 0)
+    return null;
+  return {
+    minX: Math.min(...points.map((point2) => point2.x)),
+    minY: Math.min(...points.map((point2) => point2.y)),
+    maxX: Math.max(...points.map((point2) => point2.x)),
+    maxY: Math.max(...points.map((point2) => point2.y))
+  };
+};
+var getRoutePoints = (route) => {
+  if (!Array.isArray(route))
+    return [];
+  return route.flatMap((point2) => {
+    if (!point2 || typeof point2 !== "object")
+      return [];
+    if ("x" in point2 && "y" in point2 && typeof point2.x === "number" && typeof point2.y === "number") {
+      return [{ x: point2.x, y: point2.y }];
+    }
+    if ("start" in point2 && "end" in point2) {
+      const positions = [point2.start, point2.end];
+      return positions.filter((position2) => Boolean(position2 && typeof position2 === "object" && "x" in position2 && "y" in position2 && typeof position2.x === "number" && typeof position2.y === "number"));
+    }
+    return [];
+  });
+};
+var getPcbElementBounds = (elm) => {
+  if (!elm.type.startsWith("pcb_"))
+    return null;
+  if (elm.type === "pcb_smtpad" && elm.shape === "polygon" && Array.isArray(elm.points)) {
+    return getBoundsFromPoints6(elm.points);
+  }
+  if (elm.type === "pcb_hole" && elm.hole_shape === "circle") {
+    return getCircleBounds2(elm.x, elm.y, elm.hole_diameter);
+  }
+  if (elm.type === "pcb_plated_hole") {
+    let platedHoleBounds;
+    if ("outer_diameter" in elm && typeof elm.outer_diameter === "number") {
+      platedHoleBounds = getCircleBounds2(elm.x, elm.y, elm.outer_diameter);
+    } else if ("hole_diameter" in elm && typeof elm.hole_diameter === "number") {
+      platedHoleBounds = getCircleBounds2(elm.x, elm.y, elm.hole_diameter);
+    }
+    if ((elm.shape === "oval" || elm.shape === "pill") && typeof elm.outer_width === "number" && typeof elm.outer_height === "number") {
+      const getOuterBounds = elm.shape === "pill" ? getRotatedPillBounds : getRotatedOvalBounds;
+      platedHoleBounds = getOuterBounds(elm.x, elm.y, elm.outer_width, elm.outer_height, elm.ccw_rotation ?? 0);
+    }
+    if ("rect_pad_width" in elm && typeof elm.rect_pad_width === "number" && "rect_pad_height" in elm && typeof elm.rect_pad_height === "number") {
+      const rectBounds = getRotatedRectBounds2(elm.x, elm.y, elm.rect_pad_width, elm.rect_pad_height, "rect_ccw_rotation" in elm ? elm.rect_ccw_rotation ?? 0 : 0);
+      platedHoleBounds = platedHoleBounds ? mergeBounds4(platedHoleBounds, rectBounds) : rectBounds;
+    }
+    if ("hole_diameter" in elm && typeof elm.hole_diameter === "number") {
+      const drillBounds = getCircleBounds2(elm.x + ("hole_offset_x" in elm ? elm.hole_offset_x ?? 0 : 0), elm.y + ("hole_offset_y" in elm ? elm.hole_offset_y ?? 0 : 0), elm.hole_diameter);
+      platedHoleBounds = platedHoleBounds ? mergeBounds4(platedHoleBounds, drillBounds) : drillBounds;
+    }
+    if (platedHoleBounds)
+      return platedHoleBounds;
+  }
+  const elementRecord = elm;
+  const routeBounds = getBoundsFromPoints6(getRoutePoints(elementRecord.route));
+  if (routeBounds)
+    return routeBounds;
+  const outlineBounds = getBoundsFromPoints6(getRoutePoints(elementRecord.outline));
+  if (outlineBounds)
+    return outlineBounds;
+  const pointsBounds = getBoundsFromPoints6(getRoutePoints(elementRecord.points));
+  if (pointsBounds)
+    return pointsBounds;
+  let centerX;
+  let centerY;
+  let width;
+  let height;
+  if ("x" in elm && "y" in elm) {
+    centerX = Number(elm.x);
+    centerY = Number(elm.y);
+  }
+  if ("outer_diameter" in elm) {
+    width = Number(elm.outer_diameter);
+    height = Number(elm.outer_diameter);
+  }
+  if ("width" in elm) {
+    width = Number(elm.width);
+  }
+  if ("height" in elm) {
+    height = Number(elm.height);
+  }
+  if ("center" in elm && elm.center && typeof elm.center === "object" && "x" in elm.center && "y" in elm.center) {
+    centerX = Number(elm.center.x);
+    centerY = Number(elm.center.y);
+  }
+  let rotation2 = 0;
+  if ("rotation" in elm && typeof elm.rotation === "number") {
+    rotation2 = elm.rotation;
+  }
+  if ("ccw_rotation" in elm && typeof elm.ccw_rotation === "number") {
+    rotation2 = elm.ccw_rotation;
+  }
+  if (centerX !== undefined && centerY !== undefined) {
+    if (width !== undefined && height !== undefined) {
+      return rotation2 ? getRotatedRectBounds2(centerX, centerY, width, height, rotation2) : {
+        minX: centerX - width / 2,
+        minY: centerY - height / 2,
+        maxX: centerX + width / 2,
+        maxY: centerY + height / 2
+      };
+    }
+    if ("radius" in elm && typeof elm.radius === "number") {
+      return getCircleBounds2(centerX, centerY, elm.radius * 2);
+    }
+    return { minX: centerX, minY: centerY, maxX: centerX, maxY: centerY };
+  }
+  const anchoredPoint = [elementRecord.anchor_position, elementRecord.position].filter((position2) => Boolean(position2 && typeof position2 === "object" && "x" in position2 && "y" in position2 && typeof position2.x === "number" && typeof position2.y === "number")).at(0);
+  return anchoredPoint ? {
+    minX: anchoredPoint.x,
+    minY: anchoredPoint.y,
+    maxX: anchoredPoint.x,
+    maxY: anchoredPoint.y
+  } : null;
+};
+var getBoundsOfPcbElements3 = (elements) => {
+  let bounds = {
+    minX: Number.POSITIVE_INFINITY,
+    minY: Number.POSITIVE_INFINITY,
+    maxX: Number.NEGATIVE_INFINITY,
+    maxY: Number.NEGATIVE_INFINITY
+  };
+  for (const element of elements) {
+    const elementBounds = getPcbElementBounds(element);
+    if (elementBounds)
+      bounds = mergeBounds4(bounds, elementBounds);
+  }
+  return bounds;
+};
 function stringHash3(str) {
   let hash = 0;
   if (str.length == 0)
@@ -365226,6 +365428,116 @@ var PIN1_LOCATION_PARTS = {
   bottomside_right: { side: "bottomside", alignment: "right" }
 };
 var PIN1_LOCATIONS2 = Object.keys(PIN1_LOCATION_PARTS);
+var normalizeActiveLowPinLabel = (label) => {
+  const hasActiveLowMarker = label.startsWith("#") || label.endsWith("#");
+  if (!hasActiveLowMarker)
+    return label;
+  const activeLowLabel = label.replace(/^#/, "").replace(/#$/, "");
+  if (activeLowLabel.length === 0)
+    return label;
+  if (activeLowLabel.startsWith("N_"))
+    return activeLowLabel;
+  return `N_${activeLowLabel}`;
+};
+var normalizePinLabels = (inputPinLabels) => {
+  const normalizedInputPinLabels = inputPinLabels.map((labels) => labels.map(normalizeActiveLowPinLabel));
+  const uniqueInputPinLabels = normalizedInputPinLabels.map((labels) => [
+    ...new Set(labels)
+  ]);
+  const result = uniqueInputPinLabels.map(() => []);
+  const desiredNumbers = uniqueInputPinLabels.map(() => null);
+  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
+    for (const label of uniqueInputPinLabels[i]) {
+      if (/^\d+$/.test(label)) {
+        desiredNumbers[i] = Number.parseInt(label);
+        break;
+      }
+    }
+  }
+  let highestPinNumber = 0;
+  const acceptedDesiredNumbers = /* @__PURE__ */ new Set;
+  for (let i = 0;i < desiredNumbers.length; i++) {
+    const desiredNumber = desiredNumbers[i];
+    if (desiredNumber === null || desiredNumber < 1)
+      continue;
+    if (!acceptedDesiredNumbers.has(desiredNumber)) {
+      acceptedDesiredNumbers.add(desiredNumber);
+      result[i].push(`pin${desiredNumber}`);
+      highestPinNumber = Math.max(highestPinNumber, desiredNumber);
+      continue;
+    }
+    let existingAltCount = 0;
+    for (const label of result[i]) {
+      if (label.startsWith(`pin${desiredNumber}_alt`)) {
+        existingAltCount += 1;
+      }
+    }
+    result[i].push(`pin${desiredNumber}_alt${existingAltCount + 1}`);
+  }
+  for (let i = 0;i < result.length; i++) {
+    const firstLabel = result[i][0];
+    if (firstLabel?.includes("_alt")) {
+      highestPinNumber += 1;
+      result[i].unshift(`pin${highestPinNumber}`);
+    }
+  }
+  for (let i = 0;i < result.length; i++) {
+    if (result[i].length === 0) {
+      highestPinNumber += 1;
+      result[i].push(`pin${highestPinNumber}`);
+    }
+  }
+  const totalLabelCounts = {};
+  for (const inputLabels of uniqueInputPinLabels) {
+    for (const label of inputLabels) {
+      if (/^\d+$/.test(label))
+        continue;
+      totalLabelCounts[label] = (totalLabelCounts[label] ?? 0) + 1;
+    }
+  }
+  const incrementalLabelCounts = {};
+  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
+    for (const label of uniqueInputPinLabels[i]) {
+      if (/^\d+$/.test(label))
+        continue;
+      if (totalLabelCounts[label] === 1) {
+        result[i].push(label);
+      } else {
+        incrementalLabelCounts[label] = (incrementalLabelCounts[label] ?? 0) + 1;
+        result[i].push(`${label}${incrementalLabelCounts[label]}`);
+      }
+    }
+  }
+  return result;
+};
+var normalizeEasyEdaPinLabel = (label) => {
+  if (label.endsWith("+"))
+    label = `${label.slice(0, -1)}_POS`;
+  if (/[-–−]$/.test(label))
+    label = `${label.slice(0, -1)}_NEG`;
+  label = normalizeActiveLowPinLabel(label);
+  if (/^\+\d+(?:\.\d+)?V$/i.test(label))
+    label = `V${label.slice(1, -1)}`;
+  if (label.startsWith("+"))
+    label = `${label.slice(1)}_POS`;
+  if (/^[-–−]/.test(label))
+    label = `${label.slice(1)}_NEG`;
+  return label;
+};
+var getEasyEdaPinAliases = (label) => {
+  label = label.replace(/&#(x[0-9a-f]+|[0-9]+);/gi, (entity, code) => {
+    let codePoint = Number(code);
+    if (/^x/i.test(code))
+      codePoint = Number.parseInt(code.slice(1), 16);
+    const maximumUnicodeCodePoint = 1114111;
+    if (codePoint > maximumUnicodeCodePoint)
+      return entity;
+    return String.fromCodePoint(codePoint);
+  });
+  if (label.includes("/") && !/[a-zA-Z0-9]/.test(label))
+    return [];
+  return label.split("/").map((alias) => normalizeEasyEdaPinLabel(alias.trim()).replace(/[`′]/g, "_PRIME").replace(/^[()]+|[()]+$/g, "").replace(/[^a-zA-Z0-9_]/g, "_")).filter((alias) => /[a-zA-Z0-9]/.test(alias));
+};
 function orientation3(p, q, r) {
   const val = (q.y - p.y) * (r.x - q.x) - (q.x - p.x) * (r.y - q.y);
   if (val === 0)
@@ -365253,7 +365565,7 @@ var getBoundsCenter3 = (bounds) => ({
   x: (bounds.minX + bounds.maxX) / 2,
   y: (bounds.minY + bounds.maxY) / 2
 });
-var getBoundsFromPoints6 = (points) => {
+var getBoundsFromPoints23 = (points) => {
   if (points.length === 0) {
     return null;
   }
@@ -365500,96 +365812,6 @@ var getPolarizedPinMetadata = (pinLabels) => {
     pinLabels: Object.fromEntries(polarizedPinEntries)
   };
 };
-var normalizeActiveLowPinLabel = (label) => {
-  const hasActiveLowMarker = label.startsWith("#") || label.endsWith("#");
-  if (!hasActiveLowMarker)
-    return label;
-  const activeLowLabel = label.replace(/^#/, "").replace(/#$/, "");
-  if (activeLowLabel.length === 0)
-    return label;
-  if (activeLowLabel.startsWith("N_"))
-    return activeLowLabel;
-  return `N_${activeLowLabel}`;
-};
-var normalizePinLabels = (inputPinLabels) => {
-  const normalizedInputPinLabels = inputPinLabels.map((labels) => labels.map(normalizeActiveLowPinLabel));
-  const uniqueInputPinLabels = normalizedInputPinLabels.map((labels) => [
-    ...new Set(labels)
-  ]);
-  const result = uniqueInputPinLabels.map(() => []);
-  const desiredNumbers = uniqueInputPinLabels.map(() => null);
-  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
-    for (const label of uniqueInputPinLabels[i]) {
-      if (/^\d+$/.test(label)) {
-        desiredNumbers[i] = Number.parseInt(label);
-        break;
-      }
-    }
-  }
-  let highestPinNumber = 0;
-  const acceptedDesiredNumbers = /* @__PURE__ */ new Set;
-  for (let i = 0;i < desiredNumbers.length; i++) {
-    const desiredNumber = desiredNumbers[i];
-    if (desiredNumber === null || desiredNumber < 1)
-      continue;
-    if (!acceptedDesiredNumbers.has(desiredNumber)) {
-      acceptedDesiredNumbers.add(desiredNumber);
-      result[i].push(`pin${desiredNumber}`);
-      highestPinNumber = Math.max(highestPinNumber, desiredNumber);
-      continue;
-    }
-    let existingAltCount = 0;
-    for (const label of result[i]) {
-      if (label.startsWith(`pin${desiredNumber}_alt`)) {
-        existingAltCount += 1;
-      }
-    }
-    result[i].push(`pin${desiredNumber}_alt${existingAltCount + 1}`);
-  }
-  for (let i = 0;i < result.length; i++) {
-    const firstLabel = result[i][0];
-    if (firstLabel?.includes("_alt")) {
-      highestPinNumber += 1;
-      result[i].unshift(`pin${highestPinNumber}`);
-    }
-  }
-  for (let i = 0;i < result.length; i++) {
-    if (result[i].length === 0) {
-      highestPinNumber += 1;
-      result[i].push(`pin${highestPinNumber}`);
-    }
-  }
-  const totalLabelCounts = {};
-  for (const inputLabels of uniqueInputPinLabels) {
-    for (const label of inputLabels) {
-      if (/^\d+$/.test(label))
-        continue;
-      totalLabelCounts[label] = (totalLabelCounts[label] ?? 0) + 1;
-    }
-  }
-  const incrementalLabelCounts = {};
-  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
-    for (const label of uniqueInputPinLabels[i]) {
-      if (/^\d+$/.test(label))
-        continue;
-      if (totalLabelCounts[label] === 1) {
-        result[i].push(label);
-      } else {
-        incrementalLabelCounts[label] = (incrementalLabelCounts[label] ?? 0) + 1;
-        result[i].push(`${label}${incrementalLabelCounts[label]}`);
-      }
-    }
-  }
-  return result;
-};
-var normalizeSymbolName = (name) => {
-  const trimmedName = name.trim();
-  if (trimmedName === "+")
-    return "_POS";
-  if (trimmedName === "-")
-    return "_NEG";
-  return trimmedName.replace(/(?<=[A-Za-z0-9])-(?=[A-Za-z0-9])/g, "_");
-};
 var categoryValueContainsDiode = (value) => {
   if (typeof value === "string") {
     return /(^|[^a-z])diodes?([^a-z]|$)/i.test(value);
@@ -365683,7 +365905,7 @@ var getEasyEdaModelOriginOnBoardMm = ({
   }
   let modelOriginMm = null;
   if (points.length > 0) {
-    const bounds = getBoundsFromPoints6(points);
+    const bounds = getBoundsFromPoints23(points);
     modelOriginMm = bounds ? getBoundsCenter3(bounds) : null;
   } else {
     const [originX, originY] = String(svgNode.svgData.attrs?.c_origin ?? "0,0").split(",").map((value) => Number(value.trim()));
@@ -365772,6 +365994,45 @@ var parseCadOffsetsFromSvgNode = (svgNode) => {
     })()
   };
 };
+var getCadModelOutlineBounds = (svgNode) => {
+  const points = [];
+  for (const childNode of svgNode?.svgData.childNodes ?? []) {
+    if (typeof childNode !== "object" || childNode === null)
+      continue;
+    const attrs = childNode.attrs;
+    if (typeof attrs !== "object" || attrs === null)
+      continue;
+    const rawPoints = attrs.points;
+    if (typeof rawPoints !== "string")
+      continue;
+    const coordinates = rawPoints.trim().split(/\s+/).map(Number);
+    for (let index = 0;index + 1 < coordinates.length; index += 2) {
+      const x = coordinates[index];
+      const y = coordinates[index + 1];
+      if (!Number.isFinite(x) || !Number.isFinite(y))
+        continue;
+      points.push({ x: milx10(x), y: milx10(y) });
+    }
+  }
+  if (points.length === 0)
+    return;
+  return {
+    minX: Math.min(...points.map((point2) => point2.x)),
+    minY: Math.min(...points.map((point2) => point2.y)),
+    maxX: Math.max(...points.map((point2) => point2.x)),
+    maxY: Math.max(...points.map((point2) => point2.y))
+  };
+};
+var unionBounds2 = (first, second) => {
+  if (!second)
+    return first;
+  return {
+    minX: Math.min(first.minX, second.minX),
+    minY: Math.min(first.minY, second.minY),
+    maxX: Math.max(first.maxX, second.maxX),
+    maxY: Math.max(first.maxY, second.maxY)
+  };
+};
 var readModelHeightMm = (raw) => {
   const fallback = 3.5;
   if (raw == null)
@@ -366012,13 +366273,11 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   const pads = easyEdaJson.packageDetail.dataStr.shape.filter((shape) => shape.type === "PAD");
   const pins = easyEdaJson.dataStr.shape.filter((shape) => shape.type === "PIN");
   const pinLabelSets = pads.map((pad) => {
-    const labels = [];
-    if (pad.number)
-      labels.push(pad.number.toString());
+    const padAliases = pad.number ? getEasyEdaPinAliases(pad.number.toString()) : [];
     const pin = pins.find((p) => p.pinNumber === pad.number);
-    if (pin)
-      labels.push(normalizeSymbolName(pin.label));
-    return labels;
+    const schematicAliases = pin ? getEasyEdaPinAliases(pin.label) : [];
+    const hasNamedSchematicAlias = schematicAliases.some((alias) => !/^\d+$/.test(alias));
+    return hasNamedSchematicAlias ? [...schematicAliases, ...padAliases] : [...padAliases, ...schematicAliases];
   });
   const padNumberKeys = pads.map((pad, index) => {
     const padNumber = String(pad.number ?? "").trim();
@@ -366308,16 +366567,26 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
       model_step_url: stepFileUrl
     }));
   }
-  const hasExplicitCourtyard = circuitElements.some((e) => e.type === "pcb_courtyard_outline");
+  const hasExplicitCourtyard = circuitElements.some((e) => e.type === "pcb_courtyard_outline" || e.type === "pcb_courtyard_rect");
   if (!hasExplicitCourtyard) {
     const bbox = easyEdaJson.packageDetail.dataStr.BBox;
-    if (bbox) {
+    const modelOutlineBounds = getCadModelOutlineBounds(svgNode);
+    const packageElements = circuitElements.filter((element) => element.type === "pcb_smtpad" || element.type === "pcb_plated_hole" || element.type === "pcb_hole" || element.type === "pcb_via");
+    const packageElementBounds = packageElements.length > 0 ? getBoundsOfPcbElements3(packageElements) : undefined;
+    const fallbackBounds = bbox ? {
+      minX: milx10(bbox.x),
+      minY: milx10(bbox.y),
+      maxX: milx10(bbox.x + bbox.width),
+      maxY: milx10(bbox.y + bbox.height)
+    } : undefined;
+    const courtyardBounds = modelOutlineBounds ? unionBounds2(modelOutlineBounds, packageElementBounds) : fallbackBounds;
+    if (courtyardBounds) {
       const strokeWidth = 0.05;
       const margin = 0.25;
-      const x1 = milx10(bbox.x) - margin;
-      const y1 = milx10(bbox.y) - margin;
-      const x2 = milx10(bbox.x + bbox.width) + margin;
-      const y2 = milx10(bbox.y + bbox.height) + margin;
+      const x1 = courtyardBounds.minX - margin;
+      const y1 = courtyardBounds.minY - margin;
+      const x2 = courtyardBounds.maxX + margin;
+      const y2 = courtyardBounds.maxY + margin;
       circuitElements.push(pcb_courtyard_outline2.parse({
         type: "pcb_courtyard_outline",
         pcb_courtyard_outline_id: `pcb_courtyard_outline_${easyEdaJson.lcsc.number}_1`,
@@ -366848,19 +367117,10 @@ var PinShapeOutputSchema = external_exports2.object({
 var parsePin = (pinString) => {
   const parts = pinString.split("~");
   const [, visibility, , pinNumber, x, y, rotation2, id] = parts;
-  const nameMatch = pinString.match(/~([\w+#-]+)~(start|end)~/);
-  let label = nameMatch ? nameMatch[1] : "";
-  if (label.endsWith("+"))
-    label = `${label.slice(0, -1)}_POS`;
-  if (label.endsWith("-"))
-    label = `${label.slice(0, -1)}_NEG`;
-  label = normalizeActiveLowPinLabel(label);
-  if (/^\+\d+(?:\.\d+)?V$/i.test(label))
-    label = `V${label.slice(1, -1)}`;
-  if (label.startsWith("+"))
-    label = `${label.slice(1)}_POS`;
-  if (label.startsWith("-"))
-    label = `${label.slice(1)}_NEG`;
+  const pinNameSection = pinString.split("^^")[3];
+  let label = pinNameSection?.split("~")[4] ?? "";
+  if (!label.includes("/"))
+    label = normalizeEasyEdaPinLabel(label);
   const colorMatch = pinString.match(/#[0-9A-F]{6}/);
   const labelColor = colorMatch ? colorMatch[0] : "";
   const path = pinString.split("^^")[2]?.split("~")[0] ?? "";
@@ -367350,6 +367610,14 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch2 = globalTh
   placementCache.set(cacheKey, placementPromise);
   return placementPromise;
 };
+var normalizeSymbolName = (name) => {
+  const trimmedName = name.trim();
+  if (trimmedName === "+")
+    return "_POS";
+  if (trimmedName === "-")
+    return "_NEG";
+  return trimmedName.replace(/(?<=[A-Za-z0-9])-(?=[A-Za-z0-9])/g, "_");
+};
 var round3 = (value) => Number(value.toFixed(6));
 var EASYEDA_SCHEMATIC_UNIT_TO_TSCIRCUIT_UNIT = 0.02;
 var toSchematicUnits = (value) => round3(value * EASYEDA_SCHEMATIC_UNIT_TO_TSCIRCUIT_UNIT);
@@ -367563,13 +367831,14 @@ var getPortMetadataByShapeId = (easyEdaJson, circuitJson) => {
     portName ??= `pin${pinIndex + 1}`;
     usedPortNames.add(portName);
     const sourcePort = sourcePorts.find((port) => port.name === portName);
+    let aliases = getEasyEdaPinAliases(pin.label);
+    if (sourcePort?.port_hints?.length) {
+      aliases = sourcePort.port_hints;
+    }
     metadataByShapeId.set(pin.id, {
       name: portName,
       pinNumber: sourcePort?.pin_number,
-      aliases: [
-        ...sourcePort?.port_hints ?? [],
-        ...pin.label ? [normalizeSymbolName(pin.label)] : []
-      ].filter((alias, index, aliases) => alias !== portName && aliases.indexOf(alias) === index)
+      aliases: aliases.filter((alias, index, aliases2) => alias !== portName && aliases2.indexOf(alias) === index)
     });
   });
   return metadataByShapeId;
@@ -367819,7 +368088,7 @@ var generateFootprintTsx2 = (circuitJson, options = {}) => {
       </footprint>
   `.trim();
 };
-var POWER_PIN_LABEL = /^(?:VCC|VDD|VIN|VDDA)\d*$/;
+var POWER_PIN_LABEL = /^(?:VCC|VDD|VIN|VDDA|VBUS)\d*$/;
 var GROUND_PIN_LABEL = /^(?:GND|VSS|PGND|AGND)\d*$/;
 var NO_CONNECT_PIN_LABEL = /^NC\d*$/;
 var getAttributeKind = (label) => {
@@ -368319,34 +368588,36 @@ var normalizeResistorValue = (value) => {
 var isResistorComponent = (betterEasy) => {
   const componentParameters = betterEasy.dataStr.head.c_para;
   const packageName = componentParameters.package;
-  return componentParameters.pre?.toUpperCase() === "R?" && typeof packageName === "string" && standardSmdResistorPackagePattern.test(packageName.trim()) && normalizeResistorValue(componentParameters.Value) !== undefined;
+  const hasResistorCategory = betterEasy.tags.some((tag) => /\bresistors?\b/i.test(tag));
+  return (componentParameters.pre?.toUpperCase() === "R?" || hasResistorCategory) && typeof packageName === "string" && standardSmdResistorPackagePattern.test(packageName.trim()) && normalizeResistorValue(componentParameters.Value) !== undefined;
 };
-var categoryValueContainsSwitch = (value) => {
-  if (typeof value === "string") {
-    const normalized = value.toLowerCase();
-    if (/analog\s+switch/.test(normalized) || /multiplex/.test(normalized) || /switching\s+diodes?/.test(normalized) || /\bics?\b/.test(normalized)) {
-      return false;
-    }
-    return /(?:slide|toggle|dip|key|micro|limit)\s+switch(?:es)?/.test(normalized) || /(^|[^a-z])switch(?:es)?([^a-z]|$)/.test(normalized);
-  }
-  if (Array.isArray(value)) {
-    return value.some(categoryValueContainsSwitch);
+var getCategoryStrings = (category) => {
+  if (typeof category === "string")
+    return [category.toLowerCase()];
+  if (Array.isArray(category))
+    return category.flatMap(getCategoryStrings);
+  if (category && typeof category === "object") {
+    return Object.values(category).flatMap(getCategoryStrings);
   }
-  if (value && typeof value === "object") {
-    return Object.values(value).some(categoryValueContainsSwitch);
+  return [];
+};
+var categoryValueContainsSwitch = (category) => {
+  const categoryStrings = getCategoryStrings(category);
+  if (categoryStrings.some((category2) => /analog[\s-]+switch/.test(category2) || /multiplex/.test(category2) || /switching\s+diodes?/.test(category2) || /\bics?\b/.test(category2) || /\b(?:power[\s-]+distribution|load)[\s-]+switch(?:es)?\b/.test(category2))) {
+    return false;
   }
-  return false;
+  return categoryStrings.some((category2) => /(?:slide|toggle|dip|key|micro|limit)\s+switch(?:es)?/.test(category2) || /(^|[^a-z])switch(?:es)?([^a-z]|$)/.test(category2));
 };
 var isSwitchCategoryComponent = (betterEasy) => {
   const cPara = betterEasy.dataStr.head.c_para;
-  return [
+  return categoryValueContainsSwitch([
     betterEasy.tags,
     cPara.category,
     cPara.Category,
     cPara["LCSC Category"],
     cPara["JLCPCB Category"],
     betterEasy.category
-  ].some(categoryValueContainsSwitch);
+  ]);
 };
 var getGeneratedComponentType = (betterEasy, pinCount) => {
   if (isLedCategoryComponent(betterEasy) && pinCount === 2)
@@ -368881,6 +369152,116 @@ var __export6 = (target, all) => {
   for (var name in all)
     __defProp7(target, name, { get: all[name], enumerable: true });
 };
+var normalizeActiveLowPinLabel2 = (label) => {
+  const hasActiveLowMarker = label.startsWith("#") || label.endsWith("#");
+  if (!hasActiveLowMarker)
+    return label;
+  const activeLowLabel = label.replace(/^#/, "").replace(/#$/, "");
+  if (activeLowLabel.length === 0)
+    return label;
+  if (activeLowLabel.startsWith("N_"))
+    return activeLowLabel;
+  return `N_${activeLowLabel}`;
+};
+var normalizePinLabels2 = (inputPinLabels) => {
+  const normalizedInputPinLabels = inputPinLabels.map((labels) => labels.map(normalizeActiveLowPinLabel2));
+  const uniqueInputPinLabels = normalizedInputPinLabels.map((labels) => [
+    ...new Set(labels)
+  ]);
+  const result = uniqueInputPinLabels.map(() => []);
+  const desiredNumbers = uniqueInputPinLabels.map(() => null);
+  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
+    for (const label of uniqueInputPinLabels[i]) {
+      if (/^\d+$/.test(label)) {
+        desiredNumbers[i] = Number.parseInt(label);
+        break;
+      }
+    }
+  }
+  let highestPinNumber = 0;
+  const acceptedDesiredNumbers = /* @__PURE__ */ new Set;
+  for (let i = 0;i < desiredNumbers.length; i++) {
+    const desiredNumber = desiredNumbers[i];
+    if (desiredNumber === null || desiredNumber < 1)
+      continue;
+    if (!acceptedDesiredNumbers.has(desiredNumber)) {
+      acceptedDesiredNumbers.add(desiredNumber);
+      result[i].push(`pin${desiredNumber}`);
+      highestPinNumber = Math.max(highestPinNumber, desiredNumber);
+      continue;
+    }
+    let existingAltCount = 0;
+    for (const label of result[i]) {
+      if (label.startsWith(`pin${desiredNumber}_alt`)) {
+        existingAltCount += 1;
+      }
+    }
+    result[i].push(`pin${desiredNumber}_alt${existingAltCount + 1}`);
+  }
+  for (let i = 0;i < result.length; i++) {
+    const firstLabel = result[i][0];
+    if (firstLabel?.includes("_alt")) {
+      highestPinNumber += 1;
+      result[i].unshift(`pin${highestPinNumber}`);
+    }
+  }
+  for (let i = 0;i < result.length; i++) {
+    if (result[i].length === 0) {
+      highestPinNumber += 1;
+      result[i].push(`pin${highestPinNumber}`);
+    }
+  }
+  const totalLabelCounts = {};
+  for (const inputLabels of uniqueInputPinLabels) {
+    for (const label of inputLabels) {
+      if (/^\d+$/.test(label))
+        continue;
+      totalLabelCounts[label] = (totalLabelCounts[label] ?? 0) + 1;
+    }
+  }
+  const incrementalLabelCounts = {};
+  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
+    for (const label of uniqueInputPinLabels[i]) {
+      if (/^\d+$/.test(label))
+        continue;
+      if (totalLabelCounts[label] === 1) {
+        result[i].push(label);
+      } else {
+        incrementalLabelCounts[label] = (incrementalLabelCounts[label] ?? 0) + 1;
+        result[i].push(`${label}${incrementalLabelCounts[label]}`);
+      }
+    }
+  }
+  return result;
+};
+var normalizeEasyEdaPinLabel2 = (label) => {
+  if (label.endsWith("+"))
+    label = `${label.slice(0, -1)}_POS`;
+  if (/[-–−]$/.test(label))
+    label = `${label.slice(0, -1)}_NEG`;
+  label = normalizeActiveLowPinLabel2(label);
+  if (/^\+\d+(?:\.\d+)?V$/i.test(label))
+    label = `V${label.slice(1, -1)}`;
+  if (label.startsWith("+"))
+    label = `${label.slice(1)}_POS`;
+  if (/^[-–−]/.test(label))
+    label = `${label.slice(1)}_NEG`;
+  return label;
+};
+var getEasyEdaPinAliases2 = (label) => {
+  label = label.replace(/&#(x[0-9a-f]+|[0-9]+);/gi, (entity, code) => {
+    let codePoint = Number(code);
+    if (/^x/i.test(code))
+      codePoint = Number.parseInt(code.slice(1), 16);
+    const maximumUnicodeCodePoint = 1114111;
+    if (codePoint > maximumUnicodeCodePoint)
+      return entity;
+    return String.fromCodePoint(codePoint);
+  });
+  if (label.includes("/") && !/[a-zA-Z0-9]/.test(label))
+    return [];
+  return label.split("/").map((alias) => normalizeEasyEdaPinLabel2(alias.trim()).replace(/[`′]/g, "_PRIME").replace(/^[()]+|[()]+$/g, "").replace(/[^a-zA-Z0-9_]/g, "_")).filter((alias) => /[a-zA-Z0-9]/.test(alias));
+};
 function orientation4(p, q, r) {
   const val = (q.y - p.y) * (r.x - q.x) - (q.x - p.x) * (r.y - q.y);
   if (val === 0)
@@ -374319,6 +374700,208 @@ var transformPCBElements3 = (elms, matrix) => {
   }
   return transformedElms;
 };
+var mergeBounds5 = (currentBounds, nextBounds) => ({
+  minX: Math.min(currentBounds.minX, nextBounds.minX),
+  minY: Math.min(currentBounds.minY, nextBounds.minY),
+  maxX: Math.max(currentBounds.maxX, nextBounds.maxX),
+  maxY: Math.max(currentBounds.maxY, nextBounds.maxY)
+});
+var getCircleBounds3 = (x, y, diameter) => {
+  const radius = diameter / 2;
+  return {
+    minX: x - radius,
+    minY: y - radius,
+    maxX: x + radius,
+    maxY: y + radius
+  };
+};
+var getRotatedRectBounds3 = (x, y, width, height, rotationDegrees) => {
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  const theta = rotationDegrees * Math.PI / 180;
+  const cosTheta = Math.cos(theta);
+  const sinTheta = Math.sin(theta);
+  const corners = [
+    { x: -halfWidth, y: -halfHeight },
+    { x: halfWidth, y: -halfHeight },
+    { x: halfWidth, y: halfHeight },
+    { x: -halfWidth, y: halfHeight }
+  ].map((corner) => ({
+    x: x + corner.x * cosTheta - corner.y * sinTheta,
+    y: y + corner.x * sinTheta + corner.y * cosTheta
+  }));
+  return {
+    minX: Math.min(...corners.map((corner) => corner.x)),
+    minY: Math.min(...corners.map((corner) => corner.y)),
+    maxX: Math.max(...corners.map((corner) => corner.x)),
+    maxY: Math.max(...corners.map((corner) => corner.y))
+  };
+};
+var getRotatedOvalBounds2 = (x, y, width, height, rotationDegrees) => {
+  const radiusX = width / 2;
+  const radiusY = height / 2;
+  const theta = rotationDegrees * Math.PI / 180;
+  const cosTheta = Math.cos(theta);
+  const sinTheta = Math.sin(theta);
+  const halfWidth = Math.hypot(radiusX * cosTheta, radiusY * sinTheta);
+  const halfHeight = Math.hypot(radiusX * sinTheta, radiusY * cosTheta);
+  return {
+    minX: x - halfWidth,
+    minY: y - halfHeight,
+    maxX: x + halfWidth,
+    maxY: y + halfHeight
+  };
+};
+var getRotatedPillBounds2 = (x, y, width, height, rotationDegrees) => {
+  const radius = Math.min(width, height) / 2;
+  const halfLineLength = Math.max(width, height) / 2 - radius;
+  const theta = rotationDegrees * Math.PI / 180;
+  const axis = width >= height ? { x: halfLineLength, y: 0 } : { x: 0, y: halfLineLength };
+  const rotatedAxis = {
+    x: axis.x * Math.cos(theta) - axis.y * Math.sin(theta),
+    y: axis.x * Math.sin(theta) + axis.y * Math.cos(theta)
+  };
+  const halfWidth = Math.abs(rotatedAxis.x) + radius;
+  const halfHeight = Math.abs(rotatedAxis.y) + radius;
+  return {
+    minX: x - halfWidth,
+    minY: y - halfHeight,
+    maxX: x + halfWidth,
+    maxY: y + halfHeight
+  };
+};
+var getBoundsFromPoints24 = (points) => {
+  if (points.length === 0)
+    return null;
+  return {
+    minX: Math.min(...points.map((point2) => point2.x)),
+    minY: Math.min(...points.map((point2) => point2.y)),
+    maxX: Math.max(...points.map((point2) => point2.x)),
+    maxY: Math.max(...points.map((point2) => point2.y))
+  };
+};
+var getRoutePoints2 = (route) => {
+  if (!Array.isArray(route))
+    return [];
+  return route.flatMap((point2) => {
+    if (!point2 || typeof point2 !== "object")
+      return [];
+    if ("x" in point2 && "y" in point2 && typeof point2.x === "number" && typeof point2.y === "number") {
+      return [{ x: point2.x, y: point2.y }];
+    }
+    if ("start" in point2 && "end" in point2) {
+      const positions = [point2.start, point2.end];
+      return positions.filter((position2) => Boolean(position2 && typeof position2 === "object" && "x" in position2 && "y" in position2 && typeof position2.x === "number" && typeof position2.y === "number"));
+    }
+    return [];
+  });
+};
+var getPcbElementBounds2 = (elm) => {
+  if (!elm.type.startsWith("pcb_"))
+    return null;
+  if (elm.type === "pcb_smtpad" && elm.shape === "polygon" && Array.isArray(elm.points)) {
+    return getBoundsFromPoints24(elm.points);
+  }
+  if (elm.type === "pcb_hole" && elm.hole_shape === "circle") {
+    return getCircleBounds3(elm.x, elm.y, elm.hole_diameter);
+  }
+  if (elm.type === "pcb_plated_hole") {
+    let platedHoleBounds;
+    if ("outer_diameter" in elm && typeof elm.outer_diameter === "number") {
+      platedHoleBounds = getCircleBounds3(elm.x, elm.y, elm.outer_diameter);
+    } else if ("hole_diameter" in elm && typeof elm.hole_diameter === "number") {
+      platedHoleBounds = getCircleBounds3(elm.x, elm.y, elm.hole_diameter);
+    }
+    if ((elm.shape === "oval" || elm.shape === "pill") && typeof elm.outer_width === "number" && typeof elm.outer_height === "number") {
+      const getOuterBounds = elm.shape === "pill" ? getRotatedPillBounds2 : getRotatedOvalBounds2;
+      platedHoleBounds = getOuterBounds(elm.x, elm.y, elm.outer_width, elm.outer_height, elm.ccw_rotation ?? 0);
+    }
+    if ("rect_pad_width" in elm && typeof elm.rect_pad_width === "number" && "rect_pad_height" in elm && typeof elm.rect_pad_height === "number") {
+      const rectBounds = getRotatedRectBounds3(elm.x, elm.y, elm.rect_pad_width, elm.rect_pad_height, "rect_ccw_rotation" in elm ? elm.rect_ccw_rotation ?? 0 : 0);
+      platedHoleBounds = platedHoleBounds ? mergeBounds5(platedHoleBounds, rectBounds) : rectBounds;
+    }
+    if ("hole_diameter" in elm && typeof elm.hole_diameter === "number") {
+      const drillBounds = getCircleBounds3(elm.x + ("hole_offset_x" in elm ? elm.hole_offset_x ?? 0 : 0), elm.y + ("hole_offset_y" in elm ? elm.hole_offset_y ?? 0 : 0), elm.hole_diameter);
+      platedHoleBounds = platedHoleBounds ? mergeBounds5(platedHoleBounds, drillBounds) : drillBounds;
+    }
+    if (platedHoleBounds)
+      return platedHoleBounds;
+  }
+  const elementRecord = elm;
+  const routeBounds = getBoundsFromPoints24(getRoutePoints2(elementRecord.route));
+  if (routeBounds)
+    return routeBounds;
+  const outlineBounds = getBoundsFromPoints24(getRoutePoints2(elementRecord.outline));
+  if (outlineBounds)
+    return outlineBounds;
+  const pointsBounds = getBoundsFromPoints24(getRoutePoints2(elementRecord.points));
+  if (pointsBounds)
+    return pointsBounds;
+  let centerX;
+  let centerY;
+  let width;
+  let height;
+  if ("x" in elm && "y" in elm) {
+    centerX = Number(elm.x);
+    centerY = Number(elm.y);
+  }
+  if ("outer_diameter" in elm) {
+    width = Number(elm.outer_diameter);
+    height = Number(elm.outer_diameter);
+  }
+  if ("width" in elm) {
+    width = Number(elm.width);
+  }
+  if ("height" in elm) {
+    height = Number(elm.height);
+  }
+  if ("center" in elm && elm.center && typeof elm.center === "object" && "x" in elm.center && "y" in elm.center) {
+    centerX = Number(elm.center.x);
+    centerY = Number(elm.center.y);
+  }
+  let rotation2 = 0;
+  if ("rotation" in elm && typeof elm.rotation === "number") {
+    rotation2 = elm.rotation;
+  }
+  if ("ccw_rotation" in elm && typeof elm.ccw_rotation === "number") {
+    rotation2 = elm.ccw_rotation;
+  }
+  if (centerX !== undefined && centerY !== undefined) {
+    if (width !== undefined && height !== undefined) {
+      return rotation2 ? getRotatedRectBounds3(centerX, centerY, width, height, rotation2) : {
+        minX: centerX - width / 2,
+        minY: centerY - height / 2,
+        maxX: centerX + width / 2,
+        maxY: centerY + height / 2
+      };
+    }
+    if ("radius" in elm && typeof elm.radius === "number") {
+      return getCircleBounds3(centerX, centerY, elm.radius * 2);
+    }
+    return { minX: centerX, minY: centerY, maxX: centerX, maxY: centerY };
+  }
+  const anchoredPoint = [elementRecord.anchor_position, elementRecord.position].filter((position2) => Boolean(position2 && typeof position2 === "object" && "x" in position2 && "y" in position2 && typeof position2.x === "number" && typeof position2.y === "number")).at(0);
+  return anchoredPoint ? {
+    minX: anchoredPoint.x,
+    minY: anchoredPoint.y,
+    maxX: anchoredPoint.x,
+    maxY: anchoredPoint.y
+  } : null;
+};
+var getBoundsOfPcbElements4 = (elements) => {
+  let bounds = {
+    minX: Number.POSITIVE_INFINITY,
+    minY: Number.POSITIVE_INFINITY,
+    maxX: Number.NEGATIVE_INFINITY,
+    maxY: Number.NEGATIVE_INFINITY
+  };
+  for (const element of elements) {
+    const elementBounds = getPcbElementBounds2(element);
+    if (elementBounds)
+      bounds = mergeBounds5(bounds, elementBounds);
+  }
+  return bounds;
+};
 function stringHash4(str) {
   let hash = 0;
   if (str.length == 0)
@@ -374692,96 +375275,6 @@ var getPolarizedPinMetadata2 = (pinLabels) => {
     pinLabels: Object.fromEntries(polarizedPinEntries)
   };
 };
-var normalizeActiveLowPinLabel2 = (label) => {
-  const hasActiveLowMarker = label.startsWith("#") || label.endsWith("#");
-  if (!hasActiveLowMarker)
-    return label;
-  const activeLowLabel = label.replace(/^#/, "").replace(/#$/, "");
-  if (activeLowLabel.length === 0)
-    return label;
-  if (activeLowLabel.startsWith("N_"))
-    return activeLowLabel;
-  return `N_${activeLowLabel}`;
-};
-var normalizePinLabels2 = (inputPinLabels) => {
-  const normalizedInputPinLabels = inputPinLabels.map((labels) => labels.map(normalizeActiveLowPinLabel2));
-  const uniqueInputPinLabels = normalizedInputPinLabels.map((labels) => [
-    ...new Set(labels)
-  ]);
-  const result = uniqueInputPinLabels.map(() => []);
-  const desiredNumbers = uniqueInputPinLabels.map(() => null);
-  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
-    for (const label of uniqueInputPinLabels[i]) {
-      if (/^\d+$/.test(label)) {
-        desiredNumbers[i] = Number.parseInt(label);
-        break;
-      }
-    }
-  }
-  let highestPinNumber = 0;
-  const acceptedDesiredNumbers = /* @__PURE__ */ new Set;
-  for (let i = 0;i < desiredNumbers.length; i++) {
-    const desiredNumber = desiredNumbers[i];
-    if (desiredNumber === null || desiredNumber < 1)
-      continue;
-    if (!acceptedDesiredNumbers.has(desiredNumber)) {
-      acceptedDesiredNumbers.add(desiredNumber);
-      result[i].push(`pin${desiredNumber}`);
-      highestPinNumber = Math.max(highestPinNumber, desiredNumber);
-      continue;
-    }
-    let existingAltCount = 0;
-    for (const label of result[i]) {
-      if (label.startsWith(`pin${desiredNumber}_alt`)) {
-        existingAltCount += 1;
-      }
-    }
-    result[i].push(`pin${desiredNumber}_alt${existingAltCount + 1}`);
-  }
-  for (let i = 0;i < result.length; i++) {
-    const firstLabel = result[i][0];
-    if (firstLabel?.includes("_alt")) {
-      highestPinNumber += 1;
-      result[i].unshift(`pin${highestPinNumber}`);
-    }
-  }
-  for (let i = 0;i < result.length; i++) {
-    if (result[i].length === 0) {
-      highestPinNumber += 1;
-      result[i].push(`pin${highestPinNumber}`);
-    }
-  }
-  const totalLabelCounts = {};
-  for (const inputLabels of uniqueInputPinLabels) {
-    for (const label of inputLabels) {
-      if (/^\d+$/.test(label))
-        continue;
-      totalLabelCounts[label] = (totalLabelCounts[label] ?? 0) + 1;
-    }
-  }
-  const incrementalLabelCounts = {};
-  for (let i = 0;i < uniqueInputPinLabels.length; i++) {
-    for (const label of uniqueInputPinLabels[i]) {
-      if (/^\d+$/.test(label))
-        continue;
-      if (totalLabelCounts[label] === 1) {
-        result[i].push(label);
-      } else {
-        incrementalLabelCounts[label] = (incrementalLabelCounts[label] ?? 0) + 1;
-        result[i].push(`${label}${incrementalLabelCounts[label]}`);
-      }
-    }
-  }
-  return result;
-};
-var normalizeSymbolName2 = (name) => {
-  const trimmedName = name.trim();
-  if (trimmedName === "+")
-    return "_POS";
-  if (trimmedName === "-")
-    return "_NEG";
-  return trimmedName.replace(/(?<=[A-Za-z0-9])-(?=[A-Za-z0-9])/g, "_");
-};
 var categoryValueContainsDiode2 = (value) => {
   if (typeof value === "string") {
     return /(^|[^a-z])diodes?([^a-z]|$)/i.test(value);
@@ -374950,6 +375443,45 @@ var parseCadOffsetsFromSvgNode2 = (svgNode) => {
     })()
   };
 };
+var getCadModelOutlineBounds2 = (svgNode) => {
+  const points = [];
+  for (const childNode of svgNode?.svgData.childNodes ?? []) {
+    if (typeof childNode !== "object" || childNode === null)
+      continue;
+    const attrs = childNode.attrs;
+    if (typeof attrs !== "object" || attrs === null)
+      continue;
+    const rawPoints = attrs.points;
+    if (typeof rawPoints !== "string")
+      continue;
+    const coordinates = rawPoints.trim().split(/\s+/).map(Number);
+    for (let index = 0;index + 1 < coordinates.length; index += 2) {
+      const x = coordinates[index];
+      const y = coordinates[index + 1];
+      if (!Number.isFinite(x) || !Number.isFinite(y))
+        continue;
+      points.push({ x: milx102(x), y: milx102(y) });
+    }
+  }
+  if (points.length === 0)
+    return;
+  return {
+    minX: Math.min(...points.map((point2) => point2.x)),
+    minY: Math.min(...points.map((point2) => point2.y)),
+    maxX: Math.max(...points.map((point2) => point2.x)),
+    maxY: Math.max(...points.map((point2) => point2.y))
+  };
+};
+var unionBounds3 = (first, second) => {
+  if (!second)
+    return first;
+  return {
+    minX: Math.min(first.minX, second.minX),
+    minY: Math.min(first.minY, second.minY),
+    maxX: Math.max(first.maxX, second.maxX),
+    maxY: Math.max(first.maxY, second.maxY)
+  };
+};
 var readModelHeightMm2 = (raw) => {
   const fallback = 3.5;
   if (raw == null)
@@ -375190,13 +375722,11 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
   const pads = easyEdaJson.packageDetail.dataStr.shape.filter((shape) => shape.type === "PAD");
   const pins = easyEdaJson.dataStr.shape.filter((shape) => shape.type === "PIN");
   const pinLabelSets = pads.map((pad) => {
-    const labels = [];
-    if (pad.number)
-      labels.push(pad.number.toString());
+    const padAliases = pad.number ? getEasyEdaPinAliases2(pad.number.toString()) : [];
     const pin = pins.find((p) => p.pinNumber === pad.number);
-    if (pin)
-      labels.push(normalizeSymbolName2(pin.label));
-    return labels;
+    const schematicAliases = pin ? getEasyEdaPinAliases2(pin.label) : [];
+    const hasNamedSchematicAlias = schematicAliases.some((alias) => !/^\d+$/.test(alias));
+    return hasNamedSchematicAlias ? [...schematicAliases, ...padAliases] : [...padAliases, ...schematicAliases];
   });
   const padNumberKeys = pads.map((pad, index) => {
     const padNumber = String(pad.number ?? "").trim();
@@ -375486,16 +376016,26 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
       model_step_url: stepFileUrl
     }));
   }
-  const hasExplicitCourtyard = circuitElements.some((e) => e.type === "pcb_courtyard_outline");
+  const hasExplicitCourtyard = circuitElements.some((e) => e.type === "pcb_courtyard_outline" || e.type === "pcb_courtyard_rect");
   if (!hasExplicitCourtyard) {
     const bbox = easyEdaJson.packageDetail.dataStr.BBox;
-    if (bbox) {
+    const modelOutlineBounds = getCadModelOutlineBounds2(svgNode);
+    const packageElements = circuitElements.filter((element) => element.type === "pcb_smtpad" || element.type === "pcb_plated_hole" || element.type === "pcb_hole" || element.type === "pcb_via");
+    const packageElementBounds = packageElements.length > 0 ? getBoundsOfPcbElements4(packageElements) : undefined;
+    const fallbackBounds = bbox ? {
+      minX: milx102(bbox.x),
+      minY: milx102(bbox.y),
+      maxX: milx102(bbox.x + bbox.width),
+      maxY: milx102(bbox.y + bbox.height)
+    } : undefined;
+    const courtyardBounds = modelOutlineBounds ? unionBounds3(modelOutlineBounds, packageElementBounds) : fallbackBounds;
+    if (courtyardBounds) {
       const strokeWidth = 0.05;
       const margin = 0.25;
-      const x1 = milx102(bbox.x) - margin;
-      const y1 = milx102(bbox.y) - margin;
-      const x2 = milx102(bbox.x + bbox.width) + margin;
-      const y2 = milx102(bbox.y + bbox.height) + margin;
+      const x1 = courtyardBounds.minX - margin;
+      const y1 = courtyardBounds.minY - margin;
+      const x2 = courtyardBounds.maxX + margin;
+      const y2 = courtyardBounds.maxY + margin;
       circuitElements.push(pcb_courtyard_outline3.parse({
         type: "pcb_courtyard_outline",
         pcb_courtyard_outline_id: `pcb_courtyard_outline_${easyEdaJson.lcsc.number}_1`,
@@ -376048,19 +376588,10 @@ var PinShapeOutputSchema2 = z201.object({
 var parsePin2 = (pinString) => {
   const parts = pinString.split("~");
   const [, visibility, , pinNumber, x, y, rotation2, id] = parts;
-  const nameMatch = pinString.match(/~([\w+#-]+)~(start|end)~/);
-  let label = nameMatch ? nameMatch[1] : "";
-  if (label.endsWith("+"))
-    label = `${label.slice(0, -1)}_POS`;
-  if (label.endsWith("-"))
-    label = `${label.slice(0, -1)}_NEG`;
-  label = normalizeActiveLowPinLabel2(label);
-  if (/^\+\d+(?:\.\d+)?V$/i.test(label))
-    label = `V${label.slice(1, -1)}`;
-  if (label.startsWith("+"))
-    label = `${label.slice(1)}_POS`;
-  if (label.startsWith("-"))
-    label = `${label.slice(1)}_NEG`;
+  const pinNameSection = pinString.split("^^")[3];
+  let label = pinNameSection?.split("~")[4] ?? "";
+  if (!label.includes("/"))
+    label = normalizeEasyEdaPinLabel2(label);
   const colorMatch = pinString.match(/#[0-9A-F]{6}/);
   const labelColor = colorMatch ? colorMatch[0] : "";
   const path = pinString.split("^^")[2]?.split("~")[0] ?? "";

package/dist/lib/index.js

@@ -69109,7 +69109,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2228";
+var version = "0.1.2229";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69137,7 +69137,7 @@ var package_default = {
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.657",
+    "@tscircuit/props": "^0.0.666",
     "@tscircuit/runframe": "^0.0.2884",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@tscircuit/schematic-trace-solver": "^0.0.204",
@@ -69178,7 +69178,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.357",
+    easyeda: "^0.0.366",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.2229",
+  "version": "0.1.2230",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -25,7 +25,7 @@
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.657",
+    "@tscircuit/props": "^0.0.666",
     "@tscircuit/runframe": "^0.0.2884",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@tscircuit/schematic-trace-solver": "^0.0.204",
@@ -66,7 +66,7 @@
     "debug": "^4.4.0",
     "delay": "^6.0.0",
     "dsn-converter": "^0.0.90",
-    "easyeda": "^0.0.357",
+    "easyeda": "^0.0.366",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",