@rocicorp/zero 0.7.2024112700 → 0.7.2024120101

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.
Files changed (92) hide show
  1. package/out/{chunk-HDEKBM3G.js → chunk-5S7LFUZ4.js} +77 -104
  2. package/out/{chunk-HDEKBM3G.js.map → chunk-5S7LFUZ4.js.map} +3 -3
  3. package/out/solid.js +1 -1
  4. package/out/zero-cache/src/auth/load-schema.d.ts +2 -2
  5. package/out/zero-cache/src/auth/load-schema.d.ts.map +1 -1
  6. package/out/zero-cache/src/auth/load-schema.js +5 -4
  7. package/out/zero-cache/src/auth/load-schema.js.map +1 -1
  8. package/out/zero-cache/src/auth/read-authorizer.d.ts +25 -0
  9. package/out/zero-cache/src/auth/read-authorizer.d.ts.map +1 -0
  10. package/out/zero-cache/src/auth/read-authorizer.js +126 -0
  11. package/out/zero-cache/src/auth/read-authorizer.js.map +1 -0
  12. package/out/zero-cache/src/auth/write-authorizer.d.ts +2 -2
  13. package/out/zero-cache/src/auth/write-authorizer.d.ts.map +1 -1
  14. package/out/zero-cache/src/auth/write-authorizer.js +4 -4
  15. package/out/zero-cache/src/auth/write-authorizer.js.map +1 -1
  16. package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
  17. package/out/zero-cache/src/server/syncer.js +3 -3
  18. package/out/zero-cache/src/server/syncer.js.map +1 -1
  19. package/out/zero-cache/src/services/mutagen/mutagen.d.ts +2 -2
  20. package/out/zero-cache/src/services/mutagen/mutagen.d.ts.map +1 -1
  21. package/out/zero-cache/src/services/mutagen/mutagen.js +2 -2
  22. package/out/zero-cache/src/services/mutagen/mutagen.js.map +1 -1
  23. package/out/zero-cache/src/services/view-syncer/cvr.d.ts +9 -1
  24. package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map +1 -1
  25. package/out/zero-cache/src/services/view-syncer/cvr.js +6 -1
  26. package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
  27. package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts +9 -1
  28. package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map +1 -1
  29. package/out/zero-cache/src/services/view-syncer/view-syncer.js +99 -32
  30. package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
  31. package/out/zero-cache/src/workers/connection.d.ts +2 -3
  32. package/out/zero-cache/src/workers/connection.d.ts.map +1 -1
  33. package/out/zero-cache/src/workers/connection.js +4 -3
  34. package/out/zero-cache/src/workers/connection.js.map +1 -1
  35. package/out/zero-cache/src/workers/syncer.d.ts.map +1 -1
  36. package/out/zero-cache/src/workers/syncer.js +6 -1
  37. package/out/zero-cache/src/workers/syncer.js.map +1 -1
  38. package/out/zero-client/src/mod.d.ts +1 -1
  39. package/out/zero-client/src/mod.d.ts.map +1 -1
  40. package/out/zero-protocol/src/ast.d.ts +9 -9
  41. package/out/zero-protocol/src/ast.d.ts.map +1 -1
  42. package/out/zero-protocol/src/ast.js +11 -12
  43. package/out/zero-protocol/src/ast.js.map +1 -1
  44. package/out/zero-schema/src/build-schema.d.ts.map +1 -1
  45. package/out/zero-schema/src/build-schema.js +10 -10
  46. package/out/zero-schema/src/build-schema.js.map +1 -1
  47. package/out/zero-schema/src/{compiled-authorization.d.ts → compiled-permissions.d.ts} +4 -4
  48. package/out/zero-schema/src/compiled-permissions.d.ts.map +1 -0
  49. package/out/zero-schema/src/{compiled-authorization.js → compiled-permissions.js} +2 -2
  50. package/out/zero-schema/src/compiled-permissions.js.map +1 -0
  51. package/out/zero-schema/src/mod.d.ts +1 -1
  52. package/out/zero-schema/src/mod.d.ts.map +1 -1
  53. package/out/zero-schema/src/normalize-table-schema.d.ts +19 -8
  54. package/out/zero-schema/src/normalize-table-schema.d.ts.map +1 -1
  55. package/out/zero-schema/src/normalize-table-schema.js +9 -25
  56. package/out/zero-schema/src/normalize-table-schema.js.map +1 -1
  57. package/out/zero-schema/src/normalized-schema.d.ts +6 -1
  58. package/out/zero-schema/src/normalized-schema.d.ts.map +1 -1
  59. package/out/zero-schema/src/normalized-schema.js.map +1 -1
  60. package/out/zero-schema/src/permissions.d.ts +32 -0
  61. package/out/zero-schema/src/permissions.d.ts.map +1 -0
  62. package/out/zero-schema/src/schema-config.d.ts +19 -301
  63. package/out/zero-schema/src/schema-config.d.ts.map +1 -1
  64. package/out/zero-schema/src/schema-config.js +57 -19
  65. package/out/zero-schema/src/schema-config.js.map +1 -1
  66. package/out/zero-schema/src/table-schema.d.ts +12 -8
  67. package/out/zero-schema/src/table-schema.d.ts.map +1 -1
  68. package/out/zero-schema/src/table-schema.js +15 -2
  69. package/out/zero-schema/src/table-schema.js.map +1 -1
  70. package/out/zero.js +3 -3
  71. package/out/zql/src/builder/builder.d.ts.map +1 -1
  72. package/out/zql/src/builder/builder.js +3 -4
  73. package/out/zql/src/builder/builder.js.map +1 -1
  74. package/out/zql/src/ivm/join.d.ts +1 -1
  75. package/out/zql/src/ivm/join.d.ts.map +1 -1
  76. package/out/zql/src/ivm/join.js.map +1 -1
  77. package/out/zql/src/ivm/memory-source.js +3 -3
  78. package/out/zql/src/ivm/memory-source.js.map +1 -1
  79. package/out/zql/src/query/auth-query.d.ts +0 -4
  80. package/out/zql/src/query/auth-query.d.ts.map +1 -1
  81. package/out/zql/src/query/auth-query.js +0 -4
  82. package/out/zql/src/query/auth-query.js.map +1 -1
  83. package/out/zql/src/query/query-impl.d.ts.map +1 -1
  84. package/out/zql/src/query/query-impl.js +26 -32
  85. package/out/zql/src/query/query-impl.js.map +1 -1
  86. package/out/zqlite/src/table-source.js +6 -3
  87. package/out/zqlite/src/table-source.js.map +1 -1
  88. package/package.json +1 -1
  89. package/out/zero-schema/src/authorization.d.ts +0 -32
  90. package/out/zero-schema/src/authorization.d.ts.map +0 -1
  91. package/out/zero-schema/src/compiled-authorization.d.ts.map +0 -1
  92. package/out/zero-schema/src/compiled-authorization.js.map +0 -1
@@ -7,11 +7,18 @@ import type { ReplicaState } from '../replicator/replicator.js';
7
7
  import type { ActivityBasedService } from '../service.js';
8
8
  import type { DrainCoordinator } from './drain-coordinator.js';
9
9
  import { PipelineDriver } from './pipeline-driver.js';
10
+ import type { JWTPayload } from 'jose';
11
+ import type { PermissionsConfig } from '../../../../zero-schema/src/compiled-permissions.js';
12
+ export type TokenData = {
13
+ readonly raw: string;
14
+ readonly decoded: JWTPayload;
15
+ };
10
16
  export type SyncContext = {
11
17
  readonly clientID: string;
12
18
  readonly wsID: string;
13
19
  readonly baseCookie: string | null;
14
20
  readonly schemaVersion: number;
21
+ readonly tokenData: TokenData | undefined;
15
22
  };
