@trpc/next 10.25.0 → 10.26.0

package/app-dir/client/index.d.ts

@@ -0,0 +1 @@
+export * from '../../dist/app-dir/client';

package/app-dir/client/index.js

@@ -0,0 +1 @@
+module.exports = require('../../dist/app-dir/client');

package/app-dir/server/index.d.ts

@@ -0,0 +1 @@
+export * from '../../dist/app-dir/server';

package/app-dir/server/index.js

@@ -0,0 +1 @@
+module.exports = require('../../dist/app-dir/server');

package/dist/app-dir/client.d.ts

@@ -0,0 +1,9 @@
+import { AnyRouter } from '@trpc/server';
+import { CreateTRPCNextAppRouterOptions, UseProcedureRecord } from './shared';
+export declare function experimental_createTRPCNextAppDirClient<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): import("@trpc/server").ProtectedIntersection<{
+    use: {
+        <TData extends Promise<unknown>[]>(cb: (t: UseProcedureRecord<TRouter>) => [...TData]): { [TKey in keyof TData]: import("@trpc/server").ThenArg<TData[TKey]>; };
+        <TData_1 extends Promise<unknown>>(cb: (t: UseProcedureRecord<TRouter>) => TData_1): import("@trpc/server").ThenArg<TData_1>;
+    };
+}, UseProcedureRecord<TRouter>>;
+//# sourceMappingURL=client.d.ts.map

package/dist/app-dir/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/app-dir/client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAEL,8BAA8B,EAC9B,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAkBlB,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC;;;;;gCA6D9C"}

package/dist/app-dir/client.js

@@ -0,0 +1,75 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var client = require('@trpc/client');
+var shared = require('@trpc/server/shared');
+
+function createUseProxy(client) {
+    return shared.createRecursiveProxy((opts)=>{
+        const path = opts.path.join('.');
+        return client.query(path, ...opts.args);
+    });
+}
+
+function normalizePromiseArray(promise) {
+    if (Array.isArray(promise)) {
+        return Promise.all(promise);
+    }
+    return promise;
+}
+// ts-prune-ignore-next
+function experimental_createTRPCNextAppDirClient(opts) {
+    const client$1 = client.createTRPCUntypedClient(opts.config());
+    const useProxy = createUseProxy(client$1);
+    const cache = new Map();
+    return shared.createFlatProxy((key)=>{
+        if (key === 'use') {
+            return (cb)=>{
+                const promise = normalizePromiseArray(cb(useProxy));
+                throw promise;
+            // const [data, setData] = useState<unknown | unknown[]>();
+            // useEffect(() => {
+            //   const promise = normalizePromiseArray(cb(useProxy));
+            //   void promise.then(setData).catch((err) => {
+            //     throw err;
+            //   });
+            //   // eslint-disable-next-line react-hooks/exhaustive-deps
+            // }, []);
+            // return data;
+            };
+        }
+        return shared.createRecursiveProxy(({ path , args  })=>{
+            const pathCopy = [
+                key,
+                ...path
+            ];
+            const procedureType = client.clientCallTypeToProcedureType(pathCopy.pop());
+            if (procedureType === 'query') {
+                const queryCacheKey = JSON.stringify([
+                    path,
+                    args[0]
+                ]);
+                const cached = cache.get(queryCacheKey);
+                if (cached?.promise) {
+                    return cached.promise;
+                }
+            }
+            const fullPath = pathCopy.join('.');
+            const promise = client$1[procedureType](fullPath, ...args);
+            if (procedureType !== 'query') {
+                return promise;
+            }
+            const queryCacheKey1 = JSON.stringify([
+                path,
+                args[0]
+            ]);
+            cache.set(queryCacheKey1, {
+                promise
+            });
+            return promise;
+        });
+    });
+}
+
+exports.experimental_createTRPCNextAppDirClient = experimental_createTRPCNextAppDirClient;

package/dist/app-dir/client.mjs

