circuit-json 0.0.503 → 0.0.504

package/dist/index.mjs

@@ -2513,16 +2513,46 @@ expectTypesMatch(true);
 
 // src/pcb/pcb_trace.ts
 import { z as z116 } from "zod";
+var positive_width = distance.pipe(z116.number().finite().positive());
 var pcb_trace_route_point_wire = z116.object({
   route_type: z116.literal("wire"),
   x: distance,
   y: distance,
   width: distance,
+  start_width: positive_width.optional(),
+  end_width: positive_width.optional(),
+  width_interpolation_mode: z116.enum(["linear", "quadratic"]).optional(),
   copper_pour_id: z116.string().optional(),
   is_inside_copper_pour: z116.boolean().optional(),
   start_pcb_port_id: z116.string().optional(),
   end_pcb_port_id: z116.string().optional(),
   layer: layer_ref
+}).superRefine((wire, ctx) => {
+  const present = [
+    wire.start_width,
+    wire.end_width,
+    wire.width_interpolation_mode
+  ].filter((v) => v !== void 0).length;
+  if (present === 0) return;
+  if (present !== 3) {
+    ctx.addIssue({
+      code: z116.ZodIssueCode.custom,
+      message: "Wire taper requires start_width, end_width and width_interpolation_mode together"
+    });
+  }
+  if (wire.width !== wire.start_width) {
+    ctx.addIssue({
+      code: z116.ZodIssueCode.custom,
+      path: ["start_width"],
+      message: "start_width must equal width"
+    });
+  }
+  if (!Number.isFinite(wire.x) || !Number.isFinite(wire.y)) {
+    ctx.addIssue({
+      code: z116.ZodIssueCode.custom,
+      message: "Tapered wire coordinates must be finite"
+    });
+  }
 });
 var pcb_trace_route_point_via = z116.object({
   route_type: z116.literal("via"),
@@ -2547,32 +2577,10 @@ var pcb_trace_route_point_through_pad = z116.object({
   pcb_smtpad_id: z116.string().optional(),
   pcb_plated_hole_id: z116.string().optional()
 });
-var positive_width = distance.pipe(z116.number().finite().positive());
-var finite_route_point = point.extend({
-  x: distance.pipe(z116.number().finite()),
-  y: distance.pipe(z116.number().finite())
-});
-var pcb_trace_route_point_teardrop = z116.object({
-  route_type: z116.literal("teardrop"),
-  start: finite_route_point,
-  end: finite_route_point,
-  start_width: positive_width,
-  end_width: positive_width,
-  width_interpolation_mode: z116.enum(["linear", "quadratic"]),
-  layer: layer_ref,
-  copper_pour_id: z116.string().optional(),
-  is_inside_copper_pour: z116.boolean().optional(),
-  start_pcb_port_id: z116.string().optional(),
-  end_pcb_port_id: z116.string().optional()
-}).refine(({ start, end }) => {
-  const length4 = Math.hypot(end.x - start.x, end.y - start.y);
-  return Number.isFinite(length4) && length4 > 0;
-}, "Teardrop endpoints must define a finite, nonzero-length segment");
 var pcb_trace_route_point = z116.union([
   pcb_trace_route_point_wire,
   pcb_trace_route_point_via,
-  pcb_trace_route_point_through_pad,
-  pcb_trace_route_point_teardrop
+  pcb_trace_route_point_through_pad
 ]);
 var pcb_trace = z116.object({
   type: z116.literal("pcb_trace"),
@@ -2587,7 +2595,23 @@ var pcb_trace = z116.object({
   trace_length: z116.number().optional(),
   is_antenna_trace: z116.boolean().optional(),
   highlight_color: z116.string().optional(),
-  route: z116.array(pcb_trace_route_point)
+  route: z116.array(pcb_trace_route_point).superRefine((route, ctx) => {
+    for (const [i, wire] of route.entries()) {
+      if (wire.route_type !== "wire" || wire.width_interpolation_mode === void 0)
+        continue;
+      const next = route[i + 1];
+      const end = next?.route_type === "through_pad" ? next.start : next;
+      const layer = next?.route_type === "wire" ? next.layer : next?.route_type === "via" ? next.from_layer : next?.start_layer;
+      const length4 = end ? Math.hypot(end.x - wire.x, end.y - wire.y) : NaN;
+      if (!Number.isFinite(length4) || length4 <= 0 || layer !== wire.layer) {
+        ctx.addIssue({
+          code: z116.ZodIssueCode.custom,
+          path: [i],
+          message: "Tapered wire must lead to a distinct finite next point on the same layer"
+        });
+      }
+    }
+  })
 }).describe("Defines a trace on the PCB");
 expectTypesMatch(true);
 expectTypesMatch(true);
@@ -5109,7 +5133,6 @@ export {
   pcb_trace_hint,
   pcb_trace_missing_error,
   pcb_trace_route_point,
-  pcb_trace_route_point_teardrop,
   pcb_trace_route_point_through_pad,
   pcb_trace_route_point_via,
   pcb_trace_route_point_wire,