@snowtop/ent 0.2.0-alpha.10 → 0.2.0-alpha.11-test1

package/core/ent.js

@@ -26,8 +26,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadTwoWayEdges = 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.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 = exports.getEntLoader = exports.rowIsError = void 0;
-exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = void 0;
+exports.assocEdgeLoader = exports.AssocEdgeData = exports.AssocEdge = void 0;
+exports.rowIsError = rowIsError;
+exports.getEntLoader = getEntLoader;
+exports.getEntKey = getEntKey;
+exports.loadEnt = loadEnt;
+exports.loadEntViaKey = loadEntViaKey;
+exports.loadEntX = loadEntX;
+exports.loadEntXViaKey = loadEntXViaKey;
+exports.loadEntFromClause = loadEntFromClause;
+exports.loadEntXFromClause = loadEntXFromClause;
+exports.loadEnts = loadEnts;
+exports.loadEntsList = loadEntsList;
+exports.loadEntsFromClause = loadEntsFromClause;
+exports.loadCustomEnts = loadCustomEnts;
+exports.loadCustomData = loadCustomData;
+exports.loadCustomCount = loadCustomCount;
+exports.loadDerivedEnt = loadDerivedEnt;
+exports.loadDerivedEntX = loadDerivedEntX;
+exports.logQuery = logQuery;
+exports.loadRowX = loadRowX;
+exports.loadRow = loadRow;
+exports.___setLogQueryErrorWithError = ___setLogQueryErrorWithError;
+exports.performRawQuery = performRawQuery;
+exports.loadRows = loadRows;
+exports.buildGroupQuery = buildGroupQuery;
+exports.buildInsertQuery = buildInsertQuery;
+exports.createRow = createRow;
+exports.createRowSync = createRowSync;
+exports.buildUpdateQuery = buildUpdateQuery;
+exports.editRow = editRow;
+exports.editRowSync = editRowSync;
+exports.deleteRows = deleteRows;
+exports.deleteRowsSync = deleteRowsSync;
+exports.getCursor = getCursor;
+exports.loadEdgeData = loadEdgeData;
+exports.loadEdgeDatas = loadEdgeDatas;
+exports.setDefaultLimit = setDefaultLimit;
+exports.getDefaultLimit = getDefaultLimit;
+exports.loadEdges = loadEdges;
+exports.getEdgeClauseAndFields = getEdgeClauseAndFields;
+exports.loadCustomEdges = loadCustomEdges;
+exports.loadUniqueEdge = loadUniqueEdge;
+exports.loadUniqueNode = loadUniqueNode;
+exports.loadRawEdgeCountX = loadRawEdgeCountX;
+exports.loadEdgeForID2 = loadEdgeForID2;
+exports.loadTwoWayEdges = loadTwoWayEdges;
+exports.loadNodesByEdge = loadNodesByEdge;
+exports.applyPrivacyPolicyForRow = applyPrivacyPolicyForRow;
+exports.applyPrivacyPolicyForRows = applyPrivacyPolicyForRows;
+exports.getEdgeTypeInGroup = getEdgeTypeInGroup;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const dataloader_1 = __importDefault(require("dataloader"));
@@ -109,7 +157,6 @@ function rowIsError(row) {
     // so we need to check the name as well for native error SqliteError
     return row instanceof Error || row?.constructor?.name === "SqliteError";
 }
