@snowtop/ent 0.1.0-alpha99 → 0.1.0

package/testutils/action/complex_schemas.js

@@ -173,11 +173,14 @@ exports.ChangelogSchema = (0, builder_1.getBuilderSchemaFromFields)({
 }, Changelog);
 exports.MessageSchema = (0, builder_1.getBuilderSchemaFromFields)({
     // TODO both id fields
-    sender: (0, field_1.StringType)(),
+    sender: (0, field_1.StringType)({
+        index: true,
+    }),
     recipient: (0, field_1.StringType)(),
     message: (0, field_1.StringType)(),
     transient: (0, field_1.BooleanType)({ nullable: true }),
     expiresAt: (0, field_1.TimestampType)({ nullable: true }),
+    delivered: (0, field_1.BooleanType)({ defaultValueOnCreate: () => false }),
 }, builder_1.Message);
 jest.spyOn(action, "saveBuilder").mockImplementation(saveBuilder);
 jest.spyOn(action, "saveBuilderX").mockImplementation(saveBuilderX);
@@ -233,8 +236,12 @@ class MessageAction extends builder_1.SimpleAction {
                 changeset: (builder, _input) => {
                     let sender = builder.fields.get("sender");
                     let recipient = builder.fields.get("recipient");
-                    builder.orchestrator.addInboundEdge(sender, "senderToMessage", "user");
-                    builder.orchestrator.addInboundEdge(recipient, "recipientToMessage", "user");
+                    if (sender) {
+                        builder.orchestrator.addInboundEdge(sender, "senderToMessage", "user");
+                    }
+                    if (recipient) {
+                        builder.orchestrator.addInboundEdge(recipient, "recipientToMessage", "user");
+                    }
                 },
             },
         ];

package/testutils/builder.d.ts

@@ -5,6 +5,7 @@ import { FieldMap, Schema } from "../schema";
 import { SchemaConfig, EntSchema } from "../schema/base_schema";
 import { FieldInfoMap } from "../schema/schema";
 import { Clause } from "src/core/clause";
