@akanjs/cli 0.0.63 → 0.0.65

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) {
@@ -2039,6 +2058,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 +2071,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,20 +2115,23 @@ 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);
@@ -3860,6 +3913,11 @@ var esbuild2 = __toESM(require("esbuild"));
 var import_esbuild_plugin_d = require("esbuild-plugin-d.ts");
 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}`,
@@ -3974,6 +4032,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 +4223,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) {
   }
@@ -4459,6 +4520,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 +4535,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" })),

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "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>;

package/src/templates/app/app/[lang]/(__appName__)/layout.js

@@ -24,6 +24,7 @@ function getContent(scanResult, dict) {
   return {
     filename: "layout.tsx",
     content: `
+import { RootLayoutProps } from "@akanjs/client";
 import { System } from "@shared/ui";
 import { env } from "@${dict.appName}/env/env.client";
 import { fetch } from "@${dict.appName}/client";

package/src/templates/app/ui/Footer.js

@@ -45,7 +45,7 @@ export const Footer = () => {
         </div>
         <div className="items-center justify-between mt-6 text-sm md:text-base md:mt-3 md:flex ">
           <div className="flex flex-col text-xs md:text-base gap-1 text-[#777777]">
-            ${dict.CompanyName} | <CEO_NAME> | <COMPANY_ADDRESS>
+            ${dict.CompanyName} | CEO_NAME | COMPANY_ADDRESS
           </div>
           <div>
             <div className="flex gap-4 mt-6 text-xs md:text-base md:mt-0">