@snowtop/ent 0.0.22 → 0.0.28-alpha

package/core/query/custom_query.js

@@ -16,16 +16,34 @@ class CustomEdgeQueryBase extends query_1.BaseEdgeQuery {
             this.id = options.src;
         }
     }
+    async idVisible() {
+        const ids = await this.genIDInfosToFetch();
+        if (ids.length !== 1) {
+            throw new Error("invalid number of IDInfo");
+        }
+        return !ids[0].invalidated;
+    }
     async queryRawCount() {
+        const idVisible = await this.idVisible();
+        if (!idVisible) {
+            return 0;
+        }
         return await this.options.countLoaderFactory
             .createLoader(this.viewer.context)
             .load(this.id);
     }
     async queryAllRawCount() {
-        const count = await this.queryRawCount();
+        let count = 0;
+        const idVisible = await this.idVisible();
+        if (idVisible) {
+            count = await this.queryRawCount();
+        }
         return new Map([[this.id, count]]);
     }
-    async loadRawData(options) {
+    async loadRawIDs(addID) {
+        addID(this.options.src);
+    }
+    async loadRawData(infos, options) {
         const loader = this.options.dataLoaderFactory.createConfigurableLoader(options, this.viewer.context);
         if (!options.orderby) {
             options.orderby = `${this.options.sortColumn} DESC`;
@@ -33,6 +51,14 @@ class CustomEdgeQueryBase extends query_1.BaseEdgeQuery {
         if (!options.limit) {
             options.limit = ent_1.DefaultLimit;
         }
+        if (infos.length !== 1) {
+            throw new Error(`expected 1 info passed to loadRawData. ${infos.length} passed`);
+        }
+        const info = infos[0];
+        if (info.invalidated) {
+            this.edges.set(this.id, []);
+            return;
+        }
         const rows = await loader.load(this.id);
         this.edges.set(this.id, rows);
     }

package/core/query/query.d.ts

@@ -1,4 +1,4 @@
-import { ID, Ent, Viewer, EdgeQueryableDataOptions, Data } from "../base";
+import { ID, Ent, Viewer, EdgeQueryableDataOptions, Data, PrivacyPolicy } from "../base";
 export interface EdgeQuery<TSource extends Ent, TDest extends Ent, TEdge extends Data> {
     queryEdges(): Promise<TEdge[]>;
     queryAllEdges(): Promise<Map<ID, TEdge[]>>;
@@ -15,6 +15,8 @@ export interface EdgeQuery<TSource extends Ent, TDest extends Ent, TEdge extends
     paginationInfo(): Map<ID, PaginationInfo>;
     getCursor(row: TEdge): string;
     dataToID(edge: TEdge): ID;
+    getPrivacyPolicy(): PrivacyPolicy;
+    sourceEnt(id: ID): Promise<Ent | null>;
 }
 export interface EdgeQueryFilter<T extends Data> {
     filter?(id: ID, edges: T[]): T[];
@@ -27,7 +29,7 @@ export interface PaginationInfo {
     startCursor: string;
     endCursor: string;
 }
-export declare abstract class BaseEdgeQuery<TDest extends Ent, TEdge extends Data> {
+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;
@@ -35,11 +37,18 @@ export declare abstract class BaseEdgeQuery<TDest extends Ent, TEdge extends Dat
     protected edges: Map<ID, TEdge[]>;
     private pagination;
     private memoizedloadEdges;
+    protected genIDInfosToFetch: () => Promise<IDInfo[]>;
+    private idMap;
+    private idsToFetch;
     constructor(viewer: Viewer, sortCol: string);
+    getPrivacyPolicy(): PrivacyPolicy;
+    abstract sourceEnt(id: ID): Promise<Ent | null>;
     first(n: number, after?: string): this;
     last(n: number, before?: string): this;
     private querySingleEdge;
     readonly queryEdges: () => Promise<TEdge[]>;
+    abstract queryRawCount(): Promise<number>;
+    abstract queryAllRawCount(): Promise<Map<ID, number>>;
     readonly queryAllEdges: () => Promise<Map<ID, TEdge[]>>;
     abstract dataToID(edge: TEdge): ID;
     readonly queryIDs: () => Promise<ID[]>;
@@ -52,7 +61,14 @@ export declare abstract class BaseEdgeQuery<TDest extends Ent, TEdge extends Dat
     paginationInfo(): Map<ID, PaginationInfo>;
     private assertQueryDispatched;
     private assertQueryNotDispatched;
-    protected abstract loadRawData(options: EdgeQueryableDataOptions): Promise<void>;
+    protected abstract loadRawIDs(addID: (src: ID | TSource) => void): Promise<void>;
+    protected abstract loadRawData(infos: IDInfo[], options: EdgeQueryableDataOptions): Promise<void>;
+    private addID;
+    protected genIDInfosToFetchImpl(): Promise<IDInfo[]>;
     private loadEdges;
     getCursor(row: TEdge): string;
 }
+export interface IDInfo {
+    id: ID;
+    invalidated?: boolean;
+}

package/core/query/query.js

@@ -26,6 +26,7 @@ exports.BaseEdgeQuery = void 0;
 const ent_1 = require("../ent");
 const clause = __importStar(require("../clause"));
 const memoizee_1 = __importDefault(require("memoizee"));
+const privacy_1 = require("../privacy");
 // TODO can we generalize EdgeQuery to support any clause
 function assertPositive(n) {
     if (n < 0) {
@@ -173,6 +174,8 @@ class BaseEdgeQuery {
         this.filters = [];
         this.edges = new Map();
         this.pagination = new Map();
+        this.idMap = new Map();
+        this.idsToFetch = [];
         // this is basically just raw rows
         this.queryEdges = async () => {
             return await this.querySingleEdge("queryEdges");
@@ -224,6 +227,11 @@ class BaseEdgeQuery {
             return results;
         };
         this.memoizedloadEdges = (0, memoizee_1.default)(this.loadEdges.bind(this));
+        this.genIDInfosToFetch = (0, memoizee_1.default)(this.genIDInfosToFetchImpl.bind(this));
+    }
+    getPrivacyPolicy() {
+        // default PrivacyPolicy is always allow. nothing to do here
+        return privacy_1.AlwaysAllowPrivacyPolicy;
     }
     first(n, after) {
         this.assertQueryNotDispatched("first");
@@ -269,9 +277,23 @@ class BaseEdgeQuery {
             throw new Error(`cannot call ${str} after query is dispatched`);
         }
     }
+    addID(id) {
+        if (typeof id === "object") {
+            this.idMap.set(id.id, id);
+            this.idsToFetch.push(id.id);
+        }
+        else {
+            this.idsToFetch.push(id);
+        }
+    }
+    async genIDInfosToFetchImpl() {
+        await this.loadRawIDs(this.addID.bind(this));
+        return applyPrivacyPolicyForEdgeQ(this.viewer, this, this.idsToFetch, this.idMap);
+    }
     async loadEdges() {
-        // if no filter, we add the firstN filter to ensure we get pagination info
+        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);
         }
         let options = {};
@@ -283,7 +305,7 @@ class BaseEdgeQuery {
                 options = filter.query(options);
             }
         });
-        await this.loadRawData(options);
+        await this.loadRawData(idsInfo, options);
         // no filters. nothing to do here.
         if (!this.filters.length) {
             return this.edges;
@@ -324,3 +346,18 @@ class BaseEdgeQuery {
     }
 }
 exports.BaseEdgeQuery = BaseEdgeQuery;
+async function applyPrivacyPolicyForEdgeQ(viewer, edgeQ, ids, map) {
+    const result = [];
+    await Promise.all(ids.map(async (id) => {
+        let ent = map.get(id);
+        if (!ent) {
+            ent = await edgeQ.sourceEnt(id);
+        }
+        const r = await (0, privacy_1.applyPrivacyPolicy)(viewer, edgeQ.getPrivacyPolicy(), ent || undefined);
+        result.push({
+            id,
+            invalidated: !r,
+        });
+    }));
+    return result;
+}

package/core/query/shared_assoc_test.js

@@ -92,6 +92,8 @@ function assocTests() {
             expect(query.qs?.whereClause).toBe(`id1 = $1 AND edge_type = $2`);
         }
     }
+    // TODO need to test multi-ids with id1s that aren't visible...
+    // so 2 user's friend requests at the same time
     class MultiIDsTestQueryFilter {
         constructor(filter, ents, limit) {
             this.filter = filter;
@@ -565,5 +567,107 @@ function assocTests() {
             await filter.testEnts();
         });
     });
+    describe("privacy", () => {
+        let user;
+        let friendRequests;
+        let user2;
+        beforeEach(async () => {
+            [user, friendRequests] = await (0, test_helpers_1.createUserPlusFriendRequests)();
+            user2 = await (0, test_helpers_1.createTestUser)();
+        });
+        function getQuery(viewer) {
+            return index_1.UserToIncomingFriendRequestsQuery.query(viewer, user.id);
+        }
+        test("ids", async () => {
+            const ids = await getQuery(user2.viewer).queryIDs();
+            expect(ids.length).toBe(0);
+            const idsFromUser = await getQuery(user.viewer).queryIDs();
+            expect(idsFromUser.length).toBe(friendRequests.length);
+        });
+        test("count", async () => {
+            const count = await getQuery(user2.viewer).queryCount();
+            expect(count).toBe(0);
+            const countFromUser = await getQuery(user.viewer).queryCount();
+            expect(countFromUser).toBe(friendRequests.length);
+        });
+        test("rawCount", async () => {
+            const rawCount = await getQuery(user2.viewer).queryRawCount();
+            expect(rawCount).toBe(0);
+            const rawCountFromUser = await getQuery(user.viewer).queryRawCount();
+            expect(rawCountFromUser).toBe(friendRequests.length);
+        });
+        test("edges", async () => {
+            const edges = await getQuery(user2.viewer).queryEdges();
+            expect(edges.length).toBe(0);
+            const edgesFromUser = await getQuery(user.viewer).queryEdges();
+            expect(edgesFromUser.length).toBe(friendRequests.length);
+        });
+        test("ents", async () => {
+            const ents = await getQuery(user2.viewer).queryEnts();
+            expect(ents.length).toBe(0);
+            const entsFromUser = await getQuery(user.viewer).queryEnts();
+            expect(entsFromUser.length).toBe(0);
+            const entsFromUserVCToken = await getQuery(new index_1.ViewerWithAccessToken(user.id, {
+                tokens: {
+                    allow_incoming_friend_request: true,
+                },
+            })).queryEnts();
+            expect(entsFromUserVCToken.length).toBe(friendRequests.length);
+        });
+    });
+    describe("multi-ids privacy", () => {
+        let user;
+        let friendRequests;
+        let user2;
+        let friendRequests2;
+        beforeEach(async () => {
+            [user, friendRequests] = await (0, test_helpers_1.createUserPlusFriendRequests)();
+            [user2, friendRequests2] = await (0, test_helpers_1.createUserPlusFriendRequests)();
+        });
+        function getQuery(viewer) {
+            return index_1.UserToIncomingFriendRequestsQuery.query(viewer || user.viewer, [
+                user.id,
+                user2.id,
+            ]);
+        }
+        test("ids", async () => {
+            const idsMap = await getQuery().queryAllIDs();
+            expect(idsMap.size).toBe(2);
+            expect(idsMap.get(user.id)?.length).toBe(friendRequests.length);
+            expect(idsMap.get(user2.id)?.length).toBe(0);
+        });
+        test("count", async () => {
+            const countMap = await getQuery().queryAllCount();
+            expect(countMap.size).toBe(2);
+            expect(countMap.get(user.id)).toBe(friendRequests.length);
+            expect(countMap.get(user2.id)).toBe(0);
+        });
+        test("count", async () => {
+            const countMap = await getQuery().queryAllRawCount();
+            expect(countMap.size).toBe(2);
+            expect(countMap.get(user.id)).toBe(friendRequests.length);
+            expect(countMap.get(user2.id)).toBe(0);
+        });
+        test("edges", async () => {
+            const edgesMap = await getQuery().queryAllEdges();
+            expect(edgesMap.size).toBe(2);
+            expect(edgesMap.get(user.id)?.length).toBe(friendRequests.length);
+            expect(edgesMap.get(user2.id)?.length).toBe(0);
+        });
+        test("ents", async () => {
+            const entsMap = await getQuery().queryAllEnts();
+            expect(entsMap.size).toBe(2);
+            expect(entsMap.get(user.id)?.length).toBe(0);
+            expect(entsMap.get(user2.id)?.length).toBe(0);
+            const entsMapFromUserVCToken = await getQuery(new index_1.ViewerWithAccessToken(user.id, {
+                tokens: {
+                    allow_incoming_friend_request: true,
+                },
+            })).queryAllEnts();
+            expect(entsMapFromUserVCToken.size).toBe(2);
+            expect(entsMapFromUserVCToken.get(user.id)?.length).toBe(friendRequests.length);
+            expect(entsMapFromUserVCToken.get(user2.id)?.length).toBe(0);
+        });
+    });
 }
 exports.assocTests = assocTests;

package/core/viewer.js

@@ -4,6 +4,7 @@ exports.IDViewer = exports.LoggedOutViewer = void 0;
 class LoggedOutViewer {
     constructor(context) {
         this.context = context;
+        this.viewerID = null;
     }
     async viewer() {
         return null;

package/imports/index.d.ts

@@ -10,7 +10,7 @@ interface classResult {
     class: classInfo;
     file: file;
 }
-export declare function parseCustomInput(filePath: string, opts?: Options): PathResult;
+export declare function parseCustomImports(filePath: string, opts?: Options): PathResult;
 export declare function findTSConfigFile(filePath: string): string | null;
 export interface importInfo {
     name: string;

package/imports/index.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTSConfigFile = exports.parseCustomInput = void 0;
+exports.findTSConfigFile = exports.parseCustomImports = void 0;
 const glob_1 = __importDefault(require("glob"));
 const typescript_1 = __importDefault(require("typescript"));
 const json5_1 = __importDefault(require("json5"));
@@ -42,10 +42,9 @@ function getFiles(filePath, opts) {
     }
     return files;
 }
-function parseCustomInput(filePath, opts) {
+function parseCustomImports(filePath, opts) {
     const files = getFiles(filePath, opts);
     const options = readCompilerOptions(filePath);
-    // classMap
     let classMap = new Map();
     files.forEach((file) => {
         const sourceFile = typescript_1.default.createSourceFile(file, fs.readFileSync(file).toString(), options.target || typescript_1.default.ScriptTarget.ES2015);
@@ -77,7 +76,7 @@ function parseCustomInput(filePath, opts) {
         },
     };
 }
-exports.parseCustomInput = parseCustomInput;
+exports.parseCustomImports = parseCustomImports;
 function findTSConfigFile(filePath) {
     while (filePath != "/") {
         let configPath = `${filePath}/tsconfig.json`;
@@ -95,7 +94,6 @@ function readCompilerOptions(filePath) {
     if (!configPath) {
         return {};
     }
-    const root = path.join(filePath, "..");
     let json = {};
     try {
         json = json5_1.default.parse(fs.readFileSync(configPath, {

package/index.d.ts

@@ -3,7 +3,7 @@ export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuer
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };
-export { EntPrivacyError, AlwaysAllowRule, AlwaysDenyRule, DenyIfLoggedInRule, DenyIfLoggedOutRule, AllowIfHasIdentity, AllowIfViewerRule, AllowIfFuncRule, AllowIfViewerIsRule, AllowIfViewerEqualsRule, DenyIfViewerEqualsRule, AllowIfEdgeExistsRule, AllowIfViewerInboundEdgeExistsRule, AllowIfViewerOutboundEdgeExistsRule, DenyIfEdgeExistsRule, DenyIfViewerInboundEdgeExistsRule, DenyIfViewerOutboundEdgeExistsRule, DenyIfEdgeDoesNotExistRule, DenyIfViewerInboundEdgeDoesNotExistRule, DenyIfViewerOutboundEdgeDoesNotExistRule, AllowIfEntIsVisibleRule, AllowIfEntIsNotVisibleRule, DenyIfEntIsVisibleRule, DenyIfEntIsNotVisibleRule, AllowIfEntIsVisiblePolicy, DenyIfEntIsVisiblePolicy, DelayedResultRule, applyPrivacyPolicy, applyPrivacyPolicyX, AlwaysAllowPrivacyPolicy, AlwaysDenyPrivacyPolicy, AllowIfConditionAppliesRule, AllowIfSubPolicyAllowsRule, AllowIfViewerPrivacyPolicy, AllowIfViewerHasIdentityPrivacyPolicy, } from "./core/privacy";
+export { EntPrivacyError, AlwaysAllowRule, AlwaysDenyRule, DenyIfLoggedInRule, DenyIfLoggedOutRule, AllowIfHasIdentity, AllowIfViewerRule, AllowIfFuncRule, AllowIfViewerIsRule, AllowIfViewerIsEntPropertyRule, AllowIfEntPropertyIsRule, DenyIfEntPropertyIsRule, AllowIfViewerEqualsRule, DenyIfViewerEqualsRule, AllowIfEdgeExistsRule, AllowIfViewerInboundEdgeExistsRule, AllowIfViewerOutboundEdgeExistsRule, DenyIfEdgeExistsRule, DenyIfViewerInboundEdgeExistsRule, DenyIfViewerOutboundEdgeExistsRule, DenyIfEdgeDoesNotExistRule, DenyIfViewerInboundEdgeDoesNotExistRule, DenyIfViewerOutboundEdgeDoesNotExistRule, AllowIfEntIsVisibleRule, AllowIfEntIsNotVisibleRule, DenyIfEntIsVisibleRule, DenyIfEntIsNotVisibleRule, AllowIfEntIsVisiblePolicy, DenyIfEntIsVisiblePolicy, DelayedResultRule, applyPrivacyPolicy, applyPrivacyPolicyX, AlwaysAllowPrivacyPolicy, AlwaysDenyPrivacyPolicy, AllowIfConditionAppliesRule, AllowIfSubPolicyAllowsRule, AllowIfViewerPrivacyPolicy, AllowIfViewerHasIdentityPrivacyPolicy, } from "./core/privacy";
 export * from "./core/query";
 export * from "./schema/";
 import * as q from "./core/clause";

package/index.js

@@ -25,8 +25,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.applyPrivacyPolicyForEntX = exports.applyPrivacyPolicyForEnt = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
-exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = void 0;
+exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.applyPrivacyPolicyForEntX = exports.applyPrivacyPolicyForEnt = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
+exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = void 0;
 __exportStar(require("./core/base"), exports);
 var ent_1 = require("./core/ent");
 Object.defineProperty(exports, "loadEnt", { enumerable: true, get: function () { return ent_1.loadEnt; } });
@@ -73,6 +73,9 @@ Object.defineProperty(exports, "AllowIfHasIdentity", { enumerable: true, get: fu
 Object.defineProperty(exports, "AllowIfViewerRule", { enumerable: true, get: function () { return privacy_1.AllowIfViewerRule; } });
 Object.defineProperty(exports, "AllowIfFuncRule", { enumerable: true, get: function () { return privacy_1.AllowIfFuncRule; } });
 Object.defineProperty(exports, "AllowIfViewerIsRule", { enumerable: true, get: function () { return privacy_1.AllowIfViewerIsRule; } });
+Object.defineProperty(exports, "AllowIfViewerIsEntPropertyRule", { enumerable: true, get: function () { return privacy_1.AllowIfViewerIsEntPropertyRule; } });
+Object.defineProperty(exports, "AllowIfEntPropertyIsRule", { enumerable: true, get: function () { return privacy_1.AllowIfEntPropertyIsRule; } });
+Object.defineProperty(exports, "DenyIfEntPropertyIsRule", { enumerable: true, get: function () { return privacy_1.DenyIfEntPropertyIsRule; } });
 Object.defineProperty(exports, "AllowIfViewerEqualsRule", { enumerable: true, get: function () { return privacy_1.AllowIfViewerEqualsRule; } });
 Object.defineProperty(exports, "DenyIfViewerEqualsRule", { enumerable: true, get: function () { return privacy_1.DenyIfViewerEqualsRule; } });
 Object.defineProperty(exports, "AllowIfEdgeExistsRule", { enumerable: true, get: function () { return privacy_1.AllowIfEdgeExistsRule; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.0.22",
+  "version": "0.0.28-alpha",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "@types/node": "^15.0.2",
+    "camel-case": "^4.1.2",
     "dataloader": "^2.0.0",
     "glob": "^7.1.6",
     "graph-data-structure": "^1.12.0",
@@ -30,7 +31,7 @@
   },
   "peerDependencies": {
     "better-sqlite3": "^7.4.1",
-    "graphql": ">= 15.3.0"
+    "graphql": "^15.5"
   },
   "peerDependenciesMeta": {
     "better-sqlite3": {
@@ -52,9 +53,6 @@
     "type": "git",
     "url": "git+ssh://git@github.com/lolopinto/ent.git"
   },
-  "resolutions": {
-    "graphql": "^15.3.0"
-  },
   "bugs": {
     "url": "https://github.com/lolopinto/ent/issues"
   },

package/schema/field.d.ts

@@ -1,4 +1,4 @@
-import { Type, Field, FieldOptions, PolymorphicOptions, ForeignKey } from "./schema";
+import { Field, FieldOptions, ForeignKey, PolymorphicOptions, Type } from "./schema";
 export declare abstract class BaseField {
     name: string;
     nullable?: boolean;
@@ -21,10 +21,23 @@ export declare class UUIDField extends BaseField implements Field {
     constructor(options: FieldOptions);
 }
 export declare function UUIDType(options: FieldOptions): UUIDField;
+export interface IntegerOptions extends FieldOptions {
+    min?: number;
+    max?: number;
+}
 export declare class IntegerField extends BaseField implements Field {
     type: Type;
+    private validators;
+    private options;
+    constructor(options?: IntegerOptions);
+    getOptions(): IntegerOptions;
+    private handleOptions;
+    min(l: number): this;
+    max(l: number): this;
+    valid(val: any): boolean;
+    validate(validator: (str: number) => boolean): this;
 }
-export declare function IntegerType(options: FieldOptions): IntegerField;
+export declare function IntegerType(options: IntegerOptions): IntegerField;
 export declare class BigIntegerField extends BaseField implements Field {
     type: Type;
 }
@@ -53,23 +66,24 @@ export declare class StringField extends BaseField implements Field {
     type: Type;
     private validators;
     private formatters;
+    private options;
     constructor(options?: StringOptions);
     getOptions(): StringOptions;
     private handleOptions;
-    minLen(l: number): StringField;
-    maxLen(l: number): StringField;
-    length(l: number): StringField;
+    minLen(l: number): this;
+    maxLen(l: number): this;
+    length(l: number): this;
     valid(val: any): boolean;
     format(val: any): any;
-    validate(validator: (str: string) => boolean): StringField;
-    formatter(formatter: (str: string) => string): StringField;
-    match(pattern: string | RegExp): StringField;
-    doesNotMatch(pattern: string | RegExp): StringField;
-    toLowerCase(): StringField;
-    toUpperCase(): StringField;
-    trim(): StringField;
-    trimLeft(): StringField;
-    trimRight(): StringField;
+    validate(validator: (str: string) => boolean): this;
+    formatter(formatter: (str: string) => string): this;
+    match(pattern: string | RegExp): this;
+    doesNotMatch(pattern: string | RegExp): this;
+    toLowerCase(): this;
+    toUpperCase(): this;
+    trim(): this;
+    trimLeft(): this;
+    trimRight(): this;
 }
 export declare function StringType(options: StringOptions): StringField;
 export interface TimestampOptions extends FieldOptions {

package/schema/field.js

@@ -20,10 +20,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UUIDListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.EnumType = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
-const schema_1 = require("./schema");
-const snake_case_1 = require("snake-case");
 const luxon_1 = require("luxon");
+const snake_case_1 = require("snake-case");
 const db_1 = __importStar(require("../core/db"));
+const schema_1 = require("./schema");
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -89,14 +89,52 @@ function UUIDType(options) {
 }
 exports.UUIDType = UUIDType;
 class IntegerField extends BaseField {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         this.type = { dbType: schema_1.DBType.Int };
+        this.validators = [];
+        this.options = { name: "field" };
+        // for legacy callers
+        this.handleOptions(options || this.options);
+    }
+    getOptions() {
+        return this.options;
+    }
+    handleOptions(options) {
+        const params = {
+            min: this.min,
+            max: this.max,
+        };
+        for (const k in params) {
+            const v = options[k];
+            if (v !== undefined) {
+                params[k].apply(this, [v]);
+            }
+        }
+        this.options = options;
+    }
+    min(l) {
+        return this.validate((val) => val >= l);
+    }
+    max(l) {
+        return this.validate((val) => val <= l);
+    }
+    valid(val) {
+        for (const validator of this.validators) {
+            if (!validator(val)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    validate(validator) {
+        this.validators.push(validator);
+        return this;
     }
 }
 exports.IntegerField = IntegerField;
 function IntegerType(options) {
-    let result = new IntegerField();
+    let result = new IntegerField(options);
     return Object.assign(result, options);
 }
 exports.IntegerType = IntegerType;
@@ -142,11 +180,12 @@ class StringField extends BaseField {
         this.type = { dbType: schema_1.DBType.String };
         this.validators = [];
         this.formatters = [];
+        this.options = { name: "field" };
         // for legacy callers
         this.handleOptions(options || { name: "field" });
     }
     getOptions() {
-        return this.getOptions;
+        return this.options;
     }
     handleOptions(options) {
         const noParams = {
@@ -174,6 +213,7 @@ class StringField extends BaseField {
                 noParams[k].apply(this);
             }
         }
+        this.options = options;
     }
     minLen(l) {
         return this.validate((val) => {

package/scripts/custom_graphql.js

@@ -52,7 +52,17 @@ async function readInputs() {
         });
     });
 }
-async function captureCustom(filePath) {
+async function captureCustom(filePath, filesCsv) {
+    if (filesCsv !== undefined) {
+        let files = filesCsv.split(",");
+        for (let i = 0; i < files.length; i++) {
+            // TODO fix. we have "src" in the path we get here
+            files[i] = path.join(filePath, "..", files[i]);
+        }
+        await requireFiles(files);
+        return;
+    }
+    // TODO delete all of this eventually
     // TODO configurable paths eventually
     // for now only files that are in the include path of the roots are allowed
     const rootFiles = [
@@ -81,18 +91,28 @@ async function captureCustom(filePath) {
         ignore: ignore,
     });
     const files = rootFiles.concat(customGQLResolvers, customGQLMutations);
-    //console.log(files);
-    let promises = [];
-    files.forEach((file) => {
+    await requireFiles(files);
+}
+async function requireFiles(files) {
+    await Promise.all(files.map(async (file) => {
         if (fs.existsSync(file)) {
-            promises.push(require(file));
+            try {
+                await require(file);
+            }
+            catch (e) {
+                throw new Error(`${e.message} loading ${file}`);
+            }
+        }
+        else {
+            throw new Error(`file ${file} doesn't exist`);
         }
+    })).catch((err) => {
+        throw new Error(err);
     });
-    await Promise.all(promises);
 }
 async function parseImports(filePath) {
     // only do graphql files...
-    return (0, imports_1.parseCustomInput)(path.join(filePath, "graphql"), {
+    return (0, imports_1.parseCustomImports)(path.join(filePath, "graphql"), {
         ignore: ["**/generated/**", "**/tests/**"],
     });
 }
@@ -126,7 +146,7 @@ async function main() {
     GQLCapture.enable(true);
     const [inputsRead, _, imports] = await Promise.all([
         readInputs(),
-        captureCustom(options.path),
+        captureCustom(options.path, options.files),
         parseImports(options.path),
     ]);
     const { nodes, nodesMap } = inputsRead;

package/testutils/builder.d.ts

@@ -9,6 +9,7 @@ export declare class User implements Ent {
     accountID: string;
     nodeType: string;
     privacyPolicy: import("../core/base").PrivacyPolicy;
+    firstName: string;
     constructor(viewer: Viewer, data: Data);
 }
 export declare class Event implements Ent {