@akanjs/cli 3.0.0-alpha.8 → 3.0.0-alpha.80

package/index-xnhf8tr9.js

@@ -0,0 +1,109 @@
+// @bun
+import {
+  AppInfo
+} from "./index-k1n0h7dk.js";
+
+// pkgs/@akanjs/devkit/slicePlanner.ts
+class SlicePlanner {
+  static memberDirs = ["apps", "libs", "pkgs"];
+  static toolchainDependencies = [
+    "@akanjs/cli",
+    "@akanjs/devkit",
+    "@biomejs/biome",
+    "@types/bun",
+    "akanjs",
+    "typescript"
+  ];
+  #app;
+  constructor(app) {
+    this.#app = app;
+  }
+  async#trackedFiles(paths) {
+    return await this.#app.workspace.listGitFiles(paths);
+  }
+  async#untrackedFiles(paths) {
+    const [tracked, all] = await Promise.all([
+      this.#app.workspace.listGitFiles(paths),
+      this.#app.workspace.listGitFiles(paths, { untracked: true })
+    ]);
+    const trackedSet = new Set(tracked);
+    return all.filter((file) => !trackedSet.has(file));
+  }
+  #isMemberFile(file) {
+    return SlicePlanner.memberDirs.includes(file.split("/")[0] ?? "");
+  }
+  static #requiredDependencies(appInfo) {
+    const scanResults = [
+      appInfo.getScanResult(),
+      ...[...appInfo.getLibInfos().values()].map((lib) => lib.getScanResult())
+    ];
+    return new Set([
+      ...SlicePlanner.toolchainDependencies,
+      ...scanResults.flatMap((scanResult) => [
+        ...scanResult.dependencies,
+        ...scanResult.devDependencies,
+        ...scanResult.pkgDeps
+      ])
+    ]);
+  }
+  async#patchWarnings(packageJson) {
+    const patchedDependencies = packageJson.patchedDependencies ?? {};
+    const missing = (await Promise.all(Object.entries(patchedDependencies).map(async ([spec, patchPath]) => await this.#app.workspace.exists(patchPath) ? null : `${spec} -> ${patchPath}`))).filter((entry) => !!entry);
+    return missing.length ? [`patchedDependencies references a missing patch file: ${missing.join(", ")}`] : [];
+  }
+  async plan() {
+    const appInfo = await AppInfo.fromExecutor(this.#app);
+    const libs = appInfo.getLibs();
+    const slicePaths = [`apps/${this.#app.name}`, ...libs.map((lib) => `libs/${lib}`)];
+    const [appFiles, allTracked, untracked, rootPackageJson] = await Promise.all([
+      this.#trackedFiles([`apps/${this.#app.name}`]),
+      this.#trackedFiles(["."]),
+      this.#untrackedFiles(slicePaths),
+      this.#app.workspace.getPackageJson()
+    ]);
+    const libFiles = Object.fromEntries(await Promise.all(libs.map(async (lib) => [lib, await this.#trackedFiles([`libs/${lib}`])])));
+    const rootFiles = allTracked.filter((file) => !this.#isMemberFile(file));
+    const required = SlicePlanner.#requiredDependencies(appInfo);
+    const rootDependencies = { ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies };
+    const unusedDependencies = Object.keys(rootDependencies).filter((dep) => !required.has(dep)).sort();
+    const { workspaces: _workspaces, ...slicePackageJson } = rootPackageJson;
+    const warnings = [
+      ...untracked.length ? [`${untracked.length} untracked file(s) under the slice paths: ${untracked.join(", ")}`] : [],
+      ...rootPackageJson.workspaces ? ["root `workspaces` dropped \u2014 a slice consumes akanjs from the registry"] : [],
+      ...await this.#patchWarnings(rootPackageJson)
+    ];
+    return {
+      app: this.#app.name,
+      libs,
+      appFiles,
+      libFiles,
+      rootFiles,
+      packageJson: slicePackageJson,
+      unusedDependencies,
+      warnings
+    };
+  }
+}
+var rootEntriesOf = (rootFiles) => [...new Set(rootFiles.map((file) => file.split("/")[0] ?? file))].sort();
+function formatSlicePlan(plan) {
+  const libCounts = Object.entries(plan.libFiles).map(([lib, files]) => `  - libs/${lib}: ${files.length} files`);
+  const sections = [
+    "Akan Slice Plan",
+    `app: ${plan.app} (apps/${plan.app}: ${plan.appFiles.length} files)`,
+    `libs: ${plan.libs.length ? plan.libs.join(", ") : "(none)"}`,
+    ...libCounts,
+    `workspace shell: ${plan.rootFiles.length} files across ${rootEntriesOf(plan.rootFiles).join(", ")}`,
+    "",
+    `Unused root dependencies (${plan.unusedDependencies.length}) \u2014 prune candidates, not pruned:`,
+    "",
+    ...plan.unusedDependencies.length ? plan.unusedDependencies.map((dep) => `  - ${dep}`) : ["  (none)"],
+    "",
+    `Warnings (${plan.warnings.length}):`,
+    "",
+    ...plan.warnings.length ? plan.warnings.map((warning) => `  - ${warning}`) : ["  (none)"]
+  ];
+  return sections.join(`
+`);
+}
+
+export { SlicePlanner, formatSlicePlan };

package/{index-a1e0j63x.js → index-xxe90kqy.js}

@@ -2,16 +2,24 @@
 import {
   runner,
   script
-} from "./index-6rhabeev.js";
+} from "./index-ft1sfjz0.js";
 import {
   LibExecutor
-} from "./index-vg0sj9nc.js";
+} from "./index-k1n0h7dk.js";
+import {
+  LibSource,
+  formatLibStatuses
+} from "./index-3d9y066c.js";
+
+// pkgs/@akanjs/cli/library/library.script.ts
+import { Logger } from "akanjs/common";
 
-// pkgs/@akanjs/cli/semver.ts
-function parseVersion(version) {
+// pkgs/@akanjs/devkit/semver.ts
+var stripRangeOperator = (version) => version.replace(/^[\s^~>=<v]+/, "").trim();
+var parseVersion = (version) => {
   return version.replace(/^[^\d]*/, "").split(/[.-]/).map((part) => Number.parseInt(part, 10)).map((part) => Number.isFinite(part) ? part : 0);
-}
-function compareSemver(a, b) {
+};
+var compareNumeric = (a, b) => {
   const left = parseVersion(a);
   const right = parseVersion(b);
   const length = Math.max(left.length, right.length);
@@ -21,40 +29,64 @@ function compareSemver(a, b) {
       return diff > 0 ? 1 : -1;
   }
   return 0;
-}
+};
+var compareSemver = (a, b) => {
+  try {
+    return Bun.semver.order(stripRangeOperator(a), stripRangeOperator(b));
+  } catch {
+    return compareNumeric(a, b);
+  }
+};
 
 // pkgs/@akanjs/cli/library/library.runner.ts
 class LibraryRunner extends runner("library") {
+  static libraryRepository = "https://github.com/akan-team/akanjs.git";
   async createLibrary(libName, workspace) {
-    await workspace.exec(`mkdir -p libs/${libName}`);
+    await workspace.mkdir(`libs/${libName}`);
     await workspace.applyTemplate({ basePath: `libs/${libName}`, template: "libRoot", dict: { libName } });
     const lib = LibExecutor.from(workspace, libName);
     return lib;
   }
   async removeLibrary(lib) {
-    await lib.workspace.exec(`rm -rf libs/${lib.name}`);
+    await lib.workspace.removeDir(`libs/${lib.name}`);
   }
   async#copyInstalledLibrary(workspace, libName) {
     const installedPackageJson = `node_modules/akanjs/libs/${libName}/package.json`;
     if (!await workspace.exists(installedPackageJson))
-      return false;
+      return null;
     await workspace.cp(`node_modules/akanjs/libs/${libName}`, `libs/${libName}`);
-    return true;
+    return { origin: "akanjs", sha: await this.#installedAkanVersion(workspace) };
+  }
+  async#installedAkanVersion(workspace) {
+    const manifestPath = "node_modules/akanjs/package.json";
+    if (!await workspace.exists(manifestPath))
+      return "unknown";
+    const { version } = await workspace.readJson(manifestPath);
+    return version ?? "unknown";
   }
   async#copyLibraryFromRepository(workspace, libName) {
     await workspace.mkdir("node_modules/.akan");
     if (await workspace.exists("node_modules/.akan/akanjs"))
       await workspace.removeDir("node_modules/.akan/akanjs");
-    await workspace.exec(`cd node_modules/.akan && git clone https://github.com/akan-team/akanjs.git`);
+    await workspace.exec(`cd node_modules/.akan && git clone ${LibraryRunner.libraryRepository}`);
     await workspace.cp(`node_modules/.akan/akanjs/libs/${libName}`, `libs/${libName}`);
+    const sha = await workspace.spawn("git", ["-C", "node_modules/.akan/akanjs", "rev-parse", "HEAD"]);
+    return { origin: LibraryRunner.libraryRepository, sha: sha.trim().slice(0, 12) };
   }
   async installLibrary(workspace, libName) {
-    const copiedFromInstalledPackage = await this.#copyInstalledLibrary(workspace, libName);
-    if (!copiedFromInstalledPackage)
-      await this.#copyLibraryFromRepository(workspace, libName);
-    await workspace.cp(`libs/${libName}/env/env.server.example.ts`, `libs/${libName}/env/env.server.testing.ts`);
-    await workspace.commit(`Add ${libName} library`);
-    return LibExecutor.from(workspace, libName);
+    const source = await this.#copyInstalledLibrary(workspace, libName) ?? await this.#copyLibraryFromRepository(workspace, libName);
+    const testingEnv = `libs/${libName}/env/env.server.testing.ts`;
+    if (!await workspace.exists(testingEnv))
+      await workspace.cp(`libs/${libName}/env/env.server.example.ts`, testingEnv);
+    const lib = LibExecutor.from(workspace, libName);
+    const stamp = await new LibSource(lib).write(source);
+    if (await workspace.hasChanges())
+      await workspace.commit(`Install ${libName} library from ${stamp.origin}`);
+    return lib;
+  }
+  async libraryStatuses(workspace) {
+    const libNames = await workspace.getLibs();
+    return await Promise.all(libNames.map((libName) => new LibSource(LibExecutor.from(workspace, libName)).status()));
   }
   async mergeLibraryDependencies(lib) {
     const libPackageJson = await lib.getPackageJson();
@@ -70,7 +102,7 @@ class LibraryRunner extends runner("library") {
       return [dep, newerVersion];
     }));
     Object.keys(allDependencies).sort().forEach((dep) => {
-      if (!!libPackageJson.dependencies?.[dep] || !!rootPackageJson.dependencies?.[dep])
+      if (libPackageJson.dependencies?.[dep] || rootPackageJson.dependencies?.[dep])
         dependencies[dep] = allDependencies[dep];
       else
         devDependencies[dep] = allDependencies[dep];
@@ -80,7 +112,6 @@ class LibraryRunner extends runner("library") {
     await lib.workspace.spawn("bun", ["install"]);
     await lib.workspace.commit(`Merge ${lib.name} library dependencies`);
   }
-  async testLibrary(lib) {}
 }
 
 // pkgs/@akanjs/cli/library/library.script.ts
@@ -102,6 +133,13 @@ class LibraryScript extends script("library", [LibraryRunner]) {
     await this.libraryRunner.removeLibrary(lib);
     spinner.succeed(`Library ${lib.name} (libs/${lib.name}) is removed`);
   }
+  async libraryStatus(workspace, format = "text") {
+    const spinner = workspace.spinning("Checking library sources...");
+    const statuses = await this.libraryRunner.libraryStatuses(workspace);
+    const drifted = statuses.filter((status) => status.drift === "drifted").length;
+    spinner.succeed(`Checked ${statuses.length} libraries (${drifted} drifted)`);
+    Logger.rawLog(format === "json" ? JSON.stringify(statuses, null, 2) : formatLibStatuses(statuses));
+  }
   async installLibrary(workspace, libName) {
     const installSpinner = workspace.spinning(`Installing ${libName} library`);
     const lib = await this.libraryRunner.installLibrary(workspace, libName);
@@ -110,11 +148,6 @@ class LibraryScript extends script("library", [LibraryRunner]) {
     await this.libraryRunner.mergeLibraryDependencies(lib);
     mergeSpinner.succeed(`${libName} library (libs/${libName}) dependencies merged to root package.json`);
   }
-  async testLibrary(lib) {
-    const spinner = lib.spinning("Testing library...");
-    await this.libraryRunner.testLibrary(lib);
-    spinner.succeed(`Library ${lib.name} (libs/${lib.name}) test is successful`);
-  }
 }
 
 export { LibraryScript };