@defjs/core 0.0.0-test-0001 → 0.0.0-test-0002

package/dist/index.d.ts

@@ -248,7 +248,7 @@ declare const CLIENT: unique symbol;
 export type Client = {} & {
 	readonly [CLIENT]: ClientConfig;
 };
-export declare function isClient(value: any): value is Client;
+export declare function isClient(value: unknown): value is Client;
 export declare function createClient(options: ClientOptions): Client;
 
 export {};

package/dist/index.js

@@ -296,12 +296,12 @@ async function doRequest(...args) {
   let input;
   let options = {};
   switch (argsLength) {
-    case 2: {
+    case 1: {
       ref = args[0];
       options = args[1];
       break;
     }
-    case 3: {
+    case 2: {
       ref = args[0];
       input = args[1];
       options = args[2];
@@ -324,7 +324,7 @@ async function doRequest(...args) {
     abortController = new AbortController;
     abortSignal = abortController.signal;
   }
-  const clientOptions = getClientConfig(options.client);
+  const clientOptions = getClientConfig(options.client || getGlobalClient());
   const req = {
     host: clientOptions?.host || "",
     method: requestOptions.method,
@@ -340,14 +340,7 @@ async function doRequest(...args) {
     timeout: options.timeout || 0,
     abort: abortSignal
   };
-  let handler2;
-  if (options.handler) {
-    handler2 = options.handler;
-  } else if (clientOptions?.handler) {
-    handler2 = clientOptions.handler;
-  } else {
-    handler2 = getGlobalHttpHandler();
-  }
+  const handler2 = options.handler || clientOptions?.handler || getGlobalHttpHandler();
   if (!handler2) {
     throw new Error("no handler");
   }
@@ -367,7 +360,16 @@ async function doRequest(...args) {
   if (typeof requestOptions.transformResponse === "function") {
     res.body = requestOptions.transformResponse(res);
   }
-  return res;
+  switch (req.observe) {
+    case "body":
+      return res.body;
+    case "stream":
+      throw new Error("streaming not implemented");
+    case "response":
+      return res;
+    default:
+      throw new Error("invalid observe");
+  }
 }
 var REQUEST_REF = Symbol("RequestRef");
 
@@ -527,7 +529,7 @@ var FETCH_CONFIG_KEY = makeHttpContextToken(() => ({}));
 var fetchHandler = _request;
 // src/client.ts
 function isClient(value) {
-  return typeof value === "object" && CLIENT in value;
+  return typeof value === "object" && value !== null && CLIENT in value;
 }
 function getClientConfig(client2) {
   if (!isClient(client2)) {
@@ -545,7 +547,14 @@ function createClient(options) {
     [CLIENT]: conf
   };
 }
+function getGlobalClient() {
+  if (!globalClient) {
+    throw new Error("Global client not set");
+  }
+  return globalClient;
+}
 var CLIENT = Symbol("Client");
+var globalClient;
 export {
   makeResponse,
   makeHttpContextToken,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@defjs/core",
-	"version": "0.0.0-test-0001",
+	"version": "0.0.0-test-0002",
 	"type": "module",
 	"scripts": {
 		"build": "bun run ./scripts/build.ts",