@snowtop/ent 0.1.0-alpha7 → 0.1.0-alpha75

package/core/query/shared_test.d.ts

@@ -4,11 +4,14 @@ import { EdgeQuery } from "./query";
 interface options<TData extends Data> {
     newQuery: (v: Viewer, user: FakeUser) => EdgeQuery<FakeUser, FakeContact, TData>;
     tableName: string;
+    uniqKey: string;
     entsLength?: number;
     where: string;
     sortCol: string;
     livePostgresDB?: boolean;
     sqlite?: boolean;
+    globalSchema?: boolean;
+    rawDataVerify?(user: FakeUser): Promise<void>;
 }
 export declare const commonTests: <TData extends Data>(opts: options<TData>) => void;
 export {};

package/core/query/shared_test.js

@@ -6,9 +6,12 @@ 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");
 class TestQueryFilter {
     constructor(filter, newQuery, ents, defaultViewer) {
         this.filter = filter;
@@ -37,19 +40,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();
@@ -72,7 +75,7 @@ class TestQueryFilter {
     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 +84,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 +128,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 +150,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,10 +198,12 @@ 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));
     }
     beforeAll(async () => {
         // want error on by default in tests?
@@ -196,7 +225,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
@@ -230,6 +259,55 @@ const commonTests = (opts) => {
             await filter.testAll();
         });
     });
+    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.beforeEach();
+            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);
+            }
+        });
+    });
     describe("first. no cursor", () => {
         const N = 2;
         const filter = new TestQueryFilter((q) => {

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;
@@ -17,6 +17,7 @@ export declare class IDViewer implements Viewer {
     context?: Context;
     constructor(viewerID: ID, opts?: Partial<IDViewerOptions>);
     constructor(opts: IDViewerOptions);
-    viewer(): Promise<Ent | null>;
+    setContext(ctx: Context): this;
+    viewer(): Promise<Ent<Viewer<Ent<any> | null, ID | null>> | null>;
     instanceKey(): string;
 }

package/core/viewer.js

@@ -27,11 +27,15 @@ class IDViewer {
         this.ent = opts?.ent || null;
         this.context = opts?.context;
     }
+    setContext(ctx) {
+        this.context = ctx;
+        return this;
+    }
     async viewer() {
         return this.ent;
     }
     instanceKey() {
-        return `idViewer: ${this.viewerID}`;
+        return `idViewer:${this.viewerID}`;
     }
 }
 exports.IDViewer = IDViewer;

package/graphql/builtins/connection.js

@@ -11,13 +11,13 @@ exports.GraphQLConnectionInterface = new graphql_1.GraphQLInterfaceType({
     description: "connection interface",
     fields: () => ({
         edges: {
-            type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(edge_1.GraphQLEdgeInterface))),
+            type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(edge_1.GraphQLEdgeInterface))),
         },
         nodes: {
-            type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(node_1.GraphQLNodeInterface))),
+            type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(node_1.GraphQLNodeInterface))),
         },
         pageInfo: {
-            type: (0, graphql_1.GraphQLNonNull)(page_info_1.GraphQLPageInfo),
+            type: new graphql_1.GraphQLNonNull(page_info_1.GraphQLPageInfo),
         },
     }),
 });

package/graphql/builtins/edge.js

@@ -9,10 +9,10 @@ exports.GraphQLEdgeInterface = new graphql_1.GraphQLInterfaceType({
     description: "edge interface",
     fields: () => ({
         node: {
-            type: (0, graphql_1.GraphQLNonNull)(node_1.GraphQLNodeInterface),
+            type: new graphql_1.GraphQLNonNull(node_1.GraphQLNodeInterface),
         },
         cursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
     }),
 });

package/graphql/builtins/node.js

@@ -8,7 +8,7 @@ exports.GraphQLNodeInterface = new graphql_1.GraphQLInterfaceType({
     description: "node interface",
     fields: () => ({
         id: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
         },
     }),
 });

package/graphql/graphql.d.ts

@@ -82,6 +82,9 @@ declare enum NullableResult {
     CONTENTS_AND_LIST = "contentsAndList",
     ITEM = "true"
 }