@@ -0,0 +1,71 @@
+import { createTRPCUntypedClient, clientCallTypeToProcedureType } from '@trpc/client';
+import { createRecursiveProxy, createFlatProxy } from '@trpc/server/shared';
+
+function createUseProxy(client) {
+    return createRecursiveProxy((opts)=>{
+        const path = opts.path.join('.');
+        return client.query(path, ...opts.args);
+    });
+}
+
+function normalizePromiseArray(promise) {
+    if (Array.isArray(promise)) {
+        return Promise.all(promise);
+    }
+    return promise;
+}
+// ts-prune-ignore-next
+function experimental_createTRPCNextAppDirClient(opts) {
+    const client = createTRPCUntypedClient(opts.config());
+    const useProxy = createUseProxy(client);
+    const cache = new Map();
+    return createFlatProxy((key)=>{
+        if (key === 'use') {
+            return (cb)=>{
+                const promise = normalizePromiseArray(cb(useProxy));
+                throw promise;
+            // const [data, setData] = useState<unknown | unknown[]>();
+            // useEffect(() => {
+            //   const promise = normalizePromiseArray(cb(useProxy));
+            //   void promise.then(setData).catch((err) => {
+            //     throw err;
+            //   });
+            //   // eslint-disable-next-line react-hooks/exhaustive-deps
+            // }, []);
+            // return data;
+            };
+        }
+        return createRecursiveProxy(({ path , args  })=>{
+            const pathCopy = [
+                key,
+                ...path
+            ];
+            const procedureType = clientCallTypeToProcedureType(pathCopy.pop());
+            if (procedureType === 'query') {
+                const queryCacheKey = JSON.stringify([
+                    path,
+                    args[0]
+                ]);
+                const cached = cache.get(queryCacheKey);
+                if (cached?.promise) {
+                    return cached.promise;
+                }
+            }
+            const fullPath = pathCopy.join('.');
+            const promise = client[procedureType](fullPath, ...args);
+            if (procedureType !== 'query') {
+                return promise;
+            }
+            const queryCacheKey1 = JSON.stringify([
+                path,
+                args[0]
+            ]);
+            cache.set(queryCacheKey1, {
+                promise
+            });
+            return promise;
+        });
+    });
+}
+
+export { experimental_createTRPCNextAppDirClient };

package/dist/app-dir/server.d.ts

@@ -0,0 +1,5 @@
+import { CreateTRPCProxyClient } from '@trpc/client';
+import { AnyRouter } from '@trpc/server';
+import { CreateTRPCNextAppRouterOptions } from './shared';
+export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): CreateTRPCProxyClient<TRouter>;
+//# sourceMappingURL=server.d.ts.map

package/dist/app-dir/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,qBAAqB,EAGtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAG1D,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,kCAkB9C"}

package/dist/app-dir/server.js

@@ -0,0 +1,28 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var client = require('@trpc/client');
+var shared = require('@trpc/server/shared');
+var React = require('react');
+
+/// <reference types="next" />
+// ts-prune-ignore-next
+function experimental_createTRPCNextAppDirServer(opts) {
+    const getClient = React.cache(()=>{
+        const config = opts.config();
+        return client.createTRPCUntypedClient(config);
+    });
+    return shared.createRecursiveProxy((callOpts)=>{
+        // lazily initialize client
+        const client$1 = getClient();
+        const pathCopy = [
+            ...callOpts.path
+        ];
+        const procedureType = client.clientCallTypeToProcedureType(pathCopy.pop());
+        const fullPath = pathCopy.join('.');
+        return client$1[procedureType](fullPath, ...callOpts.args);
+    });
+}
+
+exports.experimental_createTRPCNextAppDirServer = experimental_createTRPCNextAppDirServer;

package/dist/app-dir/server.mjs

@@ -0,0 +1,24 @@
+import { createTRPCUntypedClient, clientCallTypeToProcedureType } from '@trpc/client';
+import { createRecursiveProxy } from '@trpc/server/shared';
+import { cache } from 'react';
+
+/// <reference types="next" />
+// ts-prune-ignore-next
+function experimental_createTRPCNextAppDirServer(opts) {
+    const getClient = cache(()=>{
+        const config = opts.config();
+        return createTRPCUntypedClient(config);
+    });
+    return createRecursiveProxy((callOpts)=>{
+        // lazily initialize client
+        const client = getClient();
+        const pathCopy = [
+            ...callOpts.path
+        ];
+        const procedureType = clientCallTypeToProcedureType(pathCopy.pop());
+        const fullPath = pathCopy.join('.');
+        return client[procedureType](fullPath, ...callOpts.args);
+    });
+}
+
+export { experimental_createTRPCNextAppDirServer };

