@akanjs/cli 2.1.2-rc.1 → 2.2.0-rc.0

package/incrementalBuilder.proc.js

@@ -20,8 +20,8 @@ import chalk from "chalk";
 // pkgs/@akanjs/devkit/cloud/constants.ts
 var basePath = `${Bun.env.HOME ?? Bun.env.USERPROFILE}/.akan`;
 var configPath = `${basePath}/config.json`;
-var akanCloudHost = process.env.AKAN_PUBLIC_OPERATION_MODE === "local" ? "http://localhost" : "https://cloud.akanjs.com";
-var akanCloudUrl = `${akanCloudHost}${process.env.AKAN_PUBLIC_OPERATION_MODE === "local" ? ":8282" : ""}/api`;
+var akanCloudHost = process.env.USE_AKANJS_PKGS === "true" ? "http://localhost" : "https://cloud.akanjs.com";
+var akanCloudUrl = `${akanCloudHost}${process.env.USE_AKANJS_PKGS === "true" ? ":8282" : ""}/api`;
 var defaultHostConfig = {};
 var defaultAkanGlobalConfig = {
   cloudHost: {},
@@ -6228,7 +6228,9 @@ import { mkdir as mkdir5, rm, unlink } from "fs/promises";
 import path21 from "path";
 
 // pkgs/@akanjs/devkit/frontendBuild/pagesEntrySourceGenerator.ts
+import fs3 from "fs";
 import path20 from "path";
+import ts5 from "typescript";
 
 class PagesEntrySourceGenerator {
   #pageEntries;
@@ -6257,8 +6259,9 @@ ${lines.join(`
       const absPath = path20.resolve(moduleAbsPath);
       return `import * as page${index} from ${JSON.stringify(absPath)};`;
     });
-    const entries = this.#pageEntries.map(({ key }, index) => {
-      return `  ${JSON.stringify(key)}: async () => page${index},`;
+    const entries = this.#pageEntries.map(({ key, moduleAbsPath }, index) => {
+      const isAsyncDefault = PagesEntrySourceGenerator.#hasAsyncDefaultExport(moduleAbsPath);
+      return `  ${JSON.stringify(key)}: { loader: async () => page${index}, isAsyncDefault: ${isAsyncDefault} },`;
     });
     return `${imports.join(`
 `)}
@@ -6268,6 +6271,63 @@ ${entries.join(`
 };
 `;
   }
+  static #hasAsyncDefaultExport(moduleAbsPath) {
+    try {
+      const source = fs3.readFileSync(path20.resolve(moduleAbsPath), "utf8");
+      const sourceFile = ts5.createSourceFile(moduleAbsPath, source, ts5.ScriptTarget.Latest, true, PagesEntrySourceGenerator.#scriptKind(moduleAbsPath));
+      return PagesEntrySourceGenerator.#sourceFileHasAsyncDefaultExport(sourceFile);
+    } catch {
+      return false;
+    }
+  }
+  static #sourceFileHasAsyncDefaultExport(sourceFile) {
+    const asyncBindings = new Map;
+    let defaultIdentifier = null;
+    for (const statement of sourceFile.statements) {
+      if (ts5.isFunctionDeclaration(statement)) {
+        if (PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.DefaultKeyword)) {
+          return PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword);
+        }
+        if (statement.name) {
+          asyncBindings.set(statement.name.text, PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword));
+        }
+        continue;
+      }
+      if (ts5.isVariableStatement(statement)) {
+        for (const declaration of statement.declarationList.declarations) {
+          if (!ts5.isIdentifier(declaration.name))
+            continue;
+          asyncBindings.set(declaration.name.text, PagesEntrySourceGenerator.#isAsyncFunctionExpression(declaration.initializer));
+        }
+        continue;
+      }
+      if (ts5.isExportAssignment(statement)) {
+        if (PagesEntrySourceGenerator.#isAsyncFunctionExpression(statement.expression))
+          return true;
+        if (ts5.isIdentifier(statement.expression))
+          defaultIdentifier = statement.expression.text;
+        continue;
+      }
+      if (ts5.isExportDeclaration(statement) && statement.exportClause && ts5.isNamedExports(statement.exportClause)) {
+        const exportClause = statement.exportClause;
+        for (const specifier of exportClause.elements) {
+          if (specifier.name.text !== "default")
+            continue;
+          defaultIdentifier = specifier.propertyName?.text ?? specifier.name.text;
+        }
+      }
+    }
+    return defaultIdentifier ? asyncBindings.get(defaultIdentifier) === true : false;
+  }
+  static #hasModifier(node, kind) {
+    return ts5.canHaveModifiers(node) && (ts5.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
+  }
+  static #isAsyncFunctionExpression(node) {
+    return Boolean(node && (ts5.isArrowFunction(node) || ts5.isFunctionExpression(node)) && PagesEntrySourceGenerator.#hasModifier(node, ts5.SyntaxKind.AsyncKeyword));
+  }
+  static #scriptKind(moduleAbsPath) {
+    return moduleAbsPath.endsWith(".tsx") || moduleAbsPath.endsWith(".jsx") ? ts5.ScriptKind.TSX : ts5.ScriptKind.TS;
+  }
 }
 
 // pkgs/@akanjs/devkit/frontendBuild/csrArtifactBuilder.ts
@@ -6403,6 +6463,13 @@ ${remainingAssets.join(`
       jsFiles.push(jsPath);
       return await Bun.file(jsPath).text();
     });
+    const bundledCss = (await Promise.all(cssFiles.map((cssFile) => Bun.file(cssFile).text().catch(() => "")))).filter(Boolean).join(`
+`);
+    if (bundledCss) {
+      const style = CsrArtifactBuilder.createInlineStyle(bundledCss);
+      if (!next.includes(style))
+        next = CsrArtifactBuilder.injectBeforeHeadEnd(next, style);
+    }
     if (cssAsset) {
       const cssPath = path21.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, ".akan/artifact", cssAsset.cssRelPath);
       const css = await Bun.file(cssPath).text();
@@ -6881,7 +6948,7 @@ import {
 } from "fontaine";
 import { createFont, woff2 } from "fonteditor-core";
 import subsetFont from "subset-font";
-import ts5 from "typescript";
+import ts6 from "typescript";
 var FONT_URL_PREFIX = "/_akan/fonts";
 var DEFAULT_FONT_SUBSETS = ["latin"];
 
@@ -6946,17 +7013,17 @@ class FontOptimizer {
       this.#cssParts.push(...faceCss, this.#buildRootVariableRule(font));
   }
   #extractFontsExport(source, filePath) {
-    const sourceFile = ts5.createSourceFile(filePath, source, ts5.ScriptTarget.Latest, true, ts5.ScriptKind.TSX);
+    const sourceFile = ts6.createSourceFile(filePath, source, ts6.ScriptTarget.Latest, true, ts6.ScriptKind.TSX);
     const fonts = [];
     for (const statement of sourceFile.statements) {
-      if (!ts5.isVariableStatement(statement))
+      if (!ts6.isVariableStatement(statement))
         continue;
-      const modifiers = ts5.canHaveModifiers(statement) ? ts5.getModifiers(statement) : undefined;
-      const isExported = modifiers?.some((modifier) => modifier.kind === ts5.SyntaxKind.ExportKeyword) ?? false;
+      const modifiers = ts6.canHaveModifiers(statement) ? ts6.getModifiers(statement) : undefined;
+      const isExported = modifiers?.some((modifier) => modifier.kind === ts6.SyntaxKind.ExportKeyword) ?? false;
       if (!isExported)
         continue;
       for (const declaration of statement.declarationList.declarations) {
-        if (!ts5.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
+        if (!ts6.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
           continue;
         const value = declaration.initializer ? this.#literalToValue(declaration.initializer) : null;
         if (Array.isArray(value)) {
@@ -6967,20 +7034,20 @@ class FontOptimizer {
     return fonts;
   }
   #literalToValue(node) {
-    if (ts5.isStringLiteralLike(node))
+    if (ts6.isStringLiteralLike(node))
       return node.text;
-    if (ts5.isNumericLiteral(node))
+    if (ts6.isNumericLiteral(node))
       return Number(node.text);
-    if (node.kind === ts5.SyntaxKind.TrueKeyword)
+    if (node.kind === ts6.SyntaxKind.TrueKeyword)
       return true;
-    if (node.kind === ts5.SyntaxKind.FalseKeyword)
+    if (node.kind === ts6.SyntaxKind.FalseKeyword)
       return false;
-    if (ts5.isArrayLiteralExpression(node))
+    if (ts6.isArrayLiteralExpression(node))
       return node.elements.map((element) => this.#literalToValue(element));
-    if (ts5.isObjectLiteralExpression(node)) {
+    if (ts6.isObjectLiteralExpression(node)) {
       const obj = {};
       for (const prop of node.properties) {
-        if (!ts5.isPropertyAssignment(prop))
+        if (!ts6.isPropertyAssignment(prop))
           continue;
         const name = this.#getPropertyName(prop.name);
         if (!name)
@@ -6989,13 +7056,13 @@ class FontOptimizer {
       }
       return obj;
     }
-    if (ts5.isAsExpression(node) || ts5.isSatisfiesExpression(node) || ts5.isParenthesizedExpression(node)) {
+    if (ts6.isAsExpression(node) || ts6.isSatisfiesExpression(node) || ts6.isParenthesizedExpression(node)) {
       return this.#literalToValue(node.expression);
     }
     return;
   }
   #getPropertyName(name) {
-    if (ts5.isIdentifier(name) || ts5.isStringLiteral(name) || ts5.isNumericLiteral(name))
+    if (ts6.isIdentifier(name) || ts6.isStringLiteral(name) || ts6.isNumericLiteral(name))
       return name.text;
     return null;
   }
@@ -7295,7 +7362,7 @@ class HmrChangeClassifier {
   }
 }
 // pkgs/@akanjs/devkit/frontendBuild/hmrWatcher.ts
-import fs3 from "fs";
+import fs4 from "fs";
 import path26 from "path";
 class HmrWatcher {
   #roots;
@@ -7317,7 +7384,7 @@ class HmrWatcher {
   start() {
     for (const root of this.#roots) {
       try {
-        const w = fs3.watch(root, { recursive: true, persistent: false }, (_event, filename) => {
+        const w = fs4.watch(root, { recursive: true, persistent: false }, (_event, filename) => {
           if (!filename)
             return;
           const abs = path26.resolve(root, filename.toString());
@@ -7612,7 +7679,7 @@ class PagesBundleBuilder {
   }
 }
 // pkgs/@akanjs/devkit/frontendBuild/precompressArtifacts.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import path29 from "path";
 var COMPRESSIBLE_EXTS = new Set([".css", ".html", ".js", ".json", ".svg"]);
 var MIN_COMPRESS_BYTES = 1024;
@@ -7626,7 +7693,7 @@ async function precompressArtifacts(app) {
   return result;
 }
 async function precompressRoot(root, result) {
-  if (!fs4.existsSync(root) || !fs4.statSync(root).isDirectory())
+  if (!fs5.existsSync(root) || !fs5.statSync(root).isDirectory())
     return;
   const glob = new Bun.Glob("**/*");
   for await (const filePath of glob.scan({ cwd: root, absolute: true })) {
@@ -7664,9 +7731,7 @@ function formatBytes(bytes) {
 import path30 from "path";
 import { optimize } from "@tailwindcss/node";
 function prepareCssAsset(command, basePath2, cssText) {
-  if (command !== "build")
-    return cssText;
-  return optimize(cssText, { file: `${basePath2 || "root"}.css`, minify: true }).code;
+  return optimize(cssText, { file: `${basePath2 || "root"}.css`, minify: command === "build" }).code;
 }
 
 class SsrBaseArtifactBuilder {
@@ -7773,7 +7838,7 @@ ${preparedCssText}`).toString(36);
   }
 }
 // pkgs/@akanjs/devkit/frontendBuild/watchRootResolver.ts
