@akanjs/devkit 3.0.0-alpha.51 → 3.0.0-alpha.53

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @akanjs/devkit
 
+## 2.4.2
+
+### Patch Changes
+
+- Updated dependencies [6d58c7e]
+- Updated dependencies [11aa655]
+- Updated dependencies [25d5b15]
+- Updated dependencies [11aa655]
+- Updated dependencies [11aa655]
+- Updated dependencies [25d5b15]
+- Updated dependencies [42cf7a2]
+- Updated dependencies [25d5b15]
+- Updated dependencies [04cb46d]
+  - akanjs@2.4.2
+
 ## 2.4.1
 
 ### Patch Changes

package/artifact/implicitRootLayout.ts

@@ -55,7 +55,7 @@ interface RootBoundary {
   segments: string[];
 }
 
-function getRootBoundarySegments(key: string): string[] | null {
+export function getRootBoundarySegments(key: string): string[] | null {
   const match = LAYOUT_KEY_RE.exec(key);
   if (!match) return null;
   const prefix = match[1]?.replace(/\/$/, "");
@@ -76,7 +76,7 @@ function implicitDictionaryMacroAbsPath(appCwdPath: string): string {
   return path.join(path.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
 }
 
-function isRootBoundarySegments(segments: string[], basePaths: Iterable<string>): boolean {
+export function isRootBoundarySegments(segments: string[], basePaths: Iterable<string>): boolean {
   const firstVisibleIndex = segments.findIndex((segment) => !/^\(.+\)$/.test(segment));
   if (firstVisibleIndex === -1) return segments.length <= 1;
   if (segments.slice(firstVisibleIndex + 1).some((segment) => /^\(.+\)$/.test(segment))) return false;

package/executors.test.ts

@@ -621,6 +621,64 @@ describe("Workspace and app executor environment contracts", () => {
     });
   });
 
+  describe("root layout source validation during page key discovery", () => {
+    const makeRouteValidationApp = async (appName: string, config: string, files: Record<string, string>) => {
+      const root = await makeTempRoot();
+      process.env.AKAN_PUBLIC_REPO_NAME = "repo";
+      process.env.AKAN_PUBLIC_SERVE_DOMAIN = "example.com";
+      process.env.AKAN_PUBLIC_ENV = "local";
+      await writeJson(path.join(root, "package.json"), rootPackageJson());
+      await mkdir(path.join(root, "apps", appName), { recursive: true });
+      await writeFile(path.join(root, `apps/${appName}/akan.config.ts`), config);
+      for (const [file, source] of Object.entries(files)) {
+        const filePath = path.join(root, `apps/${appName}/page`, file);
+        await mkdir(path.dirname(filePath), { recursive: true });
+        await writeFile(filePath, source);
+      }
+      const workspace = new WorkspaceExecutor({ workspaceRoot: root, repoName: "repo" });
+      return AppExecutor.from(workspace, appName);
+    };
+    const wsConnectLayout = [
+      "export const wsConnect = false;",
+      "export default function Layout({ children }) { return children; }",
+      "",
+    ].join("\n");
+
+    test("accepts wsConnect on a configured base-path root layout", async () => {
+      process.env.AKAN_PUBLIC_BASE_PATHS = "web,admin";
+      const app = await makeRouteValidationApp(
+        "base-path-root-ws",
+        [
+          "export default {",
+          '  routes: [{ basePath: "web", domains: {} }, { basePath: "admin", domains: {} }],',
+          "};",
+          "",
+        ].join("\n"),
+        { "admin/_layout.tsx": wsConnectLayout },
+      );
+
+      await expect(app.getPageKeys({ refresh: true })).resolves.toEqual(["./admin/_layout.tsx"]);
+    });
+
+    test("rejects wsConnect on a nested layout", async () => {
+      const app = await makeRouteValidationApp(
+        "nested-layout-ws",
+        'export default { routes: [{ basePath: "admin", domains: {} }] };\n',
+        { "admin/users/_layout.tsx": wsConnectLayout },
+      );
+
+      await expect(app.getPageKeys({ refresh: true })).rejects.toThrow(/unsupported export "wsConnect"/);
+    });
+
+    test("accepts wsConnect on a grouped root layout", async () => {
+      const app = await makeRouteValidationApp("grouped-root-ws", "export default {};\n", {
+        "(docs)/_layout.tsx": wsConnectLayout,
+      });
+
+      await expect(app.getPageKeys({ refresh: true })).resolves.toEqual(["./(docs)/_layout.tsx"]);
+    });
+  });
+
   test("accepts metadata route exports during page key discovery", async () => {
     const root = await makeTempRoot();
     process.env.AKAN_PUBLIC_REPO_NAME = "repo";

package/executors.ts

@@ -40,6 +40,7 @@ import {
   upsertAgentBlock,
 } from "./agentsIndex";
 import { AkanAppConfig, AkanLibConfig, decreaseBuildNum, increaseBuildNum } from "./akanConfig";
+import { getRootBoundarySegments, isRootBoundarySegments } from "./artifact/implicitRootLayout";
 import { FileSys } from "./fileSys";
 import { getDirname } from "./getDirname";
 import { Linter } from "./linter";
@@ -1469,7 +1470,8 @@ export class AppExecutor extends SysExecutor {
           );
         }
         if (!owner) owners.set(routeId, { absPath, fromLib });
-        const isRootLayout = parsed.kind === "layout" && parsed.moduleSegments.at(-1) === "_layout";
+        const layoutSegments = getRootBoundarySegments(key);
+        const isRootLayout = layoutSegments !== null && isRootBoundarySegments(layoutSegments, akanConfig.basePaths);
         const routeSource = await Bun.file(absPath).text();
         const validator = await AppExecutor.#getRouteSourceValidator();
         if (parsed.kind === "overrides") validator.validateOverridesSourceExports(routeSource, absPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "3.0.0-alpha.51",
+  "version": "3.0.0-alpha.53",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -45,7 +45,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "3.0.0-alpha.51",
+    "akanjs": "3.0.0-alpha.53",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "dayjs": "^1.11.20",