akanjs 2.0.0-beta.7 → 2.0.0-beta.9

package/cli/application/application.command.ts

@@ -1,5 +1,5 @@
 import { select } from "@inquirer/prompts";
-import { App, command, Exec, Sys, Workspace } from "akanjs/devkit";
+import { App, command, Exec, getMobileTargetChoices, Sys, Workspace } from "akanjs/devkit";
 
 import { ApplicationScript } from "./application.script";
 
@@ -53,7 +53,11 @@ export class ApplicationCommand extends command("application", [ApplicationScrip
     }),
   buildIos: target({ short: true, desc: "Build iOS app with Capacitor" })
     .with(App)
-    .option("target", String, { desc: "mobile target name or all" })
+    .option("target", String, {
+      desc: "mobile target name or all",
+      ask: "Select mobile target",
+      enum: async ({ app }) => await getMobileTargetChoices(app),
+    })
     .option("env", String, {
       enum: ["local", "debug", "develop", "main"],
       desc: "backend environment",
@@ -66,7 +70,11 @@ export class ApplicationCommand extends command("application", [ApplicationScrip
     }),
   buildAndroid: target({ short: true, desc: "Build Android app with Capacitor" })
     .with(App)
-    .option("target", String, { desc: "mobile target name or all" })
+    .option("target", String, {
+      desc: "mobile target name or all",
+      ask: "Select mobile target",
+      enum: async ({ app }) => await getMobileTargetChoices(app),
+    })
     .option("env", String, {
       enum: ["local", "debug", "develop", "main"],
       desc: "backend environment",

package/cli/index.js

@@ -4816,6 +4816,9 @@ var rewriteSingleStatement = (stmt, map) => {
     return null;
   const lines = [];
   const tail = ";";
+  if (shouldPreserveBarrelSideEffects(stmt.specifier)) {
+    lines.push(`import "${stmt.specifier}"${tail}`);
+  }
   if (clause.defaultImport || remaining.length > 0) {
     const parts = [];
     if (clause.defaultImport)
@@ -4831,6 +4834,7 @@ var rewriteSingleStatement = (stmt, map) => {
   return lines.join(`
 `);
 };
+var shouldPreserveBarrelSideEffects = (specifier) => /^@(apps|libs)\/[^/]+\/client$/.test(specifier);
 var serializeNamedItem = (item) => {
   const prefix = item.isType ? "type " : "";
   if (item.imported === item.local)
@@ -6048,6 +6052,8 @@ class CssImportResolver {
 
 var SOURCE_EXTS3 = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
 var NON_SOURCE_EXT_RE3 = /\.(json|svg|png|jpe?g|webp|gif|avif|ico|woff2?|ttf|otf|mp3|mp4|wav)$/i;
+var NODE_MODULES_RE3 = /[\\/]node_modules[\\/]/;
+var AKANJS_NODE_MODULE_RE3 = /[\\/]node_modules[\\/]akanjs[\\/]/;
 
 class CssCompiler {
   #logger = new Logger("CssCompiler");
@@ -6115,7 +6121,7 @@ class CssCompiler {
     const akanConfig2 = await this.#app.getConfig({ refresh });
     while (queue.length > 0) {
       const filePath = queue.shift();
-      if (!filePath || sourceFiles.has(filePath) || filePath.includes("node_modules"))
+      if (!filePath || sourceFiles.has(filePath) || isIgnoredNodeModuleSource(filePath))
         continue;
       sourceFiles.add(filePath);
       let content;
@@ -6151,7 +6157,7 @@ class CssCompiler {
         if (NON_SOURCE_EXT_RE3.test(spec))
           continue;
         const resolved = await this.#resolveSourceImport(spec, importerDir, resolvePackage);
-        if (!resolved || sourceFiles.has(resolved) || resolved.includes("node_modules"))
+        if (!resolved || sourceFiles.has(resolved) || isIgnoredNodeModuleSource(resolved))
           continue;
         queue.push(resolved);
       }
@@ -6239,7 +6245,7 @@ class CssCompiler {
     const files = new Set(sourcePaths);
     await Promise.all(dirs.map(async (dir) => {
       for await (const file of glob.scan({ cwd: dir, absolute: true })) {
-        if (file.includes("node_modules"))
+        if (isIgnoredNodeModuleSource(file))
           continue;
         files.add(file);
       }
@@ -6286,6 +6292,9 @@ function resolveSourceWithRequire(id, fromBase) {
 function isSourceFile(filePath) {
   return SOURCE_EXTS3.includes(path23.extname(filePath));
 }
+function isIgnoredNodeModuleSource(filePath) {
+  return NODE_MODULES_RE3.test(filePath) && !AKANJS_NODE_MODULE_RE3.test(filePath);
+}
 function getPageKeyBasePath(pageKey, basePaths) {
   const normalized = pageKey.split(path23.sep).join("/").replace(/^\.\//, "");
   const segments = normalized.split("/");
@@ -7903,21 +7912,65 @@ var getMobileTargets = async (app) => {
   const config = await app.getConfig();
   return Object.entries(config.mobile.targets).map(([name, target]) => ({ name, config: target }));
 };
+var getMobileTargetChoices = async (app) => {
+  const config = await app.getConfig();
+  const targetNames = Object.keys(config.mobile.targets);
+  if (targetNames.length > 1)
+    return targetNames;
+  const basePaths = [...config.basePaths];
+  if (basePaths.length > 1)
+    return basePaths;
+  if (targetNames.length > 0)
+    return targetNames;
+  return basePaths;
+};
+var resolveMobileTargetByBasePath = (targets, basePath2) => {
+  const normalizedBasePath = basePath2.replace(/^\/+|\/+$/g, "");
+  const byBasePath = targets.find((target) => target.config.basePath?.replace(/^\/+|\/+$/g, "") === normalizedBasePath);
+  if (byBasePath)
+    return byBasePath;
+  const [template] = targets;
+  if (!template)
+    return;
+  return {
+    name: template.name,
+    config: {
+      ...template.config,
+      basePath: normalizedBasePath
+    }
+  };
+};
 var resolveMobileTargets = async (app, selection) => {
+  const config = await app.getConfig();
   const targets = await getMobileTargets(app);
   if (targets.length === 0)
     throw new Error(`No mobile targets configured for ${app.name}`);
   if (!selection) {
-    if (targets.length === 1)
-      return targets;
-    throw new Error(`Multiple mobile targets found for ${app.name}. Pass --target <${targets.map((t) => t.name).join("|")}|all>.`);
+    const choices2 = await getMobileTargetChoices(app);
+    if (choices2.length === 1)
+      return resolveMobileTargets(app, choices2[0]);
+    throw new Error(`Multiple mobile targets found for ${app.name}. Pass --target <${choices2.join("|")}|all>.`);
   }
-  if (selection === "all")
+  if (selection === "all") {
+    if (Object.keys(config.mobile.targets).length > 1)
+      return targets;
+    const basePaths = [...config.basePaths];
+    if (basePaths.length > 1) {
+      return basePaths.flatMap((basePath2) => {
+        const resolved = resolveMobileTargetByBasePath(targets, basePath2);
+        return resolved ? [resolved] : [];
+      });
+    }
     return targets;
+  }
   const target = targets.find((candidate) => candidate.name === selection);
-  if (!target)
-    throw new Error(`Mobile target '${selection}' was not found. Available: ${targets.map((t) => t.name).join(", ")}`);
-  return [target];
+  if (target)
+    return [target];
+  const basePathTarget = resolveMobileTargetByBasePath(targets, selection);
+  if (basePathTarget && config.basePaths.has(selection.replace(/^\/+|\/+$/g, "")))
+    return [basePathTarget];
+  const choices = await getMobileTargetChoices(app);
+  throw new Error(`Mobile target '${selection}' was not found. Available: ${choices.join(", ")}`);
 };
 var resolveMobilePath = (target, pathname) => {
   const basePath2 = target.basePath?.replace(/^\/+|\/+$/g, "");
@@ -8114,7 +8167,8 @@ class CapacitorApp {
   async#writeCapacitorConfig() {
     await mkdir10(this.targetRoot, { recursive: true });
     const appInfoPath = path34.relative(this.targetRoot, path34.join(this.app.cwdPath, "akan.app.json")).split(path34.sep).join("/");
-    const content = `import { withBase } from "akanjs/devkit/capacitor.base.config";
+    const baseConfigPath = path34.relative(this.targetRoot, path34.join(this.app.workspace.cwdPath, "pkgs/akanjs/devkit/capacitor.base.config")).split(path34.sep).join("/");
+    const content = `import { withBase } from "${baseConfigPath.startsWith(".") ? baseConfigPath : `./${baseConfigPath}`}";
 import appInfo from "${appInfoPath}";
 
 export default withBase((config) => config, appInfo, "${this.target.name}");
@@ -8564,7 +8618,7 @@ var formatCommandHelp = (command, key) => {
       const optName = `${flag}--${kebabName}`;
       const optDesc = opt.desc ?? "";
       const defaultVal = opt.default !== undefined ? chalk5.gray(` [default: ${String(opt.default)}]`) : "";
-      const choices = opt.enum ? chalk5.gray(` (${opt.enum.map(formatChoice).join(", ")})`) : "";
+      const choices = opt.enum ? chalk5.gray(typeof opt.enum === "function" ? " ([dynamic choices])" : ` (${opt.enum.map(formatChoice).join(", ")})`) : "";
       lines.push(`      ${chalk5.green(optName)}      ${chalk5.gray(optDesc)}${defaultVal}${choices}`);
     }
     lines.push("");
@@ -8584,7 +8638,7 @@ var handleOption = (programCommand, argMeta) => {
     ask
   } = argMeta.argsOption;
   const kebabName = camelToKebabCase2(argMeta.name);
-  const choices = enumChoices?.map((choice) => typeof choice === "object" ? { value: choice.value, name: choice.label } : { value: choice, name: choice.toString() });
+  const choices = enumChoices && typeof enumChoices !== "function" ? normalizeEnumChoices(enumChoices) : null;
   programCommand.option(`-${flag}, --${kebabName}${type === "boolean" ? " [boolean]" : ` <${kebabName}>`}`, `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.map((choice) => choice.name).join(", ")})` : ""}`);
   return programCommand;
 };
@@ -8601,7 +8655,16 @@ var convertArgValue = (value, type) => {
   else
     return value === true || value === "true";
 };
-var getOptionValue = async (argMeta, opt) => {
+var normalizeEnumChoices = (enumChoices) => enumChoices.map((choice) => typeof choice === "object" ? { value: choice.value, name: choice.label } : { value: choice, name: choice.toString() });
+var resolveEnumChoices = async (argMeta, context) => {
+  const enumChoices = argMeta.argsOption.enum;
+  if (!enumChoices)
+    return null;
+  if (typeof enumChoices === "function")
+    return await enumChoices(context);
+  return enumChoices;
+};
+var getOptionValue = async (argMeta, opt, context) => {
   const {
     name,
     argsOption: { enum: enumChoices, default: defaultValue, type, desc, nullable, example, ask }
@@ -8610,13 +8673,13 @@ var getOptionValue = async (argMeta, opt) => {
     return convertArgValue(opt[argMeta.name], type ?? "string");
   else if (defaultValue !== undefined)
     return defaultValue;
-  else if (nullable)
-    return null;
   if (enumChoices) {
-    const choices = enumChoices.map((choice2) => typeof choice2 === "object" ? { value: choice2.value, name: choice2.label } : { value: choice2, name: choice2.toString() });
+    const choices = normalizeEnumChoices(await resolveEnumChoices(argMeta, context) ?? []);
     const choice = await select2({ message: ask ?? desc ?? `Select the ${name} value`, choices });
     return choice;
-  } else if (type === "boolean") {
+  } else if (nullable)
+    return null;
+  else if (type === "boolean") {
     const message = ask ?? desc ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;
     return await confirm({ message });
   } else {
@@ -8641,6 +8704,22 @@ var getArgumentValue = async (argMeta, value) => {
   const message = ask ? `${ask}: ` : desc ? `${desc}: ` : `Enter the ${name} value${example ? ` (example: ${example})` : ""}: `;
   return convertArgValue(await input2({ message }), type ?? "string");
 };
+var assignCommandContext = (context, argMeta, value) => {
+  if (value instanceof AppExecutor)
+    context.app = value;
+  else if (value instanceof LibExecutor)
+    context.lib = value;
+  else if (value instanceof PkgExecutor)
+    context.pkg = value;
+  else if (value instanceof ModuleExecutor)
+    context.module = value;
+  else if (value instanceof Executor)
+    context.exec = value;
+  if (argMeta.type === "Argument" || argMeta.type === "Option")
+    context.values[argMeta.name] = value;
+  else
+    context.values[argMeta.type.toLowerCase()] = value;
+};
 var assertCurrentDirectoryIsWorkspaceRoot = async () => {
   const cwd = process.cwd();
   const [hasPackageJson, hasTsConfig, hasEnv] = await Promise.all([
@@ -8816,15 +8895,17 @@ It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`)
           if (targetMeta.targetOption.runsOnWorkspaceRoot)
             await assertCurrentDirectoryIsWorkspaceRoot();
           const workspace = WorkspaceExecutor.fromRoot();
+          const commandContext = { values: {} };
           for (const argMeta of allArgMetas) {
             if (argMeta.type === "Option")
-              commandArgs[argMeta.idx] = await getOptionValue(argMeta, opt);
+              commandArgs[argMeta.idx] = await getOptionValue(argMeta, opt, commandContext);
             else if (argMeta.type === "Argument")
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx]);
             else
               commandArgs[argMeta.idx] = await getInternalArgumentValue(argMeta, cmdArgs[argMeta.idx], workspace);
             if (commandArgs[argMeta.idx] instanceof AppExecutor)
               process.env.AKAN_PUBLIC_APP_NAME = commandArgs[argMeta.idx].name;
+            assignCommandContext(commandContext, argMeta, commandArgs[argMeta.idx]);
             if (opt.verbose)
               Executor.setVerbose(true);
           }
@@ -9846,14 +9927,22 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
   test: target({ desc: "Prepare and test an app, library, or package" }).with(Exec).option("write", Boolean, { desc: "write code generation", default: true }).exec(async function(exec2, write) {
     await this.applicationScript.test(exec2, { write });
   }),
-  buildIos: target({ short: true, desc: "Build iOS app with Capacitor" }).with(App).option("target", String, { desc: "mobile target name or all" }).option("env", String, {
+  buildIos: target({ short: true, desc: "Build iOS app with Capacitor" }).with(App).option("target", String, {
+    desc: "mobile target name or all",
+    ask: "Select mobile target",
+    enum: async ({ app }) => await getMobileTargetChoices(app)
+  }).option("env", String, {
     enum: ["local", "debug", "develop", "main"],
     desc: "backend environment",
     default: "debug"
   }).option("write", Boolean, { desc: "write code generation", default: true }).option("regenerate", Boolean, { flag: "g", desc: "delete and regenerate native project", default: false }).exec(async function(app, target2, env, write, regenerate) {
     await this.applicationScript.buildIos(app, { target: target2, env: asMobileEnv(env), write, regenerate });
   }),
-  buildAndroid: target({ short: true, desc: "Build Android app with Capacitor" }).with(App).option("target", String, { desc: "mobile target name or all" }).option("env", String, {
+  buildAndroid: target({ short: true, desc: "Build Android app with Capacitor" }).with(App).option("target", String, {
+    desc: "mobile target name or all",
+    ask: "Select mobile target",
+    enum: async ({ app }) => await getMobileTargetChoices(app)
+  }).option("env", String, {
     enum: ["local", "debug", "develop", "main"],
     desc: "backend environment",
     default: "debug"
@@ -9975,21 +10064,25 @@ class PackageRunner extends runner("package") {
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
     const packageRuntimeDependencies = { akanjs: ["daisyui"] };
+    const packageRuntimeDevDependencies = { akanjs: ["@biomejs/biome"] };
     const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
+    const forcedRuntimeDevDeps = packageRuntimeDevDependencies[pkg.name] ?? [];
     const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];
+    const packageRuntimeDevDeps = [...new Set([...npmDevDeps, ...forcedRuntimeDevDeps])];
     const rootPackageJson = await pkg.workspace.getPackageJson();
     const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
     const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
-    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps])].sort();
+    const missingForcedDevDeps = forcedRuntimeDevDeps.filter((dep) => !rootDeps[dep]);
+    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps, ...missingForcedDevDeps])].sort();
     if (allMissingDeps.length > 0)
       throw new Error(`Missing dependency versions in root package.json: ${allMissingDeps.join(", ")}`);
-    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, npmDevDeps);
+    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, packageRuntimeDevDeps);
     const hasBuildFile = await Bun.file(`${pkg.cwdPath}/build.ts`).exists();
     if (hasBuildFile) {
       await pkg.workspace.spawn(process.execPath, [`${pkg.cwdPath}/build.ts`], { env: process.env, stdio: "inherit" });
     } else {
       await $2`cp -r ${pkg.cwdPath}/. ${pkg.dist.cwdPath}`;
-      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, packageRuntimeDevDeps), pkg.generateTsconfigJson()]);
     }
   }
   async updateWorskpaceRootPackageJson(workspace, rootPackageJson) {

package/cli/package/package.runner.ts

@@ -39,23 +39,27 @@ export class PackageRunner extends runner("package") {
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
     const packageRuntimeDependencies: Record<string, string[]> = { akanjs: ["daisyui"] };
+    const packageRuntimeDevDependencies: Record<string, string[]> = { akanjs: ["@biomejs/biome"] };
     const forcedRuntimeDeps = packageRuntimeDependencies[pkg.name] ?? [];
+    const forcedRuntimeDevDeps = packageRuntimeDevDependencies[pkg.name] ?? [];
     const packageRuntimeDeps = [...new Set([...npmDeps, ...forcedRuntimeDeps])];
+    const packageRuntimeDevDeps = [...new Set([...npmDevDeps, ...forcedRuntimeDevDeps])];
     const rootPackageJson = await pkg.workspace.getPackageJson();
     const rootDeps = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
     const missingForcedDeps = forcedRuntimeDeps.filter((dep) => !rootDeps[dep]);
-    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps])].sort();
+    const missingForcedDevDeps = forcedRuntimeDevDeps.filter((dep) => !rootDeps[dep]);
+    const allMissingDeps = [...new Set([...missingDeps, ...missingForcedDeps, ...missingForcedDevDeps])].sort();
     if (allMissingDeps.length > 0)
       throw new Error(`Missing dependency versions in root package.json: ${allMissingDeps.join(", ")}`);
 
-    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, npmDevDeps);
+    await pkg.updatePackageJsonDependencies(packageRuntimeDeps, packageRuntimeDevDeps);
 
     const hasBuildFile = await Bun.file(`${pkg.cwdPath}/build.ts`).exists();
     if (hasBuildFile) {
       await pkg.workspace.spawn(process.execPath, [`${pkg.cwdPath}/build.ts`], { env: process.env, stdio: "inherit" });
     } else {
       await $`cp -r ${pkg.cwdPath}/. ${pkg.dist.cwdPath}`;
-      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, packageRuntimeDevDeps), pkg.generateTsconfigJson()]);
     }
   }
 

package/cli/templates/app/page/_layout.tsx

@@ -10,7 +10,6 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
     content: `
 import "./styles.css";
 import type { LayoutProps } from "akanjs/client";
-import { fetch } from "@${dict.appName}/client";
 ${isUsingShared ? "import { Auth } from '@shared/ui';" : ""}
 
 export const head = (

package/cli/templates/workspaceRoot/.gitignore.template

@@ -25,10 +25,6 @@ apps/*/scripts
 **/*secrets.yaml
 **/kubeconfig.yaml
 **/secrets.*
-**/.idea
-apps/**/src/schema.gql
-.next
-.vite
 dump
 local
 
@@ -50,7 +46,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 
-# **/android
 build/
 .gradle
 local.properties
@@ -122,9 +117,4 @@ libs/*/common/index.ts
 libs/*/client.ts
 libs/*/server.ts
 libs/*/index.ts
-# **/capacitor.config.ts
-# **/postcss.config.js
-# **/playwright.config.ts
-# **/next-env.d.ts
-# **/tsconfig.json
-# **/tsconfig.spec.json
+**/.akan

package/client/csrTypes.ts

@@ -111,7 +111,7 @@ export interface LayoutModule {
 }
 export type RouteModule = PageModule | LayoutModule;
 export interface Route {
-  csrConfig?: PageConfig;
+  PageConfig?: PageConfig;
   path: string;
   renderPage?: RouteRender;
   renderLayout?: RouteRender;

package/devkit/capacitor.base.config.ts

@@ -53,7 +53,7 @@ export const withBase = (
             androidScheme: "http",
             url: localCsrUrl(ip, target),
             cleartext: true,
-            allowNavigation: [`http://${ip}:8282/*`],
+            allowNavigation: [ip, "localhost"],
           }
         : {
             allowNavigation: ["*"],

package/devkit/capacitorApp.ts

@@ -201,7 +201,11 @@ export class CapacitorApp {
       .relative(this.targetRoot, path.join(this.app.cwdPath, "akan.app.json"))
       .split(path.sep)
       .join("/");
-    const content = `import { withBase } from "akanjs/devkit/capacitor.base.config";
+    const baseConfigPath = path
+      .relative(this.targetRoot, path.join(this.app.workspace.cwdPath, "pkgs/akanjs/devkit/capacitor.base.config"))
+      .split(path.sep)
+      .join("/");
+    const content = `import { withBase } from "${baseConfigPath.startsWith(".") ? baseConfigPath : `./${baseConfigPath}`}";
 import appInfo from "${appInfoPath}";
 
 export default withBase((config) => config, appInfo, "${this.target.name}");

package/devkit/commandDecorators/argMeta.ts

@@ -18,19 +18,33 @@ export type InternalArgType = (typeof internalArgTypes)[number];
 export type PrimitiveArgType = StringConstructor | NumberConstructor | BooleanConstructor;
 export type NormalizedPrimitiveArgType = "string" | "number" | "boolean";
 
-export interface ArgsOption {
+export type CommandContext = {
+  values: Record<string, unknown>;
+  app?: AppExecutor;
+  lib?: LibExecutor;
+  sys?: SysExecutor;
+  pkg?: PkgExecutor;
+  module?: ModuleExecutor;
+  exec?: Executor;
+};
+
+export type EnumChoice = string | number | { label: string; value: string | number | boolean };
+export type EnumChoices = readonly EnumChoice[];
+export type DynamicEnum<Context> = (context: Context) => EnumChoices | Promise<EnumChoices>;
+
+export interface ArgsOption<Context = CommandContext> {
   type?: "string" | "number" | "boolean";
   flag?: string;
   desc?: string;
   default?: string | number | boolean;
   nullable?: boolean;
   example?: string | number | boolean;
-  enum?: (string | number)[] | readonly (string | number)[] | { label: string; value: string | number | boolean }[];
+  enum?: EnumChoices | DynamicEnum<Context>;
   ask?: string;
 }
-export interface ArgMeta {
+export interface ArgMeta<Context = CommandContext> {
   name: string;
-  argsOption: ArgsOption;
+  argsOption: ArgsOption<Context>;
   key: string;
   idx: number;
   type: ArgType;
@@ -52,12 +66,12 @@ export const getArgMetas = (
   return [allArgMetas, argMetas, internalArgMetas];
 };
 
-export interface InternalArgToken<T = unknown> {
-  type: InternalArgType;
+export interface InternalArgToken<T = unknown, Type extends InternalArgType = InternalArgType> {
+  type: Type;
   _value: T;
 }
 
-const createInternalArgToken = <T>(type: InternalArgType) => ({ type }) as InternalArgToken<T>;
+const createInternalArgToken = <T, Type extends InternalArgType>(type: Type) => ({ type }) as InternalArgToken<T, Type>;
 
 export const normalizePrimitiveArgType = (type: PrimitiveArgType): NormalizedPrimitiveArgType => {
   if (type === String) return "string";
@@ -66,23 +80,23 @@ export const normalizePrimitiveArgType = (type: PrimitiveArgType): NormalizedPri
   throw new Error(`Invalid primitive argument type: ${type}`);
 };
 
-export const App = createInternalArgToken<AppExecutor>("App");
+export const App = createInternalArgToken<AppExecutor, "App">("App");
 export type App = AppExecutor;
 
-export const Lib = createInternalArgToken<LibExecutor>("Lib");
+export const Lib = createInternalArgToken<LibExecutor, "Lib">("Lib");
 export type Lib = LibExecutor;
 
-export const Sys = createInternalArgToken<SysExecutor>("Sys");
+export const Sys = createInternalArgToken<SysExecutor, "Sys">("Sys");
 export type Sys = SysExecutor;
 
-export const Exec = createInternalArgToken<Executor>("Exec");
+export const Exec = createInternalArgToken<Executor, "Exec">("Exec");
 export type Exec = Executor;
 
-export const Pkg = createInternalArgToken<PkgExecutor>("Pkg");
+export const Pkg = createInternalArgToken<PkgExecutor, "Pkg">("Pkg");
 export type Pkg = PkgExecutor;
 
-export const Module = createInternalArgToken<ModuleExecutor>("Module");
+export const Module = createInternalArgToken<ModuleExecutor, "Module">("Module");
 export type Module = ModuleExecutor;
 
-export const Workspace = createInternalArgToken<WorkspaceExecutor>("Workspace");
+export const Workspace = createInternalArgToken<WorkspaceExecutor, "Workspace">("Workspace");
 export type Workspace = WorkspaceExecutor;

package/devkit/commandDecorators/command.ts

@@ -5,7 +5,14 @@ import { type Command, program } from "commander";
 
 import { FileSys, getDirname, type PackageJson } from "..";
 import { AppExecutor, Executor, LibExecutor, ModuleExecutor, PkgExecutor, WorkspaceExecutor } from "../executors";
-import { type ArgMeta, getArgMetas, type InternalArgMeta } from "./argMeta";
+import {
+  type ArgMeta,
+  type CommandContext,
+  type EnumChoice,
+  type EnumChoices,
+  getArgMetas,
+  type InternalArgMeta,
+} from "./argMeta";
 import { CommandContainer } from "./dependencyBuilder";
 import { formatCommandHelp, formatHelp } from "./helpFormatter";
 import { type CommandCls, getTargetMetas } from "./targetMeta";
@@ -22,11 +29,7 @@ const handleOption = (programCommand: Command, argMeta: ArgMeta) => {
     ask,
   } = argMeta.argsOption;
   const kebabName = camelToKebabCase(argMeta.name);
-  const choices = enumChoices?.map((choice: string | number | { label: string; value: string | number | boolean }) =>
-    typeof choice === "object"
-      ? { value: choice.value, name: choice.label }
-      : { value: choice, name: choice.toString() },
-  );
+  const choices = enumChoices && typeof enumChoices !== "function" ? normalizeEnumChoices(enumChoices) : null;
   programCommand.option(
     `-${flag}, --${kebabName}${type === "boolean" ? " [boolean]" : ` <${kebabName}>`}`,
     `${desc}${ask ? ` (${ask})` : ""}${example ? ` (example: ${example})` : ""}${choices ? ` (choices: ${choices.map((choice) => choice.name).join(", ")})` : ""}`,
@@ -48,24 +51,34 @@ const convertArgValue = (value: string | boolean, type: "string" | "number" | "b
   else return value === true || value === "true";
 };
 
-const getOptionValue = async (argMeta: ArgMeta, opt: Record<string, unknown>) => {
+const normalizeEnumChoices = (enumChoices: EnumChoices) =>
+  enumChoices.map((choice: EnumChoice) =>
+    typeof choice === "object"
+      ? { value: choice.value, name: choice.label }
+      : { value: choice, name: choice.toString() },
+  );
+
+const resolveEnumChoices = async (argMeta: ArgMeta, context: CommandContext) => {
+  const enumChoices = argMeta.argsOption.enum;
+  if (!enumChoices) return null;
+  if (typeof enumChoices === "function") return await enumChoices(context);
+  return enumChoices;
+};
+
+const getOptionValue = async (argMeta: ArgMeta, opt: Record<string, unknown>, context: CommandContext) => {
   const {
     name,
     argsOption: { enum: enumChoices, default: defaultValue, type, desc, nullable, example, ask },
   } = argMeta;
   if (opt[argMeta.name] !== undefined) return convertArgValue(opt[argMeta.name] as string, type ?? "string");
   else if (defaultValue !== undefined) return defaultValue;
-  else if (nullable) return null;
 
   if (enumChoices) {
-    const choices = enumChoices.map((choice: string | number | { label: string; value: string | number | boolean }) =>
-      typeof choice === "object"
-        ? { value: choice.value, name: choice.label }
-        : { value: choice, name: choice.toString() },
-    );
+    const choices = normalizeEnumChoices((await resolveEnumChoices(argMeta, context)) ?? []);
     const choice = await select({ message: ask ?? desc ?? `Select the ${name} value`, choices });
     return choice;
-  } else if (type === "boolean") {
+  } else if (nullable) return null;
+  else if (type === "boolean") {
     const message = ask ?? desc ?? `Do you want to set ${name}? ${desc ? ` (${desc})` : ""}: `;
     return await confirm({ message });
   } else {
@@ -96,6 +109,16 @@ const getArgumentValue = async (argMeta: ArgMeta, value: string | undefined) =>
   return convertArgValue(await input({ message }), type ?? "string");
 };
 
+const assignCommandContext = (context: CommandContext, argMeta: ArgMeta | InternalArgMeta, value: unknown) => {
+  if (value instanceof AppExecutor) context.app = value;
+  else if (value instanceof LibExecutor) context.lib = value;
+  else if (value instanceof PkgExecutor) context.pkg = value;
+  else if (value instanceof ModuleExecutor) context.module = value;
+  else if (value instanceof Executor) context.exec = value;
+  if (argMeta.type === "Argument" || argMeta.type === "Option") context.values[argMeta.name] = value;
+  else context.values[argMeta.type.toLowerCase()] = value;
+};
+
 const assertCurrentDirectoryIsWorkspaceRoot = async () => {
   const cwd = process.cwd();
   const [hasPackageJson, hasTsConfig, hasEnv] = await Promise.all([
@@ -281,8 +304,10 @@ It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`,
           const commandArgs = [] as unknown[];
           if (targetMeta.targetOption.runsOnWorkspaceRoot) await assertCurrentDirectoryIsWorkspaceRoot();
           const workspace = WorkspaceExecutor.fromRoot();
+          const commandContext: CommandContext = { values: {} };
           for (const argMeta of allArgMetas) {
-            if (argMeta.type === "Option") commandArgs[argMeta.idx] = await getOptionValue(argMeta, opt);
+            if (argMeta.type === "Option")
+              commandArgs[argMeta.idx] = await getOptionValue(argMeta, opt, commandContext);
             else if (argMeta.type === "Argument")
               commandArgs[argMeta.idx] = await getArgumentValue(argMeta, cmdArgs[argMeta.idx] as string);
             else
@@ -294,6 +319,7 @@ It may cause unexpected behavior. Run \`akan update\` to update latest akanjs.`,
             
             if (commandArgs[argMeta.idx] instanceof AppExecutor)
               process.env.AKAN_PUBLIC_APP_NAME = (commandArgs[argMeta.idx] as AppExecutor).name;
+            assignCommandContext(commandContext, argMeta, commandArgs[argMeta.idx]);
             if ((opt as { verbose?: boolean }).verbose) Executor.setVerbose(true);
           }
           const cmd = CommandContainer.get(command);