@beignet/cli 0.0.19 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beignet/cli",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "type": "module",
   "description": "CLI for creating and maintaining Beignet apps.",
   "main": "./dist/lib.js",
@@ -66,7 +66,7 @@
     "typescript": "^5.3.0"
   },
   "dependencies": {
-    "@beignet/core": "^0.0.19",
+    "@beignet/core": "^0.0.20",
     "@clack/prompts": "^1.5.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@stricli/core": "^1.2.7",

package/src/config.ts

@@ -176,6 +176,30 @@ export function directoryPath(filePath: string): string {
   return normalizePath(filePath).replaceAll(/^\/+|\/+$/g, "");
 }
 
+/**
+ * Infer the app source root from app-context.ts placement.
+ *
+ * Default apps put app-context.ts at the project root, while src-layout apps
+ * configure it as src/app-context.ts. Client setup follows that same root.
+ */
+export function appRootPath(config: ResolvedBeignetConfig): string {
+  const appRoot = directoryPath(path.posix.dirname(config.paths.appContext));
+  return appRoot === "." ? "" : appRoot;
+}
+
+export function clientDirPath(config: ResolvedBeignetConfig): string {
+  const appRoot = appRootPath(config);
+  return path.posix.join(appRoot, "client");
+}
+
+export function clientIndexPath(config: ResolvedBeignetConfig): string {
+  return path.posix.join(clientDirPath(config), "index.ts");
+}
+
+export function clientFormsPath(config: ResolvedBeignetConfig): string {
+  return path.posix.join(clientDirPath(config), "forms.ts");
+}
+
 const configFileNames = [
   "beignet.config.ts",
   "beignet.config.json",

package/src/inspect.ts

@@ -8,6 +8,9 @@ import {
 import { createPainter } from "./ansi.js";
 import {
   type BeignetConfig,
+  clientDirPath,
+  clientFormsPath,
+  clientIndexPath,
   directoryPath,
   loadBeignetConfig,
   normalizePath,
@@ -1362,13 +1365,16 @@ async function inspectCanonicalConformance(
   const packageJson = await readPackageJson(targetDir, files);
   const installedPackages = installedPackageNames(packageJson);
   const featuresPath = directoryPath(config.paths.features);
+  const clientDir = clientDirPath(config);
+  const clientIndex = clientIndexPath(config);
+  const clientForms = clientFormsPath(config);
   const hasClientSurface =
     files.some(
       (file) =>
         file.startsWith(`${featuresPath}/`) &&
         (file.includes("/components/") || file.includes("/client/")),
     ) ||
-    files.some((file) => file.startsWith("client/")) ||
+    files.some((file) => file.startsWith(`${clientDir}/`)) ||
     [
       "@beignet/react-query",
       "@beignet/react-hook-form",
@@ -1406,20 +1412,18 @@ async function inspectCanonicalConformance(
 
   if (hasClientSurface) {
     requiredFiles.push({
-      file: "client/index.ts",
-      reason:
-        "client/index.ts should own the typed client and frontend adapter setup.",
+      file: clientIndex,
+      reason: `${clientIndex} should own the typed client and frontend adapter setup.`,
     });
   }
 
   if (
     installedPackages.has("@beignet/react-hook-form") ||
-    files.includes("client/forms.ts")
+    files.includes(clientForms)
   ) {
     requiredFiles.push({
-      file: "client/forms.ts",
-      reason:
-        "client/forms.ts should own React Hook Form adapter setup when form helpers are used.",
+      file: clientForms,
+      reason: `${clientForms} should own React Hook Form adapter setup when form helpers are used.`,
     });
   }
 

package/src/lint.ts

@@ -3,6 +3,7 @@ import path from "node:path";
 import { createPainter } from "./ansi.js";
 import {
   type BeignetConfig,
+  clientDirPath,
   directoryPath,
   loadBeignetConfig,
   normalizePath,
@@ -946,7 +947,7 @@ function runtimeBoundaryRootKind(
   if (layer === "contract") return "contract";
   if (layer === "client") return "client";
   if (hasUseClientDirective(source)) return "client";
-  if (isGeneratedClientAdapter(file)) return "client";
+  if (isGeneratedClientAdapter(file, config)) return "client";
   return undefined;
 }
 
@@ -960,13 +961,13 @@ function hasUseClientDirective(source: string): boolean {
   );
 }
 
-function isGeneratedClientAdapter(file: string): boolean {
-  return (
-    file === "client/index.ts" ||
-    file === "client/api-client.ts" ||
-    file === "client/rhf.ts" ||
-    file === "client/rq.ts" ||
-    file === "client/uploads.ts"
+function isGeneratedClientAdapter(
+  file: string,
+  config: ResolvedBeignetConfig,
+): boolean {
+  const clientDir = clientDirPath(config);
+  return ["index.ts", "api-client.ts", "rhf.ts", "rq.ts", "uploads.ts"].some(
+    (adapterFile) => file === path.posix.join(clientDir, adapterFile),
   );
 }
 
@@ -1174,7 +1175,7 @@ function classifyPath(
     return "infra";
   }
   if (isUnder(normalizedPath, portsDir)) return "port";
-  if (isUnder(normalizedPath, "client")) return "client";
+  if (isUnder(normalizedPath, clientDirPath(config))) return "client";
   if (isUnder(normalizedPath, "components")) return "component";
   if (isUnder(normalizedPath, legacySharedDomainPath(config))) return "domain";
   if (isUnder(normalizedPath, "lib")) return "lib";

package/src/make.ts

@@ -4,6 +4,7 @@ import path from "node:path";
 import type { MakeFeatureAddon } from "./choices.js";
 import {
   type BeignetConfig,
+  clientIndexPath,
   directoryPath,
   loadBeignetConfig,
   normalizePath,
@@ -5842,12 +5843,6 @@ function featureUiIndexFilePath(
   return path.join(featureUiDir(names, config), "index.ts");
 }
 
-function clientIndexPath(config: ResolvedBeignetConfig): string {
-  const appRoot = path.posix.dirname(config.paths.appContext);
-
-  return path.join(appRoot === "." ? "" : appRoot, "client/index.ts");
-}
-
 function usesFeatureOwnedContracts(config: ResolvedBeignetConfig): boolean {
   return (
     directoryPath(config.paths.contracts) ===