package/dist/app-dir/shared.d.ts

@@ -0,0 +1,27 @@
+import { CreateTRPCClientOptions, Resolver, TRPCUntypedClient } from '@trpc/client';
+import { AnyQueryProcedure, AnyRouter, Filter, ProtectedIntersection, ThenArg } from '@trpc/server';
+/**
+ * @internal
+ */
+export declare type UseProcedureRecord<TRouter extends AnyRouter> = {
+    [TKey in keyof Filter<TRouter['_def']['record'], AnyRouter | AnyQueryProcedure>]: TRouter['_def']['record'][TKey] extends AnyRouter ? UseProcedureRecord<TRouter['_def']['record'][TKey]> : Resolver<TRouter['_def']['record'][TKey]>;
+};
+export declare function createUseProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): UseProcedureRecord<TRouter>;
+declare type NextAppRouterUse<TRouter extends AnyRouter> = {
+    <TData extends Promise<unknown>[]>(cb: (t: UseProcedureRecord<TRouter>) => [...TData]): {
+        [TKey in keyof TData]: ThenArg<TData[TKey]>;
+    };
+    <TData extends Promise<unknown>>(cb: (t: UseProcedureRecord<TRouter>) => TData): ThenArg<TData>;
+};
+declare type CreateTRPCNextAppRouterBase<TRouter extends AnyRouter> = {
+    use: NextAppRouterUse<TRouter>;
+};
+export declare type CreateTRPCNextAppRouter<TRouter extends AnyRouter> = ProtectedIntersection<CreateTRPCNextAppRouterBase<TRouter>, UseProcedureRecord<TRouter>>;
+/**
+ * @internal
+ */
+export interface CreateTRPCNextAppRouterOptions<TRouter extends AnyRouter> {
+    config: () => CreateTRPCClientOptions<TRouter>;
+}
+export {};
+//# sourceMappingURL=shared.d.ts.map

package/dist/app-dir/shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/app-dir/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,qBAAqB,EACrB,OAAO,EACR,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,oBAAY,kBAAkB,CAAC,OAAO,SAAS,SAAS,IAAI;KACzD,IAAI,IAAI,MAAM,MAAM,CACnB,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,SAAS,GAAG,iBAAiB,CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GACjD,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,GACnD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,SAAS,SAAS,EACtD,MAAM,EAAE,iBAAiB,CAAC,OAAO,CAAC,+BAOnC;AAED,aAAK,gBAAgB,CAAC,OAAO,SAAS,SAAS,IAAI;IACjD,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAAE,EAC/B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GACjD;SACA,IAAI,IAAI,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KAC5C,CAAC;IACF,CAAC,KAAK,SAAS,OAAO,CAAC,OAAO,CAAC,EAC7B,EAAE,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,KAAK,GAC5C,OAAO,CAAC,KAAK,CAAC,CAAC;CACnB,CAAC;AACF,aAAK,2BAA2B,CAAC,OAAO,SAAS,SAAS,IAAI;IAC5D,GAAG,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;CAChC,CAAC;AACF,oBAAY,uBAAuB,CAAC,OAAO,SAAS,SAAS,IAC3D,qBAAqB,CACnB,2BAA2B,CAAC,OAAO,CAAC,EACpC,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;AAEJ;;GAEG;AACH,MAAM,WAAW,8BAA8B,CAAC,OAAO,SAAS,SAAS;IACvE,MAAM,EAAE,MAAM,uBAAuB,CAAC,OAAO,CAAC,CAAC;CAChD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/next",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "The tRPC Next.js library",
   "author": "KATT",
   "license": "MIT",
@@ -34,19 +34,30 @@
       "import": "./dist/index.mjs",
       "require": "./dist/index.js",
       "default": "./dist/index.js"
