create-fullstack-scaffold 0.4.21 → 0.4.23

package/dist/cli/index.js

@@ -204,11 +204,13 @@ function getExcludePatterns(resolved, allManifests) {
   if (!resolved.modules.has("tenant")) {
     excludes.push("src/tenant");
     excludes.push("tenant.html");
-    excludes.push("src/merchant");
-    excludes.push("merchant.html");
     excludes.push("src/server/middleware/tenant-isolation.ts");
     excludes.push("src/server/middleware/__tests__/tenant-isolation.test.ts");
   }
+  if (!resolved.modules.has("merchant")) {
+    excludes.push("src/merchant");
+    excludes.push("merchant.html");
+  }
   if (!resolved.hasClient) {
     excludes.push("src/client");
     excludes.push("index.html");
@@ -229,15 +231,16 @@ function getExcludePatterns(resolved, allManifests) {
   }
   excludes.push("src/client/preset-ui-config.ts");
   const standaloneSharedModules = {
-    cart: ["CartPage"],
-    community: ["TopicsPage"],
-    dashboard: ["DashboardPage"]
+    cart: { pages: ["CartPage"] },
+    community: { pages: ["TopicsPage", "ProfilePage"], serverModules: ["content"] },
+    dashboard: { pages: ["DashboardPage"] }
   };
-  for (const [moduleName, requiredPages] of Object.entries(standaloneSharedModules)) {
-    const hasRelevantPage = [...resolved.modules.values()].some(
-      (m) => m.clientPages?.some((p) => requiredPages.includes(p.name)) ?? false
+  for (const [moduleName, config] of Object.entries(standaloneSharedModules)) {
+    const hasRelevantPage = config.pages && [...resolved.modules.values()].some(
+      (m) => m.clientPages?.some((p) => config.pages.includes(p.name)) ?? false
     );
-    if (!hasRelevantPage) {
+    const hasRelevantServerModule = config.serverModules?.some((sm) => resolved.modules.has(sm)) ?? false;
+    if (!hasRelevantPage && !hasRelevantServerModule) {
       excludes.push(`src/shared/modules/${moduleName}`);
     }
   }
@@ -261,6 +264,10 @@ function getExcludePatterns(resolved, allManifests) {
   }
   if (!resolved.modules.has("captcha")) {
     excludes.push("src/server/utils/__tests__/captcha.test.ts");
+    excludes.push("src/admin/components/CaptchaModal.tsx");
+    excludes.push("src/admin/stores/captchaStore.ts");
+    excludes.push("src/admin/stores/__tests__/captchaStore.test.ts");
+    excludes.push("src/admin/stores/__tests__/captchaStoreBranches.test.ts");
   }
   return excludes;
 }
@@ -288,6 +295,8 @@ function getGeneratedFiles(resolved) {
   }
   if (resolved.hasClient && resolved.modules.has("admin")) {
     files.push("src/admin/App.tsx");
+    files.push("src/admin/components/index.ts");
+    files.push("src/admin/services/apiClient.ts");
   }
   if (resolved.hasClient && !resolved.modules.has("admin")) {
     files.push("vite.config.ts");
@@ -727,6 +736,93 @@ ${protectedRouteElements.join("\n")}
 }
 `;
 }
+function generateAdminComponentsIndex(resolved) {
+  if (!resolved.hasAdmin) return null;
+  const lines = [
+    `export { UserTable } from './UserTable'`,
+    `export { StatsCard } from './StatsCard'`,
+    `export { PageHeader } from './PageHeader'`,
+    `export { UserFormModal } from './UserFormModal'`,
+    `export { ProtectedRoute } from './ProtectedRoute'`
+  ];
+  if (resolved.hasCaptcha) {
+    lines.push(`export { CaptchaModal } from './CaptchaModal'`);
+  }
+  lines.push(`export { PermissionGuard, PermissionButton, Can, Cannot } from './PermissionGuard'`);
+  return lines.join("\n") + "\n";
+}
+function generateAdminApiClient(resolved) {
+  if (!resolved.hasAdmin) return null;
+  const captchaImport = resolved.hasCaptcha ? `import { useCaptchaStore } from '../stores/captchaStore'
+` : "";
+  const captchaFetchSetup = resolved.hasCaptcha ? `  const showCaptcha = useCaptchaStore.getState().show
+
+` : "";
+  const captchaHandler = resolved.hasCaptcha ? `    onShowCaptcha: async config => {
+      return showCaptcha({
+        type: config.type,
+        captchaUrl: config.captchaUrl,
+      })
+    },` : `    onShowCaptcha: async () => true,`;
+  return `/**
+ * @framework-baseline ab16e97716a7556e
+ * @framework-modify
+ * @reason Conditional captcha support based on preset modules
+ * @impact Captcha module excluded = no captchaStore import
+ */
+
+import { hc } from 'hono/client'
+import { WSClientImpl } from '@shared/core/ws-client'
+import { SSEClientImpl } from '@shared/core/sse-client'
+import { createRequestInterceptor } from './requestInterceptor'
+${captchaImport}import type { AdminApiType } from '@server/index'
+
+const baseUrl = import.meta.env.API_BASE_URL || window.location.origin
+
+const TOKEN_KEY = 'admin-storage'
+
+function clearAuthAndRedirect(): void {
+  localStorage.removeItem(TOKEN_KEY)
+  if (window.location.pathname !== '/admin/login') {
+    window.location.href = '/admin/login'
+  }
+}
+
+function getAuthToken(): string | null {
+  try {
+    const stored = localStorage.getItem(TOKEN_KEY)
+    if (stored) {
+      const parsed = JSON.parse(stored)
+      return parsed.state?.token || null
+    }
+  } catch {
+    return null
+  }
+  return null
+}
+
+function createCustomFetch() {
+${captchaFetchSetup}  return createRequestInterceptor({
+    onShowLogin: clearAuthAndRedirect,
+${captchaHandler}  })
+}
+
+export const apiClient = hc<AdminApiType>(baseUrl, {
+  fetch: createCustomFetch() as typeof fetch,
+  webSocket: url => new WSClientImpl(url) as unknown as WebSocket,
+  sse: url => {
+    const token = getAuthToken()
+    const headers: Record<string, string> = {}
+    if (token) {
+      headers['Authorization'] = \`Bearer \${token}\`
+    }
+    return new SSEClientImpl(url, headers)
+  },
+})
+
+export { api } from '@shared/core/api-request'
+`;
+}
 
 // src/generators/db-schema-barrel.ts
 function generateDbSchemaBarrel(resolved) {
@@ -1686,9 +1782,9 @@ function generateSharedModulesIndex(resolved) {
     "captcha"
   ];
   const STANDALONE_SHARED_MODULES2 = {
-    cart: ["CartPage.tsx"],
-    community: ["TopicsPage.tsx"],
-    dashboard: ["DashboardPage.tsx"]
+    cart: { pages: ["CartPage.tsx"] },
+    community: { pages: ["TopicsPage.tsx", "ProfilePage.tsx"], serverModules: ["content"] },
+    dashboard: { pages: ["DashboardPage.tsx"] }
   };
   for (const moduleName of moduleOrder2) {
     if (!resolved.modules.has(moduleName)) continue;
@@ -1716,11 +1812,12 @@ function generateSharedModulesIndex(resolved) {
       }
     }
   }
-  for (const [moduleName, requiredPages] of Object.entries(STANDALONE_SHARED_MODULES2)) {
-    const hasRelevantPage = [...resolved.modules.values()].some(
-      (m) => m.clientPages?.some((p) => requiredPages.includes(p.name + ".tsx")) ?? false
+  for (const [moduleName, config] of Object.entries(STANDALONE_SHARED_MODULES2)) {
+    const hasRelevantPage = config.pages && [...resolved.modules.values()].some(
+      (m) => m.clientPages?.some((p) => config.pages.includes(p.name + ".tsx")) ?? false
     );
-    if (!hasRelevantPage) continue;
+    const hasRelevantServerModule = config.serverModules?.some((sm) => resolved.modules.has(sm)) ?? false;
+    if (!hasRelevantPage && !hasRelevantServerModule) continue;
     const exports = MODULE_EXPORTS[moduleName];
     if (!exports) continue;
     lines.push(`export {
@@ -2148,9 +2245,9 @@ var ADDITIONAL_PATHS_MAP = {
   permission: ["role", "audit"]
 };
 var STANDALONE_SHARED_MODULES = {
-  cart: ["CartPage.tsx"],
-  community: ["TopicsPage.tsx"],
-  dashboard: ["DashboardPage.tsx"]
+  cart: { pages: ["CartPage.tsx"] },
+  community: { pages: ["TopicsPage.tsx", "ProfilePage.tsx"], serverModules: ["content"] },
+  dashboard: { pages: ["DashboardPage.tsx"] }
 };
 var moduleOrder = [
   "chat",
@@ -2234,12 +2331,13 @@ export {
 }
 function shouldIncludeModule(moduleName, resolved) {
   if (resolved.modules.has(moduleName)) return true;
-  const standalonePages = STANDALONE_SHARED_MODULES[moduleName];
-  if (standalonePages) {
-    const hasRelevantPage = [...resolved.modules.values()].some(
-      (m) => m.clientPages?.some((p) => standalonePages.includes(p.name + ".tsx")) ?? false
+  const standalone = STANDALONE_SHARED_MODULES[moduleName];
+  if (standalone) {
+    const hasRelevantPage = standalone.pages && [...resolved.modules.values()].some(
+      (m) => m.clientPages?.some((p) => standalone.pages.includes(p.name + ".tsx")) ?? false
     );
-    return hasRelevantPage;
+    const hasRelevantServerModule = standalone.serverModules?.some((sm) => resolved.modules.has(sm)) ?? false;
+    return !!(hasRelevantPage || hasRelevantServerModule);
   }
   for (const [parentModule, additionalPaths] of Object.entries(ADDITIONAL_PATHS_MAP)) {
     if (additionalPaths.includes(moduleName) && resolved.modules.has(parentModule)) {
@@ -2680,7 +2778,8 @@ function filterPackageJson(pkg, resolved) {
       packagesToRemove.add(pkg2);
     }
   }
-  if (!resolved.modules.has("admin")) {
+  const hasAntdConsumer = resolved.modules.has("admin") || resolved.modules.has("tenant") || resolved.modules.has("merchant");
+  if (!hasAntdConsumer) {
     for (const pkg2 of ADMIN_PANEL_PACKAGES) {
       packagesToRemove.add(pkg2);
     }
@@ -2749,8 +2848,12 @@ function generateViteConfig(resolved, templateDir) {
     aliasesToRemove.push("@admin");
   }
   if (!resolved.modules.has("tenant")) {
-    entriesToRemove.push("tenant", "merchant");
-    aliasesToRemove.push("@tenant", "@merchant");
+    entriesToRemove.push("tenant");
+    aliasesToRemove.push("@tenant");
+  }
+  if (!resolved.modules.has("merchant")) {
+    entriesToRemove.push("merchant");
+    aliasesToRemove.push("@merchant");
   }
   for (const name of entriesToRemove) {
     const re = new RegExp(
@@ -3756,6 +3859,19 @@ async function createProject(projectNameOrOptions, useCurrentDir = false, preset
         await fs.ensureDir(path.join(targetDir, "src/admin"));
         await fs.writeFile(path.join(targetDir, "src/admin/App.tsx"), adminAppContent);
       }
+      const adminComponentsIndex = generateAdminComponentsIndex(resolved);
+      if (adminComponentsIndex) {
+        await fs.ensureDir(path.join(targetDir, "src/admin/components"));
+        await fs.writeFile(
+          path.join(targetDir, "src/admin/components/index.ts"),
+          adminComponentsIndex
+        );
+      }
+      const adminApiClient = generateAdminApiClient(resolved);
+      if (adminApiClient) {
+        await fs.ensureDir(path.join(targetDir, "src/admin/services"));
+        await fs.writeFile(path.join(targetDir, "src/admin/services/apiClient.ts"), adminApiClient);
+      }
     }
     const serverAppContent = generateServerApp(resolved);
     await fs.writeFile(path.join(targetDir, "src/server/app.ts"), serverAppContent);