16
23
  export interface ViewSyncer {
17
24
  initConnection(ctx: SyncContext, msg: InitConnectionMessage): Promise<Source<Downstream>>;
@@ -20,7 +27,7 @@ export interface ViewSyncer {
20
27
  export declare class ViewSyncerService implements ViewSyncer, ActivityBasedService {
21
28
  #private;
22
29
  readonly id: string;
23
- constructor(lc: LogContext, taskID: string, clientGroupID: string, shardID: string, db: PostgresDB, pipelineDriver: PipelineDriver, versionChanges: Subscription<ReplicaState>, drainCoordinator: DrainCoordinator, keepaliveMs?: number, idleTimeoutMs?: number);
30
+ constructor(lc: LogContext, taskID: string, clientGroupID: string, shardID: string, db: PostgresDB, pipelineDriver: PipelineDriver, versionChanges: Subscription<ReplicaState>, drainCoordinator: DrainCoordinator, permissions: PermissionsConfig, keepaliveMs?: number, idleTimeoutMs?: number);
24
31
  run(): Promise<void>;
25
32
  /**
26
33
  * Guarantees that the ViewSyncer will remain running for at least
@@ -36,4 +43,5 @@ export declare class ViewSyncerService implements ViewSyncer, ActivityBasedServi
36
43
  changeDesiredQueries(ctx: SyncContext, msg: ChangeDesiredQueriesMessage): Promise<void>;
37
44
  stop(): Promise<void>;
38
45
  }
46
+ export declare function pickToken(previousToken: JWTPayload | undefined, newToken: JWTPayload | undefined): JWTPayload | undefined;
39
47
  //# sourceMappingURL=view-syncer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"view-syncer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,EAGL,KAAK,2BAA2B,EAChC,KAAK,UAAU,EACf,KAAK,qBAAqB,EAC3B,MAAM,sCAAsC,CAAC;AAG9C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAE9D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAcxD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAapE,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,cAAc,CACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,qBAAqB,GACzB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAE/B,oBAAoB,CAClB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAcD,qBAAa,iBAAkB,YAAW,UAAU,EAAE,oBAAoB;;IACxE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBA4BlB,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,YAAY,CAAC,YAAY,CAAC,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,SAAuB,EAClC,aAAa,SAA0B;IAoCnC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAwG1B;;;;;;;;OAQG;IACH,SAAS,IAAI,OAAO;IA0Bd,cAAc,CAClB,GAAG,EAAE,WAAW,EAChB,qBAAqB,EAAE,qBAAqB,GAC3C,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAuCxB,oBAAoB,CACxB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,IAAI,CAAC;IA+ehB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBtB"}
1
+ {"version":3,"file":"view-syncer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,EAGL,KAAK,2BAA2B,EAChC,KAAK,UAAU,EACf,KAAK,qBAAqB,EAC3B,MAAM,sCAAsC,CAAC;AAG9C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAElD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAE9D,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAcxD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAapE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,qDAAqD,CAAC;AAG3F,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,cAAc,CACZ,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,qBAAqB,GACzB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAE/B,oBAAoB,CAClB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAcD,qBAAa,iBAAkB,YAAW,UAAU,EAAE,oBAAoB;;IACxE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBA8BlB,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,YAAY,CAAC,YAAY,CAAC,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,WAAW,SAAuB,EAClC,aAAa,SAA0B;IAqCnC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAwG1B;;;;;;;;OAQG;IACH,SAAS,IAAI,OAAO;IA0Bd,cAAc,CAClB,GAAG,EAAE,WAAW,EAChB,qBAAqB,EAAE,qBAAqB,GAC3C,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAwCxB,oBAAoB,CACxB,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,2BAA2B,GAC/B,OAAO,CAAC,IAAI,CAAC;IA6jBhB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBtB;AAwCD,wBAAgB,SAAS,CACvB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,QAAQ,EAAE,UAAU,GAAG,SAAS,0BA2CjC"}
@@ -3,7 +3,6 @@ import { resolver } from '@rocicorp/resolver';
3
3
  import { assert, unreachable } from '../../../../shared/src/asserts.js';
4
4
  import { CustomKeyMap } from '../../../../shared/src/custom-key-map.js';
5
5
  import { must } from '../../../../shared/src/must.js';
6
- import { difference } from '../../../../shared/src/set-utils.js';
7
6
  import { ErrorKind, } from '../../../../zero-protocol/src/mod.js';
8
7
  import { stringify } from '../../types/bigint-json.js';
9
8
  import { ErrorForClient } from '../../types/error-for-client.js';
@@ -16,6 +15,7 @@ import { CVRConfigDrivenUpdater, CVRQueryDrivenUpdater, } from './cvr.js';
16
15
  import { PipelineDriver } from './pipeline-driver.js';
17
16
  import { cmpVersions, EMPTY_CVR_VERSION, versionFromString, versionString, versionToCookie, } from './schema/types.js';
18
17
  import { SchemaChangeError } from './snapshotter.js';
18
+ import { transformAndHashQuery } from '../../auth/read-authorizer.js';
19
19
  const DEFAULT_KEEPALIVE_MS = 5_000;
20
20
  // TODO: make idle timeout more intelligent when browser-level client
21
21
  // management can provide signals of whether a client is likely to
@@ -43,9 +43,11 @@ export class ViewSyncerService {
43
43
  #clients = new Map();
44
44
  #cvrStore;
45
45
  #stopped = resolver();
46
+ #permissions;
46
47
  #cvr;
47
48
  #pipelinesSynced = false;
48
- constructor(lc, taskID, clientGroupID, shardID, db, pipelineDriver, versionChanges, drainCoordinator, keepaliveMs = DEFAULT_KEEPALIVE_MS, idleTimeoutMs = DEFAULT_IDLE_TIMEOUT_MS) {
49
+ #authData;
50
+ constructor(lc, taskID, clientGroupID, shardID, db, pipelineDriver, versionChanges, drainCoordinator, permissions, keepaliveMs = DEFAULT_KEEPALIVE_MS, idleTimeoutMs = DEFAULT_IDLE_TIMEOUT_MS) {
49
51
  this.id = clientGroupID;
50
52
  this.#shardID = shardID;
51
53
  this.#lc = lc;
@@ -58,6 +60,7 @@ export class ViewSyncerService {
58
60
  // On failure, cancel the #stateChanges subscription. The run()
59
61
  // loop will then await #cvrStore.flushed() which rejects if necessary.
60
62
  () => this.#stateChanges.cancel());
63
+ this.#permissions = permissions;
61
64
  }
62
65
  #runInLockWithCVR(fn) {
63
66
  return this.#lock.withLock(async () => {
@@ -197,7 +200,8 @@ export class ViewSyncerService {
197
200
  }
198
201
  async initConnection(ctx, initConnectionMessage) {
199
202
  this.#lastConnectTime = Date.now();
200
- const { clientID, wsID, baseCookie, schemaVersion } = ctx;
203
+ const { clientID, wsID, baseCookie, schemaVersion, tokenData } = ctx;
204
+ this.#authData = pickToken(this.#authData, tokenData?.decoded);
201
205
  const lc = this.#lc
202
206
  .withContext('clientID', clientID)
203
207
  .withContext('wsID', wsID);
@@ -339,13 +343,15 @@ export class ViewSyncerService {
339
343
  if (!query.internal && Object.keys(query.desiredBy).length === 0) {
340
344
  continue; // No longer desired.
341
345
  }
342
- const newTransformationHash = hash; // Currently, no transformations are done.
346
+ const { query: transformedAst, hash: newTransformationHash } = transformAndHashQuery(ast, this.#permissions, this.#authData);
347
+ assert(transformedAst !== undefined && newTransformationHash !== undefined, 'This query may not be run because the table it reads is not readable. Table: ' +
348
+ ast.table);
343
349
  if (newTransformationHash !== transformationHash) {
344
350
  continue; // Query results may have changed.
345
351
  }
346
352
  const start = Date.now();
347
353
  let count = 0;
348
- for (const _ of this.#pipelines.addQuery(hash, ast)) {
354
+ for (const _ of this.#pipelines.addQuery(hash, transformedAst)) {
349
355
  count++;
350
356
  }
351
357
  const elapsed = Date.now() - start;
@@ -364,68 +370,84 @@ export class ViewSyncerService {
364
370
  assert(this.#pipelines.initialized());
365
371
  const lc = this.#lc.withContext('cvrVersion', versionString(cvr.version));
366
372
  const hydratedQueries = this.#pipelines.addedQueries();
367
- const allClientQueries = new Set(Object.keys(cvr.queries));
368
- const desiredClientQueries = new Set(Object.keys(cvr.queries).filter(id => {
369
- const q = cvr.queries[id];
370
- return q.internal || Object.keys(q.desiredBy).length > 0;
371
- }));
372
- const addQueries = [...difference(desiredClientQueries, hydratedQueries)];
373
- const removeQueries = [
374
- ...difference(allClientQueries, desiredClientQueries),
375
- ];
376
- if (addQueries.length > 0 || removeQueries.length > 0) {
377
- // Note: clients are caught up as part of #addAndRemoveQueries().
378
- await this.#addAndRemoveQueries(lc, cvr, addQueries, removeQueries);
373
+ // Convert queries to their transformed ast's and hashes
374
+ const transformationHashToHash = new Map();
375
+ const serverQueries = Object.entries(cvr.queries).map(([id, q]) => {
376
+ const { query, hash: transformationHash } = transformAndHashQuery(q.ast, this.#permissions, this.#authData);
377
+ assert(query !== undefined && transformationHash !== undefined, 'This query may not be run because the table it reads is not readable. Table: ' +
378
+ q.ast.table);
379
+ transformationHashToHash.set(transformationHash, id);
380
+ return {
381
+ id,
382
+ // TODO(mlaw): follow up to handle the case where we statically determine
383
+ // the query cannot be run and is `undefined`.
384
+ ast: query,
385
+ transformationHash,
386
+ desired: q.internal || Object.keys(q.desiredBy).length > 0,
387
+ };
388
+ });
389
+ const addQueries = serverQueries.filter(q => q.desired && !hydratedQueries.has(q.transformationHash));
390
+ const removeQueries = serverQueries.filter(q => !q.desired);
391
+ const desiredQueries = new Set(serverQueries.filter(q => q.desired).map(q => q.id));
392
+ const unhydrateQueries = [...hydratedQueries].filter(transformationHash => !desiredQueries.has(transformationHash));
393
+ if (addQueries.length > 0 ||
394
+ removeQueries.length > 0 ||
395
+ unhydrateQueries.length > 0) {
396
+ await this.#addAndRemoveQueries(lc, cvr, addQueries, removeQueries, unhydrateQueries, transformationHashToHash);
379
397
  }
380
398
  else {
381
399
  await this.#catchupClients(lc, cvr);
382
400
  }
383
401
  // If CVR was non-empty, then the CVR, database, and all clients
384
402
  // should now be at the same version.
385
- if (allClientQueries.size) {
403
+ if (serverQueries.length > 0) {
386
404
  const cvrVersion = must(this.#cvr).version;
387
405
  const dbVersion = this.#pipelines.currentVersion();
388
406
  assert(cvrVersion.stateVersion === dbVersion, `CVR@${versionString(cvrVersion)}" does not match DB@${dbVersion}`);
389
407
  }
390
408
  }
391
409
  // This must be called from within the #lock.
392
- async #addAndRemoveQueries(lc, cvr, addQueries, removeQueries) {
393
- assert(addQueries.length > 0 || removeQueries.length > 0);
410
+ async #addAndRemoveQueries(lc, cvr, addQueries, removeQueries, unhydrateQueries, transformationHashToHash) {
411
+ assert(addQueries.length > 0 ||
412
+ removeQueries.length > 0 ||
413
+ unhydrateQueries.length > 0);
394
414
  const start = Date.now();
395
415
  const stateVersion = this.#pipelines.currentVersion();
396
416
  lc = lc.withContext('stateVersion', stateVersion);
397
417
  lc.info?.(`hydrating ${addQueries.length} queries`);
398
418
  const updater = new CVRQueryDrivenUpdater(this.#cvrStore, cvr, stateVersion, this.#pipelines.replicaVersion);
399
- // Note: This kicks of background PG queries for CVR data associated with the
419
+ // Note: This kicks off background PG queries for CVR data associated with the
400
420
  // executed and removed queries.
401
- const { newVersion, queryPatches } = updater.trackQueries(lc, addQueries.map(hash => ({ id: hash, transformationHash: hash })), removeQueries);
421
+ const { newVersion, queryPatches } = updater.trackQueries(lc, addQueries, removeQueries);
402
422
  const pokers = [...this.#clients.values()].map(c => c.startPoke(newVersion, this.#pipelines.currentSchemaVersions()));
403
423
  for (const patch of queryPatches) {
404
424
  pokers.forEach(poker => poker.addPatch(patch));
405
425
  }
406
426
  // Removing queries is easy. The pipelines are dropped, and the CVR
407
427
  // updater handles the updates and pokes.
408
- for (const hash of removeQueries) {
428
+ for (const q of removeQueries) {
429
+ this.#pipelines.removeQuery(q.transformationHash);
430
+ }
431
+ for (const hash of unhydrateQueries) {
409
432
  this.#pipelines.removeQuery(hash);
410
433
  }
411
434
  const pipelines = this.#pipelines;
412
435
  function* generateRowChanges() {
413
- for (const hash of addQueries) {
414
- const { ast } = cvr.queries[hash];
415
- lc.debug?.(`adding pipeline for query ${hash}`, ast);
416
- yield* pipelines.addQuery(hash, ast);
436
+ for (const q of addQueries) {
437
+ lc.debug?.(`adding pipeline for query ${q.id}`, q.ast);
438
+ yield* pipelines.addQuery(q.transformationHash, q.ast);
417
439
  }
418
440
  }
419
441
  // #processChanges does batched de-duping of rows. Wrap all pipelines in
420
442
  // a single generator in order to maximize de-duping.
421
- await this.#processChanges(lc, generateRowChanges(), updater, pokers);
443
+ await this.#processChanges(lc, generateRowChanges(), updater, pokers, transformationHashToHash);
422
444
  for (const patch of await updater.deleteUnreferencedRows(lc)) {
423
445
  pokers.forEach(poker => poker.addPatch(patch));
424
446
  }
425
447
  // Commit the changes and update the CVR snapshot.
426
448
  this.#cvr = (await updater.flush(lc, this.#lastConnectTime)).cvr;
427
449
  // Before ending the poke, catch up clients that were behind the old CVR.
428
- await this.#catchupClients(lc, cvr, addQueries, pokers);
450
+ await this.#catchupClients(lc, cvr, addQueries.map(q => q.id), pokers);
429
451
  // Signal clients to commit.
430
452
  pokers.forEach(poker => poker.end());
431
453
  lc.info?.(`finished processing queries (${Date.now() - start} ms)`);
@@ -484,7 +506,7 @@ export class ViewSyncerService {
484
506
  pokers.forEach(poker => poker.end());
485
507
  }
486
508
  }
487
- async #processChanges(lc, changes, updater, pokers) {
509
+ async #processChanges(lc, changes, updater, pokers, transformationHashToHash) {
488
510
  const start = Date.now();
489
511
  const rows = new CustomKeyMap(rowIDString);
490
512
  let total = 0;
@@ -497,7 +519,8 @@ export class ViewSyncerService {
497
519
  rows.clear();
498
520
  };
499
521
  for (const change of changes) {
500
- const { type, queryHash, table, rowKey, row } = change;
522
+ const { type, queryHash: transformationHash, table, rowKey, row } = change;
523
+ const queryHash = must(transformationHashToHash.get(transformationHash), 'could not find the original hash for the transformation hash');
501
524
  const rowID = { schema: '', table, rowKey: rowKey };
502
525
  let parsedRow = rows.get(rowID);
503
526
  let rc;
@@ -557,8 +580,15 @@ export class ViewSyncerService {
557
580
  const updater = new CVRQueryDrivenUpdater(this.#cvrStore, cvr, version, this.#pipelines.replicaVersion);
558
581
  const pokers = [...this.#clients.values()].map(c => c.startPoke(updater.updatedVersion(), this.#pipelines.currentSchemaVersions()));
559
582
  lc.debug?.(`applying ${numChanges} to advance to ${version}`);
583
+ const transformationHashToHash = new Map();
584
+ for (const query of Object.values(cvr.queries)) {
585
+ if (!query.transformationHash) {
586
+ continue;
587
+ }
588
+ transformationHashToHash.set(query.transformationHash, query.id);
589
+ }
560
590
  try {
561
- await this.#processChanges(lc, changes, updater, pokers);
591
+ await this.#processChanges(lc, changes, updater, pokers, transformationHashToHash);
562
592
  }
563
593
  catch (e) {
564
594
  if (e instanceof SchemaChangeError) {
@@ -619,4 +649,41 @@ function checkClientAndCVRVersions(client, cvr) {
619
649
  ]);
620
650
  }
621
651
  }
652
+ export function pickToken(previousToken, newToken) {
653
+ if (previousToken === undefined) {
654
+ return newToken;
655
+ }
656
+ if (newToken) {
657
+ if (previousToken.sub !== newToken.sub) {
658
+ throw new ErrorForClient([
659
+ 'error',
660
+ ErrorKind.Unauthorized,
661
+ 'The user id in the new token does not match the previous token. Client groups are pinned to a single user.',
662
+ ]);
663
+ }
664
+ if (previousToken.iat === undefined) {
665
+ // No issued at time for the existing token? We take the most recently received token.
666
+ return newToken;
667
+ }
668
+ if (newToken.iat === undefined) {
669
+ throw new ErrorForClient([
670
+ 'error',
671
+ ErrorKind.Unauthorized,
672
+ 'The new token does not have an issued at time but the prior token does. Tokens for a client group must either all have issued at times or all not have issued at times',
673
+ ]);
674
+ }
675
+ // The new token is newer, so we take it.
676
+ if (previousToken.iat < newToken.iat) {
677
+ return newToken;
678
+ }
679
+ // if the new token is older or the same, we keep the existing token.
680
+ return previousToken;
681
+ }
682
+ // previousToken !== undefined but newToken is undefined
683
+ throw new ErrorForClient([
684
+ 'error',
685
+ ErrorKind.Unauthorized,
686
+ 'No token provided. An unauthenticated client cannot connect to an authenticated client group.',
687
+ ]);
688
+ }
622
689
  //# sourceMappingURL=view-syncer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"view-syncer.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"view-syncer.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/view-syncer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAC,YAAY,EAAC,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAC,IAAI,EAAC,MAAM,gCAAgC,CAAC;AACpD,OAAO,EACL,SAAS,GAKV,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,cAAc,EAAC,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAC,WAAW,EAAc,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAC,wBAAwB,EAAC,MAAM,2CAA2C,CAAC;AAEnF,OAAO,EACL,aAAa,GAId,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EACL,sBAAsB,EACtB,qBAAqB,GAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAC,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,eAAe,GAIhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,qBAAqB,EAAC,MAAM,+BAA+B,CAAC;AAoCpE,MAAM,oBAAoB,GAAG,KAAK,CAAC;AACnC,qEAAqE;AACrE,wEAAwE;AACxE,mBAAmB;AACnB,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC,MAAM,OAAO,iBAAiB;IACnB,EAAE,CAAS;IACX,QAAQ,CAAS;IACjB,GAAG,CAAa;IAChB,UAAU,CAAiB;IAC3B,aAAa,CAA6B;IAC1C,iBAAiB,CAAmB;IACpC,YAAY,CAAS;IACrB,cAAc,CAAS;IAEhC,gEAAgE;IAChE,gBAAgB,GAAG,CAAC,CAAC;IAErB,8BAA8B;IAC9B,+CAA+C;IAC/C,iCAAiC;IACjC,yEAAyE;IACzE,mDAAmD;IACnD,EAAE;IACF,4EAA4E;IACnE,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IACnB,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC5C,SAAS,CAAW;IACpB,QAAQ,GAAG,QAAQ,EAAE,CAAC;IACtB,YAAY,CAAoB;IAEzC,IAAI,CAA0B;IAC9B,gBAAgB,GAAG,KAAK,CAAC;IACzB,SAAS,CAAyB;IAElC,YACE,EAAc,EACd,MAAc,EACd,aAAqB,EACrB,OAAe,EACf,EAAc,EACd,cAA8B,EAC9B,cAA0C,EAC1C,gBAAkC,EAClC,WAA8B,EAC9B,WAAW,GAAG,oBAAoB,EAClC,aAAa,GAAG,uBAAuB;QAEvC,IAAI,CAAC,EAAE,GAAG,aAAa,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC;QACpC,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,QAAQ,CAC3B,EAAE,EACF,EAAE,EACF,MAAM,EACN,aAAa;QACb,+DAA+D;QAC/D,uEAAuE;QACvE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAClC,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IAClC,CAAC;IAED,iBAAiB,CAAI,EAAwC;QAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YACpC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC/D,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,iDAAiD;gBACjD,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;gBACtB,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAG;QACP,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,EAAC,KAAK,EAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC/C,IAAI,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC;oBACzC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,wBAAwB,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC;oBAC/D,MAAM;gBACR,CAAC;gBACD,MAAM,CAAC,KAAK,KAAK,eAAe,CAAC,CAAC,CAAC,sCAAsC;gBACzE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC;oBACnC,6DAA6D;oBAC7D,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;gBACzB,CAAC;gBACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;oBACvC,IACE,CAAC,GAAG,CAAC,cAAc,KAAK,IAAI;wBAC1B,GAAG,CAAC,OAAO,CAAC,YAAY,KAAK,IAAI,CAAC;wBACpC,GAAG,CAAC,cAAc,KAAK,IAAI,CAAC,UAAU,CAAC,cAAc,EACrD,CAAC;wBACD,MAAM,GAAG,GAAG,iCACV,GAAG,CAAC,cACN,QAAQ,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;wBACzC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC;wBACzC,MAAM,IAAI,cAAc,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC;oBACrE,CAAC;oBAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;wBAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;wBACjD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;4BACzB,OAAO;wBACT,CAAC;wBACD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,gCAAgC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;wBAClE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;oBAC1B,CAAC;oBAED,+CAA+C;oBAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;oBACrD,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oBAE1C,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;wBACvC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,WAAW,OAAO,kBAAkB,MAAM,EAAE,CAAC,CAAC;wBAC/D,OAAO,CAAC,iCAAiC;oBAC3C,CAAC;oBAED,+DAA+D;oBAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,kBAAkB,OAAO,SAAS,MAAM,GAAG,CAAC,CAAC;oBAC7D,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;oBACnC,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;oBACtC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAC/B,CAAC,CAAC,CAAC;YACL,CAAC;YAED,iEAAiE;YACjE,8BAA8B;YAC9B,IAAI,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC;gBACzC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;YACnE,CAAC;YACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;gBAAS,CAAC;YACT,uEAAuE;YACvE,eAAe;YACf,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,qBAAqB,CAAC,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;IAChD,CAAC;IAED,+EAA+E;IAC/E,qEAAqE;IACrE,qEAAqE;IACrE,4CAA4C;IAC5C,cAAc,GAAyB,IAAI,CAAC;IAE5C,mBAAmB,CAAC,MAA2B;QAC7C,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,8CAA8C;YAC9C,uCAAuC;YACvC,YAAY,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,wBAAwB,CAAC,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,uBAAuB,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,aAAa,GAAkB,EAAE,CAAC;QACxC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QAEpC,aAAa,CAAC,SAAS,GAAG,UAAU,CAClC,GAAG,EAAE;YACH,mEAAmE;YACnE,IAAI,IAAI,CAAC,cAAc,KAAK,aAAa,EAAE,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,kCAAkC,CAAC,CAAC;gBACpD,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,8CAA8C;YAC7E,CAAC;QACH,CAAC,EACD,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CACjE,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,SAAS;QACP,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,oDAAoD;YACpD,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,QAAgB,EAAE,MAAqB;QACnD,2EAA2E;QAC3E,4EAA4E;QAC5E,oEAAoE;QACpE,sBAAsB;QACtB,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,GAAgB,EAChB,qBAA4C;QAE5C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACnC,MAAM,EAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAC,GAAG,GAAG,CAAC;QACnE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAE/D,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG;aAChB,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC;aACjC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7B,mCAAmC;QACnC,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAa;YACjD,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;gBAClB,GAAG;oBACD,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,0BAA0B,EAAE,GAAG,CAAC;oBAC7C,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,eAAe,CAAC,CAAC;gBAC/B,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAC1C,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,aAAa,CACjC,EAAE,EACF,IAAI,CAAC,EAAE,EACP,QAAQ,EACR,IAAI,EACJ,IAAI,CAAC,QAAQ,EACb,UAAU,EACV,aAAa,EACb,UAAU,CACX,CAAC;QAEF,MAAM,IAAI,CAAC,mBAAmB,CAC5B,GAAG,EACH,qBAAqB,EACrB,IAAI,CAAC,aAAa,EAClB,SAAS,CACV,CAAC;QAEF,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,GAAgB,EAChB,GAAgC;QAEhC,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,mBAAmB,CACvB,GAAgB,EAChB,GAAM,EACN,EAKkB,EAClB,SAAyB;QAEzB,MAAM,EAAC,QAAQ,EAAE,IAAI,EAAC,GAAG,GAAG,CAAC;QAC7B,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG;aAChB,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC;aACjC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC;aACzB,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAE3B,yCAAyC;QACzC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;QAED,IAAI,MAAiC,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE;gBACjC,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAEtB,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;oBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;oBACrC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;oBACvC,MAAM,GAAG,SAAS,CAAC;oBAEnB,yBAAyB,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBACrC,IAAI,MAAM,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;wBAC1B,8DAA8D;wBAC9D,gEAAgE;wBAChE,EAAE,CAAC,KAAK,EAAE,CAAC,wCAAwC,GAAG,UAAU,CAAC,CAAC;wBAClE,OAAO;oBACT,CAAC;gBACH,CAAC;gBAED,OAAO,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,EAAE,CAAC,KAAK,EAAE,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;YAC/C,IAAI,MAAM,EAAE,CAAC;gBACX,+EAA+E;gBAC/E,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,sEAAsE;gBACtE,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAED,oCAAoC;IAC3B,aAAa,GAAG,KAAK,EAC5B,EAAc,EACd,QAAgB,EAChB,EAAC,mBAAmB,EAA2B,EAC/C,GAAgB,EAChB,EAAE;QACF,2BAA2B;QAC3B,IAAI,mBAAmB,CAAC,MAAM,EAAE,CAAC;YAC/B,EAAE,CAAC,KAAK,EAAE,CAAC,YAAY,mBAAmB,CAAC,MAAM,gBAAgB,CAAC,CAAC;YACnE,MAAM,OAAO,GAAG,IAAI,sBAAsB,CACxC,IAAI,CAAC,SAAS,EACd,GAAG,EACH,IAAI,CAAC,QAAQ,CACd,CAAC;YAEF,MAAM,OAAO,GAAqB,EAAE,CAAC;YACrC,KAAK,MAAM,KAAK,IAAI,mBAAmB,EAAE,CAAC;gBACxC,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;oBACjB,KAAK,KAAK;wBACR,OAAO,CAAC,IAAI,CACV,GAAG,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,EAAC,CAAC,CAClE,CAAC;wBACF,MAAM;oBACR,KAAK,KAAK;wBACR,OAAO,CAAC,IAAI,CACV,GAAG,OAAO,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CACxD,CAAC;wBACF,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;wBACvD,MAAM;gBACV,CAAC;YACH,CAAC;YAED,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC;YAEjE,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpD,sDAAsD;gBACtD,mEAAmE;gBACnE,mEAAmE;gBACnE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;gBACzB,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;qBACvC,MAAM,CACL,CAAC,CAAC,EAAE;gBACF,8DAA8D;gBAC9D,WAAW,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CACnE;qBACA,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC5B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;gBACjD,CAAC;gBACD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YACvC,CAAC;YAED,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,+BAA+B;QAClD,CAAC;QAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;IACH,CAAC,CAAC;IAEF;;;;;;;;;;;;;;OAcG;IACH,wBAAwB,CAAC,GAAgB;QACvC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC;QAE/B,IAAI,UAAU,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CACb,QAAQ,eAAe,CAAC,UAAU,CAAC,kBAAkB,SAAS,EAAE,CACjE,CAAC;YACF,OAAO,CAAC,kDAAkD;QAC5D,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CACnD,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS,CACvD,CAAC;QAEF,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;YACvC,MAAM,EAAC,GAAG,EAAE,kBAAkB,EAAC,GAAG,KAAK,CAAC;YACxC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjE,SAAS,CAAC,qBAAqB;YACjC,CAAC;YACD,MAAM,EAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,qBAAqB,EAAC,GACxD,qBAAqB,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAChE,MAAM,CACJ,cAAc,KAAK,SAAS,IAAI,qBAAqB,KAAK,SAAS,EACnE,+EAA+E;gBAC7E,GAAG,CAAC,KAAK,CACZ,CAAC;YACF,IAAI,qBAAqB,KAAK,kBAAkB,EAAE,CAAC;gBACjD,SAAS,CAAC,kCAAkC;YAC9C,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC;gBAC/D,KAAK,EAAE,CAAC;YACV,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,YAAY,KAAK,aAAa,IAAI,KAAK,OAAO,MAAM,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,qBAAqB,CAAC,GAAgB;QAC1C,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAE1E,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QAEvD,wDAAwD;QACxD,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3D,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;YAChE,MAAM,EAAC,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAC,GAAG,qBAAqB,CAC7D,CAAC,CAAC,GAAG,EACL,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,SAAS,CACf,CAAC;YACF,MAAM,CACJ,KAAK,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS,EACvD,+EAA+E;gBAC7E,CAAC,CAAC,GAAG,CAAC,KAAK,CACd,CAAC;YACF,wBAAwB,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;YACrD,OAAO;gBACL,EAAE;gBACF,yEAAyE;gBACzE,8CAA8C;gBAC9C,GAAG,EAAE,KAAK;gBACV,kBAAkB;gBAClB,OAAO,EAAE,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC;aAC3D,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CACrC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAC7D,CAAC;QACF,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACpD,CAAC;QACF,MAAM,gBAAgB,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC,MAAM,CAClD,kBAAkB,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAC9D,CAAC;QAEF,IACE,UAAU,CAAC,MAAM,GAAG,CAAC;YACrB,aAAa,CAAC,MAAM,GAAG,CAAC;YACxB,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAC3B,CAAC;YACD,MAAM,IAAI,CAAC,oBAAoB,CAC7B,EAAE,EACF,GAAG,EACH,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,wBAAwB,CACzB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACtC,CAAC;QAED,gEAAgE;QAChE,qCAAqC;QACrC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YACnD,MAAM,CACJ,UAAU,CAAC,YAAY,KAAK,SAAS,EACrC,OAAO,aAAa,CAAC,UAAU,CAAC,uBAAuB,SAAS,EAAE,CACnE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,6CAA6C;IAC7C,KAAK,CAAC,oBAAoB,CACxB,EAAc,EACd,GAAgB,EAChB,UAAgE,EAChE,aAAmE,EACnE,gBAA0B,EAC1B,wBAA6C;QAE7C,MAAM,CACJ,UAAU,CAAC,MAAM,GAAG,CAAC;YACnB,aAAa,CAAC,MAAM,GAAG,CAAC;YACxB,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAC9B,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACtD,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAClD,EAAE,CAAC,IAAI,EAAE,CAAC,aAAa,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC;QAEpD,MAAM,OAAO,GAAG,IAAI,qBAAqB,CACvC,IAAI,CAAC,SAAS,EACd,GAAG,EACH,YAAY,EACZ,IAAI,CAAC,UAAU,CAAC,cAAc,CAC/B,CAAC;QAEF,8EAA8E;QAC9E,gCAAgC;QAChC,MAAM,EAAC,UAAU,EAAE,YAAY,EAAC,GAAG,OAAO,CAAC,YAAY,CACrD,EAAE,EACF,UAAU,EACV,aAAa,CACd,CAAC;QACF,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACjD,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,CACjE,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,mEAAmE;QACnE,yCAAyC;QACzC,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;YAC9B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;QACpD,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,QAAQ,CAAC,CAAC,kBAAkB;YAC1B,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;gBAC3B,EAAE,CAAC,KAAK,EAAE,CAAC,6BAA6B,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBACvD,KAAK,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QACD,wEAAwE;QACxE,qDAAqD;QACrD,MAAM,IAAI,CAAC,eAAe,CACxB,EAAE,EACF,kBAAkB,EAAE,EACpB,OAAO,EACP,MAAM,EACN,wBAAwB,CACzB,CAAC;QAEF,KAAK,MAAM,KAAK,IAAI,MAAM,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC7D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC;QAEjE,yEAAyE;QACzE,MAAM,IAAI,CAAC,eAAe,CACxB,EAAE,EACF,GAAG,EACH,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACzB,MAAM,CACP,CAAC;QAEF,4BAA4B;QAC5B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAErC,EAAE,CAAC,IAAI,EAAE,CAAC,gCAAgC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;;;;;;;;OASG;IACH,8BAA8B;IAC9B,KAAK,CAAC,eAAe,CACnB,EAAc,EACd,GAAgB,EAChB,qBAA+B,EAAE,EACjC,SAAyB;QAEzB,MAAM,MAAM,GACV,SAAS;YACT,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAClC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAClE,CAAC;QAEJ,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC5C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;aACrB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAElE,+DAA+D;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CACjD,EAAE,EACF,WAAW,EACX,GAAG,EACH,kBAAkB,CACnB,CAAC;QAEF,6DAA6D;QAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,oBAAoB,CACvD,EAAE,EACF,WAAW,EACX,GAAG,CACJ,CAAC;QAEF,mEAAmE;QACnE,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,EAAC,MAAM,EAAE,KAAK,EAAC,GAAG,GAAG,CAAC;gBAC5B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAgB,CAAC;gBACpC,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAEtD,MAAM,EAAE,GAAU,EAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC;gBAC1C,IAAI,KAAe,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;oBACnB,KAAK,GAAG,EAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,GAAG,IAAI,CACd,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EACrC,eAAe,KAAK,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAC5C,CAAC;oBACF,MAAM,EAAC,QAAQ,EAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;oBAC3C,KAAK,GAAG,EAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAC,CAAC;gBACjD,CAAC;gBACD,MAAM,cAAc,GAAG,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC;gBAC1C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;gBACxD,aAAa,EAAE,CAAC;YAClB,CAAC;QACH,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,aAAa,cAAc,CAAC,CAAC;QAClD,CAAC;QAED,gEAAgE;QAChE,KAAK,MAAM,KAAK,IAAI,MAAM,aAAa,EAAE,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,EAAc,EACd,OAA4B,EAC5B,OAA8B,EAC9B,MAAqB,EACrB,wBAA6C;QAE7C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,YAAY,CAAmB,WAAW,CAAC,CAAC;QAC7D,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;YAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACnC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC;YACnB,EAAE,CAAC,KAAK,EAAE,CAAC,cAAc,IAAI,CAAC,IAAI,QAAQ,KAAK,WAAW,OAAO,MAAM,CAAC,CAAC;YACzE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACvD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACzE,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,EAAC,IAAI,EAAE,SAAS,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAC,GAAG,MAAM,CAAC;YACzE,MAAM,SAAS,GAAG,IAAI,CACpB,wBAAwB,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAChD,8DAA8D,CAC/D,CAAC;YACF,MAAM,KAAK,GAAU,EAAC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAgB,EAAC,CAAC;YAEnE,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,EAAU,CAAC;YACf,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,SAAS,GAAG,EAAC,SAAS,EAAE,EAAE,EAAC,CAAC;gBAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBAC3B,EAAE,GAAG,CAAC,CAAC;YACT,CAAC;iBAAM,CAAC;gBACN,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC;YAED,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAE,EAAE;gBACjC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;oBACvB,MAAM,EAAC,OAAO,EAAE,QAAQ,EAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;oBACpD,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;oBAC5B,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAChC,CAAC;YACH,CAAC,CAAC;YACF,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,KAAK;oBACR,aAAa,CAAC,GAAG,CAAC,CAAC;oBACnB,EAAE,EAAE,CAAC;oBACL,MAAM;gBACR,KAAK,MAAM;oBACT,aAAa,CAAC,GAAG,CAAC,CAAC;oBACnB,mBAAmB;oBACnB,MAAM;gBACR,KAAK,QAAQ;oBACX,EAAE,EAAE,CAAC;oBACL,MAAM;gBACR;oBACE,WAAW,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC;YAED,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YAEpC,IAAI,IAAI,CAAC,IAAI,GAAG,gBAAgB,KAAK,CAAC,EAAE,CAAC;gBACvC,MAAM,YAAY,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,MAAM,YAAY,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,iBAAiB,CACrB,GAAgB;QAEhB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzB,MAAM,EAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACjE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEvD,2DAA2D;QAC3D,MAAM,OAAO,GAAG,IAAI,qBAAqB,CACvC,IAAI,CAAC,SAAS,EACd,GAAG,EACH,OAAO,EACP,IAAI,CAAC,UAAU,CAAC,cAAc,CAC/B,CAAC;QACF,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACjD,CAAC,CAAC,SAAS,CACT,OAAO,CAAC,cAAc,EAAE,EACxB,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CACxC,CACF,CAAC;QAEF,EAAE,CAAC,KAAK,EAAE,CAAC,YAAY,UAAU,kBAAkB,OAAO,EAAE,CAAC,CAAC;QAC9D,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,SAAS;YACX,CAAC;YACD,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,eAAe,CACxB,EAAE,EACF,OAAO,EACP,OAAO,EACP,MAAM,EACN,wBAAwB,CACzB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,iBAAiB,EAAE,CAAC;gBACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxC,OAAO,CAAC,CAAC;YACX,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC;QAEjE,4BAA4B;QAC5B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAErC,EAAE,CAAC,IAAI,EAAE,CAAC,oCAAoC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,sBAAsB,CAAC,CAAC;QACxC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,QAAQ,CAAC,GAAa;QACpB,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5C,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B,SAAS,kBAAkB,CAAC,GAAQ;IAClC,MAAM,EAAC,CAAC,wBAAwB,CAAC,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAC,GAAG,GAAG,CAAC;IAC/D,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,yBAAyB,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC;AAC7B,CAAC;AAED,MAAM,eAAe,GAAG,EAAC,YAAY,EAAE,IAAI,EAAC,CAAC;AAE7C,SAAS,yBAAyB,CAChC,MAA0B,EAC1B,GAAe;IAEf,IACE,WAAW,CAAC,GAAG,EAAE,eAAe,CAAC,KAAK,CAAC;QACvC,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,EACxC,CAAC;QACD,kCAAkC;QAClC,MAAM,IAAI,cAAc,CAAC;YACvB,OAAO;YACP,SAAS,CAAC,cAAc;YACxB,kBAAkB;SACnB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,sCAAsC;QACtC,MAAM,IAAI,cAAc,CAAC;YACvB,OAAO;YACP,SAAS,CAAC,kCAAkC;YAC5C,qBAAqB,aAAa,CAAC,GAAG,CAAC,EAAE;SAC1C,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,aAAqC,EACrC,QAAgC;IAEhC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,aAAa,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC;YACvC,MAAM,IAAI,cAAc,CAAC;gBACvB,OAAO;gBACP,SAAS,CAAC,YAAY;gBACtB,4GAA4G;aAC7G,CAAC,CAAC;QACL,CAAC;QAED,IAAI,aAAa,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YACpC,sFAAsF;YACtF,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,cAAc,CAAC;gBACvB,OAAO;gBACP,SAAS,CAAC,YAAY;gBACtB,wKAAwK;aACzK,CAAC,CAAC;QACL,CAAC;QAED,yCAAyC;QACzC,IAAI,aAAa,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC;YACrC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,qEAAqE;QACrE,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,wDAAwD;IACxD,MAAM,IAAI,cAAc,CAAC;QACvB,OAAO;QACP,SAAS,CAAC,YAAY;QACtB,+FAA+F;KAChG,CAAC,CAAC;AACL,CAAC"}
@@ -1,11 +1,10 @@
1
1
  import type { LogContext } from '@rocicorp/logger';
2
- import type { JWTPayload } from 'jose';
3
2
  import WebSocket from 'ws';
4
3
  import { type Downstream, type ErrorMessage } from '../../../zero-protocol/src/mod.js';
5
4
  import type { ZeroConfig } from '../config/zero-config.js';
6
5
  import type { ConnectParams } from '../services/dispatcher/connect-params.js';
7
6
  import type { Mutagen } from '../services/mutagen/mutagen.js';
8
- import type { ViewSyncer } from '../services/view-syncer/view-syncer.js';
7
+ import type { TokenData, ViewSyncer } from '../services/view-syncer/view-syncer.js';
9
8
  /**
10
9
  * Represents a connection between the client and server.
11
10
  *
@@ -16,7 +15,7 @@ import type { ViewSyncer } from '../services/view-syncer/view-syncer.js';
16
15
  */
17
16
  export declare class Connection {
18
17
  #private;
19
- constructor(lc: LogContext, config: ZeroConfig, authData: JWTPayload | undefined, viewSyncer: ViewSyncer, mutagen: Mutagen, connectParams: ConnectParams, ws: WebSocket, onClose: () => void);
18
+ constructor(lc: LogContext, config: ZeroConfig, tokenData: TokenData | undefined, viewSyncer: ViewSyncer, mutagen: Mutagen, connectParams: ConnectParams, ws: WebSocket, onClose: () => void);
20
19
  close(): void;
21
20
  handleInitConnection(initConnectionMsg: string): Promise<void>;
22
21
  send(data: Downstream): void;
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAErC,OAAO,SAAS,MAAM,IAAI,CAAC;AAI3B,OAAO,EAEL,KAAK,UAAU,EAEf,KAAK,YAAY,EAGlB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAEV,UAAU,EACX,MAAM,wCAAwC,CAAC;AAIhD;;;;;;;GAOG;AACH,qBAAa,UAAU;;gBAgBnB,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,UAAU,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,MAAM,IAAI;IA8BrB,KAAK;IAkCL,oBAAoB,CAAC,iBAAiB,EAAE,MAAM;IAwH9C,IAAI,CAAC,IAAI,EAAE,UAAU;IAIrB,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,OAAO;CAGvD;AAED,wBAAgB,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,QAEnD;AAED,wBAAgB,SAAS,CACvB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,YAAY,EAAE,YAAY,EAC1B,MAAM,CAAC,EAAE,OAAO,QAMjB"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,SAAS,MAAM,IAAI,CAAC;AAI3B,OAAO,EAEL,KAAK,UAAU,EAEf,KAAK,YAAY,EAGlB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0CAA0C,CAAC;AAC5E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAEV,SAAS,EACT,UAAU,EACX,MAAM,wCAAwC,CAAC;AAIhD;;;;;;;GAOG;AACH,qBAAa,UAAU;;gBAgBnB,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,MAAM,IAAI;IA8BrB,KAAK;IAkCL,oBAAoB,CAAC,iBAAiB,EAAE,MAAM;IAyH9C,IAAI,CAAC,IAAI,EAAE,UAAU;IAIrB,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,OAAO;CAGvD;AAED,wBAAgB,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,QAEnD;AAED,wBAAgB,SAAS,CACvB,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,YAAY,EAAE,YAAY,EAC1B,MAAM,CAAC,EAAE,OAAO,QAMjB"}
@@ -25,12 +25,12 @@ export class Connection {
25
25
  #authData;
26
26
  #outboundStream;
27
27
  #closed = false;
28
- constructor(lc, config, authData, viewSyncer, mutagen, connectParams, ws, onClose) {
28
+ constructor(lc, config, tokenData, viewSyncer, mutagen, connectParams, ws, onClose) {
29
29
  this.#ws = ws;
30
- this.#authData = authData;
30
+ this.#authData = tokenData?.decoded;
31
31
  const { clientGroupID, clientID, wsID, baseCookie, schemaVersion } = connectParams;
32
32
  this.#clientGroupID = clientGroupID;
33
- this.#syncContext = { clientID, wsID, baseCookie, schemaVersion };
33
+ this.#syncContext = { clientID, wsID, baseCookie, schemaVersion, tokenData };
34
34
  this.#lc = lc
35
35
  .withContext('connection')
36
36
  .withContext('clientID', clientID)
@@ -140,6 +140,7 @@ export class Connection {
140
140
  lc.error?.('TODO: implement deleteClients');
141
141
  break;
142
142
  case 'initConnection': {
143
+ // TODO (mlaw): tell mutagens about the new token too
143
144
  this.#outboundStream = await viewSyncer.initConnection(this.#syncContext, msg);
144
145
  if (this.#closed) {
145
146
  this.#outboundStream.cancel();
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAIpC,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAC,gBAAgB,EAAC,MAAM,sCAAsC,CAAC;AACtE,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAGL,SAAS,EAGT,cAAc,GACf,MAAM,mCAAmC,CAAC;AAS3C,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAGhE;;;;;;;GAOG;AACH,MAAM,OAAO,UAAU;IACZ,GAAG,CAAY;IACf,cAAc,CAAS;IACvB,YAAY,CAAc;IAC1B,GAAG,CAAa;IAChB,QAAQ,CAAa;IAErB,WAAW,CAAa;IACxB,QAAQ,CAAU;IAClB,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC;IAC3B,SAAS,CAAyB;IAE3C,eAAe,CAAiC;IAChD,OAAO,GAAG,KAAK,CAAC;IAEhB,YACE,EAAc,EACd,MAAkB,EAClB,SAAgC,EAChC,UAAsB,EACtB,OAAgB,EAChB,aAA4B,EAC5B,EAAa,EACb,OAAmB;QAEnB,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC;QACpC,MAAM,EAAC,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAC,GAC9D,aAAa,CAAC;QAChB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,EAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAC,CAAC;QAC3E,IAAI,CAAC,GAAG,GAAG,EAAE;aACV,WAAW,CAAC,YAAY,CAAC;aACzB,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC;aACjC,WAAW,CAAC,eAAe,EAAE,aAAa,CAAC;aAC3C,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAExB,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtD,MAAM,gBAAgB,GAAqB;YACzC,WAAW;YACX,EAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAC;SACpC,CAAC;QACF,IAAI,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;QAC3B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACzD,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;QACjC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,KAAK,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;QAED,gCAAgC;QAChC,mDAAmD;IACrD,CAAC;IAED,4DAA4D;IAC5D,eAAe,CAAC,MAAkB;QAChC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;oBACb,MAAM;oBACN;wBACE,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC;qBAChC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,iBAAyB;QAC5C,OAAO,IAAI,CAAC,cAAc,CAAC,EAAC,IAAI,EAAE,iBAAiB,EAAC,CAAC,CAAC;IACxD,CAAC;IAED,cAAc,GAAG,KAAK,EAAE,KAAmB,EAAE,EAAE;QAC7C,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,wCAAwC,EAAE,IAAI,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IAAI,GAAG,CAAC;QACR,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/B,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,4BAA4B,IAAI,MAAM,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnE,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACxE,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACvB,QAAQ,OAAO,EAAE,CAAC;gBAChB,KAAK,MAAM;oBACT,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAuB,CAAC,CAAC;oBAC9C,MAAM;gBACR,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,EAAC,aAAa,EAAE,SAAS,EAAE,aAAa,EAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;oBACzD,IAAI,aAAa,KAAK,IAAI,CAAC,cAAc,EAAE,CAAC;wBAC1C,IAAI,CAAC,eAAe,CAAC;4BACnB,OAAO;4BACP,SAAS,CAAC,WAAW;4BACrB,8BAA8B,aAAa,mBAAmB;gCAC5D,gCAAgC,IAAI,CAAC,cAAc,EAAE;yBACxD,CAAC,CAAC;oBACL,CAAC;oBACD,mEAAmE;oBACnE,yEAAyE;oBACzE,+EAA+E;oBAC/E,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;wBAC3C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;4BACjC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,eAAe,CACpD,QAAQ,EACR,IAAI,CAAC,SAAS,EACd,aAAa,CACd,CAAC;4BACF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gCAC7B,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC1D,CAAC;wBACH,CAAC;oBACH,CAAC,CAAC,CAAC;oBACH,MAAM;gBACR,CAAC;gBACD,KAAK,MAAM;oBACT,EAAE,CAAC,KAAK,EAAE,CAAC,sBAAsB,CAAC,CAAC;oBACnC,MAAM;gBACR,KAAK,sBAAsB;oBACzB,MAAM,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;oBAC9D,MAAM;gBACR,KAAK,eAAe;oBAClB,EAAE,CAAC,KAAK,EAAE,CAAC,+BAA+B,CAAC,CAAC;oBAC5C,MAAM;gBACR,KAAK,gBAAgB,CAAC,CAAC,CAAC;oBACtB,qDAAqD;oBACrD,IAAI,CAAC,eAAe,GAAG,MAAM,UAAU,CAAC,cAAc,CACpD,IAAI,CAAC,YAAY,EACjB,GAAG,CACJ,CAAC;oBACF,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;wBACjB,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;oBAChC,CAAC;yBAAM,CAAC;wBACN,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;oBACjD,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD;oBACE,WAAW,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC;IAEF,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QAC/B,MAAM,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,uBAAuB,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAC,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC,CAAC;IAEF,YAAY,GAAG,CAAC,CAAa,EAAE,EAAE;QAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,uBAAuB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC,CAAC;IAEF,KAAK,CAAC,cAAc,CAAC,cAAkC;QACrD,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;gBAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,iCAAiC,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,CAAU;QACzB,MAAM,YAAY,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE,YAAY,IAAI;YAC1D,OAAO;YACP,SAAS,CAAC,QAAQ;YAClB,MAAM,CAAC,CAAC,CAAC;SACV,CAAC;QACF,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,eAAe,CAAC,YAA0B,EAAE,MAAgB;QAC1D,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,IAAI,CAAC,IAAgB;QACnB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,YAA0B,EAAE,MAAgB;QACpD,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;CACF;AAED,MAAM,UAAU,IAAI,CAAC,EAAa,EAAE,IAAgB;IAClD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,EAAc,EACd,EAAa,EACb,YAA0B,EAC1B,MAAgB;IAEhB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC3C,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,4BAA4B,EAAE,YAAY,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;AACzB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAY,KAAK,UAAU,EAAC,MAAM,MAAM,CAAC;AAEhD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAI3C,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGzD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sCAAsC,CAAC;AAEvE,OAAO,KAAK,EACV,oBAAoB,EACpB,OAAO,EACP,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAC,MAAM,8CAA8C,CAAC;AAC9E,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAKtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,cAAc,EAAE,WAAW,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,MAAO,YAAW,gBAAgB;;IAC7C,QAAQ,CAAC,EAAE,SAAmB;gBAa5B,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,UAAU,EAClB,iBAAiB,EAAE,CACjB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,YAAY,CAAC,YAAY,CAAC,EAC/B,gBAAgB,EAAE,gBAAgB,KAC/B,UAAU,GAAG,oBAAoB,EACtC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,EACjD,MAAM,EAAE,MAAM;IAwEhB,GAAG;IAIH;;;;;OAKG;IACG,KAAK;IAqBX,IAAI;CAKL;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,UAAU,GAAG,SAAS,EAC9B,MAAM,EAAE,MAAM,uBAaf"}
1
+ {"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAY,KAAK,UAAU,EAAC,MAAM,MAAM,CAAC;AAEhD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAI3C,OAAO,EAAC,KAAK,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAGzD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sCAAsC,CAAC;AAEvE,OAAO,KAAK,EACV,oBAAoB,EACpB,OAAO,EACP,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAC,MAAM,8CAA8C,CAAC;AAC9E,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,wCAAwC,CAAC;AACvE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAKtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,cAAc,EAAE,WAAW,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,MAAO,YAAW,gBAAgB;;IAC7C,QAAQ,CAAC,EAAE,SAAmB;gBAa5B,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,UAAU,EAClB,iBAAiB,EAAE,CACjB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,YAAY,CAAC,YAAY,CAAC,EAC/B,gBAAgB,EAAE,gBAAgB,KAC/B,UAAU,GAAG,oBAAoB,EACtC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,EACjD,MAAM,EAAE,MAAM;IA6EhB,GAAG;IAIH;;;;;OAKG;IACG,KAAK;IAqBX,IAAI;CAKL;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,UAAU,GAAG,SAAS,EAC9B,MAAM,EAAE,MAAM,uBAaf"}
@@ -70,7 +70,12 @@ export class Syncer {
70
70
  ws.close(3000, 'Failed to decode JWT');
71
71
  }
72
72
  }
73
- const connection = new Connection(this.#lc, this.#config, decodedToken, this.#viewSyncers.getService(clientGroupID), this.#mutagens.getService(clientGroupID), params, ws, () => {
73
+ const connection = new Connection(this.#lc, this.#config, auth !== undefined && decodedToken !== undefined
74
+ ? {
75
+ raw: auth,
76
+ decoded: decodedToken,
77
+ }
78
+ : undefined, this.#viewSyncers.getService(clientGroupID), this.#mutagens.getService(clientGroupID), params, ws, () => {
74
79
  if (this.#connections.get(clientID) === connection) {
75
80
  this.#connections.delete(clientID);
76
81
  }
@@ -1 +1 @@
1
- {"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/workers/syncer.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  export { IDBNotFoundError, TransactionClosedError, dropAllDatabases, dropDatabase, getDefaultPuller, makeIDBName, } from '../../replicache/src/mod.js';
2
2
  export type { AsyncIterableIteratorToArray, ClientGroupID, ClientID, CreateKVStore, ExperimentalDiff, ExperimentalDiffOperation, ExperimentalDiffOperationAdd, ExperimentalDiffOperationChange, ExperimentalDiffOperationDel, ExperimentalIndexDiff, ExperimentalNoIndexDiff, ExperimentalWatchCallbackForOptions, ExperimentalWatchIndexCallback, ExperimentalWatchIndexOptions, ExperimentalWatchNoIndexCallback, ExperimentalWatchNoIndexOptions, ExperimentalWatchOptions, GetIndexScanIterator, GetScanIterator, HTTPRequestInfo, IndexDefinition, IndexDefinitions, IndexKey, IterableUnion, JSONObject, JSONValue, KVRead, KVStore, KVWrite, KeyTypeForScanOptions, MaybePromise, MutatorDefs, MutatorReturn, PatchOperation, ReadTransaction, ReadonlyJSONObject, ReadonlyJSONValue, ScanIndexOptions, ScanNoIndexOptions, ScanOptionIndexedStartKey, ScanOptions, ScanResult, SubscribeOptions, TransactionEnvironment, TransactionLocation, TransactionReason, UpdateNeededReason, VersionNotSupportedResponse, WriteTransaction, } from '../../replicache/src/mod.js';
3
- export { defineAuthorization } from '../../zero-schema/src/authorization.js';
3
+ export { definePermissions } from '../../zero-schema/src/permissions.js';
4
4
  export { createSchema } from '../../zero-schema/src/schema.js';
5
5
  export { createTableSchema, type TableSchemaToRow, type TableSchema, } from '../../zero-schema/src/table-schema.js';
6
6
  export { escapeLike } from '../../zql/src/query/escape-like.js';
@@ -1 +1 @@
1
- {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-client/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,WAAW,GACZ,MAAM,6BAA6B,CAAC;AACrC,YAAY,EACV,4BAA4B,EAC5B,aAAa,EACb,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,yBAAyB,EACzB,4BAA4B,EAC5B,+BAA+B,EAC/B,4BAA4B,EAC5B,qBAAqB,EACrB,uBAAuB,EACvB,mCAAmC,EACnC,8BAA8B,EAC9B,6BAA6B,EAC7B,gCAAgC,EAChC,+BAA+B,EAC/B,wBAAwB,EACxB,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,UAAU,EACV,SAAS,EACT,MAAM,EACN,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,YAAY,EACZ,WAAW,EACX,aAAa,EACb,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,yBAAyB,EACzB,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,2BAA2B,EAC3B,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAC,mBAAmB,EAAC,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAC,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,iBAAiB,EACjB,KAAK,gBAAgB,EACrB,KAAK,WAAW,GACjB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAC9D,YAAY,EACV,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,qBAAqB,IAAI,mBAAmB,EAC5C,KAAK,EACL,eAAe,EACf,YAAY,EACZ,SAAS,EACT,KAAK,GACN,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,YAAY,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../../zero-client/src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,WAAW,GACZ,MAAM,6BAA6B,CAAC;AACrC,YAAY,EACV,4BAA4B,EAC5B,aAAa,EACb,QAAQ,EACR,aAAa,EACb,gBAAgB,EAChB,yBAAyB,EACzB,4BAA4B,EAC5B,+BAA+B,EAC/B,4BAA4B,EAC5B,qBAAqB,EACrB,uBAAuB,EACvB,mCAAmC,EACnC,8BAA8B,EAC9B,6BAA6B,EAC7B,gCAAgC,EAChC,+BAA+B,EAC/B,wBAAwB,EACxB,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,UAAU,EACV,SAAS,EACT,MAAM,EACN,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,YAAY,EACZ,WAAW,EACX,aAAa,EACb,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,yBAAyB,EACzB,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,2BAA2B,EAC3B,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAC,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAC,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,iBAAiB,EACjB,KAAK,gBAAgB,EACrB,KAAK,WAAW,GACjB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAC9D,YAAY,EACV,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,mCAAmC,CAAC;AAC3C,YAAY,EACV,qBAAqB,IAAI,mBAAmB,EAC5C,KAAK,EACL,eAAe,EACf,YAAY,EACZ,SAAS,EACT,KAAK,GACN,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,YAAY,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAC"}
@@ -71,12 +71,13 @@ export declare const conditionSchema: v.UnionType<[v.ObjectType<{
71
71
  related: v.Type<CorrelatedSubquery>;
72
72
  op: v.UnionType<[v.Type<"EXISTS">, v.Type<"NOT EXISTS">]>;
73
73
  }>, undefined>]>;
74
+ export type CompoundKey = readonly [string, ...string[]];
75
+ export declare const compoundKeySchema: v.Type<CompoundKey>;
74
76
  export declare const correlatedSubquerySchemaOmitSubquery: v.ObjectType<Readonly<{
75
- correlation: v.ObjectType<{
76
- parentField: v.Type<string>;
77
- childField: v.Type<string>;
78
- op: v.Type<"=">;
79
- }, undefined>;
77
+ correlation: v.ObjectType<Readonly<{
78
+ parentField: v.Type<CompoundKey>;
79
+ childField: v.Type<CompoundKey>;
80
+ }>, undefined>;
80
81
  hidden: v.Optional<boolean>;
81
82
  }>, undefined>;
82
83
  export declare const correlatedSubquerySchema: v.Type<CorrelatedSubquery>;
@@ -146,13 +147,12 @@ export type AST = {
146
147
  };
147
148
  export type CorrelatedSubquery = {
148
149
  /**
149
- * Only equality correlations are supported for now.
150
+ * Only equality correlation are supported for now.
150
151
  * E.g., direct foreign key relationships.
151
152
  */
152
153
  readonly correlation: {
153
- readonly parentField: string;
154
- readonly childField: string;
155
- readonly op: '=';
154
+ parentField: CompoundKey;
155
+ childField: CompoundKey;
156
156
  };
157
157
  readonly subquery: AST;
158
158
  readonly hidden?: boolean | undefined;