@akanjs/cli 3.1.0-rc.2 → 3.1.0-rc.21

package/{index-sqfdmb5b.js → index-4393nb4b.js}

@@ -1,12 +1,12 @@
 // @bun
 import {
   script
-} from "./index-31ce9vhg.js";
+} from "./index-vkb9m4z7.js";
 import {
   AppExecutor,
   LibExecutor,
   ModuleExecutor
-} from "./index-2etqq75t.js";
+} from "./index-g6ax17x4.js";
 import {
   workflowStatus,
   compactDiagnostics,
@@ -41,10 +41,10 @@ import {
   hasSignalFactoryEntry,
   insertSignalFactoryEntry,
   addFieldUiPolicyForType
-} from "./index-rhbabmja.js";
+} from "./index-033wne2j.js";
 import {
   ModuleScript
-} from "./index-z507nzhg.js";
+} from "./index-p2r64bpa.js";
 
 // pkgs/@akanjs/cli/primitive/primitive.script.ts
 import { capitalize, lowerlize } from "akanjs/common";

package/{index-sby8fe1p.js → index-48edp6q4.js}

@@ -2,7 +2,7 @@
 import {
   GlobalConfig,
   CloudApi
-} from "./index-6726qr1m.js";
+} from "./index-jrmzcp66.js";
 
 // pkgs/@akanjs/cli/tunnel/TunnelShare.ts
 import { TunnelAgent } from "akanjs/server/tunnel";

package/{index-g0vwzy9m.js → index-4v43h00g.js}

@@ -2,24 +2,7 @@
 import {
   DesktopBin,
   UpdatePackFolder
-} from "./index-0909wckt.js";
-
-// pkgs/@akanjs/devkit/mobile/placeholderAppId.ts
-var PLACEHOLDER_APP_IDS = [
-  "com.myapp.app",
-  "com.myorg.myapp",
-  "com.example.app",
-  "com.example.myapp"
-];
-var placeholderAppIdSegment = /^(example|examples|myorg|myapp|mycompany|myorganization|changeme|todo|sample|test)$/;
-var isPlaceholderAppId = (appId) => {
-  const normalized = appId?.trim().toLowerCase() ?? "";
-  if (!normalized)
-    return true;
-  if (PLACEHOLDER_APP_IDS.includes(normalized))
-    return true;
-  return normalized.split(".").some((segment) => placeholderAppIdSegment.test(segment));
-};
+} from "./index-35m6bzm7.js";
 // pkgs/@akanjs/devkit/mobile/desktopServerStage.ts
 import { cp, mkdir, readdir, rm, writeFile } from "fs/promises";
 import path from "path";
@@ -145,19 +128,35 @@ ${toError(error).message}`, { cause: error });
     };
   }
 }
+// pkgs/@akanjs/devkit/mobile/placeholderAppId.ts
+var PLACEHOLDER_APP_IDS = [
+  "com.myapp.app",
+  "com.myorg.myapp",
+  "com.example.app",
+  "com.example.myapp"
+];
+var placeholderAppIdSegment = /^(example|examples|myorg|myapp|mycompany|myorganization|changeme|todo|sample|test)$/;
+var isPlaceholderAppId = (appId) => {
+  const normalized = appId?.trim().toLowerCase() ?? "";
+  if (!normalized)
+    return true;
+  if (PLACEHOLDER_APP_IDS.includes(normalized))
+    return true;
+  return normalized.split(".").some((segment) => placeholderAppIdSegment.test(segment));
+};
 // pkgs/@akanjs/devkit/mobile/updateUploader.ts
 import { readdir as readdir2 } from "fs/promises";
 import path2 from "path";
-import { isRecord } from "akanjs/common";
+import { isRecord, trimTrailingSlashes } from "akanjs/common";
 class UpdateUploader {
   bucket;
   prefix;
   static #manifest = /\.json(?:\.sig)?$/;
   static parseTarget(target) {
-    const match = /^s3:\/\/([^/]+)\/?(.*)$/.exec(target.trim());
+    const match = /^s3:\/\/([^/]+)(?:\/(.*))?$/.exec(target.trim());
     if (!match?.[1])
       throw new Error(`--upload takes s3://<bucket>/<prefix>, not ${JSON.stringify(target)}.`);
