@akanjs/cli 2.4.1-rc.3 → 2.4.1-rc.5

package/.build-stamp

@@ -0,0 +1 @@
+97b051f1849d61848768f6c43d1dbcc90953864ce31504f1f376a61adb4481fb

package/{agent.command-h4afc69n.js → agent.command-t4346579.js}

@@ -1,15 +1,15 @@
 // @bun
 import {
   AgentScript
-} from "./index-hwzpw9c1.js";
-import"./index-8rc0bm04.js";
-import"./index-h6ca6qg0.js";
-import"./index-qaq13qk3.js";
+} from "./index-pya1h7wx.js";
+import"./index-eay4t1te.js";
+import"./index-2v10yr8g.js";
+import"./index-eqxmxan6.js";
 import {
   Workspace,
   command
-} from "./index-hdqztm58.js";
-import"./index-a6sbyy0b.js";
+} from "./index-qpz4csbs.js";
+import"./index-0t7pwff2.js";
 import"./index-61keag0s.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";

package/{application.command-jkmbsd1x.js → application.command-zkmeemdt.js}

@@ -1,21 +1,22 @@
 // @bun
 import {
   ApplicationScript
-} from "./index-rgfxj6qc.js";
+} from "./index-n5y2gbf2.js";
 import {
   getMobileTargetChoices
 } from "./index-76rn3g2c.js";
-import"./index-pmm9e2jf.js";
+import"./index-fh990y67.js";
 import {
   App,
   Exec,
   Sys,
   Workspace,
   command
-} from "./index-hdqztm58.js";
+} from "./index-qpz4csbs.js";
 import"./index-fgc8r6dj.js";
-import"./index-a6sbyy0b.js";
+import"./index-0t7pwff2.js";
 import"./index-61keag0s.js";
+import"./index-0fn1r7gg.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/{applicationBuildRunner-ny84tjhc.js → applicationBuildRunner-5w8j9yp7.js}

@@ -4,7 +4,8 @@ import {
   CsrArtifactBuilder,
   SsrBaseArtifactBuilder,
   precompressArtifacts
-} from "./index-q7zcac6n.js";
+} from "./index-khzzttv1.js";
+import"./index-0fn1r7gg.js";
 import {
   Spinner
 } from "./index-6pz1j0zj.js";

package/buildBatch.proc.js

@@ -2,14 +2,16 @@
 import {
   AppExecutor,
   WorkspaceExecutor
-} from "./index-a6sbyy0b.js";
+} from "./index-0t7pwff2.js";
 import"./index-61keag0s.js";
 import {
   CsrArtifactBuilder,
   CssCompiler,
   FontOptimizer,
-  PagesBundleBuilder
-} from "./index-q7zcac6n.js";
+  PagesBundleBuilder,
+  SsrBaseArtifactBuilder
+} from "./index-khzzttv1.js";
+import"./index-0fn1r7gg.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 
@@ -28,6 +30,8 @@ class BuildBatch {
     this.#result = { generation: request.generation, errors: {} };
   }
   async run() {
+    if (this.#request.needs.includes("base"))
+      await this.#buildBase();
     if (this.#request.needs.includes("csr"))
       await this.#buildCsr();
     if (this.#request.needs.includes("pages"))
@@ -51,6 +55,19 @@ class BuildBatch {
       }
     });
   }
+  async#buildBase() {
+    const started = Date.now();
+    try {
+      const { artifact, optimizedFonts } = await new SsrBaseArtifactBuilder(this.#app).build();
+      this.#result.artifact = artifact;
+      this.#result.optimizedFonts = optimizedFonts;
+      this.#logger.verbose(`base-artifact ok buildId=${artifact.pagesBundleBuildId} (${Date.now() - started}ms)`);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      this.#logger.error(`base-artifact failed: ${message}`);
+      this.#result.errors.base = message;
+    }
+  }
   async#buildCsr() {
     const started = Date.now();
     try {

package/{capacitorApp-y0h6cgft.js → capacitorApp-wnxzrppx.js}

@@ -24,9 +24,9 @@ import {
   selectLocalDevHost,
   sortIosRunTargets,
   writeRootCapacitorConfig
-} from "./index-1xdrsbry.js";
+} from "./index-hk58kr1m.js";
 import"./index-76rn3g2c.js";
-import"./index-a6sbyy0b.js";
+import"./index-0t7pwff2.js";
 import"./index-61keag0s.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";

package/{cloud.command-53j76grx.js → cloud.command-5ztqxppm.js}

@@ -1,23 +1,24 @@
 // @bun
 import {
   CloudScript
-} from "./index-0hjg9qs5.js";
-import"./index-dynknvzd.js";
+} from "./index-s9yajzkj.js";
+import"./index-gr4cjv99.js";
 import {
   GlobalConfig
 } from "./index-5vvwc0cz.js";
