@superbia/untrue 2.0.5 → 2.1.1

package/dist/Api.d.ts

@@ -1,15 +1,15 @@
 import { Context, State } from "untrue";
-import { Client, EndpointRecord, Response, ResponseResult } from "@superbia/client";
+import { Client, EndpointRecord, ResponseResult } from "@superbia/client";
 import { DocumentSchemaRecord } from "./SuperbiaContext";
 import { DocumentContext, Documents } from "./DocumentContext";
-import { RequestContext, Request } from "./RequestContext";
+import { RequestContext, Request, RequestResult } from "./RequestContext";
 export default class Api<K extends DocumentSchemaRecord, M extends EndpointRecord, N extends EndpointRecord = {}, O extends string = "id", P = any> extends Context<State, P> {
     readonly client: Client<M, N>;
     readonly documents: DocumentContext<K, M, O>;
     readonly requests: RequestContext<M, O>;
     constructor(client: Client<M, N>, idKey?: string);
     useDocuments<W>(selector: (documents: Documents<K, O>) => W): W;
-    useRequest<Y extends ResponseResult, W, X extends any[] = any[]>(key: string, selector: (request: Request<Y, O>) => W, requester?: (...args: X) => Promise<Response<Y>>): [W, (...args: X) => Promise<void>];
-    useLoad<Y extends ResponseResult, W, X extends any[]>(key: string, selector: (request: Request<Y, O>) => W, loader: (...args: X) => Promise<Response<Y>>): [W, (...args: X) => Promise<void>];
+    useRequest<Y extends ResponseResult, W, X extends any[] = any[]>(key: string, selector: (request: Request<RequestResult<Y, O>>) => W, requester?: (...args: X) => Promise<Y>): [W, (...args: X) => Promise<void>];
+    useLoad<Y extends ResponseResult, W, X extends any[]>(key: string, selector: (request: Request<RequestResult<Y, O>>) => W, loader: (...args: X) => Promise<Y>): [W, (...args: X) => Promise<void>];
     useRequestKey(params?: any[]): string;
 }

package/dist/Api.js

@@ -42,8 +42,7 @@ class Api extends untrue_1.Context {
             };
             this.requests.update();
             try {
-                const response = await requester(...args);
-                const result = response.result();
+                const result = await requester(...args);
                 const parsedResult = this.requests.parseResult(result);
                 this.requests.data[key] = {
                     loading: false,
@@ -85,8 +84,7 @@ class Api extends untrue_1.Context {
             endpointName = endpointName;
             tmpPagination = tmpPagination;
             try {
-                const response = await loader(...args);
-                const result = response.result();
+                const result = await loader(...args);
                 const parsedResult = this.requests.parseResult(result);
                 const endpointResult = parsedResult[endpointName];
                 tmpPagination.loading = false;

package/dist/RequestContext.d.ts

@@ -5,17 +5,18 @@ export interface PaginationResult<T, O extends string = "id"> {
     result: ParsedResult<T, O>;
     error: Error | null;
 }
-export type Request<T extends ResponseResult, O extends string = "id"> = {
+export type RequestResult<T extends ResponseResult, O extends string = "id"> = {
+    [K in keyof T]: T[K] extends Pagination<any> ? PaginationResult<T[K], O> : ParsedResult<T[K], O>;
+};
+export type Request<T extends ResponseResult> = {
     loading: boolean;
     done: boolean;
-    result: {
-        [K in keyof T]: T[K] extends Pagination<any> ? PaginationResult<T[K], O> : ParsedResult<T[K], O>;
-    } | null;
+    result: T | null;
     error: Error | null;
 };
-export type Requests<T extends EndpointRecord, O extends string = "id"> = Record<string, Request<{
+export type Requests<T extends EndpointRecord, O extends string = "id"> = Record<string, Request<Partial<RequestResult<{
     [K in keyof T]: Result<T[K]["result"]>;
-}, O>>;
+}, O>>>>;
 export declare class RequestContext<M extends EndpointRecord, O extends string> extends SuperbiaContext {
     data: Requests<M, O>;
     parseResult(result: ResponseResult): ResponseResult;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export { default } from "./Api";
 export { ParsedResult } from "./SuperbiaContext";
 export { Document, Documents } from "./DocumentContext";
-export { Request, Requests, PaginationResult } from "./RequestContext";
+export { Request, Requests, RequestResult, PaginationResult, } from "./RequestContext";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superbia/untrue",
-  "version": "2.0.5",
+  "version": "2.1.1",
   "description": "Integrate Superbia and Untrue.",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@superbia/client": "^2.0.10",
+    "@superbia/client": "^2.1.0",
     "untrue": "^5.9.1"
   },
   "dependencies": {