kicad-to-circuit-json 0.0.113 → 0.0.115

package/dist/index.js

@@ -12,6 +12,122 @@ function upgradeKicad5FootprintToKicad6(content) {
 // lib/stages/pcb/CollectFootprintsStage/process-footprint.ts
 import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 
+// lib/stages/pcb/CollectFootprintsStage/footprint-properties.ts
+function getFootprintProperties(footprint) {
+  const properties = footprint.properties || [];
+  return Array.isArray(properties) ? properties : [properties];
+}
+function getFootprintPropertyName(property) {
+  return property?.key;
+}
+function getFootprintPropertyValue(property) {
+  return property?.value;
+}
+function findFootprintProperty(footprint, propertyNames) {
+  const names = Array.isArray(propertyNames) ? propertyNames : [propertyNames];
+  return getFootprintProperties(footprint).find(
+    (property) => names.includes(getFootprintPropertyName(property) ?? "")
+  );
+}
+function findFootprintPropertyValue(footprint, propertyNames) {
+  const property = findFootprintProperty(footprint, propertyNames);
+  return getFootprintPropertyValue(property);
+}
+function getFootprintReference(footprint) {
+  const propertyValue = findFootprintPropertyValue(footprint, "Reference");
+  if (propertyValue) return propertyValue;
+  const textItems = footprint.fpTexts || [];
+  const textArray = Array.isArray(textItems) ? textItems : [textItems];
+  for (const text of textArray) {
+    if (text.type === "reference" && text.text) {
+      return text.text;
+    }
+  }
+  return void 0;
+}
+function parseSupplierPartNumbers(value) {
+  if (!value) return void 0;
+  const partNumbers = value.split(/[,;]/).map((partNumber) => partNumber.trim()).filter(Boolean);
+  return partNumbers.length > 0 ? partNumbers : void 0;
+}
+
+// lib/stages/pcb/CollectFootprintsStage/infer-component-type.ts
+function inferComponentType(reference, footprint) {
+  if (!reference && !footprint) return "simple_chip";
+  const normalizedReference = reference?.trim();
+  const prefix = normalizedReference?.match(/^([A-Z]+)/)?.[1];
+  if (isFiducialReference(normalizedReference) || isFiducialFootprint(footprint)) {
+    return "simple_fiducial";
+  }
+  if (prefix === "TP" || isTestPointReference(normalizedReference) || isTestPointFootprint(footprint)) {
+    return "simple_test_point";
+  }
+  switch (prefix) {
+    case "R":
+      return "simple_resistor";
+    case "C":
+      return "simple_capacitor";
+    case "L":
+      return "simple_inductor";
+    case "D":
+      if (isLedFootprint(footprint)) return "simple_led";
+      return "simple_diode";
+    case "LED":
+      return "simple_led";
+    case "SW":
+      return "simple_switch";
+    case "Q":
+      return "simple_transistor";
+    case "U":
+    case "IC":
+      return "simple_chip";
+    case "J":
+    case "P":
+      return "simple_chip";
+    // Connectors treated as chips
+    default:
+      return "simple_chip";
+  }
+}
+function isFiducialReference(reference) {
+  return /^FID\d+/i.test(reference || "");
+}
+function isFiducialFootprint(footprint) {
+  return getFootprintMetadata(footprint).includes("fiducial");
+}
+function isLedFootprint(footprint) {
+  const metadata = getFootprintMetadata(footprint);
+  return metadata.includes("led") || metadata.includes("light emitting diode");
+}
+function isTestPointReference(reference) {
+  return /^TP\d+/i.test(reference || "");
+}
+function isTestPointFootprint(footprint) {
+  const metadata = getFootprintMetadata(footprint);
+  return metadata.includes("testpoint") || metadata.includes("test point");
+}
+function getFootprintMetadata(footprint) {
+  if (!footprint) return "";
+  return [
+    footprint.libraryLink,
+    footprint.descr?.value,
+    footprint.tags?.value,
+    findFootprintPropertyValue(footprint, "Footprint"),
+    findFootprintPropertyValue(footprint, "Description"),
+    findFootprintPropertyValue(footprint, "Value")
+  ].filter(Boolean).join(" ").toLowerCase();
+}
+function inferTransistorTypeFromFootprint(footprint, value) {
+  const lowerValue = (value || "").toLowerCase();
+  if (lowerValue.includes("pnp")) return "pnp";
+  if (lowerValue.includes("npn")) return "npn";
+  const libId = footprint.libraryId;
+  const lowerLibId = (libId || "").toLowerCase();
+  if (lowerLibId.includes("pnp")) return "pnp";
+  if (lowerLibId.includes("npn")) return "npn";
+  return "npn";
+}
+
 // lib/stages/pcb/layer-mapping.ts
 var INNER_COPPER_LAYER_REGEX = /^In([1-9]\d*)\.Cu$/;
 function dedupeLayerRefs(layers) {
@@ -142,40 +258,6 @@ function mapTextLayer(kicadLayer) {
   return mapKicadLayerToVisibleLayer(kicadLayer);
 }
 
-// lib/stages/pcb/CollectFootprintsStage/process-pads.ts
-import { applyToPoint as applyToPoint2 } from "transformation-matrix";
-
-// lib/stages/pcb/pad-source-port-id.ts
-function getPadNetNum(pad) {
-  const net = pad?._sxNet || pad?.net;
-  if (!net) return null;
-  if (typeof net === "number") return net;
-  if (typeof net === "object") {
-    return net._id ?? net.number ?? net.ordinal ?? null;
-  }
-  return null;
-}
-function getSourcePortIdForPad(params) {
-  const { componentId, footprint, pad } = params;
-  const padNumber = pad.number?.toString();
-  if (!padNumber) return void 0;
-  const baseSourcePortId = `${componentId}_port_${padNumber}`;
-  if (!hasDuplicatePadNumberOnDifferentNets(footprint, padNumber)) {
-    return baseSourcePortId;
-  }
-  return `${baseSourcePortId}_net_${getPadNetNum(pad) ?? "none"}`;
-}
-function hasDuplicatePadNumberOnDifferentNets(footprint, padNumber) {
-  const pads = footprint.fpPads || [];
-  const padArray = Array.isArray(pads) ? pads : [pads];
-  const netKeys = /* @__PURE__ */ new Set();
-  for (const pad of padArray) {
-    if (pad.number?.toString() !== padNumber) continue;
-    netKeys.add(String(getPadNetNum(pad) ?? "none"));
-  }
-  return netKeys.size > 1;
-}
-
 // lib/stages/pcb/CollectFootprintsStage/process-graphics.ts
 import { applyToPoint } from "transformation-matrix";
 function insertFootprintRoute(options) {
@@ -594,6 +676,40 @@ function createFootprintPoly(params) {
   });
 }
 
+// lib/stages/pcb/CollectFootprintsStage/process-pads.ts
+import { applyToPoint as applyToPoint2 } from "transformation-matrix";
+
+// lib/stages/pcb/pad-source-port-id.ts
+function getPadNetNum(pad) {
+  const net = pad?._sxNet || pad?.net;
+  if (!net) return null;
+  if (typeof net === "number") return net;
+  if (typeof net === "object") {
+    return net._id ?? net.number ?? net.ordinal ?? null;
+  }
+  return null;
+}
+function getSourcePortIdForPad(params) {
+  const { componentId, footprint, pad } = params;
+  const padNumber = pad.number?.toString();
+  if (!padNumber) return void 0;
+  const baseSourcePortId = `${componentId}_port_${padNumber}`;
+  if (!hasDuplicatePadNumberOnDifferentNets(footprint, padNumber)) {
+    return baseSourcePortId;
+  }
+  return `${baseSourcePortId}_net_${getPadNetNum(pad) ?? "none"}`;
+}
+function hasDuplicatePadNumberOnDifferentNets(footprint, padNumber) {
+  const pads = footprint.fpPads || [];
+  const padArray = Array.isArray(pads) ? pads : [pads];
+  const netKeys = /* @__PURE__ */ new Set();
+  for (const pad of padArray) {
+    if (pad.number?.toString() !== padNumber) continue;
+    netKeys.add(String(getPadNetNum(pad) ?? "none"));
+  }
+  return netKeys.size > 1;
+}
+
 // lib/stages/pcb/CollectFootprintsStage/process-ports.ts
 function createPcbPort({
   ctx,
@@ -669,7 +785,13 @@ function attachPadPolygonContours(pad, contours) {
   });
 }
 function processPads(params) {
-  const { ctx, footprint, componentId, footprintPlacement } = params;
+  const {
+    ctx,
+    footprint,
+    componentId,
+    footprintPlacement,
+    shouldCreatePorts = true
+  } = params;
   if (!ctx.k2cMatPcb) return;
   const pads = footprint.fpPads || [];
   const padArray = Array.isArray(pads) ? pads : [pads];
@@ -679,7 +801,8 @@ function processPads(params) {
       footprint,
       pad,
       componentId,
-      footprintPlacement
+      footprintPlacement,
+      shouldCreatePorts
     });
   }
 }
