@akanjs/cli 3.0.0-beta.17 → 3.0.0-beta.19

package/{index-p4p9t45x.js → index-crmeqnmf.js}

@@ -195,6 +195,7 @@ import { readFileSync as readFileSync2 } from "fs";
 import {
   copyFile,
   cp as cpEntry,
+  lstat,
   mkdir as mkdir3,
   readdir as readDirEntries,
   realpath,
@@ -358,7 +359,7 @@ ${CLAUDE_COMMENT_RULE}
 import fs from "fs";
 import path2 from "path";
 import { fileURLToPath } from "url";
-import { normalizeRoutePrefix } from "akanjs/base";
+import { DatabaseModes, normalizeRoutePrefix } from "akanjs/base";
 import { resolveAkanI18nConfig } from "akanjs/common";
 
 // pkgs/@akanjs/devkit/akanConfig/types.ts
@@ -417,16 +418,6 @@ var MOBILE_APP_CAPACITOR_PLUGINS = [
   "@capacitor/push-notifications",
   "capacitor-plugin-safe-area"
 ];
-var DATABASE_MODE_RUNTIME_PACKAGES = {
-  single: [],
-  multiple: ["@libsql/client", "bullmq", "ioredis", "protobufjs"],
-  cluster: ["bullmq", "ioredis", "postgres", "protobufjs"]
-};
-var AKAN_RUNTIME_PACKAGES = new Set([
-  ...SSR_RUNTIME_PACKAGES,
-  ...MOBILE_RUNTIME_PACKAGES,
-  ...Object.values(DATABASE_MODE_RUNTIME_PACKAGES).flat()
-]);
 var DEFAULT_AKAN_IMAGE_CONFIG = {
   deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
   imageSizes: [32, 48, 64, 96, 128, 256, 384],
@@ -506,7 +497,7 @@ class AkanAppConfig {
   rootPackageJson;
   docker;
   dockerfile;
-  defaultDatabaseMode;
+  database;
   web;
   externalLibs;
   barrelImports;
@@ -534,7 +525,7 @@ class AkanAppConfig {
     this.baseDevEnv = baseDevEnv;
     this.plugins = plugins;
     this.#applyRoutes(config?.routes);
-    this.defaultDatabaseMode = config?.defaultDatabaseMode ?? "single";
+    this.database = AkanAppConfig.#database(app, config);
     this.externalLibs = [...new Set([...config?.externalLibs ?? [], ...libContributions.externalLibs])];
     this.barrelImports = [
       ...DEFAULT_BARREL_IMPORTS,
@@ -730,6 +721,7 @@ ENV AKAN_PUBLIC_LOCALES=${this.i18n.locales.join(",")}
 ENV AKAN_PUBLIC_API_PREFIX=${this.api.prefix}
 ENV AKAN_PUBLIC_WS_PREFIX=${this.api.websocketPrefix}
 ENV AKAN_PUBLIC_OPERATION_MODE=cloud
+ENV AKAN_DATABASE_MODES=${this.database.modes.join(",")}
 ENV AKAN_LOG_TO_FILE=0
 ${webEnvLines}
 CMD [${command.map((c) => `"${c}"`).join(",")}]`;
@@ -774,14 +766,30 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     return akanPackageJson.dependencies?.[lib] ?? akanPackageJson.peerDependencies?.[lib];
   }
   #getProductionRuntimePackages() {
-    return [...this.externalLibs, ...SSR_RUNTIME_PACKAGES, ...this.getDatabaseModeRuntimePackages()];
+    return [
+      ...this.externalLibs,
+      ...SSR_RUNTIME_PACKAGES,
+      ...this.database.modes.flatMap((mode) => this.getDatabaseModeRuntimePackages(mode))
+    ];
   }
-  getDatabaseModeRuntimePackages(databaseMode = this.defaultDatabaseMode) {
-    return [...DATABASE_MODE_RUNTIME_PACKAGES[databaseMode]];
+  getDatabaseModeRuntimePackages(databaseMode) {
+    return [...DatabaseModes.drivers[databaseMode]];
   }
-  getMissingDatabaseModeDependencySpecs(databaseMode = this.defaultDatabaseMode) {
+  getMissingDatabaseModeDependencySpecs(databaseMode) {
     return this.#getMissingDependencySpecs(this.getDatabaseModeRuntimePackages(databaseMode));
   }
+  resolveDatabaseMode() {
+    return DatabaseModes.resolve({
+      requested: process.env.AKAN_DATABASE_MODE,
+      declared: this.database.modes.join(","),
+      local: true
+    });
+  }
+  static #database(app, config) {
+    const declared = config?.database?.modes?.filter((mode) => !!mode);
+    const modes = declared?.length ? declared : ["single"];
+    return { modes: DatabaseModes.parseList(modes.join(","), `database.modes in apps/${app.name}/akan.config.ts`) };
+  }
   getMobileRuntimePackages() {
     return [...new Set([...MOBILE_RUNTIME_PACKAGES, ...MOBILE_APP_CAPACITOR_PLUGINS])];
   }
@@ -803,6 +811,9 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       return `${lib}@${version}`;
     });
   }
+  get akanVersion() {
+    return getAkanPackageJson().version;
+  }
   getProductionPackageJson(data = {}) {
     return {
       name: this.app.name,
@@ -1141,13 +1152,6 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
-export async function generateMetadata(props: PageProps) {
-  if (userLayout.generateMetadata) return userLayout.generateMetadata(props);
-  if (userLayout.metadata !== undefined) return userLayout.metadata;
-  if (inheritedLayout.generateMetadata) return inheritedLayout.generateMetadata(props);
-  return inheritedLayout.metadata;
-}
-
 export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
 export const Error = userLayout.Error ?? inheritedLayout.Error;
 export const pageConfig = userLayout.pageConfig ?? inheritedLayout.pageConfig;
@@ -1164,7 +1168,6 @@ ${layoutBinding}  return (
       theme={userLayout.theme ?? inheritedLayout.theme}
       fonts={loadFonts(userFonts)}
       className={defaultFontClassName}
-      gaTrackingId={userLayout.gaTrackingId ?? inheritedLayout.gaTrackingId}
       layoutStyle={userLayout.layoutStyle ?? inheritedLayout.layoutStyle}
       reconnect={userLayout.reconnect ?? inheritedLayout.reconnect ?? false}
       wsConnect={userLayout.wsConnect ?? inheritedLayout.wsConnect ?? true}
@@ -1185,13 +1188,6 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
-export async function generateMetadata(props: PageProps) {
-  if (userLayout.generateMetadata) return userLayout.generateMetadata(props);
-  if (userLayout.metadata !== undefined) return userLayout.metadata;
-  if (inheritedLayout.generateMetadata) return inheritedLayout.generateMetadata(props);
-  return inheritedLayout.metadata;
-}
-
 export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
 export const Error = userLayout.Error ?? inheritedLayout.Error;
 export const pageConfig = userLayout.pageConfig ?? inheritedLayout.pageConfig;
@@ -1301,13 +1297,14 @@ var asBiomeReport = (candidate) => {
 var BIOME_CONFIG_FILES = ["biome.json", "biome.jsonc"];
 
 class Linter {
+  static biomeBinName = process.platform === "win32" ? "biome.exe" : "biome";
   lintRoot;
   configPath;
   #biomeBin;
   constructor(cwdPath) {
     this.lintRoot = this.#findBiomeRootPath(cwdPath);
     this.configPath = Linter.#configPathIn(this.lintRoot) ?? path5.join(this.lintRoot, "biome.json");
-    const localBiomeBin = path5.join(this.lintRoot, "node_modules/.bin/biome");
+    const localBiomeBin = path5.join(this.lintRoot, "node_modules", ".bin", Linter.biomeBinName);
     this.#biomeBin = existsSync(localBiomeBin) ? localBiomeBin : "biome";
   }
   static #configPathIn(dir) {
@@ -1717,7 +1714,7 @@ var moduleUiFileTypes = {
   scalar: new Set(["Template", "Unit"])
 };
 var testFilePattern = /\.(test|spec)\.(ts|tsx)$/;
-var createDependencyScanner = async (exec) => (await import("./dependencyScanner-shs82ynp.js")).TypeScriptDependencyScanner.from(exec);
+var createDependencyScanner = async (exec) => (await import("./dependencyScanner-0z2h2tks.js")).TypeScriptDependencyScanner.from(exec);
 var isAllowedTestFile = (filename) => testFilePattern.test(filename);
 var getScanPath = (exec, relativePath) => path7.posix.join(`${exec.type}s`, exec.name, relativePath.split(path7.sep).join("/"));
 async function clearGeneratedRootCapacitorConfigs(exec) {
@@ -2139,11 +2136,12 @@ class PkgInfo {
     const [tsconfig, rootPackageJson] = await Promise.all([exec.getTsConfig(), exec.workspace.getPackageJson()]);
     const scanner = await createDependencyScanner(exec);
     const npmSet = new Set(Object.keys({ ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies }));
-    const pkgPathSet = new Set(Object.keys(tsconfig.compilerOptions.paths ?? {}).filter((path) => tsconfig.compilerOptions.paths?.[path]?.some((resolve) => resolve.startsWith("pkgs/"))).map((path) => path.replace("/*", "")));
+    const workspacePathOf = (resolve) => resolve.replace(/^\.\//, "");
+    const pkgPathSet = new Set(Object.keys(tsconfig.compilerOptions.paths ?? {}).filter((path) => tsconfig.compilerOptions.paths?.[path]?.some((resolve) => workspacePathOf(resolve).startsWith("pkgs/"))).map((path) => path.replace("/*", "")));
     const [npmDepSet, pkgPathDepSet] = await scanner.getImportSets([npmSet, pkgPathSet]);
     const pkgDeps = [...pkgPathDepSet].map((path) => {
       const pathSplitLength = path.split("/").length;
-      return (tsconfig.compilerOptions.paths?.[path]?.[0] ?? "*").split("/").slice(1, 1 + pathSplitLength).join("/");
+      return workspacePathOf(tsconfig.compilerOptions.paths?.[path]?.[0] ?? "*").split("/").slice(1, 1 + pathSplitLength).join("/");
     }).filter((pkg) => pkg !== exec.name);
     const pkgScanResult = {
       name: exec.name,
@@ -2240,7 +2238,8 @@ var staticTemplateFileExtensions = new Set([
   ".woff2",
   ".xml"
 ]);
-var formatCommandArg = (value) => /^[\w@%+=:,./-]+$/.test(value) ? value : JSON.stringify(value);
+var plainCommandArgPattern = process.platform === "win32" ? /^[\w@%+=:,./\\-]+$/ : /^[\w@%+=:,./-]+$/;
+var formatCommandArg = (value) => plainCommandArgPattern.test(value) ? value : JSON.stringify(value);
 var formatCommandForDisplay = (command, args = []) => [command, ...args].map(formatCommandArg).join(" ");
 
 class CommandExecutionError extends Error {
@@ -2594,7 +2593,7 @@ class Executor {
     const isDirectory = (await stat2(src)).isDirectory();
     if (!await FileSys.exists(dest) && isDirectory)
       await mkdir3(dest, { recursive: true });
-    if (dereference)
+    if (dereference || process.platform === "win32")
       await cpEntry(src, dest, { recursive: isDirectory, dereference: true, force: true });
     else
       await $`cp -r ${src}${isDirectory ? "/." : ""} ${dest}`;
@@ -3255,7 +3254,7 @@ class SysExecutor extends Executor {
 class AppExecutor extends SysExecutor {
   static #routeSourceValidator = null;
   static async#getRouteSourceValidator() {
-    AppExecutor.#routeSourceValidator ??= (await import("./routeSourceValidator-apyqw7wk.js")).RouteSourceValidator;
+    AppExecutor.#routeSourceValidator ??= (await import("./routeSourceValidator-7ycnfz0e.js")).RouteSourceValidator;
     return AppExecutor.#routeSourceValidator;
   }
   dist;
@@ -3303,14 +3302,20 @@ class AppExecutor extends SysExecutor {
       ...env
     };
   }
+  async getDatabaseModeEnv() {
+    const akanConfig = await this.getConfig();
+    return {
+      AKAN_DATABASE_MODE: akanConfig.resolveDatabaseMode(),
+      AKAN_DATABASE_MODES: akanConfig.database.modes.join(",")
+    };
+  }
   async prepareCommand(type) {
     const akanConfig = await this.getConfig();
-    const databaseMode = process.env.AKAN_DATABASE_MODE ?? akanConfig.defaultDatabaseMode ?? "single";
     const routeEnv = {
       AKAN_PUBLIC_BASE_PATHS: [...akanConfig.basePaths].join(","),
       AKAN_PUBLIC_API_PREFIX: akanConfig.api.prefix,
       AKAN_PUBLIC_WS_PREFIX: akanConfig.api.websocketPrefix,
-      AKAN_DATABASE_MODE: databaseMode
+      ...await this.getDatabaseModeEnv()
     };
     Object.assign(process.env, routeEnv);
     if (type === "build") {
@@ -3339,6 +3344,8 @@ class AppExecutor extends SysExecutor {
       const buildEnv = { ...env };
       delete buildEnv.AKAN_PUBLIC_CLIENT_PORT;
       delete buildEnv.AKAN_PUBLIC_SERVER_PORT;
+      delete buildEnv.AKAN_PUBLIC_OPERATION_MODE;
+      delete process.env.AKAN_PUBLIC_OPERATION_MODE;
       Object.assign(process.env, buildEnv);
     }
     return { env };
@@ -3386,7 +3393,9 @@ class AppExecutor extends SysExecutor {
     const owners = new Map;
     const devOnlyKeys = new Set;
     const devOnlyDirs = [];
-    for (const root of await this.getPageRoots()) {
+    const pageRoots = await this.getPageRoots();
+    const libKeyPrefixes = pageRoots.map((root) => root.keyPrefix).filter(Boolean);
+    for (const root of pageRoots) {
       if (!await FileSys.dirExists(root.dir))
         continue;
       for await (const rel of glob.scan({
@@ -3398,6 +3407,8 @@ class AppExecutor extends SysExecutor {
         if (segments.some((s) => s === "node_modules"))
           continue;
         const posix = `${root.keyPrefix}${segments.join("/")}`;
+        if (!root.keyPrefix && libKeyPrefixes.some((prefix) => posix.startsWith(prefix)))
+          continue;
         const absPath = path8.join(root.dir, ...segments);
         validatePageSourceFile(posix, { filePath: absPath });
         if (!isRouteSourceFile(posix))
@@ -3487,7 +3498,8 @@ class AppExecutor extends SysExecutor {
       return entries.map((entry) => `${parent}${AppExecutor.#pageLibsDir}/${entry}/`);
     }))).flat();
     const wanted = parents.flatMap((parent) => libs.map((lib) => `${parent}${AppExecutor.#pageLibsDir}/(${lib})/`));
-    if (linked.sort().join(",") === wanted.sort().join(","))
+    const isLink = async (key) => (await lstat(`${this.cwdPath}/page/${key.slice(0, -1)}`).catch(() => null))?.isSymbolicLink() ?? false;
+    if (linked.sort().join(",") === wanted.sort().join(",") && (await Promise.all(linked.map(isLink))).every(Boolean))
       return false;
     await Promise.all(parents.map((parent) => this.removeDir(`${this.cwdPath}/page/${parent}${AppExecutor.#pageLibsDir}`)));
     for (const parent of parents) {
@@ -3795,4 +3807,4 @@ class ModuleExecutor extends Executor {
   }
 }
 
-export { AGENT_BLOCK_START, AGENT_BLOCK_END, stampBlockVersion, extractBlockVersion, readDevkitVersion, upsertAgentBlock, extractAgentBlock, renderRecipeEntries, collectScopeRecipeSources, renderScopeAgentBlock, CLAUDE_COMMENT_RULE, AsyncDefaultExportDetector, resolveSsrPageEntriesForApp, CodegenLock, rootAllowedFiles, rootAllowedDirs, isAllowedLibFacetRootFile, isScannedRootEntry, AppInfo, Spinner, CommandExecutionError, Executor, WorkspaceExecutor, SysExecutor, AppExecutor, LibExecutor, PkgExecutor, ModuleExecutor };
+export { AGENT_BLOCK_START, AGENT_BLOCK_END, stampBlockVersion, extractBlockVersion, readDevkitVersion, upsertAgentBlock, extractAgentBlock, renderRecipeEntries, collectScopeRecipeSources, renderScopeAgentBlock, CLAUDE_COMMENT_RULE, AsyncDefaultExportDetector, resolveSsrPageEntriesForApp, CodegenLock, Linter, rootAllowedFiles, rootAllowedDirs, isAllowedLibFacetRootFile, isScannedRootEntry, AppInfo, Spinner, CommandExecutionError, Executor, WorkspaceExecutor, SysExecutor, AppExecutor, LibExecutor, PkgExecutor, ModuleExecutor };

package/{index-8k16atqy.js → index-d2242ksy.js}

@@ -4,19 +4,34 @@ class CodeAgentRpcHost2 {
   #agent;
   #write;
   #buffer = "";
+  #started = false;
+  #resolveShutdown = () => {};
+  shutdown = new Promise((resolve) => {
+    this.#resolveShutdown = resolve;
+  });
   constructor(agent, write = (line) => process.stdout.write(line)) {
     this.#agent = agent;
     this.#write = write;
   }
   async serve(input = process.stdin) {
-    this.#agent.on((event) => this.#emit(event));
-    this.#agent.announce();
+    this.start();
     const decoder = new TextDecoder;
     for await (const chunk of input)
-      await this.#push(decoder.decode(chunk, { stream: true }));
+      await this.feed(decoder.decode(chunk, { stream: true }));
     await this.#agent.abort().catch(() => {});
   }
-  async#push(text) {
+  start() {
+    if (this.#started)
+      return;
+    this.#started = true;
+    this.#agent.on((event) => this.#emit(event));
+    this.#agent.announce();
+  }
+  attach(write) {
+    this.#write = write;
+    this.#buffer = "";
+  }
+  async feed(text) {
     this.#buffer += text;
     let index = this.#buffer.indexOf(`
 `);
@@ -41,6 +56,8 @@ class CodeAgentRpcHost2 {
     } catch (error) {
       this.#reply({ type: "reply", id: request.id, ok: false, error: String(error) });
     }
+    if (request.command?.type === "shutdown")
+      this.#resolveShutdown();
   }
   async#run(command) {
     switch (command.type) {
@@ -70,11 +87,11 @@ class CodeAgentRpcHost2 {
     }
   }
   #emit(event) {
-    this.#write(`${JSON.stringify({ type: "event", event })}
+    this.#write?.(`${JSON.stringify({ type: "event", event })}
 `);
   }
   #reply(reply) {
-    this.#write(`${JSON.stringify(reply)}
+    this.#write?.(`${JSON.stringify(reply)}
 `);
   }
 }