circuit-json-to-kicad 0.0.13 → 0.0.15

package/dist/index.js

@@ -109,35 +109,32 @@ import { applyToPoint, scale as createScaleMatrix } from "transformation-matrix"
 var AddLibrarySymbolsStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
-    const schematicComponents = db.schematic_component.list();
-    if (schematicComponents.length === 0) {
-      this.finished = true;
-      return;
-    }
     const libSymbols = new LibSymbols();
     const librarySymbols = [];
+    const schematicComponents = db.schematic_component.list();
     for (const schematicComponent of schematicComponents) {
-      const sourceComp = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : null;
-      if (!sourceComp) continue;
-      const symbolName = schematicComponent.symbol_name || (sourceComp.ftype === "simple_chip" ? `generic_chip_${schematicComponent.source_component_id}` : null);
-      if (!symbolName) {
-        continue;
+      const libSymbol = this.createLibrarySymbolForComponent(schematicComponent);
+      if (libSymbol) {
+        librarySymbols.push(libSymbol);
       }
-      let symbolData;
-      if (symbolName.startsWith("generic_chip_")) {
-        symbolData = this.createGenericChipSymbolData(schematicComponent, db);
-      } else {
-        symbolData = symbols[symbolName];
-        if (!symbolData) {
-          continue;
+    }
+    const netLabels = db.schematic_net_label?.list?.() || [];
+    for (const netLabel of netLabels) {
+      if (netLabel.symbol_name) {
+        const isPower = netLabel.source_net_id ? db.source_net.get(netLabel.source_net_id)?.is_power : false;
+        const isGround = netLabel.source_net_id ? db.source_net.get(netLabel.source_net_id)?.is_ground : false;
+        const isPowerOrGround = isPower || isGround;
+        if (isPowerOrGround) {
+          const libSymbol = this.createLibrarySymbolForNetLabel({
+            netLabel,
+            isPower: isPower ?? false,
+            isGround: isGround ?? false
+          });
+          if (libSymbol) {
+            librarySymbols.push(libSymbol);
+          }
         }
       }
-      const libSymbol = this.createLibrarySymbolFromSchematicSymbol({
-        symbolData,
-        sourceComp,
-        schematicComponent
-      });
-      librarySymbols.push(libSymbol);
     }
     libSymbols.symbols = librarySymbols;
     if (kicadSch) {
@@ -145,6 +142,61 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     }
     this.finished = true;
   }
+  /**
+   * Create library symbol for a schematic component
+   */
+  createLibrarySymbolForComponent(schematicComponent) {
+    const { db } = this.ctx;
+    const sourceComp = schematicComponent.source_component_id ? db.source_component.get(schematicComponent.source_component_id) : null;
+    if (!sourceComp) return null;
+    const symbolName = schematicComponent.symbol_name || (sourceComp.ftype === "simple_chip" ? `generic_chip_${schematicComponent.source_component_id}` : null);
+    if (!symbolName) return null;
+    const symbolData = this.getSymbolData(symbolName, schematicComponent);
+    if (!symbolData) return null;
+    const libId = getLibraryId(sourceComp, schematicComponent);
+    const isChip = sourceComp.ftype === "simple_chip";
+    return this.createLibrarySymbol({
+      libId,
+      symbolData,
+      isChip,
+      schematicComponent,
+      description: this.getDescription(sourceComp),
+      keywords: this.getKeywords(sourceComp),
+      fpFilters: this.getFpFilters(sourceComp)
+    });
+  }
+  /**
+   * Create library symbol for a schematic net label with symbol_name
+   */
+  createLibrarySymbolForNetLabel({
+    netLabel,
+    isPower,
+    isGround
+  }) {
+    const symbolName = netLabel.symbol_name;
+    if (!symbolName) return null;
+    const symbolData = symbols[symbolName];
+    if (!symbolData) return null;
+    const libId = `Custom:${symbolName}`;
+    return this.createLibrarySymbol({
+      libId,
+      symbolData,
+      isChip: false,
+      schematicComponent: void 0,
+      description: isPower ? "Power net label" : isGround ? "Ground net label" : "Net symbol",
+      keywords: isPower ? "power net" : isGround ? "ground net" : "net",
+      fpFilters: ""
+    });
+  }
+  /**
+   * Get symbol data from schematic-symbols or generate for generic chips
+   */
+  getSymbolData(symbolName, schematicComponent) {
+    if (symbolName.startsWith("generic_chip_")) {
+      return this.createGenericChipSymbolData(schematicComponent, this.ctx.db);
+    }
+    return symbols[symbolName] || null;
+  }
   /**
    * Create generic chip symbol data for chips without a symbol_name
    */
@@ -182,14 +234,18 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     };
   }
   /**
-   * Convert schematic-symbols data to KiCad library symbol
+   * Create a KiCad library symbol from symbol data
+   * This is the core method that handles both components and net labels
    */
