@btravstack/prisma 0.8.0 → 0.10.0

package/dist/index.cjs

@@ -30,27 +30,25 @@ let unthrown = require("unthrown");
 * rejection propagates to `@unthrown/prisma`'s `try*` twin without this file
 * needing a `no-throw` exemption.
 */
-const instrument = (client, logger, meter) => {
-	const operations = meter.createCounter("btravstack.database.operations", { description: "Database queries, by model, operation and outcome" });
+const instrument = (client, observers) => {
 	return client.$extends({ query: { $allModels: { $allOperations: ({ model, operation, args, query }) => {
-		const label = model ?? "raw";
+		const settle = (0, _btravstack_core.observe)(observers, {
+			component: "database",
+			name: operation,
+			attributes: {
+				model: model ?? "raw",
+				operation
+			},
+			traced: false
+		});
 		return query(args).then((value) => {
-			operations.add(1, {
-				model: label,
-				operation,
-				outcome: "ok"
-			});
+			settle({ outcome: "ok" });
 			return value;
 		}, (cause) => {
-			operations.add(1, {
-				model: label,
-				operation,
-				outcome: "error"
+			settle({
+				outcome: "error",
+				cause
 			});
-			logger.error("a database query failed", {
-				model: label,
-				operation
-			}, cause);
 			return Promise.reject(cause);
 		});
 	} } } });
@@ -83,6 +81,11 @@ const defaultLoader = async () => (await import("@prisma/instrumentation")).Pris
 * **The skip is logged, not silent.** Telemetry you believe you have and do not
 * is worse than none, so the one path that quietly produces no spans says so at
 * `debug` — the level for something that is a choice rather than a fault.
+*
+* This is the one place in this package that still holds a `Logger`, and it is
+* why the module needs one: it is a STARTUP fact rather than an operation, so
+* the `Observers` seam has nothing to settle. An observer writes lines about
+* operations that fail; a missing optional peer is neither.
 */
 const loadPrismaInstrumentation = async (logger, load = defaultLoader) => {
 	try {
@@ -114,39 +117,41 @@ const loadPrismaInstrumentation = async (logger, load = defaultLoader) => {
 * against this same URL *before the process starts*; an application that
 * migrates itself at boot races every other replica.
 */
-const prismaDatabase = (name) => ({ client, instrumented }) => {
+const prismaDatabase = (name) => ({ client }) => {
 	const config = _btravstack_config.Config.provider(`${name}Config`)(_btravstack_config.Config.object({ url: _btravstack_config.Config.string("DATABASE_URL") }));
 	const DatabasePort = (0, _btravstack_di.Port)(name);
 	const open = (url) => client(new _prisma_adapter_pg.PrismaPg({ connectionString: url }));
 	const port = DatabasePort;
-	const instrumentedProvider = (0, _btravstack_di.Provider)(port)({
-		settings: config.port,
-		logger: _btravstack_core.Logger,
-		meter: _btravstack_core.Meter
-	}, {
-		acquire: ({ settings, logger, meter }) => {
-			return (0, unthrown.fromSafePromise)(Promise.resolve(instrument(open(settings.url), logger, meter)));
+	const clientProvider = (0, _btravstack_di.Provider)(port)({
+		inject: {
+			settings: config.port,
+			observers: _btravstack_core.Observers
+		},
+		acquire: ({ settings, observers }) => {
+			return (0, unthrown.fromSafePromise)(Promise.resolve(instrument(open(settings.url), observers)));
 		},
 		release: (db) => db.$disconnect()
 	});
-	const plainProvider = (0, _btravstack_di.Provider)(port)({ settings: config.port }, {
-		acquire: ({ settings }) => (0, unthrown.OkAsync)(open(settings.url)),
-		release: (db) => db.$disconnect()
+	const healthCheck = _btravstack_di.Provider.member(_btravstack_core.HealthChecks)({
+		inject: { db: port },
+		sync: ({ db }) => ({
+			name,
+			check: () => (0, unthrown.fromPromise)(db.$queryRaw`SELECT 1`, (cause) => new _btravstack_core.HealthCheckFailed({ reason: cause instanceof Error ? cause.message : "database unreachable" })).map(() => void 0)
+		})
 	});
-	const healthCheck = _btravstack_di.Provider.member(_btravstack_core.HealthChecks)({ db: port }, { sync: ({ db }) => ({
-		name,
-		check: () => (0, unthrown.fromPromise)(db.$queryRaw`SELECT 1`, (cause) => new _btravstack_core.HealthCheckFailed({ reason: cause instanceof Error ? cause.message : "database unreachable" })).map(() => void 0)
-	}) });
-	const instrumentation = _btravstack_di.Provider.member(_btravstack_core.Instrumentations)({ logger: _btravstack_core.Logger }, { sync: ({ logger }) => () => loadPrismaInstrumentation(logger) });
-	const instrumentedModule = (0, _btravstack_di.Module)(name)({
-		needs: [
-			_btravstack_config.Env,
-			_btravstack_core.Logger,
-			_btravstack_core.Meter
-		],
+	const instrumentation = _btravstack_di.Provider.member(_btravstack_core.Instrumentations)({
+		inject: { logger: _btravstack_core.Logger },
+		sync: ({ logger }) => () => loadPrismaInstrumentation(logger)
+	});
+	const chosen = (0, _btravstack_di.Module)(name)({
+		needs: [_btravstack_config.Env, _btravstack_core.Logger],
 		provides: [
 			config,
-			instrumentedProvider,
+			_btravstack_di.Provider.member(_btravstack_core.Observers)({
+				inject: {},
+				value: _btravstack_core.noObserver
+			}),
+			clientProvider,
 			healthCheck,
 			instrumentation
 		],
@@ -156,16 +161,7 @@ const prismaDatabase = (name) => ({ client, instrumented }) => {
 			_btravstack_core.Instrumentations
 		]
 	});
-	const plainModule = (0, _btravstack_di.Module)(name)({
-		needs: [_btravstack_config.Env],
-		provides: [
-			config,
-			plainProvider,
-			healthCheck
-		],
-		exports: [DatabasePort, _btravstack_core.HealthChecks]
-	});
-	return Object.assign(instrumented !== false ? instrumentedModule : plainModule, { port: DatabasePort });
+	return Object.assign(chosen, { port: DatabasePort });
 };
 //#endregion
 exports.prismaDatabase = prismaDatabase;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Env } from "@btravstack/config";
-import { HealthChecks, Instrumentations, Logger, Meter } from "@btravstack/core";
+import { HealthChecks, Instrumentations, Logger, Observers } from "@btravstack/core";
 import { Module, PortClassOf } from "@btravstack/di";
 import { PrismaPg } from "@prisma/adapter-pg";
 //#region src/prisma.d.ts
@@ -20,7 +20,7 @@ type PrismaLike = {
   readonly $queryRaw: (query: TemplateStringsArray, ...values: unknown[]) => Promise<unknown>;
 };
 /** What {@link prismaDatabase} is handed. */
-type PrismaOptions<C extends PrismaLike, Instrumented extends boolean> = {
+type PrismaOptions<C extends PrismaLike> = {
   /**
    * Builds the client from the driver adapter, which is already constructed
    * from the environment's URL.
@@ -31,19 +31,6 @@ type PrismaOptions<C extends PrismaLike, Instrumented extends boolean> = {
    * the returned type is exactly the one the application will hold.
    */
   readonly client: (adapter: PrismaPg) => C;
-  /**
-   * Span, count and log every query. **Default `true`**, `false` opts out — the
-   * same shape as `cache`, `mailer` and `storage`, and as `StartOptions`'
-   * `signals` and `probes`.
-   *
-   * On by default because telemetry that is missing is discovered during an
-   * incident. The cost is stated rather than hidden: instrumenting puts
-   * `Logger`, `Meter` and `Tracer` in the provider's dependencies, so a root
-   * without `observability()` and `otel()` gets a compile error naming all
-   * three. It also turns on Prisma's own engine-level tracing when
-   * `@prisma/instrumentation` is installed — no wiring at the root.
-   */
-  readonly instrumented?: Instrumented;
 };
 /**
  * A Prisma client whose pool is the application scope's.
@@ -63,15 +50,11 @@ type PrismaOptions<C extends PrismaLike, Instrumented extends boolean> = {
  * against this same URL *before the process starts*; an application that
  * migrates itself at boot races every other replica.
  */
-declare const prismaDatabase: <const N extends string>(name: N) => <C extends PrismaLike, Instrumented extends boolean = true>({ client, instrumented }: PrismaOptions<C, Instrumented>) => (Instrumented extends true ? Module<HealthChecks | Instrumentations | (PortClassOf<N, C> extends (infer T) ? T extends PortClassOf<N, C> ? T extends import("@btravstack/di").AnyPort ? InstanceType<T> : T extends import("@btravstack/di").AnyProvider ? InstanceType<T["port"]> : never : never : never), import("@btravstack/config").ConfigInvalid, Exclude<Env, HealthChecks | Instrumentations | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
-  readonly url: string;
-}>> | Exclude<Logger, HealthChecks | Instrumentations | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
-  readonly url: string;
-}>> | Exclude<Meter, HealthChecks | Instrumentations | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
+declare const prismaDatabase: <const N extends string>(name: N) => <C extends PrismaLike>({ client }: PrismaOptions<C>) => Module<HealthChecks | Instrumentations | (PortClassOf<N, C> extends (infer T) ? T extends PortClassOf<N, C> ? T extends import("@btravstack/di").AnyPort ? InstanceType<T> : T extends import("@btravstack/di").AnyProvider ? InstanceType<T["port"]> : never : never : never), import("@btravstack/config").ConfigInvalid, Exclude<Env, HealthChecks | Instrumentations | Observers | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
   readonly url: string;
-}>>> : Module<HealthChecks | (PortClassOf<N, C> extends (infer T) ? T extends PortClassOf<N, C> ? T extends import("@btravstack/di").AnyPort ? InstanceType<T> : T extends import("@btravstack/di").AnyProvider ? InstanceType<T["port"]> : never : never : never), import("@btravstack/config").ConfigInvalid, Exclude<Env, HealthChecks | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
+}>> | Exclude<Logger, HealthChecks | Instrumentations | Observers | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
   readonly url: string;
-}>>>) & {
+}>>> & {
   readonly port: PortClassOf<N, C>;
 };
 //#endregion

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Env } from "@btravstack/config";
-import { HealthChecks, Instrumentations, Logger, Meter } from "@btravstack/core";
+import { HealthChecks, Instrumentations, Logger, Observers } from "@btravstack/core";
 import { Module, PortClassOf } from "@btravstack/di";
 import { PrismaPg } from "@prisma/adapter-pg";
 //#region src/prisma.d.ts
@@ -20,7 +20,7 @@ type PrismaLike = {
   readonly $queryRaw: (query: TemplateStringsArray, ...values: unknown[]) => Promise<unknown>;
 };
 /** What {@link prismaDatabase} is handed. */
-type PrismaOptions<C extends PrismaLike, Instrumented extends boolean> = {
+type PrismaOptions<C extends PrismaLike> = {
   /**
    * Builds the client from the driver adapter, which is already constructed
    * from the environment's URL.
@@ -31,19 +31,6 @@ type PrismaOptions<C extends PrismaLike, Instrumented extends boolean> = {
    * the returned type is exactly the one the application will hold.
    */
   readonly client: (adapter: PrismaPg) => C;
-  /**
-   * Span, count and log every query. **Default `true`**, `false` opts out — the
-   * same shape as `cache`, `mailer` and `storage`, and as `StartOptions`'
-   * `signals` and `probes`.
-   *
-   * On by default because telemetry that is missing is discovered during an
-   * incident. The cost is stated rather than hidden: instrumenting puts
-   * `Logger`, `Meter` and `Tracer` in the provider's dependencies, so a root
-   * without `observability()` and `otel()` gets a compile error naming all
-   * three. It also turns on Prisma's own engine-level tracing when
-   * `@prisma/instrumentation` is installed — no wiring at the root.
-   */
-  readonly instrumented?: Instrumented;
 };
 /**
  * A Prisma client whose pool is the application scope's.
@@ -63,15 +50,11 @@ type PrismaOptions<C extends PrismaLike, Instrumented extends boolean> = {
  * against this same URL *before the process starts*; an application that
  * migrates itself at boot races every other replica.
  */
-declare const prismaDatabase: <const N extends string>(name: N) => <C extends PrismaLike, Instrumented extends boolean = true>({ client, instrumented }: PrismaOptions<C, Instrumented>) => (Instrumented extends true ? Module<HealthChecks | Instrumentations | (PortClassOf<N, C> extends (infer T) ? T extends PortClassOf<N, C> ? T extends import("@btravstack/di").AnyPort ? InstanceType<T> : T extends import("@btravstack/di").AnyProvider ? InstanceType<T["port"]> : never : never : never), import("@btravstack/config").ConfigInvalid, Exclude<Env, HealthChecks | Instrumentations | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
-  readonly url: string;
-}>> | Exclude<Logger, HealthChecks | Instrumentations | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
-  readonly url: string;
-}>> | Exclude<Meter, HealthChecks | Instrumentations | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
+declare const prismaDatabase: <const N extends string>(name: N) => <C extends PrismaLike>({ client }: PrismaOptions<C>) => Module<HealthChecks | Instrumentations | (PortClassOf<N, C> extends (infer T) ? T extends PortClassOf<N, C> ? T extends import("@btravstack/di").AnyPort ? InstanceType<T> : T extends import("@btravstack/di").AnyProvider ? InstanceType<T["port"]> : never : never : never), import("@btravstack/config").ConfigInvalid, Exclude<Env, HealthChecks | Instrumentations | Observers | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
   readonly url: string;
-}>>> : Module<HealthChecks | (PortClassOf<N, C> extends (infer T) ? T extends PortClassOf<N, C> ? T extends import("@btravstack/di").AnyPort ? InstanceType<T> : T extends import("@btravstack/di").AnyProvider ? InstanceType<T["port"]> : never : never : never), import("@btravstack/config").ConfigInvalid, Exclude<Env, HealthChecks | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
+}>> | Exclude<Logger, HealthChecks | Instrumentations | Observers | import("@btravstack/di").PortInstance<string, C> | import("@btravstack/di").PortInstance<`${N}Config`, {
   readonly url: string;
-}>>>) & {
+}>>> & {
   readonly port: PortClassOf<N, C>;
 };
 //#endregion

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { Config, Env } from "@btravstack/config";
-import { HealthCheckFailed, HealthChecks, Instrumentations, Logger, Meter } from "@btravstack/core";
+import { HealthCheckFailed, HealthChecks, Instrumentations, Logger, Observers, noObserver, observe } from "@btravstack/core";
 import { Module, Port, Provider } from "@btravstack/di";
 import { PrismaPg } from "@prisma/adapter-pg";
-import { OkAsync, fromPromise, fromSafePromise } from "unthrown";
+import { fromPromise, fromSafePromise } from "unthrown";
 //#region src/instrument.ts
 /**
 * Every query, wrapped: a span around it, a count of how it came out, and a log
@@ -29,27 +29,25 @@ import { OkAsync, fromPromise, fromSafePromise } from "unthrown";
 * rejection propagates to `@unthrown/prisma`'s `try*` twin without this file
 * needing a `no-throw` exemption.
 */
-const instrument = (client, logger, meter) => {
-	const operations = meter.createCounter("btravstack.database.operations", { description: "Database queries, by model, operation and outcome" });
+const instrument = (client, observers) => {
 	return client.$extends({ query: { $allModels: { $allOperations: ({ model, operation, args, query }) => {
-		const label = model ?? "raw";
+		const settle = observe(observers, {
+			component: "database",
+			name: operation,
+			attributes: {
+				model: model ?? "raw",
+				operation
+			},
+			traced: false
+		});
 		return query(args).then((value) => {
-			operations.add(1, {
-				model: label,
-				operation,
-				outcome: "ok"
-			});
+			settle({ outcome: "ok" });
 			return value;
 		}, (cause) => {
-			operations.add(1, {
-				model: label,
-				operation,
-				outcome: "error"
+			settle({
+				outcome: "error",
+				cause
 			});
-			logger.error("a database query failed", {
-				model: label,
-				operation
-			}, cause);
 			return Promise.reject(cause);
 		});
 	} } } });
@@ -82,6 +80,11 @@ const defaultLoader = async () => (await import("@prisma/instrumentation")).Pris
 * **The skip is logged, not silent.** Telemetry you believe you have and do not
 * is worse than none, so the one path that quietly produces no spans says so at
 * `debug` — the level for something that is a choice rather than a fault.
+*
+* This is the one place in this package that still holds a `Logger`, and it is
+* why the module needs one: it is a STARTUP fact rather than an operation, so
+* the `Observers` seam has nothing to settle. An observer writes lines about
+* operations that fail; a missing optional peer is neither.
 */
 const loadPrismaInstrumentation = async (logger, load = defaultLoader) => {
 	try {
@@ -113,39 +116,41 @@ const loadPrismaInstrumentation = async (logger, load = defaultLoader) => {
 * against this same URL *before the process starts*; an application that
 * migrates itself at boot races every other replica.
 */
-const prismaDatabase = (name) => ({ client, instrumented }) => {
+const prismaDatabase = (name) => ({ client }) => {
 	const config = Config.provider(`${name}Config`)(Config.object({ url: Config.string("DATABASE_URL") }));
 	const DatabasePort = Port(name);
 	const open = (url) => client(new PrismaPg({ connectionString: url }));
 	const port = DatabasePort;
-	const instrumentedProvider = Provider(port)({
-		settings: config.port,
-		logger: Logger,
-		meter: Meter
-	}, {
-		acquire: ({ settings, logger, meter }) => {
-			return fromSafePromise(Promise.resolve(instrument(open(settings.url), logger, meter)));
+	const clientProvider = Provider(port)({
+		inject: {
+			settings: config.port,
+			observers: Observers
+		},
+		acquire: ({ settings, observers }) => {
+			return fromSafePromise(Promise.resolve(instrument(open(settings.url), observers)));
 		},
 		release: (db) => db.$disconnect()
 	});
-	const plainProvider = Provider(port)({ settings: config.port }, {
-		acquire: ({ settings }) => OkAsync(open(settings.url)),
-		release: (db) => db.$disconnect()
+	const healthCheck = Provider.member(HealthChecks)({
+		inject: { db: port },
+		sync: ({ db }) => ({
+			name,
+			check: () => fromPromise(db.$queryRaw`SELECT 1`, (cause) => new HealthCheckFailed({ reason: cause instanceof Error ? cause.message : "database unreachable" })).map(() => void 0)
+		})
 	});
-	const healthCheck = Provider.member(HealthChecks)({ db: port }, { sync: ({ db }) => ({
-		name,
-		check: () => fromPromise(db.$queryRaw`SELECT 1`, (cause) => new HealthCheckFailed({ reason: cause instanceof Error ? cause.message : "database unreachable" })).map(() => void 0)
-	}) });
-	const instrumentation = Provider.member(Instrumentations)({ logger: Logger }, { sync: ({ logger }) => () => loadPrismaInstrumentation(logger) });
-	const instrumentedModule = Module(name)({
-		needs: [
-			Env,
-			Logger,
-			Meter
-		],
+	const instrumentation = Provider.member(Instrumentations)({
+		inject: { logger: Logger },
+		sync: ({ logger }) => () => loadPrismaInstrumentation(logger)
+	});
+	const chosen = Module(name)({
+		needs: [Env, Logger],
 		provides: [
 			config,
-			instrumentedProvider,
+			Provider.member(Observers)({
+				inject: {},
+				value: noObserver
+			}),
+			clientProvider,
 			healthCheck,
 			instrumentation
 		],
@@ -155,16 +160,7 @@ const prismaDatabase = (name) => ({ client, instrumented }) => {
 			Instrumentations
 		]
 	});
-	const plainModule = Module(name)({
-		needs: [Env],
-		provides: [
-			config,
-			plainProvider,
-			healthCheck
-		],
-		exports: [DatabasePort, HealthChecks]
-	});
-	return Object.assign(instrumented !== false ? instrumentedModule : plainModule, { port: DatabasePort });
+	return Object.assign(chosen, { port: DatabasePort });
 };
 //#endregion
 export { prismaDatabase };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btravstack/prisma",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "The Prisma starter for @btravstack/core: DATABASE_URL through Config, the Postgres driver adapter, and a client whose pool is the application scope's",
   "keywords": [
     "database",
@@ -53,17 +53,17 @@
     "typescript": "7.0.2",
     "unthrown": "5.7.0",
     "vitest": "4.1.11",
-    "@btravstack/config": "0.8.0",
-    "@btravstack/core": "0.8.0",
-    "@btravstack/di": "0.8.0"
+    "@btravstack/config": "0.10.0",
+    "@btravstack/di": "0.10.0",
+    "@btravstack/core": "0.10.0"
   },
   "peerDependencies": {
     "@prisma/adapter-pg": "^7.0.0",
     "@prisma/instrumentation": "^7.0.0",
     "unthrown": "^5.0.0",
-    "@btravstack/config": "^0.8.0",
-    "@btravstack/core": "^0.8.0",
-    "@btravstack/di": "^0.8.0"
+    "@btravstack/config": "^0.10.0",
+    "@btravstack/core": "^0.10.0",
+    "@btravstack/di": "^0.10.0"
   },
   "peerDependenciesMeta": {
     "@prisma/instrumentation": {