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

package/{index-crmeqnmf.js → index-9d9bgcx4.js}

@@ -1,10 +1,8 @@
 // @bun
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
-import {
-  getDirname2
-} from "./index-6wwzs1bc.js";
+  getDirname2,
+  FileSys2
+} from "./index-5b6tavv3.js";
 
 // pkgs/@akanjs/devkit/codegenLock.ts
 import { mkdir, open, readFile, rm, stat } from "fs/promises";
@@ -191,12 +189,12 @@ import {
   fork,
   spawn as spawn2
 } from "child_process";
-import { readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import {
   copyFile,
   cp as cpEntry,
   lstat,
-  mkdir as mkdir3,
+  mkdir as mkdir2,
   readdir as readDirEntries,
   realpath,
   rm as rm3,
@@ -219,7 +217,7 @@ import chalk2 from "chalk";
 
 // pkgs/@akanjs/devkit/agentsIndex.ts
 var recipeScannerLoad = null;
-var loadRecipeScanner = () => recipeScannerLoad ??= import("./recipeScanner-fpagtgc1.js");
+var loadRecipeScanner = () => recipeScannerLoad ??= import("./recipeScanner-4b69ybe0.js");
 var AGENT_BLOCK_START = "<!-- akan:agent:start -->";
 var AGENT_BLOCK_END = "<!-- akan:agent:end -->";
 var AGENT_VERSION_PREFIX = "<!-- akan:agent:version ";
@@ -229,7 +227,7 @@ ${block}`;
 var extractBlockVersion = (content) => content.match(/<!-- akan:agent:version ([^\s]+) -->/)?.[1] ?? null;
 var readDevkitVersion = async () => {
   const { readFile } = await import("fs/promises");
-  const { getDirname } = await import("./getDirname-dr3jz1xg.js");
+  const { getDirname } = await import("./fileSys-5ngz93ga.js");
   try {
     const raw = await readFile(`${getDirname(import.meta.url)}/package.json`, "utf-8");
     return JSON.parse(raw).version ?? null;
@@ -368,32 +366,11 @@ import { archs } from "akanjs";
 // pkgs/@akanjs/devkit/akanConfig/akanConfig.ts
 var DEFAULT_BARREL_IMPORTS = ["akanjs/webkit", "akanjs/common", "akanjs/ui", "akanjs/server"];
 var DEFAULT_OPTIMIZE_IMPORTS = [
-  "lucide-react",
-  "date-fns",
-  "lodash-es",
-  "ramda",
-  "antd",
-  "react-bootstrap",
-  "ahooks",
-  "@ant-design/icons",
-  "@headlessui/react",
-  "@headlessui-float/react",
-  "@heroicons/react/20/solid",
-  "@heroicons/react/24/solid",
-  "@heroicons/react/24/outline",
-  "@visx/visx",
-  "@tremor/react",
-  "rxjs",
-  "@mui/material",
-  "@mui/icons-material",
-  "recharts",
-  "react-use",
-  "@material-ui/core",
-  "@material-ui/icons",
-  "@tabler/icons-react",
-  "mui-core",
-  "react-icons/*"
-];
+  "lucide-react date-fns lodash-es ramda antd react-bootstrap ahooks @ant-design/icons @headlessui/react",
+  "@headlessui-float/react @heroicons/react/20/solid @heroicons/react/24/solid @heroicons/react/24/outline",
+  "@visx/visx @tremor/react rxjs @mui/material @mui/icons-material recharts react-use @material-ui/core",
+  "@material-ui/icons @tabler/icons-react mui-core react-icons/*"
+].flatMap((line) => line.split(" "));
 var WORKSPACE_BARREL_FACETS = ["ui", "webkit", "common", "client", "server"];
 var DEFAULT_DOCKER_IMAGE = "oven/bun:1-slim";
 var SSR_RUNTIME_PACKAGES = ["react", "react-dom", "react-server-dom-webpack"];
@@ -405,17 +382,7 @@ var MOBILE_RUNTIME_PACKAGES = [
   "@capacitor/assets"
 ];
 var MOBILE_APP_CAPACITOR_PLUGINS = [
-  "@capacitor/app",
-  "@capacitor/browser",
-  "@capacitor/camera",
-  "@capacitor/core",
-  "@capacitor/device",
-  "@capacitor/geolocation",
-  "@capacitor/haptics",
-  "@capacitor/inappbrowser",
-  "@capacitor/keyboard",
-  "@capacitor/preferences",
-  "@capacitor/push-notifications",
+  ..."app browser camera core device geolocation haptics inappbrowser keyboard preferences push-notifications".split(" ").map((name) => `@capacitor/${name}`),
   "capacitor-plugin-safe-area"
 ];
 var DEFAULT_AKAN_IMAGE_CONFIG = {
@@ -632,22 +599,15 @@ class AkanAppConfig {
   }
   #applyRoutes(routes = []) {
     for (const route of routes) {
-      if (route.basePath) {
-        const basePath = route.basePath.replace(/^\/+|\/+$/g, "");
+      const basePath = route.basePath ? route.basePath.replace(/^\/+|\/+$/g, "") : null;
+      if (basePath !== null)
         this.basePaths.add(basePath);
-        const domains = this.subRoutes.getOrInsert(basePath, new Set);
-        Object.keys(route.domains).forEach((branch) => void this.branches.add(branch));
-        Object.values(route.domains).flat().forEach((domain) => {
-          if (domain)
-            domains.add(domain.toLowerCase().replace(/:\d+$/, ""));
-        });
-      } else {
-        Object.keys(route.domains).forEach((branch) => void this.branches.add(branch));
-        Object.values(route.domains).flat().forEach((domain) => {
-          if (domain)
-            this.domains.add(domain.toLowerCase().replace(/:\d+$/, ""));
-        });
-      }
+      const domains = basePath !== null ? this.subRoutes.getOrInsert(basePath, new Set) : this.domains;
+      for (const branch of Object.keys(route.domains))
+        this.branches.add(branch);
+      for (const domain of Object.values(route.domains).flat())
+        if (domain)
+          domains.add(domain.toLowerCase().replace(/:\d+$/, ""));
     }
     const appName = this.app.name.toLowerCase();
     const serveDomain = this.baseDevEnv.serveDomain.toLowerCase();
@@ -763,7 +723,10 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
     if (rootVersion)
       return rootVersion;
     const akanPackageJson = getAkanPackageJson();
-    return akanPackageJson.dependencies?.[lib] ?? akanPackageJson.peerDependencies?.[lib];
+    const version = akanPackageJson.dependencies?.[lib] ?? akanPackageJson.peerDependencies?.[lib];
+    if (!version)
+      throw new Error(`Dependency ${lib} not found in package.json`);
+    return version;
   }
   #getProductionRuntimePackages() {
     return [
@@ -804,12 +767,7 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       ...this.rootPackageJson.dependencies,
       ...this.rootPackageJson.devDependencies
     };
-    return libs.filter((lib) => !rootDependencies[lib]).map((lib) => {
-      const version = this.#resolveProductionDependencyVersion(lib);
-      if (!version)
-        throw new Error(`Dependency ${lib} not found in package.json`);
-      return `${lib}@${version}`;
-    });
+    return libs.filter((lib) => !rootDependencies[lib]).map((lib) => `${lib}@${this.#resolveProductionDependencyVersion(lib)}`);
   }
   get akanVersion() {
     return getAkanPackageJson().version;
@@ -820,12 +778,10 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       description: this.app.name,
       version: "1.0.0",
       main: "./main.js",
-      dependencies: Object.fromEntries([...new Set(this.#getProductionRuntimePackages())].map((lib) => {
-        const version = this.#resolveProductionDependencyVersion(lib);
-        if (!version)
-          throw new Error(`Dependency ${lib} not found in package.json`);
-        return [lib, version];
-      })),
+      dependencies: Object.fromEntries([...new Set(this.#getProductionRuntimePackages())].map((lib) => [
+        lib,
+        this.#resolveProductionDependencyVersion(lib)
+      ])),
       ...data
     };
   }
@@ -891,22 +847,15 @@ class AkanLibConfig {
   }
 }
 //! need to refactor
