@akanjs/cli 0.0.43 → 0.0.44

package/index.js

@@ -47,26 +47,31 @@
   var __decorateParam = (index, decorator) => (target, key) => decorator(target, key, index);
 
   // pkgs/@akanjs/devkit/src/baseDevEnv.ts
-  var appName, repoName, serveDomain, env, baseDevEnv, getSshTunnelOptions;
+  var getBaseDevEnv, getSshTunnelOptions;
   var init_baseDevEnv = __esm({
     "pkgs/@akanjs/devkit/src/baseDevEnv.ts"() {
-      appName = process.env.NEXT_PUBLIC_APP_NAME;
-      repoName = process.env.NEXT_PUBLIC_REPO_NAME;
-      if (!repoName)
-        throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
-      serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
-      if (!serveDomain)
-        throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
-      env = process.env.NEXT_PUBLIC_ENV ?? "debug";
-      if (!env)
-        throw new Error("NEXT_PUBLIC_ENV is not set");
-      baseDevEnv = { ...appName ? { appName } : {}, repoName, serveDomain, env };
-      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
-      });
+      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 };
+      };
+      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
+        };
+      };
     }
   });
 
@@ -76,14 +81,14 @@
     "pkgs/@akanjs/devkit/src/createTunnel.ts"() {
       import_tunnel_ssh = __require("tunnel-ssh");
       init_baseDevEnv();
-      createTunnel = async ({ appName: appName2, environment, port = 27017 }) => {
+      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);
@@ -677,19 +682,19 @@
   var getBaseConfigEnv;
   var init_baseConfigEnv = __esm({
     "pkgs/@akanjs/config/src/baseConfigEnv.ts"() {
-      getBaseConfigEnv = (appName2 = process.env.NEXT_PUBLIC_APP_NAME) => {
-        if (!appName2)
+      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 };
       };
     }
   });
@@ -728,7 +733,7 @@
         disable: commandType === "serve"
       });
       devDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN ?? "akanjs.com";
