@tscircuit/cli 0.1.1920 → 0.1.1921

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.1919";
+var version = "0.1.1920";
 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.292",
+    easyeda: "^0.0.296",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -328489,6 +328489,8 @@ var generateTypescriptComponent = ({
   supplierPartNumbers,
   manufacturerPartNumber,
   componentType = "chip",
+  capacitance: capacitance22,
+  resistance: resistance22,
   inductance: inductance22,
   crystalFrequency,
   crystalPinVariant,
@@ -328626,6 +328628,58 @@ ${cadModelLines}
     />
   )
 }
+`.trim();
+  }
+  if (componentType === "capacitor") {
+    if (!capacitance22) {
+      throw new Error("Capacitance is required for capacitor components");
+    }
+    return `
+import type { CapacitorProps } from "@tscircuit/props"
+
+export const ${componentName} = (props: Omit<CapacitorProps, "capacitance">) => {
+  const { name = "C1", ...restProps } = props
+
+  return (
+    <capacitor
+      name={name}
+      capacitance=${JSON.stringify(capacitance22)}
+      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+      manufacturerPartNumber="${manufacturerPartNumber}"
+      footprint={${footprintTsx}}
+      ${objUrl || stepUrl ? `cadModel={{
+${cadModelLines}
+      }}` : ""}
+      {...restProps}
+    />
+  )
+}
+`.trim();
+  }
+  if (componentType === "resistor") {
+    if (!resistance22) {
+      throw new Error("Resistance is required for resistor components");
+    }
+    return `
+import type { ResistorProps } from "@tscircuit/props"
+
+export const ${componentName} = (props: Omit<ResistorProps, "resistance">) => {
+  const { name = "R1", ...restProps } = props
+
+  return (
+    <resistor
+      name={name}
+      resistance=${JSON.stringify(resistance22)}
+      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+      manufacturerPartNumber="${manufacturerPartNumber}"
+      footprint={${footprintTsx}}
+      ${objUrl || stepUrl ? `cadModel={{
+${cadModelLines}
+      }}` : ""}
+      {...restProps}
+    />
+  )
+}
 `.trim();
   }
   if (componentType === "inductor") {
@@ -328727,6 +328781,21 @@ ${cadModelLines}
 }
 `.trim();
 };
+var capacitancePattern = /^\d+(?:\.\d+)?\s*(?:pF|nF|[uµμ]F|mF|F)$/i;
+var normalizeCapacitanceValue = (value) => {
+  if (typeof value !== "string")
+    return;
+  const trimmedValue = value.trim();
+  if (!capacitancePattern.test(trimmedValue))
+    return;
+  return trimmedValue.replace(/\s+/g, "").replace(/[µμ]/g, "u");
+};
+var isCapacitorComponent = (betterEasy) => {
+  const componentParameters = betterEasy.dataStr.head.c_para;
+  const prefix = componentParameters.pre;
+  const value = componentParameters.Value;
+  return prefix?.toUpperCase() === "C?" && normalizeCapacitanceValue(value) !== undefined;
+};
 var frequencyPattern = /^\d+(?:\.\d+)?\s*(?:Hz|kHz|MHz|GHz)$/i;
 var isCrystalComponent = (betterEasy) => {
   const componentParameters = betterEasy.dataStr.head.c_para;
@@ -328772,6 +328841,47 @@ var isPushbuttonCategoryComponent = (betterEasy) => {
     betterEasy.category
   ].some(categoryValueContainsPushbutton);
 };
