@tscircuit/parts-engine 0.0.27 → 0.0.29

package/dist/index.js

@@ -9449,6 +9449,7 @@ var mil2mm = (mil) => {
     return mm(`${mil}mil`);
   return mm(mil);
 };
+var DEFAULT_PCB_THICKNESS_MM = 1.6;
 function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag, sweepFlag) {
   const start = { x: startX, y: startY };
   const end = { x: endX, y: endY };
@@ -9493,6 +9494,159 @@ function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag,
   return path;
 }
 var mil10ToMm = (value) => value * 10 * 0.0254;
+var getPinLabelValues = (labels) => {
+  if (typeof labels === "string") return [labels];
+  return [...labels];
+};
+var stripEasyEdaPolarityHintDecoration = (label) => label.toLowerCase().replace(/[^a-z0-9+-]/g, "");
+var getPinKeySortValue = (pinKey) => {
+  const match = /^pin(\d+)$/i.exec(pinKey);
+  return match ? Number(match[1]) : Number.MAX_SAFE_INTEGER;
+};
+var getPolarizedPinMetadata = (pinLabels) => {
+  const labelsByPin = Object.entries(pinLabels).map(([pin, labels]) => ({
+    pin,
+    labels: getPinLabelValues(labels).map(stripEasyEdaPolarityHintDecoration)
+  }));
+  const anodePin = labelsByPin.find(
+    ({ labels }) => labels.some((label) => ["a", "anode", "pos", "+"].includes(label))
+  )?.pin;
+  const cathodePin = labelsByPin.find(
+    ({ labels }) => labels.some((label) => ["c", "k", "cathode", "neg", "-"].includes(label))
+  )?.pin;
+  if (!anodePin || !cathodePin || anodePin === cathodePin) return void 0;
+  const polarizedPinEntries = [
+    [anodePin, ["anode", "pos"]],
+    [cathodePin, ["cathode", "neg"]]
+  ].sort(
+    ([pinA], [pinB]) => getPinKeySortValue(pinA) - getPinKeySortValue(pinB)
+  );
+  return {
+    portHintsMap: Object.fromEntries(
+      polarizedPinEntries.map(([pin, labels]) => [pin, [pin, ...labels]])
+    ),
+    pinLabels: Object.fromEntries(polarizedPinEntries)
+  };
+};
+var normalizePinLabels = (inputPinLabels) => {
+  const uniqueInputPinLabels = inputPinLabels.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;
+};
+var categoryValueContainsDiode = (value) => {
+  if (typeof value === "string") {
+    return /(^|[^a-z])diodes?([^a-z]|$)/i.test(value);
+  }
+  if (Array.isArray(value)) {
+    return value.some(categoryValueContainsDiode);
+  }
+  if (value && typeof value === "object") {
+    return Object.values(value).some(categoryValueContainsDiode);
+  }
+  return false;
+};
+var isDiodeCategoryComponent = (betterEasy) => {
+  const cPara = betterEasy.dataStr.head.c_para;
+  return [
+    betterEasy.tags,
+    cPara.category,
+    cPara.Category,
+    cPara["LCSC Category"],
+    cPara["JLCPCB Category"],
+    betterEasy.category
+  ].some(categoryValueContainsDiode);
+};
+var categoryValueContainsLed = (value) => {
+  if (typeof value === "string") {
+    return /(^|[^a-z])leds?([^a-z]|$)/i.test(value) || /light[-\s]?emitting\s+diodes?/i.test(value);
+  }
+  if (Array.isArray(value)) {
+    return value.some(categoryValueContainsLed);
+  }
+  if (value && typeof value === "object") {
+    return Object.values(value).some(categoryValueContainsLed);
+  }
+  return false;
+};
+var isLedCategoryComponent = (betterEasy) => {
+  const cPara = betterEasy.dataStr.head.c_para;
+  return [
+    betterEasy.tags,
+    cPara.category,
+    cPara.Category,
+    cPara["LCSC Category"],
+    cPara["JLCPCB Category"],
+    betterEasy.category
+  ].some(categoryValueContainsLed);
+};
 var getBoundsCenter = (bounds) => ({
   x: (bounds.minX + bounds.maxX) / 2,
   y: (bounds.minY + bounds.maxY) / 2
@@ -9608,80 +9762,6 @@ var getCadModelOffsetMmFromBounds = (easyEdaJson, bounds, {
     y: modelCenter.y - targetOriginInModelFrame.y
   });
 };
-var normalizePinLabels = (inputPinLabels) => {
-  const uniqueInputPinLabels = inputPinLabels.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;
-};
-var DEFAULT_PCB_THICKNESS_MM = 1.6;
 var EASYEDA_STEP_MODEL_URL = "https://modules.easyeda.com/qAxj6KHrDKw4blvCG8QJPs7Y";
 var EASYEDA_OBJ_MODEL_URL = "https://modules.easyeda.com/3dmodel";
 var TSCIRCUIT_MODEL_CDN_URL = "https://modelcdn.tscircuit.com/easyeda_models";
@@ -9886,11 +9966,20 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
     return labels;
   });
   const normalizedPinLabels = normalizePinLabels(pinLabelSets);
