@snowtop/ent 0.1.0-alpha96-2a5ea200-82e5-11ed-8c55-4da1cd949242 → 0.1.0-alpha97

package/testutils/db/temp_db.d.ts

@@ -36,12 +36,13 @@ export interface Table extends CoreConcept {
     columns: Column[];
     constraints?: Constraint[];
 }
-declare type options = Pick<Column, "nullable" | "primaryKey" | "default" | "foreignKey" | "unique" | "index">;
+type options = Pick<Column, "nullable" | "primaryKey" | "default" | "foreignKey" | "unique" | "index">;
 export declare function primaryKey(name: string, cols: string[]): Constraint;
 export declare function foreignKey(name: string, cols: string[], fkey: {
     table: string;
     cols: string[];
 }): Constraint;
+export declare function check(name: string, condition: string): Constraint;
 interface indexOptions {
     type?: string;
     unique?: boolean;
@@ -94,10 +95,12 @@ export declare class TempDB {
 }
 export declare function assoc_edge_config_table(): Table;
 export declare function assoc_edge_table(name: string, global?: boolean): Table;
-interface sqliteSetupOptions {
+interface setupOptions {
     disableDeleteAfterEachTest?: boolean;
 }
-export declare function setupSqlite(connString: string, tables: () => Table[], opts?: sqliteSetupOptions): TempDB;
+export declare function setupSqlite(connString: string, tables: () => Table[], opts?: setupOptions): TempDB;
+export declare function setupPostgres(tables: () => Table[], opts?: setupOptions): void;
+export declare function doSQLiteTestFromSchemas(schemas: BuilderSchema<Ent>[], doTest: () => Promise<void>, db?: string): Promise<TempDB>;
 export declare function getSchemaTable(schema: BuilderSchema<Ent>, dialect: Dialect): Table;
 export declare function getColumnFromField(fieldName: string, f: Field, dialect: Dialect): Column;
 export {};

package/testutils/db/temp_db.js

@@ -26,7 +26,7 @@ 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.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.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.foreignKey = exports.primaryKey = void 0;
+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.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;
 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
@@ -55,6 +55,15 @@ function foreignKey(name, cols, fkey) {
     };
 }
 exports.foreignKey = foreignKey;
+function check(name, condition) {
+    return {
+        name,
+        generate() {
+            return `CONSTRAINT ${name} CHECK(${condition})`;
+        },
+    };
+}
+exports.check = check;
 function isPostCreateIndex(s) {
     return (s.postCreate !== undefined &&
         s.postCreate());
@@ -382,13 +391,17 @@ class TempDB {
             this.db = randomDB();
             await this.client.query(`CREATE DATABASE ${this.db}`);
             if (setupConnString) {
+                delete process.env.DB_CONNECTION_STRING;
+                let connStr = "";
                 if (user && password) {
-                    process.env.DB_CONNECTION_STRING = `postgres://${user}:${password}@localhost:5432/${this.db}`;
+                    connStr = `postgres://${user}:${password}@localhost:5432/${this.db}`;
                 }
                 else {
-                    process.env.DB_CONNECTION_STRING = `postgres://localhost/${this.db}?`;
+                    connStr = `postgres://localhost/${this.db}?`;
                 }
-                db_1.default.initDB();
+                db_1.default.initDB({
+                    connectionString: connStr,
+                });
             }
             else {
                 // will probably be setup via loadConfig
@@ -547,13 +560,72 @@ function setupSqlite(connString, tables, opts) {
     return tdb;
 }
 exports.setupSqlite = setupSqlite;
+function setupPostgres(tables, opts) {
+    let tdb;
+    beforeAll(async () => {
+        tdb = new TempDB(db_1.Dialect.Postgres, tables());
+        await tdb.beforeAll();
+    });
+    // TODO need to fix this implementation...
+    if (!opts?.disableDeleteAfterEachTest) {
+        afterEach(async () => {
+            const client = await db_1.default.getInstance().getNewClient();
+            for (const [key, _] of tdb.__getTables()) {
+                const query = `delete from ${key}`;
+                await client.exec(query);
+            }
+            client.release();
+        });
+    }
+    afterAll(async () => {
+        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));
+    let tdb = new TempDB(db_1.Dialect.SQLite, tables);
+    process.env.DB_CONNECTION_STRING = connString;
+    (0, config_1.loadConfig)();
+    await tdb.beforeAll();
+    await doTest();
+    await tdb.afterAll();
+    delete process.env.DB_CONNECTION_STRING;
+    return tdb;
+}
+exports.doSQLiteTestFromSchemas = doSQLiteTestFromSchemas;
 function getSchemaTable(schema, dialect) {
     const fields = (0, schema_1.getFields)(schema);
-    const columns = [];
+    const items = [];
     for (const [fieldName, field] of fields) {
-        columns.push(getColumnFromField(fieldName, field, dialect));
+        items.push(getColumnFromField(fieldName, field, dialect));
+    }
+    if (schema.constraints) {
+        for (const constraint of schema.constraints) {
+            switch (constraint.type) {
+                case schema_1.ConstraintType.PrimaryKey:
+                    items.push(primaryKey(constraint.name, constraint.columns));
+                    break;
+                case schema_1.ConstraintType.ForeignKey:
+                    if (!constraint.fkey) {
+                        throw new Error(`need 'fkey' field for foreign key constraint`);
+                    }
+                    items.push(foreignKey(constraint.name, constraint.columns, {
+                        table: constraint.fkey.tableName,
+                        cols: constraint.fkey.columns,
+                    }));
+                    break;
+                case schema_1.ConstraintType.Check:
+                    if (!constraint.condition) {
+                        throw new Error(`need 'condition' field for check constraint`);
+                    }
+                    items.push(check(constraint.name, constraint.condition));
+                    break;
+            }
+        }
     }
-    return table((0, builder_1.getTableName)(schema), ...columns);
+    return table((0, builder_1.getTableName)(schema), ...items);
 }
 exports.getSchemaTable = getSchemaTable;
 function getColumnForDbType(t, dialect) {

package/testutils/db/value.d.ts

@@ -1,4 +1,5 @@
 import { Field, Schema } from "../../schema";
+export declare function randomEmail(domain?: string): string;
 interface Info {
     schema: Schema;
 }

package/testutils/db/value.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultValue = void 0;
+exports.getDefaultValue = exports.randomEmail = void 0;
 const uuid_1 = require("uuid");
 const schema_1 = require("../../schema");
 const schema_2 = require("../../schema");
@@ -11,6 +11,7 @@ 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)}`;
 }
@@ -145,7 +146,6 @@ const emailType = {
     },
     regex: /^email(_address)|_email$/,
 };
-const pdt = (0, schema_2.StringType)();
 const phoneType = {
     dbType: schema_1.DBType.String,
     newValue: () => {

package/testutils/db_mock.d.ts

@@ -18,7 +18,8 @@ export declare enum queryType {
     UPDATE = 2,
     BEGIN = 3,
     COMMIT = 4,
-    ROLLBACK = 5
+    ROLLBACK = 5,
+    DELETE = 6
 }
 export interface queryStructure {
     tableName?: string;
@@ -32,11 +33,14 @@ interface internalQueryStructure extends queryStructure {
     suffix?: string;
     setClause?: string;
 }
+/**
+ * @deprecated
+ */
 export declare class QueryRecorder {
     private static queries;
     private static ids;
     private static data;
-    private static getQueryStructure;
+    static getQueryStructure(query: any): internalQueryStructure | null;
     private static recordQuery;
     static newID(): ID;
     static getCurrentIDs(): ID[];
@@ -46,8 +50,16 @@ export declare class QueryRecorder {
     static clear(): void;
     static clearQueries(): void;
     static getCurrentQueries(): queryOptions[];
-    static validateQueryStructuresFromLogs(ml: MockLogs, expected: queryStructure[], skipSelect?: boolean): void;
-    private static validateQuryStructuresImpl;
+    /**
+     * @deprecated will keep this since it's just using ml.logs
+     * which we still want around (I think) but we should eventually
+     * probably stop using this
+     */
+    static validateQueryStructuresFromLogs(ml: MockLogs, expected: queryStructure[], opts?: {
+        skipSelect?: boolean;
+        flagBeginCommit?: boolean;
+    }): void;
+    private static validateQueryStructuresImpl;
     static mockPool(pool: typeof Pool): void;
 }
 export {};

package/testutils/db_mock.js

@@ -29,7 +29,11 @@ var queryType;
     queryType[queryType["BEGIN"] = 3] = "BEGIN";
     queryType[queryType["COMMIT"] = 4] = "COMMIT";
     queryType[queryType["ROLLBACK"] = 5] = "ROLLBACK";
+    queryType[queryType["DELETE"] = 6] = "DELETE";
 })(queryType = exports.queryType || (exports.queryType = {}));
+/**
+ * @deprecated
+ */
 class QueryRecorder {
     // TODO kill use AST or just throw away
     static getQueryStructure(query) {
@@ -76,6 +80,36 @@ class QueryRecorder {
                 };
             }
         }
+        if (/^DELETE/.test(query)) {
+            // regex can't do returning
+            let execArray = /^DELETE FROM (.+) WHERE (.+) /.exec(query);
+            if (execArray) {
+                return {
+                    tableName: execArray[1],
+                    whereClause: execArray[2],
+                    type: queryType.DELETE,
+                    query: execArray[0],
+                };
+            }
+        }
+        if (/^BEGIN/.test(query)) {
+            return {
+                type: queryType.BEGIN,
+                query: query,
+            };
+        }
+        if (/^COMMIT/.test(query)) {
+            return {
+                type: queryType.COMMIT,
+                query: query,
+            };
+        }
+        if (/^ROLLBACK/.test(query)) {
+            return {
+                type: queryType.ROLLBACK,
+                query: query,
+            };
+        }
         return null;
     }
     static recordQuery(query, values) {
@@ -131,7 +165,12 @@ class QueryRecorder {
     static getCurrentQueries() {
         return QueryRecorder.queries;
     }
-    static validateQueryStructuresFromLogs(ml, expected, skipSelect) {
+    /**
+     * @deprecated will keep this since it's just using ml.logs
+     * which we still want around (I think) but we should eventually
+     * probably stop using this
+     */
+    static validateQueryStructuresFromLogs(ml, expected, opts) {
         const queries = ml.logs.map((log) => {
             const qs = QueryRecorder.getQueryStructure(log.query);
             if (!qs) {
@@ -142,12 +181,16 @@ class QueryRecorder {
                 qs,
             };
         });
-        QueryRecorder.validateQuryStructuresImpl(expected, queries, skipSelect);
+        QueryRecorder.validateQueryStructuresImpl(expected, queries, opts);
     }
-    static validateQuryStructuresImpl(expected, queries, skipSelect) {
-        if (skipSelect) {
+    static validateQueryStructuresImpl(expected, queries, opts) {
+        if (opts?.skipSelect) {
             queries = queries.filter((query) => query.qs?.type !== queryType.SELECT);
         }
+        if (!opts?.flagBeginCommit) {
+            queries = queries.filter((query) => query.qs?.type !== queryType.BEGIN &&
+                query.qs?.type !== queryType.COMMIT);
+        }
         //    console.log(queries, expected);
         expect(queries.length).toBe(expected.length);
         for (let i = 0; i < expected.length; i++) {
@@ -167,7 +210,7 @@ class QueryRecorder {
                     expect(query.values).toBe(undefined);
                     break;
                 case queryType.SELECT:
-                    if (!skipSelect) {
+                    if (!opts?.skipSelect) {
                         console.error("validating select query structure not supported yet");
                     }
                     // TODO INSERT and UPDATE tests here...

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

@@ -2,7 +2,7 @@ import { Express, RequestHandler } from "express";
 import { Viewer } from "../../core/base";
 import { GraphQLSchema } from "graphql";
 import supertest from "supertest";
-export declare type Option = [string, any];
+export type Option = [string, any];
 interface queryConfig {
     viewer?: Viewer;
     init?: (app: Express) => void;
@@ -11,6 +11,12 @@ interface queryConfig {
     headers?: object;
     debugMode?: boolean;
     args: {};
+    extraVariables?: {
+        [key: string]: {
+            graphqlType: string;
+            value: string;
+        };
+    };
     expectedStatus?: number;
     expectedError?: string | RegExp;
     callback?: (res: supertest.Response) => void;

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

@@ -35,6 +35,7 @@ const graphql_1 = require("graphql");
 const auth_1 = require("../../auth");
 const supertest_1 = __importDefault(require("supertest"));
 const fs = __importStar(require("fs"));
+const util_1 = require("util");
 function server(config) {
     const viewer = config.viewer;
     if (viewer) {
@@ -115,17 +116,23 @@ function makeGraphQLRequest(config, query, fieldArgs) {
             }
         }
     });
+    let variables = {
+        ...config.args,
+    };
+    for (const k in config.extraVariables) {
+        variables[k] = config.extraVariables[k].value;
+    }
     if (files.size) {
         let ret = test
             .post(config.graphQLPath || "/graphql")
             .set(config.headers || {});
         ret.field("operations", JSON.stringify({
             query: query,
-            variables: config.args,
+            variables: variables,
         }));
         let m = {};
         let idx = 0;
-        for (const [key, val] of files) {
+        for (const [key] of files) {
             m[idx] = [`variables.${key}`];
             idx++;
         }
@@ -148,7 +155,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
                 .set(config.headers || {})
                 .send({
                 query: query,
-                variables: JSON.stringify(config.args),
+                variables: JSON.stringify(variables),
             }),
         ];
     }
@@ -309,13 +316,18 @@ async function expectFromRoot(config, ...options) {
     let fieldArgs = field.args;
     let queryParams = [];
     fieldArgs.forEach((fieldArg) => {
-        let arg = config.args[fieldArg.name];
+        const arg = config.args[fieldArg.name];
         // let the graphql runtime handle this (it may be optional for example)
         if (arg === undefined) {
             return;
         }
         queryParams.push(`$${fieldArg.name}: ${fieldArg.type}`);
     });
+    // add extra variables in queryArgs...
+    for (const key in config.extraVariables) {
+        const v = config.extraVariables[key];
+        queryParams.push(`$${key}: ${v.graphqlType}`);
+    }
     let params = [];
     for (let key in config.args) {
         params.push(`${key}: $${key}`);
@@ -354,7 +366,7 @@ async function expectFromRoot(config, ...options) {
     let [st, temp] = makeGraphQLRequest(config, q, fieldArgs);
     const res = await temp.expect("Content-Type", /json/);
     if (config.debugMode) {
-        console.log(res.body);
+        console.log((0, util_1.inspect)(res.body, false, 3));
     }
     // if there's a callback, let everything be done there and we're done
     if (config.callback) {

package/testutils/fake_data/fake_contact.d.ts

@@ -15,6 +15,7 @@ export declare class FakeContact implements Ent {
     readonly userID: ID;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
     static getFields(): string[];
     static getTestTable(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeContact>;

package/testutils/fake_data/fake_contact.js

@@ -11,6 +11,11 @@ const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
 const action_1 = require("../../action");
 class FakeContact {
+    getPrivacyPolicy() {
+        return {
+            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
+        };
+    }
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeContact;
@@ -23,11 +28,7 @@ class FakeContact {
         this.emailAddress = data.email_address;
         this.userID = data.user_id;
     }
-    getPrivacyPolicy() {
-        return {
-            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
-        };
-    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",

package/testutils/fake_data/fake_event.d.ts

@@ -16,6 +16,7 @@ export declare class FakeEvent implements Ent {
     readonly userID: ID;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
     private static getFields;
     static getTestTable(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeEvent>;

package/testutils/fake_data/fake_event.js

@@ -11,6 +11,9 @@ const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
 const action_1 = require("../../action");
 class FakeEvent {
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeEvent;
@@ -25,9 +28,7 @@ class FakeEvent {
         this.description = data.description;
         this.userID = data.user_id;
     }
-    getPrivacyPolicy() {
-        return privacy_1.AlwaysAllowPrivacyPolicy;
-    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",

package/testutils/fake_data/fake_tag.d.ts

@@ -14,6 +14,7 @@ export declare class FakeTag implements Ent {
     readonly ownerID: string;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
     static getFields(): string[];
     static getTestTable(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeTag>;
@@ -28,7 +29,7 @@ export interface TagCreateInput {
     createdAt?: Date;
     updatedAt?: Date;
 }
-export declare type TagEditInput = Partial<TagCreateInput>;
+export type TagEditInput = Partial<TagCreateInput>;
 export declare function getTagBuilder(viewer: Viewer, input: TagCreateInput): import("../builder").SimpleBuilder<FakeTag, null>;
 export declare function getTagAction(viewer: Viewer, input: TagCreateInput): SimpleAction<FakeTag, null>;
 export declare function createTag(viewer: Viewer, input: TagCreateInput): Promise<FakeTag>;

package/testutils/fake_data/fake_tag.js

@@ -11,6 +11,11 @@ const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
 const action_1 = require("../../action");
 class FakeTag {
+    getPrivacyPolicy() {
+        return {
+            rules: [new privacy_1.AllowIfViewerIsEntPropertyRule("ownerID"), privacy_1.AlwaysDenyRule],
+        };
+    }
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeUser;
@@ -22,11 +27,7 @@ class FakeTag {
         this.canonicalName = data.canonical_name;
         this.ownerID = data.owner_id;
     }
-    getPrivacyPolicy() {
-        return {
-            rules: [new privacy_1.AllowIfViewerIsEntPropertyRule("ownerID"), privacy_1.AlwaysDenyRule],
-        };
-    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",

package/testutils/fake_data/fake_user.d.ts

@@ -25,6 +25,7 @@ export declare class FakeUser implements Ent {
     protected readonly password: string | null;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
     static getFields(): string[];
     static getTestTable(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeUser>;
@@ -41,7 +42,7 @@ export interface UserCreateInput {
     createdAt?: Date;
     updatedAt?: Date;
 }
-export declare type UserEditInput = Partial<UserCreateInput>;
+export type UserEditInput = Partial<UserCreateInput>;
 export declare function getUserBuilder(viewer: Viewer, input: UserCreateInput): import("../builder").SimpleBuilder<FakeUser, null>;
 export declare function getUserAction(viewer: Viewer, input: UserCreateInput): SimpleAction<FakeUser, null>;
 export declare function createUser(viewer: Viewer, input: UserCreateInput): Promise<FakeUser>;

package/testutils/fake_data/fake_user.js

@@ -24,19 +24,6 @@ class ViewerWithAccessToken extends viewer_1.IDViewer {
 }
 exports.ViewerWithAccessToken = ViewerWithAccessToken;
 class FakeUser {
-    constructor(viewer, data) {
-        this.viewer = viewer;
-        this.nodeType = const_1.NodeType.FakeUser;
-        this.data = data;
-        this.id = data.id;
-        this.createdAt = (0, convert_1.convertDate)(data.created_at);
-        this.updatedAt = (0, convert_1.convertDate)(data.updated_at);
-        this.firstName = data.first_name;
-        this.lastName = data.last_name;
-        this.emailAddress = data.email_address;
-        this.phoneNumber = data.phone_number;
-        this.password = data.password;
-    }
     getPrivacyPolicy() {
         return {
             rules: [
@@ -61,6 +48,20 @@ class FakeUser {
             ],
         };
     }
+    constructor(viewer, data) {
+        this.viewer = viewer;
+        this.nodeType = const_1.NodeType.FakeUser;
+        this.data = data;
+        this.id = data.id;
+        this.createdAt = (0, convert_1.convertDate)(data.created_at);
+        this.updatedAt = (0, convert_1.convertDate)(data.updated_at);
+        this.firstName = data.first_name;
+        this.lastName = data.last_name;
+        this.emailAddress = data.email_address;
+        this.phoneNumber = data.phone_number;
+        this.password = data.password;
+    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",

package/tsc/ast.d.ts

@@ -10,7 +10,7 @@ export interface ClassInfo {
     wrapClassContents(inner: string): string;
 }
 export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration): ClassInfo | undefined;
-declare type transformImportFn = (imp: string) => string;
+type transformImportFn = (imp: string) => string;
 interface transformOpts {
     removeImports?: string[];
     newImports?: string[];