akanjs 2.0.0-beta.0 → 2.0.0-beta.10

package/cli/index.js

@@ -867,7 +867,9 @@ import {
 import { readFileSync as readFileSync3 } from "fs";
 import { mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
 import path7 from "path";
+var {$ } = globalThis.Bun;
 import chalk4 from "chalk";
+import ts3 from "typescript";
 
 import fs from "fs";
 import path from "path";
@@ -1163,9 +1165,6 @@ var decreaseBuildNum = async (app) => {
   fs.writeFileSync(akanConfigPath, akanConfigContent);
 };
 
-var {$ } = globalThis.Bun;
-import ts3 from "typescript";
-
 import path2 from "path";
 var getDirname = (url) => path2.dirname(new URL(url).pathname);
 
@@ -4817,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)
@@ -4832,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)
@@ -6049,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");
@@ -6116,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;
@@ -6152,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);
       }
@@ -6240,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);
       }
@@ -6287,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("/");
@@ -7904,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, "");
@@ -8115,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}");
@@ -8565,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("");
@@ -8585,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;
 };
@@ -8602,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 }
@@ -8611,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 {
@@ -8642,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([
@@ -8817,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);
           }
@@ -9847,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"
@@ -9947,13 +10035,16 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
 })) {
 }
 
+import path36 from "path";
 var {$: $2 } = globalThis.Bun;
 
 class PackageRunner extends runner("package") {
-  async version(workspace) {
-    const pkgJson = await FileSys.readJson("package.json");
+  async version(workspace, { log = true } = {}) {
+    const pkgJson = await FileSys.readJson(process.env.USE_AKANJS_PKGS === "true" ? `${workspace.workspaceRoot}/pkgs/akanjs/package.json` : `${path36.dirname(Bun.main)}/../package.json`);
     const version = pkgJson.version;
-    Logger.rawLog(`${pkgJson.name}@${version}`);
+    if (log)
+      Logger.rawLog(`${pkgJson.name}@${version}`);
+    return version;
   }
   async createPackage(workspace, pkgName) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
@@ -9972,15 +10063,26 @@ class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    if (missingDeps.length > 0)
-      throw new Error(`Missing dependency versions in root package.json: ${missingDeps.join(", ")}`);
-    await pkg.updatePackageJsonDependencies(npmDeps, npmDevDeps);
+    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 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, 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(npmDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, packageRuntimeDevDeps), pkg.generateTsconfigJson()]);
     }
   }
   async updateWorskpaceRootPackageJson(workspace, rootPackageJson) {
@@ -9997,8 +10099,8 @@ class PackageRunner extends runner("package") {
 }
 
 class PackageScript extends script("package", [PackageRunner]) {
-  async version(workspace) {
-    await this.packageRunner.version(workspace);
+  async version(workspace, { log = true } = {}) {
+    return await this.packageRunner.version(workspace, { log });
   }
   async createPackage(workspace, pkgName) {
     const spinner2 = workspace.spinning(`Creating package in pkgs/${pkgName}...`);
@@ -10257,14 +10359,14 @@ class GuidelinePrompt extends Prompter {
   async#getScanFilePaths(matchPattern, { avoidDirs = ["node_modules", ".next"], filterText } = {}) {
     const glob = new Bun.Glob(matchPattern);
     const paths = [];
-    for await (const path36 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
-      if (avoidDirs.some((dir) => path36.includes(dir)))
+    for await (const path37 of glob.scan({ cwd: this.workspace.workspaceRoot, absolute: true })) {
+      if (avoidDirs.some((dir) => path37.includes(dir)))
         continue;
-      const fileContent = await FileSys.readText(path36);
+      const fileContent = await FileSys.readText(path37);
       const textFilter = filterText ? new RegExp(filterText) : null;
       if (filterText && !textFilter?.test(fileContent))
         continue;
-      paths.push(path36);
+      paths.push(path37);
     }
     return paths;
   }
@@ -11250,18 +11352,13 @@ class ScalarCommand extends command("scalar", [ScalarScript], ({ public: target
 })) {
 }
 
-import path37 from "path";
-
-import path36 from "path";
-import latestVersion2 from "latest-version";
+import path38 from "path";
 
+import path37 from "path";
 class WorkspaceRunner extends runner("workspace") {
-  async#resolveAkanVersion(tag) {
-    return /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(tag) ? tag : await latestVersion2("akanjs", { version: tag });
-  }
-  async createWorkspace(repoName, appName, { dirname: dirname3 = ".", tag = "latest", init = true }) {
+  async createWorkspace(repoName, appName, { dirname: dirname3 = ".", init = true, akanVersion }) {
     const cwdPath = process.cwd();
-    const workspaceRoot = path36.join(cwdPath, dirname3, repoName);
+    const workspaceRoot = path37.join(cwdPath, dirname3, repoName);
     const workspace = WorkspaceExecutor.fromRoot({ workspaceRoot, repoName });
     const templateSpinner = workspace.spinning(`Creating workspace template files in ${dirname3}/${repoName}...`);
     await workspace.applyTemplate({
@@ -11271,7 +11368,6 @@ class WorkspaceRunner extends runner("workspace") {
     });
     templateSpinner.succeed(`Workspace files created in ${dirname3}/${repoName}`);
     const rootPackageJson = await workspace.getPackageJson();
-    const akanVersion = await this.#resolveAkanVersion(tag);
     const packageJson = {
       ...rootPackageJson,
       dependencies: {
@@ -11300,14 +11396,19 @@ class WorkspaceRunner extends runner("workspace") {
   }
 }
 
-class WorkspaceScript extends script("workspace", [WorkspaceRunner, ApplicationScript, LibraryScript]) {
-  async createWorkspace(repoName, appName, {
-    dirname: dirname3 = ".",
-    installLibs = false,
-    tag = "latest",
-    init = true
-  }) {
-    const workspace = await this.workspaceRunner.createWorkspace(repoName, appName, { dirname: dirname3, tag, init });
+class WorkspaceScript extends script("workspace", [
+  WorkspaceRunner,
+  ApplicationScript,
+  LibraryScript,
+  PackageScript
+]) {
+  async createWorkspace(repoName, appName, { dirname: dirname3 = ".", installLibs = false, init = true }) {
+    const akanVersion = await this.packageScript.version({ log: false });
+    const workspace = await this.workspaceRunner.createWorkspace(repoName, appName, {
+      dirname: dirname3,
+      init,
+      akanVersion
+    });
     if (installLibs) {
       await this.libraryScript.installLibrary(workspace, "util");
       await this.libraryScript.installLibrary(workspace, "shared");
@@ -11320,7 +11421,7 @@ class WorkspaceScript extends script("workspace", [WorkspaceRunner, ApplicationS
     } catch (_) {
       gitSpinner.fail("Git repository initialization failed. It's not fatal, you can commit manually");
     }
-    const workspacePath = path37.join(dirname3, repoName);
+    const workspacePath = path38.join(dirname3, repoName);
     Logger.rawLog(`
 \uD83C\uDF89 Welcome aboard! Workspace created in ${dirname3}/${repoName}`);
     Logger.rawLog(`\uD83D\uDE80 Run \`cd ${workspacePath} && akan start ${appName}\` to start the development server.`);
@@ -11362,8 +11463,7 @@ class WorkspaceScript extends script("workspace", [WorkspaceRunner, ApplicationS
 
 class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({ public: target }) => ({
   createWorkspace: target({ desc: "Create a new Akan.js workspace", runsOnWorkspaceRoot: false }).arg("workspaceName", String, { desc: "what is the name of your organization?" }).option("app", String, {
-    desc: "what is the codename of your first application? (e.g. myapp)",
-    default: "app"
+    desc: "what is the codename of your first application? (e.g. myapp)"
   }).option("dir", String, {
     desc: "directory of workspace",
     default: process.env.USE_AKANJS_PKGS === "true" ? "local" : "."
@@ -11376,15 +11476,12 @@ class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({ public
         value: true
       }
     ]
-  }).option("tag", String, {
-    desc: "tag of the update",
-    default: "latest"
   }).option("init", Boolean, {
     desc: "Do you want to initialize the workspace? (Recommended)",
     default: true
-  }).exec(async function(workspaceName, app, dir, libs, tag, init) {
+  }).exec(async function(workspaceName, app, dir, libs, init) {
     const appName = app || "app";
-    await this.workspaceScript.createWorkspace(workspaceName.toLowerCase().replace(/ /g, "-"), appName.toLowerCase().replace(/ /g, "-"), { dirname: dir, installLibs: libs, tag, init });
+    await this.workspaceScript.createWorkspace(workspaceName.toLowerCase().replace(/ /g, "-"), appName.toLowerCase().replace(/ /g, "-"), { dirname: dir, installLibs: libs, init });
   }),
   lint: target({ desc: "Lint and fix code in a specific app/lib/pkg" }).with(Exec).option("fix", Boolean, { default: true }).with(Workspace).exec(async function(exec2, fix, workspace) {
     await this.workspaceScript.lint(exec2, workspace, { fix });

package/cli/package/package.runner.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 import { Logger } from "akanjs/common";
 import {
   FileSys,
@@ -10,10 +11,15 @@ import {
 import { $ } from "bun";
 
 export class PackageRunner extends runner("package") {
-  async version(workspace: Workspace) {
-    const pkgJson = await FileSys.readJson<PackageJson>("package.json");
+  async version(workspace: Workspace, { log = true }: { log?: boolean } = {}) {
+    const pkgJson = await FileSys.readJson<PackageJson>(
+      process.env.USE_AKANJS_PKGS === "true"
+        ? `${workspace.workspaceRoot}/pkgs/akanjs/package.json`
+        : `${path.dirname(Bun.main)}/../package.json`,
+    );
     const version = pkgJson.version;
-    Logger.rawLog(`${pkgJson.name}@${version}`);
+    if (log) Logger.rawLog(`${pkgJson.name}@${version}`);
+    return version;
   }
   async createPackage(workspace: Workspace, pkgName: string) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
@@ -32,17 +38,28 @@ export class PackageRunner extends runner("package") {
     await pkg.dist.mkdir(pkg.dist.cwdPath);
     const scanner = await TypeScriptDependencyScanner.from(pkg);
     const { npmDeps, npmDevDeps, missingDeps } = await scanner.getPackageBuildDependencies(pkg.name);
-    if (missingDeps.length > 0)
-      throw new Error(`Missing dependency versions in root package.json: ${missingDeps.join(", ")}`);
+    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 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(npmDeps, 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(npmDeps, npmDevDeps), pkg.generateTsconfigJson()]);
+      await Promise.all([pkg.generateDistPackageJson(packageRuntimeDeps, packageRuntimeDevDeps), pkg.generateTsconfigJson()]);
     }
   }
 

package/cli/package/package.script.ts

@@ -3,8 +3,8 @@ import { type Pkg, script, type Workspace } from "akanjs/devkit";
 import { PackageRunner } from "./package.runner";
 
 export class PackageScript extends script("package", [PackageRunner]) {
-  async version(workspace: Workspace) {
-    await this.packageRunner.version(workspace);
+  async version(workspace: Workspace, { log = true }: { log?: boolean } = {}) {
+    return await this.packageRunner.version(workspace, { log });
   }
   async createPackage(workspace: Workspace, pkgName: string) {
     const spinner = workspace.spinning(`Creating package in pkgs/${pkgName}...`);