@rocicorp/zero 0.26.1 → 0.26.2-canary.1

package/out/zero-cache/src/services/replicator/notifier.js

@@ -1,30 +1,54 @@
-import { EventEmitter } from "eventemitter3";
 import { Subscription } from "../../types/subscription.js";
-class Notifier {
-  #eventEmitter = new EventEmitter();
-  #lastStateReceived;
-  #newSubscription() {
-    const notify = (state) => subscription.push(state);
-    const subscription = Subscription.create({
-      coalesce: (curr) => curr,
-      cleanup: () => this.#eventEmitter.off("version", notify)
-    });
-    return { notify, subscription };
-  }
-  subscribe() {
-    const { notify, subscription } = this.#newSubscription();
-    this.#eventEmitter.on("version", notify);
-    if (this.#lastStateReceived) {
-      notify(this.#lastStateReceived);
-    }
-    return subscription;
-  }
-  notifySubscribers(state = { state: "version-ready" }) {
-    this.#lastStateReceived = state;
-    return this.#eventEmitter.listeners("version").map((notify) => notify(state)).map((pending) => pending.result);
-  }
-}
-export {
-  Notifier
+import { EventEmitter } from "eventemitter3";
+//#region ../zero-cache/src/services/replicator/notifier.ts
+/**
+* Handles the semantics of {@link ReplicatorVersionNotifier.subscribe()}
+* notifications, namely:
+*
+* * New subscribers are notified immediately with the latest received
+*   ReplicaState.
+*
+* * Non-latest notifications are discarded if the subscriber is too
+*   busy to consume them.
+*
+* By encapsulating the state for the first behavior (essentially, whether
+* the first notification has been sent by the Replicator), Notifier objects
+* can be chained to simplify fanout from Replicator to View Syncers.
+*
+* In particular, each Syncer Thread can manage a single Subscription to
+* the Replicator across a MessageChannel, which it uses for its own Notifier
+* instance to manage subscriptions from View Syncers within its thread. This
+* way a Replicator only deals with sending notifications to a bounded set
+* of MessageChannel-based subscribers (Syncer Threads), while the dynamic
+* subscribe and unsubscribe traffic from View Syncers remains within each
+* Syncer Thread.
+*/
+var Notifier = class {
+	#eventEmitter = new EventEmitter();
+	#lastStateReceived;
+	#newSubscription() {
+		const notify = (state) => subscription.push(state);
+		const subscription = Subscription.create({
+			coalesce: (curr) => curr,
+			cleanup: () => this.#eventEmitter.off("version", notify)
+		});
+		return {
+			notify,
+			subscription
+		};
+	}
+	subscribe() {
+		const { notify, subscription } = this.#newSubscription();
+		this.#eventEmitter.on("version", notify);
+		if (this.#lastStateReceived) notify(this.#lastStateReceived);
+		return subscription;
+	}
+	notifySubscribers(state = { state: "version-ready" }) {
+		this.#lastStateReceived = state;
+		return this.#eventEmitter.listeners("version").map((notify) => notify(state)).map((pending) => pending.result);
+	}
 };
-//# sourceMappingURL=notifier.js.map
+//#endregion
+export { Notifier };
+
+//# sourceMappingURL=notifier.js.map

package/out/zero-cache/src/services/replicator/notifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"notifier.js","sources":["../../../../../../zero-cache/src/services/replicator/notifier.ts"],"sourcesContent":["import {EventEmitter} from 'eventemitter3';\nimport {\n  type PendingResult,\n  type Result,\n  Subscription,\n} from '../../types/subscription.ts';\nimport type {ReplicaState, ReplicaStateNotifier} from './replicator.ts';\n\n/**\n * Handles the semantics of {@link ReplicatorVersionNotifier.subscribe()}\n * notifications, namely:\n *\n * * New subscribers are notified immediately with the latest received\n *   ReplicaState.\n *\n * * Non-latest notifications are discarded if the subscriber is too\n *   busy to consume them.\n *\n * By encapsulating the state for the first behavior (essentially, whether\n * the first notification has been sent by the Replicator), Notifier objects\n * can be chained to simplify fanout from Replicator to View Syncers.\n *\n * In particular, each Syncer Thread can manage a single Subscription to\n * the Replicator across a MessageChannel, which it uses for its own Notifier\n * instance to manage subscriptions from View Syncers within its thread. This\n * way a Replicator only deals with sending notifications to a bounded set\n * of MessageChannel-based subscribers (Syncer Threads), while the dynamic\n * subscribe and unsubscribe traffic from View Syncers remains within each\n * Syncer Thread.\n */\nexport class Notifier implements ReplicaStateNotifier {\n  readonly #eventEmitter = new EventEmitter();\n  #lastStateReceived: ReplicaState | undefined;\n\n  #newSubscription() {\n    const notify = (state: ReplicaState) => subscription.push(state);\n    const subscription = Subscription.create<ReplicaState>({\n      coalesce: curr => curr,\n      cleanup: () => this.#eventEmitter.off('version', notify),\n    });\n    return {notify, subscription};\n  }\n\n  subscribe(): Subscription<ReplicaState> {\n    const {notify, subscription} = this.#newSubscription();\n    this.#eventEmitter.on('version', notify);\n    if (this.#lastStateReceived) {\n      // Per Replicator.subscribe() semantics, the current state of the\n      // replica, if known, is immediately sent on subscribe.\n      notify(this.#lastStateReceived);\n    }\n    return subscription;\n  }\n\n  notifySubscribers(\n    state: ReplicaState = {state: 'version-ready'},\n  ): Promise<Result>[] {\n    this.#lastStateReceived = state;\n    return this.#eventEmitter\n      .listeners('version')\n      .map(notify => notify(state) as unknown as PendingResult)\n      .map(pending => pending.result);\n  }\n}\n"],"names":[],"mappings":";;AA8BO,MAAM,SAAyC;AAAA,EAC3C,gBAAgB,IAAI,aAAA;AAAA,EAC7B;AAAA,EAEA,mBAAmB;AACjB,UAAM,SAAS,CAAC,UAAwB,aAAa,KAAK,KAAK;AAC/D,UAAM,eAAe,aAAa,OAAqB;AAAA,MACrD,UAAU,CAAA,SAAQ;AAAA,MAClB,SAAS,MAAM,KAAK,cAAc,IAAI,WAAW,MAAM;AAAA,IAAA,CACxD;AACD,WAAO,EAAC,QAAQ,aAAA;AAAA,EAClB;AAAA,EAEA,YAAwC;AACtC,UAAM,EAAC,QAAQ,iBAAgB,KAAK,iBAAA;AACpC,SAAK,cAAc,GAAG,WAAW,MAAM;AACvC,QAAI,KAAK,oBAAoB;AAG3B,aAAO,KAAK,kBAAkB;AAAA,IAChC;AACA,WAAO;AAAA,EACT;AAAA,EAEA,kBACE,QAAsB,EAAC,OAAO,mBACX;AACnB,SAAK,qBAAqB;AAC1B,WAAO,KAAK,cACT,UAAU,SAAS,EACnB,IAAI,CAAA,WAAU,OAAO,KAAK,CAA6B,EACvD,IAAI,CAAA,YAAW,QAAQ,MAAM;AAAA,EAClC;AACF;"}
+{"version":3,"file":"notifier.js","names":["#eventEmitter","#newSubscription","#lastStateReceived"],"sources":["../../../../../../zero-cache/src/services/replicator/notifier.ts"],"sourcesContent":["import {EventEmitter} from 'eventemitter3';\nimport {\n  type PendingResult,\n  type Result,\n  Subscription,\n} from '../../types/subscription.ts';\nimport type {ReplicaState, ReplicaStateNotifier} from './replicator.ts';\n\n/**\n * Handles the semantics of {@link ReplicatorVersionNotifier.subscribe()}\n * notifications, namely:\n *\n * * New subscribers are notified immediately with the latest received\n *   ReplicaState.\n *\n * * Non-latest notifications are discarded if the subscriber is too\n *   busy to consume them.\n *\n * By encapsulating the state for the first behavior (essentially, whether\n * the first notification has been sent by the Replicator), Notifier objects\n * can be chained to simplify fanout from Replicator to View Syncers.\n *\n * In particular, each Syncer Thread can manage a single Subscription to\n * the Replicator across a MessageChannel, which it uses for its own Notifier\n * instance to manage subscriptions from View Syncers within its thread. This\n * way a Replicator only deals with sending notifications to a bounded set\n * of MessageChannel-based subscribers (Syncer Threads), while the dynamic\n * subscribe and unsubscribe traffic from View Syncers remains within each\n * Syncer Thread.\n */\nexport class Notifier implements ReplicaStateNotifier {\n  readonly #eventEmitter = new EventEmitter();\n  #lastStateReceived: ReplicaState | undefined;\n\n  #newSubscription() {\n    const notify = (state: ReplicaState) => subscription.push(state);\n    const subscription = Subscription.create<ReplicaState>({\n      coalesce: curr => curr,\n      cleanup: () => this.#eventEmitter.off('version', notify),\n    });\n    return {notify, subscription};\n  }\n\n  subscribe(): Subscription<ReplicaState> {\n    const {notify, subscription} = this.#newSubscription();\n    this.#eventEmitter.on('version', notify);\n    if (this.#lastStateReceived) {\n      // Per Replicator.subscribe() semantics, the current state of the\n      // replica, if known, is immediately sent on subscribe.\n      notify(this.#lastStateReceived);\n    }\n    return subscription;\n  }\n\n  notifySubscribers(\n    state: ReplicaState = {state: 'version-ready'},\n  ): Promise<Result>[] {\n    this.#lastStateReceived = state;\n    return this.#eventEmitter\n      .listeners('version')\n      .map(notify => notify(state) as unknown as PendingResult)\n      .map(pending => pending.result);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,IAAa,WAAb,MAAsD;CACpD,gBAAyB,IAAI,cAAc;CAC3C;CAEA,mBAAmB;EACjB,MAAM,UAAU,UAAwB,aAAa,KAAK,MAAM;EAChE,MAAM,eAAe,aAAa,OAAqB;GACrD,WAAU,SAAQ;GAClB,eAAe,MAAA,aAAmB,IAAI,WAAW,OAAO;GACzD,CAAC;AACF,SAAO;GAAC;GAAQ;GAAa;;CAG/B,YAAwC;EACtC,MAAM,EAAC,QAAQ,iBAAgB,MAAA,iBAAuB;AACtD,QAAA,aAAmB,GAAG,WAAW,OAAO;AACxC,MAAI,MAAA,kBAGF,QAAO,MAAA,kBAAwB;AAEjC,SAAO;;CAGT,kBACE,QAAsB,EAAC,OAAO,iBAAgB,EAC3B;AACnB,QAAA,oBAA0B;AAC1B,SAAO,MAAA,aACJ,UAAU,UAAU,CACpB,KAAI,WAAU,OAAO,MAAM,CAA6B,CACxD,KAAI,YAAW,QAAQ,OAAO"}

package/out/zero-cache/src/services/replicator/replication-status.js

@@ -1,141 +1,118 @@
-import { createSilentLogContext } from "../../../../shared/src/logging-test-utils.js";
-import { listIndexes, computeZqlSpecs } from "../../db/lite-tables.js";
+import { computeZqlSpecs, listIndexes } from "../../db/lite-tables.js";
 import { makeErrorDetails, publishCriticalEvent } from "../../observability/events.js";
-const byKeys = (a, b) => a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0;
-class ReplicationStatusPublisher {
-  #db;
-  #publish;
-  #timer;
-  constructor(db, publishFn = publishCriticalEvent) {
-    this.#db = db;
-    this.#publish = publishFn;
-  }
-  publish(lc, stage, description, interval = 0, extraState, now = /* @__PURE__ */ new Date()) {
-    this.stop();
-    const event = replicationStatusEvent(
-      lc,
-      this.#db,
-      stage,
-      "OK",
-      description,
-      now
-    );
-    if (event.state) {
-      event.state = {
-        ...event.state,
-        ...extraState?.()
-      };
-    }
-    void this.#publish(lc, event);
-    if (interval) {
-      this.#timer = setInterval(
-        () => this.publish(lc, stage, description, interval, extraState),
-        interval
-      );
-    }
-    return this;
-  }
-  async publishAndThrowError(lc, stage, e) {
-    this.stop();
-    const event = replicationStatusError(lc, stage, e, this.#db);
-    await this.#publish(lc, event);
-    throw e;
-  }
-  stop() {
-    clearInterval(this.#timer);
-    return this;
-  }
-}
+import { createSilentLogContext } from "../../../../shared/src/logging-test-utils.js";
+//#region ../zero-cache/src/services/replicator/replication-status.ts
+var byKeys = (a, b) => a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0;
+var ReplicationStatusPublisher = class {
+	#db;
+	#publish;
+	#timer;
+	constructor(db, publishFn = publishCriticalEvent) {
+		this.#db = db;
+		this.#publish = publishFn;
+	}
+	publish(lc, stage, description, interval = 0, extraState, now = /* @__PURE__ */ new Date()) {
+		this.stop();
+		const event = replicationStatusEvent(lc, this.#db, stage, "OK", description, now);
+		if (event.state) event.state = {
+			...event.state,
+			...extraState?.()
+		};
+		this.#publish(lc, event);
+		if (interval) this.#timer = setInterval(() => this.publish(lc, stage, description, interval, extraState), interval);
+		return this;
+	}
+	async publishAndThrowError(lc, stage, e) {
+		this.stop();
+		const event = replicationStatusError(lc, stage, e, this.#db);
+		await this.#publish(lc, event);
+		throw e;
+	}
+	stop() {
+		clearInterval(this.#timer);
+		return this;
+	}
+};
 async function publishReplicationError(lc, stage, description, errorDetails, now = /* @__PURE__ */ new Date()) {
-  const event = {
-    type: "zero/events/status/replication/v1",
-    component: "replication",
-    status: "ERROR",
-    stage,
-    description,
-    errorDetails,
-    time: now.toISOString()
-  };
-  await publishCriticalEvent(lc, event);
+	await publishCriticalEvent(lc, {
+		type: "zero/events/status/replication/v1",
+		component: "replication",
+		status: "ERROR",
+		stage,
+		description,
+		errorDetails,
+		time: now.toISOString()
+	});
 }
 function replicationStatusError(lc, stage, e, db, now = /* @__PURE__ */ new Date()) {
-  const event = replicationStatusEvent(lc, db, stage, "ERROR", String(e), now);
-  event.errorDetails = makeErrorDetails(e);
-  return event;
+	const event = replicationStatusEvent(lc, db, stage, "ERROR", String(e), now);
+	event.errorDetails = makeErrorDetails(e);
+	return event;
 }
 function replicationStatusEvent(lc, db, stage, status, description, now = /* @__PURE__ */ new Date()) {
-  const start = performance.now();
-  try {
-    return {
-      type: "zero/events/status/replication/v1",
-      component: "replication",
-      status,
-      stage,
-      description,
-      time: now.toISOString(),
-      state: {
-        tables: db ? getReplicatedTables(db) : [],
-        indexes: db ? getReplicatedIndexes(db) : [],
-        replicaSize: db ? getReplicaSize(db) : void 0
-      }
-    };
-  } catch (e) {
-    lc.warn?.(`Unable to create full ReplicationStatusEvent`, e);
-    return {
-      type: "zero/events/status/replication/v1",
-      component: "replication",
-      status,
-      stage,
-      description,
-      time: now.toISOString(),
-      state: {
-        tables: [],
-        indexes: [],
-        replicaSize: 0
-      }
-    };
-  } finally {
-    const elapsed = (performance.now() - start).toFixed(3);
-    lc.debug?.(`computed schema for replication event (${elapsed} ms)`);
-  }
+	const start = performance.now();
+	try {
+		return {
+			type: "zero/events/status/replication/v1",
+			component: "replication",
+			status,
+			stage,
+			description,
+			time: now.toISOString(),
+			state: {
+				tables: db ? getReplicatedTables(db) : [],
+				indexes: db ? getReplicatedIndexes(db) : [],
+				replicaSize: db ? getReplicaSize(db) : void 0
+			}
+		};
+	} catch (e) {
+		lc.warn?.(`Unable to create full ReplicationStatusEvent`, e);
+		return {
+			type: "zero/events/status/replication/v1",
+			component: "replication",
+			status,
+			stage,
+			description,
+			time: now.toISOString(),
+			state: {
+				tables: [],
+				indexes: [],
+				replicaSize: 0
+			}
+		};
+	} finally {
+		const elapsed = (performance.now() - start).toFixed(3);
+		lc.debug?.(`computed schema for replication event (${elapsed} ms)`);
+	}
 }
 function getReplicatedTables(db) {
-  const fullTables = /* @__PURE__ */ new Map();
-  const clientSchema = computeZqlSpecs(
-    createSilentLogContext(),
-    // avoid logging warnings about indexes
-    db,
-    { includeBackfillingColumns: false },
-    /* @__PURE__ */ new Map(),
-    fullTables
-  );
-  return [...fullTables.entries()].sort(byKeys).map(([table, spec]) => ({
-    table,
-    columns: Object.entries(spec.columns).sort(byKeys).map(([column, spec2]) => ({
-      column,
-      upstreamType: spec2.dataType.split("|")[0],
-      clientType: clientSchema.get(table)?.zqlSpec[column]?.type ?? null
-    }))
-  }));
+	const fullTables = /* @__PURE__ */ new Map();
+	const clientSchema = computeZqlSpecs(createSilentLogContext(), db, { includeBackfillingColumns: false }, /* @__PURE__ */ new Map(), fullTables);
+	return [...fullTables.entries()].sort(byKeys).map(([table, spec]) => ({
+		table,
+		columns: Object.entries(spec.columns).sort(byKeys).map(([column, spec]) => ({
+			column,
+			upstreamType: spec.dataType.split("|")[0],
+			clientType: clientSchema.get(table)?.zqlSpec[column]?.type ?? null
+		}))
+	}));
 }
 function getReplicatedIndexes(db) {
-  return listIndexes(db).map(({ tableName: table, columns, unique }) => ({
-    table,
-    unique,
-    columns: Object.entries(columns).sort(byKeys).map(([column, dir]) => ({ column, dir }))
-  }));
+	return listIndexes(db).map(({ tableName: table, columns, unique }) => ({
+		table,
+		unique,
+		columns: Object.entries(columns).sort(byKeys).map(([column, dir]) => ({
+			column,
+			dir
+		}))
+	}));
 }
 function getReplicaSize(db) {
-  const [{ page_count: pageCount }] = db.pragma(
-    "page_count"
-  );
-  const [{ page_size: pageSize }] = db.pragma("page_size");
-  return pageCount * pageSize;
+	const [{ page_count: pageCount }] = db.pragma("page_count");
+	const [{ page_size: pageSize }] = db.pragma("page_size");
+	return pageCount * pageSize;
 }
-export {
-  ReplicationStatusPublisher,
-  publishReplicationError,
-  replicationStatusError,
-  replicationStatusEvent
-};
-//# sourceMappingURL=replication-status.js.map
+//#endregion
+export { ReplicationStatusPublisher, publishReplicationError, replicationStatusError };
+
+//# sourceMappingURL=replication-status.js.map

package/out/zero-cache/src/services/replicator/replication-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"replication-status.js","sources":["../../../../../../zero-cache/src/services/replicator/replication-status.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {createSilentLogContext} from '../../../../shared/src/logging-test-utils.ts';\nimport type {JSONObject} from '../../../../zero-events/src/json.ts';\nimport type {\n  ReplicatedIndex,\n  ReplicatedTable,\n  ReplicationStage,\n  ReplicationState,\n  ReplicationStatusEvent,\n  Status,\n} from '../../../../zero-events/src/status.ts';\nimport type {Database} from '../../../../zqlite/src/db.ts';\nimport {computeZqlSpecs, listIndexes} from '../../db/lite-tables.ts';\nimport type {LiteTableSpec} from '../../db/specs.ts';\nimport {\n  makeErrorDetails,\n  publishCriticalEvent,\n} from '../../observability/events.ts';\n\nconst byKeys = (a: [string, unknown], b: [string, unknown]) =>\n  a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0;\n\nexport class ReplicationStatusPublisher {\n  readonly #db: Database;\n  readonly #publish: typeof publishCriticalEvent;\n  #timer: NodeJS.Timeout | undefined;\n\n  constructor(db: Database, publishFn = publishCriticalEvent) {\n    this.#db = db;\n    this.#publish = publishFn;\n  }\n\n  publish(\n    lc: LogContext,\n    stage: ReplicationStage,\n    description?: string,\n    interval = 0,\n    extraState?: () => Partial<ReplicationState>,\n    now = new Date(),\n  ): this {\n    this.stop();\n    const event = replicationStatusEvent(\n      lc,\n      this.#db,\n      stage,\n      'OK',\n      description,\n      now,\n    );\n    if (event.state) {\n      event.state = {\n        ...event.state,\n        ...extraState?.(),\n      };\n    }\n    void this.#publish(lc, event);\n\n    if (interval) {\n      this.#timer = setInterval(\n        () => this.publish(lc, stage, description, interval, extraState),\n        interval,\n      );\n    }\n    return this;\n  }\n\n  async publishAndThrowError(\n    lc: LogContext,\n    stage: ReplicationStage,\n    e: unknown,\n  ): Promise<never> {\n    this.stop();\n    const event = replicationStatusError(lc, stage, e, this.#db);\n    await this.#publish(lc, event);\n    throw e;\n  }\n\n  stop(): this {\n    clearInterval(this.#timer);\n    return this;\n  }\n}\n\nexport async function publishReplicationError(\n  lc: LogContext,\n  stage: ReplicationStage,\n  description: string,\n  errorDetails?: JSONObject,\n  now = new Date(),\n) {\n  const event: ReplicationStatusEvent = {\n    type: 'zero/events/status/replication/v1',\n    component: 'replication',\n    status: 'ERROR',\n    stage,\n    description,\n    errorDetails,\n    time: now.toISOString(),\n  };\n  await publishCriticalEvent(lc, event);\n}\n\nexport function replicationStatusError(\n  lc: LogContext,\n  stage: ReplicationStage,\n  e: unknown,\n  db?: Database,\n  now = new Date(),\n) {\n  const event = replicationStatusEvent(lc, db, stage, 'ERROR', String(e), now);\n  event.errorDetails = makeErrorDetails(e);\n  return event;\n}\n\n// Exported for testing.\nexport function replicationStatusEvent(\n  lc: LogContext,\n  db: Database | undefined,\n  stage: ReplicationStage,\n  status: Status,\n  description?: string,\n  now = new Date(),\n): ReplicationStatusEvent {\n  const start = performance.now();\n  try {\n    return {\n      type: 'zero/events/status/replication/v1',\n      component: 'replication',\n      status,\n      stage,\n      description,\n      time: now.toISOString(),\n      state: {\n        tables: db ? getReplicatedTables(db) : [],\n        indexes: db ? getReplicatedIndexes(db) : [],\n        replicaSize: db ? getReplicaSize(db) : undefined,\n      },\n    };\n  } catch (e) {\n    lc.warn?.(`Unable to create full ReplicationStatusEvent`, e);\n    return {\n      type: 'zero/events/status/replication/v1',\n      component: 'replication',\n      status,\n      stage,\n      description,\n      time: now.toISOString(),\n      state: {\n        tables: [],\n        indexes: [],\n        replicaSize: 0,\n      },\n    };\n  } finally {\n    const elapsed = (performance.now() - start).toFixed(3);\n    lc.debug?.(`computed schema for replication event (${elapsed} ms)`);\n  }\n}\n\nfunction getReplicatedTables(db: Database): ReplicatedTable[] {\n  const fullTables = new Map<string, LiteTableSpec>();\n  const clientSchema = computeZqlSpecs(\n    createSilentLogContext(), // avoid logging warnings about indexes\n    db,\n    {includeBackfillingColumns: false},\n    new Map(),\n    fullTables,\n  );\n\n  return [...fullTables.entries()].sort(byKeys).map(([table, spec]) => ({\n    table,\n    columns: Object.entries(spec.columns)\n      .sort(byKeys)\n      .map(([column, spec]) => ({\n        column,\n        upstreamType: spec.dataType.split('|')[0],\n        clientType: clientSchema.get(table)?.zqlSpec[column]?.type ?? null,\n      })),\n  }));\n}\n\nfunction getReplicatedIndexes(db: Database): ReplicatedIndex[] {\n  return listIndexes(db).map(({tableName: table, columns, unique}) => ({\n    table,\n    unique,\n    columns: Object.entries(columns)\n      .sort(byKeys)\n      .map(([column, dir]) => ({column, dir})),\n  }));\n}\n\nfunction getReplicaSize(db: Database) {\n  const [{page_count: pageCount}] = db.pragma<{page_count: number}>(\n    'page_count',\n  );\n  const [{page_size: pageSize}] = db.pragma<{page_size: number}>('page_size');\n  return pageCount * pageSize;\n}\n"],"names":["spec"],"mappings":"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"}
+{"version":3,"file":"replication-status.js","names":["#db","#publish","#timer"],"sources":["../../../../../../zero-cache/src/services/replicator/replication-status.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {createSilentLogContext} from '../../../../shared/src/logging-test-utils.ts';\nimport type {JSONObject} from '../../../../zero-events/src/json.ts';\nimport type {\n  ReplicatedIndex,\n  ReplicatedTable,\n  ReplicationStage,\n  ReplicationState,\n  ReplicationStatusEvent,\n  Status,\n} from '../../../../zero-events/src/status.ts';\nimport type {Database} from '../../../../zqlite/src/db.ts';\nimport {computeZqlSpecs, listIndexes} from '../../db/lite-tables.ts';\nimport type {LiteTableSpec} from '../../db/specs.ts';\nimport {\n  makeErrorDetails,\n  publishCriticalEvent,\n} from '../../observability/events.ts';\n\nconst byKeys = (a: [string, unknown], b: [string, unknown]) =>\n  a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0;\n\nexport class ReplicationStatusPublisher {\n  readonly #db: Database;\n  readonly #publish: typeof publishCriticalEvent;\n  #timer: NodeJS.Timeout | undefined;\n\n  constructor(db: Database, publishFn = publishCriticalEvent) {\n    this.#db = db;\n    this.#publish = publishFn;\n  }\n\n  publish(\n    lc: LogContext,\n    stage: ReplicationStage,\n    description?: string,\n    interval = 0,\n    extraState?: () => Partial<ReplicationState>,\n    now = new Date(),\n  ): this {\n    this.stop();\n    const event = replicationStatusEvent(\n      lc,\n      this.#db,\n      stage,\n      'OK',\n      description,\n      now,\n    );\n    if (event.state) {\n      event.state = {\n        ...event.state,\n        ...extraState?.(),\n      };\n    }\n    void this.#publish(lc, event);\n\n    if (interval) {\n      this.#timer = setInterval(\n        () => this.publish(lc, stage, description, interval, extraState),\n        interval,\n      );\n    }\n    return this;\n  }\n\n  async publishAndThrowError(\n    lc: LogContext,\n    stage: ReplicationStage,\n    e: unknown,\n  ): Promise<never> {\n    this.stop();\n    const event = replicationStatusError(lc, stage, e, this.#db);\n    await this.#publish(lc, event);\n    throw e;\n  }\n\n  stop(): this {\n    clearInterval(this.#timer);\n    return this;\n  }\n}\n\nexport async function publishReplicationError(\n  lc: LogContext,\n  stage: ReplicationStage,\n  description: string,\n  errorDetails?: JSONObject,\n  now = new Date(),\n) {\n  const event: ReplicationStatusEvent = {\n    type: 'zero/events/status/replication/v1',\n    component: 'replication',\n    status: 'ERROR',\n    stage,\n    description,\n    errorDetails,\n    time: now.toISOString(),\n  };\n  await publishCriticalEvent(lc, event);\n}\n\nexport function replicationStatusError(\n  lc: LogContext,\n  stage: ReplicationStage,\n  e: unknown,\n  db?: Database,\n  now = new Date(),\n) {\n  const event = replicationStatusEvent(lc, db, stage, 'ERROR', String(e), now);\n  event.errorDetails = makeErrorDetails(e);\n  return event;\n}\n\n// Exported for testing.\nexport function replicationStatusEvent(\n  lc: LogContext,\n  db: Database | undefined,\n  stage: ReplicationStage,\n  status: Status,\n  description?: string,\n  now = new Date(),\n): ReplicationStatusEvent {\n  const start = performance.now();\n  try {\n    return {\n      type: 'zero/events/status/replication/v1',\n      component: 'replication',\n      status,\n      stage,\n      description,\n      time: now.toISOString(),\n      state: {\n        tables: db ? getReplicatedTables(db) : [],\n        indexes: db ? getReplicatedIndexes(db) : [],\n        replicaSize: db ? getReplicaSize(db) : undefined,\n      },\n    };\n  } catch (e) {\n    lc.warn?.(`Unable to create full ReplicationStatusEvent`, e);\n    return {\n      type: 'zero/events/status/replication/v1',\n      component: 'replication',\n      status,\n      stage,\n      description,\n      time: now.toISOString(),\n      state: {\n        tables: [],\n        indexes: [],\n        replicaSize: 0,\n      },\n    };\n  } finally {\n    const elapsed = (performance.now() - start).toFixed(3);\n    lc.debug?.(`computed schema for replication event (${elapsed} ms)`);\n  }\n}\n\nfunction getReplicatedTables(db: Database): ReplicatedTable[] {\n  const fullTables = new Map<string, LiteTableSpec>();\n  const clientSchema = computeZqlSpecs(\n    createSilentLogContext(), // avoid logging warnings about indexes\n    db,\n    {includeBackfillingColumns: false},\n    new Map(),\n    fullTables,\n  );\n\n  return [...fullTables.entries()].sort(byKeys).map(([table, spec]) => ({\n    table,\n    columns: Object.entries(spec.columns)\n      .sort(byKeys)\n      .map(([column, spec]) => ({\n        column,\n        upstreamType: spec.dataType.split('|')[0],\n        clientType: clientSchema.get(table)?.zqlSpec[column]?.type ?? null,\n      })),\n  }));\n}\n\nfunction getReplicatedIndexes(db: Database): ReplicatedIndex[] {\n  return listIndexes(db).map(({tableName: table, columns, unique}) => ({\n    table,\n    unique,\n    columns: Object.entries(columns)\n      .sort(byKeys)\n      .map(([column, dir]) => ({column, dir})),\n  }));\n}\n\nfunction getReplicaSize(db: Database) {\n  const [{page_count: pageCount}] = db.pragma<{page_count: number}>(\n    'page_count',\n  );\n  const [{page_size: pageSize}] = db.pragma<{page_size: number}>('page_size');\n  return pageCount * pageSize;\n}\n"],"mappings":"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"}

package/out/zero-cache/src/services/replicator/replicator.d.ts

@@ -4,6 +4,7 @@ import type { Database } from '../../../../zqlite/src/db.ts';
 import type { Source } from '../../types/streams.ts';
 import type { ChangeStreamer } from '../change-streamer/change-streamer.ts';
 import type { Service } from '../service.ts';
+import type { WriteWorkerClient } from './write-worker-client.ts';
 /** See {@link ReplicaStateNotifier.subscribe()}. */
 export type ReplicaState = {
     readonly state: 'version-ready';
@@ -45,7 +46,7 @@ export type ReplicatorMode = 'backup' | 'serving';
 export declare class ReplicatorService implements Replicator, Service {
     #private;
     readonly id: string;
-    constructor(lc: LogContext, taskID: string, id: string, mode: ReplicatorMode, changeStreamer: ChangeStreamer, replica: Database, publishReplicationStatus: boolean);
+    constructor(lc: LogContext, taskID: string, id: string, mode: ReplicatorMode, changeStreamer: ChangeStreamer, statusDb: Database, worker: WriteWorkerClient, publishReplicationStatus: boolean);
     status(): Promise<{
         status: string;
     }>;

package/out/zero-cache/src/services/replicator/replicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/replicator/replicator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAEvE,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAG3C,oDAAoD;AACpD,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAIhC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,SAAS,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD;;;;OAIG;IACH,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACvC;AAED,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,SAAS,CAAC;AAElD,qBAAa,iBAAkB,YAAW,UAAU,EAAE,OAAO;;IAC3D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAKlB,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,QAAQ,EACjB,wBAAwB,EAAE,OAAO;IAiBnC,MAAM;;;IAIN,GAAG;IAIH,SAAS,IAAI,MAAM,CAAC,YAAY,CAAC;IAIjC,IAAI;CAIL"}
+{"version":3,"file":"replicator.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/replicator/replicator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,8BAA8B,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAEhE,oDAAoD;AACpD,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAIhC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,SAAS,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD;;;;OAIG;IACH,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACvC;AAED,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,SAAS,CAAC;AAElD,qBAAa,iBAAkB,YAAW,UAAU,EAAE,OAAO;;IAC3D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;gBAOlB,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,cAAc,EACpB,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,iBAAiB,EACzB,wBAAwB,EAAE,OAAO;IAmBnC,MAAM;;;IAIN,GAAG;IAKH,SAAS,IAAI,MAAM,CAAC,YAAY,CAAC;IAI3B,IAAI;CAQX"}

package/out/zero-cache/src/services/replicator/replicator.js

@@ -1,36 +1,34 @@
-import { promiseVoid } from "../../../../shared/src/resolved-promises.js";
 import { IncrementalSyncer } from "./incremental-sync.js";
-class ReplicatorService {
-  id;
-  #lc;
-  #incrementalSyncer;
-  constructor(lc, taskID, id, mode, changeStreamer, replica, publishReplicationStatus) {
-    this.id = id;
-    this.#lc = lc.withContext("component", "replicator").withContext("serviceID", this.id);
-    this.#incrementalSyncer = new IncrementalSyncer(
-      taskID,
-      `${taskID}/${id}`,
-      changeStreamer,
-      replica,
-      mode,
-      publishReplicationStatus
-    );
-  }
-  status() {
-    return Promise.resolve({ status: "ok" });
-  }
-  run() {
-    return this.#incrementalSyncer.run(this.#lc);
-  }
-  subscribe() {
-    return this.#incrementalSyncer.subscribe();
-  }
-  stop() {
-    this.#incrementalSyncer.stop(this.#lc);
-    return promiseVoid;
-  }
-}
-export {
-  ReplicatorService
+//#region ../zero-cache/src/services/replicator/replicator.ts
+var ReplicatorService = class {
+	id;
+	#lc;
+	#incrementalSyncer;
+	#worker;
+	#runPromise;
+	constructor(lc, taskID, id, mode, changeStreamer, statusDb, worker, publishReplicationStatus) {
+		this.id = id;
+		this.#lc = lc.withContext("component", "replicator").withContext("serviceID", this.id);
+		this.#worker = worker;
+		this.#incrementalSyncer = new IncrementalSyncer(taskID, `${taskID}/${id}`, changeStreamer, statusDb, worker, mode, publishReplicationStatus);
+	}
+	status() {
+		return Promise.resolve({ status: "ok" });
+	}
+	run() {
+		this.#runPromise = this.#incrementalSyncer.run(this.#lc);
+		return this.#runPromise;
+	}
+	subscribe() {
+		return this.#incrementalSyncer.subscribe();
+	}
+	async stop() {
+		this.#incrementalSyncer.stop(this.#lc);
+		await this.#runPromise;
+		await this.#worker.stop();
+	}
 };
-//# sourceMappingURL=replicator.js.map
+//#endregion
+export { ReplicatorService };
+
+//# sourceMappingURL=replicator.js.map

package/out/zero-cache/src/services/replicator/replicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"replicator.js","sources":["../../../../../../zero-cache/src/services/replicator/replicator.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {ReadonlyJSONObject} from '../../../../shared/src/json.ts';\nimport {promiseVoid} from '../../../../shared/src/resolved-promises.ts';\nimport type {Database} from '../../../../zqlite/src/db.ts';\nimport type {Source} from '../../types/streams.ts';\nimport type {ChangeStreamer} from '../change-streamer/change-streamer.ts';\nimport type {Service} from '../service.ts';\nimport {IncrementalSyncer} from './incremental-sync.ts';\n\n/** See {@link ReplicaStateNotifier.subscribe()}. */\nexport type ReplicaState = {\n  readonly state: 'version-ready';\n\n  // Used in tests to verify behavior when additional information\n  // is ferried in the future. Not set in production.\n  readonly testSeqNum?: number;\n};\n\nexport interface ReplicaStateNotifier {\n  /**\n   * Creates a cancelable subscription of changes in the replica state.\n   *\n   * A `version-ready` message indicates that the replica is ready to be\n   * read, and henceforth that a _new_ version is ready, i.e. whenever a\n   * change is committed to the replica. The `version-ready` message itself\n   * otherwise contains no other information; the subscriber queries the\n   * replica for the current data.\n   *\n   * A `maintenance` state indicates that the replica should not be read from.\n   * If a subscriber is holding any transaction locks, it should release them\n   * until the next `version-ready` signal.\n   *\n   * Upon subscription, the current state of the replica is sent immediately\n   * if known. If multiple notifications occur before the subscriber\n   * can consume them, all but the last notification are discarded by the\n   * Subscription object (i.e. not buffered). Thus, a subscriber only\n   * ever consumes the current (i.e. known) state of the replica. This avoids\n   * a buildup of \"work\" if a subscriber is too busy to consume all\n   * notifications.\n   */\n  subscribe(): Source<ReplicaState>;\n}\n\nexport interface Replicator extends ReplicaStateNotifier {\n  /**\n   * Returns an opaque message for human-readable consumption. This is\n   * purely for ensuring that the Replicator has started at least once to\n   * bootstrap a new replica.\n   */\n  status(): Promise<ReadonlyJSONObject>;\n}\n\nexport type ReplicatorMode = 'backup' | 'serving';\n\nexport class ReplicatorService implements Replicator, Service {\n  readonly id: string;\n  readonly #lc: LogContext;\n  readonly #incrementalSyncer: IncrementalSyncer;\n\n  constructor(\n    lc: LogContext,\n    taskID: string,\n    id: string,\n    mode: ReplicatorMode,\n    changeStreamer: ChangeStreamer,\n    replica: Database,\n    publishReplicationStatus: boolean,\n  ) {\n    this.id = id;\n    this.#lc = lc\n      .withContext('component', 'replicator')\n      .withContext('serviceID', this.id);\n\n    this.#incrementalSyncer = new IncrementalSyncer(\n      taskID,\n      `${taskID}/${id}`,\n      changeStreamer,\n      replica,\n      mode,\n      publishReplicationStatus,\n    );\n  }\n\n  status() {\n    return Promise.resolve({status: 'ok'});\n  }\n\n  run() {\n    return this.#incrementalSyncer.run(this.#lc);\n  }\n\n  subscribe(): Source<ReplicaState> {\n    return this.#incrementalSyncer.subscribe();\n  }\n\n  stop() {\n    this.#incrementalSyncer.stop(this.#lc);\n    return promiseVoid;\n  }\n}\n"],"names":[],"mappings":";;AAsDO,MAAM,kBAAiD;AAAA,EACnD;AAAA,EACA;AAAA,EACA;AAAA,EAET,YACE,IACA,QACA,IACA,MACA,gBACA,SACA,0BACA;AACA,SAAK,KAAK;AACV,SAAK,MAAM,GACR,YAAY,aAAa,YAAY,EACrC,YAAY,aAAa,KAAK,EAAE;AAEnC,SAAK,qBAAqB,IAAI;AAAA,MAC5B;AAAA,MACA,GAAG,MAAM,IAAI,EAAE;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AAAA,EAEA,SAAS;AACP,WAAO,QAAQ,QAAQ,EAAC,QAAQ,MAAK;AAAA,EACvC;AAAA,EAEA,MAAM;AACJ,WAAO,KAAK,mBAAmB,IAAI,KAAK,GAAG;AAAA,EAC7C;AAAA,EAEA,YAAkC;AAChC,WAAO,KAAK,mBAAmB,UAAA;AAAA,EACjC;AAAA,EAEA,OAAO;AACL,SAAK,mBAAmB,KAAK,KAAK,GAAG;AACrC,WAAO;AAAA,EACT;AACF;"}
+{"version":3,"file":"replicator.js","names":["#lc","#incrementalSyncer","#worker","#runPromise"],"sources":["../../../../../../zero-cache/src/services/replicator/replicator.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {ReadonlyJSONObject} from '../../../../shared/src/json.ts';\nimport type {Database} from '../../../../zqlite/src/db.ts';\nimport type {Source} from '../../types/streams.ts';\nimport type {ChangeStreamer} from '../change-streamer/change-streamer.ts';\nimport type {Service} from '../service.ts';\nimport {IncrementalSyncer} from './incremental-sync.ts';\nimport type {WriteWorkerClient} from './write-worker-client.ts';\n\n/** See {@link ReplicaStateNotifier.subscribe()}. */\nexport type ReplicaState = {\n  readonly state: 'version-ready';\n\n  // Used in tests to verify behavior when additional information\n  // is ferried in the future. Not set in production.\n  readonly testSeqNum?: number;\n};\n\nexport interface ReplicaStateNotifier {\n  /**\n   * Creates a cancelable subscription of changes in the replica state.\n   *\n   * A `version-ready` message indicates that the replica is ready to be\n   * read, and henceforth that a _new_ version is ready, i.e. whenever a\n   * change is committed to the replica. The `version-ready` message itself\n   * otherwise contains no other information; the subscriber queries the\n   * replica for the current data.\n   *\n   * A `maintenance` state indicates that the replica should not be read from.\n   * If a subscriber is holding any transaction locks, it should release them\n   * until the next `version-ready` signal.\n   *\n   * Upon subscription, the current state of the replica is sent immediately\n   * if known. If multiple notifications occur before the subscriber\n   * can consume them, all but the last notification are discarded by the\n   * Subscription object (i.e. not buffered). Thus, a subscriber only\n   * ever consumes the current (i.e. known) state of the replica. This avoids\n   * a buildup of \"work\" if a subscriber is too busy to consume all\n   * notifications.\n   */\n  subscribe(): Source<ReplicaState>;\n}\n\nexport interface Replicator extends ReplicaStateNotifier {\n  /**\n   * Returns an opaque message for human-readable consumption. This is\n   * purely for ensuring that the Replicator has started at least once to\n   * bootstrap a new replica.\n   */\n  status(): Promise<ReadonlyJSONObject>;\n}\n\nexport type ReplicatorMode = 'backup' | 'serving';\n\nexport class ReplicatorService implements Replicator, Service {\n  readonly id: string;\n  readonly #lc: LogContext;\n  readonly #incrementalSyncer: IncrementalSyncer;\n  readonly #worker: WriteWorkerClient;\n  #runPromise: Promise<void> | undefined;\n\n  constructor(\n    lc: LogContext,\n    taskID: string,\n    id: string,\n    mode: ReplicatorMode,\n    changeStreamer: ChangeStreamer,\n    statusDb: Database,\n    worker: WriteWorkerClient,\n    publishReplicationStatus: boolean,\n  ) {\n    this.id = id;\n    this.#lc = lc\n      .withContext('component', 'replicator')\n      .withContext('serviceID', this.id);\n    this.#worker = worker;\n\n    this.#incrementalSyncer = new IncrementalSyncer(\n      taskID,\n      `${taskID}/${id}`,\n      changeStreamer,\n      statusDb,\n      worker,\n      mode,\n      publishReplicationStatus,\n    );\n  }\n\n  status() {\n    return Promise.resolve({status: 'ok'});\n  }\n\n  run() {\n    this.#runPromise = this.#incrementalSyncer.run(this.#lc);\n    return this.#runPromise;\n  }\n\n  subscribe(): Source<ReplicaState> {\n    return this.#incrementalSyncer.subscribe();\n  }\n\n  async stop() {\n    this.#incrementalSyncer.stop(this.#lc);\n    // Wait for the syncer's run loop to finish so that any in-flight\n    // worker.processMessage() call completes and clears #pending\n    // before we send the 'stop' message to the worker.\n    await this.#runPromise;\n    await this.#worker.stop();\n  }\n}\n"],"mappings":";;AAsDA,IAAa,oBAAb,MAA8D;CAC5D;CACA;CACA;CACA;CACA;CAEA,YACE,IACA,QACA,IACA,MACA,gBACA,UACA,QACA,0BACA;AACA,OAAK,KAAK;AACV,QAAA,KAAW,GACR,YAAY,aAAa,aAAa,CACtC,YAAY,aAAa,KAAK,GAAG;AACpC,QAAA,SAAe;AAEf,QAAA,oBAA0B,IAAI,kBAC5B,QACA,GAAG,OAAO,GAAG,MACb,gBACA,UACA,QACA,MACA,yBACD;;CAGH,SAAS;AACP,SAAO,QAAQ,QAAQ,EAAC,QAAQ,MAAK,CAAC;;CAGxC,MAAM;AACJ,QAAA,aAAmB,MAAA,kBAAwB,IAAI,MAAA,GAAS;AACxD,SAAO,MAAA;;CAGT,YAAkC;AAChC,SAAO,MAAA,kBAAwB,WAAW;;CAG5C,MAAM,OAAO;AACX,QAAA,kBAAwB,KAAK,MAAA,GAAS;AAItC,QAAM,MAAA;AACN,QAAM,MAAA,OAAa,MAAM"}