+  const normalizedPinLabelsByPin = Object.fromEntries(
+    normalizedPinLabels.map((labels) => {
+      const pin = labels.find((label) => /^pin\d+$/i.test(label));
+      return [pin, labels.filter((label) => label !== pin)];
+    })
+  );
+  const polarizedPinMetadata = pads.length === 2 && (isDiodeCategoryComponent(easyEdaJson) || isLedCategoryComponent(easyEdaJson)) ? getPolarizedPinMetadata(normalizedPinLabelsByPin) : void 0;
   pads.forEach((pad, index) => {
     const portHints = normalizedPinLabels[index];
     const pinNumber = Number.parseInt(
       portHints.find((hint) => hint.match(/pin\d+/)).replace("pin", "")
     );
+    const canonicalPinName = `pin${pinNumber}`;
+    const pcbPortHints = polarizedPinMetadata?.portHintsMap[canonicalPinName] ?? [canonicalPinName];
     circuitElements.push({
       type: "source_port",
       source_port_id: `source_port_${index + 1}`,
@@ -9907,7 +9996,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
         x: mil2mm(pad.center.x),
         y: mil2mm(pad.center.y),
         layers: ["top"],
-        port_hints: [`pin${pinNumber}`],
+        port_hints: pcbPortHints,
         pcb_component_id: "pcb_component_1",
         pcb_port_id: `pcb_port_${index + 1}`
       };
@@ -10019,7 +10108,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
           radius: Math.min(mil2mm(pad.width), mil2mm(pad.height)) / 2
         },
         layer: "top",
-        port_hints: [`pin${pinNumber}`],
+        port_hints: pcbPortHints,
         pcb_component_id: "pcb_component_1",
         pcb_port_id: `pcb_port_${index + 1}`
       });