-    return { bucket: match[1], prefix: (match[2] ?? "").replace(/\/+$/, "") };
+    return { bucket: match[1], prefix: trimTrailingSlashes(match[2] ?? "") };
   }
   static order(files) {
     const manifests = files.filter((file) => UpdateUploader.#manifest.test(file));

package/{index-azh29dc8.js → index-54wc2phm.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   resolveSsrPageEntriesForApp
-} from "./index-2etqq75t.js";
+} from "./index-g6ax17x4.js";
 import {
   computeRouteSeedIndex,
   saveRouteSeedIndex,
@@ -9,17 +9,20 @@ import {
   ClientEntriesBundler,
   VENDOR_SPECIFIERS,
   RouteClientBuilder
-} from "./index-xpdgxsj5.js";
+} from "./index-1r5a8bzx.js";
 import {
   SOURCE_EXTS
-} from "./index-k9rrten6.js";
+} from "./index-5nd1wtkv.js";
 import {
   CsrEntryFiles,
   BarrelAnalyzer,
   createTsconfigPackageResolver,
   rewriteBarrelImports,
   PagesBundleBuilder
-} from "./index-nq045px5.js";
+} from "./index-h3r3nr9y.js";
+import {
+  CssBlockParser
+} from "./index-62md4dwy.js";
 var __require = import.meta.require;
 
 // pkgs/@akanjs/devkit/frontendBuild/allRoutesBuilder.ts
@@ -127,7 +130,6 @@ class AllRoutesBuilder {
       this.#knownSet.add(abs);
   }
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/cssCompiler.ts
 import path3 from "path";
 import { Logger } from "akanjs/common";
@@ -135,10 +137,10 @@ import { compile } from "tailwindcss";
 
 // pkgs/@akanjs/devkit/frontendBuild/cssCandidateCache.ts
 import { stat } from "fs/promises";
