@snowtop/ent 0.1.0-alpha160-test7 → 0.1.0-alpha161-test1

package/{dist/core → core}/query/assoc_query.d.ts

@@ -24,6 +24,9 @@ export declare abstract class AssocEdgeQueryBase<TSource extends Ent<TViewer>, T
     protected loadRawData(infos: IDInfo[], options: EdgeQueryableDataOptions): Promise<void>;
     queryID2(id2: ID): Promise<TEdge | undefined>;
     queryAllID2(id2: ID): Promise<Map<ID, TEdge>>;
+    __beforeBETA(time: Date): this;
+    __afterBETA(time: Date): this;
+    __withinBeta(start: Date, end: Date): this;
 }
 export interface EdgeQueryCtr<TSource extends Ent, TDest extends Ent, TEdge extends AssocEdge> {
     new (viewer: Viewer, src: EdgeQuerySource<TSource>): EdgeQuery<TSource, TDest, TEdge>;

package/{dist/core → core}/query/assoc_query.js

@@ -1,8 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssocEdgeQueryBase = void 0;
 const ent_1 = require("../ent");
 const query_1 = require("./query");
+const clause = __importStar(require("../clause"));
 // would be nice to someday have an API for assoc asc
 class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
     constructor(viewer, src, countLoaderFactory, dataLoaderFactory, 
@@ -150,5 +174,52 @@ class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
         }));
         return m;
     }
+    __beforeBETA(time) {
+        this.__assertNoFiltersBETA("before");
+        this.__addCustomFilterBETA(new BeforeFilter(time));
+        return this;
+    }
+    __afterBETA(time) {
+        this.__assertNoFiltersBETA("after");
+        this.__addCustomFilterBETA(new AfterFilter(time));
+        return this;
+    }
+    // start is inclusive, end is exclusive
+    __withinBeta(start, end) {
+        this.__assertNoFiltersBETA("after");
+        this.__addCustomFilterBETA(new WithinFilter(start, end));
+        return this;
+    }
 }
 exports.AssocEdgeQueryBase = AssocEdgeQueryBase;
+class BeforeFilter {
+    constructor(time) {
+        this.time = time;
+    }
+    query(options) {
+        const cls = clause.Less("time", this.time);
+        options.clause = clause.AndOptional(options.clause, cls);
+        return options;
+    }
+}
+class AfterFilter {
+    constructor(time) {
+        this.time = time;
+    }
+    query(options) {
+        const cls = clause.Greater("time", this.time);
+        options.clause = clause.AndOptional(options.clause, cls);
+        return options;
+    }
+}
+class WithinFilter {
+    constructor(start, end) {
+        this.start = start;
+        this.end = end;
+    }
+    query(options) {
+        const cls = clause.And(clause.GreaterEq("time", this.start), clause.Less("time", this.end));
+        options.clause = clause.AndOptional(options.clause, cls);
+        return options;
+    }
+}

package/{dist/core → core}/query/query.d.ts

@@ -47,12 +47,15 @@ export declare abstract class BaseEdgeQuery<TSource extends Ent, TDest extends E
     private sortCol;
     private cursorCol;
     private edgeQueryOptions;
+    private limitAdded;
     constructor(viewer: Viewer, sortCol: string, cursorCol: string);
     constructor(viewer: Viewer, options: EdgeQueryOptions);
     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;
+    __addCustomFilterBETA(filter: EdgeQueryFilter<TEdge>): void;
+    protected __assertNoFiltersBETA(name: string): void;
     last(n: number, before?: string): this;
     private querySingleEdge;
     readonly queryEdges: () => Promise<TEdge[]>;

package/{dist/core → core}/query/query.js

@@ -110,7 +110,7 @@ class FirstFilter {
                 const res = this.edgeQuery.getTableName();
                 const tableName = (0, types_1.isPromise)(res) ? await res : res;
                 // inner col time
-                options.clause = clause.PaginationMultipleColsSubQuery(this.sortCol, less ? "<" : ">", tableName, this.options.cursorCol, this.offset);
+                options.clause = clause.AndOptional(options.clause, clause.PaginationMultipleColsSubQuery(this.sortCol, less ? "<" : ">", tableName, this.options.cursorCol, this.offset));
             }
         }
         else {
@@ -119,7 +119,7 @@ class FirstFilter {
                 let val = this.options.sortColTime
                     ? new Date(this.offset).toISOString()
                     : this.offset;
-                options.clause = clauseFn(this.sortCol, val);
+                options.clause = clause.AndOptional(options.clause, clauseFn(this.sortCol, val));
             }
         }
         options.orderby = orderby;
@@ -177,7 +177,7 @@ class LastFilter {
             const tableName = (0, types_1.isPromise)(res) ? await res : res;
             if (this.offset) {
                 // inner col time
-                options.clause = clause.PaginationMultipleColsSubQuery(this.sortCol, greater ? ">" : "<", tableName, this.options.cursorCol, this.offset);
+                options.clause = clause.AndOptional(options.clause, clause.PaginationMultipleColsSubQuery(this.sortCol, greater ? ">" : "<", tableName, this.options.cursorCol, this.offset));
             }
             // we also sort cursor col in same direction. (direction doesn't matter)
             orderby.push({
@@ -191,7 +191,7 @@ class LastFilter {
                 let val = this.options.sortColTime
                     ? new Date(this.offset).toISOString()
                     : this.offset;
-                options.clause = clauseFn(this.sortCol, val);
+                options.clause = clause.AndOptional(options.clause, clauseFn(this.sortCol, val));
             }
         }
         options.orderby = orderby;
@@ -209,6 +209,7 @@ class BaseEdgeQuery {
         this.pagination = new Map();
         this.idMap = new Map();
         this.idsToFetch = [];
+        this.limitAdded = false;
         // this is basically just raw rows
         this.queryEdges = async () => {
             return await this.querySingleEdge("queryEdges");
@@ -306,6 +307,7 @@ class BaseEdgeQuery {
         return privacy_1.AlwaysAllowPrivacyPolicy;
     }
     first(n, after) {
+        this.limitAdded = true;
         this.assertQueryNotDispatched("first");
         this.filters.push(new FirstFilter({
             limit: n,
@@ -317,7 +319,18 @@ class BaseEdgeQuery {
         }));
         return this;
     }
+    // API subject to change
+    // TODO https://github.com/lolopinto/ent/issues/685
+    __addCustomFilterBETA(filter) {
+        this.filters.push(filter);
+    }
+    __assertNoFiltersBETA(name) {
+        if (this.filters.length !== 0) {
+            throw new Error(`${name} must be the first filter called`);
+        }
+    }
     last(n, before) {
+        this.limitAdded = true;
         this.assertQueryNotDispatched("last");
         this.filters.push(new LastFilter({
             limit: n,
@@ -378,8 +391,9 @@ class BaseEdgeQuery {
     }
     async loadEdges() {
         const idsInfo = await this.genIDInfosToFetch();
-        if (!this.filters.length) {
-            // if no filter, we add the firstN filter to ensure we get pagination info
+        // we need first even if other filters are included...
+        if (!this.limitAdded) {
+            // if no limit filter, we add the firstN filter to ensure we get pagination info
             this.first((0, ent_1.getDefaultLimit)());
         }
         let options = this._defaultEdgeQueryableOptions ?? {};

package/core/query/shared_assoc_test.d.ts

@@ -0,0 +1,2 @@
+import { MockLogs } from "../../testutils/mock_log";
+export declare function assocTests(ml: MockLogs, global?: boolean): void;