cojson 0.8.35 → 0.8.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/dist/native/coValues/coMap.js +80 -31
- package/dist/native/coValues/coMap.js.map +1 -1
- package/dist/native/permissions.js +19 -18
- package/dist/native/permissions.js.map +1 -1
- package/dist/web/coValues/coMap.js +80 -31
- package/dist/web/coValues/coMap.js.map +1 -1
- package/dist/web/permissions.js +19 -18
- package/dist/web/permissions.js.map +1 -1
- package/package.json +1 -1
- package/src/coValueCore.ts +1 -1
- package/src/coValues/coMap.ts +114 -38
- package/src/permissions.ts +40 -39
package/CHANGELOG.md
CHANGED
|
@@ -9,23 +9,68 @@ export class RawCoMapView {
|
|
|
9
9
|
this.atTimeFilter = undefined;
|
|
10
10
|
this.id = core.id;
|
|
11
11
|
this.core = core;
|
|
12
|
-
this.
|
|
13
|
-
|
|
12
|
+
this.latest = {};
|
|
13
|
+
this.latestTxMadeAt = 0;
|
|
14
|
+
this.options = options;
|
|
15
|
+
this.processLatestTransactions();
|
|
16
|
+
}
|
|
17
|
+
processLatestTransactions() {
|
|
18
|
+
this.latest = {};
|
|
19
|
+
this.latestTxMadeAt = 0;
|
|
20
|
+
const { core, options, latest } = this;
|
|
21
|
+
for (const { txID, changes, madeAt } of core.getValidSortedTransactions({
|
|
22
|
+
ignorePrivateTransactions: options?.ignorePrivateTransactions ?? false,
|
|
23
|
+
})) {
|
|
24
|
+
if (options?.atTime && madeAt > options.atTime) {
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
if (madeAt > this.latestTxMadeAt) {
|
|
28
|
+
this.latestTxMadeAt = madeAt;
|
|
29
|
+
}
|
|
14
30
|
for (let changeIdx = 0; changeIdx < changes.length; changeIdx++) {
|
|
15
31
|
const change = changes[changeIdx];
|
|
16
|
-
let
|
|
32
|
+
let entry = latest[change.key];
|
|
33
|
+
if (!entry) {
|
|
34
|
+
entry = {
|
|
35
|
+
txID,
|
|
36
|
+
madeAt,
|
|
37
|
+
changeIdx,
|
|
38
|
+
change,
|
|
39
|
+
};
|
|
40
|
+
latest[change.key] = entry;
|
|
41
|
+
}
|
|
42
|
+
else if (madeAt >= entry.madeAt) {
|
|
43
|
+
entry.txID = txID;
|
|
44
|
+
entry.madeAt = madeAt;
|
|
45
|
+
entry.changeIdx = changeIdx;
|
|
46
|
+
entry.change = change;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
getOps() {
|
|
52
|
+
if (this.cachedOps) {
|
|
53
|
+
return this.cachedOps;
|
|
54
|
+
}
|
|
55
|
+
const ops = {};
|
|
56
|
+
for (const { txID, changes, madeAt, } of this.core.getValidSortedTransactions(this.options)) {
|
|
57
|
+
for (let changeIdx = 0; changeIdx < changes.length; changeIdx++) {
|
|
58
|
+
const change = changes[changeIdx];
|
|
59
|
+
let entries = ops[change.key];
|
|
17
60
|
if (!entries) {
|
|
18
61
|
entries = [];
|
|
19
|
-
|
|
62
|
+
ops[change.key] = entries;
|
|
20
63
|
}
|
|
21
64
|
entries.push({
|
|
22
65
|
txID,
|
|
23
66
|
madeAt,
|
|
24
67
|
changeIdx,
|
|
25
|
-
|
|
68
|
+
change,
|
|
26
69
|
});
|
|
27
70
|
}
|
|
28
71
|
}
|
|
72
|
+
this.cachedOps = ops;
|
|
73
|
+
return ops;
|
|
29
74
|
}
|
|
30
75
|
/** @category 6. Meta */
|
|
31
76
|
get headerMeta() {
|
|
@@ -37,13 +82,17 @@ export class RawCoMapView {
|
|
|
37
82
|
}
|
|
38
83
|
/** @category 4. Time travel */
|
|
39
84
|
atTime(time) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
85
|
+
if (time >= this.latestTxMadeAt) {
|
|
86
|
+
return this;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
const clone = new RawCoMapView(this.core, {
|
|
90
|
+
ignorePrivateTransactions: this.options?.ignorePrivateTransactions ?? false,
|
|
91
|
+
atTime: time,
|
|
92
|
+
});
|
|
93
|
+
Object.setPrototypeOf(clone, this);
|
|
94
|
+
return clone;
|
|
95
|
+
}
|
|
47
96
|
}
|
|
48
97
|
/** @internal */
|
|
49
98
|
timeFilteredOps(key) {
|
|
@@ -51,10 +100,10 @@ export class RawCoMapView {
|
|
|
51
100
|
return undefined;
|
|
52
101
|
}
|
|
53
102
|
if (this.atTimeFilter) {
|
|
54
|
-
return this.
|
|
103
|
+
return this.getOps()[key]?.filter((op) => op.madeAt <= this.atTimeFilter);
|
|
55
104
|
}
|
|
56
105
|
else {
|
|
57
|
-
return this.
|
|
106
|
+
return this.getOps()[key];
|
|
58
107
|
}
|
|
59
108
|
}
|
|
60
109
|
/**
|
|
@@ -62,16 +111,16 @@ export class RawCoMapView {
|
|
|
62
111
|
*
|
|
63
112
|
* @category 1. Reading */
|
|
64
113
|
keys() {
|
|
65
|
-
return Object.keys(this.
|
|
66
|
-
const
|
|
67
|
-
if (!
|
|
114
|
+
return Object.keys(this.latest).filter((key) => {
|
|
115
|
+
const latest = this.latest[key];
|
|
116
|
+
if (!latest) {
|
|
68
117
|
return undefined;
|
|
69
118
|
}
|
|
70
119
|
const includeUntil = this.atTimeFilter;
|
|
71
120
|
const lastEntry = includeUntil
|
|
72
|
-
?
|
|
73
|
-
:
|
|
74
|
-
if (lastEntry?.op === "del") {
|
|
121
|
+
? this.getOps()[key]?.findLast((entry) => entry.madeAt <= includeUntil)
|
|
122
|
+
: latest;
|
|
123
|
+
if (lastEntry?.change.op === "del") {
|
|
75
124
|
return false;
|
|
76
125
|
}
|
|
77
126
|
else {
|
|
@@ -85,19 +134,19 @@ export class RawCoMapView {
|
|
|
85
134
|
* @category 1. Reading
|
|
86
135
|
**/
|
|
87
136
|
get(key) {
|
|
88
|
-
const
|
|
89
|
-
if (!
|
|
137
|
+
const latest = this.latest[key];
|
|
138
|
+
if (!latest) {
|
|
90
139
|
return undefined;
|
|
91
140
|
}
|
|
92
141
|
const includeUntil = this.atTimeFilter;
|
|
93
142
|
const lastEntry = includeUntil
|
|
94
|
-
?
|
|
95
|
-
:
|
|
96
|
-
if (lastEntry?.op === "del") {
|
|
143
|
+
? this.timeFilteredOps(key)?.findLast((entry) => entry.madeAt <= includeUntil)
|
|
144
|
+
: latest;
|
|
145
|
+
if (lastEntry?.change.op === "del") {
|
|
97
146
|
return undefined;
|
|
98
147
|
}
|
|
99
148
|
else {
|
|
100
|
-
return lastEntry?.value;
|
|
149
|
+
return lastEntry?.change.value;
|
|
101
150
|
}
|
|
102
151
|
}
|
|
103
152
|
/** @category 1. Reading */
|
|
@@ -129,7 +178,7 @@ export class RawCoMapView {
|
|
|
129
178
|
by: accountOrAgentIDfromSessionID(entry.txID.sessionID),
|
|
130
179
|
tx: entry.txID,
|
|
131
180
|
at: new Date(entry.madeAt),
|
|
132
|
-
value: entry.op === "del" ? undefined : entry.value,
|
|
181
|
+
value: entry.change.op === "del" ? undefined : entry.change.value,
|
|
133
182
|
};
|
|
134
183
|
}
|
|
135
184
|
/** @category 5. Edit history */
|
|
@@ -175,8 +224,8 @@ export class RawCoMap extends RawCoMapView {
|
|
|
175
224
|
value: isCoValue(value) ? value.id : value,
|
|
176
225
|
},
|
|
177
226
|
], privacy);
|
|
178
|
-
|
|
179
|
-
this.
|
|
227
|
+
this.processLatestTransactions();
|
|
228
|
+
this.cachedOps = undefined;
|
|
180
229
|
}
|
|
181
230
|
/** Delete the given key (setting it to undefined).
|
|
182
231
|
*
|
|
@@ -193,8 +242,8 @@ export class RawCoMap extends RawCoMapView {
|
|
|
193
242
|
key,
|
|
194
243
|
},
|
|
195
244
|
], privacy);
|
|
196
|
-
|
|
197
|
-
this.
|
|
245
|
+
this.processLatestTransactions();
|
|
246
|
+
this.cachedOps = undefined;
|
|
198
247
|
}
|
|
199
248
|
}
|
|
200
249
|
//# sourceMappingURL=coMap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coMap.js","sourceRoot":"","sources":["../../../src/coValues/coMap.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"coMap.js","sourceRoot":"","sources":["../../../src/coValues/coMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,33 +20,34 @@ export function determineValidTransactions(coValue) {
|
|
|
20
20
|
if (groupContent.type !== "comap") {
|
|
21
21
|
throw new Error("Group must be a map");
|
|
22
22
|
}
|
|
23
|
-
|
|
23
|
+
const validTransactions = [];
|
|
24
|
+
for (const [sessionID, sessionLog] of coValue.sessionLogs.entries()) {
|
|
24
25
|
const transactor = accountOrAgentIDfromSessionID(sessionID);
|
|
25
|
-
|
|
26
|
-
.filter((tx) => {
|
|
26
|
+
sessionLog.transactions.forEach((tx, txIndex) => {
|
|
27
27
|
const groupAtTime = groupContent.atTime(tx.madeAt);
|
|
28
28
|
const effectiveTransactor = agentInAccountOrMemberInGroup(transactor, groupAtTime);
|
|
29
29
|
if (!effectiveTransactor) {
|
|
30
|
-
return
|
|
30
|
+
return;
|
|
31
31
|
}
|
|
32
32
|
const transactorRoleAtTxTime = groupAtTime.roleOfInternal(effectiveTransactor)?.role ||
|
|
33
33
|
groupAtTime.roleOfInternal(EVERYONE)?.role;
|
|
34
|
-
|
|
35
|
-
transactorRoleAtTxTime
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
txID: { sessionID
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
34
|
+
if (transactorRoleAtTxTime !== "admin" &&
|
|
35
|
+
transactorRoleAtTxTime !== "writer") {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
validTransactions.push({ txID: { sessionID, txIndex }, tx });
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
return validTransactions;
|
|
42
42
|
}
|
|
43
43
|
else if (coValue.header.ruleset.type === "unsafeAllowAll") {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
tx
|
|
48
|
-
})
|
|
49
|
-
}
|
|
44
|
+
const validTransactions = [];
|
|
45
|
+
for (const [sessionID, sessionLog] of coValue.sessionLogs.entries()) {
|
|
46
|
+
sessionLog.transactions.forEach((tx, txIndex) => {
|
|
47
|
+
validTransactions.push({ txID: { sessionID, txIndex }, tx });
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
return validTransactions;
|
|
50
51
|
}
|
|
51
52
|
else {
|
|
52
53
|
throw new Error("Unknown ruleset type " +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/permissions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAA4B,MAAM,uBAAuB,CAAC;AAE7E,OAAO,EAAE,QAAQ,EAAsB,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAML,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAmBzD,MAAM,UAAU,0BAA0B,CACxC,OAAoB;IAEpB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;QACzD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,kCAAkC,CAAC,OAAO,EAAE,YAAY,CAAC;aAC7D,iBAAiB,CAAC;IACvB,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QAC1D,MAAM,YAAY,GAAG,WAAW,CAC9B,OAAO,CAAC,IAAI;aACT,mBAAmB,CAClB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAC5B,2EAA2E,CAC5E;aACA,iBAAiB,EAAE,CACvB,CAAC;QAEF,IAAI,YAAY,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,23 +9,68 @@ export class RawCoMapView {
|
|
|
9
9
|
this.atTimeFilter = undefined;
|
|
10
10
|
this.id = core.id;
|
|
11
11
|
this.core = core;
|
|
12
|
-
this.
|
|
13
|
-
|
|
12
|
+
this.latest = {};
|
|
13
|
+
this.latestTxMadeAt = 0;
|
|
14
|
+
this.options = options;
|
|
15
|
+
this.processLatestTransactions();
|
|
16
|
+
}
|
|
17
|
+
processLatestTransactions() {
|
|
18
|
+
this.latest = {};
|
|
19
|
+
this.latestTxMadeAt = 0;
|
|
20
|
+
const { core, options, latest } = this;
|
|
21
|
+
for (const { txID, changes, madeAt } of core.getValidSortedTransactions({
|
|
22
|
+
ignorePrivateTransactions: options?.ignorePrivateTransactions ?? false,
|
|
23
|
+
})) {
|
|
24
|
+
if (options?.atTime && madeAt > options.atTime) {
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
if (madeAt > this.latestTxMadeAt) {
|
|
28
|
+
this.latestTxMadeAt = madeAt;
|
|
29
|
+
}
|
|
14
30
|
for (let changeIdx = 0; changeIdx < changes.length; changeIdx++) {
|
|
15
31
|
const change = changes[changeIdx];
|
|
16
|
-
let
|
|
32
|
+
let entry = latest[change.key];
|
|
33
|
+
if (!entry) {
|
|
34
|
+
entry = {
|
|
35
|
+
txID,
|
|
36
|
+
madeAt,
|
|
37
|
+
changeIdx,
|
|
38
|
+
change,
|
|
39
|
+
};
|
|
40
|
+
latest[change.key] = entry;
|
|
41
|
+
}
|
|
42
|
+
else if (madeAt >= entry.madeAt) {
|
|
43
|
+
entry.txID = txID;
|
|
44
|
+
entry.madeAt = madeAt;
|
|
45
|
+
entry.changeIdx = changeIdx;
|
|
46
|
+
entry.change = change;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
getOps() {
|
|
52
|
+
if (this.cachedOps) {
|
|
53
|
+
return this.cachedOps;
|
|
54
|
+
}
|
|
55
|
+
const ops = {};
|
|
56
|
+
for (const { txID, changes, madeAt, } of this.core.getValidSortedTransactions(this.options)) {
|
|
57
|
+
for (let changeIdx = 0; changeIdx < changes.length; changeIdx++) {
|
|
58
|
+
const change = changes[changeIdx];
|
|
59
|
+
let entries = ops[change.key];
|
|
17
60
|
if (!entries) {
|
|
18
61
|
entries = [];
|
|
19
|
-
|
|
62
|
+
ops[change.key] = entries;
|
|
20
63
|
}
|
|
21
64
|
entries.push({
|
|
22
65
|
txID,
|
|
23
66
|
madeAt,
|
|
24
67
|
changeIdx,
|
|
25
|
-
|
|
68
|
+
change,
|
|
26
69
|
});
|
|
27
70
|
}
|
|
28
71
|
}
|
|
72
|
+
this.cachedOps = ops;
|
|
73
|
+
return ops;
|
|
29
74
|
}
|
|
30
75
|
/** @category 6. Meta */
|
|
31
76
|
get headerMeta() {
|
|
@@ -37,13 +82,17 @@ export class RawCoMapView {
|
|
|
37
82
|
}
|
|
38
83
|
/** @category 4. Time travel */
|
|
39
84
|
atTime(time) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
85
|
+
if (time >= this.latestTxMadeAt) {
|
|
86
|
+
return this;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
const clone = new RawCoMapView(this.core, {
|
|
90
|
+
ignorePrivateTransactions: this.options?.ignorePrivateTransactions ?? false,
|
|
91
|
+
atTime: time,
|
|
92
|
+
});
|
|
93
|
+
Object.setPrototypeOf(clone, this);
|
|
94
|
+
return clone;
|
|
95
|
+
}
|
|
47
96
|
}
|
|
48
97
|
/** @internal */
|
|
49
98
|
timeFilteredOps(key) {
|
|
@@ -51,10 +100,10 @@ export class RawCoMapView {
|
|
|
51
100
|
return undefined;
|
|
52
101
|
}
|
|
53
102
|
if (this.atTimeFilter) {
|
|
54
|
-
return this.
|
|
103
|
+
return this.getOps()[key]?.filter((op) => op.madeAt <= this.atTimeFilter);
|
|
55
104
|
}
|
|
56
105
|
else {
|
|
57
|
-
return this.
|
|
106
|
+
return this.getOps()[key];
|
|
58
107
|
}
|
|
59
108
|
}
|
|
60
109
|
/**
|
|
@@ -62,16 +111,16 @@ export class RawCoMapView {
|
|
|
62
111
|
*
|
|
63
112
|
* @category 1. Reading */
|
|
64
113
|
keys() {
|
|
65
|
-
return Object.keys(this.
|
|
66
|
-
const
|
|
67
|
-
if (!
|
|
114
|
+
return Object.keys(this.latest).filter((key) => {
|
|
115
|
+
const latest = this.latest[key];
|
|
116
|
+
if (!latest) {
|
|
68
117
|
return undefined;
|
|
69
118
|
}
|
|
70
119
|
const includeUntil = this.atTimeFilter;
|
|
71
120
|
const lastEntry = includeUntil
|
|
72
|
-
?
|
|
73
|
-
:
|
|
74
|
-
if (lastEntry?.op === "del") {
|
|
121
|
+
? this.getOps()[key]?.findLast((entry) => entry.madeAt <= includeUntil)
|
|
122
|
+
: latest;
|
|
123
|
+
if (lastEntry?.change.op === "del") {
|
|
75
124
|
return false;
|
|
76
125
|
}
|
|
77
126
|
else {
|
|
@@ -85,19 +134,19 @@ export class RawCoMapView {
|
|
|
85
134
|
* @category 1. Reading
|
|
86
135
|
**/
|
|
87
136
|
get(key) {
|
|
88
|
-
const
|
|
89
|
-
if (!
|
|
137
|
+
const latest = this.latest[key];
|
|
138
|
+
if (!latest) {
|
|
90
139
|
return undefined;
|
|
91
140
|
}
|
|
92
141
|
const includeUntil = this.atTimeFilter;
|
|
93
142
|
const lastEntry = includeUntil
|
|
94
|
-
?
|
|
95
|
-
:
|
|
96
|
-
if (lastEntry?.op === "del") {
|
|
143
|
+
? this.timeFilteredOps(key)?.findLast((entry) => entry.madeAt <= includeUntil)
|
|
144
|
+
: latest;
|
|
145
|
+
if (lastEntry?.change.op === "del") {
|
|
97
146
|
return undefined;
|
|
98
147
|
}
|
|
99
148
|
else {
|
|
100
|
-
return lastEntry?.value;
|
|
149
|
+
return lastEntry?.change.value;
|
|
101
150
|
}
|
|
102
151
|
}
|
|
103
152
|
/** @category 1. Reading */
|
|
@@ -129,7 +178,7 @@ export class RawCoMapView {
|
|
|
129
178
|
by: accountOrAgentIDfromSessionID(entry.txID.sessionID),
|
|
130
179
|
tx: entry.txID,
|
|
131
180
|
at: new Date(entry.madeAt),
|
|
132
|
-
value: entry.op === "del" ? undefined : entry.value,
|
|
181
|
+
value: entry.change.op === "del" ? undefined : entry.change.value,
|
|
133
182
|
};
|
|
134
183
|
}
|
|
135
184
|
/** @category 5. Edit history */
|
|
@@ -175,8 +224,8 @@ export class RawCoMap extends RawCoMapView {
|
|
|
175
224
|
value: isCoValue(value) ? value.id : value,
|
|
176
225
|
},
|
|
177
226
|
], privacy);
|
|
178
|
-
|
|
179
|
-
this.
|
|
227
|
+
this.processLatestTransactions();
|
|
228
|
+
this.cachedOps = undefined;
|
|
180
229
|
}
|
|
181
230
|
/** Delete the given key (setting it to undefined).
|
|
182
231
|
*
|
|
@@ -193,8 +242,8 @@ export class RawCoMap extends RawCoMapView {
|
|
|
193
242
|
key,
|
|
194
243
|
},
|
|
195
244
|
], privacy);
|
|
196
|
-
|
|
197
|
-
this.
|
|
245
|
+
this.processLatestTransactions();
|
|
246
|
+
this.cachedOps = undefined;
|
|
198
247
|
}
|
|
199
248
|
}
|
|
200
249
|
//# sourceMappingURL=coMap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coMap.js","sourceRoot":"","sources":["../../../src/coValues/coMap.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"coMap.js","sourceRoot":"","sources":["../../../src/coValues/coMap.ts"],"names":[],"mappings":"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"}
|
package/dist/web/permissions.js
CHANGED
|
@@ -20,33 +20,34 @@ export function determineValidTransactions(coValue) {
|
|
|
20
20
|
if (groupContent.type !== "comap") {
|
|
21
21
|
throw new Error("Group must be a map");
|
|
22
22
|
}
|
|
23
|
-
|
|
23
|
+
const validTransactions = [];
|
|
24
|
+
for (const [sessionID, sessionLog] of coValue.sessionLogs.entries()) {
|
|
24
25
|
const transactor = accountOrAgentIDfromSessionID(sessionID);
|
|
25
|
-
|
|
26
|
-
.filter((tx) => {
|
|
26
|
+
sessionLog.transactions.forEach((tx, txIndex) => {
|
|
27
27
|
const groupAtTime = groupContent.atTime(tx.madeAt);
|
|
28
28
|
const effectiveTransactor = agentInAccountOrMemberInGroup(transactor, groupAtTime);
|
|
29
29
|
if (!effectiveTransactor) {
|
|
30
|
-
return
|
|
30
|
+
return;
|
|
31
31
|
}
|
|
32
32
|
const transactorRoleAtTxTime = groupAtTime.roleOfInternal(effectiveTransactor)?.role ||
|
|
33
33
|
groupAtTime.roleOfInternal(EVERYONE)?.role;
|
|
34
|
-
|
|
35
|
-
transactorRoleAtTxTime
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
txID: { sessionID
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
34
|
+
if (transactorRoleAtTxTime !== "admin" &&
|
|
35
|
+
transactorRoleAtTxTime !== "writer") {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
validTransactions.push({ txID: { sessionID, txIndex }, tx });
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
return validTransactions;
|
|
42
42
|
}
|
|
43
43
|
else if (coValue.header.ruleset.type === "unsafeAllowAll") {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
tx
|
|
48
|
-
})
|
|
49
|
-
}
|
|
44
|
+
const validTransactions = [];
|
|
45
|
+
for (const [sessionID, sessionLog] of coValue.sessionLogs.entries()) {
|
|
46
|
+
sessionLog.transactions.forEach((tx, txIndex) => {
|
|
47
|
+
validTransactions.push({ txID: { sessionID, txIndex }, tx });
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
return validTransactions;
|
|
50
51
|
}
|
|
51
52
|
else {
|
|
52
53
|
throw new Error("Unknown ruleset type " +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/permissions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAA4B,MAAM,uBAAuB,CAAC;AAE7E,OAAO,EAAE,QAAQ,EAAsB,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAML,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,6BAA6B,EAAE,MAAM,8CAA8C,CAAC;AAC7F,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAmBzD,MAAM,UAAU,0BAA0B,CACxC,OAAoB;IAEpB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;QACzD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,kCAAkC,CAAC,OAAO,EAAE,YAAY,CAAC;aAC7D,iBAAiB,CAAC;IACvB,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QAC1D,MAAM,YAAY,GAAG,WAAW,CAC9B,OAAO,CAAC,IAAI;aACT,mBAAmB,CAClB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAC5B,2EAA2E,CAC5E;aACA,iBAAiB,EAAE,CACvB,CAAC;QAEF,IAAI,YAAY,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/permissions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/coValueCore.ts
CHANGED
|
@@ -617,7 +617,7 @@ export class CoValueCore {
|
|
|
617
617
|
}
|
|
618
618
|
|
|
619
619
|
getValidSortedTransactions(options?: {
|
|
620
|
-
ignorePrivateTransactions:
|
|
620
|
+
ignorePrivateTransactions: boolean;
|
|
621
621
|
}): DecryptedTransaction[] {
|
|
622
622
|
const validTransactions = determineValidTransactions(this);
|
|
623
623
|
|
package/src/coValues/coMap.ts
CHANGED
|
@@ -11,7 +11,8 @@ type MapOp<K extends string, V extends JsonValue | undefined> = {
|
|
|
11
11
|
txID: TransactionID;
|
|
12
12
|
madeAt: number;
|
|
13
13
|
changeIdx: number;
|
|
14
|
-
|
|
14
|
+
change: MapOpPayload<K, V>;
|
|
15
|
+
};
|
|
15
16
|
// TODO: add after TransactionID[] for conflicts/ordering
|
|
16
17
|
|
|
17
18
|
export type MapOpPayload<K extends string, V extends JsonValue | undefined> =
|
|
@@ -39,10 +40,18 @@ export class RawCoMapView<
|
|
|
39
40
|
/** @category 6. Meta */
|
|
40
41
|
core: CoValueCore;
|
|
41
42
|
/** @internal */
|
|
42
|
-
|
|
43
|
+
latest: {
|
|
44
|
+
[Key in keyof Shape & string]?: MapOp<Key, Shape[Key]>;
|
|
45
|
+
};
|
|
46
|
+
/** @internal */
|
|
47
|
+
latestTxMadeAt: number;
|
|
48
|
+
/** @internal */
|
|
49
|
+
cachedOps?: {
|
|
43
50
|
[Key in keyof Shape & string]?: MapOp<Key, Shape[Key]>[];
|
|
44
51
|
};
|
|
45
52
|
/** @internal */
|
|
53
|
+
options?: { ignorePrivateTransactions: boolean; atTime?: number };
|
|
54
|
+
/** @internal */
|
|
46
55
|
atTimeFilter?: number = undefined;
|
|
47
56
|
/** @category 6. Meta */
|
|
48
57
|
readonly _shape!: Shape;
|
|
@@ -50,33 +59,94 @@ export class RawCoMapView<
|
|
|
50
59
|
/** @internal */
|
|
51
60
|
constructor(
|
|
52
61
|
core: CoValueCore,
|
|
53
|
-
options?: { ignorePrivateTransactions:
|
|
62
|
+
options?: { ignorePrivateTransactions: boolean; atTime?: number },
|
|
54
63
|
) {
|
|
55
64
|
this.id = core.id as CoID<this>;
|
|
56
65
|
this.core = core;
|
|
57
|
-
this.
|
|
66
|
+
this.latest = {};
|
|
67
|
+
this.latestTxMadeAt = 0;
|
|
68
|
+
this.options = options;
|
|
69
|
+
|
|
70
|
+
this.processLatestTransactions();
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
processLatestTransactions() {
|
|
74
|
+
this.latest = {};
|
|
75
|
+
this.latestTxMadeAt = 0;
|
|
76
|
+
|
|
77
|
+
const { core, options, latest } = this;
|
|
78
|
+
|
|
79
|
+
for (const { txID, changes, madeAt } of core.getValidSortedTransactions({
|
|
80
|
+
ignorePrivateTransactions: options?.ignorePrivateTransactions ?? false,
|
|
81
|
+
})) {
|
|
82
|
+
if (options?.atTime && madeAt > options.atTime) {
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
if (madeAt > this.latestTxMadeAt) {
|
|
87
|
+
this.latestTxMadeAt = madeAt;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
for (let changeIdx = 0; changeIdx < changes.length; changeIdx++) {
|
|
91
|
+
const change = changes[changeIdx] as MapOpPayload<
|
|
92
|
+
keyof Shape & string,
|
|
93
|
+
Shape[keyof Shape & string]
|
|
94
|
+
>;
|
|
95
|
+
let entry = latest[change.key];
|
|
96
|
+
if (!entry) {
|
|
97
|
+
entry = {
|
|
98
|
+
txID,
|
|
99
|
+
madeAt,
|
|
100
|
+
changeIdx,
|
|
101
|
+
change,
|
|
102
|
+
};
|
|
103
|
+
latest[change.key] = entry;
|
|
104
|
+
} else if (madeAt >= entry.madeAt) {
|
|
105
|
+
entry.txID = txID;
|
|
106
|
+
entry.madeAt = madeAt;
|
|
107
|
+
entry.changeIdx = changeIdx;
|
|
108
|
+
entry.change = change;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
private getOps() {
|
|
115
|
+
if (this.cachedOps) {
|
|
116
|
+
return this.cachedOps;
|
|
117
|
+
}
|
|
58
118
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
119
|
+
const ops: {
|
|
120
|
+
[Key in keyof Shape & string]?: MapOp<Key, Shape[Key]>[];
|
|
121
|
+
} = {};
|
|
122
|
+
|
|
123
|
+
for (const {
|
|
124
|
+
txID,
|
|
125
|
+
changes,
|
|
126
|
+
madeAt,
|
|
127
|
+
} of this.core.getValidSortedTransactions(this.options)) {
|
|
62
128
|
for (let changeIdx = 0; changeIdx < changes.length; changeIdx++) {
|
|
63
129
|
const change = changes[changeIdx] as MapOpPayload<
|
|
64
130
|
keyof Shape & string,
|
|
65
131
|
Shape[keyof Shape & string]
|
|
66
132
|
>;
|
|
67
|
-
let entries =
|
|
133
|
+
let entries = ops[change.key];
|
|
68
134
|
if (!entries) {
|
|
69
135
|
entries = [];
|
|
70
|
-
|
|
136
|
+
ops[change.key] = entries;
|
|
71
137
|
}
|
|
72
138
|
entries.push({
|
|
73
139
|
txID,
|
|
74
140
|
madeAt,
|
|
75
141
|
changeIdx,
|
|
76
|
-
|
|
142
|
+
change,
|
|
77
143
|
});
|
|
78
144
|
}
|
|
79
145
|
}
|
|
146
|
+
|
|
147
|
+
this.cachedOps = ops;
|
|
148
|
+
|
|
149
|
+
return ops;
|
|
80
150
|
}
|
|
81
151
|
|
|
82
152
|
/** @category 6. Meta */
|
|
@@ -91,13 +161,17 @@ export class RawCoMapView<
|
|
|
91
161
|
|
|
92
162
|
/** @category 4. Time travel */
|
|
93
163
|
atTime(time: number): this {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
164
|
+
if (time >= this.latestTxMadeAt) {
|
|
165
|
+
return this;
|
|
166
|
+
} else {
|
|
167
|
+
const clone = new RawCoMapView(this.core, {
|
|
168
|
+
ignorePrivateTransactions:
|
|
169
|
+
this.options?.ignorePrivateTransactions ?? false,
|
|
170
|
+
atTime: time,
|
|
171
|
+
});
|
|
172
|
+
Object.setPrototypeOf(clone, this);
|
|
173
|
+
return clone as this;
|
|
174
|
+
}
|
|
101
175
|
}
|
|
102
176
|
|
|
103
177
|
/** @internal */
|
|
@@ -109,9 +183,11 @@ export class RawCoMapView<
|
|
|
109
183
|
}
|
|
110
184
|
|
|
111
185
|
if (this.atTimeFilter) {
|
|
112
|
-
return this.
|
|
186
|
+
return this.getOps()[key]?.filter(
|
|
187
|
+
(op) => op.madeAt <= this.atTimeFilter!,
|
|
188
|
+
);
|
|
113
189
|
} else {
|
|
114
|
-
return this.
|
|
190
|
+
return this.getOps()[key];
|
|
115
191
|
}
|
|
116
192
|
}
|
|
117
193
|
|
|
@@ -120,18 +196,18 @@ export class RawCoMapView<
|
|
|
120
196
|
*
|
|
121
197
|
* @category 1. Reading */
|
|
122
198
|
keys<K extends keyof Shape & string = keyof Shape & string>(): K[] {
|
|
123
|
-
return (Object.keys(this.
|
|
124
|
-
const
|
|
125
|
-
if (!
|
|
199
|
+
return (Object.keys(this.latest) as K[]).filter((key) => {
|
|
200
|
+
const latest = this.latest[key];
|
|
201
|
+
if (!latest) {
|
|
126
202
|
return undefined;
|
|
127
203
|
}
|
|
128
204
|
|
|
129
205
|
const includeUntil = this.atTimeFilter;
|
|
130
206
|
const lastEntry = includeUntil
|
|
131
|
-
?
|
|
132
|
-
:
|
|
207
|
+
? this.getOps()[key]?.findLast((entry) => entry.madeAt <= includeUntil)
|
|
208
|
+
: latest!;
|
|
133
209
|
|
|
134
|
-
if (lastEntry?.op === "del") {
|
|
210
|
+
if (lastEntry?.change.op === "del") {
|
|
135
211
|
return false;
|
|
136
212
|
} else {
|
|
137
213
|
return true;
|
|
@@ -145,20 +221,22 @@ export class RawCoMapView<
|
|
|
145
221
|
* @category 1. Reading
|
|
146
222
|
**/
|
|
147
223
|
get<K extends keyof Shape & string>(key: K): Shape[K] | undefined {
|
|
148
|
-
const
|
|
149
|
-
if (!
|
|
224
|
+
const latest = this.latest[key];
|
|
225
|
+
if (!latest) {
|
|
150
226
|
return undefined;
|
|
151
227
|
}
|
|
152
228
|
|
|
153
229
|
const includeUntil = this.atTimeFilter;
|
|
154
230
|
const lastEntry = includeUntil
|
|
155
|
-
?
|
|
156
|
-
|
|
231
|
+
? this.timeFilteredOps(key)?.findLast(
|
|
232
|
+
(entry) => entry.madeAt <= includeUntil,
|
|
233
|
+
)
|
|
234
|
+
: latest;
|
|
157
235
|
|
|
158
|
-
if (lastEntry?.op === "del") {
|
|
236
|
+
if (lastEntry?.change.op === "del") {
|
|
159
237
|
return undefined;
|
|
160
238
|
} else {
|
|
161
|
-
return lastEntry?.value;
|
|
239
|
+
return lastEntry?.change.value;
|
|
162
240
|
}
|
|
163
241
|
}
|
|
164
242
|
|
|
@@ -216,7 +294,7 @@ export class RawCoMapView<
|
|
|
216
294
|
by: accountOrAgentIDfromSessionID(entry.txID.sessionID),
|
|
217
295
|
tx: entry.txID,
|
|
218
296
|
at: new Date(entry.madeAt),
|
|
219
|
-
value: entry.op === "del" ? undefined : entry.value,
|
|
297
|
+
value: entry.change.op === "del" ? undefined : entry.change.value,
|
|
220
298
|
};
|
|
221
299
|
}
|
|
222
300
|
|
|
@@ -292,9 +370,8 @@ export class RawCoMap<
|
|
|
292
370
|
privacy,
|
|
293
371
|
);
|
|
294
372
|
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
this.ops = after.ops;
|
|
373
|
+
this.processLatestTransactions();
|
|
374
|
+
this.cachedOps = undefined;
|
|
298
375
|
}
|
|
299
376
|
|
|
300
377
|
/** Delete the given key (setting it to undefined).
|
|
@@ -319,8 +396,7 @@ export class RawCoMap<
|
|
|
319
396
|
privacy,
|
|
320
397
|
);
|
|
321
398
|
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
this.ops = after.ops;
|
|
399
|
+
this.processLatestTransactions();
|
|
400
|
+
this.cachedOps = undefined;
|
|
325
401
|
}
|
|
326
402
|
}
|
package/src/permissions.ts
CHANGED
|
@@ -59,46 +59,47 @@ export function determineValidTransactions(
|
|
|
59
59
|
throw new Error("Group must be a map");
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
62
|
+
const validTransactions: ValidTransactionsResult[] = [];
|
|
63
|
+
|
|
64
|
+
for (const [sessionID, sessionLog] of coValue.sessionLogs.entries()) {
|
|
65
|
+
const transactor = accountOrAgentIDfromSessionID(sessionID);
|
|
66
|
+
|
|
67
|
+
sessionLog.transactions.forEach((tx, txIndex) => {
|
|
68
|
+
const groupAtTime = groupContent.atTime(tx.madeAt);
|
|
69
|
+
const effectiveTransactor = agentInAccountOrMemberInGroup(
|
|
70
|
+
transactor,
|
|
71
|
+
groupAtTime,
|
|
72
|
+
);
|
|
73
|
+
|
|
74
|
+
if (!effectiveTransactor) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
const transactorRoleAtTxTime =
|
|
79
|
+
groupAtTime.roleOfInternal(effectiveTransactor)?.role ||
|
|
80
|
+
groupAtTime.roleOfInternal(EVERYONE)?.role;
|
|
81
|
+
|
|
82
|
+
if (
|
|
83
|
+
transactorRoleAtTxTime !== "admin" &&
|
|
84
|
+
transactorRoleAtTxTime !== "writer"
|
|
85
|
+
) {
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
validTransactions.push({ txID: { sessionID, txIndex }, tx });
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
return validTransactions;
|
|
93
94
|
} else if (coValue.header.ruleset.type === "unsafeAllowAll") {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
95
|
+
const validTransactions: ValidTransactionsResult[] = [];
|
|
96
|
+
|
|
97
|
+
for (const [sessionID, sessionLog] of coValue.sessionLogs.entries()) {
|
|
98
|
+
sessionLog.transactions.forEach((tx, txIndex) => {
|
|
99
|
+
validTransactions.push({ txID: { sessionID, txIndex }, tx });
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
return validTransactions;
|
|
102
103
|
} else {
|
|
103
104
|
throw new Error(
|
|
104
105
|
"Unknown ruleset type " +
|