create-basalt 1.14.1 → 1.14.2

package/dist/bin-template.d.ts

@@ -2,6 +2,8 @@
 export declare const PROJECT_COMMANDS_MARKER = "['update', 'add', 'doctor', 'info'].includes(process.argv[2]";
 /** Marker proving a bin/basalt.ts already has the dev prelude (.env loading, `upgrade`, env errors). */
 export declare const DEV_PRELUDE_MARKER = "process.loadEnvFile(envFile)";
+/** Marker proving a bin/basalt.ts already runs the generators without booting the app. */
+export declare const GENERATORS_PRELUDE_MARKER = "process.argv[2]?.startsWith('make:')";
 export declare function basaltBin(): string;
 /**
  * Hashes of every bin/basalt.ts an earlier create-basalt release generated
@@ -11,13 +13,16 @@ export declare function basaltBin(): string;
 export declare const LEGACY_BIN_HASHES: ReadonlySet<string>;
 export declare const hasProjectCommands: (content: string) => boolean;
 export declare const hasDevPrelude: (content: string) => boolean;
+export declare const hasGeneratorsPrelude: (content: string) => boolean;
 /**
  * Upgrades a template-generated bin/basalt.ts to the current template, step by
  * step: (1) without the project commands, inserts their prelude after the
  * shebang and turns the remaining static imports into dynamic ones (so they no
  * longer run before it); (2) without the dev prelude, inserts it right after
- * the project commands and routes the app import through `explainBootFailure`.
- * Deterministic for the known templates — for the latest ones (1.9, 1.10) the
+ * the project commands and routes the app import through `explainBootFailure`;
+ * (3) without the generators prelude, inserts it right before the dev tools
+ * are imported for the booted CLI.
+ * Deterministic for the known templates — for the latest ones (1.9 to 1.14) the
  * result is exactly {@link basaltBin}.
  */
 export declare function patchBasaltBin(content: string): string;

package/dist/bin-template.js

@@ -174,10 +174,35 @@ async function databaseInUse(): Promise<{ name: string; target: string }> {
   }
 }
 `;
+/**
+ * The GENERATORS PRELUDE, after the dev prelude and still before anything of
+ * the app is imported: `make:*` only writes source files, so — like `upgrade` —
+ * it runs without booting the app. Booting it would run every boot check, and
+ * a generator would refuse to work until the database is up and migrated (or
+ * every environment variable is set), which is often exactly when the
+ * resource is being written. Any other command, and a `make:*` the generator
+ * does not know, falls through to the booted CLI below.
+ */
+const GENERATORS_PRELUDE = `// The generators (make:*) only write source files: like \`upgrade\`, they run
+// without booting the app, so they work before the database is up or migrated.
+if (process.argv[2]?.startsWith('make:')) {
+  const { consoleIo, parseArgv } = await import('@basaltkit/cli')
+  const { generatorCommands } = await import('@basaltkit/generator')
+  const { command, args, flags } = parseArgv(process.argv.slice(2))
+  const make = generatorCommands().find((candidate) => candidate.name === command)
+  if (make) {
+    // The generators read only io/args/flags — there is no app to hand them.
+    const context = { io: consoleIo(), args, flags } as unknown as Parameters<typeof make.handle>[0]
+    process.exit((await make.handle(context)) ?? 0)
+  }
+}
+`;
 /** Marker proving a bin/basalt.ts already delegates the project commands. */
 export const PROJECT_COMMANDS_MARKER = "['update', 'add', 'doctor', 'info'].includes(process.argv[2]";
 /** Marker proving a bin/basalt.ts already has the dev prelude (.env loading, `upgrade`, env errors). */
 export const DEV_PRELUDE_MARKER = 'process.loadEnvFile(envFile)';
+/** Marker proving a bin/basalt.ts already runs the generators without booting the app. */
+export const GENERATORS_PRELUDE_MARKER = "process.argv[2]?.startsWith('make:')";
 const APP_IMPORT = "await import('../src/app.js')";
 const APP_IMPORT_EXPLAINED = `${APP_IMPORT}.catch(explainBootFailure)`;
 const RUN_CLI = 'process.exit(await runCli({ app })';
@@ -185,6 +210,7 @@ export function basaltBin() {
     return `#!/usr/bin/env node
 ${PRELUDE}
 ${DEV_PRELUDE}