@@ -10281,7 +10370,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
 };
 var safeNumber = (defaultValue = 0) => external_exports.union([external_exports.number(), external_exports.string()]).transform((val) => {
   const num = Number(val);
-  return isNaN(num) ? defaultValue : num;
+  return Number.isNaN(num) ? defaultValue : num;
 }).default(defaultValue);
 var tenthmil = external_exports.union([external_exports.number(), external_exports.string()]).optional().transform(
   (n) => typeof n === "string" && n.endsWith("mil") ? n : `${Number.parseFloat(n) * 10}mil`
@@ -10428,6 +10517,7 @@ var ShapeItemSchema = external_exports.object({
     }
     case "PAD": {
       const [padShape, ...params] = shape.data.split("~");
+      const rawPadNumber = params[6];
       const [
         centerX,
         centerY,
@@ -10435,10 +10525,11 @@ var ShapeItemSchema = external_exports.object({
         height,
         layermask,
         net,
-        number,
+        numericPadNumber,
         holeRadius,
         ...rest
       ] = params.map((p) => Number.isNaN(Number(p)) ? p : Number(p));
+      const padNumber = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/.test(rawPadNumber) ? numericPadNumber : rawPadNumber;
       const center = { x: centerX, y: centerY };
       let points;
       if (padShape === "RECT" || padShape === "POLYGON") {
@@ -10454,7 +10545,7 @@ var ShapeItemSchema = external_exports.object({
         height,
         layermask,
         net,
-        number,
+        number: padNumber,
         holeRadius,
         points,
         rotation: rotation2,
@@ -10787,8 +10878,12 @@ var parsePath = (str) => {
 };
 var PathShapeSchema = external_exports.string().startsWith("PT~").transform(parsePath).pipe(PathShapeOutputSchema);
 var optionalEasyEdaTextField = (fieldSchema) => external_exports.preprocess((textField) => {
-  if (textField == null || textField === "" || textField === "undefined") {
-    return void 0;
+  if (textField == null) return void 0;
+  if (typeof textField === "string") {
+    const trimmedTextField = textField.trim();
+    if (trimmedTextField === "" || trimmedTextField === "undefined") {
+      return void 0;
+    }
   }
   return textField;
 }, fieldSchema);
@@ -10901,7 +10996,7 @@ var OwnerSchema = external_exports.object({
 });
 var HeadSchema = external_exports.object({
   docType: external_exports.preprocess((val) => val == null ? val : String(val), external_exports.string()),
-  editorVersion: external_exports.string(),
+  editorVersion: external_exports.string().default(""),
   c_para: external_exports.record(external_exports.string(), external_exports.string().nullable()),
   x: external_exports.number(),
   y: external_exports.number(),
@@ -10914,7 +11009,7 @@ var HeadSchema = external_exports.object({
   }, external_exports.number()),
   importFlag: external_exports.number().optional(),
   c_spiceCmd: external_exports.any().optional(),
-  hasIdFlag: external_exports.boolean()
+  hasIdFlag: external_exports.boolean().default(false)
 });
 var BBoxSchema = external_exports.object({
   x: external_exports.number(),
@@ -10939,9 +11034,17 @@ var DataStrSchema = external_exports.object({
   head: HeadSchema,
   canvas: external_exports.string(),
   shape: external_exports.array(SingleLetterShapeSchema),
-  BBox: BBoxSchema,
-  colors: external_exports.union([external_exports.array(external_exports.string()), external_exports.record(external_exports.string())])
-});
+  BBox: BBoxSchema.optional(),
+  colors: external_exports.union([external_exports.array(external_exports.string()), external_exports.record(external_exports.string())]).default([])
+}).transform((data) => ({
+  ...data,
+  BBox: data.BBox ?? {
+    x: data.head.x,
+    y: data.head.y,
+    width: 0,
+    height: 0
+  }
+}));
 var PackageDetailDataStrSchema = external_exports.object({
   head: HeadSchema,
   canvas: external_exports.string(),
@@ -11122,9 +11225,24 @@ async function fetchEasyEDAComponent(jlcpcbPartNumber, {
   if (!searchResult.success || !searchResult.result.lists.lcsc.length) {
     throw new Error("Component not found");
   }
+  const requestedPartNumber = jlcpcbPartNumber.trim().toUpperCase();
   const bestMatchComponent = searchResult.result.lists.lcsc.find(
-    (component) => component.dataStr.head.c_para["Supplier Part"] === jlcpcbPartNumber
-  ) ?? searchResult.result.lists.lcsc[0];
+    (component) => {
+      const candidatePartNumbers = [
+        component.dataStr?.head?.c_para?.["Supplier Part"],
+        component.lcsc?.number,
+        component.szlcsc?.number
+      ];
+      return candidatePartNumbers.some(
+        (partNumber) => typeof partNumber === "string" && partNumber.trim().toUpperCase() === requestedPartNumber
+      );
+    }
+  );
+  if (!bestMatchComponent) {
+    throw new Error(
+      `No exact EasyEDA component match for "${jlcpcbPartNumber}"`
+    );
+  }
   const componentUUID = bestMatchComponent.uuid;
   const componentResponse = await fetch2(componentUrl(componentUUID), {
     method: "GET",
@@ -11297,6 +11415,32 @@ var getFetchWithEasyEdaProxy = ({
   };
 };
 
+// lib/jlc-parts-engine/get-jst-connector-search-config.ts
+var jstConnectorSearchConfigByStandard = {
+  jst_sh: {
+    pitchMm: 1,
+    compatibleReferenceSeries: ["SH", "SR/SZ"]
+  },
+  jst_gh: { pitchMm: 1.25, compatibleReferenceSeries: ["GH"] },
+  jst_zh: { pitchMm: 1.5, compatibleReferenceSeries: ["ZH"] },
+  jst_ph: { pitchMm: 2, compatibleReferenceSeries: ["PH"] },
+  jst_xh: { pitchMm: 2.5, compatibleReferenceSeries: ["XH"] },
+  jst_vh: { pitchMm: 3.96, compatibleReferenceSeries: ["VH"] }
+};
+var getJstConnectorSearchConfig = (standard) => {
+  if (!standard || !(standard in jstConnectorSearchConfigByStandard)) {
+    return void 0;
+  }
+  return jstConnectorSearchConfigByStandard[standard];
+};
+var hasPcbPins = (attributes) => {
+  if (typeof attributes === "string") {
+    return attributes.includes('"Pins Structure"');
+  }
+  return Boolean(attributes && Object.hasOwn(attributes, "Pins Structure"));
+};
+var isCompatiblePcbMountJstConnector = (connector, compatibleReferenceSeries) => compatibleReferenceSeries.includes(connector.reference_series ?? "") && hasPcbPins(connector.attributes);
+
 // lib/jlc-parts-engine/get-pin-header-search-params.ts
 var parseMillimeters = (value) => {
   if (typeof value === "number" && Number.isFinite(value)) return value;
@@ -11506,6 +11650,24 @@ var JlcPcbPartsEngine = class {
       return {
         jlcpcb: withBasicPartPreference(usb_c_connectors).map((c) => `C${c.lcsc}`).slice(0, 3)
       };
+    } else if (sourceComponent.type === "source_component" && sourceComponent.ftype === "simple_connector") {
+      const searchConfig = getJstConnectorSearchConfig(sourceComponent.standard);
+      if (!searchConfig || !sourceComponent.pin_count) {
+        return {};
+      }
+      const { jst_connectors } = await getJlcPartsCached("jst_connectors", {
+        pitch_mm: searchConfig.pitchMm,
+        num_pins: sourceComponent.pin_count
+      });
+      const compatiblePcbMountConnectors = jst_connectors?.filter(
+        (connector) => isCompatiblePcbMountJstConnector(
+          connector,
+          searchConfig.compatibleReferenceSeries
+        )
+      );
+      return {
+        jlcpcb: withBasicPartPreference(compatiblePcbMountConnectors).map((connector) => `C${connector.lcsc}`).slice(0, 3)
+      };
     }
     return {};
   }