@snowtop/ent 0.1.0-alpha15 → 0.1.0-alpha150

package/core/ent.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];
@@ -22,13 +26,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRowX = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.loadEdges = exports.defaultEdgeQueryOptions = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.EditNodeOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = void 0;
+exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.getDefaultLimit = exports.setDefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.___setLogQueryErrorWithError = exports.loadRow = exports.loadRowX = exports.logQuery = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomCount = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
-const action_1 = require("../action");
 const logger_1 = require("./logger");
 const dataloader_1 = __importDefault(require("dataloader"));
+const global_schema_1 = require("./global_schema");
 // TODO kill this and createDataLoader
 class cacheMap {
     constructor(options) {
@@ -38,7 +42,7 @@ class cacheMap {
     get(key) {
         const ret = this.m.get(key);
         if (ret) {
-            (0, logger_1.log)("query", {
+            (0, logger_1.log)("cache", {
                 "dataloader-cache-hit": key,
                 "tableName": this.options.tableName,
             });
@@ -55,12 +59,41 @@ class cacheMap {
         return this.m.clear();
     }
 }
+class entCacheMap {
+    constructor(viewer, options) {
+        this.viewer = viewer;
+        this.options = options;
+        this.m = new Map();
+        this.logEnabled = false;
+        this.logEnabled = (0, logger_1.logEnabled)("cache");
+    }
+    get(id) {
+        const ret = this.m.get(id);
+        if (this.logEnabled && ret) {
+            const key = getEntKey(this.viewer, id, this.options);
+            (0, logger_1.log)("cache", {
+                "ent-cache-hit": key,
+            });
+        }
+        return ret;
+    }
+    set(key, value) {
+        return this.m.set(key, value);
+    }
+    delete(key) {
+        return this.m.delete(key);
+    }
+    clear() {
+        return this.m.clear();
+    }
+}
 function createDataLoader(options) {
     const loaderOptions = {};
     // if query logging is enabled, we should log what's happening with loader
     if ((0, logger_1.logEnabled)("query")) {
         loaderOptions.cacheMap = new cacheMap(options);
     }
+    // something here brokwn with strict:true
     return new dataloader_1.default(async (ids) => {
         if (!ids.length) {
             return [];
@@ -84,28 +117,151 @@ function createDataLoader(options) {
         return result;
     }, loaderOptions);
 }
-// Ent accessors
+// used to wrap errors that would eventually be thrown in ents
+// not an Error because DataLoader automatically rejects that
+class ErrorWrapper {
+    constructor(error) {
+        this.error = error;
+    }
+}
+function createEntLoader(viewer, options, map) {
+    // share the cache across loaders even if we create a new instance
+    const loaderOptions = {};
+    loaderOptions.cacheMap = map;
+    return new dataloader_1.default(async (ids) => {
+        if (!ids.length) {
+            return [];
+        }
+        let result = [];
+        const tableName = options.loaderFactory.options?.tableName;
+        const loader = options.loaderFactory.createLoader(viewer.context);
+        const rows = await loader.loadMany(ids);
+        // this is a loader which should return the same order based on passed-in ids
+        // so let's depend on that...
+        for (let idx = 0; idx < rows.length; idx++) {
+            const row = rows[idx];
+            // db error
+            if (row instanceof Error) {
+                result[idx] = row;
+                continue;
+            }
+            else if (!row) {
+                if (tableName) {
+                    result[idx] = new ErrorWrapper(new Error(`couldn't find row for value ${ids[idx]} in table ${tableName}`));
+                }
+                else {
+                    result[idx] = new ErrorWrapper(new Error(`couldn't find row for value ${ids[idx]}`));
+                }
+            }
+            else {
+                const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
+                if (r instanceof Error) {
+                    result[idx] = new ErrorWrapper(r);
+                }
+                else {
+                    result[idx] = r;
+                }
+            }
+        }
+        return result;
+    }, loaderOptions);
+}
+class EntLoader {
+    constructor(viewer, options) {
+        this.viewer = viewer;
+        this.options = options;
+        this.map = new entCacheMap(viewer, options);
+        this.loader = createEntLoader(this.viewer, this.options, this.map);
+    }
+    getMap() {
+        return this.map;
+    }
+    async load(id) {
+        return this.loader.load(id);
+    }
+    async loadMany(ids) {
+        return this.loader.loadMany(ids);
+    }
+    prime(id, ent) {
+        this.loader.prime(id, ent);
+    }
+    clear(id) {
+        this.loader.clear(id);
+    }
+    clearAll() {
+        this.loader.clearAll();
+    }
+}
+function getEntLoader(viewer, options) {
+    if (!viewer.context?.cache) {
+        return new EntLoader(viewer, options);
+    }
+    const name = `ent-loader:${viewer.instanceKey()}:${options.loaderFactory.name}`;
+    return viewer.context.cache.getLoaderWithLoadMany(name, () => new EntLoader(viewer, options));
+}
+function getEntKey(viewer, id, options) {
+    return `${viewer.instanceKey()}:${options.loaderFactory.name}:${id}`;
+}
+exports.getEntKey = getEntKey;
 async function loadEnt(viewer, id, options) {
-    const row = await options.loaderFactory.createLoader(viewer.context).load(id);
-    return await applyPrivacyPolicyForRow(viewer, options, row);
+    if (typeof id !== "string" &&
+        typeof id !== "number" &&
+        typeof id !== "bigint") {
+        throw new Error(`invalid id ${id} passed to loadEnt`);
+    }
+    const r = await getEntLoader(viewer, options).load(id);
+    return r instanceof ErrorWrapper ? null : r;
 }
 exports.loadEnt = loadEnt;
+async function applyPrivacyPolicyForRowAndStoreInEntLoader(viewer, row, options, 
+// can pass in loader when calling this for multi-id cases...
+loader) {
+    if (!loader) {
+        loader = getEntLoader(viewer, options);
+    }
+    // TODO every row.id needs to be audited...
+    // https://github.com/lolopinto/ent/issues/1064
+    const id = row.id;
+    // we should check the ent loader cache to see if this is already there
+    // TODO hmm... we eventually need a custom data-loader for this too so that it's all done correctly if there's a complicated fetch deep down in graphql
+    const result = loader.getMap().get(id);
+    if (result !== undefined) {
+        return result;
+    }
+    const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
+    if (r instanceof Error) {
+        loader.prime(id, new ErrorWrapper(r));
+        return new ErrorWrapper(r);
+    }
+    else {
+        loader.prime(id, r);
+        return r;
+    }
+}
 // this is the same implementation-wise (right now) as loadEnt. it's just clearer that it's not loaded via ID.
 // used for load via email address etc
 async function loadEntViaKey(viewer, key, options) {
     const row = await options.loaderFactory
         .createLoader(viewer.context)
         .load(key);
-    return await applyPrivacyPolicyForRow(viewer, options, row);
+    if (!row) {
+        return null;
+    }
+    const r = await applyPrivacyPolicyForRowAndStoreInEntLoader(viewer, row, options);
+    return r instanceof ErrorWrapper ? null : r;
 }
 exports.loadEntViaKey = loadEntViaKey;
 async function loadEntX(viewer, id, options) {
-    const row = await options.loaderFactory.createLoader(viewer.context).load(id);
-    if (!row) {
-        // todo make this better
-        throw new Error(`${options.loaderFactory.name}: couldn't find row for value ${id}`);
+    if (typeof id !== "string" &&
+        typeof id !== "number" &&
+        typeof id !== "bigint") {
+        throw new Error(`invalid id ${id} passed to loadEntX`);
     }
-    return await applyPrivacyPolicyForRowX(viewer, options, row);
+    const r = await getEntLoader(viewer, options).load(id);
+    if (r instanceof ErrorWrapper) {
+        throw r.error;
+    }
+    return r;
 }
 exports.loadEntX = loadEntX;
 async function loadEntXViaKey(viewer, key, options) {
@@ -116,9 +272,16 @@ async function loadEntXViaKey(viewer, key, options) {
         // todo make this better
         throw new Error(`${options.loaderFactory.name}: couldn't find row for value ${key}`);
     }
-    return await applyPrivacyPolicyForRowX(viewer, options, row);
+    const r = await applyPrivacyPolicyForRowAndStoreInEntLoader(viewer, row, options);
+    if (r instanceof ErrorWrapper) {
+        throw r.error;
+    }
+    return r;
 }
 exports.loadEntXViaKey = loadEntXViaKey;
+/**
+ * @deprecated use loadCustomEnts
+ */
 async function loadEntFromClause(viewer, options, clause) {
     const rowOptions = {
         ...options,
@@ -126,12 +289,18 @@ async function loadEntFromClause(viewer, options, clause) {
         context: viewer.context,
     };
     const row = await loadRow(rowOptions);
-    return await applyPrivacyPolicyForRow(viewer, options, row);
+    if (row === null) {
+        return null;
+    }
+    return applyPrivacyPolicyForRow(viewer, options, row);
 }
 exports.loadEntFromClause = loadEntFromClause;
 // same as loadEntFromClause
 // only works for ents where primary key is "id"
 // use loadEnt with a loaderFactory if different
+/**
+ * @deprecated use loadCustomEnts
+ */
 async function loadEntXFromClause(viewer, options, clause) {
     const rowOptions = {
         ...options,
@@ -146,37 +315,19 @@ async function loadEnts(viewer, options, ...ids) {
     if (!ids.length) {
         return new Map();
     }
-    let loaded = false;
-    let rows = [];
-    // TODO loadMany everywhere
-    const l = options.loaderFactory.createLoader(viewer.context);
-    if (l.loadMany) {
-        loaded = true;
-        rows = await l.loadMany(ids);
-    }
-    // TODO rewrite all of this
+    // result
     let m = new Map();
-    if (loaded) {
-        let rows2 = [];
-        for (const row of rows) {
-            if (!row) {
-                continue;
-            }
-            if (row instanceof Error) {
-                throw row;
-            }
-            rows2.push(row);
+    const ret = await getEntLoader(viewer, options).loadMany(ids);
+    for (const r of ret) {
+        if (r instanceof Error) {
+            throw r;
         }
-        m = await applyPrivacyPolicyForRows(viewer, rows2, options);
-    }
-    else {
-        m = await loadEntsFromClause(viewer, 
-        // this is always "id" if not using an ObjectLoaderFactory
-        clause.In("id", ...ids), options);
+        if (r instanceof ErrorWrapper) {
+            continue;
+        }
+        m.set(r.id, r);
     }
     return m;
-    // TODO do we want to change this to be a map not a list so that it's easy to check for existence?
-    // TODO eventually this should be doing a cache then db queyr and maybe depend on dataloader to get all the results at once
 }
 exports.loadEnts = loadEnts;
 // calls loadEnts and returns the results sorted in the order they were passed in
@@ -195,6 +346,9 @@ async function loadEntsList(viewer, options, ...ids) {
 exports.loadEntsList = loadEntsList;
 // we return a map here so that any sorting for queries that exist
 // can be done in O(N) time
+/**
+ * @deperecated use loadCustomEnts
+ */
 async function loadEntsFromClause(viewer, clause, options) {
     const rowOptions = {
         ...options,
@@ -202,65 +356,129 @@ async function loadEntsFromClause(viewer, clause, options) {
         context: viewer.context,
     };
     const rows = await loadRows(rowOptions);
-    return await applyPrivacyPolicyForRows(viewer, rows, options);
+    return applyPrivacyPolicyForRowsDeprecated(viewer, rows, options);
 }
 exports.loadEntsFromClause = loadEntsFromClause;
 async function loadCustomEnts(viewer, options, query) {
     const rows = await loadCustomData(options, query, viewer.context);
-    const result = new Array(rows.length);
-    await Promise.all(rows.map(async (row, idx) => {
-        const ent = new options.ent(viewer, row);
-        let privacyEnt = await applyPrivacyPolicyForEnt(viewer, ent, row, options);
-        if (privacyEnt) {
-            result[idx] = privacyEnt;
-        }
-    }));
-    // filter ents that aren't visible because of privacy
-    return result.filter((r) => r !== undefined);
+    return applyPrivacyPolicyForRows(viewer, rows, options);
 }
 exports.loadCustomEnts = loadCustomEnts;
 function isClause(opts) {
     const cls = opts;
     return cls.clause !== undefined && cls.values !== undefined;
 }
-function isRawQuery(opts) {
+function isParameterizedQuery(opts) {
     return opts.query !== undefined;
 }
+/**
+ * Note that if there's default read transformations (e.g. soft delete) and a clause is passed in
+ * either as Clause or QueryDataOptions without {disableTransformations: true}, the default transformation
+ * (e.g. soft delete) is applied.
+ *
+ * Passing a full SQL string or Paramterized SQL string doesn't apply it and the given string is sent to the
+ * database as written.
+ *
+ * e.g.
+ * Foo.loadCustom(opts, 'SELECT * FROM foo') // doesn't change the query
+ * Foo.loadCustom(opts, { query: 'SELECT * FROM foo WHERE id = ?', values: [1]}) // doesn't change the query
+ * Foo.loadCustom(opts, query.Eq('time', Date.now())) // changes the query
+ * Foo.loadCustom(opts, {
+ *   clause:  query.LessEq('time', Date.now()),
+ *   limit: 100,
+ *   orderby: 'time',
+ *  }) // changes the query
+ * Foo.loadCustom(opts, {
+ *   clause:  query.LessEq('time', Date.now()),
+ *   limit: 100,
+ *   orderby: 'time',
+ *   disableTransformations: false
+ *  }) // doesn't change the query
+ *
+ * For queries that pass in a clause, we batch them with an underlying dataloader so that multiple queries with the same clause
+ * or parallel queries with the same clause are batched together.
+ *
+ * If a raw or parameterized query is passed in, we don't attempt to batch them together and they're executed as is.
+ * If you end up with a scenario where you may need to coalesce or batch (non-clause) queries here, you should use some kind of memoization here.
+ */
 async function loadCustomData(options, query, context) {
+    const rows = await loadCustomDataImpl(options, query, context);
+    // prime the data so that subsequent fetches of the row with this id are a cache hit.
+    if (options.prime) {
+        const loader = options.loaderFactory.createLoader(context);
+        if (isPrimableLoader(loader) && loader.primeAll !== undefined) {
+            for (const row of rows) {
+                loader.primeAll(row);
+            }
+        }
+    }
+    return rows;
+}
+exports.loadCustomData = loadCustomData;
+// NOTE: if you use a raw query or paramterized query with this,
+// you should use `SELECT count(*) as count...`
+async function loadCustomCount(options, query, context) {
+    // if clause, we'll use the loader and strong typing/coalescing it provides
+    if (typeof query !== "string" && isClause(query)) {
+        return options.loaderFactory.createCountLoader(context).load(query);
+    }
+    const rows = await loadCustomDataImpl({
+        ...options,
+        fields: ["count(1) as count"],
+    }, query, context);
+    if (rows.length) {
+        return parseInt(rows[0].count);
+    }
+    return 0;
+}
+exports.loadCustomCount = loadCustomCount;
+function isPrimableLoader(loader) {
+    return loader != undefined;
+}
+async function loadCustomDataImpl(options, query, context) {
     if (typeof query === "string") {
         // no caching, perform raw query
-        return await performRawQuery(query, [], []);
+        return performRawQuery(query, [], []);
     }
     else if (isClause(query)) {
-        // this will have rudimentary caching but nothing crazy
-        return await loadRows({
-            ...options,
-            clause: query,
-            context: context,
-        });
+        const r = await options.loaderFactory
+            .createTypedLoader(context)
+            .load(query);
+        return r;
     }
-    else if (isRawQuery(query)) {
+    else if (isParameterizedQuery(query)) {
         // no caching, perform raw query
-        return await performRawQuery(query.query, query.values || [], query.logValues);
+        return performRawQuery(query.query, query.values || [], query.logValues);
     }
     else {
         // this will have rudimentary caching but nothing crazy
-        return await loadRows({
+        let cls = query.clause;
+        if (!query.disableTransformations) {
+            cls = clause.getCombinedClause(options.loaderFactory.options, query.clause);
+        }
+        return loadRows({
             ...query,
             ...options,
             context: context,
+            // @ts-expect-error
+            clause: cls,
         });
     }
 }
-exports.loadCustomData = loadCustomData;
 // Derived ents
+// no ent caching
 async function loadDerivedEnt(viewer, data, loader) {
     const ent = new loader(viewer, data);
-    return await applyPrivacyPolicyForEnt(viewer, ent, data, {
+    const r = await applyPrivacyPolicyForEnt(viewer, ent, data, {
         ent: loader,
     });
+    if (r instanceof Error) {
+        return null;
+    }
+    return r;
 }
 exports.loadDerivedEnt = loadDerivedEnt;
+// won't have caching yet either
 async function loadDerivedEntX(viewer, data, loader) {
     const ent = new loader(viewer, data);
     return await applyPrivacyPolicyForEntX(viewer, ent, data, { ent: loader });
@@ -269,19 +487,21 @@ exports.loadDerivedEntX = loadDerivedEntX;
 // everything calls into this two so should be fine
 // TODO is there a smarter way to not instantiate two objects here?
 async function applyPrivacyPolicyForEnt(viewer, ent, data, fieldPrivacyOptions) {
-    if (ent) {
-        const visible = await (0, privacy_1.applyPrivacyPolicy)(viewer, ent.getPrivacyPolicy(), ent);
-        if (!visible) {
-            return null;
-        }
+    const error = await (0, privacy_1.applyPrivacyPolicyImpl)(viewer, ent.getPrivacyPolicy(), ent);
+    if (error === null) {
         return doFieldPrivacy(viewer, ent, data, fieldPrivacyOptions);
     }
-    return null;
+    return error;
 }
 async function applyPrivacyPolicyForEntX(viewer, ent, data, options) {
-    // this will throw
-    await (0, privacy_1.applyPrivacyPolicyX)(viewer, ent.getPrivacyPolicy(), ent);
-    return doFieldPrivacy(viewer, ent, data, options);
+    const r = await applyPrivacyPolicyForEnt(viewer, ent, data, options);
+    if (r instanceof Error) {
+        throw r;
+    }
+    if (r === null) {
+        throw new Error(`couldn't apply privacyPoliy for ent ${ent.id}`);
+    }
+    return r;
 }
 async function doFieldPrivacy(viewer, ent, data, options) {
     if (!options.fieldPrivacy) {
@@ -289,16 +509,20 @@ async function doFieldPrivacy(viewer, ent, data, options) {
     }
     const promises = [];
     let somethingChanged = false;
+    const clone = { ...data };
+    const origData = {
+        ...data,
+    };
     for (const [k, policy] of options.fieldPrivacy) {
+        const curr = clone[k];
+        if (curr === null || curr === undefined) {
+            continue;
+        }
         promises.push((async () => {
             // don't do anything if key is null or for some reason missing
-            const curr = data[k];
-            if (curr === null || curr === undefined) {
-                return;
-            }
             const r = await (0, privacy_1.applyPrivacyPolicy)(viewer, policy, ent);
             if (!r) {
-                data[k] = null;
+                clone[k] = null;
                 somethingChanged = true;
             }
         })());
@@ -306,8 +530,11 @@ async function doFieldPrivacy(viewer, ent, data, options) {
     await Promise.all(promises);
     if (somethingChanged) {
         // have to create new instance
-        return new options.ent(viewer, data);
+        const ent = new options.ent(viewer, clone);
+        ent.__setRawDBData(origData);
+        return ent;
     }
+    ent.__setRawDBData(origData);
     return ent;
 }
 function logQuery(query, logValues) {
@@ -317,6 +544,7 @@ function logQuery(query, logValues) {
     });
     (0, logger_1.logTrace)();
 }
+exports.logQuery = logQuery;
 // TODO long term figure out if this API should be exposed
 async function loadRowX(options) {
     const result = await loadRow(options);
@@ -339,29 +567,26 @@ async function loadRow(options) {
     }
     const query = buildQuery(options);
     logQuery(query, options.clause.logValues());
-    try {
-        const pool = db_1.default.getInstance().getPool();
-        const res = await pool.query(query, options.clause.values());
-        if (res.rowCount != 1) {
-            if (res.rowCount > 1) {
-                (0, logger_1.log)("error", "got more than one row for query " + query);
-            }
-            return null;
-        }
-        // put the row in the cache...
-        if (cache) {
-            cache.primeCache(options, res.rows[0]);
+    const pool = db_1.default.getInstance().getPool();
+    const res = await pool.query(query, options.clause.values());
+    if (res.rowCount != 1) {
+        if (res.rowCount > 1) {
+            (0, logger_1.log)("error", "got more than one row for query " + query);
         }
-        return res.rows[0];
-    }
-    catch (e) {
-        // an example of an error being suppressed
-        // another one. TODO https://github.com/lolopinto/ent/issues/862
-        (0, logger_1.log)("error", e);
         return null;
     }
+    // put the row in the cache...
+    if (cache) {
+        cache.primeCache(options, res.rows[0]);
+    }
+    return res.rows[0];
 }
 exports.loadRow = loadRow;
+var _logQueryWithError = false;
+function ___setLogQueryErrorWithError(val) {
+    _logQueryWithError = val || false;
+}
+exports.___setLogQueryErrorWithError = ___setLogQueryErrorWithError;
 // this always goes to the db, no cache, nothing
 async function performRawQuery(query, values, logValues) {
     const pool = db_1.default.getInstance().getPool();
@@ -371,9 +596,11 @@ async function performRawQuery(query, values, logValues) {
         return res.rows;
     }
     catch (e) {
-        // TODO need to change every query to catch an error!
-        (0, logger_1.log)("error", e);
-        return [];
+        if (_logQueryWithError) {
+            const msg = e.message;
+            throw new Error(`error \`${msg}\` running query: \`${query}\` with values: \`${logValues}\``);
+        }
+        throw e;
     }
 }
 exports.performRawQuery = performRawQuery;
@@ -400,17 +627,18 @@ function buildQuery(options) {
     const fields = options.fields.join(", ");
     // always start at 1
     const whereClause = options.clause.clause(1);
-    let query = `SELECT ${fields} FROM ${options.tableName} WHERE ${whereClause}`;
+    const parts = [];
+    parts.push(`SELECT ${fields} FROM ${options.tableName} WHERE ${whereClause}`);
     if (options.groupby) {
-        query = `${query} GROUP BY ${options.groupby}`;
+        parts.push(`GROUP BY ${options.groupby}`);
     }
     if (options.orderby) {
-        query = `${query} ORDER BY ${options.orderby}`;
+        parts.push(`ORDER BY ${options.orderby}`);
     }
     if (options.limit) {
-        query = `${query} LIMIT ${options.limit}`;
+        parts.push(`LIMIT ${options.limit}`);
     }
-    return query;
+    return parts.join(" ");
 }
 exports.buildQuery = buildQuery;
 // this is used for queries when we select multiple ids at once
@@ -432,400 +660,32 @@ function buildGroupQuery(options) {
     ];
 }
 exports.buildGroupQuery = buildGroupQuery;
-class EditNodeOperation {
-    constructor(options, existingEnt = null) {
-        this.options = options;
-        this.existingEnt = existingEnt;
-        this.placeholderID = options.placeholderID;
-    }
-    resolve(executor) {
-        if (!this.options.fieldsToResolve.length) {
-            return;
-        }
-        let fields = this.options.fields;
-        this.options.fieldsToResolve.forEach((fieldName) => {
-            let value = fields[fieldName];
-            if (!value) {
-                throw new Error(`trying to resolve field ${fieldName} but not a valid field`);
-            }
-            let ent = executor.resolveValue(value.placeholderID);
-            if (!ent) {
-                throw new Error(`couldn't resolve field \`${fieldName}\` with value ${value.placeholderID}`);
-            }
-            fields[fieldName] = ent.id;
-        });
-        this.options.fields = fields;
-    }
-    hasData(data) {
-        for (const _k in data) {
-            return true;
-        }
-        return false;
-    }
-    async performWrite(queryer, context) {
-        let options = {
-            ...this.options,
-            context,
-        };
-        if (this.existingEnt) {
-            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 editRow(queryer, options, this.existingEnt.id, "RETURNING *");
-            }
-            else {
-                this.row = this.existingEnt["data"];
-            }
-        }
-        else {
-            this.row = await createRow(queryer, options, "RETURNING *");
-        }
-    }
-    reloadRow(queryer, id, options) {
-        // TODO this isn't always an ObjectLoader. should throw or figure out a way to get query
-        // and run this on its own...
-        const loader = this.options.loadEntOptions.loaderFactory.createLoader(options.context);
-        const opts = loader.getOptions();
-        let cls = clause.Eq(options.key, id);
-        if (opts.clause) {
-            let optionClause;
-            if (typeof opts.clause === "function") {
-                optionClause = opts.clause();
-            }
-            else {
-                optionClause = opts.clause;
-            }
-            if (optionClause) {
-                cls = clause.And(optionClause, cls);
-            }
-        }
-        const query = buildQuery({
-            fields: opts.fields.length ? opts.fields : ["*"],
-            tableName: options.tableName,
-            clause: cls,
-        });
-        // special case log here because we're not going through any of the normal
-        // methods here because those are async and this is sync
-        // this is the only place we're doing this so only handling here
-        logQuery(query, [id]);
-        const r = queryer.querySync(query, [id]);
-        if (r.rows.length === 1) {
-            this.row = r.rows[0];
-        }
-    }
-    performWriteSync(queryer, context) {
-        let options = {
-            ...this.options,
-            context,
-        };
-        if (this.existingEnt) {
-            if (this.hasData(this.options.fields)) {
-                editRowSync(queryer, options, this.existingEnt.id, "RETURNING *");
-                this.reloadRow(queryer, this.existingEnt.id, options);
-            }
-            else {
-                this.row = this.existingEnt["data"];
-            }
-        }
-        else {
-            createRowSync(queryer, options, "RETURNING *");
-            const id = options.fields[options.key];
-            this.reloadRow(queryer, id, options);
-        }
-    }
-    returnedRow() {
-        return this.row;
-    }
-    createdEnt(viewer) {
-        if (!this.row) {
-            return null;
-        }
-        return new this.options.loadEntOptions.ent(viewer, this.row);
-    }
-}
-exports.EditNodeOperation = EditNodeOperation;
-class EdgeOperation {
-    constructor(edgeInput, options) {
-        this.edgeInput = edgeInput;
-        this.options = options;
-    }
-    async preFetch(queryer, context) {
-        let edgeData = await loadEdgeData(this.edgeInput.edgeType);
-        if (!edgeData) {
-            throw new Error(`error loading edge data for ${this.edgeInput.edgeType}`);
-        }
-        this.edgeData = edgeData;
-    }
-    async performWrite(queryer, context) {
-        if (!this.edgeData) {
-            throw new Error(`error fetching edgeData for type ${this.edgeInput.edgeType}`);
-        }
-        switch (this.options.operation) {
-            case action_1.WriteOperation.Delete:
-                return this.performDeleteWrite(queryer, this.edgeData, this.edgeInput, context);
-            case action_1.WriteOperation.Insert:
-            case action_1.WriteOperation.Edit:
-                return this.performInsertWrite(queryer, this.edgeData, this.edgeInput, context);
-        }
-    }
-    performWriteSync(queryer, context) {
-        if (!this.edgeData) {
-            throw new Error(`error fetching edgeData for type ${this.edgeInput.edgeType}`);
-        }
-        switch (this.options.operation) {
-            case action_1.WriteOperation.Delete:
-                return this.performDeleteWriteSync(queryer, this.edgeData, this.edgeInput, context);
-            case action_1.WriteOperation.Insert:
-            case action_1.WriteOperation.Edit:
-                return this.performInsertWriteSync(queryer, this.edgeData, this.edgeInput, context);
-        }
-    }
-    getDeleteRowParams(edgeData, edge, context) {
-        return {
-            options: {
-                tableName: edgeData.edgeTable,
-                context,
-            },
-            clause: clause.And(clause.Eq("id1", edge.id1), clause.Eq("id2", edge.id2), clause.Eq("edge_type", edge.edgeType)),
-        };
-    }
-    async performDeleteWrite(q, edgeData, edge, context) {
-        const params = this.getDeleteRowParams(edgeData, edge, context);
-        return deleteRows(q, params.options, params.clause);
-    }
-    performDeleteWriteSync(q, edgeData, edge, context) {
-        const params = this.getDeleteRowParams(edgeData, edge, context);
-        return deleteRowsSync(q, params.options, params.clause);
-    }
-    getInsertRowParams(edgeData, edge, context) {
-        const fields = {
-            id1: edge.id1,
-            id2: edge.id2,
-            id1_type: edge.id1Type,
-            id2_type: edge.id2Type,
-            edge_type: edge.edgeType,
-            data: edge.data || null,
-        };
-        if (edge.time) {
-            fields["time"] = edge.time.toISOString();
-        }
-        else {
-            // todo make this a schema field like what we do in generated base files...
-            // maybe when actions exist?
-            fields["time"] = new Date().toISOString();
-        }
-        return [
-            {
-                tableName: edgeData.edgeTable,
-                fields: fields,
-                fieldsToLog: fields,
-                context,
-            },
-            "ON CONFLICT(id1, edge_type, id2) DO UPDATE SET data = EXCLUDED.data",
-        ];
-    }
-    async performInsertWrite(q, edgeData, edge, context) {
-        const [options, suffix] = this.getInsertRowParams(edgeData, edge, context);
-        await createRow(q, options, suffix);
-    }
-    performInsertWriteSync(q, edgeData, edge, context) {
-        const [options, suffix] = this.getInsertRowParams(edgeData, edge, context);
-        createRowSync(q, options, suffix);
-    }
-    resolveImpl(executor, placeholder, desc) {
-        let ent = executor.resolveValue(placeholder);
-        if (!ent) {
-            throw new Error(`could not resolve placeholder value ${placeholder} for ${desc} for edge ${this.edgeInput.edgeType}`);
-        }
-        if (ent.id === undefined) {
-            throw new Error(`id of resolved ent is not defined`);
-        }
-        return [ent.id, ent.nodeType];
-    }
-    resolve(executor) {
-        if (this.options.id1Placeholder) {
-            [this.edgeInput.id1, this.edgeInput.id1Type] = this.resolveImpl(executor, this.edgeInput.id1, "id1");
-        }
-        if (this.options.id2Placeholder) {
-            [this.edgeInput.id2, this.edgeInput.id2Type] = this.resolveImpl(executor, this.edgeInput.id2, "id2");
-        }
-        if (this.options.dataPlaceholder) {
-            if (!this.edgeInput.data) {
-                throw new Error(`data placeholder set but edgeInput data undefined`);
-            }
-            let [data, _] = this.resolveImpl(executor, this.edgeInput.data.toString(), "data");
-            this.edgeInput.data = data.toString();
-        }
-    }
-    symmetricEdge() {
-        return new EdgeOperation({
-            id1: this.edgeInput.id2,
-            id1Type: this.edgeInput.id2Type,
-            id2: this.edgeInput.id1,
-            id2Type: this.edgeInput.id1Type,
-            edgeType: this.edgeInput.edgeType,
-            time: this.edgeInput.time,
-            data: this.edgeInput.data,
-        }, {
-            operation: this.options.operation,
-            id1Placeholder: this.options.id2Placeholder,
-            id2Placeholder: this.options.id1Placeholder,
-            dataPlaceholder: this.options.dataPlaceholder,
-        });
-    }
-    inverseEdge(edgeData) {
-        return new EdgeOperation({
-            id1: this.edgeInput.id2,
-            id1Type: this.edgeInput.id2Type,
-            id2: this.edgeInput.id1,
-            id2Type: this.edgeInput.id1Type,
-            edgeType: edgeData.inverseEdgeType,
-            time: this.edgeInput.time,
-            data: this.edgeInput.data,
-        }, {
-            operation: this.options.operation,
-            id1Placeholder: this.options.id2Placeholder,
-            id2Placeholder: this.options.id1Placeholder,
-            dataPlaceholder: this.options.dataPlaceholder,
-        });
-    }
-    static resolveIDs(srcBuilder, // id1
-    destID) {
-        let destIDVal;
-        let destPlaceholder = false;
-        if (this.isBuilder(destID)) {
-            destIDVal = destID.placeholderID;
-            destPlaceholder = true;
-        }
-        else {
-            destIDVal = destID;
-        }
-        let srcIDVal;
-        let srcType;
-        let srcPlaceholder = false;
-        if (srcBuilder.existingEnt) {
-            srcIDVal = srcBuilder.existingEnt.id;
-            srcType = srcBuilder.existingEnt.nodeType;
-        }
-        else {
-            srcPlaceholder = true;
-            // get placeholder.
-            srcIDVal = srcBuilder.placeholderID;
-            // expected to be filled later
-            srcType = "";
-        }
-        return [srcIDVal, srcType, srcPlaceholder, destIDVal, destPlaceholder];
-    }
-    static isBuilder(val) {
-        return val.placeholderID !== undefined;
-    }
-    static resolveData(data) {
-        if (!data) {
-            return [undefined, false];
-        }
-        if (this.isBuilder(data)) {
-            return [data.placeholderID.toString(), true];
-        }
-        return [data, false];
-    }
-    static inboundEdge(builder, edgeType, id1, nodeType, options) {
-        let [id2Val, id2Type, id2Placeholder, id1Val, id1Placeholder] = EdgeOperation.resolveIDs(builder, id1);
-        let [data, dataPlaceholder] = EdgeOperation.resolveData(options?.data);
-        const edge = {
-            id1: id1Val,
-            edgeType: edgeType,
-            id2: id2Val,
-            id2Type: id2Type,
-            id1Type: nodeType,
-            ...options,
-        };
-        if (data) {
-            edge.data = data;
-        }
-        return new EdgeOperation(edge, {
-            operation: action_1.WriteOperation.Insert,
-            id2Placeholder,
-            id1Placeholder,
-            dataPlaceholder,
-        });
-    }
-    static outboundEdge(builder, edgeType, id2, nodeType, options) {
-        let [id1Val, id1Type, id1Placeholder, id2Val, id2Placeholder] = EdgeOperation.resolveIDs(builder, id2);
-        let [data, dataPlaceholder] = EdgeOperation.resolveData(options?.data);
-        const edge = {
-            id1: id1Val,
-            edgeType: edgeType,
-            id2: id2Val,
-            id2Type: nodeType,
-            id1Type: id1Type,
-            ...options,
-        };
-        if (data) {
-            edge.data = data;
-        }
-        return new EdgeOperation(edge, {
-            operation: action_1.WriteOperation.Insert,
-            id1Placeholder,
-            id2Placeholder,
-            dataPlaceholder,
-        });
-    }
-    static removeInboundEdge(builder, edgeType, id1) {
-        if (!builder.existingEnt) {
-            throw new Error("cannot remove an edge from a non-existing ent");
-        }
-        const edge = {
-            id1: id1,
-            edgeType: edgeType,
-            id2: builder.existingEnt.id,
-            id2Type: "",
-            id1Type: "",
-        };
-        return new EdgeOperation(edge, {
-            operation: action_1.WriteOperation.Delete,
-        });
-    }
-    static removeOutboundEdge(builder, edgeType, id2) {
-        if (!builder.existingEnt) {
-            throw new Error("cannot remove an edge from a non-existing ent");
-        }
-        const edge = {
-            id2: id2,
-            edgeType: edgeType,
-            id1: builder.existingEnt.id,
-            id2Type: "",
-            id1Type: "",
-        };
-        return new EdgeOperation(edge, {
-            operation: action_1.WriteOperation.Delete,
-        });
-    }
-}
-exports.EdgeOperation = EdgeOperation;
 function isSyncQueryer(queryer) {
     return queryer.execSync !== undefined;
 }
 async function mutateRow(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
     let cache = options.context?.cache;
+    let res;
     try {
-        let res;
         if (isSyncQueryer(queryer)) {
             res = queryer.execSync(query, values);
         }
         else {
             res = await queryer.exec(query, values);
         }
-        if (cache) {
-            cache.clearCache();
+    }
+    catch (e) {
+        if (_logQueryWithError) {
+            const msg = e.message;
+            throw new Error(`error \`${msg}\` running query: \`${query}\``);
         }
-        return res;
+        throw e;
     }
-    catch (err) {
-        // TODO:::why is this not rethrowing?
-        (0, logger_1.log)("error", err);
-        throw err;
+    if (cache) {
+        cache.clearCache();
     }
+    return res;
 }
 function mutateRowSync(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
@@ -837,10 +697,12 @@ function mutateRowSync(queryer, query, values, logValues, options) {
         }
         return res;
     }
-    catch (err) {
-        // TODO:::why is this not rethrowing?
-        (0, logger_1.log)("error", err);
-        throw err;
+    catch (e) {
+        if (_logQueryWithError) {
+            const msg = e.message;
+            throw new Error(`error \`${msg}\` running query: \`${query}\``);
+        }
+        throw e;
     }
 }
 function buildInsertQuery(options, suffix) {
@@ -867,8 +729,26 @@ function buildInsertQuery(options, suffix) {
     const cols = fields.join(", ");
     const vals = valsString.join(", ");
     let query = `INSERT INTO ${options.tableName} (${cols}) VALUES (${vals})`;
+    if (options.onConflict) {
+        let onConflict = "";
+        if (options.onConflict.onConflictConstraint) {
+            onConflict = `ON CONFLICT ON CONSTRAINT ${options.onConflict.onConflictConstraint}`;
+        }
+        else {
+            onConflict = `ON CONFLICT(${options.onConflict.onConflictCols.join(", ")})`;
+        }
+        if (options.onConflict.updateCols?.length) {
+            onConflict += ` DO UPDATE SET ${options.onConflict.updateCols
+                .map((f) => `${f} = EXCLUDED.${f}`)
+                .join(", ")}`;
+        }
+        else {
+            onConflict += ` DO NOTHING`;
+        }
+        query = query + " " + onConflict;
+    }
     if (suffix) {
-        query = query + " " + suffix;
+        query += " " + suffix;
     }
     return [query, values, logValues];
 }
@@ -893,32 +773,47 @@ function createRowSync(queryer, options, suffix) {
     return null;
 }
 exports.createRowSync = createRowSync;
-function buildUpdateQuery(options, id, suffix) {
+function buildUpdateQuery(options, suffix) {
     let valsString = [];
     let values = [];
     let logValues = [];
     const dialect = db_1.default.getDialect();
     let idx = 1;
     for (const key in options.fields) {
-        values.push(options.fields[key]);
-        if (options.fieldsToLog) {
-            logValues.push(options.fieldsToLog[key]);
-        }
-        if (dialect === db_1.Dialect.Postgres) {
-            valsString.push(`${key} = $${idx}`);
-            idx++;
+        if (options.expressions && options.expressions.has(key)) {
+            const cls = options.expressions.get(key);
+            valsString.push(`${key} = ${cls.clause(idx)}`);
+            // TODO need to test a clause with more than one value...
+            const newVals = cls.values();
+            idx += newVals.length;
+            values.push(...newVals);
+            logValues.push(...cls.logValues());
         }
         else {
-            valsString.push(`${key} = ?`);
+            const val = options.fields[key];
+            values.push(val);
+            if (options.fieldsToLog) {
+                logValues.push(options.fieldsToLog[key]);
+            }
+            // TODO would be nice to use clause here. need update version of the queries so that
+            // we don't have to handle dialect specifics here
+            // can't use clause because of IS NULL
+            // valsString.push(clause.Eq(key, val).clause(idx));
+            if (dialect === db_1.Dialect.Postgres) {
+                valsString.push(`${key} = $${idx}`);
+            }
+            else {
+                valsString.push(`${key} = ?`);
+            }
+            idx++;
         }
     }
     const vals = valsString.join(", ");
     let query = `UPDATE ${options.tableName} SET ${vals} WHERE `;
-    if (dialect === db_1.Dialect.Postgres) {
-        query = query + `${options.key} = $${idx}`;
-    }
-    else {
-        query = query + `${options.key} = ?`;
+    query = query + options.whereClause.clause(idx);
+    values.push(...options.whereClause.values());
+    if (options.fieldsToLog) {
+        logValues.push(...options.whereClause.logValues());
     }
     if (suffix) {
         query = query + " " + suffix;
@@ -926,10 +821,8 @@ function buildUpdateQuery(options, id, suffix) {
     return [query, values, logValues];
 }
 exports.buildUpdateQuery = buildUpdateQuery;
-async function editRow(queryer, options, id, suffix) {
-    const [query, values, logValues] = buildUpdateQuery(options, id, suffix);
-    // add id as value to prepared query
-    values.push(id);
+async function editRow(queryer, options, suffix) {
+    const [query, values, logValues] = buildUpdateQuery(options, suffix);
     const res = await mutateRow(queryer, query, values, logValues, options);
     if (res?.rowCount == 1) {
         // for now assume id primary key
@@ -940,10 +833,8 @@ async function editRow(queryer, options, id, suffix) {
     return null;
 }
 exports.editRow = editRow;
-function editRowSync(queryer, options, id, suffix) {
-    const [query, values, logValues] = buildUpdateQuery(options, id, suffix);
-    // add id as value to prepared query
-    values.push(id);
+function editRowSync(queryer, options, suffix) {
+    const [query, values, logValues] = buildUpdateQuery(options, suffix);
     const res = mutateRowSync(queryer, query, values, logValues, options);
     if (res?.rowCount == 1) {
         // for now assume id primary key
@@ -964,27 +855,6 @@ function deleteRowsSync(queryer, options, cls) {
     mutateRowSync(queryer, query, cls.values(), cls.logValues(), options);
 }
 exports.deleteRowsSync = deleteRowsSync;
-class DeleteNodeOperation {
-    constructor(id, options) {
-        this.id = id;
-        this.options = options;
-    }
-    async performWrite(queryer, context) {
-        let options = {
-            ...this.options,
-            context,
-        };
-        return deleteRows(queryer, options, clause.Eq("id", this.id));
-    }
-    performWriteSync(queryer, context) {
-        let options = {
-            ...this.options,
-            context,
-        };
-        return deleteRowsSync(queryer, options, clause.Eq("id", this.id));
-    }
-}
-exports.DeleteNodeOperation = DeleteNodeOperation;
 class AssocEdge {
     constructor(data) {
         this.id1 = data.id1;
@@ -994,21 +864,22 @@ class AssocEdge {
         this.edgeType = data.edge_type;
         this.time = data.time;
         this.data = data.data;
+        this.rawData = data;
+    }
+    __getRawData() {
+        // incase there's extra db fields. useful for tests
+        // in production, a subclass of this should be in use so we won't need this...
+        return this.rawData;
     }
     getCursor() {
         return getCursor({
             row: this,
-            col: "time",
-            conv: (t) => {
-                if (typeof t === "string") {
-                    return Date.parse(t);
-                }
-                return t.getTime();
-            },
+            col: "id2",
         });
     }
 }
 exports.AssocEdge = AssocEdge;
+// TODO eventually update this for sortCol time unique keys
 function getCursor(opts) {
     const { row, col, conv } = opts;
     //  row: Data, col: string, conv?: (any) => any) {
@@ -1086,54 +957,89 @@ const edgeFields = [
     "time",
     "data",
 ];
-exports.DefaultLimit = 1000;
-// TODO default limit from somewhere
-function defaultEdgeQueryOptions(id1, edgeType) {
+let defaultLimit = 1000;
+function setDefaultLimit(limit) {
+    defaultLimit = limit;
+}
+exports.setDefaultLimit = setDefaultLimit;
+function getDefaultLimit() {
+    return defaultLimit;
+}
+exports.getDefaultLimit = getDefaultLimit;
+function defaultEdgeQueryOptions(id1, edgeType, id2) {
+    let cls = clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType));
+    if (id2) {
+        cls = clause.And(cls, clause.Eq("id2", id2));
+    }
     return {
-        clause: clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType)),
+        clause: cls,
         orderby: "time DESC",
-        limit: exports.DefaultLimit,
+        limit: defaultLimit,
     };
 }
-exports.defaultEdgeQueryOptions = defaultEdgeQueryOptions;
 async function loadEdges(options) {
     return loadCustomEdges({ ...options, ctr: AssocEdge });
 }
 exports.loadEdges = loadEdges;
+function getEdgeClauseAndFields(cls, options) {
+    let fields = edgeFields;
+    const transformEdgeRead = (0, global_schema_1.__getGlobalSchema)()?.transformEdgeRead;
+    if (transformEdgeRead) {
+        const transformClause = transformEdgeRead();
+        if (!options.disableTransformations) {
+            cls = clause.And(cls, transformClause);
+        }
+        fields = edgeFields.concat(transformClause.columns());
+    }
+    return {
+        cls,
+        fields,
+    };
+}
+exports.getEdgeClauseAndFields = getEdgeClauseAndFields;
 async function loadCustomEdges(options) {
-    const { id1, edgeType, context } = options;
+    const { cls: actualClause, fields, defaultOptions, tableName, } = await loadEgesInfo(options);
+    const rows = await loadRows({
+        tableName,
+        fields: fields,
+        clause: actualClause,
+        orderby: options.queryOptions?.orderby || defaultOptions.orderby,
+        limit: options.queryOptions?.limit || defaultOptions.limit,
+        context: options.context,
+    });
+    return rows.map((row) => {
+        return new options.ctr(row);
+    });
+}
+exports.loadCustomEdges = loadCustomEdges;
+async function loadEgesInfo(options, id2) {
+    const { id1, edgeType } = options;
     const edgeData = await loadEdgeData(edgeType);
     if (!edgeData) {
         throw new Error(`error loading edge data for ${edgeType}`);
     }
-    const defaultOptions = defaultEdgeQueryOptions(id1, edgeType);
+    const defaultOptions = defaultEdgeQueryOptions(id1, edgeType, id2);
     let cls = defaultOptions.clause;
     if (options.queryOptions?.clause) {
         cls = clause.And(cls, options.queryOptions.clause);
     }
-    const rows = await loadRows({
+    return {
+        ...getEdgeClauseAndFields(cls, options),
+        defaultOptions,
         tableName: edgeData.edgeTable,
-        fields: edgeFields,
-        clause: cls,
-        orderby: options.queryOptions?.orderby || defaultOptions.orderby,
-        limit: options.queryOptions?.limit || defaultOptions.limit,
-        context,
-    });
-    return rows.map((row) => {
-        return new options.ctr(row);
-    });
+    };
 }
-exports.loadCustomEdges = loadCustomEdges;
 async function loadUniqueEdge(options) {
     const { id1, edgeType, context } = options;
     const edgeData = await loadEdgeData(edgeType);
     if (!edgeData) {
         throw new Error(`error loading edge data for ${edgeType}`);
     }
+    const { cls, fields } = getEdgeClauseAndFields(clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType)), options);
     const row = await loadRow({
         tableName: edgeData.edgeTable,
-        fields: edgeFields,
-        clause: clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType)),
+        fields: fields,
+        clause: cls,
         context,
     });
     if (!row) {
@@ -1160,21 +1066,28 @@ async function loadRawEdgeCountX(options) {
     if (!edgeData) {
         throw new Error(`error loading edge data for ${edgeType}`);
     }
+    const { cls } = getEdgeClauseAndFields(clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType)), options);
     const row = await loadRowX({
         tableName: edgeData.edgeTable,
         // sqlite needs as count otherwise it returns count(1)
         fields: ["count(1) as count"],
-        clause: clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType)),
+        clause: cls,
         context,
     });
     return parseInt(row["count"], 10) || 0;
 }
 exports.loadRawEdgeCountX = loadRawEdgeCountX;
 async function loadEdgeForID2(options) {
-    // TODO at some point, same as in go, we can be smart about this and have heuristics to determine if we fetch everything here or not
-    // we're assuming a cache here but not always true and this can be expensive if not...
-    const edges = await loadCustomEdges(options);
-    return edges.find((edge) => edge.id2 == options.id2);
+    const { cls: actualClause, fields, tableName, } = await loadEgesInfo(options, options.id2);
+    const row = await loadRow({
+        tableName,
+        fields: fields,
+        clause: actualClause,
+        context: options.context,
+    });
+    if (row) {
+        return new options.ctr(row);
+    }
 }
 exports.loadEdgeForID2 = loadEdgeForID2;
 async function loadNodesByEdge(viewer, id1, edgeType, options) {
@@ -1190,19 +1103,20 @@ async function loadNodesByEdge(viewer, id1, edgeType, options) {
 }
 exports.loadNodesByEdge = loadNodesByEdge;
 async function applyPrivacyPolicyForRow(viewer, options, row) {
-    if (!row) {
-        return null;
-    }
-    const ent = new options.ent(viewer, row);
-    return await applyPrivacyPolicyForEnt(viewer, ent, row, options);
+    const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
+    return r instanceof Error ? null : r;
 }
 exports.applyPrivacyPolicyForRow = applyPrivacyPolicyForRow;
+async function applyPrivacyPolicyForRowImpl(viewer, options, row) {
+    const ent = new options.ent(viewer, row);
+    return applyPrivacyPolicyForEnt(viewer, ent, row, options);
+}
 async function applyPrivacyPolicyForRowX(viewer, options, row) {
     const ent = new options.ent(viewer, row);
     return await applyPrivacyPolicyForEntX(viewer, ent, row, options);
 }
-exports.applyPrivacyPolicyForRowX = applyPrivacyPolicyForRowX;
-async function applyPrivacyPolicyForRows(viewer, rows, options) {
+// deprecated. doesn't use entcache
+async function applyPrivacyPolicyForRowsDeprecated(viewer, rows, options) {
     let m = new Map();
     // apply privacy logic
     await Promise.all(rows.map(async (row) => {
@@ -1213,27 +1127,62 @@ async function applyPrivacyPolicyForRows(viewer, rows, options) {
     }));
     return m;
 }
-exports.applyPrivacyPolicyForRows = applyPrivacyPolicyForRows;
-async function loadEdgeWithConst(viewer, id1, id2, edgeEnum, edgeType) {
-    const edge = await loadEdgeForID2({
-        id1: id1,
-        id2: id2,
-        edgeType: edgeType,
-        context: viewer.context,
-        ctr: AssocEdge,
-    });
-    return [edgeEnum, edge];
+async function applyPrivacyPolicyForRows(viewer, rows, options) {
+    const result = new Array(rows.length);
+    if (!rows.length) {
+        return [];
+    }
+    const entLoader = getEntLoader(viewer, options);
+    await Promise.all(rows.map(async (row, idx) => {
+        const r = await applyPrivacyPolicyForRowAndStoreInEntLoader(viewer, row, options, entLoader);
+        if (r instanceof ErrorWrapper) {
+            return;
+        }
+        result[idx] = r;
+    }));
+    // filter ents that aren't visible because of privacy
+    return result.filter((r) => r !== undefined);
 }
+exports.applyPrivacyPolicyForRows = applyPrivacyPolicyForRows;
 // given a viewer, an id pair, and a map of edgeEnum to EdgeType
 // return the edgeEnum that's set in the group
 async function getEdgeTypeInGroup(viewer, id1, id2, m) {
     let promises = [];
-    for (const [k, v] of m) {
-        promises.push(loadEdgeWithConst(viewer, id1, id2, k, v));
+    const edgeDatas = await loadEdgeDatas(...Array.from(m.values()));
+    let tableToEdgeEnumMap = new Map();
+    for (const [edgeEnum, edgeType] of m) {
+        const edgeData = edgeDatas.get(edgeType);
+        if (!edgeData) {
+            throw new Error(`could not load edge data for '${edgeType}'`);
+        }
+        const l = tableToEdgeEnumMap.get(edgeData.edgeTable) ?? [];
+        l.push(edgeEnum);
+        tableToEdgeEnumMap.set(edgeData.edgeTable, l);
     }
+    tableToEdgeEnumMap.forEach((edgeEnums, tableName) => {
+        promises.push((async () => {
+            const edgeTypes = edgeEnums.map((edgeEnum) => m.get(edgeEnum));
+            const { cls, fields } = getEdgeClauseAndFields(clause.And(clause.Eq("id1", id1), clause.In("edge_type", edgeTypes), clause.Eq("id2", id2)), {});
+            const rows = await loadRows({
+                tableName,
+                fields,
+                clause: cls,
+                context: viewer.context,
+            });
+            const row = rows[0];
+            if (row) {
+                const edgeType = row.edge_type;
+                for (const [k, v] of m) {
+                    if (v === edgeType) {
+                        return [k, new AssocEdge(row)];
+                    }
+                }
+            }
+        })());
+    });
     const results = await Promise.all(promises);
     for (const res of results) {
-        if (res[1]) {
+        if (res && res[1]) {
             return [res[0], res[1]];
         }
     }