@snowtop/ent 0.2.0-alpha.10-test1 → 0.2.0-alpha.11-test1

package/testutils/db/temp_db.js

@@ -26,7 +26,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getColumnFromField = exports.getSchemaTable = exports.doSQLiteTestFromSchemas = exports.setupPostgres = exports.setupSqlite = exports.assoc_edge_table = exports.assoc_edge_config_table = exports.TempDB = exports.enumType = exports.table = exports.boolList = exports.dateList = exports.timetzList = exports.timeList = exports.timestamptzList = exports.timestampList = exports.uuidList = exports.integerList = exports.textList = exports.bytea = exports.jsonb = exports.json = exports.float = exports.integer = exports.bool = exports.date = exports.timetz = exports.time = exports.timestamptz = exports.timestamp = exports.enumCol = exports.text = exports.uuid = exports.index = exports.check = exports.foreignKey = exports.primaryKey = void 0;
+exports.TempDB = void 0;
+exports.primaryKey = primaryKey;
+exports.foreignKey = foreignKey;
+exports.check = check;
+exports.index = index;
+exports.uuid = uuid;
+exports.text = text;
+exports.enumCol = enumCol;
+exports.timestamp = timestamp;
+exports.timestamptz = timestamptz;
+exports.time = time;
+exports.timetz = timetz;
+exports.date = date;
+exports.bool = bool;
+exports.integer = integer;
+exports.float = float;
+exports.json = json;
+exports.jsonb = jsonb;
+exports.bytea = bytea;
+exports.textList = textList;
+exports.integerList = integerList;
+exports.uuidList = uuidList;
+exports.timestampList = timestampList;
+exports.timestamptzList = timestamptzList;
+exports.timeList = timeList;
+exports.timetzList = timetzList;
+exports.dateList = dateList;
+exports.boolList = boolList;
+exports.table = table;
+exports.enumType = enumType;
+exports.assoc_edge_config_table = assoc_edge_config_table;
+exports.assoc_edge_table = assoc_edge_table;
+exports.setupSqlite = setupSqlite;
+exports.setupPostgres = setupPostgres;
+exports.doSQLiteTestFromSchemas = doSQLiteTestFromSchemas;
+exports.getSchemaTable = getSchemaTable;
+exports.getColumnFromField = getColumnFromField;
 const pg_1 = require("pg");
 const db_1 = __importStar(require("../../core/db"));
 // this should only be used in tests so we expect to be able to import without shenanigans
@@ -45,7 +81,6 @@ function primaryKey(name, cols) {
         },
     };
 }
-exports.primaryKey = primaryKey;
 function foreignKey(name, cols, fkey) {
     return {
         name,
@@ -54,7 +89,6 @@ function foreignKey(name, cols, fkey) {
         },
     };
 }
-exports.foreignKey = foreignKey;
 function check(name, condition) {
     return {
         name,
@@ -63,7 +97,6 @@ function check(name, condition) {
         },
     };
 }
-exports.check = check;
 function unique(name, cols, tableName) {
     return {
         name,
@@ -97,7 +130,6 @@ function index(tableName, cols, opts) {
         },
     };
 }
