@snowtop/ent 0.1.0-alpha90 → 0.1.0-alpha92-56721980-4046-11ed-ba1f-832778cd7daa

package/graphql/graphql.js

@@ -63,11 +63,9 @@ const isGraphQLScalarType = (type) => {
 };
 const addCustomType = (type) => {
     // TODO these should return ReadOnly objects...
-    const customType = GQLCapture.getCustomTypes().get(type.type);
-    if (customType && customType !== type) {
-        throw new Error(`cannot add multiple custom types of name ${type.type}`);
-    }
-    if (customType) {
+    const customTypes = GQLCapture.getCustomTypes();
+    const customType = customTypes.get(type.type);
+    if (customType && customType === type) {
         return;
     }
     try {
@@ -93,7 +91,13 @@ const addCustomType = (type) => {
         }
         return;
     }
-    GQLCapture.getCustomTypes().set(type.type, type);
+    if (customType) {
+        if (JSON.stringify(customType) !== JSON.stringify(type)) {
+            throw new Error(`cannot add multiple custom types of name ${type.type}`);
+        }
+        return;
+    }
+    customTypes.set(type.type, type);
 };
 exports.addCustomType = addCustomType;
 const getType = (typ, result) => {

package/graphql/query/shared_edge_connection.js

@@ -48,23 +48,9 @@ class TestConnection {
 }
 const commonTests = (opts) => {
     function getCursorFrom(contacts, idx) {
-        // we depend on the fact that the same time is used for the edge and created_at
-        // based on getContactBuilder
-        // so regardless of if we're doing assoc or custom queries, we can get the time
-        // from the created_at field
         return (0, ent_1.getCursor)({
             row: contacts[idx],
-            col: "createdAt",
-            conv: (t) => {
-                //sqlite
-                if (typeof t === "string") {
-                    return Date.parse(t);
-                }
-                return t.getTime();
-            },
-            // we want the right column to be encoded in the cursor as opposed e.g. time for
-            // assoc queries, created_at for index/custom queries
-            cursorKey: opts.sortCol,
+            col: "id",
         });
     }
     describe("no filters", () => {

package/imports/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha90",
+  "version": "0.1.0-alpha92-56721980-4046-11ed-ba1f-832778cd7daa",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/field.d.ts

@@ -1,3 +1,4 @@
+import { Builder } from "../action/action";
 import { Field, FieldMap, FieldOptions, ForeignKey, PolymorphicOptions, Type } from "./schema";
 export declare abstract class BaseField {
     name: string;
@@ -88,6 +89,18 @@ export declare class StringField extends BaseField implements Field {
     trimLeft(): this;
     trimRight(): this;
 }
+interface PolymorphicStringOptions extends StringOptions {
+    parentFieldToValidate: string;
+    types?: string[];
+}
+export declare class PolymorphicStringField extends StringField {
+    private opts;
+    private camelCaseVals;
+    constructor(opts: PolymorphicStringOptions);
+    validateWithFullData(val: any, b: Builder<any>): boolean;
+    valid(val: any): boolean;
+    format(val: any): any;
+}
 export declare function StringType(options?: StringOptions): StringField;
 export interface TimestampOptions extends FieldOptions {
     withTimezone?: boolean;

package/schema/field.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,9 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
+exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
 const snake_case_1 = require("snake-case");
+const camel_case_1 = require("camel-case");
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 const base_1 = require("../core/base");
@@ -62,32 +67,26 @@ class UUIDField extends BaseField {
             else {
                 throw new Error(`unsupported id polymorhpic type ${fieldName}`);
             }
+            let types;
+            let serverDefault = undefined;
+            if (typeof polymorphic === "object") {
+                serverDefault = polymorphic.serverDefault;
+                types = polymorphic.types;
+            }
             // polymorphic field automatically hidden from GraphQL
             // can be made visible with custom fields if user wants to change this behavior
             // can't be foreignKey so need to make other changes to the field
             // intentionally not made private as it doesn't seem like it needs to be hidden
-            if (typeof polymorphic === "object" && polymorphic.types) {
-                // an enum with types validated here
-                return {
-                    [name]: PolymorphicStringEnumType({
-                        values: polymorphic.types,
-                        hideFromGraphQL: true,
-                        derivedWhenEmbedded: true,
-                        nullable: this.options?.nullable,
-                        parentFieldToValidate: fieldName,
-                    }),
-                };
-            }
-            else {
-                return {
-                    [name]: PolymorphicStringType({
-                        hideFromGraphQL: true,
-                        derivedWhenEmbedded: true,
-                        nullable: this.options?.nullable,
-                        parentFieldToValidate: fieldName,
-                    }),
-                };
-            }
+            return {
+                [name]: PolymorphicStringType({
+                    types: types,
+                    hideFromGraphQL: true,
+                    derivedWhenEmbedded: true,
+                    nullable: this.options?.nullable,
+                    parentFieldToValidate: fieldName,
+                    serverDefault: serverDefault,
+                }),
+            };
         }
         return {};
     }
@@ -313,29 +312,54 @@ class StringField extends BaseField {
     }
 }
 exports.StringField = StringField;
-function validatePolymorphicTypeWithFullData(val, b, field) {
-    const input = b.getInput();
-    const inputKey = b.orchestrator.__getOptions().fieldInfo[field].inputKey;
-    const v = input[inputKey];
-    if (val === null) {
-        // if this is being set to null, ok if v is also null
-        return v === null;
-    }
-    // if this is not being set, ok if v is not being set
-    if (val === undefined && b.operation === base_1.WriteOperation.Insert) {
-        return v === undefined;
-    }
-    return true;
-}
 class PolymorphicStringField extends StringField {
     constructor(opts) {
         super(opts);
         this.opts = opts;
+        if (opts.types) {
+            this.camelCaseVals = opts.types.map((v) => (0, camel_case_1.camelCase)(v));
+        }
     }
     validateWithFullData(val, b) {
-        return validatePolymorphicTypeWithFullData(val, b, this.opts.parentFieldToValidate);
+        const input = b.getInput();
+        const inputKey = b.orchestrator.__getOptions().fieldInfo[this.opts.parentFieldToValidate]
+            .inputKey;
+        const v = input[inputKey];
+        if (val === null) {
+            // if this is being set to null, ok if v is also null
+            return v === null;
+        }
+        // if this is not being set, ok if v is not being set
+        if (val === undefined && b.operation === base_1.WriteOperation.Insert) {
+            return v === undefined;
+        }
+        return true;
+    }
+    valid(val) {
+        if (!this.camelCaseVals) {
+            return true;
+        }
+        let str = (0, camel_case_1.camelCase)(String(val));
+        // allow different cases because it could be coming from different clients who don't have strong typing
+        return this.camelCaseVals.some((value) => value === str);
+    }
+    format(val) {
+        if (!this.camelCaseVals) {
+            return val;
+        }
+        const converted = (0, camel_case_1.camelCase)(String(val));
+        for (const v of this.camelCaseVals) {
+            if (v === val) {
+                return val;
+            }
+            if (converted === v) {
+                return converted;
+            }
+        }
+        return val;
     }
 }
+exports.PolymorphicStringField = PolymorphicStringField;
 function PolymorphicStringType(opts) {
     let result = new PolymorphicStringField(opts);
     return Object.assign(result, opts);
@@ -586,19 +610,6 @@ exports.EnumField = EnumField;
 class StringEnumField extends EnumField {
 }
 exports.StringEnumField = StringEnumField;
-class PolymorphicStringEnumField extends StringEnumField {
-    constructor(opts) {
-        super(opts);
-        this.opts = opts;
-    }
-    validateWithFullData(val, b) {
-        return validatePolymorphicTypeWithFullData(val, b, this.opts.parentFieldToValidate);
-    }
-}
-function PolymorphicStringEnumType(options) {
-    let result = new PolymorphicStringEnumField(options);
-    return Object.assign(result, options);
-}
 function EnumType(options) {
     let result = new StringEnumField(options);
     return Object.assign(result, options);

package/schema/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/schema/schema.d.ts

@@ -215,6 +215,7 @@ export interface PolymorphicOptions {
     types?: string[];
     hideFromInverseGraphQL?: boolean;
     disableBuilderType?: boolean;
+    serverDefault?: any;
 }
 export interface Field extends FieldOptions {
     type: Type;

package/scripts/custom_compiler.js

@@ -2,7 +2,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -193,7 +197,7 @@ class Compiler {
                     }
                     relPath = path.relative(
                     // just because of how imports work. it's relative from directory not current path
-                    path.dirname(fullPath), path.join(text.substr(0, idx).replace(r, str.substr(0, strIdx)), text.substr(idx)));
+                    path.dirname(fullPath), path.join(text.substring(0, idx).replace(r, str.substring(0, strIdx)), text.substring(idx)));
                     // if file ends with "..", we've reached a case where we're trying to
                     // import something like foo/contact(.ts) from within foo/contact/bar/baz/page.ts
                     // and we're confused about it so we need to detect that case and handle it
@@ -204,7 +208,7 @@ class Compiler {
                             let text2 = text + ".ts";
                             relPath = path.relative(
                             // just because of how imports work. it's relative from directory not current path
-                            path.dirname(fullPath), path.join(text2.substr(0, idx).replace(r, str.substr(0, strIdx)), text2.substr(idx)));
+                            path.dirname(fullPath), path.join(text2.substring(0, idx).replace(r, str.substring(0, strIdx)), text2.substring(idx)));
                         }
                     }
                     if (!relPath.startsWith("..")) {
@@ -213,7 +217,7 @@ class Compiler {
                     // tsc removes this by default so we need to also do it
                     let tsIdx = relPath.indexOf(".ts");
                     if (tsIdx !== -1) {
-                        relPath = relPath.substr(0, tsIdx);
+                        relPath = relPath.substring(0, tsIdx);
                     }
                     return relPath;
                 }
@@ -225,7 +229,7 @@ class Compiler {
                     let relPath = checkPath(paths, text);
                     if (relPath) {
                         // update the node...
-                        return typescript_1.default.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, typescript_1.default.createLiteral(relPath));
+                        return typescript_1.default.factory.updateImportDeclaration(importNode, importNode.decorators, importNode.modifiers, importNode.importClause, typescript_1.default.factory.createStringLiteral(relPath), importNode.assertClause);
                     }
                 }
                 if (node.kind === typescript_1.default.SyntaxKind.ExportDeclaration) {
@@ -235,7 +239,7 @@ class Compiler {
                         let relPath = checkPath(paths, text);
                         if (relPath) {
                             // update the node...
-                            return typescript_1.default.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, typescript_1.default.createLiteral(relPath), exportNode.isTypeOnly);
+                            return typescript_1.default.updateExportDeclaration(exportNode, exportNode.decorators, exportNode.modifiers, exportNode.exportClause, typescript_1.default.factory.createStringLiteral(relPath), exportNode.isTypeOnly);
                         }
                     }
                 }

package/scripts/custom_graphql.js

@@ -2,7 +2,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/scripts/read_schema.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/testutils/db/temp_db.d.ts

@@ -24,6 +24,7 @@ interface Constraint extends SchemaItem {
 }
 interface Index extends SchemaItem {
     generate(): string;
+    postCreate?(): boolean;
 }
 export interface CoreConcept {
     name: string;
@@ -42,10 +43,10 @@ export declare function foreignKey(name: string, cols: string[], fkey: {
     cols: string[];
 }): Constraint;
 interface indexOptions {
-    type: string;
+    type?: string;
+    unique?: boolean;
 }
 export declare function index(tableName: string, cols: string[], opts?: indexOptions): Index;
-export declare function uniqueIndex(name: string): Constraint;
 export declare function uuid(name: string, opts?: options): Column;
 export declare function text(name: string, opts?: options): Column;
 export declare function enumCol(name: string, type: string): Column;
@@ -77,10 +78,10 @@ export declare class TempDB {
     private tables;
     private dialect;
     private sqlite;
-    constructor(dialect: Dialect, tables?: CoreConcept[]);
-    constructor(tables: CoreConcept[]);
+    private setTables;
+    constructor(dialect: Dialect, tables?: CoreConcept[] | (() => CoreConcept[]));
     getDialect(): Dialect;
-    getTables(): Map<string, CoreConcept>;
+    __getTables(): Map<string, CoreConcept>;
     beforeAll(setupConnString?: boolean): Promise<void>;
     createImpl(table: CoreConcept): Promise<void>;
     getSqliteClient(): SqliteDatabase;

package/testutils/db/temp_db.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,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.uniqueIndex = exports.index = exports.foreignKey = exports.primaryKey = void 0;
+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;
 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
@@ -51,25 +55,26 @@ function foreignKey(name, cols, fkey) {
     };
 }
 exports.foreignKey = foreignKey;
+function isPostCreateIndex(s) {
+    return (s.postCreate !== undefined &&
+        s.postCreate());
+}
 function index(tableName, cols, opts) {
     const name = `${tableName}_${cols.join("_")}_idx`;
     return {
         name,
         generate() {
-            return `CREATE INDEX ${name} ON ${tableName} USING ${opts?.type || "btree"} (${cols.join(",")});`;
+            if (opts?.unique && db_1.Dialect.SQLite === db_1.default.getDialect()) {
+                return `UNIQUE (${cols.join(",")})`;
+            }
+            return `CREATE ${opts?.unique ? "UNIQUE " : ""}INDEX ${name} ON ${tableName} USING ${opts?.type || "btree"} (${cols.join(",")});`;
         },
-    };
-}
-exports.index = index;
-function uniqueIndex(name) {
-    return {
-        name: "",
-        generate() {
-            return `UNIQUE (${name})`;
+        postCreate() {
+            return db_1.Dialect.Postgres === db_1.default.getDialect() && !!opts?.unique;
         },
     };
 }
-exports.uniqueIndex = uniqueIndex;
+exports.index = index;
 function uuid(name, opts) {
     return {
         name,
@@ -287,7 +292,12 @@ function table(name, ...items) {
             cols.push(item);
         }
         else if (item.generate !== undefined) {
-            constraints.push(item);
+            if (isPostCreateIndex(item) && item.postCreate()) {
+                indexes.push(item);
+            }
+            else {
+                constraints.push(item);
+            }
         }
     }
     return {
@@ -351,23 +361,15 @@ function isDialect(dialect) {
 class TempDB {
     constructor(dialect, tables) {
         this.tables = new Map();
-        let tbles = [];
-        if (isDialect(dialect)) {
-            this.dialect = dialect;
-            if (tables) {
-                tbles = tables;
-            }
-        }
-        else {
-            this.dialect = db_1.Dialect.Postgres;
-            tbles = dialect;
-        }
-        tbles.forEach((table) => this.tables.set(table.name, table));
+        this.dialect = dialect;
+        this.setTables = tables;
     }
     getDialect() {
         return this.dialect;
     }
-    getTables() {
+    // NB: this won't be set until after beforeAll() is called since it depends on
+    // dialect being correctly set
+    __getTables() {
         return this.tables;
     }
     async beforeAll(setupConnString = true) {
@@ -410,6 +412,16 @@ class TempDB {
             const filePath = process.env.DB_CONNECTION_STRING.substr(10);
             this.sqlite = (0, better_sqlite3_1.default)(filePath);
         }
+        if (this.setTables) {
+            let tables = [];
+            if (typeof this.setTables === "function") {
+                tables = this.setTables();
+            }
+            else {
+                tables = this.setTables;
+            }
+            tables.forEach((table) => this.tables.set(table.name, table));
+        }
         for (const [_, table] of this.tables) {
             await this.createImpl(table);
         }
@@ -507,7 +519,7 @@ function assoc_edge_table(name, global) {
 }
 exports.assoc_edge_table = assoc_edge_table;
 function setupSqlite(connString, tables, opts) {
-    let tdb = new TempDB(db_1.Dialect.SQLite, tables());
+    let tdb = new TempDB(db_1.Dialect.SQLite, tables);
     beforeAll(async () => {
         process.env.DB_CONNECTION_STRING = connString;
         (0, config_1.loadConfig)();
@@ -518,7 +530,7 @@ function setupSqlite(connString, tables, opts) {
     if (!opts?.disableDeleteAfterEachTest) {
         afterEach(async () => {
             const client = await db_1.default.getInstance().getNewClient();
-            for (const [key, _] of tdb.getTables()) {
+            for (const [key, _] of tdb.__getTables()) {
                 const query = `delete from ${key}`;
                 if (isSyncClient(client))
                     if (client.execSync) {

package/testutils/db_mock.js

@@ -185,7 +185,9 @@ class QueryRecorder {
         }
     }
     static mockPool(pool) {
-        const mockedPool = (0, jest_mock_1.mocked)(pool, true);
+        const mockedPool = (0, jest_mock_1.mocked)(pool);
+        // @ts-ignore
+        // TODO what changed in mockImplementation?
         mockedPool.mockImplementation(() => {
             return {
                 totalCount: 1,

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -45,6 +49,7 @@ function server(config) {
     if (config.init) {
         config.init(app);
     }
+    // @ts-ignore something changed. come back
     app.use(express_1.default.json());
     let handlers = config.customHandlers || [];
     handlers.push(async (req, res) => {
@@ -56,9 +61,11 @@ function server(config) {
             request: req,
             schema: config.schema,
             contextFactory: async (executionContext) => {
+                // @ts-ignore something changed. come back
                 return (0, auth_1.buildContext)(req, res);
             },
         });
+        // @ts-ignore something changed. come back
         await (0, graphql_helix_1.sendResult)(result, res);
     });
     app.use(config.graphQLPath || "/graphql", ...handlers);

package/testutils/fake_data/const.d.ts

@@ -18,7 +18,8 @@ export declare enum EdgeType {
 export declare enum NodeType {
     FakeUser = "user",
     FakeContact = "contact",
-    FakeEvent = "event"
+    FakeEvent = "event",
+    FakeTag = "tag"
 }
 export declare const SymmetricEdges: Set<string>;
 export declare const InverseEdges: Map<EdgeType, EdgeType>;

package/testutils/fake_data/const.js

@@ -27,6 +27,7 @@ var NodeType;
     NodeType["FakeUser"] = "user";
     NodeType["FakeContact"] = "contact";
     NodeType["FakeEvent"] = "event";
+    NodeType["FakeTag"] = "tag";
 })(NodeType = exports.NodeType || (exports.NodeType = {}));
 exports.SymmetricEdges = new Set();
 exports.SymmetricEdges.add(EdgeType.UserToFriends);
@@ -48,6 +49,8 @@ function getLoaderOptions(type) {
             return internal_1.FakeUser.loaderOptions();
         case NodeType.FakeEvent:
             return internal_1.FakeEvent.loaderOptions();
+        case NodeType.FakeTag:
+            return internal_1.FakeTag.loaderOptions();
     }
 }
 exports.getLoaderOptions = getLoaderOptions;

package/testutils/fake_data/fake_contact.d.ts

@@ -28,6 +28,8 @@ export interface ContactCreateInput {
     lastName: string;
     emailAddress: string;
     userID: ID;
+    createdAt?: Date;
+    updatedAt?: Date;
 }
 export declare function getContactBuilder(viewer: Viewer, input: ContactCreateInput): SimpleBuilder<FakeContact, null>;
 export declare function createContact(viewer: Viewer, input: ContactCreateInput): Promise<void>;