@snowtop/ent 0.1.0-alpha1 → 0.1.0-alpha10

package/scripts/transform_schema.js

@@ -27,51 +27,28 @@ const typescript_1 = __importDefault(require("typescript"));
 const fs = __importStar(require("fs"));
 const compilerOptions_1 = require("../tsc/compilerOptions");
 const child_process_1 = require("child_process");
-function getTarget(target) {
-    switch (target.toLowerCase()) {
-        case "es2015":
-            return typescript_1.default.ScriptTarget.ES2015;
-        case "es2016":
-            return typescript_1.default.ScriptTarget.ES2016;
-        case "es2017":
-            return typescript_1.default.ScriptTarget.ES2017;
-        case "es2018":
-            return typescript_1.default.ScriptTarget.ES2018;
-        case "es2019":
-            return typescript_1.default.ScriptTarget.ES2019;
-        case "es2020":
-            return typescript_1.default.ScriptTarget.ES2020;
-        case "es2021":
-            return typescript_1.default.ScriptTarget.ES2021;
-        case "es3":
-            return typescript_1.default.ScriptTarget.ES3;
-        case "es5":
-            return typescript_1.default.ScriptTarget.ES5;
-        case "esnext":
-            return typescript_1.default.ScriptTarget.ESNext;
-        default:
-            return typescript_1.default.ScriptTarget.ESNext;
-    }
-}
+const path_1 = __importDefault(require("path"));
+const ast_1 = require("../tsc/ast");
 async function main() {
     // this assumes this is being run from root of directory
     const options = (0, compilerOptions_1.readCompilerOptions)(".");
     let files = glob_1.glob.sync("src/schema/*.ts");
-    const target = options.target
-        ? // @ts-ignore
-            getTarget(options.target)
-        : typescript_1.default.ScriptTarget.ESNext;
+    const target = (0, compilerOptions_1.getTarget)(options.target?.toString());
     // filter to only event.ts e.g. for comments and whitespace...
     //  files = files.filter((f) => f.endsWith("event.ts"));
     files.forEach((file) => {
         // assume valid file since we do glob above
-        const idx = file.lastIndexOf(".ts");
-        const writeFile = file.substring(0, idx) + "2" + ".ts";
-        let contents = fs.readFileSync(file).toString();
+        //    const idx = file.lastIndexOf(".ts");
+        //    const writeFile = file.substring(0, idx) + "2" + ".ts";
+        //    console.debug(file);
+        const writeFile = "src/schema/" + path_1.default.basename(file).slice(0, -3) + "_schema.ts";
+        // const writeFile = file;
+        //    console.debug(file, writeFile);
         // go through the file and print everything back if not starting immediately after other position
-        const sourceFile = typescript_1.default.createSourceFile(file, contents, target, false, typescript_1.default.ScriptKind.TS);
+        let { contents, sourceFile } = (0, compilerOptions_1.createSourceFile)(target, file);
         const nodes = [];
         let updateImport = false;
+        let removeImports = [];
         const f = {
             trackNode: function (tni) {
                 nodes.push({
@@ -79,6 +56,9 @@ async function main() {
                     importNode: tni.node && typescript_1.default.isImportDeclaration(tni.node),
                     rawString: tni.rawString,
                 });
+                if (tni.removeImports) {
+                    removeImports.push(...tni.removeImports);
+                }
             },
             flagUpdateImport() {
                 updateImport = true;
@@ -91,7 +71,10 @@ async function main() {
         for (const node of nodes) {
             if (updateImport && node.importNode) {
                 const importNode = node.node;
-                const transformedImport = transformImport(importNode, sourceFile);
+                const transformedImport = (0, ast_1.transformImport)(contents, importNode, sourceFile, {
+                    removeImports,
+                    transform: transformSchema,
+                });
                 if (transformedImport) {
                     newContents += transformedImport;
                     continue;
@@ -110,6 +93,7 @@ async function main() {
         //    console.debug(newContents);
         // ideally there's a flag that indicates if we write
         fs.writeFileSync(writeFile, newContents);
+        fs.rmSync(file);
     });
     (0, child_process_1.execSync)("prettier src/schema/*.ts --write");
 }
@@ -129,62 +113,183 @@ function traverse(fileContents, sourceFile, f) {
     });
     return traversed;
 }
-// TODO need to replace class field member, print that and see what happens
 function traverseClass(fileContents, sourceFile, node, f) {
-    let updated = false;
-    // beginning of class...
-    // including comment
-    let klassContents = fileContents.substring(node.getFullStart(), node.members[0].getFullStart());
+    const ci = getTransformClassInfo(fileContents, sourceFile, node);
+    if (!ci) {
+        return false;
+    }
+    let klassContents = `${ci.comment}const ${ci.name} = new ${ci.class}({\n`;
+    let removeImports = [];
+    if (ci.implementsSchema) {
+        removeImports.push("Schema");
+    }
     for (let member of node.members) {
-        if (!isFieldElement(member, sourceFile)) {
-            klassContents += member.getFullText(sourceFile);
-            continue;
-        }
-        // intentionally doesn't parse decorators since we don't need it
-        let fieldMap = "";
-        // fieldMapComment...
-        const comment = getPreText(fileContents, member, sourceFile);
-        if (comment) {
-            fieldMap += comment;
+        const fInfo = getClassElementInfo(fileContents, member, sourceFile);
+        if (!fInfo) {
+            return false;
         }
-        updated = true;
-        // need to change to fields: FieldMap = {code: StringType()};
-        const property = member;
-        const initializer = property.initializer;
-        fieldMap += "fields: FieldMap = {";
-        for (const element of initializer.elements) {
-            const parsed = parseFieldElement(element, sourceFile, fileContents);
-            if (parsed === null) {
-                return false;
-            }
-            const { callEx, name, nameComment, properties } = parsed;
-            let property = "";
-            const fieldComment = getPreText(fileContents, element, sourceFile).trim();
-            if (fieldComment) {
-                property += "\n" + fieldComment + "\n";
-            }
-            if (nameComment) {
-                property += nameComment + "\n";
-            }
-            // e.g. UUIDType, StringType etc
-            let call = callEx.expression.getText(sourceFile);
-            let fnCall = "";
-            if (properties.length) {
-                fnCall = `{${properties.join(",")}}`;
-            }
-            property += `${name}:${call}(${fnCall}),`;
-            fieldMap += property;
+        klassContents += `${fInfo.comment}${fInfo.key}:${fInfo.value},\n`;
+        if (fInfo.type) {
+            removeImports.push(fInfo.type);
         }
-        fieldMap += "}";
-        klassContents += fieldMap;
     }
-    klassContents += "\n}";
+    klassContents += "\n})";
+    if (ci.export && ci.default) {
+        klassContents += `\n export default ${ci.name};`;
+    }
+    else if (ci.export) {
+        klassContents = "export " + klassContents;
+    }
     //  console.debug(klassContents);
-    if (!updated) {
-        return updated;
+    f.trackNode({ rawString: klassContents, removeImports: removeImports });
+    return true;
+}
+function transformSchema(str) {
+    // only do known class names
+    if (str === "BaseEntSchema" || str === "BaseEntSchemaWithTZ") {
+        return str.substring(4);
+    }
+    return str;
+}
+// TODO need to generify this...
+// and then have a schema specific version
+// may make sense to just duplicate this logic...
+function getTransformClassInfo(fileContents, sourceFile, node) {
+    const generic = (0, ast_1.getClassInfo)(fileContents, sourceFile, node);
+    if (!generic) {
+        return;
+    }
+    let className = generic.name;
+    if (!className?.endsWith("Schema")) {
+        className += "Schema";
+    }
+    let implementsSchema = generic.implements?.some((v) => v == "Schema");
+    let classExtends = generic.extends;
+    if (classExtends && classExtends === transformSchema(classExtends)) {
+        return undefined;
+    }
+    if (!className || !node.heritageClauses || !classExtends) {
+        return undefined;
+    }
+    let ci = {
+        ...generic,
+        name: className,
+        class: classExtends,
+        implementsSchema,
+    };
+    return ci;
+}
+// intentionally doesn't parse decorators since we don't need it
+function getClassElementInfo(fileContents, member, sourceFile) {
+    if (isFieldElement(member, sourceFile)) {
+        return getFieldElementInfo(fileContents, member, sourceFile);
+    }
+    if (member.kind === typescript_1.default.SyntaxKind.Constructor) {
+        return getConstructorElementInfo(fileContents, member, sourceFile);
+    }
+    if (member.kind !== typescript_1.default.SyntaxKind.PropertyDeclaration) {
+        return;
+    }
+    // other properties
+    const property = member;
+    if (!property.initializer) {
+        return;
     }
-    f.trackNode({ rawString: klassContents });
-    return updated;
+    const token = property.name;
+    return {
+        key: token.escapedText.toString(),
+        value: property.initializer?.getFullText(sourceFile),
+        comment: (0, ast_1.getPreText)(fileContents, member, sourceFile),
+        type: getType(property, sourceFile),
+    };
+}
+function getType(property, sourceFile) {
+    let propertytype = property.type?.getText(sourceFile) || "";
+    let ends = ["| null", "[]"];
+    for (const end of ends) {
+        if (propertytype.endsWith(end)) {
+            propertytype = propertytype.slice(0, -1 * end.length);
+        }
+    }
+    return propertytype;
+}
+function getFieldElementInfo(fileContents, member, sourceFile) {
+    let fieldMap = "";
+    // need to change to fields: {code: StringType()};
+    const property = member;
+    const initializer = property.initializer;
+    fieldMap += "{";
+    for (const element of initializer.elements) {
+        const parsed = parseFieldElement(element, sourceFile, fileContents);
+        if (parsed === null) {
+            return;
+        }
+        const { callEx, name, nameComment, properties } = parsed;
+        let property = "";
+        const fieldComment = (0, ast_1.getPreText)(fileContents, element, sourceFile).trim();
+        if (fieldComment) {
+            property += "\n" + fieldComment + "\n";
+        }
+        if (nameComment) {
+            property += nameComment + "\n";
+        }
+        // e.g. UUIDType, StringType etc
+        let call = callEx.expression.getText(sourceFile);
+        let fnCall = "";
+        if (properties.length) {
+            fnCall = `{${properties.join(",")}}`;
+        }
+        property += `${name}:${call}(${fnCall}),`;
+        fieldMap += property;
+    }
+    fieldMap += "}";
+    return {
+        key: "fields",
+        value: fieldMap,
+        comment: (0, ast_1.getPreText)(fileContents, member, sourceFile),
+        type: getType(property, sourceFile),
+    };
+}
+function getConstructorElementInfo(fileContents, member, sourceFile) {
+    const c = member;
+    //remove {}
+    let fullText = c.body?.getFullText(sourceFile) || "";
+    fullText = fullText.trim().slice(1, -1).trim();
+    // convert something like
+    /*
+    constructor() {
+      super();
+      this.addPatterns(
+        new Feedback(),
+        new DayOfWeek(),
+        new Feedback(),
+        new DayOfWeek(),
+      );
+    }
+      */
+    // into this.addPatterns(new Feedback(),new DayOfWeek(),new Feedback(),new DayOfWeek(),)
+    const lines = fullText
+        .split("\n")
+        .map((line) => line.trim())
+        .join("")
+        .split(";")
+        .filter((f) => f != "super()" && f != "");
+    // at this point there should be only line for what we handle
+    if (lines.length != 1) {
+        return;
+    }
+    const line = lines[0];
+    const addPatterns = "this.addPatterns(";
+    if (!line.startsWith(addPatterns)) {
+        return;
+    }
+    return {
+        key: "patterns",
+        // remove this.addPatterns at the front, remove trailing ) at the end
+        // if there's a trailing comma, it'll be handled by prettier
+        value: `[${line.slice(addPatterns.length, -1)}]`,
+        comment: "",
+    };
 }
 function isFieldElement(member, sourceFile) {
     if (member.kind !== typescript_1.default.SyntaxKind.PropertyDeclaration) {
@@ -230,7 +335,7 @@ function parseFieldElement(element, sourceFile, fileContents) {
         if (p2.name.escapedText === "name") {
             name = p2.initializer.getText(sourceFile);
             // check for any comment associated with name: "fooo"
-            propertyComment = getPreText(fileContents, p, sourceFile).trim();
+            propertyComment = (0, ast_1.getPreText)(fileContents, p, sourceFile).trim();
         }
         else {
             properties.push(p.getFullText(sourceFile));
@@ -249,40 +354,4 @@ function parseFieldElement(element, sourceFile, fileContents) {
         nameComment: propertyComment,
     };
 }
-function transformImport(importNode, sourceFile) {
-    // remove quotes too
-    const text = importNode.moduleSpecifier.getText(sourceFile).slice(1, -1);
-    if (text !== "@snowtop/ent" &&
-        text !== "@snowtop/ent/schema" &&
-        text !== "@snowtop/ent/schema/") {
-        return;
-    }
-    const importText = importNode.importClause?.getText(sourceFile) || "";
-    const start = importText.indexOf("{");
-    const end = importText.lastIndexOf("}");
-    if (start === -1 || end === -1) {
-        return;
-    }
-    const imports = importText
-        .substring(start + 1, end)
-        //    .trim()
-        .split(",");
-    for (let i = 0; i < imports.length; i++) {
-        const imp = imports[i].trim();
-        if (imp === "Field") {
-            imports[i] = "FieldMap";
-        }
-    }
-    // TODO better to update node instead of doing this but this works for now
-    return ("import " +
-        importText.substring(0, start + 1) +
-        imports.join(", ") +
-        importText.substring(end) +
-        ' from "' +
-        text +
-        '"');
-}
-function getPreText(fileContents, node, sourceFile) {
-    return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
-}
 Promise.resolve(main());

package/testutils/builder.d.ts

@@ -1,14 +1,15 @@
-import { Ent, ID, Viewer, Data, EntConstructor } from "../core/base";
+import { Ent, ID, Viewer, Data, EntConstructor, PrivacyPolicy } from "../core/base";
 import { Orchestrator } from "../action/orchestrator";
 import { Action, Builder, Changeset, WriteOperation, Validator, Trigger, Observer } from "../action";
-import { Schema } from "../schema";
+import { FieldMap, Schema } from "../schema";
+import { SchemaConfig } from "../schema/base_schema";
 export declare class User implements Ent {
     viewer: Viewer;
     data: Data;
     id: ID;
     accountID: string;
     nodeType: string;
-    privacyPolicy: import("../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     firstName: string;
     constructor(viewer: Viewer, data: Data);
 }
@@ -18,7 +19,7 @@ export declare class Event implements Ent {
     id: ID;
     accountID: string;
     nodeType: string;
-    privacyPolicy: import("../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
 }
 export declare class Contact implements Ent {
@@ -27,7 +28,7 @@ export declare class Contact implements Ent {
     id: ID;
     accountID: string;
     nodeType: string;
-    privacyPolicy: import("../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
 }
 export declare class Group implements Ent {
@@ -36,7 +37,7 @@ export declare class Group implements Ent {
     id: ID;
     accountID: string;
     nodeType: string;
-    privacyPolicy: import("../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
 }
 export declare class Message implements Ent {
@@ -45,7 +46,7 @@ export declare class Message implements Ent {
     id: ID;
     accountID: string;
     nodeType: string;
-    privacyPolicy: import("../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
 }
 export declare class Address implements Ent {
@@ -54,12 +55,15 @@ export declare class Address implements Ent {
     id: ID;
     accountID: string;
     nodeType: string;
-    privacyPolicy: import("../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
 }
 export interface BuilderSchema<T extends Ent> extends Schema {
     ent: EntConstructor<T>;
 }
+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 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 class SimpleBuilder<T extends Ent> implements Builder<T> {
@@ -93,7 +97,7 @@ export declare class SimpleAction<T extends Ent> implements Action<T, SimpleBuil
     observers: Observer<SimpleBuilder<T>, Data>[];
     viewerForEntLoad: viewerEntLoadFunc | undefined;
     constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation?: WriteOperation, existingEnt?: T | undefined);
-    getPrivacyPolicy(): import("../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): PrivacyPolicy<Ent>;
     getInput(): Data;
     changeset(): Promise<Changeset<T>>;
     valid(): Promise<boolean>;

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.getTableName = exports.getSchemaName = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = void 0;
+exports.SimpleAction = exports.SimpleBuilder = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = void 0;
 const privacy_1 = require("../core/privacy");
 const orchestrator_1 = require("../action/orchestrator");
 const action_1 = require("../action");
@@ -14,18 +14,21 @@ const snake_case_1 = require("snake-case");
 const loaders_1 = require("../core/loaders");
 const convert_1 = require("../core/convert");
 const camel_case_1 = require("camel-case");
+const base_schema_1 = require("../schema/base_schema");
 class User {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.data = data;
         this.accountID = "";
         this.nodeType = "User";
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         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;
     }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
 }
 exports.User = User;
 class Event {
@@ -34,9 +37,11 @@ class Event {
         this.data = data;
         this.accountID = "";
         this.nodeType = "Event";
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
     }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
 }
 exports.Event = Event;
 class Contact {
@@ -45,11 +50,13 @@ class Contact {
         this.data = data;
         this.accountID = "";
         this.nodeType = "Contact";
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         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 {
@@ -58,9 +65,11 @@ class Group {
         this.data = data;
         this.accountID = "";
         this.nodeType = "Group";
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
     }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
 }
 exports.Group = Group;
 class Message {
@@ -69,9 +78,11 @@ class Message {
         this.data = data;
         this.accountID = "";
         this.nodeType = "Message";
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
     }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
 }
 exports.Message = Message;
 class Address {
@@ -80,11 +91,34 @@ class Address {
         this.data = data;
         this.accountID = "";
         this.nodeType = "Address";
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
     }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
 }
 exports.Address = Address;
+function getBuilderSchema(cfg, ent) {
+    return {
+        ...new base_schema_1.EntSchema(cfg),
+        ent,
+    };
+}
+exports.getBuilderSchema = getBuilderSchema;
+function getBuilderSchemaFromFields(fields, ent) {
+    return {
+        ...new base_schema_1.EntSchema({ fields }),
+        ent,
+    };
+}
+exports.getBuilderSchemaFromFields = getBuilderSchemaFromFields;
+function getBuilderSchemaTZFromFields(fields, ent) {
+    return {
+        ...new base_schema_1.EntSchemaWithTZ({ fields }),
+        ent,
+    };
+}
+exports.getBuilderSchemaTZFromFields = getBuilderSchemaTZFromFields;
 function getSchemaName(value) {
     return value.ent.name;
 }
@@ -142,12 +176,34 @@ class SimpleBuilder {
                 ent: schema.ent,
                 tableName: tableName,
                 fields: [],
+                fieldPrivacy: (0, schema_1.getFieldsWithPrivacy)(schema),
             },
             builder: this,
             action: action,
             schema: this.schema,
             editedFields: () => {
-                return this.fields;
+                // to simulate what we do in generated builders where we return a new Map
+                const m = new Map();
+                for (const [k, v] of this.fields) {
+                    m.set(k, v);
+                }
+                return m;
+            },
+            updateInput: (input) => {
+                const knownFields = (0, schema_1.getFields)(this.schema);
+                for (const k in input) {
+                    if (knownFields.has(k)) {
+                        this.fields.set(k, input[k]);
+                    }
+                    else {
+                        // related to #510. we do camelCase to pass fields in here but fields may be snakeCase and we want that to pass in tests
+                        // we do camelCase in
+                        const sc = (0, snake_case_1.snakeCase)(k);
+                        if (knownFields.has(sc)) {
+                            this.fields.set(sc, input[k]);
+                        }
+                    }
+                }
             },
         });
     }

package/testutils/context/test_context.d.ts

@@ -1,8 +1,8 @@
 import { Context, Viewer } from "../../core/base";
 import { ContextCache } from "../../core/context";
-import { LoggedOutViewer } from "../../core/viewer";
 export declare class TestContext implements Context {
+    constructor(viewer?: Viewer);
     cache: ContextCache;
-    viewer: LoggedOutViewer;
+    viewer: Viewer;
     getViewer(): Viewer;
 }

package/testutils/context/test_context.js

@@ -4,9 +4,15 @@ exports.TestContext = void 0;
 const context_1 = require("../../core/context");
 const viewer_1 = require("../../core/viewer");
 class TestContext {
-    constructor() {
+    constructor(viewer) {
         this.cache = new context_1.ContextCache();
         this.viewer = new viewer_1.LoggedOutViewer(this);
+        if (viewer) {
+            this.viewer = viewer;
+            if (viewer.setContext !== undefined) {
+                viewer.setContext(this);
+            }
+        }
     }
     getViewer() {
         return this.viewer;

package/testutils/db/test_db.d.ts

@@ -71,10 +71,11 @@ export declare class TempDB {
     constructor(tables: CoreConcept[]);
     getDialect(): Dialect;
     getTables(): Map<string, CoreConcept>;
-    beforeAll(): Promise<void>;
+    beforeAll(setupConnString?: boolean): Promise<void>;
     getSqliteClient(): SqliteDatabase;
     getPostgresClient(): PGClient;
     afterAll(): Promise<void>;
+    getDB(): string;
     dropAll(): Promise<void>;
     drop(...tables: string[]): Promise<void>;
     create(...tables: CoreConcept[]): Promise<void>;