@trpc/next 10.26.0 → 10.27.0

package/dist/app-dir/server.js

@@ -3,8 +3,41 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var client = require('@trpc/client');
+var server = require('@trpc/server');
 var shared = require('@trpc/server/shared');
 var React = require('react');
+var shared$1 = require('../shared-2ca37369.js');
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */ function set(obj, path, value) {
+    if (typeof path === 'string') {
+        path = path.split(/[\.\[\]]/).filter(Boolean);
+    }
+    if (path.length > 1) {
+        const p = path.shift();
+        const isArrayIndex = /^\d+$/.test(path[0]);
+        obj[p] = obj[p] || (isArrayIndex ? [] : {});
+        set(obj[p], path, value);
+        return;
+    }
+    const p1 = path[0];
+    if (obj[p1] === undefined) {
+        obj[p1] = value;
+    } else if (Array.isArray(obj[p1])) {
+        obj[p1].push(value);
+    } else {
+        obj[p1] = [
+            obj[p1],
+            value
+        ];
+    }
+}
+function formDataToObject(formData) {
+    const obj = {};
+    for (const [key, value] of formData.entries()){
+        set(obj, key, value);
+    }
+    return obj;
+}
 
 /// <reference types="next" />
 // ts-prune-ignore-next
@@ -24,5 +57,60 @@ function experimental_createTRPCNextAppDirServer(opts) {
         return client$1[procedureType](fullPath, ...callOpts.args);
     });
 }
+function experimental_createServerActionHandler(t, opts) {
+    const config = t._config;
+    const { normalizeFormData =true , createContext  } = opts;
+    const transformer = config.transformer;
+    // TODO allow this to take a `TRouter` in addition to a `AnyProcedure`
+    return function createServerAction(proc) {
+        return async function actionHandler(rawInput) {
+            const ctx = undefined;
+            try {
+                const ctx1 = await createContext();
+                if (normalizeFormData && shared$1.isFormData(rawInput)) {
+                    // Normalizes formdata so we can use `z.object({})` etc on the server
+                    try {
+                        rawInput = formDataToObject(rawInput);
+                    } catch  {
+                        throw new server.TRPCError({
+                            code: 'INTERNAL_SERVER_ERROR',
+                            message: 'Failed to convert FormData to an object'
+                        });
+                    }
+                } else if (rawInput && !shared$1.isFormData(rawInput)) {
+                    rawInput = transformer.input.deserialize(rawInput);
+                }
+                const data = await proc({
+                    input: undefined,
+                    ctx: ctx1,
+                    path: 'serverAction',
+                    rawInput,
+                    type: proc._type
+                });
+                const transformedJSON = shared.transformTRPCResponse(config, {
+                    result: {
+                        data
+                    }
+                });
+                return transformedJSON;
+            } catch (cause) {
+                const error = server.getTRPCErrorFromUnknown(cause);
+                const shape = shared.getErrorShape({
+                    config,
+                    ctx,
+                    error,
+                    input: rawInput,
+                    path: 'serverAction',
+                    type: proc._type
+                });
+                // TODO: send the right HTTP header?!
+                return shared.transformTRPCResponse(t._config, {
+                    error: shape
+                });
+            }
+        };
+    };
+}
 
+exports.experimental_createServerActionHandler = experimental_createServerActionHandler;
 exports.experimental_createTRPCNextAppDirServer = experimental_createTRPCNextAppDirServer;

package/dist/app-dir/server.mjs

@@ -1,6 +1,39 @@
 import { createTRPCUntypedClient, clientCallTypeToProcedureType } from '@trpc/client';
-import { createRecursiveProxy } from '@trpc/server/shared';
+import { TRPCError, getTRPCErrorFromUnknown } from '@trpc/server';
+import { createRecursiveProxy, transformTRPCResponse, getErrorShape } from '@trpc/server/shared';
 import { cache } from 'react';
+import { i as isFormData } from '../shared-59b269d5.mjs';
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */ function set(obj, path, value) {
+    if (typeof path === 'string') {
+        path = path.split(/[\.\[\]]/).filter(Boolean);
+    }
+    if (path.length > 1) {
+        const p = path.shift();
+        const isArrayIndex = /^\d+$/.test(path[0]);
+        obj[p] = obj[p] || (isArrayIndex ? [] : {});
+        set(obj[p], path, value);
+        return;
+    }
+    const p1 = path[0];
+    if (obj[p1] === undefined) {
+        obj[p1] = value;
+    } else if (Array.isArray(obj[p1])) {
+        obj[p1].push(value);
+    } else {
+        obj[p1] = [
+            obj[p1],
+            value
+        ];
+    }
+}
+function formDataToObject(formData) {
+    const obj = {};
+    for (const [key, value] of formData.entries()){
+        set(obj, key, value);
+    }
+    return obj;
+}
 
 /// <reference types="next" />
 // ts-prune-ignore-next
@@ -20,5 +53,59 @@ function experimental_createTRPCNextAppDirServer(opts) {
         return client[procedureType](fullPath, ...callOpts.args);
     });
 }