-var increaseBuildNum = async (app) => {
-  const appConfig = await AkanAppConfig.from(app);
-  const akanConfigPath = path2.join(app.cwdPath, "akan.config.ts");
-  const akanConfig = fs.readFileSync(akanConfigPath, "utf8");
-  const akanConfigContent = akanConfig.replace(`buildNum: ${appConfig.mobile.buildNum}`, `buildNum: ${appConfig.mobile.buildNum + 1}`);
-  fs.writeFileSync(akanConfigPath, akanConfigContent);
-};
-var decreaseBuildNum = async (app) => {
-  const appConfig = await AkanAppConfig.from(app);
+var shiftBuildNum = async (app, delta) => {
+  const { buildNum } = (await AkanAppConfig.from(app)).mobile;
   const akanConfigPath = path2.join(app.cwdPath, "akan.config.ts");
   const akanConfig = fs.readFileSync(akanConfigPath, "utf8");
-  const akanConfigContent = akanConfig.replace(`buildNum: ${appConfig.mobile.buildNum}`, `buildNum: ${appConfig.mobile.buildNum - 1}`);
-  fs.writeFileSync(akanConfigPath, akanConfigContent);
+  fs.writeFileSync(akanConfigPath, akanConfig.replace(`buildNum: ${buildNum}`, `buildNum: ${buildNum + delta}`));
 };
+var increaseBuildNum = async (app) => await shiftBuildNum(app, 1);
+var decreaseBuildNum = async (app) => await shiftBuildNum(app, -1);
 // pkgs/@akanjs/devkit/artifact/implicitRootLayout.ts
-import { mkdir as mkdir2 } from "fs/promises";
 import path4 from "path";
 
 // pkgs/@akanjs/devkit/transforms/asyncDefaultExportDetector.ts
@@ -923,7 +872,7 @@ class AsyncDefaultExportDetector {
     try {
       const typescript = await AsyncDefaultExportDetector.#loadTypescript();
       const source = fs2.readFileSync(path3.resolve(moduleAbsPath), "utf8");
-      const sourceFile = typescript.createSourceFile(moduleAbsPath, source, typescript.ScriptTarget.Latest, true, AsyncDefaultExportDetector.#scriptKind(typescript, moduleAbsPath));
+      const sourceFile = typescript.createSourceFile(moduleAbsPath, source, typescript.ScriptTarget.Latest, true, /\.[tj]sx$/.test(moduleAbsPath) ? typescript.ScriptKind.TSX : typescript.ScriptKind.TS);
       return new AsyncDefaultExportDetector(typescript).detectInSourceFile(sourceFile);
     } catch {
       return false;
@@ -965,8 +914,7 @@ class AsyncDefaultExportDetector {
         continue;
       }
       if (ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause)) {
-        const exportClause = statement.exportClause;
-        for (const specifier of exportClause.elements) {
+        for (const specifier of statement.exportClause.elements) {
           if (specifier.name.text !== "default")
             continue;
           defaultIdentifier = specifier.propertyName?.text ?? specifier.name.text;
@@ -983,29 +931,25 @@ class AsyncDefaultExportDetector {
     const ts = this.#ts;
     return Boolean(node && (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) && this.#hasModifier(node, ts.SyntaxKind.AsyncKeyword));
   }
-  static #scriptKind(typescript, moduleAbsPath) {
-    return moduleAbsPath.endsWith(".tsx") || moduleAbsPath.endsWith(".jsx") ? typescript.ScriptKind.TSX : typescript.ScriptKind.TS;
-  }
 }
 
 // pkgs/@akanjs/devkit/artifact/implicitRootLayout.ts
 var LAYOUT_KEY_RE = /^\.\/(.+\/)?_layout\.(tsx|ts|jsx|js)$/;
-async function appHasStModule(appCwdPath) {
-  return Bun.file(path4.join(appCwdPath, "lib", "st.ts")).exists();
-}
 var IMPLICIT_LAYOUT_DIR = path4.join(".akan", "generated", "root-layouts");
 var IMPLICIT_DICT_DIR = path4.join(".akan", "generated", "dict");
 var IMPLICIT_OVERRIDES_DIR = path4.join(".akan", "generated", "overrides");
 var OVERRIDES_KEY_RE = /^\.\/(.+\/)?_overrides\.(tsx|ts|jsx|js)$/;
+var importSpecifier = (fromAbsPath, toAbsPath) => {
+  const rel = path4.relative(path4.dirname(fromAbsPath), toAbsPath).split(path4.sep).join("/");
+  return rel.startsWith(".") ? rel : `./${rel}`;
+};
 async function writeGeneratedOverridesLayoutFile(opts) {
   const filename = `${opts.key.replace(/^\.\//, "").replace(/[^a-zA-Z0-9]+/g, "_")}.tsx`;
   const absPath = path4.join(path4.resolve(opts.appCwdPath), IMPLICIT_OVERRIDES_DIR, filename);
-  const userRel = path4.relative(path4.dirname(absPath), opts.userAbsPath).split(path4.sep).join("/");
-  const userSpecifier = userRel.startsWith(".") ? userRel : `./${userRel}`;
   const source = `"use client";
 import { UiOverrideProvider } from "akanjs/ui";
 import { createElement, type ReactNode } from "react";
-import value from ${JSON.stringify(userSpecifier)};
+import value from ${JSON.stringify(importSpecifier(absPath, opts.userAbsPath))};
 
 export default function AkanUiOverridesLayout({ children }: { children?: ReactNode }) {
   return createElement(UiOverrideProvider, { value }, children);
@@ -1030,9 +974,6 @@ function implicitRootLayoutAbsPath(appCwdPath, segments) {
   const filename = segments.length ? `${segments.join("__")}__root_layout.tsx` : "__root_layout.tsx";
   return path4.join(path4.resolve(appCwdPath), IMPLICIT_LAYOUT_DIR, filename);
 }
-function implicitDictionaryMacroAbsPath(appCwdPath) {
-  return path4.join(path4.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
-}
 function isRootBoundarySegments(segments, basePaths) {
   const firstVisibleIndex = segments.findIndex((segment) => !/^\(.+\)$/.test(segment));
   if (firstVisibleIndex === -1)
@@ -1058,10 +999,8 @@ function findRootBoundaries(pageKeys, appCwdPath, basePaths) {
       segments
     });
   }
-  const hasExplicitRootBoundary = [...boundaries.values()].some((boundary) => boundary.segments.length === 0);
-  if (!hasExplicitRootBoundary && boundaries.size === 0) {
+  if (boundaries.size === 0)
     boundaries.set("", { sourceKey: null, sourceAbsPath: null, segments: [] });
-  }
   return [...boundaries.values()].sort((a, b) => a.segments.join("/").localeCompare(b.segments.join("/")));
 }
 function hasAncestorRootBoundary(boundary, boundaries) {
@@ -1074,10 +1013,6 @@ function findExplicitRootLayoutAbsPath(pageKeys, appCwdPath) {
   });
   return rootLayoutKey ? path4.resolve(appCwdPath, "page", rootLayoutKey.replace(/^\.\//, "")) : null;
 }
-function routePrefixForSegments(segments) {
-  const visible = segments.filter((segment) => !/^\(.+\)$/.test(segment));
-  return visible[0] ?? null;
-}
 async function assertEnvClientConvention(appCwdPath, appName) {
   const envPath = path4.join(appCwdPath, "env", "env.client.ts");
   if (!await Bun.file(envPath).exists()) {
@@ -1085,8 +1020,7 @@ async function assertEnvClientConvention(appCwdPath, appName) {
   }
 }
 async function writeGeneratedDictionaryMacroFile(appCwdPath, appName) {
-  const absPath = implicitDictionaryMacroAbsPath(appCwdPath);
-  await mkdir2(path4.dirname(absPath), { recursive: true });
+  const absPath = path4.join(path4.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
   await Bun.write(absPath, `import { getAllDictionary } from "@apps/${appName}/lib/dict" with { type: "macro" };
 
 export const allDictionary = getAllDictionary();
@@ -1097,14 +1031,10 @@ async function writeGeneratedRootLayoutFile(opts) {
   await assertEnvClientConvention(opts.appCwdPath, opts.appName);
   const dictMacroAbsPath = opts.includeSystemProvider ? await writeGeneratedDictionaryMacroFile(opts.appCwdPath, opts.appName) : null;
   const absPath = implicitRootLayoutAbsPath(opts.appCwdPath, opts.boundary.segments);
-  await mkdir2(path4.dirname(absPath), { recursive: true });
-  const dictMacroRel = dictMacroAbsPath ? path4.relative(path4.dirname(absPath), dictMacroAbsPath).split(path4.sep).join("/") : null;
-  const dictMacroSpecifier = dictMacroRel ? dictMacroRel.startsWith(".") ? dictMacroRel : `./${dictMacroRel}` : null;
-  const sourceRel = opts.boundary.sourceAbsPath ? path4.relative(path4.dirname(absPath), opts.boundary.sourceAbsPath).split(path4.sep).join("/") : null;
-  const sourceSpecifier = sourceRel ? sourceRel.startsWith(".") ? sourceRel : `./${sourceRel}` : null;
+  const dictMacroSpecifier = dictMacroAbsPath ? importSpecifier(absPath, dictMacroAbsPath) : null;
+  const sourceSpecifier = opts.boundary.sourceAbsPath ? importSpecifier(absPath, opts.boundary.sourceAbsPath) : null;
   const inheritedSourceAbsPath = opts.rootSourceAbsPath && opts.rootSourceAbsPath !== opts.boundary.sourceAbsPath ? opts.rootSourceAbsPath : null;
-  const inheritedSourceRel = inheritedSourceAbsPath ? path4.relative(path4.dirname(absPath), inheritedSourceAbsPath).split(path4.sep).join("/") : null;
-  const inheritedSourceSpecifier = inheritedSourceRel ? inheritedSourceRel.startsWith(".") ? inheritedSourceRel : `./${inheritedSourceRel}` : null;
+  const inheritedSourceSpecifier = inheritedSourceAbsPath ? importSpecifier(absPath, inheritedSourceAbsPath) : null;
   const clientImport = opts.includeStInit ? `import { st } from "@apps/${opts.appName}/client";
 void st;
 ` : `import "@apps/${opts.appName}/client";
@@ -1114,7 +1044,7 @@ void st;
 const inheritedLayout = resolveRouteModule(inheritedModule as never, ${JSON.stringify(inheritedLabel)}).module as LayoutModule;
 ` : `const inheritedLayout: LayoutModule = {};
 `;
-  const prefix = routePrefixForSegments(opts.boundary.segments);
+  const prefix = opts.boundary.segments.find((segment) => !/^\(.+\)$/.test(segment)) ?? null;
   const userLabel = opts.boundary.sourceAbsPath ? path4.relative(opts.appCwdPath, opts.boundary.sourceAbsPath) : "";
   const userImport = sourceSpecifier ? `import * as userModule from ${JSON.stringify(sourceSpecifier)};
 const userLayout = resolveRouteModule(userModule as never, ${JSON.stringify(userLabel)}).module as LayoutModule;
@@ -1132,6 +1062,19 @@ const userLayout: LayoutModule = {};
 ` : "";
   const layoutChild = isAsyncUserLayout ? "{layout}" : userLayoutElement;
   const layoutReturn = isAsyncUserLayout ? "layout" : userLayoutElement;
+  const layoutExports = `export async function generateHead(props: PageProps) {
+  if (userLayout.generateHead) return userLayout.generateHead(props);
+  if (userLayout.head !== undefined) return userLayout.head;
+  if (inheritedLayout.generateHead) return inheritedLayout.generateHead(props);
+  return inheritedLayout.head;
+}
+
+export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
+export const Error = userLayout.Error ?? inheritedLayout.Error;
+export const pageConfig = userLayout.pageConfig ?? inheritedLayout.pageConfig;
+
+${layoutSignature}({ children, params, searchParams }: LayoutProps) {
+${layoutBinding}  return `;
   const source = opts.includeSystemProvider ? `import type { LayoutModule, LayoutProps, PageProps } from "akanjs/client";
 import { loadFonts, resolveRouteModule } from "akanjs/client";
 import type { ReactNode } from "react";
@@ -1145,19 +1088,7 @@ if (defaultFonts.length > 1) throw new Error("[route-convention] only one defaul
 const defaultFont = defaultFonts[0];
 const defaultFontClassName = defaultFont ? (defaultFont.className ?? \`font-\${defaultFont.name}\`) : undefined;
 
-export async function generateHead(props: PageProps) {
-  if (userLayout.generateHead) return userLayout.generateHead(props);
-  if (userLayout.head !== undefined) return userLayout.head;
-  if (inheritedLayout.generateHead) return inheritedLayout.generateHead(props);
-  return inheritedLayout.head;
-}
-
-export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
-export const Error = userLayout.Error ?? inheritedLayout.Error;
-export const pageConfig = userLayout.pageConfig ?? inheritedLayout.pageConfig;
-
-${layoutSignature}({ children, params, searchParams }: LayoutProps) {
-${layoutBinding}  return (
+${layoutExports}(
     <System.Provider
       of={GeneratedLayout as never}
       appName=${JSON.stringify(opts.appName)}
@@ -1181,19 +1112,7 @@ ${layoutBinding}  return (
 import { resolveRouteModule } from "akanjs/client";
 import type { ReactNode } from "react";
 ${inheritedImport}${userImport}
-export async function generateHead(props: PageProps) {
-  if (userLayout.generateHead) return userLayout.generateHead(props);
-  if (userLayout.head !== undefined) return userLayout.head;
-  if (inheritedLayout.generateHead) return inheritedLayout.generateHead(props);
-  return inheritedLayout.head;
-}
-
-export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
-export const Error = userLayout.Error ?? inheritedLayout.Error;
-export const pageConfig = userLayout.pageConfig ?? inheritedLayout.pageConfig;
-
-${layoutSignature}({ children, params, searchParams }: LayoutProps) {
-${layoutBinding}  return ${layoutReturn};
+${layoutExports}${layoutReturn};
 }
 `;
   await Bun.write(absPath, source);
@@ -1201,7 +1120,7 @@ ${layoutBinding}  return ${layoutReturn};
 }
 async function resolveSsrPageEntries(opts) {
   const absPageDir = path4.resolve(opts.appCwdPath, "page");
-  const hasSt = await appHasStModule(opts.appCwdPath);
+  const hasSt = await Bun.file(path4.join(opts.appCwdPath, "lib", "st.ts")).exists();
   const basePaths = opts.basePaths ?? [];
   const rootSourceAbsPath = findExplicitRootLayoutAbsPath(opts.pageKeys, opts.appCwdPath);
   const rootBoundaries = findRootBoundaries(opts.pageKeys, opts.appCwdPath, basePaths);
@@ -1233,9 +1152,7 @@ async function resolveSsrPageEntries(opts) {
     }),
     seedAbsPaths: [...new Set([boundary.sourceAbsPath, rootSourceAbsPath].filter((absPath) => absPath !== null))]
   })));
-  const entries = [...base, ...generated];
-  entries.sort((a, b) => a.key.localeCompare(b.key));
-  return entries;
+  return [...base, ...generated].sort((a, b) => a.key.localeCompare(b.key));
 }
 async function resolveSsrPageEntriesForApp(app, pageKeys) {
   const config = await app.getConfig();
@@ -1295,6 +1212,14 @@ var asBiomeReport = (candidate) => {
   }
 };
 var BIOME_CONFIG_FILES = ["biome.json", "biome.jsonc"];
+var emptyResult = (filePath) => ({
+  filePath,
+  messages: [],
+  errorCount: 0,
+  warningCount: 0,
+  fixableErrorCount: 0,
+  fixableWarningCount: 0
+});
 
 class Linter {
   static biomeBinName = process.platform === "win32" ? "biome.exe" : "biome";
@@ -1376,14 +1301,7 @@ class Linter {
       if (diagnostic.severity !== "error" && diagnostic.severity !== "warning")
         continue;
       const diagnosticFilePath = this.#diagnosticFilePath(diagnostic, filePath);
-      const result = resultsByPath.get(diagnosticFilePath) ?? {
-        filePath: diagnosticFilePath,
-        messages: [],
-        errorCount: 0,
-        warningCount: 0,
-        fixableErrorCount: 0,
-        fixableWarningCount: 0
-      };
+      const result = resultsByPath.get(diagnosticFilePath) ?? emptyResult(diagnosticFilePath);
       const message = this.#createLintMessage(diagnostic);
       result.messages.push(message);
       if (message.severity === 2)
@@ -1393,14 +1311,7 @@ class Linter {
       resultsByPath.set(diagnosticFilePath, result);
     }
     return [
-      resultsByPath.get(filePath) ?? {
-        filePath,
-        messages: [],
-        errorCount: 0,
-        warningCount: 0,
-        fixableErrorCount: 0,
-        fixableWarningCount: 0
-      },
+      resultsByPath.get(filePath) ?? emptyResult(filePath),
       ...[...resultsByPath.entries()].filter(([resultPath]) => resultPath !== filePath).map(([, result]) => result)
     ];
   }
@@ -1510,12 +1421,7 @@ ${errorText}, ${warningText} found`];
       warningCount: acc.warningCount + result.warningCount,
       fixableErrorCount: acc.fixableErrorCount + result.fixableErrorCount,
       fixableWarningCount: acc.fixableWarningCount + result.fixableWarningCount
-    }), {
-      errorCount: 0,
-      warningCount: 0,
-      fixableErrorCount: 0,
-      fixableWarningCount: 0
-    });
+    }), { errorCount: 0, warningCount: 0, fixableErrorCount: 0, fixableWarningCount: 0 });
     return { results, details, stats };
   }
   async hasNoLintErrors(filePath) {
@@ -1573,12 +1479,9 @@ ${errorText}, ${warningText} found`];
   async getProblematicRules(filePath) {
     const { results } = await this.lintFile(filePath);
     const ruleCounts = {};
-    results.forEach((result) => {
-      result.messages.forEach((message) => {
-        if (message.ruleId)
-          ruleCounts[message.ruleId] = (ruleCounts[message.ruleId] || 0) + 1;
-      });
-    });
+    for (const message of results.flatMap((result) => result.messages))
+      if (message.ruleId)
+        ruleCounts[message.ruleId] = (ruleCounts[message.ruleId] || 0) + 1;
     return ruleCounts;
   }
 }
