@prisma/composer-prisma-cloud 0.3.0-dev.8 → 0.3.0

package/dist/storage/storage-entrypoint.mjs

@@ -508,13 +508,6 @@ function startStorageServer(opts) {
 		stop: () => server.stop(true)
 	};
 }
-const nodeBuild = (opts) => ({
-	extension: "@prisma/composer/node",
-	type: "node",
-	module: opts.module,
-	entry: opts.entry,
-	...opts.dir === void 0 ? {} : { dir: opts.dir }
-});
 /**
 * **Last-resort escape hatch for unsafe type assertions. Not a sanctioned tool to reach for.**
 *
@@ -587,6 +580,11 @@ function freezeParams(params) {
 	for (const [name, param] of Object.entries(params)) frozen[name] = Object.freeze({ ...param });
 	return Object.freeze(frozen);
 }
+function freezeSecrets(secrets) {
+	const frozen = {};
+	for (const [name, need] of Object.entries(secrets)) frozen[name] = Object.freeze({ ...need });
+	return blindCast(Object.freeze(frozen));
+}
 /** A frozen shallow copy that keeps the caller's declared type. */
 function frozenShallowCopy(obj) {
 	return blindCast(Object.freeze({ ...obj }));
@@ -640,8 +638,7 @@ function resource(def) {
 }
 /**
 * Constructs a branded, frozen Service node — declarations only (inputs,
-* params, the input schema, build adapter, and the ports it exposes). Pure;
-* carries no runtime behavior.
+* params, build adapter, and the ports it exposes). Pure; carries no runtime behavior.
 */
 function service$1(def) {
 	requireName(def.name, "service");
@@ -649,7 +646,8 @@ function service$1(def) {
 	requireType(def.type, "service");
 	requireConfigKeySegmentNames(Object.keys(def.inputs), "input", "service");
 	requireConfigKeySegmentNames(Object.keys(def.params), "param", "service");
-	if (def.input !== void 0 && typeof def.input["~standard"]?.validate !== "function") throw new Error("service() `input` must be a Standard Schema (an object with a \"~standard\".validate function) — see https://standardschema.dev (ADR-0042).");
+	requireConfigKeySegmentNames(Object.keys(def.secrets ?? {}), "secret", "service");
+	for (const slot of Object.keys(def.secrets ?? {})) if (Object.hasOwn(def.params, slot)) throw new Error(`service() secret slot "${slot}" collides with a param of the same name — a secret slot and a service param derive the same config key (COMPOSER_<addr>_${slot.toUpperCase()}); rename one.`);
 	return Object.freeze({
 		[NODE]: true,
 		kind: "service",
@@ -658,7 +656,7 @@ function service$1(def) {
 		type: def.type,
 		inputs: frozenShallowCopy(def.inputs),
 		params: freezeParams(def.params),
-		inputSchema: blindCast(def.input),
+		secretSlots: freezeSecrets(def.secrets ?? blindCast({})),
 		build: Object.freeze({ ...def.build }),
 		expose: def.expose !== void 0 ? frozenShallowCopy(def.expose) : void 0
 	});
@@ -691,16 +689,11 @@ function dependency(def) {
 * `JSON.stringify`, and `console.log`/`util.inspect` all print `[REDACTED]`, so
 * a secret can't leak through an accidental log or serialization.
 *
-* Every box carries a brand property keyed by the registered symbol
-* `Symbol.for('prisma:secret-box')`, which is what `isSecretString` checks. A
-* symbol key is invisible to `JSON.stringify` and `Object.keys`, so the box's
-* public shape still matches the platform's own `secrecy` type
-* (pdp-control-plane).
+* Shape matches the platform's own `secrecy` type (pdp-control-plane). The class
+* is nominal enough on its own — no phantom brand.
 */
 const REDACTED = "[REDACTED]";
-const SECRET_BOX = blindCast(Symbol.for("prisma:secret-box"));
 var SecretBox = class {
-	[SECRET_BOX] = true;
 	#value;
 	constructor(value) {
 		this.#value = value;
@@ -766,6 +759,31 @@ function hydrateSync(root, config) {
 	}
 	return deps;
 }
+/**
+* Wraps each of a service's resolved secret values in a redacting `SecretBox`
+* — what the node's `secrets()` accessor returns (ADR-0021, sibling to
+* `load()`/`config()`). The RESOLUTION of a secret's value (the boot
+* double-lookup that reads the platform var the pointer names) is the target
+* pack's job; core is handed the already-resolved strings and only boxes them,
+* so a secret is redacted by TYPE from here on. A declared slot missing from
+* `values` is a target contract violation, named loudly.
+*/
+function hydrateSecrets(root, values) {
+	const boxed = {};
+	for (const slot of Object.keys(root.secretSlots)) {
+		const value = values[slot];
+		if (value === void 0) throw new Error(`secret slot "${slot}" has no resolved value — the target must resolve every declared secret before hydrateSecrets().`);
+		boxed[slot] = new SecretBox(value);
+	}
+	return blindCast(boxed);
+}
+const nodeBuild = (opts) => ({
+	extension: "@prisma/composer/node",
+	type: "node",
+	module: opts.module,
+	entry: opts.entry,
+	...opts.dir === void 0 ? {} : { dir: opts.dir }
+});
 const liftArray = (data) => Array.isArray(data) ? data : [data];
 /**
 * Splits an array into two arrays based on the result of a predicate
@@ -7973,7 +7991,7 @@ function coerceEnvSourcedParam(raw, d, key) {
 /**
 * Boot: read each declared param from env by its key, reverse the param's own
 * serialization (missing/invalid fails loudly), assemble the typed Config.
-* The input document rides its own channel (readInput), not this one.
+* Secrets ride a separate channel (deserializeSecrets), not this one.
 */
 const deserialize = (node, address) => {
 	const service = {};
@@ -8010,84 +8028,40 @@ const stash = (node, config) => {
 		process.env[configKey("", d)] = encode(d.owner, value);
 	}
 };
-/** The input document's own row name; its full key is COMPOSER_<addr>_INPUT. */
-const INPUT_KEY_NAME = "INPUT";
-/** The input document row's key for a service address. */
-const inputKey = (address) => configKey(address, {
+/** The pointer-row key for a secret slot: COMPOSER_<addr>_<slot> (secrets are service-level). */
+const secretKey = (address, slot) => configKey(address, {
 	owner: "service",
-	name: INPUT_KEY_NAME
+	name: slot
 });
-const SECRET_MARKER = "$secret";
-const ESCAPED_KEY = /^\$\$+secret$/;
-/** True for the framework's secret pointer: `{ "$secret": "<PLATFORM_VAR>" }` and nothing else. */
-function isSecretPointer(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 1 && SECRET_MARKER in value && typeof value[SECRET_MARKER] === "string";
-}
-/** A plain data object (not an array, not a class instance) — the only object shape a binding/document may nest. */
-function isPlainObject(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	const proto = Object.getPrototypeOf(value);
-	return proto === Object.prototype || proto === null;
-}
 /**
-* Boot: read the one input document row (address-free after run()'s
-* re-stash), swap each `$secret` pointer for a redacting box over the named
-* platform var, unescape reserved keys, validate with the service's own
-* schema, and return the typed object. A missing row is a loud failure naming
-* the env var — a deployed environment always writes it; a local harness must
-* supply it (set the row to the serialized input document).
+* Boot: resolve every secret slot to its value by double-lookup — read the
+* pointer key (the platform NAME), then read that platform var. A missing
+* pointer or a missing/empty platform value is a loud failure naming both keys.
+* Returns a plain Record for core's `hydrateSecrets` to box.
 */
-function readInput(node, address) {
-	const schema = node.inputSchema;
-	if (schema === void 0) throw new Error(`input() called on service "${node.name}", which declares no input schema — declare \`input: <schema>\` on compute() to use it (ADR-0042).`);
-	const key = inputKey(address);
-	const raw = process.env[key];
-	if (raw === void 0 || raw === "") throw new Error(`this service's input is not available (env ${key} is unset) — a deployed environment writes it automatically; a local harness must supply it like any other config value (set ${key} to the serialized input document).`);
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch (cause) {
-		const message = cause instanceof Error ? cause.message : String(cause);
-		throw new Error(`this service's input document is not valid JSON (env ${key}): ${message} — a deployed environment writes it automatically; a local harness must supply the serialized input document (set ${key} to it).`);
-	}
-	const hydrated = hydrateInputDocument(parsed, key);
-	try {
-		return standardValidateSync(schema, hydrated);
-	} catch (cause) {
-		const message = cause instanceof Error ? cause.message : String(cause);
-		throw new Error(`invalid input document (env ${key}): ${message}`);
-	}
-}
-/** Reverses the document encoding: `$secret` pointers become redacting boxes over the named platform vars; escaped reserved keys drop one "$". */
-function hydrateInputDocument(value, key) {
-	if (isSecretPointer(value)) {
-		const name = value[SECRET_MARKER];
-		const secret = process.env[name];
-		if (secret === void 0 || secret === "") throw new Error(`secret input is not provisioned (env ${key} → ${name}): the platform var "${name}" is unset or empty.`);
-		return new SecretBox(secret);
-	}
-	if (Array.isArray(value)) return value.map((member) => hydrateInputDocument(member, key));
-	if (isPlainObject(value)) {
-		const out = {};
-		for (const [k, member] of Object.entries(value)) {
-			const read = ESCAPED_KEY.test(k) ? k.slice(1) : k;
-			out[read] = hydrateInputDocument(member, key);
-		}
-		return out;
-	}
-	return value;
-}
+const deserializeSecrets = (node, address) => {
+	const values = {};
+	for (const slot of Object.keys(node.secretSlots)) {
+		const key = secretKey(address, slot);
+		const name = process.env[key];
+		if (name === void 0 || name === "") throw new Error(`missing secret pointer for slot "${slot}" (env ${key}) — the deploy did not write it.`);
+		const value = process.env[name];
+		if (value === void 0 || value === "") throw new Error(`secret "${slot}" is not provisioned (env ${key} → ${name}): the platform var "${name}" is unset or empty.`);
+		values[slot] = value;
+	}
+	return values;
+};
 /**
-* run()'s setup step for the input document: re-emit the row under its
-* address-free key, so the address-free `readInput` reads identically. The
-* document carries pointers, never values — the values stay only in their
-* platform vars.
+* run()'s setup step for secrets: re-emit each slot's pointer NAME under its
+* address-free key, so the address-free `deserializeSecrets` double-looks-up
+* identically. Never the value — the value stays only in the platform var.
 */
-const stashInput = (node, address) => {
-	if (node.inputSchema === void 0) return;
-	const raw = process.env[inputKey(address)];
-	if (raw === void 0) return;
-	process.env[inputKey("")] = raw;
+const stashSecrets = (node, address) => {
+	for (const slot of Object.keys(node.secretSlots)) {
+		const name = process.env[secretKey(address, slot)];
+		if (name === void 0) continue;
+		process.env[secretKey("", slot)] = name;
+	}
 };
 /**
 * Boot: for each reserved provider param, read its address-scoped row through
@@ -8270,24 +8244,20 @@ Object.freeze({
 });
 const reservedParams = { port: number$1({ default: 3e3 }) };
 /**
-* A Prisma Compute service — declarations only (deps + one input schema +
-* build + the ports it exposes), no descriptor. The reserved `port` param
-* rides its own channel (ADR-0042 leaves it untouched); a dependency named
-* like it fails at authoring.
+* A Prisma Compute service — declarations only (deps + params + build + the
+* ports it exposes), no descriptor. `params` merges with the reserved
+* `ReservedParams` (`port`); a user param whose name collides with a reserved
+* one fails at authoring, the same way a colliding dependency name does.
 *
 *   · run(address, boot) — the process controller: deserialize the platform
 *     environment (keyed off `address`, the extension's ONE env read) into a
-*     typed Config, re-emit it (and the input document row) under address-free
-*     process-local stash keys, then call boot() to start the app's entry.
-*   · load() / input() — called from inside the app's entry: read the stash;
-*     load() hydrates + memoizes the deps, input() parses the input document,
-*     replaces each `$secret` pointer with a redacting box over the named
-*     platform var, validates with the declared schema, and memoizes (ADR-0042).
+*     typed Config, re-emit it under address-free process-local stash keys,
+*     then call boot() to start the app's entry.
+*   · load() / config() — called from inside the app's entry: read the stash;
+*     load() hydrates + memoizes the deps, config() returns the typed params.
+*     Separate accessors so a dep and a param never share a namespace (ADR-0021).
 *   · origin() — this service's platform-assigned public origin, read from the
 *     stash `run()` populates; memoized per process.
-*   · port() — this service's resolved reserved port (the value `run()` routes
-*     to and exports as PORT), read from that same stash via #processConfig();
-*     defaults to 3000 when the platform binds none.
 *
 * The underlying node carries `extension: '@prisma/composer-prisma-cloud'` —
 * the control-plane registry key `prisma-composer deploy` resolves through the
@@ -8297,7 +8267,8 @@ const reservedParams = { port: number$1({ default: 3e3 }) };
 var ComputeService = class {
 	#resolved;
 	#loadedDeps;
-	#loadedInput;
+	#loadedParams;
+	#loadedSecrets;
 	#origin;
 	constructor(node) {
 		Object.assign(this, node);
@@ -8310,7 +8281,7 @@ var ComputeService = class {
 		const config = deserialize(this, address);
 		stash(this, config);
 		stashProviderParams(RESERVED_PROVIDER_PARAMS, address);
-		stashInput(this, address);
+		stashSecrets(this, address);
 		const port = config.service["port"];
 		if (typeof port === "number") process.env["PORT"] = String(port);
 		return boot();
@@ -8319,9 +8290,13 @@ var ComputeService = class {
 		if (this.#loadedDeps === void 0) this.#loadedDeps = blindCast(hydrateSync(this, this.#processConfig()));
 		return this.#loadedDeps;
 	}
-	input() {
-		if (this.#loadedInput === void 0) this.#loadedInput = blindCast(readInput(this, ""));
-		return this.#loadedInput;
+	config() {
+		if (this.#loadedParams === void 0) this.#loadedParams = blindCast(this.#processConfig().service);
+		return this.#loadedParams;
+	}
+	secrets() {
+		if (this.#loadedSecrets === void 0) this.#loadedSecrets = blindCast(hydrateSecrets(this, deserializeSecrets(this, "")));
+		return this.#loadedSecrets;
 	}
 	/** This service's platform-assigned public origin — read from the stash
 	*  run() populates and memoized per process. Throws if called before run()
@@ -8330,24 +8305,26 @@ var ComputeService = class {
 		this.#origin ??= readOrigin();
 		return this.#origin;
 	}
-	/** This service's resolved reserved port — the value run() routes to and
-	*  exports as PORT — read the same way load() reads the stash. Defaults to
-	*  3000 when the platform binds none. */
-	port() {
-		const port = this.#processConfig().service["port"];
-		if (typeof port !== "number") throw new Error(`service "${this.name}" resolved a non-numeric port — the reserved port param is number({ default: 3000 }), so a stashed config always carries a number here.`);
-		return port;
-	}
 };
 const compute = (def) => {
-	for (const reserved of Object.keys(reservedParams)) if (reserved in def.deps) throw new Error(`compute(): dependency "${reserved}" collides with the reserved service param of the same name — rename the dependency.`);
+	const userParams = def.params ?? blindCast({});
+	for (const reserved of Object.keys(reservedParams)) {
+		if (reserved in def.deps) throw new Error(`compute(): dependency "${reserved}" collides with the reserved service param of the same name — rename the dependency.`);
+		if (reserved in userParams) throw new Error(`compute(): param "${reserved}" collides with the reserved service param of the same name — rename the param.`);
+	}
+	for (const name of Object.keys(userParams)) if (name.toUpperCase() === "ORIGIN") throw new Error(`compute(): param "${name}" collides with the framework-written origin row — rename the param.`);
+	for (const name of Object.keys(def.secrets ?? {})) if (name.toUpperCase() === "ORIGIN") throw new Error(`compute(): secret "${name}" collides with the framework-written origin row — rename the secret.`);
+	const params = blindCast({
+		...userParams,
+		...reservedParams
+	});
 	const instance = new ComputeService(service$1({
 		name: def.name,
 		extension: "@prisma/composer-prisma-cloud",
 		type: "compute",
 		inputs: def.deps,
-		params: reservedParams,
-		...def.input !== void 0 ? { input: def.input } : {},
+		params,
+		...def.secrets !== void 0 ? { secrets: def.secrets } : {},
 		build: def.build,
 		...def.expose !== void 0 ? { expose: def.expose } : {}
 	}));
@@ -8415,21 +8392,21 @@ function s3Credentials(opts) {
 /**
 * The storage service authoring factory — a `compute` service routed to the
 * `s3-store` lowering instead of `compute`'s. It is exactly `compute`'s
-* runnable (run/load/input, deps, input schema, build, expose) with the
-* routing `type` overridden to `'s3-store'`: nothing at runtime keys off
-* `type` (the serializer keys off the deployment address and each param's
-* owner/name, and `load`/`input` off deps/the input schema), so only the
-* deploy-time descriptor lookup sees the override and routes to the
-* extended-output lowering (§ 5). The return type is compute's exactly
-* (including the reserved `port` param). The storage module (D4b) calls this
-* with its `db`/`credentials` deps and `expose: { store: s3Contract }`.
+* runnable (run/load/config, deps, params, build, expose) with the routing
+* `type` overridden to `'s3-store'`: nothing at runtime keys off `type` (the
+* serializer keys off the deployment address and each param's owner/name, and
+* `load`/`config` off deps/params), so only the deploy-time descriptor lookup
+* sees the override and routes to the extended-output lowering (§ 5). The
+* return type is compute's exactly (including the reserved `port` param). The
+* storage module (D4b) calls this with its `db`/`credentials` deps, a `bucket`
+* param, and `expose: { store: s3Contract }`.
 *
-* `compute()`'s result is a `ComputeService` instance — its run/load/input/
-* origin methods live on the class prototype, not as the instance's own
-* properties, so a plain object spread (`{ ...node }`) would silently drop
-* them. Building a fresh `ComputeService` from the same data fields (which
-* `{ ...node }` DOES copy — they're the node's own enumerable properties)
-* with `type` overridden keeps every method intact.
+* `compute()`'s result is a `ComputeService` instance — its run/load/config/
+* secrets/origin methods live on the class prototype, not as the instance's
+* own properties, so a plain object spread (`{ ...node }`) would silently
+* drop them. Building a fresh `ComputeService` from the same data fields
+* (which `{ ...node }` DOES copy — they're the node's own enumerable
+* properties) with `type` overridden keeps every method intact.
 */
 function s3StoreService(def) {
 	const instance = new ComputeService({
@@ -8452,22 +8429,21 @@ const s3Contract = Object.freeze({
 /**
 * The storage service node (like cron's `scheduler.ts` + `scheduler-service.ts`
 * combined): `storageService` builds the `s3-store` service — a Postgres `db`
-* dependency, a minted `credentials` dependency, a `bucket` input key
-* (bound at provision by `storage()`, ADR-0042), and the `store` port exposing
-* `s3Contract`. The deploy bootstrap runs the default-exported bare node
-* (`main.run(address, boot)`); the real bucket comes from the stashed input
-* document at runtime — exactly like `scheduler-service.ts` default-exports a
-* schedule-free `cronScheduler()`.
+* dependency, a minted `credentials` dependency, a `bucket` param, and the
+* `store` port exposing `s3Contract`. The deploy bootstrap runs the
+* default-exported bare node (`main.run(address, boot)`); the real bucket comes
+* from serialized config at runtime, so the default's `bucket` is only a
+* placeholder — exactly like `scheduler-service.ts` default-exports
+* `cronScheduler({ jobs: [] })`.
 */
-const storageInputSchema = type({ bucket: "string" });
-function storageService() {
+function storageService(opts) {
 	return s3StoreService({
 		name: "storage",
 		deps: {
 			db: postgres(),
 			credentials: s3Credentials()
 		},
-		input: storageInputSchema,
+		params: { bucket: string$1({ default: opts.bucket }) },
 		build: nodeBuild({
 			module: new URL("./storage-service.mjs", import.meta.url).href,
 			entry: "./storage-entrypoint.mjs"
@@ -8475,11 +8451,10 @@ function storageService() {
 		expose: { store: s3Contract }
 	});
 }
-storageService();
-const service = storageService();
+storageService({ bucket: "storage" });
+const service = storageService({ bucket: "storage" });
 const { db, credentials } = service.load();
-const { bucket } = service.input();
-const port = service.port();
+const { bucket, port } = service.config();
 startStorageServer({
 	store: await createPgStore(db.url),
 	credentials,