@tscircuit/cli 0.1.2348 → 0.1.2350

package/dist/cli/main.js

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/cli/main.js
-size: 46851561 bytes
-sha256: 1806ec974815c867031d068c0b7255678fcd64b5237107d21c088f7aeae9db22
+size: 46855996 bytes
+sha256: 3e89a23a4e2d130a6b63c7dd3df361ec747b0f26f45000391dc7d6b49afa65d7

package/dist/lib/index.js

@@ -69121,7 +69121,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2347";
+var version = "0.1.2349";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69175,7 +69175,7 @@ var package_default = {
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.59",
     "circuit-json-to-gerber": "^0.0.112",
-    "circuit-json-to-kicad": "0.0.230",
+    "circuit-json-to-kicad": "0.0.235",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
@@ -69200,7 +69200,7 @@ var package_default = {
     jszip: "^3.10.1",
     "jwt-decode": "^4.0.0",
     "kicad-to-circuit-json": "^0.0.113",
-    kicadts: "^0.0.47",
+    kicadts: "^0.0.58",
     kleur: "^4.1.5",
     ky: "^1.7.4",
     "make-vfs": "^1.0.15",
@@ -72666,6 +72666,7 @@ import { Segment, SegmentNet } from "kicadts";
 import { applyToPoint as applyToPoint24 } from "transformation-matrix";
 import { Via, ViaNet } from "kicadts";
 import { applyToPoint as applyToPoint25 } from "transformation-matrix";
+import { ViaTenting } from "kicadts";
 import { Footprint as Footprint4 } from "kicadts";
 import { applyToPoint as applyToPoint26 } from "transformation-matrix";
 import { GrLine } from "kicadts";
@@ -73758,6 +73759,9 @@ function addSymbolProperties({
     }));
   }
 }
