@akanjs/devkit 0.0.42 → 0.0.44

package/index.js

@@ -30,34 +30,39 @@
   ));
 
   // pkgs/@akanjs/devkit/src/baseDevEnv.ts
-  var appName = process.env.NEXT_PUBLIC_APP_NAME;
-  var repoName = process.env.NEXT_PUBLIC_REPO_NAME;
-  if (!repoName)
-    throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
-  var serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
-  if (!serveDomain)
-    throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
-  var env = process.env.NEXT_PUBLIC_ENV ?? "debug";
-  if (!env)
-    throw new Error("NEXT_PUBLIC_ENV is not set");
-  var baseDevEnv = { ...appName ? { appName } : {}, repoName, serveDomain, env };
-  var getSshTunnelOptions = (appName2, environment) => ({
-    host: `${appName2}-${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
-  });
+  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();
+    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
+    };
+  };
 
   // pkgs/@akanjs/devkit/src/createTunnel.ts
   var import_tunnel_ssh = __require("tunnel-ssh");
-  var createTunnel = async ({ appName: appName2, environment, port = 27017 }) => {
+  var createTunnel = async ({ appName, environment, port = 27017 }) => {
     const tunnelOptions = { autoClose: true, reconnectOnError: true };
-    const sshOptions = getSshTunnelOptions(appName2, environment);
+    const sshOptions = getSshTunnelOptions(appName, environment);
     const serverOptions = { port };
     const forwardOptions = {
       srcAddr: "0.0.0.0",
       srcPort: port,
-      dstAddr: `mongo-0.mongo-svc.${appName2}-${environment}`,
+      dstAddr: `mongo-0.mongo-svc.${appName}-${environment}`,
       dstPort: 27017
     };
     const [server, client] = await (0, import_tunnel_ssh.createTunnel)(tunnelOptions, serverOptions, sshOptions, forwardOptions);
@@ -507,19 +512,19 @@
   var import_path2 = __toESM(__require("path"));
 
   // pkgs/@akanjs/config/src/baseConfigEnv.ts
-  var getBaseConfigEnv = (appName2 = process.env.NEXT_PUBLIC_APP_NAME) => {
-    if (!appName2)
+  var getBaseConfigEnv = (appName = process.env.NEXT_PUBLIC_APP_NAME) => {
+    if (!appName)
       throw new Error("NEXT_PUBLIC_APP_NAME is not set");
-    const repoName2 = process.env.NEXT_PUBLIC_REPO_NAME;
-    if (!repoName2)
+    const repoName = process.env.NEXT_PUBLIC_REPO_NAME;
+    if (!repoName)
       throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
-    const serveDomain2 = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
-    if (!serveDomain2)
+    const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
+    if (!serveDomain)
       throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
-    const env2 = process.env.NEXT_PUBLIC_ENV ?? "debug";
-    if (!env2)
+    const env = process.env.NEXT_PUBLIC_ENV ?? "debug";
+    if (!env)
       throw new Error("NEXT_PUBLIC_ENV is not set");
-    return { appName: appName2, repoName: repoName2, serveDomain: serveDomain2, env: env2 };
+    return { appName, repoName, serveDomain, env };
   };
 
   // pkgs/@akanjs/config/src/nextConfig.ts
@@ -553,7 +558,7 @@
     disable: commandType === "serve"
   });
   var devDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN ?? "akanjs.com";
-  var withBase = (appName2, config, libs, routes = []) => {
+  var withBase = (appName, config, libs, routes = []) => {
     return composePlugins(
       (0, import_bundle_analyzer.default)({ enabled: process.env.ANALYZE === "true" }),
       ...commandType !== "serve" || process.env.USE_PWA === "true" ? [withPWA] : []
@@ -587,7 +592,7 @@
       experimental: {
         ...config.experimental ?? {},
         optimizePackageImports: [
-          ...[appName2, ...libs].map((lib) => [`@${lib}/ui`, `@${lib}/next`, `@${lib}/common`, `@${lib}/client`]).flat(),
+          ...[appName, ...libs].map((lib) => [`@${lib}/ui`, `@${lib}/next`, `@${lib}/common`, `@${lib}/client`]).flat(),
           "@contract",
           "@akanjs/next",
           "@akanjs/common"
@@ -680,10 +685,10 @@
   var makeAppConfig = (config, props = {}) => {
     const baseConfigEnv = getBaseConfigEnv(props.appName);
     const {
-      appName: appName2 = baseConfigEnv.appName,
-      repoName: repoName2 = baseConfigEnv.repoName,
-      serveDomain: serveDomain2 = baseConfigEnv.serveDomain,
-      env: env2 = baseConfigEnv.env,
+      appName = baseConfigEnv.appName,
+      repoName = baseConfigEnv.repoName,
+      serveDomain = baseConfigEnv.serveDomain,
+      env = baseConfigEnv.env,
       command = "build"
     } = props;
     return {
@@ -705,10 +710,10 @@ RUN npx pnpm i --prod
 COPY . .
 ENV PORT 8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
-ENV NEXT_PUBLIC_REPO_NAME=${repoName2}
-ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain2}
-ENV NEXT_PUBLIC_APP_NAME=${appName2}
-ENV NEXT_PUBLIC_ENV=${env2}
+ENV NEXT_PUBLIC_REPO_NAME=${repoName}
+ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
+ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["node", "main.js"]`,
         explicitDependencies: config.backend?.explicitDependencies ?? []
@@ -724,14 +729,14 @@ RUN npx pnpm i --prod
 COPY . .
 ENV PORT 4200
 ENV NODE_OPTIONS=--max_old_space_size=8192
-ENV NEXT_PUBLIC_REPO_NAME=${repoName2}
-ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain2}
-ENV NEXT_PUBLIC_APP_NAME=${appName2}
-ENV NEXT_PUBLIC_ENV=${env2}
+ENV NEXT_PUBLIC_REPO_NAME=${repoName}
+ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
+ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["npm", "start"]`,
         nextConfig: withBase(
-          appName2,
+          appName,
           config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
           config.libs ?? [],
           config.frontend?.routes
@@ -1021,11 +1026,11 @@ CMD ["npm", "start"]`,
           this.logger.verbose(`File ${writePath} is unchanged`);
         else {
           import_fs7.default.writeFileSync(writePath, contentStr, "utf8");
-          this.logger.debug(`File ${writePath} is changed`);
+          this.logger.verbose(`File ${writePath} is changed`);
         }
       } else {
         import_fs7.default.writeFileSync(writePath, contentStr, "utf8");
-        this.logger.debug(`File ${writePath} is created`);
+        this.logger.verbose(`File ${writePath} is created`);
       }
       return this;
     }
