@snowtop/ent 0.2.0-alpha.4 → 0.2.0-alpha.6

package/graphql/graphql.js

@@ -517,6 +517,9 @@ class GQLCapture {
                 field.results.forEach((result) => {
                     if (result.needsResolving) {
                         if (baseObjects.has(result.type) ||
+                            // allow custom input objects to be returned
+                            // depend on GraphQL type complaining if we try and reference an input from a non-input object
+                            this.customInputObjects.has(result.type) ||
                             this.customUnions.has(result.type) ||
                             this.customInterfaces.has(result.type) ||
                             this.customTypes.has(result.type)) {

package/graphql/query/edge_connection.d.ts

@@ -1,18 +1,19 @@
-import { EdgeQuery, PaginationInfo } from "../../core/query/query";
 import { Data, Ent, ID, Viewer } from "../../core/base";
+import { EdgeQuery, PaginationInfo } from "../../core/query/query";
 export interface GraphQLEdge<T extends Data> {
     edge: T;
     node: Ent;
     cursor: string;
 }
+type MaybePromise<T> = T | Promise<T>;
 interface edgeQueryCtr<T extends Ent, TEdge extends Data, TViewer extends Viewer> {
-    (v: TViewer, src: T): EdgeQuery<T, Ent, TEdge>;
+    (v: TViewer, src: T): MaybePromise<EdgeQuery<T, Ent, TEdge>>;
 }
 interface edgeQueryCtr2<T extends Ent, TEdge extends Data, TViewer extends Viewer> {
-    (v: TViewer): EdgeQuery<T, Ent, TEdge>;
+    (v: TViewer): MaybePromise<EdgeQuery<T, Ent, TEdge>>;
 }
 export declare class GraphQLEdgeConnection<TSource extends Ent, TEdge extends Data, TViewer extends Viewer = Viewer> {
-    query: EdgeQuery<TSource, Ent, TEdge>;
+    query: Promise<EdgeQuery<TSource, Ent, TEdge>>;
     private results;
     private viewer;
     private source?;

package/graphql/query/edge_connection.js

@@ -7,13 +7,13 @@ class GraphQLEdgeConnection {
         this.results = [];
         this.viewer = viewer;
         if (typeof arg2 === "function") {
-            this.query = arg2(this.viewer);
+            this.query = Promise.resolve(arg2(this.viewer));
         }
         else {
             this.source = arg2;
         }
         if (typeof arg3 === "function") {
-            this.query = arg3(this.viewer, this.source);
+            this.query = Promise.resolve(arg3(this.viewer, this.source));
         }
         else {
             this.args = arg3;
@@ -28,28 +28,31 @@ class GraphQLEdgeConnection {
             if (this.args.before && !this.args.before) {
                 throw new Error("cannot process before without last");
             }
+            const argFirst = this.args.first;
+            const argLast = this.args.last;
+            const argCursor = this.args.cursor;
             if (this.args.first) {
-                this.query = this.query.first(this.args.first, this.args.after);
+                this.query = this.query.then((query) => query.first(argFirst, argLast));
             }
             if (this.args.last) {
-                this.query = this.query.last(this.args.last, this.args.cursor);
+                this.query = this.query.then((query) => query.last(argLast, argCursor));
             }
             // TODO custom args
             // how to proceed
         }
     }
     first(limit, cursor) {
-        this.query = this.query.first(limit, cursor);
+        this.query = this.query.then((query) => query.first(limit, cursor));
     }
     last(limit, cursor) {
-        this.query = this.query.last(limit, cursor);
+        this.query = this.query.then((query) => query.last(limit, cursor));
     }
     // any custom filters can be applied here...
     modifyQuery(fn) {
-        this.query = fn(this.query);
+        this.query = this.query.then((query) => fn(query));
     }
     async queryTotalCount() {
-        return this.query.queryRawCount();
+        return (await this.query).queryRawCount();
     }
     async queryEdges() {
         // because of privacy, we need to query the node regardless of if the node is there
@@ -60,7 +63,7 @@ class GraphQLEdgeConnection {
     // if nodes queried just return ents
     // unlikely to query nodes and pageInfo so we just load this separately for now
     async queryNodes() {
-        return this.query.queryEnts();
+        return (await this.query).queryEnts();
     }
     defaultPageInfo() {
         return {
@@ -72,7 +75,7 @@ class GraphQLEdgeConnection {
     }
     async queryPageInfo() {
         await this.queryData();
-        const paginationInfo = this.query.paginationInfo();
+        const paginationInfo = (await this.query).paginationInfo();
         if (this.source !== undefined) {
             return paginationInfo.get(this.source.id) || this.defaultPageInfo();
         }
@@ -85,24 +88,25 @@ class GraphQLEdgeConnection {
         return this.defaultPageInfo();
     }
     async queryData() {
+        const query = await this.query;
         const [edges, ents] = await Promise.all([
             // TODO need a test that this will only fetch edges once
             // and then fetch ents afterward
-            this.query.queryEdges(),
-            this.query.queryEnts(),
+            query.queryEdges(),
+            query.queryEnts(),
         ]);
         let entsMap = new Map();
         ents.forEach((ent) => entsMap.set(ent.id, ent));
         let results = [];
         for (const edge of edges) {
-            const node = entsMap.get(this.query.dataToID(edge));
+            const node = entsMap.get(query.dataToID(edge));
             if (!node) {
                 continue;
             }
             results.push({
                 edge,
                 node,
-                cursor: this.query.getCursor(edge),
+                cursor: query.getCursor(edge),
             });
         }
         this.results = results;

package/graphql/query/shared_edge_connection.d.ts

@@ -1,6 +1,6 @@
-import { Viewer, Data, Ent } from "../../core/base";
-import { FakeContact } from "../../testutils/fake_data/index";
+import { Data, Ent, Viewer } from "../../core/base";
 import { EdgeQuery } from "../../core/query/query";
+import { FakeContact } from "../../testutils/fake_data/index";
 interface options<TEnt extends Ent, TEdge extends Data> {
     getQuery: (v: Viewer, src: Ent) => EdgeQuery<TEnt, Ent, TEdge>;
     tableName: string;

package/graphql/query/shared_edge_connection.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonTests = void 0;
-const viewer_1 = require("../../core/viewer");
 const ent_1 = require("../../core/ent");
-const edge_connection_1 = require("./edge_connection");
+const viewer_1 = require("../../core/viewer");
 const index_1 = require("../../testutils/fake_data/index");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
+const edge_connection_1 = require("./edge_connection");
 class TestConnection {
     constructor(getQuery, ents, filter) {
         this.getQuery = getQuery;
@@ -18,10 +18,20 @@ class TestConnection {
         this.allContacts = this.allContacts.reverse();
         this.conn = new edge_connection_1.GraphQLEdgeConnection(new viewer_1.IDViewer(this.user.id), this.user, (v, user) => this.getQuery(v, user));
         if (this.filter) {
-            this.filter(this.conn, this.user, this.allContacts);
+            await this.filter(this.conn, this.user, this.allContacts);
         }
         this.filteredContacts = this.ents(this.allContacts);
     }
+    async testAsyncConn() {
+        const asyncConn = new edge_connection_1.GraphQLEdgeConnection(new viewer_1.IDViewer(this.user.id), this.user, (v, user) => new Promise((resolve) => {
+            setTimeout(() => resolve(this.getQuery(v, user)), 0);
+        }));
+        if (this.filter) {
+            await this.filter(asyncConn, this.user, this.allContacts);
+        }
+        const count = await asyncConn.queryTotalCount();
+        expect(count).toBe(test_helpers_1.inputs.length);
+    }
     async testTotalCount() {
         const count = await this.conn.queryTotalCount();
         expect(count).toBe(test_helpers_1.inputs.length);
@@ -39,7 +49,7 @@ class TestConnection {
         for (let i = 0; i < this.filteredContacts.length; i++) {
             const edge = edges[i];
             expect(edge.node.id).toBe(this.filteredContacts[i].id);
-            expect(this.conn.query.dataToID(edge.edge)).toBe(this.filteredContacts[i].id);
+            expect((await this.conn.query).dataToID(edge.edge)).toBe(this.filteredContacts[i].id);
         }
     }
 }
@@ -92,7 +102,7 @@ const commonTests = (opts) => {
         });
     });
     describe("filters. firstN", () => {
-        const filter = new TestConnection((v, user) => opts.getQuery(v, user), (contacts) => contacts.slice(0, 2), (conn) => {
+        const filter = new TestConnection((v, user) => opts.getQuery(v, user), (contacts) => contacts.slice(0, 2), async (conn) => {
             conn.first(2);
         });
         beforeEach(async () => {
@@ -124,8 +134,8 @@ const commonTests = (opts) => {
         const N = 3;
         const filter = new TestConnection((v, user) => opts.getQuery(v, user), 
         // get the next 2
-        (contacts) => contacts.slice(idx + 1, idx + N), (conn, user, contacts) => {
-            const cursor = getCursorFrom(conn.query, contacts, idx);
+        (contacts) => contacts.slice(idx + 1, idx + N), async (conn, user, contacts) => {
+            const cursor = getCursorFrom(await conn.query, contacts, idx);
             conn.first(2, cursor);
         });
         beforeEach(async () => {
@@ -153,9 +163,9 @@ const commonTests = (opts) => {
         });
     });
     describe("filters. before  cursor", () => {
-        const filter = new TestConnection((v, user) => opts.getQuery(v, user), (contacts) => contacts.slice(2, 4).reverse(), (conn, user, contacts) => {
+        const filter = new TestConnection((v, user) => opts.getQuery(v, user), (contacts) => contacts.slice(2, 4).reverse(), async (conn, user, contacts) => {
             // get the 2 before it
-            const cursor = getCursorFrom(conn.query, contacts, 4);
+            const cursor = getCursorFrom(await conn.query, contacts, 4);
             conn.last(2, cursor);
         });
         beforeEach(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.2.0-alpha.4",
+  "version": "0.2.0-alpha.6",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",