@defjs/core 0.0.0-test-0008 → 0.0.0-test-0010

package/dist/index.d.ts

@@ -82,7 +82,7 @@ export interface HttpProgressEvent {
 	 */
 	readonly total: number;
 }
-export type HttpProgressFn = (value: HttpProgressEvent) => void;
+export type HttpProgressFn = (event: HttpProgressEvent) => void;
 export type TransformRequestFn = (request: HttpRequest) => HttpRequest["body"];
 export type TransformResponseFn<Output = unknown> = (response: HttpResponse<unknown>) => Output;
 export interface HttpRequest {
@@ -122,11 +122,23 @@ export type RequestOptions<Output = unknown, Input extends Field<any> | Record<P
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn<Output>;
 };
-declare const REQUEST_REF: unique symbol;
-export type RequestRef<_Output = undefined, _Input = undefined> = {
-	readonly [REQUEST_REF]: RequestOptions;
+export type DoRequestOptions = {
+	abort?: AbortSignal;
+	handler?: HttpHandler;
+	client?: ClientOptions;
+	timeout?: number;
+};
+export type DoRequestFn<Input = unknown, Output = unknown> = Input extends undefined ? (options?: DoRequestOptions) => Output : (input: RequestInputValue<Input>, options?: DoRequestOptions) => Output;
+export type UseRequestFn<Output = unknown, Input = unknown> = () => {
+	doRequest: DoRequestFn<Input, Output>;
+	inputValue: Input extends Field<infer V> ? V : Input extends {
+		[K in keyof Input]: Field<any>;
+	} ? {
+		[K in keyof Input]: RequestInputValue<Input[K]>;
+	} : undefined;
+	setUploadProgress: (fn: HttpProgressFn) => void;
+	setDownloadProgress: (fn: HttpProgressFn) => void;
 };
-export type MakeRequestFn<Output = undefined, Input = undefined> = () => RequestRef<Output, Input>;
 /** Observe: Body */
 export declare function defineRequest<Output = unknown, Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
@@ -140,7 +152,7 @@ export declare function defineRequest<Output = unknown, Input extends Field<any>
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn<Output>;
-}): MakeRequestFn<Output, Input>;
+}): UseRequestFn<Output, Input>;
 export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
 	endpoint: string;
@@ -153,7 +165,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
-}): MakeRequestFn<string, Input>;
+}): UseRequestFn<string, Input>;
 export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
 	endpoint: string;
@@ -166,7 +178,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
-}): MakeRequestFn<Blob, Input>;
+}): UseRequestFn<Blob, Input>;
 export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
 	endpoint: string;
@@ -179,7 +191,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
-}): MakeRequestFn<ArrayBuffer, Input>;
+}): UseRequestFn<ArrayBuffer, Input>;
 /** Observe: Response */
 export declare function defineRequest<Output = unknown, Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
@@ -193,7 +205,7 @@ export declare function defineRequest<Output = unknown, Input extends Field<any>
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn<Output>;
-}): MakeRequestFn<HttpResponse<Output>, Input>;
+}): UseRequestFn<HttpResponse<Output>, Input>;
 export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
 	endpoint: string;
@@ -206,7 +218,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
-}): MakeRequestFn<HttpResponse<string>, Input>;
+}): UseRequestFn<HttpResponse<string>, Input>;
 export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
 	endpoint: string;
