@snowtop/ent 0.1.0-alpha8 → 0.1.0-alpha80

package/schema/struct_field.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StructListType = exports.StructType = exports.StructField = void 0;
+exports.StructTypeAsList = exports.StructListType = exports.StructType = exports.StructField = void 0;
 const field_1 = require("./field");
 const schema_1 = require("./schema");
 const camel_case_1 = require("camel-case");
@@ -17,11 +17,16 @@ class StructField extends field_1.BaseField {
         if (options.jsonNotJSONB) {
             this.type.dbType = schema_1.DBType.JSON;
         }
+        if (options?.jsonAsList) {
+            this.type.listElemType = {
+                dbType: schema_1.DBType.JSONB,
+            };
+        }
     }
     // right now, we store things in the db in lowerCase format
     // this will lead to issues if field changes.
     // TODO: use storageKey and convert back...
-    format(obj, nested) {
+    formatImpl(obj, nested) {
         if (!(obj instanceof Object)) {
             throw new Error("valid was not called");
         }
@@ -47,13 +52,23 @@ class StructField extends field_1.BaseField {
                 ret[dbKey] = val;
             }
         }
-        // don't json.stringify if nested
+        // don't json.stringify if nested or list
         if (nested) {
             return ret;
         }
         return JSON.stringify(ret);
     }
