feat: use new trpc

src/app/(authenticated)/(dashboard)/[publicId]/audits/page.tsx

@@ -18,7 +18,7 @@ const AuditsPage = async () => {
     return <UnAuthorizedState />;
   }
 
-  const audits = await api.audit.getAudits.query({});
+  const audits = await api.audit.getAudits({});
   return (
     <div className="flex flex-col gap-y-3">
       <div className="flex items-center justify-between gap-y-3 ">

src/app/(authenticated)/(dashboard)/[publicId]/documents/data-rooms/[dataRoomPublicId]/page.tsx

@@ -10,15 +10,15 @@ const DataRoomSettinsPage = async ({
 }: {
   params: { publicId: string; dataRoomPublicId: string };
 }) => {
-  const { dataRoom, documents } = await api.dataRoom.getDataRoom.query({
+  const { dataRoom, documents } = await api.dataRoom.getDataRoom({
     dataRoomPublicId,
     include: {
       company: false,
       recipients: true,
       documents: true,
     },
   });
-  const contacts = await api.common.getContacts.query();
+  const contacts = await api.common.getContacts();
 
   if (!dataRoom) {
     return notFound();

src/app/(authenticated)/(dashboard)/[publicId]/documents/esign/[templatePublicId]/page.tsx

@@ -13,11 +13,10 @@ const EsignTemplateDetailPage = async ({
 }) => {
   const session = await withServerComponentSession();
 
-  const { name, status, url, fields, recipients } =
-    await api.template.get.query({
-      publicId: templatePublicId,
-      isDraftOnly: true,
-    });
+  const { name, status, url, fields, recipients } = await api.template.get({
+    publicId: templatePublicId,
+    isDraftOnly: true,
+  });
 
   return (
     <TemplateFieldProvider recipients={recipients} fields={fields}>

src/app/(authenticated)/(dashboard)/[publicId]/documents/esign/page.tsx

@@ -14,7 +14,7 @@ export const metadata: Metadata = {
 
 const EsignDocumentPage = async () => {
   const session = await withServerComponentSession();
-  const { documents } = await api.template.all.query();
+  const { documents } = await api.template.all();
 
   if (documents.length === 0) {
     return (

src/app/(authenticated)/(dashboard)/[publicId]/documents/esign/v/[templatePublicId]/page.tsx

@@ -22,13 +22,13 @@ export default async function TemplateDetailViewPage({
   const { allow } = await serverAccessControl();
 
   const [{ name, status, url, fields }, auditsData] = await Promise.all([
-    api.template.get.query({
+    api.template.get({
       publicId: templatePublicId,
       isDraftOnly: false,
     }),
 
     allow(
-      api.audit.allEsignAudits.query({
+      api.audit.allEsignAudits({
         templatePublicId: templatePublicId,
       }),
       ["audits", "read"],

src/app/(authenticated)/(dashboard)/[publicId]/documents/page.tsx

@@ -18,10 +18,7 @@ const DocumentsPage = async () => {
   const { allow } = await serverAccessControl();
   const session = await withServerComponentSession();
 
-  const documents = await allow(api.document.getAll.query(), [
-    "documents",
-    "read",
-  ]);
+  const documents = await allow(api.document.getAll(), ["documents", "read"]);
 
   const canUpload = allow(true, ["documents", "read"]);
 

src/app/(authenticated)/(dashboard)/[publicId]/documents/share/_page.tsx

@@ -14,7 +14,7 @@ export const metadata: Metadata = {
 };
 
 const DocumentsPage = async () => {
-  const documents = await api.document.getAll.query();
+  const documents = await api.document.getAll();
   const session = await withServerComponentSession();
 
   if (documents.length === 0) {

src/app/(authenticated)/(dashboard)/[publicId]/fundraise/safes/page.tsx

@@ -12,7 +12,7 @@ export const metadata: Metadata = {
 };
 
 const SafePage = async () => {
-  const safes = await api.safe.getSafes.query();
+  const safes = await api.safe.getSafes();
 
   if (!safes?.data?.length) {
     return (

src/app/(authenticated)/(dashboard)/[publicId]/securities/options/page.tsx

@@ -12,9 +12,9 @@ export const metadata: Metadata = {
 };
 
 const OptionsPage = async () => {
-  const options = await api.securities.getOptions.query();
-  const stakeholders = await api.stakeholder.getStakeholders.query();
-  const equityPlans = await api.equityPlan.getPlans.query();
+  const options = await api.securities.getOptions();
+  const stakeholders = await api.stakeholder.getStakeholders();
+  const equityPlans = await api.equityPlan.getPlans();
 
   if (options?.data?.length === 0) {
     return (

src/app/(authenticated)/(dashboard)/[publicId]/securities/shares/page.tsx

@@ -13,9 +13,9 @@ export const metadata: Metadata = {
 };
 
 const SharesPage = async () => {
-  const shares = await api.securities.getShares.query();
-  const stakeholders = await api.stakeholder.getStakeholders.query();
-  const shareClasses = await api.shareClass.get.query();
+  const shares = await api.securities.getShares();
+  const stakeholders = await api.stakeholder.getStakeholders();
+  const shareClasses = await api.shareClass.get();
 
   if (shares?.data?.length === 0) {
     return (

src/app/(authenticated)/(dashboard)/[publicId]/settings/bank-accounts/page.tsx

@@ -14,7 +14,7 @@ export const metadata: Metadata = {
 const ApiSettingsPage = async () => {
   const { allow } = await serverAccessControl();
 
-  const data = await allow(api.bankAccounts.getAll.query(), [
+  const data = await allow(api.bankAccounts.getAll(), [
     "bank-accounts",
     "read",
   ]);

src/app/(authenticated)/(dashboard)/[publicId]/settings/billing/page.tsx

@@ -8,8 +8,8 @@ export const metadata: Metadata = {
 };
 const BillingPage = async () => {
   const [{ products }, { subscription }] = await Promise.all([
-    api.billing.getProducts.query(),
-    api.billing.getSubscription.query(),
+    api.billing.getProducts(),
+    api.billing.getSubscription(),
   ]);
 
   return (

src/app/(authenticated)/(dashboard)/[publicId]/settings/company/page.tsx

@@ -10,10 +10,7 @@ export const metadata: Metadata = {
 
 const CompanySettingsPage = async () => {
   const { allow } = await serverAccessControl();
-  const data = await allow(api.company.getCompany.query(), [
-    "company",
-    "update",
-  ]);
+  const data = await allow(api.company.getCompany(), ["company", "update"]);
 
   if (!data?.company) {
     return <UnAuthorizedState />;

src/app/(authenticated)/(dashboard)/[publicId]/settings/developer/page.tsx

@@ -11,7 +11,7 @@ export const metadata: Metadata = {
   title: "Developer settings",
 };
 const AccessTokenPage = async () => {
-  const data = await api.accessToken.listAll.query({
+  const data = await api.accessToken.listAll({
     typeEnum: "api",
   });
 

src/app/(authenticated)/(dashboard)/[publicId]/settings/profile/page.tsx

@@ -1,13 +1,13 @@
 import { ProfileSettings } from "@/components/member/member-profile";
 import { api } from "@/trpc/server";
-import { type Metadata } from "next";
+import type { Metadata } from "next";
 
 export const metadata: Metadata = {
   title: "Profile",
 };
 
 const ProfileSettingsPage = async () => {
-  const memberProfile = await api.member.getProfile.query();
+  const memberProfile = await api.member.getProfile();
 
   return <ProfileSettings memberProfile={memberProfile} />;
 };

src/app/(authenticated)/(dashboard)/[publicId]/settings/roles/page.tsx

@@ -8,7 +8,7 @@ import { api } from "@/trpc/server";
 export default async function RolesPage() {
   const { allow } = await serverAccessControl();
 
-  const data = await allow(api.rbac.listRoles.query(), ["roles", "read"]);
+  const data = await allow(api.rbac.listRoles(), ["roles", "read"]);
 
   const canCreate = allow(true, ["roles", "create"]);
 

src/app/(authenticated)/(dashboard)/[publicId]/settings/security/passkey/page.tsx

@@ -10,7 +10,7 @@ export const metadata: Metadata = {
   title: "Security",
 };
 export default async function PasskeyPage() {
-  const passkeys = await api.passkey.find.query();
+  const passkeys = await api.passkey.find();
   return (
     <div className="flex flex-col gap-y-3">
       <div className="flex items-center justify-between gap-y-3 ">

src/app/(authenticated)/(dashboard)/[publicId]/settings/team/page.tsx

@@ -11,8 +11,8 @@ export const metadata: Metadata = {
 
 const TeamMembersPage = async () => {
   const [members, roles] = await Promise.all([
-    api.member.getMembers.query(),
-    api.rbac.listRoles.query(),
+    api.member.getMembers(),
+    api.rbac.listRoles(),
   ]);
   return (
     <div className="flex flex-col gap-y-3">

src/app/(authenticated)/(dashboard)/[publicId]/stakeholders/page.tsx

@@ -17,7 +17,7 @@ const StakeholdersPage = async () => {
   const session = await withServerSession();
 
   const { allow } = await serverAccessControl();
-  const stakeholders = await allow(api.stakeholder.getStakeholders.query(), [
+  const stakeholders = await allow(api.stakeholder.getStakeholders(), [
     "stakeholder",
     "read",
   ]);

src/app/(authenticated)/(dashboard)/[publicId]/updates/page.tsx

@@ -16,7 +16,7 @@ const UpdatesPage = async ({
 }: {
   params: { publicId: string };
 }) => {
-  const updates = await api.update.get.query();
+  const updates = await api.update.get();
 
   if (updates.data.length === 0) {
     return (

src/app/(documents)/esign/[token]/page.tsx

@@ -26,7 +26,7 @@ export default async function SigningPage(props: SigningPageProps) {
     templateId,
     signableFields,
     status: templateStatus,
-  } = await api.template.getSigningFields.query({
+  } = await api.template.getSigningFields({
     token,
   });
 

src/components/dashboard/overview/activities-card.tsx

@@ -16,7 +16,7 @@ type Props = {
 };
 
 const ActivityCard = async ({ className, publicId }: Props) => {
-  const activity = await api.audit.getAudits.query({ take: 4 });
+  const activity = await api.audit.getAudits({ take: 4 });
 
   return (
     <Card className={className}>

src/components/safe/steps/investor-details/index.tsx

@@ -5,6 +5,6 @@ import { InvestorDetailsForm } from "./form";
 export { type TFormSchema } from "./form";
 
 export async function InvestorDetails() {
-  const stakeholders = await api.stakeholder.getStakeholders.query();
+  const stakeholders = await api.stakeholder.getStakeholders();
   return <InvestorDetailsForm stakeholders={stakeholders} />;
 }

src/components/securities/shares/share-modal.tsx

@@ -12,12 +12,12 @@ import { GeneralDetails } from "./steps/general-details";
 import { RelevantDates } from "./steps/relevant-dates";
 
 async function ContributionDetailsStep() {
-  const stakeholders = await api.stakeholder.getStakeholders.query();
+  const stakeholders = await api.stakeholder.getStakeholders();
   return <ContributionDetails stakeholders={stakeholders} />;
 }
 
 async function GeneralDetailsStep() {
-  const shareClasses = await api.shareClass.get.query();
+  const shareClasses = await api.shareClass.get();
   return <GeneralDetails shareClasses={shareClasses} />;
 }
 

src/trpc/api/trpc.ts

@@ -21,6 +21,7 @@ import {
 import { getServerAuthSession } from "@/server/auth";
 import { db } from "@/server/db";
 import * as Sentry from "@sentry/nextjs";
+import { cache } from "react";
 
 interface Meta {
   policies: addPolicyOption;
@@ -38,7 +39,7 @@ interface Meta {
  *
  * @see https://trpc.io/docs/server/context
  */
-export const createTRPCContext = async (opts: { headers: Headers }) => {
+export const createTRPCContext = cache(async (opts: { headers: Headers }) => {
   const session = await getServerAuthSession();
 
   return {
@@ -48,12 +49,11 @@ export const createTRPCContext = async (opts: { headers: Headers }) => {
     userAgent: getUserAgent(opts.headers),
     ...opts,
   };
-};
+});
 
 export type CreateTRPCContextType = Awaited<
   ReturnType<typeof createTRPCContext>
 >;
-
 const withAuthTrpcContext = ({ session, ...rest }: CreateTRPCContextType) => {
   if (!session || !session.user) {
     throw new TRPCError({ code: "UNAUTHORIZED" });
@@ -126,22 +126,12 @@ export type withAccessControlTrpcContextType = ReturnType<
  * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation
  * errors on the backend.
  */
-const t = initTRPC
-  .context<typeof createTRPCContext>()
-  .meta<Meta>()
-  .create({
-    transformer: superjson,
-    errorFormatter({ shape, error }) {
-      return {
-        ...shape,
-        data: {
-          ...shape.data,
-          zodError:
-            error.cause instanceof ZodError ? error.cause.flatten() : null,
-        },
-      };
-    },
-  });
+const t = initTRPC.context<CreateTRPCContextType>().meta<Meta>().create({
+  /**
+   * @see https://trpc.io/docs/server/data-transformers
+   */
+  transformer: superjson,
+});
 
 /**
  * 3. ROUTER & PROCEDURE (THE IMPORTANT BIT)
@@ -155,7 +145,6 @@ const t = initTRPC
  *
  * @see https://trpc.io/docs/router
  */
-export const createTRPCRouter = t.router;
 
 const sentryMiddleware = t.middleware(
   Sentry.trpcMiddleware({
@@ -213,3 +202,6 @@ export const withAccessControl = t.procedure.use(
     });
   }),
 );
+
+export const createTRPCRouter = t.router;
+export const createCallerFactory = t.createCallerFactory;