@@ -688,7 +811,8 @@ function processPad({
   footprint,
   pad,
   componentId,
-  footprintPlacement
+  footprintPlacement,
+  shouldCreatePorts = true
 }) {
   if (!ctx.k2cMatPcb) return;
   const padAt = pad.at || { x: 0, y: 0, angle: 0 };
@@ -721,13 +845,13 @@ function processPad({
   const padNumber = pad.number?.toString();
   let pcbPortId;
   let sourcePortId;
-  if (padNumber) {
+  if (padNumber && shouldCreatePorts) {
     sourcePortId = getSourcePortIdForPad({
       componentId,
       footprint,
       pad
     });
-    const padLayers = padType === "smd" ? copperLayers.slice(0, 1) : padType === "thru_hole" ? copperLayers : [];
+    const padLayers = padType === "smd" || padType === "connect" ? copperLayers.slice(0, 1) : padType === "thru_hole" ? copperLayers : [];
     const padPortInfo = {
       padNumber,
       sourcePortId,
@@ -742,7 +866,7 @@ function processPad({
     });
     if (!pcbPortId) sourcePortId = void 0;
   }
-  if (padType === "smd") {
+  if (padType === "smd" || padType === "connect") {
     if (copperLayers.length === 0) {
       return;
     }
@@ -1506,110 +1630,6 @@ function createGraphicText(params) {
   }
 }
 
-// lib/stages/pcb/CollectFootprintsStage/footprint-properties.ts
-function getFootprintProperties(footprint) {
-  const properties = footprint.properties || [];
-  return Array.isArray(properties) ? properties : [properties];
-}
-function getFootprintPropertyName(property) {
-  return property?.key;
-}
-function getFootprintPropertyValue(property) {
-  return property?.value;
-}
-function findFootprintProperty(footprint, propertyNames) {
-  const names = Array.isArray(propertyNames) ? propertyNames : [propertyNames];
-  return getFootprintProperties(footprint).find(
-    (property) => names.includes(getFootprintPropertyName(property) ?? "")
-  );
-}
-function findFootprintPropertyValue(footprint, propertyNames) {
-  const property = findFootprintProperty(footprint, propertyNames);
-  return getFootprintPropertyValue(property);
-}
-function parseSupplierPartNumbers(value) {
-  if (!value) return void 0;
-  const partNumbers = value.split(/[,;]/).map((partNumber) => partNumber.trim()).filter(Boolean);
-  return partNumbers.length > 0 ? partNumbers : void 0;
-}
-
-// lib/stages/pcb/CollectFootprintsStage/infer-component-type.ts
-function inferComponentType(reference, footprint) {
-  if (!reference && !footprint) return "simple_chip";
-  const normalizedReference = reference?.trim();
-  const prefix = normalizedReference?.match(/^([A-Z]+)/)?.[1];
-  if (isFiducialReference(normalizedReference) || isFiducialFootprint(footprint)) {
-    return "simple_fiducial";
-  }
-  if (prefix === "TP" || isTestPointReference(normalizedReference) || isTestPointFootprint(footprint)) {
-    return "simple_test_point";
-  }
-  switch (prefix) {
-    case "R":
-      return "simple_resistor";
-    case "C":
-      return "simple_capacitor";
-    case "L":
-      return "simple_inductor";
-    case "D":
-      if (isLedFootprint(footprint)) return "simple_led";
-      return "simple_diode";
-    case "LED":
-      return "simple_led";
-    case "SW":
-      return "simple_switch";
-    case "Q":
-      return "simple_transistor";
-    case "U":
-    case "IC":
-      return "simple_chip";
-    case "J":
-    case "P":
-      return "simple_chip";
-    // Connectors treated as chips
-    default:
-      return "simple_chip";
-  }
-}
-function isFiducialReference(reference) {
-  return /^FID\d+/i.test(reference || "");
-}
-function isFiducialFootprint(footprint) {
-  return getFootprintMetadata(footprint).includes("fiducial");
-}
-function isLedFootprint(footprint) {
-  const metadata = getFootprintMetadata(footprint);
-  return metadata.includes("led") || metadata.includes("light emitting diode");
-}
-function isTestPointReference(reference) {
-  return /^TP\d+/i.test(reference || "");
-}
-function isTestPointFootprint(footprint) {
-  const metadata = getFootprintMetadata(footprint);
-  return metadata.includes("testpoint") || metadata.includes("test point");
-}
-function getFootprintMetadata(footprint) {
-  if (!footprint) return "";
-  return [
-    footprint.libraryLink,
-    footprint.descr?.value,
-    footprint.tags?.value,
-    findFootprintPropertyValue(footprint, "Footprint"),
-    findFootprintPropertyValue(footprint, "Description"),
-    findFootprintPropertyValue(footprint, "Value")
-  ].filter(Boolean).join(" ").toLowerCase();
-}
-function inferTransistorTypeFromFootprint(footprint, value) {
-  const lowerValue = (value || "").toLowerCase();
-  if (lowerValue.includes("pnp")) return "pnp";
-  if (lowerValue.includes("npn")) return "npn";
-  const libId = footprint.libraryId;
-  const lowerLibId = (libId || "").toLowerCase();
-  if (lowerLibId.includes("pnp")) return "pnp";
-  if (lowerLibId.includes("npn")) return "npn";
-  return "npn";
-}
-
 // lib/stages/pcb/CollectFootprintsStage/process-footprint.ts
 function processFootprint(ctx, footprint) {
   if (!ctx.k2cMatPcb) return;
@@ -1620,11 +1640,12 @@ function processFootprint(ctx, footprint) {
   const uuid = footprint.uuid?.value || footprint.tstamp?.value;
   if (!uuid) return;
   const refdes = getFootprintReference(footprint);
+  const hasReference = Boolean(refdes?.trim());
   const value = getFootprintValue(footprint);
   const jlcpcbPartNumbers = getJlcpcbPartNumbers(footprint);
   const ftype = inferComponentType(refdes, footprint);
   const sourceComponentData = {
-    name: refdes || "U",
+    name: refdes ?? "",
     ftype
   };
   if (ftype === "simple_transistor") {
@@ -1675,7 +1696,8 @@ function processFootprint(ctx, footprint) {
     ctx,
     footprint,
     componentId,
-    footprintPlacement
+    footprintPlacement,
+    shouldCreatePorts: hasReference
   });
   processFootprintText({
     ctx,
@@ -1693,18 +1715,6 @@ function processFootprint(ctx, footprint) {
     ctx.stats.components = (ctx.stats.components || 0) + 1;
   }
 }
-function getFootprintReference(footprint) {
-  const propertyValue = findFootprintPropertyValue(footprint, "Reference");
-  if (propertyValue) return propertyValue;
-  const textItems = footprint.fpTexts || [];
-  const textArray = Array.isArray(textItems) ? textItems : [textItems];
-  for (const text of textArray) {
-    if (text.type === "reference") {
-      return text.text;
-    }
-  }
-  return void 0;
-}
 function getFootprintValue(footprint) {
   const propertyValue = findFootprintPropertyValue(footprint, "Value");
   if (propertyValue) return propertyValue;
@@ -3646,6 +3656,7 @@ var CollectSourceTracesStage = class extends ConverterStage {
     return null;
   }
   processFootprintPads(footprint, netToPads) {
+    if (!getFootprintReference(footprint)?.trim()) return;
     const footprintUuid = footprint.uuid?.value || footprint.tstamp?.value;
     if (!footprintUuid) return;
     const componentId = this.ctx.footprintUuidToComponentId?.get(footprintUuid);
@@ -4135,7 +4146,14 @@ var CollectTracesStage = class extends ConverterStage {
   findPortAtPosition(point, layer, netNum) {
     const portAtCenter = this.findPortCenterAtPosition(point, layer, netNum);
     if (portAtCenter) return portAtCenter;
-    return this.findPortContainingPoint(point, layer, netNum);
+    const portContainingPoint = this.findPortContainingPoint(
+      point,
+      layer,
+      netNum
+    );
+    if (portContainingPoint) return portContainingPoint;
+    if (netNum === null) return void 0;
+    return this.findPortCenterAtPosition(point, layer, null) ?? this.findPortContainingPoint(point, layer, null);
   }
   findPortCenterAtPosition(point, layer, netNum) {
     const ports = this.ctx.db.pcb_port.list();

package/package.json

@@ -2,7 +2,7 @@
   "name": "kicad-to-circuit-json",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.113",
+  "version": "0.0.115",
   "files": [
     "dist"
   ],
@@ -32,7 +32,7 @@
     "@vitejs/plugin-react": "^6.0.1",
     "bun-match-svg": "^0.0.14",
     "circuit-json-to-connectivity-map": "^0.0.25",
-    "kicadts": "^0.0.49",
+    "kicadts": "^0.0.52",
     "react": "^19.2.0",
     "react-dom": "^19.2.5",
     "tscircuit": "^0.0.2040",