@beignet/core 0.0.48 → 0.0.49

package/src/server/use-case-route.ts

@@ -192,8 +192,10 @@ type UseCaseRouteShape<
   /**
    * Map parsed request parts to the use case input.
    *
-   * Defaults to `defaultBinderInput`, which merges query, body, and path
-   * objects (path wins collisions) and never merges headers.
+   * A sole declared path, query, or body schema is passed through unchanged
+   * when no additional path, query, or object body values are present.
+   * Otherwise `defaultBinderInput` merges query, body, and path objects (path
+   * wins collisions) and never merges headers.
    */
   input?: (parts: UseCaseRouteInputParts<C>) => UseCaseRouteInput<UC>;
   handle?: never;
@@ -330,9 +332,10 @@ function isPlainObject(value: unknown): value is Record<string, unknown> {
  * Merges parsed query, body, and path objects into one input object. Path
  * keys win all collisions, then body keys, then query keys. Headers are never
  * merged: parsed headers include every raw request header, so merging them
- * would poison the use case input. Non-object bodies (text, arrays, scalars)
- * are excluded. Routes that need headers or non-object bodies declare an
- * explicit `input` mapper.
+ * would poison the use case input. The route binder passes a sole declared
+ * input schema through unchanged when no other object input contains values;
+ * this merge handles every other default mapping. Routes that combine a
+ * non-object body with another source declare an explicit `input` mapper.
  */
 export function defaultBinderInput(parts: {
   path: unknown;
@@ -356,16 +359,42 @@ export function isUseCaseRouteDef(route: {
   return route.useCase !== undefined && route.useCase !== null;
 }
 
-function computeTrustedInput(
+function computeSingleInput(
   contract: HttpContractConfig,
   def: RuntimeUseCaseRouteDef,
-): boolean {
-  if (def.input) return false;
+): { source: "path" | "query" | "body"; schema: unknown } | undefined {
+  if (def.input) return undefined;
+
+  const sources = [
+    { source: "path", schema: contract.pathParams },
+    {
+      source: "query",
+      schema: contract.query,
+    },
+    {
+      source: "body",
+      schema: contract.body,
+    },
+  ] as const;
+  const present = sources.filter(
+    (candidate) => candidate.schema !== null && candidate.schema !== undefined,
+  );
+  const single = present[0];
+  return present.length === 1 && single
+    ? { source: single.source, schema: single.schema }
+    : undefined;
+}
 
-  const sources = [contract.pathParams, contract.query, contract.body].filter(
-    (schema) => schema !== null && schema !== undefined,
+function canPassSingleInput(
+  parts: { path: unknown; query: unknown; body: unknown },
+  source: "path" | "query" | "body",
+): boolean {
+  return (["path", "query", "body"] as const).every(
+    (candidate) =>
+      candidate === source ||
+      !isPlainObject(parts[candidate]) ||
+      Object.keys(parts[candidate]).length === 0,
   );
-  return sources.length === 1 && sources[0] === def.useCase.inputSchema;
 }
 
 function computeResponseExemption(
@@ -405,11 +434,11 @@ export function createUseCaseRouteHandler<Ctx, C extends HttpContractConfig>(
     );
   }
 
-  const mapInput = def.input ?? defaultBinderInput;
-  const trustedRun = computeTrustedInput(contract, def)
-    ? def.useCase[USE_CASE_TRUSTED_RUN_KEY]
-    : undefined;
-  const run = trustedRun ?? def.useCase.run;
+  const singleInput = computeSingleInput(contract, def);
+  const trustedRun =
+    singleInput?.schema === def.useCase.inputSchema
+      ? def.useCase[USE_CASE_TRUSTED_RUN_KEY]
+      : undefined;
 
   const handler: Handler<Ctx, C> = async ({
     ctx,
@@ -417,13 +446,23 @@ export function createUseCaseRouteHandler<Ctx, C extends HttpContractConfig>(
     query,
     headers,
     body,
-  }) => ({
-    status,
-    body: await run.call(def.useCase, {
-      ctx,
-      input: mapInput({ path, query, headers, body }),
-    }),
-  });
+  }) => {
+    const parts = { path, query, headers, body };
+    const passSingle =
+      singleInput !== undefined &&
+      canPassSingleInput(parts, singleInput.source);
+    const input = def.input
+      ? def.input(parts)
+      : passSingle
+        ? parts[singleInput.source]
+        : defaultBinderInput(parts);
+    const run = passSingle && trustedRun ? trustedRun : def.useCase.run;
+
+    return {
+      status,
+      body: await run.call(def.useCase, { ctx, input }),
+    };
+  };
 
   return {
     handler,

package/src/query-codec.ts

@@ -1,130 +0,0 @@
-const QUERY_VALUE_PREFIX = "~beignet-query:";
-
-type EncodedQueryValue =
-  | { type: "null" }
-  | { type: "string"; value: string }
-  | { type: "number"; value: number }
-  | { type: "boolean"; value: boolean }
-  | { type: "date"; value: string }
-  | { type: "array"; value: EncodedQueryValue[] }
-  | { type: "object"; value: Record<string, EncodedQueryValue> };
-
-function encodeStructuredValue(
-  value: unknown,
-  ancestors: Set<object>,
-): EncodedQueryValue {
-  if (value === null) return { type: "null" };
-  if (typeof value === "string") return { type: "string", value };
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return { type: "number", value };
-  }
-  if (typeof value === "boolean") return { type: "boolean", value };
-  if (value instanceof Date && Number.isFinite(value.getTime())) {
-    return { type: "date", value: value.toISOString() };
-  }
-  if (typeof value !== "object" || value === null) {
-    throw new TypeError("Query value is not serializable.");
-  }
-  if (ancestors.has(value)) {
-    throw new TypeError("Query value contains a circular reference.");
-  }
-
-  ancestors.add(value);
-  try {
-    if (Array.isArray(value)) {
-      return {
-        type: "array",
-        value: value.map((entry) => encodeStructuredValue(entry, ancestors)),
-      };
-    }
-
-    const prototype = Object.getPrototypeOf(value);
-    if (prototype !== Object.prototype && prototype !== null) {
-      throw new TypeError("Query value contains a non-plain object.");
-    }
-    return {
-      type: "object",
-      value: Object.fromEntries(
-        Object.entries(value)
-          .filter(([, entry]) => entry !== undefined)
-          .map(([key, entry]) => [
-            key,
-            encodeStructuredValue(entry, ancestors),
-          ]),
-      ),
-    };
-  } finally {
-    ancestors.delete(value);
-  }
-}
-
-function decodeStructuredValue(value: unknown): unknown {
-  if (typeof value !== "object" || value === null || !("type" in value)) {
-    throw new TypeError("Invalid encoded query value.");
-  }
-  const encoded = value as { type: unknown; value?: unknown };
-
-  switch (encoded.type) {
-    case "null":
-      return null;
-    case "string":
-      if (typeof encoded.value === "string") return encoded.value;
-      break;
-    case "number":
-      if (typeof encoded.value === "number" && Number.isFinite(encoded.value)) {
-        return encoded.value;
-      }
-      break;
-    case "boolean":
-      if (typeof encoded.value === "boolean") return encoded.value;
-      break;
-    case "date": {
-      if (typeof encoded.value !== "string") break;
-      const date = new Date(encoded.value);
-      if (Number.isFinite(date.getTime())) return date;
-      break;
-    }
-    case "array":
-      if (Array.isArray(encoded.value)) {
-        return encoded.value.map(decodeStructuredValue);
-      }
-      break;
-    case "object":
-      if (
-        typeof encoded.value === "object" &&
-        encoded.value !== null &&
-        !Array.isArray(encoded.value)
-      ) {
-        return Object.fromEntries(
-          Object.entries(encoded.value).map(([key, entry]) => [
-            key,
-            decodeStructuredValue(entry),
-          ]),
-        );
-      }
-      break;
-  }
-
-  throw new TypeError("Invalid encoded query value.");
-}
-
-export function encodeQueryValue(value: unknown): string {
-  if (typeof value === "string" && !value.startsWith(QUERY_VALUE_PREFIX)) {
-    return value;
-  }
-  return `${QUERY_VALUE_PREFIX}${JSON.stringify(
-    encodeStructuredValue(value, new Set()),
-  )}`;
-}
-
-export function decodeQueryValue(value: string): unknown {
-  if (!value.startsWith(QUERY_VALUE_PREFIX)) return value;
-
-  try {
-    return decodeStructuredValue(
-      JSON.parse(value.slice(QUERY_VALUE_PREFIX.length)) as unknown,
-    );
-  } catch {
-    return value;
-  }
-}