@jwc/jscad-raspberrypi 3.1.0 → 3.2.1

package/dist/examples/example.jscad

@@ -1,25 +1,32 @@
 function main() {
   util.init(CSG);
 
-  var pi = RaspberryPi.BPlus().align('mb', util.unitCube(), 'xy');
+  var pi = RaspberryPi.BPlus(5, 25).align('mb', util.unitCube(), 'xy');
 
   /**
    * Add a spacer to support the screen.
    */
-  pi.add(RaspberryPi.Spacer({}, pi.parts.mb), 'spacer');
+  // pi.add(RaspberryPi.Spacer({}, pi.parts.mb), 'spacer');
 
   /**
    * Add the screen and align it with the pi and the top of the spacer.
    */
   pi.add(
-    RaspberryPi.PiTFT24({}, pi.parts.mb).snap(
-      'mb',
-      pi.parts.spacer,
-      'z',
-      'outside-'
-    ),
-    'screen'
+    RaspberryPi.MiniPiTFT()
+      .snap('board', pi.parts.mb, 'x', 'inside-')
+      .snap('board', pi.parts.mb, 'y', 'inside+')
+      .snap('board', pi.parts.mb, 'z', 'outside-', 15),
+    'miniPiTFT',
+    true,
+    'miniPiTFT'
   );
+
+  pi.add(RaspberryPi.ActiveCoolingFan()
+    .snap('board', pi.parts.mb, 'x', 'inside-')
+    .snap('board', pi.parts.mb, 'y', 'inside+')
+    .snap('board', pi.parts.cpu, 'z', 'outside-', 1)
+    .translate([0, -6, 0]), "activeCoolingFan", true, 'activeCoolingFan');
+
   return pi.combineAll();
 }
 
