@akanjs/cli 2.1.0-rc.8 → 2.1.0

package/incrementalBuilder.proc.js

@@ -2,7 +2,7 @@
 var __require = import.meta.require;
 
 // pkgs/@akanjs/devkit/incrementalBuilder/incrementalBuilder.proc.ts
-import path36 from "path";
+import path37 from "path";
 
 // pkgs/@akanjs/devkit/aiEditor.ts
 import { input, select } from "@inquirer/prompts";
@@ -486,7 +486,18 @@ var DEFAULT_OPTIMIZE_IMPORTS = [
 var WORKSPACE_BARREL_FACETS = ["ui", "webkit", "common", "client", "server"];
 var SSR_RUNTIME_PACKAGES = ["react", "react-dom", "react-server-dom-webpack"];
 var NATIVE_RUNTIME_PACKAGES = ["sharp"];
-var AKAN_RUNTIME_PACKAGES = new Set([...SSR_RUNTIME_PACKAGES, ...NATIVE_RUNTIME_PACKAGES]);
+var DEFAULT_BACKEND_RUNTIME_PACKAGES = ["croner"];
+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,
+  ...NATIVE_RUNTIME_PACKAGES,
+  ...DEFAULT_BACKEND_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],
@@ -695,13 +706,22 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     if (AKAN_RUNTIME_PACKAGES.has(lib))
       return akanPackageJson.dependencies?.[lib] ?? akanPackageJson.peerDependencies?.[lib];
   }