-import"./index-rgfxj6qc.js";
+import"./index-n5y2gbf2.js";
 import"./index-76rn3g2c.js";
-import"./index-pmm9e2jf.js";
-import"./index-n6h3482q.js";
+import"./index-fh990y67.js";
+import"./index-nv7et4t3.js";
 import {
   Workspace,
   command
-} from "./index-hdqztm58.js";
+} from "./index-qpz4csbs.js";
 import"./index-fgc8r6dj.js";
-import"./index-a6sbyy0b.js";
+import"./index-0t7pwff2.js";
 import"./index-x53a5nya.js";
 import"./index-61keag0s.js";
+import"./index-0fn1r7gg.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 

package/{context.command-ds3mka9p.js → context.command-smwxwgwf.js}

@@ -1,25 +1,25 @@
 // @bun
 import {
   ContextScript
-} from "./index-1fpjvqhs.js";
-import"./index-85msc0wg.js";
-import"./index-45aj5ry0.js";
-import"./index-gb26e7z0.js";
-import"./index-m9pca6jv.js";
-import"./index-fmky5k3p.js";
-import"./index-swf4bmbg.js";
+} from "./index-0jwvs8vp.js";
+import"./index-jbtn8h1y.js";
+import"./index-3sd2vape.js";
+import"./index-ahpcr9ss.js";
+import"./index-2v6a4wd5.js";
+import"./index-wh201a76.js";
+import"./index-y4kg682s.js";
 import"./index-ss469dec.js";
-import"./index-1xdrsbry.js";
-import"./index-8rc0bm04.js";
-import"./index-h6ca6qg0.js";
-import"./index-qaq13qk3.js";
+import"./index-hk58kr1m.js";
+import"./index-eay4t1te.js";
+import"./index-2v10yr8g.js";
+import"./index-eqxmxan6.js";
 import"./index-5vvwc0cz.js";
 import"./index-76rn3g2c.js";
 import {
   Workspace,
   command
-} from "./index-hdqztm58.js";
-import"./index-a6sbyy0b.js";
+} from "./index-qpz4csbs.js";
+import"./index-0t7pwff2.js";
 import"./index-61keag0s.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";

package/{guideline.command-ya0dh44f.js → guideline.command-1r0esdjs.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   Prompter
-} from "./index-qaq13qk3.js";
+} from "./index-eqxmxan6.js";
 import {
   AiSession
 } from "./index-5vvwc0cz.js";
@@ -10,10 +10,10 @@ import {
   command,
   runner,
   script
-} from "./index-hdqztm58.js";
+} from "./index-qpz4csbs.js";
 import {
   getDirname
-} from "./index-a6sbyy0b.js";
+} from "./index-0t7pwff2.js";
 import {
   FileSys
 } from "./index-61keag0s.js";

package/incrementalBuilder.proc.js

@@ -5,18 +5,19 @@ import {
 import {
   AppExecutor,
   WorkspaceExecutor
-} from "./index-a6sbyy0b.js";
+} from "./index-0t7pwff2.js";
 import"./index-61keag0s.js";
 import {
   AutoImportSync,
   DevChangePlanner,
   DevGeneratedIndexSync,
   GraphClientEntryDiscovery,
+  RouteClientBuilder
+} from "./index-khzzttv1.js";
+import {
   HmrWatcher,
-  RouteClientBuilder,
-  SsrBaseArtifactBuilder,
   WatchRootResolver
-} from "./index-q7zcac6n.js";
+} from "./index-0fn1r7gg.js";
 import"./index-6pz1j0zj.js";
 import"./index-r24hmh0q.js";
 
@@ -90,6 +91,39 @@ class BuildBatchRunner {
   }
 }
 
