@tscircuit/pcb-viewer 1.8.1 → 1.9.0

package/dist/index.js

@@ -10108,7 +10108,7 @@ var require_dist = __commonJS({
             route_thickness_mode: import_zod39.z.enum([
                 "constant",
                 "interpolated"
-            ]).default("interpolated").optional(),
+            ]).default("constant").optional(),
             should_round_corners: import_zod39.z.boolean().optional(),
             route: import_zod39.z.array(import_zod39.z.union([
                 import_zod39.z.object({
@@ -10118,7 +10118,7 @@ var require_dist = __commonJS({
                     width: distance,
                     start_pcb_port_id: import_zod39.z.string().optional(),
                     end_pcb_port_id: import_zod39.z.string().optional(),
-                    layer: import_zod39.z.string()
+                    layer: layer_ref
                 }),
                 import_zod39.z.object({
                     route_type: import_zod39.z.literal("via"),
@@ -10286,21 +10286,25 @@ var require_dist = __commonJS({
         var import_zod54 = require_lib2();
         var pcb_keepout = import_zod54.z.object({
             type: import_zod54.z.literal("pcb_keepout"),
-            pcb_keepout_id: import_zod54.z.string(),
-            layer: import_zod54.z.array(import_zod54.z.string()).optional(),
-            // Specify layers where the keepout applies
-            description: import_zod54.z.string().optional()
-        }).and(import_zod54.z.object({
             shape: import_zod54.z.literal("rect"),
             x: distance,
             y: distance,
             width: distance,
-            height: distance
+            height: distance,
+            pcb_keepout_id: import_zod54.z.string(),
+            layer: import_zod54.z.array(import_zod54.z.string()).optional(),
+            // Specify layers where the keepout applies
+            description: import_zod54.z.string().optional()
         }).or(import_zod54.z.object({
+            type: import_zod54.z.literal("pcb_keepout"),
             shape: import_zod54.z.literal("circle"),
             center: point,
-            radius: distance
-        })));
+            radius: distance,
+            pcb_keepout_id: import_zod54.z.string(),
+            layer: import_zod54.z.array(import_zod54.z.string()).optional(),
+            // Specify layers where the keepout applies
+            description: import_zod54.z.string().optional()
+        }));
         var import_zod55 = require_lib2();
         var cad_component = import_zod55.z.object({
             type: import_zod55.z.literal("cad_component"),
@@ -10335,6 +10339,7 @@ var require_dist = __commonJS({
             pcb_component,
             pcb_hole,
             pcb_plated_hole,
+            pcb_keepout,
             pcb_port,
             pcb_text,
             pcb_trace,
@@ -11781,16 +11786,13 @@ var drawRect = function(drawer, rect) {
     drawer.equip({
         color: rect.layer
     });
-    if (rect.align && rect.align !== "center") {
-        console.warn("Unhandled rect align", rect.align);
-    }
-    drawer.rect(rect.x, rect.y, rect.w, rect.h);
+    drawer.rect(rect.x, rect.y, rect.w, rect.h, rect.mesh_fill);
 };
 var drawCircle = function(drawer, circle) {
     drawer.equip({
         color: circle.layer
     });
-    drawer.circle(circle.x, circle.y, circle.r);
+    drawer.circle(circle.x, circle.y, circle.r, circle.mesh_fill);
 };
 var drawOval = function(drawer, oval) {
     drawer.equip({
@@ -11841,12 +11843,6 @@ var drawPrimitives = function(drawer, primitives) {
         return drawPrimitive(drawer, primitive);
     });
 };
-// src/lib/util/scale-only.ts
-var scaleOnly = function(mat) {
-    var value = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 1;
-    if (Math.abs(mat.a) !== Math.abs(mat.d)) throw new Error("Cannot scale non-uniformly");
-    return value * Math.abs(mat.a);
-};
 // src/lib/Drawer.ts
 var import_transformation_matrix = require("transformation-matrix");
 // src/lib/colors.ts
@@ -12080,6 +12076,12 @@ var colors_default = {
         worksheet: "rgb(192, 0, 0)"
     }
 };
+// src/lib/util/scale-only.ts
+var scaleOnly = function(mat) {
+    var value = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 1;
+    if (Math.abs(mat.a) !== Math.abs(mat.d)) throw new Error("Cannot scale non-uniformly");
+    return value * Math.abs(mat.a);
+};
 // src/lib/Drawer.ts
 var LAYER_NAME_TO_COLOR = _object_spread({
     // Standard colors, you shouldn't use these except for testing
@@ -12181,9 +12183,40 @@ var Drawer = /*#__PURE__*/ function() {
                 }, aperture);
             }
         },
+        {
+            key: "drawMeshPattern",
+            value: function drawMeshPattern(x, y, width, height, spacing) {
+                var angle = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : 45;
+                var ctx = this.getLayerCtx();
+                var _ref = _sliced_to_array((0, import_transformation_matrix.applyToPoint)(this.transform, [
+                    x,
+                    y
+                ]), 2), x1 = _ref[0], y1 = _ref[1];
+                var _ref1 = _sliced_to_array((0, import_transformation_matrix.applyToPoint)(this.transform, [
+                    x + width,
+                    y + height
+                ]), 2), x2 = _ref1[0], y2 = _ref1[1];
+                var spacing$ = scaleOnly(this.transform, spacing);
+                ctx.lineWidth = 1;
+                ctx.strokeStyle = this.aperture.color;
+                var drawLines = function(angle2) {
+                    var sin = Math.sin(angle2);
+                    var cos = Math.cos(angle2);
+                    var diag = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
+                    for(var i = -diag; i <= diag; i += spacing$){
+                        ctx.beginPath();
+                        ctx.moveTo(x1 + i * cos - diag * sin, y1 + i * sin + diag * cos);
+                        ctx.lineTo(x1 + i * cos + diag * sin, y1 + i * sin - diag * cos);
+                        ctx.stroke();
+                    }
+                };
+                drawLines(angle * Math.PI / 180);
+                drawLines((angle + 90) * Math.PI / 180);
+            }
+        },
         {
             key: "rect",
-            value: function rect(x, y, w, h) {
+            value: function rect(x, y, w, h, mesh_fill) {
                 var _ref = _sliced_to_array((0, import_transformation_matrix.applyToPoint)(this.transform, [
                     x - w / 2,
                     y - h / 2
@@ -12194,12 +12227,22 @@ var Drawer = /*#__PURE__*/ function() {
                 ]), 2), x2$ = _ref1[0], y2$ = _ref1[1];
                 this.applyAperture();
                 var ctx = this.getLayerCtx();
-                ctx.fillRect(x1$, y1$, x2$ - x1$, y2$ - y1$);
+                if (mesh_fill) {
+                    ctx.save();
+                    ctx.beginPath();
+                    ctx.rect(x1$, y1$, x2$ - x1$, y2$ - y1$);
+                    ctx.clip();
+                    this.drawMeshPattern(x - w / 2, y - h / 2, w, h, 0.15);
+                    ctx.restore();
+                    ctx.strokeRect(x1$, y1$, x2$ - x1$, y2$ - y1$);
+                } else {
+                    ctx.fillRect(x1$, y1$, x2$ - x1$, y2$ - y1$);
+                }
             }
         },
         {
             key: "circle",
-            value: function circle(x, y, r) {
+            value: function circle(x, y, r, mesh_fill) {
                 var r$ = scaleOnly(this.transform, r);
                 var _ref = _sliced_to_array((0, import_transformation_matrix.applyToPoint)(this.transform, [
                     x,
@@ -12207,10 +12250,21 @@ var Drawer = /*#__PURE__*/ function() {
                 ]), 2), x$ = _ref[0], y$ = _ref[1];
                 this.applyAperture();
                 var ctx = this.getLayerCtx();
-                ctx.beginPath();
-                ctx.arc(x$, y$, r$, 0, 2 * Math.PI);
-                ctx.fill();
-                ctx.closePath();
+                if (mesh_fill) {
+                    ctx.save();
+                    ctx.beginPath();
+                    ctx.arc(x$, y$, r$, 0, 2 * Math.PI);
+                    ctx.clip();
+                    this.drawMeshPattern(x - r, y - r, r * 2, r * 2, 0.15);
+                    ctx.restore();
+                    ctx.beginPath();
+                    ctx.arc(x$, y$, r$, 0, 2 * Math.PI);
+                    ctx.stroke();
+                } else {
+                    ctx.beginPath();
+                    ctx.arc(x$, y$, r$, 0, 2 * Math.PI);
+                    ctx.fill();
+                }
             }
         },
         {
@@ -12839,48 +12893,45 @@ var convertElementToPrimitives = function(element, allElements) {
                     return [];
                 }
             }
-        case "pcb_trace":
+        case "pcb_keepout":
             {
-                var primitives = [];
-                if (element.route_thickness_mode === "constant") {
-                    var prevX = null;
-                    var prevY = null;
-                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                    try {
-                        for(var _iterator = element.route[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                            var route = _step.value;
-                            if (route.route_type === "wire") {
-                                if (prevX !== null && prevY !== null) {
-                                    primitives.push({
-                                        pcb_drawing_type: "line",
-                                        x1: prevX,
-                                        y1: prevY,
-                                        x2: route.x,
-                                        y2: route.y,
-                                        width: route.width,
-                                        squareCap: false,
-                                        layer: route.layer
-                                    });
-                                }
-                                prevX = route.x;
-                                prevY = route.y;
-                            }
+                if (element.shape === "circle") {
+                    var center1 = element.center, radius1 = element.radius;
+                    return [
+                        {
+                            pcb_drawing_type: "circle",
+                            x: center1.x,
+                            y: center1.y,
+                            r: radius1,
+                            layer: "top",
+                            _element: element,
+                            _parent_pcb_component: _parent_pcb_component,
+                            _parent_source_component: _parent_source_component,
+                            mesh_fill: true
                         }
-                    } catch (err) {
-                        _didIteratorError = true;
-                        _iteratorError = err;
-                    } finally{
-                        try {
-                            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                _iterator.return();
-                            }
-                        } finally{
-                            if (_didIteratorError) {
-                                throw _iteratorError;
-                            }
+                    ];
+                } else if (element.shape === "rect") {
+                    var x6 = element.x, y6 = element.y, width2 = element.width, height2 = element.height;
+                    return [
+                        {
+                            pcb_drawing_type: "rect",
+                            x: x6,
+                            y: y6,
+                            w: width2,
+                            h: height2,
+                            layer: "drill",
+                            _element: element,
+                            _parent_pcb_component: _parent_pcb_component,
+                            _parent_source_component: _parent_source_component,
+                            mesh_fill: true
                         }
-                    }
-                } else if (element.route_thickness_mode === "interpolated") {
+                    ];
+                }
+            }
+        case "pcb_trace":
+            {
+                var primitives = [];
+                if (element.route_thickness_mode === "interpolated") {
                     var strokeInput = element.route.map(function(r) {
                         return {
                             x: r.x,
@@ -12906,17 +12957,55 @@ var convertElementToPrimitives = function(element, allElements) {
                             });
                         }
                     });
+                    return primitives;
+                }
+                var prevX = null;
+                var prevY = null;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = element.route[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var route = _step.value;
+                        if (route.route_type === "wire") {
+                            if (prevX !== null && prevY !== null) {
+                                primitives.push({
+                                    pcb_drawing_type: "line",
+                                    x1: prevX,
+                                    y1: prevY,
+                                    x2: route.x,
+                                    y2: route.y,
+                                    width: route.width,
+                                    squareCap: false,
+                                    layer: route.layer
+                                });
+                            }
+                            prevX = route.x;
+                            prevY = route.y;
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
                 }
                 return primitives;
             }
         case "pcb_via":
             {
-                var x6 = element.x, y6 = element.y, outer_diameter1 = element.outer_diameter, hole_diameter2 = element.hole_diameter, from_layer = element.from_layer, to_layer = element.to_layer;
+                var x7 = element.x, y7 = element.y, outer_diameter1 = element.outer_diameter, hole_diameter2 = element.hole_diameter, from_layer = element.from_layer, to_layer = element.to_layer;
                 return [
                     {
                         pcb_drawing_type: "circle",
-                        x: x6,
-                        y: y6,
+                        x: x7,
+                        y: y7,
                         r: outer_diameter1 / 2,
                         layer: from_layer,
                         _element: element,
@@ -12925,8 +13014,8 @@ var convertElementToPrimitives = function(element, allElements) {
                     },
                     {
                         pcb_drawing_type: "circle",
-                        x: x6,
-                        y: y6,
+                        x: x7,
+                        y: y7,
                         r: hole_diameter2 / 2,
                         layer: "drill",
                         _element: element,
@@ -12935,8 +13024,8 @@ var convertElementToPrimitives = function(element, allElements) {
                     },
                     {
                         pcb_drawing_type: "circle",
-                        x: x6,
-                        y: y6,
+                        x: x7,
+                        y: y7,
                         r: outer_diameter1 / 2,
                         layer: to_layer,
                         _element: element,
@@ -13567,7 +13656,7 @@ var import_soup2 = __toESM(require_dist());
 // package.json
 var package_default = {
     name: "@tscircuit/pcb-viewer",
-    version: "1.8.0",
+    version: "1.8.2",
     main: "dist/index.js",
     repository: "tscircuit/pcb-viewer",
     license: "MIT",
@@ -13594,7 +13683,7 @@ var package_default = {
         "@tscircuit/eagle-xml-converter": "^0.0.6",
         "@tscircuit/props": "^0.0.46",
         "@tscircuit/react-fiber": "^1.1.25",
-        "@tscircuit/soup": "^0.0.58",
+        "@tscircuit/soup": "^0.0.61",
         "@tscircuit/soup-util": "^0.0.13",
         "@types/node": "18.7.23",
         "@types/react": "^18.3.3",