@@ -1688,10 +1591,8 @@ var isAllowedLibFacetRootFile = (filename) => libFacetRootAllowedFiles.has(filen
 var isScannedRootEntry = (type, name) => !name.startsWith(".") || rootAllowedDirs[type].has(name);
 
 // pkgs/@akanjs/devkit/scanInfo.ts
-var databaseFileTypes = [
-  "constant",
+var serviceFileTypes = [
   "dictionary",
-  "document",
   "service",
   "signal",
   "store",
@@ -1701,6 +1602,9 @@ var databaseFileTypes = [
   "view",
   "zone"
 ];
+var databaseFileTypes = ["constant", "dictionary", "document", ...serviceFileTypes.slice(1)];
+var uiFileTypes = new Set(["template", "unit", "util", "view", "zone"]);
+var fileTypeOf = (filename) => databaseFileTypes.find((type) => filename.endsWith(uiFileTypes.has(type) ? `.${type[0].toUpperCase()}${type.slice(1)}.tsx` : `.${type}.ts`));
 var generatedRootCapacitorConfigFiles = ["capacitor.config.js", "capacitor.config.json"];
 var internalLibDirs = new Set(["__lib", "__scalar"]);
 var moduleNonUiFileTypes = {
@@ -1713,9 +1617,7 @@ var moduleUiFileTypes = {
   service: new Set(["Util", "Zone"]),
   scalar: new Set(["Template", "Unit"])
 };
-var testFilePattern = /\.(test|spec)\.(ts|tsx)$/;
-var createDependencyScanner = async (exec) => (await import("./dependencyScanner-0z2h2tks.js")).TypeScriptDependencyScanner.from(exec);
-var isAllowedTestFile = (filename) => testFilePattern.test(filename);
+var createDependencyScanner = async (exec) => (await import("./dependencyScanner-ye2e6pdz.js")).TypeScriptDependencyScanner.from(exec);
 var getScanPath = (exec, relativePath) => path7.posix.join(`${exec.type}s`, exec.name, relativePath.split(path7.sep).join("/"));
 async function clearGeneratedRootCapacitorConfigs(exec) {
   if (exec.type !== "app")
@@ -1735,21 +1637,21 @@ async function assertScanConvention(exec, libRoot) {
   const allowedRootFiles = rootAllowedFiles[exec.type];
   const allowedRootDirs = rootAllowedDirs[exec.type];
   const { files, dirs } = await exec.getFilesAndDirs(".");
-  files.filter((filename) => !allowedRootFiles.has(filename)).forEach((filename) => {
-    addViolation(filename, `unsupported ${exec.type} root file`);
-  });
-  dirs.filter((dirname) => !allowedRootDirs.has(dirname)).forEach((dirname) => {
-    addViolation(dirname, `unsupported ${exec.type} root folder`);
-  });
+  for (const filename of files)
+    if (!allowedRootFiles.has(filename))
+      addViolation(filename, `unsupported ${exec.type} root file`);
+  for (const dirname of dirs)
+    if (!allowedRootDirs.has(dirname))
+      addViolation(dirname, `unsupported ${exec.type} root folder`);
   if (exec.type === "lib")
     for (const { relativePath, reason } of await exec.getPageConventionViolations())
       addViolation(relativePath, reason);
-  libRoot.files.filter((filename) => !isAllowedLibFacetRootFile(filename)).forEach((filename) => {
-    addViolation(path7.join("lib", filename), "unsupported lib facet root file");
-  });
-  libRoot.dirs.filter((dirname) => dirname.startsWith("__") && !internalLibDirs.has(dirname)).forEach((dirname) => {
-    addViolation(path7.join("lib", dirname), "unsupported internal lib folder");
-  });
+  for (const filename of libRoot.files)
+    if (!isAllowedLibFacetRootFile(filename))
+      addViolation(path7.join("lib", filename), "unsupported lib facet root file");
+  for (const dirname of libRoot.dirs)
+    if (dirname.startsWith("__") && !internalLibDirs.has(dirname))
+      addViolation(path7.join("lib", dirname), "unsupported internal lib folder");
   const databaseDirs = libRoot.dirs.filter((dirname) => !dirname.startsWith("_"));
   const serviceDirs = libRoot.dirs.filter((dirname) => dirname.startsWith("_") && !dirname.startsWith("__"));
   const scalarDirs = await exec.readdir("lib/__scalar");
@@ -1771,38 +1673,25 @@ async function validateModuleFiles(exec, violations, kind, modulePath) {
     violations.push(`${getScanPath(exec, path7.join(modulePath, dirname))}: unsupported module folder`);
   });
   const uiModuleName = moduleName[0].toUpperCase() + moduleName.slice(1);
-  files.forEach((filename) => {
-    const filePath = path7.join(modulePath, filename);
-    if (filename === "index.ts" || filename === "index.tsx" || isAllowedTestFile(filename))
-      return;
+  for (const filename of files) {
+    const scanPath = getScanPath(exec, path7.join(modulePath, filename));
+    if (filename === "index.ts" || filename === "index.tsx" || /\.(test|spec)\.(ts|tsx)$/.test(filename))
+      continue;
     if (filename === `${moduleName}.abstract.md`)
-      return;
+      continue;
     const uiMatch = filename.match(/^([A-Z][A-Za-z0-9]+)\.([A-Z][A-Za-z0-9]*)\.tsx$/);
-    if (uiMatch) {
-      const fileModuleName = uiMatch[1];
-      const fileType = uiMatch[2];
-      if (fileModuleName !== uiModuleName) {
-        violations.push(`${getScanPath(exec, filePath)}: module name mismatch: expected '${uiModuleName}', got '${fileModuleName}'`);
-      }
-      if (!moduleUiFileTypes[kind].has(fileType)) {
-        violations.push(`${getScanPath(exec, filePath)}: unsupported ${kind} UI file`);
-      }
-      return;
-    }
-    const nonUiMatch = filename.match(/^([a-z][a-zA-Z0-9]*)\.([a-z][a-z0-9]*)\.ts$/);
-    if (nonUiMatch) {
-      const fileModuleName = nonUiMatch[1];
-      const fileType = nonUiMatch[2];
-      if (fileModuleName !== moduleName) {
-        violations.push(`${getScanPath(exec, filePath)}: module name mismatch: expected '${moduleName}', got '${fileModuleName}'`);
-      }
-      if (!moduleNonUiFileTypes[kind].has(fileType)) {
-        violations.push(`${getScanPath(exec, filePath)}: unsupported ${kind} file`);
-      }
-      return;
+    const match = uiMatch ?? filename.match(/^([a-z][a-zA-Z0-9]*)\.([a-z][a-z0-9]*)\.ts$/);
+    if (!match) {
+      violations.push(`${scanPath}: unsupported module file`);
+      continue;
     }
-    violations.push(`${getScanPath(exec, filePath)}: unsupported module file`);
-  });
+    const [, fileModuleName, fileType] = match;
+    const expectedName = uiMatch ? uiModuleName : moduleName;
+    if (fileModuleName !== expectedName)
+      violations.push(`${scanPath}: module name mismatch: expected '${expectedName}', got '${fileModuleName}'`);
+    if (!(uiMatch ? moduleUiFileTypes : moduleNonUiFileTypes)[kind].has(fileType))
+      violations.push(`${scanPath}: unsupported ${kind}${uiMatch ? " UI" : ""} file`);
+  }
 }
 
 class ScanInfo {
@@ -1850,79 +1739,17 @@ class ScanInfo {
       } else
         databaseDirs.push(name);
     });
+    const collect = async (dir, name, kind) => {
+      for (const filename of await exec.readdir(dir)) {
+        const type = fileTypeOf(filename);
+        if (type)
+          files[type][kind]?.push(name);
+      }
+    };
     await Promise.all([
-      ...databaseDirs.map(async (name) => {
-        const filenames = await exec.readdir(path7.join("lib", name));
-        filenames.forEach((filename) => {
-          if (filename.endsWith(".constant.ts"))
-            files.constant.databases.push(name);
-          else if (filename.endsWith(".dictionary.ts"))
-            files.dictionary.databases.push(name);
-          else if (filename.endsWith(".document.ts"))
-            files.document.databases.push(name);
-          else if (filename.endsWith(".service.ts"))
-            files.service.databases.push(name);
-          else if (filename.endsWith(".signal.ts"))
-            files.signal.databases.push(name);
-          else if (filename.endsWith(".store.ts"))
-            files.store.databases.push(name);
-          else if (filename.endsWith(".Template.tsx"))
-            files.template.databases.push(name);
-          else if (filename.endsWith(".Unit.tsx"))
-            files.unit.databases.push(name);
-          else if (filename.endsWith(".Util.tsx"))
-            files.util.databases.push(name);
-          else if (filename.endsWith(".View.tsx"))
-            files.view.databases.push(name);
-          else if (filename.endsWith(".Zone.tsx"))
-            files.zone.databases.push(name);
-        });
-      }),
-      ...serviceDirs.map(async (dirname) => {
-        const name = dirname.slice(1);
-        const filenames = await exec.readdir(path7.join("lib", dirname));
-        filenames.forEach((filename) => {
-          if (filename.endsWith(".dictionary.ts"))
-            files.dictionary.services.push(name);
-          else if (filename.endsWith(".service.ts"))
-            files.service.services.push(name);
-          else if (filename.endsWith(".signal.ts"))
-            files.signal.services.push(name);
-          else if (filename.endsWith(".store.ts"))
-            files.store.services.push(name);
-          else if (filename.endsWith(".Template.tsx"))
-            files.template.services.push(name);
-          else if (filename.endsWith(".Unit.tsx"))
-            files.unit.services.push(name);
-          else if (filename.endsWith(".Util.tsx"))
-            files.util.services.push(name);
-          else if (filename.endsWith(".View.tsx"))
-            files.view.services.push(name);
-          else if (filename.endsWith(".Zone.tsx"))
-            files.zone.services.push(name);
-        });
-      }),
-      ...scalarDirs.map(async (name) => {
-        const filenames = await exec.readdir(path7.join("lib/__scalar", name));
-        filenames.forEach((filename) => {
-          if (filename.endsWith(".constant.ts"))
-            files.constant.scalars.push(name);
-          else if (filename.endsWith(".dictionary.ts"))
-            files.dictionary.scalars.push(name);
-          else if (filename.endsWith(".document.ts"))
-            files.document.scalars.push(name);
-          else if (filename.endsWith(".Template.tsx"))
-            files.template.scalars.push(name);
-          else if (filename.endsWith(".Unit.tsx"))
-            files.unit.scalars.push(name);
-          else if (filename.endsWith(".Util.tsx"))
-            files.util.scalars.push(name);
-          else if (filename.endsWith(".View.tsx"))
-            files.view.scalars.push(name);
-          else if (filename.endsWith(".Zone.tsx"))
-            files.zone.scalars.push(name);
-        });
-      })
+      ...databaseDirs.map((name) => collect(path7.join("lib", name), name, "databases")),
+      ...serviceDirs.map((dirname) => collect(path7.join("lib", dirname), dirname.slice(1), "services")),
+      ...scalarDirs.map((name) => collect(path7.join("lib/__scalar", name), name, "scalars"))
     ]);
     const routes = exec.type === "lib" ? [] : await exec.getPageKeys();
     const common = {
@@ -1943,31 +1770,14 @@ class ScanInfo {
   constructor(scanResult) {
     this.name = scanResult.name;
     this.scanResult = scanResult;
-    Object.entries(scanResult.files).forEach(([_key, value]) => {
-      const key = _key;
-      const { databases, services, scalars } = value;
-      databases.forEach((modelName) => {
-        const model = this.database.get(modelName) ?? new Set;
-        model.add(key);
-        this.database.set(modelName, model);
-        this.file[key].all.add(modelName);
-        this.file[key].databases.add(modelName);
-      });
-      services?.forEach((serviceName) => {
-        const service = this.service.get(serviceName) ?? new Set;
-        service.add(key);
-        this.service.set(serviceName, service);
-        this.file[key].all.add(serviceName);
-        this.file[key].services.add(serviceName);
-      });
-      scalars?.forEach((scalarName) => {
-        const scalar = this.scalar.get(scalarName) ?? new Set;
-        scalar.add(key);
-        this.scalar.set(scalarName, scalar);
-        this.file[key].all.add(scalarName);
-        this.file[key].scalars.add(scalarName);
-      });
-    });
+    const modulesOf = { databases: this.database, services: this.service, scalars: this.scalar };
+    for (const [key, groups] of Object.entries(scanResult.files))
+      for (const kind of ["databases", "services", "scalars"])
+        for (const name of groups[kind] ?? []) {
+          modulesOf[kind].set(name, (modulesOf[kind].get(name) ?? new Set).add(key));
+          this.file[key].all.add(name);
+          this.file[key][kind].add(name);
+        }
   }
   getScanResult() {
     return this.scanResult;
@@ -1981,6 +1791,28 @@ class ScanInfo {
   getScalarModules() {
     return [...this.scalar.keys()];
   }
+  #sortedLibs = null;
+  sortedLibs(libDeps) {
+    if (this.#sortedLibs)
+      return this.#sortedLibs;
+    const libIndices = LibInfo.getSortedLibIndices();
+    this.#sortedLibs = libDeps.sort((libNameA, libNameB) => {
+      const indexA = libIndices.get(libNameA);
+      const indexB = libIndices.get(libNameB);
+      if (indexA === undefined || indexB === undefined)
+        throw new Error(`LibInfo not found: ${libNameA} or ${libNameB}`);
+      return indexA - indexB;
+    });
+    return this.#sortedLibs;
+  }
+  sortedLibInfos(libDeps) {
+    return new Map(this.sortedLibs(libDeps).map((libName) => {
+      const libInfo = LibInfo.libInfos.get(libName);
+      if (!libInfo)
+        throw new Error(`LibInfo not found: ${libName}`);
+      return [libName, libInfo];
+    }));
+  }
 }
 var isAkanFrameworkDependency = (dep) => dep === "akanjs" || dep.startsWith("akanjs/");
 
@@ -2030,30 +1862,11 @@ class AppInfo extends ScanInfo {
     }));
     return [...libSet];
   }
-  #sortedLibs = null;
-  #getSortedLibs() {
-    if (this.#sortedLibs)
-      return this.#sortedLibs;
-    const libIndices = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.libDeps.sort((libNameA, libNameB) => {
-      const indexA = libIndices.get(libNameA);
-      const indexB = libIndices.get(libNameB);
-      if (indexA === undefined || indexB === undefined)
-        throw new Error(`LibInfo not found: ${libNameA} or ${libNameB}`);
-      return indexA - indexB;
-    });
-    return this.#sortedLibs;
-  }
   getLibs() {
-    return this.#getSortedLibs();
+    return this.sortedLibs(this.libDeps);
   }
   getLibInfos() {
-    return new Map(this.#getSortedLibs().map((libName) => {
-      const libInfo = LibInfo.libInfos.get(libName);
-      if (!libInfo)
-        throw new Error(`LibInfo not found: ${libName}`);
-      return [libName, libInfo];
-    }));
+    return this.sortedLibInfos(this.libDeps);
   }
 }
 
