fully typed (but its optional)

packages/poster/dts/index.d.ts

@@ -2,37 +2,39 @@ declare module 'index.js';
 
 import type { paths } from './discord.d.ts'
 
-type Method = "get" | "post" | "patch" | "put" | "delete"
+export type GlobalGetAll = paths["/applications/{application_id}/commands"]["get"]
+export type GlobalGet = paths["/applications/{application_id}/commands/{command_id}"]["get"]
+export  type GlobalPost = paths["/applications/{application_id}/commands"]["post"]
+export type GlobalEdit = paths["/applications/{application_id}/commands/{command_id}"]["patch"]
+export type GlobalPut = paths["/applications/{application_id}/commands"]['put']
+export type GlobalDelete = paths["/applications/{application_id}/commands/{command_id}"]["delete"]
+export type GuildPost = paths["/applications/{application_id}/guilds/{guild_id}/commands"]["post"]
+export type GuildGet = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["get"]
+export type GuildEdit = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["patch"]
+export type GuildDelete = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["delete"]
+export type GuildPut = paths["/applications/{application_id}/guilds/{guild_id}/commands"]["put"]
 
-type GlobalGetAll = paths["/applications/{application_id}/commands"]["get"]
-type GlobalGet = paths["/applications/{application_id}/commands/{command_id}"]["get"]
-type GlobalPost = paths["/applications/{application_id}/commands"]["post"]
-type GlobalEdit = paths["/applications/{application_id}/commands/{command_id}"]["patch"]
-type GlobalPut = paths["/applications/{application_id}/commands"]['put']
-type GlobalDelete = paths["/applications/{application_id}/commands/{command_id}"]["delete"]
-type GuildPost = paths["/applications/{application_id}/guilds/{guild_id}/commands"]["post"]
-type GuildGet = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["get"]
-type GuildEdit = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["patch"]
-type GuildDelete = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["delete"]
-type GuildPut = paths["/applications/{application_id}/guilds/{guild_id}/commands"]["put"]
+type ResponsesForRoute<T> = T extends { responses: infer R } ? R : never;
 
-//We create a discriminating union to ensure Responses are typed correctly
-//type AnyRoute = 
-//    | GlobalGetAll  & { type: "global/get-all" }
-//    | GlobalGet  & { type: "global/get" }
-//    | GlobalPost  & { type: "global/post" }
-//    | GlobalEdit  & { type: "global/edit" }
-//    | GlobalPut  & { type: "global/put" }
-//    | GlobalDelete  & { type: "global/delete" }
-//    | GuildPost  & { type: "global/post" }
-//    | GuildGet  & { type: "global/x" }
-//    | GuildEdit  & { type: "global/get" }
-//    | GuildDelete  & { type: "global/delete" }
-//    | GuildPut & { type: "global/put" };
 
+type GetOk <T,  V = Omit<T, '4XX'>> 
+//@ts-ignore typescript shush
+= V[keyof V]['content']['application/json']
+
+//@ts-ignore shh
+type GetErr<T> = T['4XX']
+
+type ResultJson<T> = 
+    | (GetOk<ResponsesForRoute<T>>)
+    | (GetErr<ResponsesForRoute<T>>)
+
+
+interface TypedResponse<T> extends Response {
+    json(): Promise<ResultJson<T>>
+}
 
 interface RoutesOptions {
-  "global/get-all": [GlobalGetAll['parameters']];
+  "global/get-all": [{ query?: GlobalGetAll['parameters']['query'] }];
   "global/get":  [GlobalGet["parameters"]["path"] & { application_id?: never }];
   "global/post": [{ body: GlobalPost["requestBody"]["content"]['application/json'] } 
                   & GlobalPost["parameters"]["path"] 
@@ -56,17 +58,20 @@ interface RoutesOptions {
                   & { application_id?: never }];
 }
 
-//interface TypedResponse<T extends keyof RoutesOptions> extends Response {
-//    /**
-//      * Please do not use `.type` in runtime. It is merely a way to get accurate typings 
-//      * It does not exist in runtime.
-//      */
-//    json(): ({ type: T } & AnyRoute)['responses']
-//}
 
 interface Send {
     <T extends keyof RoutesOptions>
     (command : T, ...opts: RoutesOptions[T]): Promise<Response>
 }
 
-export default function (token: string, appid: string): Send;
+export function client(token: string, appid: string): Send;
+
+export function isOk<T>(res : TypedResponse<T>) 
+//WE CANNOT JUST INTERSECTION. We have to remove the old type for Json
+: res is Omit<TypedResponse<T>, 'json'> & { json(): Promise<GetOk<ResponsesForRoute<T>>> }
+export function is4XX<T>(res: TypedResponse<T>) 
+//WE CANNOT JUST INTERSECTION. We have to remove the old type for Json
+: res is Omit<TypedResponse<T>, 'json'> & { json(): Promise<GetErr<ResponsesForRoute<T>>> }
+
+export { TypedResponse };
+

packages/poster/shadow-cljs.edn

@@ -8,6 +8,8 @@
  :builds
  {:poster {:target :node-library
            :output-to "dist/index.js"
-           :exports-var core.poster/poster
-           :build-hooks [(dev.mv/hook 1 2 3)]
+           :exports { :client core.poster/poster
+                      :isOk core.poster/isOk?
+                      :is4XX core.poster/is4XX? }
+           :build-hooks [(dev.mv/hook)]
            }}}

packages/poster/src/core/poster.cljs

@@ -2,13 +2,13 @@
   (:require  [clojure.string :refer [replace]]
              [core.actions :refer [actions]]))
 
-(def base-url "https://discord.com/api/v10")
+(def base "https://discord.com/api/v10")
 
 (defn- inject [remaining-url opts] 
-  (-> (str base-url remaining-url)
-      (replace  #"\{application\.id\}" (.-app_id ^js opts))
-      (replace  #"\{guild\.id\}" (.-guild_id ^js opts))
-      (replace  #"\{command\.id\}" (.-command_id ^js opts))))
+  (-> (str base remaining-url)
+      (replace #"\{application\.id\}" (.-app_id ^js opts))
+      (replace #"\{guild\.id\}" (.-guild_id ^js opts))
+      (replace #"\{command\.id\}" (.-command_id ^js opts))))
 
 (defn ?params [^js query]
   (new js/URLSearchParams query))
@@ -25,5 +25,9 @@
         (set! (.-search url) (?params (.-query ^js opts))) 
         (js/fetch url (mkrequest (.-body ^js opts) header))))))
 
+(defn isOk? [^js response] 
+  (.-ok response))
 
-
+(defn is4XX? [^js response] 
+  (not (.-ok response)))
+  

packages/poster/test/spec.mjs

@@ -1,6 +1,6 @@
 import poster from '../dist/index.js';
 
-const send = poster("token", "appid");
+const send = poster.client("token", "appid");
 
 
 const req = await send("global/get-all", { 

packages/poster/test/spec.ts

@@ -0,0 +1,15 @@
+import poster from '../dist/index.js';
+import type { GlobalGetAll, GlobalPut, TypedResponse } from '../dts/index.js';
+
+const send = poster.client("token", "appid");
+
+
+const req = await send("global/get-all", { 
+    
+}) as TypedResponse<GlobalPut>;
+
+if(poster.isOk<GlobalPut>(req)) {
+    
+}
+console.log(await req.json());
+