-      withBase = (appName2, config, libs, routes = []) => {
+      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] : []
@@ -762,7 +767,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"
@@ -873,10 +878,10 @@ export default getNextConfig(config, appInfo);
       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 {
@@ -898,10 +903,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 ?? []
@@ -917,14 +922,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
@@ -1345,21 +1350,21 @@ CMD ["npm", "start"]`,
       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 });
               })
@@ -1433,7 +1438,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`),
@@ -1587,7 +1592,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`;
@@ -1628,7 +1633,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 });
         }
       };
       PkgExecutor = class _PkgExecutor extends Executor {
@@ -1671,10 +1676,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) {
@@ -2132,8 +2137,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);
@@ -3422,20 +3427,20 @@ page.tsx_end
       init_application_prompt();
       ApplicationRunner = class {
         async scanSync(app) {
-          const akanConfig = await getAppConfig(app.cwdPath, { ...baseDevEnv, appName: app.name, command: "serve" });
+          const akanConfig = await getAppConfig(app.cwdPath, { ...getBaseDevEnv(), appName: app.name, command: "serve" });
           const scanResult = await app.scan({ akanConfig });
           await app.syncAssets(scanResult.akanConfig.libs);
           return scanResult;
         }
         async #prepareCommand(app, distApp, type, target) {
           await distApp.exec(`rm -rf ${target}`);
-          const env2 = import_dotenv2.default.parse(app.workspace.readFile(".env"));
+          const env = import_dotenv2.default.parse(app.workspace.readFile(".env"));
           if (target === "frontend")
             app.writeFile("next.config.ts", defaultNextConfigFile);
           return {
             env: {
               ...process.env,
-              ...env2,
+              ...env,
               AKAN_COMMAND_TYPE: type,
               NEXT_PUBLIC_APP_NAME: app.name,
               AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot
@@ -3468,7 +3473,7 @@ page.tsx_end
           distApp.writeFile(import_path4.default.join(distApp.cwdPath, "backend", "Dockerfile"), akanConfig.backend.dockerfile);
         }
         async serveBackend(app, distApp) {
-          const { env: env2 } = await this.#prepareCommand(app, distApp, "serve", "backend");
+          const { env } = await this.#prepareCommand(app, distApp, "serve", "backend");
           const ctx = await esbuild.context({
             write: true,
             entryPoints: [`${app.cwdPath}/main.ts`],
@@ -3480,12 +3485,12 @@ page.tsx_end
           });
           await ctx.watch();
           await sleep(100);
-          await distApp.spawn("node", ["--watch", "backend/main.js"], { env: env2 });
+          await distApp.spawn("node", ["--watch", "backend/main.js"], { env });
         }
         async buildFrontend(app, distApp) {
-          const { env: env2 } = await this.#prepareCommand(app, distApp, "build", "frontend");
+          const { env } = await this.#prepareCommand(app, distApp, "build", "frontend");
           const akanConfig = await app.getConfig("build");
-          await app.spawn("npx", ["next", "build", "--no-lint"], { env: env2 });
+          await app.spawn("npx", ["next", "build", "--no-lint"], { env });
           await esbuild.build({
             entryPoints: [`${app.cwdPath}/next.config.ts`],
             outdir: `${distApp.cwdPath}/frontend`,
@@ -3521,12 +3526,12 @@ page.tsx_end
           distApp.writeFile("frontend/Dockerfile", akanConfig.frontend.dockerfile);
         }
         async serveFrontend(app, distApp) {
-          const { env: env2 } = await this.#prepareCommand(app, distApp, "serve", "frontend");
-          await app.spawn("npx", ["next", "dev", "-p", "4200"], { env: env2 });
+          const { env } = await this.#prepareCommand(app, distApp, "serve", "frontend");
+          await app.spawn("npx", ["next", "dev", "-p", "4200"], { env });
         }
         async #getViteConfig(app, distApp) {
-          const { env: env2 } = await this.#prepareCommand(app, distApp, "build", "csr");
-          const processEnv = env2;
+          const { env } = await this.#prepareCommand(app, distApp, "build", "csr");
+          const processEnv = env;
           const akanjsPrefix = process.env.USE_AKANJS_PKGS === "true" ? "../../../../pkgs/" : "";
           const config = vite.defineConfig({
             root: `${app.cwdPath}/app`,
@@ -3839,11 +3844,11 @@ page.tsx_end
             local
           });
         }
-        async createApplicationTemplate(workspace, appName2) {
+        async createApplicationTemplate(workspace, appName) {
           await workspace.applyTemplate({
-            basePath: `apps/${appName2}`,
+            basePath: `apps/${appName}`,
             template: "appRoot",
-            dict: { appName: appName2, AppName: capitalize(appName2) }
+            dict: { appName, AppName: capitalize(appName) }
           });
         }
         async generateApplicationTemplate(app) {
@@ -4659,12 +4664,12 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
           const [appNames, libNames] = await sys2.workspace.getSyss();
           const scalarConstantExampleFiles = [
             ...(await Promise.all(
-              appNames.map(async (appName2) => {
-                const app = AppExecutor.from(sys2.workspace, appName2);
+              appNames.map(async (appName) => {
+                const app = AppExecutor.from(sys2.workspace, appName);
                 const scalarModules = await app.getScalarModules();
                 return await Promise.all(
                   scalarModules.map((scalarModule) => ({
-                    path: `${appName2}/${scalarModule}/${scalarModule}.constant.ts`,
+                    path: `${appName}/${scalarModule}/${scalarModule}.constant.ts`,
                     content: app.readFile(`lib/__scalar/${scalarModule}/${scalarModule}.constant.ts`)
                   }))
                 );
@@ -4885,19 +4890,19 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
       init_devkit();
       import_uuid2 = __require("uuid");
       WorkspaceRunner = class {
-        async createWorkspace(repoName2, appName2, dirname = ".") {
+        async createWorkspace(repoName, appName, dirname = ".") {
         }
         async generateMongo(workspace) {
           const namespace = "00000000-0000-0000-0000-000000000000";
           const appNames = await workspace.getApps();
-          const apps = appNames.map((appName2) => AppExecutor.from(workspace, appName2));
+          const apps = appNames.map((appName) => AppExecutor.from(workspace, appName));
           const appDatas = apps.reduce(
             (acc, app) => [
               ...acc,
-              ...["debug", "develop", "main"].map((env2) => ({
+              ...["debug", "develop", "main"].map((env) => ({
                 appName: app.name,
-                env: env2,
-                secret: getCredentials(app, env2)
+                env,
+                secret: getCredentials(app, env)
               }))
             ],
             []
@@ -4905,17 +4910,17 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
           const mongoConnectionList = {
             type: "Compass Connections",
             version: { $numberInt: "1" },
-            connections: appDatas.map(({ appName: appName2, env: env2, secret }) => ({
-              id: (0, import_uuid2.v5)(`${appName2}-${env2}`, namespace),
+            connections: appDatas.map(({ appName, env, secret }) => ({
+              id: (0, import_uuid2.v5)(`${appName}-${env}`, namespace),
               favorite: {
-                name: `${appName2}-${env2}`,
+                name: `${appName}-${env}`,
                 color: "color9"
               },
               savedConnectionType: "favorite",
               connectionOptions: {
-                connectionString: `mongodb://${secret.mongo.account.user.username}:${secret.mongo.account.user.password}@mongo-0.mongo-svc.${appName2}-${env2}/?directConnection=true&authSource=${appName2}-${env2}`,
+                connectionString: `mongodb://${secret.mongo.account.user.username}:${secret.mongo.account.user.password}@mongo-0.mongo-svc.${appName}-${env}/?directConnection=true&authSource=${appName}-${env}`,
                 sshTunnel: {
-                  host: `${appName2}-${env2}.akamir.com`,
+                  host: `${appName}-${env}.akamir.com`,
                   port: "32767",
                   username: "root",
                   password: "akamir"
@@ -4945,10 +4950,10 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
       init_workspace_runner();
       WorkspaceScript = class {
         #runner = new WorkspaceRunner();
-        async createWorkspace(repoName2, appName2, dirname = ".") {
+        async createWorkspace(repoName, appName, dirname = ".") {
           const cwdPath = process.cwd();
-          const workspaceRoot = import_path5.default.join(cwdPath, dirname, repoName2);
-          const workspace = new WorkspaceExecutor({ workspaceRoot, repoName: repoName2 });
+          const workspaceRoot = import_path5.default.join(cwdPath, dirname, repoName);
+          const workspace = new WorkspaceExecutor({ workspaceRoot, repoName });
           const dependencies = [
             "@akanjs/base",
             "@akanjs/cli",
@@ -4969,9 +4974,9 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
           const devDependencies = ["@akanjs/test", "@akanjs/devkit"];
           const latestPublishedVersionOfBase = await (0, import_latest_version2.default)("@akanjs/base");
           const packageJson = {
-            name: repoName2,
+            name: repoName,
             version: "0.0.1",
-            description: `${repoName2} workspace`,
+            description: `${repoName} workspace`,
             dependencies: Object.fromEntries(dependencies.map((dependency) => [dependency, latestPublishedVersionOfBase])),
             devDependencies: Object.fromEntries(
               devDependencies.map((dependency) => [dependency, latestPublishedVersionOfBase])
@@ -4981,7 +4986,7 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
           await workspace.applyTemplate({
             basePath: ".",
             template: "workspaceRoot",
-            dict: { repoName: repoName2, RepoName: capitalize(repoName2) }
+            dict: { repoName, RepoName: capitalize(repoName) }
           });
           workspace.log("Installing dependencies...");
           await workspace.spawn("pnpm", ["i"]);

package/package.json

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