-var CANDIDATE_RE = /-?(?:[\w@]|\[[^\]\s]+\])[\w:/.-]*(?:(?:\[[^\]\s]+\]|\((?:[a-z-]+:)?--[^)\s]+\))[\w:/.-]*)*/g;
+var CANDIDATE_RE = /-?(?:[\w@]|\[(?:[^[\]\s]|\[[^[\]\s]+\])+\])[\w:/.-]*(?:(?:\[(?:[^[\]\s]|\[[^[\]\s]+\])+\]|\((?:[a-z-]+:)?--[^)\s]+\))[\w:/.-]*)*/g;
 
 class CssCandidateCache {
-  static #version = 4;
+  static #version = 5;
   #path;
   #entries = new Map;
   #dirty = false;
@@ -651,13 +653,19 @@ function isIgnoredNodeModuleSource(filePath) {
   return NODE_MODULES_RE.test(filePath) && !AKANJS_NODE_MODULE_RE.test(filePath);
 }
 function declaredCustomProperties(css) {
-  const withoutThemeBlocks = css.replace(/@theme[^{]*\{[^}]*\}/g, "");
-  return [...new Set([...withoutThemeBlocks.matchAll(/(?:^|[\s;{])(--[\w-]+)\s*:/g)].map(([, name]) => name))].filter((name) => !!name);
+  const names = new Set;
+  CssBlockParser.walk(CssBlockParser.parse(css), true, (node) => {
+    if (node.kind === "block")
+      return node.atRule === "@theme" ? null : true;
+    if (node.property.startsWith("--"))
+      names.add(node.property);
+    return null;
+  });
+  return [...names];
 }
 function getPageKeyBasePath(pageKey, basePaths) {
   return CsrEntryFiles.basePathOfPageKey(pageKey, basePaths);
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/fontOptimizer.ts
 import { mkdir, stat as stat2 } from "fs/promises";
 import path4 from "path";
@@ -1045,7 +1053,7 @@ class FontOptimizer {
       const filePaths = [];
       for await (const filePath of glob.scan({ cwd: root, absolute: true }))
         filePaths.push(filePath);
-      for (const filePath of filePaths.sort())
+      for (const filePath of filePaths.sort((a, b) => a < b ? -1 : a > b ? 1 : 0))
         parts.push(await Bun.file(filePath).text());
     }
     return parts.join("");
@@ -1146,7 +1154,6 @@ ${declarations.map(([prop, value]) => `  ${prop}: ${value};`).join(`
     return JSON.stringify(value);
   }
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/fontPruner.ts
 import { rm, rmdir, stat as stat3 } from "fs/promises";
 import path5 from "path";
@@ -1310,7 +1317,6 @@ class FontPruner {
     return await stat3(dir).then((entry) => entry.isDirectory(), () => false);
   }
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/precompressArtifacts.ts
 import fs from "fs";
 import path6 from "path";
@@ -1370,7 +1376,6 @@ async function shouldPrecompress(filePath) {
     return false;
   return file.size >= MIN_COMPRESS_BYTES;
 }
-
 // pkgs/@akanjs/devkit/frontendBuild/ssrBaseArtifactBuilder.ts
 import path7 from "path";
 import { optimize } from "@tailwindcss/node";

package/{index-k9rrten6.js → index-5nd1wtkv.js}

@@ -71,13 +71,6 @@ Caused by: ${ApplicationBuildReporter.formatError(error.cause, workspaceRoot)}`
   }
 }
 
-// pkgs/@akanjs/devkit/frontendBuild/hmrWatcher.ts
-import fs from "fs";
-import path5 from "path";
-
-// pkgs/@akanjs/devkit/frontendBuild/hmrChangeClassifier.ts
-import path3 from "path";
-
 // pkgs/@akanjs/devkit/akanApp/devHostPolicy.ts
 import path2 from "path";
 var UNAVAILABLE_REDIS_HOST = "redis-tunnel-unavailable.invalid";
@@ -293,7 +286,83 @@ var mergeInvalidateMessages = (current, next) => {
 var buildStatusReplaySequence = (pendingReplay, latestByPhase) => [...pendingReplay, ...latestByPhase.values()];
 var filesChangedSince = (before, after) => [...before].filter(([file, stamp]) => after.get(file) !== stamp).map(([file]) => file);
 
+// pkgs/@akanjs/devkit/frontendBuild/watchRootResolver.ts
+import fs from "fs";
+import { readFile } from "fs/promises";
+import path3 from "path";
+
+class WatchRootResolver {
+  #app;
+  constructor(app) {
+    this.#app = app;
+  }
+  async resolve() {
+    const tsconfig = await this.#app.getTsConfig();
+    const appDir = path3.resolve(this.#app.cwdPath);
+    const appsContainer = path3.dirname(appDir);
+    const libsContainer = path3.resolve(this.#app.workspace.workspaceRoot, "libs");
+    const libRoots = (await this.#resolveLibDeps(libsContainer))?.map((name) => path3.join(libsContainer, name)).filter((dir) => fs.existsSync(dir));
+    const set = new Set;
+    set.add(path3.resolve(`${this.#app.cwdPath}/page`));
+    for (const targets of Object.values(tsconfig.compilerOptions.paths ?? {})) {
+      for (const target of targets) {
+        if (!target)
+          continue;
+        if (path3.isAbsolute(target))
+          continue;
+        const cleaned = target.replace(/\/?\*+.*$/, "").replace(/\/[^/]+\.[^/]+$/, "");
+        const resolved = path3.resolve(this.#app.workspace.workspaceRoot, cleaned);
+        if (resolved === libsContainer && libRoots) {
+          for (const root of libRoots)
+            set.add(root);
+          continue;
+        }
+        const root = resolved === appsContainer ? appDir : resolved;
+        if (fs.existsSync(root))
+          set.add(root);
+      }
+    }
+    return [...set];
+  }
+  async#resolveLibDeps(libsContainer) {
+    const scanInfo = this.#app.getScanInfo({ allowEmpty: true });
+    if (scanInfo?.type === "app")
+      return scanInfo.libDeps;
+    const direct = await WatchRootResolver.#readManifestLibDeps(path3.join(this.#app.cwdPath, "akan.app.json"));
+    if (!direct)
+      return null;
+    const closure = new Set;
+    const queue = [...direct];
+    while (queue.length > 0) {
+      const name = queue.shift();
+      if (!name || closure.has(name))
+        continue;
+      closure.add(name);
+      const nested = await WatchRootResolver.#readManifestLibDeps(path3.join(libsContainer, name, "akan.lib.json"));
+      if (!nested)
+        return null;
+      queue.push(...nested);
+    }
+    return [...closure];
+  }
+  static async#readManifestLibDeps(manifestPath) {
+    try {
+      const parsed = JSON.parse(await readFile(manifestPath, "utf8"));
+      if (!Array.isArray(parsed.libDeps))
+        return null;
+      return parsed.libDeps.filter((name) => typeof name === "string" && name.length > 0);
+    } catch {
+      return null;
+    }
+  }
+}
+
+// pkgs/@akanjs/devkit/frontendBuild/hmrWatcher.ts
+import fs2 from "fs";
+import path6 from "path";
+
 // pkgs/@akanjs/devkit/frontendBuild/hmrChangeClassifier.ts
+import path4 from "path";
 var CSS_EXTS = new Set([".css"]);
 var CONFIG_BASENAMES = new Set(["akan.config.ts", "bunfig.toml", "tsconfig.json", "package.json"]);
 
@@ -301,10 +370,10 @@ class HmrChangeClassifier {
   classify(abs) {
     if (this.#isUninteresting(abs))
       return "ignore";
-    const base = path3.basename(abs);
+    const base = path4.basename(abs);
     if (CONFIG_BASENAMES.has(base))
       return "config";
-    const ext = path3.extname(abs).toLowerCase();
+    const ext = path4.extname(abs).toLowerCase();
     if (CSS_EXTS.has(ext))
       return "css";
     if (SOURCE_EXTS.has(ext))
@@ -312,16 +381,16 @@ class HmrChangeClassifier {
     return "ignore";
   }
   #isUninteresting(abs) {
-    const base = path3.basename(abs);
+    const base = path4.basename(abs);
     if (!base)
       return true;
     if (base.startsWith("."))
       return true;
     if (base.endsWith("~") || base.endsWith(".swp") || base.endsWith(".swx") || base.endsWith(".tmp"))
       return true;
-    if (abs.includes(`${path3.sep}node_modules${path3.sep}`))
+    if (abs.includes(`${path4.sep}node_modules${path4.sep}`))
       return true;
-    if (abs.includes(`${path3.sep}.akan${path3.sep}`))
+    if (abs.includes(`${path4.sep}.akan${path4.sep}`))
       return true;
     return false;
   }
@@ -329,7 +398,7 @@ class HmrChangeClassifier {
 
 // pkgs/@akanjs/devkit/frontendBuild/sourceMtimeIndex.ts
 import { readdir, stat } from "fs/promises";
-import path4 from "path";
+import path5 from "path";
 var UNREADABLE = Number.NaN;
 
 class SourceMtimeIndex {
@@ -392,7 +461,7 @@ class SourceMtimeIndex {
       if (!this.#primed)
         return;
       await Promise.all(paths.map(async (file) => {
-        const abs = path4.resolve(file);
+        const abs = path5.resolve(file);
         const stats = await stat(abs).catch(() => null);
         if (!stats?.isFile()) {
           this.#files.delete(abs);
@@ -478,7 +547,7 @@ class SourceMtimeIndex {
     for (const entry of entries) {
       if (SourceMtimeIndex.#skipDirent(entry.name))
         continue;
-      const abs = path4.join(dir, entry.name);
+      const abs = path5.join(dir, entry.name);
       if (entry.isDirectory()) {
         descend.push(abs);
         continue;
@@ -505,7 +574,7 @@ class SourceMtimeIndex {
     }
     if (known) {
       for (const abs of [...this.#files.keys()]) {
-        if (present.has(abs) || path4.dirname(abs) !== dir)
+        if (present.has(abs) || path5.dirname(abs) !== dir)
           continue;
         this.#files.delete(abs);
         changed?.add(abs);
@@ -523,7 +592,7 @@ class SourceMtimeIndex {
     this.#unsettled.delete(dir);
   }
   #forget(dir) {
-    const prefix = `${dir}${path4.sep}`;
+    const prefix = `${dir}${path5.sep}`;
     this.#dirs.delete(dir);
     this.#unreadable.delete(dir);
     this.#unsettled.delete(dir);
@@ -561,8 +630,8 @@ class SourceMtimeIndex {
     return !name || name.startsWith(".") || name === "node_modules";
   }
   static #pruneNestedRoots(roots) {
-    const resolved = [...new Set(roots.map((root) => path4.resolve(root)))].sort();
-    return resolved.filter((root) => !resolved.some((other) => other !== root && root.startsWith(`${other}${path4.sep}`)));
+    const resolved = [...new Set(roots.map((root) => path5.resolve(root)))].sort();
+    return resolved.filter((root) => !resolved.some((other) => other !== root && root.startsWith(`${other}${path5.sep}`)));
   }
 }
 
@@ -587,7 +656,7 @@ class HmrWatcher {
   #reportedCompensating = false;
   #reportedGaps = "";
   constructor(opts) {
-    this.#roots = [...new Set(opts.roots.map((r) => path5.resolve(r)))];
+    this.#roots = [...new Set(opts.roots.map((r) => path6.resolve(r)))];
     this.#debounceMs = opts.debounceMs ?? HmrWatcher.#envDebounceMs() ?? 30;
     this.#verifyDelayMs = opts.verifyDelayMs ?? 250;
     this.#onBatch = opts.onBatch;
@@ -600,10 +669,10 @@ class HmrWatcher {
   async start() {
     for (const root of this.#roots) {
       try {
-        const w = fs.watch(root, { recursive: true, persistent: false }, (_event, filename) => {
+        const w = fs2.watch(root, { recursive: true, persistent: false }, (_event, filename) => {
           if (!filename)
             return;
-          const abs = path5.resolve(root, filename.toString());
+          const abs = path6.resolve(root, filename.toString());
           this.#queue(abs);
         });
         w.on("error", (err) => {
@@ -729,7 +798,7 @@ class HmrWatcher {
   }
   #reportCoverageGaps() {
     const gaps = this.#index.coverageGaps;
-    const key = gaps.map((gap) => `${gap.code}:${gap.path}`).sort().join("|");
+    const key = gaps.map((gap) => `${gap.code}:${gap.path}`).sort((a, b) => a < b ? -1 : a > b ? 1 : 0).join("|");
     if (key === this.#reportedGaps)
       return;
     this.#reportedGaps = key;
@@ -767,75 +836,4 @@ class HmrWatcher {
   }
 }
 
-// pkgs/@akanjs/devkit/frontendBuild/watchRootResolver.ts
-import fs2 from "fs";
-import { readFile } from "fs/promises";
-import path6 from "path";
-
-class WatchRootResolver {
-  #app;
-  constructor(app) {
-    this.#app = app;
-  }
-  async resolve() {
-    const tsconfig = await this.#app.getTsConfig();
-    const appDir = path6.resolve(this.#app.cwdPath);
-    const appsContainer = path6.dirname(appDir);
-    const libsContainer = path6.resolve(this.#app.workspace.workspaceRoot, "libs");
-    const libRoots = (await this.#resolveLibDeps(libsContainer))?.map((name) => path6.join(libsContainer, name)).filter((dir) => fs2.existsSync(dir));
-    const set = new Set;
-    set.add(path6.resolve(`${this.#app.cwdPath}/page`));
-    for (const targets of Object.values(tsconfig.compilerOptions.paths ?? {})) {
-      for (const target of targets) {
-        if (!target)
-          continue;
-        if (path6.isAbsolute(target))
-          continue;
-        const cleaned = target.replace(/\/?\*+.*$/, "").replace(/\/[^/]+\.[^/]+$/, "");
-        const resolved = path6.resolve(this.#app.workspace.workspaceRoot, cleaned);
-        if (resolved === libsContainer && libRoots) {
-          for (const root of libRoots)
-            set.add(root);
-          continue;
-        }
-        const root = resolved === appsContainer ? appDir : resolved;
-        if (fs2.existsSync(root))
-          set.add(root);
-      }
-    }
-    return [...set];
-  }
-  async#resolveLibDeps(libsContainer) {
-    const scanInfo = this.#app.getScanInfo({ allowEmpty: true });
-    if (scanInfo?.type === "app")
-      return scanInfo.libDeps;
-    const direct = await WatchRootResolver.#readManifestLibDeps(path6.join(this.#app.cwdPath, "akan.app.json"));
-    if (!direct)
-      return null;
-    const closure = new Set;
-    const queue = [...direct];
-    while (queue.length > 0) {
-      const name = queue.shift();
-      if (!name || closure.has(name))
-        continue;
-      closure.add(name);
-      const nested = await WatchRootResolver.#readManifestLibDeps(path6.join(libsContainer, name, "akan.lib.json"));
-      if (!nested)
-        return null;
-      queue.push(...nested);
-    }
-    return [...closure];
-  }
-  static async#readManifestLibDeps(manifestPath) {
-    try {
-      const parsed = JSON.parse(await readFile(manifestPath, "utf8"));
-      if (!Array.isArray(parsed.libDeps))
-        return null;
-      return parsed.libDeps.filter((name) => typeof name === "string" && name.length > 0);
-    } catch {
-      return null;
-    }
-  }
-}
-
 export { ApplicationBuildReporter, UNAVAILABLE_REDIS_HOST, redisTunnelPolicy, BUILDER_MIN_RSS_RECYCLE_INTERVAL_MS, SOURCE_EXTS, shouldRestartBackendByDevPlan, shouldRestartBuilderByDevPlan, shouldAbandonBackendRecovery, normalizeBackendReportedGeneration, shouldRestartDevHostByDevPlan, devHostStateOf, isLegacyBackendFallbackFile, shouldMarkBuildPhaseRecovered, shouldKeepBuildFailure, createBackendBuildStatus, backendRestartReasonFromMessage, mergeBackendRestartReasons, shouldReplaceLastGoodMessage, shouldQueueBuildStatusReplay, hasBuildFailureForGeneration, decideBuilderRssRecycle, decideBuilderRssSettle, decideIdleSuspend, resolveIdleSuspendMs, hasAnyBuildFailure, shouldRefreshConfigOnIdleWake, shouldHoldForReturningBuilder, shouldWarnBuilderRssCeilingTight, isRssCeilingUnreachable, shouldRelayRecycledFrontendState, mergeInvalidateMessages, buildStatusReplaySequence, filesChangedSince, HmrWatcher, WatchRootResolver };