@superbia/untrue 2.1.2 → 2.1.3

package/dist/Api.js

@@ -34,31 +34,28 @@ class Api extends untrue_1.Context {
             if (requester === undefined) {
                 throw new Error("Requester not defined in useRequest.");
             }
-            this.requests.data[key] = {
+            const request = {
                 loading: true,
                 done: false,
                 result: null,
                 error: null,
             };
+            this.requests.data[key] = request;
             this.requests.update();
             try {
                 const result = await requester(...args);
                 const parsedResult = this.requests.parseResult(result);
-                this.requests.data[key] = {
-                    loading: false,
-                    done: true,
-                    result: parsedResult,
-                    error: null,
-                };
+                request.loading = false;
+                request.done = true;
+                request.result = parsedResult;
+                request.error = null;
                 this.requests.update();
             }
             catch (error) {
-                this.requests.data[key] = {
-                    loading: false,
-                    done: false,
-                    result: null,
-                    error,
-                };
+                request.loading = false;
+                request.done = false;
+                request.result = null;
+                request.error = error;
                 this.requests.update();
             }
         };
@@ -66,17 +63,50 @@ class Api extends untrue_1.Context {
     }
     useLoad(key, selector, loader) {
         const value = untrue_1.Hook.useContext(this.requests, () => {
-            const request = this.requests.data[key];
+            let request = (this.requests.data[key] ?? null);
+            request ?? (request = {
+                loading: false,
+                done: false,
+                result: null,
+                error: null,
+            });
             return selector(request);
         });
         const load = async (...args) => {
-            const request = this.requests.data[key];
+            const request = (this.requests.data[key] ??
+                null);
+            if (request === null) {
+                throw new Error("Request not initialized yet.");
+            }
+            if (request.loading) {
+                throw new Error('Request is in "loading" state.');
+            }
+            if (request.error !== null) {
+                throw new Error('Request is in "error" state.');
+            }
             const tmpResult = request.result;
             let tmpPagination;
             let endpointName;
+            let rethrow = false;
             this.client.once("request", (endpoints) => {
-                endpointName = Object.keys(endpoints)[0];
-                tmpPagination = tmpResult[endpointName];
+                const keys = Object.keys(endpoints);
+                try {
+                    if (keys.length === 0) {
+                        throw new Error(`Argument "endpoints" can't be empty.`);
+                    }
+                    endpointName = keys[0];
+                    tmpPagination = tmpResult[endpointName];
+                    if (tmpPagination === undefined) {
+                        throw new Error(`Endpoint "${endpointName}" not in request result.`);
+                    }
+                    if (!(tmpPagination instanceof RequestContext_1.PaginationResult)) {
+                        throw new Error(`Endpoint "${endpointName}" is not of Pagination type.`);
+                    }
+                }
+                catch (error) {
+                    rethrow = true;
+                    throw error;
+                }
                 tmpPagination.loading = true;
                 tmpPagination.error = null;
                 this.requests.update();
@@ -92,10 +122,16 @@ class Api extends untrue_1.Context {
                 tmpPagination.result.hasNextPage = endpointResult.result.hasNextPage;
                 tmpPagination.result.nextPageCursor =
                     endpointResult.result.nextPageCursor;
-                tmpPagination.result.nodes.push(...endpointResult.result.nodes);
+                tmpPagination.result.nodes = [
+                    ...tmpPagination.result.nodes,
+                    ...endpointResult.result.nodes,
+                ];
                 this.requests.update();
             }
             catch (error) {
+                if (rethrow) {
+                    throw error;
+                }
                 tmpPagination.loading = false;
                 tmpPagination.error = error;
                 this.requests.update();

package/dist/RequestContext.d.ts

@@ -1,9 +1,14 @@
 import { Result, Pagination, EndpointRecord, ResponseResult } from "@superbia/client";
 import { ParsedResult, SuperbiaContext } from "./SuperbiaContext";
-export interface PaginationResult<T, O extends string = "id"> {
+export declare class PaginationResult<T extends Pagination<any>, O extends string = "id"> {
     loading: boolean;
     result: ParsedResult<T, O>;
     error: Error | null;
+    constructor({ loading, result, error, }: {
+        loading: boolean;
+        result: ParsedResult<T, O>;
+        error: Error | null;
+    });
 }
 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>;

package/dist/RequestContext.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestContext = void 0;
+exports.RequestContext = exports.PaginationResult = void 0;
 const SuperbiaContext_1 = require("./SuperbiaContext");
+class PaginationResult {
+    constructor({ loading, result, error, }) {
+        this.loading = loading;
+        this.result = result;
+        this.error = error;
+    }
+}
+exports.PaginationResult = PaginationResult;
 class RequestContext extends SuperbiaContext_1.SuperbiaContext {
     constructor() {
         super(...arguments);
@@ -16,11 +24,11 @@ class RequestContext extends SuperbiaContext_1.SuperbiaContext {
                 typeof endpointResult === "object" &&
                 this.typenameKey in endpointResult &&
                 endpointResult[this.typenameKey].endsWith("Pagination")) {
-                tmpEndpointResult = {
+                tmpEndpointResult = new PaginationResult({
                     loading: false,
                     result: this.parseResultValue(endpointResult),
                     error: null,
-                };
+                });
             }
             else {
                 tmpEndpointResult = this.parseResultValue(endpointResult);

package/dist/index.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = void 0;
+exports.PaginationResult = exports.default = void 0;
 var Api_1 = require("./Api");
 Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(Api_1).default; } });
+var RequestContext_1 = require("./RequestContext");
+Object.defineProperty(exports, "PaginationResult", { enumerable: true, get: function () { return RequestContext_1.PaginationResult; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superbia/untrue",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Integrate Superbia and Untrue.",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@superbia/client": "^2.1.0",
-    "untrue": "^5.9.1"
+    "untrue": "^5.12.4"
   },
   "dependencies": {
     "uuid": "^10.0.0"