@superbia/untrue 2.0.4 → 2.1.0

package/dist/Api.d.ts

@@ -1,5 +1,5 @@
 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";
@@ -9,7 +9,7 @@ export default class Api<K extends DocumentSchemaRecord, M extends EndpointRecor
     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<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<Y, O>) => W, loader: (...args: X) => Promise<Y>): [W, (...args: X) => Promise<void>];
     useRequestKey(params?: any[]): string;
 }

package/dist/Api.js

@@ -9,7 +9,7 @@ class Api extends untrue_1.Context {
         super();
         this.client = client;
         this.documents = new DocumentContext_1.DocumentContext(client, idKey);
-        this.requests = new RequestContext_1.RequestContext(client, idKey);
+        this.requests = new RequestContext_1.RequestContext(idKey);
         const listener = () => {
             this.update();
         };
@@ -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/DocumentContext.d.ts

@@ -3,10 +3,10 @@ import { ParsedResult, SuperbiaContext, DocumentSchema, DocumentSchemaRecord } f
 export type Document<T extends DocumentSchema, O extends string = "id"> = {
     [K in keyof T]: ParsedResult<T[K], O>;
 };
-export type Documents<T extends DocumentSchemaRecord, O extends string = "id"> = {
+export type Documents<T extends DocumentSchemaRecord, O extends string = "id"> = Partial<{
     [K in keyof T]: Record<string, Result<Document<T[K], O>>>;
-};
-export declare class DocumentContext<K extends DocumentSchemaRecord, M extends EndpointRecord, O extends string> extends SuperbiaContext<M> {
+}>;
+export declare class DocumentContext<K extends DocumentSchemaRecord, M extends EndpointRecord, O extends string> extends SuperbiaContext {
     data: Documents<K, O>;
     constructor(client: Client<M, any>, idKey: string);
     private handleResult;

package/dist/DocumentContext.js

@@ -4,7 +4,7 @@ exports.DocumentContext = void 0;
 const SuperbiaContext_1 = require("./SuperbiaContext");
 class DocumentContext extends SuperbiaContext_1.SuperbiaContext {
     constructor(client, idKey) {
-        super(client, idKey);
+        super(idKey);
         this.data = {};
         const listener = (endpoints, emitter) => {
             emitter.on("result", (result) => {

package/dist/RequestContext.d.ts

@@ -13,10 +13,10 @@ export type Request<T extends ResponseResult, O extends string = "id"> = {
     } | 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<{
     [K in keyof T]: Result<T[K]["result"]>;
-}, O>>;
-export declare class RequestContext<M extends EndpointRecord, O extends string> extends SuperbiaContext<M> {
+}>, O>>;
+export declare class RequestContext<M extends EndpointRecord, O extends string> extends SuperbiaContext {
     data: Requests<M, O>;
     parseResult(result: ResponseResult): ResponseResult;
 }

package/dist/SuperbiaContext.d.ts

@@ -1,5 +1,4 @@
 import { Context } from "untrue";
-import { Client, EndpointRecord } from "@superbia/client";
 type IdObject<O extends string> = {
     [K in O]: string;
 };
@@ -9,11 +8,10 @@ export type ParsedResult<T, O extends string = "id"> = T extends string | number
 export type DocumentSchema = Record<string, any>;
 export type DocumentSchemaRecord = Record<string, DocumentSchema>;
 export type DocumentData = Record<string, Record<string, DocumentSchema>>;
-export declare class SuperbiaContext<M extends EndpointRecord> extends Context {
-    protected client: Client<M, any>;
+export declare class SuperbiaContext extends Context {
     protected idKey: string;
     protected typenameKey: string;
-    constructor(client: Client<M, any>, idKey: string);
+    constructor(idKey: string);
     parseResultValue(result: any, data?: DocumentData): any;
 }
 export {};

package/dist/SuperbiaContext.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuperbiaContext = void 0;
 const untrue_1 = require("untrue");
 class SuperbiaContext extends untrue_1.Context {
-    constructor(client, idKey) {
+    constructor(idKey) {
         super();
-        this.client = client;
         this.idKey = idKey;
         this.typenameKey = "_typename";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superbia/untrue",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "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": {