@akanjs/cli 0.0.64 → 0.0.66

package/index.js

@@ -1375,6 +1375,25 @@ var SysExecutor = class extends Executor {
     if (this.type === "lib")
       await this.applyTemplate({ basePath: ".", template: "index.ts", scanResult });
     this.writeJson(`akan.${this.type}.json`, scanResult);
+    if (this.type === "app")
+      return scanResult;
+    const libPackageJson = this.readJson("package.json");
+    const libPkgJsonWithDeps = {
+      ...libPackageJson,
+      dependencies: {
+        ...libPackageJson.dependencies,
+        ...Object.fromEntries(
+          scanResult.dependencies.filter((dep) => rootPackageJson.dependencies?.[dep]).sort().map((dep) => [dep, rootPackageJson.dependencies?.[dep]])
+        )
+      },
+      devDependencies: {
+        ...libPackageJson.devDependencies,
+        ...Object.fromEntries(
+          scanResult.dependencies.filter((dep) => rootPackageJson.devDependencies?.[dep]).sort().map((dep) => [dep, rootPackageJson.devDependencies?.[dep]])
+        )
+      }
+    };
+    this.writeJson("package.json", libPkgJsonWithDeps);
     return scanResult;
   }
   getLocalFile(filePath) {
@@ -1837,6 +1856,7 @@ var Target = {
 // pkgs/@akanjs/devkit/src/commandDecorators/command.ts
 var import_prompts3 = require("@inquirer/prompts");
 var import_commander = require("commander");
+var import_fs10 = __toESM(require("fs"), 1);
 var camelToKebabCase = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();
 var handleOption = (programCommand, argMeta) => {
   const {
@@ -1926,7 +1946,9 @@ var getArgumentValue = async (argMeta, value, workspace) => {
     throw new Error(`Invalid system type: ${argMeta.type}`);
 };
 var runCommands = async (...commands) => {
-  import_commander.program.version("0.0.1").description("An example CLI for managing a directory");
+  const hasPackageJson = import_fs10.default.existsSync("package.json");
+  const version = hasPackageJson ? JSON.parse(import_fs10.default.readFileSync("package.json", "utf8")).version : "0.0.1";
+  import_commander.program.version(version).description("Akan CLI");
   for (const command of commands) {
     const targetMetas = getTargetMetas(command);
     for (const targetMeta of targetMetas) {
@@ -2039,6 +2061,7 @@ var AiSession = class _AiSession {
 };
 
 // pkgs/@akanjs/cli/src/library/library.runner.ts
+var import_compare_versions = require("compare-versions");
 var LibraryRunner = class {
   async scanSync(lib) {
     const akanConfig = await lib.getConfig();
@@ -2051,13 +2074,43 @@ var LibraryRunner = class {
     await workspace.cp(`libs/${libName}/env/env.server.example.ts`, `libs/${libName}/env/env.server.testing.ts`);
     workspace.setTsPaths("lib", libName);
     await workspace.commit(`Add ${libName} library`);
+    return LibExecutor.from(workspace, libName);
+  }
+  async mergeLibraryDependencies(lib) {
+    const libPackageJson = lib.readJson("package.json");
+    const rootPackageJson = lib.workspace.readJson("package.json");
+    const dependencies = {};
+    const devDependencies = {};
+    const libDependencies = { ...libPackageJson.dependencies, ...libPackageJson.devDependencies };
+    const rootDependencies = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const allDependencies = Object.fromEntries(
+      Object.keys({ ...libDependencies, ...rootDependencies }).map((dep) => {
+        const libVersion = libDependencies[dep] ?? "0.0.0";
+        const rootVersion = rootDependencies[dep] ?? "0.0.0";
+        const newerVersion = (0, import_compare_versions.compareVersions)(rootVersion, libVersion) > 0 ? rootVersion : libVersion;
+        return [dep, newerVersion];
+      })
+    );
+    Object.keys(allDependencies).sort().forEach((dep) => {
+      if (!!rootDependencies[dep] || !!libDependencies[dep])
+        dependencies[dep] = allDependencies[dep];
+      else
+        devDependencies[dep] = allDependencies[dep];
+    });
+    const newRootPackageJson = { ...rootPackageJson, dependencies, devDependencies };
+    lib.workspace.writeJson("package.json", newRootPackageJson);
+    await lib.workspace.spawn("pnpm", ["install"]);
   }
   async pushLibrary(lib, branch) {
-    await lib.workspace.exec(`git subtree push --prefix=libs/${lib.name} ${lib.name} ${branch}`);
+    await lib.workspace.exec(
+      `git subtree push --prefix=libs/${lib.name} git@github.com:akan-team/${lib.name}.git ${branch}`
+    );
     lib.logger.log(`${lib.name} library pushed to ${branch} branch`);
   }
   async pullLibrary(lib, branch) {
-    await lib.workspace.exec(`git subtree pull --prefix=libs/${lib.name} ${lib.name} ${branch}`);
+    await lib.workspace.exec(
+      `git subtree pull --prefix=libs/${lib.name} git@github.com:akan-team/${lib.name}.git ${branch}`
+    );
     lib.logger.log(`${lib.name} library pulled from ${branch} branch`);
   }
 };
@@ -2065,26 +2118,30 @@ var LibraryRunner = class {
 // pkgs/@akanjs/cli/src/library/library.script.ts
 var LibraryScript = class {
   #runner = new LibraryRunner();
-  async scanLibrary(lib) {
+  async scanLibrary(lib, verbose = false) {
     const scanResult = await this.#runner.scanSync(lib);
-    lib.logger.rawLog(JSON.stringify(scanResult, null, 2));
+    if (verbose)
+      lib.logger.rawLog(JSON.stringify(scanResult, null, 2));
+    return scanResult;
   }
   async syncLibrary(lib, { recursive = true } = {}) {
-    const scanResult = await this.#runner.scanSync(lib);
-    if (recursive) {
-      for (const libName of scanResult.akanConfig.libs)
-        await this.syncLibrary(LibExecutor.from(lib.workspace, libName), { recursive: false });
-    }
+    const scanResult = await this.scanLibrary(lib);
+    if (!recursive)
+      return;
+    for (const libName of scanResult.akanConfig.libs)
+      await this.syncLibrary(LibExecutor.from(lib.workspace, libName), { recursive: false });
   }
   async installLibrary(workspace, libName) {
-    await this.#runner.installLibrary(workspace, libName);
+    const lib = await this.#runner.installLibrary(workspace, libName);
     workspace.log(`${libName} library installed`);
+    await this.#runner.mergeLibraryDependencies(lib);
   }
   async pushLibrary(lib, branch) {
     await this.#runner.pushLibrary(lib, branch);
   }
   async pullLibrary(lib, branch) {
     await this.#runner.pullLibrary(lib, branch);
+    await this.#runner.mergeLibraryDependencies(lib);
   }
 };
 
@@ -2097,7 +2154,7 @@ var import_openai3 = require("@langchain/openai");
 var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
 var import_dotenv = __toESM(require("dotenv"));
 var esbuild = __toESM(require("esbuild"));
-var import_fs10 = __toESM(require("fs"));
+var import_fs11 = __toESM(require("fs"));
 var import_promises2 = __toESM(require("fs/promises"));
 var import_js_yaml2 = __toESM(require("js-yaml"));
 var import_ora2 = __toESM(require("ora"));
@@ -3266,7 +3323,7 @@ var ApplicationRunner = class {
     app.log(`CSR server is running on http://localhost:4201`);
   }
   async #prepareIos(app) {
-    const isAdded = import_fs10.default.existsSync(`${app.cwdPath}/ios/App/Podfile`);
+    const isAdded = import_fs11.default.existsSync(`${app.cwdPath}/ios/App/Podfile`);
     if (!isAdded) {
       await app.spawn("npx", ["cap", "add", "ios"]);
       await app.spawn("npx", ["@capacitor/assets", "generate"]);
@@ -3301,7 +3358,7 @@ var ApplicationRunner = class {
     await capacitorApp.releaseIos();
   }
   async #prepareAndroid(app) {
-    const isAdded = import_fs10.default.existsSync(`${app.cwdPath}/android/app/build.gradle`);
+    const isAdded = import_fs11.default.existsSync(`${app.cwdPath}/android/app/build.gradle`);
     if (!isAdded) {
       await app.spawn("npx", ["cap", "add", "android"]);
       await app.spawn("npx", ["@capacitor/assets", "generate"]);
@@ -3384,14 +3441,14 @@ var ApplicationRunner = class {
     const buildRoot = `${app.workspace.workspaceRoot}/releases/builds/${app.name}`;
     const appVersionInfo = import_js_yaml2.default.load(app.readFile("config.yaml"));
     const platformVersion = appVersionInfo.platforms.android.versionName;
-    if (import_fs10.default.existsSync(buildRoot))
+    if (import_fs11.default.existsSync(buildRoot))
       await import_promises2.default.rm(buildRoot, { recursive: true, force: true });
     await import_promises2.default.mkdir(buildRoot, { recursive: true });
-    if (rebuild || !import_fs10.default.existsSync(`${distApp.cwdPath}/backend`))
+    if (rebuild || !import_fs11.default.existsSync(`${distApp.cwdPath}/backend`))
       await this.buildBackend(app, distApp);
-    if (rebuild || !import_fs10.default.existsSync(`${distApp.cwdPath}/frontend`))
+    if (rebuild || !import_fs11.default.existsSync(`${distApp.cwdPath}/frontend`))
       await this.buildFrontend(app, distApp);
-    if (rebuild || !import_fs10.default.existsSync(`${distApp.cwdPath}/csr`))
+    if (rebuild || !import_fs11.default.existsSync(`${distApp.cwdPath}/csr`))
       await this.buildCsr(app, distApp);
     const buildVersion = `${platformVersion}-${buildNum}`;
     const buildPath = `${buildRoot}/${buildVersion}`;
@@ -3406,7 +3463,7 @@ var ApplicationRunner = class {
       buildRoot,
       "./"
     ]);
-    if (import_fs10.default.existsSync(`${distApp.cwdPath}/csr`)) {
+    if (import_fs11.default.existsSync(`${distApp.cwdPath}/csr`)) {
       await import_promises2.default.cp(`${distApp.cwdPath}/csr`, "./csr", { recursive: true });
       await app.workspace.spawn("zip", [
         "-r",
@@ -3416,7 +3473,7 @@ var ApplicationRunner = class {
       await import_promises2.default.rm("./csr", { recursive: true, force: true });
     }
     const sourceRoot = `${app.workspace.workspaceRoot}/releases/sources/${app.name}`;
-    if (import_fs10.default.existsSync(sourceRoot)) {
+    if (import_fs11.default.existsSync(sourceRoot)) {
       const MAX_RETRY = 3;
       for (let i = 0; i < MAX_RETRY; i++) {
         try {
@@ -3436,7 +3493,7 @@ var ApplicationRunner = class {
     await Promise.all(
       [".next", "ios", "android", "public/libs"].map(async (path7) => {
         const targetPath = `${sourceRoot}/apps/${app.name}/${path7}`;
-        if (import_fs10.default.existsSync(targetPath))
+        if (import_fs11.default.existsSync(targetPath))
           await import_promises2.default.rm(targetPath, { recursive: true, force: true });
       })
     );
@@ -3464,8 +3521,8 @@ var ApplicationRunner = class {
         []
       )
     ]);
-    import_fs10.default.writeFileSync(`${sourceRoot}/tsconfig.json`, JSON.stringify(tsconfig, null, 2));
-    import_fs10.default.writeFileSync(
+    import_fs11.default.writeFileSync(`${sourceRoot}/tsconfig.json`, JSON.stringify(tsconfig, null, 2));
+    import_fs11.default.writeFileSync(
       `${sourceRoot}/README.md`,
       `# ${app.name}
   \uBCF8 \uD504\uB85C\uC81D\uD2B8\uC758 \uC18C\uC2A4\uCF54\uB4DC \uBC0F \uAD00\uB828\uC790\uB8CC\uB294 \uBAA8\uB450 \uBE44\uBC00\uC815\uBCF4\uB85C \uAD00\uB9AC\uB429\uB2C8\uB2E4.
@@ -3858,8 +3915,14 @@ ApplicationCommand = __decorateClass([
 // pkgs/@akanjs/cli/src/package/package.runner.ts
 var esbuild2 = __toESM(require("esbuild"));
 var import_esbuild_plugin_d = require("esbuild-plugin-d.ts");
+var import_fs12 = __toESM(require("fs"));
 var import_promises3 = __toESM(require("fs/promises"));
 var PackageRunner = class {
+  async version(workspace) {
+    const pkgJson = JSON.parse(await import_promises3.default.readFile("package.json", "utf-8"));
+    const version = pkgJson.version;
+    Logger.rawLog(`${pkgJson.name}@${version}`);
+  }
   async createPackage(workspace, pkgName) {
     await workspace.applyTemplate({
       basePath: `pkgs/${pkgName}`,
@@ -3874,8 +3937,8 @@ var PackageRunner = class {
   async buildPackage(pkg, distPkg) {
     const rootPackageJson = pkg.workspace.readJson("package.json");
     const pkgJson = pkg.readJson("package.json");
-    await pkg.workspace.exec(`rm -rf dist/${pkg.name}`);
-    await import_promises3.default.rm(`dist/pkgs/${pkg.name}`, { force: true, recursive: true });
+    if (import_fs12.default.existsSync(distPkg.cwdPath))
+      await pkg.workspace.exec(`rm -rf ${distPkg.cwdPath}`);
     let buildResult;
     if (pkg.name === "@akanjs/config") {
       buildResult = await esbuild2.build({
@@ -3974,6 +4037,9 @@ var PackageRunner = class {
 // pkgs/@akanjs/cli/src/package/package.script.ts
 var PackageScript = class {
   #runner = new PackageRunner();
+  async version(workspace) {
+    await this.#runner.version(workspace);
+  }
   async createPackage(workspace, pkgName) {
     await this.#runner.createPackage(workspace, pkgName);
   }
@@ -4162,7 +4228,7 @@ var LibraryCommand = class {
   async removeLibrary(lib, workspace) {
   }
   async scanLibrary(lib) {
-    await this.libraryScript.scanLibrary(lib);
+    await this.libraryScript.scanLibrary(lib, true);
   }
   async buildLibrary(lib) {
   }
@@ -4218,14 +4284,14 @@ var import_output_parsers2 = require("@langchain/core/output_parsers");
 var import_prompts8 = require("@langchain/core/prompts");
 var import_runnables3 = require("@langchain/core/runnables");
 var import_openai4 = require("@langchain/openai");
-var import_fs11 = __toESM(require("fs"));
+var import_fs13 = __toESM(require("fs"));
 var ModuleRunner = class {
   async createModule(workspace, moduleName) {
     const openAIApiKey = process.env.OPENAI_API_KEY;
     if (!openAIApiKey)
       throw new Error("OPENAI_API_KEY is not set");
     const chatModel = new import_openai4.ChatOpenAI({ modelName: "gpt-4o", openAIApiKey });
-    const projectConfig = JSON.parse(import_fs11.default.readFileSync(`rootPath/projectConfig.json`, "utf-8"));
+    const projectConfig = JSON.parse(import_fs13.default.readFileSync(`rootPath/projectConfig.json`, "utf-8"));
     const mainPrompt = import_prompts8.PromptTemplate.fromTemplate(requestModule());
     const chain = import_runnables3.RunnableSequence.from([mainPrompt, chatModel, new import_output_parsers2.StringOutputParser()]);
     const resultOne = await chain.invoke({
@@ -4279,7 +4345,7 @@ ${paths ? new Array(paths.size).fill(0).map((_, index) => {
       if (!filePath)
         throw new Error("filePath is undefined");
       return `${key}
-\`\`\`${import_fs11.default.readFileSync(filePath, "utf8")}\`\`\`\`
+\`\`\`${import_fs13.default.readFileSync(filePath, "utf8")}\`\`\`\`
 
 `;
     }) : ""}
@@ -4294,11 +4360,11 @@ css\uB77C\uC774\uBE0C\uB7EC\uB9AC\uB294 DaisyUI\uB97C \uAE30\uBC18\uC73C\uB85C \
 ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C \uB514\uC790\uC778\uD574\uC11C \uC791\uC131\uD574\uC918.
 `;
     try {
-      import_fs11.default.writeFileSync("./local/prompt.txt", prompt);
+      import_fs13.default.writeFileSync("./local/prompt.txt", prompt);
       const { content } = await streamAi(prompt, (chunk) => {
         process.stdout.write(chunk);
       });
-      import_fs11.default.writeFileSync("./local/result.txt", content);
+      import_fs13.default.writeFileSync("./local/result.txt", content);
     } catch (error) {
     }
   }
@@ -4325,7 +4391,7 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
       if (!filePath)
         throw new Error("filePath is undefined");
       return `${key}
-\`\`\`${import_fs11.default.readFileSync(filePath, "utf8")}\`\`\`\`
+\`\`\`${import_fs13.default.readFileSync(filePath, "utf8")}\`\`\`\`
 
 `;
     }) : ""}
@@ -4340,11 +4406,11 @@ ${names.Model}.Unit.Card\uC758 \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C
   ${names.Model}.View.General \uB9AC\uC561\uD2B8 \uCEF4\uD3EC\uB10C\uD2B8\uB97C \uB514\uC790\uC778\uD574\uC11C \uC791\uC131\uD574\uC918.
   `;
     try {
-      import_fs11.default.writeFileSync("./local/prompt.txt", prompt);
+      import_fs13.default.writeFileSync("./local/prompt.txt", prompt);
       const { content } = await streamAi(prompt, (chunk) => {
         process.stdout.write(chunk);
       });
-      import_fs11.default.writeFileSync("./local/result.txt", content);
+      import_fs13.default.writeFileSync("./local/result.txt", content);
     } catch (error) {
     }
   }
@@ -4459,6 +4525,9 @@ ModuleCommand = __decorateClass([
 // pkgs/@akanjs/cli/src/package/package.command.ts
 var PackageCommand = class {
   packageScript = new PackageScript();
+  async version(workspace) {
+    await this.packageScript.version(workspace);
+  }
   async createPackage(name, workspace) {
     await this.packageScript.createPackage(workspace, name);
   }
@@ -4471,6 +4540,10 @@ var PackageCommand = class {
     await this.packageScript.buildPackage(pkg);
   }
 };
+__decorateClass([
+  Target.Public(),
+  __decorateParam(0, Workspace())
+], PackageCommand.prototype, "version", 1);
 __decorateClass([
   Target.Public(),
   __decorateParam(0, Option("name", { desc: "name of package" })),
@@ -4659,7 +4732,7 @@ WorkspaceCommand = __decorateClass([
 ], WorkspaceCommand);
 
 // pkgs/@akanjs/cli/index.ts
-require("dotenv").config();
+require("dotenv").config({ path: `${process.cwd()}/.env` });
 void runCommands(
   WorkspaceCommand,
   ApplicationCommand,

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "bin": {
     "akan": "index.js"
   },
@@ -28,6 +28,7 @@
     "axios": "^1.7.9",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
+    "compare-versions": "^6.1.1",
     "dayjs": "^1.11.13",
     "dotenv": "^16.4.7",
     "esbuild": "^0.19.2",

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

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

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

@@ -1,7 +1,7 @@
 import type { Lib, Workspace } from "@akanjs/devkit";
 export declare class LibraryScript {
     #private;
-    scanLibrary(lib: Lib): Promise<void>;
+    scanLibrary(lib: Lib, verbose?: boolean): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     syncLibrary(lib: Lib, { recursive }?: {
         recursive?: boolean;
     }): Promise<void>;

package/pkgs/@akanjs/cli/src/package/package.command.d.ts

@@ -2,6 +2,7 @@ import { Pkg, Workspace } from "@akanjs/devkit";
 import { PackageScript } from "./package.script";
 export declare class PackageCommand {
     packageScript: PackageScript;
+    version(workspace: Workspace): Promise<void>;
     createPackage(name: string, workspace: Workspace): Promise<void>;
     removePackage(name: string, workspace: Workspace): Promise<void>;
     scanPackage(pkg: Pkg): Promise<void>;

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

@@ -1,5 +1,6 @@
 import { type DistPkgExecutor, type Pkg, type Workspace } from "@akanjs/devkit";
 export declare class PackageRunner {
+    version(workspace: Workspace): Promise<void>;
     createPackage(workspace: Workspace, pkgName: string): Promise<void>;
     scanSync(pkg: Pkg): Promise<import("@akanjs/config").PkgScanResult>;
     buildPackage(pkg: Pkg, distPkg: DistPkgExecutor): Promise<void>;

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

@@ -1,6 +1,7 @@
 import { DistPkgExecutor, type Pkg, type Workspace } from "@akanjs/devkit";
 export declare class PackageScript {
     #private;
+    version(workspace: Workspace): Promise<void>;
     createPackage(workspace: Workspace, pkgName: string): Promise<void>;
     scanPackage(pkg: Pkg): Promise<void>;
     buildPackage(pkg: Pkg, distPkg?: DistPkgExecutor): Promise<void>;