@graphql-box/connection-resolver 0.1.4 → 0.1.8

package/lib/module/main/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/main/index.ts"],"names":["isCursorSupplied","requestAndCachePages","resolveConnection","validateCursor","cursorCache","createMakeCursors","createResourceResolver","getters","resolver","result","resultsPerPage","source","args","context","info","makeGroupCursor","makeIDCursor","resourceResolver","groupCursor","cursorError","edges","errors","nodes","pageInfo","hasNextPage","hasPreviousPage","totalCount","has","e"],"mappings":";AAEA,OAAOA,gBAAP,MAA6B,6BAA7B;AACA,OAAOC,oBAAP,MAAiC,iCAAjC;AACA,OAAOC,iBAAP,MAA8B,8BAA9B;AACA,OAAOC,cAAP,MAA2B,2BAA3B;AAEA,gBAAe,CAAC;AACdC,EAAAA,WADc;AAEdC,EAAAA,iBAFc;AAGdC,EAAAA,sBAHc;AAIdC,EAAAA,OAJc;AAKdC,EAAAA,QAAQ,GAAGC,MAAM,IAAIA,MALP;AAMdC,EAAAA;AANc,CAAD,KAOsB,OACnCC,MADmC,EAEnCC,IAFmC,EAGnCC,OAHmC,EAInCC,IAJmC,KAKX;AACxB,MAAI;AACF,UAAM;AAAEC,MAAAA,eAAF;AAAmBC,MAAAA;AAAnB,QAAoCX,iBAAiB,CAACM,MAAD,EAASC,IAAT,EAAeC,OAAf,EAAwBC,IAAxB,CAA3D;AACA,UAAMG,gBAAgB,GAAGX,sBAAsB,CAACK,MAAD,EAASC,IAAT,EAAeC,OAAf,EAAwBC,IAAxB,CAA/C;AACA,UAAMI,WAAW,GAAGH,eAAe,EAAnC;;AAEA,QAAIf,gBAAgB,CAACY,IAAD,CAApB,EAA4B;AAC1B,YAAMO,WAAW,GAAG,MAAMhB,cAAc,CAACS,IAAD,EAAOE,IAAP,EAAa;AACnDV,QAAAA,WADmD;AAEnDc,QAAAA,WAFmD;AAGnDR,QAAAA;AAHmD,OAAb,CAAxC;;AAMA,UAAIS,WAAJ,EAAiB;AACf,eAAOX,QAAQ,CAAC;AACdY,UAAAA,KAAK,EAAE,EADO;AAEdC,UAAAA,MAAM,EAAE,CAACF,WAAD,CAFM;AAGdG,UAAAA,KAAK,EAAE,EAHO;AAIdC,UAAAA,QAAQ,EAAE;AACRC,YAAAA,WAAW,EAAE,KADL;AAERC,YAAAA,eAAe,EAAE;AAFT,WAJI;AAQdC,UAAAA,UAAU,EAAE;AARE,SAAD,CAAf;AAUD;;AAED,aAAOlB,QAAQ,CACb,MAAMN,iBAAiB,CAACU,IAAD,EAAO;AAC5BR,QAAAA,WAD4B;AAE5BG,QAAAA,OAF4B;AAG5BW,QAAAA,WAH4B;AAI5BF,QAAAA,YAJ4B;AAK5BC,QAAAA,gBAL4B;AAM5BP,QAAAA;AAN4B,OAAP,CADV,CAAf;AAUD;;AAED,QAAI,MAAMN,WAAW,CAACuB,GAAZ,CAAiB,GAAET,WAAY,WAA/B,CAAV,EAAsD;AACpD,aAAOV,QAAQ,CACb,MAAMN,iBAAiB,CAACU,IAAD,EAAO;AAC5BR,QAAAA,WAD4B;AAE5BG,QAAAA,OAF4B;AAG5BW,QAAAA,WAH4B;AAI5BF,QAAAA,YAJ4B;AAK5BC,QAAAA,gBAL4B;AAM5BP,QAAAA;AAN4B,OAAP,CADV,CAAf;AAUD;;AAED,UAAMT,oBAAoB,CAAC,CAAC,CAAD,CAAD,EAAM;AAC9BG,MAAAA,WAD8B;AAE9BG,MAAAA,OAF8B;AAG9BW,MAAAA,WAH8B;AAI9BF,MAAAA,YAJ8B;AAK9BC,MAAAA;AAL8B,KAAN,CAA1B;AAQA,WAAOT,QAAQ,CACb,MAAMN,iBAAiB,CAACU,IAAD,EAAO;AAC5BR,MAAAA,WAD4B;AAE5BG,MAAAA,OAF4B;AAG5BW,MAAAA,WAH4B;AAI5BF,MAAAA,YAJ4B;AAK5BC,MAAAA,gBAL4B;AAM5BP,MAAAA;AAN4B,KAAP,CADV,CAAf;AAUD,GApED,CAoEE,OAAOkB,CAAP,EAAU;AACV,UAAMA,CAAN;AACD;AACF,CApFD","sourcesContent":["import { GraphQLResolveInfo } from \"graphql\";\nimport { Connection, ConnectionInputOptions, ConnectionResolverUserOptions, PlainObject } from \"../defs\";\nimport isCursorSupplied from \"../helpers/isCursorSupplied\";\nimport requestAndCachePages from \"../helpers/requestAndCachePages\";\nimport resolveConnection from \"../helpers/resolveConnection\";\nimport validateCursor from \"../helpers/validateCursor\";\n\nexport default ({\n  cursorCache,\n  createMakeCursors,\n  createResourceResolver,\n  getters,\n  resolver = result => result,\n  resultsPerPage,\n}: ConnectionResolverUserOptions) => async (\n  source: PlainObject,\n  args: PlainObject & ConnectionInputOptions,\n  context: PlainObject,\n  info: GraphQLResolveInfo,\n): Promise<Connection> => {\n  try {\n    const { makeGroupCursor, makeIDCursor } = createMakeCursors(source, args, context, info);\n    const resourceResolver = createResourceResolver(source, args, context, info);\n    const groupCursor = makeGroupCursor();\n\n    if (isCursorSupplied(args)) {\n      const cursorError = await validateCursor(args, info, {\n        cursorCache,\n        groupCursor,\n        resultsPerPage,\n      });\n\n      if (cursorError) {\n        return resolver({\n          edges: [],\n          errors: [cursorError],\n          nodes: [],\n          pageInfo: {\n            hasNextPage: false,\n            hasPreviousPage: false,\n          },\n          totalCount: 0,\n        });\n      }\n\n      return resolver(\n        await resolveConnection(args, {\n          cursorCache,\n          getters,\n          groupCursor,\n          makeIDCursor,\n          resourceResolver,\n          resultsPerPage,\n        }),\n      );\n    }\n\n    if (await cursorCache.has(`${groupCursor}-metadata`)) {\n      return resolver(\n        await resolveConnection(args, {\n          cursorCache,\n          getters,\n          groupCursor,\n          makeIDCursor,\n          resourceResolver,\n          resultsPerPage,\n        }),\n      );\n    }\n\n    await requestAndCachePages([1], {\n      cursorCache,\n      getters,\n      groupCursor,\n      makeIDCursor,\n      resourceResolver,\n    });\n\n    return resolver(\n      await resolveConnection(args, {\n        cursorCache,\n        getters,\n        groupCursor,\n        makeIDCursor,\n        resourceResolver,\n        resultsPerPage,\n      }),\n    );\n  } catch (e) {\n    throw e;\n  }\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/main/index.ts"],"names":["isCursorSupplied","requestAndCachePages","resolveConnection","validateCursor","main","cursorCache","createMakeCursors","createResourceResolver","getters","resolver","result","resultsPerPage","source","args","context","info","makeGroupCursor","makeIDCursor","resourceResolver","groupCursor","cursorError","edges","errors","nodes","pageInfo","hasNextPage","hasPreviousPage","totalCount","has","e"],"mappings":";AAEA,OAAOA,gBAAP,MAA6B,6BAA7B;AACA,OAAOC,oBAAP,MAAiC,iCAAjC;AACA,OAAOC,iBAAP,MAA8B,8BAA9B;AACA,OAAOC,cAAP,MAA2B,2BAA3B;;AAEA,MAAMC,IAAI,GAAG,CAMX;AACAC,EAAAA,WADA;AAEAC,EAAAA,iBAFA;AAGAC,EAAAA,sBAHA;AAIAC,EAAAA,OAJA;AAKAC,EAAAA,QAAQ,GAAGC,MAAM,IAAIA,MALrB;AAMAC,EAAAA;AANA,CANW,KAamE,OAC9EC,MAD8E,EAE9EC,IAF8E,EAG9EC,OAH8E,EAI9EC,IAJ8E,KAKtD;AACxB,MAAI;AACF,UAAM;AAAEC,MAAAA,eAAF;AAAmBC,MAAAA;AAAnB,QAAoCX,iBAAiB,CAACM,MAAD,EAASC,IAAT,EAAeC,OAAf,EAAwBC,IAAxB,CAA3D;AACA,UAAMG,gBAAgB,GAAGX,sBAAsB,CAACK,MAAD,EAASC,IAAT,EAAeC,OAAf,EAAwBC,IAAxB,CAA/C;AACA,UAAMI,WAAW,GAAGH,eAAe,EAAnC;;AAEA,QAAIhB,gBAAgB,CAACa,IAAD,CAApB,EAA4B;AAC1B,YAAMO,WAAW,GAAG,MAAMjB,cAAc,CAACU,IAAD,EAAOE,IAAP,EAAa;AACnDV,QAAAA,WADmD;AAEnDc,QAAAA,WAFmD;AAGnDR,QAAAA;AAHmD,OAAb,CAAxC;;AAMA,UAAIS,WAAJ,EAAiB;AACf,eAAOX,QAAQ,CAAC;AACdY,UAAAA,KAAK,EAAE,EADO;AAEdC,UAAAA,MAAM,EAAE,CAACF,WAAD,CAFM;AAGdG,UAAAA,KAAK,EAAE,EAHO;AAIdC,UAAAA,QAAQ,EAAE;AACRC,YAAAA,WAAW,EAAE,KADL;AAERC,YAAAA,eAAe,EAAE;AAFT,WAJI;AAQdC,UAAAA,UAAU,EAAE;AARE,SAAD,CAAf;AAUD;;AAED,aAAOlB,QAAQ,CACb,MAAMP,iBAAiB,CAACW,IAAD,EAAO;AAC5BR,QAAAA,WAD4B;AAE5BG,QAAAA,OAF4B;AAG5BW,QAAAA,WAH4B;AAI5BF,QAAAA,YAJ4B;AAK5BC,QAAAA,gBAL4B;AAM5BP,QAAAA;AAN4B,OAAP,CADV,CAAf;AAUD;;AAED,QAAI,MAAMN,WAAW,CAACuB,GAAZ,CAAiB,GAAET,WAAY,WAA/B,CAAV,EAAsD;AACpD,aAAOV,QAAQ,CACb,MAAMP,iBAAiB,CAACW,IAAD,EAAO;AAC5BR,QAAAA,WAD4B;AAE5BG,QAAAA,OAF4B;AAG5BW,QAAAA,WAH4B;AAI5BF,QAAAA,YAJ4B;AAK5BC,QAAAA,gBAL4B;AAM5BP,QAAAA;AAN4B,OAAP,CADV,CAAf;AAUD;;AAED,UAAMV,oBAAoB,CAAyB,CAAC,CAAD,CAAzB,EAA8B;AACtDI,MAAAA,WADsD;AAEtDG,MAAAA,OAFsD;AAGtDW,MAAAA,WAHsD;AAItDF,MAAAA,YAJsD;AAKtDC,MAAAA;AALsD,KAA9B,CAA1B;AAQA,WAAOT,QAAQ,CACb,MAAMP,iBAAiB,CAACW,IAAD,EAAO;AAC5BR,MAAAA,WAD4B;AAE5BG,MAAAA,OAF4B;AAG5BW,MAAAA,WAH4B;AAI5BF,MAAAA,YAJ4B;AAK5BC,MAAAA,gBAL4B;AAM5BP,MAAAA;AAN4B,KAAP,CADV,CAAf;AAUD,GApED,CAoEE,OAAOkB,CAAP,EAAU;AACV,UAAMA,CAAN;AACD;AACF,CA1FD;;AA4FA,eAAezB,IAAf","sourcesContent":["import { GraphQLResolveInfo } from \"graphql\";\nimport { Connection, ConnectionInputOptions, ConnectionResolverUserOptions, Node, PlainObject } from \"../defs\";\nimport isCursorSupplied from \"../helpers/isCursorSupplied\";\nimport requestAndCachePages from \"../helpers/requestAndCachePages\";\nimport resolveConnection from \"../helpers/resolveConnection\";\nimport validateCursor from \"../helpers/validateCursor\";\n\nconst main = <\n  Source extends PlainObject | undefined,\n  Args extends PlainObject,\n  Ctx extends PlainObject,\n  Resource extends PlainObject,\n  ResourceNode extends Node\n>({\n  cursorCache,\n  createMakeCursors,\n  createResourceResolver,\n  getters,\n  resolver = result => result,\n  resultsPerPage,\n}: ConnectionResolverUserOptions<Source, Args, Ctx, Resource, ResourceNode>) => async (\n  source: Source,\n  args: Args & ConnectionInputOptions,\n  context: Ctx,\n  info: GraphQLResolveInfo,\n): Promise<Connection> => {\n  try {\n    const { makeGroupCursor, makeIDCursor } = createMakeCursors(source, args, context, info);\n    const resourceResolver = createResourceResolver(source, args, context, info);\n    const groupCursor = makeGroupCursor();\n\n    if (isCursorSupplied(args)) {\n      const cursorError = await validateCursor(args, info, {\n        cursorCache,\n        groupCursor,\n        resultsPerPage,\n      });\n\n      if (cursorError) {\n        return resolver({\n          edges: [],\n          errors: [cursorError],\n          nodes: [],\n          pageInfo: {\n            hasNextPage: false,\n            hasPreviousPage: false,\n          },\n          totalCount: 0,\n        });\n      }\n\n      return resolver(\n        await resolveConnection(args, {\n          cursorCache,\n          getters,\n          groupCursor,\n          makeIDCursor,\n          resourceResolver,\n          resultsPerPage,\n        }),\n      );\n    }\n\n    if (await cursorCache.has(`${groupCursor}-metadata`)) {\n      return resolver(\n        await resolveConnection(args, {\n          cursorCache,\n          getters,\n          groupCursor,\n          makeIDCursor,\n          resourceResolver,\n          resultsPerPage,\n        }),\n      );\n    }\n\n    await requestAndCachePages<Resource, ResourceNode>([1], {\n      cursorCache,\n      getters,\n      groupCursor,\n      makeIDCursor,\n      resourceResolver,\n    });\n\n    return resolver(\n      await resolveConnection(args, {\n        cursorCache,\n        getters,\n        groupCursor,\n        makeIDCursor,\n        resourceResolver,\n        resultsPerPage,\n      }),\n    );\n  } catch (e) {\n    throw e;\n  }\n};\n\nexport default main;\n"],"file":"index.js"}