+export declare const knownAllowedNames: Map<string, string>;
+export declare const knownDisAllowedNames: Map<string, boolean>;
+export declare const isCustomType: (type: Type) => type is CustomType;
 export declare const addCustomType: (type: CustomType) => void;
 export declare class GQLCapture {
     private static enabled;
@@ -107,8 +110,6 @@ export declare class GQLCapture {
     static getProcessedCustomMutations(): ProcessedCustomField[];
     static getProcessedCustomQueries(): ProcessedCustomField[];
     private static getProcessedCustomFieldsImpl;
-    private static knownAllowedNames;
-    private static knownDisAllowedNames;
     private static getResultFromMetadata;
     static gqlField(options?: gqlFieldOptions): any;
     private static getCustomField;

package/graphql/graphql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.CustomFieldType = void 0;
+exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.isCustomType = exports.knownDisAllowedNames = exports.knownAllowedNames = exports.CustomFieldType = void 0;
 require("reflect-metadata");
 // export interface gqlTopLevelOptions
 //   name?: string;
@@ -20,6 +20,22 @@ var NullableResult;
     NullableResult["CONTENTS_AND_LIST"] = "contentsAndList";
     NullableResult["ITEM"] = "true";
 })(NullableResult || (NullableResult = {}));
+exports.knownAllowedNames = new Map([
+    ["Date", "Date"],
+    ["Boolean", "boolean"],
+    ["Number", "number"],
+    ["String", "string"],
+    // TODO not right to have this and Number
+    ["Int", "number"],
+    ["Float", "number"],
+    ["ID", "ID"],
+]);
+exports.knownDisAllowedNames = new Map([
+    ["Function", true],
+    ["Object", true],
+    ["Array", true],
+    ["Promise", true],
+]);
 const isArray = (type) => {
     if (typeof type === "function") {
         return false;
@@ -41,6 +57,7 @@ const isString = (type) => {
 const isCustomType = (type) => {
     return type.importPath !== undefined;
 };
+exports.isCustomType = isCustomType;
 const isGraphQLScalarType = (type) => {
     return type.serialize !== undefined;
 };
@@ -62,12 +79,18 @@ const addCustomType = (type) => {
                 description: ct.description,
                 name: ct.name,
             };
-            if (ct.specifiedByUrl) {
-                type.scalarInfo.specifiedByUrl = ct.specifiedByUrl;
+            if (ct.specifiedByURL) {
+                type.scalarInfo.specifiedByUrl = ct.specifiedByURL;
             }
         }
     }
     catch (e) {
+        if (type.secondaryImportPath) {
+            (0, exports.addCustomType)({
+                ...type,
+                importPath: type.secondaryImportPath,
+            });
+        }
         return;
     }
     GQLCapture.getCustomTypes().set(type.type, type);
@@ -92,7 +115,7 @@ const getType = (typ, result) => {
         }
         return;
     }
-    if (isCustomType(typ)) {
+    if ((0, exports.isCustomType)(typ)) {
         result.type = typ.type;
         (0, exports.addCustomType)(typ);
         return;
@@ -197,20 +220,20 @@ class GQLCapture {
             connection = r.connection;
             type = r.type;
         }
-        if (GQLCapture.knownDisAllowedNames.has(type)) {
+        if (exports.knownDisAllowedNames.has(type)) {
             throw new Error(`${type} isn't a valid type for accessor/function/property`);
         }
         let result = {
             name: metadata.paramName || "",
             type,
-            tsType: this.knownAllowedNames.get(type) || this.customTypes.get(type)?.tsType,
+            tsType: exports.knownAllowedNames.get(type) || this.customTypes.get(type)?.tsType,
             nullable: options?.nullable,
             list: list,
             connection: connection,
             isContextArg: metadata.isContextArg,
         };
         // unknown type. we need to flag that this field needs to eventually be resolved
-        if (!GQLCapture.knownAllowedNames.has(type)) {
+        if (!exports.knownAllowedNames.has(type)) {
             if (scalarType) {
                 throw new Error(`custom scalar type ${type} is not supported this way. use CustomType syntax. see \`gqlFileUpload\` as an example`);
             }
@@ -461,22 +484,6 @@ GQLCapture.customArgs = new Map();
 GQLCapture.customInputObjects = new Map();
 GQLCapture.customObjects = new Map();
 GQLCapture.customTypes = new Map();
-GQLCapture.knownAllowedNames = new Map([
-    ["Date", "Date"],
-    ["Boolean", "boolean"],
-    ["Number", "number"],
-    ["String", "string"],
-    // TODO not right to have this and Number
-    ["Int", "number"],
-    ["Float", "number"],
-    ["ID", "ID"],
-]);
-GQLCapture.knownDisAllowedNames = new Map([
-    ["Function", true],
-    ["Object", true],
-    ["Array", true],
-    ["Promise", true],
-]);
 // User -> add -> [{name, options}, {}, {}]
 GQLCapture.argMap = new Map();
 // why is this a static class lol?

package/graphql/node_resolver.d.ts

@@ -5,7 +5,6 @@ interface Node {
     id: ID;
 }
 export interface NodeResolver {
-    encode(node: Node): string;
     decodeObj(viewer: Viewer, id: string): Promise<Node | null>;
 }
 interface loadEnt {

package/graphql/query/connection_type.js

@@ -15,10 +15,10 @@ class GraphQLEdgeType extends graphql_1.GraphQLObjectType {
             name: `${name}Edge`,
             fields: () => ({
                 node: {
-                    type: (0, graphql_1.GraphQLNonNull)(nodeType),
+                    type: new graphql_1.GraphQLNonNull(nodeType),
                 },
                 cursor: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 ...optional,
             }),
@@ -34,25 +34,25 @@ class GraphQLConnectionType extends graphql_1.GraphQLObjectType {
             name: `${name}Connection`,
             fields: () => ({
                 edges: {
-                    type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(edgeType))),
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(edgeType))),
                     resolve: (source) => {
                         return source.queryEdges();
                     },
                 },
                 nodes: {
-                    type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(nodeType))),
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(nodeType))),
                     resolve: (source) => {
                         return source.queryNodes();
                     },
                 },
                 pageInfo: {
-                    type: (0, graphql_1.GraphQLNonNull)(page_info_1.GraphQLPageInfo),
+                    type: new graphql_1.GraphQLNonNull(page_info_1.GraphQLPageInfo),
                     resolve: (source) => {
                         return source.queryPageInfo();
                     },
                 },
                 rawCount: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLInt),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLInt),
                     resolve: (source) => {
                         return source.queryTotalCount();
                     },

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/graphql/query/page_info.js

@@ -7,22 +7,22 @@ exports.GraphQLPageInfo = new graphql_1.GraphQLObjectType({
     name: "PageInfo",
     fields: () => ({
         hasNextPage: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLBoolean),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLBoolean),
             resolve: (source) => {
                 return source.hasNextPage || false;
             },
         },
         hasPreviousPage: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLBoolean),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLBoolean),
             resolve: (source) => {
                 return source.hasPreviousPage || false;
             },
         },
         startCursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
         endCursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
     }),
 });