-  createLibrarySymbolFromSchematicSymbol({
+  createLibrarySymbol({
+    libId,
     symbolData,
-    sourceComp,
-    schematicComponent
+    isChip,
+    schematicComponent,
+    description,
+    keywords,
+    fpFilters
   }) {
-    const libId = getLibraryId(sourceComp, schematicComponent);
     const symbol = new SchematicSymbol({
       libraryId: libId,
       excludeFromSim: false,
@@ -197,13 +253,18 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       onBoard: true
     });
     const pinNumbers = new SymbolPinNumbers();
-    pinNumbers.hide = sourceComp?.ftype !== "simple_chip";
+    pinNumbers.hide = !isChip;
     symbol._sxPinNumbers = pinNumbers;
     const pinNames = new SymbolPinNames();
-    pinNames.offset = sourceComp?.ftype === "simple_chip" ? 1.27 : 0;
+    pinNames.offset = isChip ? 1.27 : 0;
     symbol._sxPinNames = pinNames;
-    this.addSymbolProperties(symbol, libId, sourceComp);
-    const isChip = sourceComp?.ftype === "simple_chip";
+    this.addSymbolProperties({
+      symbol,
+      libId,
+      description,
+      keywords,
+      fpFilters
+    });
     const drawingSymbol = this.createDrawingSubsymbol({
       libId,
       symbolData,
@@ -223,7 +284,13 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
   /**
    * Add properties to the library symbol
    */
-  addSymbolProperties(symbol, libId, sourceComp) {
+  addSymbolProperties({
+    symbol,
+    libId,
+    description,
+    keywords,
+    fpFilters
+  }) {
     const refPrefix = libId.split(":")[1]?.[0] || "U";
     const properties = [
       {
@@ -250,21 +317,21 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       },
       {
         key: "Description",
-        value: this.getDescription(sourceComp),
+        value: description,
         id: 4,
         at: [0, 0, 0],
         hide: true
       },
       {
         key: "ki_keywords",
-        value: this.getKeywords(sourceComp),
+        value: keywords,
         id: 5,
         at: [0, 0, 0],
         hide: true
       },
       {
         key: "ki_fp_filters",
-        value: this.getFpFilters(sourceComp),
+        value: fpFilters,
         id: 6,
         at: [0, 0, 0],
         hide: true
@@ -745,9 +812,186 @@ var AddSchematicSymbolsStage = class extends ConverterStage {
   }
 };
 
+// lib/schematic/stages/AddSchematicNetLabelsStage.ts
+import {
+  SchematicSymbol as SchematicSymbol3,
+  SymbolLibId as SymbolLibId2,
+  SymbolProperty as SymbolProperty3,
+  SymbolPin as SymbolPin3,
+  SymbolInstances as SymbolInstances2,
+  SymbolInstancesProject as SymbolInstancesProject2,
+  SymbolInstancePath as SymbolInstancePath2,
+  TextEffects as TextEffects3,
+  TextEffectsFont as TextEffectsFont3,
+  Label
+} from "kicadts";
+import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+var AddSchematicNetLabelsStage = class extends ConverterStage {
+  _step() {
+    const { kicadSch, db } = this.ctx;
+    const netLabels = db.schematic_net_label?.list?.() || [];
+    if (netLabels.length === 0) {
+      this.finished = true;
+      return;
+    }
+    if (!this.ctx.c2kMatSch) {
+      this.finished = true;
+      return;
+    }
+    const symbols3 = [];
+    const labels = [];
+    for (const netLabel of netLabels) {
+      const labelText = netLabel.text || "";
+      const symbolName = netLabel.symbol_name;
+      if (symbolName) {
+        const symbol = this.createSymbolFromNetLabel(
+          netLabel,
+          labelText,
+          symbolName
+        );
+        if (symbol) {
+          symbols3.push(symbol);
+        }
+      } else {
+        const label = this.createLabel(netLabel, labelText);
+        if (label) {
+          labels.push(label);
+        }
+      }
+    }
+    if (kicadSch && symbols3.length > 0) {
+      const existingSymbols = kicadSch.symbols || [];
+      kicadSch.symbols = [...existingSymbols, ...symbols3];
+    }
+    if (kicadSch && labels.length > 0) {
+      kicadSch.labels = [...kicadSch.labels || [], ...labels];
+    }
+    this.finished = true;
+  }
+  /**
+   * Create a KiCad symbol instance from a net label with a symbol_name
+   * These are treated like regular components (e.g., rail_up, rail_down, vcc_up, ground_down)
+   */
+  createSymbolFromNetLabel(netLabel, labelText, symbolName) {
+    if (!this.ctx.c2kMatSch) return null;
+    const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
+      x: netLabel.center?.x || netLabel.anchor_position?.x || 0,
+      y: netLabel.center?.y || netLabel.anchor_position?.y || 0
+    });
+    const uuid = crypto.randomUUID();
+    const symbol = new SchematicSymbol3({
+      at: [x, y, 0],
+      unit: 1,
+      excludeFromSim: false,
+      inBom: true,
+      onBoard: true,
+      dnp: false,
+      uuid,
+      fieldsAutoplaced: true
+    });
+    const libId = `Custom:${symbolName}`;
+    const symLibId = new SymbolLibId2(libId);
+    symbol._sxLibId = symLibId;
+    const isUpSymbol = symbolName.includes("_up") || symbolName.toLowerCase().includes("vcc");
+    const referenceOffset = isUpSymbol ? -4 : 4;
+    const valueOffset = isUpSymbol ? -6 : 6;
+    const referenceProperty = new SymbolProperty3({
+      key: "Reference",
+      value: labelText,
+      // Use the label text as the reference
+      id: 0,
+      at: [x, y + referenceOffset, 0],
+      effects: this.createTextEffects(1.27, false)
+    });
+    const valueProperty = new SymbolProperty3({
+      key: "Value",
+      value: labelText,
+      id: 1,
+      at: [x, y + valueOffset, 0],
+      effects: this.createTextEffects(1.27, true)
+    });
+    const footprintProperty = new SymbolProperty3({
+      key: "Footprint",
+      value: "",
+      id: 2,
+      at: [x - 1.778, y, 90],
+      effects: this.createTextEffects(1.27, true)
+    });
+    const datasheetProperty = new SymbolProperty3({
+      key: "Datasheet",
+      value: "~",
+      id: 3,
+      at: [x, y, 0],
+      effects: this.createTextEffects(1.27, true)
+    });
+    const descriptionProperty = new SymbolProperty3({
+      key: "Description",
+      value: `Power/Net symbol: ${labelText}`,
+      id: 4,
+      at: [x, y, 0],
+      effects: this.createTextEffects(1.27, true)
+    });
+    symbol.properties.push(
+      referenceProperty,
+      valueProperty,
+      footprintProperty,
+      datasheetProperty,
+      descriptionProperty
+    );
+    const pin = new SymbolPin3();
+    pin.numberString = "1";
+    pin.uuid = crypto.randomUUID();
+    symbol.pins.push(pin);
+    const { kicadSch } = this.ctx;
+    const instances = new SymbolInstances2();
+    const project = new SymbolInstancesProject2("");
+    const path = new SymbolInstancePath2(`/${kicadSch?.uuid?.value || ""}`);
+    path.reference = labelText;
+    path.unit = 1;
+    project.paths.push(path);
+    instances.projects.push(project);
+    symbol._sxInstances = instances;
+    return symbol;
+  }
+  /**
+   * Create a KiCad label from a schematic_net_label without a symbol
+   */
+  createLabel(netLabel, labelText) {
+    if (!this.ctx.c2kMatSch) return null;
+    const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
+      x: netLabel.center?.x || netLabel.anchor_position?.x || 0,
+      y: netLabel.center?.y || netLabel.anchor_position?.y || 0
+    });
+    const label = new Label({
+      value: labelText,
+      at: [x, y, 0],
+      effects: this.createTextEffects(1.27, false),
+      uuid: crypto.randomUUID()
+    });
+    return label;
+  }
+  /**
+   * Creates text effects for properties and labels
+   */
+  createTextEffects(size, hide = false) {
+    const font = new TextEffectsFont3();
+    font.size = { height: size, width: size };
+    return new TextEffects3({
+      font,
+      hiddenText: hide
+    });
+  }
+  getOutput() {
+    if (!this.ctx.kicadSch) {
+      throw new Error("kicadSch is not initialized");
+    }
+    return this.ctx.kicadSch;
+  }
+};
+
 // lib/schematic/stages/AddSchematicTracesStage.ts
 import { Wire, Pts as Pts2, Xy as Xy2, Stroke as Stroke2, Junction } from "kicadts";
-import { applyToPoint as applyToPoint3 } from "transformation-matrix";
+import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 var AddSchematicTracesStage = class extends ConverterStage {
   _step() {
     const { kicadSch, db } = this.ctx;
@@ -785,11 +1029,11 @@ var AddSchematicTracesStage = class extends ConverterStage {
         "Schematic transformation matrix not initialized in context"
       );
     }
-    const from = applyToPoint3(this.ctx.c2kMatSch, {
+    const from = applyToPoint4(this.ctx.c2kMatSch, {
       x: edge.from.x,
       y: edge.from.y
     });
-    const to = applyToPoint3(this.ctx.c2kMatSch, {
+    const to = applyToPoint4(this.ctx.c2kMatSch, {
       x: edge.to.x,
       y: edge.to.y
     });
@@ -815,7 +1059,7 @@ var AddSchematicTracesStage = class extends ConverterStage {
         "Schematic transformation matrix not initialized in context"
       );
     }
-    const { x, y } = applyToPoint3(this.ctx.c2kMatSch, {
+    const { x, y } = applyToPoint4(this.ctx.c2kMatSch, {
       x: junction.x,
       y: junction.y
     });
@@ -917,8 +1161,8 @@ var CircuitJsonToKicadSchConverter = class {
   }
   constructor(circuitJson) {
     const CIRCUIT_JSON_SCALE_FACTOR = 15;
-    const KICAD_CENTER_X = 95.25;
-    const KICAD_CENTER_Y = 73.66;
+    const KICAD_CENTER_Y = 105;
+    const KICAD_CENTER_X = 148.5;
     const db = cju(circuitJson);
     const { center } = getSchematicBoundsAndCenter(db);
     this.ctx = {
@@ -938,6 +1182,7 @@ var CircuitJsonToKicadSchConverter = class {
       new InitializeSchematicStage(circuitJson, this.ctx),
       new AddLibrarySymbolsStage(circuitJson, this.ctx),
       new AddSchematicSymbolsStage(circuitJson, this.ctx),
+      new AddSchematicNetLabelsStage(circuitJson, this.ctx),
       new AddSchematicTracesStage(circuitJson, this.ctx),
       new AddSheetInstancesStage(circuitJson, this.ctx)
     ];
@@ -1071,7 +1316,7 @@ var AddNetsStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddFootprintsStage.ts
 import { Footprint, FpText, FootprintPad } from "kicadts";
-import { applyToPoint as applyToPoint4 } from "transformation-matrix";
+import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
@@ -1095,7 +1340,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 = applyToPoint4(c2kMatPcb, {
+    const transformedPos = applyToPoint5(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -1176,7 +1421,7 @@ var AddFootprintsStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddTracesStage.ts
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint6 } from "transformation-matrix";
 var AddTracesStage = class extends ConverterStage {
   tracesProcessed = 0;
   pcbTraces = [];
@@ -1204,11 +1449,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 = applyToPoint5(c2kMatPcb, {
+      const transformedStart = applyToPoint6(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint5(c2kMatPcb, {
+      const transformedEnd = applyToPoint6(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
@@ -1242,7 +1487,7 @@ var AddTracesStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddViasStage.ts
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint6 } from "transformation-matrix";
+import { applyToPoint as applyToPoint7 } from "transformation-matrix";
 var AddViasStage = class extends ConverterStage {
   viasProcessed = 0;
   pcbVias = [];
@@ -1263,7 +1508,7 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
-    const transformedPos = applyToPoint6(c2kMatPcb, {
+    const transformedPos = applyToPoint7(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -1290,7 +1535,7 @@ var AddViasStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddGraphicsStage.ts
 import { GrLine } from "kicadts";
-import { applyToPoint as applyToPoint7 } from "transformation-matrix";
+import { applyToPoint as applyToPoint8 } from "transformation-matrix";
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -1307,11 +1552,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const startPoint = path.route[i];
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint) continue;
-        const transformedStart = applyToPoint7(c2kMatPcb, {
+        const transformedStart = applyToPoint8(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint7(c2kMatPcb, {
+        const transformedEnd = applyToPoint8(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -1352,7 +1597,7 @@ var AddGraphicsStage = class extends ConverterStage {
         ];
       }
       const transformedCorners = corners.map(
-        (corner) => applyToPoint7(c2kMatPcb, corner)
+        (corner) => applyToPoint8(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.13",
+  "version": "0.0.15",
   "type": "module",
   "files": [
     "dist"