@tscircuit/cli 0.1.1956 → 0.1.1958

package/dist/cli/main.js

@@ -136044,7 +136044,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.1955";
+var version = "0.1.1957";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -136105,7 +136105,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.307",
+    easyeda: "^0.0.315",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -303593,6 +303593,7 @@ var registerCheckSchematicPlacement = (program2) => {
 // cli/check/shorts/register.ts
 import { mkdir, writeFile } from "node:fs/promises";
 import path49 from "node:path";
+import { all_layers as all_layers2, layer_string } from "circuit-json";
 
 // cli/check/shorts/get-check-short-layers.ts
 var innerCopperLayers = [
@@ -303609,12 +303610,16 @@ var getCheckShortLayers = ({
   circuitJson,
   layerOption
 }) => {
-  if (layerOption !== "all")
-    return [layerOption];
   const pcbBoard = circuitJson.find((element) => element.type === "pcb_board");
   const boardLayerCount = pcbBoard?.type === "pcb_board" ? pcbBoard.num_layers : 2;
   const innerLayerCount = Math.max(0, Math.floor(boardLayerCount) - 2);
-  return ["top", ...innerCopperLayers.slice(0, innerLayerCount), "bottom"];
+  const availableLayers = boardLayerCount <= 1 ? ["top"] : ["top", ...innerCopperLayers.slice(0, innerLayerCount), "bottom"];
+  if (layerOption === "all")
+    return availableLayers;
+  if (!availableLayers.includes(layerOption)) {
+    throw new Error(`--layer ${layerOption} is not available on this ${boardLayerCount}-layer board; available layers: ${availableLayers.join(", ")}`);
+  }
+  return [layerOption];
 };
 
 // cli/check/shorts/register.ts
@@ -303652,12 +303657,16 @@ var parseMode = (mode) => {
     return mode;
   throw new Error("--mode must be either pcb or gerber");
 };
+var checkShortsLayerNames = [...all_layers2, "all"].join(", ");
 var parseLayer = (layer) => {
   if (!layer)
     return "all";
-  if (layer === "top" || layer === "bottom" || layer === "all")
+  if (layer === "all")
     return layer;
-  throw new Error("--layer must be top, bottom, or all");
+  const parsedLayer = layer_string.safeParse(layer);
+  if (parsedLayer.success)
+    return parsedLayer.data;
+  throw new Error(`--layer must be one of: ${checkShortsLayerNames}`);
 };
 var formatLabels = (labels) => labels.length > 0 ? labels.join(", ") : "(unknown)";
 var formatShort = (short, index) => {
@@ -303729,7 +303738,7 @@ var checkShorts = async (file, options = {}) => {
   };
 };
 var registerCheckShorts = (program2) => {
-  program2.commands.find((c3) => c3.name() === "check").command("shorts").description("Detect unintended shorts between separate PCB copper groups").argument("[file]", "Path to the entry file or prebuilt circuit JSON").option("--mode <mode>", "Bitmap source to analyze: pcb or gerber", "gerber").option("--layer <layer>", "Layer to analyze: top, bottom, or all", "all").option("--pixels-per-mm <number>", "Bitmap resolution for short detection").action(async (file, options) => {
+  program2.commands.find((c3) => c3.name() === "check").command("shorts").description("Detect unintended shorts between separate PCB copper groups").argument("[file]", "Path to the entry file or prebuilt circuit JSON").option("--mode <mode>", "Bitmap source to analyze: pcb or gerber", "gerber").option("--layer <layer>", `Layer to analyze: ${checkShortsLayerNames}`, "all").option("--pixels-per-mm <number>", "Bitmap resolution for short detection").action(async (file, options) => {
     try {
       const result = await checkShorts(file, options);
       console.log(result.output);
@@ -317845,7 +317854,7 @@ var __export4 = (target, all) => {
 };
 var dist_exports = {};
 __export4(dist_exports, {
-  all_layers: () => all_layers2,
+  all_layers: () => all_layers3,
   any_circuit_element: () => any_circuit_element,
   any_soup_element: () => any_soup_element4,
   any_source_component: () => any_source_component,
@@ -317883,7 +317892,7 @@ __export4(dist_exports, {
   kicadSymbolProperties: () => kicadSymbolProperties2,
   kicadSymbolProperty: () => kicadSymbolProperty2,
   layer_ref: () => layer_ref2,
-  layer_string: () => layer_string,
+  layer_string: () => layer_string2,
   length: () => length67,
   manufacturing_drc_properties: () => manufacturing_drc_properties,
   ms: () => ms6,
@@ -322984,7 +322993,7 @@ var source_pcb_ground_plane = external_exports2.object({
   subcircuit_id: external_exports2.string().optional()
 }).describe("Defines a ground plane in the source domain");
 expectTypesMatch2(true);
-var all_layers2 = [
+var all_layers3 = [
   "top",
   "bottom",
   "inner1",
@@ -322994,9 +323003,9 @@ var all_layers2 = [
   "inner5",
   "inner6"
 ];
-var layer_string = external_exports2.enum(all_layers2);
-var layer_ref2 = layer_string.or(external_exports2.object({
-  name: layer_string
+var layer_string2 = external_exports2.enum(all_layers3);
+var layer_ref2 = layer_string2.or(external_exports2.object({
+  name: layer_string2
 })).transform((layer) => {
   if (typeof layer === "string") {
     return layer;
@@ -327218,7 +327227,7 @@ var handleSilkscreenPath = (track, index) => {
     type: "pcb_silkscreen_path",
     pcb_silkscreen_path_id: `pcb_silkscreen_path_${index + 1}`,
     pcb_component_id: "pcb_component_1",
-    layer: "top",
+    layer: getSideFromLayer(track.layer),
     route: track.points.map((point22) => ({
       x: milx10(point22.x),
       y: milx10(point22.y)
@@ -327228,6 +327237,18 @@ var handleSilkscreenPath = (track, index) => {
 };
 var isCourtyardLayer = (layer) => layer === 13 || layer === 14 || layer === 15;
 var isSilkscreenLayer = (layer) => layer === 3 || layer === 4;
+var isDocumentLayer = (layer) => layer === 12;
+var handleFabricationNotePath = (track, index) => pcb_fabrication_note_path.parse({
+  type: "pcb_fabrication_note_path",
+  pcb_fabrication_note_path_id: `pcb_fabrication_note_path_${index + 1}`,
+  pcb_component_id: "pcb_component_1",
+  layer: "top",
+  route: track.points.map((point22) => ({
+    x: mil10ToMm(point22.x),
+    y: mil10ToMm(point22.y)
+  })),
+  stroke_width: mil10ToMm(track.width)
+});
 var getSideFromLayer = (layer) => {
   if (layer === 4 || layer === 14)
     return "bottom";
@@ -327425,7 +327446,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
         pcb_plated_hole_id: platedHoleId,
         x: mil2mm(pad2.center.x),
         y: mil2mm(pad2.center.y),
-        layers: ["top"],
+        layers: ["top", "bottom"],
         port_hints: pcbPortHints,
         pcb_component_id: "pcb_component_1",
         pcb_port_id: `pcb_port_${index + 1}`
@@ -327550,8 +327571,10 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
   let hasFoundDesignator = false;
   easyEdaJson.packageDetail.dataStr.shape.forEach((shape, index) => {
     if (shape.type === "TRACK") {
-      if (!isCourtyardLayer(shape.layer)) {
+      if (isSilkscreenLayer(shape.layer)) {
         circuitElements.push(handleSilkscreenPath(shape, index));
+      } else if (isDocumentLayer(shape.layer)) {
+        circuitElements.push(handleFabricationNotePath(shape, index));
       }
     } else if (shape.type === "CIRCLE") {
       if (isSilkscreenLayer(shape.layer)) {
@@ -328688,6 +328711,7 @@ var generateFootprintTsx2 = (circuitJson, options = {}) => {
   const vias = su17(circuitJson).pcb_via.list();
   const silkscreenPaths = su17(circuitJson).pcb_silkscreen_path.list();
   const silkscreenTexts = su17(circuitJson).pcb_silkscreen_text.list();
+  const fabricationNotePaths = su17(circuitJson).pcb_fabrication_note_path.list();
   const courtyardOutlines = su17(circuitJson).pcb_courtyard_outline.list();
   const elementStrings = [];
   for (const hole of holes) {
@@ -328738,6 +328762,9 @@ var generateFootprintTsx2 = (circuitJson, options = {}) => {
     const rotationAttr = rotation23 ? ` pcbRotation="${rotation23}deg"` : "";
     elementStrings.push(`<silkscreentext text=${textValue} pcbX="${mmStr2(silkscreenText.anchor_position.x)}" pcbY="${mmStr2(silkscreenText.anchor_position.y)}" anchorAlignment="${silkscreenText.anchor_alignment}"${rotationAttr}${silkscreenText.font_size ? ` fontSize="${mmStr2(silkscreenText.font_size)}"` : ""} />`);
   }
+  for (const fabricationNotePath of fabricationNotePaths) {
+    elementStrings.push(`<fabricationnotepath route={${JSON.stringify(fabricationNotePath.route)}} strokeWidth="${mmStr2(fabricationNotePath.stroke_width)}" />`);
+  }
   for (const courtyardOutline of courtyardOutlines) {
     elementStrings.push(`<courtyardoutline outline={${JSON.stringify(courtyardOutline.outline)}} />`);
   }
@@ -328748,6 +328775,40 @@ var generateFootprintTsx2 = (circuitJson, options = {}) => {
       </footprint>
   `.trim();
 };
+var POWER_PIN_LABEL = /^(?:VCC|VDD|VIN|VDDA)\d*$/;
+var GROUND_PIN_LABEL = /^(?:GND|VSS|PGND|AGND)\d*$/;
+var NO_CONNECT_PIN_LABEL = /^NC\d*$/;
+var getAttributeKind = (label) => {
+  const normalizedLabel = label.trim().toUpperCase();
+  if (POWER_PIN_LABEL.test(normalizedLabel))
+    return "power";
+  if (GROUND_PIN_LABEL.test(normalizedLabel))
+    return "ground";
+  if (NO_CONNECT_PIN_LABEL.test(normalizedLabel))
+    return "no-connect";
+  return;
+};
+var inferPinAttributes = (pinLabels) => {
+  const pinAttributes = {};
+  for (const [pinName, labels] of Object.entries(pinLabels)) {
+    const labelList = typeof labels === "string" ? [labels] : labels;
+    const inferredKinds = labelList.map(getAttributeKind);
+    if (inferredKinds.some((kind) => kind === undefined))
+      continue;
+    const attributeKinds = new Set(inferredKinds);
+    if (attributeKinds.size !== 1)
+      continue;
+    const [attributeKind] = attributeKinds;
+    if (attributeKind === "power") {
+      pinAttributes[pinName] = { requiresPower: true };
+    } else if (attributeKind === "ground") {
+      pinAttributes[pinName] = { requiresGround: true };
+    } else if (attributeKind === "no-connect") {
+      pinAttributes[pinName] = { doNotConnect: true };
+    }
+  }
+  return pinAttributes;
+};
 var generateTypescriptComponent = ({
   pinLabels,
   componentName,
@@ -328778,6 +328839,19 @@ var generateTypescriptComponent = ({
   }));
   const pinLabelsString = Object.entries(simplifiedPinLabels).map(([pin, labels]) => `  ${pin}: ${JSON.stringify(labels)}`).join(`,
 `);
+  const inferredPinAttributes = componentType === "chip" ? inferPinAttributes(simplifiedPinLabels) : {};
+  const pinAttributesString = Object.entries(inferredPinAttributes).map(([pin, attributes2]) => {
+    const attributesString = Object.entries(attributes2).map(([attributeName, value]) => `${attributeName}: ${JSON.stringify(value)}`).join(", ");
+    return `  ${pin}: {${attributesString}}`;
+  }).join(`,
+`);
+  const pinAttributesBlock = pinAttributesString ? `const pinAttributes = {
+${pinAttributesString}
+} as const
+
+` : "";
+  const pinAttributesProp = pinAttributesString ? `      pinAttributes={pinAttributes}
+` : "";
   const polarizedPinLabelsString = Object.entries(polarizedPinLabels ?? {}).map(([pin, labels]) => `  ${pin}: ${JSON.stringify(labels)}`).join(`,
 `);
   const polarizedPinLabelsBlock = polarizedPinLabels ? `const pinLabels = {
@@ -329033,11 +329107,11 @@ const pinLabels = {
 ${pinLabelsString}
 } as const
 
-export const ${componentName} = (props: ChipProps<typeof pinLabels>) => {
+${pinAttributesBlock}export const ${componentName} = (props: ChipProps<typeof pinLabels>) => {
   return (
     <chip
       pinLabels={pinLabels}
-${symbolProp2}      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+${pinAttributesProp}${symbolProp2}      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
       manufacturerPartNumber="${manufacturerPartNumber}"
       footprint={${footprintTsx}}
       ${objUrl || stepUrl ? `cadModel={{
@@ -329088,7 +329162,7 @@ var categoryValueContainsPushbutton = (value) => {
     if (/analog\s+switch/.test(normalized) || /multiplex/.test(normalized) || /switching\s+diodes?/.test(normalized) || /\bics?\b/.test(normalized)) {
       return false;
     }
-    return /push\s*buttons?/.test(normalized) || /pushbuttons?/.test(normalized) || /tact(?:ile)?\s+switch(?:es)?/.test(normalized) || /keyboard\s+(?:switch(?:es)?|shaft)/.test(normalized) || /mechanical\s+keyboard\s+shaft/.test(normalized);
+    return /push\s*buttons?/.test(normalized) || /pushbuttons?/.test(normalized) || /tact(?:ile)?\s+switch(?:es)?/.test(normalized) || /keyboard\s+(?:switch(?:es)?|shaft)/.test(normalized) || /mechanical\s+keyboard\s+shaft/.test(normalized) || /\bkey[-_\s]+(?:th|smd)(?:\b|[_-])/.test(normalized);
   }
   if (Array.isArray(value)) {
     return value.some(categoryValueContainsPushbutton);
@@ -329102,10 +329176,14 @@ var isPushbuttonCategoryComponent = (betterEasy) => {
   const cPara = betterEasy.dataStr.head.c_para;
   return [
     betterEasy.tags,
+    betterEasy.title,
+    betterEasy.description,
     cPara.category,
     cPara.Category,
     cPara["LCSC Category"],
     cPara["JLCPCB Category"],
+    cPara.package,
+    cPara.pre,
     betterEasy.category
   ].some(categoryValueContainsPushbutton);
 };
@@ -329516,7 +329594,7 @@ var getGeneratedComponentType = (betterEasy, pinCount) => {
     return "capacitor";
   if (isResistorComponent(betterEasy) && pinCount === 2)
     return "resistor";
-  if (isInductorComponent(betterEasy))
+  if (isInductorComponent(betterEasy) && pinCount === 2)
     return "inductor";
   if (isCrystalComponent(betterEasy))
     return "crystal";
@@ -329589,8 +329667,9 @@ var convertBetterEasyToTsx = async ({
   const crystalFrequency = componentType === "crystal" ? betterEasy.dataStr.head.c_para.Value?.trim() : undefined;
   const crystalPinVariant = componentType !== "crystal" ? undefined : sourcePorts.length === 4 ? "four_pin" : sourcePorts.length === 2 ? "two_pin" : undefined;
   const isMultiPinDiode = isDiodeCategoryComponent(betterEasy) && sourcePorts.length !== 2;
+  const isMultiPinInductor = isInductorComponent(betterEasy) && sourcePorts.length !== 2;
   const isPassiveWithCustomSymbol = componentType === "capacitor" || componentType === "resistor";
-  const symbolTsx = isPassiveWithCustomSymbol || componentType === "chip" && !isMultiPinDiode && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson, {
+  const symbolTsx = isPassiveWithCustomSymbol || componentType === "chip" && !isMultiPinDiode && !isMultiPinInductor && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson, {
     alignPortsToDrawing: isPassiveWithCustomSymbol
   }) : undefined;
   return generateTypescriptComponent({
@@ -329951,7 +330030,7 @@ var __export5 = (target, all) => {
 };
 var dist_exports2 = {};
 __export5(dist_exports2, {
-  all_layers: () => all_layers3,
+  all_layers: () => all_layers4,
   any_circuit_element: () => any_circuit_element2,
   any_soup_element: () => any_soup_element5,
   any_source_component: () => any_source_component2,
@@ -329989,7 +330068,7 @@ __export5(dist_exports2, {
   kicadSymbolProperties: () => kicadSymbolProperties3,
   kicadSymbolProperty: () => kicadSymbolProperty3,
   layer_ref: () => layer_ref3,
-  layer_string: () => layer_string2,
+  layer_string: () => layer_string3,
   length: () => length69,
   manufacturing_drc_properties: () => manufacturing_drc_properties2,
   ms: () => ms7,
@@ -331168,7 +331247,7 @@ var source_pcb_ground_plane2 = z622.object({
   subcircuit_id: z622.string().optional()
 }).describe("Defines a ground plane in the source domain");
 expectTypesMatch3(true);
-var all_layers3 = [
+var all_layers4 = [
   "top",
   "bottom",
   "inner1",
@@ -331178,9 +331257,9 @@ var all_layers3 = [
   "inner5",
   "inner6"
 ];
-var layer_string2 = z632.enum(all_layers3);
-var layer_ref3 = layer_string2.or(z632.object({
-  name: layer_string2
+var layer_string3 = z632.enum(all_layers4);
+var layer_ref3 = layer_string3.or(z632.object({
+  name: layer_string3
 })).transform((layer) => {
   if (typeof layer === "string") {
     return layer;
@@ -335367,7 +335446,7 @@ var handleSilkscreenPath2 = (track, index) => {
     type: "pcb_silkscreen_path",
     pcb_silkscreen_path_id: `pcb_silkscreen_path_${index + 1}`,
     pcb_component_id: "pcb_component_1",
-    layer: "top",
+    layer: getSideFromLayer2(track.layer),
     route: track.points.map((point22) => ({
       x: milx102(point22.x),
       y: milx102(point22.y)
@@ -335377,6 +335456,18 @@ var handleSilkscreenPath2 = (track, index) => {
 };
 var isCourtyardLayer2 = (layer) => layer === 13 || layer === 14 || layer === 15;
 var isSilkscreenLayer2 = (layer) => layer === 3 || layer === 4;
+var isDocumentLayer2 = (layer) => layer === 12;
+var handleFabricationNotePath2 = (track, index) => pcb_fabrication_note_path2.parse({
+  type: "pcb_fabrication_note_path",
+  pcb_fabrication_note_path_id: `pcb_fabrication_note_path_${index + 1}`,
+  pcb_component_id: "pcb_component_1",
+  layer: "top",
+  route: track.points.map((point22) => ({
+    x: mil10ToMm2(point22.x),
+    y: mil10ToMm2(point22.y)
+  })),
+  stroke_width: mil10ToMm2(track.width)
+});
 var getSideFromLayer2 = (layer) => {
   if (layer === 4 || layer === 14)
     return "bottom";
@@ -335574,7 +335665,7 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
         pcb_plated_hole_id: platedHoleId,
         x: mil2mm2(pad2.center.x),
         y: mil2mm2(pad2.center.y),
-        layers: ["top"],
+        layers: ["top", "bottom"],
         port_hints: pcbPortHints,
         pcb_component_id: "pcb_component_1",
         pcb_port_id: `pcb_port_${index + 1}`
@@ -335699,8 +335790,10 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
   let hasFoundDesignator = false;
   easyEdaJson.packageDetail.dataStr.shape.forEach((shape, index) => {
     if (shape.type === "TRACK") {
-      if (!isCourtyardLayer2(shape.layer)) {
+      if (isSilkscreenLayer2(shape.layer)) {
         circuitElements.push(handleSilkscreenPath2(shape, index));
+      } else if (isDocumentLayer2(shape.layer)) {
+        circuitElements.push(handleFabricationNotePath2(shape, index));
       }
     } else if (shape.type === "CIRCLE") {
       if (isSilkscreenLayer2(shape.layer)) {

package/dist/lib/index.js

@@ -65757,7 +65757,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1955";
+var version = "0.1.1957";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65818,7 +65818,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.307",
+    easyeda: "^0.0.315",
     "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.1956",
+  "version": "0.1.1958",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -58,7 +58,7 @@
     "debug": "^4.4.0",
     "delay": "^6.0.0",
     "dsn-converter": "^0.0.90",
-    "easyeda": "^0.0.307",
+    "easyeda": "^0.0.315",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",