@snowtop/ent 0.1.0-alpha90 → 0.1.0-alpha91

package/action/orchestrator.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];

package/core/clause.d.ts

@@ -119,4 +119,19 @@ export declare function JSONObjectFieldKeyASJSON(col: string, field: string): st
 export declare function JSONObjectFieldKeyAsText(col: string, field: string): string;
 declare type predicate = "==" | ">" | "<" | "!=" | ">=" | "<=";
 export declare function JSONPathValuePredicate(dbCol: string, path: string, val: any, pred: predicate): Clause;
+declare class paginationMultipleColumnsSubQueryClause implements Clause {
+    private col;
+    private op;
+    private tableName;
+    private uniqueCol;
+    private val;
+    constructor(col: string, op: string, tableName: string, uniqueCol: string, val: any);
+    private buildSimpleQuery;
+    clause(idx: number): string;
+    columns(): string[];
+    values(): any[];
+    logValues(): any[];
+    instanceKey(): string;
+}
+export declare function PaginationMultipleColsSubQuery(col: string, op: string, tableName: string, uniqueCol: string, val: any): paginationMultipleColumnsSubQueryClause;
 export {};

package/core/clause.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];
@@ -19,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.inClause = void 0;
+exports.PaginationMultipleColsSubQuery = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.inClause = void 0;
 const db_1 = __importStar(require("./db"));
 function isSensitive(val) {
     return (val !== null &&
@@ -666,3 +670,41 @@ function JSONPathValuePredicate(dbCol, path, val, pred) {
     return new jSONPathValuePredicateClause(dbCol, path, val, pred);
 }
 exports.JSONPathValuePredicate = JSONPathValuePredicate;
+// TODO need a better name for this lol
+// this assumes we're doing the same direction twice which isn't necessarily accurate in the future...
+class paginationMultipleColumnsSubQueryClause {
+    constructor(col, op, tableName, uniqueCol, val) {
+        this.col = col;
+        this.op = op;
+        this.tableName = tableName;
+        this.uniqueCol = uniqueCol;
+        this.val = val;
+    }
+    buildSimpleQuery(clause, idx) {
+        return `SELECT ${this.col} FROM ${this.tableName} WHERE ${clause.clause(idx)}`;
+    }
+    clause(idx) {
+        const eq1 = this.buildSimpleQuery(Eq(this.uniqueCol, this.val), idx);
+        const eq2 = this.buildSimpleQuery(Eq(this.uniqueCol, this.val), idx + 1);
+        const op = new simpleClause(this.uniqueCol, this.val, this.op).clause(idx + 2);
+        // nest in () to make sure it's scoped correctly
+        return `(${this.col} ${this.op} (${eq1}) OR (${this.col} = (${eq2}) AND ${op}))`;
+    }
+    columns() {
+        return [this.col];
+    }
+    values() {
+        return [this.val, this.val, this.val];
+    }
+    logValues() {
+        const log = isSensitive(this.val) ? this.val.logValue() : this.val;
+        return [log, log, log];
+    }
+    instanceKey() {
+        return `${this.col}-${this.op}-${this.tableName}-${this.uniqueCol}-${this.val}`;
+    }
+}
+function PaginationMultipleColsSubQuery(col, op, tableName, uniqueCol, val) {
+    return new paginationMultipleColumnsSubQueryClause(col, op, tableName, uniqueCol, val);
+}
+exports.PaginationMultipleColsSubQuery = PaginationMultipleColsSubQuery;

package/core/config.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];

package/core/db.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];

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];
@@ -1315,17 +1319,12 @@ class AssocEdge {
     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) {

package/core/loaders/assoc_count_loader.d.ts

@@ -13,5 +13,6 @@ export declare class AssocEdgeCountLoaderFactory implements LoaderFactory<ID, nu
     private edgeType;
     name: string;
     constructor(edgeType: string);
+    getEdgeType(): string;
     createLoader(context?: Context): AssocEdgeCountLoader;
 }

package/core/loaders/assoc_count_loader.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];
@@ -73,6 +77,9 @@ class AssocEdgeCountLoaderFactory {
         this.edgeType = edgeType;
         this.name = `assocEdgeLoader:count:${edgeType}`;
     }
+    getEdgeType() {
+        return this.edgeType;
+    }
     createLoader(context) {
         return (0, loader_1.getLoader)(this, () => new AssocEdgeCountLoader(this.edgeType, context), context);
     }

package/core/loaders/assoc_edge_loader.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];

