Skip to content

Commit 15b89a1

Browse files
committed
style(json-crdt): 💄 run Prettier
1 parent 42292a4 commit 15b89a1

File tree

3 files changed

+39
-57
lines changed

3 files changed

+39
-57
lines changed

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ export class Decoder {
1717
} else {
1818
this.clockDecoder = ClockDecoder.fromArr(time as number[]);
1919
}
20-
const model = isServerTime ? Model.withServerClock(time as number) : Model.withLogicalClock(this.clockDecoder!.clock);
20+
const model = isServerTime
21+
? Model.withServerClock(time as number)
22+
: Model.withLogicalClock(this.clockDecoder!.clock);
2123
const val = root ? this.decNode(model, root) : UNDEFINED;
2224
model.root = new nodes.RootNode(model, val.id);
2325
return model;
@@ -38,13 +40,20 @@ export class Decoder {
3840

3941
protected decNode(model: Model, node: t.JsonCrdtCompactNode): nodes.JsonNode {
4042
switch (node[0]) {
41-
case JsonCrdtDataType.con: return this.decCon(model, node);
42-
case JsonCrdtDataType.val: return this.decVal(model, node);
43-
case JsonCrdtDataType.obj: return this.decObj(model, node);
44-
case JsonCrdtDataType.vec: return this.decVec(model, node);
45-
case JsonCrdtDataType.str: return this.decStr(model, node);
46-
case JsonCrdtDataType.bin: return this.decBin(model, node);
47-
case JsonCrdtDataType.arr: return this.decArr(model, node);
43+
case JsonCrdtDataType.con:
44+
return this.decCon(model, node);
45+
case JsonCrdtDataType.val:
46+
return this.decVal(model, node);
47+
case JsonCrdtDataType.obj:
48+
return this.decObj(model, node);
49+
case JsonCrdtDataType.vec:
50+
return this.decVec(model, node);
51+
case JsonCrdtDataType.str:
52+
return this.decStr(model, node);
53+
case JsonCrdtDataType.bin:
54+
return this.decBin(model, node);
55+
case JsonCrdtDataType.arr:
56+
return this.decArr(model, node);
4857
}
4958
throw new Error('UNKNOWN_NODE');
5059
}

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,17 @@ export class Encoder {
2222
this.clock.reset(model.clock);
2323
}
2424
const root = model.root;
25-
const doc: t.JsonCrdtCompactDocument = [
26-
0,
27-
!root.val.time ? 0 : this.cNode(root.node()),
28-
];
25+
const doc: t.JsonCrdtCompactDocument = [0, !root.val.time ? 0 : this.cNode(root.node())];
2926
doc[0] = isServerTime ? this.time! : this.clock!.toJson();
3027
return doc;
3128
}
3229