+    },
+    "./app-dir/server": {
+      "import": "./dist/app-dir/server.mjs",
+      "require": "./dist/app-dir/server.js",
+      "default": "./dist/app-dir/server.js"
+    },
+    "./app-dir/client": {
+      "import": "./dist/app-dir/client.mjs",
+      "require": "./dist/app-dir/client.js",
+      "default": "./dist/app-dir/client.js"
     }
   },
   "files": [
     "dist",
     "src",
     "README.md",
-    "package.json"
+    "package.json",
+    "app-dir"
   ],
   "peerDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.25.0",
-    "@trpc/react-query": "10.25.0",
-    "@trpc/server": "10.25.0",
+    "@trpc/client": "10.26.0",
+    "@trpc/react-query": "10.26.0",
+    "@trpc/server": "10.26.0",
     "next": "*",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
@@ -56,24 +67,24 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.25.0",
-    "@trpc/react-query": "10.25.0",
-    "@trpc/server": "10.25.0",
-    "@types/express": "^4.17.12",
+    "@trpc/client": "10.26.0",
+    "@trpc/react-query": "10.26.0",
+    "@trpc/server": "10.26.0",
+    "@types/express": "^4.17.17",
     "@types/node": "^18.7.20",
-    "@types/react": "^18.0.9",
-    "@types/react-dom": "^18.0.5",
-    "eslint": "^8.30.0",
+    "@types/react": "^18.2.6",
+    "@types/react-dom": "^18.2.4",
+    "eslint": "^8.40.0",
     "express": "^4.17.1",
-    "next": "^13.2.1",
+    "next": "^13.3.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rollup": "^2.79.1",
-    "tsx": "^3.12.3",
+    "tsx": "^3.12.7",
     "zod": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "58764a39f45299cd1b99af47d4a27ace46698555"
+  "gitHead": "877c5b499676e21e7ebdf79eacde300ffc03325d"
 }

package/src/app-dir/client.ts

@@ -0,0 +1,93 @@
+import {
+  clientCallTypeToProcedureType,
+  createTRPCUntypedClient,
+} from '@trpc/client';
+import { AnyRouter } from '@trpc/server';
+import { createFlatProxy, createRecursiveProxy } from '@trpc/server/shared';
+import {
+  CreateTRPCNextAppRouter,
+  CreateTRPCNextAppRouterOptions,
+  UseProcedureRecord,
+  createUseProxy,
+} from './shared';
+
+function normalizePromiseArray<TValue>(
+  promise: Promise<TValue> | Promise<TValue>[],
+) {
+  if (Array.isArray(promise)) {
+    return Promise.all(promise);
+  }
+  return promise;
+}
+
+type QueryResult = {
+  data?: unknown;
+  error?: unknown;
+  promise?: Promise<unknown>;
+};
+
+// ts-prune-ignore-next
+export function experimental_createTRPCNextAppDirClient<
+  TRouter extends AnyRouter,
+>(opts: CreateTRPCNextAppRouterOptions<TRouter>) {
+  const client = createTRPCUntypedClient<TRouter>(opts.config());
+  const useProxy = createUseProxy<TRouter>(client);
+
+  const cache = new Map<string, QueryResult>();
+  return createFlatProxy<CreateTRPCNextAppRouter<TRouter>>((key) => {
+    if (key === 'use') {
+      return (
+        cb: (
+          t: UseProcedureRecord<TRouter>,
+        ) => Promise<unknown> | Promise<unknown>[],
+      ) => {
+        const promise = normalizePromiseArray(cb(useProxy));
+        throw promise;
+        // const [data, setData] = useState<unknown | unknown[]>();
+
+        // useEffect(() => {
+        //   const promise = normalizePromiseArray(cb(useProxy));
+
+        //   void promise.then(setData).catch((err) => {
+        //     throw err;
+        //   });
+        //   // eslint-disable-next-line react-hooks/exhaustive-deps
+        // }, []);
+
+        // return data;
+      };
+    }
+
+    return createRecursiveProxy(({ path, args }) => {
+      const pathCopy = [key, ...path];
+      const procedureType = clientCallTypeToProcedureType(pathCopy.pop()!);
+
+      if (procedureType === 'query') {
+        const queryCacheKey = JSON.stringify([path, args[0]]);
+        const cached = cache.get(queryCacheKey);
+
+        if (cached?.promise) {
+          return cached.promise;
+        }
+      }
+
+      const fullPath = pathCopy.join('.');
+
+      const promise: Promise<unknown> = (client as any)[procedureType](
+        fullPath,
+        ...args,
+      );
+      if (procedureType !== 'query') {
+        return promise;
+      }
+
+      const queryCacheKey = JSON.stringify([path, args[0]]);
+
+      cache.set(queryCacheKey, {
+        promise,
+      });
+
+      return promise;
+    });
+  });
+}

