@akanjs/cli 0.0.87 → 0.0.88

package/index.js

@@ -486,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"));
@@ -656,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 ?? [],
@@ -686,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"]`,
@@ -705,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
@@ -727,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 ?? [],
@@ -1172,7 +1149,7 @@ var WorkspaceExecutor = class _WorkspaceExecutor extends Executor {
     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 ? { appName } : {}, repoName, serveDomain, env };
+    return { ...appName ? { name: appName } : {}, repoName, serveDomain, env };
   }
   async scan() {
     const [appNames, libNames, pkgNames] = await Promise.all([this.getApps(), this.getLibs(), this.getPkgs()]);
@@ -1276,7 +1253,7 @@ var SysExecutor = class extends Executor {
     this.type = type;
   }
   async getConfig(command) {
-    return this.type === "app" ? await getAppConfig(this.cwdPath, { ...this.workspace.getBaseDevEnv(), appName: this.name, command }) : await getLibConfig(this.cwdPath, { ...this.workspace.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`),
@@ -1392,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,
@@ -1474,7 +1453,12 @@ var AppExecutor = class _AppExecutor extends SysExecutor {
     return new _AppExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await getAppConfig(this.cwdPath, { ...this.workspace.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`;
@@ -1515,7 +1499,12 @@ var LibExecutor = class _LibExecutor extends SysExecutor {
     return new _LibExecutor({ workspace: executor.workspace, name });
   }
   async getConfig(command) {
-    return await getLibConfig(this.cwdPath, { ...this.workspace.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 {
@@ -3209,7 +3198,8 @@ var ApplicationRunner = class {
   async scanSync(app) {
     const akanConfig = await getAppConfig(app.cwdPath, {
       ...app.workspace.getBaseDevEnv(),
-      appName: app.name,
+      type: "app",
+      name: app.name,
       command: "serve"
     });
     const scanResult = await app.scan({ akanConfig });

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.87",
+  "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/executors.d.ts

@@ -53,7 +53,7 @@ export declare class WorkspaceExecutor extends Executor {
         repoName: string;
         serveDomain: string;
         env: "debug" | "testing" | "develop" | "main";
-        appName?: string | undefined;
+        name?: string | undefined;
     };
     scan(): Promise<WorkspaceScanResult>;
     getApps(): Promise<string[]>;

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 {};