Skip to content

Commit 92426df

Browse files
committed
refactor(json-crdt): 💡 rename method names according to node type names
1 parent 13420e6 commit 92426df

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

src/json-crdt/codec/structural/compact/Decoder.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,27 @@ export class Decoder {
4747
if (data instanceof Array) {
4848
switch (data[0]) {
4949
case JsonCrdtDataType.con:
50-
return this.decodeConst(doc, data);
50+
return this.decCon(doc, data);
5151
case JsonCrdtDataType.con + 10:
52-
return this.decodeConstId(doc, data);
52+
return this.decConId(doc, data);
5353
case JsonCrdtDataType.val:
54-
return this.decodeVal(doc, data);
54+
return this.decVal(doc, data);
5555
case JsonCrdtDataType.obj:
56-
return this.decodeObj(doc, data);
56+
return this.decObj(doc, data);
5757
case JsonCrdtDataType.vec:
58-
return this.decodeTup(doc, data);
58+
return this.decVec(doc, data);
5959
case JsonCrdtDataType.str:
60-
return this.decodeStr(doc, data);
60+
return this.decStr(doc, data);
6161
case JsonCrdtDataType.bin:
62-
return this.decodeBin(doc, data);
62+
return this.decBin(doc, data);
6363
case JsonCrdtDataType.arr:
64-
return this.decodeArr(doc, data);
64+
return this.decArr(doc, data);
6565
}
6666
}
6767
throw new Error('UNKNOWN_NODE');
6868
}
6969