+${GENERATORS_PRELUDE}
 // The dev tools are imported dynamically, after the project commands above.
 const { runCli } = await import('@basaltkit/cli')
 const { generatorCommands } = await import('@basaltkit/generator')
@@ -228,16 +254,24 @@ export const LEGACY_BIN_HASHES = new Set([
     // 2026-10-01 (create-basalt 1.10): project commands (update/add/doctor/info)
     // delegated before boot — but no .env loading and `upgrade` booted the app.
     'sha256-9091e137a5de39929d0e70b2fd973386b9cc1c2f996e130989a22c795b9d0893',
+    // 2026-10-01 (create-basalt 1.11): the dev prelude — but make:* booted the
+    // app, so a generator needed a migrated database.
+    'sha256-bd0b6c9c40089a18c2c2f1a70953044d6a74a329d38a72903b494b1f2265a114',
+    // 2026-10-08: database diagnoses in explainBootFailure — make:* still booted.
+    'sha256-abea8cbfdb41a302cabad7929617f7fc2fe822345aa8db6ff777e923eb0fc96b',
 ]);
 export const hasProjectCommands = (content) => content.includes(PROJECT_COMMANDS_MARKER);
 export const hasDevPrelude = (content) => content.includes(DEV_PRELUDE_MARKER);
+export const hasGeneratorsPrelude = (content) => content.includes(GENERATORS_PRELUDE_MARKER);
 /**
  * Upgrades a template-generated bin/basalt.ts to the current template, step by
  * step: (1) without the project commands, inserts their prelude after the
  * shebang and turns the remaining static imports into dynamic ones (so they no
  * longer run before it); (2) without the dev prelude, inserts it right after
- * the project commands and routes the app import through `explainBootFailure`.
- * Deterministic for the known templates — for the latest ones (1.9, 1.10) the
+ * the project commands and routes the app import through `explainBootFailure`;
+ * (3) without the generators prelude, inserts it right before the dev tools
+ * are imported for the booted CLI.
+ * Deterministic for the known templates — for the latest ones (1.9 to 1.14) the
  * result is exactly {@link basaltBin}.
  */
 export function patchBasaltBin(content) {
@@ -246,6 +280,8 @@ export function patchBasaltBin(content) {
         text = addProjectCommands(text);
     if (!hasDevPrelude(text))
         text = addDevPrelude(text);
+    if (!hasGeneratorsPrelude(text))
+        text = addGeneratorsPrelude(text);
     return text;
 }
 function addProjectCommands(content) {
@@ -273,11 +309,19 @@ function addDevPrelude(content) {
         .replace(`${RUN_CLI})\n`, `${RUN_CLI}.catch(explainBootFailure))\n`);
     return `${content.slice(0, end)}${DEV_PRELUDE}\n${rest}`;
 }
+/** Inserts the generators prelude right before the dev tools are imported for the booted CLI. */
+function addGeneratorsPrelude(content) {
+    const anchor = /^(?:\/\/ The dev tools are imported dynamically[^\n]*\n)?const \{ runCli \} = await import\('@basaltkit\/cli'\)$/m.exec(content);
+    // Without the template's dynamic CLI import, the file is not ours to rearrange.
+    if (!anchor || !hasDevPrelude(content))
+        return content;
+    return `${content.slice(0, anchor.index)}${GENERATORS_PRELUDE}\n${content.slice(anchor.index)}`;
+}
 /** Where a bin/basalt.ts stands: already current, an untouched old template, or user code. */
 export function binStatus(content, manifestHash) {
     if (content === undefined)
         return 'absent';
-    if (hasProjectCommands(content) && hasDevPrelude(content))
+    if (hasProjectCommands(content) && hasDevPrelude(content) && hasGeneratorsPrelude(content))
         return 'current';
     const hash = hashContent(content);
     return LEGACY_BIN_HASHES.has(hash) || hash === manifestHash ? 'patchable' : 'modified';
@@ -300,6 +344,13 @@ and explains env errors — and change the app import to
 \`const { buildApp } = ${APP_IMPORT_EXPLAINED}\`:
 
 ${DEV_PRELUDE}`);
+    }
+    if (!hasGeneratorsPrelude(content)) {
+        steps.push(`${steps.length > 0 ? 'Then paste' : 'Paste'} this after the dev prelude (before the dev tools are imported for the
+booted CLI) — it runs the make:* generators without booting the app, so they
+work before the database is up or migrated:
+
+${GENERATORS_PRELUDE}`);
     }
     return steps.join('\n');
 }

