betterstart-cli 0.0.116 → 0.0.117

package/dist/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import {
   ACCEPT_TERMS_URL_PATTERN,
+  ADMIN_CONTAINER_ROUTE_GROUP,
   BETTERSTART_ASSET_HOST,
   BETTERSTART_DIR,
   CLI_PACKAGE_NAME,
@@ -85,7 +86,7 @@ import {
   trimDotSlash,
   usesIdentifier,
   validateAdminNamespace
-} from "./chunk-SG4U6EQY.js";
+} from "./chunk-FGEVDA53.js";
 
 // cli.ts
 import * as p66 from "@clack/prompts";
@@ -263,6 +264,14 @@ function redirectStdoutToStderr() {
     process.stdout.write = originalWrite;
   };
 }
+function writeMachineJson(payload) {
+  process.stdout.write(`${JSON.stringify(payload, null, 2)}
+`);
+}
+function writeDiagnostic(message) {
+  process.stderr.write(`${message}
+`);
+}
 function renderTableRows(rows) {
   const widths = [];
   for (const row of rows) {
@@ -1933,6 +1942,7 @@ function resolveProjectPaths(config) {
   const namespace = resolveAdminNamespace(config.frameworkConfig.next.namespace);
   const adminDir = trimDotSlash(config.paths?.admin ?? "./admin");
   const pagesDir = trimDotSlash(config.paths?.pages ?? "./src/app/(admin)/admin/(authenticated)");
+  const containerDir = path6.posix.join(pagesDir, ADMIN_CONTAINER_ROUTE_GROUP);
   const schemasDir = trimDotSlash(config.paths?.schemas ?? "./admin/schemas");
   const adminDbDir = path6.posix.join(adminDir, "lib", "db");
   const adminDbCoreDir = path6.posix.join(adminDbDir, "core");
@@ -1946,6 +1956,7 @@ function resolveProjectPaths(config) {
   return {
     adminDir,
     pagesDir,
+    containerDir,
     schemasDir,
     adminDbDir,
     adminDbCoreDir,
@@ -9212,7 +9223,7 @@ function runFormPipeline(schema, cwd, config, options = {}) {
     },
     {
       name: "Admin pages",
-      run: () => generateFormAdminPages(schema, paths.pagesDir, namespacedOptions).files
+      run: () => generateFormAdminPages(schema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Navigation",
@@ -21782,37 +21793,37 @@ function runEntityPipeline(schema, cwd, config, options = {}) {
     },
     {
       name: "Column definitions",
-      run: () => generateColumns2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateColumns2(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Table component",
-      run: () => generateTable2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateTable2(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Page content",
-      run: () => generatePageContent2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generatePageContent2(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Page (server)",
-      run: () => generatePage2(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generatePage2(normalizedSchema, paths.containerDir, namespacedOptions).files
     }
   ];
   if (normalizedSchema.actions?.create || normalizedSchema.actions?.edit) {
     steps.push({
       name: "Form",
-      run: () => generateForm(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateForm(normalizedSchema, paths.containerDir, namespacedOptions).files
     });
   }
   if (normalizedSchema.actions?.create) {
     steps.push({
       name: "Create page",
-      run: () => generateCreatePage(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateCreatePage(normalizedSchema, paths.containerDir, namespacedOptions).files
     });
   }
   if (normalizedSchema.actions?.edit) {
     steps.push({
       name: "Edit page",
-      run: () => generateEditPage(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateEditPage(normalizedSchema, paths.containerDir, namespacedOptions).files
     });
   }
   steps.push({
@@ -23557,11 +23568,11 @@ function runSinglePipeline(schema, cwd, config, options = {}) {
     },
     {
       name: "Form",
-      run: () => generateSingleForm(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateSingleForm(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Single page",
-      run: () => generateSinglePage(normalizedSchema, paths.pagesDir, namespacedOptions).files
+      run: () => generateSinglePage(normalizedSchema, paths.containerDir, namespacedOptions).files
     },
     {
       name: "Navigation",
@@ -24480,7 +24491,7 @@ async function maybeBuildRenamePlan(loaded, cwd, config, generatedFiles, options
         plan.customCells.push(
           buildCustomCellRenameSelection(
             loaded.schema.name,
-            paths.pagesDir,
+            paths.containerDir,
             candidate.before,
             candidate.after
           )
@@ -32231,7 +32242,9 @@ function scaffoldLayout({ cwd, config }) {
     readTemplate("pages/reset-password-form.tsx")
   );
   write(path74.join(config.paths.pages, "page.tsx"), readTemplate("pages/dashboard-page.tsx"));
-  const usersDir = path74.join(config.paths.pages, "users");
+  const containerDir = path74.join(config.paths.pages, ADMIN_CONTAINER_ROUTE_GROUP);
+  write(path74.join(containerDir, "layout.tsx"), readTemplate("pages/container-layout.tsx"));
+  const usersDir = path74.join(containerDir, "users");
   write(path74.join(usersDir, "page.tsx"), readTemplate("pages/users/users-page.tsx"));
   write(
     path74.join(usersDir, "users-page-skeleton.tsx"),
@@ -32339,7 +32352,7 @@ function scaffoldLayout({ cwd, config }) {
     path74.join(settingsWebhooksDir, "logs", "page.tsx"),
     readTemplate("pages/settings/webhooks/webhooks-logs-page.tsx")
   );
-  const mediaDir = path74.join(config.paths.pages, "media");
+  const mediaDir = path74.join(containerDir, "media");
   write(path74.join(mediaDir, "page.tsx"), readTemplate("pages/media/media-page.tsx"));
   write(
     path74.join(mediaDir, "media-page-skeleton.tsx"),
@@ -34634,7 +34647,7 @@ async function main() {
 
   if (CHECK_ADMIN_ONLY) {
     if (existingAdmin) {
-      console.log(\`EXISTING_ADMIN:\${JSON.stringify(existingAdmin)}\`)
+      process.stdout.write(\`EXISTING_ADMIN:\${JSON.stringify(existingAdmin)}\\n\`)
       process.exit(3)
     }
     process.exit(0)
@@ -34645,7 +34658,7 @@ async function main() {
   const NAME = process.env.SEED_NAME || 'Admin'
 
   if (!EMAIL || !PASSWORD) {
-    console.error('  SEED_EMAIL and SEED_PASSWORD are required.')
+    process.stderr.write('  SEED_EMAIL and SEED_PASSWORD are required.\\n')
     process.exit(1)
   }
 
@@ -34660,15 +34673,15 @@ async function main() {
 
   if (existingUser && !replaceTarget) {
     // Exit code 2 signals "user exists" to the CLI
-    console.log(\`EXISTING_USER:\${existingUser.name}\`)
+    process.stdout.write(\`EXISTING_USER:\${existingUser.name}\\n\`)
     process.exit(2)
   }
 
   if (replaceTarget) {
-    console.log(
+    process.stdout.write(
       OVERWRITE_MODE === 'admin'
-        ? '\\n  Replacing existing admin user...'
-        : '\\n  Replacing existing account...'
+        ? '\\n  Replacing existing admin user...\\n'
+        : '\\n  Replacing existing account...\\n'
     )
     await clearAuthorshipReferences(replaceTarget.id)
     // Remove existing account + session rows first (foreign key refs)
@@ -34676,17 +34689,17 @@ async function main() {
     await db.delete(schema.account).where(eq(schema.account.userId, replaceTarget.id))
     await db.delete(schema.user).where(eq(schema.user.id, replaceTarget.id))
   } else {
-    console.log('\\n  Creating admin user...')
+    process.stdout.write('\\n  Creating admin user...\\n')
   }
 
-  console.log(\`  Email: \${EMAIL}\\n\`)
+  process.stdout.write(\`  Email: \${EMAIL}\\n\\n\`)
 
   const result = await auth.api.signUpEmail({
     body: { email: EMAIL, password: PASSWORD, name: NAME },
   })
 
   if (!result?.user) {
-    console.error('  Failed to create user.')
+    process.stderr.write('  Failed to create user.\\n')
     process.exit(1)
   }
 
@@ -34695,13 +34708,13 @@ async function main() {
     .set({ role: 'admin' })
     .where(eq(schema.user.id, result.user.id))
 
-  console.log(\`  Admin user \${replaceTarget ? 'replaced' : 'created'}: \${EMAIL}\`)
-  console.log('  Role: admin\\n')
+  process.stdout.write(\`  Admin user \${replaceTarget ? 'replaced' : 'created'}: \${EMAIL}\\n\`)
+  process.stdout.write('  Role: admin\\n\\n')
   process.exit(0)
 }
 
 main().catch((err) => {
-  console.error('  Seed failed:', err.message || err)
+  process.stderr.write(\`  Seed failed: \${err.message || err}\\n\`)
   process.exit(1)
 })
 `;
@@ -35223,7 +35236,7 @@ function writeInitJson(context, payload) {
   context.restoreStdout?.();
   context.restoreStdout = void 0;
   context.written = true;
-  console.log(JSON.stringify(payload, null, 2));
+  writeMachineJson(payload);
 }
 
 // adapters/next/commands/init/run-init-command-internal.ts
@@ -35763,7 +35776,7 @@ async function runInitCommandInternal(name, options, jsonContext) {
   const drizzleConfigPath = path92.join(cwd, "drizzle.config.ts");
   if (!dbFiles.includes("drizzle.config.ts") && fs79.existsSync(drizzleConfigPath)) {
     if (forceMode) {
-      const { readNamespacedTemplate } = await import("./read-namespaced-template-D2CD4Q7U.js");
+      const { readNamespacedTemplate } = await import("./read-namespaced-template-KUENIIDC.js");
       fs79.writeFileSync(
         drizzleConfigPath,
         readNamespacedTemplate("drizzle.config.ts", namespace),
@@ -35776,7 +35789,7 @@ async function runInitCommandInternal(name, options, jsonContext) {
         initialValue: true
       });
       if (!p61.isCancel(overwrite) && overwrite) {
-        const { readNamespacedTemplate } = await import("./read-namespaced-template-D2CD4Q7U.js");
+        const { readNamespacedTemplate } = await import("./read-namespaced-template-KUENIIDC.js");
         fs79.writeFileSync(
           drizzleConfigPath,
           readNamespacedTemplate("drizzle.config.ts", namespace),
@@ -36209,7 +36222,7 @@ async function runListIntegrationsCommand(options) {
     try {
       installed2 = new Set((await resolveConfig(cwd)).integrations.installed);
     } catch (error) {
-      console.error(
+      writeDiagnostic(
         `Error loading config: ${error instanceof Error ? error.message : String(error)}`
       );
       process.exit(1);
@@ -36220,7 +36233,7 @@ async function runListIntegrationsCommand(options) {
       kind: integration.kind,
       description: integration.description
     }));
-    console.log(JSON.stringify(items, null, 2));
+    writeMachineJson(items);
     return;
   }
   const config = await resolveConfigOrExit(cwd);
@@ -36254,7 +36267,7 @@ async function runListPresetsCommand(options) {
     try {
       installed2 = new Set((await resolveConfig(cwd)).presets.installed);
     } catch (error) {
-      console.error(
+      writeDiagnostic(
         `Error loading config: ${error instanceof Error ? error.message : String(error)}`
       );
       process.exit(1);
@@ -36265,7 +36278,7 @@ async function runListPresetsCommand(options) {
       kind: preset.kind,
       description: preset.description
     }));
-    console.log(JSON.stringify(items, null, 2));
+    writeMachineJson(items);
     return;
   }
   const config = await resolveConfigOrExit(cwd);
@@ -38001,6 +38014,11 @@ var TEMPLATE_REGISTRY = {
     base: "cwd",
     dependencies: ["auth-gate"]
   },
+  "container-layout": {
+    relPath: "app/(admin)/admin/(authenticated)/(container)/layout.tsx",
+    content: () => readTemplate("pages/container-layout.tsx"),
+    base: "cwd"
+  },
   "auth-gate": {
     relPath: "app/(admin)/admin/(authenticated)/auth-gate.tsx",
     content: () => readTemplate("pages/auth-gate.tsx"),
@@ -39166,15 +39184,15 @@ async function runRemoveSchemaCommand(schemaName, options) {
     if (removePath(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
       deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
     }
-    if (removePath(cwd, `${paths.pagesDir}/forms/${kebabName}`)) {
-      deletedPaths.push(`${paths.pagesDir}/forms/${kebabName}`);
+    if (removePath(cwd, `${paths.containerDir}/forms/${kebabName}`)) {
+      deletedPaths.push(`${paths.containerDir}/forms/${kebabName}`);
     }
   } else {
     if (removePath(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
       deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
     }
-    if (removePath(cwd, `${paths.pagesDir}/${schemaName}`)) {
-      deletedPaths.push(`${paths.pagesDir}/${schemaName}`);
+    if (removePath(cwd, `${paths.containerDir}/${schemaName}`)) {
+      deletedPaths.push(`${paths.containerDir}/${schemaName}`);
     }
   }
   cleanupSchemaEmptyDirs(cwd, deletedPaths, paths);
@@ -40471,7 +40489,7 @@ async function runUpdateCommand(components, options) {
         ...templateKeys.map((name) => ({ name, path: templatePath(name), kind: "template" })),
         { name: "tiptap", path: "components/custom/content-editor/tiptap-*/", kind: "special" }
       ];
-      console.log(JSON.stringify(items, null, 2));
+      writeMachineJson(items);
       return;
     }
     const all = getAllComponentNames();