70-
protected decodeObj(doc: Model, data: unknown[]): nodes.ObjNode {
70+
protected decObj(doc: Model, data: unknown[]): nodes.ObjNode {
7171
const [id, index] = this.ts(data, 1);
7272
const obj = new nodes.ObjNode(doc, id);
7373
const length = data.length;
@@ -81,7 +81,7 @@ export class Decoder {
8181
return obj;
8282
}
8383

84-
protected decodeTup(doc: Model, data: unknown[]): nodes.VecNode {
84+
protected decVec(doc: Model, data: unknown[]): nodes.VecNode {
8585
const [id, index] = this.ts(data, 1);
8686
const obj = new nodes.VecNode(doc, id);
8787
const length = data.length;
@@ -98,7 +98,7 @@ export class Decoder {
9898
return obj;
9999
}
100100

101-
protected decodeArr(doc: Model, data: unknown[]): nodes.ArrNode {
101+
protected decArr(doc: Model, data: unknown[]): nodes.ArrNode {
102102
const size = data[1] as number;
103103
const [id, index] = this.ts(data, 2);
104104
const obj = new nodes.ArrNode(doc, id);
@@ -116,7 +116,7 @@ export class Decoder {
116116
return obj;
117117
}
118118

119-
protected decodeStr(doc: Model, data: unknown[]): nodes.StrNode {
119+
protected decStr(doc: Model, data: unknown[]): nodes.StrNode {
120120
const size = data[1] as number;
121121
const [id, index] = this.ts(data, 2);
122122
const node = new nodes.StrNode(id);
@@ -133,7 +133,7 @@ export class Decoder {
133133
return node;
134134
}
135135

136-
protected decodeBin(doc: Model, data: unknown[]): nodes.BinNode {
136+
protected decBin(doc: Model, data: unknown[]): nodes.BinNode {
137137
const size = data[1] as number;
138138
const [id, index] = this.ts(data, 2);
139139
const node = new nodes.BinNode(id);
@@ -151,23 +151,23 @@ export class Decoder {
151151
return node;
152152
}
153153

154-
protected decodeVal(doc: Model, data: unknown[]): nodes.ValNode {
154+
protected decVal(doc: Model, data: unknown[]): nodes.ValNode {
155155
const [id, index] = this.ts(data, 1);
156156
const child = this.decodeNode(doc, data[index]);
157157
const obj = new nodes.ValNode(doc, id, child.id);
158158
doc.index.set(id, obj);
159159
return obj;
160160
}
161161

162-
protected decodeConst(doc: Model, data: unknown[]): nodes.ConNode {
162+
protected decCon(doc: Model, data: unknown[]): nodes.ConNode {
163163
const [id, index] = this.ts(data, 1);
164164
const value = data[index];
165165
const obj = new nodes.ConNode(id, value);
166166
doc.index.set(id, obj);
167167
return obj;
168168
}
169169

170-
protected decodeConstId(doc: Model, data: unknown[]): nodes.ConNode {
170+
protected decConId(doc: Model, data: unknown[]): nodes.ConNode {
171171
const [id, index] = this.ts(data, 1);
172172
const val = this.ts(data, index)[0];
173173
const obj = new nodes.ConNode(id, val);

src/json-crdt/codec/structural/compact/Encoder.ts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ export class Encoder {
5050

5151
protected cNode(arr: unknown[], node: nodes.JsonNode): void {
5252
// TODO: PERF: use switch with `node.constructor`.
53-
if (node instanceof nodes.ObjNode) return this.encodeObj(arr, node);
54-
else if (node instanceof nodes.ArrNode) return this.encodeArr(arr, node);
55-
else if (node instanceof nodes.StrNode) return this.encodeStr(arr, node);
53+
if (node instanceof nodes.ObjNode) return this.cObj(arr, node);
54+
else if (node instanceof nodes.ArrNode) return this.cArr(arr, node);
55+
else if (node instanceof nodes.StrNode) return this.cStr(arr, node);
5656
else if (node instanceof nodes.ValNode) return this.cVal(arr, node);
57-
else if (node instanceof nodes.VecNode) return this.cTup(arr, node);
58-
else if (node instanceof nodes.ConNode) return this.cConst(arr, node);
59-
else if (node instanceof nodes.BinNode) return this.encodeBin(arr, node);
57+
else if (node instanceof nodes.VecNode) return this.cVec(arr, node);
58+
else if (node instanceof nodes.ConNode) return this.cCon(arr, node);
59+
else if (node instanceof nodes.BinNode) return this.cBin(arr, node);
6060
throw new Error('UNKNOWN_NODE');
6161
}
6262

63-
protected encodeObj(arr: unknown[], obj: nodes.ObjNode): void {
63+
protected cObj(arr: unknown[], obj: nodes.ObjNode): void {
6464
const res: unknown[] = [JsonCrdtDataType.obj];
6565
arr.push(res);
6666
this.ts(res, obj.id);
@@ -70,7 +70,7 @@ export class Encoder {
7070
});
7171
}
7272

73-
protected cTup(arr: unknown[], obj: nodes.VecNode): void {
73+
protected cVec(arr: unknown[], obj: nodes.VecNode): void {
7474
const res: unknown[] = [JsonCrdtDataType.vec];
7575
arr.push(res);
7676
this.ts(res, obj.id);
@@ -87,16 +87,16 @@ export class Encoder {
8787
}
8888
}
8989

90-
protected encodeArr(arr: unknown[], obj: nodes.ArrNode): void {
90+
protected cArr(arr: unknown[], obj: nodes.ArrNode): void {
9191
const res: unknown[] = [JsonCrdtDataType.arr, obj.size()];
9292
arr.push(res);
9393
this.ts(res, obj.id);
9494
const iterator = obj.iterator();
9595
let chunk;
96-
while ((chunk = iterator())) this.encodeArrChunk(res, chunk);
96+
while ((chunk = iterator())) this.cArrChunk(res, chunk);
9797
}
9898

99-
protected encodeArrChunk(arr: unknown[], chunk: nodes.ArrChunk): void {
99+
protected cArrChunk(arr: unknown[], chunk: nodes.ArrChunk): void {
100100
this.ts(arr, chunk.id);
101101
if (chunk.del) arr.push(chunk.span);
102102
else {
@@ -107,30 +107,30 @@ export class Encoder {
107107
}
108108
}
109109

110-
protected encodeStr(arr: unknown[], obj: nodes.StrNode): void {
110+
protected cStr(arr: unknown[], obj: nodes.StrNode): void {
111111
const res: unknown[] = [JsonCrdtDataType.str, obj.size()];
112112
arr.push(res);
113113
this.ts(res, obj.id);
114114
const iterator = obj.iterator();
115115
let chunk;
116-
while ((chunk = iterator())) this.encodeStrChunk(res, chunk as nodes.StrChunk);
116+
while ((chunk = iterator())) this.cStrChunk(res, chunk as nodes.StrChunk);
117117
}
118118

119-
protected encodeStrChunk(arr: unknown[], chunk: nodes.StrChunk): void {
119+
protected cStrChunk(arr: unknown[], chunk: nodes.StrChunk): void {
120120
this.ts(arr, chunk.id);
121121
arr.push(chunk.del ? chunk.span : chunk.data!);
122122
}
123123

124-
protected encodeBin(arr: unknown[], obj: nodes.BinNode): void {
124+
protected cBin(arr: unknown[], obj: nodes.BinNode): void {
125125
const res: unknown[] = [JsonCrdtDataType.bin, obj.size()];
126126
arr.push(res);
127127
this.ts(res, obj.id);
128128
const iterator = obj.iterator();
129129
let chunk;
130-
while ((chunk = iterator())) this.encodeBinChunk(res, chunk as nodes.BinChunk);
130+
while ((chunk = iterator())) this.cBinChunk(res, chunk as nodes.BinChunk);
131131
}
132132

133-
protected encodeBinChunk(arr: unknown[], chunk: nodes.BinChunk): void {
133+
protected cBinChunk(arr: unknown[], chunk: nodes.BinChunk): void {
134134
this.ts(arr, chunk.id);
135135
arr.push(chunk.del ? chunk.span : chunk.data!);
136136
}
@@ -142,7 +142,7 @@ export class Encoder {
142142
this.cNode(res, obj.node());
143143
}
144144

145-
protected cConst(arr: unknown[], obj: nodes.ConNode): void {
145+
protected cCon(arr: unknown[], obj: nodes.ConNode): void {
146146
const val = obj.val;
147147
const res: unknown[] = [];
148148
if (val instanceof Timestamp) {

0 commit comments

Comments
 (0)