@tscircuit/cli 0.1.1190 → 0.1.1191

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

@@ -11529,9 +11529,8 @@ function analyzeCircuitJson(circuitJson) {
 }
 
 // lib/shared/generate-circuit-json.tsx
-var import_make_vfs = __toESM(require_dist(), 1);
-import path2 from "node:path";
 import fs2 from "node:fs";
+import path2 from "node:path";
 import { pathToFileURL } from "node:url";
 import Debug from "debug";
 
@@ -11549,6 +11548,9 @@ var abbreviateStringifyObject = (obj) => {
   })));
 };
 
+// lib/shared/generate-circuit-json.tsx
+var import_make_vfs = __toESM(require_dist(), 1);
+
 // lib/shared/importFromUserLand.ts
 import { createRequire as createRequire2 } from "node:module";
 import fs from "node:fs";
@@ -11598,7 +11600,8 @@ async function generateCircuitJson({
   outputFileName,
   saveToFile = false,
   platformConfig,
-  injectedProps
+  injectedProps,
+  onAsyncEffectStatus
 }) {
   debug(`Generating circuit JSON for ${filePath}`);
   const React = await importFromUserLand("react");
@@ -11648,7 +11651,21 @@ async function generateCircuitJson({
   runner.add(/* @__PURE__ */ jsxDEV(Component, {
     ...injectedProps ?? {}
   }, undefined, false, undefined, this));
-  await runner.renderUntilSettled();
+  runner.render();
+  const loggedAsyncEffectNames = new Set;
+  while (runner._hasIncompleteAsyncEffects()) {
+    for (const asyncEffect of runner.getRunningAsyncEffects()) {
+      const asyncEffectName = asyncEffect.effectName;
+      if (!asyncEffectName || loggedAsyncEffectNames.has(asyncEffectName)) {
+        continue;
+      }
+      loggedAsyncEffectNames.add(asyncEffectName);
+      onAsyncEffectStatus?.(asyncEffectName);
+    }
+    await new Promise((resolve2) => setTimeout(resolve2, 100));
+    runner.render();
+  }
+  runner.emit("renderComplete");
   const circuitJson = await runner.getCircuitJson();
   if (saveToFile) {
     debug(`Saving circuit JSON to ${outputPath}`);
@@ -11656,7 +11673,8 @@ async function generateCircuitJson({
   }
   return {
     circuitJson,
-    outputPath
+    outputPath,
+    rootCircuit: runner
   };
 }
 
@@ -13543,7 +13561,7 @@ var loadCircuitJsonFromInputFile = (filePath) => {
   const parsed = JSON.parse(fs10.readFileSync(filePath, "utf-8"));
   return Array.isArray(parsed) ? parsed : [];
 };
-var handleBuildFile = async (filePath, outputPath, glbOutputPath, previewOutputDir, projectDir, options, workerLog) => {
+var handleBuildFile = async (filePath, outputPath, glbOutputPath, previewOutputDir, projectDir, options, workerLog, workerStatus) => {
   const errors = [];
   const warnings = [];
   const startedAt = options?.profile ? performance.now() : 0;
@@ -13557,7 +13575,10 @@ var handleBuildFile = async (filePath, outputPath, glbOutputPath, previewOutputD
     const circuitJson = isPrebuiltCircuitJson ? loadCircuitJsonFromInputFile(filePath) : (await generateCircuitJson({
       filePath,
       platformConfig: completePlatformConfig,
-      injectedProps: options?.injectedProps
+      injectedProps: options?.injectedProps,
+      onAsyncEffectStatus: (asyncEffectName) => {
+        workerStatus(`waiting on ${asyncEffectName}…`);
+      }
     })).circuitJson;
     fs10.mkdirSync(path13.dirname(outputPath), { recursive: true });
     fs10.writeFileSync(outputPath, JSON.stringify(circuitJson, null, 2));
@@ -13654,6 +13675,8 @@ var handleBuildFile = async (filePath, outputPath, glbOutputPath, previewOutputD
       warnings,
       durationMs: options?.profile ? performance.now() - startedAt : undefined
     };
+  } finally {
+    workerStatus(null);
   }
 };
 
@@ -13671,9 +13694,16 @@ var workerLog = (...args) => {
     log_lines: [line]
   });
 };
+var workerStatus = (statusLine) => {
+  sendMessage({
+    message_type: "worker_log",
+    log_lines: [],
+    status_line: statusLine
+  });
+};
 parentPort.on("message", async (msg) => {
   if (msg.message_type === "build_file") {
-    const result = await handleBuildFile(msg.file_path, msg.output_path, msg.glb_output_path, msg.preview_output_dir, msg.project_dir, msg.options, workerLog);
+    const result = await handleBuildFile(msg.file_path, msg.output_path, msg.glb_output_path, msg.preview_output_dir, msg.project_dir, msg.options, workerLog, workerStatus);
     sendMessage(result);
   }
 });

package/dist/cli/main.js

@@ -99964,7 +99964,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1189";
+var version = "0.1.1190";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -100031,7 +100031,7 @@ var package_default = {
     redaxios: "^0.5.1",
     semver: "^7.6.3",
     tempy: "^3.1.0",
-    tscircuit: "0.0.1579-libonly",
+    tscircuit: "0.0.1590-libonly",
     tsx: "^4.7.1",
     "typed-ky": "^0.0.4",
     zod: "^3.23.8",
@@ -109050,9 +109050,8 @@ function analyzeCircuitJson(circuitJson) {
 }
 
 // lib/shared/generate-circuit-json.tsx
-var import_make_vfs = __toESM2(require_dist4(), 1);
-import path25 from "node:path";
 import fs24 from "node:fs";
+import path25 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 import Debug from "debug";
 
@@ -109071,6 +109070,7 @@ var abbreviateStringifyObject = (obj) => {
 };
 
 // lib/shared/generate-circuit-json.tsx
+var import_make_vfs = __toESM2(require_dist4(), 1);
 import { jsxDEV as jsxDEV2 } from "react/jsx-dev-runtime";
 var debug = Debug("tsci:generate-circuit-json");
 var ALLOWED_FILE_EXTENSIONS = [
@@ -109090,7 +109090,8 @@ async function generateCircuitJson({
   outputFileName,
   saveToFile = false,
   platformConfig,
-  injectedProps
+  injectedProps,
+  onAsyncEffectStatus
 }) {
   debug(`Generating circuit JSON for ${filePath}`);
   const React = await importFromUserLand("react");
@@ -109140,7 +109141,21 @@ async function generateCircuitJson({
   runner.add(/* @__PURE__ */ jsxDEV2(Component, {
     ...injectedProps ?? {}
   }, undefined, false, undefined, this));
-  await runner.renderUntilSettled();
+  runner.render();
+  const loggedAsyncEffectNames = new Set;
+  while (runner._hasIncompleteAsyncEffects()) {
+    for (const asyncEffect of runner.getRunningAsyncEffects()) {
+      const asyncEffectName = asyncEffect.effectName;
+      if (!asyncEffectName || loggedAsyncEffectNames.has(asyncEffectName)) {
+        continue;
+      }
+      loggedAsyncEffectNames.add(asyncEffectName);
+      onAsyncEffectStatus?.(asyncEffectName);
+    }
+    await new Promise((resolve3) => setTimeout(resolve3, 100));
+    runner.render();
+  }
+  runner.emit("renderComplete");
   const circuitJson = await runner.getCircuitJson();
   if (saveToFile) {
     debug(`Saving circuit JSON to ${outputPath}`);
@@ -109148,7 +109163,8 @@ async function generateCircuitJson({
   }
   return {
     circuitJson,
-    outputPath
+    outputPath,
+    rootCircuit: runner
   };
 }
 
@@ -110696,7 +110712,8 @@ class ThreadWorkerPool {
         }
         const runningForMs = now - worker.currentJobStartedAt;
         const jobDescription = this.describeJob(worker.currentJob.job);
-        return `w${index}:busy task=${jobDescription} running_ms=${runningForMs}`;
+        const statusSuffix = worker.currentStatus ? ` status=${worker.currentStatus}` : "";
+        return `w${index}:busy task=${jobDescription} running_ms=${runningForMs}${statusSuffix}`;
       });
       this.options.onLog?.([
         `[worker-pool] heartbeat: workers busy=${busyWorkers}/${totalWorkers}, idle=${idleWorkers}, queued_jobs=${queuedJobs} | ${workerDetails.join(" | ")}`
@@ -110717,7 +110734,8 @@ class ThreadWorkerPool {
       busy: false,
       currentJob: null,
       currentJobStartedAt: null,
-      timeoutId: null
+      timeoutId: null,
+      currentStatus: null
     };
     this.attachWorkerHandlers(threadWorker);
     return threadWorker;
@@ -110762,6 +110780,7 @@ class ThreadWorkerPool {
     threadWorker.busy = false;
     threadWorker.currentJob = null;
     threadWorker.currentJobStartedAt = null;
+    threadWorker.currentStatus = null;
     this.attachWorkerHandlers(threadWorker);
   }
   finishJob(threadWorker, action) {
@@ -110772,6 +110791,7 @@ class ThreadWorkerPool {
     this.clearWorkerTimeout(threadWorker);
     threadWorker.currentJob = null;
     threadWorker.currentJobStartedAt = null;
+    threadWorker.currentStatus = null;
     threadWorker.busy = false;
     action(job);
     this.processQueue();
@@ -110783,6 +110803,7 @@ class ThreadWorkerPool {
         return;
       }
       if (this.options.isLogMessage(message)) {
+        threadWorker.currentStatus = this.options.getStatusLine?.(message) ?? null;
         this.options.onLog?.(this.options.getLogLines(message));
         return;
       }
@@ -110837,6 +110858,7 @@ class ThreadWorkerPool {
     availableWorker.busy = true;
     availableWorker.currentJob = queuedJob;
     availableWorker.currentJobStartedAt = Date.now();
+    availableWorker.currentStatus = null;
     this.startJobTimeout(availableWorker);
     availableWorker.worker.postMessage(this.options.createMessage(queuedJob.job));
   }
@@ -110902,6 +110924,7 @@ async function buildFilesWithWorkerPool(options) {
     }),
     isLogMessage: (message) => message.message_type === "worker_log",
     getLogLines: (message) => message.message_type === "worker_log" ? message.log_lines : [],
+    getStatusLine: (message) => message.message_type === "worker_log" ? message.status_line ?? null : null,
     isCompletionMessage: (message) => message.message_type === "build_completed",
     getResult: (message) => {
       const completedMessage = message;
@@ -110932,7 +110955,8 @@ async function buildFilesWithWorkerPool(options) {
     },
     cancellationError,
     jobTimeoutMs: Number.isFinite(workerJobTimeoutMs) && workerJobTimeoutMs > 0 ? workerJobTimeoutMs : undefined,
-    onLog: options.onLog
+    onLog: options.onLog,
+    heartbeatIntervalMs: 100
   });
   const results = [];
   const promises = [];

package/dist/cli/snapshot/snapshot.worker.js

@@ -11667,9 +11667,8 @@ function applyCameraPreset(preset, cam) {
 }
 
 // lib/shared/generate-circuit-json.tsx
-var import_make_vfs = __toESM(require_dist(), 1);
-import path2 from "node:path";
 import fs2 from "node:fs";
+import path2 from "node:path";
 import { pathToFileURL } from "node:url";
 import Debug from "debug";
 
@@ -11687,6 +11686,9 @@ var abbreviateStringifyObject = (obj) => {
   })));
 };
 
+// lib/shared/generate-circuit-json.tsx
+var import_make_vfs = __toESM(require_dist(), 1);
+
 // lib/shared/importFromUserLand.ts
 import { createRequire as createRequire2 } from "node:module";
 import fs from "node:fs";
@@ -11736,7 +11738,8 @@ async function generateCircuitJson({
   outputFileName,
   saveToFile = false,
   platformConfig,
-  injectedProps
+  injectedProps,
+  onAsyncEffectStatus
 }) {
   debug(`Generating circuit JSON for ${filePath}`);
   const React = await importFromUserLand("react");
@@ -11786,7 +11789,21 @@ async function generateCircuitJson({
   runner.add(/* @__PURE__ */ jsxDEV(Component, {
     ...injectedProps ?? {}
   }, undefined, false, undefined, this));
-  await runner.renderUntilSettled();
+  runner.render();
+  const loggedAsyncEffectNames = new Set;
+  while (runner._hasIncompleteAsyncEffects()) {
+    for (const asyncEffect of runner.getRunningAsyncEffects()) {
+      const asyncEffectName = asyncEffect.effectName;
+      if (!asyncEffectName || loggedAsyncEffectNames.has(asyncEffectName)) {
+        continue;
+      }
+      loggedAsyncEffectNames.add(asyncEffectName);
+      onAsyncEffectStatus?.(asyncEffectName);
+    }
+    await new Promise((resolve2) => setTimeout(resolve2, 100));
+    runner.render();
+  }
+  runner.emit("renderComplete");
   const circuitJson = await runner.getCircuitJson();
   if (saveToFile) {
     debug(`Saving circuit JSON to ${outputPath}`);
@@ -11794,7 +11811,8 @@ async function generateCircuitJson({
   }
   return {
     circuitJson,
-    outputPath
+    outputPath,
+    rootCircuit: runner
   };
 }
 

package/dist/lib/index.js

@@ -60678,7 +60678,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1189";
+var version = "0.1.1190";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -60745,7 +60745,7 @@ var package_default = {
     redaxios: "^0.5.1",
     semver: "^7.6.3",
     tempy: "^3.1.0",
-    tscircuit: "0.0.1579-libonly",
+    tscircuit: "0.0.1590-libonly",
     tsx: "^4.7.1",
     "typed-ky": "^0.0.4",
     zod: "^3.23.8",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1190",
+  "version": "0.1.1191",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -64,7 +64,7 @@
     "redaxios": "^0.5.1",
     "semver": "^7.6.3",
     "tempy": "^3.1.0",
-    "tscircuit": "0.0.1579-libonly",
+    "tscircuit": "0.0.1590-libonly",
     "tsx": "^4.7.1",
     "typed-ky": "^0.0.4",
     "zod": "^3.23.8",