enhance: Move state.endpoints above state.indexes

reactive · Jul 22, 2024 · 09ad848 · 09ad848
1 parent 6fccfbc
commit 09ad848
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/.changeset/rude-wolves-march.md b/.changeset/rude-wolves-march.md
@@ -0,0 +1,10 @@
+---
+'@data-client/core': patch
+'@data-client/react': patch
+---
+
+state.endpoints moved above indexes
+
+`entites` and `endpoints` are the most commonly inspected
+parts of state when debugging, so it is better to have endpoints
+above indexes.
diff --git a/packages/core/src/state/reducer/createReducer.ts b/packages/core/src/state/reducer/createReducer.ts
@@ -66,8 +66,8 @@ export default function createReducer(controller: Controller): ReducerType {
 
 export const initialState: State<unknown> = {
   entities: {},
-  indexes: {},
   endpoints: {},
+  indexes: {},
   meta: {},
   entityMeta: {},
   optimistic: [],

diff --git a/packages/core/src/state/reducer/setReducer.ts b/packages/core/src/state/reducer/setReducer.ts
@@ -26,10 +26,10 @@ export function setReducer(
     );
     return {
       entities,
-      indexes,
       endpoints: state.endpoints,
-      entityMeta,
+      indexes,
       meta: state.meta,
+      entityMeta,
       optimistic: state.optimistic,
       lastReset: state.lastReset,
     };

diff --git a/packages/core/src/state/reducer/setResponseReducer.ts b/packages/core/src/state/reducer/setResponseReducer.ts
@@ -69,9 +69,8 @@ export function setResponseReducer(
     }
     return {
       entities,
-      indexes,
       endpoints,
-      entityMeta,
+      indexes,
       meta: {
         ...state.meta,
         [action.key]: {
@@ -80,6 +79,7 @@ export function setResponseReducer(
           prevExpiresAt: state.meta[action.key]?.expiresAt,
         },
       },
+      entityMeta,
       optimistic: filterOptimistic(state, action),
       lastReset: state.lastReset,
     };

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -22,10 +22,10 @@ export interface State<T> {
   readonly entities: {
     readonly [entityKey: string]: { readonly [pk: string]: T } | undefined;
   };
-  readonly indexes: NormalizedIndex;
   readonly endpoints: {
     readonly [key: string]: unknown | PK[] | PK | undefined;
   };
+  readonly indexes: NormalizedIndex;
   readonly meta: {
     readonly [key: string]: {
       readonly date: number;

diff --git a/website/src/components/Playground/editor-types/@data-client/core.d.ts b/website/src/components/Playground/editor-types/@data-client/core.d.ts
@@ -393,10 +393,10 @@ interface State<T> {
             readonly [pk: string]: T;
         } | undefined;
     };
-    readonly indexes: NormalizedIndex;
     readonly endpoints: {
         readonly [key: string]: unknown | PK[] | PK | undefined;
     };
+    readonly indexes: NormalizedIndex;
     readonly meta: {
         readonly [key: string]: {
             readonly date: number;