@tscircuit/cli 0.1.1907 → 0.1.1908

package/dist/cli/main.js

@@ -135502,7 +135502,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.279",
+    easyeda: "^0.0.292",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -322819,6 +322819,8 @@ var isDiodeCategoryComponent = (betterEasy) => {
 };
 var categoryValueContainsLed = (value) => {
   if (typeof value === "string") {
+    if (/(^|[^a-z])leds?\s+drivers?([^a-z]|$)/i.test(value))
+      return false;
     return /(^|[^a-z])leds?([^a-z]|$)/i.test(value) || /light[-\s]?emitting\s+diodes?/i.test(value);
   }
   if (Array.isArray(value)) {
@@ -323264,7 +323266,7 @@ var convertEasyEdaJsonToCircuitJson = (easyEdaJson, {
       if (pad2.shape === "RECT") {
         soupShape = "rect";
       } else if (pad2.shape === "ELLIPSE") {
-        soupShape = "rect";
+        soupShape = "circle";
       } else if (pad2.shape === "OVAL") {
         soupShape = "pill";
       } else if (pad2.shape === "POLYGON") {
@@ -324032,8 +324034,13 @@ var parsePath = (str) => {
 };
 var PathShapeSchema = external_exports2.string().startsWith("PT~").transform(parsePath).pipe(PathShapeOutputSchema);
 var optionalEasyEdaTextField = (fieldSchema) => external_exports2.preprocess((textField) => {
-  if (textField == null || textField === "" || textField === "undefined") {
+  if (textField == null)
     return;
+  if (typeof textField === "string") {
+    const trimmedTextField = textField.trim();
+    if (trimmedTextField === "" || trimmedTextField === "undefined") {
+      return;
+    }
   }
   return textField;
 }, fieldSchema);
@@ -324476,6 +324483,9 @@ var generateTypescriptComponent = ({
   supplierPartNumbers,
   manufacturerPartNumber,
   componentType = "chip",
+  inductance: inductance22,
+  crystalFrequency,
+  crystalPinVariant,
   symbolTsx
 }) => {
   const safePinLabels = pinLabels ?? {};
@@ -324610,6 +324620,82 @@ ${cadModelLines}
     />
   )
 }
+`.trim();
+  }
+  if (componentType === "inductor") {
+    if (!inductance22) {
+      throw new Error("Inductance is required for inductor components");
+    }
+    return `
+import type { InductorProps } from "@tscircuit/props"
+
+export const ${componentName} = (props: Omit<InductorProps, "inductance">) => {
+  return (
+    <inductor
+      inductance=${JSON.stringify(inductance22)}
+      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+      manufacturerPartNumber="${manufacturerPartNumber}"
+      footprint={${footprintTsx}}
+      ${objUrl || stepUrl ? `cadModel={{
+${cadModelLines}
+      }}` : ""}
+      {...props}
+    />
+  )
+}
+`.trim();
+  }
+  if (componentType === "crystal") {
+    if (!crystalFrequency || !crystalPinVariant) {
+      throw new Error("Crystal frequency and pin variant are required");
+    }
+    return `
+import type { CrystalProps } from "@tscircuit/props"
+
+type ImportedCrystalProps = Omit<CrystalProps, "frequency" | "pinVariant">
+
+export const ${componentName} = (props: ImportedCrystalProps) => {
+  const { name = "X1", ...restProps } = props
+
+  return (
+    <crystal
+      name={name}
+      frequency=${JSON.stringify(crystalFrequency)}
+      pinVariant=${JSON.stringify(crystalPinVariant)}
+      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+      manufacturerPartNumber="${manufacturerPartNumber}"
+      footprint={${footprintTsx}}
+      ${objUrl || stepUrl ? `cadModel={{
+${cadModelLines}
+      }}` : ""}
+      {...restProps}
+    />
+  )
+}
+`.trim();
+  }
+  if (componentType === "connector") {
+    return `
+import type { ConnectorProps } from "@tscircuit/props"
+
+const pinLabels = {
+${pinLabelsString}
+} as const
+
+export const ${componentName} = (props: ConnectorProps) => {
+  return (
+    <connector
+      pinLabels={pinLabels}
+      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+      manufacturerPartNumber="${manufacturerPartNumber}"
+      footprint={${footprintTsx}}
+      ${objUrl || stepUrl ? `cadModel={{
+${cadModelLines}
+      }}` : ""}
+      {...props}
+    />
+  )
+}
 `.trim();
   }
   return `
@@ -324635,6 +324721,24 @@ ${cadModelLines}
 }
 `.trim();
 };
+var frequencyPattern = /^\d+(?:\.\d+)?\s*(?:Hz|kHz|MHz|GHz)$/i;
+var isCrystalComponent = (betterEasy) => {
+  const componentParameters = betterEasy.dataStr.head.c_para;
+  const packageName = componentParameters.package;
+  const value = componentParameters.Value;
+  return componentParameters.pre === "X?" && packageName?.toUpperCase().startsWith("CRYSTAL-") === true && typeof value === "string" && frequencyPattern.test(value.trim());
+};
+var inductancePattern = /^\d+(?:\.\d+)?\s*(?:pH|nH|uH|µH|mH|H)$/i;
+var isInductorComponent = (betterEasy) => {
+  const componentParameters = betterEasy.dataStr.head.c_para;
+  const packageName = componentParameters.package;
+  const value = componentParameters.Value;
+  return packageName?.toUpperCase().startsWith("IND-") === true && typeof value === "string" && inductancePattern.test(value.trim());
+};
+var isMicroUsbConnectorComponent = (betterEasy) => {
+  const componentParameters = betterEasy.dataStr.head.c_para;
+  return componentParameters.pre === "USB?" && componentParameters.package?.toUpperCase().startsWith("MICRO-USB-") === true;
+};
 var categoryValueContainsPushbutton = (value) => {
   if (typeof value === "string") {
     const normalized = value.toLowerCase();
@@ -324690,10 +324794,11 @@ var isSwitchCategoryComponent = (betterEasy) => {
   ].some(categoryValueContainsSwitch);
 };
 var round = (value) => Number(value.toFixed(6));
-var toMillimeters = (value) => round(mil10ToMm(value));
+var EASYEDA_SCHEMATIC_UNIT_TO_TSCIRCUIT_UNIT = 0.02;
+var toSchematicUnits = (value) => round(value * EASYEDA_SCHEMATIC_UNIT_TO_TSCIRCUIT_UNIT);
 var getPointTransformer = (origin) => (point22) => ({
-  x: toMillimeters(point22.x - origin.x),
-  y: toMillimeters(origin.y - point22.y)
+  x: toSchematicUnits(point22.x - origin.x),
+  y: toSchematicUnits(origin.y - point22.y)
 });
 var formatNumber5 = (value) => String(round(value));
 var SVG_PATH_COMMAND_PARAMETER_COUNTS = {
@@ -324785,8 +324890,8 @@ var transformSvgPath = (pathData, origin) => {
       const transformedEndpoint = transformPoint2(endpoint);
       output.push([
         "A",
-        formatNumber5(toMillimeters(Math.abs(values[0]))),
-        formatNumber5(toMillimeters(Math.abs(values[1]))),
+        formatNumber5(toSchematicUnits(Math.abs(values[0]))),
+        formatNumber5(toSchematicUnits(Math.abs(values[1]))),
         formatNumber5(-values[2]),
         String(values[3]),
         String(values[4] === 0 ? 1 : 0),
@@ -324813,16 +324918,13 @@ var getPinStemLength = (path72) => {
   const segment2 = path72.match(/[hHvV]\s*(-?(?:\d*\.\d+|\d+\.?))/);
   if (!segment2)
     return;
-  return toMillimeters(Math.abs(Number(segment2[1])));
+  return toSchematicUnits(Math.abs(Number(segment2[1])));
 };
-var getTextFontSizeMm = (fontSize) => {
+var getTextFontSize = (fontSize) => {
   const numericFontSize = Number.parseFloat(fontSize);
   if (!Number.isFinite(numericFontSize))
-    return 1;
-  if (fontSize.toLowerCase().endsWith("pt")) {
-    return round(numericFontSize * 25.4 / 72);
-  }
-  return toMillimeters(numericFontSize);
+    return 0.2;
+  return toSchematicUnits(numericFontSize);
 };
 var getTextAnchor = (alignment) => {
   if (alignment === "L")
@@ -324862,11 +324964,12 @@ var getPortMetadataByShapeId = (easyEdaJson, circuitJson) => {
     const numericPinNumber = Number(pin.pinNumber);
     if (!portName && Number.isInteger(numericPinNumber)) {
       const numericPortName = `pin${numericPinNumber}`;
-      if (sourcePorts.some((port) => port.name === numericPortName)) {
+      if (!usedPortNames.has(numericPortName) && sourcePorts.some((port) => port.name === numericPortName)) {
         portName = numericPortName;
       }
     }
-    portName ??= sourcePorts[pinIndex]?.name ?? `pin${pinIndex + 1}`;
+    portName ??= sourcePorts.find((port) => !usedPortNames.has(port.name))?.name;
+    portName ??= `pin${pinIndex + 1}`;
     usedPortNames.add(portName);
     const sourcePort = sourcePorts.find((port) => port.name === portName);
     metadataByShapeId.set(pin.id, {
@@ -324891,36 +324994,36 @@ var generateShapeTsx = ({
       x: shape.position.x + shape.width / 2,
       y: shape.position.y + shape.height / 2
     });
-    return `<schematicrect schX={${center2.x}} schY={${center2.y}} width={${toMillimeters(shape.width)}} height={${toMillimeters(shape.height)}} strokeWidth={${toMillimeters(shape.lineWidth)}} color=${JSON.stringify(shape.color)}${shape.fillColor && shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
+    return `<schematicrect schX={${center2.x}} schY={${center2.y}} width={${toSchematicUnits(shape.width)}} height={${toSchematicUnits(shape.height)}} color=${JSON.stringify(shape.color)}${shape.fillColor && shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
   }
   if (shape.type === "ELLIPSE") {
     const center2 = transformPoint2(shape.center);
-    return `<schematiccircle center={{ x: ${center2.x}, y: ${center2.y} }} radius={${toMillimeters(Math.max(shape.radiusX, shape.radiusY))}} strokeWidth={${toMillimeters(shape.lineWidth)}} color=${JSON.stringify(shape.color)}${shape.fillColor && shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
+    return `<schematiccircle center={{ x: ${center2.x}, y: ${center2.y} }} radius={${toSchematicUnits(Math.max(shape.radiusX, shape.radiusY))}} color=${JSON.stringify(shape.color)}${shape.fillColor && shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
   }
   if (shape.type === "POLYLINE" || shape.type === "POLYGON") {
     const isPolygon = shape.type === "POLYGON";
     const points = shape.points.map(transformPoint2);
     if (isPolygon && points.length > 0)
       points.push(points[0]);
-    return `<schematicpath points={${JSON.stringify(points)}} strokeWidth={${toMillimeters(shape.lineWidth)}} strokeColor=${JSON.stringify(isPolygon ? shape.lineColor : shape.color)}${isPolygon && shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
+    return `<schematicpath points={${JSON.stringify(points)}} strokeColor=${JSON.stringify(isPolygon ? shape.lineColor : shape.color)}${isPolygon && shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
   }
   if (shape.type === "PATH") {
     const transformedPath = transformSvgPath(shape.pathData, origin);
     if (!transformedPath)
       return;
-    return `<schematicpath svgPath=${JSON.stringify(transformedPath)} strokeWidth={${shape.strokeWidth}} strokeColor=${JSON.stringify(shape.strokeColor)}${shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
+    return `<schematicpath svgPath=${JSON.stringify(transformedPath)} strokeColor=${JSON.stringify(shape.strokeColor)}${shape.fillColor !== "none" ? ` isFilled fillColor=${JSON.stringify(shape.fillColor)}` : ""} />`;
   }
   if (shape.type === "ARC") {
     const transformedPath = transformSvgPath(shape.pathData, origin);
     if (!transformedPath)
       return;
-    return `<schematicpath svgPath=${JSON.stringify(transformedPath)} strokeWidth={${toMillimeters(shape.lineWidth)}} strokeColor=${JSON.stringify(shape.color)} />`;
+    return `<schematicpath svgPath=${JSON.stringify(transformedPath)} strokeColor=${JSON.stringify(shape.color)} />`;
   }
   if (shape.type === "TEXT") {
     if (shape.visibility !== "1")
       return;
     const position2 = transformPoint2({ x: shape.x, y: shape.y });
-    return `<schematictext schX={${position2.x}} schY={${position2.y}} text=${JSON.stringify(shape.content)} fontSize={${getTextFontSizeMm(shape.fontSize)}} anchor=${JSON.stringify(getTextAnchor(shape.alignment))} color=${JSON.stringify(shape.fontColor)} schRotation={${round(-shape.rotation)}} />`;
+    return `<schematictext schX={${position2.x}} schY={${position2.y}} text=${JSON.stringify(shape.content)} fontSize={${getTextFontSize(shape.fontSize)}} anchor=${JSON.stringify(getTextAnchor(shape.alignment))} color=${JSON.stringify(shape.fontColor)} schRotation={${round(-shape.rotation)}} />`;
   }
   if (shape.type === "PIN" && portMetadata) {
     const position2 = transformPoint2({ x: shape.x, y: shape.y });
@@ -324976,6 +325079,12 @@ var getGeneratedComponentType = (betterEasy) => {
     return "pushbutton";
   if (isSwitchCategoryComponent(betterEasy))
     return "switch";
+  if (isInductorComponent(betterEasy))
+    return "inductor";
+  if (isCrystalComponent(betterEasy))
+    return "crystal";
+  if (isMicroUsbConnectorComponent(betterEasy))
+    return "connector";
   return "chip";
 };
 var convertRawEasyToTsx = async ({ rawEasy }) => {
@@ -325003,8 +325112,11 @@ var convertBetterEasyToTsx = async ({
     cadComponent.position.x = 0;
     cadComponent.position.y = 0;
   }
-  const rawPn = betterEasy.dataStr.head.c_para["Manufacturer Part"];
-  const pn3 = rawPn ? normalizeManufacturerPartNumber(rawPn) : "unknown";
+  const manufacturerPartNumber = betterEasy.dataStr.head.c_para["Manufacturer Part"];
+  if (!manufacturerPartNumber) {
+    throw new Error(`Missing manufacturer part number for ${betterEasy.lcsc.number}`);
+  }
+  const componentName = normalizeManufacturerPartNumber(manufacturerPartNumber);
   const sourcePorts = su17(circuitJson).source_port.list();
   const pinLabels = {};
   const sortedPorts = sourcePorts.sort((a2, b3) => {
@@ -325034,16 +325146,22 @@ var convertBetterEasyToTsx = async ({
     jlcpcb: [betterEasy.lcsc.number]
   };
   const componentType = getGeneratedComponentType(betterEasy);
+  const inductance22 = componentType === "inductor" ? betterEasy.dataStr.head.c_para.Value?.trim() : 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;
   return generateTypescriptComponent({
-    componentName: pn3,
-    manufacturerPartNumber: pn3,
+    componentName,
+    manufacturerPartNumber,
     pinLabels,
     objUrl: modelObjUrl,
     stepUrl: modelStepUrl,
     circuitJson,
     supplierPartNumbers,
     componentType,
+    inductance: inductance22,
+    crystalFrequency,
+    crystalPinVariant,
     symbolTsx
   });
 };
@@ -325146,7 +325264,18 @@ async function fetchEasyEDAComponent(jlcpcbPartNumber, {
   if (!searchResult.success || !searchResult.result.lists.lcsc.length) {
     throw new Error("Component not found");
   }
-  const bestMatchComponent = searchResult.result.lists.lcsc.find((component) => component.dataStr.head.c_para["Supplier Part"] === jlcpcbPartNumber) ?? searchResult.result.lists.lcsc[0];
+  const requestedPartNumber = jlcpcbPartNumber.trim().toUpperCase();
+  const bestMatchComponent = searchResult.result.lists.lcsc.find((component) => {
+    const candidatePartNumbers = [
+      component.dataStr?.head?.c_para?.["Supplier Part"],
+      component.lcsc?.number,
+      component.szlcsc?.number
+    ];
+    return candidatePartNumbers.some((partNumber) => typeof partNumber === "string" && partNumber.trim().toUpperCase() === requestedPartNumber);
+  });
+  if (!bestMatchComponent) {
+    throw new Error(`No exact EasyEDA component match for "${jlcpcbPartNumber}"`);
+  }
   const componentUUID = bestMatchComponent.uuid;
   const componentResponse = await fetch22(componentUrl(componentUUID), {
     method: "GET",
@@ -330595,6 +330724,8 @@ var isDiodeCategoryComponent2 = (betterEasy) => {
 };
 var categoryValueContainsLed2 = (value) => {
   if (typeof value === "string") {
+    if (/(^|[^a-z])leds?\s+drivers?([^a-z]|$)/i.test(value))
+      return false;
     return /(^|[^a-z])leds?([^a-z]|$)/i.test(value) || /light[-\s]?emitting\s+diodes?/i.test(value);
   }
   if (Array.isArray(value)) {
@@ -331026,7 +331157,7 @@ var convertEasyEdaJsonToCircuitJson2 = (easyEdaJson, {
       if (pad2.shape === "RECT") {
         soupShape = "rect";
       } else if (pad2.shape === "ELLIPSE") {
-        soupShape = "rect";
+        soupShape = "circle";
       } else if (pad2.shape === "OVAL") {
         soupShape = "pill";
       } else if (pad2.shape === "POLYGON") {
@@ -331794,8 +331925,13 @@ var parsePath2 = (str) => {
 };
 var PathShapeSchema2 = z180.string().startsWith("PT~").transform(parsePath2).pipe(PathShapeOutputSchema2);
 var optionalEasyEdaTextField2 = (fieldSchema) => z180.preprocess((textField) => {
-  if (textField == null || textField === "" || textField === "undefined") {
+  if (textField == null)
     return;
+  if (typeof textField === "string") {
+    const trimmedTextField = textField.trim();
+    if (trimmedTextField === "" || trimmedTextField === "undefined") {
+      return;
+    }
   }
   return textField;
 }, fieldSchema);

package/dist/lib/index.js

@@ -65817,7 +65817,7 @@ var package_default = {
     debug: "^4.4.0",
     delay: "^6.0.0",
     "dsn-converter": "^0.0.90",
-    easyeda: "^0.0.279",
+    easyeda: "^0.0.292",
     "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.1907",
+  "version": "0.1.1908",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -57,7 +57,7 @@
     "debug": "^4.4.0",
     "delay": "^6.0.0",
     "dsn-converter": "^0.0.90",
-    "easyeda": "^0.0.279",
+    "easyeda": "^0.0.292",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",