@superbia/untrue 1.1.6 → 1.1.8

package/README.md

@@ -373,11 +373,8 @@ To implement paginated requests the server must return a Pagination object.
       { "_typename": "Post", "_id": "123", "text": "Hello world" },
       { "_typename": "Post", "_id": "456", "text": "Lorem ipsum" }
     ],
-    "pageInfo": {
-      "_typename": "PaginationPageInfo",
-      "hasNextPage": true,
-      "nextPageCursor": "789"
-    }
+    "hasNextPage": true,
+    "nextPageCursor": "789"
   }
 }
 ```
@@ -388,7 +385,7 @@ To implement paginated requests the server must return a Pagination object.
 this.requests = {
   someRequestKey: {
     loading: false,
-    done: false,
+    done: true,
     error: null,
     data: {
       userPosts: {
@@ -396,7 +393,8 @@ this.requests = {
         error: null,
         data: {
           nodes: ["123", "456"],
-          pageInfo: { hasNextPage: true, nextPageCursor: "789" },
+          hasNextPage: true,
+          nextPageCursor: "789",
         },
       },
     },
@@ -518,7 +516,8 @@ export default Wrapper.wrapContext(Content, AppRequestContext, (props) => {
     error,
     data: {
       nodes: postIds, // renaming for convenience
-      pageInfo: { hasNextPage, nextPageCursor },
+      hasNextPage,
+      nextPageCursor,
     },
   } = requests[requestKey].data.posts; // the desired request's data
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superbia/untrue",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "Integrate Superbia and Untrue.",
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "untrue": "^4.0.5"
+    "untrue": "^4.4.2"
   },
   "dependencies": {
     "uuid": "^9.0.0"

package/src/DocumentContext.js

@@ -1,22 +1,17 @@
 import SuperbiaContext from "./SuperbiaContext";
 
 export class DocumentContext extends SuperbiaContext {
-  constructor(client, documentKeys) {
-    super(documentKeys);
+  constructor(client, id) {
+    super(id);
 
     this.documents = {};
 
-    client
-      .on("request", (endpoints, emitter) => {
-        emitter.on("data", (data) => {
-          this.onData(data);
-        });
-      })
-      .on("subscribe", (endpoint, emitter) => {
-        emitter.on("data", (data) => {
-          this.onData(data);
-        });
-      });
+    const listener = (endpoints, emitter) => {
+      emitter.on("data", (data) => this.data(data));
+    };
+
+    client.on("request", listener);
+    client.on("subscribe", listener);
   }
 
   // default persistence
@@ -33,7 +28,7 @@ export class DocumentContext extends SuperbiaContext {
     return this.documents;
   }
 
-  onData(data) {
+  data(data) {
     const newData = {};
 
     Object.values(data).forEach((result) => {

package/src/RequestContext.js

@@ -1,8 +1,8 @@
 import SuperbiaContext from "./SuperbiaContext";
 
 export class RequestContext extends SuperbiaContext {
-  constructor(client, documentKeys) {
-    super(documentKeys);
+  constructor(client, id) {
+    super(id);
 
     this.requests = {};
 
@@ -31,8 +31,8 @@ export class RequestContext extends SuperbiaContext {
     if (
       result !== null &&
       typeof result === "object" &&
-      this.documentKeys.typename in result &&
-      result[this.documentKeys.typename].endsWith("Pagination")
+      this.keys.typename in result &&
+      result[this.keys.typename].endsWith("Pagination")
     ) {
       return { loading: false, error: null, data: this.parseResult(result) };
     } else {
@@ -40,7 +40,7 @@ export class RequestContext extends SuperbiaContext {
     }
   }
 
-  onRequest = async (key, endpoints, payload = null) => {
+  async request(key, endpoints, payload = null) {
     key = key !== null && key !== undefined ? key : Date.now().toString();
 
     this.requests[key] = {
@@ -104,9 +104,9 @@ export class RequestContext extends SuperbiaContext {
 
       this.update();
     }
-  };
+  }
 
-  onLoad = async (key, endpoints, payload = null) => {
+  async load(key, endpoints, payload = null) {
     const interceptors = this.intercept();
 
     const endpointKey = Object.keys(endpoints)[0];
@@ -151,5 +151,5 @@ export class RequestContext extends SuperbiaContext {
 
       this.update();
     }
-  };
+  }
 }

package/src/SuperbiaContext.js

@@ -1,10 +1,10 @@
 import { Context } from "untrue";
 
 class SuperbiaContext extends Context {
-  constructor(documentKeys) {
+  constructor(id = "id") {
     super();
 
-    this.documentKeys = documentKeys;
+    this.keys = { id, typename: "_typename" };
   }
 
   parseResult(result, data = {}) {
@@ -13,7 +13,7 @@ class SuperbiaContext extends Context {
     }
 
     if (Array.isArray(result)) {
-      return result.map((item) => this.parseResult(item, data));
+      return result.map((element) => this.parseResult(element, data));
     }
 
     if (typeof result === "object") {
@@ -23,15 +23,14 @@ class SuperbiaContext extends Context {
         newResult[key] = this.parseResult(result[key], data);
       }
 
-      const isDocument =
-        this.documentKeys.id in result && this.documentKeys.typename in result;
+      const isDocument = this.keys.id in result && this.keys.typename in result;
 
       if (!isDocument) {
         return newResult;
       }
 
-      const id = result[this.documentKeys.id];
-      const typename = result[this.documentKeys.typename];
+      const id = result[this.keys.id];
+      const typename = result[this.keys.typename];
 
       if (!(typename in data)) {
         data[typename] = {};
@@ -39,7 +38,7 @@ class SuperbiaContext extends Context {
 
       data[typename][id] = newResult;
 
-      return result[this.documentKeys.id];
+      return result[this.keys.id];
     }
 
     return result;