@snowtop/ent 0.1.0-alpha2 → 0.1.0-alpha20

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.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");
@@ -14,18 +14,22 @@ 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");
+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 {
@@ -34,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 {
@@ -45,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 {
@@ -58,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 {
@@ -69,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 {
@@ -80,11 +92,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;
 }
@@ -96,9 +131,21 @@ 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;
@@ -128,11 +175,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,
@@ -142,15 +191,45 @@ class SimpleBuilder {
                 ent: schema.ent,
                 tableName: tableName,
                 fields: [],
+                fieldPrivacy: (0, schema_1.getFieldsWithPrivacy)(schema, fieldInfo),
             },
             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: 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]);
+                }
+            }
+        }
+    }
     build() {
         return this.orchestrator.build();
     }
@@ -175,14 +254,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;
     }

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>;

package/testutils/db/test_db.js

@@ -336,7 +336,7 @@ class TempDB {
     getTables() {
         return this.tables;
     }
-    async beforeAll() {
+    async beforeAll(setupConnString = true) {
         if (this.dialect === db_1.Dialect.Postgres) {
             const user = process.env.POSTGRES_USER || "";
             const password = process.env.POSTGRES_PASSWORD || "";
@@ -348,11 +348,17 @@ class TempDB {
             await this.client.connect();
             this.db = randomDB();
             await this.client.query(`CREATE DATABASE ${this.db}`);
-            if (user && password) {
-                process.env.DB_CONNECTION_STRING = `postgres://${user}:${password}@localhost:5432/${this.db}`;
+            if (setupConnString) {
+                if (user && password) {
+                    process.env.DB_CONNECTION_STRING = `postgres://${user}:${password}@localhost:5432/${this.db}`;
+                }
+                else {
+                    process.env.DB_CONNECTION_STRING = `postgres://localhost/${this.db}?`;
+                }
             }
             else {
-                process.env.DB_CONNECTION_STRING = `postgres://localhost/${this.db}?`;
+                // will probably be setup via loadConfig
+                delete process.env.DB_CONNECTION_STRING;
             }
             this.dbClient = new pg_1.Client({
                 host: "localhost",
@@ -397,6 +403,9 @@ class TempDB {
         await this.client.query(`DROP DATABASE ${this.db}`);
         await this.client.end();
     }
+    getDB() {
+        return this.db;
+    }
     async dropAll() {
         for (const [t, _] of this.tables) {
             await this.drop(t);

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

@@ -16,6 +16,8 @@ interface queryConfig {
     callback?: (res: supertest.Response) => void;
     inlineFragmentRoot?: string;
     customHandlers?: RequestHandler[];
+    server?: any;
+    graphQLPath?: string;
 }
 export interface queryRootConfig extends queryConfig {
     root: string;

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

@@ -26,7 +26,7 @@ exports.expectMutation = exports.expectQueryFromRoot = void 0;
 // NB: this is copied from ent-graphql-tests package until I have time to figure out how to share code here effectively
 // the circular dependencies btw this package and ent-graphql-tests seems to imply something needs to change
 const express_1 = __importDefault(require("express"));
-const express_graphql_1 = require("express-graphql");
+const graphql_helix_1 = require("graphql-helix");
 const graphql_1 = require("graphql");
 const auth_1 = require("../../auth");
 const supertest_1 = __importDefault(require("supertest"));
@@ -45,18 +45,23 @@ function server(config) {
     if (config.init) {
         config.init(app);
     }
+    app.use(express_1.default.json());
     let handlers = config.customHandlers || [];
-    handlers.push((0, express_graphql_1.graphqlHTTP)((request, response) => {
-        const doWork = async () => {
-            let context = await (0, auth_1.buildContext)(request, response);
-            return {
-                schema: config.schema,
-                context,
-            };
-        };
-        return doWork();
-    }));
-    app.use("/graphql", ...handlers);
+    handlers.push(async (req, res) => {
+        const { operationName, query, variables } = (0, graphql_helix_1.getGraphQLParameters)(req);
+        const result = await (0, graphql_helix_1.processRequest)({
+            operationName,
+            query,
+            variables,
+            request: req,
+            schema: config.schema,
+            contextFactory: async (executionContext) => {
+                return (0, auth_1.buildContext)(req, res);
+            },
+        });
+        await (0, graphql_helix_1.sendResult)(result, res);
+    });
+    app.use(config.graphQLPath || "/graphql", ...handlers);
     return app;
 }
 function getInnerType(typ, list) {
@@ -72,14 +77,14 @@ function makeGraphQLRequest(config, query, fieldArgs) {
     let test;
     if (config.test) {
         if (typeof config.test === "function") {
-            test = config.test(server(config));
+            test = config.test(config.server ? config.server : server(config));
         }
         else {
             test = config.test;
         }
     }
     else {
-        test = (0, supertest_1.default)(server(config));
+        test = (0, supertest_1.default)(config.server ? config.server : server(config));
     }
     let files = new Map();
     // handle files
@@ -104,7 +109,9 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         }
     });
     if (files.size) {
-        let ret = test.post("/graphql").set(config.headers || {});
+        let ret = test
+            .post(config.graphQLPath || "/graphql")
+            .set(config.headers || {});
         ret.field("operations", JSON.stringify({
             query: query,
             variables: config.args,
@@ -130,7 +137,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         return [
             test,
             test
-                .post("/graphql")
+                .post(config.graphQLPath || "/graphql")
                 .set(config.headers || {})
                 .send({
                 query: query,
@@ -353,7 +360,9 @@ async function expectFromRoot(config, ...options) {
     else {
         expect(res.ok, `expected ok response. instead got ${res.status} and result ${JSON.stringify(res.body)}`);
     }
-    if (!res.ok) {
+    // res.ok = true in graphql-helix when there's errors...
+    // res.ok = false in express-graphql when there's errors...
+    if (!res.ok || (res.body.errors && res.body.errors.length > 0)) {
         let errors = res.body.errors;
         expect(errors.length).toBeGreaterThan(0);
         if (config.expectedError) {

package/testutils/fake_data/fake_contact.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleBuilder } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleBuilder } from "../builder";
 import { NodeType } from "./const";
 import { ObjectLoaderFactory } from "../../core/loaders";
 export declare class FakeContact implements Ent {
@@ -14,7 +13,7 @@ export declare class FakeContact implements Ent {
     readonly lastName: string;
     readonly emailAddress: string;
     readonly userID: ID;
-    privacyPolicy: PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     static getFields(): string[];
     static getTestTable(): import("../db/test_db").Table;
@@ -22,16 +21,13 @@ export declare class FakeContact implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeContact | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeContact>;
 }
-export declare class FakeContactSchema extends BaseEntSchema implements BuilderSchema<FakeContact> {
-    ent: typeof FakeContact;
-    fields: FieldMap;
-}
+export declare const FakeContactSchema: import("../builder").BuilderSchema<FakeContact>;
 export interface ContactCreateInput {
     firstName: string;
     lastName: string;
     emailAddress: string;
     userID: ID;
 }
-export declare function getContactBuilder(viewer: Viewer, input: ContactCreateInput): SimpleBuilder<FakeContact>;
+export declare function getContactBuilder(viewer: Viewer, input: ContactCreateInput): SimpleBuilder<FakeContact, null>;
 export declare function createContact(viewer: Viewer, input: ContactCreateInput): Promise<void>;
 export declare const contactLoader: ObjectLoaderFactory<unknown>;

package/testutils/fake_data/fake_contact.js

@@ -9,13 +9,11 @@ const const_1 = require("./const");
 const test_db_1 = require("../db/test_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
+const action_1 = require("../../action");
 class FakeContact {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeContact;
-        this.privacyPolicy = {
-            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
-        };
         this.data = data;
         this.id = data.id;
         this.createdAt = (0, convert_1.convertDate)(data.created_at);
@@ -25,6 +23,11 @@ class FakeContact {
         this.emailAddress = data.email_address;
         this.userID = data.user_id;
     }
+    getPrivacyPolicy() {
+        return {
+            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
+        };
+    }
     static getFields() {
         return [
             "id",
@@ -59,21 +62,14 @@ class FakeContact {
     }
 }
 exports.FakeContact = FakeContact;
-class FakeContactSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeContact;
-        this.fields = {
-            firstName: (0, schema_1.StringType)(),
-            lastName: (0, schema_1.StringType)(),
-            emailAddress: (0, schema_1.StringType)(),
-            userID: (0, schema_1.UUIDType)({
-                foreignKey: { schema: "User", column: "ID" },
-            }),
-        };
-    }
-}
-exports.FakeContactSchema = FakeContactSchema;
+exports.FakeContactSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    firstName: (0, schema_1.StringType)(),
+    lastName: (0, schema_1.StringType)(),
+    emailAddress: (0, schema_1.StringType)(),
+    userID: (0, schema_1.UUIDType)({
+        foreignKey: { schema: "User", column: "ID" },
+    }),
+}, FakeContact);
 function getContactBuilder(viewer, input) {
     const m = new Map();
     for (const key in input) {
@@ -82,7 +78,7 @@ function getContactBuilder(viewer, input) {
     //To lock in the value of Date now incase of advanceTo/advanceBy
     m.set("createdAt", new Date());
     m.set("updatedAt", new Date());
-    return new builder_1.SimpleBuilder(viewer, new FakeContactSchema(), m);
+    return new builder_1.SimpleBuilder(viewer, exports.FakeContactSchema, m, action_1.WriteOperation.Insert, null);
 }
 exports.getContactBuilder = getContactBuilder;
 async function createContact(viewer, input) {

package/testutils/fake_data/fake_event.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleBuilder } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleBuilder } from "../builder";
 import { NodeType } from "./const";
 export declare class FakeEvent implements Ent {
     viewer: Viewer;
@@ -15,7 +14,7 @@ export declare class FakeEvent implements Ent {
     readonly title: string;
     readonly description: string | null;
     readonly userID: ID;
-    privacyPolicy: PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     private static getFields;
     static getTestTable(): import("../db/test_db").Table;
@@ -23,10 +22,7 @@ export declare class FakeEvent implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeEvent | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeEvent>;
 }
-export declare class FakeEventSchema extends BaseEntSchema implements BuilderSchema<FakeEvent> {
-    ent: typeof FakeEvent;
-    fields: FieldMap;
-}
+export declare const FakeEventSchema: import("../builder").BuilderSchema<FakeEvent>;
 export interface EventCreateInput {
     startTime: Date;
     endTime?: Date | null;
@@ -35,5 +31,5 @@ export interface EventCreateInput {
     description?: string | null;
     userID: ID;
 }
-export declare function getEventBuilder(viewer: Viewer, input: EventCreateInput): SimpleBuilder<FakeEvent>;
+export declare function getEventBuilder(viewer: Viewer, input: EventCreateInput): SimpleBuilder<FakeEvent, null>;
 export declare function createEvent(viewer: Viewer, input: EventCreateInput): Promise<void>;

package/testutils/fake_data/fake_event.js

@@ -9,11 +9,11 @@ const const_1 = require("./const");
 const test_db_1 = require("../db/test_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
+const action_1 = require("../../action");
 class FakeEvent {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeEvent;
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.data = data;
         this.id = data.id;
         this.createdAt = (0, convert_1.convertDate)(data.created_at);
@@ -25,6 +25,9 @@ class FakeEvent {
         this.description = data.description;
         this.userID = data.user_id;
     }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
     static getFields() {
         return [
             "id",
@@ -63,35 +66,28 @@ class FakeEvent {
     }
 }
 exports.FakeEvent = FakeEvent;
-class FakeEventSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeEvent;
-        this.fields = {
-            startTime: (0, schema_1.TimestampType)({
-                index: true,
-            }),
-            endTime: (0, schema_1.TimestampType)({
-                nullable: true,
-            }),
-            title: (0, schema_1.StringType)(),
-            location: (0, schema_1.StringType)(),
-            description: (0, schema_1.StringType)({
-                nullable: true,
-            }),
-            userID: (0, schema_1.UUIDType)({
-                foreignKey: { schema: "User", column: "ID" },
-            }),
-        };
-    }
-}
-exports.FakeEventSchema = FakeEventSchema;
+exports.FakeEventSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    startTime: (0, schema_1.TimestampType)({
+        index: true,
+    }),
+    endTime: (0, schema_1.TimestampType)({
+        nullable: true,
+    }),
+    title: (0, schema_1.StringType)(),
+    location: (0, schema_1.StringType)(),
+    description: (0, schema_1.StringType)({
+        nullable: true,
+    }),
+    userID: (0, schema_1.UUIDType)({
+        foreignKey: { schema: "User", column: "ID" },
+    }),
+}, FakeEvent);
 function getEventBuilder(viewer, input) {
     const m = new Map();
     for (const key in input) {
         m.set(key, input[key]);
     }
-    return new builder_1.SimpleBuilder(viewer, new FakeEventSchema(), m);
+    return new builder_1.SimpleBuilder(viewer, exports.FakeEventSchema, m, action_1.WriteOperation.Insert, null);
 }
 exports.getEventBuilder = getEventBuilder;
 async function createEvent(viewer, input) {

package/testutils/fake_data/fake_user.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleAction } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleAction } from "../builder";
 import { NodeType } from "./const";
 import { IDViewer, IDViewerOptions } from "../../core/viewer";
 import { ObjectLoaderFactory } from "../../core/loaders";
@@ -24,7 +23,7 @@ export declare class FakeUser implements Ent {
     readonly emailAddress: string;
     readonly phoneNumber: string | null;
     protected readonly password: string | null;
-    privacyPolicy: PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     static getFields(): string[];
     static getTestTable(): import("../db/test_db").Table;
@@ -32,10 +31,7 @@ export declare class FakeUser implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeUser | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeUser>;
 }
-export declare class FakeUserSchema extends BaseEntSchema implements BuilderSchema<FakeUser> {
-    ent: typeof FakeUser;
-    fields: FieldMap;
-}
+export declare const FakeUserSchema: import("../builder").BuilderSchema<FakeUser>;
 export interface UserCreateInput {
     firstName: string;
     lastName: string;
@@ -44,8 +40,8 @@ export interface UserCreateInput {
     password: string | null;
 }
 export declare type UserEditInput = Partial<UserCreateInput>;
-export declare function getUserBuilder(viewer: Viewer, input: UserCreateInput): import("../builder").SimpleBuilder<FakeUser>;
-export declare function getUserAction(viewer: Viewer, input: UserCreateInput): SimpleAction<FakeUser>;
+export declare function getUserBuilder(viewer: Viewer, input: UserCreateInput): import("../builder").SimpleBuilder<FakeUser, null>;
+export declare function getUserAction(viewer: Viewer, input: UserCreateInput): SimpleAction<FakeUser, null>;
 export declare function createUser(viewer: Viewer, input: UserCreateInput): Promise<FakeUser>;
 export declare const userLoader: ObjectLoaderFactory<unknown>;
 export declare const userEmailLoader: ObjectLoaderFactory<unknown>;