@superbia/untrue 2.1.8 → 2.3.0

package/dist/esm/Api.d.ts

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

package/dist/{Api.js → esm/Api.js}

@@ -1,15 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const untrue_1 = require("untrue");
-const uuid_1 = require("uuid");
-const DocumentContext_1 = require("./DocumentContext");
-const RequestContext_1 = require("./RequestContext");
-class Api extends untrue_1.Context {
-    constructor(client, idKey = "id") {
+import { Context, Hook } from "untrue";
+import { v4 as uuid } from "uuid";
+import { DocumentContext } from "./DocumentContext";
+import { RequestContext, PaginationResult, } from "./RequestContext";
+export default class Api extends Context {
+    client;
+    documents;
+    requests;
+    constructor(client, idKey) {
         super();
         this.client = client;
-        this.documents = new DocumentContext_1.DocumentContext(client, idKey);
-        this.requests = new RequestContext_1.RequestContext(idKey);
+        this.documents = new DocumentContext(client, idKey);
+        this.requests = new RequestContext(idKey);
         const listener = () => {
             this.update();
         };
@@ -17,17 +18,17 @@ class Api extends untrue_1.Context {
         this.requests.on("update", listener);
     }
     useDocuments(selector) {
-        return untrue_1.Hook.useContext(this.documents, () => selector(this.documents.data));
+        return Hook.useContext(this.documents, () => selector(this.documents.data));
     }
     useRequest(key, selector, requester) {
-        const value = untrue_1.Hook.useContext(this.requests, () => {
+        const value = Hook.useContext(this.requests, () => {
             let request = (this.requests.data[key] ?? null);
-            request ?? (request = {
+            request ??= {
                 loading: false,
                 done: false,
                 result: null,
                 error: null,
-            });
+            };
             return selector(request);
         });
         const request = async (...args) => {
@@ -62,14 +63,14 @@ class Api extends untrue_1.Context {
         return [value, request];
     }
     useLoad(key, selector, loader) {
-        const value = untrue_1.Hook.useContext(this.requests, () => {
+        const value = Hook.useContext(this.requests, () => {
             let request = (this.requests.data[key] ?? null);
-            request ?? (request = {
+            request ??= {
                 loading: false,
                 done: false,
                 result: null,
                 error: null,
-            });
+            };
             return selector(request);
         });
         const load = async (...args) => {
@@ -85,8 +86,8 @@ class Api extends untrue_1.Context {
                 throw new Error('Request is in "error" state.');
             }
             const tmpResult = request.result;
-            let tmpPagination;
             let endpointName;
+            let tmpPagination;
             let rethrow = false;
             this.client.once("request", (endpoints) => {
                 const keys = Object.keys(endpoints);
@@ -99,7 +100,7 @@ class Api extends untrue_1.Context {
                     if (tmpPagination === undefined) {
                         throw new Error(`Endpoint "${endpointName}" not in request result.`);
                     }
-                    if (!(tmpPagination instanceof RequestContext_1.PaginationResult)) {
+                    if (!(tmpPagination instanceof PaginationResult)) {
                         throw new Error(`Endpoint "${endpointName}" is not of Pagination type.`);
                     }
                 }
@@ -140,7 +141,6 @@ class Api extends untrue_1.Context {
         return [value, load];
     }
     useRequestKey(params) {
-        return untrue_1.Hook.useMemo(() => (0, uuid_1.v4)(), params);
+        return Hook.useMemo(() => uuid(), params);
     }
 }
-exports.default = Api;

package/dist/esm/DocumentContext.d.ts

@@ -0,0 +1,15 @@
+import { Client, Result, ResponseResult } from "@superbia/client";
+import { IdDocument, IdDocumentRecord, ParsedResult, SuperbiaContext } from "./SuperbiaContext";
+export type ApiDocument<O extends string, T extends IdDocument<O>> = {
+    [K in keyof T]: ParsedResult<O, T[K]>;
+};
+export type ApiDocuments<O extends string, T extends IdDocumentRecord<O>> = Partial<{
+    [K in keyof T]: Record<string, Result<ApiDocument<O, T[K]>>>;
+}>;
+export declare class DocumentContext<O extends string, K extends IdDocumentRecord<O>> extends SuperbiaContext {
+    data: ApiDocuments<O, K>;
+    private updateAfterResultLoop;
+    constructor(client: Client<any, any>, idKey: string);
+    handleResult(result: ResponseResult): void;
+    private parseResultValue;
+}

package/dist/esm/DocumentContext.js

@@ -0,0 +1,53 @@
+import { SuperbiaContext, } from "./SuperbiaContext";
+export class DocumentContext extends SuperbiaContext {
+    data = {};
+    updateAfterResultLoop = false;
+    constructor(client, idKey) {
+        super(idKey);
+        const listener = (endpoints, emitter) => {
+            emitter.on("result", (result) => {
+                this.handleResult(result);
+            });
+        };
+        client.on("request", listener);
+        client.on("subscribe", listener);
+    }
+    handleResult(result) {
+        const endpointResults = Object.values(result);
+        for (const endpointResult of endpointResults) {
+            this.parseResultValue(endpointResult);
+        }
+        if (this.updateAfterResultLoop) {
+            this.update();
+        }
+        this.updateAfterResultLoop = false;
+    }
+    parseResultValue(value) {
+        if (value === null) {
+            return null;
+        }
+        if (Array.isArray(value)) {
+            return value.map((tmpValue) => this.parseResultValue(tmpValue));
+        }
+        if (typeof value === "object") {
+            const tmpValue = {};
+            for (const key in value) {
+                tmpValue[key] = this.parseResultValue(value[key]);
+            }
+            const isIdDocument = this.isIdDocument(value);
+            if (!isIdDocument) {
+                return tmpValue;
+            }
+            const id = value[this.idKey];
+            const typename = value[this.typenameKey];
+            const documents = this.data;
+            if (!(typename in documents)) {
+                documents[typename] = {};
+            }
+            documents[typename][id] = tmpValue;
+            this.updateAfterResultLoop = true;
+            return id;
+        }
+        return value;
+    }
+}

package/dist/esm/RequestContext.d.ts

@@ -0,0 +1,29 @@
+import { Result, Pagination, EndpointRecord, ResponseResult } from "@superbia/client";
+import { ParsedResult, SuperbiaContext } from "./SuperbiaContext";
+export declare class PaginationResult<O extends string, T extends Pagination<any>> {
+    loading: boolean;
+    result: ParsedResult<O, T>;
+    error: any;
+    constructor({ loading, result, error, }: {
+        loading: boolean;
+        result: ParsedResult<O, T>;
+        error: any;
+    });
+}
+export type RequestResult<O extends string, T extends ResponseResult> = {
+    [K in keyof T]: T[K] extends Pagination<any> ? PaginationResult<O, T[K]> : ParsedResult<O, T[K]>;
+};
+export type ApiRequest<T extends ResponseResult> = {
+    loading: boolean;
+    done: boolean;
+    result: T | null;
+    error: any;
+};
+export type ApiRequests<O extends string, T extends EndpointRecord> = Record<string, ApiRequest<Partial<RequestResult<O, {
+    [K in keyof T]: Result<T[K]["result"]>;
+}>>>>;
+export declare class RequestContext<O extends string, M extends EndpointRecord> extends SuperbiaContext {
+    data: ApiRequests<O, M>;
+    parseResult(result: ResponseResult): ResponseResult;
+    private parseResultValue;
+}

package/dist/esm/RequestContext.js

@@ -0,0 +1,57 @@
+import { SuperbiaContext } from "./SuperbiaContext";
+export class PaginationResult {
+    loading;
+    result;
+    error;
+    constructor({ loading, result, error, }) {
+        this.loading = loading;
+        this.result = result;
+        this.error = error;
+    }
+}
+export class RequestContext extends SuperbiaContext {
+    data = {};
+    parseResult(result) {
+        const tmpResult = {};
+        for (const key in result) {
+            const endpointResult = result[key];
+            let tmpEndpointResult;
+            if (endpointResult !== null &&
+                typeof endpointResult === "object" &&
+                this.typenameKey in endpointResult &&
+                endpointResult[this.typenameKey] === "__pagination__") {
+                tmpEndpointResult = new PaginationResult({
+                    loading: false,
+                    result: this.parseResultValue(endpointResult),
+                    error: null,
+                });
+            }
+            else {
+                tmpEndpointResult = this.parseResultValue(endpointResult);
+            }
+            tmpResult[key] = tmpEndpointResult;
+        }
+        return tmpResult;
+    }
+    parseResultValue(value) {
+        if (value === null) {
+            return null;
+        }
+        if (Array.isArray(value)) {
+            return value.map((tmpValue) => this.parseResultValue(tmpValue));
+        }
+        if (typeof value === "object") {
+            const isIdDocument = this.isIdDocument(value);
+            if (isIdDocument) {
+                const id = value[this.idKey];
+                return id;
+            }
+            const tmpValue = {};
+            for (const key in value) {
+                tmpValue[key] = this.parseResultValue(value[key]);
+            }
+            return tmpValue;
+        }
+        return value;
+    }
+}

package/dist/esm/SuperbiaContext.d.ts

@@ -0,0 +1,15 @@
+import { Context } from "untrue";
+import { Document } from "@superbia/client";
+export type IdDocument<O extends string> = Document & {
+    [K in O]: string;
+};
+export type IdDocumentRecord<O extends string> = Record<string, IdDocument<O>>;
+export type ParsedResult<O extends string, T> = T extends string | number | boolean | null ? T : T extends IdDocument<O> ? string : {
+    [K in keyof T]: ParsedResult<O, T[K]>;
+};
+export declare class SuperbiaContext extends Context {
+    protected idKey: string;
+    protected typenameKey: string;
+    constructor(idKey: string);
+    protected isIdDocument(value: Record<string, any>): boolean;
+}

package/dist/esm/SuperbiaContext.js

@@ -0,0 +1,15 @@
+import { Context } from "untrue";
+export class SuperbiaContext extends Context {
+    idKey;
+    typenameKey = "__typename__";
+    constructor(idKey) {
+        super();
+        this.idKey = idKey;
+    }
+    isIdDocument(value) {
+        return (this.idKey in value &&
+            this.typenameKey in value &&
+            typeof value[this.idKey] === "string" &&
+            typeof value[this.typenameKey] === "string");
+    }
+}

package/dist/esm/index.d.ts

@@ -0,0 +1,4 @@
+export { default } from "./Api";
+export { ParsedResult } from "./SuperbiaContext";
+export { ApiDocument, ApiDocuments } from "./DocumentContext";
+export { ApiRequest, ApiRequests, RequestResult, PaginationResult, } from "./RequestContext";

package/dist/esm/index.js

@@ -0,0 +1,2 @@
+export { default } from "./Api";
+export { PaginationResult, } from "./RequestContext";

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@superbia/untrue",
-  "version": "2.1.8",
+  "version": "2.3.0",
   "description": "Integrate Superbia and Untrue.",
   "repository": {
     "type": "git",
     "url": "https://github.com/iconshot/superbia-untrue.git"
   },
-  "main": "dist/index.js",
+  "type": "module",
+  "main": "dist/esm/index.js",
   "scripts": {
     "clean": "rm -rf dist",
     "build": "npm run clean && tsc",
@@ -18,8 +19,8 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@superbia/client": "^2.1.3",
-    "untrue": "^5.15.2"
+    "@superbia/client": "^2.3.0",
+    "untrue": "^5.18.0"
   },
   "dependencies": {
     "uuid": "^10.0.0"

package/dist/Api.d.ts

@@ -1,15 +0,0 @@
-import { Context, State } from "untrue";
-import { Client, EndpointRecord, ResponseResult } from "@superbia/client";
-import { DocumentSchemaRecord } from "./SuperbiaContext";
-import { DocumentContext, Documents } from "./DocumentContext";
-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<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/DocumentContext.d.ts

@@ -1,13 +0,0 @@
-import { Client, Result, ResponseResult, EndpointRecord } from "@superbia/client";
-import { ParsedResult, SuperbiaContext, DocumentSchema, DocumentSchemaRecord } from "./SuperbiaContext";
-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"> = 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 {
-    data: Documents<K, O>;
-    constructor(client: Client<M, any>, idKey: string);
-    handleResult(result: ResponseResult): void;
-}

package/dist/DocumentContext.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DocumentContext = void 0;
-const SuperbiaContext_1 = require("./SuperbiaContext");
-class DocumentContext extends SuperbiaContext_1.SuperbiaContext {
-    constructor(client, idKey) {
-        super(idKey);
-        this.data = {};
-        const listener = (endpoints, emitter) => {
-            emitter.on("result", (result) => {
-                this.handleResult(result);
-            });
-        };
-        client.on("request", listener);
-        client.on("subscribe", listener);
-    }
-    handleResult(result) {
-        const data = {};
-        for (const tmpResult of Object.values(result)) {
-            this.parseResultValue(tmpResult, data);
-        }
-        const types = Object.keys(data);
-        if (types.length === 0) {
-            return;
-        }
-        const documents = this.data;
-        for (const type of types) {
-            if (!(type in documents)) {
-                documents[type] = {};
-            }
-            const tmpDocuments = data[type];
-            for (const id in tmpDocuments) {
-                documents[type][id] = tmpDocuments[id];
-            }
-        }
-        this.update();
-    }
-}
-exports.DocumentContext = DocumentContext;

package/dist/RequestContext.d.ts

@@ -1,28 +0,0 @@
-import { Result, Pagination, EndpointRecord, ResponseResult } from "@superbia/client";
-import { ParsedResult, SuperbiaContext } from "./SuperbiaContext";
-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>;
-};
-export type Request<T extends ResponseResult> = {
-    loading: boolean;
-    done: boolean;
-    result: T | null;
-    error: Error | null;
-};
-export type Requests<T extends EndpointRecord, O extends string = "id"> = Record<string, Request<Partial<RequestResult<{
-    [K in keyof T]: Result<T[K]["result"]>;
-}, O>>>>;
-export declare class RequestContext<M extends EndpointRecord, O extends string> extends SuperbiaContext {
-    data: Requests<M, O>;
-    parseResult(result: ResponseResult): ResponseResult;
-}

package/dist/RequestContext.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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);
-        this.data = {};
-    }
-    parseResult(result) {
-        const tmpResult = {};
-        for (const key in result) {
-            const endpointResult = result[key];
-            let tmpEndpointResult;
-            if (endpointResult !== null &&
-                typeof endpointResult === "object" &&
-                this.typenameKey in endpointResult &&
-                endpointResult[this.typenameKey].endsWith("Pagination")) {
-                tmpEndpointResult = new PaginationResult({
-                    loading: false,
-                    result: this.parseResultValue(endpointResult),
-                    error: null,
-                });
-            }
-            else {
-                tmpEndpointResult = this.parseResultValue(endpointResult);
-            }
-            tmpResult[key] = tmpEndpointResult;
-        }
-        return tmpResult;
-    }
-}
-exports.RequestContext = RequestContext;

package/dist/SuperbiaContext.d.ts

@@ -1,17 +0,0 @@
-import { Context } from "untrue";
-type IdObject<O extends string> = {
-    [K in O]: string;
-};
-export type ParsedResult<T, O extends string = "id"> = T extends string | number | boolean | null ? T : T extends IdObject<O> ? string : {
-    [K in keyof T]: ParsedResult<T[K], O>;
-};
-export type DocumentSchema = Record<string, any>;
-export type DocumentSchemaRecord = Record<string, DocumentSchema>;
-export type DocumentData = Record<string, Record<string, DocumentSchema>>;
-export declare class SuperbiaContext extends Context {
-    protected idKey: string;
-    protected typenameKey: string;
-    constructor(idKey: string);
-    parseResultValue(result: any, data?: DocumentData): any;
-}
-export {};

package/dist/SuperbiaContext.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SuperbiaContext = void 0;
-const untrue_1 = require("untrue");
-class SuperbiaContext extends untrue_1.Context {
-    constructor(idKey) {
-        super();
-        this.idKey = idKey;
-        this.typenameKey = "_typename";
-    }
-    parseResultValue(result, data = {}) {
-        if (result === null) {
-            return null;
-        }
-        if (Array.isArray(result)) {
-            return result.map((element) => this.parseResultValue(element, data));
-        }
-        if (typeof result === "object") {
-            const tmpResult = {};
-            for (const key in result) {
-                tmpResult[key] = this.parseResultValue(result[key], data);
-            }
-            const isDocument = this.idKey in result && this.typenameKey in result;
-            if (!isDocument) {
-                return tmpResult;
-            }
-            const id = result[this.idKey];
-            const typename = result[this.typenameKey];
-            if (!(typename in data)) {
-                data[typename] = {};
-            }
-            data[typename][id] = tmpResult;
-            return result[this.idKey];
-        }
-        return result;
-    }
-}
-exports.SuperbiaContext = SuperbiaContext;

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,10 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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; } });