@snowtop/ent 0.1.0-alpha142 → 0.1.0-alpha143

package/core/config.d.ts

@@ -18,8 +18,11 @@ export interface Config {
     dbFile?: string;
     db?: Database | DBDict;
     log?: logType | logType[];
-    codegen?: CodegenConfig;
     logQueryWithError?: boolean;
+    defaultConnectionLimit?: number;
+}
+export interface ConfigWithCodegen extends Config {
+    codegen?: CodegenConfig;
     customGraphQLJSONPath?: string;
     dynamicScriptCustomGraphQLJSONPath?: string;
     globalSchemaPath?: string;

package/core/config.js

@@ -62,6 +62,9 @@ function setConfig(cfg) {
         });
     }
     (0, ent_1.___setLogQueryErrorWithError)(cfg.logQueryWithError);
+    if (cfg.defaultConnectionLimit) {
+        (0, ent_1.setDefaultLimit)(cfg.defaultConnectionLimit);
+    }
 }
 function isBuffer(b) {
     return b.write !== undefined;

package/core/ent.d.ts

@@ -131,7 +131,8 @@ interface loadEdgesOptions {
 interface loadCustomEdgesOptions<T extends AssocEdge> extends loadEdgesOptions {
     ctr: AssocEdgeConstructor<T>;
 }
-export declare const DefaultLimit = 1000;
+export declare function setDefaultLimit(limit: number): void;
+export declare function getDefaultLimit(): number;
 export declare function loadEdges(options: loadEdgesOptions): Promise<AssocEdge[]>;
 export declare function getEdgeClauseAndFields(cls: clause.Clause, options: Pick<loadEdgesOptions, "disableTransformations">): {
     cls: clause.Clause<Data, string | number>;

package/core/ent.js

@@ -26,7 +26,7 @@ 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.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.DefaultLimit = 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;
+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"));
@@ -955,8 +955,15 @@ const edgeFields = [
     "time",
     "data",
 ];
-exports.DefaultLimit = 1000;
-// TODO default limit from somewhere
+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) {
@@ -965,7 +972,7 @@ function defaultEdgeQueryOptions(id1, edgeType, id2) {
     return {
         clause: cls,
         orderby: "time DESC",
-        limit: exports.DefaultLimit,
+        limit: defaultLimit,
     };
 }
 async function loadEdges(options) {

package/core/loaders/assoc_edge_loader.js

@@ -61,7 +61,7 @@ function createLoader(options, edgeType, edgeCtr, edgeData) {
         }
         options.orderby = options.orderby || "time DESC";
         // TODO defaultEdgeQueryOptions
-        options.limit = options.limit || ent_1.DefaultLimit;
+        options.limit = options.limit || (0, ent_1.getDefaultLimit)();
         const tableName = edgeData.edgeTable;
         const { cls: cls1, fields } = (0, ent_1.getEdgeClauseAndFields)(clause.Eq("edge_type", edgeType), {});
         const [query, cls] = (0, ent_1.buildGroupQuery)({
@@ -69,7 +69,7 @@ function createLoader(options, edgeType, edgeCtr, edgeData) {
             fields,
             values: keys,
             orderby: options.orderby,
-            limit: options.limit || ent_1.DefaultLimit,
+            limit: options.limit || (0, ent_1.getDefaultLimit)(),
             groupColumn: "id1",
             clause: cls1,
         });

package/core/loaders/query_loader.js

@@ -67,7 +67,7 @@ async function simpleCase(options, id, queryOptions) {
         ...options,
         clause: cls,
         orderby: getOrderBy(sortCol, queryOptions?.orderby),
-        limit: queryOptions?.limit || ent_1.DefaultLimit,
+        limit: queryOptions?.limit || (0, ent_1.getDefaultLimit)(),
     });
 }
 function createLoader(options, queryOptions) {
@@ -110,7 +110,7 @@ function createLoader(options, queryOptions) {
             fields: options.fields,
             values: keys,
             orderby: getOrderBy(sortCol, queryOptions?.orderby),
-            limit: queryOptions?.limit || ent_1.DefaultLimit,
+            limit: queryOptions?.limit || (0, ent_1.getDefaultLimit)(),
             groupColumn: col,
             clause: extraClause,
         });

package/core/query/custom_clause_query.js

@@ -62,14 +62,14 @@ class CustomClauseQuery extends query_1.BaseEdgeQuery {
             options.orderby = `${this.options.sortColumn} ${direction}`;
         }
         if (!options.limit) {
-            options.limit = ent_1.DefaultLimit;
+            options.limit = (0, ent_1.getDefaultLimit)();
         }
         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)(this.getSortCol(), options?.orderby),
-            limit: options?.limit || ent_1.DefaultLimit,
+            limit: options?.limit || (0, ent_1.getDefaultLimit)(),
             context: this.viewer.context,
         });
         this.edges.set(1, rows);

package/core/query/custom_query.js

@@ -127,7 +127,7 @@ class CustomEdgeQueryBase extends query_1.BaseEdgeQuery {
             options.orderby = `${this.getSortCol()} DESC`;
         }
         if (!options.limit) {
-            options.limit = ent_1.DefaultLimit;
+            options.limit = (0, ent_1.getDefaultLimit)();
         }
         const loader = this.getQueryLoader(options);
         const info = infos[0];

package/core/query/query.js