@@ -2093,38 +1906,18 @@ class LibInfo extends ScanInfo {
   getScanResult() {
     return this.scanResult;
   }
-  #sortedLibs = null;
-  #getSortedLibs() {
-    if (this.#sortedLibs)
-      return this.#sortedLibs;
-    const libs = LibInfo.getSortedLibIndices();
-    this.#sortedLibs = this.scanResult.libDeps.sort((libNameA, libNameB) => {
-      const indexA = libs.get(libNameA);
-      const indexB = libs.get(libNameB);
-      if (indexA === undefined || indexB === undefined)
-        throw new Error(`LibInfo not found: ${libNameA} or ${libNameB}`);
-      return indexA - indexB;
-    });
-    return this.#sortedLibs;
-  }
   getLibs() {
-    return this.#getSortedLibs();
+    return this.sortedLibs(this.scanResult.libDeps);
   }
   getLibInfo(libName) {
     if (!this.getScanResult().libDeps.includes(libName))
       return;
-    const libSet = new Set(this.#getSortedLibs());
-    if (!libSet.has(libName))
+    if (!this.getLibs().includes(libName))
       throw new Error(`LibInfo is invalid: ${libName}`);
     return LibInfo.libInfos.get(libName);
   }
   getLibInfos() {
-    return new Map(this.#getSortedLibs().map((libName) => {
-      const libInfo = LibInfo.libInfos.get(libName);
-      if (!libInfo)
-        throw new Error(`LibInfo not found: ${libName}`);
-      return [libName, libInfo];
-    }));
+    return this.sortedLibInfos(this.scanResult.libDeps);
   }
 }
 
