@stryke/trpc-next 0.5.1 → 0.5.3

package/dist/action-handler.cjs

@@ -6,15 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.createTRPCServerActionHandler = createTRPCServerActionHandler;
 var _server = require("@trpc/next/app-dir/server");
 var _defu = _interopRequireDefault(require("defu"));
-var _headers = require("next/headers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function createTRPCServerActionHandler(e, t = async () => ({})) {
-  return (0, _server.experimental_createServerActionHandler)(e, {
+function createTRPCServerActionHandler(e, t, o = async () => ({})) {
+  return (0, _server.experimental_createServerActionHandler)(t, {
     createContext: async () => {
-      const o = await Promise.resolve(t());
-      return (0, _defu.default)(o, {
+      const r = await Promise.resolve(o());
+      return (0, _defu.default)(r, {
         headers: {
-          cookies: (await (0, _headers.headers)()).get("cookie") ?? ""
+          cookies: (await e()).toString() ?? ""
         }
       });
     }

package/dist/action-handler.d.ts

@@ -1,5 +1,6 @@
 import type { MaybePromise } from "@stryke/types";
 import type { AnyRootTypes, RootConfig } from "@trpc/server/unstable-core-do-not-import";
+import type { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
 import type { BaseContext } from "./types";
 /**
  * This client invokes procedures directly on the server without fetching over HTTP.
@@ -9,7 +10,7 @@ import type { BaseContext } from "./types";
  */
 export declare function createTRPCServerActionHandler<TInstance extends {
     _config: RootConfig<AnyRootTypes>;
-}, TContext extends BaseContext = BaseContext>(t: TInstance, createContext?: () => MaybePromise<TContext>): <TProc extends import("@trpc/server/unstable-core-do-not-import").AnyProcedure>(proc: TProc) => import("@trpc/next/app-dir/server").TRPCActionHandler<{
+}, TContext extends BaseContext = BaseContext>(cookies: () => Promise<ReadonlyRequestCookies>, t: TInstance, createContext?: () => MaybePromise<TContext>): <TProc extends import("@trpc/server/unstable-core-do-not-import").AnyProcedure>(proc: TProc) => import("@trpc/next/app-dir/server").TRPCActionHandler<{
     input: import("@trpc/server/unstable-core-do-not-import").inferProcedureInput<TProc>;
     output: import("@trpc/server/unstable-core-do-not-import").inferProcedureOutput<TProc>;
     errorShape: import("@trpc/server/unstable-core-do-not-import").inferClientTypes<TInstance>["errorShape"];

package/dist/action-handler.mjs

@@ -1 +1 @@
-import{experimental_createServerActionHandler as r}from"@trpc/next/app-dir/server";import n from"defu";import{headers as s}from"next/headers";export function createTRPCServerActionHandler(e,t=async()=>({})){return r(e,{createContext:async()=>{const o=await Promise.resolve(t());return n(o,{headers:{cookies:(await s()).get("cookie")??""}})}})}
+import{experimental_createServerActionHandler as n}from"@trpc/next/app-dir/server";import s from"defu";export function createTRPCServerActionHandler(e,t,o=async()=>({})){return n(t,{createContext:async()=>{const r=await Promise.resolve(o());return s(r,{headers:{cookies:(await e()).toString()??""}})}})}

package/dist/server.cjs

@@ -19,10 +19,9 @@ Object.defineProperty(exports, "redirect", {
 var _client = require("@trpc/client");
 var _nextCache = require("@trpc/next/app-dir/links/nextCache");
 var _server = require("@trpc/next/app-dir/server");
-var _headers = require("next/headers");
 var _shared = require("./shared.cjs");
 var _nextAppDir = require("@trpc/server/adapters/next-app-dir");
-function createTRPCServer(r, t = () => ({})) {
+function createTRPCServer(r, t, o = () => ({})) {
   return (0, _server.experimental_createTRPCNextAppDirServer)({
     config() {
       return {
@@ -30,11 +29,11 @@ function createTRPCServer(r, t = () => ({})) {
           enabled: e => !0
         }), (0, _nextCache.experimental_nextCacheLink)({
           revalidate: 5,
-          router: r,
+          router: t,
           transformer: _shared.transformer,
           createContext: async () => {
-            const e = await Promise.resolve(t());
-            return e.headers ??= {}, e.headers["x-trpc-source"] = "rsc-invoke", e.headers.cookie = (await (0, _headers.cookies)()).toString(), e;
+            const e = await Promise.resolve(o());
+            return e.headers ??= {}, e.headers["x-trpc-source"] = "rsc-invoke", e.headers.cookie = (await r()).toString(), e;
           }
         })]
       };

package/dist/server.d.ts

@@ -3,6 +3,7 @@ import type { Resolver } from "@trpc/client";
 import type { AnyTRPCRouter, inferRouterContext } from "@trpc/server";
 import type { AnyProcedure, AnyRootTypes, inferProcedureInput, inferTransformedProcedureOutput, ProcedureType, RouterRecord } from "@trpc/server/unstable-core-do-not-import";
 import type { ResolverDef } from "@trpc/tanstack-react-query";
+import type { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
 export type DecorateProcedureServer<TType extends ProcedureType, TDef extends ResolverDef> = TType extends "query" ? {
     query: Resolver<TDef>;
     revalidate: (input?: TDef["input"]) => Promise<{
@@ -30,5 +31,5 @@ export type NextAppDirDecorateRouterRecord<TRoot extends AnyRootTypes, TRecord e
  * @param router - The router created by the user
  * @param createContext - An optional function to generate a context
  */
-export declare function createTRPCServer<TRouter extends AnyTRPCRouter, TContext extends inferRouterContext<TRouter>>(router: TRouter, createContext?: () => MaybePromise<TContext>): NextAppDirDecorateRouterRecord<TRouter["_def"]["_config"]["$types"], TRouter["_def"]["record"]>;
+export declare function createTRPCServer<TRouter extends AnyTRPCRouter, TContext extends inferRouterContext<TRouter> = inferRouterContext<TRouter>>(cookies: () => Promise<ReadonlyRequestCookies>, router: TRouter, createContext?: () => MaybePromise<TContext>): NextAppDirDecorateRouterRecord<TRouter["_def"]["_config"]["$types"], TRouter["_def"]["record"]>;
 export { experimental_notFound as notFound, experimental_redirect as redirect } from "@trpc/server/adapters/next-app-dir";

package/dist/server.mjs

@@ -1 +1 @@
-import{loggerLink as o}from"@trpc/client";import{experimental_nextCacheLink as n}from"@trpc/next/app-dir/links/nextCache";import{experimental_createTRPCNextAppDirServer as p}from"@trpc/next/app-dir/server";import{cookies as u}from"next/headers";import{transformer as i}from"./shared";export function createTRPCServer(r,t=()=>({})){return p({config(){return{links:[o({enabled:e=>!0}),n({revalidate:5,router:r,transformer:i,createContext:async()=>{const e=await Promise.resolve(t());return e.headers??={},e.headers["x-trpc-source"]="rsc-invoke",e.headers.cookie=(await u()).toString(),e}})]}}})}export{experimental_notFound as notFound,experimental_redirect as redirect}from"@trpc/server/adapters/next-app-dir";
+import{loggerLink as n}from"@trpc/client";import{experimental_nextCacheLink as s}from"@trpc/next/app-dir/links/nextCache";import{experimental_createTRPCNextAppDirServer as u}from"@trpc/next/app-dir/server";import{transformer as p}from"./shared";export function createTRPCServer(r,t,o=()=>({})){return u({config(){return{links:[n({enabled:e=>!0}),s({revalidate:5,router:t,transformer:p,createContext:async()=>{const e=await Promise.resolve(o());return e.headers??={},e.headers["x-trpc-source"]="rsc-invoke",e.headers.cookie=(await r()).toString(),e}})]}}})}export{experimental_notFound as notFound,experimental_redirect as redirect}from"@trpc/server/adapters/next-app-dir";

package/dist/shared.cjs

@@ -25,7 +25,7 @@ _superjson.default.registerCustom({
   deserialize: e => _polyfill.Temporal.PlainDateTime.from(e)
 }, "Temporal.PlainDateTime");
 const transformer = exports.transformer = _superjson.default,
-  createQueryClient = e => new _reactQuery.QueryClient((0, _defu.default)(e, {
+  createQueryClient = (e = {}) => new _reactQuery.QueryClient((0, _defu.default)(e, {
     defaultOptions: {
       queries: {
         staleTime: 1e3 * 30

package/dist/shared.d.ts

@@ -7,7 +7,7 @@ export declare const transformer: DataTransformer;
 /**
  * Create a TRPC Tanstack Query client.
  *
- * @param config - The query client config
+ * @param queryClientConfig - The query client config
  * @returns The TRPC Tanstack Query client
  */
-export declare const createQueryClient: (config?: Partial<QueryClientConfig>) => QueryClient;
+export declare const createQueryClient: (queryClientConfig?: Partial<QueryClientConfig>) => QueryClient;

package/dist/shared.mjs

@@ -1 +1 @@
-import{Temporal as r}from"@js-temporal/polyfill";import{joinPaths as i}from"@stryke/path/join-paths";import{defaultShouldDehydrateQuery as o,QueryClient as n}from"@tanstack/react-query";import s from"defu";import a from"superjson";export function getTRPCServerUrl(e,t=1){return i(typeof e=="string"?e:e.host||"","api",t?`v${t}`:"","trpc")}a.registerCustom({isApplicable:e=>e instanceof r.PlainDate,serialize:e=>e.toJSON(),deserialize:e=>r.PlainDate.from(e)},"Temporal.PlainDate"),a.registerCustom({isApplicable:e=>e instanceof r.PlainDateTime,serialize:e=>e.toJSON(),deserialize:e=>r.PlainDateTime.from(e)},"Temporal.PlainDateTime");export const transformer=a,createQueryClient=e=>new n(s(e,{defaultOptions:{queries:{staleTime:1e3*30},dehydrate:{shouldDehydrateQuery:t=>o(t)||t.state.status==="pending",serializeData:transformer.serialize},hydrate:{deserializeData:transformer.deserialize}}}));
+import{Temporal as r}from"@js-temporal/polyfill";import{joinPaths as i}from"@stryke/path/join-paths";import{defaultShouldDehydrateQuery as o,QueryClient as n}from"@tanstack/react-query";import s from"defu";import a from"superjson";export function getTRPCServerUrl(e,t=1){return i(typeof e=="string"?e:e.host||"","api",t?`v${t}`:"","trpc")}a.registerCustom({isApplicable:e=>e instanceof r.PlainDate,serialize:e=>e.toJSON(),deserialize:e=>r.PlainDate.from(e)},"Temporal.PlainDate"),a.registerCustom({isApplicable:e=>e instanceof r.PlainDateTime,serialize:e=>e.toJSON(),deserialize:e=>r.PlainDateTime.from(e)},"Temporal.PlainDateTime");export const transformer=a,createQueryClient=(e={})=>new n(s(e,{defaultOptions:{queries:{staleTime:1e3*30},dehydrate:{shouldDehydrateQuery:t=>o(t)||t.state.status==="pending",serializeData:transformer.serialize},hydrate:{deserializeData:transformer.deserialize}}}));

package/dist/tanstack-query/server.cjs

@@ -7,27 +7,26 @@ exports.createTRPCTanstackQueryServer = createTRPCTanstackQueryServer;
 var _reactQuery = require("@tanstack/react-query");
 var _tanstackReactQuery = require("@trpc/tanstack-react-query");
 var _defu = _interopRequireDefault(require("defu"));
-var _headers = require("next/headers");
 var _react = _interopRequireWildcard(require("react"));
 require("server-only");
 var _shared = require("../shared.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function createTRPCTanstackQueryServer(n, i = () => ({}), a) {
-  const c = (0, _react.cache)(async () => {
-      const e = await Promise.resolve(i()),
-        t = new Headers(await (0, _headers.headers)());
+function createTRPCTanstackQueryServer(n, i, a = () => ({}), c = {}) {
+  const s = (0, _react.cache)(async () => {
+      const e = await Promise.resolve(a()),
+        t = new Headers(await n());
       return t.set("x-trpc-source", "rsc"), (0, _defu.default)({
         headers: Object.fromEntries(t)
       }, e);
     }),
-    r = (0, _react.cache)(() => (0, _shared.createQueryClient)(a));
+    r = (0, _react.cache)(() => (0, _shared.createQueryClient)(c));
   return {
     trpc: (0, _tanstackReactQuery.createTRPCOptionsProxy)({
-      router: n,
+      router: i,
       queryClient: r,
-      ctx: c
+      ctx: s
     }),
     HydrateClient: e => {
       const t = (0, _reactQuery.dehydrate)(r());

package/dist/tanstack-query/server.d.ts

@@ -9,10 +9,10 @@ import "server-only";
  *
  * @param router - The TRPC router
  * @param createContext - The context creator function
- * @param config - The query client config
+ * @param queryClientConfig - The query client config
  * @returns The TRPC Tanstack Query server
  */
-export declare function createTRPCTanstackQueryServer<TRouter extends AnyTRPCRouter, TContext extends inferRouterContext<TRouter>>(router: TRouter, createContext?: () => MaybePromise<TContext>, config?: Partial<QueryClientConfig>): {
+export declare function createTRPCTanstackQueryServer<TRouter extends AnyTRPCRouter, TContext extends inferRouterContext<TRouter> = inferRouterContext<TRouter>>(headers: () => Promise<Headers>, router: TRouter, createContext?: () => MaybePromise<TContext>, queryClientConfig?: Partial<QueryClientConfig>): {
     trpc: import("@trpc/tanstack-react-query").TRPCOptionsProxy<TRouter>;
     HydrateClient: (props: {
         children: React.ReactNode;

package/dist/tanstack-query/server.mjs

@@ -1 +1 @@
-import{dehydrate as s,HydrationBoundary as y}from"@tanstack/react-query";import{createTRPCOptionsProxy as p}from"@trpc/tanstack-react-query";import u from"defu";import{headers as m}from"next/headers";import d,{cache as o}from"react";import"server-only";import{createQueryClient as f}from"../shared";export function createTRPCTanstackQueryServer(n,i=()=>({}),a){const c=o(async()=>{const e=await Promise.resolve(i()),t=new Headers(await m());return t.set("x-trpc-source","rsc"),u({headers:Object.fromEntries(t)},e)}),r=o(()=>f(a));return{trpc:p({router:n,queryClient:r,ctx:c}),HydrateClient:e=>{const t=s(r());return d.createElement(y,{state:t},e.children)},prefetch:e=>{const t=r();e.queryKey[1]?.type==="infinite"?t.prefetchInfiniteQuery(e):t.prefetchQuery(e)}}}
+import{dehydrate as y,HydrationBoundary as u}from"@tanstack/react-query";import{createTRPCOptionsProxy as p}from"@trpc/tanstack-react-query";import m from"defu";import C,{cache as o}from"react";import"server-only";import{createQueryClient as d}from"../shared";export function createTRPCTanstackQueryServer(n,i,a=()=>({}),c={}){const s=o(async()=>{const e=await Promise.resolve(a()),t=new Headers(await n());return t.set("x-trpc-source","rsc"),m({headers:Object.fromEntries(t)},e)}),r=o(()=>d(c));return{trpc:p({router:i,queryClient:r,ctx:s}),HydrateClient:e=>{const t=y(r());return C.createElement(u,{state:t},e.children)},prefetch:e=>{const t=r();e.queryKey[1]?.type==="infinite"?t.prefetchInfiniteQuery(e):t.prefetchQuery(e)}}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/trpc-next",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "type": "module",
   "description": "A package to help in using tRPC in modern NextJs applications.",
   "repository": {
@@ -22,10 +22,10 @@
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.0",
     "@tanstack/react-query": "^5.70.0",
-    "@trpc/client": "^11.0.1",
-    "@trpc/next": "^11.0.1",
-    "@trpc/server": "^11.0.1",
-    "@trpc/tanstack-react-query": "^11.0.1",
+    "@trpc/client": "next",
+    "@trpc/next": "next",
+    "@trpc/server": "next",
+    "@trpc/tanstack-react-query": "next",
     "defu": "^6.1.4",
     "server-only": "^0.0.1",
     "superjson": "2.2.2",