@@ -219,7 +231,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
-}): MakeRequestFn<HttpResponse<Blob>, Input>;
+}): UseRequestFn<HttpResponse<Blob>, Input>;
 export declare function defineRequest<Input extends Field<any> | Record<PropertyKey, Field<any>> | undefined = undefined>(options: {
 	method: string;
 	endpoint: string;
@@ -232,21 +244,7 @@ export declare function defineRequest<Input extends Field<any> | Record<Property
 	validators?: (ValidatorFn<RequestInputValue<Input>> | AsyncValidatorFn<RequestInputValue<Input>>)[];
 	transformRequest?: TransformRequestFn;
 	transformResponse?: TransformResponseFn;
-}): MakeRequestFn<HttpResponse<ArrayBuffer>, Input>;
-export declare function isRequestRef(value: unknown): value is RequestRef;
-export type DoRequestOptions = {
-	uploadProgress?: HttpProgressFn;
-	downloadProgress?: HttpProgressFn;
-	abort?: AbortSignal;
-	handler?: HttpHandler;
-	client?: ClientOptions;
-	timeout?: number;
-};
-export type RequestRefOutput<T> = T extends RequestRef<infer O> ? O : undefined;
-export type RequestRefInput<T> = T extends RequestRef<unknown, infer I> ? RequestInputValue<I> : never;
-export type RequestRefWithInput<T> = T extends RequestRef<unknown, infer Input> ? (Input extends undefined ? false : true) : false;
-export declare function doRequest<Ref extends RequestRef>(ref: RequestRefWithInput<Ref> extends true ? never : Ref, options?: DoRequestOptions): Promise<RequestRefOutput<Ref>>;
-export declare function doRequest<Ref extends RequestRef>(ref: RequestRefWithInput<Ref> extends true ? Ref : never, input: RequestRefInput<Ref>, options?: DoRequestOptions): Promise<RequestRefOutput<Ref>>;
+}): UseRequestFn<HttpResponse<ArrayBuffer>, Input>;
 export type HttpHandler = (req: HttpRequest) => Promise<HttpResponse<unknown>>;
 export declare function fetchHandler(httpRequest: HttpRequest): Promise<HttpResponse<unknown>>;
 export interface ClientOptions {

package/dist/index.js

@@ -134,27 +134,103 @@ function detectContentTypeHeader(body) {
       return null;
   }
 }