+  #getProductionRuntimePackages() {
+    return [
+      ...this.externalLibs,
+      ...SSR_RUNTIME_PACKAGES,
+      ...NATIVE_RUNTIME_PACKAGES,
+      ...DEFAULT_BACKEND_RUNTIME_PACKAGES,
+      ...DATABASE_MODE_RUNTIME_PACKAGES[this.defaultDatabaseMode]
+    ];
+  }
   getProductionPackageJson(data = {}) {
     return {
       name: this.app.name,
       description: this.app.name,
       version: "1.0.0",
       main: "./main.js",
-      dependencies: Object.fromEntries([...new Set([...this.externalLibs, ...SSR_RUNTIME_PACKAGES, ...NATIVE_RUNTIME_PACKAGES])].map((lib) => {
+      dependencies: Object.fromEntries([...new Set(this.#getProductionRuntimePackages())].map((lib) => {
         const version = this.#resolveProductionDependencyVersion(lib);
         if (!version)
           throw new Error(`Dependency ${lib} not found in package.json`);
@@ -7168,9 +7188,19 @@ var SSR_RENDER_EXTERNALS = [
   "react/jsx-dev-runtime",
   "react-dom",
   "react-dom/server.browser",
+  "react-server-dom-webpack",
+  "react-server-dom-webpack/server.node",
   "react-server-dom-webpack/client.node",
   "react-server-dom-webpack/client.browser"
 ];
+var AKAN_OPTIONAL_BACKEND_EXTERNALS = [
+  "@libsql/client",
+  "bullmq",
+  "croner",
+  "ioredis",
+  "postgres",
+  "protobufjs"
+];
 
 class ApplicationBuildRunner {
   #app;
@@ -7239,7 +7269,9 @@ class ApplicationBuildRunner {
   }
   async#buildBackend() {
     const akanConfig2 = await this.#app.getConfig();
-    const backendExternals = [...new Set([...akanConfig2.externalLibs, ...SSR_RENDER_EXTERNALS])];
+    const backendExternals = [
+      ...new Set([...akanConfig2.externalLibs, ...SSR_RENDER_EXTERNALS, ...AKAN_OPTIONAL_BACKEND_EXTERNALS])
+    ];
     const backendEntryPoints = [`${this.#app.cwdPath}/main.ts`, `${this.#app.cwdPath}/server.ts`];
     for (const entrypoint of backendEntryPoints) {
       if (!await Bun.file(entrypoint).exists())
@@ -7261,7 +7293,7 @@ class ApplicationBuildRunner {
       naming: { entry: "[name].[ext]", chunk: "chunk-[hash].[ext]" },
       conditions: ["react-server"],
       define: { "process.env.NODE_ENV": JSON.stringify("production") },
-      plugins: akanConfig2.externalLibs.length > 0 ? [this.#createExternalSpecifiersPlugin(akanConfig2.externalLibs)] : []
+      plugins: backendExternals.length > 0 ? [this.#createExternalSpecifiersPlugin(backendExternals)] : []
     });
     return {
       entrypoints: backendEntryPoints.length + 1,
@@ -7609,10 +7641,31 @@ class ApplicationReleasePackager {
   `;
   }
 }
+// pkgs/@akanjs/devkit/applicationTestPreload.ts
+import path33 from "path";
+var SIGNAL_TEST_PRELOAD_PATH = "test/signalTest.preload.ts";
+async function resolveSignalTestPreloadPath(target) {
+  const candidates = [];
+  const addResolvedPackageCandidate = (basePath2) => {
+    try {
+      candidates.push(path33.join(path33.dirname(Bun.resolveSync("akanjs/package.json", basePath2)), SIGNAL_TEST_PRELOAD_PATH));
+    } catch {}
+  };
+  addResolvedPackageCandidate(target.cwdPath);
+  addResolvedPackageCandidate(process.cwd());
+  addResolvedPackageCandidate(path33.dirname(Bun.main));
+  addResolvedPackageCandidate(import.meta.dir);
+  candidates.push(path33.join(target.cwdPath, "../../node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(target.cwdPath, "../../pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(process.cwd(), "node_modules/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(process.cwd(), "pkgs/akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.join(path33.dirname(Bun.main), "../../akanjs", SIGNAL_TEST_PRELOAD_PATH), path33.resolve(import.meta.dir, "../../akanjs", SIGNAL_TEST_PRELOAD_PATH));
+  for (const candidate of [...new Set(candidates)]) {
+    if (await Bun.file(candidate).exists())
+      return candidate;
+  }
+  throw new Error(`Failed to locate ${SIGNAL_TEST_PRELOAD_PATH} from ${target.cwdPath}`);
+}
 // pkgs/@akanjs/devkit/builder.ts
 import { existsSync as existsSync2 } from "fs";
 import { mkdir as mkdir9 } from "fs/promises";
-import path33 from "path";
+import path34 from "path";
 var SKIP_ENTRY_DIR_SET = new Set(["node_modules", "dist", "build", ".git", ".next"]);
 var assetExtensions = [".css", ".md", ".js", ".png", ".ico", ".svg", ".json", ".template"];
 var assetLoader = Object.fromEntries(assetExtensions.map((ext) => [ext, "file"]));
@@ -7629,14 +7682,14 @@ class Builder {
   #globEntrypoints(cwd, pattern) {
     const glob = new Bun.Glob(pattern);
     return Array.from(glob.scanSync({ cwd, onlyFiles: true })).filter((relativePath) => {
-      const segments = relativePath.split(path33.sep);
+      const segments = relativePath.split(path34.sep);
       return !segments.some((segment) => SKIP_ENTRY_DIR_SET.has(segment));
-    }).map((rel) => path33.join(cwd, rel));
+    }).map((rel) => path34.join(cwd, rel));
   }
   #globFiles(cwd, pattern = "**/*.*") {
     const glob = new Bun.Glob(pattern);
     return Array.from(glob.scanSync({ cwd, onlyFiles: true })).filter((relativePath) => {
-      const segments = relativePath.split(path33.sep);
+      const segments = relativePath.split(path34.sep);
       return !segments.some((segment) => SKIP_ENTRY_DIR_SET.has(segment));
     });
   }
@@ -7644,17 +7697,17 @@ class Builder {
     const out = [];
     for (const p of additionalEntryPoints) {
       if (p.includes("*")) {
-        const rel = p.startsWith(`${cwd}/`) || p.startsWith(`${cwd}${path33.sep}`) ? p.slice(cwd.length + 1) : p;
+        const rel = p.startsWith(`${cwd}/`) || p.startsWith(`${cwd}${path34.sep}`) ? p.slice(cwd.length + 1) : p;
         out.push(...this.#globEntrypoints(cwd, rel));
       } else
-        out.push(path33.isAbsolute(p) ? p : path33.join(cwd, p));
+        out.push(path34.isAbsolute(p) ? p : path34.join(cwd, p));
     }
     return out;
   }
   #getBuildOptions({ bundle = false, additionalEntryPoints = [] } = {}) {
     const cwd = this.#executor.cwdPath;
     const entrypoints = [
-      ...bundle ? [path33.join(cwd, "index.ts")] : this.#globEntrypoints(cwd, "**/*.{ts,tsx}"),
+      ...bundle ? [path34.join(cwd, "index.ts")] : this.#globEntrypoints(cwd, "**/*.{ts,tsx}"),
       ...this.#resolveAdditionalEntrypoints(cwd, additionalEntryPoints)
     ];
     return {
@@ -7675,9 +7728,9 @@ class Builder {
     for (const relativePath of this.#globFiles(cwd)) {
       if (relativePath === "package.json")
         continue;
-      const sourcePath = path33.join(cwd, relativePath);
-      const targetPath = path33.join(this.#distExecutor.cwdPath, relativePath);
-      await mkdir9(path33.dirname(targetPath), { recursive: true });
+      const sourcePath = path34.join(cwd, relativePath);
+      const targetPath = path34.join(this.#distExecutor.cwdPath, relativePath);
+      await mkdir9(path34.dirname(targetPath), { recursive: true });
       await Bun.write(targetPath, Bun.file(sourcePath));
     }
   }
@@ -7688,13 +7741,13 @@ class Builder {
       return withoutFormatDir;
     if (!hasDotSlash && withoutFormatDir === publishedPath)
       return publishedPath;
-    const parsed = path33.posix.parse(withoutFormatDir);
+    const parsed = path34.posix.parse(withoutFormatDir);
     if (![".js", ".mjs", ".cjs"].includes(parsed.ext))
       return withoutFormatDir;
-    const withoutExt = path33.posix.join(parsed.dir, parsed.name);
+    const withoutExt = path34.posix.join(parsed.dir, parsed.name);
     const sourcePath = withoutExt.startsWith("./") ? withoutExt.slice(2) : withoutExt;
     const sourceCandidates = [`${sourcePath}.ts`, `${sourcePath}.tsx`];
-    const matchedSource = sourceCandidates.find((candidate) => existsSync2(path33.join(this.#executor.cwdPath, candidate)));
+    const matchedSource = sourceCandidates.find((candidate) => existsSync2(path34.join(this.#executor.cwdPath, candidate)));
     if (!matchedSource)
       return withoutFormatDir;
     return hasDotSlash ? `./${matchedSource}` : matchedSource;
@@ -7744,7 +7797,7 @@ class Builder {
 }
 // pkgs/@akanjs/devkit/capacitorApp.ts
 import { cp as cp2, mkdir as mkdir10, rm as rm4 } from "fs/promises";
-import path34 from "path";
+import path35 from "path";
 import { MobileProject } from "@trapezedev/project";
 import { capitalize as capitalize2 } from "akanjs/common";
 
@@ -7938,10 +7991,10 @@ class CapacitorApp {
   constructor(app, target) {
     this.app = app;
     this.target = target;
-    this.targetRootPath = path34.posix.join("mobile", this.target.name);
-    this.targetRoot = path34.join(this.app.cwdPath, this.targetRootPath);
-    this.targetWebRoot = path34.join(this.targetRoot, "www");
-    this.targetAssetRoot = path34.join(this.targetRoot, "assets");
+    this.targetRootPath = path35.posix.join("mobile", this.target.name);
+    this.targetRoot = path35.join(this.app.cwdPath, this.targetRootPath);
+    this.targetWebRoot = path35.join(this.targetRoot, "www");
+    this.targetAssetRoot = path35.join(this.targetRoot, "assets");
     this.project = new MobileProject(this.app.cwdPath, {
       android: { path: this.androidRootPath },
       ios: { path: this.iosProjectPath }
@@ -7957,9 +8010,9 @@ class CapacitorApp {
     await this.#writeCapacitorConfig();
     if (regenerate) {
       if (!platform || platform === "ios")
-        await rm4(path34.join(this.app.cwdPath, this.iosRootPath), { recursive: true, force: true });
+        await rm4(path35.join(this.app.cwdPath, this.iosRootPath), { recursive: true, force: true });
       if (!platform || platform === "android")
-        await rm4(path34.join(this.app.cwdPath, this.androidRootPath), { recursive: true, force: true });
+        await rm4(path35.join(this.app.cwdPath, this.androidRootPath), { recursive: true, force: true });
     }
     const project = this.project;
     await this.project.load();
@@ -8021,7 +8074,7 @@ class CapacitorApp {
     await this.#spawnMobile("npx", ["cap", "sync", "android"], { operation, env });
   }
   async#updateAndroidBuildTypes() {
-    const appGradle = await FileEditor.create(path34.join(this.app.cwdPath, this.androidRootPath, "app/build.gradle"));
+    const appGradle = await FileEditor.create(path35.join(this.app.cwdPath, this.androidRootPath, "app/build.gradle"));
     const buildTypesBlock = `
       debug {
         applicationIdSuffix ".debug"
@@ -8064,7 +8117,7 @@ class CapacitorApp {
     const gradleCommand = isWindows ? "gradlew.bat" : "./gradlew";
     await this.app.spawn(gradleCommand, [assembleType === "apk" ? "assembleRelease" : "bundleRelease"], {
       stdio: "inherit",
-      cwd: path34.join(this.app.cwdPath, this.androidRootPath),
+      cwd: path35.join(this.app.cwdPath, this.androidRootPath),
       env: this.#commandEnv("release", env)
     });
   }
@@ -8093,12 +8146,12 @@ class CapacitorApp {
     await this.#prepareAndroid({ operation: "release", env: "main" });
   }
   async prepareWww() {
-    const htmlSource = path34.join(this.app.dist.cwdPath, "csr", targetHtmlFilename(this.target));
+    const htmlSource = path35.join(this.app.dist.cwdPath, "csr", targetHtmlFilename(this.target));
     if (!await Bun.file(htmlSource).exists())
       throw new Error(`CSR html for mobile target '${this.target.name}' not found: ${htmlSource}`);
     await rm4(this.targetWebRoot, { recursive: true, force: true });
     await mkdir10(this.targetWebRoot, { recursive: true });
-    await Bun.write(path34.join(this.targetWebRoot, "index.html"), this.#injectMobileTargetMeta(await Bun.file(htmlSource).text()));
+    await Bun.write(path35.join(this.targetWebRoot, "index.html"), this.#injectMobileTargetMeta(await Bun.file(htmlSource).text()));
   }
   #injectMobileTargetMeta(html) {
     const basePath2 = this.target.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
@@ -8110,7 +8163,7 @@ class CapacitorApp {
   }
   async#writeCapacitorConfig() {
     await mkdir10(this.targetRoot, { recursive: true });
-    const appInfoPath = path34.relative(this.app.cwdPath, path34.join(this.app.cwdPath, "akan.app.json")).split(path34.sep).join("/");
+    const appInfoPath = path35.relative(this.app.cwdPath, path35.join(this.app.cwdPath, "akan.app.json")).split(path35.sep).join("/");
     const content = `import type { AppScanResult } from "akanjs";
 import { withBase } from "akanjs/capacitor.base.config";
 import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
@@ -8131,18 +8184,18 @@ export default withBase(
   appInfo as AppScanResult,
 );
 `;
-    await Bun.write(path34.join(this.app.cwdPath, "capacitor.config.ts"), content);
+    await Bun.write(path35.join(this.app.cwdPath, "capacitor.config.ts"), content);
   }
   async#prepareTargetAssets() {
     if (!this.target.assets)
       return;
     await mkdir10(this.targetAssetRoot, { recursive: true });
     if (this.target.assets.icon)
-      await cp2(path34.join(this.app.cwdPath, this.target.assets.icon), path34.join(this.targetAssetRoot, "icon.png"), {
+      await cp2(path35.join(this.app.cwdPath, this.target.assets.icon), path35.join(this.targetAssetRoot, "icon.png"), {
         force: true
       });
     if (this.target.assets.splash)
-      await cp2(path34.join(this.app.cwdPath, this.target.assets.splash), path34.join(this.targetAssetRoot, "splash.png"), {
+      await cp2(path35.join(this.app.cwdPath, this.target.assets.splash), path35.join(this.targetAssetRoot, "splash.png"), {
         force: true
       });
   }
@@ -8150,11 +8203,11 @@ export default withBase(
     const files = this.target.files?.[platform];
     if (!files)
       return;
-    const platformRoot = path34.join(this.app.cwdPath, platform === "ios" ? this.iosRootPath : this.androidRootPath);
+    const platformRoot = path35.join(this.app.cwdPath, platform === "ios" ? this.iosRootPath : this.androidRootPath);
     await Promise.all(Object.entries(files).map(async ([to, from]) => {
-      const targetPath = path34.join(platformRoot, to);
-      await mkdir10(path34.dirname(targetPath), { recursive: true });
-      await cp2(path34.join(this.app.cwdPath, from), targetPath, { force: true });
+      const targetPath = path35.join(platformRoot, to);
+      await mkdir10(path35.dirname(targetPath), { recursive: true });
+      await cp2(path35.join(this.app.cwdPath, from), targetPath, { force: true });
     }));
   }
   async#generateAssets({ operation, env }) {
@@ -8164,7 +8217,7 @@ export default withBase(
       "@capacitor/assets",
       "generate",
       "--assetPath",
-      path34.posix.join(this.targetRootPath, "assets"),
+      path35.posix.join(this.targetRootPath, "assets"),
       "--iosProject",
       this.iosProjectPath,
       "--androidProject",
@@ -8349,7 +8402,7 @@ var Pkg = createInternalArgToken("Pkg");
 var Module = createInternalArgToken("Module");
 var Workspace = createInternalArgToken("Workspace");
 // pkgs/@akanjs/devkit/commandDecorators/command.ts
-import path35 from "path";
+import path36 from "path";
 import { confirm, input as input2, select as select2 } from "@inquirer/prompts";
 import { Logger as Logger11 } from "akanjs/common";
 import chalk6 from "chalk";
@@ -8849,7 +8902,7 @@ var runCommands = async (...commands) => {
     process.exit(1);
   });
   const __dirname2 = getDirname(import.meta.url);
-  const packageJsonCandidates = [`${path35.dirname(Bun.main)}/package.json`, `${__dirname2}/../package.json`];
+  const packageJsonCandidates = [`${path36.dirname(Bun.main)}/package.json`, `${__dirname2}/../package.json`];
   let cliPackageJson = null;
   for (const packageJsonPath of packageJsonCandidates) {
     if (!await FileSys.fileExists(packageJsonPath))
@@ -9125,8 +9178,8 @@ var scanModuleSpecifiers = (source, filePath, includeExports) => {
   return importSpecifiers;
 };
 var parseTsConfig = (tsConfigPath = "./tsconfig.json") => {
-  const configFile = ts6.readConfigFile(tsConfigPath, (path36) => {
-    return ts6.sys.readFile(path36);
+  const configFile = ts6.readConfigFile(tsConfigPath, (path37) => {
+    return ts6.sys.readFile(path37);
   });
   return ts6.parseJsonConfigFileContent(configFile.config, ts6.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
 };
@@ -9428,10 +9481,10 @@ class IncrementalBuilder {
     }
   }
   batchTouchesPagesTree(appDir, batch) {
-    const absAppDir = path36.resolve(appDir);
+    const absAppDir = path37.resolve(appDir);
     for (const f of batch.files) {
-      const abs = path36.resolve(f);
-      if (!abs.startsWith(`${absAppDir}${path36.sep}`) && abs !== absAppDir)
+      const abs = path37.resolve(f);
+      if (!abs.startsWith(`${absAppDir}${path37.sep}`) && abs !== absAppDir)
         continue;
       if (/\.(tsx|ts|jsx|js)$/.test(abs))
         return true;
@@ -9439,15 +9492,15 @@ class IncrementalBuilder {
     return false;
   }
   async batchMayChangePageKeys(appDir, batch) {
-    const absAppDir = path36.resolve(appDir);
-    const pageKeys = new Set((await this.#app.getPageKeys()).map((key) => path36.normalize(key)));
+    const absAppDir = path37.resolve(appDir);
+    const pageKeys = new Set((await this.#app.getPageKeys()).map((key) => path37.normalize(key)));
     for (const f of batch.files) {
-      const abs = path36.resolve(f);
-      if (!abs.startsWith(`${absAppDir}${path36.sep}`) && abs !== absAppDir)
+      const abs = path37.resolve(f);
+      if (!abs.startsWith(`${absAppDir}${path37.sep}`) && abs !== absAppDir)
         continue;
       if (!/\.(tsx|ts|jsx|js)$/.test(abs))
         continue;
-      const rel = path36.normalize(path36.relative(absAppDir, abs));
+      const rel = path37.normalize(path37.relative(absAppDir, abs));
       if (!await Bun.file(abs).exists() || !pageKeys.has(rel))
         return true;
     }
@@ -9475,7 +9528,7 @@ class IncrementalBuilder {
 ${cssText}`).toString(36);
           const cssRelPath = `styles/${cssAssetName}-${cssHash}.css`;
           const cssUrl = `/_akan/styles/${cssAssetName}-${cssHash}.css`;
-          await Bun.write(path36.join(artifactDir, cssRelPath), cssText);
+          await Bun.write(path37.join(artifactDir, cssRelPath), cssText);
           cssAssetEntries.push([basePath2, { cssUrl, cssRelPath }]);
           cssBase64ByUrl[cssUrl] = Buffer.from(new TextEncoder().encode(cssText)).toString("base64");
         })()
@@ -9535,10 +9588,10 @@ ${cssText}`).toString(36);
     if (changedFiles.length === 0)
       return false;
     return changedFiles.some((file) => {
-      const normalized = path36.resolve(file);
+      const normalized = path37.resolve(file);
       if (/\.(woff2?|ttf|otf)$/i.test(normalized))
         return true;
-      return this.#optimizedFonts.files.some((fontFile) => path36.resolve(fontFile) === normalized);
+      return this.#optimizedFonts.files.some((fontFile) => path37.resolve(fontFile) === normalized);
     });
   }
   async installWatcher() {