-import fs5 from "fs";
+import fs6 from "fs";
 import path31 from "path";
 
 class WatchRootResolver {
@@ -7793,7 +7858,7 @@ class WatchRootResolver {
           continue;
         const cleaned = target.replace(/\/?\*+.*$/, "").replace(/\/[^/]+\.[^/]+$/, "");
         const resolved = path31.resolve(this.#app.workspace.workspaceRoot, cleaned);
-        if (fs5.existsSync(resolved))
+        if (fs6.existsSync(resolved))
           set.add(resolved);
       }
     }
@@ -8616,10 +8681,11 @@ class CapacitorApp {
   iosRootPath = "ios";
   iosProjectPath = "ios/App";
   androidRootPath = "android";
+  androidAssetsPath = "android/app/src/main/assets";
   constructor(app, target) {
     this.app = app;
     this.target = target;
-    this.targetRootPath = path35.posix.join("mobile", this.target.name);
+    this.targetRootPath = path35.posix.join(".akan", "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");
@@ -8699,6 +8765,8 @@ class CapacitorApp {
     await this.#applyLinks();
     await this.project.commit();
     await this.#generateAssets({ operation, env });
+    await this.#ensureAndroidAssetsDir();
+    await this.#ensureAndroidDebugKeystore();
     await this.#spawnMobile("npx", ["cap", "sync", "android"], { operation, env });
   }
   async#updateAndroidBuildTypes() {
@@ -8746,12 +8814,40 @@ class CapacitorApp {
     await this.app.spawn(gradleCommand, [assembleType === "apk" ? "assembleRelease" : "bundleRelease"], {
       stdio: "inherit",
       cwd: path35.join(this.app.cwdPath, this.androidRootPath),
-      env: this.#commandEnv("release", env)
+      env: await this.#commandEnv("release", env)
     });
   }
   async openAndroid() {
     await this.#spawnMobile("npx", ["cap", "open", "android"], { operation: "local", env: "local" });
   }
+  async#ensureAndroidAssetsDir() {
+    await mkdir10(path35.join(this.app.cwdPath, this.androidAssetsPath), { recursive: true });
+  }
+  async#ensureAndroidDebugKeystore() {
+    const keystorePath = path35.join(this.app.cwdPath, this.androidRootPath, "app/debug.keystore");
+    if (await Bun.file(keystorePath).exists())
+      return;
+    await this.#spawn("keytool", [
+      "-genkeypair",
+      "-v",
+      "-keystore",
+      keystorePath,
+      "-storepass",
+      "android",
+      "-alias",
+      "androiddebugkey",
+      "-keypass",
+      "android",
+      "-keyalg",
+      "RSA",
+      "-keysize",
+      "2048",
+      "-validity",
+      "10000",
+      "-dname",
+      "CN=Android Debug,O=Android,C=US"
+    ]);
+  }
   async syncAndroid(options = {}) {
     await this.prepareWww();
     await this.#prepareAndroid({ operation: "release", env: "debug", ...options });
@@ -8793,13 +8889,13 @@ class CapacitorApp {
     await mkdir10(this.targetRoot, { recursive: true });
     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 { withBase } from "${process.env.USE_AKANJS_PKGS === "true" ? "../../pkgs/" : ""}akanjs/capacitor.base.config";
 import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
 
 export default withBase(
   (config, target) => ({
     ...config,
-    webDir: \`mobile/\${target.name}/www\`,
+    webDir: \`.akan/mobile/\${target.name}/www\`,
     android: {
       ...config.android,
       path: "android",
@@ -8899,12 +8995,14 @@ export default withBase(
       this.project.android.getAndroidManifest().injectFragment("activity", `<intent-filter android:autoVerify="true"><action android:name="android.intent.action.VIEW" /><category android:name="android.intent.category.DEFAULT" /><category android:name="android.intent.category.BROWSABLE" /><data android:scheme="https" android:host="${host}" android:pathPrefix="${pathPrefix}" /></intent-filter>`);
     }
   }
-  #commandEnv(operation, env) {
+  async#commandEnv(operation, env) {
+    const devPort = operation === "local" ? (await this.app.getDevPort()).toString() : undefined;
     return this.app.getCommandEnv({
       APP_OPERATION_MODE: operation,
       AKAN_PUBLIC_OPERATION_MODE: env === "local" ? "local" : "cloud",
       AKAN_PUBLIC_ENV: env,
-      AKAN_MOBILE_TARGET: this.target.name
+      AKAN_MOBILE_TARGET: this.target.name,
+      ...devPort ? { PORT: devPort, AKAN_PUBLIC_CLIENT_PORT: devPort, AKAN_PUBLIC_SERVER_PORT: devPort } : {}
     });
   }
   async#spawn(command, args = [], options = {}) {
@@ -8913,7 +9011,7 @@ export default withBase(
   async#spawnMobile(command, args = [], { operation, env }, options = {}) {
     return await this.#spawn(command, args, {
       ...options,
-      env: { ...this.#commandEnv(operation, env), ...options.env }
+      env: { ...await this.#commandEnv(operation, env), ...options.env }
     });
   }
   async addCamera() {
@@ -9773,7 +9871,7 @@ import yaml from "js-yaml";
 // pkgs/@akanjs/devkit/getRelatedCnsts.ts
 import { readFileSync as readFileSync4, realpathSync } from "fs";
 import ora2 from "ora";
-import * as ts6 from "typescript";
+import * as ts7 from "typescript";
 var tsTranspiler = new Bun.Transpiler({ loader: "ts" });
 var tsxTranspiler = new Bun.Transpiler({ loader: "tsx" });
 var getTranspiler = (filePath) => filePath.endsWith(".tsx") ? tsxTranspiler : tsTranspiler;
@@ -9806,10 +9904,10 @@ var scanModuleSpecifiers = (source, filePath, includeExports) => {
   return importSpecifiers;
 };
 var parseTsConfig = (tsConfigPath = "./tsconfig.json") => {
-  const configFile = ts6.readConfigFile(tsConfigPath, (path37) => {
-    return ts6.sys.readFile(path37);
+  const configFile = ts7.readConfigFile(tsConfigPath, (path37) => {
+    return ts7.sys.readFile(path37);
   });
-  return ts6.parseJsonConfigFileContent(configFile.config, ts6.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
+  return ts7.parseJsonConfigFileContent(configFile.config, ts7.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
 };
 var collectImportedFiles = (constantFilePath, parsedConfig) => {
   const allFilesToAnalyze = new Set([constantFilePath]);
@@ -9824,7 +9922,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
     for (const importPath of scanModuleSpecifiers(source, filePath, false)) {
       if (!importPath.startsWith("."))
         continue;
-      const resolved = ts6.resolveModuleName(importPath, filePath, parsedConfig.options, ts6.sys).resolvedModule?.resolvedFileName;
+      const resolved = ts7.resolveModuleName(importPath, filePath, parsedConfig.options, ts7.sys).resolvedModule?.resolvedFileName;
       if (resolved && !allFilesToAnalyze.has(resolved)) {
         allFilesToAnalyze.add(resolved);
         collectImported(resolved);
@@ -9841,7 +9939,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
 var createTsProgram = (filePaths, options) => {
   const spinner = ora2("Creating TypeScript program for all files...");
   spinner.start();
-  const program2 = ts6.createProgram(Array.from(filePaths), options);
+  const program2 = ts7.createProgram(Array.from(filePaths), options);
   const checker = program2.getTypeChecker();
   spinner.succeed("TypeScript program created.");
   return {
@@ -9881,17 +9979,17 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
     function visit(node) {
       if (!source)
         return;
-      if (ts6.isPropertyAccessExpression(node)) {
+      if (ts7.isPropertyAccessExpression(node)) {
         const left = node.expression;
         const right = node.name;
-        const { line } = ts6.getLineAndCharacterOfPosition(source, node.getStart());
-        if (ts6.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
+        const { line } = ts7.getLineAndCharacterOfPosition(source, node.getStart());
+        if (ts7.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
           const symbol = getCachedSymbol(right);
           if (symbol?.declarations && symbol.declarations.length > 0) {
             const key = symbol.declarations[0]?.getSourceFile().fileName.split("/").pop()?.split(".")[0] ?? "";
             const property = propertyMap.get(key);
             const isScalar = symbol.declarations[0]?.getSourceFile().fileName.includes("_") ?? false;
-            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts6.sys.getCurrentDirectory()}/`, "");
+            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts7.sys.getCurrentDirectory()}/`, "");
             if (!symbolFilePath)
               throw new Error(`No symbol file path found for ${left.text}.${right.text}`);
             if (property) {
@@ -9915,10 +10013,10 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
             }
           }
         }
-      } else if (ts6.isImportDeclaration(node) && ts6.isStringLiteral(node.moduleSpecifier)) {
+      } else if (ts7.isImportDeclaration(node) && ts7.isStringLiteral(node.moduleSpecifier)) {
         const importPath = node.moduleSpecifier.text;
         if (importPath.startsWith(".")) {
-          const resolved = ts6.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts6.sys).resolvedModule?.resolvedFileName;
+          const resolved = ts7.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts7.sys).resolvedModule?.resolvedFileName;
           const moduleName = importPath.split("/").pop()?.split(".")[0] ?? "";
           const property = propertyMap.get(moduleName);
           const isScalar = importPath.includes("_");
@@ -9933,7 +10031,7 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
           }
         }
       }
-      ts6.forEachChild(node, visit);
+      ts7.forEachChild(node, visit);
     }
     visit(source);
   }

package/index.js

@@ -18,8 +18,8 @@ import chalk from "chalk";
 // pkgs/@akanjs/devkit/cloud/constants.ts
 var basePath = `${Bun.env.HOME ?? Bun.env.USERPROFILE}/.akan`;
 var configPath = `${basePath}/config.json`;
-var akanCloudHost = process.env.AKAN_PUBLIC_OPERATION_MODE === "local" ? "http://localhost" : "https://cloud.akanjs.com";
-var akanCloudUrl = `${akanCloudHost}${process.env.AKAN_PUBLIC_OPERATION_MODE === "local" ? ":8282" : ""}/api`;
+var akanCloudHost = process.env.USE_AKANJS_PKGS === "true" ? "http://localhost" : "https://cloud.akanjs.com";
+var akanCloudUrl = `${akanCloudHost}${process.env.USE_AKANJS_PKGS === "true" ? ":8282" : ""}/api`;
 var defaultHostConfig = {};
 var defaultAkanGlobalConfig = {
   cloudHost: {},
@@ -6226,7 +6226,9 @@ import { mkdir as mkdir5, rm, unlink } from "fs/promises";
 import path21 from "path";
 
 // pkgs/@akanjs/devkit/frontendBuild/pagesEntrySourceGenerator.ts
+import fs3 from "fs";
 import path20 from "path";
+import ts5 from "typescript";
 
 class PagesEntrySourceGenerator {
   #pageEntries;
@@ -6255,8 +6257,9 @@ ${lines.join(`
       const absPath = path20.resolve(moduleAbsPath);
       return `import * as page${index} from ${JSON.stringify(absPath)};`;
     });
-    const entries = this.#pageEntries.map(({ key }, index) => {
-      return `  ${JSON.stringify(key)}: async () => page${index},`;
+    const entries = this.#pageEntries.map(({ key, moduleAbsPath }, index) => {
+      const isAsyncDefault = PagesEntrySourceGenerator.#hasAsyncDefaultExport(moduleAbsPath);
+      return `  ${JSON.stringify(key)}: { loader: async () => page${index}, isAsyncDefault: ${isAsyncDefault} },`;
     });
     return `${imports.join(`
 `)}
@@ -6266,6 +6269,63 @@ ${entries.join(`
 };
 `;
   }
+  static #hasAsyncDefaultExport(moduleAbsPath) {
+    try {
+      const source = fs3.readFileSync(path20.resolve(moduleAbsPath), "utf8");
+      const sourceFile = ts5.createSourceFile(moduleAbsPath, source, ts5.ScriptTarget.Latest, true, PagesEntrySourceGenerator.#scriptKind(moduleAbsPath));
+      return PagesEntrySourceGenerator.#sourceFileHasAsyncDefaultExport(sourceFile);
+    } catch {
+      return false;
+    }
+  }
+  static #sourceFileHasAsyncDefaultExport(sourceFile) {
+    const asyncBindings = new Map;
+    let defaultIdentifier = null;
+    for (const statement of sourceFile.statements) {
+      if (ts5.isFunctionDeclaration(statement)) {
+        if (PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.DefaultKeyword)) {
+          return PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword);
+        }
+        if (statement.name) {
+          asyncBindings.set(statement.name.text, PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword));
+        }
+        continue;
+      }
+      if (ts5.isVariableStatement(statement)) {
+        for (const declaration of statement.declarationList.declarations) {
+          if (!ts5.isIdentifier(declaration.name))
+            continue;
+          asyncBindings.set(declaration.name.text, PagesEntrySourceGenerator.#isAsyncFunctionExpression(declaration.initializer));
+        }
+        continue;
+      }
+      if (ts5.isExportAssignment(statement)) {
+        if (PagesEntrySourceGenerator.#isAsyncFunctionExpression(statement.expression))
+          return true;
+        if (ts5.isIdentifier(statement.expression))
+          defaultIdentifier = statement.expression.text;
+        continue;
+      }
+      if (ts5.isExportDeclaration(statement) && statement.exportClause && ts5.isNamedExports(statement.exportClause)) {
+        const exportClause = statement.exportClause;
+        for (const specifier of exportClause.elements) {
+          if (specifier.name.text !== "default")
+            continue;
+          defaultIdentifier = specifier.propertyName?.text ?? specifier.name.text;
+        }
+      }
+    }
+    return defaultIdentifier ? asyncBindings.get(defaultIdentifier) === true : false;
+  }
+  static #hasModifier(node, kind) {
+    return ts5.canHaveModifiers(node) && (ts5.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
+  }
+  static #isAsyncFunctionExpression(node) {
+    return Boolean(node && (ts5.isArrowFunction(node) || ts5.isFunctionExpression(node)) && PagesEntrySourceGenerator.#hasModifier(node, ts5.SyntaxKind.AsyncKeyword));
+  }
+  static #scriptKind(moduleAbsPath) {
+    return moduleAbsPath.endsWith(".tsx") || moduleAbsPath.endsWith(".jsx") ? ts5.ScriptKind.TSX : ts5.ScriptKind.TS;
+  }
 }
 
 // pkgs/@akanjs/devkit/frontendBuild/csrArtifactBuilder.ts
@@ -6401,6 +6461,13 @@ ${remainingAssets.join(`
       jsFiles.push(jsPath);
       return await Bun.file(jsPath).text();
     });
