Skip to content

Commit 09ad848

Browse files
committed
enhance: Move state.endpoints above state.indexes
1 parent 6fccfbc commit 09ad848

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

.changeset/rude-wolves-march.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
'@data-client/core': patch
3+
'@data-client/react': patch
4+
---
5+
6+
state.endpoints moved above indexes
7+
8+
`entites` and `endpoints` are the most commonly inspected
9+
parts of state when debugging, so it is better to have endpoints
10+
above indexes.

packages/core/src/state/reducer/createReducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ export default function createReducer(controller: Controller): ReducerType {
6666

6767
export const initialState: State<unknown> = {
6868
entities: {},
69-
indexes: {},
7069
endpoints: {},
70+
indexes: {},
7171
meta: {},
7272
entityMeta: {},
7373
optimistic: [],

packages/core/src/state/reducer/setReducer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ export function setReducer(
2626
);
2727
return {
2828
entities,
29-
indexes,
3029
endpoints: state.endpoints,
31-
entityMeta,
30+
indexes,
3231
meta: state.meta,
32+
entityMeta,
3333
optimistic: state.optimistic,
3434
lastReset: state.lastReset,
3535
};

packages/core/src/state/reducer/setResponseReducer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@ export function setResponseReducer(
6969
}
7070
return {
7171
entities,
72-
indexes,
7372
endpoints,
74-
entityMeta,
73+
indexes,
7574
meta: {
7675
...state.meta,
7776
[action.key]: {
@@ -80,6 +79,7 @@ export function setResponseReducer(
8079
prevExpiresAt: state.meta[action.key]?.expiresAt,
8180
},
8281
},
82+
entityMeta,
8383
optimistic: filterOptimistic(state, action),
8484
lastReset: state.lastReset,
8585
};

packages/core/src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ export interface State<T> {
2222
readonly entities: {
2323
readonly [entityKey: string]: { readonly [pk: string]: T } | undefined;
2424
};
25-
readonly indexes: NormalizedIndex;
2625
readonly endpoints: {
2726
readonly [key: string]: unknown | PK[] | PK | undefined;
2827
};
28+
readonly indexes: NormalizedIndex;
2929
readonly meta: {
3030
readonly [key: string]: {
3131
readonly date: number;

website/src/components/Playground/editor-types/@data-client/core.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,10 @@ interface State<T> {
393393
readonly [pk: string]: T;
394394
} | undefined;
395395
};
396-
readonly indexes: NormalizedIndex;
397396
readonly endpoints: {
398397
readonly [key: string]: unknown | PK[] | PK | undefined;
399398
};
399+
readonly indexes: NormalizedIndex;
400400
readonly meta: {
401401
readonly [key: string]: {
402402
readonly date: number;

0 commit comments

Comments
 (0)