@snowtop/ent 0.2.0-alpha.6.test2 → 0.2.0-alpha.8

package/graphql/query/edge_connection.js

@@ -1,23 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLEdgeConnection = void 0;
+const query_1 = require("../../core/query");
 // TODO probably need to template Ent. maybe 2 ents?
 class GraphQLEdgeConnection {
     constructor(viewer, arg2, arg3, args) {
         this.results = [];
         this.viewer = viewer;
+        async function resolveQuery(query, source) {
+            const resolved = await query;
+            // To have pagination correctly work with CustomClauseQuery in GraphQL contexts, we need to
+            // pass the source to the query so that we can set the page info correctly
+            // See https://github.com/lolopinto/ent/issues/1836 for full details of how this breaks down
+            if (resolved instanceof query_1.CustomClauseQuery && source !== undefined) {
+                resolved.__maybeSetSource(source);
+            }
+            return resolved;
+        }
+        let query;
+        let source;
         if (typeof arg2 === "function") {
-            this.query = arg2(this.viewer);
+            query = arg2(this.viewer);
         }
         else {
             this.source = arg2;
+            source = arg2;
         }
         if (typeof arg3 === "function") {
-            this.query = arg3(this.viewer, this.source);
+            query = arg3(this.viewer, this.source);
         }
         else {
             this.args = arg3;
         }
+        this.query = Promise.resolve(resolveQuery(query, source));
         if (args !== undefined) {
             this.args = args;
         }
@@ -29,27 +44,31 @@ class GraphQLEdgeConnection {
                 throw new Error("cannot process before without last");
             }
             if (this.args.first) {
-                this.query = this.query.first(this.args.first, this.args.after);
+                const argFirst = this.args.first;
+                const argAfter = this.args.after;
+                this.query = this.query.then((query) => query.first(argFirst, argAfter));
             }
             if (this.args.last) {
-                this.query = this.query.last(this.args.last, this.args.cursor);
+                const argLast = this.args.last;
+                const argBefore = this.args.before;
+                this.query = this.query.then((query) => query.last(argLast, argBefore));
             }
             // 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 +79,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 +91,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 +104,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,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonTests = void 0;
-const viewer_1 = require("../../core/viewer");
+const query_1 = require("../../core/query");
 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 +19,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 +50,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);
         }
     }
 }