@@ -1133,21 +1138,21 @@ CMD ["npm", "start"]`,
   var WorkspaceExecutor = class _WorkspaceExecutor extends Executor {
     workspaceRoot;
     repoName;
-    constructor({ workspaceRoot, repoName: repoName2 }) {
-      super(`${repoName2} Executor`, workspaceRoot);
+    constructor({ workspaceRoot, repoName }) {
+      super(`${repoName} Executor`, workspaceRoot);
       this.workspaceRoot = workspaceRoot;
-      this.repoName = repoName2;
+      this.repoName = repoName;
     }
     static fromRoot() {
-      const repoName2 = import_path3.default.basename(process.cwd());
-      return new _WorkspaceExecutor({ workspaceRoot: process.cwd(), repoName: repoName2 });
+      const repoName = import_path3.default.basename(process.cwd());
+      return new _WorkspaceExecutor({ workspaceRoot: process.cwd(), repoName });
     }
     async scan() {
       const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
       const [appScanResults, libScanResults, pkgScanResults] = await Promise.all([
         Promise.all(
-          appNames.map(async (appName2) => {
-            const app = AppExecutor.from(this, appName2);
+          appNames.map(async (appName) => {
+            const app = AppExecutor.from(this, appName);
             const akanConfig = await app.getConfig("scan");
             return await app.scan({ akanConfig });
           })
@@ -1221,7 +1226,7 @@ CMD ["npm", "start"]`,
       this.type = type;
     }
     async getConfig(command) {
-      return this.type === "app" ? await getAppConfig(this.cwdPath, { ...baseDevEnv, appName: this.name, command }) : await getLibConfig(this.cwdPath, { ...baseDevEnv, appName: this.name, command });
+      return this.type === "app" ? await getAppConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command }) : await getLibConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command });
     }
     async scan({
       tsconfig = this.getTsConfig(`${this.cwdPath}/tsconfig.json`),
@@ -1375,7 +1380,7 @@ CMD ["npm", "start"]`,
       return new _AppExecutor({ workspace: executor.workspace, name });
     }
     async getConfig(command) {
-      return await getAppConfig(this.cwdPath, { ...baseDevEnv, appName: this.name, command });
+      return await getAppConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command });
     }
     async syncAssets(libDeps) {
       const projectPublicLibPath = `${this.cwdPath}/public/libs`;
@@ -1416,7 +1421,7 @@ CMD ["npm", "start"]`,
       return new _LibExecutor({ workspace: executor.workspace, name });
     }
     async getConfig(command) {
-      return await getLibConfig(this.cwdPath, { ...baseDevEnv, appName: this.name, command });
+      return await getLibConfig(this.cwdPath, { ...getBaseDevEnv(), appName: this.name, command });
     }
   };
   var DistLibExecutor = class _DistLibExecutor extends Executor {
@@ -1471,10 +1476,10 @@ CMD ["npm", "start"]`,
     workspaceRoot;
     repoName;
     name;
-    constructor({ workspaceRoot, repoName: repoName2, name }) {
+    constructor({ workspaceRoot, repoName, name }) {
       super(`${name} Dist Pkg Executor`, `${workspaceRoot}/dist/pkgs/${name}`);
       this.workspaceRoot = workspaceRoot;
-      this.repoName = repoName2;
+      this.repoName = repoName;
       this.name = name;
     }
     static from(workspaceExecutor, name) {
@@ -1805,6 +1810,7 @@ CMD ["npm", "start"]`,
   // pkgs/@akanjs/devkit/src/commandDecorators/command.ts
   var import_prompts3 = __require("@inquirer/prompts");
   var import_commander = __require("commander");
+  var import_dotenv = __toESM(__require("dotenv"));
   var camelToKebabCase = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
   var handleOption = (programCommand, argMeta) => {
     const {
@@ -1876,8 +1882,8 @@ CMD ["npm", "start"]`,
       if (value)
         return AppExecutor.from(workspace, value);
       const apps = await workspace.getApps();
-      const appName2 = await (0, import_prompts3.select)({ message: `Select the ${sysType} name`, choices: apps });
-      return AppExecutor.from(workspace, appName2);
+      const appName = await (0, import_prompts3.select)({ message: `Select the ${sysType} name`, choices: apps });
+      return AppExecutor.from(workspace, appName);
     } else if (sysType === "lib") {
       if (value)
         return LibExecutor.from(workspace, value);
@@ -1894,6 +1900,7 @@ CMD ["npm", "start"]`,
       throw new Error(`Invalid system type: ${argMeta.type}`);
   };
   var runCommands = async (...commands) => {
+    import_dotenv.default.config();
     import_commander.program.version("0.0.1").description("An example CLI for managing a directory");
     for (const command of commands) {
       const targetMetas = getTargetMetas(command);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -24,6 +24,7 @@
     "axios": "^1.7.9",
     "commander": "^13.1.0",
     "dayjs": "^1.11.13",
+    "dotenv": "^16.4.7",
     "form-data": "^4.0.1",
     "js-yaml": "^4.1.0",
     "next-pwa": "^5.6.0",

package/src/baseDevEnv.d.ts

@@ -5,6 +5,6 @@ interface BaseDevEnv {
     serveDomain: string;
     env: "testing" | "debug" | "develop" | "main";
 }
-export declare const baseDevEnv: BaseDevEnv;
+export declare const getBaseDevEnv: () => BaseDevEnv;
 export declare const getSshTunnelOptions: (appName: string, environment: string) => SshOptions;
 export {};