@snowtop/ent 0.1.0-alpha13 → 0.1.0-alpha130

package/testutils/fake_data/fake_tag.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tagLoader = exports.createTag = exports.getTagAction = exports.getTagBuilder = exports.FakeTagSchema = exports.FakeTag = void 0;
+const ent_1 = require("../../core/ent");
+const privacy_1 = require("../../core/privacy");
+const builder_1 = require("../builder");
+const schema_1 = require("../../schema");
+const const_1 = require("./const");
+const temp_db_1 = require("../db/temp_db");
+const loaders_1 = require("../../core/loaders");
+const convert_1 = require("../../core/convert");
+const action_1 = require("../../action");
+class FakeTag {
+    getPrivacyPolicy() {
+        return {
+            rules: [new privacy_1.AllowIfViewerIsEntPropertyRule("ownerID"), privacy_1.AlwaysDenyRule],
+        };
+    }
+    constructor(viewer, data) {
+        this.viewer = viewer;
+        this.nodeType = const_1.NodeType.FakeUser;
+        this.data = data;
+        this.id = data.id;
+        this.createdAt = (0, convert_1.convertDate)(data.created_at);
+        this.updatedAt = (0, convert_1.convertDate)(data.updated_at);
+        this.displayName = data.display_name;
+        this.canonicalName = data.canonical_name;
+        this.ownerID = data.owner_id;
+    }
+    __setRawDBData(data) { }
+    static getFields() {
+        return [
+            "id",
+            "created_at",
+            "updated_at",
+            "display_name",
+            "canonical_name",
+            "owner_id",
+        ];
+    }
+    static getTestTable() {
+        return (0, temp_db_1.table)("fake_tags", (0, temp_db_1.uuid)("id", { primaryKey: true }), (0, temp_db_1.timestamptz)("created_at"), (0, temp_db_1.timestamptz)("updated_at"), (0, temp_db_1.text)("display_name"), (0, temp_db_1.text)("canonical_name"), (0, temp_db_1.uuid)("owner_id"), // TODO index: true sqlite broken?
+        (0, temp_db_1.index)("fake_tags", ["canonical_name", "owner_id"], { unique: true }));
+    }
+    static loaderOptions() {
+        return {
+            tableName: "fake_tags",
+            fields: FakeTag.getFields(),
+            ent: this,
+            loaderFactory: exports.tagLoader,
+        };
+    }
+    static async load(v, id) {
+        return (0, ent_1.loadEnt)(v, id, FakeTag.loaderOptions());
+    }
+    static async loadX(v, id) {
+        return (0, ent_1.loadEntX)(v, id, FakeTag.loaderOptions());
+    }
+}
+exports.FakeTag = FakeTag;
+exports.FakeTagSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    displayName: (0, schema_1.StringType)(),
+    canonicalName: (0, schema_1.StringType)().trim().toLowerCase(),
+    ownerID: (0, schema_1.UUIDType)({}),
+}, FakeTag);
+function getTagBuilder(viewer, input) {
+    const action = getTagAction(viewer, input);
+    return action.builder;
+}
+exports.getTagBuilder = getTagBuilder;
+function getTagAction(viewer, input) {
+    const m = new Map();
+    for (const key in input) {
+        m.set(key, input[key]);
+    }
+    const action = new builder_1.SimpleAction(viewer, exports.FakeTagSchema, m, action_1.WriteOperation.Insert, null);
+    return action;
+}
+exports.getTagAction = getTagAction;
+async function createTag(viewer, input) {
+    const action = getTagAction(viewer, input);
+    return action.saveX();
+}
+exports.createTag = createTag;
+exports.tagLoader = new loaders_1.ObjectLoaderFactory({
+    tableName: "fake_tags",
+    fields: FakeTag.getFields(),
+    key: "id",
+});

package/testutils/fake_data/fake_user.d.ts

