@data-client/core 0.14.13 → 0.14.18

package/src/actions.ts

@@ -7,17 +7,17 @@ import type {
 } from '@data-client/normalizr';
 
 import type {
-  SET_TYPE,
-  RESET_TYPE,
-  FETCH_TYPE,
-  SUBSCRIBE_TYPE,
-  UNSUBSCRIBE_TYPE,
-  INVALIDATE_TYPE,
-  GC_TYPE,
-  OPTIMISTIC_TYPE,
-  INVALIDATEALL_TYPE,
-  EXPIREALL_TYPE,
-  SET_RESPONSE_TYPE,
+  SET,
+  RESET,
+  FETCH,
+  SUBSCRIBE,
+  UNSUBSCRIBE,
+  INVALIDATE,
+  GC,
+  OPTIMISTIC,
+  INVALIDATEALL,
+  EXPIREALL,
+  SET_RESPONSE,
 } from './actionTypes.js';
 import type { EndpointUpdateFunction } from './controller/types.js';
 
@@ -37,7 +37,7 @@ export interface ActionMeta {
 
 /** Action for Controller.set() */
 export interface SetAction<S extends Queryable = any> {
-  type: typeof SET_TYPE;
+  type: typeof SET;
   schema: S;
   args: readonly any[];
   meta: ActionMeta;
@@ -48,7 +48,7 @@ export interface SetAction<S extends Queryable = any> {
 export interface SetResponseActionBase<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof SET_RESPONSE_TYPE;
+  type: typeof SET_RESPONSE;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -81,7 +81,7 @@ export interface FetchMeta {
 
 /** Action for Controller.fetch() */
 export interface FetchAction<E extends EndpointAndUpdate<E> = EndpointDefault> {
-  type: typeof FETCH_TYPE;
+  type: typeof FETCH;
   endpoint: E;
   args: readonly [...Parameters<E>];
   key: string;
@@ -93,7 +93,7 @@ export interface FetchAction<E extends EndpointAndUpdate<E> = EndpointDefault> {
 export interface OptimisticAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof OPTIMISTIC_TYPE;
+  type: typeof OPTIMISTIC;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -106,7 +106,7 @@ export interface OptimisticAction<
 export interface SubscribeAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof SUBSCRIBE_TYPE;
+  type: typeof SUBSCRIBE;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -116,7 +116,7 @@ export interface SubscribeAction<
 export interface UnsubscribeAction<
   E extends EndpointAndUpdate<E> = EndpointDefault,
 > {
-  type: typeof UNSUBSCRIBE_TYPE;
+  type: typeof UNSUBSCRIBE;
   endpoint: E;
   args: readonly any[];
   key: string;
@@ -124,30 +124,30 @@ export interface UnsubscribeAction<
 
 /* EXPIRY */
 export interface ExpireAllAction {
-  type: typeof EXPIREALL_TYPE;
+  type: typeof EXPIREALL;
   testKey: (key: string) => boolean;
 }
 
 /* INVALIDATE */
 export interface InvalidateAllAction {
-  type: typeof INVALIDATEALL_TYPE;
+  type: typeof INVALIDATEALL;
   testKey: (key: string) => boolean;
 }
 
 export interface InvalidateAction {
-  type: typeof INVALIDATE_TYPE;
+  type: typeof INVALIDATE;
   key: string;
 }
 
 /* RESET */
 export interface ResetAction {
-  type: typeof RESET_TYPE;
+  type: typeof RESET;
   date: number;
 }
 
 /* GC */
 export interface GCAction {
-  type: typeof GC_TYPE;
+  type: typeof GC;
   entities: [string, string][];
   endpoints: string[];
 }

package/src/controller/Controller.ts

@@ -464,7 +464,7 @@ export default class Controller<
     }
 
     // second argument is false if any entities are missing
-    // eslint-disable-next-line prefer-const
+
     const { data, paths } = this.memo.denormalize(
       schema,
       input,

package/src/controller/actions/createExpireAll.ts

@@ -1,11 +1,11 @@
-import { EXPIREALL_TYPE } from '../../actionTypes.js';
+import { EXPIREALL } from '../../actionTypes.js';
 import type { ExpireAllAction } from '../../types.js';
 
 export function createExpireAll(
   testKey: (key: string) => boolean,
 ): ExpireAllAction {
   return {
-    type: EXPIREALL_TYPE,
+    type: EXPIREALL,
     testKey,
   };
 }

package/src/controller/actions/createFetch.ts

@@ -1,6 +1,6 @@
 import type { EndpointInterface, NI } from '@data-client/normalizr';
 
-import { FETCH_TYPE } from '../../actionTypes.js';
+import { FETCH } from '../../actionTypes.js';
 import type { FetchAction, FetchMeta } from '../../types.js';
 import { EndpointUpdateFunction } from '../types.js';
 
@@ -26,7 +26,7 @@ export function createFetch<
   };
 
   return {
-    type: FETCH_TYPE,
+    type: FETCH,
     key: endpoint.key(...args),
     args,
     endpoint,

package/src/controller/actions/createInvalidate.ts

@@ -1,6 +1,6 @@
 import type { EndpointInterface } from '@data-client/normalizr';
 
-import { INVALIDATE_TYPE } from '../../actionTypes.js';
+import { INVALIDATE } from '../../actionTypes.js';
 import type { InvalidateAction } from '../../types.js';
 
 export function createInvalidate<E extends EndpointInterface>(
@@ -8,7 +8,7 @@ export function createInvalidate<E extends EndpointInterface>(
   { args }: { args: readonly [...Parameters<E>] },
 ): InvalidateAction {
   return {
-    type: INVALIDATE_TYPE,
+    type: INVALIDATE,
     key: endpoint.key(...args),
   };
 }

package/src/controller/actions/createInvalidateAll.ts

@@ -1,11 +1,11 @@
-import { INVALIDATEALL_TYPE } from '../../actionTypes.js';
+import { INVALIDATEALL } from '../../actionTypes.js';
 import type { InvalidateAllAction } from '../../types.js';
 
 export function createInvalidateAll(
   testKey: (key: string) => boolean,
 ): InvalidateAllAction {
   return {
-    type: INVALIDATEALL_TYPE,
+    type: INVALIDATEALL,
     testKey,
   };
 }

package/src/controller/actions/createOptimistic.ts

@@ -1,7 +1,7 @@
 import type { EndpointInterface } from '@data-client/normalizr';
 
 import { createMeta } from './createMeta.js';
-import { OPTIMISTIC_TYPE } from '../../actionTypes.js';
+import { OPTIMISTIC } from '../../actionTypes.js';
 import type { OptimisticAction } from '../../types.js';
 import type { EndpointUpdateFunction } from '../types.js';
 
@@ -23,7 +23,7 @@ export function createOptimistic<
   }
 
   return {
-    type: OPTIMISTIC_TYPE,
+    type: OPTIMISTIC,
     key: endpoint.key(...args),
     args,
     endpoint,

package/src/controller/actions/createReset.ts

@@ -1,9 +1,9 @@
-import { RESET_TYPE } from '../../actionTypes.js';
+import { RESET } from '../../actionTypes.js';
 import type { ResetAction } from '../../types.js';
 
 export function createReset(): ResetAction {
   return {
-    type: RESET_TYPE,
+    type: RESET,
     date: Date.now(),
   };
 }

package/src/controller/actions/createSet.ts

@@ -5,7 +5,7 @@ import type {
 } from '@data-client/normalizr';
 
 import { createMeta } from './createMeta.js';
-import { SET_TYPE } from '../../actionTypes.js';
+import { SET } from '../../actionTypes.js';
 import type { SetAction } from '../../types.js';
 import ensurePojo from '../ensurePojo.js';
 
@@ -22,7 +22,7 @@ export function createSet<S extends Queryable>(
   },
 ): SetAction<S> {
   return {
-    type: SET_TYPE,
+    type: SET,
     value,
     args: args.map(ensurePojo) as SchemaArgs<S>,
     schema,

package/src/controller/actions/createSetResponse.ts

@@ -1,7 +1,7 @@
 import type { EndpointInterface, ResolveType } from '@data-client/normalizr';
 
 import { createMeta } from './createMeta.js';
-import { SET_RESPONSE_TYPE } from '../../actionTypes.js';
+import { SET_RESPONSE } from '../../actionTypes.js';
 import type { SetResponseAction } from '../../types.js';
 import ensurePojo from '../ensurePojo.js';
 import { EndpointUpdateFunction } from '../types.js';
@@ -62,7 +62,7 @@ export function createSetResponse<
   }
 
   return {
-    type: SET_RESPONSE_TYPE,
+    type: SET_RESPONSE,
     key: endpoint.key(...args),
     response,
     args: args.map(ensurePojo),

package/src/controller/actions/createSubscription.ts

@@ -1,6 +1,6 @@
 import type { EndpointInterface } from '@data-client/normalizr';
 
-import { SUBSCRIBE_TYPE, UNSUBSCRIBE_TYPE } from '../../actionTypes.js';
+import { SUBSCRIBE, UNSUBSCRIBE } from '../../actionTypes.js';
 import type { SubscribeAction, UnsubscribeAction } from '../../types.js';
 
 export function createSubscription<E extends EndpointInterface>(
@@ -8,10 +8,10 @@ export function createSubscription<E extends EndpointInterface>(
   { args }: { args: readonly [...Parameters<E>] },
 ): SubscribeAction<E> {
   return {
-    type: SUBSCRIBE_TYPE,
-    endpoint,
-    args,
+    type: SUBSCRIBE,
     key: endpoint.key(...args),
+    args,
+    endpoint,
   };
 }
 
@@ -20,7 +20,7 @@ export function createUnsubscription<E extends EndpointInterface>(
   { args }: { args: readonly [...Parameters<E>] },
 ): UnsubscribeAction<E> {
   return {
-    type: UNSUBSCRIBE_TYPE,
+    type: UNSUBSCRIBE,
     key: endpoint.key(...args),
     args,
     endpoint,

package/src/manager/DevtoolsManager.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-inner-declarations */
 import type { DevToolsConfig } from './devtoolsTypes.js';
 import type { Controller, EndpointInterface } from '../index.js';
 import type { Middleware } from '../middlewareTypes.js';
@@ -90,10 +89,10 @@ if (process.env.NODE_ENV !== 'production') {
  */
 export default class DevToolsManager implements Manager {
   declare middleware: Middleware;
-  protected declare devTools: undefined | any;
+  declare protected devTools: undefined | any;
   protected started = false;
   protected actions: [ActionTypes, State<unknown>][] = [];
-  protected declare controller: Controller;
+  declare protected controller: Controller;
   declare skipLogging?: (action: ActionTypes) => boolean;
   maxBufferLength = 100;
 

package/src/manager/LogoutManager.ts

@@ -1,4 +1,4 @@
-import { SET_RESPONSE_TYPE } from '../actionTypes.js';
+import { SET_RESPONSE } from '../actionTypes.js';
 import type Controller from '../controller/Controller.js';
 import { UnknownError } from '../index.js';
 import type { Manager, Middleware } from '../types.js';
@@ -16,7 +16,7 @@ export default class LogoutManager implements Manager {
   middleware: Middleware = controller => next => async action => {
     await next(action);
     if (
-      action.type === SET_RESPONSE_TYPE &&
+      action.type === SET_RESPONSE &&
       action.error &&
       this.shouldLogout(action.response)
     ) {

package/src/manager/NetworkManager.ts

@@ -1,4 +1,4 @@
-import { SET_RESPONSE_TYPE, FETCH_TYPE, RESET_TYPE } from '../actionTypes.js';
+import { SET_RESPONSE, FETCH, RESET } from '../actionTypes.js';
 import { createSetResponse } from '../controller/actions/index.js';
 import Controller from '../controller/Controller.js';
 import type {
@@ -46,7 +46,7 @@ export default class NetworkManager implements Manager {
     this.controller = controller;
     return next => action => {
       switch (action.type) {
-        case FETCH_TYPE:
+        case FETCH:
           this.handleFetch(action);
           // This is the only case that causes any state change
           // It's important to intercept other fetches as we don't want to trigger reducers during
@@ -58,7 +58,7 @@ export default class NetworkManager implements Manager {
             return next(action);
           }
           return Promise.resolve();
-        case SET_RESPONSE_TYPE:
+        case SET_RESPONSE:
           // only set after new state is computed
           return next(action).then(() => {
             if (action.key in this.fetched) {
@@ -79,7 +79,7 @@ export default class NetworkManager implements Manager {
               }
             }
           });
-        case RESET_TYPE: {
+        case RESET: {
           const rejectors = { ...this.rejectors };
 
           this.clearAll();
@@ -112,7 +112,7 @@ export default class NetworkManager implements Manager {
   /** Used by DevtoolsManager to determine whether to log an action */
   skipLogging(action: ActionTypes) {
     /* istanbul ignore next */
-    return action.type === FETCH_TYPE && action.key in this.fetched;
+    return action.type === FETCH && action.key in this.fetched;
   }
 
   allSettled() {

package/src/manager/PollingSubscription.ts

@@ -14,16 +14,16 @@ import type { SubscribeAction } from '../types.js';
  * @see https://dataclient.io/docs/api/PollingSubscription
  */
 export default class PollingSubscription implements Subscription {
-  protected declare readonly endpoint: EndpointInterface;
-  protected declare readonly args: readonly any[];
-  protected declare readonly key: string;
-  protected declare frequency: number;
+  declare protected readonly endpoint: EndpointInterface;
+  declare protected readonly args: readonly any[];
+  declare protected readonly key: string;
+  declare protected frequency: number;
   protected frequencyHistogram: Map<number, number> = new Map();
-  protected declare controller: Controller;
-  protected declare intervalId?: ReturnType<typeof setInterval>;
-  protected declare lastIntervalId?: ReturnType<typeof setInterval>;
-  protected declare startId?: ReturnType<typeof setTimeout>;
-  private declare connectionListener: ConnectionListener;
+  declare protected controller: Controller;
+  declare protected intervalId?: ReturnType<typeof setInterval>;
+  declare protected lastIntervalId?: ReturnType<typeof setInterval>;
+  declare protected startId?: ReturnType<typeof setTimeout>;
+  declare private connectionListener: ConnectionListener;
 
   constructor(
     action: Omit<SubscribeAction, 'type'>,

package/src/manager/SubscriptionManager.ts

@@ -1,4 +1,4 @@
-import { SUBSCRIBE_TYPE, UNSUBSCRIBE_TYPE } from '../actionTypes.js';
+import { SUBSCRIBE, UNSUBSCRIBE } from '../actionTypes.js';
 import Controller from '../controller/Controller.js';
 import type {
   Manager,
@@ -40,7 +40,7 @@ export default class SubscriptionManager<
     [key: string]: InstanceType<S>;
   } = {};
 
-  protected declare readonly Subscription: S;
+  declare protected readonly Subscription: S;
   protected controller: Controller = new Controller();
 
   constructor(Subscription: S) {
@@ -51,14 +51,14 @@ export default class SubscriptionManager<
     this.controller = controller;
     return next => action => {
       switch (action.type) {
-        case SUBSCRIBE_TYPE:
+        case SUBSCRIBE:
           try {
             this.handleSubscribe(action);
           } catch (e) {
             console.error(e);
           }
           return Promise.resolve();
-        case UNSUBSCRIBE_TYPE:
+        case UNSUBSCRIBE:
           this.handleUnsubscribe(action);
           return Promise.resolve();
         default:

package/src/manager/__tests__/logoutManager.ts

@@ -1,7 +1,7 @@
 import { CoolerArticleResource } from '__tests__/new';
 
 import { Controller, initialState } from '../..';
-import { FETCH_TYPE, RESET_TYPE } from '../../actionTypes';
+import { FETCH, RESET } from '../../actionTypes';
 import { createSetResponse } from '../../controller/actions';
 import LogoutManager from '../LogoutManager.js';
 
@@ -73,7 +73,7 @@ describe('LogoutManager', () => {
       await manager.middleware(API)(next)(action);
 
       expect(dispatch.mock.calls.length).toBe(1);
-      expect(dispatch.mock.calls[0][0]?.type).toBe(RESET_TYPE);
+      expect(dispatch.mock.calls[0][0]?.type).toBe(RESET);
     });
 
     it('should call custom handleLogout', async () => {
@@ -97,7 +97,7 @@ describe('LogoutManager', () => {
     });
 
     it('should let other actions pass through', async () => {
-      const action = { type: FETCH_TYPE };
+      const action = { type: FETCH };
       next.mockReset();
 
       await manager.middleware(API)(next)(action as any);

package/src/manager/__tests__/networkManager.ts

@@ -1,7 +1,7 @@
 import { Endpoint } from '@data-client/endpoint';
 import { Article, ArticleResource } from '__tests__/new';
 
-import { SET_RESPONSE_TYPE } from '../../actionTypes';
+import { SET_RESPONSE } from '../../actionTypes';
 import { createFetch } from '../../controller/actions';
 import Controller from '../../controller/Controller';
 import NetworkManager from '../../manager/NetworkManager';
@@ -159,7 +159,7 @@ describe('NetworkManager', () => {
       await new Promise(resolve => setTimeout(resolve, 0));
 
       const action: SetResponseAction = {
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchResolveAction.endpoint,
         response,
         args: fetchResolveAction.args,
@@ -195,7 +195,7 @@ describe('NetworkManager', () => {
       await new Promise(resolve => setTimeout(resolve, 0));
 
       const action: SetResponseAction = {
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchSetWithUpdatersAction.endpoint,
         response,
         args: fetchSetWithUpdatersAction.args,
@@ -231,7 +231,7 @@ describe('NetworkManager', () => {
       await new Promise(resolve => setTimeout(resolve, 0));
 
       const action: SetResponseAction = {
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchRpcWithUpdatersAction.endpoint,
         response,
         args: fetchRpcWithUpdatersAction.args,
@@ -267,7 +267,7 @@ describe('NetworkManager', () => {
       // mutations resolve before dispatch, so we must wait for next tick to see set
       await new Promise(resolve => setTimeout(resolve, 0));
       expect(dispatch).toHaveBeenCalledWith({
-        type: SET_RESPONSE_TYPE,
+        type: SET_RESPONSE,
         endpoint: fetchRpcWithUpdatersAndOptimisticAction.endpoint,
         response,
         args: fetchRpcWithUpdatersAndOptimisticAction.args,
@@ -338,7 +338,7 @@ describe('NetworkManager', () => {
       } catch (error) {
         expect(next).not.toHaveBeenCalled();
         expect(dispatch).toHaveBeenCalledWith({
-          type: SET_RESPONSE_TYPE,
+          type: SET_RESPONSE,
           response: error,
           key: fetchRejectAction.key,
           meta: {

package/src/manager/__tests__/subscriptionManager.ts

@@ -4,7 +4,7 @@ import { actionTypes, Controller, initialState } from '../..';
 import { SubscribeAction, UnsubscribeAction } from '../../types';
 import SubscriptionManager, { Subscription } from '../SubscriptionManager.js';
 
-const { UNSUBSCRIBE_TYPE, SUBSCRIBE_TYPE, SET_RESPONSE_TYPE } = actionTypes;
+const { UNSUBSCRIBE, SUBSCRIBE, SET_RESPONSE } = actionTypes;
 
 function onError(e: any) {
   e.preventDefault();
@@ -55,7 +55,7 @@ describe('SubscriptionManager', () => {
           () => Promise.reject(new Error('Failed'))
         : () => Promise.resolve(response);
       return {
-        type: SUBSCRIBE_TYPE,
+        type: SUBSCRIBE,
         endpoint: PollingArticleResource.get.extend({ fetch }),
         args: [{ id: response.id }],
         key: PollingArticleResource.get.key({ id: response.id }),
@@ -65,7 +65,7 @@ describe('SubscriptionManager', () => {
       response: Record<string, any>,
     ): UnsubscribeAction {
       return {
-        type: UNSUBSCRIBE_TYPE,
+        type: UNSUBSCRIBE,
         endpoint: PollingArticleResource.get,
         key: PollingArticleResource.get.key({ id: response.id }),
         args: [{ id: response.id }],
@@ -185,7 +185,7 @@ describe('SubscriptionManager', () => {
     });
 
     it('should let other actions pass through', () => {
-      const action = { type: SET_RESPONSE_TYPE };
+      const action = { type: SET_RESPONSE };
       next.mockReset();
 
       manager.middleware(API)(next)(action as any);