@tscircuit/cli 0.1.1202 → 0.1.1204

package/dist/cli/main.js

@@ -99964,7 +99964,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1201";
+var version = "0.1.1203";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -100010,7 +100010,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "0.0.86",
-    easyeda: "^0.0.253",
+    easyeda: "^0.0.258",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -259346,6 +259346,11 @@ var unitToMm3 = {
   ft: 304.8,
   feet: 304.8
 };
+var mmNumberFormatter = new Intl.NumberFormat("en-US", {
+  useGrouping: false,
+  notation: "standard",
+  maximumFractionDigits: 12
+});
 var mm4 = (n3) => {
   let unit = typeof n3 === "number" ? "mm" : n3.replace(/^[^a-zA-Z]+/g, "").toLowerCase();
   if (!unit)
@@ -259357,9 +259362,15 @@ var mm4 = (n3) => {
   throw new Error(`Unsupported unit: ${unit}`);
 };
 var mmStr2 = (n3) => {
-  return `${mm4(n3)}mm`;
+  return `${mmNumberFormatter.format(mm4(n3))}mm`;
+};
+var mil2mm = (mil) => {
+  if (typeof mil === "number")
+    return mm4(`${mil}mil`);
+  if (mil.match(/^\d+$/))
+    return mm4(`${mil}mil`);
+  return mm4(mil);
 };
-var DEFAULT_PCB_THICKNESS_MM = 1.6;
 function generateArcFromSweep(startX, startY, endX, endY, radius, largeArcFlag, sweepFlag) {
   const start = { x: startX, y: startY };
   const end = { x: endX, y: endY };
@@ -259479,16 +259490,10 @@ var normalizeSymbolName = (name) => {
     return "_NEG";
   return trimmedName;
 };
+var DEFAULT_PCB_THICKNESS_MM = 1.6;
 var EASYEDA_STEP_MODEL_URL = "https://modules.easyeda.com/qAxj6KHrDKw4blvCG8QJPs7Y";
 var EASYEDA_OBJ_MODEL_URL = "https://modules.easyeda.com/3dmodel";
 var TSCIRCUIT_MODEL_CDN_URL = "https://modelcdn.tscircuit.com/easyeda_models";
-var mil2mm = (mil) => {
-  if (typeof mil === "number")
-    return mm4(`${mil}mil`);
-  if (mil.match(/^\d+$/))
-    return mm4(`${mil}mil`);
-  return mm4(mil);
-};
 var milx10 = (mil10) => {
   if (typeof mil10 === "number")
     return mil2mm(mil10) * 10;
@@ -259616,7 +259621,8 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   shouldRecenter = true,
   cadPositionXMm,
   cadPositionYMm,
-  cadPositionZMm
+  cadPositionZMm,
+  showDesignator = false
 } = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata(easyEdaJson);
   const circuitElements = [];
@@ -259789,6 +259795,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   easyEdaJson.packageDetail.dataStr.shape.filter((shape) => shape.type === "SOLIDREGION" && shape.fillStyle === "cutout").forEach((sr3, index) => {
     circuitElements.push(handleCutout(sr3, index));
   });
+  let hasFoundDesignator = false;
   easyEdaJson.packageDetail.dataStr.shape.forEach((shape, index) => {
     if (shape.type === "TRACK") {
       if (!isCourtyardLayer(shape.layer)) {
@@ -259801,11 +259808,22 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
     } else if (shape.type === "TEXT") {
       if (isCourtyardLayer(shape.layer))
         return;
+      let text = shape.text;
+      const designatorPrefix = easyEdaJson.dataStr.head.c_para.pre || "U";
+      const normalizedPrefix = designatorPrefix.replace(/\?/g, "");
+      const trimmedText = text.trim();
+      const isDesignator = trimmedText === designatorPrefix || trimmedText === `${normalizedPrefix}?` || trimmedText === normalizedPrefix;
+      if (isDesignator) {
+        if (!showDesignator)
+          return;
+        text = "{NAME}";
+        hasFoundDesignator = true;
+      }
       circuitElements.push(pcb_silkscreen_text2.parse({
         type: "pcb_silkscreen_text",
         pcb_silkscreen_text_id: `pcb_silkscreen_text_${index + 1}`,
         pcb_component_id: "pcb_component_1",
-        text: normalizeSymbolName(shape.text),
+        text,
         anchor_position: {
           x: mil2mm(shape.x),
           y: mil2mm(shape.y)
@@ -259815,11 +259833,27 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
           C: "center",
           R: "bottom_right"
         }[shape.textAnchor ?? "L"],
-        font_size: shape.size_mm ? shape.size_mm : undefined,
+        font_size: shape.size_mm || 1,
         layer: "top"
       }));
     }
   });
+  if (!hasFoundDesignator && showDesignator) {
+    const bbox = easyEdaJson.packageDetail.dataStr.BBox;
+    circuitElements.push(pcb_silkscreen_text2.parse({
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: `pcb_silkscreen_text_designator_fallback`,
+      pcb_component_id: "pcb_component_1",
+      text: "{NAME}",
+      anchor_position: {
+        x: milx10(bbox.x + bbox.width / 2),
+        y: milx10(bbox.y) - 1
+      },
+      anchor_alignment: "center",
+      font_size: 1,
+      layer: "top"
+    }));
+  }
   const pcbElements = circuitElements.filter((e4) => e4.type === "pcb_smtpad" || e4.type === "pcb_plated_hole" || e4.type === "pcb_hole" || e4.type === "pcb_via" || e4.type === "pcb_courtyard_outline" || e4.type === "pcb_silkscreen_path" || e4.type === "pcb_silkscreen_text");
   if (pcbElements.length > 0) {
     const bounds = findBoundsAndCenter2(pcbElements);
@@ -260741,7 +260775,10 @@ var getRotatedOffsetMm = ({
 };
 var getCadModelOffsetMm = (easyEdaJson) => {
   const svgNode = getCadSvgNode(easyEdaJson);
-  const bounds = easyEdaJson._objMetadata?.bounds;
+  return getCadModelOffsetMmFromBounds(easyEdaJson, easyEdaJson._objMetadata?.bounds);
+};
+var getCadModelOffsetMmFromBounds = (easyEdaJson, bounds) => {
+  const svgNode = getCadSvgNode(easyEdaJson);
   if (!svgNode || !bounds)
     return null;
   const [originX, originY] = String(svgNode.svgData.attrs?.c_origin ?? "0,0").split(",").map((value) => Number(value.trim()));
@@ -260836,9 +260873,8 @@ var getPositionZMmFromBounds = (bounds, svgNodeZOffsetMm) => {
 var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch22 = globalThis.fetch } = {}) => {
   const modelUuid = getCadSvgNodeModelUuid(easyEdaJson);
   const partNumber = easyEdaJson.lcsc.number;
-  const derivedOffsetMm = getCadModelOffsetMm(easyEdaJson);
   const svgNodeZOffsetMm = getCadSvgNodeZOffsetMm(easyEdaJson);
-  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !derivedOffsetMm || !fetch22) {
+  if (!modelUuid || !partNumber || svgNodeZOffsetMm == null || !fetch22) {
     return null;
   }
   const modelObjUrl = getModelObjCdnUrl({
@@ -260851,6 +260887,9 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch22 = globalT
   });
   const metadataBounds = easyEdaJson._objMetadata?.bounds;
   if (metadataBounds) {
+    const derivedOffsetMm = getCadModelOffsetMm(easyEdaJson);
+    if (!derivedOffsetMm)
+      return null;
     return {
       modelObjUrl,
       positionXMm: derivedOffsetMm.x,
@@ -260873,6 +260912,9 @@ var getEasyEdaCadModelPlacement = async (easyEdaJson, { fetch: fetch22 = globalT
       const bounds = parseObjBounds(objText);
       if (!bounds)
         return null;
+      const derivedOffsetMm = getCadModelOffsetMmFromBounds(easyEdaJson, bounds);
+      if (!derivedOffsetMm)
+        return null;
       return {
         modelObjUrl,
         positionXMm: derivedOffsetMm.x,
@@ -260932,7 +260974,9 @@ var generateFootprintTsx2 = (circuitJson) => {
     elementStrings.push(`<silkscreenpath route={${JSON.stringify(silkscreenPath.route)}} />`);
   }
   for (const silkscreenText of silkscreenTexts) {
-    elementStrings.push(`<silkscreentext text="${silkscreenText.text}" pcbX="${mmStr2(silkscreenText.anchor_position.x)}" pcbY="${mmStr2(silkscreenText.anchor_position.y)}" anchorAlignment="${silkscreenText.anchor_alignment}" ${silkscreenText.font_size ? `fontSize="${mmStr2(silkscreenText.font_size)}"` : ""} />`);
+    const isRefDes = silkscreenText.text === "{NAME}";
+    const textValue = isRefDes ? JSON.stringify("{NAME}") : JSON.stringify(silkscreenText.text);
+    elementStrings.push(`<silkscreentext text=${textValue} pcbX="${mmStr2(silkscreenText.anchor_position.x)}" pcbY="${mmStr2(silkscreenText.anchor_position.y)}" anchorAlignment="${silkscreenText.anchor_alignment}" ${silkscreenText.font_size ? `fontSize="${mmStr2(silkscreenText.font_size)}"` : ""} />`);
   }
   for (const courtyardOutline of courtyardOutlines) {
     elementStrings.push(`<courtyardoutline outline={${JSON.stringify(courtyardOutline.outline)}} />`);
@@ -261010,7 +261054,8 @@ var convertBetterEasyToTsx = async ({
     shouldRecenter: true,
     cadPositionXMm: cadPlacement?.positionXMm,
     cadPositionYMm: cadPlacement?.positionYMm,
-    cadPositionZMm: cadPlacement?.positionZMm
+    cadPositionZMm: cadPlacement?.positionZMm,
+    showDesignator: true
   });
   const [cadComponent] = su9(circuitJson).cad_component.list();
   if (cadComponent) {
@@ -265859,6 +265904,11 @@ var unitToMm4 = {
   ft: 304.8,
   feet: 304.8
 };
+var mmNumberFormatter2 = new Intl.NumberFormat("en-US", {
+  useGrouping: false,
+  notation: "standard",
+  maximumFractionDigits: 12
+});
 var mm5 = (n3) => {
   let unit = typeof n3 === "number" ? "mm" : n3.replace(/^[^a-zA-Z]+/g, "").toLowerCase();
   if (!unit)
@@ -265869,7 +265919,13 @@ var mm5 = (n3) => {
   }
   throw new Error(`Unsupported unit: ${unit}`);
 };
-var DEFAULT_PCB_THICKNESS_MM2 = 1.6;
+var mil2mm2 = (mil) => {
+  if (typeof mil === "number")
+    return mm5(`${mil}mil`);
+  if (mil.match(/^\d+$/))
+    return mm5(`${mil}mil`);
+  return mm5(mil);
+};
 function generateArcFromSweep2(startX, startY, endX, endY, radius, largeArcFlag, sweepFlag) {
   const start = { x: startX, y: startY };
   const end = { x: endX, y: endY };
@@ -265900,15 +265956,15 @@ function generateArcFromSweep2(startX, startY, endX, endY, radius, largeArcFlag,
     }
   }
   const numPoints = Math.max(2, Math.ceil(Math.abs(endAngle - startAngle) * radius));
-  const path210 = [];
+  const path59 = [];
   for (let i2 = 0;i2 <= numPoints; i2++) {
     const t17 = i2 / numPoints;
     const angle2 = startAngle + t17 * (endAngle - startAngle);
     const x3 = centerX + radius * Math.cos(angle2);
     const y4 = centerY + radius * Math.sin(angle2);
-    path210.push({ x: x3, y: y4 });
+    path59.push({ x: x3, y: y4 });
   }
-  return path210;
+  return path59;
 }
 var mil10ToMm2 = (value) => value * 10 * 0.0254;
 var normalizePinLabels2 = (inputPinLabels) => {
@@ -265989,16 +266045,10 @@ var normalizeSymbolName2 = (name) => {
     return "_NEG";
   return trimmedName;
 };
+var DEFAULT_PCB_THICKNESS_MM2 = 1.6;
 var EASYEDA_STEP_MODEL_URL2 = "https://modules.easyeda.com/qAxj6KHrDKw4blvCG8QJPs7Y";
 var EASYEDA_OBJ_MODEL_URL2 = "https://modules.easyeda.com/3dmodel";
 var TSCIRCUIT_MODEL_CDN_URL2 = "https://modelcdn.tscircuit.com/easyeda_models";
-var mil2mm2 = (mil) => {
-  if (typeof mil === "number")
-    return mm5(`${mil}mil`);
-  if (mil.match(/^\d+$/))
-    return mm5(`${mil}mil`);
-  return mm5(mil);
-};
 var milx102 = (mil10) => {
   if (typeof mil10 === "number")
     return mil2mm2(mil10) * 10;
@@ -266126,7 +266176,8 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
   shouldRecenter = true,
   cadPositionXMm,
   cadPositionYMm,
-  cadPositionZMm
+  cadPositionZMm,
+  showDesignator = false
 } = {}) => {
   const resolvedCadPositionZMm = cadPositionZMm ?? getCadPositionZMmFromMetadata2(easyEdaJson);
   const circuitElements = [];
@@ -266299,6 +266350,7 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
   easyEdaJson.packageDetail.dataStr.shape.filter((shape) => shape.type === "SOLIDREGION" && shape.fillStyle === "cutout").forEach((sr3, index) => {
     circuitElements.push(handleCutout2(sr3, index));
   });
+  let hasFoundDesignator = false;
   easyEdaJson.packageDetail.dataStr.shape.forEach((shape, index) => {
     if (shape.type === "TRACK") {
       if (!isCourtyardLayer2(shape.layer)) {
@@ -266311,11 +266363,22 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
     } else if (shape.type === "TEXT") {
       if (isCourtyardLayer2(shape.layer))
         return;
+      let text = shape.text;
+      const designatorPrefix = easyEdaJson.dataStr.head.c_para.pre || "U";
+      const normalizedPrefix = designatorPrefix.replace(/\?/g, "");
+      const trimmedText = text.trim();
+      const isDesignator = trimmedText === designatorPrefix || trimmedText === `${normalizedPrefix}?` || trimmedText === normalizedPrefix;
+      if (isDesignator) {
+        if (!showDesignator)
+          return;
+        text = "{NAME}";
+        hasFoundDesignator = true;
+      }
       circuitElements.push(pcb_silkscreen_text3.parse({
         type: "pcb_silkscreen_text",
         pcb_silkscreen_text_id: `pcb_silkscreen_text_${index + 1}`,
         pcb_component_id: "pcb_component_1",
-        text: normalizeSymbolName2(shape.text),
+        text,
         anchor_position: {
           x: mil2mm2(shape.x),
           y: mil2mm2(shape.y)
@@ -266325,11 +266388,27 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
           C: "center",
           R: "bottom_right"
         }[shape.textAnchor ?? "L"],
-        font_size: shape.size_mm ? shape.size_mm : undefined,
+        font_size: shape.size_mm || 1,
         layer: "top"
       }));
     }
   });
+  if (!hasFoundDesignator && showDesignator) {
+    const bbox = easyEdaJson.packageDetail.dataStr.BBox;
+    circuitElements.push(pcb_silkscreen_text3.parse({
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: `pcb_silkscreen_text_designator_fallback`,
+      pcb_component_id: "pcb_component_1",
+      text: "{NAME}",
+      anchor_position: {
+        x: milx102(bbox.x + bbox.width / 2),
+        y: milx102(bbox.y) - 1
+      },
+      anchor_alignment: "center",
+      font_size: 1,
+      layer: "top"
+    }));
+  }
   const pcbElements = circuitElements.filter((e4) => e4.type === "pcb_smtpad" || e4.type === "pcb_plated_hole" || e4.type === "pcb_hole" || e4.type === "pcb_via" || e4.type === "pcb_courtyard_outline" || e4.type === "pcb_silkscreen_path" || e4.type === "pcb_silkscreen_text");
   if (pcbElements.length > 0) {
     const bounds = findBoundsAndCenter3(pcbElements);
@@ -266880,7 +266959,7 @@ var parsePin2 = (pinString) => {
   const colorMatch = pinString.match(/#[0-9A-F]{6}/);
   const labelColor = colorMatch ? colorMatch[0] : "";
   const pathMatch = pinString.match(/\^\^([^~]+)/);
-  const path210 = pathMatch ? pathMatch[1] : "";
+  const path59 = pathMatch ? pathMatch[1] : "";
   const arrowMatch = pinString.match(/\^\^0~(.+)$/);
   const arrow = arrowMatch ? arrowMatch[1] : "";
   const r4 = Number.parseFloat(rotation22);
@@ -266894,7 +266973,7 @@ var parsePin2 = (pinString) => {
     rotation: Number.isNaN(r4) ? 0 : r4,
     label,
     labelColor,
-    path: path210,
+    path: path59,
     arrow
   };
 };
@@ -268960,7 +269039,7 @@ export default () => (
     await setupTscircuitSkill(projectDir, options?.yes);
     setupTsciProject(projectDir, options?.install ? undefined : []);
     console.info(`
-`, kleur_default.green("\uD83C\uDF89 Initialization complete!"), "Run ", kleur_default.bold(kleur_default.blue(`${directory ? `${kleur_default.bold(`cd ${directory}`)} & ` : ""}${kleur_default.bold("tsci dev")}`)), " to start developing.");
+`, kleur_default.green("\uD83C\uDF89 Initialization complete!"), "Run ", kleur_default.bold(kleur_default.blue(`${directory ? `${kleur_default.bold(`cd ${directory}`)} && ` : ""}${kleur_default.bold("tsci dev")}`)), " to start developing.");
     process.exit(0);
   });
 };

package/dist/lib/index.js

@@ -60678,7 +60678,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1201";
+var version = "0.1.1203";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -60724,7 +60724,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "0.0.86",
-    easyeda: "^0.0.253",
+    easyeda: "^0.0.258",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1202",
+  "version": "0.1.1204",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -43,7 +43,7 @@
     "debug": "^4.4.0",
     "delay": "^6.0.0",
     "dsn-converter": "0.0.86",
-    "easyeda": "^0.0.253",
+    "easyeda": "^0.0.258",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",