fixes

Author: crowlKats

auth.ts

@@ -9,9 +9,9 @@ import {
   httpSubscriptionLink,
   retryLink,
   splitLink,
-  type TRPCClient as OriginalTRPCClient,
   TRPCClientError,
   type TRPCLink,
+  type TRPCUntypedClient,
 } from "@trpc/client";
 import { observable } from "@trpc/server/observable";
 import { Spinner } from "@std/cli/unstable-spinner";
@@ -20,7 +20,7 @@ import { EventSourcePolyfill } from "event-source-polyfill";
 import type { GlobalContext } from "./main.ts";
 
 // deno-lint-ignore no-explicit-any
-export type TRPCClient = OriginalTRPCClient<any>;
+export type TRPCClient = TRPCUntypedClient<any>;
 
 export function createTrpcClient(
   context: GlobalContext,

deploy/create/flow.ts

@@ -65,12 +65,11 @@ export async function createFlow(
   const trpcClient = createTrpcClient(context);
 
   let org;
-  const orgs: Array<{
+  const orgs = await trpcClient.query("orgs.list") as Array<{
     name: string;
     slug: string;
     id: string;
-    // deno-lint-ignore no-explicit-any
-  }> = await (trpcClient.orgs as any).list.query();
+  }>;
 
   if (orgs.length === 1) {
     org = orgs[0].slug;
@@ -451,11 +450,10 @@ async function github(
   context: GlobalContext,
   trpcClient: TRPCClient,
 ) {
-  const owners: Array<{
+  const owners = await trpcClient.query("github.listOrgsForUser") as Array<{
     id: number;
     login: string;
-    // deno-lint-ignore no-explicit-any
-  }> = await (trpcClient.github as any).listOrgsForUser.query();
+  }>;
 
   const selectedOwner = promptSelect(
     "Select a github owner:",
@@ -470,13 +468,15 @@ async function github(
   }
   logTitle(TITLES.githubOwner, selectedOwner.value.login);
 
-  const repos: Array<{
+  const repos = await trpcClient.query(
+    "github.listReposInInstallationForUser",
+    {
+      installation_id: selectedOwner.value.id,
+    },
+  ) as Array<{
     id: number;
     name: string;
-    // deno-lint-ignore no-explicit-any
-  }> = await (trpcClient.github as any).listReposInInstallationForUser.query({
-    installation_id: selectedOwner.value.id,
-  });
+  }>;
 
   const selectedRepo = promptSelect(
     "Select a github repo:",
@@ -491,12 +491,13 @@ async function github(
   }
   logTitle(TITLES.githubRepo, selectedRepo.value.name);
 
-  const appDirectories: WorkspaceDetectionResult =
-    // deno-lint-ignore no-explicit-any
-    await (trpcClient.github as any).detectWorkspaceForRepo.query({
+  const appDirectories = await trpcClient.query(
+    "github.detectWorkspaceForRepo",
+    {
       owner: selectedOwner.value.login,
       repo: selectedRepo.value.name,
-    });
+    },
+  ) as WorkspaceDetectionResult;
 
   return {
     appDirectories,

deploy/create/mod.ts

@@ -213,9 +213,10 @@ export const createCommand = new Command<GlobalContext>()
         };
 
         const trpcClient = createTrpcClient(options);
-        // deno-lint-ignore no-explicit-any
-        appDirectories = await (trpcClient.github as any).detectWorkspaceForRepo
-          .query(repo);
+        appDirectories = await trpcClient.query(
+          "github.detectWorkspaceForRepo",
+          repo,
+        ) as WorkspaceDetectionResult;
       } else {
         appDirectories = await detectWorkspace(
           new FrameworkFileSystemReader(rootPath),
@@ -245,7 +246,9 @@ export const createCommand = new Command<GlobalContext>()
         if (member?.buildConfig) {
           buildConfig = member?.buildConfig;
         } else {
-          console.warn(`No build configuration was detected in '${buildDirectory}'.`);
+          console.warn(
+            `No build configuration was detected in '${buildDirectory}'.`,
+          );
         }
       }
 
@@ -402,8 +405,7 @@ export async function createApp(
     deviceCreation = id;
   }
 
-  // deno-lint-ignore no-explicit-any
-  await (trpcClient.apps as any).create.mutate({
+  await trpcClient.mutation("apps.create", {
     org: data.org,
     slug: data.app,
     repo: data.repo,
@@ -428,14 +430,12 @@ export async function createApp(
       wait ?? false,
     );
   } else {
-    // deno-lint-ignore no-explicit-any
-    const revisionId = await (trpcClient.apps as any).triggerGitHubBuild.mutate(
-      {
-        org: data.org,
-        app: data.app,
-        branch: null,
-      },
-    );
+    const revisionId = await trpcClient.mutation("apps.triggerGitHubBuild", {
+      org: data.org,
+      app: data.app,
+      branch: null,
+    }) as string;
+
     console.log(
       `You can view the revision here:\n  ${context.endpoint}/${data.org}/${data.app}/builds/${revisionId}\n`,
     );

deploy/publish.ts

@@ -175,7 +175,7 @@ export async function publish(
   existingFilesSpinner.start();
 
   let revision: Revision | undefined = undefined;
-  const sub = await trpcClient.subscription(
+  const sub = trpcClient.subscription(
     "revisions.watchUntilReady",
     {
       org,
@@ -355,14 +355,14 @@ export async function waitForRevision(
 
   const completionPromise = Promise.withResolvers<void>();
 
-  // deno-lint-ignore no-explicit-any
-  const completionSub = await trpcClient.subscription(
+  const completionSub = trpcClient.subscription(
     "revisions.watchUntilReady",
     {
       org,
       app,
       revision: revisionId,
-    }, {
+    },
+    {
       onData: (data: unknown) => {
         const newRevision = data as Revision;
         revision = newRevision;
@@ -383,7 +383,8 @@ export async function waitForRevision(
       onStopped: () => {
         completionSub.unsubscribe();
       },
-    });
+    },
+  );
 
   await completionPromise.promise;