npm - @modular-circuit/transpiler - Versions diffs - 0.2.8 → 0.2.10 - Mend

@modular-circuit/transpiler 0.2.8 → 0.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -378,17 +378,6 @@ declare function collect_sub_sheets(dependencies: Record<string, string>, module
     modules: Record<string, ModuleCircuit>;
 }>;
-interface Size {
-    height: number;
-    width: number;
-}
-declare const PAPER_SIZE: Record<string, Size>;
-declare const DEFAULT_PAPER_SIZE: Size;
-declare const GENERATOR_NAME = "modular_circuit";
-declare const SCH_VERSION = 20231120;
-declare const PAPER = "A4";
-declare const GENERATOR_VERSION = "8.0";
 declare function filterNullOrUndefined(originalMethod: unknown, _context: ClassMethodDecoratorContext): (this: unknown, ...args: unknown[]) => any;
 declare const tab = "\t";
@@ -425,4 +414,4 @@ declare const gen_sch_gnd: (value: string, pwr_number: number, port_id: string,
 declare const gen_sch_vcc: (value: string, pwr_number: number, port_id: string, position: VECTOR2) => SCH_SYMBOL;
-export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, DEFAULT_PAPER_SIZE, FONT_SIZE, GENERATOR_NAME, GENERATOR_VERSION, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, PAPER, PAPER_SIZE, SCHEMATIC_PRINTER, SCH_VERSION, type Size, StringFormatter, WIRE_PADDING, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, fmt_module_place_holder_sch_name, fmt_to_valid_filename, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };
+export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, FONT_SIZE, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, SCHEMATIC_PRINTER, StringFormatter, WIRE_PADDING, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, fmt_module_place_holder_sch_name, fmt_to_valid_filename, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };

package/dist/index.d.ts CHANGED Viewed

@@ -378,17 +378,6 @@ declare function collect_sub_sheets(dependencies: Record<string, string>, module
     modules: Record<string, ModuleCircuit>;
 }>;
-interface Size {
-    height: number;
-    width: number;
-}
-declare const PAPER_SIZE: Record<string, Size>;
-declare const DEFAULT_PAPER_SIZE: Size;
-declare const GENERATOR_NAME = "modular_circuit";
-declare const SCH_VERSION = 20231120;
-declare const PAPER = "A4";
-declare const GENERATOR_VERSION = "8.0";
 declare function filterNullOrUndefined(originalMethod: unknown, _context: ClassMethodDecoratorContext): (this: unknown, ...args: unknown[]) => any;
 declare const tab = "\t";
@@ -425,4 +414,4 @@ declare const gen_sch_gnd: (value: string, pwr_number: number, port_id: string,
 declare const gen_sch_vcc: (value: string, pwr_number: number, port_id: string, position: VECTOR2) => SCH_SYMBOL;
-export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, DEFAULT_PAPER_SIZE, FONT_SIZE, GENERATOR_NAME, GENERATOR_VERSION, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, PAPER, PAPER_SIZE, SCHEMATIC_PRINTER, SCH_VERSION, type Size, StringFormatter, WIRE_PADDING, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, fmt_module_place_holder_sch_name, fmt_to_valid_filename, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };
+export { BLOCK_PIN_GAP, BLOCK_PIN_TB_MARGIN, type BlockLabelPadding, type BlockSize, type BoxGeometry, type ConnectionGraphMap, type ConvertGraphToKiCadContext, type ConvertGraphToKiCadInput, FONT_SIZE, GRID_SIZE, GraphConverter, KICAD_SCH_FRAME, KiCadProjectArchive, type LabelPadding, Layout, NetListConverter, type NetlistProject, type NetlistToKicadContext, SCHEMATIC_PRINTER, StringFormatter, WIRE_PADDING, collect_sub_sheets, collect_sub_sheets_by_id, convert_graph_to_design_block, convert_graph_to_kicad_project, convert_graph_to_sheets, filterNullOrUndefined, fmt_module_place_holder_sch_name, fmt_to_valid_filename, gen_empty_sch, gen_lib_gnd, gen_lib_vcc, gen_sch_gnd, gen_sch_vcc, get_power_pos, get_sch_default_drawing_sheet, tab };

package/dist/index.js CHANGED Viewed

