@akanjs/cli 2.1.1 → 2.1.2-rc.1

package/incrementalBuilder.proc.js

@@ -205,11 +205,13 @@ class HttpClient {
 class CloudApi {
   #api;
   #accessToken = null;
-  static async fromHost(host) {
+  #workspace;
+  static async fromHost(workspace, host) {
     const hostConfig = await GlobalConfig.getHostConfig(host);
-    return new CloudApi(hostConfig);
+    return new CloudApi(workspace, hostConfig);
   }
-  constructor(hostConfig) {
+  constructor(workspace, hostConfig) {
+    this.#workspace = workspace;
     const host = akanCloudHost;
     this.#api = new HttpClient(`${host}/api`);
     this.#accessToken = hostConfig.auth?.accessToken ?? null;
@@ -225,16 +227,18 @@ class CloudApi {
     const data = await this.#api.post(`/uploadEnv/${devProjectId}`, formData);
     return data;
   }
-  async downloadEnv(devProjectId, localPath) {
+  async downloadEnv(devProjectId) {
+    const localPath = `${this.#workspace.workspaceRoot}/local/env.tar`;
     await this.#api.getFile(`/downloadEnv/${devProjectId}`, localPath);
+    return localPath;
   }
   async getRemoteAuthToken(remoteId) {
     try {
       if (this.#accessToken) {
         if (GlobalConfig.needRefreshToken(this.#accessToken))
-          return await this.refreshAuthToken();
+          return await this.#refreshAuthToken();
         else
-          return await this.refreshAuthToken();
+          return await this.#refreshAuthToken();
       }
       const accessToken = await this.#api.get(`/getRemoteAuthToken/${remoteId}`);
       this.#accessToken = GlobalConfig.toAccessToken(accessToken);
@@ -246,10 +250,14 @@ class CloudApi {
       return null;
     }
   }
-  async refreshAuthToken() {
-    const response = await this.#api.post(`/refreshRemoteAuthToken`, {
-      refreshToken: this.#accessToken?.refreshToken
-    });
+  async#refreshAuthToken() {
+    const refreshToken = this.#accessToken?.refreshToken;
+    if (!refreshToken)
+      throw new Error("No refresh token");
+    return await this.refreshAuthToken(refreshToken);
+  }
+  async refreshAuthToken(refreshToken) {
+    const response = await this.#api.post(`/refreshRemoteAuthToken`, { refreshToken });
     this.#accessToken = GlobalConfig.toAccessToken(response);
     this.#api.setHeaders({ Authorization: `Bearer ${this.#accessToken.jwt}` });
     return this.#accessToken;
@@ -652,12 +660,7 @@ import {
   spawn as spawn2
 } from "child_process";
 import { readFileSync as readFileSync3 } from "fs";
-import {
-  copyFile,
-  mkdir as mkdir2,
-  readdir as readDirEntries,
-  stat as stat2
-} from "fs/promises";
+import { copyFile, mkdir as mkdir2, readdir as readDirEntries, stat as stat2 } from "fs/promises";
 import path7 from "path";
 import {
   capitalize,
@@ -709,8 +712,18 @@ var DEFAULT_OPTIMIZE_IMPORTS = [
   "mui-core",
   "react-icons/*"
 ];
-var WORKSPACE_BARREL_FACETS = ["ui", "webkit", "common", "client", "server"];
-var SSR_RUNTIME_PACKAGES = ["react", "react-dom", "react-server-dom-webpack"];
+var WORKSPACE_BARREL_FACETS = [
+  "ui",
+  "webkit",
+  "common",
+  "client",
+  "server"
+];
+var SSR_RUNTIME_PACKAGES = [
+  "react",
+  "react-dom",
+  "react-server-dom-webpack"
+];
 var NATIVE_RUNTIME_PACKAGES = ["sharp"];
 var DEFAULT_BACKEND_RUNTIME_PACKAGES = ["croner"];
 var DATABASE_MODE_RUNTIME_PACKAGES = {
@@ -770,7 +783,12 @@ class AkanAppConfig {
       ...libs.flatMap((lib) => WORKSPACE_BARREL_FACETS.map((facet) => `@libs/${lib}/${facet}`)),
       ...config?.barrelImports ?? []
     ];
-    this.optimizeImports = [...new Set([...DEFAULT_OPTIMIZE_IMPORTS, ...config?.optimizeImports ?? []])];
+    this.optimizeImports = [
+      ...new Set([
+        ...DEFAULT_OPTIMIZE_IMPORTS,
+        ...config?.optimizeImports ?? []
+      ])
+    ];
     this.images = mergeImageConfig(config?.images);
     this.i18n = resolveAkanI18nConfig(config?.i18n);
     process.env.AKAN_PUBLIC_DEFAULT_LOCALE = this.i18n.defaultLocale;
@@ -881,7 +899,13 @@ class AkanAppConfig {
   }
   #makeDockerContent(docker) {
     if (docker.content)
-      return { content: docker.content, image: {}, preRuns: [], postRuns: [], command: [] };
+      return {
+        content: docker.content,
+        image: {},
+        preRuns: [],
+        postRuns: [],
+        command: []
+      };
     const preRunScripts = this.#getDockerRunScripts(docker.preRuns ?? []);
     const postRunScripts = this.#getDockerRunScripts(docker.postRuns ?? []);
     const imageScript = docker.image ? this.#getDockerImageScript(docker.image, "oven/bun:1-slim") : "FROM oven/bun:1-slim";
@@ -912,7 +936,13 @@ ENV AKAN_PUBLIC_LOCALES=${this.i18n.locales.join(",")}
 ENV AKAN_PUBLIC_OPERATION_MODE=cloud
 
 CMD [${command.map((c) => `"${c}"`).join(",")}]`;
-    return { content, image: imageScript, preRuns: docker.preRuns ?? [], postRuns: docker.postRuns ?? [], command };
+    return {
+      content,
+      image: imageScript,
+      preRuns: docker.preRuns ?? [],
+      postRuns: docker.postRuns ?? [],
+      command
+    };
   }
   static async from(app) {
     const [configImp, baseDevEnv, libs, rootPackageJson] = await Promise.all([
@@ -938,9 +968,24 @@ CMD [${command.map((c) => `"${c}"`).join(",")}]`;
       ...SSR_RUNTIME_PACKAGES,
       ...NATIVE_RUNTIME_PACKAGES,
       ...DEFAULT_BACKEND_RUNTIME_PACKAGES,
-      ...DATABASE_MODE_RUNTIME_PACKAGES[this.defaultDatabaseMode]
+      ...this.getDatabaseModeRuntimePackages()
     ];
   }
+  getDatabaseModeRuntimePackages(databaseMode = this.defaultDatabaseMode) {
+    return [...DATABASE_MODE_RUNTIME_PACKAGES[databaseMode]];
+  }
+  getMissingDatabaseModeDependencySpecs(databaseMode = this.defaultDatabaseMode) {
+    const rootDependencies = {
+      ...this.rootPackageJson.dependencies,
+      ...this.rootPackageJson.devDependencies
+    };
+    return this.getDatabaseModeRuntimePackages(databaseMode).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}`;
+    });
+  }
   getProductionPackageJson(data = {}) {
     return {
       name: this.app.name,
@@ -976,7 +1021,12 @@ function getAkanPackageJson() {
       return akanPackageJson;
     } catch {}
   }
-  akanPackageJson = { name: "akanjs", version: "0.0.0", description: "akanjs", dependencies: {} };
+  akanPackageJson = {
+    name: "akanjs",
+    version: "0.0.0",
+    description: "akanjs",
+    dependencies: {}
+  };
   return akanPackageJson;
 }
 function mergeImageConfig(config = {}) {
@@ -1000,7 +1050,9 @@ class AkanLibConfig {
     this.externalLibs = config?.externalLibs ?? [];
   }
   static async from(lib) {
-    const [configImp] = await Promise.all([import(`${lib.cwdPath}/akan.config.ts`).then((mod) => mod.default)]);
+    const [configImp] = await Promise.all([
+      import(`${lib.cwdPath}/akan.config.ts`).then((mod) => mod.default)
+    ]);
     const config = typeof configImp === "function" ? configImp(lib) : configImp;
     return new AkanLibConfig(lib, config);
   }
@@ -2374,13 +2426,8 @@ class CommandExecutionError extends Error {
     const displayCommand = formatCommandForDisplay(command, args);
     const status = signal ? `signal: ${signal}` : `exit code: ${code ?? "unknown"}`;
     const output = (stderr || stdout).trim();
-    super([
-      `Command failed: ${displayCommand}`,
-      `cwd: ${cwd}`,
-      status,
-      output ? `
-${output}` : ""
-    ].join(`
+    super([`Command failed: ${displayCommand}`, `cwd: ${cwd}`, status, output ? `
+${output}` : ""].join(`
 `), {
       cause
     });
@@ -2429,13 +2476,7 @@ var parseEnvFile = (envPath) => {
   }
   return env;
 };
-var PAGE_ROUTE_EXPORTS = new Set([
-  "default",
-  "pageConfig",
-  "head",
-  "generateHead",
-  "Loading"
-]);
+var PAGE_ROUTE_EXPORTS = new Set(["default", "pageConfig", "head", "generateHead", "Loading"]);
 var ROOT_LAYOUT_EXPORTS = new Set([
   "default",
   "head",
@@ -2446,14 +2487,11 @@ var ROOT_LAYOUT_EXPORTS = new Set([
   "reconnect",
   "layoutStyle",
   "gaTrackingId",
-  "Loading"
-]);
-var LAYOUT_ROUTE_EXPORTS = new Set([
-  "default",
-  "head",
-  "generateHead",
-  "Loading"
+  "Loading",
+  "NotFound",
+  "Error"
 ]);
+var LAYOUT_ROUTE_EXPORTS = new Set(["default", "head", "generateHead", "Loading", "NotFound", "Error"]);
 function validateRouteSourceExports(source, filePath, kind, options = {}) {
   const sourceFile = ts3.createSourceFile(filePath, source, ts3.ScriptTarget.Latest, true, ts3.ScriptKind.TSX);
   const allowed = kind === "page" ? PAGE_ROUTE_EXPORTS : options.rootLayout ? ROOT_LAYOUT_EXPORTS : LAYOUT_ROUTE_EXPORTS;
@@ -2800,11 +2838,7 @@ class Executor {
     this.logger.debug(msg);
     return this;
   }
-  spinning(msg, {
-    prefix = `${this.emoji}${this.name}`,
-    indent = 0,
-    enableSpin = !Executor.verbose
-  } = {}) {
+  spinning(msg, { prefix = `${this.emoji}${this.name}`, indent = 0, enableSpin = !Executor.verbose } = {}) {
     return new Spinner(msg, { prefix, indent, enableSpin }).start();
   }
   #tsconfig = null;
@@ -2833,9 +2867,7 @@ class Executor {
     this.#tsconfig = tsconfig;
   }
   #packageJson = null;
-  async getPackageJson({
-    refresh
-  } = {}) {
+  async getPackageJson({ refresh } = {}) {
     if (this.#packageJson && !refresh)
       return this.#packageJson;
     const packageJson = await this.readJson("package.json");
@@ -2951,10 +2983,7 @@ class Executor {
   async applyTemplate(options) {
     const dict = {
       ...options.dict ?? {},
-      ...Object.fromEntries(Object.entries(options.dict ?? {}).map(([key, value]) => [
-        capitalize(key),
-        capitalize(value)
-      ]))
+      ...Object.fromEntries(Object.entries(options.dict ?? {}).map(([key, value]) => [capitalize(key), capitalize(value)]))
     };
     return this._applyTemplate({ ...options, dict });
   }
@@ -3090,10 +3119,7 @@ class WorkspaceExecutor extends Executor {
     return await this.#getDirHasFile(`${this.workspaceRoot}/libs`, "akan.config.ts");
   }
   async getSyss() {
-    const [appNames, libNames] = await Promise.all([
-      this.getApps(),
-      this.getLibs()
-    ]);
+    const [appNames, libNames] = await Promise.all([this.getApps(), this.getLibs()]);
     return [appNames, libNames];
   }
   async getPkgs() {
@@ -3102,11 +3128,7 @@ class WorkspaceExecutor extends Executor {
     return await this.#getDirHasFile(`${this.workspaceRoot}/pkgs`, "package.json");
   }
   async getExecs() {
-    const [appNames, libNames, pkgNames] = await Promise.all([
-      this.getApps(),
-      this.getLibs(),
-      this.getPkgs()
-    ]);
+    const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
     return [appNames, libNames, pkgNames];
   }
   async setPkgTsPaths(name) {
@@ -3124,10 +3146,7 @@ class WorkspaceExecutor extends Executor {
   async unsetPkgTsPaths(name) {
     const rootTsConfig = await this.readJson("tsconfig.json");
     const filteredKeys = Object.keys(rootTsConfig.compilerOptions.paths ?? {}).filter((key) => key !== name && key !== `${name}/*`);
-    rootTsConfig.compilerOptions.paths = Object.fromEntries(filteredKeys.map((key) => [
-      key,
-      rootTsConfig.compilerOptions.paths?.[key] ?? []
-    ]));
+    rootTsConfig.compilerOptions.paths = Object.fromEntries(filteredKeys.map((key) => [key, rootTsConfig.compilerOptions.paths?.[key] ?? []]));
     if (rootTsConfig.references) {
       rootTsConfig.references = rootTsConfig.references.filter((ref) => ref.path !== `./pkgs/${name}/tsconfig.json`);
     }
@@ -3219,11 +3238,7 @@ class SysExecutor extends Executor {
   name;
   type;
   emoji;
-  constructor({
-    workspace = WorkspaceExecutor.fromRoot(),
-    name,
-    type
-  }) {
+  constructor({ workspace = WorkspaceExecutor.fromRoot(), name, type }) {
     super(name, `${workspace.workspaceRoot}/${type}s/${name}`);
     this.workspace = workspace;
     this.name = name;
@@ -3326,10 +3341,7 @@ class SysExecutor extends Executor {
       },
       devDependencies: {
         ...Object.fromEntries(Object.entries(libPackageJson.devDependencies ?? {}).filter(([dep]) => !dependencySet.has(dep))),
-        ...Object.fromEntries(devDependencies.filter((dep) => rootPackageJson.dependencies?.[dep] || rootPackageJson.devDependencies?.[dep]).sort().map((dep) => [
-          dep,
-          rootPackageJson.devDependencies?.[dep] ?? rootPackageJson.dependencies?.[dep]
-        ]))
+        ...Object.fromEntries(devDependencies.filter((dep) => rootPackageJson.dependencies?.[dep] || rootPackageJson.devDependencies?.[dep]).sort().map((dep) => [dep, rootPackageJson.devDependencies?.[dep] ?? rootPackageJson.dependencies?.[dep]]))
       }
     };
     await this.setPackageJson(libPkgJsonWithDeps);
@@ -3396,11 +3408,7 @@ class SysExecutor extends Executor {
       ...await LibExecutor.from(this, lib).getConstantFiles(),
       ...await LibExecutor.from(this, lib).getScalarConstantFiles()
     ]));
-    return [
-      ...sysContantFiles,
-      ...sysScalarConstantFiles,
-      ...libConstantFiles.flat()
-    ];
+    return [...sysContantFiles, ...sysScalarConstantFiles, ...libConstantFiles.flat()];
   }
   async getDictionaryFiles() {
     const modules = await this.getModules();
@@ -3409,10 +3417,7 @@ class SysExecutor extends Executor {
   async applyTemplate(options) {
     const dict = {
       ...options.dict ?? {},
-      ...Object.fromEntries(Object.entries(options.dict ?? {}).map(([key, value]) => [
-        capitalize(key),
-        capitalize(value)
-      ]))
+      ...Object.fromEntries(Object.entries(options.dict ?? {}).map(([key, value]) => [capitalize(key), capitalize(value)]))
     };
     const scanInfo = await this.scan();
     const fileContents = await this._applyTemplate({
@@ -3445,6 +3450,13 @@ class AppExecutor extends SysExecutor {
   getEnv() {
     return WorkspaceExecutor.getBaseDevEnv().env;
   }
+  async getDevPort() {
+    const basePort = 8282;
+    const appNames = (await this.workspace.getApps()).sort((a, b) => a.localeCompare(b));
+    const appIndex = Math.max(appNames.indexOf(this.name), 0);
+    const portOffset = WorkspaceExecutor.getBaseDevEnv().portOffset;
+    return basePort + appIndex + portOffset;
+  }
   getCommandEnv(env = {}) {
     const basePort = 8282;
     const portOffset = WorkspaceExecutor.getBaseDevEnv().portOffset;
@@ -3471,17 +3483,19 @@ class AppExecutor extends SysExecutor {
     if (type === "build") {
       if (await this.exists(this.dist.cwdPath))
         await this.dist.exec(`rm -rf ${this.dist.cwdPath}`);
-      await Promise.all([
-        this.dist.mkdir("private"),
-        this.dist.mkdir("public")
-      ]);
+      await Promise.all([this.dist.mkdir("private"), this.dist.mkdir("public")]);
       await Promise.all([
         this.cp("private", `${this.dist.cwdPath}/private`),
         this.cp("public", `${this.dist.cwdPath}/public`)
       ]);
     } else
       await this.removeDir(".akan");
-    const env = this.getCommandEnv({ AKAN_COMMAND_TYPE: type, ...routeEnv });
+    const devPort = type === "start" ? (await this.getDevPort()).toString() : undefined;
+    const env = this.getCommandEnv({
+      AKAN_COMMAND_TYPE: type,
+      ...routeEnv,
+      ...devPort ? { PORT: devPort, AKAN_PUBLIC_CLIENT_PORT: devPort, AKAN_PUBLIC_SERVER_PORT: devPort } : {}
+    });
     return { env };
   }
   #publicEnv = null;
@@ -3517,9 +3531,7 @@ class AppExecutor extends SysExecutor {
     return this.#akanConfig;
   }
   #pageKeys = null;
-  async getPageKeys({
-    refresh
-  } = {}) {
+  async getPageKeys({ refresh } = {}) {
     if (this.#pageKeys && !refresh)
       return this.#pageKeys;
     const akanConfig2 = await this.getConfig();
@@ -3568,10 +3580,7 @@ class AppExecutor extends SysExecutor {
     const projectAssetsPath = `${this.cwdPath}/private`;
     const projectPublicLibPath = `${projectPublicPath}/libs`;
     const projectAssetsLibPath = `${projectAssetsPath}/libs`;
-    await Promise.all([
-      this.removeDir(projectPublicLibPath),
-      this.removeDir(projectAssetsLibPath)
-    ]);
+    await Promise.all([this.removeDir(projectPublicLibPath), this.removeDir(projectAssetsLibPath)]);
     const targetPublicDeps = [];
     for (const dep of libDeps) {
       if (await this.exists(`${this.workspace.workspaceRoot}/libs/${dep}/public`))
@@ -3589,10 +3598,7 @@ class AppExecutor extends SysExecutor {
       ...targetAssetsDeps.map((dep) => this.cp(`${this.workspace.workspaceRoot}/libs/${dep}/private`, `${projectAssetsLibPath}/${dep}`))
     ]);
   }
-  async scanSync({
-    refresh = false,
-    write = true
-  } = {}) {
+  async scanSync({ refresh = false, write = true } = {}) {
     const scanInfo = await this.scan({
       refresh,
       write,
@@ -3641,10 +3647,7 @@ class PkgExecutor extends Executor {
   name;
   dist;
   emoji = execEmoji.pkg;
-  constructor({
-    workspace = WorkspaceExecutor.fromRoot(),
-    name
-  }) {
+  constructor({ workspace = WorkspaceExecutor.fromRoot(), name }) {
     super(name, `${workspace.workspaceRoot}/pkgs/${name}`);
     this.workspace = workspace;
     this.name = name;
@@ -3708,10 +3711,7 @@ class PkgExecutor extends Executor {
     };
   }
   async updatePackageJsonDependencies(dependencies = [], devDependencies = []) {
-    const [rootPackageJson, pkgJson] = await Promise.all([
-      this.workspace.getPackageJson(),
-      this.getPackageJson()
-    ]);
+    const [rootPackageJson, pkgJson] = await Promise.all([this.workspace.getPackageJson(), this.getPackageJson()]);
     const dependencyMaps = await this.#toDependencyMap(rootPackageJson, dependencies, devDependencies);
     const newPkgJson = {
       ...pkgJson,
@@ -3721,10 +3721,7 @@ class PkgExecutor extends Executor {
     return newPkgJson;
   }
   async generateDistPackageJson(dependencies = [], devDependencies = []) {
-    const [rootPackageJson, pkgJson] = await Promise.all([
-      this.workspace.getPackageJson(),
-      this.getPackageJson()
-    ]);
+    const [rootPackageJson, pkgJson] = await Promise.all([this.workspace.getPackageJson(), this.getPackageJson()]);
     const dependencyMaps = await this.#toDependencyMap(rootPackageJson, dependencies, devDependencies);
     const distPkgJson = {
       ...pkgJson,
@@ -3740,10 +3737,7 @@ class PkgExecutor extends Executor {
       engines: { bun: ">=1.3.13" },
       ...dependencyMaps
     };
-    await Promise.all([
-      this.dist.writeJson("package.json", distPkgJson),
-      this.writeJson("package.json", distPkgJson)
-    ]);
+    await Promise.all([this.dist.writeJson("package.json", distPkgJson), this.writeJson("package.json", distPkgJson)]);
     return distPkgJson;
   }
   async build() {
@@ -3756,10 +3750,7 @@ class PkgExecutor extends Executor {
     await this.cp(`${this.cwdPath}/dist`, this.dist.cwdPath);
   }
   async generateTsconfigJson() {
-    const [rootTsconfig, pkgTsconfig] = await Promise.all([
-      this.workspace.getTsConfig(),
-      this.getTsConfig()
-    ]);
+    const [rootTsconfig, pkgTsconfig] = await Promise.all([this.workspace.getTsConfig(), this.getTsConfig()]);
     const tsconfig = {
       ...rootTsconfig,
       ...pkgTsconfig,
@@ -4630,6 +4621,9 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
+export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
+export const Error = userLayout.Error ?? inheritedLayout.Error;
+
 export default function GeneratedLayout({ children, params, searchParams }: LayoutProps) {
   return (
     <System.Provider
@@ -4659,6 +4653,9 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
+export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
+export const Error = userLayout.Error ?? inheritedLayout.Error;
+
 export default function GeneratedLayout({ children, params, searchParams }: LayoutProps) {
   return <UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>;
 }