-exports.rowIsError = rowIsError;
 function createEntLoader(viewer, options, map) {
     // share the cache across loaders even if we create a new instance
     const loaderOptions = {};
@@ -191,11 +238,9 @@ function getEntLoader(viewer, options) {
     const name = `ent-loader:${viewer.instanceKey()}:${options.loaderFactory.name}`;
     return viewer.context.cache.getLoaderWithLoadMany(name, () => new EntLoader(viewer, options));
 }
-exports.getEntLoader = getEntLoader;
 function getEntKey(viewer, id, options) {
     return `${viewer.instanceKey()}:${options.loaderFactory.name}:${id}`;
 }
-exports.getEntKey = getEntKey;
 async function loadEnt(viewer, id, options) {
     if (typeof id !== "string" &&
         typeof id !== "number" &&
@@ -205,7 +250,6 @@ async function loadEnt(viewer, id, options) {
     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) {
@@ -243,7 +287,6 @@ async function loadEntViaKey(viewer, key, options) {
     const r = await applyPrivacyPolicyForRowAndStoreInEntLoader(viewer, row, options);
     return r instanceof ErrorWrapper ? null : r;
 }
-exports.loadEntViaKey = loadEntViaKey;
 async function loadEntX(viewer, id, options) {
     if (typeof id !== "string" &&
         typeof id !== "number" &&
@@ -256,7 +299,6 @@ async function loadEntX(viewer, id, options) {
     }
     return r;
 }
-exports.loadEntX = loadEntX;
 async function loadEntXViaKey(viewer, key, options) {
     const row = await options.loaderFactory
         .createLoader(viewer.context)
@@ -271,7 +313,6 @@ async function loadEntXViaKey(viewer, key, options) {
     }
     return r;
 }
-exports.loadEntXViaKey = loadEntXViaKey;
 /**
  * @deprecated use loadCustomEnts
  */
@@ -287,7 +328,6 @@ async function loadEntFromClause(viewer, options, clause) {
     }
     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
@@ -303,7 +343,6 @@ async function loadEntXFromClause(viewer, options, clause) {
     const row = await loadRowX(rowOptions);
     return applyPrivacyPolicyForRowX(viewer, options, row);
 }
-exports.loadEntXFromClause = loadEntXFromClause;
 async function loadEnts(viewer, options, ...ids) {
     if (!ids.length) {
         return new Map();
@@ -322,7 +361,6 @@ async function loadEnts(viewer, options, ...ids) {
     }
     return m;
 }
-exports.loadEnts = loadEnts;
 // calls loadEnts and returns the results sorted in the order they were passed in
 // useful for EntQuery and other paths where the order matters
 async function loadEntsList(viewer, options, ...ids) {
@@ -336,7 +374,6 @@ async function loadEntsList(viewer, options, ...ids) {
     });
     return result;
 }
-exports.loadEntsList = loadEntsList;
 // we return a map here so that any sorting for queries that exist
 // can be done in O(N) time
 /**
@@ -351,12 +388,10 @@ async function loadEntsFromClause(viewer, clause, options) {
     const rows = await loadRows(rowOptions);
     return applyPrivacyPolicyForRowsDeprecated(viewer, rows, options);
 }
-exports.loadEntsFromClause = loadEntsFromClause;
 async function loadCustomEnts(viewer, options, query) {
     const rows = await loadCustomData(options, query, viewer.context);
     return applyPrivacyPolicyForRows(viewer, rows, options);
 }
-exports.loadCustomEnts = loadCustomEnts;
 function isClause(opts) {
     const cls = opts;
     return cls.clause !== undefined && cls.values !== undefined;
@@ -407,7 +442,6 @@ async function loadCustomData(options, query, context) {
     }
     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) {
@@ -424,7 +458,6 @@ async function loadCustomCount(options, query, context) {
     }
     return 0;
 }
-exports.loadCustomCount = loadCustomCount;
 function isPrimableLoader(loader) {
     return loader != undefined;
 }
@@ -480,13 +513,11 @@ async function loadDerivedEnt(viewer, data, loader) {
     }
     return r;
 }
-exports.loadDerivedEnt = loadDerivedEnt;
 // won't have caching yet either
 async function loadDerivedEntX(viewer, data, loader) {
     const ent = new loader(viewer, data);
     return applyPrivacyPolicyForEntX(viewer, ent, data, { ent: loader });
 }
-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) {
@@ -547,7 +578,6 @@ 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);
@@ -558,7 +588,6 @@ async function loadRowX(options) {
     }
     return result;
 }
-exports.loadRowX = loadRowX;
 // primitive data fetching. called by loaders
 async function loadRow(options) {
     let cache = options.context?.cache;
@@ -584,12 +613,10 @@ async function loadRow(options) {
     }
     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();
@@ -606,7 +633,6 @@ async function performRawQuery(query, values, logValues) {
         throw e;
     }
 }
-exports.performRawQuery = performRawQuery;
 // TODO this should throw, we can't be hiding errors here
 async function loadRows(options) {
     let cache = options.context?.cache;
@@ -624,7 +650,6 @@ async function loadRows(options) {
     }
     return r;
 }
-exports.loadRows = loadRows;
 // this is used for queries when we select multiple ids at once
 function buildGroupQuery(options) {
     const fields = [...options.fields, "row_number()"];
@@ -654,7 +679,6 @@ function buildGroupQuery(options) {
         cls,
     ];
 }
-exports.buildGroupQuery = buildGroupQuery;
 function isSyncQueryer(queryer) {
     return queryer.execSync !== undefined;
 }
@@ -747,7 +771,6 @@ function buildInsertQuery(options, suffix) {
     }
     return [query, values, logValues];
 }
-exports.buildInsertQuery = buildInsertQuery;
 // TODO: these three are not to be exported out of this package
 // only from this file
 async function createRow(queryer, options, suffix) {
@@ -758,7 +781,6 @@ async function createRow(queryer, options, suffix) {
     }
     return null;
 }
-exports.createRow = createRow;
 function createRowSync(queryer, options, suffix) {
     const [query, values, logValues] = buildInsertQuery(options, suffix);
     const res = mutateRowSync(queryer, query, values, logValues, options);
@@ -767,7 +789,6 @@ function createRowSync(queryer, options, suffix) {
     }
     return null;
 }
-exports.createRowSync = createRowSync;
 function buildUpdateQuery(options, suffix) {
     let valsString = [];
     let values = [];
@@ -815,7 +836,6 @@ function buildUpdateQuery(options, suffix) {
     }
     return [query, values, logValues];
 }
-exports.buildUpdateQuery = buildUpdateQuery;
 async function editRow(queryer, options, suffix) {
     const [query, values, logValues] = buildUpdateQuery(options, suffix);
     const res = await mutateRow(queryer, query, values, logValues, options);
@@ -827,7 +847,6 @@ async function editRow(queryer, options, suffix) {
     }
     return null;
 }
-exports.editRow = editRow;
 function editRowSync(queryer, options, suffix) {
     const [query, values, logValues] = buildUpdateQuery(options, suffix);
     const res = mutateRowSync(queryer, query, values, logValues, options);
@@ -839,17 +858,14 @@ function editRowSync(queryer, options, suffix) {
     }
     return null;
 }
-exports.editRowSync = editRowSync;
 async function deleteRows(queryer, options, cls) {
     const query = `DELETE FROM ${options.tableName} WHERE ${cls.clause(1)}`;
     await mutateRow(queryer, query, cls.values(), cls.logValues(), options);
 }
-exports.deleteRows = deleteRows;
 function deleteRowsSync(queryer, options, cls) {
     const query = `DELETE FROM ${options.tableName} WHERE ${cls.clause(1)}`;
     mutateRowSync(queryer, query, cls.values(), cls.logValues(), options);
 }
-exports.deleteRowsSync = deleteRowsSync;
 class AssocEdge {
     constructor(data) {
         this.id1 = data.id1;
@@ -893,7 +909,6 @@ function getCursor(opts) {
     }
     return btoa(JSON.stringify(parts));
 }
-exports.getCursor = getCursor;
 class AssocEdgeData {
     constructor(data) {
         this.edgeType = data.edge_type;
@@ -926,7 +941,6 @@ async function loadEdgeData(edgeType) {
     }
     return new AssocEdgeData(row);
 }
-exports.loadEdgeData = loadEdgeData;
 async function loadEdgeDatas(...edgeTypes) {
     if (!edgeTypes.length) {
         return new Map();
@@ -944,7 +958,6 @@ async function loadEdgeDatas(...edgeTypes) {
     });
     return m;
 }
-exports.loadEdgeDatas = loadEdgeDatas;
 const edgeFields = [
     "id1",
     "id1_type",
@@ -958,11 +971,9 @@ 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) {
@@ -982,7 +993,6 @@ function defaultEdgeQueryOptions(id1, edgeType, id2) {
 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;
@@ -998,7 +1008,6 @@ function getEdgeClauseAndFields(cls, options) {
         fields,
     };
 }
-exports.getEdgeClauseAndFields = getEdgeClauseAndFields;
 async function loadCustomEdges(options) {
     const { cls: actualClause, fields, defaultOptions, tableName, } = await loadEdgesInfo(options);
     const rows = await loadRows({
@@ -1013,7 +1022,6 @@ async function loadCustomEdges(options) {
         return new options.ctr(row);
     });
 }
-exports.loadCustomEdges = loadCustomEdges;
 async function loadEdgesInfo(options, id2) {
     const { id1, edgeType } = options;
     const edgeData = await loadEdgeData(edgeType);
@@ -1049,7 +1057,6 @@ async function loadUniqueEdge(options) {
     }
     return new AssocEdge(row);
 }
-exports.loadUniqueEdge = loadUniqueEdge;
 async function loadUniqueNode(viewer, id1, edgeType, options) {
     const edge = await loadUniqueEdge({
         id1,
@@ -1061,7 +1068,6 @@ async function loadUniqueNode(viewer, id1, edgeType, options) {
     }
     return loadEnt(viewer, edge.id2, options);
 }
-exports.loadUniqueNode = loadUniqueNode;
 async function loadRawEdgeCountX(options) {
     const { id1, edgeType, context } = options;
     const edgeData = await loadEdgeData(edgeType);
@@ -1078,7 +1084,6 @@ async function loadRawEdgeCountX(options) {
     });
     return parseInt(row["count"], 10) || 0;
 }
-exports.loadRawEdgeCountX = loadRawEdgeCountX;
 async function loadEdgeForID2(options) {
     const { cls: actualClause, fields, tableName, } = await loadEdgesInfo(options, options.id2);
     const row = await loadRow({
@@ -1091,7 +1096,6 @@ async function loadEdgeForID2(options) {
         return new options.ctr(row);
     }
 }
-exports.loadEdgeForID2 = loadEdgeForID2;
 async function loadTwoWayEdges(opts) {
     const { cls: actualClause, fields, tableName } = await loadEdgesInfo(opts);
     const rows = await loadRows({
@@ -1112,7 +1116,6 @@ async function loadTwoWayEdges(opts) {
     });
     return rows;
 }
-exports.loadTwoWayEdges = loadTwoWayEdges;
 async function loadNodesByEdge(viewer, id1, edgeType, options) {
     // load edges
     const rows = await loadEdges({
@@ -1124,12 +1127,10 @@ async function loadNodesByEdge(viewer, id1, edgeType, options) {
     const ids = rows.map((row) => row.id2);
     return loadEntsList(viewer, options, ...ids);
 }
-exports.loadNodesByEdge = loadNodesByEdge;
 async function applyPrivacyPolicyForRow(viewer, options, row) {
     const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
     return rowIsError(r) ? null : r;
 }
-exports.applyPrivacyPolicyForRow = applyPrivacyPolicyForRow;
 async function applyPrivacyPolicyForRowImpl(viewer, options, row) {
     const ent = new options.ent(viewer, row);
     return applyPrivacyPolicyForEnt(viewer, ent, row, options);
@@ -1166,7 +1167,6 @@ async function applyPrivacyPolicyForRows(viewer, rows, options) {
     // 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) {
@@ -1210,4 +1210,3 @@ async function getEdgeTypeInGroup(viewer, id1, id2, m) {
         }
     }
 }
-exports.getEdgeTypeInGroup = getEdgeTypeInGroup;

package/core/global_schema.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__getGlobalSchemaField = exports.__getGlobalSchemaFields = exports.__getGlobalSchema = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = void 0;
+exports.setGlobalSchema = setGlobalSchema;
+exports.clearGlobalSchema = clearGlobalSchema;
+exports.__hasGlobalSchema = __hasGlobalSchema;
+exports.__getGlobalSchema = __getGlobalSchema;
+exports.__getGlobalSchemaFields = __getGlobalSchemaFields;
+exports.__getGlobalSchemaField = __getGlobalSchemaField;
 const schema_1 = require("../schema/schema");
 let globalSchema;
 let globalSchemaFields = new Map();
@@ -25,27 +30,21 @@ function setGlobalSchema(val) {
         }
     }
 }
-exports.setGlobalSchema = setGlobalSchema;
 function clearGlobalSchema() {
     globalSchema = undefined;
     globalSchemaFields.clear();
 }
-exports.clearGlobalSchema = clearGlobalSchema;
 // used by tests. no guarantee will always exist
 function __hasGlobalSchema() {
     return globalSchema !== undefined;
 }
-exports.__hasGlobalSchema = __hasGlobalSchema;
 // used by tests. no guarantee will always exist
 function __getGlobalSchema() {
     return globalSchema;
 }
-exports.__getGlobalSchema = __getGlobalSchema;
 function __getGlobalSchemaFields() {
     return globalSchemaFields;
 }
-exports.__getGlobalSchemaFields = __getGlobalSchemaFields;
 function __getGlobalSchemaField(type) {
     return globalSchemaFields.get(type);
 }
-exports.__getGlobalSchemaField = __getGlobalSchemaField;

package/core/loaders/assoc_count_loader.d.ts

@@ -1,11 +1,11 @@
 import { ID, Context, Loader, LoaderFactory, EdgeQueryableDataOptionsConfigureLoader } from "../base";
 export declare class AssocEdgeCountLoader implements Loader<ID, number> {
     private edgeType;
-    context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
+    context?: Context | undefined;
     private options?;
     private loaderFn;
     private loader;
-    constructor(edgeType: string, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined, options?: EdgeQueryableDataOptionsConfigureLoader | undefined);
+    constructor(edgeType: string, context?: Context | undefined, options?: EdgeQueryableDataOptionsConfigureLoader | undefined);
     private getLoader;
     load(id: ID): Promise<number>;
     clearAll(): void;

package/core/loaders/assoc_edge_loader.d.ts

@@ -22,8 +22,8 @@ export declare class AssocDirectEdgeLoader<T extends AssocEdge> implements Loade
     private edgeType;
     private edgeCtr;
     private options?;
-    context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
-    constructor(edgeType: string, edgeCtr: AssocEdgeConstructor<T>, options?: Partial<Pick<import("../base").QueryableDataOptions, "clause" | "limit" | "orderby" | "disableTransformations">> | undefined, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
+    context?: Context | undefined;
+    constructor(edgeType: string, edgeCtr: AssocEdgeConstructor<T>, options?: EdgeQueryableDataOptions | undefined, context?: Context | undefined);
     load(id: ID): Promise<T[]>;
     loadTwoWay(id: ID): Promise<T[]>;
     loadEdgeForID2(id: ID, id2: ID): Promise<T | undefined>;

package/core/loaders/loader.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheMap = exports.getCustomLoader = exports.getLoader = void 0;
+exports.CacheMap = void 0;
+exports.getLoader = getLoader;
+exports.getCustomLoader = getCustomLoader;
 const logger_1 = require("../logger");
 // this is like factory factory FML
 // helper function to handle context vs not
@@ -14,7 +16,6 @@ function getLoader(factory, create, context) {
     // g|set from context cache
     return context.cache.getLoader(factory.name, create);
 }
-exports.getLoader = getLoader;
 function getCustomLoader(key, create, context) {
     // just create a new one every time if no context cache
     if (!context?.cache) {
@@ -24,7 +25,6 @@ function getCustomLoader(key, create, context) {
     // g|set from context cache
     return context.cache.getLoader(key, create);
 }
-exports.getCustomLoader = getCustomLoader;
 class CacheMap {
     constructor(options) {
         this.options = options;

package/core/loaders/object_loader.d.ts

@@ -2,13 +2,13 @@ import { ID, Data, SelectDataOptions, Context, Loader, LoaderFactory } from "../
 import * as clause from "../clause";
 export declare class ObjectLoader<TQueryData extends Data = Data, TResultData extends Data = TQueryData, K = keyof TQueryData> implements Loader<ID, TResultData | null>, Loader<clause.Clause<TQueryData, K>, TResultData[] | null> {
     private options;
-    context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
+    context?: Context | undefined;
     private toPrime?;
     private idLoader;
     private clauseLoader;
     private primedLoaders;
     private memoizedInitPrime;
-    constructor(options: SelectDataOptions, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined, toPrime?: ObjectLoaderFactory<TResultData>[] | undefined);
+    constructor(options: SelectDataOptions, context?: Context | undefined, toPrime?: ObjectLoaderFactory<TResultData>[] | undefined);
     getOptions(): SelectDataOptions;
     private initPrime;
     load(key: ID): Promise<TResultData | null>;
@@ -25,9 +25,9 @@ export declare class ObjectLoader<TQueryData extends Data = Data, TResultData ex
 }
 export declare class ObjectCountLoader<V extends Data = Data, K = keyof V> implements Loader<clause.Clause<V, K>, number> {
     private options;
-    context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
+    context?: Context | undefined;
     private loader;
-    constructor(options: SelectDataOptions, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
+    constructor(options: SelectDataOptions, context?: Context | undefined);
     getOptions(): SelectDataOptions;
     load(key: clause.Clause<V, K>): Promise<number>;
     clearAll(): void;

package/core/loaders/query_loader.d.ts

@@ -5,10 +5,10 @@ import { ObjectLoaderFactory } from "./object_loader";
 declare class QueryDirectLoader<K extends any> implements Loader<K, Data[]> {
     private options;
     private queryOptions?;
-    context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, import("../base").ID | null>> | undefined;
+    context?: Context | undefined;
     private memoizedInitPrime;
     private primedLoaders;
-    constructor(options: QueryOptions, queryOptions?: Partial<Pick<import("../base").QueryableDataOptions, "clause" | "limit" | "orderby" | "disableTransformations">> | undefined, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, import("../base").ID | null>> | undefined);
+    constructor(options: QueryOptions, queryOptions?: EdgeQueryableDataOptions | undefined, context?: Context | undefined);
     private initPrime;
     load(id: K): Promise<Data[]>;
     clearAll(): void;

package/core/loaders/raw_count_loader.d.ts

@@ -10,9 +10,9 @@ interface QueryCountOptions {
 export declare function createCountDataLoader<K extends any>(options: QueryCountOptions): DataLoader<K, number, K>;
 export declare class RawCountLoader<K extends any> implements Loader<K, number> {
     private options;
-    context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
+    context?: Context | undefined;
     private loader;
-    constructor(options: QueryCountOptions, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
+    constructor(options: QueryCountOptions, context?: Context | undefined);
     load(id: K): Promise<number>;
     clearAll(): void;
 }

package/core/loaders/raw_count_loader.js

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RawCountLoaderFactory = exports.RawCountLoader = exports.createCountDataLoader = void 0;
+exports.RawCountLoaderFactory = exports.RawCountLoader = void 0;
+exports.createCountDataLoader = createCountDataLoader;
 const dataloader_1 = __importDefault(require("dataloader"));
 const ent_1 = require("../ent");
 const clause = __importStar(require("../clause"));
@@ -99,7 +100,6 @@ function createCountDataLoader(options) {
         return result;
     }, loaderOptions);
 }
-exports.createCountDataLoader = createCountDataLoader;
 // for now this only works for single column counts
 // e.g. foreign key count
 class RawCountLoader {

package/core/logger.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logEnabled = exports.logTrace = exports.logIf = exports.log = exports.clearLogLevels = exports.setLogLevels = void 0;
+exports.setLogLevels = setLogLevels;
+exports.clearLogLevels = clearLogLevels;
+exports.log = log;
+exports.logIf = logIf;
+exports.logTrace = logTrace;
+exports.logEnabled = logEnabled;
 var m = {
     query: "log",
     warn: "warn",
@@ -16,11 +21,9 @@ function setLogLevels(levels) {
     }
     levels.forEach((level) => logLevels.set(level, true));
 }
-exports.setLogLevels = setLogLevels;
 function clearLogLevels() {
     logLevels.clear();
 }
-exports.clearLogLevels = clearLogLevels;
 function log(level, msg) {
     if (logLevels.has(level)) {
         // mostly for sqlite error but fine for any type of error
@@ -32,20 +35,16 @@ function log(level, msg) {
         console[m[level]](msg);
     }
 }
-exports.log = log;
 function logIf(level, logFn) {
     if (logLevels.has(level)) {
         console[m[level]](logFn());
     }
 }
-exports.logIf = logIf;
 function logTrace() {
     if (logLevels.has("debug")) {
         console.trace();
     }
 }
-exports.logTrace = logTrace;
 function logEnabled(level) {
     return logLevels.has(level);
 }
-exports.logEnabled = logEnabled;

package/core/privacy.d.ts

@@ -88,7 +88,7 @@ export declare class AllowIfEntIsVisiblePolicy<TEnt extends Ent<TViewer>, TViewe
     private options;
     constructor(id: ID, options: LoadEntOptions<TEnt, TViewer>);
     rules: {
-        apply(_v: Viewer<Ent<any> | null, ID | null>, _ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+        apply(_v: Viewer, _ent?: Ent): Promise<PrivacyResult>;
     }[];
 }
 export declare class DenyIfEntIsVisiblePolicy<TEnt extends Ent<TViewer>, TViewer extends Viewer> implements PrivacyPolicy<TEnt, TViewer> {
@@ -96,7 +96,7 @@ export declare class DenyIfEntIsVisiblePolicy<TEnt extends Ent<TViewer>, TViewer
     private options;
     constructor(id: ID, options: LoadEntOptions<TEnt, TViewer>);
     rules: {
-        apply(_v: Viewer<Ent<any> | null, ID | null>, _ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+        apply(_v: Viewer, _ent?: Ent): Promise<PrivacyResult>;
     }[];
 }
 export declare class DenyIfEntIsVisibleRule<TEnt extends Ent<TViewer>, TViewer extends Viewer> implements PrivacyPolicyRule<TEnt, TViewer> {