enhance: Queries passthrough suspense rather than converting to undef…

…ined
reactive · Apr 24, 2024 · 6afbdef · 6afbdef
1 parent 5469db0
commit 6afbdef
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,6 +11,7 @@ jobs:
     resource_class: large
     steps:
       - checkout
+          depth: 1
       - run:
           name: examples use local packages
           command: |
@@ -80,7 +81,7 @@ jobs:
             if [ "<< parameters.react-version >>" == "^17.0.0" ]; then
               curl -Os https://uploader.codecov.io/latest/linux/codecov;
               chmod +x codecov;
-              yarn run test:coverage --ci --maxWorkers=3 --coverageReporters=text-lcov > ./lcov.info;
+              yarn run test:coverage --ci --maxWorkers=4 --coverageReporters=text-lcov > ./lcov.info;
               if [ "$CODECOV_TOKEN" != "" ]; then
                 ./codecov -t ${CODECOV_TOKEN} < ./lcov.info || true;
               else

diff --git a/packages/endpoint/src/schema.d.ts b/packages/endpoint/src/schema.d.ts
@@ -127,7 +127,9 @@ export class All<
     | (S extends EntityMap ? UnionResult<S> : Normalize<S>)[]
     | undefined;
 
-  _denormalizeNullable(): (S extends EntityMap<infer T> ? T : Denormalize<S>)[];
+  _denormalizeNullable():
+    | (S extends EntityMap<infer T> ? T : Denormalize<S>)[]
+    | undefined;
 
   denormalize(
     input: {},

diff --git a/packages/endpoint/src/schemas/Query.ts b/packages/endpoint/src/schemas/Query.ts
@@ -5,6 +5,7 @@ import type {
   SchemaSimple,
 } from '../interface.js';
 import type {
+  Denormalize,
   DenormalizeNullable,
   NormalizeNullable,
   SchemaArgs,
@@ -17,7 +18,7 @@ import type {
  */
 export default class Query<
   S extends Queryable,
-  P extends (entries: DenormalizeNullable<S>, ...args: any) => any,
+  P extends (entries: Denormalize<S>, ...args: any) => any,
 > implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>>
 {
   declare schema: S;
@@ -32,9 +33,9 @@ export default class Query<
     return (this.schema as any).normalize(...args);
   }
 
-  denormalize(input: {}, args: any, unvisit: any): ReturnType<P> | undefined {
+  denormalize(input: {}, args: any, unvisit: any): ReturnType<P> {
     const value = unvisit(input, this.schema);
-    return typeof value === 'symbol' ? undefined : this.process(value, ...args);
+    return typeof value === 'symbol' ? value : this.process(value, ...args);
   }
 
   queryKey(

diff --git a/packages/endpoint/src/schemas/__tests__/Query.test.ts b/packages/endpoint/src/schemas/__tests__/Query.test.ts
@@ -1,5 +1,7 @@
 // eslint-env jest
 import { MemoCache } from '@data-client/normalizr';
+import { useQuery, useSuspense } from '@data-client/react';
+import { RestEndpoint } from '@data-client/rest';
 import { IDEntity } from '__tests__/new';
 import { fromJS } from 'immutable';
 
@@ -188,7 +190,6 @@ describe('top level schema', () => {
   const sortedUsers = new schema.Query(
     new schema.Collection([User]),
     (results, { asc } = { asc: false }, ...args) => {
-      if (!results) return results;
       const sorted = [...results].sort((a, b) => a.name.localeCompare(b.name));
       if (asc) return sorted;
       return sorted.reverse();
@@ -214,6 +215,34 @@ describe('top level schema', () => {
     expect(users).toMatchSnapshot();
   });
 
+  test('works if base entity suspends', () => {
+    const entities = {
+      User: {
+        1: { id: '1', name: 'Milo' },
+        2: { id: '2', name: 'Jake' },
+        3: { id: '3', name: 'Zeta' },
+        4: { id: '4', name: 'Alpha' },
+      },
+    };
+    const users = new MemoCache().query('', sortedUsers, [], entities, {});
+    expect(users).toBeUndefined();
+  });
+
+  test('works if base entity suspends', () => {
+    const allSortedUsers = new schema.Query(
+      new schema.All(User),
+      (results, { asc } = { asc: false }, ...args) => {
+        const sorted = [...results].sort((a, b) =>
+          a.name.localeCompare(b.name),
+        );
+        if (asc) return sorted;
+        return sorted.reverse();
+      },
+    );
+    const users = new MemoCache().query('', allSortedUsers, [], {}, {});
+    expect(users).toBeUndefined();
+  });
+
   test('denormalizes should not be found when no entities are present', () => {
     const entities = {
       DOG: {
@@ -226,4 +255,20 @@ describe('top level schema', () => {
 
     expect(value).toEqual(undefined);
   });
+
+  test('', () => {
+    const getUsers = new RestEndpoint({
+      path: '/users',
+      searchParams: {} as { asc?: boolean },
+      schema: sortedUsers,
+    });
+    () => {
+      const users = useSuspense(getUsers, { asc: true });
+      users.map(user => user.name);
+      const others = useQuery(getUsers.schema, { asc: true });
+      // @ts-expect-error
+      others.map(user => user.name);
+      others?.map(user => user.name);
+    };
+  });
 });
diff --git a/website/src/components/Playground/editor-types/@data-client/endpoint.d.ts b/website/src/components/Playground/editor-types/@data-client/endpoint.d.ts
@@ -459,12 +459,12 @@ declare class Invalidate<E extends EntityInterface & {
  *
  * @see https://dataclient.io/rest/api/Query
  */
-declare class Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
+declare class Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
     schema: S;
     process: P;
     constructor(schema: S, process: P);
     normalize(...args: any): any;
-    denormalize(input: {}, args: any, unvisit: any): ReturnType<P> | undefined;
+    denormalize(input: {}, args: any, unvisit: any): ReturnType<P>;
     queryKey(args: ProcessParameters<P, S>, queryKey: (schema: any, args: any, getEntity: GetEntity, getIndex: GetIndex) => any, getEntity: GetEntity, getIndex: GetIndex): any;
     _denormalizeNullable: (input: {}, args: readonly any[], unvisit: (input: any, schema: any) => any) => ReturnType<P> | undefined;
     _normalizeNullable: () => NormalizeNullable<S>;
@@ -636,7 +636,9 @@ declare class All<
     | (S extends EntityMap ? UnionResult<S> : Normalize<S>)[]
     | undefined;
 
-  _denormalizeNullable(): (S extends EntityMap<infer T> ? T : Denormalize<S>)[];
+  _denormalizeNullable():
+    | (S extends EntityMap<infer T> ? T : Denormalize<S>)[]
+    | undefined;
 
   denormalize(
     input: {},
@@ -915,7 +917,7 @@ type schema_d_Invalidate<E extends EntityInterface & {
     process: any;
 }> = Invalidate<E>;
 declare const schema_d_Invalidate: typeof Invalidate;
-type schema_d_Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> = Query<S, P>;
+type schema_d_Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> = Query<S, P>;
 declare const schema_d_Query: typeof Query;
 type schema_d_SchemaClass<T = any, N = T | undefined, Args extends any[] = any[]> = SchemaClass<T, N, Args>;
 type schema_d_All<S extends EntityMap | EntityInterface = EntityMap | EntityInterface> = All<S>;

diff --git a/website/src/components/Playground/editor-types/@data-client/graphql.d.ts b/website/src/components/Playground/editor-types/@data-client/graphql.d.ts
@@ -459,12 +459,12 @@ declare class Invalidate<E extends EntityInterface & {
  *
  * @see https://dataclient.io/rest/api/Query
  */
-declare class Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
+declare class Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
     schema: S;
     process: P;
     constructor(schema: S, process: P);
     normalize(...args: any): any;
-    denormalize(input: {}, args: any, unvisit: any): ReturnType<P> | undefined;
+    denormalize(input: {}, args: any, unvisit: any): ReturnType<P>;
     queryKey(args: ProcessParameters<P, S>, queryKey: (schema: any, args: any, getEntity: GetEntity, getIndex: GetIndex) => any, getEntity: GetEntity, getIndex: GetIndex): any;
     _denormalizeNullable: (input: {}, args: readonly any[], unvisit: (input: any, schema: any) => any) => ReturnType<P> | undefined;
     _normalizeNullable: () => NormalizeNullable<S>;
@@ -636,7 +636,9 @@ declare class All<
     | (S extends EntityMap ? UnionResult<S> : Normalize<S>)[]
     | undefined;
 
-  _denormalizeNullable(): (S extends EntityMap<infer T> ? T : Denormalize<S>)[];
+  _denormalizeNullable():
+    | (S extends EntityMap<infer T> ? T : Denormalize<S>)[]
+    | undefined;
 
   denormalize(
     input: {},
@@ -915,7 +917,7 @@ type schema_d_Invalidate<E extends EntityInterface & {
     process: any;
 }> = Invalidate<E>;
 declare const schema_d_Invalidate: typeof Invalidate;
-type schema_d_Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> = Query<S, P>;
+type schema_d_Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> = Query<S, P>;
 declare const schema_d_Query: typeof Query;
 type schema_d_SchemaClass<T = any, N = T | undefined, Args extends any[] = any[]> = SchemaClass<T, N, Args>;
 type schema_d_All<S extends EntityMap | EntityInterface = EntityMap | EntityInterface> = All<S>;

diff --git a/website/src/components/Playground/editor-types/@data-client/rest.d.ts b/website/src/components/Playground/editor-types/@data-client/rest.d.ts
@@ -457,12 +457,12 @@ declare class Invalidate<E extends EntityInterface & {
  *
  * @see https://dataclient.io/rest/api/Query
  */
-declare class Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
+declare class Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
     schema: S;
     process: P;
     constructor(schema: S, process: P);
     normalize(...args: any): any;
-    denormalize(input: {}, args: any, unvisit: any): ReturnType<P> | undefined;
+    denormalize(input: {}, args: any, unvisit: any): ReturnType<P>;
     queryKey(args: ProcessParameters<P, S>, queryKey: (schema: any, args: any, getEntity: GetEntity, getIndex: GetIndex) => any, getEntity: GetEntity, getIndex: GetIndex): any;
     _denormalizeNullable: (input: {}, args: readonly any[], unvisit: (input: any, schema: any) => any) => ReturnType<P> | undefined;
     _normalizeNullable: () => NormalizeNullable<S>;
@@ -634,7 +634,9 @@ declare class All<
     | (S extends EntityMap ? UnionResult<S> : Normalize<S>)[]
     | undefined;
 
-  _denormalizeNullable(): (S extends EntityMap<infer T> ? T : Denormalize<S>)[];
+  _denormalizeNullable():
+    | (S extends EntityMap<infer T> ? T : Denormalize<S>)[]
+    | undefined;
 
   denormalize(
     input: {},
@@ -913,7 +915,7 @@ type schema_d_Invalidate<E extends EntityInterface & {
     process: any;
 }> = Invalidate<E>;
 declare const schema_d_Invalidate: typeof Invalidate;
-type schema_d_Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> = Query<S, P>;
+type schema_d_Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> = Query<S, P>;
 declare const schema_d_Query: typeof Query;
 type schema_d_SchemaClass<T = any, N = T | undefined, Args extends any[] = any[]> = SchemaClass<T, N, Args>;
 type schema_d_All<S extends EntityMap | EntityInterface = EntityMap | EntityInterface> = All<S>;

diff --git a/website/src/components/Playground/editor-types/globals.d.ts b/website/src/components/Playground/editor-types/globals.d.ts
@@ -461,12 +461,12 @@ declare class Invalidate<E extends EntityInterface & {
  *
  * @see https://dataclient.io/rest/api/Query
  */
-declare class Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
+declare class Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> implements SchemaSimple<ReturnType<P> | undefined, ProcessParameters<P, S>> {
     schema: S;
     process: P;
     constructor(schema: S, process: P);
     normalize(...args: any): any;
-    denormalize(input: {}, args: any, unvisit: any): ReturnType<P> | undefined;
+    denormalize(input: {}, args: any, unvisit: any): ReturnType<P>;
     queryKey(args: ProcessParameters<P, S>, queryKey: (schema: any, args: any, getEntity: GetEntity, getIndex: GetIndex) => any, getEntity: GetEntity, getIndex: GetIndex): any;
     _denormalizeNullable: (input: {}, args: readonly any[], unvisit: (input: any, schema: any) => any) => ReturnType<P> | undefined;
     _normalizeNullable: () => NormalizeNullable<S>;
@@ -638,7 +638,9 @@ declare class All<
     | (S extends EntityMap ? UnionResult<S> : Normalize<S>)[]
     | undefined;
 
-  _denormalizeNullable(): (S extends EntityMap<infer T> ? T : Denormalize<S>)[];
+  _denormalizeNullable():
+    | (S extends EntityMap<infer T> ? T : Denormalize<S>)[]
+    | undefined;
 
   denormalize(
     input: {},
@@ -917,7 +919,7 @@ type schema_d_Invalidate<E extends EntityInterface & {
     process: any;
 }> = Invalidate<E>;
 declare const schema_d_Invalidate: typeof Invalidate;
-type schema_d_Query<S extends Queryable, P extends (entries: DenormalizeNullable<S>, ...args: any) => any> = Query<S, P>;
+type schema_d_Query<S extends Queryable, P extends (entries: Denormalize<S>, ...args: any) => any> = Query<S, P>;
 declare const schema_d_Query: typeof Query;
 type schema_d_SchemaClass<T = any, N = T | undefined, Args extends any[] = any[]> = SchemaClass<T, N, Args>;
 type schema_d_All<S extends EntityMap | EntityInterface = EntityMap | EntityInterface> = All<S>;