@fougere/adapter-rest 0.11.0-alpha.0 → 0.12.1-alpha.0

package/dist/routes/RouteDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouteDefinition.d.ts","sourceRoot":"","sources":["../../src/routes/RouteDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,kEAAkE;IAClE,OAAO,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,8DAA8D;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mFAAmF;IACnF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uFAAuF;IACvF,WAAW,CAAC,EAAE,MAAM,CAAC;CAItB;AAED,kFAAkF;AAClF,KAAK,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,SAAS,CAAC,GAAG;IAClE,iFAAiF;IACjF,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,mFAAmF;IACnF,IAAI,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,CAAC,GAAG;QAAE,QAAQ,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC;CACxE,CAAC;AASF,UAAU,cAAc;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACpC,yFAAyF;IACzF,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;CACtG;AAED,UAAU,OAAO;IACf,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,4EAA4E;IAC5E,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAC;IAClF,kDAAkD;IAClD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;CACzF;AA6DD,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,eAAe,EAAE,CA2F/F"}
+{"version":3,"file":"RouteDefinition.d.ts","sourceRoot":"","sources":["../../src/routes/RouteDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,kEAAkE;IAClE,OAAO,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,8DAA8D;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mFAAmF;IACnF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uFAAuF;IACvF,WAAW,CAAC,EAAE,MAAM,CAAC;CAItB;AAED,kFAAkF;AAClF,KAAK,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,GAAG,SAAS,CAAC,GAAG;IAClE,iFAAiF;IACjF,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,mFAAmF;IACnF,IAAI,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,CAAC,GAAG;QAAE,QAAQ,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC;CACxE,CAAC;AASF,UAAU,cAAc;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACpC,yFAAyF;IACzF,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;CACtG;AAED,UAAU,OAAO;IACf,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,4EAA4E;IAC5E,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAC;IAClF,kDAAkD;IAClD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,SAAS,CAAC;CACzF;AA6DD,0DAA0D;AAC1D,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,eAAe,EAAE,CAGnG"}

package/dist/routes/RouteDefinition.js

@@ -50,83 +50,75 @@ function derivePath(entityName, opName) {
 // Membership is the axes-derived `Visibility.input` projection from @fougere/schema.
 // ─── Public API ─────────────────────────────────
 /** Generate REST route definitions from a fougere App. */
-export function generateRoutes(app, options) {
-    const prefix = options?.prefix ?? '';
-    const overrides = options?.overrides ?? {};
-    const routes = [];
-    for (const frond of app.fronds) {
-        const handlerMap = new Map(frond.handlers.filter((h) => !h.surface).map((h) => [h.address, h]));
-        const surfaceName = options?.surface;
-        for (const entity of frond.entities) {
-            // Membership is core's answer, not ours — one rule, read here (see App.facadeFor).
-            const facade = app.facadeFor(entity.name, surfaceName);
-            if (!facade)
-                continue;
-            if (options?.filter && !options.filter(entity, frond.name))
-                continue;
-            if (!surfaceName && entity.exposed === false)
-                continue;
-            const handler = (surfaceName
-                ? frond.handlers.find((h) => h.address === entity.name && h.surface === surfaceName)
-                : undefined) ?? handlerMap.get(entity.name);
-            const effectiveOperations = app.operationsFor(entity.name, surfaceName);
-            if (!effectiveOperations) {
-                throw new Error(`REST cannot project '${entity.name}' without its EffectiveOperation table.`);
-            }
-            // The resolved table defines the public operation set. This also works for remote
-            // proxy facades, which intentionally cannot enumerate their keys before discovery.
-            const opNames = [...effectiveOperations.keys()];
-            const entityOverrides = overrides[entity.name] ?? {};
-            // Use handler's output schema if declared, otherwise entity. A frond whose class
-            // never crossed the wire arrives as one too: boot rebuilds the card before here.
-            const outputSchema = handler?.outputOverride
-                ?? handler?.ctor?.__output
-                ?? entity.entityClass;
-            const fields = outputSchema.getFields();
-            for (const opName of opNames) {
-                const meta = effectiveOperations.get(opName);
-                if (!meta) {
-                    throw new Error(`REST facade '${entity.name}' exposes '${opName}' but its EffectiveOperation table does not.`);
-                }
-                // What the FROND said, then what this call said, then the convention. The frond
-                // comes first because it names the operation; a host that overrides is deciding
-                // for someone else's, which is what `overrides:` is for and why it wins.
-                const stated = frond.operationsOverrides?.[opName]?.rest;
-                const override = { ...stated, ...entityOverrides[opName] };
-                const method = override.method ?? deriveMethod(opName, meta?.kind);
-                const path = prefix + (override.path ?? derivePath(entity.name, opName));
-                // Input/output fields: use meta if available, fallback to entity fields for CRUD.
-                // Both pass through the client-surface projections (write-only out, read-only in).
-                let inputFields;
-                let outputFields = Visibility.of(fields).output;
-                if (meta?.input) {
-                    inputFields = meta.input.getFields();
-                }
-                else if (opName === 'create' || opName === 'update') {
-                    inputFields = Visibility.of(fields).input;
-                }
-                if (meta?.output)
-                    outputFields = Visibility.of(meta.output.getFields()).output;
-                // Handler/method overrides are already executed by the facade from the same
-                // EffectiveOperation local and RPC use. The adapter never resolves DI itself.
-                const op = facade[opName];
-                if (typeof op !== 'function') {
-                    throw new Error(`REST EffectiveOperation table exposes '${opName}' but its facade does not.`);
-                }
-                routes.push({
-                    method,
-                    path,
-                    operationName: opName,
-                    entityName: entity.name,
-                    handler: (invocation) => op(invocation),
-                    inputFields,
-                    outputFields,
-                    successStatus: override.status,
-                    ...(meta?.description && { description: meta.description }),
-                });
-            }
-        }
+export function generateRoutes(app, options = {}) {
+    return app.fronds.flatMap((frond) => frond.entities.flatMap((entity) => routesOf(app, frond, entity, options)));
+}
+/** What one entity answers on REST — nothing, when this surface does not serve it. */
+function routesOf(app, frond, entity, options) {
+    const surface = options.surface;
+    // Membership is core's answer, not ours — one rule, read here (see App.facadeFor).
+    const facade = app.facadeFor(entity.name, surface);
+    if (!facade)
+        return [];
+    if (options.filter && !options.filter(entity, frond.name))
+        return [];
+    if (!surface && entity.exposed === false)
+        return [];
+    const effectiveOperations = app.operationsFor(entity.name, surface);
+    if (!effectiveOperations) {
+        throw new Error(`REST cannot project '${entity.name}' without its EffectiveOperation table.`);
+    }
+    const handler = (surface
+        ? frond.handlers.find((one) => one.address === entity.name && one.surface === surface)
+        : undefined) ?? frond.handlers.find((one) => !one.surface && one.address === entity.name);
+    // The handler's output schema if declared, otherwise the entity. A frond whose class never
+    // crossed the wire arrives as one too: boot rebuilds the card before here.
+    const outputSchema = handler?.outputOverride ?? handler?.ctor?.__output ?? entity.entityClass;
+    // The resolved table defines the public operation set. This also works for remote proxy
+    // facades, which intentionally cannot enumerate their keys before discovery.
+    return [...effectiveOperations.keys()].map((opName) => routeFor({
+        entity,
+        frond,
+        facade,
+        fields: outputSchema.getFields(),
+        opName,
+        meta: effectiveOperations.get(opName),
+        options,
+    }));
+}
+function routeFor({ entity, frond, facade, fields, opName, meta, options }) {
+    if (!meta) {
+        throw new Error(`REST facade '${entity.name}' exposes '${opName}' but its EffectiveOperation table does not.`);
     }
-    return routes;
+    // What the FROND said, then what this call said, then the convention. The frond comes first
+    // because it names the operation; a host that overrides is deciding for someone else's,
+    // which is what `overrides:` is for and why it wins.
+    const stated = frond.operationsOverrides?.[opName]?.rest;
+    const override = { ...stated, ...(options.overrides?.[entity.name] ?? {})[opName] };
+    // Handler and method overrides are already executed by the facade, from the same
+    // EffectiveOperation local and RPC use. The adapter never resolves DI itself.
+    const op = facade[opName];
+    if (typeof op !== 'function') {
+        throw new Error(`REST EffectiveOperation table exposes '${opName}' but its facade does not.`);
+    }
+    return {
+        method: override.method ?? deriveMethod(opName, meta.kind),
+        path: (options.prefix ?? '') + (override.path ?? derivePath(entity.name, opName)),
+        operationName: opName,
+        entityName: entity.name,
+        handler: (invocation) => op(invocation),
+        ...inputAndOutput(meta, fields, opName),
+        successStatus: override.status,
+        ...(meta.description && { description: meta.description }),
+    };
+}
+/** Both pass through the client-surface projections — write-only out, read-only in. */
+function inputAndOutput(meta, fields, opName) {
+    const inputFields = meta.input?.getFields()
+        ?? (opName === 'create' || opName === 'update' ? Visibility.of(fields).input : undefined);
+    return {
+        inputFields,
+        outputFields: meta.output ? Visibility.of(meta.output.getFields()).output : Visibility.of(fields).output,
+    };
 }
 //# sourceMappingURL=RouteDefinition.js.map

package/dist/routes/RouteDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteDefinition.js","sourceRoot":"","sources":["../../src/routes/RouteDefinition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RouteDefinition.js","sourceRoot":"","sources":["../../src/routes/RouteDefinition.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fougere/adapter-rest",
-  "version": "0.11.0-alpha.0",
+  "version": "0.12.1-alpha.0",
   "description": "Entity → REST routes.",
   "keywords": [
     "fougere",
@@ -29,9 +29,9 @@
     "src"
   ],
   "dependencies": {
-    "@fougere/core": "0.11.0-alpha.0",
-    "@fougere/schema": "0.11.0-alpha.0",
-    "@fougere/http": "0.11.0-alpha.0"
+    "@fougere/core": "0.12.1-alpha.0",
+    "@fougere/schema": "0.12.1-alpha.0",
+    "@fougere/http": "0.12.1-alpha.0"
   },
   "publishConfig": {
     "access": "public"

package/src/routes/RouteDefinition.ts

@@ -124,95 +124,106 @@ function derivePath(entityName: string, opName: string): string {
 // ─── Public API ─────────────────────────────────
 
 /** Generate REST route definitions from a fougere App. */
-export function generateRoutes(app: AppLike, options?: GenerateRoutesOptions): RouteDefinition[] {
-  const prefix = options?.prefix ?? '';
-  const overrides = options?.overrides ?? {};
-  const routes: RouteDefinition[] = [];
-
-  for (const frond of app.fronds) {
-    const handlerMap = new Map(frond.handlers.filter((h) => !h.surface).map((h) => [h.address, h]));
-
-    const surfaceName = options?.surface;
-
-    for (const entity of frond.entities) {
-      // Membership is core's answer, not ours — one rule, read here (see App.facadeFor).
-      const facade = app.facadeFor(entity.name, surfaceName) as HandlerFacade | undefined;
-      if (!facade) continue;
-
-      if (options?.filter && !options.filter(entity, frond.name)) continue;
-      if (!surfaceName && entity.exposed === false) continue;
-
-      const handler = (surfaceName
-        ? frond.handlers.find((h) => h.address === entity.name && h.surface === surfaceName)
-        : undefined) ?? handlerMap.get(entity.name);
-      const effectiveOperations = app.operationsFor(entity.name, surfaceName);
-      if (!effectiveOperations) {
-        throw new Error(
-          `REST cannot project '${entity.name}' without its EffectiveOperation table.`,
-        );
-      }
-      // The resolved table defines the public operation set. This also works for remote
-      // proxy facades, which intentionally cannot enumerate their keys before discovery.
-      const opNames = [...effectiveOperations.keys()];
-      const entityOverrides = overrides[entity.name] ?? {};
-      // Use handler's output schema if declared, otherwise entity. A frond whose class
-      // never crossed the wire arrives as one too: boot rebuilds the card before here.
-      const outputSchema: SchemaView = handler?.outputOverride
-        ?? handler?.ctor?.__output
-        ?? entity.entityClass;
-      const fields = outputSchema.getFields();
-
-      for (const opName of opNames) {
-        const meta = effectiveOperations.get(opName);
-        if (!meta) {
-          throw new Error(
-            `REST facade '${entity.name}' exposes '${opName}' but its EffectiveOperation table does not.`,
-          );
-        }
-        // What the FROND said, then what this call said, then the convention. The frond
-        // comes first because it names the operation; a host that overrides is deciding
-        // for someone else's, which is what `overrides:` is for and why it wins.
-        const stated = frond.operationsOverrides?.[opName]?.rest as
-          { method?: HttpMethod; path?: string; status?: number } | undefined;
-        const override = { ...stated, ...entityOverrides[opName] } as
-          { method?: HttpMethod; path?: string; status?: number };
-        const method = override.method ?? deriveMethod(opName, meta?.kind);
-        const path = prefix + (override.path ?? derivePath(entity.name, opName));
-
-        // Input/output fields: use meta if available, fallback to entity fields for CRUD.
-        // Both pass through the client-surface projections (write-only out, read-only in).
-        let inputFields: Fields | undefined;
-        let outputFields: Fields | undefined = Visibility.of(fields).output;
-        if (meta?.input) {
-          inputFields = meta.input.getFields();
-        } else if (opName === 'create' || opName === 'update') {
-          inputFields = Visibility.of(fields).input;
-        }
-        if (meta?.output) outputFields = Visibility.of(meta.output.getFields()).output;
-
-        // Handler/method overrides are already executed by the facade from the same
-        // EffectiveOperation local and RPC use. The adapter never resolves DI itself.
-        const op = facade[opName];
-        if (typeof op !== 'function') {
-          throw new Error(
-            `REST EffectiveOperation table exposes '${opName}' but its facade does not.`,
-          );
-        }
-
-        routes.push({
-          method,
-          path,
-          operationName: opName,
-          entityName: entity.name,
-          handler: (invocation) => op(invocation),
-          inputFields,
-          outputFields,
-          successStatus: override.status,
-          ...(meta?.description && { description: meta.description }),
-        });
-      }
-    }
+export function generateRoutes(app: AppLike, options: GenerateRoutesOptions = {}): RouteDefinition[] {
+  return app.fronds.flatMap((frond) =>
+    frond.entities.flatMap((entity) => routesOf(app, frond, entity, options)));
+}
+
+/** What one entity answers on REST — nothing, when this surface does not serve it. */
+function routesOf(
+  app: AppLike,
+  frond: FrondLike,
+  entity: EntityEntry,
+  options: GenerateRoutesOptions,
+): RouteDefinition[] {
+  const surface = options.surface;
+  // Membership is core's answer, not ours — one rule, read here (see App.facadeFor).
+  const facade = app.facadeFor(entity.name, surface) as HandlerFacade | undefined;
+  if (!facade) return [];
+  if (options.filter && !options.filter(entity, frond.name)) return [];
+  if (!surface && entity.exposed === false) return [];
+
+  const effectiveOperations = app.operationsFor(entity.name, surface);
+  if (!effectiveOperations) {
+    throw new Error(`REST cannot project '${entity.name}' without its EffectiveOperation table.`);
   }
 
-  return routes;
+  const handler = (surface
+    ? frond.handlers.find((one) => one.address === entity.name && one.surface === surface)
+    : undefined) ?? frond.handlers.find((one) => !one.surface && one.address === entity.name);
+  // The handler's output schema if declared, otherwise the entity. A frond whose class never
+  // crossed the wire arrives as one too: boot rebuilds the card before here.
+  const outputSchema: SchemaView = handler?.outputOverride ?? handler?.ctor?.__output ?? entity.entityClass;
+
+  // The resolved table defines the public operation set. This also works for remote proxy
+  // facades, which intentionally cannot enumerate their keys before discovery.
+  return [...effectiveOperations.keys()].map((opName) => routeFor({
+    entity,
+    frond,
+    facade,
+    fields: outputSchema.getFields(),
+    opName,
+    meta: effectiveOperations.get(opName),
+    options,
+  }));
+}
+
+/** One operation of one entity, and everything that decides how it is addressed. */
+interface Projecting {
+  entity: EntityEntry;
+  frond: FrondLike;
+  facade: HandlerFacade;
+  fields: Fields;
+  opName: string;
+  meta: OperationMeta | undefined;
+  options: GenerateRoutesOptions;
+}
+
+function routeFor({ entity, frond, facade, fields, opName, meta, options }: Projecting): RouteDefinition {
+  if (!meta) {
+    throw new Error(
+      `REST facade '${entity.name}' exposes '${opName}' but its EffectiveOperation table does not.`,
+    );
+  }
+
+  // What the FROND said, then what this call said, then the convention. The frond comes first
+  // because it names the operation; a host that overrides is deciding for someone else's,
+  // which is what `overrides:` is for and why it wins.
+  const stated = frond.operationsOverrides?.[opName]?.rest as
+    { method?: HttpMethod; path?: string; status?: number } | undefined;
+  const override = { ...stated, ...(options.overrides?.[entity.name] ?? {})[opName] } as
+    { method?: HttpMethod; path?: string; status?: number };
+
+  // Handler and method overrides are already executed by the facade, from the same
+  // EffectiveOperation local and RPC use. The adapter never resolves DI itself.
+  const op = facade[opName];
+  if (typeof op !== 'function') {
+    throw new Error(`REST EffectiveOperation table exposes '${opName}' but its facade does not.`);
+  }
+
+  return {
+    method: override.method ?? deriveMethod(opName, meta.kind),
+    path: (options.prefix ?? '') + (override.path ?? derivePath(entity.name, opName)),
+    operationName: opName,
+    entityName: entity.name,
+    handler: (invocation) => op(invocation),
+    ...inputAndOutput(meta, fields, opName),
+    successStatus: override.status,
+    ...(meta.description && { description: meta.description }),
+  };
+}
+
+/** Both pass through the client-surface projections — write-only out, read-only in. */
+function inputAndOutput(
+  meta: OperationMeta,
+  fields: Fields,
+  opName: string,
+): { inputFields: Fields | undefined; outputFields: Fields | undefined } {
+  const inputFields = meta.input?.getFields()
+    ?? (opName === 'create' || opName === 'update' ? Visibility.of(fields).input : undefined);
+
+  return {
+    inputFields,
+    outputFields: meta.output ? Visibility.of(meta.output.getFields()).output : Visibility.of(fields).output,
+  };
 }