package/lib/types/__testUtils__/generateCursorCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateCursorCache.d.ts","sourceRoot":"","sources":["../../../src/__testUtils__/generateCursorCache.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAMtC,oBAAY,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;0FAE0F,MAAM;AAAlG,wBAwCE"}
+{"version":3,"file":"generateCursorCache.d.ts","sourceRoot":"","sources":["../../../src/__testUtils__/generateCursorCache.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAMtC,oBAAY,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;0FAE0F,MAAM;AAAlG,wBAyCE"}

package/lib/types/defs/index.d.ts

@@ -4,7 +4,7 @@ export declare type PlainObject = {
     [key: string]: any;
 };
 export declare type Node = PlainObject & {
-    id: string;
+    id: string | number;
 };
 export declare type Direction = "backward" | "forward";
 export declare type CursorCacheEntry = {
@@ -42,28 +42,28 @@ export declare type Connection = {
     pageInfo: PageInfo;
     totalCount: number;
 };
-export interface ResourceResponse extends Response {
-    data?: PlainObject;
+export interface ResourceResponse<Resource extends PlainObject> extends Response {
+    data?: Resource;
     errors?: Error[];
 }
-export declare type ResourceResolver = (args: {
+export declare type ResourceResolver<Resource extends PlainObject> = (args: {
     page: number;
-}) => Promise<ResourceResponse>;
-export declare type CreateResourceResolver<Src = PlainObject, Args = PlainObject, Cxt = PlainObject> = (source: PlainObject & Src, args: PlainObject & Args, context: PlainObject & Cxt, info: GraphQLResolveInfo) => ResourceResolver;
-export interface Getters {
-    nodes: (obj: PlainObject) => Node[];
-    page: (obj: PlainObject) => number;
-    totalPages: (obj: PlainObject) => number;
-    totalResults: (obj: PlainObject) => number;
+}) => Promise<ResourceResponse<Resource>>;
+export declare type CreateResourceResolver<Source extends PlainObject | undefined, Args extends PlainObject, Ctx extends PlainObject, Resource extends PlainObject> = (source: Source, args: Args, context: Ctx, info: GraphQLResolveInfo) => ResourceResolver<Resource>;
+export interface Getters<Resource extends PlainObject, ResourceNode extends Node> {
+    nodes: (obj: Resource) => ResourceNode[];
+    page: (obj: Resource) => number;
+    totalPages: (obj: Resource) => number;
+    totalResults: (obj: Resource) => number;
 }
-export interface ConnectionResolverUserOptions {
-    createMakeCursors: (source: PlainObject, args: PlainObject, context: PlainObject, info: GraphQLResolveInfo) => {
+export interface ConnectionResolverUserOptions<Source extends PlainObject | undefined, Args extends PlainObject, Ctx extends PlainObject, Resource extends PlainObject, ResourceNode extends Node> {
+    createMakeCursors: (source: Source, args: Args, context: Ctx, info: GraphQLResolveInfo) => {
         makeGroupCursor: () => string;
         makeIDCursor: (id: string | number) => string;
     };
-    createResourceResolver: CreateResourceResolver;
+    createResourceResolver: CreateResourceResolver<Source, Args, Ctx, Resource>;
     cursorCache: Cachemap;
-    getters: Getters;
+    getters: Getters<Resource, ResourceNode>;
     resolver?: (args: Connection) => Connection;
     resultsPerPage: number;
 }

package/lib/types/defs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/defs/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/defs/index.ts"],"names":[],"mappings":"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"}

package/lib/types/helpers/requestAndCachePages.d.ts

@@ -1,21 +1,21 @@
 import Cachemap from "@cachemap/core";
-import { Getters, ResourceResolver } from "../defs";
-export declare type Context = {
+import { Getters, Node, PlainObject, ResourceResolver } from "../defs";
+export declare type Context<Resource extends PlainObject, ResourceNode extends Node> = {
     cursorCache: Cachemap;
-    getters: Getters;
+    getters: Getters<Resource, ResourceNode>;
     groupCursor: string;
     makeIDCursor: (id: string | number) => string;
-    resourceResolver: ResourceResolver;
+    resourceResolver: ResourceResolver<Resource>;
 };
-declare const _default: (pages: number[], { cursorCache, getters, groupCursor, makeIDCursor, resourceResolver }: Context) => Promise<{
+declare const requestAndCachePages: <Resource extends PlainObject, ResourceNode extends Node>(pages: number[], { cursorCache, getters, groupCursor, makeIDCursor, resourceResolver }: Context<Resource, ResourceNode>) => Promise<{
     cachedEdges: {
         edges: {
-            node: import("../defs").Node;
+            node: Node;
             cursor: string;
         }[];
         pageNumber: number;
     }[];
     errors: Error[];
 }>;
-export default _default;
+export default requestAndCachePages;
 //# sourceMappingURL=requestAndCachePages.d.ts.map

package/lib/types/helpers/requestAndCachePages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestAndCachePages.d.ts","sourceRoot":"","sources":["../../../src/helpers/requestAndCachePages.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAIpD,oBAAY,OAAO,GAAG;IACpB,WAAW,EAAE,QAAQ,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;IAC9C,gBAAgB,EAAE,gBAAgB,CAAC;CACpC,CAAC;gCAGO,MAAM,EAAE,yEACwD,OAAO;;;;;;;;;;AAFhF,wBAoCE"}
+{"version":3,"file":"requestAndCachePages.d.ts","sourceRoot":"","sources":["../../../src/helpers/requestAndCachePages.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAIvE,oBAAY,OAAO,CAAC,QAAQ,SAAS,WAAW,EAAE,YAAY,SAAS,IAAI,IAAI;IAC7E,WAAW,EAAE,QAAQ,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;IAC9C,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;CAC9C,CAAC;AAEF,QAAA,MAAM,oBAAoB,mEACjB,MAAM,EAAE;;;;;;;;;EAmChB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/lib/types/helpers/resolveConnection.d.ts

@@ -1,17 +1,17 @@
 import Cachemap from "@cachemap/core";
-import { ConnectionInputOptions, Getters, PlainObject, ResourceResolver } from "../defs";
-export declare type Context = {
+import { ConnectionInputOptions, Getters, Node, PlainObject, ResourceResolver } from "../defs";
+export declare type Context<Resource extends PlainObject, ResourceNode extends Node> = {
     cursorCache: Cachemap;
-    getters: Getters;
+    getters: Getters<Resource, ResourceNode>;
     groupCursor: string;
     makeIDCursor: (id: string | number) => string;
-    resourceResolver: ResourceResolver;
+    resourceResolver: ResourceResolver<Resource>;
     resultsPerPage: number;
 };
-declare const _default: (args: PlainObject & ConnectionInputOptions, { cursorCache, getters, groupCursor, makeIDCursor, resourceResolver, resultsPerPage }: Context) => Promise<{
+declare const resolveConnection: <Resource extends PlainObject, ResourceNode extends Node>(args: PlainObject & ConnectionInputOptions, { cursorCache, getters, groupCursor, makeIDCursor, resourceResolver, resultsPerPage, }: Context<Resource, ResourceNode>) => Promise<{
     edges: import("../defs").Edge[];
     errors: Error[];
-    nodes: import("../defs").Node[];
+    nodes: Node[];
     pageInfo: {
         endCursor: string;
         hasNextPage: boolean;
@@ -20,5 +20,5 @@ declare const _default: (args: PlainObject & ConnectionInputOptions, { cursorCac
     };
     totalCount: number;
 }>;
-export default _default;
+export default resolveConnection;
 //# sourceMappingURL=resolveConnection.d.ts.map

package/lib/types/helpers/resolveConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveConnection.d.ts","sourceRoot":"","sources":["../../../src/helpers/resolveConnection.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AASzF,oBAAY,OAAO,GAAG;IACpB,WAAW,EAAE,QAAQ,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;IAC9C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;+BAGM,WAAW,GAAG,sBAAsB,yFAC6C,OAAO;;;;;;;;;;;;AAFhG,wBA8DE"}
+{"version":3,"file":"resolveConnection.d.ts","sourceRoot":"","sources":["../../../src/helpers/resolveConnection.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAS/F,oBAAY,OAAO,CAAC,QAAQ,SAAS,WAAW,EAAE,YAAY,SAAS,IAAI,IAAI;IAC7E,WAAW,EAAE,QAAQ,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC;IAC9C,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,iBAAiB,kEACf,WAAW,GAAG,sBAAsB;;;;;;;;;;;EAoE3C,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/lib/types/main/index.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLResolveInfo } from "graphql";
-import { Connection, ConnectionInputOptions, ConnectionResolverUserOptions, PlainObject } from "../defs";
-declare const _default: ({ cursorCache, createMakeCursors, createResourceResolver, getters, resolver, resultsPerPage, }: ConnectionResolverUserOptions) => (source: PlainObject, args: PlainObject & ConnectionInputOptions, context: PlainObject, info: GraphQLResolveInfo) => Promise<Connection>;
-export default _default;
+import { Connection, ConnectionInputOptions, ConnectionResolverUserOptions, Node, PlainObject } from "../defs";
+declare const main: <Source extends PlainObject | undefined, Args extends PlainObject, Ctx extends PlainObject, Resource extends PlainObject, ResourceNode extends Node>({ cursorCache, createMakeCursors, createResourceResolver, getters, resolver, resultsPerPage, }: ConnectionResolverUserOptions<Source, Args, Ctx, Resource, ResourceNode>) => (source: Source, args: Args & ConnectionInputOptions, context: Ctx, info: GraphQLResolveInfo) => Promise<Connection>;
+export default main;
 //# sourceMappingURL=index.d.ts.map

package/lib/types/main/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/main/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;yHAatG,6BAA6B,cACtB,WAAW,QACb,WAAW,GAAG,sBAAsB,WACjC,WAAW,QACd,kBAAkB,KACvB,OAAO,CAAC,UAAU,CAAC;AAZtB,wBAoFE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/main/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAM/G,QAAA,MAAM,IAAI,8YAiBF,kBAAkB,KACvB,OAAO,CAAC,UAAU,CAwEpB,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-box/connection-resolver",
-  "version": "0.1.4",
+  "version": "0.1.8",
   "description": "The GraphQL Box connection manager module.",
   "keywords": [
     "graphql-box",

package/src/__testUtils__/generateCursorCache.ts

@@ -16,6 +16,7 @@ export default async ({ group, pageRanges = [], resultsPerPage, totalPages, tota
   const cursorCache = new Cachemap({
     name: "cursorCache",
     store: map(),
+    type: "someType",
   });
 
   const headers = new Headers({ "Cache-Control": "max-age=60" });

package/src/defs/index.ts

@@ -5,7 +5,7 @@ export type PlainObject = {
   [key: string]: any;
 };
 
-export type Node = PlainObject & { id: string };
+export type Node = PlainObject & { id: string | number };
 
 export type Direction = "backward" | "forward";
 
@@ -51,40 +51,48 @@ export type Connection = {
   totalCount: number;
 };
 
-export interface ResourceResponse extends Response {
-  data?: PlainObject;
+export interface ResourceResponse<Resource extends PlainObject> extends Response {
+  data?: Resource;
   errors?: Error[];
 }
 
-export type ResourceResolver = (args: { page: number }) => Promise<ResourceResponse>;
-
-export type CreateResourceResolver<Src = PlainObject, Args = PlainObject, Cxt = PlainObject> = (
-  source: PlainObject & Src,
-  args: PlainObject & Args,
-  context: PlainObject & Cxt,
-  info: GraphQLResolveInfo,
-) => ResourceResolver;
-
-export interface Getters {
-  nodes: (obj: PlainObject) => Node[];
-  page: (obj: PlainObject) => number;
-  totalPages: (obj: PlainObject) => number;
-  totalResults: (obj: PlainObject) => number;
+export type ResourceResolver<Resource extends PlainObject> = (args: {
+  page: number;
+}) => Promise<ResourceResponse<Resource>>;
+
+export type CreateResourceResolver<
+  Source extends PlainObject | undefined,
+  Args extends PlainObject,
+  Ctx extends PlainObject,
+  Resource extends PlainObject
+> = (source: Source, args: Args, context: Ctx, info: GraphQLResolveInfo) => ResourceResolver<Resource>;
+
+export interface Getters<Resource extends PlainObject, ResourceNode extends Node> {
+  nodes: (obj: Resource) => ResourceNode[];
+  page: (obj: Resource) => number;
+  totalPages: (obj: Resource) => number;
+  totalResults: (obj: Resource) => number;
 }
 
-export interface ConnectionResolverUserOptions {
+export interface ConnectionResolverUserOptions<
+  Source extends PlainObject | undefined,
+  Args extends PlainObject,
+  Ctx extends PlainObject,
+  Resource extends PlainObject,
+  ResourceNode extends Node
+> {
   createMakeCursors: (
-    source: PlainObject,
-    args: PlainObject,
-    context: PlainObject,
+    source: Source,
+    args: Args,
+    context: Ctx,
     info: GraphQLResolveInfo,
   ) => {
     makeGroupCursor: () => string;
     makeIDCursor: (id: string | number) => string;
   };
-  createResourceResolver: CreateResourceResolver;
+  createResourceResolver: CreateResourceResolver<Source, Args, Ctx, Resource>;
   cursorCache: Cachemap;
-  getters: Getters;
+  getters: Getters<Resource, ResourceNode>;
   resolver?: (args: Connection) => Connection;
   resultsPerPage: number;
 }

package/src/helpers/requestAndCachePages.ts

@@ -1,19 +1,19 @@
 import Cachemap from "@cachemap/core";
-import { Getters, ResourceResolver } from "../defs";
+import { Getters, Node, PlainObject, ResourceResolver } from "../defs";
 import cacheCursors from "./cacheCursors";
 import makeEdges from "./makeEdges";
 
-export type Context = {
+export type Context<Resource extends PlainObject, ResourceNode extends Node> = {
   cursorCache: Cachemap;
-  getters: Getters;
+  getters: Getters<Resource, ResourceNode>;
   groupCursor: string;
   makeIDCursor: (id: string | number) => string;
-  resourceResolver: ResourceResolver;
+  resourceResolver: ResourceResolver<Resource>;
 };
 
-export default async (
+const requestAndCachePages = async <Resource extends PlainObject, ResourceNode extends Node>(
   pages: number[],
-  { cursorCache, getters, groupCursor, makeIDCursor, resourceResolver }: Context,
+  { cursorCache, getters, groupCursor, makeIDCursor, resourceResolver }: Context<Resource, ResourceNode>,
 ) => {
   const errors: Error[] = [];
 
@@ -48,3 +48,5 @@ export default async (
 
   return { cachedEdges, errors };
 };
+
+export default requestAndCachePages;

package/src/helpers/resolveConnection.ts

@@ -1,5 +1,5 @@
 import Cachemap from "@cachemap/core";
-import { ConnectionInputOptions, Getters, PlainObject, ResourceResolver } from "../defs";
+import { ConnectionInputOptions, Getters, Node, PlainObject, ResourceResolver } from "../defs";
 import extractEdges from "./extractEdges";
 import extractNodes from "./extractNodes";
 import getInRangeCachedEdges from "./getInRangeCachedEdges";
@@ -8,18 +8,25 @@ import mergeCachedEdges from "./mergeCachedEdges";
 import requestAndCachePages from "./requestAndCachePages";
 import retrieveCachedConnection from "./retrieveCachedConnection";
 
-export type Context = {
+export type Context<Resource extends PlainObject, ResourceNode extends Node> = {
   cursorCache: Cachemap;
-  getters: Getters;
+  getters: Getters<Resource, ResourceNode>;
   groupCursor: string;
   makeIDCursor: (id: string | number) => string;
-  resourceResolver: ResourceResolver;
+  resourceResolver: ResourceResolver<Resource>;
   resultsPerPage: number;
 };
 
-export default async (
+const resolveConnection = async <Resource extends PlainObject, ResourceNode extends Node>(
   args: PlainObject & ConnectionInputOptions,
-  { cursorCache, getters, groupCursor, makeIDCursor, resourceResolver, resultsPerPage }: Context,
+  {
+    cursorCache,
+    getters,
+    groupCursor,
+    makeIDCursor,
+    resourceResolver,
+    resultsPerPage,
+  }: Context<Resource, ResourceNode>,
 ) => {
   const {
     cachedEdges,
@@ -51,7 +58,7 @@ export default async (
     };
   }
 
-  const { cachedEdges: missingCachedEdges, errors } = await requestAndCachePages(missingPages, {
+  const { cachedEdges: missingCachedEdges, errors } = await requestAndCachePages<Resource, ResourceNode>(missingPages, {
     cursorCache,
     getters,
     groupCursor,
@@ -80,3 +87,5 @@ export default async (
     totalCount: totalResults,
   };
 };
+
+export default resolveConnection;

package/src/helpers/retrieveCachedConnection.test.ts

@@ -30,8 +30,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(5);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("1::1");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("5::1");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("1::1");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("5::1");
       expect(hasPreviousPage).toBe(true);
       expect(hasNextPage).toBe(true);
       expect(missingPages.length).toBe(0);
@@ -59,8 +59,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(15);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("6::1");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("0::3");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("6::1");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("0::3");
       expect(hasPreviousPage).toBe(true);
       expect(hasNextPage).toBe(true);
       expect(missingPages.length).toBe(0);
@@ -88,8 +88,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(9);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("1::10");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("9::10");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("1::10");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("9::10");
       expect(hasPreviousPage).toBe(true);
       expect(hasNextPage).toBe(false);
       expect(missingPages.length).toBe(0);
@@ -118,8 +118,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(29);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("1::8");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("9::10");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("1::8");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("9::10");
         expect(hasPreviousPage).toBe(true);
         expect(hasNextPage).toBe(false);
         expect(missingPages.length).toBe(0);
@@ -147,8 +147,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(25);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("1::8");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("5::10");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("1::8");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("5::10");
         expect(hasPreviousPage).toBe(true);
         expect(hasNextPage).toBe(false);
         expect(missingPages.length).toBe(0);
@@ -178,8 +178,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(25);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("1::8");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("5::10");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("1::8");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("5::10");
         expect(hasPreviousPage).toBe(true);
         expect(hasNextPage).toBe(true);
         expect(missingPages.length).toBe(0);
@@ -207,8 +207,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(25);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("1::8");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("5::10");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("1::8");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("5::10");
         expect(hasPreviousPage).toBe(true);
         expect(hasNextPage).toBe(false);
         expect(missingPages.length).toBe(0);
@@ -238,8 +238,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(20);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("0::8");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("9::10");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("0::8");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("9::10");
         expect(hasPreviousPage).toBe(true);
         expect(hasNextPage).toBe(false);
         expect(missingPages.length).toBe(1);
@@ -268,8 +268,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(20);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("0::8");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("9::10");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("0::8");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("9::10");
         expect(hasPreviousPage).toBe(true);
         expect(hasNextPage).toBe(true);
         expect(missingPages.length).toBe(1);
@@ -301,8 +301,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(5);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("4::10");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("8::10");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("4::10");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("8::10");
       expect(hasPreviousPage).toBe(true);
       expect(hasNextPage).toBe(true);
       expect(missingPages.length).toBe(0);
@@ -330,8 +330,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(15);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("4::9");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("8::10");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("4::9");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("8::10");
       expect(hasPreviousPage).toBe(true);
       expect(hasNextPage).toBe(true);
       expect(missingPages.length).toBe(0);
@@ -359,8 +359,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(9);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("0::1");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("8::1");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("0::1");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("8::1");
       expect(hasPreviousPage).toBe(false);
       expect(hasNextPage).toBe(true);
       expect(missingPages.length).toBe(0);
@@ -388,8 +388,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(27);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("0::1");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("6::3");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("0::1");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("6::3");
       expect(hasPreviousPage).toBe(false);
       expect(hasNextPage).toBe(true);
       expect(missingPages.length).toBe(0);
@@ -417,8 +417,8 @@ describe("retrieveCachedConnection", () => {
 
       const edges = extractEdges(cachedEdges);
       expect(edges.length).toBe(25);
-      expect(decode(edges[0].node.id.split("::")[0])).toBe("2::1");
-      expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("6::3");
+      expect(decode((edges[0].node.id as string).split("::")[0])).toBe("2::1");
+      expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("6::3");
       expect(hasPreviousPage).toBe(true);
       expect(hasNextPage).toBe(true);
       expect(missingPages.length).toBe(0);
@@ -447,8 +447,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(20);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("0::1");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("9::3");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("0::1");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("9::3");
         expect(hasPreviousPage).toBe(false);
         expect(hasNextPage).toBe(true);
         expect(missingPages.length).toBe(1);
@@ -477,8 +477,8 @@ describe("retrieveCachedConnection", () => {
 
         const edges = extractEdges(cachedEdges);
         expect(edges.length).toBe(20);
-        expect(decode(edges[0].node.id.split("::")[0])).toBe("0::1");
-        expect(decode(edges[edges.length - 1].node.id.split("::")[0])).toBe("9::3");
+        expect(decode((edges[0].node.id as string).split("::")[0])).toBe("0::1");
+        expect(decode((edges[edges.length - 1].node.id as string).split("::")[0])).toBe("9::3");
         expect(hasPreviousPage).toBe(true);
         expect(hasNextPage).toBe(true);
         expect(missingPages.length).toBe(1);

package/src/helpers/validateCursor.test.ts

@@ -8,6 +8,7 @@ describe("validateCursor", () => {
     cursorCache: new Cachemap({
       name: "GRAPHQL_BOX_CONNECTION_RESOLVER",
       store: map(),
+      type: "CONNECTION_RESOLVER",
     }),
     groupCursor: "abcdefg",
     resultsPerPage: 10,

package/src/main/index.test.ts

@@ -5,7 +5,7 @@ import { encode } from "js-base64";
 import makeConnectionResolver from ".";
 import generateCursorCache from "../__testUtils__/generateCursorCache";
 import generatePageResponse from "../__testUtils__/generatePageResponse";
-import { Getters, PlainObject } from "../defs";
+import { PlainObject } from "../defs";
 import removeConnectionInputOptions from "../helpers/removeConnectionInputOptions";
 
 describe("connectionResolver", () => {
@@ -14,11 +14,11 @@ describe("connectionResolver", () => {
     makeIDCursor: (id: string | number) => encode(`${id}::${JSON.stringify(removeConnectionInputOptions(args))}`),
   });
 
-  const getters: Getters = {
-    nodes: ({ results }) => results,
-    page: ({ page }) => page,
-    totalPages: ({ totalPages }) => totalPages,
-    totalResults: ({ totalResults }) => totalResults,
+  const getters = {
+    nodes: ({ results }: PlainObject) => results,
+    page: ({ page }: PlainObject) => page,
+    totalPages: ({ totalPages }: PlainObject) => totalPages,
+    totalResults: ({ totalResults }: PlainObject) => totalResults,
   };
 
   const resultsPerPage = 10;
@@ -35,6 +35,7 @@ describe("connectionResolver", () => {
         cursorCache: new Cachemap({
           name: "GRAPHQL_BOX_CONNECTION_RESOLVER",
           store: map(),
+          type: "CONNECTION_RESOLVER",
         }),
         getters,
         resultsPerPage,
@@ -213,6 +214,7 @@ describe("connectionResolver", () => {
       const cursorCache = new Cachemap({
         name: "cursorCache",
         store: map(),
+        type: "someType",
       });
 
       const connectionResolver = makeConnectionResolver({
@@ -322,6 +324,7 @@ describe("connectionResolver", () => {
       const cursorCache = new Cachemap({
         name: "cursorCache",
         store: map(),
+        type: "someType",
       });
 
       const connectionResolver = makeConnectionResolver({