@snowtop/ent 0.1.0-alpha95 → 0.1.0-alpha96

package/testutils/builder.d.ts

@@ -4,60 +4,45 @@ import { Action, Builder, Changeset, WriteOperation, Validator, Trigger, Observe
 import { FieldMap, Schema } from "../schema";
 import { SchemaConfig, EntSchema } from "../schema/base_schema";
 import { FieldInfoMap } from "../schema/schema";
-export declare class User implements Ent {
+import { Clause } from "src/core/clause";
+export declare class BaseEnt {
+    viewer: Viewer;
+    readonly data: Data;
+    readonly id: ID;
+    constructor(viewer: Viewer, data: Data);
+    getKey(): string;
+    getPrivacyPolicy(): PrivacyPolicy;
+    __setRawDBData(data: Data): void;
+}
+export declare class User extends BaseEnt implements Ent {
     viewer: Viewer;
     data: Data;
-    id: ID;
     accountID: string;
     nodeType: string;
-    getPrivacyPolicy(): PrivacyPolicy<this>;
     firstName: string;
     constructor(viewer: Viewer, data: Data);
 }
-export declare class Event implements Ent {
-    viewer: Viewer;
-    data: Data;
-    id: ID;
+export declare class Event extends BaseEnt implements Ent {
     accountID: string;
     nodeType: string;
-    getPrivacyPolicy(): PrivacyPolicy<this>;
-    constructor(viewer: Viewer, data: Data);
 }
-export declare class Contact implements Ent {
-    viewer: Viewer;
-    data: Data;
-    id: ID;
+export declare class Contact extends BaseEnt implements Ent {
     accountID: string;
     nodeType: string;
     getPrivacyPolicy(): PrivacyPolicy<this>;
-    constructor(viewer: Viewer, data: Data);
 }
-export declare class Group implements Ent {
-    viewer: Viewer;
-    data: Data;
-    id: ID;
+export declare class Group extends BaseEnt implements Ent {
     accountID: string;
     nodeType: string;
     getPrivacyPolicy(): PrivacyPolicy<this>;
-    constructor(viewer: Viewer, data: Data);
 }
-export declare class Message implements Ent {
-    viewer: Viewer;
-    data: Data;
-    id: ID;
+export declare class Message extends BaseEnt implements Ent {
     accountID: string;
     nodeType: string;
-    getPrivacyPolicy(): PrivacyPolicy<this>;
-    constructor(viewer: Viewer, data: Data);
 }
-export declare class Address implements Ent {
-    viewer: Viewer;
-    data: Data;
-    id: ID;
+export declare class Address extends BaseEnt implements Ent {
     accountID: string;
     nodeType: string;
-    getPrivacyPolicy(): PrivacyPolicy<this>;
-    constructor(viewer: Viewer, data: Data);
 }
 export interface BuilderSchema<T extends Ent> extends Schema {
     ent: EntConstructor<T>;
@@ -67,13 +52,13 @@ export declare class EntBuilderSchema<T extends Ent> extends EntSchema {
     constructor(ent: EntConstructor<T>, cfg: SchemaConfig);
 }
 export declare function getBuilderSchema<T extends Ent>(cfg: SchemaConfig, ent: EntConstructor<T>): BuilderSchema<T>;
-export declare function getBuilderSchemaFromFields<T extends Ent>(fields: FieldMap, ent: EntConstructor<T>): BuilderSchema<T>;
+export declare function getBuilderSchemaFromFields<T extends Ent>(fields: FieldMap, ent: EntConstructor<T>, opts?: Partial<Exclude<SchemaConfig, "fields">>): BuilderSchema<T>;
 export declare function getBuilderSchemaTZFromFields<T extends Ent>(fields: FieldMap, ent: EntConstructor<T>): BuilderSchema<T>;
 export declare function getSchemaName(value: BuilderSchema<Ent>): string;
 export declare function getTableName(value: BuilderSchema<Ent>): string;
 export declare function getFieldInfo(value: BuilderSchema<Ent>): FieldInfoMap;
-declare type MaybeNull<T extends Ent> = T | null;
-declare type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
+type MaybeNull<T extends Ent> = T | null;
+type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
 export declare class SimpleBuilder<T extends Ent, TExistingEnt extends TMaybleNullableEnt<T> = MaybeNull<T>> implements Builder<T, Viewer, TExistingEnt> {
     viewer: Viewer;
     private schema;
@@ -85,7 +70,7 @@ export declare class SimpleBuilder<T extends Ent, TExistingEnt extends TMaybleNu
     fields: Map<string, any>;
     nodeType: string;
     m: Map<string, any>;
-    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation: WriteOperation, existingEnt: TExistingEnt, action?: Action<T, SimpleBuilder<T, TExistingEnt>, Viewer, Data, TExistingEnt> | undefined);
+    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation: WriteOperation, existingEnt: TExistingEnt, action?: Action<T, SimpleBuilder<T, TExistingEnt>, Viewer, Data, TExistingEnt> | undefined, expressions?: Map<string, Clause>);
     getInput(): Data;
     updateInput(input: Data): void;
     storeData(k: string, v: any): void;
@@ -106,7 +91,7 @@ export declare class SimpleAction<T extends Ent, TExistingEnt extends TMaybleNul
     private fields;
     builder: SimpleBuilder<T, TExistingEnt>;
     viewerForEntLoad: viewerEntLoadFunc | undefined;
-    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation: WriteOperation | undefined, existingEnt: TExistingEnt);
+    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation: WriteOperation | undefined, existingEnt: TExistingEnt, expressions?: Map<string, Clause>);
     getTriggers(): (Trigger<T, SimpleBuilder<T>> | Array<Trigger<T, SimpleBuilder<T>>>)[];
     getValidators(): Validator<T, SimpleBuilder<T>>[];
     getObservers(): Observer<T, SimpleBuilder<T>>[];

package/testutils/builder.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleAction = exports.SimpleBuilder = exports.getFieldInfo = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.EntBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = void 0;
+exports.SimpleAction = exports.SimpleBuilder = exports.getFieldInfo = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.EntBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = exports.BaseEnt = void 0;
 const privacy_1 = require("../core/privacy");
 const orchestrator_1 = require("../action/orchestrator");
 const action_1 = require("../action");
@@ -16,86 +16,79 @@ const convert_1 = require("../core/convert");
 const camel_case_1 = require("camel-case");
 const base_schema_1 = require("../schema/base_schema");
 const schema_2 = require("../schema/schema");
-class User {
+class BaseEnt {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.data = data;
-        this.accountID = "";
-        this.nodeType = "User";
         this.data.created_at = (0, convert_1.convertDate)(data.created_at);
         this.data.updated_at = (0, convert_1.convertDate)(data.updated_at);
-        this.id = data.id;
-        this.firstName = data.first_name;
+        this.id = data[this.getKey()];
+    }
+    getKey() {
+        return "id";
     }
     getPrivacyPolicy() {
         return privacy_1.AlwaysAllowPrivacyPolicy;
     }
+    __setRawDBData(data) {
+        // doesn't apply here so ignore...
+    }
 }
-exports.User = User;
-class Event {
+exports.BaseEnt = BaseEnt;
+class User extends BaseEnt {
     constructor(viewer, data) {
+        super(viewer, data);
         this.viewer = viewer;
         this.data = data;
         this.accountID = "";
-        this.nodeType = "Event";
-        this.id = data.id;
+        this.nodeType = "User";
+        this.firstName = data.first_name;
     }
-    getPrivacyPolicy() {
-        return privacy_1.AlwaysAllowPrivacyPolicy;
+}
+exports.User = User;
+class Event extends BaseEnt {
+    constructor() {
+        super(...arguments);
+        this.accountID = "";
+        this.nodeType = "Event";
     }
 }
 exports.Event = Event;
-class Contact {
-    constructor(viewer, data) {
-        this.viewer = viewer;
-        this.data = data;
+class Contact extends BaseEnt {
+    constructor() {
+        super(...arguments);
         this.accountID = "";
         this.nodeType = "Contact";
-        this.data.created_at = (0, convert_1.convertDate)(data.created_at);
-        this.data.updated_at = (0, convert_1.convertDate)(data.updated_at);
-        this.id = data.id;
     }
     getPrivacyPolicy() {
         return privacy_1.AlwaysAllowPrivacyPolicy;
     }
 }
 exports.Contact = Contact;
-class Group {
-    constructor(viewer, data) {
-        this.viewer = viewer;
-        this.data = data;
+class Group extends BaseEnt {
+    constructor() {
+        super(...arguments);
         this.accountID = "";
         this.nodeType = "Group";
-        this.id = data.id;
     }
     getPrivacyPolicy() {
         return privacy_1.AlwaysAllowPrivacyPolicy;
     }
 }
 exports.Group = Group;
-class Message {
-    constructor(viewer, data) {
-        this.viewer = viewer;
-        this.data = data;
+class Message extends BaseEnt {
+    constructor() {
+        super(...arguments);
         this.accountID = "";
         this.nodeType = "Message";
-        this.id = data.id;
-    }
-    getPrivacyPolicy() {
-        return privacy_1.AlwaysAllowPrivacyPolicy;
     }
 }
 exports.Message = Message;
-class Address {
-    constructor(viewer, data) {
-        this.viewer = viewer;
-        this.data = data;
+class Address extends BaseEnt {
+    constructor() {
+        super(...arguments);
         this.accountID = "";
         this.nodeType = "Address";
-        this.id = data.id;
-    }
-    getPrivacyPolicy() {
-        return privacy_1.AlwaysAllowPrivacyPolicy;
     }
 }
 exports.Address = Address;
@@ -113,9 +106,9 @@ function getBuilderSchema(cfg, ent) {
     };
 }
 exports.getBuilderSchema = getBuilderSchema;
-function getBuilderSchemaFromFields(fields, ent) {
+function getBuilderSchemaFromFields(fields, ent, opts) {
     return {
-        ...new base_schema_1.EntSchema({ fields }),
+        ...new base_schema_1.EntSchema({ ...opts, fields }),
         ent,
     };
 }
@@ -153,7 +146,7 @@ function getFieldInfo(value) {
 exports.getFieldInfo = getFieldInfo;
 // reuses orchestrator and standard things
 class SimpleBuilder {
-    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt, action) {
+    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt, action, expressions) {
         this.viewer = viewer;
         this.schema = schema;
         this.operation = operation;
@@ -204,6 +197,7 @@ class SimpleBuilder {
             },
             builder: this,
             action: action,
+            expressions,
             schema: this.schema,
             editedFields: () => {
                 // to simulate what we do in generated builders where we return a new Map
@@ -271,10 +265,10 @@ class SimpleBuilder {
 }
 exports.SimpleBuilder = SimpleBuilder;
 class SimpleAction {
-    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt) {
+    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt, expressions) {
         this.viewer = viewer;
         this.fields = fields;
-        this.builder = new SimpleBuilder(this.viewer, schema, fields, operation, existingEnt, this);
+        this.builder = new SimpleBuilder(this.viewer, schema, fields, operation, existingEnt, this, expressions);
     }
     getTriggers() {
         return [];

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;