@akanjs/cli 2.1.0-rc.2 → 2.1.0-rc.3

package/incrementalBuilder.proc.js

@@ -5865,9 +5865,9 @@ class CssImportResolver {
   }
   async resolve(id, fromBase) {
     for (const resolve of [
+      () => this.#resolveWithTsconfig(id),
       () => this.#resolveWithBun(id, fromBase),
       () => this.#resolveWithRequire(id, fromBase),
-      () => this.#resolveWithTsconfig(id),
       () => this.#resolvePackageStyle(id, fromBase)
     ]) {
       const resolved = await resolve();
@@ -5877,20 +5877,24 @@ class CssImportResolver {
     return null;
   }
   #resolveWithBun(id, fromBase) {
-    try {
-      const resolved = Bun.resolveSync(id, fromBase);
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = Bun.resolveSync(id, base);
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   #resolveWithRequire(id, fromBase) {
-    try {
-      const resolved = __require.resolve(id, { paths: [fromBase] });
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = __require.resolve(id, { paths: [base] });
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   async#resolveWithTsconfig(id) {
     const exact = this.#paths[id];
@@ -5918,8 +5922,25 @@ class CssImportResolver {
     const pkgName = CssImportResolver.getPackageName(id);
     if (!pkgName)
       return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [base] });
+        const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+        if (resolved)
+          return resolved;
+      } catch {}
+    }
+    for (const pkgPath of this.#packageJsonCandidates(pkgName)) {
+      const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+      if (resolved)
+        return resolved;
+    }
+    return null;
+  }
+  async#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath) {
     try {
-      const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [fromBase] });
+      if (!await Bun.file(pkgPath).exists())
+        return null;
       const pkgDir = path22.dirname(pkgPath);
       const pkg = await Bun.file(pkgPath).json();
       const subpath = id === pkgName ? "." : `.${id.slice(pkgName.length)}`;
@@ -5930,6 +5951,22 @@ class CssImportResolver {
       return null;
     }
   }
+  #resolutionBases(fromBase) {
+    return [
+      fromBase,
+      this.#workspaceRoot,
+      path22.dirname(Bun.main),
+      path22.resolve(path22.dirname(Bun.main), "../..")
+    ];
+  }
+  #packageJsonCandidates(pkgName) {
+    return [
+      path22.join(this.#workspaceRoot, "pkgs", pkgName, "package.json"),
+      path22.join(this.#workspaceRoot, "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "../../", pkgName, "package.json")
+    ];
+  }
   async#firstExisting(basePath2) {
     for (const suffix of CSS_IMPORT_EXTS) {
       const candidate = `${basePath2}${suffix}`;
@@ -7054,14 +7091,23 @@ class SsrBaseArtifactBuilder {
   async#resolveAkanServerPath() {
     const candidates = [
       path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
+      path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"),
+      path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"),
+      path30.join(path30.dirname(Bun.main), "../../akanjs/server"),
       path30.resolve(import.meta.dir, "../../server"),
       path30.resolve(import.meta.dir, "../server")
     ];
+    try {
+      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+    } catch {}
+    try {
+      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
+    } catch {}
     for (const candidate of candidates) {
       if (await Bun.file(path30.join(candidate, "rscClient.tsx")).exists())
         return candidate;
     }
-    return candidates[0];
+    throw new Error(`[base-artifact] failed to locate akanjs/server; looked in: ${candidates.join(", ")}`);
   }
   async#buildStyleAssets() {
     const cssCompiler = new CssCompiler(this.#app);

package/index.js

@@ -5862,9 +5862,9 @@ class CssImportResolver {
   }
   async resolve(id, fromBase) {
     for (const resolve of [
+      () => this.#resolveWithTsconfig(id),
       () => this.#resolveWithBun(id, fromBase),
       () => this.#resolveWithRequire(id, fromBase),
-      () => this.#resolveWithTsconfig(id),
       () => this.#resolvePackageStyle(id, fromBase)
     ]) {
       const resolved = await resolve();
@@ -5874,20 +5874,24 @@ class CssImportResolver {
     return null;
   }
   #resolveWithBun(id, fromBase) {
-    try {
-      const resolved = Bun.resolveSync(id, fromBase);
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = Bun.resolveSync(id, base);
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   #resolveWithRequire(id, fromBase) {
-    try {
-      const resolved = __require.resolve(id, { paths: [fromBase] });
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = __require.resolve(id, { paths: [base] });
+        if (CssImportResolver.isCssFile(resolved))
+          return resolved;
+      } catch {}
     }
+    return null;
   }
   async#resolveWithTsconfig(id) {
     const exact = this.#paths[id];
@@ -5915,8 +5919,25 @@ class CssImportResolver {
     const pkgName = CssImportResolver.getPackageName(id);
     if (!pkgName)
       return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [base] });
+        const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+        if (resolved)
+          return resolved;
+      } catch {}
+    }
+    for (const pkgPath of this.#packageJsonCandidates(pkgName)) {
+      const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+      if (resolved)
+        return resolved;
+    }
+    return null;
+  }
+  async#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath) {
     try {
-      const pkgPath = __require.resolve(`${pkgName}/package.json`, { paths: [fromBase] });
+      if (!await Bun.file(pkgPath).exists())
+        return null;
       const pkgDir = path22.dirname(pkgPath);
       const pkg = await Bun.file(pkgPath).json();
       const subpath = id === pkgName ? "." : `.${id.slice(pkgName.length)}`;
@@ -5927,6 +5948,22 @@ class CssImportResolver {
       return null;
     }
   }
+  #resolutionBases(fromBase) {
+    return [
+      fromBase,
+      this.#workspaceRoot,
+      path22.dirname(Bun.main),
+      path22.resolve(path22.dirname(Bun.main), "../..")
+    ];
+  }
+  #packageJsonCandidates(pkgName) {
+    return [
+      path22.join(this.#workspaceRoot, "pkgs", pkgName, "package.json"),
+      path22.join(this.#workspaceRoot, "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "node_modules", pkgName, "package.json"),
+      path22.join(path22.dirname(Bun.main), "../../", pkgName, "package.json")
+    ];
+  }
   async#firstExisting(basePath2) {
     for (const suffix of CSS_IMPORT_EXTS) {
       const candidate = `${basePath2}${suffix}`;
@@ -7051,14 +7088,23 @@ class SsrBaseArtifactBuilder {
   async#resolveAkanServerPath() {
     const candidates = [
       path30.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
+      path30.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"),
+      path30.join(path30.dirname(Bun.main), "node_modules/akanjs/server"),
+      path30.join(path30.dirname(Bun.main), "../../akanjs/server"),
       path30.resolve(import.meta.dir, "../../server"),
       path30.resolve(import.meta.dir, "../server")
     ];
+    try {
+      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+    } catch {}
+    try {
+      candidates.unshift(path30.dirname(Bun.resolveSync("akanjs/server", path30.dirname(Bun.main))));
+    } catch {}
     for (const candidate of candidates) {
       if (await Bun.file(path30.join(candidate, "rscClient.tsx")).exists())
         return candidate;
     }
-    return candidates[0];
+    throw new Error(`[base-artifact] failed to locate akanjs/server; looked in: ${candidates.join(", ")}`);
   }
   async#buildStyleAssets() {
     const cssCompiler = new CssCompiler(this.#app);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.1.0-rc.2",
+  "version": "2.1.0-rc.3",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,7 @@
     "@langchain/deepseek": "^1.0.26",
     "@langchain/openai": "^1.4.6",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.1.0-rc.1",
+    "akanjs": "2.1.0-rc.3",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "fontaine": "^0.8.0",