@protobase/cli 0.8.2 → 0.9.0

package/dist/dev/entry.js

@@ -1,12 +1,13 @@
 import { devJobs } from "./dev-jobs.js";
+import { projectAdmin } from "../project/project-admin.js";
 import { loadProject, projectDb } from "./project.js";
-import { checkAuthSchema, checkChanges, configExports, createAdmin, hasUsers, jobDefinitions } from "@protobase/server";
+import { checkAuthSchema, checkChanges, checkWebhooksSchema, configExports, hasUsers } from "@protobase/server";
 import { Hono } from "hono";
 //#region src/dev/entry.ts
 const projectDir = process.env.PROTOBASE_PROJECT;
 const project = await loadProject(projectDir, JSON.parse(process.env.PROTOBASE_EXTENSIONS ?? "[]"));
 const db = projectDb(project, projectDir);
-const { resources, views, pages, userMenu } = configExports(project.exports);
+const { resources } = configExports(project.exports);
 if (!project.authenticate) throw new Error("No authenticator: export `authenticate` (and `auth`) from protobase.config.ts; see https://docs.protobase.net/reference/auth/");
 const store = globalThis;
 if (project.auth && !store.__protobaseAuthSchemaChecked) {
@@ -14,24 +15,12 @@ if (project.auth && !store.__protobaseAuthSchemaChecked) {
 	store.__protobaseAuthSchemaChecked = true;
 }
 await checkChanges(db, resources.map((resource) => resource.toModel()), project.events);
-await devJobs(db, jobDefinitions(project.jobs ?? {}));
-const admin = createAdmin({
-	resources,
-	views,
-	pages,
-	...userMenu && { userMenu },
-	db,
-	authenticate: project.authenticate,
-	...project.auth && { auth: project.auth },
-	...project.functions && { functions: project.functions },
-	...project.files && { files: project.files },
-	...project.events && { events: project.events },
-	jobs: jobDefinitions(project.jobs ?? {}),
-	options: {
-		onUnhandledError: (error) => console.error(error),
-		...project.options
-	}
-});
+if (project.webhooks) await checkWebhooksSchema(db, project.webhooks);
+const { admin, jobs } = projectAdmin({
+	...project,
+	authenticate: project.authenticate
+}, project.exports, db);
+await devJobs(db, jobs);
 var entry_default = new Hono().route("/", admin);
 if (project.auth && !store.__protobaseNoUsersShown) {
 	store.__protobaseNoUsersShown = true;

package/dist/migration/load-project.js

@@ -32,6 +32,7 @@ const loadMigrationProject = async (dir, extensions = []) => {
 		db: project.db ?? ownDb,
 		...project.auth && { auth: project.auth },
 		...project.events && { events: project.events },
+		...project.webhooks && { webhooks: project.webhooks },
 		jobs: jobDefinitions(project.jobs ?? {}),
 		close: async () => {
 			await ownDb?.destroy();

package/dist/migration/parts.js

@@ -1,4 +1,4 @@
-import { authSchemaMigration, changesMigration, jobsSchemaMigration } from "@protobase/server";
+import { authSchemaMigration, changesMigration, jobsSchemaMigration, webhooksMigration } from "@protobase/server";
 //#region src/migration/parts.ts
 /** Every feature the project's config enables, in the order their files are written. */
 const migrationParts = (project) => [
@@ -7,7 +7,7 @@ const migrationParts = (project) => [
 		title: "The auth schema changes this version of Protobase needs",
 		sql: () => authSchemaMigration(project.auth)
 	}] : [],
-	...project.jobs.length > 0 ? [{
+	...project.jobs.length > 0 || project.models.some((model) => model.events) || project.webhooks ? [{
 		name: "jobs",
 		title: "The jobs schema this version of Protobase needs",
 		sql: () => jobsSchemaMigration(project.db)
@@ -16,7 +16,12 @@ const migrationParts = (project) => [
 		name: "changes",
 		title: "The change capture the resources' events need",
 		sql: () => changesMigration(project.db, project.models, project.events)
-	}
+	},
+	...project.webhooks ? [{
+		name: "webhooks",
+		title: "The webhook subscriptions of webhooks()",
+		sql: () => webhooksMigration(project.db, project.webhooks, project.events)
+	}] : []
 ];
 //#endregion
 export { migrationParts };

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.8.2";
+var version = "0.9.0";
 //#endregion
 export { version };

package/dist/project/project-admin.js

@@ -0,0 +1,35 @@
+import { configExports, createAdmin, jobDefinitions } from "@protobase/server";
+//#region src/project/project-admin.ts
+/**
+* The admin API of a project over `db`, as `dev`, `serve` and `worker` build it: its config module's resources, views,
+* pages and subscriptions, and the rest of its config. `jobs` are the project's own and the delivery of its events.
+*/
+const projectAdmin = (project, config, db) => {
+	const { resources, views, pages, userMenu, subscriptions } = configExports(config);
+	const own = jobDefinitions(project.jobs ?? {});
+	const admin = createAdmin({
+		resources,
+		views,
+		pages,
+		...userMenu && { userMenu },
+		db,
+		authenticate: project.authenticate,
+		...project.auth && { auth: project.auth },
+		...project.functions && { functions: project.functions },
+		...project.files && { files: project.files },
+		...project.events && { events: project.events },
+		...project.webhooks && { webhooks: project.webhooks },
+		jobs: own,
+		subscriptions,
+		options: {
+			onUnhandledError: (error) => console.error(error),
+			...project.options
+		}
+	});
+	return {
+		admin,
+		jobs: [...own, ...admin.jobs]
+	};
+};
+//#endregion
+export { projectAdmin };

package/dist/serve/app.js

@@ -1,28 +1,10 @@
 import { isApiPath } from "../bundle/manifest.js";
 import { serveStaticSite } from "./static-site.js";
-import { configExports, createAdmin, jobDefinitions, jobsDrainApp } from "@protobase/server";
+import { jobsDrainApp } from "@protobase/server";
 import { Hono } from "hono";
 import { logger } from "hono/logger";
 //#region src/serve/app.ts
-const createServeApp = ({ project, db, requestLog, site, jobs, drainToken }) => {
-	const { resources, views, pages, userMenu } = configExports(project.config);
-	const admin = createAdmin({
-		resources,
-		views,
-		pages,
-		...userMenu && { userMenu },
-		db,
-		authenticate: project.authenticate,
-		...project.auth && { auth: project.auth },
-		...project.functions && { functions: project.functions },
-		...project.files && { files: project.files },
-		...project.events && { events: project.events },
-		jobs: jobDefinitions(project.jobs ?? {}),
-		options: {
-			onUnhandledError: (error) => console.error(error),
-			...project.options
-		}
-	});
+const createServeApp = ({ admin, requestLog, site, jobs, drainToken }) => {
 	const app = new Hono();
 	if (requestLog) app.use(logger());
 	app.get("/health", (c) => c.json({ status: "ok" }));

package/dist/serve/lifecycle.js

@@ -1,7 +1,8 @@
+import { projectAdmin } from "../project/project-admin.js";
 import { createPgDb } from "../project/pg-db.js";
 import { createServeApp } from "./app.js";
 import { startCleanupTimer } from "./cleanup-timer.js";
-import { checkAuthSchema, checkChanges, checkJobsSchema, configExports, createFileCleanup, jobDefinitions, startJobs } from "@protobase/server";
+import { checkAuthSchema, checkChanges, checkJobsSchema, checkWebhooksSchema, configExports, createFileCleanup, startJobs } from "@protobase/server";
 import { createAdaptorServer } from "@hono/node-server";
 import pg from "pg";
 //#region src/serve/lifecycle.ts
@@ -19,9 +20,10 @@ const startServe = async ({ project, env, createDb = (url) => createPgDb(pg, url
 	const ownDb = project.db ? void 0 : createDb(env.databaseUrl);
 	const db = project.db ?? ownDb;
 	const { resources } = configExports(project.config);
-	const definitions = jobDefinitions(project.jobs ?? {});
 	const startJobsAndListen = async () => {
 		await checkChanges(db, resources.map((resource) => resource.toModel()), project.events);
+		if (project.webhooks) await checkWebhooksSchema(db, project.webhooks);
+		const { admin, jobs: definitions } = projectAdmin(project, project.config, db);
 		if (definitions.length > 0) await checkJobsSchema(db);
 		const jobs = definitions.length > 0 ? await startJobs({
 			db,
@@ -30,8 +32,7 @@ const startServe = async ({ project, env, createDb = (url) => createPgDb(pg, url
 			onError: (error) => console.error(error)
 		}) : void 0;
 		const app = createServeApp({
-			project,
-			db,
+			admin,
 			requestLog: env.requestLog,
 			site,
 			...jobs && { jobs },

package/dist/worker/start-worker.js

@@ -1,10 +1,11 @@
 import { readManifest } from "../bundle/manifest.js";
 import { checkBundleVersion } from "../serve/bundle-version.js";
+import { projectAdmin } from "../project/project-admin.js";
 import { createPgDb } from "../project/pg-db.js";
 import { loadBundle } from "../serve/load-bundle.js";
 import { statSync } from "node:fs";
 import path from "node:path";
-import { checkJobsSchema, jobDefinitions, startJobs } from "@protobase/server";
+import { checkJobsSchema, configExports, jobDefinitions, startJobs } from "@protobase/server";
 import pg from "pg";
 //#region src/worker/start-worker.ts
 const bundleConfigFile = async (bundle) => {
@@ -16,20 +17,24 @@ const bundleConfigFile = async (bundle) => {
 * their own. It reads the jobs schema at start and refuses one that is missing or behind, like `serve`.
 */
 const startWorker = async ({ project, databaseUrl, createDb = (url) => createPgDb(pg, url) }) => {
-	const definitions = jobDefinitions(project.jobs ?? {});
-	if (definitions.length === 0) throw new Error("The bundle has no jobs: export them from protobase.config.ts as `jobs`");
+	const withEvents = configExports(project.config).resources.some((resource) => resource.toModel().events);
+	if (jobDefinitions(project.jobs ?? {}).length === 0 && !withEvents) throw new Error("The bundle has no jobs: export them from protobase.config.ts as `jobs`, or give a resource events");
 	if (!project.db && !databaseUrl) throw new Error("No database: set DATABASE_URL or export `db` from protobase.config.ts");
 	const ownDb = project.db ? void 0 : createDb(databaseUrl);
 	const db = project.db ?? ownDb;
 	const start = async () => {
+		const { jobs: definitions } = projectAdmin(project, project.config, db);
 		await checkJobsSchema(db);
-		return startJobs({
-			db,
-			jobs: definitions,
-			onError: (error) => console.error(error)
-		});
+		return {
+			definitions,
+			runtime: await startJobs({
+				db,
+				jobs: definitions,
+				onError: (error) => console.error(error)
+			})
+		};
 	};
-	const jobs = await start().catch(async (error) => {
+	const { definitions, runtime: jobs } = await start().catch(async (error) => {
 		await ownDb?.destroy();
 		throw error;
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/cli",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "description": "The protobase command: scaffold, doctor, dev, build and serve a Protobase project.",
   "license": "Apache-2.0",
   "repository": {
@@ -34,11 +34,11 @@
   "dependencies": {
     "@hono/node-server": "^2.1.3",
     "@hono/vite-dev-server": "^0.26.1",
-    "@protobase/layout": "0.8.2",
-    "@protobase/query": "0.8.2",
-    "@protobase/schema": "0.8.2",
-    "@protobase/server": "0.8.2",
-    "@protobase/ui": "0.8.2",
+    "@protobase/layout": "0.9.0",
+    "@protobase/query": "0.9.0",
+    "@protobase/schema": "0.9.0",
+    "@protobase/server": "0.9.0",
+    "@protobase/ui": "0.9.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@tailwindcss/vite": "^4.3.3",
     "@vitejs/plugin-react": "^6.1.2",