+function experimental_createServerActionHandler(t, opts) {
+    const config = t._config;
+    const { normalizeFormData =true , createContext  } = opts;
+    const transformer = config.transformer;
+    // TODO allow this to take a `TRouter` in addition to a `AnyProcedure`
+    return function createServerAction(proc) {
+        return async function actionHandler(rawInput) {
+            const ctx = undefined;
+            try {
+                const ctx1 = await createContext();
+                if (normalizeFormData && isFormData(rawInput)) {
+                    // Normalizes formdata so we can use `z.object({})` etc on the server
+                    try {
+                        rawInput = formDataToObject(rawInput);
+                    } catch  {
+                        throw new TRPCError({
+                            code: 'INTERNAL_SERVER_ERROR',
+                            message: 'Failed to convert FormData to an object'
+                        });
+                    }
+                } else if (rawInput && !isFormData(rawInput)) {
+                    rawInput = transformer.input.deserialize(rawInput);
+                }
+                const data = await proc({
+                    input: undefined,
+                    ctx: ctx1,
+                    path: 'serverAction',
+                    rawInput,
+                    type: proc._type
+                });
+                const transformedJSON = transformTRPCResponse(config, {
+                    result: {
+                        data
+                    }
+                });
+                return transformedJSON;
+            } catch (cause) {
+                const error = getTRPCErrorFromUnknown(cause);
+                const shape = getErrorShape({
+                    config,
+                    ctx,
+                    error,
+                    input: rawInput,
+                    path: 'serverAction',
+                    type: proc._type
+                });
+                // TODO: send the right HTTP header?!
+                return transformTRPCResponse(t._config, {
+                    error: shape
+                });
+            }
+        };
+    };
+}
 
-export { experimental_createTRPCNextAppDirServer };
+export { experimental_createServerActionHandler, experimental_createTRPCNextAppDirServer };

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

@@ -1,5 +1,5 @@
 import { CreateTRPCClientOptions, Resolver, TRPCUntypedClient } from '@trpc/client';
-import { AnyQueryProcedure, AnyRouter, Filter, ProtectedIntersection, ThenArg } from '@trpc/server';
+import { AnyProcedure, AnyQueryProcedure, AnyRouter, Filter, ProtectedIntersection, ThenArg, inferHandlerInput } from '@trpc/server';
 /**
  * @internal
  */
@@ -23,5 +23,25 @@ export declare type CreateTRPCNextAppRouter<TRouter extends AnyRouter> = Protect
 export interface CreateTRPCNextAppRouterOptions<TRouter extends AnyRouter> {
     config: () => CreateTRPCClientOptions<TRouter>;
 }
+/**
+ * @internal
+ */
+export declare function isFormData(value: unknown): value is FormData;
+/**
+ * @internal
+ */
+export interface ActionHandlerDef {
+    input?: any;
+    output?: any;
+    errorShape: any;
+}
+/**
+ * @internal
+ */
+export declare type inferActionDef<TProc extends AnyProcedure> = {
+    input: inferHandlerInput<TProc>[0];
+    output: TProc['_def']['_output_out'];
+    errorShape: TProc['_def']['_config']['$types']['errorShape'];
+};
 export {};
 //# sourceMappingURL=shared.d.ts.map

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

@@ -1 +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"}
+{"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,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,MAAM,EACN,qBAAqB,EACrB,OAAO,EACP,iBAAiB,EAClB,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;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAM5D;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;CACjB;AAGD;;GAEG;AACH,oBAAY,cAAc,CAAC,KAAK,SAAS,YAAY,IAAI;IACvD,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC;IACrC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;CAC9D,CAAC"}

package/dist/shared-2ca37369.js

@@ -0,0 +1,15 @@
+'use strict';
+
+require('@trpc/server/shared');
+
+/**
+ * @internal
+ */ function isFormData(value) {
+    if (typeof FormData === 'undefined') {
+        // FormData is not supported
+        return false;
+    }
+    return value instanceof FormData;
+}
+
+exports.isFormData = isFormData;

package/dist/shared-59b269d5.mjs

@@ -0,0 +1,13 @@
+import '@trpc/server/shared';
+
+/**
+ * @internal
+ */ function isFormData(value) {
+    if (typeof FormData === 'undefined') {
+        // FormData is not supported
+        return false;
+    }
+    return value instanceof FormData;
+}
+
+export { isFormData as i };

package/dist/shared-bc6a2699.js

@@ -0,0 +1,14 @@
+import '@trpc/server/shared';
+
+/**
+ * @internal
+ */
+function isFormData(value) {
+    if (typeof FormData === 'undefined') {
+        // FormData is not supported
+        return false;
+    }
+    return value instanceof FormData;
+}
+
+export { isFormData as i };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/next",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "The tRPC Next.js library",
   "author": "KATT",
   "license": "MIT",
@@ -55,10 +55,10 @@
   ],
   "peerDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.26.0",
-    "@trpc/react-query": "10.26.0",
-    "@trpc/server": "10.26.0",
-    "next": "*",
+    "@trpc/client": "10.27.0",
+    "@trpc/react-query": "10.27.0",
+    "@trpc/server": "10.27.0",
+    "next": "13.4.3",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
   },
@@ -67,16 +67,16 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^4.18.0",
-    "@trpc/client": "10.26.0",
-    "@trpc/react-query": "10.26.0",
-    "@trpc/server": "10.26.0",
+    "@trpc/client": "10.27.0",
+    "@trpc/react-query": "10.27.0",
+    "@trpc/server": "10.27.0",
     "@types/express": "^4.17.17",
     "@types/node": "^18.7.20",
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "eslint": "^8.40.0",
     "express": "^4.17.1",
-    "next": "^13.3.4",
+    "next": "^13.4.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rollup": "^2.79.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "877c5b499676e21e7ebdf79eacde300ffc03325d"
+  "gitHead": "e6c8ff151ba15273361e9df233fe17b7d0f6db36"
 }