circuit-json-to-kicad 0.0.10 → 0.0.12

package/dist/index.js

@@ -105,6 +105,7 @@ function getLibraryId(sourceComp, schematicComp) {
 }
 
 // lib/schematic/stages/AddLibrarySymbolsStage.ts
+import { applyToPoint, scale as createScaleMatrix } from "transformation-matrix";
 var AddLibrarySymbolsStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
@@ -131,12 +132,11 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
           continue;
         }
       }
-      const libSymbol = this.createLibrarySymbolFromSchematicSymbol(
-        symbolName,
+      const libSymbol = this.createLibrarySymbolFromSchematicSymbol({
         symbolData,
         sourceComp,
         schematicComponent
-      );
+      });
       librarySymbols.push(libSymbol);
     }
     libSymbols.symbols = librarySymbols;
@@ -184,8 +184,12 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
   /**
    * Convert schematic-symbols data to KiCad library symbol
    */
-  createLibrarySymbolFromSchematicSymbol(symbolName, symbolData, sourceComp, schematicComp) {
-    const libId = getLibraryId(sourceComp, schematicComp);
+  createLibrarySymbolFromSchematicSymbol({
+    symbolData,
+    sourceComp,
+    schematicComponent
+  }) {
+    const libId = getLibraryId(sourceComp, schematicComponent);
     const symbol = new SchematicSymbol({
       libraryId: libId,
       excludeFromSim: false,
@@ -200,9 +204,18 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     symbol._sxPinNames = pinNames;
     this.addSymbolProperties(symbol, libId, sourceComp);
     const isChip = sourceComp?.ftype === "simple_chip";
-    const drawingSymbol = this.createDrawingSubsymbol(libId, symbolData, isChip);
+    const drawingSymbol = this.createDrawingSubsymbol({
+      libId,
+      symbolData,
+      isChip
+    });
     symbol.subSymbols.push(drawingSymbol);
-    const pinSymbol = this.createPinSubsymbol(libId, symbolData, isChip);
+    const pinSymbol = this.createPinSubsymbol({
+      libId,
+      symbolData,
+      isChip,
+      schematicComponent
+    });
     symbol.subSymbols.push(pinSymbol);
     symbol._sxEmbeddedFonts = new EmbeddedFonts(false);
     return symbol;
@@ -291,7 +304,11 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
    * Create the drawing subsymbol (primitives, no pins)
    * Converts schematic-symbols primitives to KiCad drawing elements
    */
-  createDrawingSubsymbol(libId, symbolData, isChip = false) {
+  createDrawingSubsymbol({
+    libId,
+    symbolData,
+    isChip
+  }) {
     const drawingSymbol = new SchematicSymbol({
       libraryId: `${libId.split(":")[1]}_0_1`
     });
@@ -299,11 +316,12 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     for (const primitive of symbolData.primitives || []) {
       if (primitive.type === "path" && primitive.points) {
         const fillType = isChip ? "background" : "none";
-        const polyline = this.createPolylineFromPoints(
-          primitive.points,
-          symbolScale,
+        const polyline = this.createPolylineFromPoints({
+          points: primitive.points,
+          scale: symbolScale,
+          center: symbolData.center,
           fillType
-        );
+        });
         drawingSymbol.polylines.push(polyline);
       }
     }
@@ -312,9 +330,20 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
   /**
    * Create a KiCad polyline from points
    */
-  createPolylineFromPoints(points, scale3, fillType = "none") {
+  createPolylineFromPoints({
+    points,
+    scale: scale3,
+    center,
+    fillType
+  }) {
     const polyline = new SymbolPolyline();
-    const xyPoints = points.map((p) => new Xy(p.x * scale3, p.y * scale3));
+    const cx = center?.x ?? 0;
+    const cy = center?.y ?? 0;
+    const scaleMatrix = createScaleMatrix(scale3, scale3);
+    const xyPoints = points.map((p) => {
+      const translated = applyToPoint(scaleMatrix, { x: p.x - cx, y: p.y - cy });
+      return new Xy(translated.x, translated.y);
+    });
     const pts = new Pts(xyPoints);
     polyline.points = pts;
     const stroke = new Stroke();
@@ -329,7 +358,12 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
   /**
    * Create the pin subsymbol
    */
-  createPinSubsymbol(libId, symbolData, isChip = false) {
+  createPinSubsymbol({
+    libId,
+    symbolData,
+    isChip,
+    schematicComponent
+  }) {
     const pinSymbol = new SchematicSymbol({
       libraryId: `${libId.split(":")[1]}_1_1`
     });
@@ -342,7 +376,9 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
         port,
         symbolData.center,
         symbolData.size,
-        isChip
+        isChip,
+        i,
+        schematicComponent
       );
       pin.at = [x, y, angle];
       pin.length = isChip ? 6 : 1.27;
@@ -367,17 +403,52 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
    * Calculate KiCad pin position and rotation from schematic-symbols port
    * Scale pins to match the c2kMatSch transformation scale
    */
-  calculatePinPosition(port, center, size, isChip) {
+  calculatePinPosition(port, center, size, isChip, portIndex, schematicComponent) {
     const symbolScale = this.ctx.c2kMatSch?.a || 15;
-    const dx = port.x - center.x;
-    const dy = port.y - center.y;
-    let x = port.x * symbolScale;
-    let y = port.y * symbolScale;
+    let portX = port.x ?? 0;
+    let portY = port.y ?? 0;
+    let usingCircuitJsonPort = false;
+    if (portIndex !== void 0 && schematicComponent) {
+      const schematicPorts = this.ctx.db.schematic_port.list().filter(
+        (p) => p.schematic_component_id === schematicComponent.schematic_component_id
+      ).sort((a, b) => (a.pin_number || 0) - (b.pin_number || 0));
+      if (schematicPorts[portIndex]) {
+        const schPort = schematicPorts[portIndex];
+        portX = schPort.center.x - schematicComponent.center.x;
+        portY = schPort.center.y - schematicComponent.center.y;
+        usingCircuitJsonPort = true;
+      }
+    }
+    let dx;
+    let dy;
+    if (usingCircuitJsonPort) {
+      dx = portX;
+      dy = portY;
+    } else {
+      const cx = center?.x ?? 0;
+      const cy = center?.y ?? 0;
+      dx = portX - cx;
+      dy = portY - cy;
+    }
+    const scaleMatrix = createScaleMatrix(symbolScale, symbolScale);
+    const scaled = applyToPoint(scaleMatrix, { x: dx, y: dy });
+    let isHorizontalPin;
+    if (isChip && size) {
+      const halfWidth = size.width / 2;
+      const halfHeight = size.height / 2;
+      const normalizedDx = Math.abs(dx) / halfWidth;
+      const normalizedDy = Math.abs(dy) / halfHeight;
+      isHorizontalPin = normalizedDx > normalizedDy;
+    } else {
+      isHorizontalPin = Math.abs(dx) > Math.abs(dy);
+    }
+    let x = scaled.x;
+    let y = scaled.y;
     const chipPinLength = 6;
     if (isChip && size) {
       const halfWidth = size.width / 2 * symbolScale;
       const halfHeight = size.height / 2 * symbolScale;
-      if (Math.abs(dx) > Math.abs(dy)) {
+      if (isHorizontalPin) {
         x = dx > 0 ? halfWidth : -halfWidth;
         y = dy * symbolScale;
       } else {
@@ -386,7 +457,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       }
     }
     let angle = 0;
-    if (Math.abs(dx) > Math.abs(dy)) {
+    if (isHorizontalPin) {
       if (dx > 0) {
         if (isChip) {
           angle = 180;
@@ -453,7 +524,7 @@ import {
   TextEffectsFont as TextEffectsFont2,
   TextEffectsJustify
 } from "kicadts";
-import { applyToPoint } from "transformation-matrix";
+import { applyToPoint as applyToPoint2 } from "transformation-matrix";
 import { symbols as symbols2 } from "schematic-symbols";
 var AddSchematicSymbolsStage = class extends ConverterStage {
   _step() {
@@ -468,7 +539,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
       const sourceComponent = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : null;
       if (!sourceComponent) continue;
       if (!this.ctx.c2kMatSch) continue;
-      const { x, y } = applyToPoint(this.ctx.c2kMatSch, {
+      const { x, y } = applyToPoint2(this.ctx.c2kMatSch, {
         x: schematicComponent.center.x,
         y: schematicComponent.center.y
       });
@@ -567,7 +638,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
     ) || [];
     const refText = schematicTexts.find((t) => t.text && t.text.length > 0);
     if (refText && this.ctx.c2kMatSch) {
-      const refTextPos2 = applyToPoint(this.ctx.c2kMatSch, {
+      const refTextPos2 = applyToPoint2(this.ctx.c2kMatSch, {
         x: refText.position.x,
         y: refText.position.y
       });
@@ -593,37 +664,17 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
         }
       }
     }
-    const refTextPos = refTextPrimitive && this.ctx.c2kMatSch ? applyToPoint(this.ctx.c2kMatSch, {
-      x: schematicComponent.center.x + refTextPrimitive.x,
-      y: schematicComponent.center.y + refTextPrimitive.y
+    const symbolCenter = symbol.center || { x: 0, y: 0 };
+    const refTextPos = refTextPrimitive && this.ctx.c2kMatSch ? applyToPoint2(this.ctx.c2kMatSch, {
+      x: schematicComponent.center.x + (refTextPrimitive.x - symbolCenter.x),
+      y: schematicComponent.center.y + (refTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: symbolKicadPos.y - 6 };
-    const valTextPos = valTextPrimitive && this.ctx.c2kMatSch ? applyToPoint(this.ctx.c2kMatSch, {
-      x: schematicComponent.center.x + valTextPrimitive.x,
-      y: schematicComponent.center.y + valTextPrimitive.y
+    const valTextPos = valTextPrimitive && this.ctx.c2kMatSch ? applyToPoint2(this.ctx.c2kMatSch, {
+      x: schematicComponent.center.x + (valTextPrimitive.x - symbolCenter.x),
+      y: schematicComponent.center.y + (valTextPrimitive.y - symbolCenter.y)
     }) : { x: symbolKicadPos.x, y: symbolKicadPos.y + 6 };
     return { refTextPos, valTextPos };
   }
-  /**
-   * Get KiCad library ID for a component
-   */
-  getLibraryId(sourceComp) {
-    if (sourceComp.ftype === "simple_resistor") {
-      return "Device:R";
-    }
-    if (sourceComp.ftype === "simple_capacitor") {
-      return "Device:C";
-    }
-    if (sourceComp.ftype === "simple_inductor") {
-      return "Device:L";
-    }
-    if (sourceComp.ftype === "simple_diode") {
-      return "Device:D";
-    }
-    if (sourceComp.ftype === "simple_chip") {
-      return "Device:U";
-    }
-    return "Device:Component";
-  }
   /**
    * Get component metadata (reference, value, description)
    */
@@ -694,7 +745,7 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
 
 // lib/schematic/stages/AddSchematicTracesStage.ts
 import { Wire, Pts as Pts2, Xy as Xy2, Stroke as Stroke2, Junction } from "kicadts";
-import { applyToPoint as applyToPoint2 } from "transformation-matrix";
+import { applyToPoint as applyToPoint3 } from "transformation-matrix";
 var AddSchematicTracesStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
@@ -732,11 +783,11 @@ var AddSchematicTracesStage = class extends ConverterStage {
         "Schematic transformation matrix not initialized in context"
       );
     }
-    const from = applyToPoint2(this.ctx.c2kMatSch, {
+    const from = applyToPoint3(this.ctx.c2kMatSch, {
       x: edge.from.x,
       y: edge.from.y
     });
-    const to = applyToPoint2(this.ctx.c2kMatSch, {
+    const to = applyToPoint3(this.ctx.c2kMatSch, {
       x: edge.to.x,
       y: edge.to.y
     });
@@ -762,7 +813,7 @@ var AddSchematicTracesStage = class extends ConverterStage {
         "Schematic transformation matrix not initialized in context"
       );
     }
-    const { x, y } = applyToPoint2(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
       x: junction.x,
       y: junction.y
     });
@@ -1018,7 +1069,7 @@ var AddNetsStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddFootprintsStage.ts
 import { Footprint, FpText, FootprintPad } from "kicadts";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
@@ -1042,7 +1093,7 @@ var AddFootprintsStage = class extends ConverterStage {
     const sourceComponent = component.source_component_id ? this.ctx.db.source_component.get(component.source_component_id) : null;
     const footprintName = sourceComponent?.ftype || "Unknown";
     const componentName = sourceComponent?.name || `Component_${this.componentsProcessed}`;
-    const transformedPos = applyToPoint3(c2kMatPcb, {
+    const transformedPos = applyToPoint4(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -1123,7 +1174,7 @@ var AddFootprintsStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddTracesStage.ts
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 var AddTracesStage = class extends ConverterStage {
   tracesProcessed = 0;
   pcbTraces = [];
@@ -1151,11 +1202,11 @@ var AddTracesStage = class extends ConverterStage {
     for (let i = 0; i < trace.route.length - 1; i++) {
       const startPoint = trace.route[i];
       const endPoint = trace.route[i + 1];
-      const transformedStart = applyToPoint4(c2kMatPcb, {
+      const transformedStart = applyToPoint5(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint4(c2kMatPcb, {
+      const transformedEnd = applyToPoint5(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
@@ -1189,7 +1240,7 @@ var AddTracesStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddViasStage.ts
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint6 } from "transformation-matrix";
 var AddViasStage = class extends ConverterStage {
   viasProcessed = 0;
   pcbVias = [];
@@ -1210,7 +1261,7 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
-    const transformedPos = applyToPoint5(c2kMatPcb, {
+    const transformedPos = applyToPoint6(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -1237,7 +1288,7 @@ var AddViasStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddGraphicsStage.ts
 import { GrLine } from "kicadts";
-import { applyToPoint as applyToPoint6 } from "transformation-matrix";
+import { applyToPoint as applyToPoint7 } from "transformation-matrix";
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -1254,11 +1305,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const startPoint = path.route[i];
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint) continue;
-        const transformedStart = applyToPoint6(c2kMatPcb, {
+        const transformedStart = applyToPoint7(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint6(c2kMatPcb, {
+        const transformedEnd = applyToPoint7(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -1299,7 +1350,7 @@ var AddGraphicsStage = class extends ConverterStage {
         ];
       }
       const transformedCorners = corners.map(
-        (corner) => applyToPoint6(c2kMatPcb, corner)
+        (corner) => applyToPoint7(c2kMatPcb, corner)
       );
       for (let i = 0; i < transformedCorners.length; i++) {
         const start = transformedCorners[i];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "type": "module",
   "files": [
     "dist"
@@ -24,7 +24,7 @@
     "schematic-symbols": "^0.0.202",
     "sharp": "^0.34.4",
     "transformation-matrix": "^3.1.0",
-    "tscircuit": "^0.0.698",
+    "tscircuit": "^0.0.713",
     "tsup": "^8.5.0"
   },
   "peerDependencies": {