package/dist/project/doctor.js

@@ -382,10 +382,10 @@ export async function runDoctor(ctx, options = {}) {
     const bin = await readText(join(dir, 'bin', 'basalt.ts'));
     const status = binStatus(bin, ctx.manifest?.files['bin/basalt.ts']);
     if (status === 'patchable') {
-        push('warn', 'tooling', 'bin/basalt.ts is an older template (no .env loading / pre-boot project commands) — `npx create-basalt@latest update` patches it.');
+        push('warn', 'tooling', 'bin/basalt.ts is an older template (it lacks some of: .env loading, pre-boot project commands, make:* without booting the app) — `npx create-basalt@latest update` patches it.');
     }
     if (status === 'modified') {
-        push('info', 'tooling', 'bin/basalt.ts is customised and lacks the current preludes (project commands, .env loading, pre-boot `upgrade`) — see `create-basalt update` for the snippet.');
+        push('info', 'tooling', 'bin/basalt.ts is customised and lacks the current preludes (project commands, .env loading, pre-boot `upgrade` and make:*) — see `create-basalt update` for the snippet.');
     }
     const dev = await readText(join(dir, 'src', 'dev.ts'));
     const devStatus = devEntryStatus(dev, ctx.manifest?.files['src/dev.ts']);

package/dist/project/update.js

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { binStatus, hasProjectCommands, manualBinSnippet, patchBasaltBin } from '../bin-template.js';
+import { binStatus, hasDevPrelude, hasProjectCommands, manualBinSnippet, patchBasaltBin } from '../bin-template.js';
 import { devEntryStatus, MANUAL_DEV_SNIPPET, patchDevEntry, patchEnvExample } from '../dev-entry.js';
 import { alwaysLatest, lookupLatestVersions, minimumReleaseAgeMinutes, } from '../latest-versions.js';
 import { BASALT_PROJECT_SCRIPT } from '../templates.js';
@@ -207,7 +207,7 @@ export async function planUpdate(ctx, options = {}) {
             const after = patchBasaltBin(bin);
             files['bin/basalt.ts'] = { before: bin, after };
             patched['bin/basalt.ts'] = after;
-            toolingNotes.push(`bin/basalt.ts: unmodified template from an earlier release — ${hasProjectCommands(bin) ? '' : 'gains update/add/doctor/info; '}loads .env for development, runs \`upgrade\` without booting the app, explains env errors`);
+            toolingNotes.push(`bin/basalt.ts: unmodified template from an earlier release — ${hasProjectCommands(bin) ? '' : 'gains update/add/doctor/info; '}${hasDevPrelude(bin) ? '' : 'loads .env for development, runs \`upgrade\` without booting the app, explains env errors; '}runs make:* without booting the app (no database needed to generate code)`);
         }
         else if (status === 'modified' && bin !== undefined) {
             manual.push(`bin/basalt.ts was customised, so it was not patched. To bring it up to date:\n${manualBinSnippet(bin)}`);

package/dist/templates.js

@@ -367,9 +367,13 @@ export function appTs(options) {
     if (options.prisma) {
         imports.push(`import { prismaPlugin } from '@basaltkit/prisma'`);
         imports.push(`import { db, prisma } from './db.js'`);
-        plugins.push(`prismaPlugin({
+        plugins.push(`prismaPlugin({${options.tenancy
+            ? `
       // \`db\` is the tenant-scoped client (src/db.ts): db<PrismaClient>() in a
-      // handler returns it, already filtered by the request's tenant.
+      // handler returns it, already filtered by the request's tenant.`
+            : `
+      // \`db\` is the application client (src/db.ts): db<PrismaClient>() in a
+      // handler returns it. No tenancy, so queries are not filtered by tenant.`}
       client: db,
       // Fail the BOOT when this database is not the migrated one — a shell that
       // exported another project's DATABASE_URL, a typo in the database name.

package/dist/versions.js

@@ -11,11 +11,11 @@ export const SCAFFOLD_VERSIONS = {
     '@basaltkit/cli': '^1.4.2',
     '@basaltkit/config': '^1.1.2',
     '@basaltkit/core': '^1.6.0',
-    '@basaltkit/deploy': '^0.5.0',
+    '@basaltkit/deploy': '^0.8.0',
     '@basaltkit/env': '^3.1.1',
     '@basaltkit/events': '^1.3.0',
     '@basaltkit/fastify': '^3.0.0',
-    '@basaltkit/generator': '^1.6.0',
+    '@basaltkit/generator': '^1.7.0',
     '@basaltkit/logger': '^1.3.0',
     '@basaltkit/mailer': '^2.1.0',
     '@basaltkit/mcp': '^6.0.0',
@@ -28,5 +28,5 @@ export const SCAFFOLD_VERSIONS = {
     '@basaltkit/tenancy': '^4.0.0',
     '@basaltkit/tenancy-prisma': '^3.0.0',
     '@basaltkit/testing': '^3.0.0',
-    'create-basalt': '^1.14.1',
+    'create-basalt': '^1.14.2',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-basalt",
-  "version": "1.14.1",
+  "version": "1.14.2",
   "engines": {
     "node": ">=22.5.0"
   },
@@ -24,23 +24,23 @@
     "@prisma/adapter-pg": "^7.10.0",
     "@prisma/client": "^7.10.0",
     "@prisma/client-runtime-utils": "^7.10.0",
-    "@types/node": "^26.6.1",
+    "@types/node": "^26.6.5",
     "@types/pg": "^8.23.1",
-    "pg": "^8.23.0",
+    "pg": "^8.23.1",
     "prisma": "^7.10.0",
-    "tsx": "^4.23.13",
+    "tsx": "^4.23.15",
     "typescript": "^7.0.2",
-    "vitest": "^5.0.1",
-    "zod": "^4.6.5",
-    "@basaltkit/auth": "^5.0.0",
-    "@basaltkit/auth-prisma": "^3.0.0",
-    "@basaltkit/config": "^1.1.2",
+    "vitest": "^5.0.3",
+    "zod": "^4.6.6",
     "@basaltkit/cli": "^1.4.2",
+    "@basaltkit/config": "^1.1.2",
     "@basaltkit/core": "^1.6.0",
-    "@basaltkit/deploy": "^0.5.0",
+    "@basaltkit/auth-prisma": "^3.0.0",
+    "@basaltkit/deploy": "^0.8.0",
+    "@basaltkit/env": "^3.1.1",
     "@basaltkit/events": "^1.3.0",
     "@basaltkit/fastify": "^3.0.0",
-    "@basaltkit/generator": "^1.6.0",
+    "@basaltkit/generator": "^1.7.0",
     "@basaltkit/logger": "^1.3.0",
     "@basaltkit/mcp": "^6.0.0",
     "@basaltkit/prisma": "^4.0.0",
@@ -50,9 +50,9 @@
     "@basaltkit/teams-prisma": "^1.1.0",
     "@basaltkit/tenancy": "^4.0.0",
     "@basaltkit/tenancy-prisma": "^3.0.0",
-    "@basaltkit/env": "^3.1.1",
+    "@basaltkit/testing": "^3.0.0",
     "@basaltkit/tsconfig": "^0.24.0",
-    "@basaltkit/testing": "^3.0.0"
+    "@basaltkit/auth": "^5.0.0"
   },
   "publishConfig": {
     "access": "public"