@akanjs/cli 0.0.86 → 0.0.88

package/index.js

@@ -32,40 +32,25 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 var __decorateParam = (index, decorator) => (target, key) => decorator(target, key, index);
 
-// pkgs/@akanjs/devkit/src/baseDevEnv.ts
-var getBaseDevEnv = () => {
-  const appName = process.env.NEXT_PUBLIC_APP_NAME;
-  const repoName = process.env.NEXT_PUBLIC_REPO_NAME;
-  if (!repoName)
-    throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
-  const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
-  if (!serveDomain)
-    throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
-  const env = process.env.NEXT_PUBLIC_ENV ?? "debug";
-  if (!env)
-    throw new Error("NEXT_PUBLIC_ENV is not set");
-  return { ...appName ? { appName } : {}, repoName, serveDomain, env };
-};
-var getSshTunnelOptions = (appName, environment) => {
-  const { serveDomain, repoName } = getBaseDevEnv();
+// pkgs/@akanjs/devkit/src/createTunnel.ts
+var import_tunnel_ssh = require("tunnel-ssh");
+var getSshTunnelOptions = (app, environment) => {
+  const { serveDomain, repoName } = app.workspace.getBaseDevEnv();
   return {
-    host: `${appName}-${environment}.${serveDomain}`,
-    port: process.env.SSU_TUNNEL_PORT ? parseInt(process.env.SSU_TUNNEL_PORT) : 32767,
-    username: process.env.SSU_TUNNEL_USERNAME ?? "root",
-    password: process.env.SSU_TUNNEL_PASSWORD ?? repoName
+    host: `${app.name}-${environment}.${serveDomain}`,
+    port: process.env.SSH_TUNNEL_PORT ? parseInt(process.env.SSH_TUNNEL_PORT) : 32767,
+    username: process.env.SSH_TUNNEL_USERNAME ?? "root",
+    password: process.env.SSH_TUNNEL_PASSWORD ?? repoName
   };
 };
-
-// pkgs/@akanjs/devkit/src/createTunnel.ts
-var import_tunnel_ssh = require("tunnel-ssh");
-var createTunnel = async ({ appName, environment, port = 27017 }) => {
+var createTunnel = async ({ app, environment, port = 27017 }) => {
   const tunnelOptions = { autoClose: true, reconnectOnError: true };
-  const sshOptions = getSshTunnelOptions(appName, environment);
+  const sshOptions = getSshTunnelOptions(app, environment);
   const serverOptions = { port };
   const forwardOptions = {
     srcAddr: "0.0.0.0",
     srcPort: port,
-    dstAddr: `mongo-0.mongo-svc.${appName}-${environment}`,
+    dstAddr: `mongo-0.mongo-svc.${app.name}-${environment}`,
     dstPort: 27017
   };
   const [server, client] = await (0, import_tunnel_ssh.createTunnel)(tunnelOptions, serverOptions, sshOptions, forwardOptions);
@@ -379,7 +364,7 @@ var Logger = class _Logger {
     "NestApplication"
   ]);
   static level = process.env.NEXT_PUBLIC_LOG_LEVEL ?? "log";
-  static #levelIdx = logLevels.findIndex((l) => l === process.env.NEXT_PUBLIC_LOG_LEVEL);
+  static #levelIdx = logLevels.findIndex((l) => l === (process.env.NEXT_PUBLIC_LOG_LEVEL ?? "log"));
   static #startAt = (0, import_dayjs4.default)();
   static setLevel(level) {
     this.level = level;
@@ -501,22 +486,6 @@ var sleep = async (ms) => {
 var import_fs6 = __toESM(require("fs"));
 var import_path2 = __toESM(require("path"));
 
-// pkgs/@akanjs/config/src/baseConfigEnv.ts
-var getBaseConfigEnv = (appName = process.env.NEXT_PUBLIC_APP_NAME) => {
-  if (!appName)
-    throw new Error("NEXT_PUBLIC_APP_NAME is not set");
-  const repoName = process.env.NEXT_PUBLIC_REPO_NAME;
-  if (!repoName)
-    throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
-  const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
-  if (!serveDomain)
-    throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
-  const env = process.env.NEXT_PUBLIC_ENV ?? "debug";
-  if (!env)
-    throw new Error("NEXT_PUBLIC_ENV is not set");
-  return { appName, repoName, serveDomain, env };
-};
-
 // pkgs/@akanjs/config/src/nextConfig.ts
 var import_bundle_analyzer = __toESM(require("@next/bundle-analyzer"));
 var import_next_pwa = __toESM(require("next-pwa"));
@@ -671,15 +640,8 @@ export default getNextConfig(config, appInfo);
 `;
 
 // pkgs/@akanjs/config/src/akanConfig.ts
-var makeAppConfig = (config, props = {}) => {
-  const baseConfigEnv = getBaseConfigEnv(props.appName);
-  const {
-    appName = baseConfigEnv.appName,
-    repoName = baseConfigEnv.repoName,
-    serveDomain = baseConfigEnv.serveDomain,
-    env = baseConfigEnv.env,
-    command = "build"
-  } = props;
+var makeAppConfig = (config, props) => {
+  const { name, repoName, serveDomain, env, command = "build" } = props;
   return {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
@@ -701,7 +663,7 @@ ENV PORT 8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["node", "main.js"]`,
@@ -720,12 +682,12 @@ ENV PORT 4200
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["npm", "start"]`,
       nextConfig: withBase(
-        appName,
+        name,
         config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
         config.libs ?? [],
         config.frontend?.routes
@@ -742,7 +704,7 @@ var getAppConfig = async (appRoot, props) => {
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeAppConfig(config, props);
 };
-var makeLibConfig = (config, props = {}) => {
+var makeLibConfig = (config, props) => {
   return {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
@@ -805,6 +767,7 @@ var import_child_process = require("child_process");
 var import_fs7 = __toESM(require("fs"), 1);
 var import_promises = __toESM(require("fs/promises"), 1);
 var import_path3 = __toESM(require("path"), 1);
+var import_dotenv = __toESM(require("dotenv"), 1);
 
 // pkgs/@akanjs/devkit/src/dependencyScanner.ts
 var fs7 = __toESM(require("fs"), 1);
@@ -1029,7 +992,7 @@ var Executor = class {
     const readPath = this.#getPath(filePath);
     return import_fs7.default.existsSync(readPath);
   }
-  writeFile(filePath, content) {
+  writeFile(filePath, content, { overwrite = true } = {}) {
     const writePath = this.#getPath(filePath);
     const dir = import_path3.default.dirname(writePath);
     if (!import_fs7.default.existsSync(dir))
@@ -1037,7 +1000,7 @@ var Executor = class {
     const contentStr = typeof content === "string" ? content : JSON.stringify(content, null, 2);
     if (import_fs7.default.existsSync(writePath)) {
       const currentContent = import_fs7.default.readFileSync(writePath, "utf8");
-      if (currentContent === contentStr)
+      if (currentContent === contentStr || !overwrite)
         this.logger.verbose(`File ${writePath} is unchanged`);
       else {
         import_fs7.default.writeFileSync(writePath, contentStr, "utf8");
@@ -1094,7 +1057,8 @@ var Executor = class {
   async #applyTemplateFile({
     templatePath,
     targetPath,
-    scanResult
+    scanResult,
+    overwrite = true
   }, dict = {}) {
     if (targetPath.endsWith(".js") || targetPath.endsWith(".jsx")) {
       const getContent = await import(templatePath);
@@ -1128,12 +1092,16 @@ var Executor = class {
     basePath: basePath2,
     template,
     scanResult,
-    dict = {}
+    dict = {},
+    overwrite = true
   }) {
     const templatePath = `${__dirname}/src/templates${template ? `/${template}` : ""}`.replace(".ts", ".js");
     if (import_fs7.default.statSync(templatePath).isFile()) {
       const filename = import_path3.default.basename(templatePath);
-      await this.#applyTemplateFile({ templatePath, targetPath: import_path3.default.join(basePath2, filename), scanResult }, dict);
+      await this.#applyTemplateFile(
+        { templatePath, targetPath: import_path3.default.join(basePath2, filename), scanResult, overwrite },
+        dict
+      );
     } else {
       const subdirs = await import_promises.default.readdir(templatePath);
       await Promise.all(
@@ -1141,7 +1109,7 @@ var Executor = class {
           const subpath = import_path3.default.join(templatePath, subdir);
           if (import_fs7.default.statSync(subpath).isFile())
             await this.#applyTemplateFile(
-              { templatePath: subpath, targetPath: import_path3.default.join(basePath2, subdir), scanResult },
+              { templatePath: subpath, targetPath: import_path3.default.join(basePath2, subdir), scanResult, overwrite },
               dict
             );
           else
@@ -1149,7 +1117,8 @@ var Executor = class {
               basePath: import_path3.default.join(basePath2, subdir),
               template: import_path3.default.join(template, subdir),
               scanResult,
-              dict
+              dict,
+              overwrite
             });
         })
       );
@@ -1168,6 +1137,20 @@ var WorkspaceExecutor = class _WorkspaceExecutor extends Executor {
     const repoName = import_path3.default.basename(process.cwd());
     return new _WorkspaceExecutor({ workspaceRoot: process.cwd(), repoName });
   }
+  getBaseDevEnv() {
+    const envFile = import_dotenv.default.parse(this.readFile(".env"));
+    const appName = process.env.NEXT_PUBLIC_APP_NAME ?? envFile.NEXT_PUBLIC_APP_NAME;
+    const repoName = process.env.NEXT_PUBLIC_REPO_NAME ?? envFile.NEXT_PUBLIC_REPO_NAME;
+    if (!repoName)
+      throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
+    const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN ?? envFile.NEXT_PUBLIC_SERVE_DOMAIN;
+    if (!serveDomain)
+      throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
+    const env = process.env.NEXT_PUBLIC_ENV ?? envFile.NEXT_PUBLIC_ENV ?? "debug";
+    if (!env)
+      throw new Error("NEXT_PUBLIC_ENV is not set");
+    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env };
+  }
   async scan() {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
     const [appScanResults, libScanResults, pkgScanResults] = await Promise.all([
@@ -1270,7 +1253,7 @@ var SysExecutor = class extends Executor {
     this.type = type;
   }
   async getConfig(command) {
-    return this.type === "app" ? await getAppConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command }) : await getLibConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command });
+    return this.type === "app" ? await getAppConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "app", name: this.name, command }) : await getLibConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), type: "lib", name: this.name, command });
   }
   async scan({
     tsconfig = this.getTsConfig(`${this.cwdPath}/tsconfig.json`),
@@ -1386,6 +1369,8 @@ var SysExecutor = class extends Executor {
     const scanResult = {
       name: this.name,
       type: this.type,
+      repoName: this.workspace.repoName,
+      serveDomain: this.workspace.getBaseDevEnv().serveDomain,
       akanConfig,
       files,
       libDeps,
@@ -1468,7 +1453,12 @@ var AppExecutor = class _AppExecutor extends SysExecutor {
     return new _AppExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await getAppConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command });
+    return await getAppConfig(this.cwdPath, {
+      ...this.workspace.getBaseDevEnv(),
+      type: "app",
+      name: this.name,
+      command
+    });
   }
   async syncAssets(libDeps) {
     const projectPublicLibPath = `${this.cwdPath}/public/libs`;
@@ -1509,7 +1499,12 @@ var LibExecutor = class _LibExecutor extends SysExecutor {
     return new _LibExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await getLibConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command });
+    return await getLibConfig(this.cwdPath, {
+      ...this.workspace.getBaseDevEnv(),
+      type: "lib",
+      name: this.name,
+      command
+    });
   }
 };
 var PkgExecutor = class _PkgExecutor extends Executor {
@@ -2096,7 +2091,7 @@ var AiSession = class _AiSession {
 
 // pkgs/@akanjs/cli/src/library/library.runner.ts
 var import_compare_versions = require("compare-versions");
-var import_dotenv = __toESM(require("dotenv"));
+var import_dotenv2 = __toESM(require("dotenv"));
 var LibraryRunner = class {
   async scanSync(lib) {
     const akanConfig = await lib.getConfig();
@@ -2150,7 +2145,7 @@ var LibraryRunner = class {
     lib.logger.log(`${lib.name} library pulled from ${branch} branch`);
   }
   #getEnv(lib, env = {}) {
-    const rootEnv = import_dotenv.default.parse(lib.workspace.readFile(".env"));
+    const rootEnv = import_dotenv2.default.parse(lib.workspace.readFile(".env"));
     return {
       ...process.env,
       ...rootEnv,
@@ -2216,7 +2211,7 @@ var import_prompts6 = require("@langchain/core/prompts");
 var import_runnables2 = require("@langchain/core/runnables");
 var import_openai3 = require("@langchain/openai");
 var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
-var import_dotenv2 = __toESM(require("dotenv"));
+var import_dotenv3 = __toESM(require("dotenv"));
 var esbuild = __toESM(require("esbuild"));
 var import_fs12 = __toESM(require("fs"));
 var import_promises2 = __toESM(require("fs/promises"));
@@ -3201,13 +3196,18 @@ var ApplicationRunner = class {
     return AppExecutor.from(workspace, appName);
   }
   async scanSync(app) {
-    const akanConfig = await getAppConfig(app.cwdPath, { ...getBaseDevEnv(), appName: app.name, command: "serve" });
+    const akanConfig = await getAppConfig(app.cwdPath, {
+      ...app.workspace.getBaseDevEnv(),
+      type: "app",
+      name: app.name,
+      command: "serve"
+    });
     const scanResult = await app.scan({ akanConfig });
     await app.syncAssets(scanResult.akanConfig.libs);
     return scanResult;
   }
   #getEnv(app, env = {}) {
-    const rootEnv = import_dotenv2.default.parse(app.workspace.readFile(".env"));
+    const rootEnv = import_dotenv3.default.parse(app.workspace.readFile(".env"));
     return {
       ...process.env,
       ...rootEnv,
@@ -3218,8 +3218,10 @@ var ApplicationRunner = class {
   }
   async #prepareCommand(app, distApp, type, target) {
     await distApp.exec(`rm -rf ${target}`);
-    if (target === "frontend")
+    if (target === "frontend") {
+      await app.exec("rm -rf .next");
       app.writeFile("next.config.ts", defaultNextConfigFile);
+    }
     return { env: this.#getEnv(app, { AKAN_COMMAND_TYPE: type }) };
   }
   async buildBackend(app, distApp) {
@@ -3454,7 +3456,7 @@ var ApplicationRunner = class {
       return `mongodb://localhost:27017/${app.name}-${environment}`;
     const secret = getCredentials(app, environment);
     const mongoAccount = secret.mongo.account.user;
-    const localUrl = await createTunnel({ appName: app.name, environment });
+    const localUrl = await createTunnel({ app, environment });
     const mongoUri = `mongodb://${mongoAccount.username}:${encodeURIComponent(
       mongoAccount.password
     )}@${localUrl}/${app.name}-${environment}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.86",
+  "version": "0.0.88",
   "bin": {
     "akan": "index.js"
   },

package/pkgs/@akanjs/config/src/akanConfig.d.ts

@@ -1,7 +1,7 @@
 import type { AppConfig, AppConfigResult, DeepPartial, LibConfigResult, RunnerProps } from "@akanjs/config";
 import type { NextConfig } from "next";
-export declare const makeAppConfig: (config: DeepPartial<AppConfigResult>, props?: Partial<RunnerProps>) => AppConfigResult;
+export declare const makeAppConfig: (config: DeepPartial<AppConfigResult>, props: RunnerProps) => AppConfigResult;
 export declare const getAppConfig: (appRoot: string, props: RunnerProps) => Promise<AppConfigResult>;
-export declare const makeLibConfig: (config: DeepPartial<LibConfigResult>, props?: Partial<RunnerProps>) => LibConfigResult;
+export declare const makeLibConfig: (config: DeepPartial<LibConfigResult>, props: RunnerProps) => LibConfigResult;
 export declare const getLibConfig: (libRoot: string, props: RunnerProps) => Promise<LibConfigResult>;
 export declare const getNextConfig: (configImp: AppConfig, appData: any) => NextConfig | (() => Promise<NextConfig> | NextConfig);

package/pkgs/@akanjs/config/src/types.d.ts

@@ -1,9 +1,10 @@
 import type { NextConfig } from "next";
 export interface RunnerProps {
-    appName: string;
+    type: "app" | "lib";
+    name: string;
     repoName: string;
     serveDomain: string;
-    env: "testing" | "debug" | "develop" | "main";
+    env: "testing" | "local" | "debug" | "develop" | "main";
     command?: string;
 }
 export type Arch = "amd64" | "arm64";
@@ -88,6 +89,8 @@ export declare const getDefaultFileScan: () => FileConventionScanResult;
 export interface AppScanResult {
     name: string;
     type: "app" | "lib";
+    repoName: string;
+    serveDomain: string;
     akanConfig: AppConfigResult;
     files: FileConventionScanResult;
     libDeps: string[];
@@ -100,6 +103,8 @@ export interface AppScanResult {
 export interface LibScanResult {
     name: string;
     type: "app" | "lib";
+    repoName: string;
+    serveDomain: string;
     akanConfig: LibConfigResult;
     files: FileConventionScanResult;
     libDeps: string[];

package/pkgs/@akanjs/devkit/src/createTunnel.d.ts

@@ -1,7 +1,8 @@
+import type { AppExecutor } from "./executors";
 interface TunnelOption {
-    appName: string;
+    app: AppExecutor;
     environment: string;
     port?: number;
 }
-export declare const createTunnel: ({ appName, environment, port }: TunnelOption) => Promise<string>;
+export declare const createTunnel: ({ app, environment, port }: TunnelOption) => Promise<string>;
 export {};

package/pkgs/@akanjs/devkit/src/executors.d.ts

@@ -15,7 +15,9 @@ export declare class Executor {
     fork(modulePath: string, args?: string[], options?: ForkOptions): Promise<unknown>;
     mkdir(dirPath: string): this;
     exists(filePath: string): boolean;
-    writeFile(filePath: string, content: string | object): this;
+    writeFile(filePath: string, content: string | object, { overwrite }?: {
+        overwrite?: boolean;
+    }): this;
     writeJson(filePath: string, content: object): this;
     getLocalFile(filePath: string): {
         filepath: string;
@@ -27,13 +29,14 @@ export declare class Executor {
     log(msg: string): this;
     verbose(msg: string): this;
     getTsConfig(pathname: string): TsConfigJson;
-    applyTemplate({ basePath, template, scanResult, dict, }: {
+    applyTemplate({ basePath, template, scanResult, dict, overwrite, }: {
         basePath: string;
         template: string;
         scanResult?: AppScanResult | LibScanResult | null;
         dict?: {
             [key: string]: string;
         };
+        overwrite?: boolean;
     }): Promise<void>;
 }
 interface ExecutorOptions {
@@ -46,6 +49,12 @@ export declare class WorkspaceExecutor extends Executor {
     repoName: string;
     constructor({ workspaceRoot, repoName }: ExecutorOptions);
     static fromRoot(): WorkspaceExecutor;
+    getBaseDevEnv(): {
+        repoName: string;
+        serveDomain: string;
+        env: "debug" | "testing" | "develop" | "main";
+        name?: string | undefined;
+    };
     scan(): Promise<WorkspaceScanResult>;
     getApps(): Promise<string[]>;
     getLibs(): Promise<string[]>;

package/pkgs/@akanjs/devkit/src/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./baseDevEnv";
 export * from "./createTunnel";
 export * from "./getCredentials";
 export * from "./uploadRelease";

package/pkgs/@akanjs/config/src/baseConfigEnv.d.ts

@@ -1,8 +0,0 @@
-interface BaseConfigEnv {
-    appName: string;
-    repoName: string;
-    serveDomain: string;
-    env: "testing" | "debug" | "develop" | "main";
-}
-export declare const getBaseConfigEnv: (appName?: string | undefined) => BaseConfigEnv;
-export {};

package/pkgs/@akanjs/devkit/src/baseDevEnv.d.ts

@@ -1,10 +0,0 @@
-import { SshOptions } from "tunnel-ssh";
-interface BaseDevEnv {
-    appName?: string;
-    repoName: string;
-    serveDomain: string;
-    env: "testing" | "debug" | "develop" | "main";
-}
-export declare const getBaseDevEnv: () => BaseDevEnv;
-export declare const getSshTunnelOptions: (appName: string, environment: string) => SshOptions;
-export {};