-exports.index = index;
 function uuid(name, opts) {
     return {
         name,
@@ -107,7 +139,6 @@ function uuid(name, opts) {
         ...opts,
     };
 }
-exports.uuid = uuid;
 function text(name, opts) {
     return {
         name,
@@ -117,7 +148,6 @@ function text(name, opts) {
         ...opts,
     };
 }
-exports.text = text;
 function enumCol(name, type) {
     return {
         name,
@@ -126,7 +156,6 @@ function enumCol(name, type) {
         },
     };
 }
-exports.enumCol = enumCol;
 function timestamp(name, opts) {
     return {
         name,
@@ -136,7 +165,6 @@ function timestamp(name, opts) {
         ...opts,
     };
 }
-exports.timestamp = timestamp;
 function timestamptz(name, opts) {
     return {
         name,
@@ -151,7 +179,6 @@ function timestamptz(name, opts) {
         ...opts,
     };
 }
-exports.timestamptz = timestamptz;
 function time(name, opts) {
     return {
         name,
@@ -161,7 +188,6 @@ function time(name, opts) {
         ...opts,
     };
 }
-exports.time = time;
 function timetz(name, opts) {
     return {
         name,
@@ -171,7 +197,6 @@ function timetz(name, opts) {
         ...opts,
     };
 }
-exports.timetz = timetz;
 function date(name, opts) {
     return {
         name,
@@ -181,7 +206,6 @@ function date(name, opts) {
         ...opts,
     };
 }
-exports.date = date;
 function bool(name, opts) {
     const dialect = db_1.default.getDialect();
     if (opts?.default === "FALSE" && dialect === db_1.Dialect.SQLite) {
@@ -198,7 +222,6 @@ function bool(name, opts) {
         ...opts,
     };
 }
-exports.bool = bool;
 function integer(name, opts) {
     return {
         name,
@@ -208,7 +231,6 @@ function integer(name, opts) {
         ...opts,
     };
 }
-exports.integer = integer;
 function float(name, opts) {
     return {
         name,
@@ -218,7 +240,6 @@ function float(name, opts) {
         ...opts,
     };
 }
-exports.float = float;
 function json(name, opts) {
     return {
         name,
@@ -228,7 +249,6 @@ function json(name, opts) {
         ...opts,
     };
 }
-exports.json = json;
 function jsonb(name, opts) {
     return {
         name,
@@ -238,7 +258,6 @@ function jsonb(name, opts) {
         ...opts,
     };
 }
-exports.jsonb = jsonb;
 function bytea(name, opts) {
     return {
         name,
@@ -248,7 +267,6 @@ function bytea(name, opts) {
         ...opts,
     };
 }
-exports.bytea = bytea;
 function list(name, col, opts) {
     return {
         name,
@@ -261,39 +279,30 @@ function list(name, col, opts) {
 function textList(name, opts) {
     return list(name, text(name), opts);
 }
-exports.textList = textList;
 function integerList(name, opts) {
     return list(name, integer(name), opts);
 }
-exports.integerList = integerList;
 function uuidList(name, opts) {
     return list(name, uuid(name), opts);
 }
-exports.uuidList = uuidList;
 function timestampList(name, opts) {
     return list(name, timestamp(name), opts);
 }
-exports.timestampList = timestampList;
 function timestamptzList(name, opts) {
     return list(name, timestamptz(name), opts);
 }
-exports.timestamptzList = timestamptzList;
 function timeList(name, opts) {
     return list(name, time(name), opts);
 }
-exports.timeList = timeList;
 function timetzList(name, opts) {
     return list(name, timetz(name), opts);
 }
-exports.timetzList = timetzList;
 function dateList(name, opts) {
     return list(name, date(name), opts);
 }
-exports.dateList = dateList;
 function boolList(name, opts) {
     return list(name, bool(name), opts);
 }
-exports.boolList = boolList;
 function table(name, ...items) {
     let cols = [];
     let constraints = [];
@@ -370,7 +379,6 @@ function table(name, ...items) {
         },
     };
 }
-exports.table = table;
 function enumType(name, values) {
     return {
         name,
@@ -382,7 +390,6 @@ function enumType(name, values) {
         },
     };
 }
-exports.enumType = enumType;
 function randomDB() {
     let str = Math.random().toString(16).substring(2);
     // always ensure it starts with an alpha character
@@ -565,7 +572,6 @@ function assoc_edge_config_table() {
     // edge_type and inverse_edge_type are text intentionally instead of uuid...
     text("edge_type", { primaryKey: true }), text("edge_name"), bool("symmetric_edge", { default: "FALSE" }), text("inverse_edge_type", { nullable: true }), text("edge_table"), timestamptz("created_at"), timestamptz("updated_at"));
 }
-exports.assoc_edge_config_table = assoc_edge_config_table;
 // if global flag is true, add any column from testEdgeGlobalSchema
 // up to caller to set/clear that as needed
 function assoc_edge_table(name, global, unique_edge) {
@@ -592,7 +598,6 @@ function assoc_edge_table(name, global, unique_edge) {
     }
     return t;
 }
-exports.assoc_edge_table = assoc_edge_table;
 function setupSqlite(connString, tables, opts) {
     let tdb = new TempDB({
         dialect: db_1.Dialect.SQLite,
@@ -628,7 +633,6 @@ function setupSqlite(connString, tables, opts) {
     });
     return tdb;
 }
-exports.setupSqlite = setupSqlite;
 function setupPostgres(tables, opts) {
     let tdb;
     beforeAll(async () => {
@@ -650,7 +654,6 @@ function setupPostgres(tables, opts) {
         await tdb.afterAll();
     });
 }
-exports.setupPostgres = setupPostgres;
 async function doSQLiteTestFromSchemas(schemas, doTest, db) {
     const connString = `sqlite:///${db || randomDB()}.db`;
     const tables = schemas.map((schema) => getSchemaTable(schema, db_1.Dialect.SQLite));
@@ -663,7 +666,6 @@ async function doSQLiteTestFromSchemas(schemas, doTest, db) {
     delete process.env.DB_CONNECTION_STRING;
     return tdb;
 }
-exports.doSQLiteTestFromSchemas = doSQLiteTestFromSchemas;
 function getSchemaTable(schema, dialect) {
     const fields = (0, schema_1.getFields)(schema);
     const items = [];
@@ -702,7 +704,6 @@ function getSchemaTable(schema, dialect) {
     }
     return table(tableName, ...items);
 }
-exports.getSchemaTable = getSchemaTable;
 function getColumnForDbType(t, dialect) {
     switch (t) {
         case schema_1.DBType.UUID:
@@ -762,7 +763,6 @@ function getColumnFromField(fieldName, f, dialect) {
             return getColumn(fieldName, f, fn);
     }
 }
-exports.getColumnFromField = getColumnFromField;
 function getColumn(fieldName, f, col) {
     return col(storageKey(fieldName, f), buildOpts(f));
 }

package/testutils/db/value.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultValue = exports.randomPhoneNumber = exports.randomEmail = void 0;
+exports.randomEmail = randomEmail;
+exports.randomPhoneNumber = randomPhoneNumber;
+exports.getDefaultValue = getDefaultValue;
 const uuid_1 = require("uuid");
 const schema_1 = require("../../schema");
 const schema_2 = require("../../schema");
@@ -11,11 +13,9 @@ function randomEmail(domain) {
     domain = domain || "email.com";
     return `test+${random()}@${domain}`;
 }
-exports.randomEmail = randomEmail;
 function randomPhoneNumber() {
     return `+1${Math.random().toString(10).substring(2, 11)}`;
 }
-exports.randomPhoneNumber = randomPhoneNumber;
 function coinFlip() {
     return Math.floor(Math.random() * 10) >= 5;
 }
@@ -54,7 +54,6 @@ function getDefaultValue(f, col, infos) {
     }
     return getValueForType(f.type, f, infos);
 }
-exports.getDefaultValue = getDefaultValue;
 function getValueForType(typ, f, infos) {
     switch (typ.dbType) {
         case schema_1.DBType.UUID:

package/testutils/db_mock.js

@@ -229,15 +229,46 @@ class QueryRecorder {
     }
     static mockPool(pool) {
         const mockedPool = (0, jest_mock_1.mocked)(pool);
-        // @ts-ignore
-        // TODO what changed in mockImplementation?
+        // changed to any but seems off
         mockedPool.mockImplementation(() => {
             return {
                 totalCount: 1,
                 idleCount: 1,
                 waitingCount: 1,
-                connect: async () => {
-                    return {
+                ending: false,
+                ended: false,
+                expiredCount: 1,
+                options: {
+                    max: 1,
+                    maxUses: 1,
+                    allowExitOnIdle: true,
+                    maxLifetimeSeconds: 1,
+                    idleTimeoutMillis: 1,
+                },
+                connect: function (callback) {
+                    if (callback) {
+                        // return;
+                        // const client = {
+                        //   connect: jest.fn(),
+                        //   release: jest.fn(),
+                        //   query: jest
+                        //     .fn()
+                        //     .mockImplementation((query: string, values: any[]) => {
+                        //       return QueryRecorder.recordQuery(query, values);
+                        //     }),
+                        //   copyFrom: jest.fn(),
+                        //   copyTo: jest.fn(),
+                        //   pauseDrain: jest.fn(),
+                        //   resumeDrain: jest.fn(),
+                        //   escapeIdentifier: jest.fn(),
+                        //   escapeLiteral: jest.fn(),
+                        //   setTypeParser: jest.fn(),
+                        //   getTypeParser: jest.fn(),
+                        //   ...eventEmitter,
+                        // };
+                        // callback(null as unknown as Error, client, jest.fn());
+                    }
+                    return Promise.resolve({
                         connect: jest.fn(),
                         release: jest.fn(),
                         query: jest
@@ -251,9 +282,10 @@ class QueryRecorder {
                         resumeDrain: jest.fn(),
                         escapeIdentifier: jest.fn(),
                         escapeLiteral: jest.fn(),
-                        // EventEmitter
+                        setTypeParser: jest.fn(),
+                        getTypeParser: jest.fn(),
                         ...eventEmitter,
-                    };
+                    });
                 },
                 end: jest.fn(),
                 query: jest.fn().mockImplementation(QueryRecorder.recordQuery),

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

@@ -6,7 +6,7 @@ export type Option = [string, any] | [string, any, string];
 interface queryConfig {
     viewer?: Viewer;
     init?: (app: Express) => void;
-    test?: supertest.SuperTest<supertest.Test> | ((express: Express) => supertest.SuperTest<supertest.Test>);
+    test?: supertest.Agent | ((express: Express) => supertest.Agent);
     schema: GraphQLSchema;
     headers?: object;
     debugMode?: boolean;
@@ -31,11 +31,11 @@ export interface queryRootConfig extends queryConfig {
     nullQueryPaths?: string[];
     undefinedQueryPaths?: string[];
 }
-export declare function expectQueryFromRoot(config: queryRootConfig, ...options: Option[]): Promise<supertest.SuperTest<supertest.Test>>;
+export declare function expectQueryFromRoot(config: queryRootConfig, ...options: Option[]): Promise<supertest.Agent>;
 export interface mutationRootConfig extends queryConfig {
     mutation: string;
     disableInputWrapping?: boolean;
     nullQueryPaths?: string[];
 }
-export declare function expectMutation(config: mutationRootConfig, ...options: Option[]): Promise<supertest.SuperTest<supertest.Test>>;
+export declare function expectMutation(config: mutationRootConfig, ...options: Option[]): Promise<supertest.Agent>;
 export {};

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

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectMutation = exports.expectQueryFromRoot = void 0;
+exports.expectQueryFromRoot = expectQueryFromRoot;
+exports.expectMutation = expectMutation;
 // 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"));
@@ -82,17 +83,17 @@ function getInnerType(typ, list) {
     return [typ, list];
 }
 function makeGraphQLRequest(config, query, fieldArgs) {
-    let test;
+    let agent;
     if (config.test) {
         if (typeof config.test === "function") {
-            test = config.test(config.server ? config.server : server(config));
+            agent = config.test(config.server ? config.server : server(config));
         }
         else {
-            test = config.test;
+            agent = config.test;
         }
     }
     else {
-        test = (0, supertest_1.default)(config.server ? config.server : server(config));
+        agent = (0, supertest_1.default)(config.server ? config.server : server(config));
     }
     let files = new Map();
     // handle files
@@ -123,7 +124,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         variables[k] = config.extraVariables[k].value;
     }
     if (files.size) {
-        let ret = test
+        let ret = agent
             .post(config.graphQLPath || "/graphql")
             .set((config.headers || {}));
         ret.field("operations", JSON.stringify({
@@ -145,12 +146,12 @@ function makeGraphQLRequest(config, query, fieldArgs) {
             ret.attach(`${idx}`, val, key);
             idx++;
         }
-        return [test, ret];
+        return [agent, ret];
     }
     else {
         return [
-            test,
-            test
+            agent,
+            agent
                 .post(config.graphQLPath || "/graphql")
                 .set((config.headers || {}))
                 .send({
@@ -282,7 +283,6 @@ async function expectQueryFromRoot(config, ...options // TODO queries? expected
         queryFN: config.schema.getQueryType(),
     }, ...options);
 }
-exports.expectQueryFromRoot = expectQueryFromRoot;
 async function expectMutation(config, ...options) {
     // wrap args in input because we simplify the args for mutations
     // and don't require the input
@@ -301,7 +301,6 @@ async function expectMutation(config, ...options) {
         queryFN: config.schema.getMutationType(),
     }, ...options);
 }
-exports.expectMutation = expectMutation;
 const fragmentRegex = /^...on (\w+)(.*)/;
 function splitPath(path) {
     // handle fragment queries. we don't want to compare against this when checking the result

package/testutils/fake_data/const.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoaderOptions = exports.InverseEdges = exports.SymmetricEdges = exports.NodeType = exports.EdgeType = void 0;
+exports.InverseEdges = exports.SymmetricEdges = exports.NodeType = exports.EdgeType = void 0;
+exports.getLoaderOptions = getLoaderOptions;
 const internal_1 = require("./internal");
 var EdgeType;
 (function (EdgeType) {
@@ -53,4 +54,3 @@ function getLoaderOptions(type) {
             return internal_1.FakeTag.loaderOptions();
     }
 }
-exports.getLoaderOptions = getLoaderOptions;

package/testutils/fake_data/fake_contact.js

@@ -23,7 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contactLoader = exports.createContact = exports.getContactBuilder = exports.FakeContactSchemaWithDeletedAt = exports.FakeContactSchema = exports.FakeContact = void 0;
+exports.contactLoader = exports.FakeContactSchemaWithDeletedAt = exports.FakeContactSchema = exports.FakeContact = void 0;
+exports.getContactBuilder = getContactBuilder;
+exports.createContact = createContact;
 const ent_1 = require("../../core/ent");
 const clause = __importStar(require("../../core/clause"));
 const privacy_1 = require("../../core/privacy");
@@ -153,12 +155,10 @@ function getContactBuilder(viewer, input) {
     m.set("updatedAt", new Date());
     return new builder_1.SimpleBuilder(viewer, exports.FakeContactSchema, m, action_1.WriteOperation.Insert, null);
 }
-exports.getContactBuilder = getContactBuilder;
 async function createContact(viewer, input) {
     const builder = getContactBuilder(viewer, input);
     return builder.saveX();
 }
-exports.createContact = createContact;
 exports.contactLoader = new loaders_1.ObjectLoaderFactory({
     tableName: "fake_contacts",
     fields: FakeContact.getFields(),

package/testutils/fake_data/fake_event.js

@@ -23,7 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEvent = exports.getEventBuilder = exports.FakeEventSchema = exports.FakeEvent = void 0;
+exports.FakeEventSchema = exports.FakeEvent = void 0;
+exports.getEventBuilder = getEventBuilder;
+exports.createEvent = createEvent;
 const ent_1 = require("../../core/ent");
 const clause = __importStar(require("../../core/clause"));
 const privacy_1 = require("../../core/privacy");
@@ -142,9 +144,7 @@ function getEventBuilder(viewer, input) {
     }
     return new builder_1.SimpleBuilder(viewer, exports.FakeEventSchema, m, action_1.WriteOperation.Insert, null);
 }
-exports.getEventBuilder = getEventBuilder;
 async function createEvent(viewer, input) {
     const builder = getEventBuilder(viewer, input);
     return builder.saveX();
 }
-exports.createEvent = createEvent;

package/testutils/fake_data/fake_tag.js

@@ -23,7 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tagLoaderWithDeletedAt = exports.tagLoader = exports.createTag = exports.getTagAction = exports.getTagBuilder = exports.FakeTagSchema = exports.FakeTag = void 0;
+exports.tagLoaderWithDeletedAt = exports.tagLoader = exports.FakeTagSchema = exports.FakeTag = void 0;
+exports.getTagBuilder = getTagBuilder;
+exports.getTagAction = getTagAction;
+exports.createTag = createTag;
 const ent_1 = require("../../core/ent");
 const clause = __importStar(require("../../core/clause"));
 const privacy_1 = require("../../core/privacy");
@@ -109,7 +112,6 @@ function getTagBuilder(viewer, input) {
     const action = getTagAction(viewer, input);
     return action.builder;
 }
-exports.getTagBuilder = getTagBuilder;
 function getTagAction(viewer, input) {
     const m = new Map();
     for (const key in input) {
@@ -118,12 +120,10 @@ function getTagAction(viewer, input) {
     const action = new builder_1.SimpleAction(viewer, exports.FakeTagSchema, m, action_1.WriteOperation.Insert, null);
     return action;
 }
-exports.getTagAction = getTagAction;
 async function createTag(viewer, input) {
     const action = getTagAction(viewer, input);
     return action.saveX();
 }
-exports.createTag = createTag;
 exports.tagLoader = new loaders_1.ObjectLoaderFactory({
     tableName: "fake_tags",
     fields: FakeTag.getFields(),

package/testutils/fake_data/fake_user.js

@@ -23,7 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userPhoneNumberLoader = exports.userEmailLoader = exports.userLoaderWithDeletedAt = exports.userLoader = exports.createUser = exports.getUserAction = exports.getUserBuilder = exports.FakeUserSchema = exports.FakeUser = exports.ViewerWithAccessToken = void 0;
+exports.userPhoneNumberLoader = exports.userEmailLoader = exports.userLoaderWithDeletedAt = exports.userLoader = exports.FakeUserSchema = exports.FakeUser = exports.ViewerWithAccessToken = void 0;
+exports.getUserBuilder = getUserBuilder;
+exports.getUserAction = getUserAction;
+exports.createUser = createUser;
 const base_1 = require("../../core/base");
 const ent_1 = require("../../core/ent");
 const clause = __importStar(require("../../core/clause"));
@@ -172,7 +175,6 @@ function getUserBuilder(viewer, input) {
     const action = getUserAction(viewer, input);
     return action.builder;
 }
-exports.getUserBuilder = getUserBuilder;
 function getUserAction(viewer, input) {
     const m = new Map();
     for (const key in input) {
@@ -187,12 +189,10 @@ function getUserAction(viewer, input) {
     };
     return action;
 }
-exports.getUserAction = getUserAction;
 async function createUser(viewer, input) {
     const action = getUserAction(viewer, input);
     return action.saveX();
 }
-exports.createUser = createUser;
 exports.userLoader = new loaders_1.ObjectLoaderFactory({
     tableName: "fake_users",
     fields: FakeUser.getFields(),