+// pkgs/@akanjs/devkit/incrementalBuilder/builderChannel.ts
+class BuilderChannel {
+  static #flushTimeoutMs = 5000;
+  static #flushing = new Set;
+  static send(message) {
+    const send = process.send;
+    if (!send)
+      return Promise.resolve();
+    const flushed = new Promise((resolve) => {
+      const timer = setTimeout(resolve, BuilderChannel.#flushTimeoutMs);
+      send.call(process, message, undefined, undefined, () => {
+        clearTimeout(timer);
+        resolve();
+      });
+    });
+    BuilderChannel.#flushing.add(flushed);
+    flushed.then(() => BuilderChannel.#flushing.delete(flushed));
+    return flushed;
+  }
+  static emit(message) {
+    BuilderChannel.send(message);
+  }
+  static async drain() {
+    let flushed = 0;
+    while (BuilderChannel.#flushing.size) {
+      const pending = [...BuilderChannel.#flushing];
+      flushed += pending.length;
+      await Promise.all(pending);
+    }
+    return flushed;
+  }
+}
+
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts
 class IncrementalBuilder {
   #logger = new Logger2("IncrementalBuilder");
@@ -102,6 +136,7 @@ class IncrementalBuilder {
   #changePlanner;
   #generatedIndexSync;
   #autoImportSync;
+  #watcher = null;
   #generation = 0;
   #csrActive = IncrementalBuilder.#csrArmedByEnv();
   #workQueue = Promise.resolve();
@@ -130,7 +165,7 @@ class IncrementalBuilder {
     return `${this.#app.cwdPath}/.akan/artifact`;
   }
   async handleBuildRoute(msg) {
-    return this.#enqueueWork(`build-route:${msg.routeId}`, async () => this.#handleBuildRoute(msg));
+    await this.#enqueueWork(`build-route:${msg.routeId}`, async () => BuilderChannel.send(await this.#handleBuildRoute(msg)));
   }
   async#handleBuildRoute(msg) {
     try {
@@ -169,7 +204,7 @@ class IncrementalBuilder {
   #sendBuildStatus(phase, { generation, ok, files, message }) {
     if (typeof generation !== "number")
       return;
-    process.send?.({
+    BuilderChannel.emit({
       type: "build-status",
       data: {
         generation,
@@ -204,7 +239,7 @@ class IncrementalBuilder {
   #reportMetrics() {
     if (!this.#idle || this.#shuttingDown)
       return;
-    process.send?.({
+    BuilderChannel.emit({
       type: "builder-metrics",
       data: { rssBytes: process.memoryUsage.rss(), generation: this.#generation, workCount: this.#workCount }
     });
@@ -226,7 +261,8 @@ class IncrementalBuilder {
     await this.#cssRebuildQueue.catch(() => {
       return;
     });
-    this.#logger.info(`drained in ${Date.now() - started}ms; exiting for recycle`);
+    const flushed = await BuilderChannel.drain();
+    this.#logger.info(`drained in ${Date.now() - started}ms${flushed ? ` after flushing ${flushed} ipc write(s)` : ""}; exiting for recycle`);
     process.exit(0);
   }
   get shuttingDown() {
@@ -300,7 +336,8 @@ class IncrementalBuilder {
         await this.#enqueueWork("hmr-batch", async () => this.#handleWatchBatch(appDir, artifactDir, batch));
       }
     });
-    watcher.start();
+    await watcher.start();
+    this.#watcher = watcher;
     this.#logger.verbose(`watching ${roots.length} roots`);
   }
   async#handleWatchBatch(appDir, artifactDir, batch) {
@@ -314,6 +351,7 @@ class IncrementalBuilder {
     if (autoImport.changedFiles.length > 0)
       this.#logger.verbose(`[auto-import] inserted imports into ${autoImport.changedFiles.length} file(s)`);
     const indexSync = await this.#generatedIndexSync.syncForBatch(batch.files);
+    await this.#watcher?.absorb([...autoImport.changedFiles, ...indexSync.changedFiles]);
     const { files, kinds, expandedBatch, event, hasSyncErrors } = prepareDevWatchBatch({
       generation,
       batch,
@@ -335,7 +373,7 @@ class IncrementalBuilder {
     if (hasSyncErrors) {
       this.#sendBuildStatus("barrel", { generation, ok: false, files, message: indexSync.errors.join(`
 `) });
-      process.send?.(event);
+      BuilderChannel.emit(event);
       return;
     }
     if (indexSync.changedFiles.length > 0)
@@ -360,7 +398,7 @@ class IncrementalBuilder {
       needs.push("pages");
       needs.push("css");
     }
-    process.send?.(event);
+    BuilderChannel.emit(event);
     if (needs.length > 0)
       await this.#runBatch({ generation, needs, changedFiles: files });
     else if (kinds.includes("css")) {
@@ -374,14 +412,15 @@ class IncrementalBuilder {
     changedFiles
   }) {
     const started = Date.now();
-    const result = await this.#batchRunner.run(await this.#batchRequest({ generation, needs, changedFiles }), (msg) => process.send?.(msg));
+    const result = await this.#batchRunner.run(await this.#batchRequest({ generation, needs, changedFiles }), (msg) => BuilderChannel.emit(msg));
     if (result.optimizedFonts)
       this.#optimizedFonts = result.optimizedFonts;
     if (result.cssAssets)
       this.#artifact = { ...this.#artifact, cssAssets: result.cssAssets };
     if (result.crashed) {
       for (const need of needs)
-        this.#sendBuildStatus(need, { generation, ok: false, files: changedFiles, message: result.errors[need] });
+        if (need !== "base")
+          this.#sendBuildStatus(need, { generation, ok: false, files: changedFiles, message: result.errors[need] });
     }
     if (needs.includes("css"))
       this.#logger.verbose(`css-rebuild checked (${Date.now() - started}ms)`);
@@ -408,7 +447,7 @@ class IncrementalBuilder {
   async boot() {
     if (this.#watch)
       await this.installWatcher();
-    process.send?.({ type: "builder-ready" });
+    BuilderChannel.emit({ type: "builder-ready" });
     this.#logger.verbose(`ready (watch=${this.#watch})`);
   }
   async announceRecoveredState(changedFiles) {
@@ -420,7 +459,7 @@ class IncrementalBuilder {
   async announceBootState() {
     const generation = ++this.#generation;
     const reason = "builder-recycle";
-    process.send?.({
+    await BuilderChannel.send({
       type: "pages-updated",
       data: {
         bundlePath: this.#artifact.pagesBundlePath,
@@ -435,24 +474,25 @@ class IncrementalBuilder {
       cssUrl,
       Buffer.from(await Bun.file(path2.join(this.#artifactDir, cssRelPath)).arrayBuffer()).toString("base64")
     ])));
-    process.send?.({
+    await BuilderChannel.send({
       type: "css-updated",
       data: { cssAssets, cssBase64ByUrl, generation, changedFiles: [], reason }
     });
     this.#logger.verbose(`announced boot state after recycle generation=${generation}`);
   }
   async handleBuildCsr(msg) {
-    return this.#enqueueWork("build-csr", async () => {
+    await this.#enqueueWork("build-csr", async () => {
       const started = Date.now();
       const result = await this.#batchRunner.run(await this.#batchRequest({ generation: this.#generation, needs: ["csr"], changedFiles: [] }));
       const error = result.errors.csr;
       if (error) {
         this.#logger.error(`csr-build failed: ${error}`);
-        return { type: "build-csr-res", id: msg.id, ok: false, error };
+        await BuilderChannel.send({ type: "build-csr-res", id: msg.id, ok: false, error });
+        return;
       }
       this.#csrActive = true;
       this.#logger.info(`csr-build ok on demand (${Date.now() - started}ms); rebuilding CSR on every save now`);
-      return { type: "build-csr-res", id: msg.id, ok: true };
+      await BuilderChannel.send({ type: "build-csr-res", id: msg.id, ok: true });
     });
   }
   #shouldRebuildCsr() {
@@ -461,10 +501,25 @@ class IncrementalBuilder {
   static #csrArmedByEnv() {
     return process.env.AKAN_DEV_CSR_REBUILD === "1";
   }
-  static async#buildBootDeps(app) {
-    const { artifact, optimizedFonts } = await new SsrBaseArtifactBuilder(app).build();
+  static async#buildBootDeps(app, runner) {
+    const result = await runner.run({
+      appName: app.name,
+      workspaceRoot: app.workspace.workspaceRoot,
+      repoName: app.workspace.repoName,
+      generation: 0,
+      needs: ["base"],
+      changedFiles: [],
+      pageKeys: null,
+      optimizedFonts: null,
+      cssAssets: null,
+      artifactDir: path2.resolve(`${app.cwdPath}/.akan/artifact`)
+    });
+    if (result.errors.base)
+      throw new Error(result.errors.base);
+    if (!result.artifact || !result.optimizedFonts)
+      throw new Error("boot build reported success without an artifact; the build worker likely died");
     const discovery = await GraphClientEntryDiscovery.create(app);
-    return { artifact, optimizedFonts, discovery };
+    return { artifact: result.artifact, optimizedFonts: result.optimizedFonts, discovery };
   }
   async rearmCsrFromEnv() {
     if (!IncrementalBuilder.#csrArmedByEnv())
@@ -478,18 +533,18 @@ class IncrementalBuilder {
         this.#logger.verbose("csr-rearm ok; this session had CSR armed before the builder restarted");
     });
   }
-  static #recoverBoot(app, bootError, logger) {
+  static #recoverBoot(app, bootError, logger, runner) {
     const firstMessage = bootError instanceof Error ? bootError.message : String(bootError);
     logger.error(`boot build failed; entering degraded watch mode until the error is fixed: ${firstMessage}`);
     let generation = 0;
     const sendFailure = (files, message) => {
-      process.send?.({
+      BuilderChannel.emit({
         type: "build-status",
         data: { generation, phase: "pages", ok: false, files, message: `Boot build failed: ${message}` }
       });
     };
     sendFailure([], firstMessage);
-    process.send?.({ type: "builder-ready" });
+    BuilderChannel.emit({ type: "builder-ready" });
     return new Promise((resolve, reject) => {
       (async () => {
         const roots = await new WatchRootResolver(app).resolve();
@@ -502,7 +557,7 @@ class IncrementalBuilder {
             try {
               if (new Set(batch.kinds).has("config"))
                 await app.getConfig({ refresh: true });
-              const deps = await IncrementalBuilder.#buildBootDeps(app);
+              const deps = await IncrementalBuilder.#buildBootDeps(app, runner);
               const builder = new IncrementalBuilder({ app, watch: true, initialGeneration: generation, ...deps });
               watcher.stop();
               logger.info(`boot build recovered generation=${generation}`);
@@ -514,7 +569,7 @@ class IncrementalBuilder {
             }
           }
         });
-        watcher.start();
+        await watcher.start();
         logger.warn(`[degraded] watching ${roots.length} roots for a fix`);
       })().catch(reject);
     });
@@ -544,19 +599,19 @@ class IncrementalBuilder {
       if (msg.type === "build-route") {
         const error = builder?.shuttingDown ? recyclingError : bootingError;
         if (!builder || builder.shuttingDown) {
-          process.send?.({ type: "build-route-res", id: msg.id, ok: false, error });
+          BuilderChannel.emit({ type: "build-route-res", id: msg.id, ok: false, error });
           return;
         }
-        builder.handleBuildRoute(msg).then((res) => process.send?.(res));
+        builder.handleBuildRoute(msg);
         return;
       }
       if (msg.type === "build-csr") {
         const error = builder?.shuttingDown ? recyclingError : bootingError;
         if (!builder || builder.shuttingDown) {
-          process.send?.({ type: "build-csr-res", id: msg.id, ok: false, error });
+          BuilderChannel.emit({ type: "build-csr-res", id: msg.id, ok: false, error });
           return;
         }
-        builder.handleBuildCsr(msg).then((res) => process.send?.(res));
+        builder.handleBuildCsr(msg);
       }
     });
     process.on("disconnect", () => {
@@ -564,19 +619,20 @@ class IncrementalBuilder {
       process.exit(0);
     });
     let recoveredFiles = null;
+    const bootRunner = new BuildBatchRunner({ workspaceRoot, cwd: app.cwdPath });
     try {
-      builder = new IncrementalBuilder({ app, watch, ...await IncrementalBuilder.#buildBootDeps(app) });
+      builder = new IncrementalBuilder({ app, watch, ...await IncrementalBuilder.#buildBootDeps(app, bootRunner) });
     } catch (err) {
       if (!watch)
         throw err;
-      const recovered = await IncrementalBuilder.#recoverBoot(app, err, logger);
+      const recovered = await IncrementalBuilder.#recoverBoot(app, err, logger, bootRunner);
       builder = recovered.builder;
       recoveredFiles = recovered.changedFiles;
     }
     await builder.boot();
     if (recoveredFiles)
       await builder.announceRecoveredState(recoveredFiles);
-    else if (process.env.AKAN_BUILDER_RECYCLED === "1")
+    else if (process.env.AKAN_BUILDER_ANNOUNCE_BOOT === "1")
       await builder.announceBootState();
     await builder.rearmCsrFromEnv();
   }