@snowtop/ent 0.1.0-alpha75 → 0.1.0-alpha76

package/core/ent.js

@@ -128,7 +128,7 @@ async function applyPrivacyPolicyForRowAndStoreInCacheX(viewer, options, row, in
         throw ent;
     }
     if (ent === null) {
-        throw new Error(`TODO`);
+        throw new Error(`applyPrivacyPolicyForRowImpl returned null when it shouldn't. ent error`);
     }
     return ent;
 }
@@ -151,6 +151,7 @@ async function loadEntViaKey(viewer, key, options) {
         return null;
     }
     // TODO every row.id needs to be audited...
+    // https://github.com/lolopinto/ent/issues/1064
     const info = entFromCacheMaybe(viewer, row.id, options);
     if (info.ent !== undefined) {
         return info.ent;
@@ -158,7 +159,6 @@ async function loadEntViaKey(viewer, key, options) {
     return applyPrivacyPolicyForRowAndStoreInCache(viewer, options, row, info);
 }
 exports.loadEntViaKey = loadEntViaKey;
-// need a cached error...
 async function loadEntX(viewer, id, options) {
     const info = entFromCacheMaybe(viewer, id, options);
     if (info.error !== undefined) {
@@ -175,8 +175,6 @@ async function loadEntX(viewer, id, options) {
     return applyPrivacyPolicyForRowAndStoreInCacheX(viewer, options, row, info);
 }
 exports.loadEntX = loadEntX;
-// TODO test this and loadEntViaKey
-// replace loadEntViaClause??
 async function loadEntXViaKey(viewer, key, options) {
     const row = await options.loaderFactory
         .createLoader(viewer.context)
@@ -242,6 +240,7 @@ async function loadEnts(viewer, options, ...ids) {
                 });
                 if (ent === null) {
                     // TODO this should return null if not loadable...
+                    // https://github.com/lolopinto/ent/issues/1070
                     continue;
                 }
                 // @ts-ignore
@@ -282,12 +281,11 @@ async function loadEnts(viewer, options, ...ids) {
         }
         if (ent !== undefined) {
             // TODO this should return null if not loadable...?
+            // TODO https://github.com/lolopinto/ent/issues/1070
             m.set(id, ent);
         }
     }
     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
@@ -324,6 +322,7 @@ async function loadCustomEnts(viewer, options, query) {
     const result = new Array(rows.length);
     await Promise.all(rows.map(async (row, idx) => {
         // TODO what if key is different
+        // TODO https://github.com/lolopinto/ent/issues/1064
         const info = entFromCacheMaybe(viewer, row.id, options);
         if (info.ent !== undefined) {
             if (info.ent === null) {
@@ -533,42 +532,27 @@ 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;
 // this always goes to the db, no cache, nothing
 async function performRawQuery(query, values, logValues) {
     const pool = db_1.default.getInstance().getPool();
     logQuery(query, logValues || []);
-    try {
-        const res = await pool.queryAll(query, values);
-        return res.rows;
-    }
-    catch (e) {
-        // TODO need to change every query to catch an error!
-        (0, logger_1.log)("error", e);
-        return [];
-    }
+    const res = await pool.queryAll(query, values);
+    return res.rows;
 }
 exports.performRawQuery = performRawQuery;
 // TODO this should throw, we can't be hiding errors here
@@ -1094,40 +1078,26 @@ function isSyncQueryer(queryer) {
 async function mutateRow(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
     let cache = options.context?.cache;
-    try {
-        let res;
-        if (isSyncQueryer(queryer)) {
-            res = queryer.execSync(query, values);
-        }
-        else {
-            res = await queryer.exec(query, values);
-        }
-        if (cache) {
-            cache.clearCache();
-        }
-        return res;
+    let res;
+    if (isSyncQueryer(queryer)) {
+        res = queryer.execSync(query, values);
     }
-    catch (err) {
-        // TODO:::why is this not rethrowing?
-        (0, logger_1.log)("error", err);
-        throw err;
+    else {
+        res = await queryer.exec(query, values);
     }
+    if (cache) {
+        cache.clearCache();
+    }
+    return res;
 }
 function mutateRowSync(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
     let cache = options.context?.cache;
-    try {
-        const res = queryer.execSync(query, values);
-        if (cache) {
-            cache.clearCache();
-        }
-        return res;
-    }
-    catch (err) {
-        // TODO:::why is this not rethrowing?
-        (0, logger_1.log)("error", err);
-        throw err;
+    const res = queryer.execSync(query, values);
+    if (cache) {
+        cache.clearCache();
     }
+    return res;
 }
 function buildInsertQuery(options, suffix) {
     let fields = [];
@@ -1516,6 +1486,8 @@ async function applyPrivacyPolicyForRowX(viewer, options, row) {
     return await applyPrivacyPolicyForEntX(viewer, ent, row, options);
 }
 // TODO this needs to be changed to use ent cache as needed...
+// most current callsites fine not using it
+// custom_query is one that should be updated
 async function applyPrivacyPolicyForRows(viewer, rows, options) {
     let m = new Map();
     // apply privacy logic

package/core/loaders/object_loader.js

@@ -71,6 +71,9 @@ function createDataLoader(options) {
         const rows = await (0, ent_1.loadRows)(rowOptions);
         for (const row of rows) {
             const id = row[col];
+            if (id === undefined) {
+                throw new Error(`need to query for column ${col} when using an object loader because the query may not be sorted and we need the id to maintain sort order`);
+            }
             const idx = m.get(id);
             if (idx === undefined) {
                 throw new Error(`malformed query. got ${id} back but didn't query for it`);
@@ -195,6 +198,9 @@ class ObjectLoader {
     }
 }
 exports.ObjectLoader = ObjectLoader;
+// NOTE: if not querying for all columns
+// have to query for the id field as one of the fields
+// because it's used to maintain sort order of the queried ids
 class ObjectLoaderFactory {
     constructor(options) {
         this.options = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha75",
+  "version": "0.1.0-alpha76",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",