@akanjs/cli 3.0.0-beta.2 → 3.0.0-beta.20

package/{index-w8kmx1b6.js → index-fgq75haa.js}

@@ -1,7 +1,10 @@
 // @bun
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  SOURCE_EXTS
+} from "./index-khpfpcsd.js";
+import {
+  FileSys2
+} from "./index-5b6tavv3.js";
 
 // pkgs/@akanjs/devkit/frontendBuild/clientEntryDiscovery.ts
 import path3 from "path";
@@ -9,6 +12,40 @@ import path3 from "path";
 // pkgs/@akanjs/devkit/transforms/barrelAnalyzer.ts
 import path from "path";
 import { Logger } from "akanjs/common";
+
+// pkgs/@akanjs/devkit/transforms/moduleSyntax.ts
+var loaderFor = (absPath) => {
+  if (absPath.endsWith(".tsx"))
+    return "tsx";
+  if (absPath.endsWith(".jsx"))
+    return "jsx";
+  if (absPath.endsWith(".ts"))
+    return "ts";
+  return "js";
+};
+var parseNamedList = (listBody) => {
+  const out = [];
+  for (const raw of listBody.split(",")) {
+    let rest = raw.trim();
+    if (!rest)
+      continue;
+    let isType = false;
+    if (rest.startsWith("type ")) {
+      isType = true;
+      rest = rest.slice(5).trim();
+    }
+    const asMatch = /^(\w+)\s+as\s+(\w+)$/.exec(rest);
+    if (asMatch) {
+      out.push({ imported: asMatch[1] ?? "", local: asMatch[2] ?? "", isType });
+      continue;
+    }
+    if (/^\w+$/.test(rest))
+      out.push({ imported: rest, local: rest, isType });
+  }
+  return out;
+};
+
+// pkgs/@akanjs/devkit/transforms/barrelAnalyzer.ts
 var REEXPORT_RE = /(?:^|\n)\s*export\s+(?:type\s+)?(?:(\*)(?:\s+as\s+(\w+))?|\{\s*([^}]*?)\s*\})\s+from\s+(["'])([^"']+)\4;?/g;
 var LOCAL_NAMED_RE = /(?:^|\n)\s*export\s+\{\s*([^}]*?)\s*\}(?!\s*from)/g;
 var CANDIDATE_EXTS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
@@ -32,53 +69,53 @@ class BarrelAnalyzer {
   }
   async#analyzeSafe(pkgName) {
     try {
-      return await this.#analyzeUncached(pkgName);
+      const pkg = await this.#opts.resolvePackage(pkgName);
+      if (!pkg)
+        return null;
+      const map = new Map;
+      await this.#walk(pkg.entryFile, pkg, map, new Set);
+      return map;
     } catch (err) {
       this.#logger.error(`analyze failed for ${pkgName}: ${err.message}`);
       return null;
     }
   }
-  async#analyzeUncached(pkgName) {
-    const pkg = await this.#opts.resolvePackage(pkgName);
-    if (!pkg)
-      return null;
-    const map = new Map;
-    const visited = new Set;
-    await this.#walk(pkg.entryFile, pkg, map, visited);
-    return map;
-  }
   async#walk(absFile, pkg, map, visited) {
     if (visited.has(absFile))
       return;
     visited.add(absFile);
-    const source = await readIfExists(absFile);
-    if (source === null)
+    const file = Bun.file(absFile);
+    if (!await file.exists())
       return;
+    const source = await file.text();
     const currentSubpath = this.#subpathFor(pkg, absFile);
     if (!currentSubpath)
       return;
     const authoritative = this.#scanExports(source, absFile);
     authoritative.delete("default");
     const attributed = new Set;
