circuit-json-to-gltf 0.0.53 → 0.0.57

package/dist/index.js

@@ -14117,6 +14117,11 @@ async function loadGLB(url, transform) {
     return glbCache.get(cacheKey);
   }
   const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch GLB: ${response.status} ${response.statusText}`
+    );
+  }
   const buffer = await response.arrayBuffer();
   const mesh = parseGLB(buffer, transform);
   glbCache.set(cacheKey, mesh);
@@ -14273,20 +14278,7 @@ function extractTrianglesFromGLTF(gltf, binaryBuffer) {
       let indices;
       if (primitive.indices !== void 0) {
         const indexAccessor = gltf.accessors[primitive.indices];
-        const indexData = getAccessorData(
-          indexAccessor,
-          gltf.bufferViews,
-          binaryBuffer
-        );
-        indices = indexAccessor.componentType === 5123 ? new Uint16Array(
-          indexData.buffer,
-          indexData.byteOffset,
-          indexData.length
-        ) : new Uint32Array(
-          indexData.buffer,
-          indexData.byteOffset,
-          indexData.length
-        );
+        indices = getAccessorData(indexAccessor, gltf.bufferViews, binaryBuffer);
       }
       const vertexCount = positions.length / 3;
       if (indices) {
@@ -14678,7 +14670,7 @@ async function renderBoardLayer(circuitJson, options) {
 }
 async function convertSvgToPng(svgString, resolution, backgroundColor) {
   if (typeof window !== "undefined" && typeof document !== "undefined") {
-    const { svgToPngDataUrl } = await import("./svg-to-png-browser-VH734VGT.js");
+    const { svgToPngDataUrl } = await import("./svg-to-png-browser-MXUWCXAZ.js");
     return await svgToPngDataUrl(svgString, {
       width: resolution,
       background: backgroundColor
@@ -14725,20 +14717,18 @@ async function convertSvgToCanvasBrowser(svgString, resolution, backgroundColor)
   });
 }
 async function renderBoardTextures(circuitJson, resolution = 1024) {
-  const [top, bottom] = await Promise.all([
-    renderBoardLayer(circuitJson, {
-      layer: "top",
-      resolution,
-      backgroundColor: "#0F3812"
-      // Green PCB background
-    }),
-    renderBoardLayer(circuitJson, {
-      layer: "bottom",
-      resolution,
-      backgroundColor: "#0F3812"
-      // Darker green for bottom layer
-    })
-  ]);
+  const top = await renderBoardLayer(circuitJson, {
+    layer: "top",
+    resolution,
+    backgroundColor: "#0F3812"
+    // Green PCB background
+  });
+  const bottom = await renderBoardLayer(circuitJson, {
+    layer: "bottom",
+    resolution,
+    backgroundColor: "#0F3812"
+    // Darker green for bottom layer
+  });
   return { top, bottom };
 }
 
@@ -15187,7 +15177,11 @@ async function convertCircuitJsonTo3D(circuitJson, options = {}) {
     } else if (model_obj_url) {
       box.mesh = await loadOBJ(model_obj_url, defaultTransform);
     } else if (model_glb_url) {
-      box.mesh = await loadGLB(model_glb_url, defaultTransform);
+      try {
+        box.mesh = await loadGLB(model_glb_url, defaultTransform);
+      } catch (err) {
+        console.error(`Failed to load GLB from ${model_glb_url}:`, err);
+      }
     } else if (model_gltf_url) {
       box.mesh = await loadGLTF(model_gltf_url, defaultTransform);
     } else if (hasFootprinterModel && cad.footprinter_string) {
@@ -15914,7 +15908,8 @@ var GLTFBuilder = class {
       },
       alphaMode: "BLEND"
     });
-    for (const box of scene3D.boxes) {
+    for (let i = 0; i < scene3D.boxes.length; i++) {
+      const box = scene3D.boxes[i];
       await this.addBox(box, defaultMaterialIndex);
     }
   }
@@ -15998,9 +15993,8 @@ var GLTFBuilder = class {
     }
     const primitives = [];
     for (const { meshData, materialIndex } of meshDataArray) {
-      const transformedMeshData = convertMeshToGLTFOrientation(
-        transformMesh(meshData, box.center, box.rotation)
-      );
+      const translatedMesh = transformMesh(meshData, box.center, box.rotation);
+      const transformedMeshData = convertMeshToGLTFOrientation(translatedMesh);
       const positionAccessorIndex = this.addAccessor(
         transformedMeshData.positions,
         "VEC3",

package/dist/{svg-to-png-browser-VH734VGT.js → svg-to-png-browser-MXUWCXAZ.js}

@@ -6,14 +6,18 @@ import {
 } from "./chunk-QGM4M3NI.js";
 
 // lib/utils/svg-to-png-browser.ts
-import { Resvg, initWasm } from "@resvg/resvg-wasm";
 var wasmInitialized = false;
+var Resvg;
+var initWasm;
 async function ensureWasmInitialized() {
   if (!wasmInitialized) {
     try {
       if (typeof process !== "undefined" && process.versions?.node) {
         const { readFileSync } = await import("fs");
         const { dirname, join } = await import("path");
+        const resvgModule = await import("@resvg/resvg-wasm");
+        Resvg = resvgModule.Resvg;
+        initWasm = resvgModule.initWasm;
         try {
           const packagePath = __require.resolve("@resvg/resvg-wasm/package.json");
           const wasmPath = join(dirname(packagePath), "index_bg.wasm");
@@ -33,12 +37,28 @@ async function ensureWasmInitialized() {
         }
       } else {
         try {
+          const resvgModule = await import("@resvg/resvg-wasm");
+          Resvg = resvgModule.Resvg;
+          initWasm = resvgModule.initWasm;
           const wasmUrl = await import("@resvg/resvg-wasm/index_bg.wasm?url");
           await initWasm(fetch(wasmUrl.default));
         } catch {
-          await initWasm(
-            fetch("https://unpkg.com/@resvg/resvg-wasm@2.6.2/index_bg.wasm")
-          );
+          try {
+            const cdnUrl = "https://cdn.jsdelivr.net/npm/@resvg/resvg-wasm@2.6.2/+esm";
+            const resvgModule = await import(
+              /* @vite-ignore */
+              cdnUrl
+            );
+            Resvg = resvgModule.Resvg;
+            initWasm = resvgModule.initWasm;
+            await initWasm(
+              fetch("https://unpkg.com/@resvg/resvg-wasm@2.6.2/index_bg.wasm")
+            );
+          } catch (cdnError) {
+            throw new Error(
+              `Failed to load resvg-wasm from CDN: ${cdnError.message}`
+            );
+          }
         }
       }
       wasmInitialized = true;

package/package.json

@@ -2,7 +2,7 @@
   "name": "circuit-json-to-gltf",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.53",
+  "version": "0.0.57",
   "scripts": {
     "test": "bun test tests/",
     "format": "biome format --write .",