@snowtop/ent 0.1.0-alpha1 → 0.1.0-alpha100

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

@@ -3,15 +3,20 @@ import { GraphQLScalarType } from "graphql";
 interface ClassType<T = any> {
     new (...args: any[]): T;
 }
+declare type StringToStringMap = {
+    [key: string]: string;
+};
 export interface CustomType {
     type: string;
     importPath: string;
     tsType?: string;
     tsImportPath?: string;
+    enumMap?: StringToStringMap;
+    inputType?: boolean;
     [x: string]: any;
 }
-declare type Type = GraphQLScalarType | ClassType | string | CustomType;
-export declare type GraphQLConnection<T> = {
+type Type = GraphQLScalarType | ClassType | string | CustomType;
+export type GraphQLConnection<T> = {
     node: T;
 };
 export interface gqlFieldOptions {
@@ -24,7 +29,7 @@ export interface gqlObjectOptions {
     name?: string;
     description?: string;
 }
-declare type gqlTopLevelOptions = Exclude<gqlFieldOptions, "nullable">;
+type gqlTopLevelOptions = Exclude<gqlFieldOptions, "nullable">;
 export declare enum CustomFieldType {
     Accessor = "ACCESSOR",
     Field = "FIELD",
@@ -42,6 +47,8 @@ interface CustomFieldImpl {
 export interface CustomField extends CustomFieldImpl {
     args: Field[];
     results: Field[];
+    extraImports?: any[];
+    functionContents?: string;
 }
 export interface CustomMutation extends CustomField {
 }
@@ -51,15 +58,15 @@ export interface ProcessedCustomField extends CustomFieldImpl {
     args: ProcessedField[];
     results: ProcessedField[];
 }
-export declare type ProcessCustomFieldMap = {
-    [key: string]: ProcessedCustomField;
+export type ProcessCustomFieldMap = {
+    [key: string]: ProcessedCustomField[];
 };
 export interface CustomObject {
     nodeName: string;
     className: string;
     description?: string;
 }
-declare type NullableListOptions = "contents" | "contentsAndList";
+type NullableListOptions = "contents" | "contentsAndList";
 interface FieldImpl {
     type: string;
     tsType?: string;
@@ -82,7 +89,10 @@ declare enum NullableResult {
     CONTENTS_AND_LIST = "contentsAndList",
     ITEM = "true"
 }
-export declare const addCustomType: (type: CustomType) => void;
+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, gqlCapture: typeof GQLCapture) => void;
 export declare class GQLCapture {
     private static enabled;
     static enable(enabled: boolean): void;
@@ -107,8 +117,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,16 +57,19 @@ const isString = (type) => {
 const isCustomType = (type) => {
     return type.importPath !== undefined;
 };
+exports.isCustomType = isCustomType;
 const isGraphQLScalarType = (type) => {
     return type.serialize !== undefined;
 };
-const addCustomType = (type) => {
+const addCustomType = (type, gqlCapture) => {
     // TODO these should return ReadOnly objects...
-    const customType = GQLCapture.getCustomTypes().get(type.type);
-    if (customType && customType !== type) {
-        throw new Error(`cannot add multiple custom types of name ${type.type}`);
+    const customTypes = gqlCapture.getCustomTypes();
+    const customType = customTypes.get(type.type);
+    if (customType && customType === type) {
+        return;
     }
-    if (customType) {
+    if (type.enumMap) {
+        customTypes.set(type.type, type);
         return;
     }
     try {
@@ -62,15 +81,27 @@ 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,
+            }, gqlCapture);
+        }
         return;
     }
-    GQLCapture.getCustomTypes().set(type.type, type);
+    if (customType) {
+        if (JSON.stringify(customType) !== JSON.stringify(type)) {
+            throw new Error(`cannot add multiple custom types of name ${type.type}`);
+        }
+        return;
+    }
+    customTypes.set(type.type, type);
 };
 exports.addCustomType = addCustomType;
 const getType = (typ, result) => {
@@ -92,9 +123,10 @@ const getType = (typ, result) => {
         }
         return;
     }
-    if (isCustomType(typ)) {
+    if ((0, exports.isCustomType)(typ)) {
         result.type = typ.type;
-        (0, exports.addCustomType)(typ);
+        // TODO???
+        (0, exports.addCustomType)(typ, GQLCapture);
         return;
     }
     // GraphQLScalarType or ClassType
@@ -197,20 +229,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`);
             }
@@ -416,6 +448,7 @@ class GQLCapture {
         this.customInputObjects.forEach((_val, key) => baseArgs.set(key, true));
         baseArgs.set("Context", true);
         this.customTypes.forEach((_val, key) => baseArgs.set(key, true));
+        // TODO this should be aware of knownCustomTypes
         const resolveFields = (fields) => {
             fields.forEach((field) => {
                 // we have a check earlier that *should* make this path impossible
@@ -461,22 +494,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/index.d.ts

@@ -7,4 +7,4 @@ export { GraphQLNodeInterface } from "./builtins/node";
 export { GraphQLConnectionInterface } from "./builtins/connection";
 export { GraphQLEdgeInterface } from "./builtins/edge";
 export { NodeResolver, EntNodeResolver, registerResolver, clearResolvers, resolveID, nodeIDEncoder, mustDecodeIDFromGQLID, mustDecodeNullableIDFromGQLID, encodeGQLID, } from "./node_resolver";
-export { convertFromGQLEnum, convertToGQLEnum } from "./enums";
+export { transformUnionTypes } from "./mutations/union";

package/graphql/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToGQLEnum = exports.convertFromGQLEnum = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
+exports.transformUnionTypes = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
 var graphql_1 = require("./graphql");
 Object.defineProperty(exports, "gqlField", { enumerable: true, get: function () { return graphql_1.gqlField; } });
 Object.defineProperty(exports, "gqlArg", { enumerable: true, get: function () { return graphql_1.gqlArg; } });
@@ -37,6 +37,5 @@ Object.defineProperty(exports, "nodeIDEncoder", { enumerable: true, get: functio
 Object.defineProperty(exports, "mustDecodeIDFromGQLID", { enumerable: true, get: function () { return node_resolver_1.mustDecodeIDFromGQLID; } });
 Object.defineProperty(exports, "mustDecodeNullableIDFromGQLID", { enumerable: true, get: function () { return node_resolver_1.mustDecodeNullableIDFromGQLID; } });
 Object.defineProperty(exports, "encodeGQLID", { enumerable: true, get: function () { return node_resolver_1.encodeGQLID; } });
-var enums_1 = require("./enums");
-Object.defineProperty(exports, "convertFromGQLEnum", { enumerable: true, get: function () { return enums_1.convertFromGQLEnum; } });
-Object.defineProperty(exports, "convertToGQLEnum", { enumerable: true, get: function () { return enums_1.convertToGQLEnum; } });
+var union_1 = require("./mutations/union");
+Object.defineProperty(exports, "transformUnionTypes", { enumerable: true, get: function () { return union_1.transformUnionTypes; } });

package/graphql/mutations/union.d.ts

@@ -0,0 +1,2 @@
+import { Data } from "../../core/base";
+export declare function transformUnionTypes<T extends Data>(input: T, pathsList: string[][]): T;

package/graphql/mutations/union.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformUnionTypes = void 0;
+// this transforms an input for union types from graphql format to TS format
+// in graphql, we represent it as UnionType =  {foo: FooType, bar: BarType, baz: BazType}
+// in TS, we repseent it as UnionType = FooType | BarType | BazType
+// this takes an input, paths to unions and transforms them as needed
+// only works on fields that are defined. depends on graphql to handle nullable/missing fields
+function transformUnionTypes(input, pathsList) {
+    for (const paths of pathsList) {
+        const lastPath = paths[paths.length - 1];
+        let last = input;
+        for (const path of paths) {
+            let curr = last[path];
+            if (curr === undefined) {
+                break;
+            }
+            if (path === lastPath) {
+                let count = 0;
+                let lastKey = undefined;
+                for (const k in curr) {
+                    count++;
+                    lastKey = k;
+                }
+                if (count != 1) {
+                    throw new Error(`can only only pass one key of union. passed ${count}`);
+                }
+                last[path] = curr[lastKey];
+            }
+            last = curr;
+        }
+    }
+    return input;
+}
+exports.transformUnionTypes = transformUnionTypes;

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.d.ts

@@ -1,16 +1,16 @@
 import { GraphQLFieldConfigMap, GraphQLObjectType, GraphQLInterfaceType } from "graphql";
 import { RequestContext } from "../../core/context";
 import { GraphQLEdge } from "./edge_connection";
-import { Data } from "../../core/base";
-declare type nodeType = GraphQLObjectType | GraphQLInterfaceType;
-export declare class GraphQLEdgeType<TNode extends nodeType, TEdge extends Data> extends GraphQLObjectType {
-    constructor(name: string, nodeType: TNode, optionalFields?: () => GraphQLFieldConfigMap<GraphQLEdge<TEdge>, RequestContext>);
+import { Data, Viewer } from "../../core/base";
+type nodeType = GraphQLObjectType | GraphQLInterfaceType;
+export declare class GraphQLEdgeType<TNode extends nodeType, TEdge extends Data, TViewer extends Viewer> extends GraphQLObjectType {
+    constructor(name: string, nodeType: TNode, optionalFields?: () => GraphQLFieldConfigMap<GraphQLEdge<TEdge>, RequestContext<TViewer>>);
 }
-interface connectionOptions<T extends Data> {
-    fields?(): GraphQLFieldConfigMap<GraphQLEdge<T>, RequestContext>;
+interface connectionOptions<T extends Data, TViewer extends Viewer> {
+    fields?(): GraphQLFieldConfigMap<GraphQLEdge<T>, RequestContext<TViewer>>;
 }
-export declare class GraphQLConnectionType<TNode extends nodeType, TEdge extends Data> extends GraphQLObjectType {
-    edgeType: GraphQLEdgeType<TNode, TEdge>;
-    constructor(name: string, nodeType: TNode, options?: connectionOptions<TEdge>);
+export declare class GraphQLConnectionType<TNode extends nodeType, TEdge extends Data, TViewer extends Viewer> extends GraphQLObjectType {
+    edgeType: GraphQLEdgeType<TNode, TEdge, TViewer>;
+    constructor(name: string, nodeType: TNode, options?: connectionOptions<TEdge, TViewer>);
 }
 export {};

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],
@@ -139,7 +139,7 @@ function sharedAssocTests() {
         const conn = new connection_type_1.GraphQLConnectionType("CustomEdge", eventType);
         const length = (m) => {
             let count = 0;
-            for (let k in m) {
+            for (let _ in m) {
                 count++;
             }
             return count;

package/graphql/query/shared_edge_connection.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonTests = void 0;
-const pg_1 = require("pg");
 const viewer_1 = require("../../core/viewer");
 const ent_1 = require("../../core/ent");
-const db_mock_1 = require("../../testutils/db_mock");
 const edge_connection_1 = require("./edge_connection");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
-jest.mock("pg");
-db_mock_1.QueryRecorder.mockPool(pg_1.Pool);
 class TestConnection {
     constructor(getQuery, ents, filter) {
         this.getQuery = getQuery;
@@ -48,23 +44,9 @@ class TestConnection {
 }
 const commonTests = (opts) => {
     function getCursorFrom(contacts, idx) {
-        // we depend on the fact that the same time is used for the edge and created_at
-        // based on getContactBuilder
-        // so regardless of if we're doing assoc or custom queries, we can get the time
-        // from the created_at field
         return (0, ent_1.getCursor)({
             row: contacts[idx],
-            col: "createdAt",
-            conv: (t) => {
-                //sqlite
-                if (typeof t === "string") {
-                    return Date.parse(t);
-                }
-                return t.getTime();
-            },
-            // we want the right column to be encoded in the cursor as opposed e.g. time for
-            // assoc queries, created_at for index/custom queries
-            cursorKey: opts.sortCol,
+            col: "id",
         });
     }
     describe("no filters", () => {

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/imports/index.d.ts

@@ -1,5 +1,6 @@
 export interface Options {
     filter?: (file: string, index: number, array: string[]) => boolean;
+    justCurrentDir?: boolean;
     ignore?: string | Readonly<string[]> | undefined;
 }
 export interface PathResult {
@@ -10,7 +11,11 @@ interface classResult {
     class: classInfo;
     file: file;
 }
-export declare function parseCustomImports(filePath: string, opts?: Options): PathResult;
+interface ParseInput {
+    root: string;
+    opts?: Options;
+}
+export declare function parseCustomImports(filePath: string, inputs: ParseInput[]): PathResult;
 export interface importInfo {
     name: string;
     importPath: string;