@@ -351,7 +351,7 @@ class BaseEdgeQuery {
         const idsInfo = await this.genIDInfosToFetch();
         if (!this.filters.length) {
             // if no filter, we add the firstN filter to ensure we get pagination info
-            this.first(ent_1.DefaultLimit);
+            this.first((0, ent_1.getDefaultLimit)());
         }
         let options = {};
         // TODO once we add a lot of complex filters, this needs to be more complicated

package/core/query/shared_assoc_test.js

@@ -52,7 +52,7 @@ function assocTests(ml, global = false) {
         let execArray = /^SELECT (.+) FROM (.+) WHERE (.+)?/.exec(query.query);
         return execArray?.[3];
     }
-    function verifyQuery({ length = 1, numQueries = 1, limit = ent_1.DefaultLimit, disablePaginationBump = false, }) {
+    function verifyQuery({ length = 1, numQueries = 1, limit = (0, ent_1.getDefaultLimit)(), disablePaginationBump = false, }) {
         expect(ml.logs.length).toBe(length);
         for (let i = 0; i < numQueries; i++) {
             const whereClause = getWhereClause(ml.logs[i]);
@@ -118,7 +118,7 @@ function assocTests(ml, global = false) {
             verifyQuery({
                 length: this.dataz.length,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         // rawCount isn't affected by filters...
@@ -141,7 +141,7 @@ function assocTests(ml, global = false) {
             verifyQuery({
                 length: this.dataz.length,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEdges() {
@@ -154,7 +154,7 @@ function assocTests(ml, global = false) {
             verifyQuery({
                 length: this.dataz.length,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEnts() {
@@ -178,7 +178,7 @@ function assocTests(ml, global = false) {
                 // and then twice to fetch all the nodes for the contacts
                 length: this.dataz.length + this.dataz.length + this.dataz.length * 2,
                 numQueries: this.dataz.length,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
     }
@@ -464,7 +464,7 @@ function assocTests(ml, global = false) {
             verifyQuery({
                 length: 1,
                 numQueries: 1,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         // rawCount isn't affected by filters...
@@ -479,7 +479,7 @@ function assocTests(ml, global = false) {
             verifyQuery({
                 length: 1,
                 numQueries: 1,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEdges() {
@@ -500,7 +500,7 @@ function assocTests(ml, global = false) {
             verifyQuery({
                 length: 1,
                 numQueries: 1,
-                limit: this.limit || ent_1.DefaultLimit,
+                limit: this.limit || (0, ent_1.getDefaultLimit)(),
             });
         }
         async testEnts() {
@@ -524,7 +524,7 @@ function assocTests(ml, global = false) {
             //   // 1 for edges, 1 for users, 1 for events
             //   length: 3,
             //   numQueries: 3,
-            //   limit: this.limit || DefaultLimit,
+            //   limit: this.limit || getDefaultLimit(),
             // });
         }
     }

package/core/query/shared_test.js

@@ -147,7 +147,7 @@ const commonTests = (opts) => {
             this.verifyEnts(ents);
         }
     }
-    function verifyQuery(filter, { length = 1, numQueries = 1, limit = ent_1.DefaultLimit, disablePaginationBump = false, orderby = opts.orderby, }) {
+    function verifyQuery(filter, { length = 1, numQueries = 1, limit = (0, ent_1.getDefaultLimit)(), disablePaginationBump = false, orderby = opts.orderby, }) {
         const uniqCol = isCustomQuery(filter) ? "id" : "id2";
         expect(ml.logs.length).toBe(length);
         for (let i = 0; i < numQueries; i++) {
@@ -355,6 +355,68 @@ const commonTests = (opts) => {
             await filter.testDataCache();
         });
     });
+    describe("override default limit", () => {
+        const filter = new TestQueryFilter((q) => {
+            // no filters
+            return q;
+        }, opts.newQuery, (contacts) => {
+            // nothing to do here
+            // reverse because edges are most recent first
+            if (opts.orderby === "DESC") {
+                return contacts.reverse();
+            }
+            return contacts;
+        }, getViewer());
+        const OUR_DEFAULT_LIMIT = 10;
+        beforeAll(async () => {
+            (0, ent_1.setDefaultLimit)(OUR_DEFAULT_LIMIT);
+        });
+        afterAll(async () => {
+            //set it back to real default
+            (0, ent_1.setDefaultLimit)(1000);
+        });
+        beforeEach(async () => {
+            await filter.createData();
+        });
+        test("ids", async () => {
+            await filter.testIDs();
+            verifyQuery(filter, {
+                limit: OUR_DEFAULT_LIMIT,
+            });
+        });
+        test("rawCount", async () => {
+            await filter.testRawCount();
+            verifyCountQuery({});
+        });
+        test("count", async () => {
+            await filter.testCount();
+            verifyQuery(filter, {
+                limit: OUR_DEFAULT_LIMIT,
+            });
+        });
+        test("edges", async () => {
+            await filter.testEdges();
+            verifyQuery(filter, {
+                limit: OUR_DEFAULT_LIMIT,
+            });
+        });
+        test("ents", async () => {
+            await filter.testEnts();
+            verifyQuery(filter, {
+                length: opts.entsLength,
+                limit: OUR_DEFAULT_LIMIT,
+            });
+        });
+        test("all", async () => {
+            await filter.testAll();
+        });
+        test("ents cache", async () => {
+            await filter.testEntsCache();
+        });
+        test("data cache", async () => {
+            await filter.testDataCache();
+        });
+    });
     describe("after delete", () => {
         const filter = new TestQueryFilter((q) => {
             // no filters

package/package.json

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