@tscircuit/cli 0.1.1947 → 0.1.1949

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.1946";
+var version = "0.1.1948";
 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.296",
+    easyeda: "^0.0.305",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     globby: "^14.1.0",
@@ -326886,8 +326886,17 @@ var getPolarizedPinMetadata = (pinLabels) => {
     pinLabels: Object.fromEntries(polarizedPinEntries)
   };
 };
+var normalizeActiveLowPinLabel = (label) => {
+  if (!label.startsWith("#"))
+    return label;
+  const activeLowLabel = label.slice(1);
+  if (activeLowLabel.length === 0)
+    return label;
+  return `N_${activeLowLabel}`;
+};
 var normalizePinLabels = (inputPinLabels) => {
-  const uniqueInputPinLabels = inputPinLabels.map((labels) => [
+  const normalizedInputPinLabels = inputPinLabels.map((labels) => labels.map(normalizeActiveLowPinLabel));
+  const uniqueInputPinLabels = normalizedInputPinLabels.map((labels) => [
     ...new Set(labels)
   ]);
   const result = uniqueInputPinLabels.map(() => []);
@@ -327012,6 +327021,23 @@ var isLedCategoryComponent = (betterEasy) => {
     betterEasy.category
   ].some(categoryValueContainsLed);
 };
+function distance211(p12, p22) {
+  const dx3 = p12.x - p22.x;
+  const dy3 = p12.y - p22.y;
+  return Math.sqrt(dx3 * dx3 + dy3 * dy3);
+}
+var getUnitVectorFromDirection2 = (direction2) => {
+  switch (direction2) {
+    case "up":
+      return { x: 0, y: 1 };
+    case "down":
+      return { x: 0, y: -1 };
+    case "left":
+      return { x: -1, y: 0 };
+    case "right":
+      return { x: 1, y: 0 };
+  }
+};
 var getBoundsCenter3 = (bounds) => ({
   x: (bounds.minX + bounds.maxX) / 2,
   y: (bounds.minY + bounds.maxY) / 2
@@ -327213,7 +327239,7 @@ var handleSilkscreenArc = (arc2, index) => {
     type: "pcb_silkscreen_path",
     pcb_silkscreen_path_id: `pcb_silkscreen_arc_${index + 1}`,
     pcb_component_id: "pcb_component_1",
-    layer: "top",
+    layer: getSideFromLayer(arc2.layer),
     route: arcPath.map((p3) => ({
       x: milx10(p3.x),
       y: milx10(p3.y)
@@ -327766,7 +327792,7 @@ var SolidRegionSchema = BaseShapeSchema.extend({
   type: external_exports2.literal("SOLIDREGION"),
   layermask: external_exports2.number(),
   points: external_exports2.array(PointSchema),
-  fillStyle: external_exports2.string()
+  fillStyle: external_exports2.string().default("none")
 });
 var SVGNodeSchema = BaseShapeSchema.extend({
   type: external_exports2.literal("SVGNODE"),
@@ -327797,7 +327823,7 @@ var RectSchema = BaseShapeSchema.extend({
   width: tenthmil,
   height: tenthmil,
   lineWidth: external_exports2.number(),
-  fillStyle: external_exports2.string(),
+  fillStyle: external_exports2.string().default("none"),
   rotation: external_exports2.number().optional()
 });
 var TextSchema = BaseShapeSchema.extend({
@@ -327955,7 +327981,7 @@ var ShapeItemSchema = external_exports2.object({
         type: "SOLIDREGION",
         layermask: Number(layermask),
         points,
-        fillStyle,
+        fillStyle: fillStyle || undefined,
         id: id2
       });
     }
@@ -328203,6 +328229,17 @@ var parsePath = (str) => {
   };
 };
 var PathShapeSchema = external_exports2.string().startsWith("PT~").transform(parsePath).pipe(PathShapeOutputSchema);
+var IgnoredShapeOutputSchema = external_exports2.object({
+  type: external_exports2.literal("IGNORED"),
+  sourceType: external_exports2.enum(["AR", "I"])
+});
+var IgnoredShapeSchema = external_exports2.string().transform((shape) => {
+  const sourceType = shape.startsWith("AR~") ? "AR" : shape.startsWith("I~") ? "I" : undefined;
+  if (!sourceType) {
+    throw new Error(`Invalid ignored shape: ${shape}`);
+  }
+  return { type: "IGNORED", sourceType };
+}).pipe(IgnoredShapeOutputSchema);
 var optionalEasyEdaTextField = (fieldSchema) => external_exports2.preprocess((textField) => {
   if (textField == null)
     return;
@@ -328253,7 +328290,7 @@ var parseText = (str) => {
   ] = str.split("~");
   return {
     type: "TEXT",
-    alignment,
+    alignment: alignment === "P" ? "L" : alignment,
     x: Number(x4),
     y: Number(y4),
     rotation: Number(rotation23),
@@ -328286,6 +328323,9 @@ var SingleLetterShapeSchema = external_exports2.string().transform((x4) => {
     return PathShapeSchema.parse(x4);
   if (x4.startsWith("T~"))
     return TextShapeSchema.parse(x4);
+  if (x4.startsWith("AR~") || x4.startsWith("I~")) {
+    return IgnoredShapeSchema.parse(x4);
+  }
   if (x4.startsWith("A~"))
     return ArcShapeSchema.parse(x4);
   throw new Error(`Invalid shape type: ${x4}`);
@@ -328297,15 +328337,28 @@ var SingleLetterShapeSchema = external_exports2.string().transform((x4) => {
   PolygonShapeOutputSchema,
   PathShapeOutputSchema,
   TextShapeOutputSchema,
+  IgnoredShapeOutputSchema,
   ArcShapeOutputSchema
 ]));
 var maybeNumber = external_exports2.any().transform((k4) => k4 === "nan" || Number.isNaN(k4) ? null : k4).pipe(external_exports2.number().nullable().optional());
+var optionalNumberWithNumericString = external_exports2.preprocess((value) => {
+  if (typeof value !== "string")
+    return value;
+  if (value.trim() === "")
+    return;
+  return Number(value);
+}, external_exports2.number().optional());
 var SzlcscSchema = external_exports2.object({
-  id: external_exports2.number(),
+  id: external_exports2.preprocess((value) => {
+    if (typeof value === "string" && /^\d+$/.test(value)) {
+      return Number(value);
+    }
+    return value;
+  }, external_exports2.number()),
   number: external_exports2.string(),
   step: external_exports2.number().optional(),
   min: external_exports2.number().optional(),
-  price: external_exports2.number().optional(),
+  price: optionalNumberWithNumericString,
   stock: external_exports2.number().optional(),
   url: external_exports2.string().url().optional(),
   image: external_exports2.string().optional().optional()
@@ -328315,7 +328368,7 @@ var LcscSchema = external_exports2.object({
   number: external_exports2.string(),
   step: external_exports2.number().optional(),
   min: external_exports2.number().optional(),
-  price: external_exports2.number().optional(),
+  price: optionalNumberWithNumericString,
   stock: external_exports2.number().optional(),
   url: external_exports2.string().url().optional()
 });
@@ -328334,12 +328387,12 @@ var HeadSchema = external_exports2.object({
   puuid: external_exports2.string().optional(),
   uuid: external_exports2.string(),
   utime: external_exports2.preprocess((val) => {
-    if (val === "")
-      return 0;
+    if (val == null || val === "")
+      return;
     if (typeof val === "string")
       return Number(val);
     return val;
-  }, external_exports2.number()),
+  }, external_exports2.number().optional()),
   importFlag: external_exports2.number().optional(),
   c_spiceCmd: external_exports2.any().optional(),
   hasIdFlag: external_exports2.boolean().default(false)
@@ -328592,7 +328645,7 @@ var generateFootprintTsx2 = (circuitJson, options = {}) => {
     if (hole.hole_shape === "circle") {
       elementStrings.push(`<hole pcbX="${mmStr2(hole.x)}" pcbY="${mmStr2(hole.y)}" diameter="${mmStr2(hole.hole_diameter)}" />`);
     } else if (hole.hole_shape === "oval") {
-      console.warn("Unhandled oval hole in conversion (needs implementation)");
+      elementStrings.push(`<hole pcbX="${mmStr2(hole.x)}" pcbY="${mmStr2(hole.y)}" width="${mmStr2(hole.hole_width)}" height="${mmStr2(hole.hole_height)}" shape="oval" />`);
     }
   }
   for (const platedHole of platedHoles) {
@@ -328808,7 +328861,7 @@ export const ${componentName} = (props: Omit<CapacitorProps, "capacitance">) =>
     <capacitor
       name={name}
       capacitance=${JSON.stringify(capacitance22)}
-      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+${symbolProp2}      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
       manufacturerPartNumber="${manufacturerPartNumber}"
       footprint={${footprintTsx}}
       ${objUrl || stepUrl ? `cadModel={{
@@ -328834,7 +328887,7 @@ export const ${componentName} = (props: Omit<ResistorProps, "resistance">) => {
     <resistor
       name={name}
       resistance=${JSON.stringify(resistance22)}
-      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
+${symbolProp2}      supplierPartNumbers={${JSON.stringify(supplierPartNumbers, null, "  ")}}
       manufacturerPartNumber="${manufacturerPartNumber}"
       footprint={${footprintTsx}}
       ${objUrl || stepUrl ? `cadModel={{
@@ -329200,6 +329253,40 @@ var getPinStemLength = (path72) => {
     return;
   return toSchematicUnits(Math.abs(Number(segment2[1])));
 };
+var getOpenPolylineEndpoints = (shapes, transformPoint2) => shapes.flatMap((shape) => {
+  if (shape.type !== "POLYLINE" || shape.points.length < 2)
+    return [];
+  const first = shape.points[0];
+  const last = shape.points[shape.points.length - 1];
+  if (first.x === last.x && first.y === last.y)
+    return [];
+  return [transformPoint2(first), transformPoint2(last)];
+});
+var alignPortToDrawing = ({
+  position: position2,
+  direction: direction2,
+  stemLength,
+  drawingEndpoints
+}) => {
+  if (stemLength === undefined)
+    return position2;
+  const outwardDirection = getUnitVectorFromDirection2(direction2);
+  const expectedBodyConnection = {
+    x: position2.x - outwardDirection.x * stemLength,
+    y: position2.y - outwardDirection.y * stemLength
+  };
+  const alignmentTolerance = Math.max(0.02, stemLength * 0.25);
+  const nearestEndpoint = drawingEndpoints.map((endpoint) => ({
+    endpoint,
+    distance: distance211(endpoint, expectedBodyConnection)
+  })).filter((candidate) => candidate.distance <= alignmentTolerance).sort((a2, b3) => a2.distance - b3.distance)[0]?.endpoint;
+  if (!nearestEndpoint)
+    return position2;
+  return {
+    x: round(nearestEndpoint.x + outwardDirection.x * stemLength),
+    y: round(nearestEndpoint.y + outwardDirection.y * stemLength)
+  };
+};
 var getTextFontSize = (fontSize) => {
   const numericFontSize = Number.parseFloat(fontSize);
   if (!Number.isFinite(numericFontSize))
@@ -329266,7 +329353,8 @@ var getPortMetadataByShapeId = (easyEdaJson, circuitJson) => {
 var generateShapeTsx = ({
   shape,
   origin,
-  portMetadata
+  portMetadata,
+  drawingEndpoints = []
 }) => {
   const transformPoint2 = getPointTransformer(origin);
   if (shape.type === "RECTANGLE") {
@@ -329306,16 +329394,27 @@ var generateShapeTsx = ({
     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 });
+    const direction2 = getPinDirection3(shape.rotation);
+    const stemLength = getPinStemLength(shape.path);
+    const position2 = alignPortToDrawing({
+      position: transformPoint2({ x: shape.x, y: shape.y }),
+      direction: direction2,
+      stemLength,
+      drawingEndpoints
+    });
     const pinNumberProp = portMetadata.pinNumber === undefined ? "" : ` pinNumber={${portMetadata.pinNumber}}`;
     const aliasesProp = portMetadata.aliases.length === 0 ? "" : ` aliases={${JSON.stringify(portMetadata.aliases)}}`;
-    const stemLength = getPinStemLength(shape.path);
     const stemLengthProp = stemLength === undefined ? "" : ` schStemLength={${stemLength}}`;
-    return `<port name=${JSON.stringify(portMetadata.name)}${pinNumberProp}${aliasesProp} direction=${JSON.stringify(getPinDirection3(shape.rotation))} schX={${position2.x}} schY={${position2.y}}${stemLengthProp} />`;
+    return `<port name=${JSON.stringify(portMetadata.name)}${pinNumberProp}${aliasesProp} direction=${JSON.stringify(direction2)} schX={${position2.x}} schY={${position2.y}}${stemLengthProp} />`;
   }
+  if (shape.type === "IGNORED")
+    return;
   return;
 };
-var generateSymbolTsx2 = (easyEdaJson, circuitJson) => {
+var generateSymbolTsx2 = (easyEdaJson, circuitJson, {
+  includePorts = true,
+  alignPortsToDrawing = false
+} = {}) => {
   const shapes = easyEdaJson.dataStr.shape;
   if (shapes.length === 0)
     return;
@@ -329330,10 +329429,13 @@ var generateSymbolTsx2 = (easyEdaJson, circuitJson) => {
     y: bounds.y + bounds.height / 2
   };
   const portMetadataByShapeId = getPortMetadataByShapeId(easyEdaJson, circuitJson);
-  const shapeTsx = shapes.map((shape) => generateShapeTsx({
+  const transformPoint2 = getPointTransformer(origin);
+  const drawingEndpoints = alignPortsToDrawing ? getOpenPolylineEndpoints(shapes, transformPoint2) : [];
+  const shapeTsx = shapes.filter((shape) => includePorts || shape.type !== "PIN").map((shape) => generateShapeTsx({
     shape,
     origin,
-    portMetadata: shape.type === "PIN" ? portMetadataByShapeId.get(shape.id) : undefined
+    portMetadata: shape.type === "PIN" ? portMetadataByShapeId.get(shape.id) : undefined,
+    drawingEndpoints
   })).filter((tsx) => Boolean(tsx));
   if (shapeTsx.length === 0)
     return;
@@ -329343,7 +329445,7 @@ ${shapeTsx.map((tsx) => `  ${tsx}`).join(`
 </symbol>`;
 };
 var hasNonBoxSchematicSymbol = (easyEdaJson) => {
-  const drawableShapes = easyEdaJson.dataStr.shape.filter((shape) => shape.type !== "PIN" && shape.type !== "TEXT");
+  const drawableShapes = easyEdaJson.dataStr.shape.filter((shape) => shape.type !== "PIN" && shape.type !== "TEXT" && shape.type !== "IGNORED");
   if (drawableShapes.length === 0)
     return false;
   const rectangles = drawableShapes.filter((shape) => shape.type === "RECTANGLE");
@@ -329436,7 +329538,10 @@ 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 symbolTsx = componentType === "chip" && !isMultiPinDiode && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson) : undefined;
+  const isPassiveWithCustomSymbol = componentType === "capacitor" || componentType === "resistor";
+  const symbolTsx = isPassiveWithCustomSymbol || componentType === "chip" && !isMultiPinDiode && hasNonBoxSchematicSymbol(betterEasy) ? generateSymbolTsx2(betterEasy, circuitJson, {
+    alignPortsToDrawing: isPassiveWithCustomSymbol
+  }) : undefined;
   return generateTypescriptComponent({
     componentName,
     manufacturerPartNumber,
@@ -334910,8 +335015,17 @@ var getPolarizedPinMetadata2 = (pinLabels) => {
     pinLabels: Object.fromEntries(polarizedPinEntries)
   };
 };
+var normalizeActiveLowPinLabel2 = (label) => {
+  if (!label.startsWith("#"))
+    return label;
+  const activeLowLabel = label.slice(1);
+  if (activeLowLabel.length === 0)
+    return label;
+  return `N_${activeLowLabel}`;
+};
 var normalizePinLabels2 = (inputPinLabels) => {
-  const uniqueInputPinLabels = inputPinLabels.map((labels) => [
+  const normalizedInputPinLabels = inputPinLabels.map((labels) => labels.map(normalizeActiveLowPinLabel2));
+  const uniqueInputPinLabels = normalizedInputPinLabels.map((labels) => [
     ...new Set(labels)
   ]);
   const result = uniqueInputPinLabels.map(() => []);
@@ -335223,7 +335337,7 @@ var handleSilkscreenArc2 = (arc2, index) => {
     type: "pcb_silkscreen_path",
     pcb_silkscreen_path_id: `pcb_silkscreen_arc_${index + 1}`,
     pcb_component_id: "pcb_component_1",
-    layer: "top",
+    layer: getSideFromLayer2(arc2.layer),
     route: arcPath.map((p3) => ({
       x: milx102(p3.x),
       y: milx102(p3.y)
@@ -335776,7 +335890,7 @@ var SolidRegionSchema2 = BaseShapeSchema2.extend({
   type: z179.literal("SOLIDREGION"),
   layermask: z179.number(),
   points: z179.array(PointSchema3),
-  fillStyle: z179.string()
+  fillStyle: z179.string().default("none")
 });
 var SVGNodeSchema2 = BaseShapeSchema2.extend({
   type: z179.literal("SVGNODE"),
@@ -335807,7 +335921,7 @@ var RectSchema2 = BaseShapeSchema2.extend({
   width: tenthmil2,
   height: tenthmil2,
   lineWidth: z179.number(),
-  fillStyle: z179.string(),
+  fillStyle: z179.string().default("none"),
   rotation: z179.number().optional()
 });
 var TextSchema2 = BaseShapeSchema2.extend({
@@ -335965,7 +336079,7 @@ var ShapeItemSchema2 = z179.object({
         type: "SOLIDREGION",
         layermask: Number(layermask),
         points,
-        fillStyle,
+        fillStyle: fillStyle || undefined,
         id: id2
       });
     }
@@ -336213,6 +336327,17 @@ var parsePath2 = (str) => {
   };
 };
 var PathShapeSchema2 = z180.string().startsWith("PT~").transform(parsePath2).pipe(PathShapeOutputSchema2);
+var IgnoredShapeOutputSchema2 = z180.object({
+  type: z180.literal("IGNORED"),
+  sourceType: z180.enum(["AR", "I"])
+});
+var IgnoredShapeSchema2 = z180.string().transform((shape) => {
+  const sourceType = shape.startsWith("AR~") ? "AR" : shape.startsWith("I~") ? "I" : undefined;
+  if (!sourceType) {
+    throw new Error(`Invalid ignored shape: ${shape}`);
+  }
+  return { type: "IGNORED", sourceType };
+}).pipe(IgnoredShapeOutputSchema2);
 var optionalEasyEdaTextField2 = (fieldSchema) => z180.preprocess((textField) => {
   if (textField == null)
     return;
@@ -336263,7 +336388,7 @@ var parseText2 = (str) => {
   ] = str.split("~");
   return {
     type: "TEXT",
-    alignment,
+    alignment: alignment === "P" ? "L" : alignment,
     x: Number(x4),
     y: Number(y4),
     rotation: Number(rotation23),
@@ -336296,6 +336421,9 @@ var SingleLetterShapeSchema2 = z180.string().transform((x4) => {
     return PathShapeSchema2.parse(x4);
   if (x4.startsWith("T~"))
     return TextShapeSchema2.parse(x4);
+  if (x4.startsWith("AR~") || x4.startsWith("I~")) {
+    return IgnoredShapeSchema2.parse(x4);
+  }
   if (x4.startsWith("A~"))
     return ArcShapeSchema2.parse(x4);
   throw new Error(`Invalid shape type: ${x4}`);
@@ -336307,15 +336435,28 @@ var SingleLetterShapeSchema2 = z180.string().transform((x4) => {
   PolygonShapeOutputSchema2,
   PathShapeOutputSchema2,
   TextShapeOutputSchema2,
+  IgnoredShapeOutputSchema2,
   ArcShapeOutputSchema2
 ]));
 var maybeNumber2 = z181.any().transform((k4) => k4 === "nan" || Number.isNaN(k4) ? null : k4).pipe(z181.number().nullable().optional());
+var optionalNumberWithNumericString2 = z181.preprocess((value) => {
+  if (typeof value !== "string")
+    return value;
+  if (value.trim() === "")
+    return;
+  return Number(value);
+}, z181.number().optional());
 var SzlcscSchema2 = z181.object({
-  id: z181.number(),
+  id: z181.preprocess((value) => {
+    if (typeof value === "string" && /^\d+$/.test(value)) {
+      return Number(value);
+    }
+    return value;
+  }, z181.number()),
   number: z181.string(),
   step: z181.number().optional(),
   min: z181.number().optional(),
-  price: z181.number().optional(),
+  price: optionalNumberWithNumericString2,
   stock: z181.number().optional(),
   url: z181.string().url().optional(),
   image: z181.string().optional().optional()
@@ -336325,7 +336466,7 @@ var LcscSchema2 = z181.object({
   number: z181.string(),
   step: z181.number().optional(),
   min: z181.number().optional(),
-  price: z181.number().optional(),
+  price: optionalNumberWithNumericString2,
   stock: z181.number().optional(),
   url: z181.string().url().optional()
 });
@@ -336344,12 +336485,12 @@ var HeadSchema2 = z181.object({
   puuid: z181.string().optional(),
   uuid: z181.string(),
   utime: z181.preprocess((val) => {
-    if (val === "")
-      return 0;
+    if (val == null || val === "")
+      return;
     if (typeof val === "string")
       return Number(val);
     return val;
-  }, z181.number()),
+  }, z181.number().optional()),
   importFlag: z181.number().optional(),
   c_spiceCmd: z181.any().optional(),
   hasIdFlag: z181.boolean().default(false)

package/dist/lib/index.js

@@ -65757,7 +65757,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1946";
+var version = "0.1.1948";
 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.296",
+    easyeda: "^0.0.305",
     "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.1947",
+  "version": "0.1.1949",
   "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.296",
+    "easyeda": "^0.0.305",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",