@data-client/core 0.11.5 → 0.12.3

package/src/controller/Controller.ts

@@ -5,6 +5,7 @@ import type {
   Denormalize,
   Queryable,
   SchemaArgs,
+  NI,
 } from '@data-client/normalizr';
 import {
   ExpiryStatus,
@@ -154,7 +155,7 @@ export default class Controller<
     args[0] !== null ?
       this.dispatch(
         createInvalidate(endpoint, {
-          args: args as readonly [...Parameters<E>],
+          args: args as Parameters<E>,
         }),
       )
     : Promise.resolve();
@@ -266,7 +267,7 @@ export default class Controller<
     args[0] !== null ?
       this.dispatch(
         createSubscription(endpoint, {
-          args: args as readonly [...Parameters<E>],
+          args: args as Parameters<E>,
         }),
       )
     : Promise.resolve();
@@ -288,7 +289,7 @@ export default class Controller<
     args[0] !== null ?
       this.dispatch(
         createUnsubscription(endpoint, {
-          args: args as readonly [...Parameters<E>],
+          args: args as Parameters<E>,
         }),
       )
     : Promise.resolve();
@@ -314,17 +315,28 @@ export default class Controller<
    * Gets the error, if any, for a given endpoint. Returns undefined for no errors.
    * @see https://dataclient.io/docs/api/Controller#getError
    */
-  getError = <
-    E extends Pick<EndpointInterface, 'key'>,
-    Args extends readonly [...Parameters<E['key']>] | readonly [null],
-  >(
+  getError<E extends EndpointInterface>(
+    endpoint: E,
+    ...rest:
+      | readonly [null, State<unknown>]
+      | readonly [...Parameters<E>, State<unknown>]
+  ): ErrorTypes | undefined;
+
+  getError<E extends Pick<EndpointInterface, 'key'>>(
     endpoint: E,
-    ...rest: [...Args, State<unknown>]
-  ): ErrorTypes | undefined => {
+    ...rest:
+      | readonly [null, State<unknown>]
+      | readonly [...Parameters<E['key']>, State<unknown>]
+  ): ErrorTypes | undefined;
+
+  getError(
+    endpoint: EndpointInterface,
+    ...rest: readonly [...unknown[], State<unknown>]
+  ): ErrorTypes | undefined {
     if (rest[0] === null) return;
     const state = rest[rest.length - 1] as State<unknown>;
     // this is typescript generics breaking
-    const args: any = rest.slice(0, rest.length - 1) as Parameters<E['key']>;
+    const args: any = rest.slice(0, rest.length - 1);
     const key = endpoint.key(...args);
 
     const meta = selectMeta(state, key);
@@ -333,7 +345,7 @@ export default class Controller<
     if (error !== undefined && meta?.errorPolicy === 'soft') return;
 
     return meta?.error as any;
-  };
+  }
 
   /**
    * Gets the (globally referentially stable) response for a given endpoint/args pair from state given.
@@ -341,16 +353,9 @@ export default class Controller<
    */
   getResponse<E extends EndpointInterface>(
     endpoint: E,
-    ...rest: readonly [null, State<unknown>]
-  ): {
-    data: DenormalizeNullable<E['schema']>;
-    expiryStatus: ExpiryStatus;
-    expiresAt: number;
-  };
-
-  getResponse<E extends EndpointInterface>(
-    endpoint: E,
-    ...rest: readonly [...Parameters<E>, State<unknown>]
+    ...rest:
+      | readonly [null, State<unknown>]
+      | readonly [...Parameters<E>, State<unknown>]
   ): {
     data: DenormalizeNullable<E['schema']>;
     expiryStatus: ExpiryStatus;
@@ -557,10 +562,12 @@ function schemaHasEntity(schema: Schema): boolean {
 export type { ErrorTypes };
 
 class Snapshot<T = unknown> implements SnapshotInterface {
+  static readonly abort = new AbortOptimistic();
+
   private state: State<T>;
   private controller: Controller;
   readonly fetchedAt: number;
-  readonly abort = new AbortOptimistic();
+  readonly abort = Snapshot.abort;
 
   constructor(controller: Controller, state: State<T>, fetchedAt = 0) {
     this.state = state;
@@ -613,15 +620,22 @@ class Snapshot<T = unknown> implements SnapshotInterface {
   }
 
   /** @see https://dataclient.io/docs/api/Snapshot#getError */
-  getError = <
-    E extends Pick<EndpointInterface, 'key'>,
-    Args extends readonly [...Parameters<E['key']>],
-  >(
+  getError<E extends EndpointInterface>(
+    endpoint: E,
+    ...args: readonly [...Parameters<E>] | readonly [null]
+  ): ErrorTypes | undefined;
+
+  getError<E extends Pick<EndpointInterface, 'key'>>(
     endpoint: E,
-    ...args: Args
-  ): ErrorTypes | undefined => {
+    ...args: readonly [...Parameters<E['key']>] | readonly [null]
+  ): ErrorTypes | undefined;
+
+  getError<E extends Pick<EndpointInterface, 'key'>>(
+    endpoint: E,
+    ...args: readonly [...Parameters<E['key']>] | readonly [null]
+  ): ErrorTypes | undefined {
     return this.controller.getError(endpoint, ...args, this.state);
-  };
+  }
 
   /**
    * Retrieved memoized value for any Querable schema

package/src/controller/createFetch.ts

@@ -1,4 +1,4 @@
-import type { EndpointInterface } from '@data-client/normalizr';
+import type { EndpointInterface, NI } from '@data-client/normalizr';
 
 import { EndpointUpdateFunction } from './types.js';
 import { FETCH_TYPE } from '../actionTypes.js';
@@ -19,7 +19,7 @@ export default function createFetch<
   const promise = new Promise<any>((a, b) => {
     [resolve, reject] = [a, b];
   });
-  const meta: FetchMeta = {
+  const meta: FetchMeta<typeof args> = {
     args,
     key,
     throttle: !endpoint.sideEffect,

package/src/manager/NetworkManager.ts

@@ -71,7 +71,7 @@ export default class NetworkManager implements Manager {
                   if (error) {
                     this.handleSet(
                       createSet(action.endpoint, {
-                        args: action.meta.args as any,
+                        args: action.meta.args,
                         response: error,
                         fetchedAt: action.meta.fetchedAt,
                         error: true,
@@ -192,7 +192,7 @@ export default class NetworkManager implements Manager {
           // don't update state with promises started before last clear
           if (createdAt >= lastReset) {
             this.controller.resolve(action.endpoint, {
-              args: action.meta.args as any,
+              args: action.meta.args,
               response: data,
               fetchedAt: createdAt,
             });
@@ -204,7 +204,7 @@ export default class NetworkManager implements Manager {
           // don't update state with promises started before last clear
           if (createdAt >= lastReset) {
             this.controller.resolve(action.endpoint, {
-              args: action.meta.args as any,
+              args: action.meta.args,
               response: error,
               fetchedAt: createdAt,
               error: true,

package/src/manager/__tests__/networkManager.ts

@@ -54,6 +54,7 @@ describe('NetworkManager', () => {
       (v: { id: number }) => Promise.resolve({ id: 5, title: 'hi' }),
       {
         schema: Article,
+        name: 'detailEndpoint',
       },
     );
     const fetchResolveAction = createFetch(detailEndpoint, {

package/src/manager/__tests__/pollingSubscription.ts

@@ -288,7 +288,9 @@ describe('PollingSubscription', () => {
       afterEach(() => {
         warnSpy.mockRestore();
       });
-      beforeEach(() => (warnSpy = jest.spyOn(console, 'warn')));
+      beforeEach(() =>
+        (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
+      );
 
       it('should stop all timers', () => {
         dispatch.mockClear();

package/ts3.4/actions.d.ts

@@ -29,8 +29,8 @@ export interface SetActionError<E extends EndpointAndUpdate<E> = EndpointDefault
     error: true;
 }
 export type SetAction<E extends EndpointAndUpdate<E> = EndpointDefault> = SetActionSuccess<E> | SetActionError<E>;
-export interface FetchMeta {
-    args: readonly any[];
+export interface FetchMeta<A extends readonly any[] = readonly any[]> {
+    args: A;
     key: string;
     throttle: boolean;
     resolve: (value?: any | PromiseLike<any>) => void;
@@ -42,7 +42,9 @@ export interface FetchMeta {
 export interface FetchAction<E extends EndpointAndUpdate<E> = EndpointDefault> {
     type: typeof FETCH_TYPE;
     endpoint: E;
-    meta: FetchMeta;
+    meta: FetchMeta<readonly [
+        ...Parameters<E>
+    ]>;
     payload: () => ReturnType<E>;
 }
 export interface OptimisticAction<E extends EndpointAndUpdate<E> = EndpointDefault> {

package/ts3.4/controller/Controller.d.ts

@@ -147,14 +147,20 @@ export default class Controller<D extends GenericDispatch = DataClientDispatch>
      * Gets the error, if any, for a given endpoint. Returns undefined for no errors.
      * @see https://dataclient.io/docs/api/Controller#getError
      */
-    getError: <E extends Pick<EndpointInterface<FetchFunction, Schema | undefined, boolean | undefined>, "key">, Args extends readonly [
-        null
+    getError<E extends EndpointInterface>(endpoint: E, ...rest: readonly [
+        null,
+        State<unknown>
+    ] | readonly [
+        ...Parameters<E>,
+        State<unknown>
+    ]): ErrorTypes | undefined;
+    getError<E extends Pick<EndpointInterface, 'key'>>(endpoint: E, ...rest: readonly [
+        null,
+        State<unknown>
     ] | readonly [
-        ...Parameters<E["key"]>
-    ]>(endpoint: E, ...rest: [
-        ...Args,
+        ...Parameters<E['key']>,
         State<unknown>
-    ]) => ErrorTypes | undefined;
+    ]): ErrorTypes | undefined;
     /**
      * Gets the (globally referentially stable) response for a given endpoint/args pair from state given.
      * @see https://dataclient.io/docs/api/Controller#getResponse
@@ -162,12 +168,7 @@ export default class Controller<D extends GenericDispatch = DataClientDispatch>
     getResponse<E extends EndpointInterface>(endpoint: E, ...rest: readonly [
         null,
         State<unknown>
-    ]): {
-        data: DenormalizeNullable<E['schema']>;
-        expiryStatus: ExpiryStatus;
-        expiresAt: number;
-    };
-    getResponse<E extends EndpointInterface>(endpoint: E, ...rest: readonly [
+    ] | readonly [
         ...Parameters<E>,
         State<unknown>
     ]): {