@@ -25,8 +25,9 @@ export declare class FakeUser implements Ent {
     protected readonly password: string | null;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
     static getFields(): string[];
-    static getTestTable(): import("../db/test_db").Table;
+    static getTestTable(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeUser>;
     static load(v: Viewer, id: ID): Promise<FakeUser | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeUser>;
@@ -38,12 +39,14 @@ export interface UserCreateInput {
     emailAddress: string;
     phoneNumber: string | null;
     password: string | null;
+    createdAt?: Date;
+    updatedAt?: Date;
 }
-export declare type UserEditInput = Partial<UserCreateInput>;
+export type UserEditInput = Partial<UserCreateInput>;
 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>;
-export declare const userPhoneNumberLoader: ObjectLoaderFactory<unknown>;
+export declare const userLoader: ObjectLoaderFactory<Data>;
+export declare const userEmailLoader: ObjectLoaderFactory<Data>;
+export declare const userPhoneNumberLoader: ObjectLoaderFactory<Data>;
 export {};

package/testutils/fake_data/fake_user.js

@@ -8,7 +8,7 @@ const schema_1 = require("../../schema");
 const internal_1 = require("./internal");
 const const_1 = require("./const");
 const viewer_1 = require("../../core/viewer");
-const test_db_1 = require("../db/test_db");
+const temp_db_1 = require("../db/temp_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
 const action_1 = require("../../action");
@@ -24,19 +24,6 @@ class ViewerWithAccessToken extends viewer_1.IDViewer {
 }
 exports.ViewerWithAccessToken = ViewerWithAccessToken;
 class FakeUser {
-    constructor(viewer, data) {
-        this.viewer = viewer;
-        this.nodeType = const_1.NodeType.FakeUser;
-        this.data = data;
-        this.id = data.id;
-        this.createdAt = (0, convert_1.convertDate)(data.created_at);
-        this.updatedAt = (0, convert_1.convertDate)(data.updated_at);
-        this.firstName = data.first_name;
-        this.lastName = data.last_name;
-        this.emailAddress = data.email_address;
-        this.phoneNumber = data.phone_number;
-        this.password = data.password;
-    }
     getPrivacyPolicy() {
         return {
             rules: [
@@ -61,6 +48,20 @@ class FakeUser {
             ],
         };
     }
+    constructor(viewer, data) {
+        this.viewer = viewer;
+        this.nodeType = const_1.NodeType.FakeUser;
+        this.data = data;
+        this.id = data.id;
+        this.createdAt = (0, convert_1.convertDate)(data.created_at);
+        this.updatedAt = (0, convert_1.convertDate)(data.updated_at);
+        this.firstName = data.first_name;
+        this.lastName = data.last_name;
+        this.emailAddress = data.email_address;
+        this.phoneNumber = data.phone_number;
+        this.password = data.password;
+    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",
@@ -74,7 +75,7 @@ class FakeUser {
         ];
     }
     static getTestTable() {
-        return (0, test_db_1.table)("fake_users", (0, test_db_1.uuid)("id", { primaryKey: true }), (0, test_db_1.timestamptz)("created_at"), (0, test_db_1.timestamptz)("updated_at"), (0, test_db_1.text)("first_name"), (0, test_db_1.text)("last_name"), (0, test_db_1.text)("email_address"), (0, test_db_1.text)("phone_number"), (0, test_db_1.text)("password"));
+        return (0, temp_db_1.table)("fake_users", (0, temp_db_1.uuid)("id", { primaryKey: true }), (0, temp_db_1.timestamptz)("created_at"), (0, temp_db_1.timestamptz)("updated_at"), (0, temp_db_1.text)("first_name"), (0, temp_db_1.text)("last_name"), (0, temp_db_1.text)("email_address"), (0, temp_db_1.text)("phone_number"), (0, temp_db_1.text)("password"));
     }
     static loaderOptions() {
         return {

package/testutils/fake_data/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/testutils/fake_data/internal.d.ts

@@ -2,5 +2,7 @@ export * from "./const";
 export * from "./fake_contact";
 export * from "./fake_user";
 export * from "./fake_event";
+export * from "./fake_tag";
 export * from "./events_query";
 export * from "./user_query";
+export * from "./tag_query";

package/testutils/fake_data/internal.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];
@@ -14,5 +18,7 @@ __exportStar(require("./const"), exports);
 __exportStar(require("./fake_contact"), exports);
 __exportStar(require("./fake_user"), exports);
 __exportStar(require("./fake_event"), exports);
+__exportStar(require("./fake_tag"), exports);
 __exportStar(require("./events_query"), exports);
 __exportStar(require("./user_query"), exports);
+__exportStar(require("./tag_query"), exports);

package/testutils/fake_data/tag_query.d.ts

@@ -0,0 +1,13 @@
+import { ID, Viewer } from "../../core/base";
+import { CustomEdgeQueryBase } from "../../core/query/custom_query";
+import { FakeUser, FakeTag } from "./internal";
+export declare class UserToTagsFkeyQuery extends CustomEdgeQueryBase<FakeUser, FakeTag> {
+    constructor(viewer: Viewer, src: ID | FakeUser);
+    static query(viewer: Viewer, src: FakeUser | ID): UserToTagsFkeyQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
+}
+export declare class UserToTagsFkeyQueryAsc extends CustomEdgeQueryBase<FakeUser, FakeTag> {
+    constructor(viewer: Viewer, src: ID | FakeUser);
+    static query(viewer: Viewer, src: FakeUser | ID): UserToTagsFkeyQueryAsc;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
+}

package/testutils/fake_data/tag_query.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserToTagsFkeyQueryAsc = exports.UserToTagsFkeyQuery = void 0;
+const custom_query_1 = require("../../core/query/custom_query");
+const internal_1 = require("./internal");
+class UserToTagsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
+    constructor(viewer, src) {
+        super(viewer, {
+            src,
+            loadEntOptions: internal_1.FakeTag.loaderOptions(),
+            groupCol: "owner_id",
+            name: "user_to_tags",
+            sortColumn: "canonical_name",
+            sortColumnUnique: true,
+        });
+    }
+    static query(viewer, src) {
+        return new UserToTagsFkeyQuery(viewer, src);
+    }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
+}
+exports.UserToTagsFkeyQuery = UserToTagsFkeyQuery;
+class UserToTagsFkeyQueryAsc extends custom_query_1.CustomEdgeQueryBase {
+    constructor(viewer, src) {
+        super(viewer, {
+            src,
+            loadEntOptions: internal_1.FakeTag.loaderOptions(),
+            groupCol: "owner_id",
+            name: "user_to_tags_asc",
+            sortColumn: "canonical_name ASC",
+            sortColumnUnique: true,
+        });
+    }
+    static query(viewer, src) {
+        return new UserToTagsFkeyQueryAsc(viewer, src);
+    }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
+}
+exports.UserToTagsFkeyQueryAsc = UserToTagsFkeyQueryAsc;

package/testutils/fake_data/test_helpers.d.ts

@@ -1,6 +1,6 @@
 import { Data, Ent } from "../../core/base";
 import { AssocEdge } from "../../core/ent";
-import { TempDB } from "../db/test_db";
+import { TempDB } from "../db/temp_db";
 import { FakeUser, UserCreateInput, ContactCreateInput, FakeContact } from ".";
 import { EventCreateInput, FakeEvent } from "./fake_event";
 import { BuilderSchema } from "../builder";
@@ -9,7 +9,13 @@ export declare function getUserInput(input?: Partial<UserCreateInput>): UserCrea
 export declare function getEventInput(user: FakeUser, input?: Partial<EventCreateInput>): EventCreateInput;
 export declare function createTestUser(input?: Partial<UserCreateInput>): Promise<FakeUser>;
 export declare const inputs: Partial<ContactCreateInput>[];
-export declare function createAllContacts(input?: Partial<UserCreateInput>, slice?: number): Promise<[FakeUser, FakeContact[]]>;
+interface createContactOptions {
+    input?: Partial<UserCreateInput>;
+    slice?: number;
+    user?: FakeUser;
+    start?: number;
+}
+export declare function createAllContacts(opts?: createContactOptions): Promise<[FakeUser, FakeContact[]]>;
 export declare function createUserPlusFriendRequests(input?: Partial<UserCreateInput>, slice?: number): Promise<[FakeUser, FakeUser[]]>;
 export declare function addEdge<T extends Ent>(source: T, schema: BuilderSchema<T>, edgeType: string, inbound: boolean, // inbound or outbound
 ...dest: Ent[]): Promise<void>;
@@ -19,13 +25,14 @@ export declare function verifyUserToContacts(user: FakeUser, ents: FakeContact[]
 export declare function createEdges(): Promise<void>;
 export declare function edgeTableNames(): string[];
 export declare function createTestEvent(user: FakeUser, input?: Partial<EventCreateInput>): Promise<FakeEvent>;
-export declare function setupTempDB(): Promise<TempDB>;
-export declare function tempDBTables(): import("../db/test_db").Table[];
+export declare function setupTempDB(global?: boolean): Promise<TempDB>;
+export declare function tempDBTables(global?: boolean): import("../db/temp_db").Table[];
 interface options {
     howMany: number;
     interval: number;
     userInput?: Partial<UserCreateInput>;
     eventInputs?: Partial<EventCreateInput>[];
+    startTime?: number | Date;
 }
 export declare function createAllEvents(opts: options): Promise<[FakeUser, FakeEvent[]]>;
 export {};

package/testutils/fake_data/test_helpers.js

@@ -6,19 +6,23 @@ const viewer_1 = require("../../core/viewer");
 const ent_1 = require("../../core/ent");
 const snake_case_1 = require("snake-case");
 const write_1 = require("../write");
-const test_db_1 = require("../db/test_db");
+const temp_db_1 = require("../db/temp_db");
 const _1 = require(".");
 const fake_event_1 = require("./fake_event");
 const const_1 = require("./const");
 const mock_date_1 = require("./../mock_date");
 const builder_1 = require("../builder");
 const action_1 = require("../../action");
+const fake_tag_1 = require("./fake_tag");
+const db_1 = require("../../core/db");
 function getContactInput(user, input) {
     return {
         firstName: "Jon",
         lastName: "Snow",
         emailAddress: "foo@bar.com",
         userID: user.id,
+        createdAt: new Date(),
+        updatedAt: new Date(),
         ...input,
     };
 }
@@ -30,6 +34,8 @@ function getUserInput(input) {
         emailAddress: "foo@bar.com",
         phoneNumber: "415-212-1212",
         password: "pa$$w0rd",
+        createdAt: new Date(),
+        updatedAt: new Date(),
         ...input,
     };
 }
@@ -41,6 +47,8 @@ function getEventInput(user, input) {
         title: "title",
         description: "fun event",
         userID: user.id,
+        createdAt: new Date(),
+        updatedAt: new Date(),
         ...input,
     };
 }
@@ -82,22 +90,29 @@ exports.inputs = [
         lastName: "Stark",
     },
 ];
-async function createAllContacts(input, slice) {
-    const user = await createTestUser(input);
+async function createAllContacts(opts) {
+    let { input, slice, user } = opts || {};
+    if (!user) {
+        user = await createTestUser(input);
+    }
+    const userr = user;
+    if (opts?.start) {
+        (0, jest_date_mock_1.advanceTo)(opts.start);
+    }
     let userInputs = exports.inputs.slice(0, slice || exports.inputs.length);
     const contacts = await Promise.all(userInputs.map(async (input) => {
         // just to make times deterministic so that tests can consistently work
         (0, jest_date_mock_1.advanceBy)(100);
-        const builder = (0, _1.getContactBuilder)(user.viewer, getContactInput(user, input));
+        const builder = (0, _1.getContactBuilder)(userr.viewer, getContactInput(userr, input));
         // add edge from user to contact
-        builder.orchestrator.addInboundEdge(user.id, _1.EdgeType.UserToContacts, const_1.NodeType.FakeUser, {
+        builder.orchestrator.addInboundEdge(userr.id, _1.EdgeType.UserToContacts, const_1.NodeType.FakeUser, {
             time: new Date(), // set time to advanceBy time
         });
         await builder.saveX();
         return await builder.editedEntX();
     }));
     expect(contacts.length).toBe(userInputs.length);
-    return [user, contacts];
+    return [userr, contacts];
 }
 exports.createAllContacts = createAllContacts;
 async function createUserPlusFriendRequests(input, slice) {
@@ -208,22 +223,23 @@ async function createTestEvent(user, input) {
     return await builder.editedEntX();
 }
 exports.createTestEvent = createTestEvent;
-async function setupTempDB() {
-    const tdb = new test_db_1.TempDB(tempDBTables());
+async function setupTempDB(global = false) {
+    const tdb = new temp_db_1.TempDB(db_1.Dialect.Postgres, tempDBTables(global));
     await tdb.beforeAll();
     // create once
     await createEdges();
     return tdb;
 }
 exports.setupTempDB = setupTempDB;
-function tempDBTables() {
+function tempDBTables(global = false) {
     const tables = [
         _1.FakeUser.getTestTable(),
         _1.FakeContact.getTestTable(),
         fake_event_1.FakeEvent.getTestTable(),
-        (0, test_db_1.assoc_edge_config_table)(),
+        fake_tag_1.FakeTag.getTestTable(),
+        (0, temp_db_1.assoc_edge_config_table)(),
     ];
-    edgeTableNames().forEach((tableName) => tables.push((0, test_db_1.assoc_edge_table)(tableName)));
+    edgeTableNames().forEach((tableName) => tables.push((0, temp_db_1.assoc_edge_table)(tableName, global)));
     return tables;
 }
 exports.tempDBTables = tempDBTables;
@@ -232,7 +248,7 @@ async function createAllEvents(opts) {
     let arr = new Array(opts.howMany);
     arr.fill(1);
     // start at date in case something else has used a date already
-    (0, jest_date_mock_1.advanceTo)(mock_date_1.MockDate.getDate());
+    (0, jest_date_mock_1.advanceTo)(opts.startTime || mock_date_1.MockDate.getDate());
     const events = await Promise.all(arr.map(async (v, idx) => {
         // just to make times deterministic so that tests can consistently work
         if (opts.interval > 0) {

package/testutils/fake_data/user_query.d.ts

@@ -5,7 +5,6 @@ import * as clause from "../../core/clause";
 import { AssocEdgeQueryBase, EdgeQuerySource } from "../../core/query/assoc_query";
 import { FakeUser, FakeEvent, FakeContact, EventToAttendeesQuery, EventToDeclinedQuery, EventToHostsQuery, EventToInvitedQuery, EventToMaybeQuery } from "./internal";
 import { RawCountLoaderFactory } from "../../core/loaders/raw_count_loader";
-import { IndexLoaderFactory } from "../../core/loaders/index_loader";
 import { QueryLoaderFactory } from "../../core/loaders/query_loader";
 export declare class UserToContactsQuery extends AssocEdgeQueryBase<FakeUser, FakeContact, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
@@ -13,12 +12,22 @@ export declare class UserToContactsQuery extends AssocEdgeQueryBase<FakeUser, Fa
     sourceEnt(id: ID): Promise<FakeUser | null>;
 }
 export declare const userToContactsCountLoaderFactory: RawCountLoaderFactory;
-export declare const userToContactsDataLoaderFactory: IndexLoaderFactory;
+export declare const userToContactsDataLoaderFactory: QueryLoaderFactory<unknown>;
+export declare class UserToContactsFkeyQueryDeprecated extends CustomEdgeQueryBase<FakeUser, FakeContact> {
+    constructor(viewer: Viewer, src: ID | FakeUser);
+    static query(viewer: Viewer, src: FakeUser | ID): UserToContactsFkeyQueryDeprecated;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
+}
 export declare class UserToContactsFkeyQuery extends CustomEdgeQueryBase<FakeUser, FakeContact> {
     constructor(viewer: Viewer, src: ID | FakeUser);
     static query(viewer: Viewer, src: FakeUser | ID): UserToContactsFkeyQuery;
     sourceEnt(id: ID): Promise<FakeUser | null>;
 }
+export declare class UserToContactsFkeyQueryAsc extends CustomEdgeQueryBase<FakeUser, FakeContact> {
+    constructor(viewer: Viewer, src: ID | FakeUser);
+    static query(viewer: Viewer, src: FakeUser | ID): UserToContactsFkeyQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
+}
 export declare class UserToFriendsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToFriendsQuery;
@@ -53,7 +62,7 @@ export declare class UserToFriendRequestsQuery extends AssocEdgeQueryBase<FakeUs
 }
 export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);
-    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
     sourceEnt(id: ID): Promise<FakeUser | null>;
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>): UserToIncomingFriendRequestsQuery;
     queryContacts(): UserToContactsQuery;
@@ -84,13 +93,11 @@ export declare class UserToHostedEventsQuery extends AssocEdgeQueryBase<FakeUser
 }
 export declare const getNextWeekClause: () => clause.Clause;
 export declare function getCompleteClause(id: ID): clause.Clause;
-export declare const userToEventsInNextWeekCountLoaderFactory: RawCountLoaderFactory;
-export declare const userToEventsInNextWeekDataLoaderFactory: QueryLoaderFactory<unknown>;
 export declare class UserToEventsInNextWeekQuery extends CustomEdgeQueryBase<FakeUser, FakeEvent> {
     constructor(viewer: Viewer, src: ID | FakeUser);
     static query(viewer: Viewer, src: FakeUser | ID): UserToEventsInNextWeekQuery;
     sourceEnt(id: ID): Promise<FakeUser | null>;
-    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
 }
 export declare class UserToFollowingQuery extends AssocEdgeQueryBase<FakeUser, Ent, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);

package/testutils/fake_data/user_query.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,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserToFollowingQuery = exports.UserToEventsInNextWeekQuery = exports.userToEventsInNextWeekDataLoaderFactory = exports.userToEventsInNextWeekCountLoaderFactory = exports.getCompleteClause = exports.getNextWeekClause = exports.UserToHostedEventsQuery = exports.UserToEventsAttendingQuery = exports.UserToIncomingFriendRequestsQuery = exports.UserToFriendRequestsQuery = exports.UserToCustomEdgeQuery = exports.CustomEdge = exports.UserToFriendsQuery = exports.UserToContactsFkeyQuery = exports.userToContactsDataLoaderFactory = exports.userToContactsCountLoaderFactory = exports.UserToContactsQuery = void 0;
+exports.UserToFollowingQuery = exports.UserToEventsInNextWeekQuery = exports.getCompleteClause = exports.getNextWeekClause = exports.UserToHostedEventsQuery = exports.UserToEventsAttendingQuery = exports.UserToIncomingFriendRequestsQuery = exports.UserToFriendRequestsQuery = exports.UserToCustomEdgeQuery = exports.CustomEdge = exports.UserToFriendsQuery = exports.UserToContactsFkeyQueryAsc = exports.UserToContactsFkeyQuery = exports.UserToContactsFkeyQueryDeprecated = exports.userToContactsDataLoaderFactory = exports.userToContactsCountLoaderFactory = exports.UserToContactsQuery = void 0;
 const custom_query_1 = require("../../core/query/custom_query");
 const ent_1 = require("../../core/ent");
 const clause = __importStar(require("../../core/clause"));
@@ -28,7 +32,6 @@ const internal_1 = require("./internal");
 const raw_count_loader_1 = require("../../core/loaders/raw_count_loader");
 const assoc_count_loader_1 = require("../../core/loaders/assoc_count_loader");
 const assoc_edge_loader_1 = require("../../core/loaders/assoc_edge_loader");
-const index_loader_1 = require("../../core/loaders/index_loader");
 const fake_contact_1 = require("./fake_contact");
 const jest_date_mock_1 = require("jest-date-mock");
 const luxon_1 = require("luxon");
@@ -52,10 +55,13 @@ exports.userToContactsCountLoaderFactory = new raw_count_loader_1.RawCountLoader
     ...internal_1.FakeContact.loaderOptions(),
     groupCol: "user_id",
 });
-exports.userToContactsDataLoaderFactory = new index_loader_1.IndexLoaderFactory(internal_1.FakeContact.loaderOptions(), "user_id", {
+exports.userToContactsDataLoaderFactory = new query_loader_1.QueryLoaderFactory({
+    ...internal_1.FakeContact.loaderOptions(),
+    groupCol: "user_id",
     toPrime: [fake_contact_1.contactLoader],
 });
-class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
+// note: this is still used in graphql tests...
+class UserToContactsFkeyQueryDeprecated extends custom_query_1.CustomEdgeQueryBase {
     constructor(viewer, src) {
         super(viewer, {
             src,
@@ -63,6 +69,27 @@ class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
             countLoaderFactory: exports.userToContactsCountLoaderFactory,
             dataLoaderFactory: exports.userToContactsDataLoaderFactory,
             options: internal_1.FakeContact.loaderOptions(),
+            sortColumn: "created_at",
+        });
+    }
+    static query(viewer, src) {
+        return new UserToContactsFkeyQueryDeprecated(viewer, src);
+    }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
+}
+exports.UserToContactsFkeyQueryDeprecated = UserToContactsFkeyQueryDeprecated;
+// this replaces UserToContactsFkeyQueryDeprecated
+class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
+    constructor(viewer, src) {
+        super(viewer, {
+            src,
+            loadEntOptions: internal_1.FakeContact.loaderOptions(),
+            groupCol: "user_id",
+            name: "user_to_contacts",
+            // instead of the id col...
+            sortColumn: "created_at",
         });
     }
     static query(viewer, src) {
@@ -73,6 +100,24 @@ class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
     }
 }
 exports.UserToContactsFkeyQuery = UserToContactsFkeyQuery;
+class UserToContactsFkeyQueryAsc extends custom_query_1.CustomEdgeQueryBase {
+    constructor(viewer, src) {
+        super(viewer, {
+            src,
+            loadEntOptions: internal_1.FakeContact.loaderOptions(),
+            groupCol: "user_id",
+            name: "user_to_contacts",
+            sortColumn: "created_at ASC",
+        });
+    }
+    static query(viewer, src) {
+        return new UserToContactsFkeyQueryAsc(viewer, src);
+    }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
+}
+exports.UserToContactsFkeyQueryAsc = UserToContactsFkeyQueryAsc;
 class UserToFriendsQuery extends assoc_query_1.AssocEdgeQueryBase {
     constructor(viewer, src) {
         super(viewer, src, new assoc_count_loader_1.AssocEdgeCountLoaderFactory(internal_1.EdgeType.UserToFriends), new assoc_edge_loader_1.AssocEdgeLoaderFactory(internal_1.EdgeType.UserToFriends, ent_1.AssocEdge), internal_1.FakeUser.loaderOptions());
@@ -257,27 +302,14 @@ function getCompleteClause(id) {
     return clause.And(clause.Eq("user_id", id), (0, exports.getNextWeekClause)());
 }
 exports.getCompleteClause = getCompleteClause;
-exports.userToEventsInNextWeekCountLoaderFactory = new raw_count_loader_1.RawCountLoaderFactory({
-    ...internal_1.FakeEvent.loaderOptions(),
-    groupCol: "user_id",
-    clause: (0, exports.getNextWeekClause)(),
-});
-exports.userToEventsInNextWeekDataLoaderFactory = new query_loader_1.QueryLoaderFactory({
-    ...internal_1.FakeEvent.loaderOptions(),
-    groupCol: "user_id",
-    clause: (0, exports.getNextWeekClause)(),
-    toPrime: [fake_contact_1.contactLoader],
-    sortColumn: "start_time",
-});
 class UserToEventsInNextWeekQuery extends custom_query_1.CustomEdgeQueryBase {
     constructor(viewer, src) {
         super(viewer, {
             src,
-            // we want to reuse this and not create a new one every time...
-            countLoaderFactory: exports.userToEventsInNextWeekCountLoaderFactory,
-            dataLoaderFactory: exports.userToEventsInNextWeekDataLoaderFactory,
-            options: internal_1.FakeEvent.loaderOptions(),
-            // hmm TODO shouldn't need to write this twice...
+            groupCol: "user_id",
+            clause: (0, exports.getNextWeekClause)(),
+            loadEntOptions: internal_1.FakeEvent.loaderOptions(),
+            name: "events_in_next_week",
             sortColumn: "start_time",
         });
     }

package/testutils/fake_log.d.ts

@@ -1,4 +1,4 @@
-import { Ent } from "../core/base";
+import { Ent, Viewer } from "../core/base";
 import { Builder } from "./../action";
 export declare class FakeLogger {
     private static logs;
@@ -8,6 +8,6 @@ export declare class FakeLogger {
     static contains(line: string): boolean;
     static clear(): void;
 }
-export declare class EntCreationObserver<T extends Ent> {
-    observe(builder: Builder<T>): Promise<void>;
+export declare class EntCreationObserver<TEnt extends Ent<TViewer>, TViewer extends Viewer = Viewer> {
+    observe(builder: Builder<TEnt, TViewer>): Promise<void>;
 }

package/testutils/fake_log.js

@@ -21,12 +21,12 @@ class FakeLogger {
         this.logs = [];
     }
 }
-exports.FakeLogger = FakeLogger;
 // todo this is quick and ideal.
 // more ideal is capturing all console.logs
 // we do it in golang for example
 // and will need this for production launch anyways
 FakeLogger.logs = [];
+exports.FakeLogger = FakeLogger;
 // TODO instead of needing to add this manually
 // we need to build a way to add global observers (and maybe triggers)
 // to be run on every action/mutation