+function buildFieldValue(input) {
+  if (isField(input)) {
+    return input();
+  }
+  if (isFieldGroup(input)) {
+    const obj = {};
+    for (const [key, field3] of Object.entries(input)) {
+      obj[key] = field3();
+    }
+    return obj;
+  }
+  return;
+}
 function defineRequest(options) {
+  const requestOptions = {
+    ...options
+  };
+  const requiredInput = !!requestOptions.input;
   return () => {
-    const opts = {
-      ...options
+    let uploadProgress;
+    let downloadProgress;
+    let abortController;
+    let abortSignal;
+    const setUploadProgress = (fn) => {
+      uploadProgress = fn;
+    };
+    const setDownloadProgress = (fn) => {
+      downloadProgress = fn;
+    };
+    const doRequest = async (input, options2) => {
+      if (requiredInput && !input) {
+        throw new Error("input is required");
+      }
+      if (options2?.abort) {
+        abortSignal = options2.abort;
+      } else {
+        abortController = new AbortController;
+        abortSignal = abortController.signal;
+      }
+      const clientOptions = getClientConfig(options2?.client || getGlobalClient());
+      const req = {
+        host: clientOptions?.host,
+        method: requestOptions.method,
+        endpoint: requestOptions.endpoint,
+        queryParams: new URLSearchParams,
+        headers: new Headers,
+        body: undefined,
+        withCredentials: requestOptions.withCredentials,
+        responseType: requestOptions.responseType ?? "json",
+        context: requestOptions.context || makeHttpContext(),
+        observe: requestOptions.observe ?? "body",
+        uploadProgress,
+        downloadProgress,
+        timeout: options2?.timeout || 0,
+        abort: abortSignal
+      };
+      const handler2 = options2?.handler || clientOptions?.handler || getGlobalHttpHandler();
+      if (!handler2) {
+        throw new Error("no handler");
+      }
+      if (requiredInput) {
+        await fillRequestFromField(req, requestOptions.input, input);
+      }
+      if (typeof requestOptions.transformRequest === "function") {
+        req.body = requestOptions.transformRequest(req);
+      }
+      const chain = makeInterceptorChain([...clientOptions?.interceptors || [], ...requestOptions?.interceptors || []]);
+      if (typeof req.timeout === "number" && req.timeout > 0 && abortController) {
+        setTimeout(() => {
+          if (!req.abort?.aborted) {
+            abortController?.abort("timeout");
+          }
+        }, req.timeout);
+      }
+      const res = await chain(req, handler2);
+      if (typeof requestOptions.transformResponse === "function") {
+        res.body = requestOptions.transformResponse(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");
+      }
+    };
+    return {
+      doRequest,
+      inputValue: buildFieldValue(requestOptions.input),
+      setUploadProgress,
+      setDownloadProgress
     };
-    const ref = {};
-    Object.defineProperty(ref, REQUEST_REF, {
-      value: opts
-    });
-    return ref;
   };
 }
-function isRequestRef(value) {
-  return !!value && typeof value === "object" && REQUEST_REF in value;
-}
-function getRequestRefOptions(value) {
-  if (!isRequestRef(value)) {
-    throw new Error("no request ref");
-  }
-  return value[REQUEST_REF];
-}
 function throwAliaNotSet() {
   throw new Error("alias not set");
 }
@@ -209,9 +285,6 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
     }
     for (const [type, aliasName] of meta.alias) {
       switch (type) {
-        case 1 /* Json */:
-          body = JSON.stringify(fieldValue);
-          break;
         case 2 /* Query */: {
           if (!aliasName) {
             throwAliaNotSet();
@@ -240,6 +313,7 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
           body = appendValue(new FormData, aliasName, fieldValue);
           break;
         }
+        case 1 /* Json */:
         case 6 /* Body */:
           body = fieldValue;
           break;
@@ -303,95 +377,12 @@ async function fillRequestFromField(request, fieldOrFieldGroup, input) {
     } else if (Array.from(formData.keys()).length > 0) {
       request.body = formData;
     } else if (Object.keys(json).length) {
-      request.body = JSON.stringify(json);
+      request.body = json;
     }
     return;
   }
   throw new Error("unsupported field type");
 }
-async function doRequest(...args) {
-  const argsLength = args.length;
-  let ref;
-  let input;
-  let options;
-  switch (argsLength) {
-    case 1: {
-      ref = args[0];
-      options = args[1];
-      break;
-    }
-    case 2: {
-      ref = args[0];
-      input = args[1];
-      options = args[2];
-      break;
-    }
-    default: {
-      throw new Error("invalid arguments");
-    }
-  }
-  const requestOptions = getRequestRefOptions(ref);
-  const requiredInput = !!requestOptions.input;
-  if (requiredInput && !input) {
-    throw new Error("input is required");
-  }
-  let abortController;
-  let abortSignal;
-  if (options?.abort) {
-    abortSignal = options.abort;
-  } else {
-    abortController = new AbortController;
-    abortSignal = abortController.signal;
-  }
-  const clientOptions = getClientConfig(options?.client || getGlobalClient());
-  const req = {
-    host: clientOptions?.host,
-    method: requestOptions.method,
-    endpoint: requestOptions.endpoint,
-    queryParams: new URLSearchParams,
-    headers: new Headers,
-    body: undefined,
-    withCredentials: requestOptions.withCredentials,
-    responseType: requestOptions.responseType ?? "json",
-    context: requestOptions.context || makeHttpContext(),
-    observe: requestOptions.observe ?? "body",
-    uploadProgress: options?.uploadProgress,
-    downloadProgress: options?.downloadProgress,
-    timeout: options?.timeout || 0,
-    abort: abortSignal
-  };
-  const handler2 = options?.handler || clientOptions?.handler || getGlobalHttpHandler();
-  if (!handler2) {
-    throw new Error("no handler");
-  }
-  await fillRequestFromField(req, requestOptions.input, input);
-  if (typeof requestOptions.transformRequest === "function") {
-    req.body = requestOptions.transformRequest(req);
-  }
-  const chain = makeInterceptorChain([...clientOptions?.interceptors || [], ...requestOptions?.interceptors || []]);
-  if (typeof req.timeout === "number" && req.timeout > 0 && abortController) {
-    setTimeout(() => {
-      if (!req.abort?.aborted) {
-        abortController.abort("timeout");
-      }
-    }, req.timeout);
-  }
-  const res = await chain(req, handler2);
-  if (typeof requestOptions.transformResponse === "function") {
-    res.body = requestOptions.transformResponse(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");
 
 // src/response.ts
 function makeResponse(options) {
@@ -593,14 +584,12 @@ export {
   makeResponse,
   makeHttpContextToken,
   makeHttpContext,
-  isRequestRef,
   isFieldGroup,
   isField,
   isClient,
   getGlobalClient,
   field,
   fetchHandler,
-  doRequest,
   defineRequest,
   createGlobalClient,
   createClient

package/package.json

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