@akanjs/cli 0.0.80 → 0.0.82

package/index.js

@@ -2084,6 +2084,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 LibraryRunner = class {
   async scanSync(lib) {
     const akanConfig = await lib.getConfig();
@@ -2136,13 +2137,30 @@ 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"));
+    return {
+      ...process.env,
+      ...rootEnv,
+      NEXT_PUBLIC_APP_NAME: lib.name,
+      AKAN_WORKSPACE_ROOT: lib.workspace.workspaceRoot,
+      ...env
+    };
+  }
   async testLibrary(lib) {
-    await lib.workspace.spawn("node", [
-      "node_modules/jest/bin/jest.js",
-      `libs/${lib.name}`,
-      "-c",
-      `libs/${lib.name}/jest.config.ts`
-    ]);
+    await lib.workspace.spawn(
+      "node",
+      ["node_modules/jest/bin/jest.js", `libs/${lib.name}`, "-c", `libs/${lib.name}/jest.config.ts`],
+      {
+        env: {
+          ...this.#getEnv(lib),
+          NEXT_PUBLIC_ENV: "testing",
+          NEXT_PUBLIC_OPERATION_MODE: "local",
+          NEXT_PUBLIC_APP_NAME: lib.name,
+          NODE_TLS_REJECT_UNAUTHORIZED: "0"
+        }
+      }
+    );
   }
 };
 
@@ -2186,7 +2204,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_dotenv = __toESM(require("dotenv"));
+var import_dotenv2 = __toESM(require("dotenv"));
 var esbuild = __toESM(require("esbuild"));
 var import_fs11 = __toESM(require("fs"));
 var import_promises2 = __toESM(require("fs/promises"));
@@ -3177,6 +3195,7 @@ var ApplicationRunner = class {
       }
     });
     workspace.setTsPaths("app", appName);
+    return AppExecutor.from(workspace, appName);
   }
   async scanSync(app) {
     const akanConfig = await getAppConfig(app.cwdPath, { ...getBaseDevEnv(), appName: app.name, command: "serve" });
@@ -3184,20 +3203,21 @@ var ApplicationRunner = class {
     await app.syncAssets(scanResult.akanConfig.libs);
     return scanResult;
   }
+  #getEnv(app, env = {}) {
+    const rootEnv = import_dotenv2.default.parse(app.workspace.readFile(".env"));
+    return {
+      ...process.env,
+      ...rootEnv,
+      NEXT_PUBLIC_APP_NAME: app.name,
+      AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot,
+      ...env
+    };
+  }
   async #prepareCommand(app, distApp, type, target) {
     await distApp.exec(`rm -rf ${target}`);
-    const env = import_dotenv.default.parse(app.workspace.readFile(".env"));
     if (target === "frontend")
       app.writeFile("next.config.ts", defaultNextConfigFile);
-    return {
-      env: {
-        ...process.env,
-        ...env,
-        AKAN_COMMAND_TYPE: type,
-        NEXT_PUBLIC_APP_NAME: app.name,
-        AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot
-      }
-    };
+    return { env: this.#getEnv(app, { AKAN_COMMAND_TYPE: type }) };
   }
   async buildBackend(app, distApp) {
     await this.#prepareCommand(app, distApp, "serve", "backend");
@@ -3636,12 +3656,19 @@ var ApplicationRunner = class {
     };
   }
   async testApplication(app) {
-    await app.workspace.spawn("node", [
-      "node_modules/jest/bin/jest.js",
-      `apps/${app.name}`,
-      "-c",
-      `apps/${app.name}/jest.config.ts`
-    ]);
+    await app.workspace.spawn(
+      "node",
+      ["node_modules/jest/bin/jest.js", `apps/${app.name}`, "-c", `apps/${app.name}/jest.config.ts`],
+      {
+        env: {
+          ...this.#getEnv(app),
+          NEXT_PUBLIC_ENV: "testing",
+          NEXT_PUBLIC_OPERATION_MODE: "local",
+          NEXT_PUBLIC_APP_NAME: app.name,
+          NODE_TLS_REJECT_UNAUTHORIZED: "0"
+        }
+      }
+    );
   }
 };
 
@@ -3650,11 +3677,14 @@ var ApplicationScript = class {
   #runner = new ApplicationRunner();
   libraryScript = new LibraryScript();
   async createApplication(appName, workspace) {
-    await this.#runner.createApplication(appName, workspace);
+    const app = await this.#runner.createApplication(appName, workspace);
+    await this.syncApplication(app);
   }
-  async scanApplication(app) {
+  async scanApplication(app, verbose = false) {
     const scanResult = await this.#runner.scanSync(app);
-    app.logger.rawLog(JSON.stringify(scanResult, null, 2));
+    if (verbose)
+      app.logger.rawLog(JSON.stringify(scanResult, null, 2));
+    return scanResult;
   }
   async syncApplication(app, { recursive = true } = {}) {
     const scanResult = await this.#runner.scanSync(app);
@@ -3769,7 +3799,7 @@ var ApplicationCommand = class {
   async removeApplication(app, workspace) {
   }
   async scanApplication(app) {
-    await this.applicationScript.scanApplication(app);
+    await this.applicationScript.scanApplication(app, true);
   }
   async build(app) {
     await this.applicationScript.build(app);

package/package.json

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

package/pkgs/@akanjs/cli/src/application/application.runner.d.ts

@@ -1,4 +1,4 @@
-import { App, DistAppExecutor, type Workspace } from "@akanjs/devkit";
+import { App, AppExecutor, DistAppExecutor, type Workspace } from "@akanjs/devkit";
 export interface ReleaseSourceOptions {
     rebuild?: boolean;
     buildNum?: number;
@@ -7,7 +7,7 @@ export interface ReleaseSourceOptions {
 }
 export declare class ApplicationRunner {
     #private;
-    createApplication(appName: string, workspace: Workspace): Promise<void>;
+    createApplication(appName: string, workspace: Workspace): Promise<AppExecutor>;
     scanSync(app: App): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     buildBackend(app: App, distApp: DistAppExecutor): Promise<void>;
     serveBackend(app: App, distApp: DistAppExecutor): Promise<void>;

package/pkgs/@akanjs/cli/src/application/application.script.d.ts

@@ -6,7 +6,7 @@ export declare class ApplicationScript {
     #private;
     libraryScript: LibraryScript;
     createApplication(appName: string, workspace: Workspace): Promise<void>;
-    scanApplication(app: App): Promise<void>;
+    scanApplication(app: App, verbose?: boolean): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     syncApplication(app: App, { recursive }?: {
         recursive?: boolean;
     }): Promise<void>;

package/pkgs/@akanjs/cli/src/library/library.runner.d.ts

@@ -1,5 +1,6 @@
 import { Lib, LibExecutor, Workspace } from "@akanjs/devkit";
 export declare class LibraryRunner {
+    #private;
     scanSync(lib: Lib): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     installLibrary(workspace: Workspace, libName: string): Promise<LibExecutor>;
     mergeLibraryDependencies(lib: Lib): Promise<void>;

package/src/templates/workspaceRoot/package.json.template

@@ -15,6 +15,7 @@
     "eslint": "^9.19.0",
     "jest": "^29.7.0",
     "jiti": "^2.4.2",
-    "prettier": "^3.5.3"
+    "prettier": "^3.5.3",
+    "ts-jest": "^29.3.4"
   }
 }