+function getPhysicalPinName(sourcePort) {
+  return sourcePort && sourcePort.pin_number === undefined && /^[A-Z]+[1-9]\d*$/.test(sourcePort.name) ? sourcePort.name : undefined;
+}
 function calculatePinPosition({
   port,
   center,
@@ -73956,8 +73960,10 @@ function createPinSubsymbol({
     numFont.size = { height: 1.27, width: 1.27 };
     const numEffects = new TextEffects4({ font: numFont });
     const pinNum = port.pinNumber?.toString() ?? circuitPinNumbers.get(i) ?? `${i + 1}`;
+    const schematicPort = schematicPorts.find((candidate) => candidate.schematic_component_id === schematicComponent?.schematic_component_id && String(candidate.pin_number) === pinNum);
+    const sourcePort = sourcePorts.find((candidate) => candidate.source_port_id === schematicPort?.source_port_id);
     pin._sxNumber = new SymbolPinNumber({
-      value: pinNum,
+      value: getPhysicalPinName(sourcePort) ?? pinNum,
       effects: numEffects
     });
     pinSymbol.pins.push(pin);
@@ -73966,11 +73972,14 @@ function createPinSubsymbol({
 }
 var AddLibrarySymbolsStage = class extends ConverterStage {
   processedSymbolNames = /* @__PURE__ */ new Set;
+  pinNumberingsByLibId = /* @__PURE__ */ new Map;
   _step() {
     const { kicadSch, db } = this.ctx;
     const libSymbols = new LibSymbols;
     const librarySymbols = [];
     this.processedSymbolNames = /* @__PURE__ */ new Set;
+    this.pinNumberingsByLibId = /* @__PURE__ */ new Map;
+    this.ctx.schematicComponentLibraryIds = /* @__PURE__ */ new Map;
     const schematicComponents = db.schematic_component.list();
     for (const schematicComponent of schematicComponents) {
       const libSymbol = this.createLibrarySymbolForComponent(schematicComponent);
@@ -74066,8 +74075,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     if (!symbolData)
       return null;
     const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
-    return this.createLibrarySymbol({
-      libId: libraryId,
+    const librarySymbolOptions = {
       symbolData,
       isChip,
       schematicComponent,
@@ -74077,8 +74085,31 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       footprintRef: footprintName ? `tscircuit:${footprintName}` : "",
       referencePrefix: getReferencePrefixForComponent(sourceComp),
       symbolScale: this.ctx.kicadSchematicScaleFactor
+    };
+    const librarySymbol = this.createLibrarySymbol({
+      libId: libraryId,
+      ...librarySymbolOptions
+    });
+    const pinNumberingLibId = this.getLibraryIdForPinNumbering(libraryId, librarySymbol);
+    if (pinNumberingLibId === libraryId)
+      return librarySymbol;
+    this.ctx.schematicComponentLibraryIds.set(schematicComponent.schematic_component_id, pinNumberingLibId);
+    return this.createLibrarySymbol({
+      libId: pinNumberingLibId,
+      ...librarySymbolOptions
     });
   }
+  getLibraryIdForPinNumbering(libId, librarySymbol) {
+    const pinNumbering = librarySymbol.subSymbols.flatMap((subSymbol) => subSymbol.pins.map((pin) => pin.numberString)).join(",");
+    const numberings = this.pinNumberingsByLibId.get(libId) ?? [];
+    this.pinNumberingsByLibId.set(libId, numberings);
+    let index = numberings.indexOf(pinNumbering);
+    if (index === -1) {
+      numberings.push(pinNumbering);
+      index = numberings.length - 1;
+    }
+    return index === 0 ? libId : `${libId}_${index + 1}`;
+  }
   createLibrarySymbolFromSchematicSymbol(schematicComponent, sourceComp, symbolContext) {
     const { cadComponent, schematicSymbol, schematicSymbolId, libraryId } = symbolContext;
     if (!schematicSymbol || !schematicSymbolId) {
@@ -74096,6 +74127,12 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       schematicComponentCenter: schematicComponent.center,
       schematicComponentSize: schematicComponent.size
     });
+    if (sourceComp.name) {
+      const referenceTextIndex = symbolData.texts.findIndex((text) => text.text === sourceComp.name);
+      if (referenceTextIndex !== -1) {
+        symbolData.texts.splice(referenceTextIndex, 1);
+      }
+    }
     const footprintName = getKicadCompatibleComponentName(sourceComp, cadComponent);
     return this.createLibrarySymbol({
       libId: libraryId,
@@ -74643,6 +74680,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
     return this.ctx.kicadSch;
   }
 };
+var DEFAULT_PROPERTY_FONT_SIZE = 1.27;
 var AddSchematicSymbolsStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
@@ -74686,7 +74724,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         uuid,
         fieldsAutoplaced: false
       });
-      const symLibId = new SymbolLibId2(libraryId);
+      const symLibId = new SymbolLibId2(this.ctx.schematicComponentLibraryIds?.get(schematicComponent.schematic_component_id) ?? libraryId);
       symbol._sxLibId = symLibId;
       const { reference, value, description } = this.getComponentMetadata(sourceComponent);
       const hasManufacturerValueForValuePlacement = (sourceComponent.ftype === "simple_chip" || sourceComponent.ftype === "simple_connector") && Boolean(sourceComponent.manufacturer_part_number);
@@ -74698,16 +74736,30 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         value
       });
       const symbolMetadata = schematicSymbol?.metadata?.kicad_symbol;
+      let customReferenceText;
+      if (schematicSymbolId && sourceComponent.name) {
+        customReferenceText = db.schematic_text.list().find((text) => text.schematic_symbol_id === schematicSymbolId && text.text === sourceComponent.name);
+      }
+      const customReferencePosition = this.getTextPosition(customReferenceText);
+      const referencePosition = customReferencePosition?.position ?? refTextPos;
+      let referenceFontSize = DEFAULT_PROPERTY_FONT_SIZE;
+      if (customReferenceText) {
+        referenceFontSize = customReferenceText.font_size * this.ctx.kicadSchematicScaleFactor;
+      }
       const refMeta = symbolMetadata?.properties?.Reference;
       const hideGeneratedCustomReference = Boolean(schematicSymbolId) || usesComponentLevelSymbolPrimitives;
       const referenceProperty = new SymbolProperty3({
         key: "Reference",
         value: refMeta?.value ?? reference,
         id: 0,
-        at: [refTextPos.x, refTextPos.y, 0],
-        effects: this.createTextEffects(Number(refMeta?.effects?.font?.size?.x ?? 1.27), {
-          hide: refMeta?.effects?.hide ?? hideGeneratedCustomReference,
-          justify: refJustify
+        at: [
+          referencePosition.x,
+          referencePosition.y,
+          customReferenceText?.rotation ?? 0
+        ],
+        effects: this.createTextEffects(Number(refMeta?.effects?.font?.size?.x ?? referenceFontSize), {
+          hide: refMeta?.effects?.hide ?? (hideGeneratedCustomReference && !customReferenceText),
+          justify: customReferencePosition?.justify ?? refJustify
         })
       });
       const hideValue = Boolean(schematicSymbolId) || usesComponentLevelSymbolPrimitives || sourceComponent.ftype === "simple_chip" && !hasManufacturerValueForValuePlacement || sourceComponent.ftype === "simple_diode" && !schematicComponent.symbol_display_value || sourceComponent.ftype === "simple_pin_header" || sourceComponent.ftype === "simple_test_point";
@@ -74717,7 +74769,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         value: valMeta?.value ?? value,
         id: 1,
         at: [valTextPos.x, valTextPos.y, 0],
-        effects: this.createTextEffects(Number(valMeta?.effects?.font?.size?.x ?? 1.27), { hide: valMeta?.effects?.hide ?? hideValue, justify: valJustify })
+        effects: this.createTextEffects(Number(valMeta?.effects?.font?.size?.x ?? DEFAULT_PROPERTY_FONT_SIZE), { hide: valMeta?.effects?.hide ?? hideValue, justify: valJustify })
       });
       const fpMeta = symbolMetadata?.properties?.Footprint;
       const footprintProperty = new SymbolProperty3({
@@ -74725,7 +74777,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         value: fpMeta?.value ?? "",
         id: 2,
         at: [x - 1.778, y, 90],
-        effects: this.createTextEffects(1.27, {
+        effects: this.createTextEffects(DEFAULT_PROPERTY_FONT_SIZE, {
           hide: fpMeta?.effects?.hide ?? true
         })
       });
@@ -74735,7 +74787,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         value: dsMeta?.value ?? "~",
         id: 3,
         at: [x, y, 0],
-        effects: this.createTextEffects(1.27, {
+        effects: this.createTextEffects(DEFAULT_PROPERTY_FONT_SIZE, {
           hide: dsMeta?.effects?.hide ?? true
         })
       });
@@ -74745,7 +74797,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         value: descMeta?.value ?? description,
         id: 4,
         at: [x, y, 0],
-        effects: this.createTextEffects(1.27, {
+        effects: this.createTextEffects(DEFAULT_PROPERTY_FONT_SIZE, {
           hide: descMeta?.effects?.hide ?? true
         })
       });
@@ -74757,7 +74809,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
           value: kwMeta.value,
           id: 5,
           at: [x, y, 0],
-          effects: this.createTextEffects(1.27, {
+          effects: this.createTextEffects(DEFAULT_PROPERTY_FONT_SIZE, {
             hide: kwMeta.effects?.hide ?? true
           })
         });
@@ -74770,7 +74822,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
           value: fpFilterMeta.value,
           id: 6,
           at: [x, y, 0],
-          effects: this.createTextEffects(1.27, {
+          effects: this.createTextEffects(DEFAULT_PROPERTY_FONT_SIZE, {
             hide: fpFilterMeta.effects?.hide ?? true
           })
         });
@@ -74820,7 +74872,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         if (!port)
           continue;
         const pin = new SymbolPin3;
-        pin.numberString = `${port.pin_number || i + 1}`;
+        pin.numberString = getPhysicalPinName(port.source_port_id ? db.source_port.get(port.source_port_id) : undefined) ?? `${port.pin_number || i + 1}`;
         pin.uuid = crypto.randomUUID();
         symbol.pins.push(pin);
       }
@@ -75876,7 +75928,7 @@ var ExtractFootprintsStage = class extends ConverterStage {
         customFootprintNames.add(footprintName);
         const pcbComp = this.ctx.circuitJson.find((el) => el.type === "pcb_component" && el.source_component_id === cadComponent.source_component_id);
         if (pcbComp && pcbComp.type === "pcb_component" && pcbComp.metadata?.kicad_footprint?.footprintName) {
-          customFootprintNames.add(pcbComp.metadata.kicad_footprint.footprintName);
+          customFootprintNames.add(pcbComp.metadata.kicad_footprint.footprintName.split(":").pop());
         }
       }
     }
@@ -76944,7 +76996,7 @@ function convertSmdPads({
     const sourcePort = pcbPort?.source_port_id ? ctx.db.source_port?.get(pcbPort.source_port_id) : undefined;
     const pinHint = pcbPad.port_hints?.find((h) => /^pin[A-Za-z0-9_]+$/i.test(h));
     const gridHint = pcbPad.port_hints?.find((h) => /^[A-Za-z]?\d+[A-Za-z0-9_]*$/.test(h));
-    const resolvedPadNumber = sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber);
+    const resolvedPadNumber = getPhysicalPinName(sourcePort) ?? (sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber));
     const pad = createSmdPadFromCircuitJson({
       pcbPad,
       componentCenter,
@@ -77077,7 +77129,7 @@ function convertPlatedHoles({
     const sourcePort = pcbPort?.source_port_id ? ctx.db.source_port?.get(pcbPort.source_port_id) : undefined;
     const pinHint = platedHole.port_hints?.find((h) => /^pin[A-Za-z0-9_]+$/i.test(h));
     const gridHint = platedHole.port_hints?.find((h) => /^[A-Za-z]?\d+[A-Za-z0-9_]*$/.test(h));
-    const resolvedPadNumber = sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber);
+    const resolvedPadNumber = getPhysicalPinName(sourcePort) ?? (sourcePort?.pin_number != null ? String(sourcePort.pin_number) : pinHint ? pinHint.replace(/^pin/i, "") : gridHint ?? String(padNumber));
     const pad = createThruHolePadFromCircuitJson({
       platedHole,
       componentCenter,
@@ -77574,6 +77626,26 @@ var AddTracesStage = class extends ConverterStage {
     return this.ctx.kicadPcb;
   }
 };
+var toKicadTentingValue = (tented) => tented === undefined ? "none" : tented ? "yes" : "no";
+var KicadViaTenting = class extends ViaTenting {
+  constructor(front, back) {
+    super();
+    this.front = front;
+    this.back = back;
+  }
+  front;
+  back;
+  getString() {
+    return `(tenting (front ${this.front}) (back ${this.back}))`;
+  }
+};
+var createViaTenting = (via) => {
+  const top = via.tented_on_top ?? via.is_tented;
+  const bottom = via.tented_on_bottom ?? via.is_tented;
+  if (top === undefined && bottom === undefined)
+    return;
+  return new KicadViaTenting(toKicadTentingValue(top), toKicadTentingValue(bottom));
+};
 var AddViasStage = class extends ConverterStage {
   viasProcessed = 0;
   pcbVias = [];
@@ -77593,7 +77665,9 @@ var AddViasStage = class extends ConverterStage {
       to_layer: point.to_layer,
       pcb_trace_id: trace.pcb_trace_id,
       subcircuit_connectivity_map_key: trace.subcircuit_connectivity_map_key,
-      connection_name: trace.connection_name
+      connection_name: trace.connection_name,
+      tented_on_top: point.tented_on_top,
+      tented_on_bottom: point.tented_on_bottom
     })).filter((via) => {
       const viaKey = this.getViaDedupeKey(via);
       if (seenViaKeys.has(viaKey)) {
@@ -77701,7 +77775,8 @@ var AddViasStage = class extends ConverterStage {
       drill: viaDrill,
       layers: viaLayers,
       net: new ViaNet(netInfo?.id ?? 0),
-      uuid: generateDeterministicUuid(viaData)
+      uuid: generateDeterministicUuid(viaData),
+      tenting: createViaTenting(via)
     });
     const vias = kicadPcb.vias;
     vias.push(kicadVia);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.2348",
+  "version": "0.1.2350",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -51,7 +51,7 @@
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.59",
     "circuit-json-to-gerber": "^0.0.112",
-    "circuit-json-to-kicad": "0.0.230",
+    "circuit-json-to-kicad": "0.0.235",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
@@ -76,7 +76,7 @@
     "jszip": "^3.10.1",
     "jwt-decode": "^4.0.0",
     "kicad-to-circuit-json": "^0.0.113",
-    "kicadts": "^0.0.47",
+    "kicadts": "^0.0.58",
     "kleur": "^4.1.5",
     "ky": "^1.7.4",
     "make-vfs": "^1.0.15",