@@ -76,20 +76,14 @@ var index_exports = {};
 __export(index_exports, {
   BLOCK_PIN_GAP: () => BLOCK_PIN_GAP,
   BLOCK_PIN_TB_MARGIN: () => BLOCK_PIN_TB_MARGIN,
-  DEFAULT_PAPER_SIZE: () => DEFAULT_PAPER_SIZE,
   FONT_SIZE: () => FONT_SIZE,
-  GENERATOR_NAME: () => GENERATOR_NAME,
-  GENERATOR_VERSION: () => GENERATOR_VERSION,
   GRID_SIZE: () => GRID_SIZE,
   GraphConverter: () => GraphConverter,
   KICAD_SCH_FRAME: () => KICAD_SCH_FRAME,
   KiCadProjectArchive: () => KiCadProjectArchive,
   Layout: () => Layout,
   NetListConverter: () => NetListConverter,
-  PAPER: () => PAPER,
-  PAPER_SIZE: () => PAPER_SIZE,
   SCHEMATIC_PRINTER: () => SCHEMATIC_PRINTER,
-  SCH_VERSION: () => SCH_VERSION,
   StringFormatter: () => StringFormatter,
   WIRE_PADDING: () => WIRE_PADDING,
   collect_sub_sheets: () => collect_sub_sheets,
@@ -172,24 +166,6 @@ async function collect_sub_sheets(dependencies, module_resolver) {
   return { sheets, module_main_sheet, modules };
 }
-// src/utils/constraints.ts
-var PAPER_SIZE = {
-  A0: { width: 841, height: 1189 },
-  A1: { width: 594, height: 841 },
-  A2: { width: 420, height: 594 },
-  A3: { width: 297, height: 420 },
-  A4: { width: 210, height: 297 },
-  A5: { width: 148, height: 210 },
-  A6: { width: 105, height: 148 },
-  A7: { width: 74, height: 105 },
-  A8: { width: 52, height: 74 }
-};
-var DEFAULT_PAPER_SIZE = PAPER_SIZE.A4;
-var GENERATOR_NAME = "modular_circuit";
-var SCH_VERSION = 20231120;
-var PAPER = "A4";
-var GENERATOR_VERSION = "8.0";
 // src/utils/filter_null_undefined.ts
 function filterNullOrUndefined(originalMethod, _context) {
   function replacementMethod(...args) {
@@ -353,11 +329,11 @@ var SCHEMATIC_PRINTER = class {
     })();
     return `
 (kicad_sch
-    (version ${SCH_VERSION})
-    (generator "${GENERATOR_NAME}")
-    (generator_version "${GENERATOR_VERSION}")
+    (version ${import_utils4.SCH_VERSION})
+    (generator "${import_utils4.GENERATOR_NAME}")
+    (generator_version "${import_utils4.GENERATOR_VERSION}")
     (uuid "${(0, import_utils4.gen_uuid)()}")
-    (paper "${PAPER}")
+    (paper "${import_utils4.PAPER}")
     ${lib_symbols}
     ${wires}
     ${labels}
@@ -1545,6 +1521,105 @@ var Dvp8LinkTester = class extends CompositePortLinkConverterBase {
     return true;
   }
 };
+var JtagLinkTester = class extends CompositePortLinkConverterBase {
+  get_signals() {
+    if (!this.link) return [];
+    return [
+      {
+        name: "TCK",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TCK
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TCK
+          }
+        ]
+      },
+      {
+        name: "TDI",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TDI
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TDI
+          }
+        ]
+      },
+      {
+        name: "TDO",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TDO
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TDO
+          }
+        ]
+      },
+      {
+        name: "TMS",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TMS
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TMS
+          }
+        ]
+      },
+      {
+        name: "TRST",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TRST
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TRST
+          }
+        ]
+      }
+    ];
+  }
+  init_link() {
+    const hosts = [];
+    const targets = [];
+    for (const v of this.ports) {
+      switch (v.type) {
+        case import_electronics_model2.PortType.JtagHostPort: {
+          hosts.push(v);
+          break;
+        }
+        case import_electronics_model2.PortType.JtagTargetPort: {
+          targets.push(v);
+          break;
+        }
+      }
+    }
+    if (hosts.length !== 1) {
+      return false;
+    }
+    if (targets.length !== 1) {
+      return false;
+    }
+    this.link = {
+      host: hosts[0],
+      target: targets[0]
+    };
+    return true;
+  }
+};
 // src/converter/link_to_netlist/converter.ts
 var LINK_CONVERTER = class {
@@ -1633,6 +1708,10 @@ var LINK_CONVERTER = class {
           this.do_convert(Dvp8LinkTester, v, cc);
           break;
         }
+        case import_electronics_model3.LinkType.JtagLink: {
+          this.do_convert(JtagLinkTester, v, cc);
+          break;
+        }
         default: {
           throw new Error(`Unhandled link type: ${k}`);
         }
@@ -1732,12 +1811,13 @@ var GraphConverter = class {
 };
 // src/converter/netlist_to_kicad/layout.ts
+var import_utils6 = require("@modular-circuit/utils");
 var import_elk_bundled = __toESM(require("elkjs/lib/elk.bundled.js"));
 var MIL_TO_MM = 0.0254;
 var GRID_SIZE = 50 * MIL_TO_MM;
 var FONT_SIZE = GRID_SIZE;
 var POWER_START_Y = 30 * GRID_SIZE;
-var POWER_START_X = (PAPER_SIZE.A4.height - 30) * GRID_SIZE;
+var POWER_START_X = (import_utils6.PAPER_SIZE.A4.height - 30) * GRID_SIZE;
 var POWER_Y_STEP = 16 * GRID_SIZE;
 var BLOCK_V_SPACE = 8 * GRID_SIZE;
 var BLOCK_H_SPACE = 14 * GRID_SIZE - BLOCK_V_SPACE;
@@ -1775,8 +1855,8 @@ var Layout = class {
         "org.eclipse.elk.aspectRatio": "1.414",
         "elk.spacing.nodeNode": `${BLOCK_V_SPACE}`,
         "elk.padding": `[top=${PADDING_TOP},left=${PADDING},bottom=${PADDING},right=${PADDING}]`,
-        "elk.childAreaWidth": `${PAPER_SIZE.A4.height}`,
-        "elk.childAreaHeight": `${PAPER_SIZE.A4.width}`
+        "elk.childAreaWidth": `${import_utils6.PAPER_SIZE.A4.height}`,
+        "elk.childAreaHeight": `${import_utils6.PAPER_SIZE.A4.width}`
       },
       children: [],
       edges: []
@@ -1835,10 +1915,10 @@ var Layout = class {
 // src/converter/netlist_to_kicad/netlist_converter.ts
 var import_electronics_model8 = require("@modular-circuit/electronics-model");
 var import_ir4 = require("@modular-circuit/ir");
-var import_utils14 = require("@modular-circuit/utils");
+var import_utils15 = require("@modular-circuit/utils");
 // src/kicad/label/net_label.ts
-var import_utils6 = require("@modular-circuit/utils");
+var import_utils7 = require("@modular-circuit/utils");
 var gen_net_label = (name, at, justify) => ({
   label_type: "label",
   text: name,
@@ -1846,23 +1926,23 @@ var gen_net_label = (name, at, justify) => ({
   fields_autoplaced: true,
   at: { position: at, rotation: 0 },
   effects: {
-    font: { size: import_utils6.DEFAULT_FONT_SIZE },
+    font: { size: import_utils7.DEFAULT_FONT_SIZE },
     justify
   },
-  uuid: (0, import_utils6.gen_uuid)()
+  uuid: (0, import_utils7.gen_uuid)()
 });
 // src/kicad/label/sheet_pin.ts
-var import_utils7 = require("@modular-circuit/utils");
+var import_utils8 = require("@modular-circuit/utils");
 var gen_base_hierarchical_label = (text, at, justify, rotation, shape) => ({
   shape,
   effects: {
-    font: { size: import_utils7.DEFAULT_FONT_SIZE },
+    font: { size: import_utils8.DEFAULT_FONT_SIZE },
     justify
   },
   text,
   at: { position: at, rotation },
-  uuid: (0, import_utils7.gen_uuid)()
+  uuid: (0, import_utils8.gen_uuid)()
 });
 var gen_sheet_pin = (text, at, justify, rotation, shape) => ({
   label_type: "hierarchical_label",
@@ -1871,7 +1951,7 @@ var gen_sheet_pin = (text, at, justify, rotation, shape) => ({
 var gen_hierarchical_label = gen_sheet_pin;
 // src/kicad/sheet/sheet.ts
-var import_utils8 = require("@modular-circuit/utils");
+var import_utils9 = require("@modular-circuit/utils");
 var TEXT_MARGIN = 0.7116;
 var gen_sch_sheet = (rect, pins, fields) => ({
   // NOTE no rotation in the sheet
@@ -1884,7 +1964,7 @@ var gen_sch_sheet = (rect, pins, fields) => ({
       text: fields.Sheetname,
       at: { position: { x: rect.pos.x, y: rect.pos.y - TEXT_MARGIN }, rotation: 0 },
       effects: {
-        font: { size: import_utils8.DEFAULT_FONT_SIZE },
+        font: { size: import_utils9.DEFAULT_FONT_SIZE },
         justify: {
           vertical: "bottom",
           horizontal: "left"
@@ -1896,7 +1976,7 @@ var gen_sch_sheet = (rect, pins, fields) => ({
       text: fields.Sheetfile,
       at: { position: { x: rect.pos.x, y: rect.pos.y + rect.size.y + TEXT_MARGIN }, rotation: 0 },
       effects: {
-        font: { size: import_utils8.DEFAULT_FONT_SIZE },
+        font: { size: import_utils9.DEFAULT_FONT_SIZE },
         justify: {
           vertical: "top",
           horizontal: "left"
@@ -1912,13 +1992,13 @@ var gen_sch_sheet = (rect, pins, fields) => ({
   fill: {
     color: { r: 0, g: 0, b: 0, a: 0 }
   },
-  uuid: (0, import_utils8.gen_uuid)()
+  uuid: (0, import_utils9.gen_uuid)()
 });
 // src/kicad/symbols/lib_symbol/gnd.ts
 var import_electronics_model5 = require("@modular-circuit/electronics-model");
 var import_ir2 = require("@modular-circuit/ir");
-var import_utils9 = require("@modular-circuit/utils");
+var import_utils10 = require("@modular-circuit/utils");
 var gen_lib_gnd = (value) => ({
   name: `power:${value}`,
   pin_numbers: {
@@ -1938,7 +2018,7 @@ var gen_lib_gnd = (value) => ({
       text: "#PWR",
       at: { position: { x: 0, y: -6.35 }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -1947,7 +2027,7 @@ var gen_lib_gnd = (value) => ({
       text: `${value}`,
       at: { position: { x: 0, y: -3.81 }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE }
+        font: { size: import_utils10.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -1955,7 +2035,7 @@ var gen_lib_gnd = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -1964,7 +2044,7 @@ var gen_lib_gnd = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -1973,7 +2053,7 @@ var gen_lib_gnd = (value) => ({
       text: 'Power symbol creates a global label with name \\"GND\\" , ground',
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -1982,7 +2062,7 @@ var gen_lib_gnd = (value) => ({
       text: "global power",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils9.DEFAULT_FONT_SIZE },
+        font: { size: import_utils10.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2023,13 +2103,13 @@ var gen_lib_gnd = (value) => ({
           name: {
             text: "~",
             effects: {
-              font: { size: import_utils9.DEFAULT_FONT_SIZE }
+              font: { size: import_utils10.DEFAULT_FONT_SIZE }
             }
           },
           number: {
             text: "1",
             effects: {
-              font: { size: import_utils9.DEFAULT_FONT_SIZE }
+              font: { size: import_utils10.DEFAULT_FONT_SIZE }
             }
           }
         }
@@ -2041,7 +2121,7 @@ var gen_lib_gnd = (value) => ({
 // src/kicad/symbols/lib_symbol/vcc.ts
 var import_electronics_model6 = require("@modular-circuit/electronics-model");
 var import_ir3 = require("@modular-circuit/ir");
-var import_utils10 = require("@modular-circuit/utils");
+var import_utils11 = require("@modular-circuit/utils");
 var gen_lib_vcc = (value) => ({
   name: `power:${value}`,
   power: true,
@@ -2062,7 +2142,7 @@ var gen_lib_vcc = (value) => ({
       text: "#PWR",
       at: { position: { x: 0, y: -3.81 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2071,7 +2151,7 @@ var gen_lib_vcc = (value) => ({
       text: `${value}`,
       at: { position: { x: 0, y: 3.556 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE }
+        font: { size: import_utils11.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -2079,7 +2159,7 @@ var gen_lib_vcc = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2088,7 +2168,7 @@ var gen_lib_vcc = (value) => ({
       text: "",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2097,7 +2177,7 @@ var gen_lib_vcc = (value) => ({
       text: `Power symbol creates a global label with name \\"${value}\\"`,
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2106,7 +2186,7 @@ var gen_lib_vcc = (value) => ({
       text: "global power",
       at: { position: { x: 0, y: 0 }, rotation: 0 },
       effects: {
-        font: { size: import_utils10.DEFAULT_FONT_SIZE },
+        font: { size: import_utils11.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2144,13 +2224,13 @@ var gen_lib_vcc = (value) => ({
           name: {
             text: "~",
             effects: {
-              font: { size: import_utils10.DEFAULT_FONT_SIZE }
+              font: { size: import_utils11.DEFAULT_FONT_SIZE }
             }
           },
           number: {
             text: "1",
             effects: {
-              font: { size: import_utils10.DEFAULT_FONT_SIZE }
+              font: { size: import_utils11.DEFAULT_FONT_SIZE }
             }
           }
         }
@@ -2160,7 +2240,7 @@ var gen_lib_vcc = (value) => ({
 });
 // src/kicad/symbols/sch_symbol/gnd.ts
-var import_utils11 = require("@modular-circuit/utils");
+var import_utils12 = require("@modular-circuit/utils");
 // src/kicad/symbols/symbol_utils.ts
 var gen_pwr_ref = (pwr_num) => `#PWR${pwr_num}`;
@@ -2175,14 +2255,14 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
   on_board: true,
   dnp: false,
   fields_autoplaced: true,
-  uuid: (0, import_utils11.gen_uuid)(),
+  uuid: (0, import_utils12.gen_uuid)(),
   properties: [
     {
       name: "Reference",
       text: gen_pwr_ref(pwr_number),
       at: { position: { x: position.x, y: position.y + 6.35 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2191,7 +2271,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: `${value}`,
       at: { position: { x: position.x, y: position.y + 5.08 }, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE }
+        font: { size: import_utils12.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -2199,7 +2279,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2208,7 +2288,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2217,7 +2297,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
       text: `Power symbol creates a global label with name \\"${value}\\" , ground`,
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils11.DEFAULT_FONT_SIZE },
+        font: { size: import_utils12.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2231,7 +2311,7 @@ var gen_sch_gnd = (value, pwr_number, port_id, position) => ({
 });
 // src/kicad/symbols/sch_symbol/vcc.ts
-var import_utils12 = require("@modular-circuit/utils");
+var import_utils13 = require("@modular-circuit/utils");
 var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
   lib_id: `power:${value}`,
   at: { position, rotation: 0 },
@@ -2241,14 +2321,14 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
   on_board: true,
   dnp: false,
   fields_autoplaced: true,
-  uuid: (0, import_utils12.gen_uuid)(),
+  uuid: (0, import_utils13.gen_uuid)(),
   properties: [
     {
       name: "Reference",
       text: gen_pwr_ref(pwr_number),
       at: { position: { x: position.x, y: position.y + 3.81 }, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils13.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2257,7 +2337,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: `${value}`,
       at: { position: { x: position.x, y: position.y - 5.08 }, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE }
+        font: { size: import_utils13.DEFAULT_FONT_SIZE }
       }
     },
     {
@@ -2265,7 +2345,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils13.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2274,7 +2354,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: "",
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils13.DEFAULT_FONT_SIZE },
         hide: true
       }
     },
@@ -2283,7 +2363,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
       text: `Power symbol creates a global label with name \\"${value}\\"`,
       at: { position, rotation: 0 },
       effects: {
-        font: { size: import_utils12.DEFAULT_FONT_SIZE },
+        font: { size: import_utils13.DEFAULT_FONT_SIZE },
         hide: true
       }
     }
@@ -2298,7 +2378,7 @@ var gen_sch_vcc = (value, pwr_number, port_id, position) => ({
 // src/kicad/wire/gen_wire.ts
 var import_electronics_model7 = require("@modular-circuit/electronics-model");
-var import_utils13 = require("@modular-circuit/utils");
+var import_utils14 = require("@modular-circuit/utils");
 var gen_wire = (start, end) => ({
   stroke: {
     type: "default",
@@ -2306,7 +2386,7 @@ var gen_wire = (start, end) => ({
   },
   start,
   end,
-  uuid: (0, import_utils13.gen_uuid)(),
+  uuid: (0, import_utils14.gen_uuid)(),
   type: import_electronics_model7.GS_SCH_ITEM_TYPE.LINE
 });
@@ -2354,15 +2434,15 @@ var NetListConverter = class {
     const powers = /* @__PURE__ */ new Set();
     this.wires = [];
     const sch = {
-      version: SCH_VERSION,
-      generator: GENERATOR_NAME,
-      generator_version: GENERATOR_VERSION,
+      version: import_utils15.SCH_VERSION,
+      generator: import_utils15.GENERATOR_NAME,
+      generator_version: import_utils15.GENERATOR_VERSION,
       paper: {
         size: "A4"
       },
       title_block: {
         title: name.replace(`.${import_ir4.MODULAR_CIRCUIT_SCH_EXT}`, ""),
-        date: (0, import_utils14.replaceAll)((/* @__PURE__ */ new Date()).toISOString().slice(0, 10), "-", "/"),
+        date: (0, import_utils15.replaceAll)((/* @__PURE__ */ new Date()).toISOString().slice(0, 10), "-", "/"),
         rev: "1.0",
         comment: {
           1: "https://www.eda.cn",
@@ -2525,7 +2605,7 @@ var NetListConverter = class {
 // src/builder/graph_to_kicad/convert_graph_to_sheets.ts
 var import_ir5 = require("@modular-circuit/ir");
 var import_perc = require("@modular-circuit/perc");
-var import_utils15 = require("@modular-circuit/utils");
+var import_utils16 = require("@modular-circuit/utils");
 async function do_convert_graph_to_kicad_project(ctx) {
   const module_ids = [];
   for (const sch of Object.values(ctx.schematics)) {
@@ -2561,7 +2641,7 @@ async function do_convert_graph_to_kicad_project(ctx) {
     if (k in sheets) {
       console.error(`Duplicated sheet file name found ${k}`);
     }
-    sheets[k.replace(import_ir5.MODULAR_CIRCUIT_SCH_EXT, import_utils15.KiCadSchematicFileExtension)] = sexpr_printer.schematic(v);
+    sheets[k.replace(import_ir5.MODULAR_CIRCUIT_SCH_EXT, import_utils16.KiCadSchematicFileExtension)] = sexpr_printer.schematic(v);
   }
   return sheets;
 }
@@ -2576,7 +2656,7 @@ async function convert_graph_to_sheets(ctx) {
 }
 // src/kicad/project/kicad_project_archive.ts
-var import_utils18 = require("@modular-circuit/utils");
+var import_utils19 = require("@modular-circuit/utils");
 var import_jszip = __toESM(require("jszip"));
 // src/kicad/project/kicad_prl.ts
@@ -2665,7 +2745,7 @@ var kicad_prl = (prj_name) => ({
 });
 // src/kicad/project/kicad_pro.ts
-var import_utils17 = require("@modular-circuit/utils");
+var import_utils18 = require("@modular-circuit/utils");
 var kicad_pro = (project_name) => ({
   board: {
     "3dviewports": [],
@@ -2875,7 +2955,7 @@ var kicad_pro = (project_name) => ({
       version: 1
     },
     net_format_name: "",
-    page_layout_descr_file: `${project_name}.${import_utils17.DrawingSheetFileExtension}`,
+    page_layout_descr_file: `${project_name}.${import_utils18.DrawingSheetFileExtension}`,
     plot_directory: "",
     spice_current_sheet_as_root: false,
     spice_external_command: 'spice "%I"',
@@ -2913,16 +2993,16 @@ var KiCadProjectArchive = class {
     return kicad_pro(this.project_name);
   }
   get main_sch_name() {
-    return this.get_project_directive_file_name(import_utils18.KiCadSchematicFileExtension);
+    return this.get_project_directive_file_name(import_utils19.KiCadSchematicFileExtension);
   }
   get_project_directive_file_name(ext) {
     return `${this.project_name}.${ext}`;
   }
   async toZip() {
     const zip = new import_jszip.default();
-    zip.file(this.get_project_directive_file_name(import_utils18.ProjectLocalSettingsFileExtension), JSON.stringify(this.kicad_prl));
-    zip.file(this.get_project_directive_file_name(import_utils18.ProjectFileExtension), JSON.stringify(this.kicad_pro));
-    zip.file(this.get_project_directive_file_name(import_utils18.DrawingSheetFileExtension), this.sch_frame);
+    zip.file(this.get_project_directive_file_name(import_utils19.ProjectLocalSettingsFileExtension), JSON.stringify(this.kicad_prl));
+    zip.file(this.get_project_directive_file_name(import_utils19.ProjectFileExtension), JSON.stringify(this.kicad_pro));
+    zip.file(this.get_project_directive_file_name(import_utils19.DrawingSheetFileExtension), this.sch_frame);
     for (const schematic of this.designBlock.schematics) {
       zip.file(schematic.filename, schematic.content);
     }
@@ -2970,9 +3050,9 @@ var KiCadProjectArchive = class {
 };
 // src/builder/graph_to_kicad/convert_graph_to_design_block.ts
-var import_utils19 = require("@modular-circuit/utils");
+var import_utils20 = require("@modular-circuit/utils");
 async function convert_graph_to_design_block(ctx) {
-  const root = ctx.project.main.replace(import_utils19.ModularCircuitFileExtension, import_utils19.KiCadSchematicFileExtension);
+  const root = ctx.project.main.replace(import_utils20.ModularCircuitFileExtension, import_utils20.KiCadSchematicFileExtension);
   const sheets = await convert_graph_to_sheets(ctx);
   if (!(root in sheets)) {
     throw new Error(`Cannot find root sch file ${root}`);
@@ -3001,20 +3081,14 @@ async function convert_graph_to_kicad_project(ctx) {
 0 && (module.exports = {
   BLOCK_PIN_GAP,
   BLOCK_PIN_TB_MARGIN,
-  DEFAULT_PAPER_SIZE,
   FONT_SIZE,
-  GENERATOR_NAME,
-  GENERATOR_VERSION,
   GRID_SIZE,
   GraphConverter,
   KICAD_SCH_FRAME,
   KiCadProjectArchive,
   Layout,
   NetListConverter,
-  PAPER,
-  PAPER_SIZE,
   SCHEMATIC_PRINTER,
-  SCH_VERSION,
   StringFormatter,
   WIRE_PADDING,
   collect_sub_sheets,

package/dist/index.mjs CHANGED Viewed

@@ -62,7 +62,7 @@ import { READABLE_ELECTRICAL_PINTYPE } from "@modular-circuit/electronics-model"
 import {
   SHAPE_T
 } from "@modular-circuit/ir";
-import { gen_uuid as gen_uuid2 } from "@modular-circuit/utils";
+import { GENERATOR_NAME, GENERATOR_VERSION, PAPER, SCH_VERSION, gen_uuid as gen_uuid2 } from "@modular-circuit/utils";
 // src/utils/collect_sub_sheets.ts
 import {
@@ -114,24 +114,6 @@ async function collect_sub_sheets(dependencies, module_resolver) {
   return { sheets, module_main_sheet, modules };
 }
-// src/utils/constraints.ts
-var PAPER_SIZE = {
-  A0: { width: 841, height: 1189 },
-  A1: { width: 594, height: 841 },
-  A2: { width: 420, height: 594 },
-  A3: { width: 297, height: 420 },
-  A4: { width: 210, height: 297 },
-  A5: { width: 148, height: 210 },
-  A6: { width: 105, height: 148 },
-  A7: { width: 74, height: 105 },
-  A8: { width: 52, height: 74 }
-};
-var DEFAULT_PAPER_SIZE = PAPER_SIZE.A4;
-var GENERATOR_NAME = "modular_circuit";
-var SCH_VERSION = 20231120;
-var PAPER = "A4";
-var GENERATOR_VERSION = "8.0";
 // src/utils/filter_null_undefined.ts
 function filterNullOrUndefined(originalMethod, _context) {
   function replacementMethod(...args) {
@@ -1505,6 +1487,105 @@ var Dvp8LinkTester = class extends CompositePortLinkConverterBase {
     return true;
   }
 };
+var JtagLinkTester = class extends CompositePortLinkConverterBase {
+  get_signals() {
+    if (!this.link) return [];
+    return [
+      {
+        name: "TCK",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TCK
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TCK
+          }
+        ]
+      },
+      {
+        name: "TDI",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TDI
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TDI
+          }
+        ]
+      },
+      {
+        name: "TDO",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TDO
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TDO
+          }
+        ]
+      },
+      {
+        name: "TMS",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TMS
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TMS
+          }
+        ]
+      },
+      {
+        name: "TRST",
+        ports: [
+          {
+            parent: this.link.host,
+            meta_port: this.link.host.TRST
+          },
+          {
+            parent: this.link.target,
+            meta_port: this.link.target.TRST
+          }
+        ]
+      }
+    ];
+  }
+  init_link() {
+    const hosts = [];
+    const targets = [];
+    for (const v of this.ports) {
+      switch (v.type) {
+        case PortType.JtagHostPort: {
+          hosts.push(v);
+          break;
+        }
+        case PortType.JtagTargetPort: {
+          targets.push(v);
+          break;
+        }
+      }
+    }
+    if (hosts.length !== 1) {
+      return false;
+    }
+    if (targets.length !== 1) {
+      return false;
+    }
+    this.link = {
+      host: hosts[0],
+      target: targets[0]
+    };
+    return true;
+  }
+};
 // src/converter/link_to_netlist/converter.ts
 var LINK_CONVERTER = class {
@@ -1593,6 +1674,10 @@ var LINK_CONVERTER = class {
           this.do_convert(Dvp8LinkTester, v, cc);
           break;
         }
+        case LinkType.JtagLink: {
+          this.do_convert(JtagLinkTester, v, cc);
+          break;
+        }
         default: {
           throw new Error(`Unhandled link type: ${k}`);
         }
@@ -1692,6 +1777,7 @@ var GraphConverter = class {
 };
 // src/converter/netlist_to_kicad/layout.ts
+import { PAPER_SIZE } from "@modular-circuit/utils";
 import ELK from "elkjs/lib/elk.bundled.js";
 var MIL_TO_MM = 0.0254;
 var GRID_SIZE = 50 * MIL_TO_MM;
@@ -1797,7 +1883,7 @@ import { PowerShape } from "@modular-circuit/electronics-model";
 import {
   MODULAR_CIRCUIT_SCH_EXT
 } from "@modular-circuit/ir";
-import { replaceAll } from "@modular-circuit/utils";
+import { GENERATOR_NAME as GENERATOR_NAME2, GENERATOR_VERSION as GENERATOR_VERSION2, SCH_VERSION as SCH_VERSION2, replaceAll } from "@modular-circuit/utils";
 // src/kicad/label/net_label.ts
 import { DEFAULT_FONT_SIZE, gen_uuid as gen_uuid3 } from "@modular-circuit/utils";
@@ -2316,9 +2402,9 @@ var NetListConverter = class {
     const powers = /* @__PURE__ */ new Set();
     this.wires = [];
     const sch = {
-      version: SCH_VERSION,
-      generator: GENERATOR_NAME,
-      generator_version: GENERATOR_VERSION,
+      version: SCH_VERSION2,
+      generator: GENERATOR_NAME2,
+      generator_version: GENERATOR_VERSION2,
       paper: {
         size: "A4"
       },
@@ -2971,20 +3057,14 @@ async function convert_graph_to_kicad_project(ctx) {
 export {
   BLOCK_PIN_GAP,
   BLOCK_PIN_TB_MARGIN,
-  DEFAULT_PAPER_SIZE,
   FONT_SIZE,
-  GENERATOR_NAME,
-  GENERATOR_VERSION,
   GRID_SIZE,
   GraphConverter,
   KICAD_SCH_FRAME,
   KiCadProjectArchive,
   Layout,
   NetListConverter,
-  PAPER,
-  PAPER_SIZE,
   SCHEMATIC_PRINTER,
-  SCH_VERSION,
   StringFormatter,
   WIRE_PADDING,
   collect_sub_sheets,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@modular-circuit/transpiler",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Intermediate representation of the modular circuit",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -29,10 +29,10 @@
     "elkjs": "^0.11.0",
     "js-base64": "^3.7.7",
     "jszip": "^3.10.1",
-    "@modular-circuit/electronics-model": "0.2.10",
-    "@modular-circuit/ir": "0.2.8",
-    "@modular-circuit/utils": "0.2.8",
-    "@modular-circuit/perc": "0.2.15"
+    "@modular-circuit/ir": "0.2.10",
+    "@modular-circuit/electronics-model": "0.2.12",
+    "@modular-circuit/perc": "0.2.18",
+    "@modular-circuit/utils": "0.2.10"
   },
   "scripts": {
     "clean": "rimraf dist",
@@ -40,6 +40,6 @@
     "build": "tsup src/index.ts --format cjs,esm --dts --clean --tsconfig tsconfig.build.json",
     "lint:ci": "biome ci",
     "lint": "biome check --fix --unsafe",
-    "test:unit": "vitest --workspace ../../vitest.workspace.ts --project unit run"
+    "type-check": "tsc --noEmit"
   }
 }