package/graphql/query/shared_assoc_test.js

@@ -110,7 +110,7 @@ function sharedAssocTests() {
             name: "User",
             fields: {
                 id: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
                 firstName: {
                     type: graphql_1.GraphQLString,
@@ -128,7 +128,7 @@ function sharedAssocTests() {
             name: "Event",
             fields: {
                 id: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
             },
             interfaces: [node_1.GraphQLNodeInterface],

package/graphql/scalars/time.d.ts

@@ -1,2 +1,2 @@
 import { GraphQLScalarType } from "graphql";
-export declare const GraphQLTime: GraphQLScalarType;
+export declare const GraphQLTime: GraphQLScalarType<Date, string>;

package/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./core/base";
-export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, applyPrivacyPolicyForEnt, applyPrivacyPolicyForEntX, 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, 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, setGlobalSchema, } from "./core/ent";
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };
@@ -11,12 +11,32 @@ declare const query: {
     Eq: typeof q.Eq;
     NotEq: typeof q.NotEq;
     And: typeof q.And;
+    AndOptional: typeof q.AndOptional;
     Or: typeof q.Or;
     In: typeof q.In;
     Greater: typeof q.Greater;
     Less: typeof q.Less;
     GreaterEq: typeof q.GreaterEq;
     LessEq: typeof q.LessEq;
+    ArrayEq: typeof q.ArrayEq;
+    ArrayNotEq: typeof q.ArrayNotEq;
+    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;
+    WebsearchToTsQuery: typeof q.WebsearchToTsQuery;
+    TsVectorColTsQuery: typeof q.TsVectorColTsQuery;
+    TsVectorPlainToTsQuery: typeof q.TsVectorPlainToTsQuery;
+    TsVectorPhraseToTsQuery: typeof q.TsVectorPhraseToTsQuery;
+    TsVectorWebsearchToTsQuery: typeof q.TsVectorWebsearchToTsQuery;
 };
 export { query };
 export { RequestContext, ContextCache } from "./core/context";