+    const bundledCss = (await Promise.all(cssFiles.map((cssFile) => Bun.file(cssFile).text().catch(() => "")))).filter(Boolean).join(`
+`);
+    if (bundledCss) {
+      const style = CsrArtifactBuilder.createInlineStyle(bundledCss);
+      if (!next.includes(style))
+        next = CsrArtifactBuilder.injectBeforeHeadEnd(next, style);
+    }
     if (cssAsset) {
       const cssPath = path21.join(this.#command === "build" ? this.#app.dist.cwdPath : this.#app.cwdPath, ".akan/artifact", cssAsset.cssRelPath);
       const css = await Bun.file(cssPath).text();
@@ -6879,7 +6946,7 @@ import {
 } from "fontaine";
 import { createFont, woff2 } from "fonteditor-core";
 import subsetFont from "subset-font";
-import ts5 from "typescript";
+import ts6 from "typescript";
 var FONT_URL_PREFIX = "/_akan/fonts";
 var DEFAULT_FONT_SUBSETS = ["latin"];
 
@@ -6944,17 +7011,17 @@ class FontOptimizer {
       this.#cssParts.push(...faceCss, this.#buildRootVariableRule(font));
   }
   #extractFontsExport(source, filePath) {
-    const sourceFile = ts5.createSourceFile(filePath, source, ts5.ScriptTarget.Latest, true, ts5.ScriptKind.TSX);
+    const sourceFile = ts6.createSourceFile(filePath, source, ts6.ScriptTarget.Latest, true, ts6.ScriptKind.TSX);
     const fonts = [];
     for (const statement of sourceFile.statements) {
-      if (!ts5.isVariableStatement(statement))
+      if (!ts6.isVariableStatement(statement))
         continue;
-      const modifiers = ts5.canHaveModifiers(statement) ? ts5.getModifiers(statement) : undefined;
-      const isExported = modifiers?.some((modifier) => modifier.kind === ts5.SyntaxKind.ExportKeyword) ?? false;
+      const modifiers = ts6.canHaveModifiers(statement) ? ts6.getModifiers(statement) : undefined;
+      const isExported = modifiers?.some((modifier) => modifier.kind === ts6.SyntaxKind.ExportKeyword) ?? false;
       if (!isExported)
         continue;
       for (const declaration of statement.declarationList.declarations) {
-        if (!ts5.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
+        if (!ts6.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
           continue;
         const value = declaration.initializer ? this.#literalToValue(declaration.initializer) : null;
         if (Array.isArray(value)) {
@@ -6965,20 +7032,20 @@ class FontOptimizer {
     return fonts;
   }
   #literalToValue(node) {
-    if (ts5.isStringLiteralLike(node))
+    if (ts6.isStringLiteralLike(node))
       return node.text;
-    if (ts5.isNumericLiteral(node))
+    if (ts6.isNumericLiteral(node))
       return Number(node.text);
-    if (node.kind === ts5.SyntaxKind.TrueKeyword)
+    if (node.kind === ts6.SyntaxKind.TrueKeyword)
       return true;
-    if (node.kind === ts5.SyntaxKind.FalseKeyword)
+    if (node.kind === ts6.SyntaxKind.FalseKeyword)
       return false;
-    if (ts5.isArrayLiteralExpression(node))
+    if (ts6.isArrayLiteralExpression(node))
       return node.elements.map((element) => this.#literalToValue(element));
-    if (ts5.isObjectLiteralExpression(node)) {
+    if (ts6.isObjectLiteralExpression(node)) {
       const obj = {};
       for (const prop of node.properties) {
-        if (!ts5.isPropertyAssignment(prop))
+        if (!ts6.isPropertyAssignment(prop))
           continue;
         const name = this.#getPropertyName(prop.name);
         if (!name)
@@ -6987,13 +7054,13 @@ class FontOptimizer {
       }
       return obj;
     }
-    if (ts5.isAsExpression(node) || ts5.isSatisfiesExpression(node) || ts5.isParenthesizedExpression(node)) {
+    if (ts6.isAsExpression(node) || ts6.isSatisfiesExpression(node) || ts6.isParenthesizedExpression(node)) {
       return this.#literalToValue(node.expression);
     }
     return;
   }
   #getPropertyName(name) {
-    if (ts5.isIdentifier(name) || ts5.isStringLiteral(name) || ts5.isNumericLiteral(name))
+    if (ts6.isIdentifier(name) || ts6.isStringLiteral(name) || ts6.isNumericLiteral(name))
       return name.text;
     return null;
   }
@@ -7293,7 +7360,7 @@ class HmrChangeClassifier {
   }
 }
 // pkgs/@akanjs/devkit/frontendBuild/hmrWatcher.ts
-import fs3 from "fs";
+import fs4 from "fs";
 import path26 from "path";
 class HmrWatcher {
   #roots;
@@ -7315,7 +7382,7 @@ class HmrWatcher {
   start() {
     for (const root of this.#roots) {
       try {
-        const w = fs3.watch(root, { recursive: true, persistent: false }, (_event, filename) => {
+        const w = fs4.watch(root, { recursive: true, persistent: false }, (_event, filename) => {
           if (!filename)
             return;
           const abs = path26.resolve(root, filename.toString());
@@ -7610,7 +7677,7 @@ class PagesBundleBuilder {
   }
 }
 // pkgs/@akanjs/devkit/frontendBuild/precompressArtifacts.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import path29 from "path";
 var COMPRESSIBLE_EXTS = new Set([".css", ".html", ".js", ".json", ".svg"]);
 var MIN_COMPRESS_BYTES = 1024;
@@ -7624,7 +7691,7 @@ async function precompressArtifacts(app) {
   return result;
 }
 async function precompressRoot(root, result) {
-  if (!fs4.existsSync(root) || !fs4.statSync(root).isDirectory())
+  if (!fs5.existsSync(root) || !fs5.statSync(root).isDirectory())
     return;
   const glob = new Bun.Glob("**/*");
   for await (const filePath of glob.scan({ cwd: root, absolute: true })) {
@@ -7662,9 +7729,7 @@ function formatBytes(bytes) {
 import path30 from "path";
 import { optimize } from "@tailwindcss/node";
 function prepareCssAsset(command, basePath2, cssText) {
-  if (command !== "build")
-    return cssText;
-  return optimize(cssText, { file: `${basePath2 || "root"}.css`, minify: true }).code;
+  return optimize(cssText, { file: `${basePath2 || "root"}.css`, minify: command === "build" }).code;
 }
 
 class SsrBaseArtifactBuilder {
@@ -7771,7 +7836,7 @@ ${preparedCssText}`).toString(36);
   }
 }
 // pkgs/@akanjs/devkit/frontendBuild/watchRootResolver.ts
-import fs5 from "fs";
+import fs6 from "fs";
 import path31 from "path";
 
 class WatchRootResolver {
@@ -7791,7 +7856,7 @@ class WatchRootResolver {
           continue;
         const cleaned = target.replace(/\/?\*+.*$/, "").replace(/\/[^/]+\.[^/]+$/, "");
         const resolved = path31.resolve(this.#app.workspace.workspaceRoot, cleaned);
-        if (fs5.existsSync(resolved))
+        if (fs6.existsSync(resolved))
           set.add(resolved);
       }
     }
@@ -8614,10 +8679,11 @@ class CapacitorApp {
   iosRootPath = "ios";
   iosProjectPath = "ios/App";
   androidRootPath = "android";
+  androidAssetsPath = "android/app/src/main/assets";
   constructor(app, target) {
     this.app = app;
     this.target = target;
-    this.targetRootPath = path35.posix.join("mobile", this.target.name);
+    this.targetRootPath = path35.posix.join(".akan", "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");
@@ -8697,6 +8763,8 @@ class CapacitorApp {
     await this.#applyLinks();
     await this.project.commit();
     await this.#generateAssets({ operation, env });
+    await this.#ensureAndroidAssetsDir();
+    await this.#ensureAndroidDebugKeystore();
     await this.#spawnMobile("npx", ["cap", "sync", "android"], { operation, env });
   }
   async#updateAndroidBuildTypes() {
@@ -8744,12 +8812,40 @@ class CapacitorApp {
     await this.app.spawn(gradleCommand, [assembleType === "apk" ? "assembleRelease" : "bundleRelease"], {
       stdio: "inherit",
       cwd: path35.join(this.app.cwdPath, this.androidRootPath),
-      env: this.#commandEnv("release", env)
+      env: await this.#commandEnv("release", env)
     });
   }
   async openAndroid() {
     await this.#spawnMobile("npx", ["cap", "open", "android"], { operation: "local", env: "local" });
   }
+  async#ensureAndroidAssetsDir() {
+    await mkdir10(path35.join(this.app.cwdPath, this.androidAssetsPath), { recursive: true });
+  }
+  async#ensureAndroidDebugKeystore() {
+    const keystorePath = path35.join(this.app.cwdPath, this.androidRootPath, "app/debug.keystore");
+    if (await Bun.file(keystorePath).exists())
+      return;
+    await this.#spawn("keytool", [
+      "-genkeypair",
+      "-v",
+      "-keystore",
+      keystorePath,
+      "-storepass",
+      "android",
+      "-alias",
+      "androiddebugkey",
+      "-keypass",
+      "android",
+      "-keyalg",
+      "RSA",
+      "-keysize",
+      "2048",
+      "-validity",
+      "10000",
+      "-dname",
+      "CN=Android Debug,O=Android,C=US"
+    ]);
+  }
   async syncAndroid(options = {}) {
     await this.prepareWww();
     await this.#prepareAndroid({ operation: "release", env: "debug", ...options });
@@ -8791,13 +8887,13 @@ class CapacitorApp {
     await mkdir10(this.targetRoot, { recursive: true });
     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 { withBase } from "${process.env.USE_AKANJS_PKGS === "true" ? "../../pkgs/" : ""}akanjs/capacitor.base.config";
 import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
 
 export default withBase(
   (config, target) => ({
     ...config,
-    webDir: \`mobile/\${target.name}/www\`,
+    webDir: \`.akan/mobile/\${target.name}/www\`,
     android: {
       ...config.android,
       path: "android",
@@ -8897,12 +8993,14 @@ export default withBase(
       this.project.android.getAndroidManifest().injectFragment("activity", `<intent-filter android:autoVerify="true"><action android:name="android.intent.action.VIEW" /><category android:name="android.intent.category.DEFAULT" /><category android:name="android.intent.category.BROWSABLE" /><data android:scheme="https" android:host="${host}" android:pathPrefix="${pathPrefix}" /></intent-filter>`);
     }
   }
-  #commandEnv(operation, env) {
+  async#commandEnv(operation, env) {
+    const devPort = operation === "local" ? (await this.app.getDevPort()).toString() : undefined;
     return this.app.getCommandEnv({
       APP_OPERATION_MODE: operation,
       AKAN_PUBLIC_OPERATION_MODE: env === "local" ? "local" : "cloud",
       AKAN_PUBLIC_ENV: env,
-      AKAN_MOBILE_TARGET: this.target.name
+      AKAN_MOBILE_TARGET: this.target.name,
+      ...devPort ? { PORT: devPort, AKAN_PUBLIC_CLIENT_PORT: devPort, AKAN_PUBLIC_SERVER_PORT: devPort } : {}
     });
   }
   async#spawn(command, args = [], options = {}) {
@@ -8911,7 +9009,7 @@ export default withBase(
   async#spawnMobile(command, args = [], { operation, env }, options = {}) {
     return await this.#spawn(command, args, {
       ...options,
-      env: { ...this.#commandEnv(operation, env), ...options.env }
+      env: { ...await this.#commandEnv(operation, env), ...options.env }
     });
   }
   async addCamera() {
@@ -9771,7 +9869,7 @@ import yaml from "js-yaml";
 // pkgs/@akanjs/devkit/getRelatedCnsts.ts
 import { readFileSync as readFileSync4, realpathSync } from "fs";
 import ora2 from "ora";
-import * as ts6 from "typescript";
+import * as ts7 from "typescript";
 var tsTranspiler = new Bun.Transpiler({ loader: "ts" });
 var tsxTranspiler = new Bun.Transpiler({ loader: "tsx" });
 var getTranspiler = (filePath) => filePath.endsWith(".tsx") ? tsxTranspiler : tsTranspiler;
@@ -9804,10 +9902,10 @@ var scanModuleSpecifiers = (source, filePath, includeExports) => {
   return importSpecifiers;
 };
 var parseTsConfig = (tsConfigPath = "./tsconfig.json") => {
-  const configFile = ts6.readConfigFile(tsConfigPath, (path37) => {
-    return ts6.sys.readFile(path37);
+  const configFile = ts7.readConfigFile(tsConfigPath, (path37) => {
+    return ts7.sys.readFile(path37);
   });
-  return ts6.parseJsonConfigFileContent(configFile.config, ts6.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
+  return ts7.parseJsonConfigFileContent(configFile.config, ts7.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
 };
 var collectImportedFiles = (constantFilePath, parsedConfig) => {
   const allFilesToAnalyze = new Set([constantFilePath]);
@@ -9822,7 +9920,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
     for (const importPath of scanModuleSpecifiers(source, filePath, false)) {
       if (!importPath.startsWith("."))
         continue;
-      const resolved = ts6.resolveModuleName(importPath, filePath, parsedConfig.options, ts6.sys).resolvedModule?.resolvedFileName;
+      const resolved = ts7.resolveModuleName(importPath, filePath, parsedConfig.options, ts7.sys).resolvedModule?.resolvedFileName;
       if (resolved && !allFilesToAnalyze.has(resolved)) {
         allFilesToAnalyze.add(resolved);
         collectImported(resolved);
@@ -9839,7 +9937,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
 var createTsProgram = (filePaths, options) => {
   const spinner = ora2("Creating TypeScript program for all files...");
   spinner.start();
-  const program2 = ts6.createProgram(Array.from(filePaths), options);
+  const program2 = ts7.createProgram(Array.from(filePaths), options);
   const checker = program2.getTypeChecker();
   spinner.succeed("TypeScript program created.");
   return {
@@ -9879,17 +9977,17 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
     function visit(node) {
       if (!source)
         return;
-      if (ts6.isPropertyAccessExpression(node)) {
+      if (ts7.isPropertyAccessExpression(node)) {
         const left = node.expression;
         const right = node.name;
-        const { line } = ts6.getLineAndCharacterOfPosition(source, node.getStart());
-        if (ts6.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
+        const { line } = ts7.getLineAndCharacterOfPosition(source, node.getStart());
+        if (ts7.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
           const symbol = getCachedSymbol(right);
           if (symbol?.declarations && symbol.declarations.length > 0) {
             const key = symbol.declarations[0]?.getSourceFile().fileName.split("/").pop()?.split(".")[0] ?? "";
             const property = propertyMap.get(key);
             const isScalar = symbol.declarations[0]?.getSourceFile().fileName.includes("_") ?? false;
-            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts6.sys.getCurrentDirectory()}/`, "");
+            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts7.sys.getCurrentDirectory()}/`, "");
             if (!symbolFilePath)
               throw new Error(`No symbol file path found for ${left.text}.${right.text}`);
             if (property) {
@@ -9913,10 +10011,10 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
             }
           }
         }
-      } else if (ts6.isImportDeclaration(node) && ts6.isStringLiteral(node.moduleSpecifier)) {
+      } else if (ts7.isImportDeclaration(node) && ts7.isStringLiteral(node.moduleSpecifier)) {
         const importPath = node.moduleSpecifier.text;
         if (importPath.startsWith(".")) {
-          const resolved = ts6.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts6.sys).resolvedModule?.resolvedFileName;
+          const resolved = ts7.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts7.sys).resolvedModule?.resolvedFileName;
           const moduleName = importPath.split("/").pop()?.split(".")[0] ?? "";
           const property = propertyMap.get(moduleName);
           const isScalar = importPath.includes("_");
@@ -9931,7 +10029,7 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
           }
         }
       }
-      ts6.forEachChild(node, visit);
+      ts7.forEachChild(node, visit);
     }
     visit(source);
   }
@@ -10272,8 +10370,6 @@ class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     if (operation === "release")
       await this.#buildMobileCsr(app, env);
-    else
-      await this.start(app);
     await this.#runMobileTargets(targets, async (mobileTarget2) => {
       const capacitorApp2 = new CapacitorApp(app, mobileTarget2.config);
       await capacitorApp2.runIos({ operation, env, regenerate });
@@ -10305,8 +10401,6 @@ class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     if (operation === "release")
       await this.#buildMobileCsr(app, env);
-    else
-      await this.start(app);
     await this.#runMobileTargets(targets, async (mobileTarget2) => {
       const capacitorApp2 = new CapacitorApp(app, mobileTarget2.config);
       await capacitorApp2.runAndroid({ operation, env, regenerate });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.1.2-rc.1",
+  "version": "2.2.0-rc.0",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -35,7 +35,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.1.2-rc.1",
+    "akanjs": "2.2.0-rc.0",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",