package/core/loaders/object_loader.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];

package/core/loaders/query_loader.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];

package/core/loaders/raw_count_loader.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];

package/core/privacy.d.ts

@@ -6,22 +6,22 @@ export declare class EntPrivacyError extends Error implements PrivacyError {
     constructor(privacyPolicy: PrivacyPolicy, rule: PrivacyPolicyRule, ent?: Ent);
 }
 export declare const AlwaysAllowRule: {
-    apply(_v: Viewer, _ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+    apply(_v: Viewer, _ent?: Ent): Promise<PrivacyResult>;
 };
 export declare const AlwaysDenyRule: {
-    apply(_v: Viewer, _ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+    apply(_v: Viewer, _ent?: Ent): Promise<PrivacyResult>;
 };
 export declare const DenyIfLoggedOutRule: {
-    apply(v: Viewer, _ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+    apply(v: Viewer, _ent?: Ent): Promise<PrivacyResult>;
 };
 export declare const DenyIfLoggedInRule: {
-    apply(v: Viewer, _ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+    apply(v: Viewer, _ent?: Ent): Promise<PrivacyResult>;
 };
 export declare const AllowIfHasIdentity: {
-    apply(v: Viewer, _ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+    apply(v: Viewer, _ent?: Ent): Promise<PrivacyResult>;
 };
 export declare const AllowIfViewerRule: {
-    apply(v: Viewer, ent?: Ent<Viewer<Ent<any> | null, ID | null>> | undefined): Promise<PrivacyResult>;
+    apply(v: Viewer, ent?: Ent): Promise<PrivacyResult>;
 };
 export declare class AllowIfViewerEqualsRule {
     private id;

package/core/query/assoc_query.d.ts

@@ -14,6 +14,7 @@ export declare abstract class AssocEdgeQueryBase<TSource extends Ent<TViewer>, T
     constructor(viewer: TViewer, src: EdgeQuerySource<TSource, TDest, TViewer>, countLoaderFactory: AssocEdgeCountLoaderFactory, dataLoaderFactory: AssocEdgeLoaderFactory<TEdge>, options: LoadEntOptions<TDest, TViewer> | loaderOptionsFunc<TViewer>);
     private isEdgeQuery;
     abstract sourceEnt(id: ID): Promise<Ent | null>;
+    getTableName(): Promise<string>;
     private getSingleID;
     queryRawCount(): Promise<number>;
     queryAllRawCount(): Promise<Map<ID, number>>;

package/core/query/assoc_query.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssocEdgeQueryBase = void 0;
 const ent_1 = require("../ent");
 const query_1 = require("./query");
+// would be nice to someday have an API for assoc asc
 class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
     constructor(viewer, src, countLoaderFactory, dataLoaderFactory, 
     // if function, it's a polymorphic edge and need to provide
     // a function that goes from edgeType to LoadEntOptions
     options) {
-        super(viewer, "time");
+        super(viewer, "time", "id2");
         this.viewer = viewer;
         this.src = src;
         this.countLoaderFactory = countLoaderFactory;
@@ -21,6 +22,13 @@ class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
         }
         return false;
     }
+    async getTableName() {
+        const edgeData = await (0, ent_1.loadEdgeData)(this.countLoaderFactory.getEdgeType());
+        if (!edgeData) {
+            throw new Error(`couldn't load edgeData`);
+        }
+        return edgeData.edgeTable;
+    }
     async getSingleID() {
         const infos = await this.genIDInfosToFetch();
         if (infos.length !== 1) {

package/core/query/custom_clause_query.d.ts

@@ -6,6 +6,7 @@ interface CustomClauseQueryOptions<TDest extends Ent<TViewer>, TViewer extends V
     clause: Clause;
     name: string;
     sortColumn?: string;
+    sortColumnUnique?: boolean;
     disableTransformations?: boolean;
 }
 export declare class CustomClauseQuery<TDest extends Ent<TViewer>, TViewer extends Viewer = Viewer> extends BaseEdgeQuery<any, TDest, Data> {
@@ -14,6 +15,7 @@ export declare class CustomClauseQuery<TDest extends Ent<TViewer>, TViewer exten
     private clause;
     constructor(viewer: TViewer, options: CustomClauseQueryOptions<TDest, TViewer>);
     sourceEnt(_id: ID): Promise<null>;
+    getTableName(): string;
     queryRawCount(): Promise<number>;
     queryAllRawCount(): Promise<Map<ID, number>>;
     protected loadRawIDs(_addID: (src: ID) => void): Promise<void>;

package/core/query/custom_clause_query.js

@@ -21,7 +21,11 @@ function getClause(opts) {
 }
 class CustomClauseQuery extends query_1.BaseEdgeQuery {
     constructor(viewer, options) {
-        super(viewer, options.sortColumn || "created_at");
+        const sortCol = options.sortColumn || "id";
+        let unique = options.sortColumnUnique
+            ? sortCol
+            : options.loadEntOptions.loaderFactory.options?.key || "id";
+        super(viewer, options.sortColumn || sortCol, unique);
         this.viewer = viewer;
         this.options = options;
         this.clause = getClause(options);
@@ -29,6 +33,9 @@ class CustomClauseQuery extends query_1.BaseEdgeQuery {
     async sourceEnt(_id) {
         return null;
     }
+    getTableName() {
+        return this.options.loadEntOptions.tableName;
+    }
     async queryRawCount() {
         const row = await (0, ent_1.loadRow)({
             tableName: this.options.loadEntOptions.tableName,
@@ -51,12 +58,11 @@ class CustomClauseQuery extends query_1.BaseEdgeQuery {
         if (!options.limit) {
             options.limit = ent_1.DefaultLimit;
         }
-        let sortCol = this.options.sortColumn || "created_at";
         const rows = await (0, ent_1.loadRows)({
             tableName: this.options.loadEntOptions.tableName,
             fields: this.options.loadEntOptions.fields,
             clause: (0, clause_1.AndOptional)(this.clause, options.clause),
-            orderby: (0, query_loader_1.getOrderBy)(sortCol, options?.orderby),
+            orderby: (0, query_loader_1.getOrderBy)(this.getSortCol(), options?.orderby),
             limit: options?.limit || ent_1.DefaultLimit,
             context: this.viewer.context,
         });

package/core/query/custom_query.d.ts

@@ -15,6 +15,7 @@ export interface CustomEdgeQueryOptions<TSource extends Ent<TViewer>, TDest exte
     clause?: Clause;
     name: string;
     sortColumn?: string;
+    sortColumnUnique?: boolean;
     disableTransformations?: boolean;
 }
 export declare abstract class CustomEdgeQueryBase<TSource extends Ent<TViewer>, TDest extends Ent<TViewer>, TViewer extends Viewer = Viewer> extends BaseEdgeQuery<TSource, TDest, Data> implements EdgeQuery<TSource, TDest, Data> {
@@ -23,15 +24,14 @@ export declare abstract class CustomEdgeQueryBase<TSource extends Ent<TViewer>,
     private id;
     private opts;
     constructor(viewer: TViewer, options: CustomEdgeQueryOptionsDeprecated<TSource, TDest, TViewer> | CustomEdgeQueryOptions<TSource, TDest, TViewer>);
+    getTableName(): string;
     abstract sourceEnt(id: ID): Promise<Ent | null>;
     private idVisible;
-    private isDeprecatedOptions;
     private getCountLoader;
     private getQueryLoader;
     queryRawCount(): Promise<number>;
     queryAllRawCount(): Promise<Map<ID, number>>;
     protected loadRawIDs(addID: (src: ID | TSource) => void): Promise<void>;
-    private getLoadEntOptions;
     protected loadRawData(infos: IDInfo[], options: EdgeQueryableDataOptions): Promise<void>;
     dataToID(edge: Data): ID;
     protected loadEntsFromEdges(id: ID, rows: Data[]): Promise<TDest[]>;

package/core/query/custom_query.js

@@ -45,20 +45,42 @@ function getQueryLoader(viewer, opts, options) {
         toPrime: [loader],
     }, options, viewer.context);
 }
+function isDeprecatedOptions(options) {
+    return (options
+        .countLoaderFactory !== undefined);
+}
 class CustomEdgeQueryBase extends query_1.BaseEdgeQuery {
     constructor(viewer, options) {
-        // @ts-ignore
-        super(viewer, options?.sortColumn || "created_at");
+        let opts;
+        let defaultSort = "id";
+        let uniqueColIsSort = false;
+        if (isDeprecatedOptions(options)) {
+            opts = options.options;
+        }
+        else {
+            opts = options.loadEntOptions;
+            if (options.sortColumnUnique) {
+                uniqueColIsSort = true;
+            }
+        }
+        let uniqueCol = opts.loaderFactory.options?.key || "id";
+        if (uniqueColIsSort) {
+            uniqueCol = options.sortColumn || defaultSort;
+        }
+        options.sortColumn = options.sortColumn || defaultSort;
+        super(viewer, options.sortColumn, uniqueCol);
         this.viewer = viewer;
         this.options = options;
-        options.sortColumn = options.sortColumn || "created_at";
         if (typeof options.src === "object") {
             this.id = options.src.id;
         }
         else {
             this.id = options.src;
         }
-        this.opts = this.getLoadEntOptions();
+        this.opts = opts;
+    }
+    getTableName() {
+        return this.opts.tableName;
     }
     async idVisible() {
         const ids = await this.genIDInfosToFetch();
@@ -67,18 +89,14 @@ class CustomEdgeQueryBase extends query_1.BaseEdgeQuery {
         }
         return !ids[0].invalidated;
     }
-    isDeprecatedOptions(options) {
-        return (options
-            .countLoaderFactory !== undefined);
-    }
     getCountLoader() {
-        if (this.isDeprecatedOptions(this.options)) {
+        if (isDeprecatedOptions(this.options)) {
             return this.options.countLoaderFactory.createLoader(this.viewer.context);
         }
         return getRawCountLoader(this.viewer, this.options);
     }
     getQueryLoader(options) {
-        if (this.isDeprecatedOptions(this.options)) {
+        if (isDeprecatedOptions(this.options)) {
             return this.options.dataLoaderFactory.createConfigurableLoader(options, this.viewer.context);
         }
         return getQueryLoader(this.viewer, this.options, options);
@@ -101,22 +119,12 @@ class CustomEdgeQueryBase extends query_1.BaseEdgeQuery {
     async loadRawIDs(addID) {
         addID(this.options.src);
     }
-    getLoadEntOptions() {
-        let opts;
-        if (this.isDeprecatedOptions(this.options)) {
-            opts = this.options.options;
-        }
-        else {
-            opts = this.options.loadEntOptions;
-        }
-        return opts;
-    }
     async loadRawData(infos, options) {
         if (infos.length !== 1) {
             throw new Error(`expected 1 info passed to loadRawData. ${infos.length} passed`);
         }
         if (!options.orderby) {
-            options.orderby = `${this.options.sortColumn} DESC`;
+            options.orderby = `${this.getSortCol()} DESC`;
         }
         if (!options.limit) {
             options.limit = ent_1.DefaultLimit;

package/core/query/query.d.ts

@@ -20,7 +20,7 @@ export interface EdgeQuery<TSource extends Ent, TDest extends Ent, TEdge extends
 }
 export interface EdgeQueryFilter<T extends Data> {
     filter?(id: ID, edges: T[]): T[];
-    query?(options: EdgeQueryableDataOptions): EdgeQueryableDataOptions;
+    query?(options: EdgeQueryableDataOptions): EdgeQueryableDataOptions | Promise<EdgeQueryableDataOptions>;
     paginationInfo?(id: ID): PaginationInfo | undefined;
 }
 export interface PaginationInfo {
@@ -31,7 +31,6 @@ export interface PaginationInfo {
 }
 export declare abstract class BaseEdgeQuery<TSource extends Ent, TDest extends Ent, TEdge extends Data> implements EdgeQuery<TSource, TDest, TEdge> {
     viewer: Viewer;
-    private sortCol;
     private filters;
     private queryDispatched;
     protected edges: Map<ID, TEdge[]>;
@@ -40,7 +39,11 @@ export declare abstract class BaseEdgeQuery<TSource extends Ent, TDest extends E
     protected genIDInfosToFetch: () => Promise<IDInfo[]>;
     private idMap;
     private idsToFetch;
-    constructor(viewer: Viewer, sortCol: string);
+    private sortCol;
+    private cursorCol;
+    private defaultDirection?;
+    constructor(viewer: Viewer, sortCol: string, cursorCol: string);
+    protected getSortCol(): string;
     getPrivacyPolicy(): PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
     abstract sourceEnt(id: ID): Promise<Ent | null>;
     first(n: number, after?: string): this;
@@ -64,6 +67,7 @@ export declare abstract class BaseEdgeQuery<TSource extends Ent, TDest extends E
     protected abstract loadRawIDs(addID: (src: ID | TSource) => void): Promise<void>;
     protected abstract loadRawData(infos: IDInfo[], options: EdgeQueryableDataOptions): Promise<void>;
     private addID;
+    abstract getTableName(): string | Promise<string>;
     protected genIDInfosToFetchImpl(): Promise<IDInfo[]>;
     private loadEdges;
     getCursor(row: TEdge): string;