3330
protected ts(ts: ITimestampStruct): t.JsonCrdtCompactTimestamp {
3431
switch (ts.sid) {
35-
case SESSION.SYSTEM: return [ts.sid, ts.time];
36-
case SESSION.SERVER: return this.time! - ts.time;
32+
case SESSION.SYSTEM:
33+
return [ts.sid, ts.time];
34+
case SESSION.SERVER:
35+
return this.time! - ts.time;
3736
default: {
3837
const relativeId = this.clock!.append(ts);
3938
return [-relativeId.sessionIndex, relativeId.timeDiff];
@@ -55,7 +54,7 @@ export class Encoder {
5554

5655
protected cObj(obj: nodes.ObjNode): t.JsonCrdtCompactObj {
5756
const map: t.JsonCrdtCompactObj[2] = {};
58-
obj.nodes((child, key) => map[key] = this.cNode(child));
57+
obj.nodes((child, key) => (map[key] = this.cNode(child)));
5958
const res: t.JsonCrdtCompactObj = [JsonCrdtDataType.obj, this.ts(obj.id), map];
6059
return res;
6160
}
@@ -100,15 +99,19 @@ export class Encoder {
10099
protected cStr(node: nodes.StrNode): t.JsonCrdtCompactStr {
101100
const chunks: t.JsonCrdtCompactStr[2] = [];
102101
for (let chunk = node.first(); chunk; chunk = node.next(chunk))
103-
chunks.push([this.ts(chunk.id), chunk.del ? chunk.span : chunk.data!] as t.JsonCrdtCompactStrChunk | t.JsonCrdtCompactTombstone);
102+
chunks.push([this.ts(chunk.id), chunk.del ? chunk.span : chunk.data!] as
103+
| t.JsonCrdtCompactStrChunk
104+
| t.JsonCrdtCompactTombstone);
104105
const res: t.JsonCrdtCompactStr = [JsonCrdtDataType.str, this.ts(node.id), chunks];
105106
return res;
106107
}
107108

108109
protected cBin(node: nodes.BinNode): t.JsonCrdtCompactBin {
109110
const chunks: t.JsonCrdtCompactBin[2] = [];
110111
for (let chunk = node.first(); chunk; chunk = node.next(chunk))
111-
chunks.push([this.ts(chunk.id), chunk.del ? chunk.span : chunk.data!] as t.JsonCrdtCompactBinChunk | t.JsonCrdtCompactTombstone);
112+
chunks.push([this.ts(chunk.id), chunk.del ? chunk.span : chunk.data!] as
113+
| t.JsonCrdtCompactBinChunk
114+
| t.JsonCrdtCompactTombstone);
112115
const res: t.JsonCrdtCompactBin = [JsonCrdtDataType.bin, this.ts(node.id), chunks];
113116
return res;
114117
}
Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
import type {JsonCrdtDataType} from '../../../../json-crdt-patch/constants';
22

3-
export type JsonCrdtCompactDocument = [
4-
time: JsonCrdtCompactClockTable | number,
5-
root: JsonCrdtCompactNode | 0,
6-
];
3+
export type JsonCrdtCompactDocument = [time: JsonCrdtCompactClockTable | number, root: JsonCrdtCompactNode | 0];
74

85
export type JsonCrdtCompactClockTable = number[];
96

10-
export type JsonCrdtCompactTimestamp =
11-
| JsonCrdtCompactTimestampServer
12-
| JsonCrdtCompactTimestampLogical;
7+
export type JsonCrdtCompactTimestamp = JsonCrdtCompactTimestampServer | JsonCrdtCompactTimestampLogical;
138

149
export type JsonCrdtCompactTimestampServer = number;
1510
export type JsonCrdtCompactTimestampLogical = [sessionId: number, time: number];
@@ -24,23 +19,10 @@ export type JsonCrdtCompactNode =
2419
| JsonCrdtCompactArr;
2520

2621
export type JsonCrdtCompactCon =
27-
| [
28-
type: JsonCrdtDataType.con,
29-
id: JsonCrdtCompactTimestamp,
30-
data: unknown,
31-
]
32-
| [
33-
type: JsonCrdtDataType.con,
34-
id: JsonCrdtCompactTimestamp,
35-
data: 0,
36-
specialData: JsonCrdtCompactTimestamp | 0,
37-
];
38-
39-
export type JsonCrdtCompactVal = [
40-
type: JsonCrdtDataType.val,
41-
id: JsonCrdtCompactTimestamp,
42-
child: JsonCrdtCompactNode,
43-
];
22+
| [type: JsonCrdtDataType.con, id: JsonCrdtCompactTimestamp, data: unknown]
23+
| [type: JsonCrdtDataType.con, id: JsonCrdtCompactTimestamp, data: 0, specialData: JsonCrdtCompactTimestamp | 0];
24+
25+
export type JsonCrdtCompactVal = [type: JsonCrdtDataType.val, id: JsonCrdtCompactTimestamp, child: JsonCrdtCompactNode];
4426

4527
export type JsonCrdtCompactObj = [
4628
type: JsonCrdtDataType.obj,
@@ -60,34 +42,22 @@ export type JsonCrdtCompactStr = [
6042
chunks: Array<JsonCrdtCompactStrChunk | JsonCrdtCompactTombstone>,
6143
];
6244

63-
export type JsonCrdtCompactStrChunk = [
64-
id: JsonCrdtCompactTimestamp,
65-
data: string,
66-
];
45+
export type JsonCrdtCompactStrChunk = [id: JsonCrdtCompactTimestamp, data: string];
6746

6847
export type JsonCrdtCompactBin = [
6948
type: JsonCrdtDataType.bin,
7049
id: JsonCrdtCompactTimestamp,
7150
chunks: Array<JsonCrdtCompactBinChunk | JsonCrdtCompactTombstone>,
7251
];
7352

74-
export type JsonCrdtCompactBinChunk = [
75-
id: JsonCrdtCompactTimestamp,
76-
data: Uint8Array,
77-
];
53+
export type JsonCrdtCompactBinChunk = [id: JsonCrdtCompactTimestamp, data: Uint8Array];
7854

7955
export type JsonCrdtCompactArr = [
8056
type: JsonCrdtDataType.arr,
8157
id: JsonCrdtCompactTimestamp,
8258
chunks: Array<JsonCrdtCompactArrChunk | JsonCrdtCompactTombstone>,
8359
];
8460

85-
export type JsonCrdtCompactArrChunk = [
86-
id: JsonCrdtCompactTimestamp,
87-
data: JsonCrdtCompactNode[],
88-
];
61+
export type JsonCrdtCompactArrChunk = [id: JsonCrdtCompactTimestamp, data: JsonCrdtCompactNode[]];
8962

90-
export type JsonCrdtCompactTombstone = [
91-
id: JsonCrdtCompactTimestamp,
92-
span: number,
93-
];
63+
export type JsonCrdtCompactTombstone = [id: JsonCrdtCompactTimestamp, span: number];

0 commit comments

Comments
 (0)