@snowtop/ent 0.1.0-alpha6 → 0.1.0-alpha9

package/testutils/db/test_db.js

@@ -336,7 +336,7 @@ class TempDB {
     getTables() {
         return this.tables;
     }
-    async beforeAll() {
+    async beforeAll(setupConnString = true) {
         if (this.dialect === db_1.Dialect.Postgres) {
             const user = process.env.POSTGRES_USER || "";
             const password = process.env.POSTGRES_PASSWORD || "";
@@ -348,11 +348,17 @@ class TempDB {
             await this.client.connect();
             this.db = randomDB();
             await this.client.query(`CREATE DATABASE ${this.db}`);
-            if (user && password) {
-                process.env.DB_CONNECTION_STRING = `postgres://${user}:${password}@localhost:5432/${this.db}`;
+            if (setupConnString) {
+                if (user && password) {
+                    process.env.DB_CONNECTION_STRING = `postgres://${user}:${password}@localhost:5432/${this.db}`;
+                }
+                else {
+                    process.env.DB_CONNECTION_STRING = `postgres://localhost/${this.db}?`;
+                }
             }
             else {
-                process.env.DB_CONNECTION_STRING = `postgres://localhost/${this.db}?`;
+                // will probably be setup via loadConfig
+                delete process.env.DB_CONNECTION_STRING;
             }
             this.dbClient = new pg_1.Client({
                 host: "localhost",
@@ -397,6 +403,9 @@ class TempDB {
         await this.client.query(`DROP DATABASE ${this.db}`);
         await this.client.end();
     }
+    getDB() {
+        return this.db;
+    }
     async dropAll() {
         for (const [t, _] of this.tables) {
             await this.drop(t);

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

@@ -16,6 +16,8 @@ interface queryConfig {
     callback?: (res: supertest.Response) => void;
     inlineFragmentRoot?: string;
     customHandlers?: RequestHandler[];
+    server?: any;
+    graphQLPath?: string;
 }
 export interface queryRootConfig extends queryConfig {
     root: string;

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

@@ -26,7 +26,7 @@ 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 express_graphql_1 = require("express-graphql");
+const graphql_helix_1 = require("graphql-helix");
 const graphql_1 = require("graphql");
 const auth_1 = require("../../auth");
 const supertest_1 = __importDefault(require("supertest"));
@@ -45,18 +45,23 @@ function server(config) {
     if (config.init) {
         config.init(app);
     }
+    app.use(express_1.default.json());
     let handlers = config.customHandlers || [];
-    handlers.push((0, express_graphql_1.graphqlHTTP)((request, response) => {
-        const doWork = async () => {
-            let context = await (0, auth_1.buildContext)(request, response);
-            return {
-                schema: config.schema,
-                context,
-            };
-        };
-        return doWork();
-    }));
-    app.use("/graphql", ...handlers);
+    handlers.push(async (req, res) => {
+        const { operationName, query, variables } = (0, graphql_helix_1.getGraphQLParameters)(req);
+        const result = await (0, graphql_helix_1.processRequest)({
+            operationName,
+            query,
+            variables,
+            request: req,
+            schema: config.schema,
+            contextFactory: async (executionContext) => {
+                return (0, auth_1.buildContext)(req, res);
+            },
+        });
+        await (0, graphql_helix_1.sendResult)(result, res);
+    });
+    app.use(config.graphQLPath || "/graphql", ...handlers);
     return app;
 }
 function getInnerType(typ, list) {
@@ -72,14 +77,14 @@ function makeGraphQLRequest(config, query, fieldArgs) {
     let test;
     if (config.test) {
         if (typeof config.test === "function") {
-            test = config.test(server(config));
+            test = config.test(config.server ? config.server : server(config));
         }
         else {
             test = config.test;
         }
     }
     else {
-        test = (0, supertest_1.default)(server(config));
+        test = (0, supertest_1.default)(config.server ? config.server : server(config));
     }
     let files = new Map();
     // handle files
@@ -104,7 +109,9 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         }
     });
     if (files.size) {
-        let ret = test.post("/graphql").set(config.headers || {});
+        let ret = test
+            .post(config.graphQLPath || "/graphql")
+            .set(config.headers || {});
         ret.field("operations", JSON.stringify({
             query: query,
             variables: config.args,
@@ -130,7 +137,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         return [
             test,
             test
-                .post("/graphql")
+                .post(config.graphQLPath || "/graphql")
                 .set(config.headers || {})
                 .send({
                 query: query,
@@ -353,7 +360,9 @@ async function expectFromRoot(config, ...options) {
     else {
         expect(res.ok, `expected ok response. instead got ${res.status} and result ${JSON.stringify(res.body)}`);
     }
-    if (!res.ok) {
+    // res.ok = true in graphql-helix when there's errors...
+    // res.ok = false in express-graphql when there's errors...
+    if (!res.ok || (res.body.errors && res.body.errors.length > 0)) {
         let errors = res.body.errors;
         expect(errors.length).toBeGreaterThan(0);
         if (config.expectedError) {

package/testutils/fake_data/fake_contact.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleBuilder } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleBuilder } from "../builder";
 import { NodeType } from "./const";
 import { ObjectLoaderFactory } from "../../core/loaders";
 export declare class FakeContact implements Ent {
@@ -22,10 +21,7 @@ export declare class FakeContact implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeContact | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeContact>;
 }
-export declare class FakeContactSchema extends BaseEntSchema implements BuilderSchema<FakeContact> {
-    ent: typeof FakeContact;
-    fields: FieldMap;
-}
+export declare const FakeContactSchema: import("../builder").BuilderSchema<FakeContact>;
 export interface ContactCreateInput {
     firstName: string;
     lastName: string;

package/testutils/fake_data/fake_contact.js

@@ -59,21 +59,14 @@ class FakeContact {
     }
 }
 exports.FakeContact = FakeContact;
-class FakeContactSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeContact;
-        this.fields = {
-            firstName: (0, schema_1.StringType)(),
-            lastName: (0, schema_1.StringType)(),
-            emailAddress: (0, schema_1.StringType)(),
-            userID: (0, schema_1.UUIDType)({
-                foreignKey: { schema: "User", column: "ID" },
-            }),
-        };
-    }
-}
-exports.FakeContactSchema = FakeContactSchema;
+exports.FakeContactSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    firstName: (0, schema_1.StringType)(),
+    lastName: (0, schema_1.StringType)(),
+    emailAddress: (0, schema_1.StringType)(),
+    userID: (0, schema_1.UUIDType)({
+        foreignKey: { schema: "User", column: "ID" },
+    }),
+}, FakeContact);
 function getContactBuilder(viewer, input) {
     const m = new Map();
     for (const key in input) {
@@ -82,7 +75,7 @@ function getContactBuilder(viewer, input) {
     //To lock in the value of Date now incase of advanceTo/advanceBy
     m.set("createdAt", new Date());
     m.set("updatedAt", new Date());
-    return new builder_1.SimpleBuilder(viewer, new FakeContactSchema(), m);
+    return new builder_1.SimpleBuilder(viewer, exports.FakeContactSchema, m);
 }
 exports.getContactBuilder = getContactBuilder;
 async function createContact(viewer, input) {

package/testutils/fake_data/fake_event.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleBuilder } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleBuilder } from "../builder";
 import { NodeType } from "./const";
 export declare class FakeEvent implements Ent {
     viewer: Viewer;
@@ -23,10 +22,7 @@ export declare class FakeEvent implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeEvent | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeEvent>;
 }
-export declare class FakeEventSchema extends BaseEntSchema implements BuilderSchema<FakeEvent> {
-    ent: typeof FakeEvent;
-    fields: FieldMap;
-}
+export declare const FakeEventSchema: import("../builder").BuilderSchema<FakeEvent>;
 export interface EventCreateInput {
     startTime: Date;
     endTime?: Date | null;

package/testutils/fake_data/fake_event.js

@@ -63,35 +63,28 @@ class FakeEvent {
     }
 }
 exports.FakeEvent = FakeEvent;
-class FakeEventSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeEvent;
-        this.fields = {
-            startTime: (0, schema_1.TimestampType)({
-                index: true,
-            }),
-            endTime: (0, schema_1.TimestampType)({
-                nullable: true,
-            }),
-            title: (0, schema_1.StringType)(),
-            location: (0, schema_1.StringType)(),
-            description: (0, schema_1.StringType)({
-                nullable: true,
-            }),
-            userID: (0, schema_1.UUIDType)({
-                foreignKey: { schema: "User", column: "ID" },
-            }),
-        };
-    }
-}
-exports.FakeEventSchema = FakeEventSchema;
+exports.FakeEventSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    startTime: (0, schema_1.TimestampType)({
+        index: true,
+    }),
+    endTime: (0, schema_1.TimestampType)({
+        nullable: true,
+    }),
+    title: (0, schema_1.StringType)(),
+    location: (0, schema_1.StringType)(),
+    description: (0, schema_1.StringType)({
+        nullable: true,
+    }),
+    userID: (0, schema_1.UUIDType)({
+        foreignKey: { schema: "User", column: "ID" },
+    }),
+}, FakeEvent);
 function getEventBuilder(viewer, input) {
     const m = new Map();
     for (const key in input) {
         m.set(key, input[key]);
     }
-    return new builder_1.SimpleBuilder(viewer, new FakeEventSchema(), m);
+    return new builder_1.SimpleBuilder(viewer, exports.FakeEventSchema, m);
 }
 exports.getEventBuilder = getEventBuilder;
 async function createEvent(viewer, input) {

package/testutils/fake_data/fake_user.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleAction } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleAction } from "../builder";
 import { NodeType } from "./const";
 import { IDViewer, IDViewerOptions } from "../../core/viewer";
 import { ObjectLoaderFactory } from "../../core/loaders";
@@ -32,10 +31,7 @@ export declare class FakeUser implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeUser | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeUser>;
 }
-export declare class FakeUserSchema extends BaseEntSchema implements BuilderSchema<FakeUser> {
-    ent: typeof FakeUser;
-    fields: FieldMap;
-}
+export declare const FakeUserSchema: import("../builder").BuilderSchema<FakeUser>;
 export interface UserCreateInput {
     firstName: string;
     lastName: string;

package/testutils/fake_data/fake_user.js

@@ -89,22 +89,15 @@ class FakeUser {
     }
 }
 exports.FakeUser = FakeUser;
-class FakeUserSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeUser;
-        this.fields = {
-            firstName: (0, schema_1.StringType)(),
-            lastName: (0, schema_1.StringType)(),
-            emailAddress: (0, schema_1.StringType)(),
-            phoneNumber: (0, schema_1.StringType)(),
-            password: (0, schema_1.StringType)({
-                nullable: true,
-            }),
-        };
-    }
-}
-exports.FakeUserSchema = FakeUserSchema;
+exports.FakeUserSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    firstName: (0, schema_1.StringType)(),
+    lastName: (0, schema_1.StringType)(),
+    emailAddress: (0, schema_1.StringType)(),
+    phoneNumber: (0, schema_1.StringType)(),
+    password: (0, schema_1.StringType)({
+        nullable: true,
+    }),
+}, FakeUser);
 function getUserBuilder(viewer, input) {
     const action = getUserAction(viewer, input);
     return action.builder;
@@ -115,7 +108,7 @@ function getUserAction(viewer, input) {
     for (const key in input) {
         m.set(key, input[key]);
     }
-    const action = new builder_1.SimpleAction(viewer, new FakeUserSchema(), m);
+    const action = new builder_1.SimpleAction(viewer, exports.FakeUserSchema, m);
     action.viewerForEntLoad = (data) => {
         // load the created ent using a VC of the newly created user.
         return new viewer_1.IDViewer(data.id);

package/testutils/fake_data/test_helpers.js

@@ -107,7 +107,7 @@ async function createUserPlusFriendRequests(input, slice) {
         return createTestUser(input);
     }));
     expect(friendRequests.length).toBe(userInputs.length);
-    await addEdge(user, new _1.FakeUserSchema(), _1.EdgeType.UserToFriendRequests, true, ...friendRequests);
+    await addEdge(user, _1.FakeUserSchema, _1.EdgeType.UserToFriendRequests, true, ...friendRequests);
     return [user, friendRequests];
 }
 exports.createUserPlusFriendRequests = createUserPlusFriendRequests;