@dxos/echo-pipeline 0.8.1 → 0.8.2-main.2f9c567
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/dist/lib/browser/index.mjs +15 -14
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +15 -14
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node-esm/index.mjs +15 -14
- package/dist/lib/node-esm/index.mjs.map +3 -3
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/types/src/automerge/echo-data-monitor.d.ts +5 -5
- package/dist/types/src/automerge/echo-data-monitor.d.ts.map +1 -1
- package/package.json +34 -34
- package/src/automerge/echo-data-monitor.ts +7 -7
- package/src/db-host/echo-host.ts +1 -1
- package/src/db-host/query-service.ts +1 -1
- package/src/db-host/query-state.ts +9 -10
- package/src/edge/echo-edge-replicator.test.ts +2 -2
|
@@ -181,21 +181,20 @@ export class QueryState extends Resource {
|
|
|
181
181
|
|
|
182
182
|
// TODO(burdon): Process Filter DSL.
|
|
183
183
|
const filterToIndexQuery = (filter: FilterProto): IndexQuery => {
|
|
184
|
-
|
|
184
|
+
const { type = [], or = [] } = filter;
|
|
185
|
+
|
|
186
|
+
invariant(!(type.length > 0 && or.length > 0), 'Cannot mix type and or filters.');
|
|
185
187
|
invariant(
|
|
186
|
-
|
|
188
|
+
or.every((subFilter) => !((subFilter.type ?? []).length > 0 && (subFilter.or ?? []).length > 0)),
|
|
187
189
|
'Cannot mix type and or filters.',
|
|
188
190
|
);
|
|
189
|
-
if (
|
|
190
|
-
filter.type ||
|
|
191
|
-
((filter.or ?? []).length > 0 && (filter.or ?? []).every((subFilter) => !subFilter.not && subFilter.type))
|
|
192
|
-
) {
|
|
191
|
+
if (type.length > 0 || (or.length > 0 && (or ?? []).every((subFilter) => !subFilter.not && subFilter.type))) {
|
|
193
192
|
return {
|
|
194
193
|
typenames:
|
|
195
|
-
|
|
196
|
-
?
|
|
197
|
-
:
|
|
198
|
-
.flatMap((f) => f.type
|
|
194
|
+
type.length > 0
|
|
195
|
+
? type.map((type) => dxnToIndexerTypename(DXN.parse(type)))
|
|
196
|
+
: or
|
|
197
|
+
.flatMap((f) => (f.type ?? []).map((type) => dxnToIndexerTypename(DXN.parse(type))) ?? [])
|
|
199
198
|
.filter(isNonNullable),
|
|
200
199
|
inverted: filter.not,
|
|
201
200
|
};
|
|
@@ -33,12 +33,12 @@ describe('EchoEdgeReplicator', () => {
|
|
|
33
33
|
await connectionOpen.waitForCount(1);
|
|
34
34
|
|
|
35
35
|
const forbidden = createForbiddenMessage({ identityKey: client.identityKey, peerKey: client.peerKey }, spaceId);
|
|
36
|
-
server.sendMessage(forbidden);
|
|
36
|
+
await server.sendMessage(forbidden);
|
|
37
37
|
await connectionOpen.waitForCount(1);
|
|
38
38
|
|
|
39
39
|
// Double restart to check for race conditions.
|
|
40
40
|
client.setIdentity(await createEphemeralEdgeIdentity());
|
|
41
|
-
server.sendMessage(forbidden);
|
|
41
|
+
await server.sendMessage(forbidden);
|
|
42
42
|
await connectionOpen.waitForCount(1);
|
|
43
43
|
|
|
44
44
|
await replicator.disconnect();
|