+var standardSmdResistorPackagePattern = /^R(?:01005|0201|0402|0504|0603|0805|1206|1210|1812|2010|2512)(?:$|[_-])/i;
+var normalizeExplicitScale = (scale23) => {
+  if (scale23 === "k" || scale23 === "K")
+    return "k";
+  if (scale23 === "m")
+    return "m";
+  if (scale23 === "M")
+    return "M";
+  if (scale23 === "g" || scale23 === "G")
+    return "G";
+  return "";
+};
+var normalizeResistorValue = (value) => {
+  if (typeof value !== "string")
+    return;
+  const compactValue = value.trim().replace(/\s+/g, "");
+  const explicitUnitMatch = compactValue.match(/^(\d+(?:\.\d+)?)([mMkKgG]?)(?:Ω|ohms?)$/i);
+  if (explicitUnitMatch) {
+    const [, magnitude, scale23] = explicitUnitMatch;
+    if (Number(magnitude) === 0)
+      return "0ohm";
+    return `${magnitude}${normalizeExplicitScale(scale23)}ohm`;
+  }
+  const resistorCodeMatch = compactValue.match(/^(\d+)([RrKkMm])(\d*)$/);
+  if (resistorCodeMatch) {
+    const [, whole, multiplier, fraction] = resistorCodeMatch;
+    const magnitude = fraction ? `${whole}.${fraction}` : whole;
+    if (Number(magnitude) === 0)
+      return "0ohm";
+    const scale23 = multiplier === "R" || multiplier === "r" ? "" : multiplier === "K" || multiplier === "k" ? "k" : "M";
+    return `${magnitude}${scale23}ohm`;
+  }
+  if (/^0+(?:\.0+)?$/.test(compactValue))
+    return "0ohm";
+  return;
+};
+var isResistorComponent = (betterEasy) => {
+  const componentParameters = betterEasy.dataStr.head.c_para;
+  const packageName = componentParameters.package;
+  return componentParameters.pre?.toUpperCase() === "R?" && typeof packageName === "string" && standardSmdResistorPackagePattern.test(packageName.trim()) && normalizeResistorValue(componentParameters.Value) !== undefined;
+};
 var categoryValueContainsSwitch = (value) => {
   if (typeof value === "string") {
     const normalized = value.toLowerCase();
@@ -329076,15 +329186,19 @@ var hasNonBoxSchematicSymbol = (easyEdaJson) => {
   const onlyBoxPrimitives = drawableShapes.every((shape) => shape.type === "RECTANGLE" || shape.type === "ELLIPSE" && shape.radiusX <= 2 && shape.radiusY <= 2);
   return rectangles.length !== 1 || !onlyBoxPrimitives;
 };
-var getGeneratedComponentType = (betterEasy) => {
-  if (isLedCategoryComponent(betterEasy))
+var getGeneratedComponentType = (betterEasy, pinCount) => {
+  if (isLedCategoryComponent(betterEasy) && pinCount === 2)
     return "led";
-  if (isDiodeCategoryComponent(betterEasy))
+  if (isDiodeCategoryComponent(betterEasy) && pinCount === 2)
     return "diode";
   if (isPushbuttonCategoryComponent(betterEasy))
     return "pushbutton";
   if (isSwitchCategoryComponent(betterEasy))
     return "switch";
+  if (isCapacitorComponent(betterEasy))
+    return "capacitor";
+  if (isResistorComponent(betterEasy) && pinCount === 2)
+    return "resistor";
   if (isInductorComponent(betterEasy))
     return "inductor";
   if (isCrystalComponent(betterEasy))
@@ -329151,11 +329265,14 @@ var convertBetterEasyToTsx = async ({
   const supplierPartNumbers = {
     jlcpcb: [betterEasy.lcsc.number]
   };
-  const componentType = getGeneratedComponentType(betterEasy);
+  const componentType = getGeneratedComponentType(betterEasy, sourcePorts.length);
   const inductance22 = componentType === "inductor" ? betterEasy.dataStr.head.c_para.Value?.trim() : undefined;
+  const capacitance22 = componentType === "capacitor" ? normalizeCapacitanceValue(betterEasy.dataStr.head.c_para.Value) : undefined;
+  const resistance22 = componentType === "resistor" ? normalizeResistorValue(betterEasy.dataStr.head.c_para.Value) : undefined;
   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 symbolTsx = componentType === "chip" && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson) : undefined;
+  const isMultiPinDiode = isDiodeCategoryComponent(betterEasy) && sourcePorts.length !== 2;
+  const symbolTsx = componentType === "chip" && !isMultiPinDiode && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson) : undefined;
   return generateTypescriptComponent({
     componentName,
     manufacturerPartNumber,
@@ -329165,6 +329282,8 @@ var convertBetterEasyToTsx = async ({
     circuitJson,
     supplierPartNumbers,
     componentType,
+    capacitance: capacitance22,
+    resistance: resistance22,
     inductance: inductance22,
     crystalFrequency,
     crystalPinVariant,

package/dist/lib/index.js

@@ -65757,7 +65757,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1919";
+var version = "0.1.1920";
 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.292",
+    easyeda: "^0.0.296",
     "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.1920",
+  "version": "0.1.1921",
   "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.292",
+    "easyeda": "^0.0.296",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",