+import { ChangesetOptions } from "../action/action";
 export declare class BaseEnt {
     viewer: Viewer;
     readonly data: Data;
@@ -76,6 +77,7 @@ export declare class SimpleBuilder<T extends Ent, TExistingEnt extends TMaybleNu
     storeData(k: string, v: any): void;
     getStoredData(k: string): any;
     build(): Promise<Changeset>;
+    buildWithOptions_BETA(options: ChangesetOptions): Promise<Changeset>;
     editedEnt(): Promise<T | null>;
     editedEntX(): Promise<T>;
     save(): Promise<void>;
@@ -98,6 +100,7 @@ export declare class SimpleAction<T extends Ent, TExistingEnt extends TMaybleNul
     getPrivacyPolicy(): PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
     getInput(): Data;
     changeset(): Promise<Changeset>;
+    changesetWithOptions_BETA(options: ChangesetOptions): Promise<Changeset>;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     validWithErrors(): Promise<Error[]>;

package/testutils/builder.js

@@ -244,6 +244,9 @@ class SimpleBuilder {
     build() {
         return this.orchestrator.build();
     }
+    buildWithOptions_BETA(options) {
+        return this.orchestrator.buildWithOptions_BETA(options);
+    }
     async editedEnt() {
         return await this.orchestrator.editedEnt();
     }
@@ -292,6 +295,9 @@ class SimpleAction {
     changeset() {
         return this.builder.build();
     }
+    changesetWithOptions_BETA(options) {
+        return this.builder.buildWithOptions_BETA(options);
+    }
     valid() {
         return this.builder.orchestrator.valid();
     }

package/testutils/db/temp_db.d.ts

@@ -21,6 +21,7 @@ interface Column extends SchemaItem {
 }
 interface Constraint extends SchemaItem {
     generate(): string;
+    postCreate?(): boolean;
 }
 interface Index extends SchemaItem {
     generate(): string;
@@ -72,6 +73,11 @@ export declare function dateList(name: string, opts?: options): Column;
 export declare function boolList(name: string, opts?: options): Column;
 export declare function table(name: string, ...items: SchemaItem[]): Table;
 export declare function enumType(name: string, values: string[]): CoreConcept;
+interface TempDBOptions {
+    dialect: Dialect;
+    sqliteConnString?: string;
+    tables?: CoreConcept[] | (() => CoreConcept[]);
+}
 export declare class TempDB {
     private db;
     private client;
@@ -80,7 +86,9 @@ export declare class TempDB {
     private dialect;
     private sqlite;
     private setTables;
+    private sqliteConnString;
     constructor(dialect: Dialect, tables?: CoreConcept[] | (() => CoreConcept[]));
+    constructor(opts: TempDBOptions);
     getDialect(): Dialect;
     __getTables(): Map<string, CoreConcept>;
     beforeAll(setupConnString?: boolean): Promise<void>;
@@ -94,7 +102,7 @@ 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, global?: boolean): Table;
+export declare function assoc_edge_table(name: string, global?: boolean, unique_edge?: boolean): Table;
 interface setupOptions {
     disableDeleteAfterEachTest?: boolean;
 }

package/testutils/db/temp_db.js

@@ -64,6 +64,20 @@ function check(name, condition) {
     };
 }
 exports.check = check;
+function unique(name, cols, tableName) {
+    return {
+        name,
+        generate() {
+            if (db_1.Dialect.SQLite === db_1.default.getDialect()) {
+                return `UNIQUE (${cols.join(",")})`;
+            }
+            return `ALTER TABLE ${tableName} ADD CONSTRAINT ${name} UNIQUE (${cols.join(", ")});`;
+        },
+        postCreate() {
+            return db_1.Dialect.Postgres === db_1.default.getDialect();
+        },
+    };
+}
 function isPostCreateIndex(s) {
     return (s.postCreate !== undefined &&
         s.postCreate());
@@ -367,8 +381,15 @@ function randomDB() {
 class TempDB {
     constructor(dialect, tables) {
         this.tables = new Map();
-        this.dialect = dialect;
-        this.setTables = tables;
+        if (typeof dialect === "string") {
+            this.dialect = dialect;
+            this.setTables = tables;
+        }
+        else {
+            this.dialect = dialect.dialect;
+            this.setTables = dialect.tables;
+            this.sqliteConnString = dialect.sqliteConnString;
+        }
     }
     getDialect() {
         return this.dialect;
@@ -401,6 +422,10 @@ class TempDB {
                 }
                 db_1.default.initDB({
                     connectionString: connStr,
+                    cfg: {
+                        max: 100,
+                        idleTimeoutMillis: 100,
+                    },
                 });
             }
             else {
@@ -416,10 +441,17 @@ class TempDB {
             await this.dbClient.connect();
         }
         else {
-            if (process.env.DB_CONNECTION_STRING === undefined) {
-                throw new Error(`DB_CONNECTION_STRING required for sqlite `);
+            let connString;
+            if (this.sqliteConnString) {
+                connString = this.sqliteConnString;
             }
-            const filePath = process.env.DB_CONNECTION_STRING.substr(10);
+            else {
+                if (process.env.DB_CONNECTION_STRING === undefined) {
+                    throw new Error(`DB_CONNECTION_STRING required for sqlite if sqliteConnString is not set`);
+                }
+                connString = process.env.DB_CONNECTION_STRING;
+            }
+            const filePath = connString.substr(10);
             this.sqlite = (0, better_sqlite3_1.default)(filePath);
         }
         if (this.setTables) {
@@ -463,6 +495,16 @@ class TempDB {
     async afterAll() {
         if (this.dialect === db_1.Dialect.SQLite) {
             this.sqlite.close();
+            if (!this.sqlite.memory) {
+                const f = this.getSqliteClient().name;
+                fs.rmSync(f);
+                fs.rmSync(`${f}-shm`, {
+                    force: true,
+                });
+                fs.rmSync(`${f}-wal`, {
+                    force: true,
+                });
+            }
             return;
         }
         // end our connection to db
@@ -471,6 +513,7 @@ class TempDB {
         await db_1.default.getInstance().endPool();
         // drop db
         await this.client.query(`DROP DATABASE ${this.db}`);
+        // console.log(this.db);
         await this.client.end();
     }
     getDB() {
@@ -515,10 +558,22 @@ function assoc_edge_config_table() {
 exports.assoc_edge_config_table = assoc_edge_config_table;
 // if global flag is true, add any column from testEdgeGlobalSchema
 // up to caller to set/clear that as needed
-function assoc_edge_table(name, global) {
-    const t = table(name, uuid("id1"), text("id1_type"), 
-    // same as in assoc_edge_config_table
-    text("edge_type"), uuid("id2"), text("id2_type"), timestamptz("time"), text("data", { nullable: true }), primaryKey(`${name}_pkey`, ["id1", "id2", "edge_type"]));
+function assoc_edge_table(name, global, unique_edge) {
+    const items = [
+        uuid("id1"),
+        text("id1_type"),
+        // same as in assoc_edge_config_table
+        text("edge_type"),
+        uuid("id2"),
+        text("id2_type"),
+        timestamptz("time"),
+        text("data", { nullable: true }),
+        primaryKey(`${name}_pkey`, ["id1", "id2", "edge_type"]),
+    ];
+    if (unique_edge) {
+        items.push(unique(`${name}_unique_id1_edge_type`, ["id1", "edge_type"], name));
+    }
+    const t = table(name, ...items);
     if (global) {
         for (const k in test_edge_global_schema_1.testEdgeGlobalSchema.extraEdgeFields) {
             const col = getColumnFromField(k, test_edge_global_schema_1.testEdgeGlobalSchema.extraEdgeFields[k], db_1.Dialect.Postgres);
@@ -529,10 +584,15 @@ function assoc_edge_table(name, global) {
 }
 exports.assoc_edge_table = assoc_edge_table;
 function setupSqlite(connString, tables, opts) {
-    let tdb = new TempDB(db_1.Dialect.SQLite, tables);
+    let tdb = new TempDB({
+        dialect: db_1.Dialect.SQLite,
+        tables,
+        sqliteConnString: connString,
+    });
     beforeAll(async () => {
-        process.env.DB_CONNECTION_STRING = connString;
-        (0, config_1.loadConfig)();
+        (0, config_1.loadConfig)({
+            dbConnectionString: connString,
+        });
         await tdb.beforeAll();
         const conn = db_1.default.getInstance().getConnection();
         expect(conn.db.memory).toBe(false);
@@ -554,7 +614,6 @@ function setupSqlite(connString, tables, opts) {
     }
     afterAll(async () => {
         await tdb.afterAll();
-        fs.rmSync(tdb.getSqliteClient().name);
         delete process.env.DB_CONNECTION_STRING;
     });
     return tdb;
@@ -601,6 +660,7 @@ function getSchemaTable(schema, dialect) {
     for (const [fieldName, field] of fields) {
         items.push(getColumnFromField(fieldName, field, dialect));
     }
+    const tableName = (0, builder_1.getTableName)(schema);
     if (schema.constraints) {
         for (const constraint of schema.constraints) {
             switch (constraint.type) {
@@ -622,10 +682,15 @@ function getSchemaTable(schema, dialect) {
                     }
                     items.push(check(constraint.name, constraint.condition));
                     break;
+                case schema_1.ConstraintType.Unique:
+                    items.push(unique(constraint.name, constraint.columns, tableName));
+                    break;
+                default:
+                    throw new Error(`unknown constraint type ${constraint.type}`);
             }
         }
     }
-    return table((0, builder_1.getTableName)(schema), ...items);
+    return table(tableName, ...items);
 }
 exports.getSchemaTable = getSchemaTable;
 function getColumnForDbType(t, dialect) {
@@ -702,6 +767,9 @@ function buildOpts(f) {
     if (f.serverDefault) {
         ret.default = f.serverDefault;
     }
+    if (f.unique) {
+        ret.unique = true;
+    }
     return ret;
 }
 function storageKey(fieldName, f) {

package/testutils/db_mock.js

@@ -263,10 +263,8 @@ class QueryRecorder {
         });
     }
 }
-exports.QueryRecorder = QueryRecorder;
 QueryRecorder.queries = [];
 QueryRecorder.ids = [];
 // we need pkeys when storing...
 QueryRecorder.data = new Map();
-// TODO
-process.env.DB_CONNECTION_STRING = "INVALID DATABASE";
+exports.QueryRecorder = QueryRecorder;

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

@@ -2,7 +2,7 @@ import { Express, RequestHandler } from "express";
 import { Viewer } from "../../core/base";
 import { GraphQLSchema } from "graphql";
 import supertest from "supertest";
-export type Option = [string, any];
+export type Option = [string, any] | [string, any, string];
 interface queryConfig {
     viewer?: Viewer;
     init?: (app: Express) => void;

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

@@ -162,8 +162,9 @@ function makeGraphQLRequest(config, query, fieldArgs) {
 }
 function buildTreeFromQueryPaths(schema, fieldType, ...options) {
     let fields;
-    if (fieldType instanceof graphql_1.GraphQLObjectType) {
-        fields = fieldType.getFields();
+    const [typ] = getInnerType(fieldType, false);
+    if (typ instanceof graphql_1.GraphQLObjectType) {
+        fields = typ.getFields();
     }
     let topLevelTree = {};
     options.forEach((option) => {
@@ -201,10 +202,11 @@ function buildTreeFromQueryPaths(schema, fieldType, ...options) {
             }
             // TODO this needs to be aware of paths etc so this part works for complicated
             // cases but inlineFragmentRoot is a workaround for now.
-            function handleSubtree(obj, tree) {
+            function handleSubtree(obj, tree, parts) {
+                let parts2 = [...parts];
                 if (Array.isArray(obj)) {
                     for (const obj2 of obj) {
-                        handleSubtree(obj2, tree);
+                        handleSubtree(obj2, tree, parts2);
                     }
                     return;
                 }
@@ -213,28 +215,36 @@ function buildTreeFromQueryPaths(schema, fieldType, ...options) {
                         tree[key] = {};
                     }
                     if (typeof obj[key] === "object") {
-                        if (!isScalarField(key)) {
-                            handleSubtree(obj[key], tree[key]);
+                        let parts2 = [...parts, key];
+                        if (!scalarFieldAtLeaf(parts2)) {
+                            handleSubtree(obj[key], tree[key], parts2);
                         }
                     }
                 }
             }
-            // TODO this needs to work for super complicated objects and have fields update as nesting applies...
-            function isScalarField(f) {
-                const subField = fields?.[f];
-                if (!subField) {
+            function scalarFieldAtLeaf(pathFromRoot) {
+                let root = fields;
+                if (!root) {
                     return false;
                 }
-                if (!(0, graphql_1.isWrappingType)(subField.type)) {
+                let subField;
+                for (const p of pathFromRoot) {
+                    subField = root?.[p];
+                    if (subField) {
+                        [subField] = getInnerType(subField.type, false);
+                        if (subField instanceof graphql_1.GraphQLObjectType) {
+                            root = subField.getFields();
+                        }
+                    }
+                }
+                if (!subField) {
                     return false;
                 }
-                // only spread out if an object
-                const [typ, _] = getInnerType(subField.type, true);
-                return (0, graphql_1.isScalarType)(typ) || (0, graphql_1.isEnumType)(typ);
+                return (0, graphql_1.isScalarType)(subField) || (0, graphql_1.isEnumType)(subField);
             }
             if (i === parts.length - 1 && typeof option[1] === "object") {
-                if (!isScalarField(part)) {
-                    handleSubtree(option[1], tree);
+                if (!scalarFieldAtLeaf(parts)) {
+                    handleSubtree(option[1], tree, parts);
                 }
             }
         }
@@ -408,8 +418,9 @@ async function expectFromRoot(config, ...options) {
         }
     }
     await Promise.all(options.map(async (option) => {
-        let path = option[0];
-        let expected = option[1];
+        const path = option[0];
+        const expected = option[1];
+        const alias = option[2];
         let nullPath;
         let nullParts = [];
         let undefinedPath;
@@ -432,7 +443,7 @@ async function expectFromRoot(config, ...options) {
                 }
             }
         }
-        let parts = splitPath(path);
+        let parts = splitPath(alias ?? path);
         let current = result;
         // possible to make this smarter and better
         // e.g. when building up the tree above

package/testutils/fake_comms.js

@@ -32,5 +32,5 @@ class FakeComms {
         this.sent = [];
     }
 }
-exports.FakeComms = FakeComms;
 FakeComms.sent = [];
+exports.FakeComms = FakeComms;

package/testutils/fake_data/fake_contact.d.ts

@@ -34,4 +34,4 @@ export interface ContactCreateInput {
 }
 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>;
+export declare const contactLoader: ObjectLoaderFactory<Data>;

package/testutils/fake_data/fake_tag.d.ts

@@ -33,4 +33,4 @@ export type TagEditInput = Partial<TagCreateInput>;
 export declare function getTagBuilder(viewer: Viewer, input: TagCreateInput): import("../builder").SimpleBuilder<FakeTag, null>;
 export declare function getTagAction(viewer: Viewer, input: TagCreateInput): SimpleAction<FakeTag, null>;
 export declare function createTag(viewer: Viewer, input: TagCreateInput): Promise<FakeTag>;
-export declare const tagLoader: ObjectLoaderFactory<unknown>;
+export declare const tagLoader: ObjectLoaderFactory<Data>;

package/testutils/fake_data/fake_user.d.ts

@@ -46,7 +46,7 @@ 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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.userPhoneNumberLoader = exports.userEmailLoader = exports.userLoader = exports.createUser = exports.getUserAction = exports.getUserBuilder = exports.FakeUserSchema = exports.FakeUser = exports.ViewerWithAccessToken = void 0;
+const base_1 = require("../../core/base");
 const ent_1 = require("../../core/ent");
 const privacy_1 = require("../../core/privacy");
 const builder_1 = require("../builder");
@@ -28,9 +29,17 @@ class FakeUser {
         return {
             rules: [
                 privacy_1.AllowIfViewerRule,
-                //can view user if friends
+                {
+                    async apply(v, ent) {
+                        if (!(v instanceof ViewerWithAccessToken)) {
+                            return (0, base_1.Skip)();
+                        }
+                        return v.hasToken("always_allow_user") ? (0, base_1.Allow)() : (0, base_1.Skip)();
+                    },
+                },
+                // can view user if friends
                 new privacy_1.AllowIfViewerInboundEdgeExistsRule(internal_1.EdgeType.UserToFriends),
-                //can view user if following
+                // can view user if following
                 new privacy_1.AllowIfViewerInboundEdgeExistsRule(internal_1.EdgeType.UserToFollowing),
                 new privacy_1.AllowIfConditionAppliesRule((viewer, ent) => {
                     if (!(viewer instanceof ViewerWithAccessToken)) {
@@ -113,9 +122,11 @@ function getUserAction(viewer, input) {
         m.set(key, input[key]);
     }
     const action = new builder_1.SimpleAction(viewer, exports.FakeUserSchema, m, action_1.WriteOperation.Insert, null);
-    action.viewerForEntLoad = (data) => {
+    action.viewerForEntLoad = (data, context) => {
         // load the created ent using a VC of the newly created user.
-        return new viewer_1.IDViewer(data.id);
+        return new viewer_1.IDViewer(data.id, {
+            context,
+        });
     };
     return action;
 }

package/testutils/fake_data/tag_query.js

@@ -11,7 +11,7 @@ class UserToTagsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
             groupCol: "owner_id",
             name: "user_to_tags",
             sortColumn: "canonical_name",
-            sortColumnUnique: true,
+            primarySortColIsUnique: true,
         });
     }
     static query(viewer, src) {
@@ -29,8 +29,13 @@ class UserToTagsFkeyQueryAsc extends custom_query_1.CustomEdgeQueryBase {
             loadEntOptions: internal_1.FakeTag.loaderOptions(),
             groupCol: "owner_id",
             name: "user_to_tags_asc",
-            sortColumn: "canonical_name ASC",
-            sortColumnUnique: true,
+            orderby: [
+                {
+                    column: "canonical_name",
+                    direction: "ASC",
+                },
+            ],
+            primarySortColIsUnique: true,
         });
     }
     static query(viewer, src) {

package/testutils/fake_data/test_helpers.d.ts

@@ -1,4 +1,4 @@
-import { Data, Ent } from "../../core/base";
+import { Context, Data, Ent } from "../../core/base";
 import { AssocEdge } from "../../core/ent";
 import { TempDB } from "../db/temp_db";
 import { FakeUser, UserCreateInput, ContactCreateInput, FakeContact } from ".";
@@ -7,13 +7,14 @@ import { BuilderSchema } from "../builder";
 export declare function getContactInput(user: FakeUser, input?: Partial<ContactCreateInput>): ContactCreateInput;
 export declare function getUserInput(input?: Partial<UserCreateInput>): UserCreateInput;
 export declare function getEventInput(user: FakeUser, input?: Partial<EventCreateInput>): EventCreateInput;
-export declare function createTestUser(input?: Partial<UserCreateInput>): Promise<FakeUser>;
+export declare function createTestUser(input?: Partial<UserCreateInput>, ctx?: Context): Promise<FakeUser>;
 export declare const inputs: Partial<ContactCreateInput>[];
 interface createContactOptions {
     input?: Partial<UserCreateInput>;
     slice?: number;
     user?: FakeUser;
     start?: number;
+    ctx?: Context;
 }
 export declare function createAllContacts(opts?: createContactOptions): Promise<[FakeUser, FakeContact[]]>;
 export declare function createUserPlusFriendRequests(input?: Partial<UserCreateInput>, slice?: number): Promise<[FakeUser, FakeUser[]]>;

package/testutils/fake_data/test_helpers.js

@@ -53,8 +53,8 @@ function getEventInput(user, input) {
     };
 }
 exports.getEventInput = getEventInput;
-async function createTestUser(input) {
-    const user = await (0, _1.createUser)(new viewer_1.LoggedOutViewer(), {
+async function createTestUser(input, ctx) {
+    const user = await (0, _1.createUser)(new viewer_1.LoggedOutViewer(ctx), {
         firstName: "Jon",
         lastName: "Snow",
         password: "12345678",
@@ -93,7 +93,7 @@ exports.inputs = [
 async function createAllContacts(opts) {
     let { input, slice, user } = opts || {};
     if (!user) {
-        user = await createTestUser(input);
+        user = await createTestUser(input, opts?.ctx);
     }
     const userr = user;
     if (opts?.start) {
@@ -257,7 +257,7 @@ async function createAllEvents(opts) {
         const input = opts.eventInputs?.[idx];
         const builder = (0, fake_event_1.getEventBuilder)(user.viewer, getEventInput(user, input));
         await builder.saveX();
-        return await builder.editedEntX();
+        return builder.editedEntX();
     }));
     expect(events.length).toBe(opts.howMany);
     return [user, events];

package/testutils/fake_data/user_query.d.ts

@@ -1,4 +1,4 @@
-import { Ent, ID, Viewer } from "../../core/base";
+import { Data, Ent, ID, Viewer } from "../../core/base";
 import { CustomEdgeQueryBase } from "../../core/query/custom_query";
 import { AssocEdge } from "../../core/ent";
 import * as clause from "../../core/clause";
@@ -39,6 +39,8 @@ export declare class UserToFriendsQuery extends AssocEdgeQueryBase<FakeUser, Fak
     queryCustomEdge(): UserToCustomEdgeQuery;
 }
 export declare class CustomEdge extends AssocEdge {
+    deleted_at: Date | null;
+    constructor(data: Data);
     loadUser(viewer: Viewer): Promise<FakeUser | null>;
 }
 export declare class UserToCustomEdgeQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, CustomEdge> {
@@ -60,7 +62,7 @@ export declare class UserToFriendRequestsQuery extends AssocEdgeQueryBase<FakeUs
     queryEventsAttending(): UserToEventsAttendingQuery;
     queryCustomEdge(): UserToCustomEdgeQuery;
 }
-export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
+export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, CustomEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);
     getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
     sourceEnt(id: ID): Promise<FakeUser | null>;
@@ -70,6 +72,7 @@ export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBas
     queryHostedEvents(): UserToHostedEventsQuery;
     queryEventsAttending(): UserToEventsAttendingQuery;
     queryCustomEdge(): UserToCustomEdgeQuery;
+    withoutTransformations(): this;
 }
 export declare class UserToEventsAttendingQuery extends AssocEdgeQueryBase<FakeUser, FakeEvent, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeEvent>);

package/testutils/fake_data/user_query.js

@@ -107,7 +107,12 @@ class UserToContactsFkeyQueryAsc extends custom_query_1.CustomEdgeQueryBase {
             loadEntOptions: internal_1.FakeContact.loaderOptions(),
             groupCol: "user_id",
             name: "user_to_contacts",
-            sortColumn: "created_at ASC",
+            orderby: [
+                {
+                    column: "created_at",
+                    direction: "ASC",
+                },
+            ],
         });
     }
     static query(viewer, src) {
@@ -147,6 +152,11 @@ class UserToFriendsQuery extends assoc_query_1.AssocEdgeQueryBase {
 exports.UserToFriendsQuery = UserToFriendsQuery;
 // example with custom method
 class CustomEdge extends ent_1.AssocEdge {
+    constructor(data) {
+        super(data);
+        this.deleted_at = null;
+        this.deleted_at = data.deleted_at;
+    }
     async loadUser(viewer) {
         return await internal_1.FakeUser.load(viewer, this.id2);
     }
@@ -205,7 +215,7 @@ class UserToFriendRequestsQuery extends assoc_query_1.AssocEdgeQueryBase {
 exports.UserToFriendRequestsQuery = UserToFriendRequestsQuery;
 class UserToIncomingFriendRequestsQuery extends assoc_query_1.AssocEdgeQueryBase {
     constructor(viewer, src) {
-        super(viewer, src, new assoc_count_loader_1.AssocEdgeCountLoaderFactory(internal_1.EdgeType.UserToIncomingFriendRequests), new assoc_edge_loader_1.AssocEdgeLoaderFactory(internal_1.EdgeType.UserToIncomingFriendRequests, ent_1.AssocEdge), internal_1.FakeUser.loaderOptions());
+        super(viewer, src, new assoc_count_loader_1.AssocEdgeCountLoaderFactory(internal_1.EdgeType.UserToIncomingFriendRequests), new assoc_edge_loader_1.AssocEdgeLoaderFactory(internal_1.EdgeType.UserToIncomingFriendRequests, CustomEdge), internal_1.FakeUser.loaderOptions());
     }
     getPrivacyPolicy() {
         return privacy_1.AllowIfViewerPrivacyPolicy;
@@ -231,6 +241,13 @@ class UserToIncomingFriendRequestsQuery extends assoc_query_1.AssocEdgeQueryBase
     queryCustomEdge() {
         return UserToCustomEdgeQuery.query(this.viewer, this);
     }
+    // this is generated in codegen. we'll just add it manually here
+    withoutTransformations() {
+        this.configureEdgeQueryableDataOptions({
+            disableTransformations: true,
+        });
+        return this;
+    }
 }
 exports.UserToIncomingFriendRequestsQuery = UserToIncomingFriendRequestsQuery;
 class UserToEventsAttendingQuery extends assoc_query_1.AssocEdgeQueryBase {