@@ -50,14 +61,16 @@ const commonTests = (opts) => {
             q instanceof index_1.UserToContactsFkeyQueryDeprecated ||
             q instanceof index_1.UserToContactsFkeyQueryAsc ||
             q instanceof index_1.UserToContactsFkeyQueryDeletedAt ||
-            q instanceof index_1.UserToContactsFkeyQueryDeletedAtAsc);
+            q instanceof index_1.UserToContactsFkeyQueryDeletedAtAsc ||
+            q instanceof query_1.CustomClauseQuery);
     }
     function getCursorFrom(q, contacts, idx) {
         let opts;
         if (isCustomQuery(q)) {
             opts = {
                 row: contacts[idx],
-                keys: ["id"],
+                cursorKeys: ["created_at", "id"],
+                rowKeys: ["createdAt", "id"],
             };
         }
         else {
@@ -65,8 +78,8 @@ const commonTests = (opts) => {
             // is from assoc_edge table id2 field and so cursor takes it from there
             opts = {
                 row: contacts[idx],
-                keys: ["id2"],
-                cursorKeys: ["id"],
+                cursorKeys: ["time", "id2"],
+                rowKeys: ["createdAt", "id"],
             };
         }
         return (0, ent_1.getCursor)(opts);
@@ -92,7 +105,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 +137,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 +166,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.6.test2",
+  "version": "0.2.0-alpha.8",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/testutils/db_mock.d.ts

@@ -1,5 +1,5 @@
 import { Pool } from "pg";
-import { ID, Data } from "../core/base";
+import { Data, ID } from "../core/base";
 import { Clause } from "../core/clause";
 import { MockLogs } from "./mock_log";
 export interface queryOptions {

package/testutils/db_mock.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryRecorder = exports.queryType = void 0;
-const uuid_1 = require("uuid");
 const jest_mock_1 = require("jest-mock");
+const uuid_1 = require("uuid");
 const parse_sql_1 = require("./parse_sql");
 const eventEmitter = {
     on: jest.fn(),

package/testutils/ent-graphql-tests/index.d.ts

@@ -1,7 +1,7 @@
 import { Express, RequestHandler } from "express";
-import { Viewer } from "../../core/base";
 import { GraphQLSchema } from "graphql";
 import supertest from "supertest";
+import { Viewer } from "../../core/base";
 export type Option = [string, any] | [string, any, string];
 interface queryConfig {
     viewer?: Viewer;

package/testutils/ent-graphql-tests/index.js

@@ -30,12 +30,12 @@ exports.expectMutation = exports.expectQueryFromRoot = void 0;
 // NB: this is copied from ent-graphql-tests package until I have time to figure out how to share code here effectively
 // the circular dependencies btw this package and ent-graphql-tests seems to imply something needs to change
 const express_1 = __importDefault(require("express"));
-const graphql_helix_1 = require("graphql-helix");
+const fs = __importStar(require("fs"));
 const graphql_1 = require("graphql");
-const auth_1 = require("../../auth");
+const graphql_helix_1 = require("graphql-helix");
 const supertest_1 = __importDefault(require("supertest"));
-const fs = __importStar(require("fs"));
 const util_1 = require("util");
+const auth_1 = require("../../auth");
 function server(config) {
     const viewer = config.viewer;
     if (viewer) {
@@ -125,7 +125,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
     if (files.size) {
         let ret = test
             .post(config.graphQLPath || "/graphql")
-            .set(config.headers || {});
+            .set((config.headers || {}));
         ret.field("operations", JSON.stringify({
             query: query,
             variables: variables,
@@ -152,7 +152,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
             test,
             test
                 .post(config.graphQLPath || "/graphql")
-                .set(config.headers || {})
+                .set((config.headers || {}))
                 .send({
                 query: query,
                 variables: JSON.stringify(variables),

package/testutils/fake_data/user_query.d.ts

@@ -1,11 +1,11 @@
 import { Data, Ent, ID, Viewer } from "../../core/base";
-import { CustomEdgeQueryBase } from "../../core/query/custom_query";
-import { AssocEdge } from "../../core/ent";
 import * as clause from "../../core/clause";
-import { AssocEdgeQueryBase, EdgeQuerySource } from "../../core/query/assoc_query";
-import { FakeUser, FakeEvent, FakeContact, EventToAttendeesQuery, EventToDeclinedQuery, EventToHostsQuery, EventToInvitedQuery, EventToMaybeQuery } from "./internal";
-import { RawCountLoaderFactory } from "../../core/loaders/raw_count_loader";
+import { AssocEdge } from "../../core/ent";
 import { QueryLoaderFactory } from "../../core/loaders/query_loader";
+import { RawCountLoaderFactory } from "../../core/loaders/raw_count_loader";
+import { AssocEdgeQueryBase, EdgeQuerySource } from "../../core/query/assoc_query";
+import { CustomEdgeQueryBase } from "../../core/query/custom_query";
+import { EventToAttendeesQuery, EventToDeclinedQuery, EventToHostsQuery, EventToInvitedQuery, EventToMaybeQuery, FakeContact, FakeEvent, FakeUser } from "./internal";
 export declare class UserToContactsQuery extends AssocEdgeQueryBase<FakeUser, FakeContact, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToContactsQuery;

package/testutils/fake_data/user_query.js

@@ -24,21 +24,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserToFollowingQuery = exports.UserToEventsInNextWeekQuery = exports.getCompleteClause = exports.getNextWeekClause = exports.UserToHostedEventsQuery = exports.UserToEventsAttendingQuery = exports.UserToIncomingFriendRequestsQuery = exports.UserToFriendRequestsQuery = exports.UserToCustomEdgeQuery = exports.CustomEdge = exports.UserToFriendsQuery = exports.UserToContactsFkeyQueryDeletedAtAsc = exports.UserToContactsFkeyQueryAsc = exports.UserToContactsFkeyQueryDeletedAt = exports.UserToContactsFkeyQuery = exports.UserToContactsFkeyQueryDeprecated = exports.userToContactsDataLoaderFactory = exports.userToContactsCountLoaderFactory = exports.UserToContactsQuery = void 0;
-const custom_query_1 = require("../../core/query/custom_query");
-const ent_1 = require("../../core/ent");
+const jest_date_mock_1 = require("jest-date-mock");
+const _1 = require(".");
 const clause = __importStar(require("../../core/clause"));
-const assoc_query_1 = require("../../core/query/assoc_query");
-const internal_1 = require("./internal");
-const raw_count_loader_1 = require("../../core/loaders/raw_count_loader");
+const ent_1 = require("../../core/ent");
 const assoc_count_loader_1 = require("../../core/loaders/assoc_count_loader");
 const assoc_edge_loader_1 = require("../../core/loaders/assoc_edge_loader");
-const fake_contact_1 = require("./fake_contact");
-const jest_date_mock_1 = require("jest-date-mock");
-const luxon_1 = require("luxon");
 const query_loader_1 = require("../../core/loaders/query_loader");
-const mock_date_1 = require("./../mock_date");
-const _1 = require(".");
+const raw_count_loader_1 = require("../../core/loaders/raw_count_loader");
 const privacy_1 = require("../../core/privacy");
+const assoc_query_1 = require("../../core/query/assoc_query");
+const custom_query_1 = require("../../core/query/custom_query");
+const mock_date_1 = require("./../mock_date");
+const fake_contact_1 = require("./fake_contact");
+const internal_1 = require("./internal");
 class UserToContactsQuery extends assoc_query_1.AssocEdgeQueryBase {
     constructor(viewer, src) {
         super(viewer, src, new assoc_count_loader_1.AssocEdgeCountLoaderFactory(internal_1.EdgeType.UserToContacts), new assoc_edge_loader_1.AssocEdgeLoaderFactory(internal_1.EdgeType.UserToContacts, ent_1.AssocEdge), internal_1.FakeContact.loaderOptions());
@@ -351,10 +350,8 @@ const getNextWeekClause = () => {
     (0, jest_date_mock_1.clear)();
     const start = mock_date_1.MockDate.getDate();
     // 7 days
-    const end = luxon_1.Interval.after(start, 86400 * 1000 * 7)
-        .end.toUTC()
-        .toISO();
-    return clause.And(clause.GreaterEq("start_time", start.toISOString()), clause.LessEq("start_time", end));
+    const end = new Date(start.getTime() + 86400 * 1000 * 7);
+    return clause.And(clause.GreaterEq("start_time", start.toISOString()), clause.LessEq("start_time", end.toISOString()));
 };
 exports.getNextWeekClause = getNextWeekClause;
 function getCompleteClause(id) {

package/tsc/compilerOptions.js

@@ -60,9 +60,6 @@ function readCompilerOptions(filePath) {
     if (options.moduleResolution === "node") {
         options.moduleResolution = typescript_1.default.ModuleResolutionKind.NodeJs;
     }
-    if (options.target) {
-        options.target = getTarget(options.target.toString());
-    }
     return options;
 }
 exports.readCompilerOptions = readCompilerOptions;
@@ -95,7 +92,7 @@ function getTarget(target) {
 exports.getTarget = getTarget;
 function getTargetFromCurrentDir() {
     const options = readCompilerOptions(".");
-    return options.target ?? typescript_1.default.ScriptTarget.ESNext;
+    return getTarget(options.target?.toString());
 }
 exports.getTargetFromCurrentDir = getTargetFromCurrentDir;
 function createSourceFile(target, file) {