@tscircuit/cli 0.1.1534 → 0.1.1535

package/dist/cli/build/build.worker.js

@@ -12169,6 +12169,190 @@ var resolveImageFormatSelection = (options) => {
 import fs9 from "node:fs";
 import path13 from "node:path";
 
+// node_modules/circuit-json-to-3d-png/dist/index.js
+function normalizeDir(dir) {
+  const len = Math.sqrt(dir[0] ** 2 + dir[1] ** 2 + dir[2] ** 2);
+  if (len === 0)
+    return [0, 1, 0];
+  return [dir[0] / len, dir[1] / len, dir[2] / len];
+}
+function distance(a, b) {
+  return Math.sqrt((a[0] - b[0]) ** 2 + (a[1] - b[1]) ** 2 + (a[2] - b[2]) ** 2);
+}
+function repositionCamera(cam, dir, distOverride) {
+  const dist = distOverride ?? distance(cam.camPos, cam.lookAt);
+  const [nx, ny, nz] = normalizeDir(dir);
+  return {
+    camPos: [
+      cam.lookAt[0] + nx * dist,
+      cam.lookAt[1] + ny * dist,
+      cam.lookAt[2] + nz * dist
+    ],
+    lookAt: cam.lookAt,
+    fov: cam.fov
+  };
+}
+var CAMERA_PRESETS = {
+  "top-down": (cam) => repositionCamera(cam, [0.00000001, 1, -0.001]),
+  "top-down-ortho": (cam) => {
+    const desiredFov = 3;
+    const dir = [0.00000001, 1, -0.001];
+    const origDist = distance(cam.camPos, cam.lookAt);
+    const origFovRad = Math.max(cam.fov * Math.PI / 180, 0.01);
+    const desiredFovRad = Math.max(desiredFov * Math.PI / 180, 0.01);
+    const tanOrig = Math.tan(origFovRad / 2);
+    const tanDesired = Math.max(Math.tan(desiredFovRad / 2), 0.0001);
+    const distScale = Number.isFinite(tanOrig / tanDesired) && tanOrig > 0 ? tanOrig / tanDesired : 1;
+    const newDist = origDist * distScale;
+    const repositioned = repositionCamera(cam, dir, newDist);
+    return { ...repositioned, fov: desiredFov };
+  },
+  "top-left-corner": (cam) => repositionCamera(cam, [0.7, 1.2, -0.8]),
+  "top-left": (cam) => repositionCamera(cam, [1, 1.2, 0]),
+  "top-right-corner": (cam) => repositionCamera(cam, [-0.7, 1.2, -0.8]),
+  "top-right": (cam) => repositionCamera(cam, [-1, 1.2, 0]),
+  "left-sideview": (cam) => repositionCamera(cam, [1, 0.05, 0]),
+  "right-sideview": (cam) => repositionCamera(cam, [-1, 0.05, 0]),
+  front: (cam) => repositionCamera(cam, [0, 0.05, -1]),
+  "top-center-angled": (cam) => repositionCamera(cam, [0, 1, -1])
+};
+var CAMERA_PRESET_NAMES = Object.keys(CAMERA_PRESETS);
+function applyCameraPreset(preset, cam) {
+  if (!(preset in CAMERA_PRESETS)) {
+    throw new Error(`Unknown camera preset "${preset}". Valid presets: ${CAMERA_PRESET_NAMES.join(", ")}`);
+  }
+  return CAMERA_PRESETS[preset](cam);
+}
+var viewToArrayBuffer = (view) => {
+  const copy = new Uint8Array(view.byteLength);
+  copy.set(new Uint8Array(view.buffer, view.byteOffset, view.byteLength));
+  return copy.buffer;
+};
+var normalizeToArrayBuffer = async (value) => {
+  if (value instanceof ArrayBuffer) {
+    return value;
+  }
+  if (ArrayBuffer.isView(value)) {
+    return viewToArrayBuffer(value);
+  }
+  if ("arrayBuffer" in value && typeof value.arrayBuffer === "function") {
+    const result = value.arrayBuffer();
+    return result instanceof Promise ? await result : result;
+  }
+  throw new Error("Expected ArrayBuffer, ArrayBufferView, or Buffer-compatible object");
+};
+var normalizeToUint8Array = (value) => {
+  if (value instanceof Uint8Array) {
+    return value;
+  }
+  if (value instanceof ArrayBuffer) {
+    return new Uint8Array(value);
+  }
+  if (ArrayBuffer.isView(value)) {
+    return new Uint8Array(viewToArrayBuffer(value));
+  }
+  throw new Error("Expected Uint8Array, ArrayBuffer, or ArrayBufferView");
+};
+var circuitJsonToGltfModulePromise = null;
+var poppyGlModulePromise = null;
+var loadCircuitJsonToGltf = async () => {
+  circuitJsonToGltfModulePromise ??= import("circuit-json-to-gltf");
+  return circuitJsonToGltfModulePromise;
+};
+var loadPoppyGl = async () => {
+  poppyGlModulePromise ??= import("poppygl");
+  return poppyGlModulePromise;
+};
+var modelUrlKeys = [
+  "model_glb_url",
+  "glb_model_url",
+  "model_stl_url",
+  "stl_model_url",
+  "model_obj_url",
+  "obj_model_url",
+  "model_gltf_url",
+  "gltf_model_url",
+  "model_step_url",
+  "step_model_url"
+];
+var hasUriScheme = (value) => /^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(value) && !/^[a-zA-Z]:[\\/]/.test(value);
+var isWindowsAbsolutePath = (value) => /^[a-zA-Z]:[\\/]/.test(value);
+var getDefaultBaseDir = () => {
+  if (typeof process !== "undefined" && process && typeof process.cwd === "function") {
+    return process.cwd();
+  }
+  return;
+};
+var toFileUrl = (value) => {
+  const normalizedPath = value.replace(/\\/g, "/");
+  const pathname = isWindowsAbsolutePath(value) ? `/${normalizedPath}` : normalizedPath;
+  return new URL(`file://${encodeURI(pathname)}`).href;
+};
+var toDirectoryUrl = (value) => {
+  if (hasUriScheme(value)) {
+    return value.endsWith("/") ? value : `${value}/`;
+  }
+  const directoryPath = value.endsWith("/") || value.endsWith("\\") ? value : `${value}/`;
+  return toFileUrl(directoryPath);
+};
+var normalizeModelUrls = (circuitJson, options = {}) => {
+  const baseDir = options.modelPathBaseDir ?? getDefaultBaseDir();
+  const hasModelPathBaseDir = options.modelPathBaseDir != null;
+  const preserveRelativeModelUrls = Boolean(options.projectBaseUrl);
+  return circuitJson.map((element) => {
+    if (!element || typeof element !== "object")
+      return element;
+    const updated = { ...element };
+    for (const key of modelUrlKeys) {
+      const value = updated[key];
+      if (!value)
+        continue;
+      if (hasUriScheme(value))
+        continue;
+      if (value.startsWith("/") && preserveRelativeModelUrls) {
+        updated[key] = value;
+      } else if (value.startsWith("/") || isWindowsAbsolutePath(value)) {
+        updated[key] = toFileUrl(value);
+      } else if (preserveRelativeModelUrls && !hasModelPathBaseDir) {
+        updated[key] = value;
+      } else if (!baseDir) {
+        updated[key] = value;
+      } else {
+        updated[key] = new URL(value, toDirectoryUrl(baseDir)).href;
+      }
+    }
+    return updated;
+  });
+};
+var getRenderCamera = (circuitJson, defaultCamera, options = {}) => {
+  if (options.camera) {
+    return options.camera;
+  }
+  if (!options.cameraPreset) {
+    return defaultCamera;
+  }
+  return applyCameraPreset(options.cameraPreset, defaultCamera);
+};
+var getConversionOptions = (format, options = {}) => ({
+  format,
+  ...options.projectBaseUrl ? { projectBaseUrl: options.projectBaseUrl } : {},
+  ...options.authHeaders ? { authHeaders: options.authHeaders } : {},
+  ...options.boardTextureResolution ? { boardTextureResolution: options.boardTextureResolution } : {}
+});
+var convertCircuitJsonTo3dGlb = async (circuitJson, options = {}) => {
+  const normalizedCircuitJson = normalizeModelUrls(circuitJson, options);
+  const { convertCircuitJsonToGltf } = await loadCircuitJsonToGltf();
+  const glbBuffer = await convertCircuitJsonToGltf(normalizedCircuitJson, getConversionOptions("glb", options));
+  return normalizeToUint8Array(await normalizeToArrayBuffer(glbBuffer));
+};
+var renderCircuitJsonTo3dPng = async (circuitJson, options = {}) => {
+  const [{ getBestCameraPosition }, { renderGLTFToPNGFromGLB }] = await Promise.all([loadCircuitJsonToGltf(), loadPoppyGl()]);
+  const glbBuffer = await convertCircuitJsonTo3dGlb(circuitJson, options);
+  const glbArrayBuffer = await normalizeToArrayBuffer(glbBuffer);
+  const defaultCamera = getBestCameraPosition(circuitJson);
+  return renderGLTFToPNGFromGLB(glbArrayBuffer, getRenderCamera(circuitJson, defaultCamera, options));
+};
+
 // node_modules/circuit-json-to-step/node_modules/stepts/dist/index.js
 var Entity = class {
   static parse(_a, _ctx) {
@@ -14455,15 +14639,11 @@ async function circuitJsonToStep(circuitJson, options = {}) {
 }
 
 // cli/build/worker-output-generators.ts
-import {
-  convertCircuitJsonToGltf,
-  getBestCameraPosition
-} from "circuit-json-to-gltf";
+import { convertCircuitJsonToGltf } from "circuit-json-to-gltf";
 import {
   convertCircuitJsonToPcbSvg,
   convertCircuitJsonToSchematicSvg
 } from "circuit-to-svg";
-import { renderGLTFToPNGFromGLB } from "poppygl";
 
 // node_modules/conf/dist/source/index.js
 import { isDeepStrictEqual } from "node:util";
@@ -15952,7 +16132,7 @@ var getCircuitJsonToGltfOptions = ({
 import path11 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 var convertModelUrlsToFileUrls = (circuitJson) => {
-  const modelUrlKeys = [
+  const modelUrlKeys2 = [
     "model_glb_url",
     "glb_model_url",
     "model_stl_url",
@@ -15968,7 +16148,7 @@ var convertModelUrlsToFileUrls = (circuitJson) => {
     if (!element || typeof element !== "object")
       return element;
     const updated = { ...element };
-    for (const key of modelUrlKeys) {
+    for (const key of modelUrlKeys2) {
       const value = updated[key];
       if (typeof value === "string" && value.length > 0) {
         if (value.match(/^[a-zA-Z]+:\/\//))
@@ -15985,12 +16165,12 @@ var convertModelUrlsToFileUrls = (circuitJson) => {
 };
 
 // cli/build/worker-binary-utils.ts
-var viewToArrayBuffer = (view) => {
+var viewToArrayBuffer2 = (view) => {
   const copy = new Uint8Array(view.byteLength);
   copy.set(new Uint8Array(view.buffer, view.byteOffset, view.byteLength));
   return copy.buffer;
 };
-var normalizeToUint8Array = (value) => {
+var normalizeToUint8Array2 = (value) => {
   if (value instanceof Uint8Array) {
     return value;
   }
@@ -15998,26 +16178,10 @@ var normalizeToUint8Array = (value) => {
     return new Uint8Array(value);
   }
   if (ArrayBuffer.isView(value)) {
-    return new Uint8Array(viewToArrayBuffer(value));
+    return new Uint8Array(viewToArrayBuffer2(value));
   }
   throw new Error("Expected Uint8Array, ArrayBuffer, or ArrayBufferView for binary data");
 };
-var normalizeToArrayBuffer = async (value) => {
-  if (value instanceof ArrayBuffer) {
-    return value;
-  }
-  if (ArrayBuffer.isView(value)) {
-    return viewToArrayBuffer(value);
-  }
-  if (value && typeof value === "object") {
-    const maybeArrayBufferLike = value;
-    if (typeof maybeArrayBufferLike.arrayBuffer === "function") {
-      const result = maybeArrayBufferLike.arrayBuffer();
-      return result instanceof Promise ? await result : result;
-    }
-  }
-  throw new Error("Expected ArrayBuffer, ArrayBufferView, or Buffer-compatible object");
-};
 
 // cli/build/svg-to-png.ts
 import { Resvg } from "@resvg/resvg-js";
@@ -16107,7 +16271,7 @@ var writeSimulationSvgAssetsFromCircuitJson = (circuitJson, outputDir, imageForm
 var writeGlbFromCircuitJson = async (circuitJson, glbOutputPath) => {
   const circuitJsonWithFileUrls = convertModelUrlsToFileUrls(circuitJson);
   const glbBuffer = await convertCircuitJsonToGltf(circuitJsonWithFileUrls, getCircuitJsonToGltfOptions({ format: "glb" }));
-  const glbData = normalizeToUint8Array(glbBuffer);
+  const glbData = normalizeToUint8Array2(glbBuffer);
   fs9.mkdirSync(path13.dirname(glbOutputPath), { recursive: true });
   fs9.writeFileSync(glbOutputPath, Buffer.from(glbData));
 };
@@ -16137,11 +16301,8 @@ var writeImageAssetsFromCircuitJson = async (circuitJson, options) => {
   }
   writeSimulationSvgAssetsFromCircuitJson(circuitJson, outputDir, imageFormats);
   if (imageFormats.threeDPngs) {
-    const circuitJsonWithFileUrls = convertModelUrlsToFileUrls(circuitJson);
-    const glbBuffer = await convertCircuitJsonToGltf(circuitJsonWithFileUrls, getCircuitJsonToGltfOptions({ format: "glb" }));
-    const glbArrayBuffer = await normalizeToArrayBuffer(glbBuffer);
-    const pngBuffer = await renderGLTFToPNGFromGLB(glbArrayBuffer, getBestCameraPosition(circuitJson));
-    fs9.writeFileSync(path13.join(outputDir, "3d.png"), Buffer.from(normalizeToUint8Array(pngBuffer)));
+    const pngBuffer = await renderCircuitJsonTo3dPng(circuitJson);
+    fs9.writeFileSync(path13.join(outputDir, "3d.png"), Buffer.from(pngBuffer));
   }
 };