@protobase/server 0.47.1 → 0.49.0

package/dist/admin-options.d.ts

@@ -67,7 +67,7 @@ export type AdminOptions = {
   /** The assistant in the admin app's dock: a backend elsewhere or the built-in one (see `AssistantOptions`); `false` turns it off. */
   assistant?: AssistantOptions | false;
   /**
-   * The MCP endpoint, on with `createAuth({ mcp })`. `sql: true` also offers admins and the `ai` role
+   * The MCP endpoint, on with `auth.mcp`. `sql: true` also offers admins and the `ai` role
    * `run_read_only_query`, which reads the whole database as the app's database role, outside the access rules.
    * `writes: true` offers `create_record` and `update_record`, through the REST API's access rules, `validate` and write
    * hooks; the person approves each write in their client, and a client that cannot ask is refused.
@@ -84,7 +84,7 @@ export type AdminOptions = {
   } | false;
   /**
    * The websites whose browser code may call the API (`/api/*` but `/api/auth/*`) besides the app's own origins (see
-   * `createAuth`'s `origins`): a list of origins, or `*` for any. Defaults to the one the platform passes in
+   * `auth.origins`): a list of origins, or `*` for any. Defaults to the one the platform passes in
    * `PROTOBASE_CORS_ORIGINS` (`*` or comma separated), when set. A `mobile` section adds the app's Capacitor origins
    * (`capacitor://localhost`, `https://localhost`). With none of these nor other origins, the API sends no CORS headers.
    */

package/dist/app-identity.d.ts

@@ -1,7 +1,7 @@
 //#region src/app-identity.d.ts
 /**
- * The `app` section of `protobase.config.ts`: the colours the installed app shows, beside its name (`createAuth`'s
- * `appName`) and its icons (`protobase.favicon.svg` and the PNGs beside it). Any CSS colour, such as `#0d9488`.
+ * The `app` section of `protobase.config.ts`: the colours the installed app shows, beside its name (`auth.appName`)
+ * and its icons (`protobase.favicon.svg` and the PNGs beside it). Any CSS colour, such as `#0d9488`.
  */
 export type AppIdentity = {
   /** The colour of the installed app's title bar and of the browser's toolbar around it. */

package/dist/app-name.d.ts

@@ -1,6 +1,8 @@
 //#region src/app-name.d.ts
 /** The app's name when neither the app nor the platform names it. */
 export declare const defaultAppName = "Protobase";
+/** The name the app goes by: the platform's `PROTOBASE_APP_NAME`, which deployments rename it with, over its own `own`. */
+export declare const appNameOver: (env: Record<string, string | undefined>, own: string | undefined) => string | undefined;
 /** The name the app shows, in its upper left and its tabs, and mails as: its auth's, else the platform's, else the default. */
 export declare const shownAppName: (auth: {
   appName?: string;

package/dist/auth-store.d.ts

@@ -0,0 +1,3 @@
+import { storeTableNames } from "./better-auth/store/table-names.js";
+import { migrationsTableName } from "./better-auth/store/migrations-table.js";
+export { migrationsTableName, storeTableNames };

package/dist/auth-store.js

@@ -0,0 +1,3 @@
+import { migrationsTableName } from "./better-auth/store/migrations-table.js";
+import { storeTableNames } from "./better-auth/store/table-names.js";
+export { migrationsTableName, storeTableNames };

package/dist/better-auth/auth-schema.d.ts

@@ -1,17 +1,16 @@
 import { AdminAuth } from "./create-auth.js";
 //#region src/better-auth/auth-schema.d.ts
 /**
- * The SQL that brings the admin store up to what this version of Protobase and the project's Better Auth plugins need:
- * for a store with the camelCase names of Protobase 0.6, their rename to snake_case (`snakeCaseMigration`); otherwise
- * new tables, columns and indexes, each skipped where it exists, and never a drop but of MCP's tables once MCP is off
- * (`dropMcpTables`). `undefined` when the store is current. A change Better Auth cannot make safely, such as a required
- * column without a default on a table with rows, is an error.
+ * The SQL that brings the admin store to this version of Protobase: the migrations it has not applied, each followed by
+ * its row in `auth_migrations`; for a new store, that table first. A store an earlier Protobase made without the record
+ * is adopted: the migrations it matches are recorded as applied (`planAdoption`), the others follow. `undefined` when
+ * the store is current. The SQL never drops anything.
  */
 export declare const authSchemaMigration: (auth: AdminAuth) => Promise<string | undefined>;
 /**
- * Refuses to go on while the admin store lacks a table or column Better Auth needs, still has the camelCase names of
- * Protobase 0.6, since every sign-in would fail, or still has MCP's tables with MCP off, since their grants would come
- * back with MCP. The server never changes the schema itself: the project's migrations do, before the new version serves.
+ * Refuses to go on while the admin store has not applied every migration of this version of Protobase, from its
+ * `auth_migrations` alone, since every sign-in would fail. The server never changes the schema itself: the project's
+ * migrations do, before the new version serves.
  */
 export declare const checkAuthSchema: (auth: AdminAuth) => Promise<void>;
 //#endregion

package/dist/better-auth/auth-schema.js

@@ -1,54 +1,52 @@
-import { storeSchema } from "./auth-tables.js";
-import { dropMcpTables, leftoverMcpTables, mcpTableNames, withMcpTables } from "./mcp/mcp-tables.js";
-import { snakeCaseMigration } from "./snake-case-migration.js";
-import { getMigrations } from "better-auth/db/migration";
+import { storeNames } from "./store/store-names.js";
+import { latestStoreVersion, storeMigrations } from "./store/migrations/index.js";
+import { appliedVersions, migrationsTableName } from "./store/migrations-table.js";
+import { migrationSql, migrationsTableSql } from "./store/migration-sql.js";
+import { adoptionSql, planAdoption, storeHasTables } from "./store/adoption.js";
+import { storeDb } from "./store/store-db.js";
 //#region src/better-auth/auth-schema.ts
 /** The command that writes the pending changes as a migration file of the project. */
 const authMigrationCommand = "protobase auth migration";
+const refuseNewer = (applied) => {
+	const newest = applied.at(-1);
+	if (newest !== void 0 && newest > latestStoreVersion) throw new Error(`The auth store is at migration ${newest}, newer than the ${latestStoreVersion} this version of Protobase knows; upgrade Protobase`);
+};
 /**
-* Better Auth's statements, each made to skip what exists already, so a migration written from an empty database also
-* applies to one an earlier Protobase set up in place.
-*/
-const skipExisting = (sql) => sql.split(";\n\n").map((statement) => statement.replace(/^create table (?!if not exists )/, "create table if not exists ").replace(/^create (unique )?index (?!if not exists )/, (_, unique) => `create ${unique ?? ""}index if not exists `).replace(/^(alter table .+? )add column (?!if not exists )/, "$1add column if not exists ")).join(";\n\n");
-/**
-* Better Auth adds `email_verified` to a `user` table that exists only when the table still has the camelCase names
-* of Protobase 0.6, whose `emailVerified` it does not know: such a store is renamed, never given new columns beside
-* the old ones.
-*/
-const hasCamelCaseNames = ({ toBeAdded }) => toBeAdded.some(({ table, fields }) => table === "user" && "email_verified" in fields);
-/**
-* The SQL that brings the admin store up to what this version of Protobase and the project's Better Auth plugins need:
-* for a store with the camelCase names of Protobase 0.6, their rename to snake_case (`snakeCaseMigration`); otherwise
-* new tables, columns and indexes, each skipped where it exists, and never a drop but of MCP's tables once MCP is off
-* (`dropMcpTables`). `undefined` when the store is current. A change Better Auth cannot make safely, such as a required
-* column without a default on a table with rows, is an error.
+* The SQL that brings the admin store to this version of Protobase: the migrations it has not applied, each followed by
+* its row in `auth_migrations`; for a new store, that table first. A store an earlier Protobase made without the record
+* is adopted: the migrations it matches are recorded as applied (`planAdoption`), the others follow. `undefined` when
+* the store is current. The SQL never drops anything.
 */
 const authSchemaMigration = async (auth) => {
-	const found = await getMigrations(withMcpTables(auth), { throwOnUnsafe: false });
-	if (hasCamelCaseNames(found)) return snakeCaseMigration(storeSchema(auth));
-	const drop = leftoverMcpTables(auth, found).length > 0 ? [dropMcpTables(storeSchema(auth))] : [];
-	const { toBeCreated, toBeAdded, toBeAddedIndexes, compileMigrations } = await getMigrations(auth.options);
-	const statements = [...toBeCreated.length === 0 && toBeAdded.length === 0 && toBeAddedIndexes.length === 0 ? [] : [skipExisting(await compileMigrations())], ...drop];
-	return statements.length === 0 ? void 0 : statements.join("\n\n");
+	const names = storeNames(auth);
+	const db = storeDb(auth);
+	const applied = await appliedVersions(db, names);
+	if (applied !== void 0) {
+		refuseNewer(applied);
+		const pending = storeMigrations.filter((migration) => !applied.includes(migration.version));
+		return pending.length === 0 ? void 0 : pending.map((migration) => migrationSql(names, migration)).join("\n\n");
+	}
+	if (!await storeHasTables(db, names)) return [migrationsTableSql(names), ...storeMigrations.map((migration) => migrationSql(names, migration))].join("\n\n");
+	const { adopted, pending } = await planAdoption(db, names);
+	return [
+		migrationsTableSql(names),
+		adoptionSql(names, adopted),
+		...pending.map((migration) => migrationSql(names, migration))
+	].join("\n\n");
 };
 /**
-* The tables and `table.column`s the admin store lacks; an index missing is not a reason to refuse requests. MCP's
-* tables, named with MCP off only to find them left over, are never missing then.
-*/
-const missingTablesAndColumns = (auth, { toBeCreated, toBeAdded }) => [...toBeCreated.map(({ table }) => table).filter((table) => auth.mcp || !mcpTableNames.includes(table)), ...toBeAdded.flatMap(({ table, fields }) => Object.keys(fields).map((field) => `${table}.${field}`))];
-/**
-* Refuses to go on while the admin store lacks a table or column Better Auth needs, still has the camelCase names of
-* Protobase 0.6, since every sign-in would fail, or still has MCP's tables with MCP off, since their grants would come
-* back with MCP. The server never changes the schema itself: the project's migrations do, before the new version serves.
+* Refuses to go on while the admin store has not applied every migration of this version of Protobase, from its
+* `auth_migrations` alone, since every sign-in would fail. The server never changes the schema itself: the project's
+* migrations do, before the new version serves.
 */
 const checkAuthSchema = async (auth) => {
-	const plan = await getMigrations(withMcpTables(auth), { throwOnUnsafe: false });
-	if (hasCamelCaseNames(plan)) throw new Error(`The auth schema still has the camelCase names of Protobase 0.6, which this version names in snake_case. Write their rename as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again.`);
-	const missing = missingTablesAndColumns(auth, plan);
-	if (missing.length > 0) throw new Error(`The auth schema is behind this version of Protobase (missing ${missing.join(", ")}). Write the change as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again.`);
-	const leftovers = leftoverMcpTables(auth, plan);
-	if (leftovers.length === 0) return;
-	throw new Error(`The auth schema still has the tables of the OAuth provider for MCP (${leftovers.join(", ")}), which is off. Write their removal as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again; every MCP client then has to be allowed again.`);
+	const applied = await appliedVersions(storeDb(auth), storeNames(auth));
+	const write = `Write it as a migration with \`${authMigrationCommand}\`, apply it with the project's migrations, then start again.`;
+	if (applied === void 0) throw new Error(`The auth store has no ${migrationsTableName} table: it is new, or an earlier Protobase made it. ${write}`);
+	refuseNewer(applied);
+	const missing = storeMigrations.filter((migration) => !applied.includes(migration.version));
+	if (missing.length === 0) return;
+	throw new Error(`The auth schema is behind this version of Protobase (missing migrations ${missing.map(({ version, name }) => `${version} ${name}`).join(", ")}). ${write}`);
 };
 //#endregion
-export { authMigrationCommand, authSchemaMigration, checkAuthSchema, skipExisting };
+export { authMigrationCommand, authSchemaMigration, checkAuthSchema };