@teamscala/service-boot 0.23.355 → 0.23.356

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "@teamscala/service-boot",
   "type": "module",
-  "version": "0.23.355",
+  "version": "0.23.356",
   "sideEffects": false,
   "imports": {
     "#service-boot/*": "./src/*",

package/src/resolve-from-loader-config.test.ts

@@ -10,7 +10,14 @@
  */
 
 import { describe, expect, test } from "bun:test";
-import { interpolateMeta } from "./resolve-from-loader-config";
+import {
+	interpolateMeta,
+	resolveFromLoaderConfig,
+} from "./resolve-from-loader-config";
+import {
+	getServerClient,
+	setServerClient,
+} from "./page-server-orpc/server-client";
 
 describe("interpolateMeta (resolver_input ref contract)", () => {
 	test("a bare :sourceKey ref passes the whole resolved source object", () => {
@@ -42,3 +49,57 @@ describe("interpolateMeta (resolver_input ref contract)", () => {
 		expect(out.score).toBe(48);
 	});
 });
+
+describe("resource-loader model capability", () => {
+	test("an optional source still refuses a model absent from the generated client", async () => {
+		const original = getServerClient();
+		setServerClient({} as never);
+		try {
+			await expect(
+				resolveFromLoaderConfig(
+					{
+						sources: [
+							{
+								key: "body",
+								source: "orpc",
+								model: "builda_pages",
+								optional: true,
+							},
+						],
+					},
+					{},
+				),
+			).rejects.toThrow(
+				'requires model "builda_pages", but the generated server client does not expose findFirst',
+			);
+		} finally {
+			setServerClient(original);
+		}
+	});
+
+	test("an optional source may resolve an absent row when the model capability exists", async () => {
+		const original = getServerClient();
+		setServerClient({
+			builda_pages: { findFirst: async () => null },
+		} as never);
+		try {
+			await expect(
+				resolveFromLoaderConfig(
+					{
+						sources: [
+							{
+								key: "body",
+								source: "orpc",
+								model: "builda_pages",
+								optional: true,
+							},
+						],
+					},
+					{},
+				),
+			).resolves.toEqual({ body: null });
+		} finally {
+			setServerClient(original);
+		}
+	});
+});

package/src/resolve-from-loader-config.ts

@@ -34,6 +34,15 @@ interface LoaderConfig {
 	merge_strategy?: Record<string, unknown>;
 }
 
+class MissingLoaderModelCapabilityError extends Error {
+	constructor(model: string, sourceKey: string) {
+		super(
+			`[resource_loader] source "${sourceKey}" requires model "${model}", but the generated server client does not expose findFirst for it — regenerate the service schema from its page loaders`,
+		);
+		this.name = "MissingLoaderModelCapabilityError";
+	}
+}
+
 function resolveParamRef(
 	ref: string,
 	params: Record<string, unknown>,
@@ -161,7 +170,9 @@ async function resolveSource(
 						}) => Promise<unknown>;
 				  }
 				| undefined;
-			if (!model?.findFirst) return null;
+			if (!model?.findFirst) {
+				throw new MissingLoaderModelCapabilityError(source.model, source.key);
+			}
 			return model.findFirst({
 				where,
 				select: toSelectMap(source.select),
@@ -261,7 +272,10 @@ export async function resolveFromLoaderConfig(
 			if (!source || !result) continue;
 			if (result.status === "fulfilled") {
 				resolved[source.key] = result.value;
-			} else if (source.optional) {
+			} else if (
+				source.optional &&
+				!(result.reason instanceof MissingLoaderModelCapabilityError)
+			) {
 				resolved[source.key] = null;
 			} else {
 				throw result.reason;