@snowtop/ent 0.1.17 → 0.1.19-test2

package/action/operations.d.ts

@@ -65,6 +65,7 @@ export declare class EditNodeOperation<TEnt extends Ent<TViewer>, TViewer extend
     performWrite(queryer: Queryer, context?: Context): Promise<void>;
     private buildReloadQuery;
     private reloadRow;
+    private getReturning;
     performWriteSync(queryer: SyncQueryer, context?: Context): void;
     returnedRow(): Data | null;
     createdEnt(viewer: Viewer): TEnt | null;

package/action/operations.js

@@ -154,7 +154,7 @@ class EditNodeOperation {
             if (this.hasData(options.fields)) {
                 // even this with returning * may not always work if transformed...
                 // we can have a transformed flag to see if it should be returned?
-                this.row = await (0, ent_1.editRow)(queryer, options, "RETURNING *");
+                this.row = await (0, ent_1.editRow)(queryer, options, this.getReturning());
             }
             else {
                 // @ts-ignore
@@ -164,7 +164,7 @@ class EditNodeOperation {
         else {
             // TODO: eventually, when we officially support auto-increment ids. need to make sure/test that this works
             // https://github.com/lolopinto/ent/issues/1431
-            this.row = await (0, ent_1.createRow)(queryer, options, "RETURNING *");
+            this.row = await (0, ent_1.createRow)(queryer, options, this.getReturning());
             const key = this.options.key;
             if (this.row && this.row[key] !== this.options.fields[key]) {
                 this.updatedOp = {
@@ -222,6 +222,12 @@ class EditNodeOperation {
             this.row = r.rows[0];
         }
     }
+    getReturning() {
+        if (this.options.loadEntOptions.fields.length) {
+            return `RETURNING ${this.options.loadEntOptions.fields.join(",")}`;
+        }
+        return `RETURNING *`;
+    }
     performWriteSync(queryer, context) {
         let options = {
             ...this.options,
@@ -229,7 +235,7 @@ class EditNodeOperation {
         };
         if (this.existingEnt) {
             if (this.hasData(this.options.fields)) {
-                (0, ent_1.editRowSync)(queryer, options, "RETURNING *");
+                (0, ent_1.editRowSync)(queryer, options, this.getReturning());
                 this.reloadRow(queryer, this.existingEnt.id, options);
             }
             else {
@@ -238,7 +244,7 @@ class EditNodeOperation {
             }
         }
         else {
-            (0, ent_1.createRowSync)(queryer, options, "RETURNING *");
+            (0, ent_1.createRowSync)(queryer, options, this.getReturning());
             const id = options.fields[options.key];
             this.reloadRow(queryer, id, options);
             const key = this.options.key;

package/core/clause.d.ts

@@ -73,6 +73,12 @@ export declare function ArrayEq<T extends Data, K = keyof T>(col: K, value: any)
  */
 export declare function ArrayNotEq<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Eq<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
+export declare function StartsWith<T extends Data, K = keyof T>(col: K, value: string): Clause<T, K>;
+export declare function EndsWith<T extends Data, K = keyof T>(col: K, value: string): Clause<T, K>;
+export declare function Contains<T extends Data, K = keyof T>(col: K, value: string): Clause<T, K>;
+export declare function StartsWithIgnoreCase<T extends Data, K = keyof T>(col: K, value: string): Clause<T, K>;
+export declare function EndsWithIgnoreCase<T extends Data, K = keyof T>(col: K, value: string): Clause<T, K>;
+export declare function ContainsIgnoreCase<T extends Data, K = keyof T>(col: K, value: string): Clause<T, K>;
 export declare function NotEq<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Greater<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Less<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
@@ -125,5 +131,6 @@ export declare function Multiply<T extends Data, K = keyof T>(col: K, value: any
 export declare function Divide<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Modulo<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function getCombinedClause<V extends Data = Data, K = keyof V>(options: Pick<SelectDataOptions, "clause">, cls: Clause<V, K>, checkIntersection?: boolean): Clause<V, K>;
+export declare function getCombinedClause<V extends Data = Data, K = keyof V>(options: Pick<SelectDataOptions, "clause">, cls: Clause<V, K> | undefined, checkIntersection?: boolean): Clause<V, K> | undefined;
 export declare function Expression<T extends Data, K = keyof T>(expression: string): Clause<T, K>;
 export {};

package/core/clause.js

@@ -23,8 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = exports.JSONKeyInList = exports.JSONBKeyInList = exports.JSONKeyExists = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeNotIn = exports.TextNotIn = exports.IntegerNotIn = exports.UuidNotIn = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.notInClause = exports.inClause = void 0;
-exports.Expression = exports.getCombinedClause = void 0;
+exports.JSONKeyInList = exports.JSONBKeyInList = exports.JSONKeyExists = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeNotIn = exports.TextNotIn = exports.IntegerNotIn = exports.UuidNotIn = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.ContainsIgnoreCase = exports.EndsWithIgnoreCase = exports.StartsWithIgnoreCase = exports.Contains = exports.EndsWith = exports.StartsWith = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.notInClause = exports.inClause = void 0;
+exports.Expression = exports.getCombinedClause = exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = void 0;
 const db_1 = __importStar(require("./db"));
 const query_impl_1 = require("./query_impl");
 function isSensitive(val) {
@@ -566,6 +566,30 @@ function Eq(col, value) {
     return new simpleClause(col, value, "=", new isNullClause(col));
 }
 exports.Eq = Eq;
+function StartsWith(col, value) {
+    return new simpleClause(col, `${value}%`, "LIKE");
+}
+exports.StartsWith = StartsWith;
+function EndsWith(col, value) {
+    return new simpleClause(col, `%${value}`, "LIKE");
+}
+exports.EndsWith = EndsWith;
+function Contains(col, value) {
+    return new simpleClause(col, `%${value}%`, "LIKE");
+}
+exports.Contains = Contains;
+function StartsWithIgnoreCase(col, value) {
+    return new simpleClause(col, `${value}%`, "ILIKE");
+}
+exports.StartsWithIgnoreCase = StartsWithIgnoreCase;
+function EndsWithIgnoreCase(col, value) {
+    return new simpleClause(col, `%${value}`, "ILIKE");
+}
+exports.EndsWithIgnoreCase = EndsWithIgnoreCase;
+function ContainsIgnoreCase(col, value) {
+    return new simpleClause(col, `%${value}%`, "ILIKE");
+}
+exports.ContainsIgnoreCase = ContainsIgnoreCase;
 function NotEq(col, value) {
     return new simpleClause(col, value, "!=", new isNotNullClause(col));
 }
@@ -886,7 +910,7 @@ function getCombinedClause(options, cls, checkIntersection = false) {
             if (checkIntersection) {
                 // this should be the smaller one
                 const transformedCols = new Set(optionClause.columns());
-                const queriedCols = cls.columns();
+                const queriedCols = cls?.columns() ?? [];
                 const has = new Set();
                 for (const col of queriedCols) {
                     if (transformedCols.has(col)) {
@@ -897,7 +921,7 @@ function getCombinedClause(options, cls, checkIntersection = false) {
             }
             if (and) {
                 // @ts-expect-error different types
-                cls = And(cls, optionClause);
+                cls = AndOptional(cls, optionClause);
             }
         }
     }

package/core/ent.d.ts

@@ -130,7 +130,7 @@ export declare class AssocEdge {
     __getRawData(): Data;
     getCursor(): string;
 }
-interface cursorOptions {
+export interface cursorOptions {
     row: Data;
     col: string;
     cursorKey?: string;

package/core/query/custom_query.js

@@ -7,7 +7,7 @@ const loaders_1 = require("../loaders");
 const query_1 = require("./query");
 function getClause(opts) {
     let cls = opts.clause;
-    if (opts.disableTransformations || !cls) {
+    if (opts.disableTransformations) {
         return cls;
     }
     return (0, clause_1.getCombinedClause)(opts.loadEntOptions.loaderFactory?.options, cls, true);
@@ -21,6 +21,7 @@ function getRawCountLoader(viewer, opts) {
         });
     }
     const name = `custom_query_count_loader:${opts.name}`;
+    console.debug(opts.name);
     return viewer.context.cache.getLoader(name, () => new loaders_1.RawCountLoader({
         tableName: opts.loadEntOptions.tableName,
         groupCol: opts.groupCol,

package/core/query/shared_test.d.ts

@@ -1,6 +1,7 @@
-import { Data, Viewer } from "../base";
+import { Data, ID, Viewer } from "../base";
 import { FakeUser, FakeContact } from "../../testutils/fake_data/index";
 import { EdgeQuery } from "./query";
+import { BuilderSchema } from "../../testutils/builder";
 import { MockLogs } from "../../testutils/mock_log";
 import { Clause } from "../clause";
 import { OrderBy } from "../query_impl";
@@ -16,6 +17,9 @@ interface options<TData extends Data> {
     globalSchema?: boolean;
     orderby: OrderBy;
     rawDataVerify?(user: FakeUser): Promise<void>;
+    loadEnt?(v: Viewer, id: ID): Promise<FakeContact>;
+    loadRawData?(id: ID, context: any): Promise<Data | null>;
+    contactSchemaForDeletionTest?: BuilderSchema<FakeContact>;
 }
 export declare const commonTests: <TData extends Data>(opts: options<TData>) => void;
 export {};

package/core/query/shared_test.js

@@ -26,7 +26,9 @@ const commonTests = (opts) => {
         // TODO sad not generic enough
         return (q instanceof index_1.UserToContactsFkeyQuery ||
             q instanceof index_1.UserToContactsFkeyQueryDeprecated ||
-            q instanceof index_1.UserToContactsFkeyQueryAsc);
+            q instanceof index_1.UserToContactsFkeyQueryAsc ||
+            q instanceof index_1.UserToContactsFkeyQueryDeletedAt ||
+            q instanceof index_1.UserToContactsFkeyQueryDeletedAtAsc);
     }
     class TestQueryFilter {
         constructor(filter, newQuery, ents, defaultViewer) {
@@ -98,7 +100,7 @@ const commonTests = (opts) => {
             const ents = await this.testEnts(v);
             expect(ml.logs.length).toBe(1);
             expect(ml.logs[0].query).toMatch(/SELECT (.+) FROM /);
-            await Promise.all(ents.map((ent) => index_1.FakeContact.loadX(v, ent.id)));
+            await Promise.all(ents.map((ent) => opts.loadEnt ? opts.loadEnt(v, ent.id) : index_1.FakeContact.loadX(v, ent.id)));
             expect(ml.logs.length).toBe(this.filteredContacts.length + 1);
             for (const log of ml.logs.slice(1)) {
                 expect(log["ent-cache-hit"]).toBeDefined();
@@ -115,7 +117,9 @@ const commonTests = (opts) => {
             const ents = await this.testEnts(v);
             expect(ml.logs.length).toBe(1);
             expect(ml.logs[0].query).toMatch(/SELECT (.+) FROM /);
-            await Promise.all(ents.map((ent) => index_1.FakeContact.loadRawData(ent.id, v.context)));
+            await Promise.all(ents.map((ent) => opts.loadRawData
+                ? opts.loadRawData(ent.id, v.context)
+                : index_1.FakeContact.loadRawData(ent.id, v.context)));
             expect(ml.logs.length).toBe(this.filteredContacts.length + 1);
             for (const log of ml.logs.slice(1)) {
                 expect(log["dataloader-cache-hit"]).toBeDefined();
@@ -166,7 +170,9 @@ const commonTests = (opts) => {
         const uniqCol = isCustomQuery(filter) ? "id" : "id2";
         let parts = opts.clause.clause(1).split(" AND ");
         const cmp = (0, clause_1.PaginationMultipleColsSubQuery)(opts.orderby[0].column, opts.orderby[0].direction === "DESC" ? "<" : ">", opts.tableName, uniqCol, "").clause(opts.clause.values().length + 1);
-        if (parts[parts.length - 1] === "deleted_at IS NULL") {
+        // order of parts is different in custom query seemingly
+        const customQuery = isCustomQuery(filter);
+        if (!customQuery && parts[parts.length - 1] === "deleted_at IS NULL") {
             parts = parts
                 .slice(0, parts.length - 1)
                 .concat([cmp, "deleted_at IS NULL"]);
@@ -182,7 +188,9 @@ const commonTests = (opts) => {
         const uniqCol = isCustomQuery(filter) ? "id" : "id2";
         let parts = opts.clause.clause(1).split(" AND ");
         const cmp = (0, clause_1.PaginationMultipleColsSubQuery)(orderby[0].column, orderby[0].direction === "ASC" ? ">" : "<", opts.tableName, uniqCol, "").clause(opts.clause.values().length + 1);
-        if (parts[parts.length - 1] === "deleted_at IS NULL") {
+        // order of parts is different in custom query seemingly
+        const customQuery = isCustomQuery(filter);
+        if (!customQuery && parts[parts.length - 1] === "deleted_at IS NULL") {
             parts = parts
                 .slice(0, parts.length - 1)
                 .concat([cmp, "deleted_at IS NULL"]);
@@ -398,7 +406,7 @@ const commonTests = (opts) => {
             const action = new builder_1.SimpleAction(filter.user.viewer, index_1.FakeUserSchema, new Map(), action_1.WriteOperation.Edit, filter.user);
             await Promise.all(filter.allContacts.map(async (contact) => {
                 action.builder.orchestrator.removeOutboundEdge(contact.id, index_1.EdgeType.UserToContacts);
-                const action2 = new builder_1.SimpleAction(filter.user.viewer, index_1.FakeContactSchema, new Map(), action_1.WriteOperation.Delete, contact);
+                const action2 = new builder_1.SimpleAction(filter.user.viewer, opts.contactSchemaForDeletionTest ?? index_1.FakeContactSchema, new Map(), action_1.WriteOperation.Delete, contact);
                 await action2.save();
             }));
             await action.save();

package/graphql/query/shared_edge_connection.js

@@ -4,6 +4,7 @@ exports.commonTests = void 0;
 const viewer_1 = require("../../core/viewer");
 const ent_1 = require("../../core/ent");
 const edge_connection_1 = require("./edge_connection");
+const index_1 = require("../../testutils/fake_data/index");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
 class TestConnection {
     constructor(getQuery, ents, filter) {
@@ -43,11 +44,35 @@ class TestConnection {
     }
 }
 const commonTests = (opts) => {
-    function getCursorFrom(contacts, idx) {
-        return (0, ent_1.getCursor)({
-            row: contacts[idx],
-            col: "id",
-        });
+    function isCustomQuery(q) {
+        // TODO sad not generic enough
+        return (q instanceof index_1.UserToContactsFkeyQuery ||
+            q instanceof index_1.UserToContactsFkeyQueryDeprecated ||
+            q instanceof index_1.UserToContactsFkeyQueryAsc ||
+            q instanceof index_1.UserToContactsFkeyQueryDeletedAt ||
+            q instanceof index_1.UserToContactsFkeyQueryDeletedAtAsc);
+    }
+    function getCursorFrom(q, contacts, idx) {
+        let opts;
+        if (isCustomQuery(q)) {
+            opts = {
+                row: contacts[idx],
+                col: "id",
+                // keys: ["id"],
+            };
+        }
+        else {
+            // for assoc queries, we're getting the value from 'id' field but the edge
+            // is from assoc_edge table id2 field and so cursor takes it from there
+            opts = {
+                row: contacts[idx],
+                col: "id",
+                cursorKey: "id2",
+                // keys: ["id2"],
+                // cursorKeys: ["id"],
+            };
+        }
+        return (0, ent_1.getCursor)(opts);
     }
     describe("no filters", () => {
         const filter = new TestConnection((v, user) => opts.getQuery(v, user), (contacts) => contacts);
@@ -103,7 +128,7 @@ const commonTests = (opts) => {
         const filter = new TestConnection((v, user) => opts.getQuery(v, user), 
         // get the next 2
         (contacts) => contacts.slice(idx + 1, idx + N), (conn, user, contacts) => {
-            const cursor = getCursorFrom(contacts, idx);
+            const cursor = getCursorFrom(conn.query, contacts, idx);
             conn.first(2, cursor);
         });
         beforeEach(async () => {
@@ -133,7 +158,7 @@ const commonTests = (opts) => {
     describe("filters. before  cursor", () => {
         const filter = new TestConnection((v, user) => opts.getQuery(v, user), (contacts) => contacts.slice(2, 4).reverse(), (conn, user, contacts) => {
             // get the 2 before it
-            const cursor = getCursorFrom(contacts, 4);
+            const cursor = getCursorFrom(conn.query, contacts, 4);
             conn.last(2, cursor);
         });
         beforeEach(async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.17",
+  "version": "0.1.19-test2",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/testutils/builder.d.ts

@@ -57,6 +57,7 @@ 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 const getDbFields: (schema: BuilderSchema<Ent>) => string[];
 export declare function getFieldInfo(value: BuilderSchema<Ent>): FieldInfoMap;
 type MaybeNull<T extends Ent> = T | null;
 type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;

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.getFieldInfo = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.EntBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = exports.BaseEnt = void 0;
+exports.SimpleAction = exports.SimpleBuilder = exports.getFieldInfo = exports.getDbFields = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.EntBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = exports.BaseEnt = void 0;
 const privacy_1 = require("../core/privacy");
 const orchestrator_1 = require("../action/orchestrator");
 const action_1 = require("../action");
@@ -128,6 +128,15 @@ function getTableName(value) {
     return (0, pluralize_1.default)((0, snake_case_1.snakeCase)(value.ent.name)).toLowerCase();
 }
 exports.getTableName = getTableName;
+const getDbFields = (schema) => {
+    const fields = (0, schema_1.getFields)(schema);
+    const dbFields = [];
+    for (const [fieldName, field] of fields) {
+        dbFields.push((0, schema_2.getStorageKey)(field, fieldName));
+    }
+    return dbFields;
+};
+exports.getDbFields = getDbFields;
 function randomNum() {
     return Math.random().toString(10).substring(2);
 }
@@ -166,6 +175,10 @@ class SimpleBuilder {
         this.fields = fields;
         const schemaFields = (0, schema_1.getFields)(schema);
         let key = "id";
+        const dbFields = [];
+        for (const [name, f] of schemaFields) {
+            dbFields.push((0, schema_2.getStorageKey)(f, name));
+        }
         if (!schemaFields.has("id") && !schemaFields.has("ID")) {
             if (schemaFields.size !== 1) {
                 throw new Error(`no id field and multiple fields so can't deduce key. add an id field to schema`);
@@ -187,12 +200,12 @@ class SimpleBuilder {
             loaderOptions: {
                 loaderFactory: new loaders_1.ObjectLoaderFactory({
                     tableName: tableName,
-                    fields: [],
+                    fields: dbFields,
                     key,
                 }),
                 ent: schema.ent,
                 tableName: tableName,
-                fields: [],
+                fields: dbFields,
                 fieldPrivacy: (0, schema_1.getFieldsWithPrivacy)(schema, fieldInfo),
             },
             builder: this,

package/testutils/fake_data/fake_contact.d.ts

@@ -13,17 +13,25 @@ export declare class FakeContact implements Ent {
     readonly lastName: string;
     readonly emailAddress: string;
     readonly userID: ID;
+    readonly deletedAt: Date | null;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     __setRawDBData(data: Data): void;
     static getFields(): string[];
+    static getFieldsWithDeletedAt(): string[];
     static getTestTable(): import("../db/temp_db").Table;
+    static getTestTableWithDeletedAt(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeContact>;
+    static loaderOptionsWithDeletedAt(): LoadEntOptions<FakeContact>;
     static load(v: Viewer, id: ID): Promise<FakeContact | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeContact>;
+    static loadWithDeletedAt(v: Viewer, id: ID): Promise<FakeContact | null>;
+    static loadXWithDeletedAt(v: Viewer, id: ID): Promise<FakeContact>;
     static loadRawData(id: ID, context?: Context): Promise<Data | null>;
+    static loadRawDataWithDeletedAt(id: ID, context?: Context): Promise<Data | null>;
 }
 export declare const FakeContactSchema: import("../builder").BuilderSchema<FakeContact>;
+export declare const FakeContactSchemaWithDeletedAt: import("../builder").BuilderSchema<FakeContact>;
 export interface ContactCreateInput {
     firstName: string;
     lastName: string;

package/testutils/fake_data/fake_contact.js

@@ -1,7 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contactLoader = exports.createContact = exports.getContactBuilder = exports.FakeContactSchema = exports.FakeContact = void 0;
+exports.contactLoader = exports.createContact = exports.getContactBuilder = exports.FakeContactSchemaWithDeletedAt = exports.FakeContactSchema = exports.FakeContact = void 0;
 const ent_1 = require("../../core/ent");
+const clause = __importStar(require("../../core/clause"));
 const privacy_1 = require("../../core/privacy");
 const builder_1 = require("../builder");
 const schema_1 = require("../../schema");
@@ -10,6 +34,7 @@ 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");
+const soft_delete_1 = require("../soft_delete");
 class FakeContact {
     getPrivacyPolicy() {
         return {
@@ -27,6 +52,7 @@ class FakeContact {
         this.lastName = data.last_name;
         this.emailAddress = data.email_address;
         this.userID = data.user_id;
+        this.deletedAt = data.deleted_at ? (0, convert_1.convertDate)(data.deleted_at) : null;
     }
     __setRawDBData(data) { }
     static getFields() {
@@ -40,9 +66,15 @@ class FakeContact {
             "user_id",
         ];
     }
+    static getFieldsWithDeletedAt() {
+        return [...FakeContact.getFields(), "deleted_at"];
+    }
     static getTestTable() {
         return (0, temp_db_1.table)("fake_contacts", (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.uuid)("user_id"));
     }
+    static getTestTableWithDeletedAt() {
+        return (0, temp_db_1.table)("fake_contacts", (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.uuid)("user_id"), (0, temp_db_1.timestamptz)("deleted_at", { nullable: true }));
+    }
     static loaderOptions() {
         return {
             tableName: "fake_contacts",
@@ -55,17 +87,42 @@ class FakeContact {
             }),
         };
     }
+    static loaderOptionsWithDeletedAt() {
+        return {
+            tableName: "fake_contacts",
+            fields: FakeContact.getFieldsWithDeletedAt(),
+            ent: this,
+            loaderFactory: new loaders_1.ObjectLoaderFactory({
+                tableName: "fake_contacts",
+                key: "id",
+                fields: FakeContact.getFieldsWithDeletedAt(),
+                clause: clause.Eq("deleted_at", null),
+                instanceKey: "fake_contacts:transformedReadClause",
+            }),
+        };
+    }
     static async load(v, id) {
         return (0, ent_1.loadEnt)(v, id, FakeContact.loaderOptions());
     }
     static async loadX(v, id) {
         return (0, ent_1.loadEntX)(v, id, FakeContact.loaderOptions());
     }
+    static async loadWithDeletedAt(v, id) {
+        return (0, ent_1.loadEnt)(v, id, FakeContact.loaderOptionsWithDeletedAt());
+    }
+    static async loadXWithDeletedAt(v, id) {
+        return (0, ent_1.loadEntX)(v, id, FakeContact.loaderOptionsWithDeletedAt());
+    }
     static async loadRawData(id, context) {
         return FakeContact.loaderOptions()
             .loaderFactory.createLoader(context)
             .load(id);
     }
+    static async loadRawDataWithDeletedAt(id, context) {
+        return FakeContact.loaderOptionsWithDeletedAt()
+            .loaderFactory.createLoader(context)
+            .load(id);
+    }
 }
 exports.FakeContact = FakeContact;
 exports.FakeContactSchema = (0, builder_1.getBuilderSchemaFromFields)({
@@ -76,6 +133,16 @@ exports.FakeContactSchema = (0, builder_1.getBuilderSchemaFromFields)({
         foreignKey: { schema: "User", column: "ID" },
     }),
 }, FakeContact);
+exports.FakeContactSchemaWithDeletedAt = (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, {
+    patterns: [new soft_delete_1.DeletedAtPattern()],
+});
 function getContactBuilder(viewer, input) {
     const m = new Map();
     for (const key in input) {

package/testutils/fake_data/fake_event.d.ts

@@ -14,14 +14,20 @@ export declare class FakeEvent implements Ent {
     readonly title: string;
     readonly description: string | null;
     readonly userID: ID;
+    readonly deletedAt: Date | null;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     __setRawDBData(data: Data): void;
     private static getFields;
+    private static getFieldsWithDeletedAt;
     static getTestTable(): import("../db/temp_db").Table;
+    static getTestTableWithDeletedAt(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeEvent>;
+    static loaderOptionsWithDeletedAt(): LoadEntOptions<FakeEvent>;
     static load(v: Viewer, id: ID): Promise<FakeEvent | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeEvent>;
+    static loadWithDeletedAt(v: Viewer, id: ID): Promise<FakeEvent | null>;
+    static loadWithDeletedAtX(v: Viewer, id: ID): Promise<FakeEvent>;
 }
 export declare const FakeEventSchema: import("../builder").BuilderSchema<FakeEvent>;
 export interface EventCreateInput {

package/testutils/fake_data/fake_event.js

@@ -1,7 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEvent = exports.getEventBuilder = exports.FakeEventSchema = exports.FakeEvent = void 0;
 const ent_1 = require("../../core/ent");
+const clause = __importStar(require("../../core/clause"));
 const privacy_1 = require("../../core/privacy");
 const builder_1 = require("../builder");
 const schema_1 = require("../../schema");
@@ -42,11 +66,19 @@ class FakeEvent {
             "user_id",
         ];
     }
+    static getFieldsWithDeletedAt() {
+        return [...FakeEvent.getFields(), "deleted_at"];
+    }
     static getTestTable() {
         return (0, temp_db_1.table)("fake_events", (0, temp_db_1.uuid)("id", { primaryKey: true }), (0, temp_db_1.timestamptz)("created_at"), (0, temp_db_1.timestamptz)("updated_at"), 
         // TODO index:true
         (0, temp_db_1.timestamptz)("start_time"), (0, temp_db_1.timestamptz)("end_time", { nullable: true }), (0, temp_db_1.text)("location"), (0, temp_db_1.text)("title"), (0, temp_db_1.text)("description", { nullable: true }), (0, temp_db_1.uuid)("user_id"));
     }
+    static getTestTableWithDeletedAt() {
+        return (0, temp_db_1.table)("fake_events", (0, temp_db_1.uuid)("id", { primaryKey: true }), (0, temp_db_1.timestamptz)("created_at"), (0, temp_db_1.timestamptz)("updated_at"), 
+        // TODO index:true
+        (0, temp_db_1.timestamptz)("start_time"), (0, temp_db_1.timestamptz)("end_time", { nullable: true }), (0, temp_db_1.text)("location"), (0, temp_db_1.text)("title"), (0, temp_db_1.text)("description", { nullable: true }), (0, temp_db_1.uuid)("user_id"), (0, temp_db_1.timestamptz)("deleted_at", { nullable: true }));
+    }
     static loaderOptions() {
         return {
             tableName: "fake_events",
@@ -59,12 +91,32 @@ class FakeEvent {
             }),
         };
     }
+    static loaderOptionsWithDeletedAt() {
+        return {
+            tableName: "fake_events",
+            fields: FakeEvent.getFields(),
+            ent: this,
+            loaderFactory: new loaders_1.ObjectLoaderFactory({
+                tableName: "fake_events",
+                key: "id",
+                fields: FakeEvent.getFieldsWithDeletedAt(),
+                clause: clause.Eq("deleted_at", null),
+                instanceKey: "fake_events:transformedReadClause",
+            }),
+        };
+    }
     static async load(v, id) {
         return (0, ent_1.loadEnt)(v, id, FakeEvent.loaderOptions());
     }
     static async loadX(v, id) {
         return (0, ent_1.loadEntX)(v, id, FakeEvent.loaderOptions());
     }
+    static async loadWithDeletedAt(v, id) {
+        return (0, ent_1.loadEnt)(v, id, FakeEvent.loaderOptionsWithDeletedAt());
+    }
+    static async loadWithDeletedAtX(v, id) {
+        return (0, ent_1.loadEntX)(v, id, FakeEvent.loaderOptionsWithDeletedAt());
+    }
 }
 exports.FakeEvent = FakeEvent;
 exports.FakeEventSchema = (0, builder_1.getBuilderSchemaFromFields)({

package/testutils/fake_data/fake_tag.d.ts

@@ -12,12 +12,16 @@ export declare class FakeTag implements Ent {
     readonly displayName: string;
     readonly canonicalName: string;
     readonly ownerID: string;
+    readonly deletedAt: Date | null;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     __setRawDBData(data: Data): void;
     static getFields(): string[];
+    static getFieldsWithDeletedAt(): string[];
     static getTestTable(): import("../db/temp_db").Table;
+    static getTestTableWithDeletedAt(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeTag>;
+    static loaderOptionsWithDeletedAt(): LoadEntOptions<FakeTag>;
     static load(v: Viewer, id: ID): Promise<FakeTag | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeTag>;
 }
@@ -34,3 +38,4 @@ export declare function getTagBuilder(viewer: Viewer, input: TagCreateInput): im
 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<Data>;
+export declare const tagLoaderWithDeletedAt: ObjectLoaderFactory<Data>;

package/testutils/fake_data/fake_tag.js

@@ -1,7 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tagLoader = exports.createTag = exports.getTagAction = exports.getTagBuilder = exports.FakeTagSchema = exports.FakeTag = void 0;
+exports.tagLoaderWithDeletedAt = exports.tagLoader = exports.createTag = exports.getTagAction = exports.getTagBuilder = exports.FakeTagSchema = exports.FakeTag = void 0;
 const ent_1 = require("../../core/ent");
+const clause = __importStar(require("../../core/clause"));
 const privacy_1 = require("../../core/privacy");
 const builder_1 = require("../builder");
 const schema_1 = require("../../schema");
@@ -26,6 +50,7 @@ class FakeTag {
         this.displayName = data.display_name;
         this.canonicalName = data.canonical_name;
         this.ownerID = data.owner_id;
+        this.deletedAt = data.deleted_at ? (0, convert_1.convertDate)(data.deleted_at) : null;
     }
     __setRawDBData(data) { }
     static getFields() {
@@ -38,10 +63,19 @@ class FakeTag {
             "owner_id",
         ];
     }
+    static getFieldsWithDeletedAt() {
+        return [...FakeTag.getFields(), "deleted_at"];
+    }
     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 getTestTableWithDeletedAt() {
+        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 }), (0, temp_db_1.timestamptz)("deleted_at", {
+            nullable: true,
+        }));
+    }
     static loaderOptions() {
         return {
             tableName: "fake_tags",
@@ -50,6 +84,14 @@ class FakeTag {
             loaderFactory: exports.tagLoader,
         };
     }
+    static loaderOptionsWithDeletedAt() {
+        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());
     }
@@ -87,3 +129,10 @@ exports.tagLoader = new loaders_1.ObjectLoaderFactory({
     fields: FakeTag.getFields(),
     key: "id",
 });
+exports.tagLoaderWithDeletedAt = new loaders_1.ObjectLoaderFactory({
+    tableName: "fake_tags",
+    fields: FakeTag.getFieldsWithDeletedAt(),
+    key: "id",
+    clause: clause.Eq("deleted_at", null),
+    instanceKey: "fake_tags:transformedReadClause",
+});

package/testutils/fake_data/fake_user.d.ts

@@ -23,14 +23,20 @@ export declare class FakeUser implements Ent {
     readonly emailAddress: string;
     readonly phoneNumber: string | null;
     protected readonly password: string | null;
+    readonly deletedAt: Date | null;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     __setRawDBData(data: Data): void;
     static getFields(): string[];
+    static getFieldsWithDeletedAt(): string[];
     static getTestTable(): import("../db/temp_db").Table;
+    static getTestTableWithDeletedAt(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeUser>;
+    static loaderOptionsWithDeletedAt(): LoadEntOptions<FakeUser>;
     static load(v: Viewer, id: ID): Promise<FakeUser | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeUser>;
+    static loadWithDeletedAt(v: Viewer, id: ID): Promise<FakeUser | null>;
+    static loadWithDeletedAtX(v: Viewer, id: ID): Promise<FakeUser>;
 }
 export declare const FakeUserSchema: import("../builder").BuilderSchema<FakeUser>;
 export interface UserCreateInput {
@@ -47,6 +53,7 @@ export declare function getUserBuilder(viewer: Viewer, input: UserCreateInput):
 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<Data>;
+export declare const userLoaderWithDeletedAt: ObjectLoaderFactory<Data>;
 export declare const userEmailLoader: ObjectLoaderFactory<Data>;
 export declare const userPhoneNumberLoader: ObjectLoaderFactory<Data>;
 export {};

package/testutils/fake_data/fake_user.js

@@ -1,8 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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;
+exports.userPhoneNumberLoader = exports.userEmailLoader = exports.userLoaderWithDeletedAt = 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 clause = __importStar(require("../../core/clause"));
 const privacy_1 = require("../../core/privacy");
 const builder_1 = require("../builder");
 const schema_1 = require("../../schema");
@@ -69,6 +93,7 @@ class FakeUser {
         this.emailAddress = data.email_address;
         this.phoneNumber = data.phone_number;
         this.password = data.password;
+        this.deletedAt = data.deleted_at ? (0, convert_1.convertDate)(data.deleted_at) : null;
     }
     __setRawDBData(data) { }
     static getFields() {
@@ -83,9 +108,27 @@ class FakeUser {
             "password",
         ];
     }
+    static getFieldsWithDeletedAt() {
+        return [
+            "id",
+            "created_at",
+            "updated_at",
+            "first_name",
+            "last_name",
+            "email_address",
+            "phone_number",
+            "password",
+            "deleted_at",
+        ];
+    }
     static getTestTable() {
         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 getTestTableWithDeletedAt() {
+        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"), (0, temp_db_1.timestamptz)("deleted_at", {
+            nullable: true,
+        }));
+    }
     static loaderOptions() {
         return {
             tableName: "fake_users",
@@ -94,12 +137,26 @@ class FakeUser {
             loaderFactory: exports.userLoader,
         };
     }
+    static loaderOptionsWithDeletedAt() {
+        return {
+            tableName: "fake_users",
+            fields: FakeUser.getFields(),
+            ent: this,
+            loaderFactory: exports.userLoaderWithDeletedAt,
+        };
+    }
     static async load(v, id) {
         return (0, ent_1.loadEnt)(v, id, FakeUser.loaderOptions());
     }
     static async loadX(v, id) {
         return (0, ent_1.loadEntX)(v, id, FakeUser.loaderOptions());
     }
+    static async loadWithDeletedAt(v, id) {
+        return (0, ent_1.loadEnt)(v, id, FakeUser.loaderOptionsWithDeletedAt());
+    }
+    static async loadWithDeletedAtX(v, id) {
+        return (0, ent_1.loadEntX)(v, id, FakeUser.loaderOptionsWithDeletedAt());
+    }
 }
 exports.FakeUser = FakeUser;
 exports.FakeUserSchema = (0, builder_1.getBuilderSchemaFromFields)({
@@ -141,6 +198,13 @@ exports.userLoader = new loaders_1.ObjectLoaderFactory({
     fields: FakeUser.getFields(),
     key: "id",
 });
+exports.userLoaderWithDeletedAt = new loaders_1.ObjectLoaderFactory({
+    tableName: "fake_users",
+    fields: FakeUser.getFieldsWithDeletedAt(),
+    key: "id",
+    clause: clause.Eq("deleted_at", null),
+    instanceKey: "fake_users:transformedReadClause",
+});
 exports.userEmailLoader = new loaders_1.ObjectLoaderFactory({
     tableName: "fake_users",
     fields: FakeUser.getFields(),

package/testutils/fake_data/test_helpers.js

@@ -234,10 +234,10 @@ async function setupTempDB(global = false) {
 exports.setupTempDB = setupTempDB;
 function tempDBTables(global = false) {
     const tables = [
-        _1.FakeUser.getTestTable(),
-        _1.FakeContact.getTestTable(),
-        fake_event_1.FakeEvent.getTestTable(),
-        fake_tag_1.FakeTag.getTestTable(),
+        _1.FakeUser.getTestTableWithDeletedAt(),
+        _1.FakeContact.getTestTableWithDeletedAt(),
+        fake_event_1.FakeEvent.getTestTableWithDeletedAt(),
+        fake_tag_1.FakeTag.getTestTableWithDeletedAt(),
         (0, temp_db_1.assoc_edge_config_table)(),
     ];
     edgeTableNames().forEach((tableName) => tables.push((0, temp_db_1.assoc_edge_table)(tableName, global)));

package/testutils/fake_data/user_query.d.ts

@@ -23,11 +23,21 @@ export declare class UserToContactsFkeyQuery extends CustomEdgeQueryBase<FakeUse
     static query(viewer: Viewer, src: FakeUser | ID): UserToContactsFkeyQuery;
     sourceEnt(id: ID): Promise<FakeUser | null>;
 }
+export declare class UserToContactsFkeyQueryDeletedAt 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 UserToContactsFkeyQueryDeletedAtAsc 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;

package/testutils/fake_data/user_query.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.UserToFollowingQuery = exports.UserToEventsInNextWeekQuery = exports.getCompleteClause = exports.getNextWeekClause = exports.UserToHostedEventsQuery = exports.UserToEventsAttendingQuery = exports.UserToIncomingFriendRequestsQuery = exports.UserToFriendRequestsQuery = exports.UserToCustomEdgeQuery = exports.CustomEdge = exports.UserToFriendsQuery = exports.UserToContactsFkeyQueryDeletedAtAsc = exports.UserToContactsFkeyQueryAsc = exports.UserToContactsFkeyQueryDeletedAt = 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"));
@@ -100,13 +100,32 @@ class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
     }
 }
 exports.UserToContactsFkeyQuery = UserToContactsFkeyQuery;
+class UserToContactsFkeyQueryDeletedAt extends custom_query_1.CustomEdgeQueryBase {
+    constructor(viewer, src) {
+        super(viewer, {
+            src,
+            loadEntOptions: internal_1.FakeContact.loaderOptionsWithDeletedAt(),
+            groupCol: "user_id",
+            name: "user_to_contacts_deleted_at",
+            // instead of the id col...
+            sortColumn: "created_at",
+        });
+    }
+    static query(viewer, src) {
+        return new UserToContactsFkeyQueryDeletedAt(viewer, src);
+    }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
+}
+exports.UserToContactsFkeyQueryDeletedAt = UserToContactsFkeyQueryDeletedAt;
 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",
+            name: "user_to_contacts_asc",
             orderby: [
                 {
                     column: "created_at",
@@ -123,6 +142,29 @@ class UserToContactsFkeyQueryAsc extends custom_query_1.CustomEdgeQueryBase {
     }
 }
 exports.UserToContactsFkeyQueryAsc = UserToContactsFkeyQueryAsc;
+class UserToContactsFkeyQueryDeletedAtAsc extends custom_query_1.CustomEdgeQueryBase {
+    constructor(viewer, src) {
+        super(viewer, {
+            src,
+            loadEntOptions: internal_1.FakeContact.loaderOptionsWithDeletedAt(),
+            groupCol: "user_id",
+            name: "user_to_contacts_deleted_at_asc",
+            orderby: [
+                {
+                    column: "created_at",
+                    direction: "ASC",
+                },
+            ],
+        });
+    }
+    static query(viewer, src) {
+        return new UserToContactsFkeyQueryDeletedAtAsc(viewer, src);
+    }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
+}
+exports.UserToContactsFkeyQueryDeletedAtAsc = UserToContactsFkeyQueryDeletedAtAsc;
 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());

package/testutils/soft_delete.d.ts

@@ -0,0 +1,26 @@
+import { Ent, Viewer } from "../core/base";
+import { Pattern, UpdateOperation, TransformedUpdateOperation } from "../schema";
+import * as clause from "../core/clause";
+import { FieldMap } from "../schema";
+interface CustomViewer extends Viewer {
+    marker: string;
+}
+export declare class DeletedAtPattern implements Pattern {
+    name: string;
+    fields: FieldMap;
+    transformRead(): clause.Clause;
+    transformWrite<T extends Ent>(stmt: UpdateOperation<T>): TransformedUpdateOperation<T> | null;
+}
+export declare class DeletedAtSnakeCasePattern implements Pattern {
+    name: string;
+    fields: FieldMap;
+    transformRead(): clause.Clause;
+    transformWrite<T extends Ent>(stmt: UpdateOperation<T>): TransformedUpdateOperation<T> | null;
+}
+export declare class DeletedAtPatternWithExtraWrites implements Pattern {
+    name: string;
+    fields: FieldMap;
+    transformRead(): clause.Clause;
+    transformWrite<T extends Ent<TViewer>, TViewer extends Viewer = CustomViewer>(stmt: UpdateOperation<T, TViewer>): TransformedUpdateOperation<T, TViewer> | null;
+}
+export {};

package/testutils/soft_delete.js

@@ -0,0 +1,142 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeletedAtPatternWithExtraWrites = exports.DeletedAtSnakeCasePattern = exports.DeletedAtPattern = void 0;
+const orchestrator_1 = require("../action/orchestrator");
+const field_1 = require("../schema/field");
+const schema_1 = require("../schema");
+const clause = __importStar(require("../core/clause"));
+const db_1 = __importStar(require("../core/db"));
+class DeletedAtPattern {
+    constructor() {
+        this.name = "deleted_at";
+        this.fields = {
+            // need this to be lowerCamelCase because we do this based on field name
+            // #510
+            deletedAt: (0, field_1.TimestampType)({
+                nullable: true,
+                index: true,
+                defaultValueOnCreate: () => null,
+            }),
+        };
+    }
+    transformRead() {
+        // this is based on sql. other is based on field
+        return clause.Eq("deleted_at", null);
+    }
+    transformWrite(stmt) {
+        switch (stmt.op) {
+            case schema_1.SQLStatementOperation.Delete:
+                return {
+                    op: schema_1.SQLStatementOperation.Update,
+                    data: {
+                        // this should return field, it'll be formatted as needed
+                        deletedAt: new Date(),
+                    },
+                };
+        }
+        return null;
+    }
+}
+exports.DeletedAtPattern = DeletedAtPattern;
+class DeletedAtSnakeCasePattern {
+    constructor() {
+        this.name = "deleted_at";
+        this.fields = {
+            deleted_at: (0, field_1.TimestampType)({
+                nullable: true,
+                index: true,
+                defaultValueOnCreate: () => null,
+            }),
+        };
+    }
+    transformRead() {
+        // this is based on sql. other is based on field
+        return clause.Eq("deleted_at", null);
+    }
+    transformWrite(stmt) {
+        switch (stmt.op) {
+            case schema_1.SQLStatementOperation.Delete:
+                return {
+                    op: schema_1.SQLStatementOperation.Update,
+                    data: {
+                        // this should return field, it'll be formatted as needed
+                        deleted_at: new Date(),
+                    },
+                };
+        }
+        return null;
+    }
+}
+exports.DeletedAtSnakeCasePattern = DeletedAtSnakeCasePattern;
+class DeletedAtPatternWithExtraWrites {
+    constructor() {
+        this.name = "deleted_at";
+        this.fields = {
+            // need this to be lowerCamelCase because we do this based on field name
+            // #510
+            deletedAt: (0, field_1.TimestampType)({
+                nullable: true,
+                index: true,
+                defaultValueOnCreate: () => null,
+            }),
+        };
+    }
+    transformRead() {
+        // this is based on sql. other is based on field
+        return clause.Eq("deleted_at", null);
+    }
+    transformWrite(stmt) {
+        switch (stmt.op) {
+            case schema_1.SQLStatementOperation.Delete:
+                return {
+                    op: schema_1.SQLStatementOperation.Update,
+                    data: {
+                        // this should return field, it'll be formatted as needed
+                        deletedAt: new Date(),
+                    },
+                    changeset: () => orchestrator_1.EntChangeset.changesetFromQueries(stmt.builder, [
+                        `DELETE FROM edge_table WHERE id1 = '${stmt.builder.existingEnt?.id}'`,
+                        `DELETE FROM inverse_edge_table WHERE id1 = '${stmt.builder.existingEnt?.id}'`,
+                        `DELETE FROM symmetric_edge_table WHERE id1 = '${stmt.builder.existingEnt?.id}'`,
+                        {
+                            query: `DELETE FROM edge_table WHERE id2 = ${db_1.default.getDialect() === db_1.Dialect.Postgres ? "$1" : "?"}`,
+                            values: [stmt.builder.existingEnt?.id],
+                        },
+                        {
+                            query: `DELETE FROM inverse_edge_table WHERE id2 = ${db_1.default.getDialect() === db_1.Dialect.Postgres ? "$1" : "?"}`,
+                            values: [stmt.builder.existingEnt?.id],
+                        },
+                        {
+                            query: `DELETE FROM symmetric_edge_table WHERE id2 = ${db_1.default.getDialect() === db_1.Dialect.Postgres ? "$1" : "?"}`,
+                            values: [stmt.builder.existingEnt?.id],
+                        },
+                    ]),
+                };
+        }
+        return null;
+    }
+}
+exports.DeletedAtPatternWithExtraWrites = DeletedAtPatternWithExtraWrites;