@snowtop/ent 0.1.0-alpha9 → 0.1.0-alpha90

package/core/query/shared_test.js

@@ -6,9 +6,13 @@ const ent_1 = require("../ent");
 const viewer_1 = require("../viewer");
 const index_1 = require("../../testutils/fake_data/index");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
-const test_db_1 = require("../../testutils/db/test_db");
+const temp_db_1 = require("../../testutils/db/temp_db");
 const test_context_1 = require("../../testutils/context/test_context");
 const logger_1 = require("../logger");
+const test_edge_global_schema_1 = require("../../testutils/test_edge_global_schema");
+const builder_1 = require("../../testutils/builder");
+const action_1 = require("../../action");
+const mock_log_1 = require("../../testutils/mock_log");
 class TestQueryFilter {
     constructor(filter, newQuery, ents, defaultViewer) {
         this.filter = filter;
@@ -17,11 +21,15 @@ class TestQueryFilter {
         this.defaultViewer = defaultViewer;
         this.allContacts = [];
         this.filteredContacts = [];
+        // @ts-ignore
+        const q = this.newQuery(this.defaultViewer);
+        // TODO sad not generic enough
+        this.customQuery =
+            q instanceof index_1.UserToContactsFkeyQuery ||
+                q instanceof index_1.UserToContactsFkeyQueryDeprecated;
     }
-    async beforeEach() {
-        //    console.log("sss");
+    async createData() {
         [this.user, this.allContacts] = await (0, test_helpers_1.createAllContacts)();
-        //    console.log(this.user, this.contacts);
         //    this.allContacts = this.allContacts.reverse();
         this.filteredContacts = this.ents(this.allContacts);
         db_mock_1.QueryRecorder.clearQueries();
@@ -37,19 +45,19 @@ class TestQueryFilter {
         expect(ids).toEqual(this.filteredContacts.map((contact) => contact.id));
     }
     // rawCount isn't affected by filters...
-    async testRawCount() {
+    async testRawCount(expectedCount) {
         const count = await this.getQuery().queryRawCount();
-        this.verifyRawCount(count);
+        this.verifyRawCount(count, expectedCount);
     }
-    verifyRawCount(count) {
-        expect(count).toBe(test_helpers_1.inputs.length);
+    verifyRawCount(count, expectedCount) {
+        expect(count).toBe(expectedCount ?? test_helpers_1.inputs.length);
     }
-    async testCount() {
+    async testCount(expectedCount) {
         const count = await this.getQuery().queryCount();
-        this.verifyCount(count);
+        this.verifyCount(count, expectedCount);
     }
-    verifyCount(count) {
-        expect(count).toBe(this.filteredContacts.length);
+    verifyCount(count, expectedCount) {
+        expect(count).toBe(expectedCount ?? this.filteredContacts.length);
     }
     async testEdges() {
         const edges = await this.getQuery().queryEdges();
@@ -58,21 +66,60 @@ class TestQueryFilter {
     verifyEdges(edges) {
         const q = this.getQuery();
         // TODO sad not generic enough
-        if (q instanceof index_1.UserToContactsFkeyQuery) {
+        if (this.customQuery) {
             (0, test_helpers_1.verifyUserToContactRawData)(this.user, edges, this.filteredContacts);
         }
         else {
             (0, test_helpers_1.verifyUserToContactEdges)(this.user, edges, this.filteredContacts);
         }
     }
-    async testEnts() {
-        const entsMap = await this.getQuery(new viewer_1.IDViewer(this.user.id)).queryEnts();
-        this.verifyEnts(entsMap);
+    async testEnts(v) {
+        const ents = await this.getQuery(v || new viewer_1.IDViewer(this.user.id)).queryEnts();
+        this.verifyEnts(ents);
+        return ents;
+    }
+    async testEntsCache() {
+        if (!this.customQuery) {
+            return;
+        }
+        (0, logger_1.setLogLevels)(["query", "cache"]);
+        const ml = new mock_log_1.MockLogs();
+        ml.mock();
+        const v = new test_context_1.TestContext(new viewer_1.IDViewer(this.user.id)).getViewer();
+        const ents = await this.testEnts(v);
+        expect(ml.logs.length).toBe(1);
+        expect(ml.logs[0].query).toMatch(/SELECT (.+) FROM /);
+        await Promise.all(ents.map((ent) => index_1.FakeContact.loadX(v, ent.id)));
+        expect(ml.logs.length).toBe(this.filteredContacts.length + 1);
+        for (const log of ml.logs.slice(1)) {
+            expect(log["ent-cache-hit"]).toBeDefined();
+        }
+        ml.restore();
+        (0, logger_1.clearLogLevels)();
+    }
+    async testDataCache() {
+        if (!this.customQuery) {
+            return;
+        }
+        (0, logger_1.setLogLevels)(["query", "cache"]);
+        const ml = new mock_log_1.MockLogs();
+        ml.mock();
+        const v = new test_context_1.TestContext(new viewer_1.IDViewer(this.user.id)).getViewer();
+        const ents = await this.testEnts(v);
+        expect(ml.logs.length).toBe(1);
+        expect(ml.logs[0].query).toMatch(/SELECT (.+) FROM /);
+        await Promise.all(ents.map((ent) => index_1.FakeContact.loadRawData(ent.id, v.context)));
+        expect(ml.logs.length).toBe(this.filteredContacts.length + 1);
+        for (const log of ml.logs.slice(1)) {
+            expect(log["dataloader-cache-hit"]).toBeDefined();
+        }
+        ml.restore();
+        (0, logger_1.clearLogLevels)();
     }
     verifyEnts(ents) {
         (0, test_helpers_1.verifyUserToContacts)(this.user, ents, this.filteredContacts);
     }
-    async testAll() {
+    async testAll(expectedCount) {
         const query = this.getQuery(new viewer_1.IDViewer(this.user.id));
         const [edges, count, ids, rawCount, ents] = await Promise.all([
             query.queryEdges(),
@@ -81,10 +128,10 @@ class TestQueryFilter {
             query.queryRawCount(),
             query.queryEnts(),
         ]);
-        this.verifyCount(count);
+        this.verifyCount(count, expectedCount);
         this.verifyEdges(edges);
         this.verifyIDs(ids);
-        this.verifyRawCount(rawCount);
+        this.verifyRawCount(rawCount, expectedCount);
         this.verifyEnts(ents);
     }
 }
@@ -125,7 +172,19 @@ const commonTests = (opts) => {
         expect(queries.length).toBe(length);
         const query = queries[0];
         const result = [...opts.where.matchAll(preparedVar)];
-        expect(query.qs?.whereClause).toBe(`${opts.where} AND ${opts.sortCol} < $${result.length + 1} ORDER BY ${opts.sortCol} DESC LIMIT 4`);
+        let parts = opts.where.split(" AND ");
+        if (parts[parts.length - 1] === "deleted_at IS NULL") {
+            parts = parts
+                .slice(0, parts.length - 1)
+                .concat([
+                `${opts.sortCol} < $${result.length + 1}`,
+                "deleted_at IS NULL",
+            ]);
+        }
+        else {
+            parts.push(`${opts.sortCol} < $${result.length + 1}`);
+        }
+        expect(query.qs?.whereClause).toBe(`${parts.join(" AND ")} ORDER BY ${opts.sortCol} DESC LIMIT 4`);
     }
     function verifyLastBeforeCursorQuery(length = 1) {
         if (opts.livePostgresDB || opts.sqlite) {
@@ -135,9 +194,21 @@ const commonTests = (opts) => {
         expect(queries.length).toBe(length);
         const query = queries[0];
         const result = [...opts.where.matchAll(preparedVar)];
+        let parts = opts.where.split(" AND ");
+        if (parts[parts.length - 1] === "deleted_at IS NULL") {
+            parts = parts
+                .slice(0, parts.length - 1)
+                .concat([
+                `${opts.sortCol} > $${result.length + 1}`,
+                "deleted_at IS NULL",
+            ]);
+        }
+        else {
+            parts.push(`${opts.sortCol} > $${result.length + 1}`);
+        }
         expect(query.qs?.whereClause).toBe(
         // extra fetched for pagination
-        `${opts.where} AND ${opts.sortCol} > $${result.length + 1} ORDER BY ${opts.sortCol} ASC LIMIT 4`);
+        `${parts.join(" AND ")} ORDER BY ${opts.sortCol} ASC LIMIT 4`);
     }
     function getViewer() {
         // live db, let's do context because we're testing complicated paths
@@ -171,20 +242,26 @@ const commonTests = (opts) => {
             cursorKey: opts.sortCol,
         });
     }
+    if (opts.globalSchema) {
+        (0, ent_1.setGlobalSchema)(test_edge_global_schema_1.testEdgeGlobalSchema);
+    }
     let tdb;
     if (opts.sqlite) {
-        // tableName just to make it unique
-        (0, test_db_1.setupSqlite)(`sqlite:///shared_test+${opts.tableName}.db`, test_helpers_1.tempDBTables);
+        (0, temp_db_1.setupSqlite)(`sqlite:///shared_test+${opts.uniqKey}.db`, () => (0, test_helpers_1.tempDBTables)(opts.globalSchema), {
+            disableDeleteAfterEachTest: true,
+        });
     }
     beforeAll(async () => {
         // want error on by default in tests?
         (0, logger_1.setLogLevels)(["error", "warn", "info"]);
         if (opts.livePostgresDB) {
             tdb = await (0, test_helpers_1.setupTempDB)();
+            return;
         }
+        await (0, test_helpers_1.createEdges)();
     });
     beforeEach(async () => {
-        if (opts.livePostgresDB) {
+        if (opts.livePostgresDB || opts.sqlite) {
             return;
         }
         await (0, test_helpers_1.createEdges)();
@@ -196,7 +273,7 @@ const commonTests = (opts) => {
     });
     describe("simple queries", () => {
         const filter = new TestQueryFilter((q) => {
-            // no filterzs
+            // no filters
             return q;
         }, opts.newQuery, (contacts) => {
             // nothing to do here
@@ -204,7 +281,7 @@ const commonTests = (opts) => {
             return contacts.reverse();
         }, getViewer());
         beforeEach(async () => {
-            await filter.beforeEach();
+            await filter.createData();
         });
         test("ids", async () => {
             await filter.testIDs();
@@ -229,6 +306,67 @@ const commonTests = (opts) => {
         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
+            return q;
+        }, opts.newQuery, (contacts) => {
+            // nothing expected since deleted
+            return [];
+        }, getViewer());
+        beforeEach(async () => {
+            await filter.createData();
+            const action = new builder_1.SimpleAction(filter.user.viewer, index_1.FakeUserSchema, new Map(), action_1.WriteOperation.Edit, filter.user);
+            await Promise.all(filter.allContacts.map(async (contact) => {
+                action.builder.orchestrator.removeOutboundEdge(contact.id, index_1.EdgeType.UserToContacts);
+                const action2 = new builder_1.SimpleAction(filter.user.viewer, index_1.FakeContactSchema, new Map(), action_1.WriteOperation.Delete, contact);
+                await action2.save();
+            }));
+            await action.save();
+            db_mock_1.QueryRecorder.clearQueries();
+        });
+        test("ids", async () => {
+            await filter.testIDs();
+            verifyQuery({});
+        });
+        test("rawCount", async () => {
+            await filter.testRawCount(0);
+            verifyCountQuery({});
+        });
+        test("count", async () => {
+            await filter.testCount(0);
+            verifyQuery({});
+        });
+        test("edges", async () => {
+            await filter.testEdges();
+            verifyQuery({});
+        });
+        test("ents", async () => {
+            await filter.testEnts();
+            // no ents so no subsequent query. just the edge query
+            verifyQuery({ length: 1 });
+        });
+        test("all", async () => {
+            await filter.testAll(0);
+        });
+        test("raw_data", async () => {
+            if (opts.rawDataVerify) {
+                await opts.rawDataVerify(filter.user);
+            }
+        });
+        test("ents cache", async () => {
+            await filter.testEntsCache();
+        });
+        test("data cache", async () => {
+            await filter.testDataCache();
+        });
     });
     describe("first. no cursor", () => {
         const N = 2;
@@ -239,7 +377,7 @@ const commonTests = (opts) => {
             return contacts.reverse().slice(0, N);
         }, getViewer());
         beforeEach(async () => {
-            await filter.beforeEach();
+            await filter.createData();
         });
         test("ids", async () => {
             await filter.testIDs();
@@ -264,6 +402,12 @@ const commonTests = (opts) => {
         test("all", async () => {
             await filter.testAll();
         });
+        test("ents cache", async () => {
+            await filter.testEntsCache();
+        });
+        test("data cache", async () => {
+            await filter.testDataCache();
+        });
     });
     describe("last", () => {
         const N = 2;
@@ -275,7 +419,7 @@ const commonTests = (opts) => {
             return contacts.slice(0, N).reverse();
         }, getViewer());
         beforeEach(async () => {
-            await filter.beforeEach();
+            await filter.createData();
         });
         test("ids", async () => {
             await filter.testIDs();
@@ -300,6 +444,12 @@ const commonTests = (opts) => {
         test("all", async () => {
             await filter.testAll();
         });
+        test("ents cache", async () => {
+            await filter.testEntsCache();
+        });
+        test("data cache", async () => {
+            await filter.testDataCache();
+        });
     });
     describe("first after cursor", () => {
         const idx = 2;
@@ -310,8 +460,18 @@ const commonTests = (opts) => {
             // < check so we shouldn't get that index
             return contacts.reverse().slice(idx + 1, idx + N);
         }, getViewer());
+        beforeAll(async () => {
+            if (opts.livePostgresDB || opts.sqlite) {
+                await filter.createData();
+            }
+        });
+        // TODO do we still need QueryRecorder?
+        // should just delete this...
         beforeEach(async () => {
-            await filter.beforeEach();
+            if (opts.livePostgresDB || opts.sqlite) {
+                return;
+            }
+            await filter.createData();
         });
         test("ids", async () => {
             await filter.testIDs();
@@ -336,6 +496,12 @@ const commonTests = (opts) => {
         test("all", async () => {
             await filter.testAll();
         });
+        test("ents cache", async () => {
+            await filter.testEntsCache();
+        });
+        test("data cache", async () => {
+            await filter.testDataCache();
+        });
     });
     test("first. after each cursor", async () => {
         let [user, contacts] = await (0, test_helpers_1.createAllContacts)();
@@ -378,8 +544,17 @@ const commonTests = (opts) => {
             // > check so we don't want that index
             return contacts.reverse().slice(0, idx).reverse(); // because of order returned
         }, getViewer());
+        beforeAll(async () => {
+            if (opts.livePostgresDB || opts.sqlite) {
+                await filter.createData();
+            }
+        });
+        // same TODO above
         beforeEach(async () => {
-            await filter.beforeEach();
+            if (opts.livePostgresDB || opts.sqlite) {
+                return;
+            }
+            await filter.createData();
         });
         test("ids", async () => {
             await filter.testIDs();
@@ -404,6 +579,12 @@ const commonTests = (opts) => {
         test("all", async () => {
             await filter.testAll();
         });
+        test("ents cache", async () => {
+            await filter.testEntsCache();
+        });
+        test("data cache", async () => {
+            await filter.testDataCache();
+        });
     });
     test("last. before each cursor", async () => {
         let [user, contacts] = await (0, test_helpers_1.createAllContacts)();

package/core/viewer.d.ts

@@ -1,7 +1,7 @@
 import { ID, Ent, Viewer, Context } from "./base";
 export declare class LoggedOutViewer implements Viewer {
-    context?: Context | undefined;
-    constructor(context?: Context | undefined);
+    context?: Context<Viewer<Ent<any> | null, ID | null>> | undefined;
+    constructor(context?: Context<Viewer<Ent<any> | null, ID | null>> | undefined);
     viewerID: null;
     viewer(): Promise<null>;
     instanceKey(): string;
@@ -18,6 +18,6 @@ export declare class IDViewer implements Viewer {
     constructor(viewerID: ID, opts?: Partial<IDViewerOptions>);
     constructor(opts: IDViewerOptions);
     setContext(ctx: Context): this;
-    viewer(): Promise<Ent | null>;
+    viewer(): Promise<Ent<Viewer<Ent<any> | null, ID | null>> | null>;
     instanceKey(): string;
 }

package/core/viewer.js

@@ -35,7 +35,7 @@ class IDViewer {
         return this.ent;
     }
     instanceKey() {
-        return `idViewer: ${this.viewerID}`;
+        return `idViewer:${this.viewerID}`;
     }
 }
 exports.IDViewer = IDViewer;

package/graphql/graphql.js

@@ -85,6 +85,12 @@ const addCustomType = (type) => {
         }
     }
     catch (e) {
+        if (type.secondaryImportPath) {
+            (0, exports.addCustomType)({
+                ...type,
+                importPath: type.secondaryImportPath,
+            });
+        }
         return;
     }
     GQLCapture.getCustomTypes().set(type.type, type);

package/graphql/query/edge_connection.d.ts

@@ -1,30 +1,30 @@
 import { EdgeQuery, PaginationInfo } from "../../core/query/query";
-import { Data, Ent, Viewer } from "../../core/base";
+import { Data, Ent, ID, Viewer } from "../../core/base";
 export interface GraphQLEdge<T extends Data> {
     edge: T;
     node: Ent;
     cursor: string;
 }
-interface edgeQueryCtr<T extends Ent, TEdge extends Data> {
-    (v: Viewer, src: T): EdgeQuery<T, Ent, TEdge>;
+interface edgeQueryCtr<T extends Ent, TEdge extends Data, TViewer extends Viewer> {
+    (v: TViewer, src: T): EdgeQuery<T, Ent, TEdge>;
 }
-interface edgeQueryCtr2<T extends Ent, TEdge extends Data> {
-    (v: Viewer): EdgeQuery<T, Ent, TEdge>;
+interface edgeQueryCtr2<T extends Ent, TEdge extends Data, TViewer extends Viewer> {
+    (v: TViewer): EdgeQuery<T, Ent, TEdge>;
 }
-export declare class GraphQLEdgeConnection<TSource extends Ent, TEdge extends Data> {
+export declare class GraphQLEdgeConnection<TSource extends Ent, TEdge extends Data, TViewer extends Viewer = Viewer> {
     query: EdgeQuery<TSource, Ent, TEdge>;
     private results;
     private viewer;
     private source?;
     private args?;
-    constructor(viewer: Viewer, source: TSource, getQuery: edgeQueryCtr<TSource, TEdge>, args?: Data);
-    constructor(viewer: Viewer, getQuery: edgeQueryCtr2<TSource, TEdge>, args?: Data);
+    constructor(viewer: TViewer, source: TSource, getQuery: edgeQueryCtr<TSource, TEdge, TViewer>, args?: Data);
+    constructor(viewer: TViewer, getQuery: edgeQueryCtr2<TSource, TEdge, TViewer>, args?: Data);
     first(limit: number, cursor?: string): void;
     last(limit: number, cursor?: string): void;
     modifyQuery(fn: (query: EdgeQuery<TSource, Ent, TEdge>) => EdgeQuery<TSource, Ent, TEdge>): void;
     queryTotalCount(): Promise<number>;
     queryEdges(): Promise<GraphQLEdge<TEdge>[]>;
-    queryNodes(): Promise<Ent[]>;
+    queryNodes(): Promise<Ent<Viewer<Ent<any> | null, ID | null>>[]>;
     private defaultPageInfo;
     queryPageInfo(): Promise<PaginationInfo>;
     private queryData;

package/graphql/query/page_info.d.ts

@@ -1,4 +1,4 @@
 import { GraphQLObjectType } from "graphql";
 import { RequestContext } from "../../core/context";
 import { PaginationInfo } from "../../core/query/query";
-export declare const GraphQLPageInfo: GraphQLObjectType<PaginationInfo, RequestContext>;
+export declare const GraphQLPageInfo: GraphQLObjectType<PaginationInfo, RequestContext<import("../..").Viewer<import("../..").Ent<any> | null, import("../..").ID | null>>>;

package/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./core/base";
-export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, } from "./core/ent";
+export { loadEnt, loadCustomData, loadCustomEnts, loadCustomCount, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, RawQueryOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, setGlobalSchema, } from "./core/ent";
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };
@@ -13,6 +13,7 @@ declare const query: {
     And: typeof q.And;
     AndOptional: typeof q.AndOptional;
     Or: typeof q.Or;
+    OrOptional: typeof q.OrOptional;
     In: typeof q.In;
     Greater: typeof q.Greater;
     Less: typeof q.Less;
@@ -20,10 +21,15 @@ declare const query: {
     LessEq: typeof q.LessEq;
     ArrayEq: typeof q.ArrayEq;
     ArrayNotEq: typeof q.ArrayNotEq;
-    ArrayGreater: typeof q.ArrayGreater;
-    ArrayLess: typeof q.ArrayLess;
-    ArrayGreaterEq: typeof q.ArrayGreaterEq;
-    ArrayLessEq: typeof q.ArrayLessEq;
+    PostgresArrayContainsValue: typeof q.PostgresArrayContainsValue;
+    PostgresArrayContains: typeof q.PostgresArrayContains;
+    PostgresArrayNotContainsValue: typeof q.PostgresArrayNotContainsValue;
+    PostgresArrayNotContains: typeof q.PostgresArrayNotContains;
+    PostgresArrayOverlaps: typeof q.PostgresArrayOverlaps;
+    PostgresArrayNotOverlaps: typeof q.PostgresArrayNotOverlaps;
+    JSONPathValuePredicate: typeof q.JSONPathValuePredicate;
+    JSONObjectFieldKeyASJSON: typeof q.JSONObjectFieldKeyASJSON;
+    JSONObjectFieldKeyAsText: typeof q.JSONObjectFieldKeyAsText;
     TsQuery: typeof q.TsQuery;
     PlainToTsQuery: typeof q.PlainToTsQuery;
     PhraseToTsQuery: typeof q.PhraseToTsQuery;

package/index.js

@@ -25,13 +25,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = 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.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 = void 0;
+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.setGlobalSchema = 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.RawQueryOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomCount = 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 = exports.DenyIfViewerOutboundEdgeExistsRule = 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; } });
 Object.defineProperty(exports, "loadCustomData", { enumerable: true, get: function () { return ent_1.loadCustomData; } });
 Object.defineProperty(exports, "loadCustomEnts", { enumerable: true, get: function () { return ent_1.loadCustomEnts; } });
+Object.defineProperty(exports, "loadCustomCount", { enumerable: true, get: function () { return ent_1.loadCustomCount; } });
 Object.defineProperty(exports, "loadEntX", { enumerable: true, get: function () { return ent_1.loadEntX; } });
 Object.defineProperty(exports, "loadEnts", { enumerable: true, get: function () { return ent_1.loadEnts; } });
 Object.defineProperty(exports, "loadDerivedEnt", { enumerable: true, get: function () { return ent_1.loadDerivedEnt; } });
@@ -44,6 +45,7 @@ Object.defineProperty(exports, "loadRowX", { enumerable: true, get: function ()
 Object.defineProperty(exports, "loadRow", { enumerable: true, get: function () { return ent_1.loadRow; } });
 Object.defineProperty(exports, "loadRows", { enumerable: true, get: function () { return ent_1.loadRows; } });
 Object.defineProperty(exports, "EditNodeOperation", { enumerable: true, get: function () { return ent_1.EditNodeOperation; } });
+Object.defineProperty(exports, "RawQueryOperation", { enumerable: true, get: function () { return ent_1.RawQueryOperation; } });
 Object.defineProperty(exports, "EdgeOperation", { enumerable: true, get: function () { return ent_1.EdgeOperation; } });
 Object.defineProperty(exports, "DeleteNodeOperation", { enumerable: true, get: function () { return ent_1.DeleteNodeOperation; } });
 Object.defineProperty(exports, "AssocEdge", { enumerable: true, get: function () { return ent_1.AssocEdge; } });
@@ -57,6 +59,7 @@ Object.defineProperty(exports, "loadRawEdgeCountX", { enumerable: true, get: fun
 Object.defineProperty(exports, "loadEdgeForID2", { enumerable: true, get: function () { return ent_1.loadEdgeForID2; } });
 Object.defineProperty(exports, "loadNodesByEdge", { enumerable: true, get: function () { return ent_1.loadNodesByEdge; } });
 Object.defineProperty(exports, "getEdgeTypeInGroup", { enumerable: true, get: function () { return ent_1.getEdgeTypeInGroup; } });
+Object.defineProperty(exports, "setGlobalSchema", { enumerable: true, get: function () { return ent_1.setGlobalSchema; } });
 const db_1 = __importDefault(require("./core/db"));
 exports.DB = db_1.default;
 __exportStar(require("./core/loaders"), exports);
@@ -109,6 +112,7 @@ const query = {
     And: q.And,
     AndOptional: q.AndOptional,
     Or: q.Or,
+    OrOptional: q.OrOptional,
     In: q.In,
     Greater: q.Greater,
     Less: q.Less,
@@ -116,10 +120,15 @@ const query = {
     LessEq: q.LessEq,
     ArrayEq: q.ArrayEq,
     ArrayNotEq: q.ArrayNotEq,
-    ArrayGreater: q.ArrayGreater,
-    ArrayLess: q.ArrayLess,
-    ArrayGreaterEq: q.ArrayGreaterEq,
-    ArrayLessEq: q.ArrayLessEq,
+    PostgresArrayContainsValue: q.PostgresArrayContainsValue,
+    PostgresArrayContains: q.PostgresArrayContains,
+    PostgresArrayNotContainsValue: q.PostgresArrayNotContainsValue,
+    PostgresArrayNotContains: q.PostgresArrayNotContains,
+    PostgresArrayOverlaps: q.PostgresArrayOverlaps,
+    PostgresArrayNotOverlaps: q.PostgresArrayNotOverlaps,
+    JSONPathValuePredicate: q.JSONPathValuePredicate,
+    JSONObjectFieldKeyASJSON: q.JSONObjectFieldKeyASJSON,
+    JSONObjectFieldKeyAsText: q.JSONObjectFieldKeyAsText,
     TsQuery: q.TsQuery,
     PlainToTsQuery: q.PlainToTsQuery,
     PhraseToTsQuery: q.PhraseToTsQuery,

package/package.json

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

package/parse_schema/parse.d.ts

@@ -1,5 +1,5 @@
 import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
-import { ActionField, Type } from "../schema/schema";
+import { ActionField, Type, GlobalSchema } from "../schema/schema";
 declare enum NullableResult {
     CONTENTS = "contents",
     CONTENTS_AND_LIST = "contentsAndList",
@@ -24,6 +24,7 @@ declare type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" |
     assocEdgeGroups: ProcessedAssocEdgeGroup[];
     fields: ProcessedField[];
     schemaPath?: string;
+    patternNames?: string[];
 };
 declare type ProcessedAssocEdgeGroup = Omit<AssocEdgeGroup, "edgeAction"> & {
     edgeAction?: OutputAction;
@@ -38,13 +39,14 @@ interface ProcessedPattern {
     name: string;
     assocEdges: ProcessedAssocEdge[];
     fields: ProcessedField[];
+    disableMixin?: boolean;
 }
 declare type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFields"> & {
     subFields?: ProcessedField[];
     listElemType?: ProcessedType;
     unionFields?: ProcessedField[];
 };
-declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type"> & {
+declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type" | "serverDefault"> & {
     name: string;
     hasDefaultValueOnCreate?: boolean;
     hasDefaultValueOnEdit?: boolean;
@@ -52,6 +54,7 @@ declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOn
     hasFieldPrivacy?: boolean;
     derivedFields?: ProcessedField[];
     type: ProcessedType;
+    serverDefault?: string;
 };
 interface patternsDict {
     [key: string]: ProcessedPattern;
@@ -59,9 +62,15 @@ interface patternsDict {
 interface Result {
     schemas: schemasDict;
     patterns: patternsDict;
+    globalSchema?: ProcessedGlobalSchema;
 }
 declare type PotentialSchemas = {
     [key: string]: any;
 };
-export declare function parseSchema(potentialSchemas: PotentialSchemas): Result;
+export declare function parseSchema(potentialSchemas: PotentialSchemas, globalSchema?: GlobalSchema): Promise<Result>;
+interface ProcessedGlobalSchema {
+    globalEdges: ProcessedAssocEdge[];
+    extraEdgeFields: ProcessedField[];
+    initForEdges?: boolean;
+}
 export {};