@trpc/server 11.0.0-next-beta.242 → 11.0.0-next-beta.248

package/src/unstable-core-do-not-import/router.ts

@@ -9,14 +9,11 @@ import type {
 import type { ProcedureCallOptions } from './procedureBuilder';
 import type { AnyRootTypes, RootConfig } from './rootConfig';
 import { defaultTransformer } from './transformer';
-import type { MaybePromise } from './types';
+import type { MaybePromise, ValueOf } from './types';
 import { mergeWithoutOverrides, omitPrototype } from './utils';
 
-/** @internal **/
-export type ProcedureRecord = Record<string, AnyProcedure>;
-
-export interface ProcedureRouterRecord {
-  [key: string]: AnyProcedure | AnyRouter;
+export interface RouterRecord {
+  [key: string]: AnyProcedure | RouterRecord;
 }
 
 type DecorateProcedure<TProcedure extends AnyProcedure> = (
@@ -26,13 +23,11 @@ type DecorateProcedure<TProcedure extends AnyProcedure> = (
 /**
  * @internal
  */
-export type DecoratedProcedureRecord<
-  TProcedures extends ProcedureRouterRecord,
-> = {
-  [TKey in keyof TProcedures]: TProcedures[TKey] extends AnyRouter
-    ? DecoratedProcedureRecord<TProcedures[TKey]['_def']['record']>
-    : TProcedures[TKey] extends AnyProcedure
-    ? DecorateProcedure<TProcedures[TKey]>
+export type DecorateRouterRecord<TRecord extends RouterRecord> = {
+  [TKey in keyof TRecord]: TRecord[TKey] extends AnyProcedure
+    ? DecorateProcedure<TRecord[TKey]>
+    : TRecord[TKey] extends RouterRecord
+    ? DecorateRouterRecord<TRecord[TKey]>
     : never;
 };
 
@@ -41,7 +36,7 @@ export type DecoratedProcedureRecord<
  */
 export type RouterCaller<
   TRoot extends AnyRootTypes,
-  TRecord extends ProcedureRouterRecord,
+  TRecord extends RouterRecord,
 > = (
   /**
    * @note
@@ -49,11 +44,11 @@ export type RouterCaller<
    * e.g. wrapped in `React.cache` to avoid unnecessary computations
    */
   ctx: TRoot['ctx'] | (() => MaybePromise<TRoot['ctx']>),
-) => DecoratedProcedureRecord<TRecord>;
+) => DecorateRouterRecord<TRecord>;
 
 export interface Router<
   TRoot extends AnyRootTypes,
-  TRecord extends ProcedureRouterRecord,
+  TRecord extends RouterRecord,
 > {
   _def: {
     _config: RootConfig<TRoot>;
@@ -71,8 +66,8 @@ export interface Router<
 
 export type BuiltRouter<
   TRoot extends AnyRootTypes,
-  TRecord extends ProcedureRouterRecord,
-> = Router<TRoot, TRecord> & TRecord;
+  TDef extends RouterRecord,
+> = Router<TRoot, TDef> & TDef;
 
 export type AnyRouter = Router<any, any>;
 
@@ -88,33 +83,36 @@ export type inferRouterMeta<TRouter extends AnyRouter> =
 
 export type GetInferenceHelpers<
   TType extends 'input' | 'output',
-  TRouter extends AnyRouter,
+  TRoot extends AnyRootTypes,
+  TRecord extends RouterRecord,
 > = {
-  [TKey in keyof TRouter['_def']['record']]: TRouter['_def']['record'][TKey] extends infer TRouterOrProcedure
-    ? TRouterOrProcedure extends AnyRouter
-      ? GetInferenceHelpers<TType, TRouterOrProcedure>
-      : TRouterOrProcedure extends AnyProcedure
+  [TKey in keyof TRecord]: TRecord[TKey] extends infer $Value
+    ? $Value extends RouterRecord
+      ? GetInferenceHelpers<TType, TRoot, $Value>
+      : $Value extends AnyProcedure
       ? TType extends 'input'
-        ? inferProcedureInput<TRouterOrProcedure>
-        : inferTransformedProcedureOutput<TRouter, TRouterOrProcedure>
+        ? inferProcedureInput<$Value>
+        : inferTransformedProcedureOutput<TRoot, $Value>
       : never
     : never;
 };
 
 export type inferRouterInputs<TRouter extends AnyRouter> = GetInferenceHelpers<
   'input',
-  TRouter
+  TRouter['_def']['_config']['$types'],
+  TRouter['_def']['record']
 >;
 
 export type inferRouterOutputs<TRouter extends AnyRouter> = GetInferenceHelpers<
   'output',
-  TRouter
+  TRouter['_def']['_config']['$types'],
+  TRouter['_def']['record']
 >;
 
 function isRouter(
-  procedureOrRouter: AnyProcedure | AnyRouter,
+  procedureOrRouter: ValueOf<CreateRouterOptions>,
 ): procedureOrRouter is AnyRouter {
-  return 'router' in procedureOrRouter._def;
+  return procedureOrRouter._def && 'router' in procedureOrRouter._def;
 }
 
 const emptyRouter = {
@@ -139,17 +137,39 @@ const reservedWords = [
   'then',
 ];
 
+export type CreateRouterOptions = {
+  [key: string]: AnyProcedure | AnyRouter | CreateRouterOptions;
+};
+
+export type DecorateCreateRouterOptions<
+  TRouterOptions extends CreateRouterOptions,
+> = {
+  [K in keyof TRouterOptions]: TRouterOptions[K] extends infer $Value
+    ? $Value extends AnyProcedure
+      ? $Value
+      : $Value extends Router<any, infer TRecord>
+      ? TRecord
+      : $Value extends CreateRouterOptions
+      ? DecorateCreateRouterOptions<$Value>
+      : never
+    : never;
+};
+
 /**
  * @internal
  */
 export function createRouterFactory<TRoot extends AnyRootTypes>(
   config: RootConfig<TRoot>,
 ) {
-  return function createRouterInner<
-    TProcRouterRecord extends ProcedureRouterRecord,
-  >(procedures: TProcRouterRecord): BuiltRouter<TRoot, TProcRouterRecord> {
+  function createRouterInner<TInput extends RouterRecord>(
+    input: TInput,
+  ): BuiltRouter<TRoot, TInput>;
+  function createRouterInner<TInput extends CreateRouterOptions>(
+    input: TInput,
+  ): BuiltRouter<TRoot, DecorateCreateRouterOptions<TInput>>;
+  function createRouterInner(input: RouterRecord | CreateRouterOptions) {
     const reservedWordsUsed = new Set(
-      Object.keys(procedures).filter((v) => reservedWords.includes(v)),
+      Object.keys(input).filter((v) => reservedWords.includes(v)),
     );
     if (reservedWordsUsed.size > 0) {
       throw new Error(
@@ -158,37 +178,47 @@ export function createRouterFactory<TRoot extends AnyRootTypes>(
       );
     }
 
-    const routerProcedures: ProcedureRecord = omitPrototype({});
-    function recursiveGetPaths(procedures: ProcedureRouterRecord, path = '') {
-      for (const [key, procedureOrRouter] of Object.entries(procedures ?? {})) {
-        const newPath = `${path}${key}`;
+    const procedures: Record<string, AnyProcedure> = omitPrototype({});
 
-        if (isRouter(procedureOrRouter)) {
-          recursiveGetPaths(procedureOrRouter._def.procedures, `${newPath}.`);
+    function step(from: CreateRouterOptions, path: string[] = []) {
+      const aggregate: RouterRecord = omitPrototype({});
+      for (const [key, item] of Object.entries(from ?? {})) {
+        if (isRouter(item)) {
+          aggregate[key] = step(item._def.record, [...path, key]);
+          continue;
+        }
+        if (!isProcedure(item)) {
+          // RouterRecord
+          aggregate[key] = step(item, [...path, key]);
           continue;
         }
 
-        if (routerProcedures[newPath]) {
+        const newPath = [...path, key].join('.');
+
+        if (procedures[newPath]) {
           throw new Error(`Duplicate key: ${newPath}`);
         }
 
-        routerProcedures[newPath] = procedureOrRouter;
+        procedures[newPath] = item;
+        aggregate[key] = item;
       }
+
+      return aggregate;
     }
-    recursiveGetPaths(procedures);
+    const record = step(input);
 
     const _def: AnyRouter['_def'] = {
       _config: config,
       router: true,
-      procedures: routerProcedures,
+      procedures,
       ...emptyRouter,
-      record: procedures,
+      record,
     };
 
-    const router: BuiltRouter<TRoot, TProcRouterRecord> = {
-      ...procedures,
+    return {
+      ...record,
       _def,
-      createCaller(ctx) {
+      createCaller(ctx: TRoot['ctx']) {
         const proxy = createRecursiveProxy(({ path, args }) => {
           const fullPath = path.join('.');
           const procedure = _def.procedures[fullPath] as AnyProcedure;
@@ -204,21 +234,21 @@ export function createRouterFactory<TRoot extends AnyRootTypes>(
         return proxy as ReturnType<RouterCaller<any, any>>;
       },
     };
+  }
 
-    return router;
-  };
+  return createRouterInner;
 }
 
 function isProcedure(
-  procedureOrRouter: AnyProcedure | AnyRouter,
+  procedureOrRouter: ValueOf<CreateRouterOptions>,
 ): procedureOrRouter is AnyProcedure {
-  return !!procedureOrRouter._def.procedure;
+  return typeof procedureOrRouter === 'function';
 }
 /**
  * @internal
  */
 export function callProcedure(
-  opts: ProcedureCallOptions & { procedures: ProcedureRouterRecord },
+  opts: ProcedureCallOptions & { procedures: RouterRecord },
 ) {
   const { type, path } = opts;
   const proc = opts.procedures[path];
@@ -233,7 +263,7 @@ export function callProcedure(
 }
 
 export function createCallerFactory<TRoot extends AnyRootTypes>() {
-  return function createCallerInner<TRecord extends ProcedureRouterRecord>(
+  return function createCallerInner<TRecord extends RouterRecord>(
     router: Router<TRoot, TRecord>,
   ): RouterCaller<TRoot, TRecord> {
     const _def = router._def;
@@ -274,7 +304,7 @@ type MergeRouters<
   TRouters extends AnyRouter[],
   TRoot extends AnyRootTypes = TRouters[0]['_def']['_config']['$types'],
   // eslint-disable-next-line @typescript-eslint/ban-types
-  TRecord extends ProcedureRouterRecord = {},
+  TRecord extends RouterRecord = {},
 > = TRouters extends [
   infer Head extends AnyRouter,
   ...infer Tail extends AnyRouter[],

package/src/unstable-core-do-not-import/rpc/codes.ts

@@ -1,3 +1,4 @@
+import type { ValueOf } from '../types';
 import { invert } from '../utils';
 
 // reference: https://www.jsonrpc.org/specification
@@ -39,6 +40,5 @@ export const TRPC_ERROR_CODES_BY_KEY = {
 
 export const TRPC_ERROR_CODES_BY_NUMBER = invert(TRPC_ERROR_CODES_BY_KEY);
 
-type ValueOf<TObj> = TObj[keyof TObj];
 export type TRPC_ERROR_CODE_NUMBER = ValueOf<typeof TRPC_ERROR_CODES_BY_KEY>;
 export type TRPC_ERROR_CODE_KEY = keyof typeof TRPC_ERROR_CODES_BY_KEY;

package/src/unstable-core-do-not-import/types.ts

@@ -154,3 +154,4 @@ export const ERROR_SYMBOL = Symbol('TypeError');
 export type TypeError<TMessage extends string> = TMessage & {
   _: typeof ERROR_SYMBOL;
 };
+export type ValueOf<TObj> = TObj[keyof TObj];

package/dist/node_modules/.pnpm/@web3-storage_multipart-parser@1.0.0/node_modules/@web3-storage/multipart-parser/esm/src/index.js

@@ -1,203 +0,0 @@
-'use strict';
-
-var search = require('./search.js');
-var utils = require('./utils.js');
-
-const mergeArrays2 = Function.prototype.apply.bind(utils.mergeArrays, undefined);
-const dash = utils.stringToArray('--');
-const CRLF = utils.stringToArray('\r\n');
-function parseContentDisposition(header) {
-  const parts = header.split(';').map(part => part.trim());
-  if (parts.shift() !== 'form-data') {
-    throw new Error('malformed content-disposition header: missing "form-data" in `' + JSON.stringify(parts) + '`');
-  }
-  const out = {};
-  for (const part of parts) {
-    const kv = part.split('=', 2);
-    if (kv.length !== 2) {
-      throw new Error('malformed content-disposition header: key-value pair not found - ' + part + ' in `' + header + '`');
-    }
-    const [name, value] = kv;
-    if (value[0] === '"' && value[value.length - 1] === '"') {
-      out[name] = value.slice(1, -1).replace(/\\"/g, '"');
-    } else if (value[0] !== '"' && value[value.length - 1] !== '"') {
-      out[name] = value;
-    } else if (value[0] === '"' && value[value.length - 1] !== '"' || value[0] !== '"' && value[value.length - 1] === '"') {
-      throw new Error('malformed content-disposition header: mismatched quotations in `' + header + '`');
-    }
-  }
-  if (!out.name) {
-    throw new Error('malformed content-disposition header: missing field name in `' + header + '`');
-  }
-  return out;
-}
-function parsePartHeaders(lines) {
-  const entries = [];
-  let disposition = false;
-  let line;
-  while (typeof (line = lines.shift()) !== 'undefined') {
-    const colon = line.indexOf(':');
-    if (colon === -1) {
-      throw new Error('malformed multipart-form header: missing colon');
-    }
-    const header = line.slice(0, colon).trim().toLowerCase();
-    const value = line.slice(colon + 1).trim();
-    switch (header) {
-    case 'content-disposition':
-      disposition = true;
-      entries.push(...Object.entries(parseContentDisposition(value)));
-      break;
-    case 'content-type':
-      entries.push([
-        'contentType',
-        value
-      ]);
-    }
-  }
-  if (!disposition) {
-    throw new Error('malformed multipart-form header: missing content-disposition');
-  }
-  return Object.fromEntries(entries);
-}
-async function readHeaderLines(it, needle) {
-  let firstChunk = true;
-  let lastTokenWasMatch = false;
-  const headerLines = [[]];
-  const crlfSearch = new search.StreamSearch(CRLF);
-  for (;;) {
-    const result = await it.next();
-    if (result.done) {
-      throw new Error('malformed multipart-form data: unexpected end of stream');
-    }
-    if (firstChunk && result.value !== search.MATCH && utils.arraysEqual(result.value.slice(0, 2), dash)) {
-      return [
-        undefined,
-        new Uint8Array()
-      ];
-    }
-    let chunk;
-    if (result.value !== search.MATCH) {
-      chunk = result.value;
-    } else if (!lastTokenWasMatch) {
-      chunk = needle;
-    } else {
-      throw new Error('malformed multipart-form data: unexpected boundary');
-    }
-    if (!chunk.length) {
-      continue;
-    }
-    if (firstChunk) {
-      firstChunk = false;
-    }
-    const tokens = crlfSearch.feed(chunk);
-    for (const [i, token] of tokens.entries()) {
-      const isMatch = token === search.MATCH;
-      if (!isMatch && !token.length) {
-        continue;
-      }
-      if (lastTokenWasMatch && isMatch) {
-        tokens.push(crlfSearch.end());
-        return [
-          headerLines.filter(chunks => chunks.length).map(mergeArrays2).map(utils.arrayToString),
-          utils.mergeArrays(...tokens.slice(i + 1).map(token => token === search.MATCH ? CRLF : token))
-        ];
-      }
-      if (lastTokenWasMatch = isMatch) {
-        headerLines.push([]);
-      } else {
-        headerLines[headerLines.length - 1].push(token);
-      }
-    }
-  }
-}
-async function* streamMultipart(body, boundary) {
-  const needle = utils.mergeArrays(dash, utils.stringToArray(boundary));
-  const it = new search.ReadableStreamSearch(needle, body)[Symbol.asyncIterator]();
-  for (;;) {
-    const result = await it.next();
-    if (result.done) {
-      return;
-    }
-    if (result.value === search.MATCH) {
-      break;
-    }
-  }
-  const crlfSearch = new search.StreamSearch(CRLF);
-  for (;;) {
-    const [headerLines, tail] = await readHeaderLines(it, needle);
-    if (!headerLines) {
-      return;
-    }
-    async function nextToken() {
-      const result = await it.next();
-      if (result.done) {
-        throw new Error('malformed multipart-form data: unexpected end of stream');
-      }
-      return result;
-    }
-    let trailingCRLF = false;
-    function feedChunk(chunk) {
-      const chunks = [];
-      for (const token of crlfSearch.feed(chunk)) {
-        if (trailingCRLF) {
-          chunks.push(CRLF);
-        }
-        if (!(trailingCRLF = token === search.MATCH)) {
-          chunks.push(token);
-        }
-      }
-      return utils.mergeArrays(...chunks);
-    }
-    let done = false;
-    async function nextChunk() {
-      const result = await nextToken();
-      let chunk;
-      if (result.value !== search.MATCH) {
-        chunk = result.value;
-      } else if (!trailingCRLF) {
-        chunk = CRLF;
-      } else {
-        done = true;
-        return { value: crlfSearch.end() };
-      }
-      return { value: feedChunk(chunk) };
-    }
-    const bufferedChunks = [{ value: feedChunk(tail) }];
-    yield {
-      ...parsePartHeaders(headerLines),
-      data: {
-        [Symbol.asyncIterator]() {
-          return this;
-        },
-        async next() {
-          for (;;) {
-            const result = bufferedChunks.shift();
-            if (!result) {
-              break;
-            }
-            if (result.value.length > 0) {
-              return result;
-            }
-          }
-          for (;;) {
-            if (done) {
-              return {
-                done,
-                value: undefined
-              };
-            }
-            const result = await nextChunk();
-            if (result.value.length > 0) {
-              return result;
-            }
-          }
-        }
-      }
-    };
-    while (!done) {
-      bufferedChunks.push(await nextChunk());
-    }
-  }
-}
-
-exports.streamMultipart = streamMultipart;

package/dist/node_modules/.pnpm/@web3-storage_multipart-parser@1.0.0/node_modules/@web3-storage/multipart-parser/esm/src/index.mjs

@@ -1,201 +0,0 @@
-import { ReadableStreamSearch, MATCH, StreamSearch } from './search.mjs';
-import { mergeArrays, stringToArray, arraysEqual, arrayToString } from './utils.mjs';
-
-const mergeArrays2 = Function.prototype.apply.bind(mergeArrays, undefined);
-const dash = stringToArray('--');
-const CRLF = stringToArray('\r\n');
-function parseContentDisposition(header) {
-  const parts = header.split(';').map(part => part.trim());
-  if (parts.shift() !== 'form-data') {
-    throw new Error('malformed content-disposition header: missing "form-data" in `' + JSON.stringify(parts) + '`');
-  }
-  const out = {};
-  for (const part of parts) {
-    const kv = part.split('=', 2);
-    if (kv.length !== 2) {
-      throw new Error('malformed content-disposition header: key-value pair not found - ' + part + ' in `' + header + '`');
-    }
-    const [name, value] = kv;
-    if (value[0] === '"' && value[value.length - 1] === '"') {
-      out[name] = value.slice(1, -1).replace(/\\"/g, '"');
-    } else if (value[0] !== '"' && value[value.length - 1] !== '"') {
-      out[name] = value;
-    } else if (value[0] === '"' && value[value.length - 1] !== '"' || value[0] !== '"' && value[value.length - 1] === '"') {
-      throw new Error('malformed content-disposition header: mismatched quotations in `' + header + '`');
-    }
-  }
-  if (!out.name) {
-    throw new Error('malformed content-disposition header: missing field name in `' + header + '`');
-  }
-  return out;
-}
-function parsePartHeaders(lines) {
-  const entries = [];
-  let disposition = false;
-  let line;
-  while (typeof (line = lines.shift()) !== 'undefined') {
-    const colon = line.indexOf(':');
-    if (colon === -1) {
-      throw new Error('malformed multipart-form header: missing colon');
-    }
-    const header = line.slice(0, colon).trim().toLowerCase();
-    const value = line.slice(colon + 1).trim();
-    switch (header) {
-    case 'content-disposition':
-      disposition = true;
-      entries.push(...Object.entries(parseContentDisposition(value)));
-      break;
-    case 'content-type':
-      entries.push([
-        'contentType',
-        value
-      ]);
-    }
-  }
-  if (!disposition) {
-    throw new Error('malformed multipart-form header: missing content-disposition');
-  }
-  return Object.fromEntries(entries);
-}
-async function readHeaderLines(it, needle) {
-  let firstChunk = true;
-  let lastTokenWasMatch = false;
-  const headerLines = [[]];
-  const crlfSearch = new StreamSearch(CRLF);
-  for (;;) {
-    const result = await it.next();
-    if (result.done) {
-      throw new Error('malformed multipart-form data: unexpected end of stream');
-    }
-    if (firstChunk && result.value !== MATCH && arraysEqual(result.value.slice(0, 2), dash)) {
-      return [
-        undefined,
-        new Uint8Array()
-      ];
-    }
-    let chunk;
-    if (result.value !== MATCH) {
-      chunk = result.value;
-    } else if (!lastTokenWasMatch) {
-      chunk = needle;
-    } else {
-      throw new Error('malformed multipart-form data: unexpected boundary');
-    }
-    if (!chunk.length) {
-      continue;
-    }
-    if (firstChunk) {
-      firstChunk = false;
-    }
-    const tokens = crlfSearch.feed(chunk);
-    for (const [i, token] of tokens.entries()) {
-      const isMatch = token === MATCH;
-      if (!isMatch && !token.length) {
-        continue;
-      }
-      if (lastTokenWasMatch && isMatch) {
-        tokens.push(crlfSearch.end());
-        return [
-          headerLines.filter(chunks => chunks.length).map(mergeArrays2).map(arrayToString),
-          mergeArrays(...tokens.slice(i + 1).map(token => token === MATCH ? CRLF : token))
-        ];
-      }
-      if (lastTokenWasMatch = isMatch) {
-        headerLines.push([]);
-      } else {
-        headerLines[headerLines.length - 1].push(token);
-      }
-    }
-  }
-}
-async function* streamMultipart(body, boundary) {
-  const needle = mergeArrays(dash, stringToArray(boundary));
-  const it = new ReadableStreamSearch(needle, body)[Symbol.asyncIterator]();
-  for (;;) {
-    const result = await it.next();
-    if (result.done) {
-      return;
-    }
-    if (result.value === MATCH) {
-      break;
-    }
-  }
-  const crlfSearch = new StreamSearch(CRLF);
-  for (;;) {
-    const [headerLines, tail] = await readHeaderLines(it, needle);
-    if (!headerLines) {
-      return;
-    }
-    async function nextToken() {
-      const result = await it.next();
-      if (result.done) {
-        throw new Error('malformed multipart-form data: unexpected end of stream');
-      }
-      return result;
-    }
-    let trailingCRLF = false;
-    function feedChunk(chunk) {
-      const chunks = [];
-      for (const token of crlfSearch.feed(chunk)) {
-        if (trailingCRLF) {
-          chunks.push(CRLF);
-        }
-        if (!(trailingCRLF = token === MATCH)) {
-          chunks.push(token);
-        }
-      }
-      return mergeArrays(...chunks);
-    }
-    let done = false;
-    async function nextChunk() {
-      const result = await nextToken();
-      let chunk;
-      if (result.value !== MATCH) {
-        chunk = result.value;
-      } else if (!trailingCRLF) {
-        chunk = CRLF;
-      } else {
-        done = true;
-        return { value: crlfSearch.end() };
-      }
-      return { value: feedChunk(chunk) };
-    }
-    const bufferedChunks = [{ value: feedChunk(tail) }];
-    yield {
-      ...parsePartHeaders(headerLines),
-      data: {
-        [Symbol.asyncIterator]() {
-          return this;
-        },
-        async next() {
-          for (;;) {
-            const result = bufferedChunks.shift();
-            if (!result) {
-              break;
-            }
-            if (result.value.length > 0) {
-              return result;
-            }
-          }
-          for (;;) {
-            if (done) {
-              return {
-                done,
-                value: undefined
-              };
-            }
-            const result = await nextChunk();
-            if (result.value.length > 0) {
-              return result;
-            }
-          }
-        }
-      }
-    };
-    while (!done) {
-      bufferedChunks.push(await nextChunk());
-    }
-  }
-}
-
-export { streamMultipart };