-    REEXPORT_RE.lastIndex = 0;
-    let m = REEXPORT_RE.exec(source);
-    while (m !== null) {
+    const attribute = (listBody, subpath) => {
+      for (const item of parseNamedList(listBody)) {
+        if (item.isType || item.imported === "default" || !authoritative.has(item.local))
+          continue;
+        attributed.add(item.local);
+        if (!map.has(item.local))
+          map.set(item.local, { subpath, originalName: item.imported });
+      }
+    };
+    const starSpecs = [];
+    for (const m of source.matchAll(REEXPORT_RE)) {
       const star = m[1];
       const nsAs = m[2];
       const namedList = m[3];
       const spec = m[5] ?? "";
-      m = REEXPORT_RE.exec(source);
       if (!isRelative(spec))
         continue;
       if (star) {
-        if (nsAs) {
+        if (nsAs)
           authoritative.delete(nsAs);
-          continue;
-        }
-        const targetAbs = await this.#resolveRel(absFile, spec);
-        if (!targetAbs)
-          continue;
-        await this.#walk(targetAbs, pkg, map, visited);
+        else
+          starSpecs.push(spec);
         continue;
       }
       if (namedList !== undefined) {
@@ -86,20 +123,8 @@ class BarrelAnalyzer {
         if (!targetAbs)
           continue;
         const targetSubpath = this.#subpathFor(pkg, targetAbs);
-        if (!targetSubpath)
-          continue;
-        for (const item of parseNamedList(namedList)) {
-          if (item.isType)
-            continue;
-          if (item.imported === "default")
-            continue;
-          if (!authoritative.has(item.local))
-            continue;
-          attributed.add(item.local);
-          if (!map.has(item.local)) {
-            map.set(item.local, { subpath: targetSubpath, originalName: item.imported });
-          }
-        }
+        if (targetSubpath)
+          attribute(namedList, targetSubpath);
       }
     }
     LOCAL_NAMED_RE.lastIndex = 0;
@@ -107,18 +132,7 @@ class BarrelAnalyzer {
     while (n !== null) {
       const body = n[1] ?? "";
       n = LOCAL_NAMED_RE.exec(source);
-      for (const item of parseNamedList(body)) {
-        if (item.isType)
-          continue;
-        if (item.imported === "default")
-          continue;
-        if (!authoritative.has(item.local))
-          continue;
-        attributed.add(item.local);
-        if (!map.has(item.local)) {
-          map.set(item.local, { subpath: currentSubpath, originalName: item.imported });
-        }
-      }
+      attribute(body, currentSubpath);
     }
     for (const name of authoritative) {
       if (attributed.has(name))
@@ -127,6 +141,11 @@ class BarrelAnalyzer {
         continue;
       map.set(name, { subpath: currentSubpath, originalName: name });
     }
+    for (const spec of starSpecs) {
+      const targetAbs = await this.#resolveRel(absFile, spec);
+      if (targetAbs)
+        await this.#walk(targetAbs, pkg, map, visited);
+    }
   }
   #scanExports(source, absFile) {
     try {
@@ -144,11 +163,12 @@ class BarrelAnalyzer {
       return null;
     if (pkg.preserveFilePath)
       return `${pkg.pkgName}/${rel.split(path.sep).join("/")}`;
-    const noExt = stripKnownExt(rel);
-    const tail = collapseIndex(noExt);
-    if (tail === "")
-      return pkg.pkgName;
-    return `${pkg.pkgName}/${tail.split(path.sep).join("/")}`;
+    const ext = CANDIDATE_EXTS.find((candidate) => rel.endsWith(candidate));
+    const parts = (ext ? rel.slice(0, -ext.length) : rel).split(path.sep);
+    if (parts[parts.length - 1] === "index")
+      parts.pop();
+    const tail = parts.join("/");
+    return tail === "" ? pkg.pkgName : `${pkg.pkgName}/${tail}`;
   }
   async#resolveRel(fromFile, relSpec) {
     if (this.#opts.resolveRelative)
@@ -156,38 +176,9 @@ class BarrelAnalyzer {
     return defaultResolveRelative(fromFile, relSpec);
   }
 }
-var parseNamedList = (listBody) => {
-  const out = [];
-  for (const raw of listBody.split(",")) {
-    const s = raw.trim();
-    if (!s)
-      continue;
-    let rest = s;
-    let isType = false;
-    if (rest.startsWith("type ")) {
-      isType = true;
-      rest = rest.slice(5).trim();
-    }
-    const asMatch = /^(\w+)\s+as\s+(\w+)$/.exec(rest);
-    if (asMatch) {
-      out.push({ imported: asMatch[1] ?? "", local: asMatch[2] ?? "", isType });
-      continue;
-    }
-    if (/^\w+$/.test(rest)) {
-      out.push({ imported: rest, local: rest, isType });
-    }
-  }
-  return out;
-};
 var isRelative = (spec) => {
   return spec.startsWith("./") || spec.startsWith("../") || spec === "." || spec === "..";
 };
-var readIfExists = async (absFile) => {
-  const file = Bun.file(absFile);
-  if (!await file.exists())
-    return null;
-  return file.text();
-};
 var defaultResolveRelative = async (fromFile, relSpec) => {
   const baseDir = path.dirname(fromFile);
   const joined = path.resolve(baseDir, relSpec);
@@ -208,19 +199,6 @@ var defaultResolveRelative = async (fromFile, relSpec) => {
   }
   return null;
 };
-var stripKnownExt = (relPath) => {
-  for (const ext of CANDIDATE_EXTS) {
-    if (relPath.endsWith(ext))
-      return relPath.slice(0, -ext.length);
-  }
-  return relPath;
-};
-var collapseIndex = (relPathNoExt) => {
-  const parts = relPathNoExt.split(path.sep);
-  if (parts[parts.length - 1] === "index")
-    parts.pop();
-  return parts.join(path.sep);
-};
 
 // pkgs/@akanjs/devkit/transforms/barrelImportsPlugin.ts
 import path2 from "path";
@@ -239,13 +217,10 @@ var createBarrelImportsPlugin = async (app, { skipPath = defaultSkipPath, pipeAf
       }, async (args) => {
         const realPath = args.path.replace(/\?v=\d+$/, "");
         const loader = loaderFor(realPath);
-        if (skipPath(realPath)) {
-          const raw = await Bun.file(realPath).text();
-          return { contents: raw, loader };
-        }
         let source = await Bun.file(realPath).text();
-        const hasMacroAttr = MACRO_ATTR_RE.test(source);
-        if (!hasMacroAttr && barrels.length > 0) {
+        if (skipPath(realPath))
+          return { contents: source, loader };
+        if (!MACRO_ATTR_RE.test(source) && barrels.length > 0) {
           const rewritten = await rewriteBarrelImports(source, barrels, analyzer);
           if (rewritten !== null)
             source = rewritten;
@@ -263,10 +238,7 @@ var createBarrelImportsPlugin = async (app, { skipPath = defaultSkipPath, pipeAf
 var createTsconfigPackageResolver = async (app) => {
   const tsconfig = await app.getTsConfig();
   const tsconfigPaths = tsconfig.compilerOptions.paths ?? {};
-  const wildcardEntries = Object.entries(tsconfigPaths).filter(([k]) => k.endsWith("/*")).map(([k, v]) => ({
-    prefix: k.slice(0, -1),
-    replacements: v
-  })).sort((a, b) => b.prefix.length - a.prefix.length);
+  const wildcardEntries = Object.entries(tsconfigPaths).filter(([k]) => k.endsWith("/*")).map(([k, v]) => ({ prefix: k.slice(0, -1), replacements: v })).sort((a, b) => b.prefix.length - a.prefix.length);
   return async (pkgName) => {
     const exact = tsconfigPaths[pkgName];
     if (exact && exact.length > 0) {
@@ -278,13 +250,8 @@ var createTsconfigPackageResolver = async (app) => {
         return null;
       const parsed = path2.parse(entryFile);
       const lastSlash = pkgName.lastIndexOf("/");
-      if (parsed.name !== "index" && lastSlash !== -1) {
-        const facet = pkgName.slice(lastSlash + 1);
-        const parentSpec = pkgName.slice(0, lastSlash);
-        if (facet === parsed.name && parentSpec.length > 0) {
-          return { pkgName: parentSpec, entryFile, pkgDir: parsed.dir };
-        }
-      }
+      if (parsed.name !== "index" && lastSlash > 0 && pkgName.slice(lastSlash + 1) === parsed.name)
+        return { pkgName: pkgName.slice(0, lastSlash), entryFile, pkgDir: parsed.dir };
       return { pkgName, entryFile, pkgDir: path2.dirname(entryFile) };
     }
     for (const { prefix, replacements } of wildcardEntries) {
@@ -300,20 +267,14 @@ var createTsconfigPackageResolver = async (app) => {
           const file = `${candidate}${ext}`;
           if (await Bun.file(file).exists()) {
             const lastSlash = pkgName.lastIndexOf("/");
-            if (lastSlash !== -1) {
-              const parentSpec = pkgName.slice(0, lastSlash);
-              if (parentSpec.length > 0) {
-                return { pkgName: parentSpec, entryFile: file, pkgDir: path2.dirname(file) };
-              }
-            }
-            return { pkgName, entryFile: file, pkgDir: path2.dirname(file) };
+            const parentSpec = lastSlash > 0 ? pkgName.slice(0, lastSlash) : pkgName;
+            return { pkgName: parentSpec, entryFile: file, pkgDir: path2.dirname(file) };
           }
         }
         for (const ext of CANDIDATE_EXTS2) {
           const file = path2.join(candidate, `index${ext}`);
-          if (await Bun.file(file).exists()) {
+          if (await Bun.file(file).exists())
             return { pkgName, entryFile: file, pkgDir: candidate };
-          }
         }
       }
       return null;
@@ -358,8 +319,7 @@ var resolveNodePackageExport = async (workspaceRoot, specifier) => {
     const entryFile = await resolveFileCandidate(path2.resolve(pkgDir, rel));
     if (!entryFile)
       return null;
-    const pkgEntryName = specifier;
-    return { pkgName: pkgEntryName, entryFile, pkgDir: path2.dirname(entryFile), preserveFilePath: true };
+    return { pkgName: specifier, entryFile, pkgDir: path2.dirname(entryFile), preserveFilePath: true };
   } catch {
     return null;
   }
@@ -467,15 +427,11 @@ var findImportStatements = (source) => {
     const importClause = statement.importClause;
     if (!importClause)
       continue;
-    const statementStart = statement.getStart(sourceFile);
-    const statementEnd = statement.end;
     statements.push({
-      start: statementStart,
-      end: statementEnd,
+      start: statement.getStart(sourceFile),
+      end: statement.end,
       clause: source.slice(importClause.getStart(sourceFile), importClause.end).trim(),
-      specifier: statement.moduleSpecifier.text,
-      trailingSemicolon: source.slice(statement.moduleSpecifier.end, statement.end).includes(";"),
-      raw: source.slice(statementStart, statementEnd)
+      specifier: statement.moduleSpecifier.text
     });
   }
   return statements;
@@ -507,35 +463,10 @@ var parseImportClause = (clause) => {
     const close = rest.indexOf("}");
     if (close === -1)
       return null;
-    const inner = rest.slice(1, close);
-    parsed.named = parseNamedImportList(inner);
-    return parsed;
+    parsed.named = parseNamedList(rest.slice(1, close));
   }
   return parsed;
 };
-var parseNamedImportList = (body) => {
-  const out = [];
-  for (const raw of body.split(",")) {
-    const s = raw.trim();
-    if (!s)
-      continue;
-    let isType = false;
-    let rest = s;
-    if (rest.startsWith("type ")) {
-      isType = true;
-      rest = rest.slice(5).trim();
-    }
-    const asMatch = /^(\w+)\s+as\s+(\w+)$/.exec(rest);
-    if (asMatch) {
-      out.push({ imported: asMatch[1] ?? "", local: asMatch[2] ?? "", isType });
-      continue;
-    }
-    if (/^\w+$/.test(rest)) {
-      out.push({ imported: rest, local: rest, isType });
-    }
-  }
-  return out;
-};
 var rewriteSingleStatement = (stmt, map) => {
   const clause = parseImportClause(stmt.clause);
   if (!clause)
@@ -544,9 +475,8 @@ var rewriteSingleStatement = (stmt, map) => {
     return null;
   if (clause.typeOnly && !clause.defaultImport)
     return null;
-  if (!clause.named || clause.named.length === 0) {
+  if (!clause.named?.length)
     return null;
-  }
   const remaining = [];
   const rewrites = new Map;
   for (const item of clause.named) {
@@ -566,21 +496,18 @@ var rewriteSingleStatement = (stmt, map) => {
   if (rewrites.size === 0)
     return null;
   const lines = [];
-  const tail = ";";
-  if (shouldPreserveBarrelSideEffects(stmt.specifier)) {
-    lines.push(`import "${stmt.specifier}"${tail}`);
-  }
+  if (shouldPreserveBarrelSideEffects(stmt.specifier))
+    lines.push(`import "${stmt.specifier}";`);
   if (clause.defaultImport || remaining.length > 0) {
     const parts = [];
     if (clause.defaultImport)
       parts.push(clause.defaultImport);
-    if (remaining.length > 0) {
+    if (remaining.length > 0)
       parts.push(`{ ${remaining.map(serializeNamedItem).join(", ")} }`);
-    }
-    lines.push(`import ${parts.join(", ")} from "${stmt.specifier}"${tail}`);
+    lines.push(`import ${parts.join(", ")} from "${stmt.specifier}";`);
   }
   for (const [subpath, items] of rewrites) {
-    lines.push(`import { ${items.map(serializeNamedItem).join(", ")} } from "${subpath}"${tail}`);
+    lines.push(`import { ${items.map(serializeNamedItem).join(", ")} } from "${subpath}";`);
   }
   return lines.join(`
 `);
@@ -592,19 +519,9 @@ var serializeNamedItem = (item) => {
     return `${prefix}${item.imported}`;
   return `${prefix}${item.imported} as ${item.local}`;
 };
-var loaderFor = (absPath) => {
-  if (absPath.endsWith(".tsx"))
-    return "tsx";
-  if (absPath.endsWith(".jsx"))
-    return "jsx";
-  if (absPath.endsWith(".ts"))
-    return "ts";
-  return "js";
-};
 
 // pkgs/@akanjs/devkit/frontendBuild/clientEntryDiscovery.ts
 var USE_CLIENT_RE = /^\s*(?:\/\*[\s\S]*?\*\/\s*|\/\/[^\n]*\n\s*)*["']use client["']/;
-var SOURCE_EXTS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
 var NODE_MODULES_RE2 = /[\\/]node_modules[\\/]/;
 var AKANJS_NODE_MODULE_RE2 = /[\\/]node_modules[\\/]akanjs[\\/]/;
 var NON_SOURCE_EXT_RE = /\.(css|scss|sass|less|json|svg|png|jpe?g|webp|gif|avif|ico|woff2?|ttf|otf|mp3|mp4|wav)$/i;
@@ -796,18 +713,30 @@ import path6 from "path";
 
 // pkgs/@akanjs/devkit/transforms/rscUseClientTransform.ts
 import path4 from "path";
+import ts2 from "typescript";
 var USE_CLIENT_RE2 = /^\s*(?:\/\*[\s\S]*?\*\/\s*|\/\/[^\n]*\n\s*)*["']use client["']/;
 var IMPLICIT_ROOT_LAYOUT_RE = /[/\\]\.akan[/\\]generated[/\\](?:implicit-root-layout|root-layouts[/\\].*__root_layout)\.(tsx|ts|jsx|js)$/;
+var STAR_REEXPORT_HINT_RE = /\bexport\s*\*\s*from\b/;
 function toClientReferencePath(absPath, workspaceRoot) {
   return path4.relative(path4.resolve(workspaceRoot), path4.resolve(absPath)).split(path4.sep).join("/");
 }
+var starReexportSpecifiers = (source, filePath) => ts2.createSourceFile(filePath, source, ts2.ScriptTarget.Latest).statements.filter((statement) => ts2.isExportDeclaration(statement) && !statement.exportClause && !statement.isTypeOnly && !!statement.moduleSpecifier && ts2.isStringLiteral(statement.moduleSpecifier)).map((statement) => statement.moduleSpecifier.text);
+var scanUseClientExports = (source, filePath, workspaceRoot) => {
+  const stars = USE_CLIENT_RE2.test(source) && STAR_REEXPORT_HINT_RE.test(source) ? starReexportSpecifiers(source, filePath) : [];
+  if (stars.length) {
+    const file = workspaceRoot ? toClientReferencePath(filePath, workspaceRoot) : filePath;
+    const listed = stars.slice(0, 3).map((specifier) => `\`export * from ${JSON.stringify(specifier)}\``);
+    const written = stars.length > 3 ? `${listed.join(", ")} (and ${stars.length - 3} more)` : listed.join(", ");
+    throw new Error(`${file} is a "use client" module, so it cannot ${written}: the server sees only the names a client module ` + `declares, and a star re-export declares none. Re-export them by name \u2014 \`export { \u2026 } from ${JSON.stringify(stars[0])}\`.`);
+  }
+  return new Bun.Transpiler({ loader: loaderFor(filePath) }).scan(source).exports;
+};
 function transformUseClient(source, args) {
   if (!USE_CLIENT_RE2.test(source))
     return null;
   if (IMPLICIT_ROOT_LAYOUT_RE.test(args.path))
     return null;
-  const transpiler = new Bun.Transpiler({ loader: loaderFor2(args.path) });
-  const { exports } = transpiler.scan(source);
+  const exports = scanUseClientExports(source, args.path, args.workspaceRoot);
   if (exports.length === 0)
     return null;
   const referencePath = args.workspaceRoot ? toClientReferencePath(args.path, args.workspaceRoot) : args.path;
@@ -823,20 +752,21 @@ function transformUseClient(source, args) {
   return lines.join(`
 `);
 }
-function loaderFor2(absPath) {
-  if (absPath.endsWith(".tsx"))
-    return "tsx";
-  if (absPath.endsWith(".jsx"))
-    return "jsx";
-  if (absPath.endsWith(".ts"))
-    return "ts";
-  return "js";
-}
 
 // pkgs/@akanjs/devkit/frontendBuild/clientEntriesBundler.ts
 import fs from "fs";
 import path5 from "path";
 
+// pkgs/@akanjs/devkit/frontendBuild/bundleDefine.ts
+var bundleDefine = (app, command, renderEnv) => {
+  const nodeEnv = command === "build" ? "production" : "development";
+  return {
+    "process.env.NODE_ENV": JSON.stringify(nodeEnv),
+    "process.env.AKAN_PUBLIC_RENDER_ENV": JSON.stringify(renderEnv),
+    ...Object.fromEntries(Object.entries(app.getPublicEnv()).map(([key, value]) => [`process.env.${key}`, JSON.stringify(value)]))
+  };
+};
+
 // pkgs/@akanjs/devkit/frontendBuild/clientBuildTypes.ts
 var CLIENT_BUNDLE_NAMING = {
   entry: "[name]-[hash].[ext]",
@@ -856,7 +786,6 @@ class ClientEntriesBundler {
   #target;
   #outputSubdir;
   #reactFastRefresh;
-  #artifactDir;
   #outdir;
   #servePrefix;
   #manifest = {};
@@ -878,8 +807,8 @@ class ClientEntriesBundler {
     this.#target = options.target ?? "browser";
     this.#outputSubdir = options.outputSubdir ?? "client";
     this.#reactFastRefresh = options.reactFastRefresh ?? false;
-    this.#artifactDir = `${this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath}/.akan/artifact`;
-    this.#outdir = `${this.#artifactDir}/${this.#outputSubdir}`;
+    const artifactDir = `${this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath}/.akan/artifact`;
+    this.#outdir = `${artifactDir}/${this.#outputSubdir}`;
     this.#servePrefix = `/_akan/${this.#outputSubdir}`;
   }
   async bundle() {
@@ -893,7 +822,7 @@ class ClientEntriesBundler {
       format: "esm",
       naming: CLIENT_BUNDLE_NAMING,
       metafile: true,
-      define: this.#getDefine(),
+      define: bundleDefine(this.#app, this.#command, "ssr"),
       minify: this.#command === "build",
       optimizeImports: akanConfig.optimizeImports,
       reactFastRefresh: this.#command === "start" && this.#outputSubdir === "client" && this.#reactFastRefresh,
@@ -917,14 +846,6 @@ class ClientEntriesBundler {
       clientReferenceIdByAbsPath: this.#clientReferenceIdByAbsPath
     };
   }
-  #getDefine() {
-    const nodeEnv = this.#command === "build" ? "production" : "development";
-    return {
-      "process.env.NODE_ENV": JSON.stringify(nodeEnv),
-      "process.env.AKAN_PUBLIC_RENDER_ENV": JSON.stringify("ssr"),
-      ...Object.fromEntries(Object.entries(this.#app.getPublicEnv()).map(([key, value]) => [`process.env.${key}`, JSON.stringify(value)]))
-    };
-  }
   async#createOpaqueEntryAliases() {
     const aliasDir = path5.join(this.#app.cwdPath, ".akan", "generated", "client-entry-alias", this.#outputSubdir);
     fs.mkdirSync(aliasDir, { recursive: true });
@@ -955,18 +876,7 @@ ${absEntry}`).toString(36);
 `;
   }
   async#scanEntryExportNames(absEntry) {
-    const source = await Bun.file(absEntry).text();
-    const transpiler = new Bun.Transpiler({ loader: this.#loaderForEntry(absEntry) });
-    return transpiler.scan(source).exports;
-  }
-  #loaderForEntry(absPath) {
-    if (absPath.endsWith(".tsx"))
-      return "tsx";
-    if (absPath.endsWith(".jsx"))
-      return "jsx";
-    if (absPath.endsWith(".ts"))
-      return "ts";
-    return "js";
+    return scanUseClientExports(await Bun.file(absEntry).text(), absEntry, this.#app.workspace.workspaceRoot);
   }
   #createExternalSpecifiersPlugin() {
     const set = new Set(this.#external);
@@ -990,14 +900,11 @@ ${absEntry}`).toString(36);
     };
   }
   static #matchesExternalSpecifier(specifier, exactExternals, subpathExternals) {
-    if (exactExternals.has(specifier))
+    if (exactExternals.has(specifier) || subpathExternals.has(specifier))
       return true;
-    if (subpathExternals.has(specifier))
-      return true;
-    for (const external of subpathExternals) {
+    for (const external of subpathExternals)
       if (specifier.startsWith(`${external}/`))
         return true;
-    }
     return false;
   }
   async#rewriteExternalImportSpecifiers(outputs) {
@@ -1128,14 +1035,6 @@ var VENDOR_SPECIFIERS = [
 ];
 
 // pkgs/@akanjs/devkit/frontendBuild/routeClientBuilder.ts
-var SSR_CLIENT_EXTERNALS = [
-  "react",
-  "react-dom",
-  "react-dom/client",
-  "react/jsx-runtime",
-  "react/jsx-dev-runtime",
-  "akanjs/fetch"
-];
 var SSR_CLIENT_ALIAS_EXTERNALS = [
   "react",
   "react-dom",
@@ -1143,10 +1042,12 @@ var SSR_CLIENT_ALIAS_EXTERNALS = [
   "react/jsx-runtime",
   "react/jsx-dev-runtime"
 ];
+var SSR_CLIENT_EXTERNALS = [...SSR_CLIENT_ALIAS_EXTERNALS, "akanjs/fetch"];
 
 class RouteClientBuilder {
   #app;
   #seeds;
+  #graphSeeds;
   #knownEntries;
   #command;
   #discovery;
@@ -1154,20 +1055,22 @@ class RouteClientBuilder {
   constructor(options) {
     this.#app = options.app;
     this.#seeds = options.seeds;
+    this.#graphSeeds = options.graphSeeds;
     this.#knownEntries = options.knownEntries ?? new Set;
     this.#command = options.command ?? "start";
     this.#discovery = options.discovery;
     this.#entries = options.entries;
   }
   async build() {
-    const discovered = this.#entries ?? await (this.#discovery ?? await GraphClientEntryDiscovery.create(this.#app)).discover(this.#seeds);
-    const entries = discovered.filter((e) => !this.#knownEntries.has(e));
-    if (entries.length === 0)
+    const discovered = this.#entries ?? await (await this.#getDiscovery()).discover(this.#seeds);
+    if (discovered.every((e) => this.#knownEntries.has(e)))
       return this.#emptyResult(discovered);
+    const entries = this.#graphSeeds ? [...new Set([...discovered, ...await (await this.#getDiscovery()).discover(this.#graphSeeds)])].sort() : discovered.filter((e) => !this.#knownEntries.has(e));
     const bootstrapEntries = await this.#createBootstrapEntries(entries);
     const browserBundle = await this.#buildBrowserBundle(bootstrapEntries);
     const ssrBundle = await this.#buildSsrBundle(bootstrapEntries);
     const acceptedEntries = new Set(entries);
+    const routeEntries = new Set(discovered);
     const manifestDelta = {};
     const ssrModuleMap = {};
     const clientDeps = new Set;
@@ -1195,18 +1098,23 @@ class RouteClientBuilder {
         deps.add(path6.resolve(dep));
       const sortedDeps = [...deps].sort();
       clientDepsByEntry[originalEntry] = sortedDeps;
-      for (const dep of sortedDeps)
-        clientDeps.add(dep);
+      if (routeEntries.has(originalEntry))
+        for (const dep of sortedDeps)
+          clientDeps.add(dep);
     }
     return {
       manifestDelta,
       ssrManifestDelta: { moduleLoading: null, moduleMap: ssrModuleMap },
-      newEntries: entries,
+      newEntries: entries.filter((e) => !this.#knownEntries.has(e)),
       discoveredEntries: discovered,
       clientDeps: [...clientDeps].sort(),
       clientDepsByEntry
     };
   }
+  async#getDiscovery() {
+    this.#discovery ??= await GraphClientEntryDiscovery.create(this.#app);
+    return this.#discovery;
+  }
   #emptyResult(discoveredEntries = []) {
     return {
       manifestDelta: {},
@@ -1267,18 +1175,7 @@ ${absEntry}`).toString(36);
     return { buildEntries, originalByBuildEntry };
   }
   async#scanExportNames(absEntry) {
-    const source = await Bun.file(absEntry).text();
-    const transpiler = new Bun.Transpiler({ loader: this.#loaderFor(absEntry) });
-    return transpiler.scan(source).exports;
-  }
-  #loaderFor(absPath) {
-    if (absPath.endsWith(".tsx"))
-      return "tsx";
-    if (absPath.endsWith(".jsx"))
-      return "jsx";
-    if (absPath.endsWith(".ts"))
-      return "ts";
-    return "js";
+    return scanUseClientExports(await Bun.file(absEntry).text(), absEntry, this.#app.workspace.workspaceRoot);
   }
   static normalizeNamedDefaultFunctionForFastRefresh(source) {
     let changed = false;
@@ -1346,7 +1243,7 @@ ${defaultNames.map((name) => `export default ${name};`).join(`
 // pkgs/@akanjs/devkit/frontendBuild/autoImportSync.ts
 import { readdir, readFile, stat } from "fs/promises";
 import path7 from "path";
-import ts2 from "typescript";
+import ts3 from "typescript";
 var TEST_FILE_RE = /\.(test|spec)\.(ts|tsx)$/;
 var AKAN_BASE = {
   names: ["Int", "Float", "ID", "Any", "Upload", "enumOf", "dayjs"],
@@ -1440,6 +1337,7 @@ var LIB_BARRELS = {
   cnst: { barrel: "cnst", kind: "namespace" },
   srv: { barrel: "srv", kind: "namespace" }
 };
+var GLOBAL_NAMES = new Set(["fetch"]);
 var DOMAIN_DENYLIST = new Set([
   "Map",
   "Set",
@@ -1538,7 +1436,7 @@ class AutoImportSync {
     const next = transformSource(source, abs, ctx, resolveExtra);
     if (next === null || next === source)
       return false;
-    await FileSys.writeTextAtomic(abs, next);
+    await FileSys2.writeTextAtomic(abs, next);
     return true;
   }
   async#extraResolverFor(abs, ctx) {
@@ -1639,13 +1537,14 @@ var targetFor = (symbol, ctx) => {
   return null;
 };
 var transformSource = (source, fileName, ctx, resolveExtra) => {
-  const sf = ts2.createSourceFile(fileName, source, ts2.ScriptTarget.Latest, true, scriptKindFor(fileName));
+  const sf = ts3.createSourceFile(fileName, source, ts3.ScriptTarget.Latest, true, scriptKindFor(fileName));
   const bound = collectBoundNames(sf);
   const used = collectUsedReferences(sf);
+  const bareGlobals = collectBareGlobalReferences(sf);
   const namedBySpecifier = new Map;
   const namespaceImports = [];
   for (const name of used) {
-    if (bound.has(name))
+    if (bound.has(name) || bareGlobals.has(name))
       continue;
     const target = targetFor(name, ctx) ?? resolveExtra?.(name) ?? null;
     if (!target)
@@ -1660,7 +1559,7 @@ var transformSource = (source, fileName, ctx, resolveExtra) => {
   }
   if (namedBySpecifier.size === 0 && namespaceImports.length === 0)
     return null;
-  const importDecls = sf.statements.filter(ts2.isImportDeclaration);
+  const importDecls = sf.statements.filter(ts3.isImportDeclaration);
   const anchor = importDecls.at(-1) ?? null;
   const namedImportsBySpecifier = collectExistingNamedImports(importDecls);
   const edits = [];
@@ -1716,48 +1615,61 @@ ${newStatements.join(`
 var collectBoundNames = (sf) => {
   const names = new Set;
   const visit = (node) => {
-    if (ts2.isImportClause(node)) {
+    if (ts3.isImportClause(node)) {
       if (node.name)
         names.add(node.name.text);
       const bindings = node.namedBindings;
-      if (bindings && ts2.isNamespaceImport(bindings))
+      if (bindings && ts3.isNamespaceImport(bindings))
         names.add(bindings.name.text);
-      if (bindings && ts2.isNamedImports(bindings))
+      if (bindings && ts3.isNamedImports(bindings))
         for (const el of bindings.elements)
           names.add(el.name.text);
     }
-    if ((ts2.isVariableDeclaration(node) || ts2.isFunctionDeclaration(node) || ts2.isClassDeclaration(node) || ts2.isParameter(node) || ts2.isBindingElement(node) || ts2.isEnumDeclaration(node) || ts2.isTypeAliasDeclaration(node) || ts2.isInterfaceDeclaration(node)) && node.name && ts2.isIdentifier(node.name))
+    if ((ts3.isVariableDeclaration(node) || ts3.isFunctionDeclaration(node) || ts3.isClassDeclaration(node) || ts3.isParameter(node) || ts3.isBindingElement(node) || ts3.isEnumDeclaration(node) || ts3.isTypeAliasDeclaration(node) || ts3.isInterfaceDeclaration(node)) && node.name && ts3.isIdentifier(node.name))
       names.add(node.name.text);
-    ts2.forEachChild(node, visit);
+    ts3.forEachChild(node, visit);
   };
-  ts2.forEachChild(sf, visit);
+  ts3.forEachChild(sf, visit);
   return names;
 };
 var collectUsedReferences = (sf) => {
   const used = new Set;
   const visit = (node) => {
-    if (ts2.isIdentifier(node) && isReferencePosition(node))
+    if (ts3.isIdentifier(node) && isReferencePosition(node))
       used.add(node.text);
-    ts2.forEachChild(node, visit);
+    ts3.forEachChild(node, visit);
   };
-  ts2.forEachChild(sf, visit);
+  ts3.forEachChild(sf, visit);
   return used;
 };
+var collectBareGlobalReferences = (sf) => {
+  const bare = new Set;
+  const visit = (node) => {
+    if (ts3.isIdentifier(node) && GLOBAL_NAMES.has(node.text) && isReferencePosition(node)) {
+      const parent = node.parent;
+      if (!(parent && ts3.isPropertyAccessExpression(parent) && parent.expression === node))
+        bare.add(node.text);
+    }
+    ts3.forEachChild(node, visit);
+  };
+  ts3.forEachChild(sf, visit);
+  return bare;
+};
 var isReferencePosition = (node) => {
   const parent = node.parent;
   if (!parent)
     return true;
-  if (ts2.isPropertyAccessExpression(parent) && parent.name === node)
+  if (ts3.isPropertyAccessExpression(parent) && parent.name === node)
     return false;
-  if (ts2.isQualifiedName(parent) && parent.right === node)
+  if (ts3.isQualifiedName(parent) && parent.right === node)
     return false;
-  if (ts2.isPropertyAssignment(parent) && parent.name === node)
+  if (ts3.isPropertyAssignment(parent) && parent.name === node)
     return false;
-  if (ts2.isPropertySignature(parent) && parent.name === node)
+  if (ts3.isPropertySignature(parent) && parent.name === node)
     return false;
-  if (ts2.isBindingElement(parent) && parent.propertyName === node)
+  if (ts3.isBindingElement(parent) && parent.propertyName === node)
     return false;
-  if (ts2.isImportSpecifier(parent) || ts2.isExportSpecifier(parent))
+  if (ts3.isImportSpecifier(parent) || ts3.isExportSpecifier(parent))
     return false;
   return true;
 };
@@ -1766,9 +1678,9 @@ var collectExistingNamedImports = (importDecls) => {
   for (const decl of importDecls) {
     const clause = decl.importClause;
     const bindings = clause?.namedBindings;
-    if (!clause || !bindings || !ts2.isNamedImports(bindings))
+    if (!clause || !bindings || !ts3.isNamedImports(bindings))
       continue;
-    if (!ts2.isStringLiteral(decl.moduleSpecifier))
+    if (!ts3.isStringLiteral(decl.moduleSpecifier))
       continue;
     const specifier = decl.moduleSpecifier.text;
     if (map.has(specifier))
@@ -1790,14 +1702,14 @@ var formatNamedImport = (specifier, names) => {
 var directivePrologueEnd = (sf) => {
   let end = -1;
   for (const stmt of sf.statements) {
-    if (ts2.isExpressionStatement(stmt) && ts2.isStringLiteral(stmt.expression))
+    if (ts3.isExpressionStatement(stmt) && ts3.isStringLiteral(stmt.expression))
       end = stmt.getEnd();
     else
       break;
   }
   return end;
 };
-var scriptKindFor = (fileName) => fileName.endsWith(".tsx") ? ts2.ScriptKind.TSX : ts2.ScriptKind.TS;
+var scriptKindFor = (fileName) => fileName.endsWith(".tsx") ? ts3.ScriptKind.TSX : ts3.ScriptKind.TS;
 var compareNames = (a, b) => {
   const [la, lb] = [a.toLowerCase(), b.toLowerCase()];
   if (la !== lb)
@@ -1847,18 +1759,18 @@ var collectDomainFiles = async (dir) => {
   return files;
 };
 var exportedPascalNames = (source, fileName) => {
-  const sf = ts2.createSourceFile(fileName, source, ts2.ScriptTarget.Latest, true);
-  const isExported = (node) => ts2.canHaveModifiers(node) && (ts2.getModifiers(node) ?? []).some((m) => m.kind === ts2.SyntaxKind.ExportKeyword);
+  const sf = ts3.createSourceFile(fileName, source, ts3.ScriptTarget.Latest, true);
+  const isExported = (node) => ts3.canHaveModifiers(node) && (ts3.getModifiers(node) ?? []).some((m) => m.kind === ts3.SyntaxKind.ExportKeyword);
   const names = [];
   for (const stmt of sf.statements) {
-    if ((ts2.isClassDeclaration(stmt) || ts2.isFunctionDeclaration(stmt) || ts2.isEnumDeclaration(stmt)) && stmt.name) {
+    if ((ts3.isClassDeclaration(stmt) || ts3.isFunctionDeclaration(stmt) || ts3.isEnumDeclaration(stmt)) && stmt.name) {
       if (isExported(stmt))
         names.push(stmt.name.text);
-    } else if (ts2.isVariableStatement(stmt) && isExported(stmt)) {
+    } else if (ts3.isVariableStatement(stmt) && isExported(stmt)) {
       for (const decl of stmt.declarationList.declarations)
-        if (ts2.isIdentifier(decl.name))
+        if (ts3.isIdentifier(decl.name))
           names.push(decl.name.text);
-    } else if (ts2.isExportDeclaration(stmt) && stmt.exportClause && ts2.isNamedExports(stmt.exportClause)) {
+    } else if (ts3.isExportDeclaration(stmt) && stmt.exportClause && ts3.isNamedExports(stmt.exportClause)) {
       for (const el of stmt.exportClause.elements)
         names.push(el.name.text);
     }
@@ -1872,7 +1784,6 @@ var relativeSpecifier = (fromDir, toFile) => {
 
 // pkgs/@akanjs/devkit/frontendBuild/devChangePlanner.ts
 import path8 from "path";
-var SOURCE_EXTS2 = new Set([".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"]);
 var CONFIG_BASENAMES = new Set(["akan.config.ts", "bunfig.toml", "tsconfig.json", "package.json"]);
 var BARREL_FACETS = new Set(["common", "srvkit", "ui", "webkit", "plugin"]);
 var CLIENT_SUFFIXES = [".Template.tsx", ".Unit.tsx", ".Util.tsx", ".View.tsx", ".Zone.tsx", ".store.ts"];
@@ -1934,7 +1845,7 @@ class DevChangePlanner {
     const abs = path8.resolve(file);
     const base = path8.basename(abs);
     const ext = path8.extname(abs).toLowerCase();
-    const isSource = SOURCE_EXTS2.has(ext);
+    const isSource = SOURCE_EXTS.has(ext);
     const rel = path8.relative(this.#workspaceRoot, abs);
     const parts = rel.split(path8.sep).filter(Boolean);
     if (CONFIG_BASENAMES.has(base)) {
@@ -1949,15 +1860,15 @@ class DevChangePlanner {
       roles.add("barrel");
       reasons.add(isGenerated ? "generated-index" : "barrel-facet-child");
     }
-    if (isSource && this.#isServerBiased(abs, parts)) {
+    if (isSource && this.#isServerBiased(base, parts)) {
       roles.add("server");
       reasons.add("server-path");
     }
-    if (isSource && this.#isClientBiased(abs, parts)) {
+    if (isSource && this.#isClientBiased(base, parts)) {
       roles.add("client");
       reasons.add("client-path");
     }
-    if (isSource && this.#isSharedBiased(abs, parts)) {
+    if (isSource && this.#isSharedBiased(base, parts)) {
       roles.add("shared");
       reasons.add("shared-path");
     }
@@ -1970,22 +1881,19 @@ class DevChangePlanner {
       roles.add("shared");
       reasons.add("server-client-overlap");
     }
-    if (roles.size === 0 && SOURCE_EXTS2.has(ext) && this.#isWorkspaceSource(rel)) {
+    if (roles.size === 0 && SOURCE_EXTS.has(ext) && this.#isWorkspaceSource(rel)) {
       roles.add("shared");
       reasons.add("workspace-source-fallback");
     }
     return roles;
   }
-  #isServerBiased(abs, parts) {
-    const base = path8.basename(abs);
+  #isServerBiased(base, parts) {
     return parts.includes("srvkit") || SERVER_SUFFIXES.some((suffix) => base.endsWith(suffix)) || base === "main.ts" || base === "server.ts";
   }
-  #isClientBiased(abs, parts) {
-    const base = path8.basename(abs);
+  #isClientBiased(base, parts) {
     return parts.includes("ui") || parts.includes("webkit") || parts.includes("page") || CLIENT_SUFFIXES.some((suffix) => base.endsWith(suffix));
   }
-  #isSharedBiased(abs, parts) {
-    const base = path8.basename(abs);
+  #isSharedBiased(base, parts) {
     return parts.includes("common") || SHARED_SUFFIXES.some((suffix) => base.endsWith(suffix)) || RUNTIME_METADATA_BASENAMES.has(base);
   }
   #isRuntimeMetadataFile(parts, base) {
@@ -2021,6 +1929,7 @@ var uniqueResolved = (files) => [...new Set(files.map((file) => path8.resolve(fi
 // pkgs/@akanjs/devkit/frontendBuild/devGeneratedIndexSync.ts
 import { mkdir as mkdir2, readdir as readdir2, readFile as readFile2, rm, stat as stat2 } from "fs/promises";
 import path9 from "path";
+import { capitalize } from "akanjs/common";
 var BARREL_FACETS2 = new Set(["common", "srvkit", "ui", "webkit", "plugin"]);
 var FACET_SOURCE_FILE_RE = /\.(ts|tsx)$/;
 var FACET_EXCLUDED_FILE_RE = /(^index\.tsx?$|\.d\.ts$|\.(test|spec)\.(ts|tsx)$|\.css$|\.scss$|\.sass$)/;
@@ -2111,7 +2020,7 @@ class DevGeneratedIndexSync {
     if (current === content)
       return false;
     await mkdir2(dir, { recursive: true });
-    await FileSys.writeTextAtomic(indexPath, content);
+    await FileSys2.writeTextAtomic(indexPath, content);
     return true;
   }
   async#contentForIndex(indexPath) {
@@ -2170,7 +2079,6 @@ export const ${modelName} = { ${fileTypes.join(", ")} };`;
   }
 }
 var exists = async (file) => stat2(file).then(() => true).catch(() => false);
-var capitalize = (value) => `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
 var formatError2 = (err) => err instanceof Error ? err.message : String(err);
 
-export { BarrelAnalyzer, createBarrelImportsPlugin, createTsconfigPackageResolver, rewriteBarrelImports, GraphClientEntryDiscovery, transformUseClient, ClientEntriesBundler, VENDOR_SPECIFIERS, RouteClientBuilder, AutoImportSync, DevChangePlanner, DevGeneratedIndexSync };
+export { loaderFor, BarrelAnalyzer, createBarrelImportsPlugin, createTsconfigPackageResolver, rewriteBarrelImports, GraphClientEntryDiscovery, transformUseClient, bundleDefine, ClientEntriesBundler, VENDOR_SPECIFIERS, RouteClientBuilder, AutoImportSync, DevChangePlanner, DevGeneratedIndexSync };