@@ -2143,12 +1936,7 @@ class PkgInfo {
       const pathSplitLength = path.split("/").length;
       return workspacePathOf(tsconfig.compilerOptions.paths?.[path]?.[0] ?? "*").split("/").slice(1, 1 + pathSplitLength).join("/");
     }).filter((pkg) => pkg !== exec.name);
-    const pkgScanResult = {
-      name: exec.name,
-      pkgDeps,
-      dependencies: [...npmDepSet]
-    };
-    return pkgScanResult;
+    return { name: exec.name, pkgDeps, dependencies: [...npmDepSet] };
   }
   static #pkgInfos = new Map;
   static async fromExecutor(exec, options = {}) {
@@ -2186,17 +1974,9 @@ class WorkspaceInfo {
       return existingWorkspaceInfo;
     const [appNames, libNames, pkgNames] = await Promise.all([exec.getApps(), exec.getLibs(), exec.getPkgs()]);
     const [appInfos, libInfos, pkgInfos] = await Promise.all([
-      Promise.all(appNames.map(async (appName) => {
-        const app = AppExecutor.from(exec, appName);
-        return await app.scan();
-      })),
-      Promise.all(libNames.map(async (libName) => {
-        const lib = LibExecutor.from(exec, libName);
-        return await lib.scan();
-      })),
-      Promise.all(pkgNames.map(async (pkgName) => {
-        return await PkgExecutor.from(exec, pkgName).scan();
-      }))
+      Promise.all(appNames.map(async (appName) => await AppExecutor.from(exec, appName).scan())),
+      Promise.all(libNames.map(async (libName) => await LibExecutor.from(exec, libName).scan())),
+      Promise.all(pkgNames.map(async (pkgName) => await PkgExecutor.from(exec, pkgName).scan()))
     ]);
     const workspaceInfo = new WorkspaceInfo(new Map(appInfos.map((app) => [app.exec.name, app])), new Map(libInfos.map((lib) => [lib.exec.name, lib])), new Map(pkgInfos.map((pkg) => [pkg.exec.name, pkg])));
     WorkspaceInfo.#workspaceInfos.set(exec.name, workspaceInfo);
@@ -2205,39 +1985,7 @@ class WorkspaceInfo {
 }
 
 // pkgs/@akanjs/devkit/executors.ts
-var staticTemplateFileExtensions = new Set([
-  ".avif",
-  ".bmp",
-  ".cjs",
-  ".css",
-  ".eot",
-  ".gif",
-  ".html",
-  ".ico",
-  ".jpeg",
-  ".jpg",
-  ".js",
-  ".json",
-  ".map",
-  ".md",
-  ".mjs",
-  ".mp3",
-  ".mp4",
-  ".ogg",
-  ".otf",
-  ".pdf",
-  ".png",
-  ".svg",
-  ".ttf",
-  ".txt",
-  ".wasm",
-  ".wav",
-  ".webm",
-  ".webp",
-  ".woff",
-  ".woff2",
-  ".xml"
-]);
+var staticTemplateFileExtensions = new Set(".avif .bmp .cjs .css .eot .gif .html .ico .jpeg .jpg .js .json .map .md .mjs .mp3 .mp4 .ogg .otf .pdf .png .svg".split(" ").concat(".ttf .txt .wasm .wav .webm .webp .woff .woff2 .xml".split(" ")));
 var plainCommandArgPattern = process.platform === "win32" ? /^[\w@%+=:,./\\-]+$/ : /^[\w@%+=:,./-]+$/;
 var formatCommandArg = (value) => plainCommandArgPattern.test(value) ? value : JSON.stringify(value);
 var formatCommandForDisplay = (command, args = []) => [command, ...args].map(formatCommandArg).join(" ");
@@ -2313,6 +2061,10 @@ var parseEnvFile = (envPath) => {
   }
   return env;
 };
+var withCapitalizedDict = (dict = {}) => ({
+  ...dict,
+  ...Object.fromEntries(Object.entries(dict).map(([key, value]) => [capitalize(key), capitalize(value)]))
+});
 
 class Executor {
   static verbose = false;
@@ -2339,144 +2091,51 @@ class Executor {
   #stderr(data) {
     Logger2.raw(chalk2.red(data.toString()));
   }
-  exec(command, options = {}) {
-    const cwd = options.cwd?.toString() ?? this.cwdPath;
-    const proc = exec(command, { cwd: this.cwdPath, ...options });
+  #settle(proc, target, { onClose = false, keepLogs = false, redStderr = false } = {}) {
     let stdout = "";
     let stderr = "";
     proc.stdout?.on("data", (data) => {
       stdout += data.toString();
+      if (keepLogs)
+        this.logs.push(data.toString());
       this.#stdout(data);
     });
     proc.stderr?.on("data", (data) => {
       stderr += data.toString();
-      this.#stdout(data);
+      if (keepLogs)
+        this.logs.push(data.toString());
+      if (redStderr)
+        this.#stderr(data);
+      else
+        this.#stdout(data);
     });
     return new Promise((resolve, reject) => {
-      proc.on("error", (error) => {
-        reject(new CommandExecutionError({
-          command,
-          cwd,
-          code: null,
-          signal: null,
-          stdout,
-          stderr,
-          cause: error
-        }));
-      });
-      proc.on("exit", (code, signal) => {
-        if (code || signal)
-          reject(new CommandExecutionError({
-            command,
-            cwd,
-            code,
-            signal,
-            stdout,
-            stderr
-          }));
+      proc.on("error", (cause) => reject(new CommandExecutionError({ ...target, code: null, signal: null, stdout, stderr, cause })));
+      proc.on(onClose ? "close" : "exit", (code, signal) => {
+        if ((onClose ? code !== 0 : code) || signal)
+          reject(new CommandExecutionError({ ...target, code, signal, stdout, stderr }));
         else
-          resolve({ code, signal });
+          resolve({ code, signal, stdout });
       });
     });
   }
+  exec(command, options = {}) {
+    const target = { command, cwd: options.cwd?.toString() ?? this.cwdPath };
+    const proc = exec(command, { cwd: this.cwdPath, ...options });
+    return this.#settle(proc, target).then(({ code, signal }) => ({ code, signal }));
+  }
   spawn(command, args = [], options = {}) {
-    const cwd = options.cwd?.toString() ?? this.cwdPath;
-    const proc = spawn2(command, args, {
-      cwd: this.cwdPath,
-      ...options
-    });
-    let stdout = "";
-    let stderr = "";
-    proc.stdout?.on("data", (data) => {
-      stdout += data.toString();
-      this.logs.push(data.toString());
-      this.#stdout(data);
-    });
-    proc.stderr?.on("data", (data) => {
-      stderr += data.toString();
-      this.logs.push(data.toString());
-      this.#stdout(data);
-    });
-    return new Promise((resolve, reject) => {
-      proc.on("error", (error) => {
-        reject(new CommandExecutionError({
-          command,
-          args,
-          cwd,
-          code: null,
-          signal: null,
-          stdout,
-          stderr,
-          cause: error
-        }));
-      });
-      proc.on("close", (code, signal) => {
-        if (code !== 0 || signal)
-          reject(new CommandExecutionError({
-            command,
-            args,
-            cwd,
-            code,
-            signal,
-            stdout,
-            stderr
-          }));
-        else
-          resolve(stdout);
-      });
-    });
+    const target = { command, args, cwd: options.cwd?.toString() ?? this.cwdPath };
+    const proc = spawn2(command, args, { cwd: this.cwdPath, ...options });
+    return this.#settle(proc, target, { onClose: true, keepLogs: true }).then(({ stdout }) => stdout);
   }
   spawnSync(command, args = [], options = {}) {
-    const proc = spawn2(command, args, {
-      cwd: this.cwdPath,
-      ...options
-    });
-    return proc;
+    return spawn2(command, args, { cwd: this.cwdPath, ...options });
   }
   fork(modulePath, args = [], options = {}) {
-    const cwd = options.cwd?.toString() ?? this.cwdPath;
-    const proc = fork(modulePath, args, {
-      cwd: this.cwdPath,
-      ...options
-    });
-    let stdout = "";
-    let stderr = "";
-    proc.stdout?.on("data", (data) => {
-      stdout += data.toString();
-      this.#stdout(data);
-    });
-    proc.stderr?.on("data", (data) => {
-      stderr += data.toString();
-      this.#stderr(data);
-    });
-    return new Promise((resolve, reject) => {
-      proc.on("error", (error) => {
-        reject(new CommandExecutionError({
-          command: modulePath,
-          args,
-          cwd,
-          code: null,
-          signal: null,
-          stdout,
-          stderr,
-          cause: error
-        }));
-      });
-      proc.on("exit", (code, signal) => {
-        if (code || signal)
-          reject(new CommandExecutionError({
-            command: modulePath,
-            args,
-            cwd,
-            code,
-            signal,
-            stdout,
-            stderr
-          }));
-        else
-          resolve({ code, signal });
-      });
-    });
+    const target = { command: modulePath, args, cwd: options.cwd?.toString() ?? this.cwdPath };
+    const proc = fork(modulePath, args, { cwd: this.cwdPath, ...options });
+    return this.#settle(proc, target, { redStderr: true }).then(({ code, signal }) => ({ code, signal }));
   }
   getPath(filePath) {
     if (path8.isAbsolute(filePath))
@@ -2500,8 +2159,8 @@ class Executor {
   }
   async mkdir(dirPath) {
     const writePath = this.getPath(dirPath);
-    if (!await FileSys.dirExists(writePath))
-      await mkdir3(writePath, { recursive: true });
+    if (!await FileSys2.dirExists(writePath))
+      await mkdir2(writePath, { recursive: true });
     this.logger.verbose(`Make directory ${writePath}`);
     return this;
   }
@@ -2520,27 +2179,25 @@ class Executor {
   }
   async getFilesAndDirs(dirPath) {
     const fullDirPath = this.getPath(dirPath);
-    const fileGlob = new Bun.Glob("*");
-    const files = Array.from(fileGlob.scanSync({ cwd: fullDirPath, onlyFiles: true }));
-    const dirGlob = new Bun.Glob("*");
-    const allEntries = Array.from(dirGlob.scanSync({ cwd: fullDirPath, onlyFiles: false }));
+    const glob = new Bun.Glob("*");
+    const files = Array.from(glob.scanSync({ cwd: fullDirPath, onlyFiles: true }));
+    const allEntries = Array.from(glob.scanSync({ cwd: fullDirPath, onlyFiles: false }));
     const dirs = allEntries.filter((entry) => !files.includes(entry));
     return { files, dirs };
   }
   async exists(filePath) {
-    const readPath = this.getPath(filePath);
-    return await FileSys.exists(readPath);
+    return await FileSys2.exists(this.getPath(filePath));
   }
   async remove(filePath) {
     const readPath = this.getPath(filePath);
-    if (await FileSys.fileExists(readPath))
-      await FileSys.delete(readPath);
+    if (await FileSys2.fileExists(readPath))
+      await FileSys2.delete(readPath);
     this.logger.verbose(`Remove file ${readPath}`);
     return this;
   }
   async removeDir(dirPath) {
     const readPath = path8.join(this.getPath(dirPath), ".");
-    if (await FileSys.entryExists(readPath))
+    if (await FileSys2.entryExists(readPath))
       await rm3(readPath, { recursive: true, force: true });
     this.logger.verbose(`Remove directory ${readPath}`);
     return this;
@@ -2548,22 +2205,22 @@ class Executor {
   async writeFile(filePath, content, { overwrite = true, silent = false } = {}) {
     const writePath = this.getPath(filePath);
     const dir = path8.dirname(writePath);
-    if (!await FileSys.dirExists(dir))
-      await mkdir3(dir, { recursive: true });
+    if (!await FileSys2.dirExists(dir))
+      await mkdir2(dir, { recursive: true });
     let contentStr = typeof content === "string" ? content : `${JSON.stringify(content, null, 2)}
 `;
-    if (await FileSys.fileExists(writePath)) {
-      const currentContent = await FileSys.readText(writePath);
+    if (await FileSys2.fileExists(writePath)) {
+      const currentContent = await FileSys2.readText(writePath);
       if (currentContent === contentStr || !overwrite) {
         this.logger.verbose(`File ${writePath} is unchanged`);
         contentStr = currentContent;
       } else {
-        await FileSys.writeText(writePath, contentStr);
+        await FileSys2.writeText(writePath, contentStr);
         if (Logger2.isVerbose())
           this.logger.rawLog(chalk2.yellow(`File Update: ${filePath}`));
       }
     } else {
-      await FileSys.writeText(writePath, contentStr);
+      await FileSys2.writeText(writePath, contentStr);
       if (!silent)
         this.logger.rawLog(chalk2.green(`File Create: ${filePath}`));
     }
@@ -2578,21 +2235,19 @@ class Executor {
     return { filePath, content };
   }
   async readFile(filePath) {
-    const readPath = this.getPath(filePath);
-    return await FileSys.readText(readPath);
+    return await FileSys2.readText(this.getPath(filePath));
   }
   async readJson(filePath) {
-    const readPath = this.getPath(filePath);
-    return await FileSys.readJson(readPath);
+    return await FileSys2.readJson(this.getPath(filePath));
   }
   async cp(srcPath, destPath, { dereference = false } = {}) {
     const src = this.getPath(srcPath);
     const dest = this.getPath(destPath);
-    if (!await FileSys.exists(src))
+    if (!await FileSys2.exists(src))
       return;
     const isDirectory = (await stat2(src)).isDirectory();
-    if (!await FileSys.exists(dest) && isDirectory)
-      await mkdir3(dest, { recursive: true });
+    if (!await FileSys2.exists(dest) && isDirectory)
+      await mkdir2(dest, { recursive: true });
     if (dereference || process.platform === "win32")
       await cpEntry(src, dest, { recursive: isDirectory, dereference: true, force: true });
     else
@@ -2617,19 +2272,10 @@ class Executor {
   async getTsConfig(pathname = "tsconfig.json", { refresh } = {}) {
     if (this.#tsconfig && !refresh)
       return this.#tsconfig;
-    const tsconfig = await this.readJson(pathname);
+    let tsconfig = await this.readJson(pathname);
     if (tsconfig.extends) {
-      const extendsTsconfig = await this.getTsConfig(tsconfig.extends);
-      const result = {
-        ...extendsTsconfig,
-        ...tsconfig,
-        compilerOptions: {
-          ...extendsTsconfig.compilerOptions,
-          ...tsconfig.compilerOptions
-        }
-      };
-      this.#tsconfig = result;
-      return result;
+      const base = await this.getTsConfig(tsconfig.extends, { refresh });
+      tsconfig = { ...base, ...tsconfig, compilerOptions: { ...base.compilerOptions, ...tsconfig.compilerOptions } };
     }
     this.#tsconfig = tsconfig;
     return tsconfig;
@@ -2665,6 +2311,7 @@ class Executor {
     scanInfo,
     overwrite = true
   }, dict = {}, options = {}) {
+    const convertPath = (target) => Object.entries(dict).reduce((converted, [key, value]) => converted.replace(new RegExp(`__${key}__`, "g"), value), target);
     if (targetPath.endsWith(".ts") || targetPath.endsWith(".tsx")) {
       const getContent = await import(templatePath);
       const result = await getContent.default(scanInfo ?? null, dict, options);
@@ -2672,24 +2319,21 @@ class Executor {
         return null;
       const filename = typeof result === "object" ? result.filename : path8.basename(targetPath).replace(".js", ".ts");
       const content = typeof result === "object" ? result.content : result;
-      const dirname = path8.dirname(targetPath);
-      const convertedTargetPath = Object.entries(dict).reduce((path, [key, value]) => path.replace(new RegExp(`__${key}__`, "g"), value), `${dirname}/${filename}`);
+      const convertedTargetPath = convertPath(`${path8.dirname(targetPath)}/${filename}`);
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       return this.writeFile(convertedTargetPath, content, { overwrite });
     } else if (targetPath.endsWith(".template")) {
-      const content = await FileSys.readText(templatePath);
-      const convertedTargetPath = Object.entries(dict).reduce((path, [key, value]) => path.replace(new RegExp(`__${key}__`, "g"), value), targetPath.slice(0, -9));
+      const content = await FileSys2.readText(templatePath);
+      const convertedTargetPath = convertPath(targetPath.slice(0, -9));
       const convertedContent = Object.entries(dict).reduce((data, [key, value]) => data.replace(new RegExp(`<%= ${key} %>`, "g"), value), content);
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
-      return this.writeFile(convertedTargetPath, convertedContent, {
-        overwrite
-      });
+      return this.writeFile(convertedTargetPath, convertedContent, { overwrite });
     } else if (staticTemplateFileExtensions.has(path8.extname(targetPath).toLowerCase())) {
-      const convertedTargetPath = Object.entries(dict).reduce((path, [key, value]) => path.replace(new RegExp(`__${key}__`, "g"), value), targetPath);
+      const convertedTargetPath = convertPath(targetPath);
       const writePath = this.getPath(convertedTargetPath);
       const dirname = path8.dirname(writePath);
-      if (!await FileSys.dirExists(dirname))
-        await mkdir3(dirname, { recursive: true });
+      if (!await FileSys2.dirExists(dirname))
+        await mkdir2(dirname, { recursive: true });
       await copyFile(templatePath, writePath);
       this.logger.verbose(`Apply template ${templatePath} to ${convertedTargetPath}`);
       return { filePath: writePath, content: "" };
@@ -2706,12 +2350,10 @@ class Executor {
   }) {
     const templateRoot = await this.#resolveTemplateRoot();
     const templatePath = `${templateRoot}${template ? `/${template}` : ""}`;
-    const prefixTemplatePath = templatePath;
-    if ((await stat2(prefixTemplatePath)).isFile()) {
-      const filename = path8.basename(prefixTemplatePath);
+    if ((await stat2(templatePath)).isFile()) {
       const fileContent = await this.#applyTemplateFile({
-        templatePath: prefixTemplatePath,
-        targetPath: path8.join(basePath, filename),
+        templatePath,
+        targetPath: path8.join(basePath, path8.basename(templatePath)),
         scanInfo,
         overwrite
       }, dict, options);
@@ -2747,17 +2389,13 @@ class Executor {
       path8.resolve(getDirname2(import.meta.url), "../cli/templates")
     ];
     for (const candidate of candidates) {
-      if (await FileSys.dirExists(candidate))
+      if (await FileSys2.dirExists(candidate))
         return candidate;
     }
     return candidates[0];
   }
   async applyTemplate(options) {
-    const dict = {
-      ...options.dict ?? {},
-      ...Object.fromEntries(Object.entries(options.dict ?? {}).map(([key, value]) => [capitalize(key), capitalize(value)]))
-    };
-    const fileContents = await this._applyTemplate({ ...options, dict });
+    const fileContents = await this._applyTemplate({ ...options, dict: withCapitalizedDict(options.dict) });
     await this.#formatAppliedTemplate(fileContents);
     return fileContents;
   }
@@ -2774,7 +2412,7 @@ class Executor {
     }
   }
   async getTypeChecker() {
-    const { TypeChecker } = await import("./typeChecker-3xgrzc2v.js");
+    const { TypeChecker } = await import("./typeChecker-px49mezc.js");
     this.typeChecker ??= new TypeChecker(this);
     return this.typeChecker;
   }
@@ -2852,12 +2490,11 @@ class WorkspaceExecutor extends Executor {
     this.workspaceRoot = workspaceRoot;
     this.repoName = repoName;
   }
-  static #execs = new Map;
   static fromRoot({
     workspaceRoot = process.cwd(),
     repoName = resolveRepoName(workspaceRoot)
   } = {}) {
-    return WorkspaceExecutor.#execs.get(repoName) ?? new WorkspaceExecutor({ workspaceRoot, repoName });
+    return new WorkspaceExecutor({ workspaceRoot, repoName });
   }
   static getBaseDevEnv(envPath) {
     const sourceEnv = envPath ? { ...process.env, ...parseEnvFile(envPath) } : process.env;
@@ -2896,13 +2533,9 @@ class WorkspaceExecutor extends Executor {
     return await WorkspaceInfo.fromExecutor(this);
   }
   async getApps() {
-    if (!await FileSys.dirExists(`${this.workspaceRoot}/apps`))
-      return [];
     return await this.#getDirHasFile(`${this.workspaceRoot}/apps`, "akan.config.ts");
   }
   async getLibs() {
-    if (!await FileSys.dirExists(`${this.workspaceRoot}/libs`))
-      return [];
     return await this.#getDirHasFile(`${this.workspaceRoot}/libs`, "akan.config.ts");
   }
   async getSyss() {
@@ -2910,8 +2543,6 @@ class WorkspaceExecutor extends Executor {
     return [appNames, libNames];
   }
   async getPkgs() {
-    if (!await FileSys.dirExists(`${this.workspaceRoot}/pkgs`))
-      return [];
     return await this.#getDirHasFile(`${this.workspaceRoot}/pkgs`, "package.json");
   }
   async getExecs() {
@@ -2976,6 +2607,8 @@ class WorkspaceExecutor extends Executor {
     return stdout.split("\x00").filter((file) => !!file).sort();
   }
   async#getDirHasFile(basePath, targetFilename) {
+    if (!await FileSys2.dirExists(basePath))
+      return [];
     const AVOID_DIRS = ["node_modules", "dist", "public", "webkit"];
     const getDirs = async (dirname, maxDepth = 3, results = [], prefix = "") => {
       const dirs = await this.readdir(dirname);
@@ -2983,8 +2616,8 @@ class WorkspaceExecutor extends Executor {
         if (AVOID_DIRS.includes(dir))
           return;
         const dirPath = path8.join(dirname, dir);
-        if (await FileSys.dirExists(dirPath)) {
-          const hasTargetFile = await FileSys.fileExists(path8.join(dirPath, targetFilename));
+        if (await FileSys2.dirExists(dirPath)) {
+          const hasTargetFile = await FileSys2.fileExists(path8.join(dirPath, targetFilename));
           if (hasTargetFile)
             results.push(`${prefix}${dir}`);
           if (maxDepth > 0)
@@ -2993,39 +2626,25 @@ class WorkspaceExecutor extends Executor {
       }));
       return results;
     };
-    return await getDirs(basePath);
+    return (await getDirs(basePath)).sort((a, b) => a.localeCompare(b));
   }
-  async getScalarConstantFiles() {
+  async#fromEverySys(read) {
     const [appNames, libNames] = await this.getSyss();
-    const scalarConstantExampleFiles = [
-      ...(await Promise.all(appNames.map((appName) => AppExecutor.from(this, appName).getScalarConstantFiles()))).flat(),
-      ...(await Promise.all(libNames.map((libName) => LibExecutor.from(this, libName).getScalarConstantFiles()))).flat()
-    ];
-    return scalarConstantExampleFiles;
+    const fromApps = await Promise.all(appNames.map((appName) => read(AppExecutor.from(this, appName))));
+    const fromLibs = await Promise.all(libNames.map((libName) => read(LibExecutor.from(this, libName))));
+    return [...fromApps.flat(), ...fromLibs.flat()];
+  }
+  async getScalarConstantFiles() {
+    return await this.#fromEverySys((sys) => sys.getScalarConstantFiles());
   }
   async getConstantFiles() {
-    const [appNames, libNames] = await this.getSyss();
-    const moduleConstantExampleFiles = [
-      ...(await Promise.all(appNames.map((appName) => AppExecutor.from(this, appName).getConstantFiles()))).flat(),
-      ...(await Promise.all(libNames.map((libName) => LibExecutor.from(this, libName).getConstantFiles()))).flat()
-    ];
-    return moduleConstantExampleFiles;
+    return await this.#fromEverySys((sys) => sys.getConstantFiles());
   }
   async getDictionaryFiles() {
-    const [appNames, libNames] = await this.getSyss();
-    const moduleDictionaryExampleFiles = [
-      ...(await Promise.all(appNames.map((appName) => AppExecutor.from(this, appName).getDictionaryFiles()))).flat(),
-      ...(await Promise.all(libNames.map((libName) => LibExecutor.from(this, libName).getDictionaryFiles()))).flat()
-    ];
-    return moduleDictionaryExampleFiles;
+    return await this.#fromEverySys((sys) => sys.getDictionaryFiles());
   }
   async getViewFiles() {
-    const [appNames, libNames] = await this.getSyss();
-    const viewExampleFiles = [
-      ...(await Promise.all(appNames.map((appName) => AppExecutor.from(this, appName).getViewsSourceCode()))).flat(),
-      ...(await Promise.all(libNames.map((libName) => LibExecutor.from(this, libName).getViewsSourceCode()))).flat()
-    ];
-    return viewExampleFiles;
+    return await this.#fromEverySys((sys) => sys.getViewsSourceCode());
   }
 }
 var scanFacetDirs = ["ui", "webkit", "srvkit", "common", "plugin"];
@@ -3089,24 +2708,11 @@ class SysExecutor extends Executor {
         scanInfo,
         options: { exec: this, facet }
       })),
-      ...scanInfo.getDatabaseModules().map((model) => this._applyTemplate({
-        basePath: `lib/${model}`,
-        template: "moduleRoot",
-        scanInfo,
-        dict: { model, Model: capitalize(model) }
-      })),
-      ...scanInfo.getServiceModules().map((model) => this._applyTemplate({
-        basePath: `lib/_${model}`,
-        template: "moduleRoot",
-        scanInfo,
-        dict: { model, Model: capitalize(model) }
-      })),
-      ...scanInfo.getScalarModules().map((model) => this._applyTemplate({
-        basePath: `lib/__scalar/${model}`,
-        template: "moduleRoot",
-        scanInfo,
-        dict: { model, Model: capitalize(model) }
-      }))
+      ...[
+        ...scanInfo.getDatabaseModules().map((model) => [model, `lib/${model}`]),
+        ...scanInfo.getServiceModules().map((model) => [model, `lib/_${model}`]),
+        ...scanInfo.getScalarModules().map((model) => [model, `lib/__scalar/${model}`])
+      ].map(([model, basePath]) => this._applyTemplate({ basePath, template: "moduleRoot", scanInfo, dict: { model, Model: capitalize(model) } }))
     ];
   }
   async scan({
@@ -3173,40 +2779,38 @@ class SysExecutor extends Executor {
     return { filePath, content };
   }
   async getDatabaseModules() {
-    const databaseModules = (await this.readdir("lib")).filter((name) => !name.startsWith("_") && !name.startsWith("__") && !name.endsWith(".ts")).filter((name) => Bun.file(`${this.cwdPath}/lib/${name}/${name}.constant.ts`).exists());
-    return databaseModules;
+    return (await this.readdir("lib")).filter((name) => !name.startsWith("_") && !name.endsWith(".ts")).filter((name) => existsSync2(`${this.cwdPath}/lib/${name}/${name}.constant.ts`));
   }
   async getServiceModules() {
-    const serviceModules = (await this.readdir("lib")).filter((name) => name.startsWith("_") && !name.startsWith("__")).filter((name) => Bun.file(`${this.cwdPath}/lib/${name}/${name}.service.ts`).exists());
-    return serviceModules;
+    return (await this.readdir("lib")).filter((name) => name.startsWith("_") && !name.startsWith("__")).filter((name) => existsSync2(`${this.cwdPath}/lib/${name}/${name.slice(1)}.service.ts`));
   }
   async getScalarModules() {
-    const scalarModules = (await this.readdir("lib/__scalar")).filter((name) => !name.startsWith("_")).filter((name) => Bun.file(`${this.cwdPath}/lib/__scalar/${name}/${name}.constant.ts`).exists());
-    return scalarModules;
+    return (await this.readdir("lib/__scalar")).filter((name) => !name.startsWith("_")).filter((name) => existsSync2(`${this.cwdPath}/lib/__scalar/${name}/${name}.constant.ts`));
+  }
+  async#getComponentModules(role) {
+    return (await this.readdir("lib")).filter((name) => !name.startsWith("_") && !name.endsWith(".ts")).filter((name) => existsSync2(`${this.cwdPath}/lib/${name}/${capitalize(name)}.${role}.tsx`));
+  }
+  async#getComponentSources(role) {
+    const modules = await this.#getComponentModules(role);
+    return Promise.all(modules.map((name) => this.getLocalFile(`lib/${name}/${capitalize(name)}.${role}.tsx`)));
   }
   async getViewComponents() {
-    const viewComponents = (await this.readdir("lib")).filter((name) => !name.startsWith("_") && !name.startsWith("__") && !name.endsWith(".ts")).filter((name) => Bun.file(`${this.cwdPath}/lib/${name}/${capitalize(name)}.View.tsx`).exists());
-    return viewComponents;
+    return await this.#getComponentModules("View");
   }
   async getUnitComponents() {
-    const unitComponents = (await this.readdir("lib")).filter((name) => !name.startsWith("_") && !name.startsWith("__") && !name.endsWith(".ts")).filter((name) => Bun.file(`${this.cwdPath}/lib/${name}/${capitalize(name)}.Unit.tsx`).exists());
-    return unitComponents;
+    return await this.#getComponentModules("Unit");
   }
   async getTemplateComponents() {
-    const templateComponents = (await this.readdir("lib")).filter((name) => !name.startsWith("_") && !name.startsWith("__") && !name.endsWith(".ts")).filter((name) => Bun.file(`${this.cwdPath}/lib/${name}/${capitalize(name)}.Template.tsx`).exists());
-    return templateComponents;
+    return await this.#getComponentModules("Template");
   }
   async getViewsSourceCode() {
-    const viewComponents = await this.getViewComponents();
-    return Promise.all(viewComponents.map((viewComponent) => this.getLocalFile(`lib/${viewComponent}/${capitalize(viewComponent)}.View.tsx`)));
+    return await this.#getComponentSources("View");
   }
   async getUnitsSourceCode() {
-    const unitComponents = await this.getUnitComponents();
-    return Promise.all(unitComponents.map((unitComponent) => this.getLocalFile(`lib/${unitComponent}/${capitalize(unitComponent)}.Unit.tsx`)));
+    return await this.#getComponentSources("Unit");
   }
   async getTemplatesSourceCode() {
-    const templateComponents = await this.getTemplateComponents();
-    return Promise.all(templateComponents.map((templateComponent) => this.getLocalFile(`lib/${templateComponent}/${capitalize(templateComponent)}.Template.tsx`)));
+    return await this.#getComponentSources("Template");
   }
   async getScalarConstantFiles() {
     const scalarModules = await this.getScalarModules();
@@ -3214,7 +2818,7 @@ class SysExecutor extends Executor {
   }
   async getScalarDictionaryFiles() {
     const scalarModules = await this.getScalarModules();
-    return Promise.all(scalarModules.map((scalarModule) => this.getLocalFile(`lib/${scalarModule}/${scalarModule}.dictionary.ts`)));
+    return Promise.all(scalarModules.map((scalarModule) => this.getLocalFile(`lib/__scalar/${scalarModule}/${scalarModule}.dictionary.ts`)));
   }
   async getConstantFiles() {
     const modules = await this.getModules();
@@ -3236,16 +2840,8 @@ class SysExecutor extends Executor {
     return Promise.all(modules.map((module) => this.getLocalFile(`lib/${module}/${module}.dictionary.ts`)));
   }
   async applyTemplate(options) {
-    const dict = {
-      ...options.dict ?? {},
-      ...Object.fromEntries(Object.entries(options.dict ?? {}).map(([key, value]) => [capitalize(key), capitalize(value)]))
-    };
     const scanInfo = await this.scan();
-    const fileContents = await this._applyTemplate({
-      ...options,
-      scanInfo,
-      dict
-    });
+    const fileContents = await this._applyTemplate({ ...options, scanInfo, dict: withCapitalizedDict(options.dict) });
     await this.scan();
     return fileContents;
   }
@@ -3263,15 +2859,8 @@ class AppExecutor extends SysExecutor {
     super({ workspace, name, type: "app" });
     this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/apps/${name}`);
   }
-  static #execs = new Map;
   static from(executor, name) {
-    const exec = AppExecutor.#execs.get(name);
-    if (exec)
-      return exec;
-    else if (executor instanceof WorkspaceExecutor)
-      return new AppExecutor({ workspace: executor, name });
-    else
-      return new AppExecutor({ workspace: executor.workspace, name });
+    return new AppExecutor({ workspace: executor instanceof WorkspaceExecutor ? executor : executor.workspace, name });
   }
   getEnv() {
     return WorkspaceExecutor.getBaseDevEnv().env;
@@ -3287,10 +2876,8 @@ class AppExecutor extends SysExecutor {
     return basePort + appIndex + portOffset;
   }
   getCommandEnv(env = {}) {
-    const basePort = 8282;
-    const portOffset = WorkspaceExecutor.getBaseDevEnv().portOffset;
-    const PORT = (basePort + portOffset).toString();
-    const AKAN_PUBLIC_SERVER_PORT = portOffset ? (8282 + portOffset).toString() : undefined;
+    const { portOffset } = WorkspaceExecutor.getBaseDevEnv();
+    const PORT = (8282 + portOffset).toString();
     return {
       ...process.env,
       AKAN_PUBLIC_APP_NAME: this.name,
@@ -3298,7 +2885,7 @@ class AppExecutor extends SysExecutor {
       NODE_NO_WARNINGS: "1",
       PORT,
       AKAN_PUBLIC_CLIENT_PORT: PORT,
-      ...AKAN_PUBLIC_SERVER_PORT ? { AKAN_PUBLIC_SERVER_PORT } : {},
+      ...portOffset ? { AKAN_PUBLIC_SERVER_PORT: PORT } : {},
       ...env
     };
   }
@@ -3355,16 +2942,7 @@ class AppExecutor extends SysExecutor {
     if (this.#publicEnv)
       return this.#publicEnv;
     const searchPatterns = [...patterns, "AKAN_PUBLIC_*"];
-    const regexes = searchPatterns.map((pattern) => {
-      let body = "";
-      for (const ch of pattern) {
-        if (ch === "*")
-          body += ".*";
-        else
-          body += ch.replace(/[.+^${}()|[\]\\?]/g, "\\$&");
-      }
-      return new RegExp(`^${body}$`);
-    });
+    const regexes = searchPatterns.map((pattern) => new RegExp(`^${pattern.split("*").map((part) => part.replace(/[.+^${}()|[\]\\?]/g, "\\$&")).join(".*")}$`));
     const publicEnv = {};
     for (const [k, v] of Object.entries(process.env)) {
       if (typeof v !== "string")
@@ -3396,7 +2974,7 @@ class AppExecutor extends SysExecutor {
     const pageRoots = await this.getPageRoots();
     const libKeyPrefixes = pageRoots.map((root) => root.keyPrefix).filter(Boolean);
     for (const root of pageRoots) {
-      if (!await FileSys.dirExists(root.dir))
+      if (!await FileSys2.dirExists(root.dir))
         continue;
       for await (const rel of glob.scan({
         cwd: root.dir,
@@ -3473,7 +3051,7 @@ class AppExecutor extends SysExecutor {
       const entries = await readDirEntries(libsDir).catch(() => []);
       for (const entry of entries.sort()) {
         const dir = `${libsDir}/${entry}`;
-        if (!await FileSys.dirExists(dir))
+        if (!await FileSys2.dirExists(dir))
           continue;
         roots.push({ dir, realDir: await realpath(dir), keyPrefix: `${parent}${AppExecutor.#pageLibsDir}/${entry}/` });
       }
@@ -3515,7 +3093,7 @@ class AppExecutor extends SysExecutor {
   async#resolvePageLibs(syncPageLibs, libDeps) {
     if (!syncPageLibs)
       return [];
-    const hasPageDir = async (lib) => await FileSys.dirExists(`${this.workspace.workspaceRoot}/libs/${lib}/page`);
+    const hasPageDir = async (lib) => await FileSys2.dirExists(`${this.workspace.workspaceRoot}/libs/${lib}/page`);
     if (syncPageLibs === true) {
       const libs = [];
       for (const lib of libDeps)
@@ -3555,7 +3133,7 @@ class AppExecutor extends SysExecutor {
     } catch (error) {
       if (!isWindows)
         throw error;
-      await mkdir3(linkPath, { recursive: true });
+      await mkdir2(linkPath, { recursive: true });
       await cpEntry(targetPath, linkPath, { recursive: true, dereference: true, force: true });
     }
   }
@@ -3587,14 +3165,14 @@ class AppExecutor extends SysExecutor {
       appPath: this.cwdPath,
       executor: this,
       getPath: (rel) => this.getPath(rel),
-      fileExists: (rel) => FileSys.fileExists(this.getPath(rel)),
+      fileExists: (rel) => FileSys2.fileExists(this.getPath(rel)),
       readFile: (rel) => this.readFile(rel),
       writeFile: async (rel, content, opts) => {
         await this.writeFile(rel, content, opts);
       },
       readEnvClient: async () => {
         const envClientPath = path8.join(this.cwdPath, "env", "env.client.ts");
-        if (!await FileSys.fileExists(envClientPath))
+        if (!await FileSys2.fileExists(envClientPath))
           return null;
         try {
           const envUrl = pathToFileURL(envClientPath);
@@ -3650,15 +3228,8 @@ class LibExecutor extends SysExecutor {
     super({ workspace, name, type: "lib" });
     this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/libs/${name}`);
   }
-  static #execs = new Map;
   static from(executor, name) {
-    const exec = LibExecutor.#execs.get(name);
-    if (exec)
-      return exec;
-    else if (executor instanceof WorkspaceExecutor)
-      return new LibExecutor({ workspace: executor, name });
-    else
-      return new LibExecutor({ workspace: executor.workspace, name });
+    return new LibExecutor({ workspace: executor instanceof WorkspaceExecutor ? executor : executor.workspace, name });
   }
   #akanConfig = null;
   async getConfig({ refresh } = {}) {
@@ -3681,9 +3252,7 @@ class PkgExecutor extends Executor {
     this.dist = new Executor(`dist/${name}`, `${this.workspace.workspaceRoot}/dist/pkgs/${name}`);
   }
   static from(executor, name) {
-    if (executor instanceof WorkspaceExecutor)
-      return new PkgExecutor({ workspace: executor, name });
-    return new PkgExecutor({ workspace: executor.workspace, name });
+    return new PkgExecutor({ workspace: executor instanceof WorkspaceExecutor ? executor : executor.workspace, name });
   }
   #scanInfo = null;
   async scan({ refresh } = {}) {
@@ -3729,16 +3298,8 @@ class PkgExecutor extends Executor {
     }
     if (missingDeps.length > 0)
       throw new Error(`Missing dependency versions in root package.json: ${missingDeps.join(", ")}`);
-    const toDependencyEntries = (names) => names.map((dep) => {
-      const version = dependencyVersions.get(dep);
-      if (!version)
-        throw new Error(`Missing dependency versions in root package.json: ${dep}`);
-      return [dep, version];
-    });
-    return {
-      dependencies: Object.fromEntries(toDependencyEntries(dependencyNames)),
-      devDependencies: Object.fromEntries(toDependencyEntries(devDependencyNames))
-    };
+    const toDependencyMap = (names) => Object.fromEntries(names.map((dep) => [dep, dependencyVersions.get(dep)]));
+    return { dependencies: toDependencyMap(dependencyNames), devDependencies: toDependencyMap(devDependencyNames) };
   }
   async updatePackageJsonDependencies(dependencies = [], devDependencies = []) {
     const [rootPackageJson, pkgJson] = await Promise.all([this.workspace.getPackageJson(), this.getPackageJson()]);