package/src/app-dir/server.ts

@@ -0,0 +1,34 @@
+/// <reference types="next" />
+
+import {
+  CreateTRPCProxyClient,
+  clientCallTypeToProcedureType,
+  createTRPCUntypedClient,
+} from '@trpc/client';
+import { AnyRouter } from '@trpc/server';
+import { createRecursiveProxy } from '@trpc/server/shared';
+import { cache } from 'react';
+import { CreateTRPCNextAppRouterOptions } from './shared';
+
+// ts-prune-ignore-next
+export function experimental_createTRPCNextAppDirServer<
+  TRouter extends AnyRouter,
+>(opts: CreateTRPCNextAppRouterOptions<TRouter>) {
+  const getClient = cache(() => {
+    const config = opts.config();
+    return createTRPCUntypedClient(config);
+  });
+
+  return createRecursiveProxy((callOpts) => {
+    // lazily initialize client
+    const client = getClient();
+
+    const pathCopy = [...callOpts.path];
+    const procedureType = clientCallTypeToProcedureType(
+      pathCopy.pop() as string,
+    );
+    const fullPath = pathCopy.join('.');
+
+    return (client[procedureType] as any)(fullPath, ...callOpts.args);
+  }) as CreateTRPCProxyClient<TRouter>;
+}

package/src/app-dir/shared.ts

@@ -0,0 +1,61 @@
+import {
+  CreateTRPCClientOptions,
+  Resolver,
+  TRPCUntypedClient,
+} from '@trpc/client';
+import {
+  AnyQueryProcedure,
+  AnyRouter,
+  Filter,
+  ProtectedIntersection,
+  ThenArg,
+} from '@trpc/server';
+import { createRecursiveProxy } from '@trpc/server/shared';
+
+/**
+ * @internal
+ */
+export type UseProcedureRecord<TRouter extends AnyRouter> = {
+  [TKey in keyof Filter<
+    TRouter['_def']['record'],
+    AnyRouter | AnyQueryProcedure
+  >]: TRouter['_def']['record'][TKey] extends AnyRouter
+    ? UseProcedureRecord<TRouter['_def']['record'][TKey]>
+    : Resolver<TRouter['_def']['record'][TKey]>;
+};
+
+export function createUseProxy<TRouter extends AnyRouter>(
+  client: TRPCUntypedClient<TRouter>,
+) {
+  return createRecursiveProxy((opts) => {
+    const path = opts.path.join('.');
+
+    return client.query(path, ...opts.args);
+  }) as UseProcedureRecord<TRouter>;
+}
+
+type NextAppRouterUse<TRouter extends AnyRouter> = {
+  <TData extends Promise<unknown>[]>(
+    cb: (t: UseProcedureRecord<TRouter>) => [...TData],
+  ): {
+    [TKey in keyof TData]: ThenArg<TData[TKey]>;
+  };
+  <TData extends Promise<unknown>>(
+    cb: (t: UseProcedureRecord<TRouter>) => TData,
+  ): ThenArg<TData>;
+};
+type CreateTRPCNextAppRouterBase<TRouter extends AnyRouter> = {
+  use: NextAppRouterUse<TRouter>;
+};
+export type CreateTRPCNextAppRouter<TRouter extends AnyRouter> =
+  ProtectedIntersection<
+    CreateTRPCNextAppRouterBase<TRouter>,
+    UseProcedureRecord<TRouter>
+  >;
+
+/**
+ * @internal
+ */
+export interface CreateTRPCNextAppRouterOptions<TRouter extends AnyRouter> {
+  config: () => CreateTRPCClientOptions<TRouter>;
+}