Skip to content

Commit 5002c27

Browse files
andrewimmandrewimm
committed
Rename ObjectState to ObjectStateMutations
1 parent 053eed3 commit 5002c27

16 files changed

+56
-56
lines changed

‎src/CoreManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @flow
1010
*/
1111

12-
import type { AttributeMap } from './ObjectState';
12+
import type { AttributeMap } from './ObjectStateMutations';
1313
import type { FileSource } from './ParseFile';
1414
import type ParseObject from './ParseObject';
1515
import type ParsePromise from './ParsePromise';

‎src/ObjectState.js renamed to ‎src/ObjectStateMutations.js

File renamed without changes.

‎src/ParseInstallation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import ParseObject from './ParseObject';
1313

14-
import type { AttributeMap } from './ObjectState';
14+
import type { AttributeMap } from './ObjectStateMutations';
1515

1616
export default class Installation extends ParseObject {
1717
constructor(attributes: ?AttributeMap) {

‎src/ParseObject.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import unique from './unique';
3838
import * as UniqueInstanceState from './UniqueInstanceState';
3939
import unsavedChildren from './unsavedChildren';
4040

41-
import type { AttributeMap, OpsMap } from './ObjectState';
41+
import type { AttributeMap, OpsMap } from './ObjectStateMutations';
4242
import type { RequestOptions, FullOptions } from './RESTController';
4343

4444
export type Pointer = {

‎src/ParseRole.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import ParseACL from './ParseACL';
1313
import ParseError from './ParseError';
1414
import ParseObject from './ParseObject';
1515

16-
import type { AttributeMap } from './ObjectState';
16+
import type { AttributeMap } from './ObjectStateMutations';
1717
import type ParseRelation from './ParseRelation';
1818

1919
/**

‎src/ParseSession.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import ParseObject from './ParseObject';
1515
import ParsePromise from './ParsePromise';
1616
import ParseUser from './ParseUser';
1717

18-
import type { AttributeMap } from './ObjectState';
18+
import type { AttributeMap } from './ObjectStateMutations';
1919
import type { RequestOptions, FullOptions } from './RESTController';
2020

2121
/**

‎src/ParseUser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import ParsePromise from './ParsePromise';
1717
import ParseSession from './ParseSession';
1818
import Storage from './Storage';
1919

20-
import type { AttributeMap } from './ObjectState';
20+
import type { AttributeMap } from './ObjectStateMutations';
2121
import type { RequestOptions, FullOptions } from './RESTController';
2222

2323
export type AuthData = ?{ [key: string]: mixed };

‎src/SingleInstanceState.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @flow
1010
*/
1111

12-
import * as ObjectState from './ObjectState';
12+
import * as ObjectStateMutations from './ObjectStateMutations';
1313

1414
type ObjectIdentifier = {
1515
className: string;
@@ -39,7 +39,7 @@ export function initializeState(obj: ObjectIdentifier, initial?: State): State {
3939
objectState[obj.className] = {};
4040
}
4141
if (!initial) {
42-
initial = ObjectState.defaultState();
42+
initial = ObjectStateMutations.defaultState();
4343
}
4444
state = objectState[obj.className][obj.id] = initial;
4545
return state;
@@ -64,7 +64,7 @@ export function getServerData(obj: ObjectIdentifier): AttributeMap {
6464

6565
export function setServerData(obj: ObjectIdentifier, attributes: AttributeMap) {
6666
let serverData = initializeState(obj).serverData;
67-
ObjectState.setServerData(serverData, attributes);
67+
ObjectStateMutations.setServerData(serverData, attributes);
6868
}
6969

7070
export function getPendingOps(obj: ObjectIdentifier): Array<OpsMap> {
@@ -77,22 +77,22 @@ export function getPendingOps(obj: ObjectIdentifier): Array<OpsMap> {
7777

7878
export function setPendingOp(obj: ObjectIdentifier, attr: string, op: ?Op) {
7979
let pendingOps = initializeState(obj).pendingOps;
80-
ObjectState.setPendingOp(pendingOps, attr, op);
80+
ObjectStateMutations.setPendingOp(pendingOps, attr, op);
8181
}
8282

8383
export function pushPendingState(obj: ObjectIdentifier) {
8484
let pendingOps = initializeState(obj).pendingOps;
85-
ObjectState.pushPendingState(pendingOps);
85+
ObjectStateMutations.pushPendingState(pendingOps);
8686
}
8787

8888
export function popPendingState(obj: ObjectIdentifier): OpsMap {
8989
let pendingOps = initializeState(obj).pendingOps;
90-
return ObjectState.popPendingState(pendingOps);
90+
return ObjectStateMutations.popPendingState(pendingOps);
9191
}
9292

9393
export function mergeFirstPendingState(obj: ObjectIdentifier) {
9494
let pendingOps = getPendingOps(obj);
95-
ObjectState.mergeFirstPendingState(pendingOps);
95+
ObjectStateMutations.mergeFirstPendingState(pendingOps);
9696
}
9797

9898
export function getObjectCache(obj: ObjectIdentifier): ObjectCache {
@@ -106,18 +106,18 @@ export function getObjectCache(obj: ObjectIdentifier): ObjectCache {
106106
export function estimateAttribute(obj: ObjectIdentifier, attr: string): mixed {
107107
let serverData = getServerData(obj);
108108
let pendingOps = getPendingOps(obj);
109-
return ObjectState.estimateAttribute(serverData, pendingOps, obj.className, obj.id, attr);
109+
return ObjectStateMutations.estimateAttribute(serverData, pendingOps, obj.className, obj.id, attr);
110110
}
111111

112112
export function estimateAttributes(obj: ObjectIdentifier): AttributeMap {
113113
let serverData = getServerData(obj);
114114
let pendingOps = getPendingOps(obj);
115-
return ObjectState.estimateAttributes(serverData, pendingOps, obj.className, obj.id);
115+
return ObjectStateMutations.estimateAttributes(serverData, pendingOps, obj.className, obj.id);
116116
}
117117

118118
export function commitServerChanges(obj: ObjectIdentifier, changes: AttributeMap) {
119119
let state = initializeState(obj);
120-
ObjectState.commitServerChanges(state.serverData, state.objectCache, changes);
120+
ObjectStateMutations.commitServerChanges(state.serverData, state.objectCache, changes);
121121
}
122122

123123
export function enqueueTask(obj: ObjectIdentifier, task: () => ParsePromise) {

‎src/UniqueInstanceState.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @flow
1010
*/
1111

12-
import * as ObjectState from './ObjectState';
12+
import * as ObjectStateMutations from './ObjectStateMutations';
1313
import TaskQueue from './TaskQueue';
1414

1515
import type ParseObject from './ParseObject';
@@ -59,7 +59,7 @@ export function getServerData(obj: ParseObject): AttributeMap {
5959

6060
export function setServerData(obj: ParseObject, attributes: AttributeMap) {
6161
let serverData = initializeState(obj).serverData;
62-
ObjectState.setServerData(serverData, attributes);
62+
ObjectStateMutations.setServerData(serverData, attributes);
6363
}
6464

6565
export function getPendingOps(obj: ParseObject): Array<OpsMap> {
@@ -72,22 +72,22 @@ export function getPendingOps(obj: ParseObject): Array<OpsMap> {
7272

7373
export function setPendingOp(obj: ParseObject, attr: string, op: ?Op) {
7474
let pendingOps = initializeState(obj).pendingOps;
75-
ObjectState.setPendingOp(pendingOps, attr, op);
75+
ObjectStateMutations.setPendingOp(pendingOps, attr, op);
7676
}
7777

7878
export function pushPendingState(obj: ParseObject) {
7979
let pendingOps = initializeState(obj).pendingOps;
80-
ObjectState.pushPendingState(pendingOps);
80+
ObjectStateMutations.pushPendingState(pendingOps);
8181
}
8282

8383
export function popPendingState(obj: ParseObject): OpsMap {
8484
let pendingOps = initializeState(obj).pendingOps;
85-
return ObjectState.popPendingState(pendingOps);
85+
return ObjectStateMutations.popPendingState(pendingOps);
8686
}
8787

8888
export function mergeFirstPendingState(obj: ParseObject) {
8989
let pendingOps = getPendingOps(obj);
90-
ObjectState.mergeFirstPendingState(pendingOps);
90+
ObjectStateMutations.mergeFirstPendingState(pendingOps);
9191
}
9292

9393
export function getObjectCache(obj: ParseObject): ObjectCache {
@@ -101,18 +101,18 @@ export function getObjectCache(obj: ParseObject): ObjectCache {
101101
export function estimateAttribute(obj: ParseObject, attr: string): mixed {
102102
let serverData = getServerData(obj);
103103
let pendingOps = getPendingOps(obj);
104-
return ObjectState.estimateAttribute(serverData, pendingOps, obj.className, obj.id, attr);
104+
return ObjectStateMutations.estimateAttribute(serverData, pendingOps, obj.className, obj.id, attr);
105105
}
106106

107107
export function estimateAttributes(obj: ParseObject): AttributeMap {
108108
let serverData = getServerData(obj);
109109
let pendingOps = getPendingOps(obj);
110-
return ObjectState.estimateAttributes(serverData, pendingOps, obj.className, obj.id);
110+
return ObjectStateMutations.estimateAttributes(serverData, pendingOps, obj.className, obj.id);
111111
}
112112

113113
export function commitServerChanges(obj: ParseObject, changes: AttributeMap) {
114114
let state = initializeState(obj);
115-
ObjectState.commitServerChanges(state.serverData, state.objectCache, changes);
115+
ObjectStateMutations.commitServerChanges(state.serverData, state.objectCache, changes);
116116
}
117117

118118
export function enqueueTask(obj: ParseObject, task: () => ParsePromise) {

‎src/__tests__/ObjectState-test.js renamed to ‎src/__tests__/ObjectStateMutations-test.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
jest.dontMock('../decode');
1111
jest.dontMock('../encode');
12-
jest.dontMock('../ObjectState');
12+
jest.dontMock('../ObjectStateMutations');
1313
jest.dontMock('../ParseFile');
1414
jest.dontMock('../ParseGeoPoint');
1515
jest.dontMock('../ParseOp');
@@ -23,77 +23,77 @@ const mockObject = function(className) {
2323
mockObject.registerSubclass = function() {};
2424
jest.setMock('../ParseObject', mockObject);
2525

26-
const ObjectState = require('../ObjectState');
26+
const ObjectStateMutations = require('../ObjectStateMutations');
2727
const ParseOps = require('../ParseOp');
2828
const TaskQueue = require('../TaskQueue');
2929

30-
describe('ObjectState', () => {
30+
describe('ObjectStateMutations', () => {
3131
it('can apply server data', () => {
3232
let serverData = {};
33-
ObjectState.setServerData(serverData, { counter: 12 });
33+
ObjectStateMutations.setServerData(serverData, { counter: 12 });
3434
expect(serverData).toEqual({ counter: 12 });
35-
ObjectState.setServerData(serverData, { counter: undefined });
35+
ObjectStateMutations.setServerData(serverData, { counter: undefined });
3636
expect(serverData).toEqual({});
3737
});
3838

3939
it('can set a pending op', () => {
4040
let pendingOps = [{}];
4141
let op = new ParseOps.IncrementOp(1);
42-
ObjectState.setPendingOp(pendingOps, 'counter', op);
42+
ObjectStateMutations.setPendingOp(pendingOps, 'counter', op);
4343
expect(pendingOps).toEqual([{ counter: op }]);
4444

4545
pendingOps = [{}, {}];
46-
ObjectState.setPendingOp(pendingOps, 'counter', op);
46+
ObjectStateMutations.setPendingOp(pendingOps, 'counter', op);
4747
expect(pendingOps).toEqual([{}, { counter: op }]);
4848

49-
ObjectState.setPendingOp(pendingOps, 'counter', null);
49+
ObjectStateMutations.setPendingOp(pendingOps, 'counter', null);
5050
expect(pendingOps).toEqual([{}, {}]);
5151
});
5252

5353
it('can push a new pending state', () => {
5454
let pendingOps = [{}];
55-
ObjectState.pushPendingState(pendingOps);
55+
ObjectStateMutations.pushPendingState(pendingOps);
5656
expect(pendingOps).toEqual([{}, {}]);
5757

58-
ObjectState.pushPendingState(pendingOps);
58+
ObjectStateMutations.pushPendingState(pendingOps);
5959
expect(pendingOps).toEqual([{}, {}, {}]);
6060
});
6161

6262
it('can pop a pending state', () => {
6363
let pendingOps = [{}];
6464
let first = pendingOps[0];
65-
expect(ObjectState.popPendingState(pendingOps)).toBe(first);
65+
expect(ObjectStateMutations.popPendingState(pendingOps)).toBe(first);
6666
expect(pendingOps).toEqual([{}]);
6767

6868
let op = new ParseOps.IncrementOp(1);
6969
pendingOps = [{ counter: op }, {}, {}];
7070
first = pendingOps[0];
71-
expect(ObjectState.popPendingState(pendingOps)).toBe(first);
71+
expect(ObjectStateMutations.popPendingState(pendingOps)).toBe(first);
7272
expect(pendingOps).toEqual([{}, {}]);
7373
});
7474

7575
it('can merge the first op set into the next', () => {
7676
let pendingOps = [{ counter: new ParseOps.SetOp(1), name: new ParseOps.SetOp('foo') }, {}];
77-
ObjectState.mergeFirstPendingState(pendingOps);
77+
ObjectStateMutations.mergeFirstPendingState(pendingOps);
7878
expect(pendingOps).toEqual([{ counter: new ParseOps.SetOp(1), name: new ParseOps.SetOp('foo') }]);
7979

8080
pendingOps = [{ counter: new ParseOps.SetOp(1) }, { counter: new ParseOps.IncrementOp(1)}];
81-
ObjectState.mergeFirstPendingState(pendingOps);
81+
ObjectStateMutations.mergeFirstPendingState(pendingOps);
8282
expect(pendingOps).toEqual([{ counter: new ParseOps.SetOp(2) }]);
8383
});
8484

8585
it('can estimate an attribute value', () => {
8686
let serverData = { counter: 12 };
8787
let pendingOps = [{ counter: new ParseOps.IncrementOp(2), name: new ParseOps.SetOp('foo') }];
88-
expect(ObjectState.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'counter')).toBe(14);
89-
expect(ObjectState.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'name')).toBe('foo');
88+
expect(ObjectStateMutations.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'counter')).toBe(14);
89+
expect(ObjectStateMutations.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'name')).toBe('foo');
9090

9191
pendingOps.push({ counter: new ParseOps.IncrementOp(1), name: new ParseOps.SetOp('override') });
92-
expect(ObjectState.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'counter')).toBe(15);
93-
expect(ObjectState.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'name')).toBe('override');
92+
expect(ObjectStateMutations.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'counter')).toBe(15);
93+
expect(ObjectStateMutations.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'name')).toBe('override');
9494

9595
pendingOps.push({ likes: new ParseOps.RelationOp([], []) });
96-
let relation = ObjectState.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'likes');
96+
let relation = ObjectStateMutations.estimateAttribute(serverData, pendingOps, 'someClass', 'someId', 'likes');
9797
expect(relation.parent.id).toBe('someId');
9898
expect(relation.parent.className).toBe('someClass');
9999
expect(relation.key).toBe('likes');
@@ -102,19 +102,19 @@ describe('ObjectState', () => {
102102
it('can estimate all attributes', () => {
103103
let serverData = { counter: 12 };
104104
let pendingOps = [{ counter: new ParseOps.IncrementOp(2), name: new ParseOps.SetOp('foo') }];
105-
expect(ObjectState.estimateAttributes(serverData, pendingOps, 'someClass', 'someId')).toEqual({
105+
expect(ObjectStateMutations.estimateAttributes(serverData, pendingOps, 'someClass', 'someId')).toEqual({
106106
counter: 14,
107107
name: 'foo'
108108
});
109109

110110
pendingOps.push({ counter: new ParseOps.IncrementOp(1), name: new ParseOps.SetOp('override') });
111-
expect(ObjectState.estimateAttributes(serverData, pendingOps, 'someClass', 'someId')).toEqual({
111+
expect(ObjectStateMutations.estimateAttributes(serverData, pendingOps, 'someClass', 'someId')).toEqual({
112112
counter: 15,
113113
name: 'override'
114114
});
115115

116116
pendingOps.push({ likes: new ParseOps.RelationOp([], []) });
117-
let attributes = ObjectState.estimateAttributes(serverData, pendingOps, 'someClass', 'someId');
117+
let attributes = ObjectStateMutations.estimateAttributes(serverData, pendingOps, 'someClass', 'someId');
118118
expect(attributes.likes.parent.id).toBe('someId');
119119
expect(attributes.likes.parent.className).toBe('someClass');
120120
expect(attributes.likes.key).toBe('likes');
@@ -123,13 +123,13 @@ describe('ObjectState', () => {
123123
it('can commit changes from the server', () => {
124124
let serverData = {};
125125
let objectCache = {};
126-
ObjectState.commitServerChanges(serverData, objectCache, { name: 'foo', data: { count: 5 } });
126+
ObjectStateMutations.commitServerChanges(serverData, objectCache, { name: 'foo', data: { count: 5 } });
127127
expect(serverData).toEqual({ name: 'foo', data: { count: 5 } });
128128
expect(objectCache).toEqual({ data: '{"count":5}' });
129129
});
130130

131131
it('can generate a default state for implementations', () => {
132-
expect(ObjectState.defaultState()).toEqual({
132+
expect(ObjectStateMutations.defaultState()).toEqual({
133133
serverData: {},
134134
pendingOps: [{}],
135135
objectCache: {},

0 commit comments

Comments
 (0)