@akanjs/cli 2.4.1-rc.1 → 2.4.1-rc.2

package/{cloud.command-qgjxja3n.js → cloud.command-hxcgsf80.js}

@@ -1,12 +1,12 @@
 // @bun
 import {
   CloudScript
-} from "./index-z9gvz7b0.js";
+} from "./index-mq6ns0f9.js";
 import"./index-sgmas1fc.js";
 import"./index-77crfweb.js";
 import"./index-76rn3g2c.js";
 import"./index-pmm9e2jf.js";
-import"./index-wq8jwx8z.js";
+import"./index-n6h3482q.js";
 import {
   GlobalConfig
 } from "./index-5vvwc0cz.js";

package/{index-z9gvz7b0.js → index-mq6ns0f9.js}

@@ -7,7 +7,7 @@ import {
 } from "./index-77crfweb.js";
 import {
   PackageScript
-} from "./index-wq8jwx8z.js";
+} from "./index-n6h3482q.js";
 import {
   AiSession,
   CloudApi,

package/{index-wq8jwx8z.js → index-n6h3482q.js}

@@ -14,7 +14,93 @@ import {
 } from "./index-61keag0s.js";
 
 // pkgs/@akanjs/cli/package/package.runner.ts
+import path2 from "path";
+
+// pkgs/@akanjs/devkit/packageExportsMap.ts
+import { statSync } from "fs";
 import path from "path";
+
+class PackageExportsMap {
+  static async from(packageDir) {
+    const manifest = await Bun.file(path.join(packageDir, "package.json")).json();
+    return new PackageExportsMap(packageDir, manifest.exports);
+  }
+  static #runtimeTargetOf(value) {
+    if (typeof value === "string")
+      return value;
+    if (Array.isArray(value)) {
+      for (const entry of value) {
+        const target = PackageExportsMap.#runtimeTargetOf(entry);
+        if (target)
+          return target;
+      }
+      return null;
+    }
+    if (!value || typeof value !== "object")
+      return null;
+    const conditions = value;
+    for (const condition of ["bun", "import", "default", "require", "types"]) {
+      if (!(condition in conditions))
+        continue;
+      const target = PackageExportsMap.#runtimeTargetOf(conditions[condition]);
+      if (target)
+        return target;
+    }
+    return null;
+  }
+  #packageDir;
+  #literals = new Map;
+  #patterns = [];
+  constructor(packageDir, exportsField) {
+    this.#packageDir = packageDir;
+    if (!exportsField || typeof exportsField !== "object")
+      return;
+    for (const [key, value] of Object.entries(exportsField)) {
+      if (!key.startsWith("."))
+        continue;
+      const target = PackageExportsMap.#runtimeTargetOf(value);
+      if (!target)
+        continue;
+      const star = key.indexOf("*");
+      if (star === -1)
+        this.#literals.set(key, target);
+      else
+        this.#patterns.push({ prefix: key.slice(0, star), suffix: key.slice(star + 1), target });
+    }
+    this.#patterns.sort((a, b) => b.prefix.length - a.prefix.length || b.suffix.length - a.suffix.length);
+  }
+  resolve(subpath) {
+    const literal = this.#literals.get(subpath);
+    if (literal)
+      return literal;
+    for (const { prefix, suffix, target } of this.#patterns) {
+      if (!subpath.startsWith(prefix) || !subpath.endsWith(suffix))
+        continue;
+      if (subpath.length < prefix.length + suffix.length)
+        continue;
+      return target.replace("*", subpath.slice(prefix.length, subpath.length - suffix.length));
+    }
+    return null;
+  }
+  resolveToFile(subpath) {
+    const target = this.resolve(subpath);
+    if (!target)
+      return { target: null, exists: false };
+    const stat = statSync(path.join(this.#packageDir, target), { throwIfNoEntry: false });
+    return { target, exists: !!stat?.isFile() };
+  }
+  findUnreachable(subpaths) {
+    const unreachable = [];
+    for (const subpath of subpaths) {
+      const { target, exists } = this.resolveToFile(subpath);
+      if (!exists)
+        unreachable.push({ subpath, target });
+    }
+    return unreachable;
+  }
+}
+
+// pkgs/@akanjs/cli/package/package.runner.ts
 import { Logger } from "akanjs/common";
 var {$ } = globalThis.Bun;
 
@@ -34,11 +120,11 @@ class PackageRunner extends runner("package") {
   }
   async#getInstalledPackageJson() {
     const packageJsonCandidates = [
-      `${path.dirname(Bun.main)}/package.json`,
+      `${path2.dirname(Bun.main)}/package.json`,
       `${process.cwd()}/node_modules/akanjs/package.json`
     ];
     try {
-      packageJsonCandidates.unshift(Bun.resolveSync("akanjs/package.json", path.dirname(Bun.main)));
+      packageJsonCandidates.unshift(Bun.resolveSync("akanjs/package.json", path2.dirname(Bun.main)));
     } catch {}
     for (const packageJsonPath of packageJsonCandidates) {
       if (!await Bun.file(packageJsonPath).exists())
@@ -47,7 +133,7 @@ class PackageRunner extends runner("package") {
       if (packageJson.name === "akanjs" || packageJson.name === "@akanjs/cli")
         return packageJson;
     }
-    throw new Error(`[package] failed to locate akanjs package.json from ${path.dirname(Bun.main)}`);
+    throw new Error(`[package] failed to locate akanjs package.json from ${path2.dirname(Bun.main)}`);
   }
   async createPackage(workspace, pkgName) {
     await workspace.applyTemplate({ basePath: `pkgs/${pkgName}`, template: "pkgRoot", dict: { pkgName } });
@@ -111,7 +197,68 @@ class PackageRunner extends runner("package") {
     }
     await this.#copyPackageReadmes(pkg);
   }
-  async verifyDistPackage(pkg) {
+  static #scannableDistFiles = "**/*.{ts,tsx,js,jsx,mjs,cjs}";
+  static #importPosition = /(?:\bfrom\s*|\brequire\s*\(\s*|\bimport\s*\(\s*|\bimport\s+)$/;
+  static #splitSpecifier(specifier) {
+    const segments = specifier.split("/");
+    const name = specifier.startsWith("@") ? segments.slice(0, 2).join("/") : segments[0];
+    const subpath = specifier.slice(name.length).replace(/^\//, "");
+    return { name, subpath: subpath ? `./${subpath}` : "." };
+  }
+  async#collectDistAkanImports(distPath, packageNames) {
+    const alternatives = [...new Set(packageNames)].map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+    const specifierPattern = new RegExp(`["'](${alternatives.join("|")})((?:/[^"'\\s]*)?)["']`, "g");
+    const glob = new Bun.Glob(PackageRunner.#scannableDistFiles);
+    const imports = new Map;
+    for await (const relative of glob.scan({ cwd: distPath })) {
+      if (relative.includes("node_modules/") || relative.endsWith(".d.ts"))
+        continue;
+      if (/\.(test|spec)\.[a-z]+$/.test(relative))
+        continue;
+      const source = await Bun.file(`${distPath}/${relative}`).text();
+      for (const line of source.split(`
+`)) {
+        const trimmed = line.trimStart();
+        if (trimmed.startsWith("//") || trimmed.startsWith("*") || trimmed.startsWith("/*"))
+          continue;
+        for (const match of line.matchAll(specifierPattern)) {
+          if (!PackageRunner.#importPosition.test(line.slice(0, match.index)))
+            continue;
+          const specifier = `${match[1]}${match[2] ?? ""}`;
+          const importers = imports.get(specifier) ?? new Set;
+          imports.set(specifier, importers.add(relative));
+        }
+      }
+    }
+    return imports;
+  }
+  async#verifyDistExportsReachable(pkg, peerExportsMaps) {
+    const exportsMaps = new Map(peerExportsMaps).set(pkg.name, await PackageExportsMap.from(pkg.dist.cwdPath));
+    const imports = await this.#collectDistAkanImports(pkg.dist.cwdPath, exportsMaps.keys());
+    const failures = [];
+    for (const [specifier, importers] of imports) {
+      const { name, subpath } = PackageRunner.#splitSpecifier(specifier);
+      const exportsMap = exportsMaps.get(name);
+      if (!exportsMap)
+        continue;
+      const [unreachable] = exportsMap.findUnreachable([subpath]);
+      if (!unreachable)
+        continue;
+      const reason = unreachable.target ? `its exports map yields ${unreachable.target}, which is not a file` : "no exports entry matches it";
+      const files = [...importers].sort();
+      const shown = files.slice(0, 3).join(", ") + (files.length > 3 ? ` (+${files.length - 3} more)` : "");
+      failures.push(`  ${specifier} \u2014 ${reason}; imported by ${shown}`);
+    }
+    if (!failures.length)
+      return;
+    throw new Error(`[package] ${pkg.name} dist imports ${failures.length} subpath(s) no consumer can resolve:
+` + `${failures.sort().join(`
+`)}
+` + `Add the missing "exports" entries: a bare file facet needs "./*": "./*.ts", a directory facet ` + `needs its own "./name": "./name/index.ts", and "./*.ts": "./*.ts" keeps an already-suffixed ` + `specifier from gaining a second extension.`);
+  }
+  async verifyDistPackage(pkg, {
+    peerExportsMaps = new Map
+  } = {}) {
     const distPackageJsonPath = `${pkg.dist.cwdPath}/package.json`;
     if (!await Bun.file(distPackageJsonPath).exists()) {
       throw new Error(`[package] dist package not found for ${pkg.name}. Run build-package first.`);
@@ -142,6 +289,7 @@ class PackageRunner extends runner("package") {
         throw new Error("[package] akanjs dist exports must point type declarations at ./types");
       }
     }
+    await this.#verifyDistExportsReachable(pkg, peerExportsMaps);
     const packOutput = await pkg.workspace.spawn("npm", ["pack", "--dry-run", "--json", pkg.dist.cwdPath], {
       cwd: pkg.workspace.workspaceRoot
     });
@@ -154,9 +302,16 @@ class PackageRunner extends runner("package") {
     };
   }
   async verifyAkanPublishPackages(workspace) {
+    const pkgs = PackageRunner.publishableAkanPackages.map((pkgName) => PkgExecutor.from(workspace, pkgName));
+    const peerExportsMaps = new Map;
+    for (const pkg of pkgs) {
+      if (!await Bun.file(`${pkg.dist.cwdPath}/package.json`).exists())
+        continue;
+      peerExportsMaps.set(pkg.name, await PackageExportsMap.from(pkg.dist.cwdPath));
+    }
     const results = [];
-    for (const pkgName of PackageRunner.publishableAkanPackages) {
-      results.push(await this.verifyDistPackage(PkgExecutor.from(workspace, pkgName)));
+    for (const pkg of pkgs) {
+      results.push(await this.verifyDistPackage(pkg, { peerExportsMaps }));
     }
     return results;
   }

package/index.js

@@ -17,16 +17,16 @@ import path from "path";
 
 // pkgs/@akanjs/cli/commandModules.ts
 var commandModules = {
-  workspace: async () => (await import("./workspace.command-xk68sd6c.js")).WorkspaceCommand,
+  workspace: async () => (await import("./workspace.command-875aj35r.js")).WorkspaceCommand,
   agent: async () => (await import("./agent.command-h4afc69n.js")).AgentCommand,
   application: async () => (await import("./application.command-47mj9qsy.js")).ApplicationCommand,
   library: async () => (await import("./library.command-r15zdqvp.js")).LibraryCommand,
-  localRegistry: async () => (await import("./localRegistry.command-p1pgxw78.js")).LocalRegistryCommand,
-  package: async () => (await import("./package.command-r8sq5kzp.js")).PackageCommand,
+  localRegistry: async () => (await import("./localRegistry.command-6z4s13mj.js")).LocalRegistryCommand,
+  package: async () => (await import("./package.command-5x5m0ej1.js")).PackageCommand,
   module: async () => (await import("./module.command-qrj3kmyz.js")).ModuleCommand,
   page: async () => (await import("./page.command-c6xdx0xm.js")).PageCommand,
   context: async () => (await import("./context.command-nqbtak4f.js")).ContextCommand,
-  cloud: async () => (await import("./cloud.command-qgjxja3n.js")).CloudCommand,
+  cloud: async () => (await import("./cloud.command-hxcgsf80.js")).CloudCommand,
   guideline: async () => (await import("./guideline.command-ya0dh44f.js")).GuidelineCommand,
   scalar: async () => (await import("./scalar.command-kabkd6wd.js")).ScalarCommand,
   primitive: async () => (await import("./primitive.command-pv9ssmtf.js")).PrimitiveCommand,

package/{localRegistry.command-p1pgxw78.js → localRegistry.command-6z4s13mj.js}

@@ -10,7 +10,7 @@ import"./index-76rn3g2c.js";
 import"./index-pmm9e2jf.js";
 import {
   PackageScript
-} from "./index-wq8jwx8z.js";
+} from "./index-n6h3482q.js";
 import"./index-5vvwc0cz.js";
 import {
   Workspace,

package/{package.command-r8sq5kzp.js → package.command-5x5m0ej1.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   PackageScript
-} from "./index-wq8jwx8z.js";
+} from "./index-n6h3482q.js";
 import {
   Pkg,
   Workspace,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.4.1-rc.1",
+  "version": "2.4.1-rc.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.4.1-rc.1",
+    "akanjs": "2.4.1-rc.2",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "5.5.23",

package/{workspace.command-xk68sd6c.js → workspace.command-875aj35r.js}

@@ -5,7 +5,7 @@ import {
 import"./index-45aj5ry0.js";
 import {
   CloudScript
-} from "./index-z9gvz7b0.js";
+} from "./index-mq6ns0f9.js";
 import"./index-y3hdhy4p.js";
 import"./index-73pr2cmy.js";
 import"./index-85msc0wg.js";
@@ -27,7 +27,7 @@ import {
 } from "./index-pmm9e2jf.js";
 import {
   PackageScript
-} from "./index-wq8jwx8z.js";
+} from "./index-n6h3482q.js";
 import"./index-8pkbzj26.js";
 import"./index-swf4bmbg.js";
 import"./index-ss469dec.js";