@tscircuit/cli 0.1.1813 → 0.1.1814

package/dist/cli/main.js

@@ -118529,7 +118529,7 @@ var package_default = {
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.592",
+    "@tscircuit/props": "^0.0.612",
     "@tscircuit/runframe": "^0.0.2349",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@tscircuit/solver-utils": "0.0.16",
@@ -118543,14 +118543,14 @@ var package_default = {
     "@types/semver": "^7.5.8",
     "bun-match-svg": "^0.0.12",
     chokidar: "4.0.1",
-    "circuit-json": "^0.0.455",
+    "circuit-json": "^0.0.464",
     "circuit-json-to-3d-png": "^0.0.6",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-footprinter": "^0.0.15",
     "circuit-json-to-gerber": "^0.0.83",
     "circuit-json-to-kicad": "0.0.157",
-    "circuit-json-to-pnp-csv": "^0.0.7",
+    "circuit-json-to-pnp-csv": "^0.0.9",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
     "circuit-json-to-step": "^0.0.38",
@@ -118595,7 +118595,7 @@ var package_default = {
     zod: "^3.23.8"
   },
   peerDependencies: {
-    "circuit-json": "^0.0.446",
+    "circuit-json": "^0.0.464",
     tscircuit: "*"
   },
   bin: {
@@ -292605,15 +292605,141 @@ var registerDoctor = (program2) => {
 import fs61 from "node:fs";
 import path69 from "node:path";
 import { promisify as promisify3 } from "node:util";
+
+// node_modules/circuit-json-to-bom-csv/dist/index.js
+var import_format_si_prefix = __toESM2(require_dist10(), 1);
+var import_papaparse = __toESM2(require_papaparse(), 1);
+var convertCircuitJsonToBomRows = async ({
+  circuitJson,
+  resolvePart
+}) => {
+  const bom = [];
+  for (const elm of circuitJson) {
+    if (elm.type !== "pcb_component")
+      continue;
+    const source_component = circuitJson.find((e4) => e4.type === "source_component" && e4.source_component_id === elm.source_component_id);
+    if (!source_component)
+      continue;
+    const part_info = await resolvePart?.({ pcb_component: elm, source_component }) ?? {};
+    let comment2 = "";
+    if (source_component.ftype === "simple_resistor")
+      comment2 = si3(source_component.resistance);
+    if (source_component.ftype === "simple_capacitor")
+      comment2 = si3(source_component.capacitance);
+    bom.push({
+      designator: source_component.name ?? elm.pcb_component_id,
+      comment: comment2,
+      value: comment2,
+      footprint: part_info.footprint || "",
+      supplier_part_number_columns: part_info.supplier_part_number_columns ?? source_component.supplier_part_numbers ? convertSupplierPartNumbersIntoColumns(source_component.supplier_part_numbers) : undefined
+    });
+  }
+  return bom;
+};
+function convertSupplierPartNumbersIntoColumns(supplier_part_numbers) {
+  const supplier_part_number_columns = {};
+  if (supplier_part_numbers?.jlcpcb) {
+    supplier_part_number_columns["JLCPCB Part #"] = supplier_part_numbers.jlcpcb[0];
+  }
+  if (supplier_part_numbers?.lcsc) {
+    supplier_part_number_columns["JLCPCB Part #"] = supplier_part_numbers.lcsc[0];
+  }
+  return supplier_part_number_columns;
+}
+function si3(v4) {
+  if (v4 === null || v4 === undefined)
+    return "";
+  if (typeof v4 === "string")
+    return v4;
+  return import_format_si_prefix.formatSI(v4);
+}
+var convertBomRowsToCsv = (bom_rows) => {
+  const csv_data = bom_rows.map((row) => {
+    const supplier_part_number_columns = row.supplier_part_number_columns;
+    const supplier_part_numbers = Object.values(supplier_part_number_columns || {}).join(", ");
+    const extraColumns = Object.entries(row.extra_columns || {}).map(([key, value]) => `${key}: ${value}`).join(", ");
+    return {
+      Designator: row.designator,
+      Comment: row.comment,
+      Value: row.value,
+      Footprint: row.footprint,
+      ...supplier_part_number_columns
+    };
+  });
+  const columnHeaders = [
+    "Designator",
+    "Comment",
+    "Value",
+    "Footprint"
+  ];
+  for (const row of csv_data) {
+    for (const key in row) {
+      if (!columnHeaders.includes(key)) {
+        columnHeaders.push(key);
+      }
+    }
+  }
+  return import_papaparse.default.unparse(csv_data, { columns: columnHeaders });
+};
+
+// lib/shared/export-snippet.ts
+init_dist();
 import { convertCircuitJsonToGltf as convertCircuitJsonToGltf4 } from "circuit-json-to-gltf";
+
+// node_modules/circuit-json-to-pnp-csv/dist/index.js
+var import_papaparse2 = __toESM2(require_papaparse(), 1);
+import { su as su14 } from "@tscircuit/soup-util";
+import {
+  getRotationBetweenPcbPin1Locations
+} from "circuit-json";
+var fixedDecimals = 3;
+var normalizeRotation = (rotation11) => (rotation11 % 360 + 360) % 360;
+var getPickAndPlaceRotation = (pcbComponent, supplier) => {
+  if (!supplier || !pcbComponent.pin1_location)
+    return pcbComponent.rotation;
+  const supplierPin1Location = pcbComponent.supplier_pin1_location_map?.[supplier];
+  if (!supplierPin1Location)
+    return pcbComponent.rotation;
+  const rotationAdjustment = getRotationBetweenPcbPin1Locations(supplierPin1Location, pcbComponent.pin1_location);
+  if (rotationAdjustment === null)
+    return pcbComponent.rotation;
+  return normalizeRotation(pcbComponent.rotation + rotationAdjustment);
+};
+var convertCircuitJsonToPickAndPlaceRows = (circuitJson, opts = {}) => {
+  const rows = [];
+  for (const element of circuitJson) {
+    if (element.type === "pcb_component") {
+      const source_component = su14(circuitJson).source_component.get(element.source_component_id);
+      if (!source_component)
+        continue;
+      rows.push({
+        designator: source_component?.name ?? element.pcb_component_id,
+        mid_x: element.center.x,
+        mid_y: element.center.y * (opts.flip_y_axis ? -1 : 1),
+        layer: element.layer,
+        rotation: getPickAndPlaceRotation(element, opts.supplier)
+      });
+    }
+  }
+  return rows;
+};
+var convertCircuitJsonToPickAndPlaceCsv = (circuitJson, opts = {}) => import_papaparse2.default.unparse(convertCircuitJsonToPickAndPlaceRows(circuitJson, opts).map((row) => ({
+  Designator: row.designator,
+  "Mid X": row.mid_x.toFixed(fixedDecimals),
+  "Mid Y": row.mid_y.toFixed(fixedDecimals),
+  Layer: row.layer,
+  Rotation: row.rotation
+})));
+
+// lib/shared/export-snippet.ts
 import {
+  convertCircuitJsonToAssemblySvg as convertCircuitJsonToAssemblySvg2,
   convertCircuitJsonToPcbSvg as convertCircuitJsonToPcbSvg6,
-  convertCircuitJsonToSchematicSvg as convertCircuitJsonToSchematicSvg4,
-  convertCircuitJsonToAssemblySvg as convertCircuitJsonToAssemblySvg2
+  convertCircuitJsonToSchematicSvg as convertCircuitJsonToSchematicSvg4
 } from "circuit-to-svg";
 
 // node_modules/dsn-converter/dist/index.js
-import { su as su14 } from "@tscircuit/soup-util";
+import { su as su16 } from "@tscircuit/soup-util";
 import { getBoundsFromPoints as getBoundsFromPoints6 } from "@tscircuit/math-utils";
 import { applyToPoint as applyToPoint31, scale as scale8 } from "transformation-matrix";
 import { su as su24 } from "@tscircuit/soup-util";
@@ -293022,8 +293148,8 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
     const { pcb_component_id, pcb_smtpads } = group;
     if (pcb_smtpads.length === 0)
       continue;
-    const pcbComponent = su14(circuitElements).pcb_component.list().find((e4) => e4.pcb_component_id === pcb_component_id);
-    const sourceComponent = su14(circuitElements).source_component.list().find((e4) => e4.source_component_id === pcbComponent?.source_component_id);
+    const pcbComponent = su16(circuitElements).pcb_component.list().find((e4) => e4.pcb_component_id === pcb_component_id);
+    const sourceComponent = su16(circuitElements).source_component.list().find((e4) => e4.source_component_id === pcbComponent?.source_component_id);
     const footprintName = getFootprintName(sourceComponent, pcbComponent);
     const componentName = sourceComponent?.name || "Unknown";
     const circuitSpaceCoordinates = applyToPoint31(transformMmToUm, pcbComponent.center);
@@ -293058,8 +293184,8 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
       outlines: [],
       pins: componentGroup.pcb_smtpads.map((pad2) => {
         const pcbComponent = circuitElements.find((e4) => e4.type === "pcb_component" && e4.source_component_id === firstComponent.sourceComponent?.source_component_id);
-        const pcbPort = su14(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === pad2.pcb_port_id);
-        const sourcePort = su14(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort?.source_port_id);
+        const pcbPort = su16(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === pad2.pcb_port_id);
+        const sourcePort = su16(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort?.source_port_id);
         return createPinForImage({
           pad: pad2,
           pcbComponent,
@@ -293920,115 +294046,6 @@ var debug102 = Debug10("dsn-converter:parse-dsn-to-dsn-json");
 
 // lib/shared/export-snippet.ts
 var import_jszip5 = __toESM2(require_lib4(), 1);
-init_dist();
-
-// node_modules/circuit-json-to-bom-csv/dist/index.js
-var import_format_si_prefix = __toESM2(require_dist10(), 1);
-var import_papaparse = __toESM2(require_papaparse(), 1);
-var convertCircuitJsonToBomRows = async ({
-  circuitJson,
-  resolvePart
-}) => {
-  const bom = [];
-  for (const elm of circuitJson) {
-    if (elm.type !== "pcb_component")
-      continue;
-    const source_component = circuitJson.find((e4) => e4.type === "source_component" && e4.source_component_id === elm.source_component_id);
-    if (!source_component)
-      continue;
-    const part_info = await resolvePart?.({ pcb_component: elm, source_component }) ?? {};
-    let comment2 = "";
-    if (source_component.ftype === "simple_resistor")
-      comment2 = si3(source_component.resistance);
-    if (source_component.ftype === "simple_capacitor")
-      comment2 = si3(source_component.capacitance);
-    bom.push({
-      designator: source_component.name ?? elm.pcb_component_id,
-      comment: comment2,
-      value: comment2,
-      footprint: part_info.footprint || "",
-      supplier_part_number_columns: part_info.supplier_part_number_columns ?? source_component.supplier_part_numbers ? convertSupplierPartNumbersIntoColumns(source_component.supplier_part_numbers) : undefined
-    });
-  }
-  return bom;
-};
-function convertSupplierPartNumbersIntoColumns(supplier_part_numbers) {
-  const supplier_part_number_columns = {};
-  if (supplier_part_numbers?.jlcpcb) {
-    supplier_part_number_columns["JLCPCB Part #"] = supplier_part_numbers.jlcpcb[0];
-  }
-  if (supplier_part_numbers?.lcsc) {
-    supplier_part_number_columns["JLCPCB Part #"] = supplier_part_numbers.lcsc[0];
-  }
-  return supplier_part_number_columns;
-}
-function si3(v4) {
-  if (v4 === null || v4 === undefined)
-    return "";
-  if (typeof v4 === "string")
-    return v4;
-  return import_format_si_prefix.formatSI(v4);
-}
-var convertBomRowsToCsv = (bom_rows) => {
-  const csv_data = bom_rows.map((row) => {
-    const supplier_part_number_columns = row.supplier_part_number_columns;
-    const supplier_part_numbers = Object.values(supplier_part_number_columns || {}).join(", ");
-    const extraColumns = Object.entries(row.extra_columns || {}).map(([key, value]) => `${key}: ${value}`).join(", ");
-    return {
-      Designator: row.designator,
-      Comment: row.comment,
-      Value: row.value,
-      Footprint: row.footprint,
-      ...supplier_part_number_columns
-    };
-  });
-  const columnHeaders = [
-    "Designator",
-    "Comment",
-    "Value",
-    "Footprint"
-  ];
-  for (const row of csv_data) {
-    for (const key in row) {
-      if (!columnHeaders.includes(key)) {
-        columnHeaders.push(key);
-      }
-    }
-  }
-  return import_papaparse.default.unparse(csv_data, { columns: columnHeaders });
-};
-
-// node_modules/circuit-json-to-pnp-csv/dist/index.js
-var import_papaparse2 = __toESM2(require_papaparse(), 1);
-import"circuit-json";
-import { su as su16 } from "@tscircuit/soup-util";
-var fixedDecimals = 3;
-var convertCircuitJsonToPickAndPlaceRows = (circuitJson, opts = {}) => {
-  opts.flip_y_axis ??= false;
-  const rows = [];
-  for (const element of circuitJson) {
-    if (element.type === "pcb_component") {
-      const source_component = su16(circuitJson).source_component.get(element.source_component_id);
-      rows.push({
-        designator: source_component?.name ?? element.pcb_component_id,
-        mid_x: element.center.x,
-        mid_y: element.center.y * (opts.flip_y_axis ? -1 : 1),
-        layer: element.layer,
-        rotation: element.rotation
-      });
-    }
-  }
-  return rows;
-};
-var convertCircuitJsonToPickAndPlaceCsv = (circuitJson) => import_papaparse2.default.unparse(convertCircuitJsonToPickAndPlaceRows(circuitJson).map((row) => ({
-  Designator: row.designator,
-  "Mid X": row.mid_x.toFixed(fixedDecimals),
-  "Mid Y": row.mid_y.toFixed(fixedDecimals),
-  Layer: row.layer,
-  Rotation: row.rotation
-})));
-
-// lib/shared/export-snippet.ts
 var writeFileAsync = promisify3(fs61.writeFile);
 var ALLOWED_EXPORT_FORMATS = [
   "json",
@@ -294128,10 +294145,15 @@ var exportSnippet = async ({
       return onExit(1);
     }
   } else {
-    const circuitData = await getOrGenerateCircuitJson({
+    const isJlcpcbFabricationExport = format === "gerbers";
+    const fabricationPlatformConfig = isJlcpcbFabricationExport ? getPlatformConfigWithCliDefaults(mergePlatformConfigs(platformConfig2, {
+      enablePartOrientationAnalysis: true
+    })) : platformConfig2;
+    const generateCircuitData = isJlcpcbFabricationExport ? generateCircuitJson : getOrGenerateCircuitJson;
+    const circuitData = await generateCircuitData({
       filePath,
       saveToFile: format === "circuit-json",
-      platformConfig: platformConfig2
+      platformConfig: fabricationPlatformConfig
     }).catch((err2) => {
       onError(`Error generating circuit JSON: ${err2}`);
       return null;
@@ -294242,7 +294264,9 @@ var exportSnippet = async ({
       const bomRows = await convertCircuitJsonToBomRows({ circuitJson });
       const bomCsv = await convertBomRowsToCsv(bomRows);
       zip.file("bom.csv", bomCsv);
-      const pnpCsv = await convertCircuitJsonToPickAndPlaceCsv(circuitJson);
+      const pnpCsv = await convertCircuitJsonToPickAndPlaceCsv(circuitJson, {
+        supplier: "jlcpcb"
+      });
       zip.file("pick_and_place.csv", pnpCsv);
       outputContent = await zip.generateAsync({ type: "nodebuffer" });
       break;

package/dist/lib/index.js

@@ -65780,7 +65780,7 @@ var package_default = {
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.592",
+    "@tscircuit/props": "^0.0.612",
     "@tscircuit/runframe": "^0.0.2349",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@tscircuit/solver-utils": "0.0.16",
@@ -65794,14 +65794,14 @@ var package_default = {
     "@types/semver": "^7.5.8",
     "bun-match-svg": "^0.0.12",
     chokidar: "4.0.1",
-    "circuit-json": "^0.0.455",
+    "circuit-json": "^0.0.464",
     "circuit-json-to-3d-png": "^0.0.6",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-footprinter": "^0.0.15",
     "circuit-json-to-gerber": "^0.0.83",
     "circuit-json-to-kicad": "0.0.157",
-    "circuit-json-to-pnp-csv": "^0.0.7",
+    "circuit-json-to-pnp-csv": "^0.0.9",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
     "circuit-json-to-step": "^0.0.38",
@@ -65846,7 +65846,7 @@ var package_default = {
     zod: "^3.23.8"
   },
   peerDependencies: {
-    "circuit-json": "^0.0.446",
+    "circuit-json": "^0.0.464",
     tscircuit: "*"
   },
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1813",
+  "version": "0.1.1814",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -20,7 +20,7 @@
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
-    "@tscircuit/props": "^0.0.592",
+    "@tscircuit/props": "^0.0.612",
     "@tscircuit/runframe": "^0.0.2349",
     "@tscircuit/schematic-match-adapt": "^0.0.22",
     "@tscircuit/solver-utils": "0.0.16",
@@ -34,14 +34,14 @@
     "@types/semver": "^7.5.8",
     "bun-match-svg": "^0.0.12",
     "chokidar": "4.0.1",
-    "circuit-json": "^0.0.455",
+    "circuit-json": "^0.0.464",
     "circuit-json-to-3d-png": "^0.0.6",
     "circuit-json-to-bom-csv": "^0.0.7",
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-footprinter": "^0.0.15",
     "circuit-json-to-gerber": "^0.0.83",
     "circuit-json-to-kicad": "0.0.157",
-    "circuit-json-to-pnp-csv": "^0.0.7",
+    "circuit-json-to-pnp-csv": "^0.0.9",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
     "circuit-json-to-step": "^0.0.38",
@@ -86,7 +86,7 @@
     "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "circuit-json": "^0.0.446",
+    "circuit-json": "^0.0.464",
     "tscircuit": "*"
   },
   "bin": {