@@ -68,8 +75,13 @@ function initJscadutils(_CSG, options = {}) {
     });
     var jscadUtils = function(exports, jsCadCSG, scadApi) {
         "use strict";
-        jsCadCSG = jsCadCSG && Object.prototype.hasOwnProperty.call(jsCadCSG, "default") ? jsCadCSG["default"] : jsCadCSG;
-        scadApi = scadApi && Object.prototype.hasOwnProperty.call(scadApi, "default") ? scadApi["default"] : scadApi;
+        function _interopDefaultLegacy(e) {
+            return e && typeof e === "object" && "default" in e ? e : {
+                default: e
+            };
+        }
+        var jsCadCSG__default = _interopDefaultLegacy(jsCadCSG);
+        var scadApi__default = _interopDefaultLegacy(scadApi);
         var util = Object.freeze({
             __proto__: null,
             get NOZZEL_SIZE() {
@@ -154,7 +166,7 @@ function initJscadutils(_CSG, options = {}) {
                 return divxyz;
             },
             get div() {
-                return div$1;
+                return div;
             },
             get mulxyz() {
                 return mulxyz;
@@ -286,104 +298,98 @@ function initJscadutils(_CSG, options = {}) {
                 return addConnector;
             }
         });
-        function _typeof(obj) {
-            "@babel/helpers - typeof";
-            if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-                _typeof = function(obj) {
-                    return typeof obj;
-                };
-            } else {
-                _typeof = function(obj) {
-                    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-                };
-            }
-            return _typeof(obj);
-        }
-        function _defineProperty(obj, key, value) {
-            if (key in obj) {
-                Object.defineProperty(obj, key, {
-                    value,
-                    enumerable: true,
-                    configurable: true,
-                    writable: true
-                });
-            } else {
-                obj[key] = value;
-            }
-            return obj;
-        }
-        function ownKeys(object, enumerableOnly) {
-            var keys = Object.keys(object);
-            if (Object.getOwnPropertySymbols) {
-                var symbols = Object.getOwnPropertySymbols(object);
-                if (enumerableOnly) symbols = symbols.filter((function(sym) {
-                    return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-                }));
-                keys.push.apply(keys, symbols);
-            }
-            return keys;
-        }
-        function _objectSpread2(target) {
-            for (var i = 1; i < arguments.length; i++) {
-                var source = arguments[i] != null ? arguments[i] : {};
-                if (i % 2) {
-                    ownKeys(Object(source), true).forEach((function(key) {
-                        _defineProperty(target, key, source[key]);
-                    }));
-                } else if (Object.getOwnPropertyDescriptors) {
-                    Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-                } else {
-                    ownKeys(Object(source)).forEach((function(key) {
-                        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-                    }));
+        function _arrayLikeToArray(r, a) {
+            (null == a || a > r.length) && (a = r.length);
+            for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+            return n;
+        }
+        function _arrayWithHoles(r) {
+            if (Array.isArray(r)) return r;
+        }
+        function _defineProperty(e, r, t) {
+            return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+                value: t,
+                enumerable: !0,
+                configurable: !0,
+                writable: !0
+            }) : e[r] = t, e;
+        }
+        function _iterableToArrayLimit(r, l) {
+            var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+            if (null != t) {
+                var e, n, i, u, a = [], f = !0, o = !1;
+                try {
+                    if (i = (t = t.call(r)).next, 0 === l) {
+                        if (Object(t) !== t) return;
+                        f = !1;
+                    } else for (;!(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0) ;
+                } catch (r) {
+                    o = !0, n = r;
+                } finally {
+                    try {
+                        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
+                    } finally {
+                        if (o) throw n;
+                    }
                 }
+                return a;
             }
-            return target;
         }
-        function _slicedToArray(arr, i) {
-            return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-        }
-        function _arrayWithHoles(arr) {
-            if (Array.isArray(arr)) return arr;
+        function _nonIterableRest() {
+            throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
         }
-        function _iterableToArrayLimit(arr, i) {
-            if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
-            var _arr = [];
-            var _n = true;
-            var _d = false;
-            var _e = undefined;
-            try {
-                for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
-                    _arr.push(_s.value);
-                    if (i && _arr.length === i) break;
-                }
-            } catch (err) {
-                _d = true;
-                _e = err;
-            } finally {
-                try {
-                    if (!_n && _i["return"] != null) _i["return"]();
-                } finally {
-                    if (_d) throw _e;
-                }
+        function ownKeys(e, r) {
+            var t = Object.keys(e);
+            if (Object.getOwnPropertySymbols) {
+                var o = Object.getOwnPropertySymbols(e);
+                r && (o = o.filter(function(r) {
+                    return Object.getOwnPropertyDescriptor(e, r).enumerable;
+                })), t.push.apply(t, o);
             }
-            return _arr;
+            return t;
         }
-        function _unsupportedIterableToArray(o, minLen) {
-            if (!o) return;
-            if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-            var n = Object.prototype.toString.call(o).slice(8, -1);
-            if (n === "Object" && o.constructor) n = o.constructor.name;
-            if (n === "Map" || n === "Set") return Array.from(o);
-            if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+        function _objectSpread2(e) {
+            for (var r = 1; r < arguments.length; r++) {
+                var t = null != arguments[r] ? arguments[r] : {};
+                r % 2 ? ownKeys(Object(t), !0).forEach(function(r) {
+                    _defineProperty(e, r, t[r]);
+                }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function(r) {
+                    Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+                });
+            }
+            return e;
+        }
+        function _slicedToArray(r, e) {
+            return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
+        }
+        function _toPrimitive(t, r) {
+            if ("object" != typeof t || !t) return t;
+            var e = t[Symbol.toPrimitive];
+            if (void 0 !== e) {
+                var i = e.call(t, r || "default");
+                if ("object" != typeof i) return i;
+                throw new TypeError("@@toPrimitive must return a primitive value.");
+            }
+            return ("string" === r ? String : Number)(t);
         }
-        function _arrayLikeToArray(arr, len) {
-            if (len == null || len > arr.length) len = arr.length;
-            for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-            return arr2;
+        function _toPropertyKey(t) {
+            var i = _toPrimitive(t, "string");
+            return "symbol" == typeof i ? i : i + "";
         }
-        function _nonIterableRest() {
-            throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+        function _typeof(o) {
+            "@babel/helpers - typeof";
+            return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
+                return typeof o;
+            } : function(o) {
+                return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+            }, _typeof(o);
+        }
+        function _unsupportedIterableToArray(r, a) {
+            if (r) {
+                if ("string" == typeof r) return _arrayLikeToArray(r, a);
+                var t = {}.toString.call(r).slice(8, -1);
+                return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+            }
         }
         var toRadians = function toRadians(deg) {
             return deg / 180 * Math.PI;
@@ -443,30 +449,30 @@ function initJscadutils(_CSG, options = {}) {
             solve90ac,
             solveab
         });
-        var div = function div(a, f) {
-            return a.map((function(e) {
+        var div$1 = function div(a, f) {
+            return a.map(function(e) {
                 return e / f;
-            }));
+            });
         };
         var addValue = function addValue(a, f) {
-            return a.map((function(e) {
+            return a.map(function(e) {
                 return e + f;
-            }));
+            });
         };
         var addArray = function addArray(a, f) {
-            return a.map((function(e, i) {
+            return a.map(function(e, i) {
                 return e + f[i];
-            }));
+            });
         };
         var add = function add(a) {
-            return Array.prototype.slice.call(arguments, 1).reduce((function(result, arg) {
+            return Array.prototype.slice.call(arguments, 1).reduce(function(result, arg) {
                 if (Array.isArray(arg)) {
                     result = addArray(result, arg);
                 } else {
                     result = addValue(result, arg);
                 }
                 return result;
-            }), a);
+            }, a);
         };
         var fromxyz = function fromxyz(object) {
             return Array.isArray(object) ? object : [ object.x, object.y, object.z ];
@@ -485,9 +491,9 @@ function initJscadutils(_CSG, options = {}) {
             return a && a.length > 0 ? a[a.length - 1] : undefined;
         };
         var min = function min(a) {
-            return a.reduce((function(result, value) {
+            return a.reduce(function(result, value) {
                 return value < result ? value : result;
-            }), Number.MAX_VALUE);
+            }, Number.MAX_VALUE);
         };
         var range = function range(a, b) {
             var result = [];
@@ -498,7 +504,7 @@ function initJscadutils(_CSG, options = {}) {
         };
         var array = Object.freeze({
             __proto__: null,
-            div,
+            div: div$1,
             addValue,
             addArray,
             add,
@@ -521,11 +527,11 @@ function initJscadutils(_CSG, options = {}) {
                 }
             }, jscadUtilsDebug || {});
             var style = checks.options.browser ? "color:".concat(debugColors[debugCount++ % debugColors.length]) : "".concat(termColors[debugCount++ % termColors.length]);
-            var enabled = checks.enabled.some((function checkEnabled(check) {
+            var enabled = checks.enabled.some(function checkEnabled(check) {
                 return check.test(name);
-            })) && !checks.disabled.some((function checkEnabled(check) {
+            }) && !checks.disabled.some(function checkEnabled(check) {
                 return check.test(name);
-            }));
+            });
             var logger = enabled ? checks.options.browser ? function() {
                 var _console;
                 for (var _len = arguments.length, msg = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -712,9 +718,9 @@ function initJscadutils(_CSG, options = {}) {
         function color(o, r, g, b, a) {
             if (typeof r !== "string") return o.setColor(r, g, b, a);
             if (r === "") return o;
-            var c = name2rgb(r).map((function(x) {
+            var c = name2rgb(r).map(function(x) {
                 return x / 255;
-            }));
+            });
             c[3] = g || 1;
             return o.setColor(c);
         }
@@ -816,10 +822,10 @@ function initJscadutils(_CSG, options = {}) {
                 if (arguments.length === 1) {
                     return this._translate(arguments[0]);
                 } else {
-                    var t = Array.prototype.slice.call(arguments, 0).reduce((function(result, arg) {
+                    var t = Array.prototype.slice.call(arguments, 0).reduce(function(result, arg) {
                         result = undefined(result, arg);
                         return result;
-                    }), [ 0, 0, 0 ]);
+                    }, [ 0, 0, 0 ]);
                     return this._translate(t);
                 }
             };
@@ -829,9 +835,9 @@ function initJscadutils(_CSG, options = {}) {
             proto.prototype.connect = function connectTo(myConnectorName, otherConnector) {
                 var mirror = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
                 var normalrotation = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-                var myConnector = myConnectorName.split(".").reduce((function(a, v) {
+                var myConnector = myConnectorName.split(".").reduce(function(a, v) {
                     return a[v];
-                }), this.properties);
+                }, this.properties);
                 if (!myConnector) {
                     error("The connector '".concat(myConnectorName, "' does not exist on the object [").concat(Object.keys(this.properties).join(","), "]"), "Missing connector property");
                 }
@@ -843,12 +849,12 @@ function initJscadutils(_CSG, options = {}) {
             __proto__: null,
             default: init
         });
-        var CSG = jsCadCSG.CSG, CAG = jsCadCSG.CAG;
-        var rectangular_extrude = scadApi.extrusions.rectangular_extrude;
-        var _scadApi$text = scadApi.text, vector_text = _scadApi$text.vector_text, vector_char = _scadApi$text.vector_char;
-        var union = scadApi.booleanOps.union;
+        var CSG = jsCadCSG__default["default"].CSG, CAG = jsCadCSG__default["default"].CAG;
+        var rectangular_extrude = scadApi__default["default"].extrusions.rectangular_extrude;
+        var _scadApi$text = scadApi__default["default"].text, vector_text = _scadApi$text.vector_text, vector_char = _scadApi$text.vector_char;
+        var union = scadApi__default["default"].booleanOps.union;
         init(CSG);
-        var debug = Debug("jscadUtils:group");
+        var debug$3 = Debug("jscadUtils:group");
         function JsCadUtilsGroup() {
             var names = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
             var parts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -859,16 +865,16 @@ function initJscadutils(_CSG, options = {}) {
             this.holes = holes;
         }
         JsCadUtilsGroup.prototype.add = function(object, name, hidden, subparts, parts) {
-            debug("add", object, name, hidden, subparts, parts);
+            debug$3("add", object, name, hidden, subparts, parts);
             var self = this;
             if (object.parts) {
                 if (name) {
                     if (!hidden) self.names.push(name);
                     self.parts[name] = object.combine(parts);
                     if (subparts) {
-                        Object.keys(object.parts).forEach((function(key) {
+                        Object.keys(object.parts).forEach(function(key) {
                             self.parts[subparts + key] = object.parts[key];
-                        }));
+                        });
                     }
                 } else {
                     Object.assign(self.parts, object.parts);
@@ -894,29 +900,30 @@ function initJscadutils(_CSG, options = {}) {
                 if (pieces.length === 0) {
                     throw new Error("no pieces found in ".concat(self.name, " pieces: ").concat(pieces, " parts: ").concat(Object.keys(self.parts), " names: ").concat(self.names));
                 }
-                debug("combine", self.names, self.parts);
-                var g = union(mapPick(self.parts, pieces, (function(value, key, index, object) {
+                debug$3("combine", self.names, self.parts);
+                var g = union(mapPick(self.parts, pieces, function(value, key, index, object) {
+                    debug$3("combine mapPick", value, key, object);
                     return map ? map(value, key, index, object) : identity(value);
-                }), self.name));
+                }, self.name));
                 return g.subtractIf(self.holes && Array.isArray(self.holes) ? union(self.holes) : self.holes, self.holes && !options.noholes);
             } catch (err) {
-                debug("combine error", this, pieces, options, err);
+                debug$3("combine error", this, pieces, options, err);
                 throw error('group::combine error "'.concat(err.message || err.toString(), '"\nthis: ').concat(this, '\npieces: "').concat(pieces, '"\noptions: ').concat(JSON.stringify(options, null, 2), "\nstack: ").concat(err.stack, "\n"), "JSCAD_UTILS_GROUP_ERROR");
             }
         };
         JsCadUtilsGroup.prototype.map = function(cb) {
             var self = this;
-            self.parts = Object.keys(self.parts).filter((function(k) {
+            self.parts = Object.keys(self.parts).filter(function(k) {
                 return k !== "holes";
-            })).reduce((function(result, key) {
+            }).reduce(function(result, key) {
                 result[key] = cb(self.parts[key], key);
                 return result;
-            }), {});
+            }, {});
             if (self.holes) {
                 if (Array.isArray(self.holes)) {
-                    self.holes = self.holes.map((function(hole, idx) {
+                    self.holes = self.holes.map(function(hole, idx) {
                         return cb(hole, idx);
-                    }));
+                    });
                 } else {
                     self.holes = cb(self.holes, "holes");
                 }
@@ -924,7 +931,7 @@ function initJscadutils(_CSG, options = {}) {
             return self;
         };
         JsCadUtilsGroup.prototype.clone = function(name, map) {
-            debug("clone", name, _typeof(name), map);
+            debug$3("clone", name, _typeof(name), map);
             var self = this;
             if (typeof name == "function") {
                 map = name;
@@ -932,15 +939,15 @@ function initJscadutils(_CSG, options = {}) {
             }
             if (!map) map = identity;
             var group = Group(name);
-            Object.keys(self.parts).forEach((function(key) {
+            Object.keys(self.parts).forEach(function(key) {
                 var part = self.parts[key];
                 var hidden = self.names.indexOf(key) == -1;
                 group.add(map(clone(part)), key, hidden);
-            }));
+            });
             if (self.holes) {
-                group.holes = toArray(self.holes).map((function(part) {
+                group.holes = toArray(self.holes).map(function(part) {
                     return map(CSG.fromPolygons(part.toPolygons()), "holes");
-                }));
+                });
             }
             return group;
         };
@@ -957,9 +964,9 @@ function initJscadutils(_CSG, options = {}) {
             }
             var rotationCenter = solid.centroid();
             var rotationAxis = axes[axis];
-            self.map((function(part) {
+            self.map(function(part) {
                 return part.rotate(rotationCenter, rotationAxis, angle);
-            }));
+            });
             return self;
         };
         JsCadUtilsGroup.prototype.combineAll = function(options, map) {
@@ -970,12 +977,12 @@ function initJscadutils(_CSG, options = {}) {
             try {
                 var self = this;
                 var t = calcSnap(self.combine(part), to, axis, orientation, delta);
-                self.map((function(part) {
+                self.map(function(part) {
                     return part.translate(t);
-                }));
+                });
                 return self;
             } catch (err) {
-                debug("snap error", this, part, to, axis, delta, err);
+                debug$3("snap error", this, part, to, axis, delta, err);
                 throw error('group::snap error "'.concat(err.message || err.toString(), '"\nthis: ').concat(this, '\npart: "').concat(part, '"\nto: ').concat(to, '\naxis: "').concat(axis, '"\norientation: "').concat(orientation, '"\ndelta: "').concat(delta, '"\nstack: ').concat(err.stack, "\n"), "JSCAD_UTILS_GROUP_ERROR");
             }
         };
@@ -985,12 +992,12 @@ function initJscadutils(_CSG, options = {}) {
                 var t = calcCenterWith(self.combine(part, {
                     noholes: true
                 }), axis, to, delta);
-                self.map((function(part) {
+                self.map(function(part) {
                     return part.translate(t);
-                }));
+                });
                 return self;
             } catch (err) {
-                debug("align error", this, part, to, axis, delta, err);
+                debug$3("align error", this, part, to, axis, delta, err);
                 throw error('group::align error "'.concat(err.message || err.toString(), '"\nthis: ').concat(this, '\npart: "').concat(part, '"\nto: ').concat(to, '\naxis: "').concat(axis, '"\ndelta: "').concat(delta, '"\nstack: ').concat(err.stack, "\n"), "JSCAD_UTILS_GROUP_ERROR");
             }
         };
@@ -1006,7 +1013,7 @@ function initJscadutils(_CSG, options = {}) {
         JsCadUtilsGroup.prototype.connectTo = function connectTo(partName, connectorName, to, toConnectorName) {
             var mirror = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
             var normalrotation = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
-            debug("connectTo", {
+            debug$3("connectTo", {
                 partName,
                 connectorName,
                 to,
@@ -1015,38 +1022,38 @@ function initJscadutils(_CSG, options = {}) {
                 normalrotation
             });
             var self = this;
-            var myConnector = connectorName.split(".").reduce((function(a, v) {
+            var myConnector = connectorName.split(".").reduce(function(a, v) {
                 return a[v];
-            }), self.parts[partName].properties);
-            debug("toConnector", to instanceof CSG.Connector);
-            var toConnector = toConnectorName.split(".").reduce((function(a, v) {
+            }, self.parts[partName].properties);
+            debug$3("toConnector", to instanceof CSG.Connector);
+            var toConnector = toConnectorName.split(".").reduce(function(a, v) {
                 return a[v];
-            }), to.properties);
+            }, to.properties);
             var matrix = myConnector.getTransformationTo(toConnector, mirror, normalrotation);
-            debug("connectTo", matrix);
-            self.map((function(part) {
+            debug$3("connectTo", matrix);
+            self.map(function(part) {
                 return part.transform(matrix);
-            }));
+            });
             return self;
         };
         JsCadUtilsGroup.prototype.midlineTo = function midlineTo(part, axis, to) {
             var self = this;
             var size = self.combine(part).size();
-            var t = axisApply(axis, (function(i, a) {
+            var t = axisApply(axis, function(i, a) {
                 return to - size[a] / 2;
-            }));
-            self.map((function(part) {
+            });
+            self.map(function(part) {
                 return part.translate(t);
-            }));
+            });
             return self;
         };
         JsCadUtilsGroup.prototype.translate = function translate(x, y, z) {
             var self = this;
             var t = Array.isArray(x) ? x : [ x, y, z ];
-            debug("translate", t);
-            self.map((function(part) {
+            debug$3("translate", t);
+            self.map(function(part) {
                 return part.translate(t);
-            }));
+            });
             return self;
         };
         JsCadUtilsGroup.prototype.pick = function(parts, map) {
@@ -1054,9 +1061,9 @@ function initJscadutils(_CSG, options = {}) {
             var p = parts && parts.length > 0 && parts.split(",") || self.names;
             if (!map) map = identity;
             var g = Group();
-            p.forEach((function(name) {
+            p.forEach(function(name) {
                 g.add(map(CSG.fromPolygons(self.parts[name].toPolygons()), name), name);
-            }));
+            });
             return g;
         };
         JsCadUtilsGroup.prototype.array = function(parts, map) {
@@ -1065,32 +1072,32 @@ function initJscadutils(_CSG, options = {}) {
             var p = parts && parts.length > 0 && parts.split(",") || self.names;
             if (!map) map = identity;
             var a = [];
-            p.forEach((function(name) {
+            p.forEach(function(name) {
                 if (!self.parts[name]) {
-                    debug("array error", _this, parts);
+                    debug$3("array error", _this, parts);
                     throw error('group::array error "'.concat(name, '" not found.\nthis: ').concat(_this, '\nparts: "').concat(parts, '"\n'), "JSCAD_UTILS_GROUP_ERROR");
                 }
                 a.push(map(CSG.fromPolygons(self.parts[name].toPolygons()), name));
-            }));
+            });
             return a;
         };
         JsCadUtilsGroup.prototype.toArray = function(pieces) {
             var self = this;
             var piecesArray = pieces ? pieces.split(",") : self.names;
-            return piecesArray.map((function(piece) {
+            return piecesArray.map(function(piece) {
                 if (!self.parts[piece]) console.error("Cannot find ".concat(piece, " in ").concat(self.names));
                 return self.parts[piece];
-            }));
+            });
         };
         JsCadUtilsGroup.prototype.toString = function() {
-            return '{\n  name: "'.concat(this.name, '",\n  names: "').concat(this.names.join(","), '", \n  parts: "').concat(Object.keys(this.parts), '",\n  holes: "').concat(this.holes, '"\n}');
+            return '{\n  name: "'.concat(this.name, '",\n  names: "').concat(this.names.join(","), '", \n  parts: "').concat(Object.keys(this.parts), '",\n  holes: ').concat(Array.isArray(this.holes) ? this.holes.length : this.holes ? 1 : 0, "\n}");
         };
         JsCadUtilsGroup.prototype.setName = function(name) {
             this.name = name;
             return this;
         };
         function Group(objectNames, addObjects) {
-            debug("Group", objectNames, addObjects);
+            debug$3("Group", objectNames, addObjects);
             var self = {
                 name: "",
                 names: [],
@@ -1113,9 +1120,9 @@ function initJscadutils(_CSG, options = {}) {
                         self.name = objectNames;
                     } else {
                         var objects = objectNames;
-                        self.names = Object.keys(objects).filter((function(k) {
+                        self.names = Object.keys(objects).filter(function(k) {
                             return k !== "holes";
-                        }));
+                        });
                         self.parts = Object.assign({}, objects);
                         self.holes = objects.holes;
                     }
@@ -1123,7 +1130,7 @@ function initJscadutils(_CSG, options = {}) {
             }
             return new JsCadUtilsGroup(self.names, self.parts, self.holes);
         }
-        var debug$1 = Debug("jscadUtils:util");
+        var debug$2 = Debug("jscadUtils:util");
         var NOZZEL_SIZE = .4;
         var nearest = {
             under: function under(desired) {
@@ -1158,7 +1165,7 @@ function initJscadutils(_CSG, options = {}) {
             return ((n = +n) || 1 / n) < 0;
         }
         function print(msg, o) {
-            debug$1(msg, JSON.stringify(o.getBounds()), JSON.stringify(this.size(o.getBounds())));
+            debug$2(msg, JSON.stringify(o.getBounds()), JSON.stringify(this.size(o.getBounds())));
         }
         function jscadToString(o) {
             if (_typeof(o) == "object") {
@@ -1194,21 +1201,21 @@ function initJscadutils(_CSG, options = {}) {
         function label(text, x, y, width, height) {
             var l = vector_text(x || 0, y || 0, text);
             var o = [];
-            l.forEach((function(pl) {
+            l.forEach(function(pl) {
                 o.push(rectangular_extrude(pl, {
                     w: width || 2,
                     h: height || 2
                 }));
-            }));
+            });
             return center(union(o));
         }
         function text(text) {
             var l = vector_char(0, 0, text);
-            var _char = l.segments.reduce((function(result, segment) {
+            var _char = l.segments.reduce(function(result, segment) {
                 var path = new CSG.Path2D(segment);
                 var cag = path.expandToCAG(2);
                 return result ? result.union(cag) : cag;
-            }), undefined);
+            }, undefined);
             return _char;
         }
         function unitCube(length, radius) {
@@ -1219,7 +1226,7 @@ function initJscadutils(_CSG, options = {}) {
             });
         }
         function unitAxis(length, radius, centroid) {
-            debug$1("unitAxis", length, radius, centroid);
+            debug$2("unitAxis", length, radius, centroid);
             centroid = centroid || [ 0, 0, 0 ];
             var unitaxis = unitCube(length, radius).setColor(1, 0, 0).union([ unitCube(length, radius).rotateY(90).setColor(0, 1, 0), unitCube(length, radius).rotateX(90).setColor(0, 0, 1) ]);
             unitaxis.properties.origin = new CSG.Connector([ 0, 0, 0 ], [ 1, 0, 0 ], [ 0, 1, 0 ]);
@@ -1241,38 +1248,38 @@ function initJscadutils(_CSG, options = {}) {
             return result;
         }
         function zipObject(names, values) {
-            return names.reduce((function(result, value, idx) {
+            return names.reduce(function(result, value, idx) {
                 result[value] = values[idx];
                 return result;
-            }), {});
+            }, {});
         }
         function map(o, f) {
-            return Object.keys(o).map((function(key) {
+            return Object.keys(o).map(function(key) {
                 return f(o[key], key, o);
-            }));
+            });
         }
         function mapValues(o, f) {
-            return Object.keys(o).map((function(key) {
+            return Object.keys(o).map(function(key) {
                 return f(o[key], key);
-            }));
+            });
         }
         function pick(o, names) {
-            return names.reduce((function(result, name) {
+            return names.reduce(function(result, name) {
                 result[name] = o[name];
                 return result;
-            }), {});
+            }, {});
         }
         function mapPick(o, names, f, options) {
-            return names.reduce((function(result, name, index) {
+            return names.reduce(function(result, name, index) {
                 if (!o[name]) {
                     throw new Error("".concat(name, " not found in ").concat(options.name, ": ").concat(Object.keys(o).join(",")));
                 }
                 result.push(f ? f(o[name], name, index, o) : o[name]);
                 return result;
-            }), []);
+            }, []);
         }
         function divA(a, f) {
-            return div(a, f);
+            return div$1(a, f);
         }
         function divxyz(size, x, y, z) {
             return {
@@ -1281,7 +1288,7 @@ function initJscadutils(_CSG, options = {}) {
                 z: size.z / z
             };
         }
-        function div$1(size, d) {
+        function div(size, d) {
             return this.divxyz(size, d, d, d);
         }
         function mulxyz(size, x, y, z) {
@@ -1333,9 +1340,9 @@ function initJscadutils(_CSG, options = {}) {
             var objectSize = size(object);
             var objectCentroid = centroid(object, objectSize);
             var idx = 0;
-            var t = map(objectSize, (function(i) {
+            var t = map(objectSize, function(i) {
                 return scale(i, a[idx++]);
-            }));
+            });
             var new_object = object.scale(t);
             var new_centroid = centroid(new_object);
             var delta = new_centroid.minus(objectCentroid).times(-1);
@@ -1359,10 +1366,10 @@ function initJscadutils(_CSG, options = {}) {
             }
             var s = [ scale(objectSize.x, x), scale(objectSize.y, y), scale(objectSize.z, z) ];
             var min$1 = min(s);
-            return centerWith(object.scale(s.map((function(d, i) {
+            return centerWith(object.scale(s.map(function(d, i) {
                 if (a[i] === 0) return 1;
                 return keep_aspect_ratio ? min$1 : d;
-            }))), "xyz", object);
+            })), "xyz", object);
         }
         function shift(object, x, y, z) {
             var hsize = this.div(this.size(object.getBounds()), 2);
@@ -1401,9 +1408,9 @@ function initJscadutils(_CSG, options = {}) {
             if (side[0] === -1) {
                 w[-1] = toxyz(withobj.centroid());
             }
-            return this.axisApply(axes, (function(i, axis) {
+            return this.axisApply(axes, function(i, axis) {
                 return w[side[0]][axis] - m[side[1]][axis];
-            }));
+            });
         }
         function calcSnap(moveobj, withobj, axes, orientation) {
             var delta = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
@@ -1424,15 +1431,15 @@ function initJscadutils(_CSG, options = {}) {
             if (side[0] === -1) {
                 w[-1] = withobj.centroid();
             }
-            var t = axisApply(axes, (function(i, axis) {
+            var t = axisApply(axes, function(i, axis) {
                 return w[side[0]][axis] - m[side[1]][axis];
-            }));
-            return delta ? axisApply(axes, (function(i) {
+            });
+            return delta ? axisApply(axes, function(i) {
                 return t[i] + delta;
-            })) : t;
+            }) : t;
         }
         function snap(moveobj, withobj, axis, orientation, delta) {
-            debug$1("snap", moveobj, withobj, axis, orientation, delta);
+            debug$2("snap", moveobj, withobj, axis, orientation, delta);
             var t = calcSnap(moveobj, withobj, axis, orientation, delta);
             return moveobj.translate(t);
         }
@@ -1440,16 +1447,16 @@ function initJscadutils(_CSG, options = {}) {
             return moveobj.translate(calcFlush(moveobj, withobj, axis, mside, wside));
         }
         function axisApply(axes, valfun, a) {
-            debug$1("axisApply", axes, valfun, a);
+            debug$2("axisApply", axes, valfun, a);
             var retval = a || [ 0, 0, 0 ];
             var lookup = {
                 x: 0,
                 y: 1,
                 z: 2
             };
-            axes.split("").forEach((function(axis) {
+            axes.split("").forEach(function(axis) {
                 retval[lookup[axis]] = valfun(lookup[axis], axis);
-            }));
+            });
             return retval;
         }
         function axis2array(axes, valfun) {
@@ -1460,10 +1467,10 @@ function initJscadutils(_CSG, options = {}) {
                 y: 1,
                 z: 2
             };
-            axes.split("").forEach((function(axis) {
+            axes.split("").forEach(function(axis) {
                 var i = lookup[axis];
                 a[i] = valfun(i, axis);
-            }));
+            });
             return a;
         }
         function centroid(o, objectSize) {
@@ -1478,9 +1485,9 @@ function initJscadutils(_CSG, options = {}) {
         function calcmidlineTo(o, axis, to) {
             var bounds = o.getBounds();
             var objectSize = size(bounds);
-            return axisApply(axis, (function(i, a) {
+            return axisApply(axis, function(i, a) {
                 return to - objectSize[a] / 2;
-            }));
+            });
         }
         function midlineTo(o, axis, to) {
             return o.translate(calcmidlineTo(o, axis, to));
@@ -1488,18 +1495,18 @@ function initJscadutils(_CSG, options = {}) {
         function translator(o, axis, withObj) {
             var objectCentroid = centroid(o);
             var withCentroid = centroid(withObj);
-            var t = axisApply(axis, (function(i) {
+            var t = axisApply(axis, function(i) {
                 return withCentroid[i] - objectCentroid[i];
-            }));
+            });
             return t;
         }
         function calcCenterWith(o, axes, withObj) {
             var delta = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
             var objectCentroid = centroid(o);
             var withCentroid = centroid(withObj);
-            var t = axisApply(axes, (function(i, axis) {
+            var t = axisApply(axes, function(i, axis) {
                 return withCentroid[axis] - objectCentroid[axis];
-            }));
+            });
             return delta ? add(t, delta) : t;
         }
         function centerWith(o, axis, withObj) {
@@ -1512,9 +1519,9 @@ function initJscadutils(_CSG, options = {}) {
                 }
             }
             var dist = isNegative(offset) ? offset = size[axis] + offset : offset;
-            return axisApply(axis, (function(i, a) {
+            return axisApply(axis, function(i, a) {
                 return bounds[0][a] + (isEmpty(dist) ? size[axis] / 2 : dist);
-            }));
+            });
         }
         function bisect() {
             for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -1577,14 +1584,14 @@ function initJscadutils(_CSG, options = {}) {
             }[[ axis, rotateaxis ].sort().join("")];
             var centroid = object.centroid();
             var rotateDelta = getDelta(objectSize, bounds, rotateOffsetAxis, rotateoffset);
-            var rotationCenter = options.rotationCenter || new CSG.Vector3D(axisApply("xyz", (function(i, a) {
+            var rotationCenter = options.rotationCenter || new CSG.Vector3D(axisApply("xyz", function(i, a) {
                 if (a == axis) return cutDelta[i];
                 if (a == rotateOffsetAxis) return rotateDelta[i];
                 return centroid[a];
-            })));
+            }));
             var theRotationAxis = rotationAxes[rotateaxis];
             var cutplane = CSG.OrthoNormalBasis.GetCartesian(info.orthoNormalCartesian[0], info.orthoNormalCartesian[1]).translate(cutDelta).rotate(rotationCenter, theRotationAxis, angle);
-            debug$1("bisect", debug$1.enabled && {
+            debug$2("bisect", debug$2.enabled && {
                 axis,
                 offset,
                 angle,
@@ -1665,15 +1672,18 @@ function initJscadutils(_CSG, options = {}) {
             return CSG.fromPolygons(polygons);
         }
         function slices2poly(slices, options, axis) {
+            debug$2("slices2poly", slices, options, axis);
+            options = Object.assign({
+                twistangle: 0,
+                twiststeps: 0
+            }, options);
             var twistangle = options && parseFloat(options.twistangle) || 0;
-            var twiststeps = options && parseInt(options.twiststeps) || CSG.defaultResolution3D;
-            if (twistangle == 0 || twiststeps < 1) {
-                twiststeps = 1;
-            }
+            options && parseInt(options.twiststeps) || CSG.defaultResolution3D;
             var normalVector = options.si.normalVector;
             var polygons = [];
             var first$1 = first(slices);
             var last$1 = last(slices);
+            debug$2("slices2poly first", first$1, first$1.offset, "last", last$1);
             var up = first$1.offset[axis] > last$1.offset[axis];
             polygons = polygons.concat(first$1.poly._toPlanePolygons({
                 translation: first$1.offset,
@@ -1692,7 +1702,7 @@ function initJscadutils(_CSG, options = {}) {
                 return v[rotateAxis](angle * percent);
             };
             var connectorAxis = last$1.offset.minus(first$1.offset).abs();
-            slices.forEach((function(slice, idx) {
+            slices.forEach(function(slice, idx) {
                 if (idx < slices.length - 1) {
                     var nextidx = idx + 1;
                     var top = !up ? slices[nextidx] : slice;
@@ -1705,7 +1715,7 @@ function initJscadutils(_CSG, options = {}) {
                         toConnector2: c2
                     }));
                 }
-            }));
+            });
             return CSG.fromPolygons(polygons);
         }
         function normalVector(axis) {
@@ -1746,30 +1756,32 @@ function initJscadutils(_CSG, options = {}) {
             var info = dirInfo["dir" + direction];
             return Object.assign({
                 axis,
-                cutDelta: axisApply(axis, (function(i, a) {
+                cutDelta: axisApply(axis, function(i, a) {
                     return bounds[info.sizeIdx][a] + Math.abs(radius) * info.sizeDir;
-                })),
-                moveDelta: axisApply(axis, (function(i, a) {
+                }),
+                moveDelta: axisApply(axis, function(i, a) {
                     return bounds[info.sizeIdx][a] + Math.abs(radius) * info.moveDir;
-                }))
+                })
             }, info, normalVector(axis));
         }
         function reShape(object, radius, orientation, options, slicer) {
             options = options || {};
             var b = object.getBounds();
-            var ar = Math.abs(radius);
+            var absoluteRadius = Math.abs(radius);
             var si = sliceParams(orientation, radius, b);
+            debug$2("reShape", absoluteRadius, si);
             if (si.axis !== "z") throw new Error('reShape error: CAG._toPlanePolytons only uses the "z" axis.  You must use the "z" axis for now.');
             var cutplane = CSG.OrthoNormalBasis.GetCartesian(si.orthoNormalCartesian[0], si.orthoNormalCartesian[1]).translate(si.cutDelta);
             var slice = object.sectionCut(cutplane);
-            var first = axisApply(si.axis, (function() {
-                return si.positive ? 0 : ar;
-            }));
-            var last = axisApply(si.axis, (function() {
-                return si.positive ? ar : 0;
-            }));
+            var first = axisApply(si.axis, function() {
+                return si.positive ? 0 : absoluteRadius;
+            });
+            var last = axisApply(si.axis, function() {
+                return si.positive ? absoluteRadius : 0;
+            });
             var plane = si.positive ? cutplane.plane : cutplane.plane.flipped();
-            var slices = slicer(first, last, slice);
+            debug$2("reShape first/last", first, last);
+            var slices = slicer(first, last, slice, radius);
             var delta = slices2poly(slices, Object.assign(options, {
                 si
             }), si.axis).color(options.color);
@@ -1777,7 +1789,7 @@ function initJscadutils(_CSG, options = {}) {
             return union([ options.unionOriginal ? object : remainder, delta.translate(si.moveDelta) ]);
         }
         function chamfer(object, radius, orientation, options) {
-            return reShape(object, radius, orientation, options, (function(first, last, slice) {
+            return reShape(object, radius, orientation, options, function(first, last, slice) {
                 return [ {
                     poly: slice,
                     offset: new CSG.Vector3D(first)
@@ -1785,15 +1797,15 @@ function initJscadutils(_CSG, options = {}) {
                     poly: enlarge(slice, [ -radius * 2, -radius * 2 ]),
                     offset: new CSG.Vector3D(last)
                 } ];
-            }));
+            });
         }
         function fillet(object, radius, orientation, options) {
             options = options || {};
-            return reShape(object, radius, orientation, options, (function(first, last, slice) {
+            return reShape(object, radius, orientation, options, function(first, last, slice) {
                 var v1 = new CSG.Vector3D(first);
                 var v2 = new CSG.Vector3D(last);
                 var res = options.resolution || CSG.defaultResolution3D;
-                var slices = range(0, res).map((function(i) {
+                var slices = range(0, res).map(function(i) {
                     var p = i > 0 ? i / (res - 1) : 0;
                     var v = v1.lerp(v2, p);
                     var size = -radius * 2 - Math.cos(Math.asin(p)) * (-radius * 2);
@@ -1801,9 +1813,9 @@ function initJscadutils(_CSG, options = {}) {
                         poly: enlarge(slice, [ size, size ]),
                         offset: v
                     };
-                }));
+                });
                 return slices;
-            }));
+            });
         }
         function calcRotate(part, solid, axis) {
             var axes = {
@@ -1823,16 +1835,16 @@ function initJscadutils(_CSG, options = {}) {
             return part.rotate(rotationCenter, rotationAxis, angle);
         }
         function cloneProperties(from, to) {
-            return Object.entries(from).reduce((function(props, _ref) {
+            return Object.entries(from).reduce(function(props, _ref) {
                 var _ref2 = _slicedToArray(_ref, 2), key = _ref2[0], value = _ref2[1];
                 props[key] = value;
                 return props;
-            }), to);
+            }, to);
         }
         function clone(o) {
             var c = CSG.fromPolygons(o.toPolygons());
             cloneProperties(o, c);
-            debug$1("clone", o, c, CSG);
+            debug$2("clone", o, c, CSG);
             return c;
         }
         function addConnector(object, name) {
@@ -1842,15 +1854,15 @@ function initJscadutils(_CSG, options = {}) {
             object.properties[name] = new CSG.Connector(point, axis, normal);
             return object;
         }
-        var debug$2 = Debug("jscadUtils:parts");
+        var debug$1 = Debug("jscadUtils:parts");
         var parts = {
-            BBox,
+            BBox: BBox$1,
             Cube,
             RoundedCube,
             Cylinder,
             Cone
         };
-        function BBox() {
+        function BBox$1() {
             function box(object) {
                 return CSG.cube({
                     center: object.centroid(),
@@ -1860,13 +1872,13 @@ function initJscadutils(_CSG, options = {}) {
             for (var _len = arguments.length, objects = new Array(_len), _key = 0; _key < _len; _key++) {
                 objects[_key] = arguments[_key];
             }
-            return objects.reduce((function(bbox, part) {
+            return objects.reduce(function(bbox, part) {
                 var object = bbox ? union([ bbox, box(part) ]) : part;
                 return box(object);
-            }), undefined);
+            }, undefined);
         }
         function Cube(width) {
-            var r = div(fromxyz(width), 2);
+            var r = div$1(fromxyz(width), 2);
             return CSG.cube({
                 center: r,
                 radius: r
@@ -1881,7 +1893,7 @@ function initJscadutils(_CSG, options = {}) {
             } else {
                 var r = [ x / 2, y / 2 ];
             }
-            debug$2("RoundedCube", size$1, r, thickness, corner_radius);
+            debug$1("RoundedCube", size$1, r, thickness, corner_radius);
             var roundedcube = CAG.roundedRectangle({
                 center: [ r[0], r[1], 0 ],
                 radius: r,
@@ -1894,7 +1906,7 @@ function initJscadutils(_CSG, options = {}) {
         }
         function Cylinder(diameter, height) {
             var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-            debug$2("parts.Cylinder", diameter, height, options);
+            debug$1("parts.Cylinder", diameter, height, options);
             options = Object.assign({
                 start: [ 0, 0, 0 ],
                 end: [ 0, 0, height ],
@@ -1905,7 +1917,7 @@ function initJscadutils(_CSG, options = {}) {
         }
         function Cone(diameter1, diameter2, height) {
             var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-            debug$2("parts.Cone", diameter1, diameter2, height, options);
+            debug$1("parts.Cone", diameter1, diameter2, height, options);
             return CSG.cylinder(Object.assign({
                 start: [ 0, 0, 0 ],
                 end: [ 0, 0, height ],
@@ -1915,7 +1927,7 @@ function initJscadutils(_CSG, options = {}) {
             }, options));
         }
         function Hexagon(diameter, height) {
-            debug$2("hexagon", diameter, height);
+            debug$1("hexagon", diameter, height);
             var radius = diameter / 2;
             var sqrt3 = Math.sqrt(3) / 2;
             var hex = CAG.fromPoints([ [ radius, 0 ], [ radius / 2, radius * sqrt3 ], [ -radius / 2, radius * sqrt3 ], [ -radius, 0 ], [ -radius / 2, -radius * sqrt3 ], [ radius / 2, -radius * sqrt3 ] ]);
@@ -2013,7 +2025,7 @@ function initJscadutils(_CSG, options = {}) {
         var parts$1 = Object.freeze({
             __proto__: null,
             default: parts,
-            BBox,
+            BBox: BBox$1,
             Cube,
             RoundedCube,
             Cylinder,
@@ -2025,13 +2037,13 @@ function initJscadutils(_CSG, options = {}) {
             Board,
             Hardware
         });
-        var debug$3 = Debug("jscadUtils:boxes");
+        var debug = Debug("jscadUtils:boxes");
         function RabbetJoin(box, thickness, cutHeight) {
             depreciated("RabbetJoin", true, "Use 'Rabbet' instead");
             return rabbetJoin(box, thickness, cutHeight);
         }
         function topMiddleBottom(box, thickness) {
-            debug$3("TopMiddleBottom", box, thickness);
+            debug("TopMiddleBottom", box, thickness);
             var bottom = box.bisect("z", thickness, {
                 color: true
             });
@@ -2040,20 +2052,21 @@ function initJscadutils(_CSG, options = {}) {
         }
         function Rabett(box, thickness, gap, height, face) {
             var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
-            debug$3("Rabett", "thickness", thickness, "gap", gap, "height", height, "face", face);
+            debug("Rabett", "thickness", thickness, "gap", gap, "height", height, "face", face);
             gap = gap || .25;
             var inside = thickness - gap;
             var outside = -thickness + gap;
-            options.color = true;
+            debug("inside", inside, "outside", outside);
             var group = Group();
-            debug$3("Rabbet top height:", height, "options:", options);
             var _box$bisect$parts = box.bisect("z", height, options).parts, top = _box$bisect$parts.positive, lower2_3rd = _box$bisect$parts.negative;
-            debug$3("face", face, "height", height);
             var lowerBisectHeight = Math.sign(height) < 0 ? face * Math.sign(height) : height - face;
-            debug$3("Rabbet bottom height:", lowerBisectHeight, "options:", options);
             var _lower2_3rd$bisect$pa = lower2_3rd.bisect("z", lowerBisectHeight, options).parts, middle = _lower2_3rd$bisect$pa.positive, bottom = _lower2_3rd$bisect$pa.negative;
-            group.add(top.union(middle.color("yellow").subtract(middle.color("darkred").enlarge([ outside, outside, 0 ]))), "top");
-            group.add(bottom.color("orange").union(middle.color("green").subtract(middle.color("red").enlarge([ inside, inside, 0 ]))), "bottom");
+            var middleTop = middle.color("yellow").subtract(middle.color("darkred").enlarge([ outside, outside, 0 ]));
+            group.add(top.union(middleTop), "top");
+            var bottomOutline = middle.color("yellow").subtract(middle.color("orange").enlarge([ outside, outside, 0 ])).enlarge([ outside, outside, 0 ]);
+            group.add(bottomOutline, "middle-top", true);
+            group.add(middle.color("green").subtract(middle.color("pink").enlarge([ inside, inside, 0 ])), "middle-bottom", true);
+            group.add(bottom.color("orange").union(middle.color("green").subtract(middle.color("red").enlarge([ inside, inside, 0 ])).subtract(middleTop)), "bottom");
             return group;
         }
         var RabettTopBottom = function rabbetTMB(box, thickness) {
@@ -2065,7 +2078,7 @@ function initJscadutils(_CSG, options = {}) {
                 topWidth: -thickness,
                 bottomWidth: thickness
             }, options);
-            debug$3("RabettTopBottom", box, thickness, gap, options);
+            debug("RabettTopBottom", box, thickness, gap, options);
             var group = Group("", {
                 box
             });
@@ -2111,7 +2124,7 @@ function initJscadutils(_CSG, options = {}) {
         };
         var Rectangle = function Rectangle(size, thickness, cb) {
             thickness = thickness || 2;
-            var s = div(xyz2array(size), 2);
+            var s = div$1(xyz2array(size), 2);
             var r = add(s, thickness);
             var box = CSG.cube({
                 center: r,
@@ -2131,16 +2144,16 @@ function initJscadutils(_CSG, options = {}) {
             if (exteriorcb) box = exteriorcb(box);
             return box;
         };
-        var BBox$1 = function BBox(o) {
+        var BBox = function BBox(o) {
             depreciated("BBox", true, "Use 'parts.BBox' instead");
-            var s = div(xyz2array(o.size()), 2);
+            var s = div$1(xyz2array(o.size()), 2);
             return CSG.cube({
                 center: s,
                 radius: s
             }).align(o, "xyz");
         };
         function getRadius(o) {
-            return div(xyz2array(o.size()), 2);
+            return div$1(xyz2array(o.size()), 2);
         }
         function rabbetJoin(box, thickness) {
             var gap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : .25;
@@ -2168,7 +2181,7 @@ function initJscadutils(_CSG, options = {}) {
             CutOut,
             Rectangle,
             Hollow,
-            BBox: BBox$1
+            BBox
         });
         var compatV1 = _objectSpread2(_objectSpread2({}, util), {}, {
             group: Group,
@@ -2188,6 +2201,9 @@ function initJscadutils(_CSG, options = {}) {
         exports.parts = parts$1;
         exports.triUtils = triUtils;
         exports.util = util;
+        Object.defineProperty(exports, "__esModule", {
+            value: true
+        });
         return exports;
     }({}, jsCadCSG, scadApi);
     const debug = jscadUtils.Debug("jscadUtils:initJscadutils");
@@ -2253,15 +2269,14 @@ function initJscadRPi() {
     };
     var jscadRPi = function(exports, jscadUtils, jsCadCSG, scadApi) {
         "use strict";
-        function _interopDefaultLegacy(e) {
-            return e && typeof e === "object" && "default" in e ? e : {
-                default: e
-            };
+        function activeCoolingFan() {
+            var g = jscadUtils.Group("ActiveCoolingFan");
+            var board = jscadUtils.parts.Cube([ 64, 42.5, 1 ]).subtract(jscadUtils.parts.Cube([ 64 - 58, 31.3, 1 ]).translate([ 0, 42.5 - 31.3, 0 ]).color("orange").union(jscadUtils.parts.Cube([ 28, 42.5 - 31.3, 1 ]).translate([ 64 - 28, 0, 0 ]).color("blue"))).union(jscadUtils.parts.Cube([ 19, 40, 9 ]).translate([ 64 - 58, 2.5, 0 ])).color("silver").union(jscadUtils.parts.Cube([ 30, 30, 9 ]).translate([ 64 - 58 + 19, 42.5 - 31.3, 0 ]).color("black"));
+            g.add(board, "board");
+            return g;
         }
-        var jsCadCSG__default = _interopDefaultLegacy(jsCadCSG);
-        var scadApi__default = _interopDefaultLegacy(scadApi);
-        var CSG$1 = jsCadCSG__default["default"].CSG;
-        var union = scadApi__default["default"].booleanOps.union;
+        jsCadCSG.CSG;
+        scadApi.booleanOps.union;
         function RightSide(o, mb) {
             return o.translate(jscadUtils.array.add(o.calcSnap(mb, "z", "outside-"), o.calcSnap(mb, "x", "inside+"), o.calcSnap(mb, "y", "inside-"), [ 2, 0, 0 ]));
         }
@@ -2326,13 +2341,13 @@ function initJscadRPi() {
         function BoardLed() {
             return jscadUtils.parts.Cube([ 1, 2, .7 ]);
         }
-        var debug = jscadUtils.Debug("jscadRPi:BPlusMounting");
+        var debug$2 = jscadUtils.Debug("jscadRPi:BPlusMounting");
         function holes(mb) {
             var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
             options = Object.assign(options, {
                 height: 8
             });
-            debug("holes", mb, options);
+            debug$2("holes", mb, options);
             var hole = MountingHole(options.diameter || 3.25, options.height).snap(mb, "xy", "inside-").align(mb, "z");
             var holes = [ hole.midlineTo("x", 3.5).midlineTo("y", 3.5), hole.midlineTo("x", 61.5).midlineTo("y", 3.5), hole.midlineTo("x", 3.5).midlineTo("y", 52.5), hole.midlineTo("x", 61.5).midlineTo("y", 52.5) ];
             return jscadUtils.Group("hole1,hole2,hole3,hole4", holes);
@@ -2377,6 +2392,8 @@ function initJscadRPi() {
             group.add(BoardLed().snap(mb, "z", "outside-").midlineTo("x", 1.1).midlineTo("y", 12).color("red"), "powerled");
         }
         function pi5(group, clearance, mb) {
+            group.add(jscadUtils.parts.Cube([ 12, 12, 3 ]).color("lightgray").translate([ 24, 15, 2 ]), "cpu");
+            group.add(jscadUtils.parts.Cube([ 12, 12, clearance ]).color("red").translate([ 24, 15, 2 ]), "clearance-cpu", true, "clearance");
             group.add(RightSide(jscadUtils.parts.Cube([ 21.5, 16.5, 13.5 ]).color("lightgray"), mb).translate([ 2, 0, 0 ]).midlineTo("y", 10.2), "ethernet");
             group.add(jscadUtils.parts.Cube([ clearance, 16.5, 13.5 ]).align(group.parts.ethernet, "yz").snap(group.parts.ethernet, "x", "outside-").color("red"), "clearance-ethernet", true, "clearance");
             var usb = jscadUtils.Group();
@@ -2442,9 +2459,15 @@ function initJscadRPi() {
             group.add(group.holes[1], "hole2", true);
             group.add(group.holes[2], "hole3", true);
             group.add(group.holes[3], "hole4", true);
+            if (model >= 5) {
+                group.holes.push(MountingHole(3.25, 8).snap(mb, "xy", "inside-").align(mb, "z").midlineTo("x", 3.5).midlineTo("y", 6 + 3.5));
+                group.add(group.holes[4], "fan1hole", true);
+                group.holes.push(MountingHole(3.25, 8).snap(mb, "xy", "inside-").align(mb, "z").midlineTo("x", 3.5 + 58).midlineTo("y", 52.5 - 6));
+                group.add(group.holes[5], "fan2hole", true);
+            }
             return group;
         }
-        function CameraModuleV1() {
+        function CameraModuleV1$1() {
             var t = 1.1;
             var height = {
                 sensor: 5.9 - t,
@@ -2457,27 +2480,27 @@ function initJscadRPi() {
             }
             g.holes = [ Hole(2, 2).color("yellow"), Hole(2, 23), Hole(12.5 + 2, 2), Hole(12.5 + 2, 23) ];
             g.add(jscadUtils.Group("hole0,hole1,hole2,hole3", g.holes), "hole", false, "holes");
-            var mounts = g.holes.reduce((function(m, h, i) {
+            var mounts = g.holes.reduce(function(m, h, i) {
                 m["mount".concat(i)] = jscadUtils.parts.Cylinder(4, 2).align(h, "xy").snap(g.parts.board, "z", "outside-");
                 return m;
-            }), {});
+            }, {});
             g.add(jscadUtils.Group(mounts), "mounts", true, "mounts");
-            var pins = g.holes.reduce((function(m, h, i) {
+            var pins = g.holes.reduce(function(m, h, i) {
                 m["pin".concat(i)] = jscadUtils.parts.Cylinder(jscadUtils.util.nearest.under(1.5), height.board).align(h, "xy").align(g.parts.board, "z");
                 return m;
-            }), {});
+            }, {});
             g.add(jscadUtils.Group(pins), "pins", true, "pins");
             g.add(jscadUtils.parts.Cube([ 8.5, 8.5, 2 ]).snap(g.parts.board, "xy", "inside-").snap(g.parts.board, "z", "outside-").midlineTo("x", 12.5 + 2).midlineTo("y", 8.5 + 4).color("black"), "sensor");
             g.add(jscadUtils.parts.Cube([ 8.5, 8.5, height.sensor - 2 ]).align(g.parts.sensor, "xy").snap(g.parts.sensor, "z", "outside-").color("gray"), "lense");
             g.add(jscadUtils.parts.Cube([ 7.56, 10, 2.65 - t ]).snap(g.parts.board, "z", "outside-").align(g.parts.lense, "y", "inside-").snap(g.parts.lense, "x", "outside+", -1).color("gray"), "lenseribbon");
             g.add(jscadUtils.parts.Cube([ 5.5, 17, 3 ]).snap(g.parts.board, "x", "inside+").snap(g.parts.board, "y", "inside-").snap(g.parts.board, "z", "outside+").midlineTo("y", 12.5), "ribbon");
-            g.add(jscadUtils.parts.RoundedCube(24 - 5.5, 25, 2.5 - t, 2).snap(g.parts.board, "xy", "inside-").snap(g.parts.board, "z", "outside+").subtract(g.holes.map((function(hole) {
+            g.add(jscadUtils.parts.RoundedCube(24 - 5.5, 25, 2.5 - t, 2).snap(g.parts.board, "xy", "inside-").snap(g.parts.board, "z", "outside+").subtract(g.holes.map(function(hole) {
                 return hole.enlarge(3, 3, 5);
-            }))).color("red"), "bottom-nogo");
+            })).color("red"), "bottom-nogo");
             g.add(g.parts.ribbon.enlarge(2, -1, -1).snap(g.parts.ribbon, "x", "outside-").color("red"), "ribbon-nogo");
             return g;
         }
-        function CameraModuleV1$1() {
+        function CameraModuleV1() {
             var t = 1.1;
             var height = {
                 sensor: 4 - t,
@@ -2490,23 +2513,23 @@ function initJscadRPi() {
             }
             g.holes = [ Hole(2, 2).color("yellow"), Hole(2, 23), Hole(14.5, 2), Hole(14.5, 23) ];
             g.add(jscadUtils.Group("hole0,hole1,hole2,hole3", g.holes), "hole", false, "holes");
-            var mounts = g.holes.reduce((function(m, h, i) {
+            var mounts = g.holes.reduce(function(m, h, i) {
                 m["mount".concat(i)] = jscadUtils.parts.Cylinder(4, height.sensor).align(h, "xy").snap(g.parts.board, "z", "outside-");
                 return m;
-            }), {});
+            }, {});
             g.add(jscadUtils.Group(mounts), "mounts", true, "mounts");
-            var pins = g.holes.reduce((function(m, h, i) {
+            var pins = g.holes.reduce(function(m, h, i) {
                 m["pin".concat(i)] = jscadUtils.parts.Cylinder(jscadUtils.util.nearest.under(1.5), height.board).align(h, "xy").align(g.parts.board, "z");
                 return m;
-            }), {});
+            }, {});
             g.add(jscadUtils.Group(pins), "pins", true, "pins");
             g.add(jscadUtils.parts.Cube([ 8.5, 8.5, height.sensor ]).snap(g.parts.board, "xy", "inside-").snap(g.parts.board, "z", "outside-").midlineTo("x", 14.5).midlineTo("y", 12.5).color("black"), "sensor");
             g.add(jscadUtils.parts.Cylinder(7.3, 1.6).align(g.parts.sensor, "xy").snap(g.parts.sensor, "z", "outside-").color("gray"), "lense");
             g.add(jscadUtils.parts.Cube([ 4, 9, 2.65 - t ]).snap(g.parts.board, "xy", "inside-").snap(g.parts.board, "z", "outside-").midlineTo("x", 4.7).midlineTo("y", 13.8).stretch("x", 4).color("gray"), "lenseribbon");
             g.add(jscadUtils.parts.Cube([ 5.5, 20.8, 3.55 - t ]).snap(g.parts.board, "x", "inside+").snap(g.parts.board, "y", "inside-").snap(g.parts.board, "z", "outside+").midlineTo("y", 12.5), "ribbon");
-            g.add(jscadUtils.parts.RoundedCube(23.862 - 5.5, 25, 2.5 - t, 2).snap(g.parts.board, "xy", "inside-").snap(g.parts.board, "z", "outside+").subtract(g.holes.map((function(hole) {
+            g.add(jscadUtils.parts.RoundedCube(23.862 - 5.5, 25, 2.5 - t, 2).snap(g.parts.board, "xy", "inside-").snap(g.parts.board, "z", "outside+").subtract(g.holes.map(function(hole) {
                 return hole.enlarge(3, 3, 5);
-            }))).color("red"), "bottom-nogo");
+            })).color("red"), "bottom-nogo");
             g.add(g.parts.ribbon.enlarge(2, -1, -1).snap(g.parts.ribbon, "x", "outside-").color("red"), "ribbon-nogo");
             return g;
         }
@@ -2532,31 +2555,30 @@ function initJscadRPi() {
             var peg = MountingHole(null, options.height + 3);
             return standoff.union(peg);
         }
-        function _toConsumableArray(arr) {
-            return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-        }
-        function _arrayWithoutHoles(arr) {
-            if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+        function _arrayLikeToArray(r, a) {
+            (null == a || a > r.length) && (a = r.length);
+            for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+            return n;
         }
-        function _iterableToArray(iter) {
-            if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
+        function _arrayWithoutHoles(r) {
+            if (Array.isArray(r)) return _arrayLikeToArray(r);
         }
-        function _unsupportedIterableToArray(o, minLen) {
-            if (!o) return;
-            if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-            var n = Object.prototype.toString.call(o).slice(8, -1);
-            if (n === "Object" && o.constructor) n = o.constructor.name;
-            if (n === "Map" || n === "Set") return Array.from(o);
-            if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-        }
-        function _arrayLikeToArray(arr, len) {
-            if (len == null || len > arr.length) len = arr.length;
-            for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-            return arr2;
+        function _iterableToArray(r) {
+            if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
         }
         function _nonIterableSpread() {
             throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
         }
+        function _toConsumableArray(r) {
+            return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
+        }
+        function _unsupportedIterableToArray(r, a) {
+            if (r) {
+                if ("string" == typeof r) return _arrayLikeToArray(r, a);
+                var t = {}.toString.call(r).slice(8, -1);
+                return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
+            }
+        }
         function HQCameraModule() {
             var _camera$holes;
             var t = 1.1;
@@ -2627,8 +2649,8 @@ function initJscadRPi() {
             group.add(buttons[3], "button4");
             return group;
         }
-        var union$2 = scadApi.booleanOps.union;
-        var debug$2 = jscadUtils.Debug("jscadRPi:PiTFT24");
+        var union = scadApi.booleanOps.union;
+        var debug = jscadUtils.Debug("jscadRPi:PiTFT24");
         function PiTFT24() {
             var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
             var pi = arguments.length > 1 ? arguments[1] : undefined;
@@ -2639,7 +2661,7 @@ function initJscadRPi() {
                 buttonWireYOffset: 5,
                 clearance: .9
             });
-            debug$2("PiTFT24", options);
+            debug("PiTFT24", options);
             var hat = Hat(pi);
             var mb = hat.parts.mb;
             var group = jscadUtils.Group();
@@ -2653,36 +2675,36 @@ function initJscadRPi() {
             group.add(lcdbevel.translate(lcdbevel.calcSnap(mb, "xy", "inside-")).translate(lcdbevel.calcSnap(mb, "z", "outside-")).translate([ 4.5, 7, 0 ]), "lcdbevel");
             var buttonBase = jscadUtils.parts.Cube([ 6.1, 3.5, 3.55 ]).color("beige").snap(mb, "z", "outside-").snap(mb, "xy", "inside-").midlineTo("y", 2.5);
             var button = buttonBase.union(jscadUtils.parts.Cube([ 3, 1.5, .5 ]).color("white").snap(buttonBase, "z", "outside-").align(buttonBase, "xy"));
-            var buttons = [ 12.39, 12.39 + 10, 12.39 + 20, 12.39 + 30, 12.39 + 40 ].map((function(midpoint) {
+            var buttons = [ 12.39, 12.39 + 10, 12.39 + 20, 12.39 + 30, 12.39 + 40 ].map(function(midpoint) {
                 return button.midlineTo("x", midpoint);
-            }));
+            });
             group.add(jscadUtils.Group("1,2,3,4,5", buttons), "buttons", false, "button");
             var capBaseHeight = options.capBaseHeight;
             var buttonCapBase = jscadUtils.parts.Cube([ 6.6, 4, capBaseHeight ]).color("blue");
             var buttonCapTop = jscadUtils.parts.Cube([ 6.1, 3.5, options.buttonCapHeight - capBaseHeight ]).snap(buttonCapBase, "z", "outside-").align(buttonCapBase, "xy").fillet(1, "z+").color("deepskyblue");
-            var buttonCaps = buttons.map((function(button) {
-                return union$2([ buttonCapBase, buttonCapTop ]).snap(button, "z", "outside-").align(button, "xy");
-            }));
-            group.add(union$2(buttonCaps), "buttonCaps", hiddenPart);
-            group.add(union$2(buttonCaps.map((function(button) {
-                return union$2([ buttonCapBase.align(button, "xy").snap(button, "z", "inside-").enlarge([ options.clearance, options.clearance, 1 ]), jscadUtils.parts.Cube([ 6.1, 3.5, options.buttonCapHeight - capBaseHeight ]).align(button, "xy").snap(button, "z", "inside-").enlarge([ options.clearance, options.clearance, 1 ]) ]);
-            }))), "buttonCapClearance", hiddenPart);
+            var buttonCaps = buttons.map(function(button) {
+                return union([ buttonCapBase, buttonCapTop ]).snap(button, "z", "outside-").align(button, "xy");
+            });
+            group.add(union(buttonCaps), "buttonCaps", hiddenPart);
+            group.add(union(buttonCaps.map(function(button) {
+                return union([ buttonCapBase.align(button, "xy").snap(button, "z", "inside-").enlarge([ options.clearance, options.clearance, 1 ]), jscadUtils.parts.Cube([ 6.1, 3.5, options.buttonCapHeight - capBaseHeight ]).align(button, "xy").snap(button, "z", "inside-").enlarge([ options.clearance, options.clearance, 1 ]) ]);
+            })), "buttonCapClearance", hiddenPart);
             var bwthickness = options.capBaseHeight;
             var connector = LeftSide(jscadUtils.parts.Cube([ bwthickness, options.buttonWireYOffset, bwthickness ]), mb).snap(buttonCaps[0], "z", "inside-").snap(buttonCaps[0], "y", "outside+").color("blue");
             var buttonWire = jscadUtils.parts.Cube([ 40, bwthickness, bwthickness ]).snap(buttonCaps[0], "x", "center-").snap(buttonCaps[0], "z", "inside-").snap(connector, "y", "inside-").color("blue");
-            group.add(union$2(buttonWire), "buttonWire", hiddenPart);
-            var buttonWireConnector = buttonCaps.map((function(buttonCap) {
+            group.add(union(buttonWire), "buttonWire", hiddenPart);
+            var buttonWireConnector = buttonCaps.map(function(buttonCap) {
                 return connector.align(buttonCap, "x");
-            }));
-            group.add(union$2(buttonWireConnector), "buttonWireConnector", hiddenPart);
-            var buttonWireClearance = union$2(buttonWireConnector.map((function(connector) {
+            });
+            group.add(union(buttonWireConnector), "buttonWireConnector", hiddenPart);
+            var buttonWireClearance = union(buttonWireConnector.map(function(connector) {
                 return connector.enlarge([ options.clearance, options.clearance, options.buttonCapHeight ]);
-            }))).union(buttonWire.enlarge([ options.clearance, options.clearance, options.buttonCapHeight ])).snap(buttonWire, "z", "inside+").color("red");
+            })).union(buttonWire.enlarge([ options.clearance, options.clearance, options.buttonCapHeight ])).snap(buttonWire, "z", "inside+").color("red");
             group.add(buttonWireClearance, "buttonWireClearance", hiddenPart);
             group.add(jscadUtils.parts.Cube([ 15, 33, 7 ]).snap(mb, "x", "inside-").snap(mb, "z", "outside+").align(mb, "y").color("red"), "gpio2", hiddenPart);
             return group;
         }
-        var debug$3 = jscadUtils.Debug("jscadRPi:Spacer");
+        jscadUtils.Debug("jscadRPi:Spacer");
         function Spacer() {
             var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
             var mb = arguments.length > 1 ? arguments[1] : undefined;
@@ -2718,9 +2740,10 @@ function initJscadRPi() {
             var assembly = spacers.union(gusset.unionIf(cross, !options.hollow).translate([ 0, 0, -options.offset ])).subtractIf(gpio.enlarge([ 1, 1, 0 ]), options.gpio);
             return assembly.color("yellow");
         }
+        exports.ActiveCoolingFan = activeCoolingFan;
         exports.BPlus = BPlus;
-        exports.CameraModuleV1 = CameraModuleV1;
-        exports.CameraModuleV2 = CameraModuleV1$1;
+        exports.CameraModuleV1 = CameraModuleV1$1;
+        exports.CameraModuleV2 = CameraModuleV1;
         exports.HQCameraModule = HQCameraModule;
         exports.Hat = Hat;
         exports.HatStandoff = HatStandoff;