update query work

examples/todo-app/src/resources/TodoResource.ts

@@ -21,11 +21,6 @@ export const TodoResource = createPlaceholderResource({
 });
 
 export const queryRemainingTodos = new Query(
-  new schema.All(Todo),
-  (entries, { userId } = {}) => {
-    if (userId !== undefined)
-      return entries.filter((todo) => todo.userId === userId && !todo.completed)
-        .length;
-    return entries.filter((todo) => !todo.completed).length;
-  },
+  TodoResource.getList.schema,
+  (entries) => entries && entries.filter((todo) => !todo.completed).length,
 );

packages/endpoint/src/index.ts

@@ -34,6 +34,7 @@ export type {
   NormalizeNullable,
   Denormalize,
   DenormalizeNullable,
+  SchemaToArgs,
 } from './normal.js';
 export type {
   EndpointExtraOptions,

packages/endpoint/src/interface.ts

@@ -14,7 +14,7 @@ export type Serializable<
   T extends { toJSON(): string } = { toJSON(): string },
 > = (value: any) => T;
 
-export interface SchemaSimple<T = any> {
+export interface SchemaSimple<T = any, Args extends any[] = any[]> {
   normalize(
     input: any,
     parent: any,
@@ -23,7 +23,7 @@ export interface SchemaSimple<T = any> {
     addEntity: (...args: any) => any,
     visitedEntities: Record<string, any>,
     storeEntities: any,
-    args?: any[],
+    args: Args,
   ): any;
   denormalize(
     input: {},

packages/endpoint/src/normal.ts

@@ -131,3 +131,31 @@ export type NormalizedSchema<E, R> = {
 export interface EntityMap<T = any> {
   readonly [k: string]: EntityInterface<T>;
 }
+
+export type SchemaToArgs<
+  S extends {
+    normalize(
+      input: any,
+      parent: any,
+      key: any,
+      visit: (...args: any) => any,
+      addEntity: (...args: any) => any,
+      visitedEntities: Record<string, any>,
+      storeEntities: any,
+      args: any,
+    ): any;
+  },
+> = S extends {
+  normalize(
+    input: any,
+    parent: any,
+    key: any,
+    visit: (...args: any) => any,
+    addEntity: (...args: any) => any,
+    visitedEntities: Record<string, any>,
+    storeEntities: any,
+    args: infer Args,
+  ): any;
+}
+  ? Args
+  : never;

packages/endpoint/src/queryEndpoint.ts

@@ -3,15 +3,15 @@ import type {
   NormalizedIndex,
   SchemaSimple,
 } from './interface.js';
-import type { Denormalize } from './normal.js';
+import type { Denormalize, SchemaToArgs } from './normal.js';
 
 /**
  * Programmatic cache reading
  * @see https://dataclient.io/rest/api/Query
  */
 export class Query<
   S extends SchemaSimple,
-  P extends any[] = [],
+  P extends SchemaToArgs<S> = SchemaToArgs<S>,
   R = Denormalize<S>,
 > {
   declare schema: QuerySchema<S, R>;
@@ -34,17 +34,15 @@ export class Query<
 
   protected createQuerySchema(schema: SchemaSimple) {
     const query = Object.create(schema);
-    query.denormalize = (
-      { args, input }: { args: P; input: any },
-      _: P,
-      unvisit: any,
-    ) => {
+    query.denormalize = (input: any, args: P, unvisit: any) => {
       if (input === undefined) return undefined;
-      const value = (schema as any).denormalize(input, args, unvisit);
+      const value = unvisit(input, schema);
       return typeof value === 'symbol'
         ? undefined
         : this.process(value, ...args);
     };
+    // anywhere in the hierarchy
+    if ('key' in schema) query.key = `QUERY ${schema.key}`;
     query.infer = (
       args: any,
       indexes: any,
@@ -56,7 +54,7 @@ export class Query<
       ) => any,
       entities: EntityTable,
     ) => {
-      return { args, input: recurse(schema, args, indexes, entities) };
+      return recurse(schema, args, indexes, entities);
     };
     return query;
   }

packages/endpoint/src/schema.d.ts

@@ -317,11 +317,12 @@ export declare let CollectionRoot: CollectionConstructor;
  */
 export declare class Collection<
   S extends any[] | PolymorphicInterface = any,
-  Parent extends any[] = [
+  Args extends any[] = [
     urlParams: Record<string, any>,
     body?: Record<string, any>,
   ],
-> extends CollectionRoot<S, Parent> {}
+  Parent = any,
+> extends CollectionRoot<S, Args, Parent> {}
 
 // id is in Instance, so we default to that as pk
 /**

packages/endpoint/src/schemaTypes.ts

@@ -24,9 +24,10 @@ export type CollectionArrayAdder<S extends PolymorphicInterface> = S extends {
 
 export interface CollectionInterface<
   S extends PolymorphicInterface = any,
-  Parent extends any[] = any,
+  Args extends any[] = any[],
+  Parent = any,
 > {
-  addWith<P extends any[] = Parent>(
+  addWith<P extends any[] = Args>(
     merge: (existing: any, incoming: any) => any,
     createCollectionFilter?: (
       ...args: P
@@ -46,7 +47,7 @@ export interface CollectionInterface<
     addEntity: (...args: any) => any,
     visitedEntities: Record<string, any>,
     storeEntities: any,
-    args: any[],
+    args: Args,
   ): string;
 
   merge(existing: any, incoming: any): any;
@@ -126,28 +127,34 @@ export interface CollectionInterface<
    * @see https://dataclient.io/rest/api/Collection#assign
    */
   assign: S extends { denormalize(...args: any): Record<string, unknown> }
-    ? schema.Collection<S, Parent>
+    ? schema.Collection<S, Args, Parent>
     : never;
 }
 export type CollectionFromSchema<
   S extends any[] | PolymorphicInterface = any,
-  Parent extends any[] = [
+  Args extends any[] = [
     urlParams: Record<string, any>,
     body?: Record<string, any>,
   ],
-> = CollectionInterface<S extends any[] ? schema.Array<S[number]> : S, Parent>;
+  Parent = any,
+> = CollectionInterface<
+  S extends any[] ? schema.Array<S[number]> : S,
+  Args,
+  Parent
+>;
 
 export interface CollectionConstructor {
   new <
     S extends SchemaSimple[] | PolymorphicInterface = any,
-    Parent extends any[] = [
+    Args extends any[] = [
       urlParams: Record<string, any>,
       body?: Record<string, any>,
     ],
+    Parent = any,
   >(
     schema: S,
-    options?: CollectionOptions,
-  ): CollectionFromSchema<S, Parent>;
+    options?: CollectionOptions<Args, Parent>,
+  ): CollectionFromSchema<S, Args, Parent>;
   readonly prototype: CollectionInterface;
 }
 

packages/endpoint/src/schemas/Collection.ts

@@ -21,10 +21,11 @@ const createValue = (value: any) => ({ ...value });
  */
 export default class CollectionSchema<
   S extends PolymorphicInterface = any,
-  Parent extends any[] = [
+  Args extends any[] = [
     urlParams: Record<string, any>,
     body?: Record<string, any>,
   ],
+  Parent = any,
 > {
   protected declare nestKey: (parent: any, key: string) => Record<string, any>;
 
@@ -35,18 +36,18 @@ export default class CollectionSchema<
   declare readonly key: string;
 
   declare push: S extends ArraySchema<any>
-    ? CollectionSchema<S, Parent>
+    ? CollectionSchema<S, Args, Parent>
     : undefined;
 
   declare unshift: S extends ArraySchema<any>
-    ? CollectionSchema<S, Parent>
+    ? CollectionSchema<S, Args, Parent>
     : undefined;
 
   declare assign: S extends Values<any>
-    ? CollectionSchema<S, Parent>
+    ? CollectionSchema<S, Args, Parent>
     : undefined;
 
-  addWith<P extends any[] = Parent>(
+  addWith<P extends any[] = Args>(
     merge: (existing: any, incoming: any) => any,
     createCollectionFilter?: (
       ...args: P
@@ -59,7 +60,7 @@ export default class CollectionSchema<
   // so fetch(create, { userId: 'bob', completed: true }, data)
   // would possibly add to {}, {userId: 'bob'}, {completed: true}, {userId: 'bob', completed: true } - but only those already in the store
   // it ignores keys that start with sort as those are presumed to not filter results
-  protected createCollectionFilter(...args: Parent) {
+  protected createCollectionFilter(...args: Args) {
     return (collectionKey: Record<string, string>) =>
       Object.entries(collectionKey).every(
         ([key, value]) =>
@@ -74,7 +75,7 @@ export default class CollectionSchema<
     return key.startsWith('order');
   }
 
-  constructor(schema: S, options?: CollectionOptions) {
+  constructor(schema: S, options?: CollectionOptions<Args, Parent>) {
     this.schema = Array.isArray(schema)
       ? (new ArraySchema(schema[0]) as any)
       : schema;
@@ -109,7 +110,7 @@ export default class CollectionSchema<
       this.createCollectionFilter = (
         options as any as {
           createCollectionFilter: (
-            ...args: Parent
+            ...args: Args
           ) => (collectionKey: Record<string, string>) => boolean;
         }
       ).createCollectionFilter.bind(this) as any;
@@ -152,13 +153,13 @@ export default class CollectionSchema<
 
   normalize(
     input: any,
-    parent: any,
+    parent: Parent,
     key: string,
     visit: (...args: any) => any,
     addEntity: (...args: any) => any,
     visitedEntities: Record<string, any>,
     storeEntities: any,
-    args: any[],
+    args: Args,
   ): string {
     const pkList = this.schema.normalize(
       input,
@@ -239,22 +240,23 @@ export default class CollectionSchema<
 }
 
 export type CollectionOptions<
-  Parent extends any[] = [
+  Args extends any[] = [
     urlParams: Record<string, any>,
     body?: Record<string, any>,
   ],
+  Parent = any,
 > = (
   | {
-      nestKey?: (parent: any, key: string) => Record<string, any>;
+      nestKey?: (parent: Parent, key: string) => Record<string, any>;
     }
   | {
-      argsKey?: (...args: any) => Record<string, any>;
+      argsKey?: (...args: Args) => Record<string, any>;
     }
 ) &
   (
     | {
         createCollectionFilter?: (
-          ...args: Parent
+          ...args: Args
         ) => (collectionKey: Record<string, string>) => boolean;
       }
     | {

packages/endpoint/src/schemas/__tests__/Collection.test.ts

@@ -88,6 +88,7 @@ describe(`${schema.Collection.name} normalization`, () => {
         () => undefined,
         {},
         {},
+        // @ts-expect-error
         [],
       );
     }

packages/endpoint/src/schemas/__tests__/Query.test.ts

@@ -80,6 +80,9 @@ describe.each([
             inferResults(sortedUsers.schema, [{ asc: true }], {}, entities),
             sortedUsers.schema,
             createInput(entities),
+            {},
+            new WeakEntityMap(),
+            [{ asc: true }],
           ),
         ).toMatchSnapshot();
       });
@@ -137,6 +140,9 @@ describe.each([
           ),
           userCountByAdmin.schema,
           createInput(entities),
+          {},
+          new WeakEntityMap(),
+          [{ isAdmin: false }],
         );
         expect(nonAdminCount).toBe(3);
         const adminCount:
@@ -150,6 +156,9 @@ describe.each([
           ),
           userCountByAdmin.schema,
           createInput(entities),
+          {},
+          new WeakEntityMap(),
+          [{ isAdmin: true }],
         );
         expect(adminCount).toBe(1);
         if (typeof totalCount === 'symbol') return;

packages/rest/src/resourceTypes.ts

@@ -72,7 +72,16 @@ export interface Resource<
     ? GetEndpoint<
         {
           path: ShortenPath<O['path']>;
-          schema: schema.Collection<[O['schema']]>;
+          schema: schema.Collection<
+            [O['schema']],
+            [
+              'searchParams' extends keyof O
+                ? O['searchParams'] extends undefined
+                  ? PathArgs<ShortenPath<O['path']>>
+                  : O['searchParams'] & PathArgs<ShortenPath<O['path']>>
+                : PathArgs<ShortenPath<O['path']>>,
+            ]
+          >;
           body: 'body' extends keyof O
             ? O['body']
             : Partial<Denormalize<O['schema']>>;
@@ -82,7 +91,16 @@ export interface Resource<
     : GetEndpoint<
         {
           path: ShortenPath<O['path']>;
-          schema: schema.Collection<[O['schema']]>;
+          schema: schema.Collection<
+            [O['schema']],
+            [
+              'searchParams' extends keyof O
+                ? O['searchParams'] extends undefined
+                  ? PathArgs<ShortenPath<O['path']>>
+                  : O['searchParams'] & PathArgs<ShortenPath<O['path']>>
+                : PathArgs<ShortenPath<O['path']>>,
+            ]
+          >;
           body: 'body' extends keyof O
             ? O['body']
             : Partial<Denormalize<O['schema']>>;