jscad-electronics 0.0.18 → 0.0.19

package/dist/index.d.ts

@@ -1,11 +1,17 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { AnyCircuitElement, PcbSmtPad, PcbPlatedHole } from 'circuit-json';
 
-declare const A0402: () => react_jsx_runtime.JSX.Element;
+declare const A0402: ({ color }: {
+    color?: string | undefined;
+}) => react_jsx_runtime.JSX.Element;
 
-declare const A0603: () => react_jsx_runtime.JSX.Element;
+declare const A0603: ({ color }: {
+    color?: string | undefined;
+}) => react_jsx_runtime.JSX.Element;
 
-declare const A0805: () => react_jsx_runtime.JSX.Element;
+declare const A0805: ({ color }: {
+    color?: string | undefined;
+}) => react_jsx_runtime.JSX.Element;
 
 interface BGAProps {
     packageWidth?: number;

package/dist/index.js

@@ -77332,22 +77332,42 @@ var require_dist = __commonJS({
     });
     module.exports = __toCommonJS2(lib_exports);
     var import_react_reconciler2 = __toESM2(require_react_reconciler(), 1);
+    var import_react2 = __toESM2(require_react(), 1);
+    function flattenArray(arr) {
+      return arr.reduce(
+        (flat, item) => flat.concat(Array.isArray(item) ? flattenArray(item) : item),
+        []
+      );
+    }
     function createHostConfig(jscad3) {
       const createInstance = (type, props, rootContainerInstance, hostContext, internalInstanceHandle) => {
         const renderChildren = (children) => {
+          if (!children) return [];
           if (Array.isArray(children)) {
-            throw new Error("Unioning multiple children is not yet supported");
-          }
-          if (children) {
-            return createInstance(
-              children.type,
-              children.props,
-              [],
-              hostContext,
-              internalInstanceHandle
+            return flattenArray(
+              children.filter(import_react2.default.isValidElement).map(
+                (child) => createInstance(
+                  child.type,
+                  child.props,
+                  [],
+                  hostContext,
+                  internalInstanceHandle
+                )
+              )
             );
           }
-          return null;
+          if (import_react2.default.isValidElement(children)) {
+            return [
+              createInstance(
+                children.type,
+                children.props,
+                [],
+                hostContext,
+                internalInstanceHandle
+              )
+            ];
+          }
+          return [];
         };
         if (typeof type === "function") {
           const element = type(props);
@@ -77523,21 +77543,43 @@ var require_dist = __commonJS({
           }
           case "subtract": {
             const { children } = props;
-            if (!Array.isArray(children) || children.length < 2) {
-              throw new Error("Subtract must have at least two children");
+            if (!children || children.length < 2) {
+              throw new Error(
+                "Subtract must have at least one base component and one component to subtract."
+              );
             }
-            const geometries = children.map(
-              (child) => createInstance(
-                child.type,
-                child.props,
-                rootContainerInstance,
-                hostContext,
-                internalInstanceHandle
-              )
+            const validChildren = import_react2.default.Children.toArray(children).filter(
+              import_react2.default.isValidElement
             );
-            return geometries.reduce(
-              (acc, curr) => jscad3.booleans.subtract(acc, curr)
+            if (validChildren.length < 2) {
+              throw new Error(
+                "Subtract must have at least one base component and one component to subtract."
+              );
+            }
+            const baseGeometry = createInstance(
+              validChildren[0].type,
+              validChildren[0].props,
+              rootContainerInstance,
+              hostContext,
+              internalInstanceHandle
+            );
+            const subtractGeometries = flattenArray(
+              validChildren.slice(1).map(
+                (child) => createInstance(
+                  child.type,
+                  child.props,
+                  rootContainerInstance,
+                  hostContext,
+                  internalInstanceHandle
+                )
+              )
             );
+            if (!baseGeometry || subtractGeometries.some((geo) => geo == null)) {
+              throw new Error(
+                "One or more geometries could not be processed for subtraction."
+              );
+            }
+            return jscad3.booleans.subtract(baseGeometry, subtractGeometries);
           }
           case "translate": {
             const { args, children } = props;
@@ -78012,7 +78054,7 @@ var require_dist = __commonJS({
       withColorProp(ExtrudeFromSlicesBase)
     );
     var jscad = __toESM2(require_src(), 1);
-    var import_react2 = __toESM2(require_react(), 1);
+    var import_react22 = __toESM2(require_react(), 1);
     var THREE = __toESM2(require_three(), 1);
     var import_OrbitControls = (init_OrbitControls(), __toCommonJS(OrbitControls_exports));
     var import_three2 = require_three();
@@ -78101,17 +78143,43 @@ var require_dist = __commonJS({
       zAxisUp = false,
       showGrid = false
     }) {
-      const containerRef = import_react2.default.useRef(null);
-      const sceneRef = import_react2.default.useRef(null);
-      const gridRef = import_react2.default.useRef(null);
-      import_react2.default.useEffect(() => {
+      const containerRef = import_react22.default.useRef(null);
+      const sceneRef = import_react22.default.useRef(null);
+      const gridRef = import_react22.default.useRef(null);
+      import_react22.default.useEffect(() => {
         if (containerRef.current) {
-          let animate2 = function() {
+          let processCGS2 = function(csg) {
+            if (Array.isArray(csg)) {
+              for (const child of csg) {
+                processCGS2(child);
+              }
+            } else {
+              const geometry = convert_csg_to_three_geom_default(csg);
+              if (csg.sides) {
+                const material = new THREE.LineBasicMaterial({
+                  vertexColors: true,
+                  linewidth: 2
+                  // Note: linewidth > 1 only works in WebGL 2
+                });
+                const lineLoop = new THREE.LineLoop(geometry, material);
+                scene.add(lineLoop);
+              } else {
+                const material = new THREE.MeshStandardMaterial({
+                  vertexColors: true,
+                  wireframe,
+                  side: THREE.DoubleSide
+                  // Ensure both sides are visible
+                });
+                const mesh = new THREE.Mesh(geometry, material);
+                scene.add(mesh);
+              }
+            }
+          }, animate2 = function() {
             requestAnimationFrame(animate2);
             controls.update();
             renderer.render(scene, camera);
           };
-          var animate = animate2;
+          var processCGS = processCGS2, animate = animate2;
           const jscadGeoms = [];
           const root = createJSCADRoot(jscadGeoms);
           root.render(children);
@@ -78145,25 +78213,7 @@ var require_dist = __commonJS({
           scene.add(gridHelper);
           gridRef.current = gridHelper;
           for (const csg of jscadGeoms) {
-            const geometry = convert_csg_to_three_geom_default(csg);
-            if (csg.sides) {
-              const material = new THREE.LineBasicMaterial({
-                vertexColors: true,
-                linewidth: 2
-                // Note: linewidth > 1 only works in WebGL 2
-              });
-              const lineLoop = new THREE.LineLoop(geometry, material);
-              scene.add(lineLoop);
-            } else {
-              const material = new THREE.MeshStandardMaterial({
-                vertexColors: true,
-                wireframe,
-                side: THREE.DoubleSide
-                // Ensure both sides are visible
-              });
-              const mesh = new THREE.Mesh(geometry, material);
-              scene.add(mesh);
-            }
+            processCGS2(csg);
           }
           camera.position.x = 20;
           camera.position.y = 20;
@@ -78183,7 +78233,7 @@ var require_dist = __commonJS({
           };
         }
       }, [children, wireframe, zAxisUp, showGrid]);
-      import_react2.default.useEffect(() => {
+      import_react22.default.useEffect(() => {
         if (gridRef.current) {
           gridRef.current.visible = showGrid;
         }
@@ -78191,14 +78241,14 @@ var require_dist = __commonJS({
       return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { ref: containerRef, style: { width: "100%", minHeight: "400px" } });
     }
     var jscad2 = __toESM2(require_src(), 1);
-    var import_react22 = require_react();
+    var import_react3 = require_react();
     var import_react_reconciler = __toESM2(require_react_reconciler(), 1);
     var THREE2 = __toESM2(require_three(), 1);
     var hostConfig = createHostConfig(jscad2);
     var reconciler = (0, import_react_reconciler.default)(hostConfig);
     function useJSCADRenderer(children) {
-      const container = (0, import_react22.useMemo)(() => [], []);
-      const root = (0, import_react22.useMemo)(() => {
+      const container = (0, import_react3.useMemo)(() => [], []);
+      const root = (0, import_react3.useMemo)(() => {
         const root2 = reconciler.createContainer(
           container,
           0,
@@ -78211,8 +78261,8 @@ var require_dist = __commonJS({
         );
         return root2;
       }, [container]);
-      const [mesh, setMesh] = (0, import_react22.useState)(null);
-      (0, import_react22.useEffect)(() => {
+      const [mesh, setMesh] = (0, import_react3.useState)(null);
+      (0, import_react3.useEffect)(() => {
         reconciler.updateContainer(children, root, null, () => {
         });
         const scene = new THREE2.Scene();
@@ -78250,15 +78300,15 @@ var require_dist = __commonJS({
       }
       return /* @__PURE__ */ (0, import_jsx_runtime322.jsx)("primitive", { object: mesh });
     }
-    var import_react3 = __toESM2(require_react(), 1);
+    var import_react4 = __toESM2(require_react(), 1);
     var useRenderElementsToJscadPlan = (jscad3, children) => {
-      const { renderer } = import_react3.default.useMemo(() => {
+      const { renderer } = import_react4.default.useMemo(() => {
         const renderer2 = createJSCADRenderer(jscad3);
         return { renderer: renderer2 };
       }, [jscad3]);
-      const [error, setError] = import_react3.default.useState(null);
-      const [loading, setLoading] = import_react3.default.useState(true);
-      const jscadElms = import_react3.default.useMemo(() => {
+      const [error, setError] = import_react4.default.useState(null);
+      const [loading, setLoading] = import_react4.default.useState(true);
+      const jscadElms = import_react4.default.useMemo(() => {
         setLoading(true);
         const jscadElms2 = [];
         const root = renderer.createJSCADRoot(jscadElms2);
@@ -78307,14 +78357,14 @@ var width = 0.5;
 var height = 0.5;
 var terminatorWidth = 0.2;
 var bodyLength = fullLength - terminatorWidth * 2;
-var A0402 = () => {
+var A0402 = ({ color = "#333" }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       import_jscad_fiber.Cuboid,
       {
         size: [bodyLength, width, height],
         offset: [0, 0, height / 2],
-        color: "#333"
+        color
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -78344,14 +78394,14 @@ var bodyLength2 = fullLength2 - 0.3 * 2;
 var terminatorLength = 0.3;
 var width2 = 0.85;
 var height2 = 0.6;
-var A0603 = () => {
+var A0603 = ({ color = "#333" }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
       import_jscad_fiber2.Cuboid,
       {
         size: [bodyLength2, width2, height2],
         offset: [0, 0, height2 / 2],
-        color: "#333"
+        color
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
@@ -78381,14 +78431,14 @@ var width3 = 1.25;
 var height3 = 0.55;
 var terminatorWidth2 = 0.5;
 var bodyLength3 = fullLength3 - terminatorWidth2 * 2;
-var A0805 = () => {
+var A0805 = ({ color = "#333" }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
       import_jscad_fiber3.Cuboid,
       {
         size: [bodyLength3, width3, height3],
         offset: [0, 0, height3 / 2],
-        color: "#333"
+        color
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
@@ -79007,6 +79057,16 @@ var Footprinter3d = ({ footprint }) => {
       );
     case "pinrow":
       return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(PinRow, { numberOfPins: fpJson.num_pins, pitch: fpJson.p });
+    case "cap": {
+      switch (fpJson.imperial) {
+        case "0402":
+          return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(A0402, { color: "#856c4d" });
+        case "0603":
+          return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(A0603, { color: "#856c4d" });
+        case "0805":
+          return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(A0805, { color: "#856c4d" });
+      }
+    }
     case "soic":
       return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
         Tssop,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jscad-electronics",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "main": "./dist/index.js",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "@biomejs/biome": "^1.9.3",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.1",
-    "jscad-fiber": "^0.0.68",
+    "jscad-fiber": "^0.0.71",
     "react": "^18.3.1",
     "react-cosmos": "^6.2.0",
     "react-cosmos-plugin-vite": "^6.2.0",
@@ -32,7 +32,7 @@
     "vite-tsconfig-paths": "^5.0.1"
   },
   "dependencies": {
-    "@tscircuit/footprinter": "^0.0.70",
-    "circuit-json": "^0.0.84"
+    "@tscircuit/footprinter": "^0.0.82",
+    "circuit-json": "^0.0.92"
   }
 }