-    async valid(obj) {
+    format(obj, nested) {
+        if (Array.isArray(obj) && this.options.jsonAsList) {
+            const ret = obj.map((v) => this.formatImpl(v, true));
+            if (nested) {
+                return ret;
+            }
+            return JSON.stringify(ret);
+        }
+        return this.formatImpl(obj, nested);
+    }
+    async validImpl(obj) {
         if (!(obj instanceof Object)) {
             return false;
         }
@@ -89,6 +104,19 @@ class StructField extends field_1.BaseField {
         const ret = await Promise.all(promises);
         return ret.every((v) => v);
     }
+    async valid(obj) {
+        if (this.options.jsonAsList) {
+            if (!Array.isArray(obj)) {
+                return false;
+            }
+            const valid = await Promise.all(obj.map((v) => this.validImpl(v)));
+            return valid.every((b) => b);
+        }
+        if (!(obj instanceof Object)) {
+            return false;
+        }
+        return this.validImpl(obj);
+    }
 }
 exports.StructField = StructField;
 function StructType(options) {
@@ -96,7 +124,18 @@ function StructType(options) {
     return Object.assign(result, options);
 }
 exports.StructType = StructType;
+/**
+ * @deprecated use StructTypeAsList
+ */
 function StructListType(options) {
     return new field_1.ListField(StructType(options), options);
 }
 exports.StructListType = StructListType;
+function StructTypeAsList(options) {
+    let result = new StructField({
+        ...options,
+        jsonAsList: true,
+    });
+    return Object.assign(result, options);
+}
+exports.StructTypeAsList = StructTypeAsList;

package/scripts/custom_graphql.js

@@ -235,7 +235,11 @@ async function main() {
     // if this list grows too long, need to build this into golang types and passed here
     // TODO foreign non-scalars eventually
     (0, graphql_1.addCustomType)({
-        importPath: "../graphql/scalars/time",
+        importPath: MODULE_PATH,
+        // for go tests...
+        // TODO need a flag that only does this for go tests
+        // breaks when running locally sometimes...
+        secondaryImportPath: "../graphql/scalars/time",
         type: "GraphQLTime",
     });
     (0, graphql_1.addCustomType)({

package/scripts/migrate_v0.1.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const transform_1 = require("../tsc/transform");
+const transform_schema_1 = require("../tsc/transform_schema");
+const transform_ent_1 = require("../tsc/transform_ent");
+const move_generated_1 = require("../tsc/move_generated");
+const transform_action_1 = require("../tsc/transform_action");
+const minimist_1 = __importDefault(require("minimist"));
+const ast_1 = require("../tsc/ast");
+// todo-sqlite
+//  ts-node-script --swc --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/migrate_v0.1.ts --transform_schema --old_base_class BaseEntTodoSchema --new_schema_class TodoEntSchema  --transform_path src/schema/patterns/base
+function main() {
+    const customInfo = (0, ast_1.getCustomInfo)();
+    const options = (0, minimist_1.default)(process.argv.slice(2));
+    // install 0.1.x dependencies
+    // maybe provide options to make this easier if someone wants to do this in steps to see what's happening
+    if (options.move_generated) {
+        (0, move_generated_1.moveGenerated)(customInfo.relativeImports);
+    }
+    // codegen  write-all --disable-custom-graphql
+    if (options.transform_schema) {
+        (0, transform_1.transform)(new transform_schema_1.TransformSchema(customInfo.relativeImports, options.old_base_class, options.new_schema_class, options.transform_path));
+    }
+    // codegen write-all --disable-custom-graphql
+    if (options.transform_ent) {
+        (0, transform_1.transform)(new transform_ent_1.TransformEnt());
+    }
+    if (options.transform_action) {
+        (0, transform_1.transform)(new transform_action_1.TransformAction(customInfo));
+    }
+    // codegen write-all
+}
+main();

package/scripts/read_schema.js

@@ -28,26 +28,49 @@ const pascal_case_1 = require("pascal-case");
 const minimist_1 = __importDefault(require("minimist"));
 const process_1 = require("process");
 const parse_1 = require("../parse_schema/parse");
+const ast_1 = require("../tsc/ast");
 function main() {
     const options = (0, minimist_1.default)(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
     }
+    const customInfo = (0, ast_1.getCustomInfo)();
+    const globalSchemaPath = customInfo.globalSchemaPath || "__global__schema.ts";
+    let globalSchema;
     const r = /(\w+).ts/;
+    // do we still even need this...
     const paths = glob_1.default.sync(path.join(options.path, "*.ts"), {
         ignore: [`\d+_read_schema.ts`],
     });
     let potentialSchemas = {};
     for (const p of paths) {
         const basename = path.basename(p);
+        if (basename === globalSchemaPath) {
+            globalSchema = require(p).default;
+            continue;
+        }
         const match = r.exec(basename);
         if (!match) {
             throw new Error(`non-typescript file ${p} returned by glob`);
         }
-        potentialSchemas[(0, pascal_case_1.pascalCase)(match[1])] = require(p).default;
+        let schema = match[1];
+        // convert foo_schema.ts -> foo
+        if (schema.endsWith("_schema")) {
+            schema = schema.slice(0, -7);
+        }
+        let relativePath;
+        const index = p.indexOf("src/schema");
+        if (index !== -1) {
+            relativePath = p.substring(index);
+        }
+        const s = require(p).default;
+        if (relativePath !== undefined) {
+            s.schemaPath = relativePath;
+        }
+        potentialSchemas[(0, pascal_case_1.pascalCase)(schema)] = s;
     }
     //  console.log(potentialSchemas);
-    const result = (0, parse_1.parseSchema)(potentialSchemas);
+    const result = (0, parse_1.parseSchema)(potentialSchemas, globalSchema);
     console.log(JSON.stringify(result));
 }
 try {

package/testutils/builder.d.ts

@@ -1,15 +1,16 @@
-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 { FieldMap, Schema } from "../schema";
 import { SchemaConfig } from "../schema/base_schema";
+import { FieldInfoMap } from "../schema/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);
 }
@@ -19,7 +20,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 {
@@ -28,7 +29,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 {
@@ -37,7 +38,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 {
@@ -46,7 +47,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 {
@@ -55,7 +56,7 @@ 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 {
@@ -66,18 +67,26 @@ export declare function getBuilderSchemaFromFields<T extends Ent>(fields: FieldM
 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> {
+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>;
+export declare class SimpleBuilder<T extends Ent, TExistingEnt extends TMaybleNullableEnt<T> = MaybeNull<T>> implements Builder<T, Viewer, TExistingEnt> {
     viewer: Viewer;
     private schema;
     operation: WriteOperation;
-    existingEnt: T | undefined;
-    ent: EntConstructor<T>;
+    existingEnt: TExistingEnt;
+    ent: EntConstructor<T, Viewer>;
     placeholderID: ID;
-    orchestrator: Orchestrator<T, Data>;
+    orchestrator: Orchestrator<T, Data, Viewer, TExistingEnt>;
     fields: Map<string, any>;
     nodeType: string;
-    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation?: WriteOperation, existingEnt?: T | undefined, action?: Action<T, SimpleBuilder<T>, Data> | undefined);
-    build(): Promise<Changeset<T>>;
+    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);
+    getInput(): Data;
+    updateInput(input: Data): void;
+    storeData(k: string, v: any): void;
+    getStoredData(k: string): any;
+    build(): Promise<Changeset>;
     editedEnt(): Promise<T | null>;
     editedEntX(): Promise<T>;
     save(): Promise<void>;
@@ -88,20 +97,21 @@ export declare class SimpleBuilder<T extends Ent> implements Builder<T> {
 interface viewerEntLoadFunc {
     (data: Data): Viewer | Promise<Viewer>;
 }
-export declare class SimpleAction<T extends Ent> implements Action<T, SimpleBuilder<T>, Data> {
+export declare class SimpleAction<T extends Ent, TExistingEnt extends TMaybleNullableEnt<T> = MaybeNull<T>> implements Action<T, SimpleBuilder<T, TExistingEnt>, Viewer, Data, TExistingEnt> {
     viewer: Viewer;
     private fields;
-    builder: SimpleBuilder<T>;
-    validators: Validator<SimpleBuilder<T>, Data>[];
-    triggers: Trigger<SimpleBuilder<T>, Data>[];
-    observers: Observer<SimpleBuilder<T>, Data>[];
+    builder: SimpleBuilder<T, TExistingEnt>;
     viewerForEntLoad: viewerEntLoadFunc | undefined;
-    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation?: WriteOperation, existingEnt?: T | undefined);
-    getPrivacyPolicy(): import("../core/base").PrivacyPolicy<Ent>;
+    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation: WriteOperation | undefined, existingEnt: TExistingEnt);
+    getTriggers(): (Trigger<T, SimpleBuilder<T>> | Array<Trigger<T, SimpleBuilder<T>>>)[];
+    getValidators(): Validator<T, SimpleBuilder<T>>[];
+    getObservers(): Observer<T, SimpleBuilder<T>>[];
+    getPrivacyPolicy(): PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
     getInput(): Data;
-    changeset(): Promise<Changeset<T>>;
+    changeset(): Promise<Changeset>;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
+    validWithErrors(): Promise<Error[]>;
     save(): Promise<T | null>;
     saveX(): Promise<T>;
     editedEnt(): Promise<T | null>;

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.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = 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.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");
@@ -15,18 +15,21 @@ 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");
+const schema_2 = require("../schema/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 {
@@ -35,9 +38,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 {
@@ -46,11 +51,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 {
@@ -59,9 +66,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 {
@@ -70,9 +79,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 {
@@ -81,9 +92,11 @@ 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) {
@@ -118,13 +131,26 @@ exports.getTableName = getTableName;
 function randomNum() {
     return Math.random().toString(10).substring(2);
 }
+function getFieldInfo(value) {
+    const fields = (0, schema_1.getFields)(value);
+    let ret = {};
+    for (const [k, f] of fields) {
+        ret[k] = {
+            dbCol: (0, schema_2.getStorageKey)(f, k),
+            inputKey: (0, camel_case_1.camelCase)(k),
+        };
+    }
+    return ret;
+}
+exports.getFieldInfo = getFieldInfo;
 // reuses orchestrator and standard things
 class SimpleBuilder {
-    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt = undefined, action) {
+    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt, action) {
         this.viewer = viewer;
         this.schema = schema;
         this.operation = operation;
         this.existingEnt = existingEnt;
+        this.m = new Map();
         // create dynamic placeholder
         // TODO: do we need to use this as the node when there's an existingEnt
         // same for generated builders.
@@ -150,11 +176,13 @@ class SimpleBuilder {
         this.ent = schema.ent;
         const tableName = getTableName(schema);
         this.nodeType = (0, camel_case_1.camelCase)(schema.ent.name);
+        const fieldInfo = getFieldInfo(schema);
         this.orchestrator = new orchestrator_1.Orchestrator({
             viewer: this.viewer,
             operation: operation,
             tableName: tableName,
             key,
+            fieldInfo,
             loaderOptions: {
                 loaderFactory: new loaders_1.ObjectLoaderFactory({
                     tableName: tableName,
@@ -164,7 +192,7 @@ class SimpleBuilder {
                 ent: schema.ent,
                 tableName: tableName,
                 fields: [],
-                fieldPrivacy: (0, schema_1.getFieldsWithPrivacy)(schema),
+                fieldPrivacy: (0, schema_1.getFieldsWithPrivacy)(schema, fieldInfo),
             },
             builder: this,
             action: action,
@@ -177,24 +205,40 @@ class SimpleBuilder {
                 }
                 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]);
-                        }
-                    }
-                }
-            },
+            updateInput: this.updateInput.bind(this),
         });
     }
+    getInput() {
+        let ret = {};
+        for (const [k, v] of this.fields) {
+            ret[k] = v;
+        }
+        return ret;
+    }
+    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]);
+                }
+            }
+        }
+    }
+    // store data in Builder that can be retrieved by another validator, trigger, observer later in the action
+    storeData(k, v) {
+        this.m.set(k, v);
+    }
+    // retrieve data stored in this Builder with key
+    getStoredData(k) {
+        return this.m.get(k);
+    }
     build() {
         return this.orchestrator.build();
     }
@@ -219,14 +263,20 @@ class SimpleBuilder {
 }
 exports.SimpleBuilder = SimpleBuilder;
 class SimpleAction {
-    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt = undefined) {
+    constructor(viewer, schema, fields, operation = action_1.WriteOperation.Insert, existingEnt) {
         this.viewer = viewer;
         this.fields = fields;
-        this.validators = [];
-        this.triggers = [];
-        this.observers = [];
         this.builder = new SimpleBuilder(this.viewer, schema, fields, operation, existingEnt, this);
     }
+    getTriggers() {
+        return [];
+    }
+    getValidators() {
+        return [];
+    }
+    getObservers() {
+        return [];
+    }
     getPrivacyPolicy() {
         return privacy_1.AlwaysAllowPrivacyPolicy;
     }
@@ -246,6 +296,9 @@ class SimpleAction {
     validX() {
         return this.builder.orchestrator.validX();
     }
+    validWithErrors() {
+        return this.builder.orchestrator.validWithErrors();
+    }
     async save() {
         await (0, action_1.saveBuilder)(this.builder);
         if (this.builder.operation !== action_1.WriteOperation.Delete) {

package/testutils/db/fixture.d.ts

@@ -0,0 +1,10 @@
+import { Client } from "pg";
+import { Data } from "../../core/base";
+import { Schema } from "../../schema";
+interface Options {
+    overrides?: Data;
+    client: Client;
+    tableName: string;
+}
+export declare function writeFixture(schema: Schema, opts: Options): Promise<void>;
+export {};

package/testutils/db/fixture.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeFixture = void 0;
+const schema_1 = require("../../schema");
+const value_1 = require("./value");
+const ent_1 = require("../../core/ent");
+async function writeFixture(schema, opts) {
+    const fields = (0, schema_1.getFields)(schema);
+    const d = {};
+    for (const [fieldName, field] of fields) {
+        const col = (0, schema_1.getStorageKey)(field, fieldName);
+        const val = (0, value_1.getDefaultValue)(field, col);
+        d[col] = val;
+    }
+    if (opts.overrides) {
+        for (const k in opts.overrides) {
+            d[k] = opts.overrides[k];
+        }
+    }
+    const q = (0, ent_1.buildInsertQuery)({
+        tableName: opts.tableName,
+        fields: d,
+    });
+    await opts.client.query(q[0], q[1]);
+}
+exports.writeFixture = writeFixture;

package/testutils/db/{test_db.d.ts → temp_db.d.ts}

@@ -1,6 +1,7 @@
 import { Client as PGClient } from "pg";
 import { Dialect } from "../../core/db";
 import { Database as SqliteDatabase } from "better-sqlite3";
+import { Field } from "../../schema";
 import { BuilderSchema } from "../builder";
 import { Ent } from "../../core/base";
 interface SchemaItem {
@@ -12,6 +13,7 @@ interface Column extends SchemaItem {
     primaryKey?: boolean;
     unique?: boolean;
     default?: string;
+    index?: boolean | indexOptions;
     foreignKey?: {
         table: string;
         col: string;
@@ -20,21 +22,29 @@ interface Column extends SchemaItem {
 interface Constraint extends SchemaItem {
     generate(): string;
 }
+interface Index extends SchemaItem {
+    generate(): string;
+}
 export interface CoreConcept {
     name: string;
     create(): string;
+    postCreate?(): string[];
     drop(): string;
 }
 export interface Table extends CoreConcept {
     columns: Column[];
     constraints?: Constraint[];
 }
-declare type options = Pick<Column, "nullable" | "primaryKey" | "default" | "foreignKey" | "unique">;
+declare 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;
+interface indexOptions {
+    type: string;
+}
+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;
@@ -72,6 +82,7 @@ export declare class TempDB {
     getDialect(): Dialect;
     getTables(): Map<string, CoreConcept>;
     beforeAll(setupConnString?: boolean): Promise<void>;
+    createImpl(table: CoreConcept): Promise<void>;
     getSqliteClient(): SqliteDatabase;
     getPostgresClient(): PGClient;
     afterAll(): Promise<void>;
@@ -81,10 +92,11 @@ export declare class TempDB {
     create(...tables: CoreConcept[]): Promise<void>;
 }
 export declare function assoc_edge_config_table(): Table;
-export declare function assoc_edge_table(name: string): Table;
+export declare function assoc_edge_table(name: string, global?: boolean): Table;
 interface sqliteSetupOptions {
     disableDeleteAfterEachTest?: boolean;
 }
-export declare function setupSqlite(connString: string, tables: () => Table[], opts?: sqliteSetupOptions): void;
+export declare function setupSqlite(connString: string, tables: () => Table[], opts?: sqliteSetupOptions): TempDB;
 export declare function getSchemaTable(schema: BuilderSchema<Ent>, dialect: Dialect): Table;
+export declare function getColumnFromField(fieldName: string, f: Field, dialect: Dialect): Column;
 export {};