@rocicorp/zero 0.21.2025062101 → 0.21.2025062400

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 (86) hide show
  1. package/out/{chunk-Q6J6FSMO.js → chunk-CDC3FKYC.js} +2 -2
  2. package/out/{chunk-YUXLTO6E.js → chunk-T6YUETW7.js} +2 -2
  3. package/out/react.js +1 -1
  4. package/out/{zero-cache/src/types → shared/src}/bigint-json.d.ts +1 -1
  5. package/out/shared/src/bigint-json.d.ts.map +1 -0
  6. package/out/{zero-cache/src/types → shared/src}/bigint-json.js +1 -1
  7. package/out/shared/src/bigint-json.js.map +1 -0
  8. package/out/shared/src/logging.d.ts +12 -0
  9. package/out/shared/src/logging.d.ts.map +1 -0
  10. package/out/shared/src/logging.js +63 -0
  11. package/out/shared/src/logging.js.map +1 -0
  12. package/out/solid.js +2 -2
  13. package/out/z2s/src/compiler.js +1 -1
  14. package/out/z2s/src/compiler.js.map +1 -1
  15. package/out/zero/src/zero-cache-dev.js +16 -30
  16. package/out/zero/src/zero-cache-dev.js.map +1 -1
  17. package/out/zero-cache/src/db/transaction-pool.js +1 -1
  18. package/out/zero-cache/src/db/transaction-pool.js.map +1 -1
  19. package/out/zero-cache/src/scripts/deploy-permissions.js +3 -3
  20. package/out/zero-cache/src/scripts/deploy-permissions.js.map +1 -1
  21. package/out/zero-cache/src/server/logging.d.ts +2 -6
  22. package/out/zero-cache/src/server/logging.d.ts.map +1 -1
  23. package/out/zero-cache/src/server/logging.js +9 -52
  24. package/out/zero-cache/src/server/logging.js.map +1 -1
  25. package/out/zero-cache/src/server/otel-log-sink.js +2 -2
  26. package/out/zero-cache/src/server/otel-log-sink.js.map +1 -1
  27. package/out/zero-cache/src/services/change-source/custom/change-source.js +1 -1
  28. package/out/zero-cache/src/services/change-source/custom/change-source.js.map +1 -1
  29. package/out/zero-cache/src/services/change-source/pg/change-source.js +1 -1
  30. package/out/zero-cache/src/services/change-source/pg/change-source.js.map +1 -1
  31. package/out/zero-cache/src/services/change-source/protocol/current/data.d.ts +10 -10
  32. package/out/zero-cache/src/services/change-source/protocol/current/data.d.ts.map +1 -1
  33. package/out/zero-cache/src/services/change-source/protocol/current/data.js +1 -1
  34. package/out/zero-cache/src/services/change-source/protocol/current/data.js.map +1 -1
  35. package/out/zero-cache/src/services/change-source/protocol/current/downstream.d.ts +12 -12
  36. package/out/zero-cache/src/services/change-streamer/change-streamer.d.ts +4 -4
  37. package/out/zero-cache/src/services/change-streamer/storer.js +1 -1
  38. package/out/zero-cache/src/services/change-streamer/storer.js.map +1 -1
  39. package/out/zero-cache/src/services/replicator/change-processor.js +1 -1
  40. package/out/zero-cache/src/services/replicator/change-processor.js.map +1 -1
  41. package/out/zero-cache/src/services/replicator/schema/change-log.d.ts +1 -1
  42. package/out/zero-cache/src/services/replicator/schema/change-log.js +1 -1
  43. package/out/zero-cache/src/services/replicator/schema/change-log.js.map +1 -1
  44. package/out/zero-cache/src/services/statz.js +1 -1
  45. package/out/zero-cache/src/services/statz.js.map +1 -1
  46. package/out/zero-cache/src/services/view-syncer/client-handler.d.ts +1 -1
  47. package/out/zero-cache/src/services/view-syncer/client-handler.d.ts.map +1 -1
  48. package/out/zero-cache/src/services/view-syncer/cvr.d.ts +1 -1
  49. package/out/zero-cache/src/services/view-syncer/cvr.d.ts.map +1 -1
  50. package/out/zero-cache/src/services/view-syncer/cvr.js +1 -1
  51. package/out/zero-cache/src/services/view-syncer/cvr.js.map +1 -1
  52. package/out/zero-cache/src/services/view-syncer/key-columns.d.ts +1 -1
  53. package/out/zero-cache/src/services/view-syncer/key-columns.d.ts.map +1 -1
  54. package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts +1 -1
  55. package/out/zero-cache/src/services/view-syncer/schema/cvr.d.ts.map +1 -1
  56. package/out/zero-cache/src/services/view-syncer/schema/cvr.js +1 -1
  57. package/out/zero-cache/src/services/view-syncer/schema/cvr.js.map +1 -1
  58. package/out/zero-cache/src/services/view-syncer/schema/types.d.ts +6 -6
  59. package/out/zero-cache/src/services/view-syncer/schema/types.js +1 -1
  60. package/out/zero-cache/src/services/view-syncer/schema/types.js.map +1 -1
  61. package/out/zero-cache/src/services/view-syncer/snapshotter.d.ts +1 -1
  62. package/out/zero-cache/src/services/view-syncer/snapshotter.d.ts.map +1 -1
  63. package/out/zero-cache/src/services/view-syncer/snapshotter.js +1 -1
  64. package/out/zero-cache/src/services/view-syncer/snapshotter.js.map +1 -1
  65. package/out/zero-cache/src/services/view-syncer/view-syncer.js +1 -1
  66. package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
  67. package/out/zero-cache/src/types/lite.js +1 -1
  68. package/out/zero-cache/src/types/lite.js.map +1 -1
  69. package/out/zero-cache/src/types/pg.d.ts +3 -3
  70. package/out/zero-cache/src/types/pg.d.ts.map +1 -1
  71. package/out/zero-cache/src/types/pg.js +1 -1
  72. package/out/zero-cache/src/types/pg.js.map +1 -1
  73. package/out/zero-cache/src/types/row-key.d.ts +1 -1
  74. package/out/zero-cache/src/types/row-key.d.ts.map +1 -1
  75. package/out/zero-cache/src/types/row-key.js +1 -1
  76. package/out/zero-cache/src/types/row-key.js.map +1 -1
  77. package/out/zero-cache/src/types/streams.d.ts +1 -1
  78. package/out/zero-cache/src/types/streams.d.ts.map +1 -1
  79. package/out/zero-cache/src/types/streams.js +1 -1
  80. package/out/zero-cache/src/types/streams.js.map +1 -1
  81. package/out/zero.js +2 -2
  82. package/package.json +1 -1
  83. package/out/zero-cache/src/types/bigint-json.d.ts.map +0 -1
  84. package/out/zero-cache/src/types/bigint-json.js.map +0 -1
  85. /package/out/{chunk-Q6J6FSMO.js.map → chunk-CDC3FKYC.js.map} +0 -0
  86. /package/out/{chunk-YUXLTO6E.js.map → chunk-T6YUETW7.js.map} +0 -0
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  clientToServer
3
- } from "./chunk-YUXLTO6E.js";
3
+ } from "./chunk-T6YUETW7.js";
4
4
  import {
5
5
  AbstractQuery,
6
6
  ExpressionBuilder,
@@ -337,4 +337,4 @@ export {
337
337
  querify,
338
338
  namedQuery
339
339
  };
340
- //# sourceMappingURL=chunk-Q6J6FSMO.js.map
340
+ //# sourceMappingURL=chunk-CDC3FKYC.js.map
@@ -8328,7 +8328,7 @@ function makeMessage(message, context, logLevel) {
8328
8328
  }
8329
8329
 
8330
8330
  // ../zero-client/src/client/version.ts
8331
- var version2 = "0.21.2025062101";
8331
+ var version2 = "0.21.2025062400";
8332
8332
 
8333
8333
  // ../zero-client/src/client/log-options.ts
8334
8334
  var LevelFilterLogSink = class {
@@ -11013,4 +11013,4 @@ export {
11013
11013
  update_needed_reason_type_enum_exports,
11014
11014
  Zero
11015
11015
  };
11016
- //# sourceMappingURL=chunk-YUXLTO6E.js.map
11016
+ //# sourceMappingURL=chunk-T6YUETW7.js.map
package/out/react.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  Zero
3
- } from "./chunk-YUXLTO6E.js";
3
+ } from "./chunk-T6YUETW7.js";
4
4
  import {
5
5
  DEFAULT_TTL,
6
6
  hasOwn
@@ -1,4 +1,4 @@
1
- import * as v from '../../../shared/src/valita.ts';
1
+ import * as v from './valita.ts';
2
2
  export type JSONValue = null | string | number | bigint | boolean | readonly JSONValue[] | JSONObject;
3
3
  export type JSONObject = {
4
4
  readonly [prop: string]: JSONValue | undefined;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bigint-json.d.ts","sourceRoot":"","sources":["../../../../shared/src/bigint-json.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,CAAC,MAAM,aAAa,CAAC;AAWjC,MAAM,MAAM,SAAS,GACjB,IAAI,GACJ,MAAM,GACN,MAAM,GACN,MAAM,GACN,OAAO,GACP,SAAS,SAAS,EAAE,GACpB,UAAU,CAAC;AAEf,MAAM,MAAM,UAAU,GAAG;IAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;CAAC,CAAC;AAE1E,eAAO,MAAM,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAY5C,CAAC;AAEH,eAAO,MAAM,gBAAgB,6CAAwC,CAAC;AAEtE;;;GAGG;AACH,wBAAgB,KAAK,CACnB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,KAAK,OAAO,GAC3C,SAAS,CAEX;AAOD;;;;;;;GAOG;AACH,wBAAgB,SAAS,CACvB,GAAG,EAAE,OAAO,EACZ,QAAQ,CAAC,EACL,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,GAC1C,IAAI,EACR,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,UAGzB;AAGD,eAAO,MAAM,UAAU;;;CAGb,CAAC"}
@@ -4,7 +4,7 @@
4
4
  * https://neon.tech/blog/parsing-json-from-postgres-in-js
5
5
  */
6
6
  import { parse as customParse, stringify as customStringify, } from 'json-custom-numbers';
7
- import * as v from "../../../shared/src/valita.js";
7
+ import * as v from "./valita.js";
8
8
  function numberParser(_, v) {
9
9
  const n = +v;
10
10
  if (n >= Number.MIN_SAFE_INTEGER && n <= Number.MAX_SAFE_INTEGER)
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bigint-json.js","sourceRoot":"","sources":["../../../../shared/src/bigint-json.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EACL,KAAK,IAAI,WAAW,EACpB,SAAS,IAAI,eAAe,GAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,CAAC,MAAM,aAAa,CAAC;AAEjC,SAAS,YAAY,CAAC,CAAU,EAAE,CAAS;IACzC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACb,IAAI,CAAC,IAAI,MAAM,CAAC,gBAAgB,IAAI,CAAC,IAAI,MAAM,CAAC,gBAAgB;QAAE,OAAO,CAAC,CAAC;IAC3E,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzE,OAAO,CAAC,CAAC;IACX,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAcD,MAAM,CAAC,MAAM,eAAe,GAAsB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IAC5D,MAAM,gBAAgB,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;IAE/D,OAAO,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,IAAI,EAAE,EACR,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,OAAO,EAAE,EACX,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,EACpC,gBAAgB,CACjB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;AAEtE;;;GAGG;AACH,MAAM,UAAU,KAAK,CACnB,GAAW,EACX,OAA4C;IAE5C,OAAO,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;AACjD,CAAC;AAED,8DAA8D;AAC9D,SAAS,gBAAgB,CAAC,CAAS,EAAE,CAAM,EAAE,IAAY;IACvD,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC7C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CACvB,GAAY,EACZ,QAGQ,EACR,MAAwB;IAExB,OAAO,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAClE,CAAC;AAED,gEAAgE;AAChE,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,KAAK;IACL,SAAS;CACD,CAAC"}
@@ -0,0 +1,12 @@
1
+ import { FormatLogger, type LogLevel, type LogSink, LogContext } from '@rocicorp/logger';
2
+ export type LogConfig = {
3
+ level: LogLevel;
4
+ format: 'text' | 'json';
5
+ };
6
+ export declare const consoleSink: FormatLogger<unknown[], unknown[], unknown[], unknown[]>;
7
+ export declare function getLogSink(config: LogConfig): LogSink;
8
+ export declare function createLogContext({ log }: {
9
+ log: LogConfig;
10
+ }, context?: {}, sink?: LogSink<unknown[], unknown[], unknown[], unknown[]>): LogContext;
11
+ export declare function errorOrObject(v: unknown): object | undefined;
12
+ //# sourceMappingURL=logging.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../shared/src/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,KAAK,QAAQ,EACb,KAAK,OAAO,EAEZ,UAAU,EACX,MAAM,kBAAkB,CAAC;AAK1B,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,QAAQ,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB,CAAC;AASF,eAAO,MAAM,WAAW,0DAKtB,CAAC;AAEH,wBAAgB,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAErD;AAED,wBAAgB,gBAAgB,CAC9B,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,SAAS,CAAA;CAAC,EACvB,OAAO,KAAK,EACZ,IAAI,sDAAkB,GACrB,UAAU,CAOZ;AA6BD,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAc5D"}
@@ -0,0 +1,63 @@
1
+ import { FormatLogger, logLevelPrefix, LogContext, } from '@rocicorp/logger';
2
+ import { stringify } from "./bigint-json.js";
3
+ import chalk from 'chalk';
4
+ import { pid } from 'node:process';
5
+ const colors = {
6
+ debug: chalk.grey,
7
+ info: chalk.whiteBright,
8
+ warn: chalk.yellow,
9
+ error: chalk.red,
10
+ };
11
+ export const consoleSink = new FormatLogger((level, ...args) => [
12
+ colors[level](logLevelPrefix[level], ...args.map(s => (typeof s === 'string' ? s : stringify(s)))),
13
+ ]);
14
+ export function getLogSink(config) {
15
+ return config.format === 'json' ? consoleJsonLogSink : consoleSink;
16
+ }
17
+ export function createLogContext({ log }, context = {}, sink = getLogSink(log)) {
18
+ const ctx = { pid, ...context };
19
+ const lc = new LogContext(log.level, ctx, sink);
20
+ // Emit a blank line to absorb random ANSI control code garbage that
21
+ // for some reason gets prepended to the first log line in CloudWatch.
22
+ lc.info?.('');
23
+ return lc;
24
+ }
25
+ const consoleJsonLogSink = {
26
+ log(level, context, ...args) {
27
+ // If the last arg is an object or an Error, combine those fields into the message.
28
+ const lastObj = errorOrObject(args.at(-1));
29
+ if (lastObj) {
30
+ args.pop();
31
+ }
32
+ const message = args.length
33
+ ? {
34
+ message: args
35
+ .map(s => (typeof s === 'string' ? s : stringify(s)))
36
+ .join(' '),
37
+ }
38
+ : undefined;
39
+ // eslint-disable-next-line no-console
40
+ console[level](stringify({
41
+ level: level.toUpperCase(),
42
+ ...context,
43
+ ...lastObj,
44
+ ...message,
45
+ }));
46
+ },
47
+ };
48
+ export function errorOrObject(v) {
49
+ if (v instanceof Error) {
50
+ return {
51
+ ...v, // some properties of Error subclasses may be enumerable
52
+ name: v.name,
53
+ errorMsg: v.message,
54
+ stack: v.stack,
55
+ ...('cause' in v ? { cause: errorOrObject(v.cause) } : null),
56
+ };
57
+ }
58
+ if (v && typeof v === 'object') {
59
+ return v;
60
+ }
61
+ return undefined;
62
+ }
63
+ //# sourceMappingURL=logging.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../shared/src/logging.ts"],"names":[],"mappings":"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"}
package/out/solid.js CHANGED
@@ -1,7 +1,7 @@
1
- import "./chunk-Q6J6FSMO.js";
1
+ import "./chunk-CDC3FKYC.js";
2
2
  import {
3
3
  Zero
4
- } from "./chunk-YUXLTO6E.js";
4
+ } from "./chunk-T6YUETW7.js";
5
5
  import {
6
6
  DEFAULT_TTL,
7
7
  applyChange,
@@ -3,7 +3,7 @@ import { assert, unreachable } from "../../shared/src/asserts.js";
3
3
  import { hasOwn } from "../../shared/src/has-own.js";
4
4
  import {} from "../../shared/src/json.js";
5
5
  import { must } from "../../shared/src/must.js";
6
- import { parse as parseBigIntJson, } from "../../zero-cache/src/types/bigint-json.js";
6
+ import { parse as parseBigIntJson, } from "../../shared/src/bigint-json.js";
7
7
  import { pgToZqlStringTypeMap } from "../../zero-cache/src/types/pg.js";
8
8
  import { clientToServer, } from "../../zero-schema/src/name-mapper.js";
9
9
  import { sql, sqlConvertColumnArg, sqlConvertPluralLiteralArg, sqlConvertSingularLiteralArg, Z2S_COLLATION, } from "./sql.js";
@@ -1 +1 @@
1
- {"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAE,GAAG,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAgB,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,KAAK,IAAI,eAAe,GAEzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,oBAAoB,EAAC,MAAM,kCAAkC,CAAC;AAatE,OAAO,EACL,cAAc,GAEf,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,GAAG,EACH,mBAAmB,EACnB,0BAA0B,EAC1B,4BAA4B,EAC5B,aAAa,GAEd,MAAM,UAAU,CAAC;AAwBlB,MAAM,cAAc,GAAG,YAAY,CAAC;AACpC,MAAM,oBAAoB,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAEvD,MAAM,UAAU,OAAO,CACrB,YAA0B,EAC1B,SAAiB,EACjB,GAAQ,EACR,MAA2B;IAE3B,MAAM,IAAI,GAAS;QACjB,UAAU,EAAE,CAAC;QACb,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC;SACzC;QACD,GAAG,EAAE,SAAS,CAAC,MAAM;KACtB,CAAC;IACF,OAAO,GAAG,CAAA;MACN,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,aAAa,oBAAoB;YAC3D,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,MAAM,CACb,IAAU,EACV,GAAQ,EACR,MAA0B,EAC1B,SAAyD;IAEzD,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAC9C,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,YAAY,CAAC,IAAI,CACf,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;gBACvB,KAAK;gBACL,GAAG,EAAE,MAAM;aACZ,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,SAAS,UAAU,CAAC,IAAyB;QAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,GAAG,CAAA,EAAE,CAAC;QACf,CAAC;QAED,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAA,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA,OAAO,CAAC;QACjD,YAAY,GAAG,IAAI,CAAC;QACpB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,GAAG,CAAA,UAAU,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC;WACtC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC;MAClC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC;MACtD,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,EAAE;MAC7D,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC;MACjC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,KAAK,CACnB,KAAyB,EACzB,QAA6B;IAE7B,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,OAAO,GAAG,CAAA,SAAS,CAAC;IACtB,CAAC;IACD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,GAAG,CAAA,SAAS,CAAC;IACtB,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,GAAG,CAAA,EAAE,CAAC;IACf,CAAC;IACD,OAAO,GAAG,CAAA,SAAS,4BAA4B,CAAC,KAAK,CAAC,EAAE,CAAC;AAC3D,CAAC;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,GAAW,EAAE,KAA0B;IACpE,KAAK,GAAG,KAAK,IAAI,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAC/C,OAAO;QACL,GAAG;QACH,KAAK;KACN,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,OAAO,CACrB,IAAU,EACV,OAA6B,EAC7B,KAAY;IAEZ,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,CAAA,EAAE,CAAC;IACf,CAAC;IACD,OAAO,GAAG,CAAA,YAAY,GAAG,CAAC,IAAI,CAC5B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;QACzB,MAAM,kBAAkB,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACpE,OAAO,GAAG,KAAK,KAAK;YAClB,CAAC,CAAC,2FAA2F;gBAC3F,6GAA6G;gBAC7G,GAAG,CAAA,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;oBAC1B,KAAK;oBACL,GAAG,EAAE,GAAG;iBACT,CAAC,GAAG,YAAY,CAAC,kBAAkB,CAAC,kBAAkB;YACzD,CAAC,CAAC,GAAG,CAAA,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;gBAC1B,KAAK;gBACL,GAAG,EAAE,GAAG;aACT,CAAC,GAAG,YAAY,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;IAC9D,CAAC,CAAC,EACF,IAAI,CACL,EAAE,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,kBAAsC;IAC1D,IAAI,kBAAkB,CAAC,IAAI,KAAK,MAAM,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;QACpE,OAAO,GAAG,CAAA,kBAAkB,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;IACzD,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;QACjE,OAAO,GAAG,CAAA,YAAY,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;IACnD,CAAC;IAED,OAAO,GAAG,CAAA,EAAE,CAAC;AACf,CAAC;AAED,SAAS,OAAO,CACd,IAAU,EACV,aAA4C,EAC5C,MAA0B,EAC1B,WAAkB;IAElB,OAAO,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CACtC,oBAAoB,CAClB,IAAI,EACJ,YAAY,EACZ,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EACxD,WAAW,CACZ,CACF,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAU,EACV,YAAgC,EAChC,MAA0B,EAC1B,WAAkB;IAElB,MAAM,UAAU,GAAG,SAAS,YAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC1D,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,EAAC,IAAI,EAAE,mBAAmB,EAAC,GAAG,gBAAgB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC;QAExD,MAAM,CACJ,YAAY,CAAC,QAAQ,CAAC,OAAO,EAC7B,wCAAwC,CACzC,CAAC;QACF,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC5D,MAAM,YAAY,GAAG,OAAO,CAC1B,IAAI,EACJ,SAAS,CAAC,OAAO,IAAI,EAAE,EACvB,MAAM,EACN,SAAS,CACV,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACtD,YAAY,CAAC,IAAI,CACf,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;gBACvB,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,MAAM;aACZ,CAAC,CACH,CAAC;QACJ,CAAC;QAED,OAAO,GAAG,CAAA;iBACG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,iBAAiB,GAAG,CAAC,IAAI,CACpE,YAAY,EACZ,GAAG,CACJ,SAAS,IAAI,WAAW,cAAc,CACrC,IAAI,EACJ,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC7C,KAAK,EAAE,WAAW;YAClB,GAAG,EAAE,CAAC;SACP,CAAC,CAAC,EACH,YAAY,CAAC,WAAW,CAAC,UAAU,CACpC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAC7B,SAAS,CAAC,KAAK;YACb,CAAC,CAAC,GAAG,CAAA,OAAO,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;YACrD,CAAC,CAAC,GAAG,CAAA,EACT,IAAI,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,KAAK,CACtD,IAAI,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAChC,MAAM,EAAE,QAAQ,CACjB,MAAM,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;aACvB,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACpD,CAAC;IAED,OAAO,GAAG,CAAA;eACG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,MAAM,CAC3D,IAAI,EACJ,YAAY,CAAC,QAAQ,EACrB,MAAM,EACN,cAAc,CACZ,IAAI,EACJ,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7C,KAAK,EAAE,WAAW;QAClB,GAAG,EAAE,CAAC;KACP,CAAC,CAAC,EACH,YAAY,CAAC,WAAW,CAAC,UAAU,CACpC,CACF,KAAK,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC;WACtB,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;AACpD,CAAC;AAED,SAAS,KAAK,CACZ,IAAU,EACV,SAAgC,EAChC,KAAY;IAEZ,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,GAAG,CAAA,EAAE,CAAC;IACf,CAAC;IAED,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,KAAK;YACR,OAAO,GAAG,CAAA,IAAI,GAAG,CAAC,IAAI,CACpB,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EACpD,OAAO,CACR,GAAG,CAAC;QACP,KAAK,IAAI;YACP,OAAO,GAAG,CAAA,IAAI,GAAG,CAAC,IAAI,CACpB,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EACpD,MAAM,CACP,GAAG,CAAC;QACP,KAAK,oBAAoB;YACvB,OAAO,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACxC,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC;AACH,CAAC;AAED,SAAS,MAAM,CACb,IAAU,EACV,SAAsC,EACtC,WAAkB;IAElB,QAAQ,SAAS,CAAC,EAAE,EAAE,CAAC;QACrB,KAAK,QAAQ;YACX,OAAO,GAAG,CAAA,WAAW,MAAM,CACzB,IAAI,EACJ,SAAS,CAAC,OAAO,CAAC,QAAQ,EAC1B,SAAS,EACT,cAAc,CACZ,IAAI,EACJ,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClD,KAAK,EAAE,WAAW;gBAClB,GAAG,EAAE,CAAC;aACP,CAAC,CAAC,EACH,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CACzC,CACF,GAAG,CAAC;QACP,KAAK,YAAY;YACf,OAAO,GAAG,CAAA,eAAe,MAAM,CAC7B,IAAI,EACJ,SAAS,CAAC,OAAO,CAAC,QAAQ,EAC1B,SAAS,EACT,cAAc,CACZ,IAAI,EACJ,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAClD,KAAK,EAAE,WAAW;gBAClB,GAAG,EAAE,CAAC;aACP,CAAC,CAAC,EACH,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CACzC,CACF,GAAG,CAAC;IACT,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,IAAU,EACV,YAAwC,EACxC,cAAiC;IAEjC,OAAO,CAAC,UAAiB,EAAE,EAAE;QAC3B,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAClD,KAAK,EAAE,UAAU;YACjB,GAAG,EAAE,QAAQ;SACd,CAAC,CAAC,CAAC;QACJ,OAAO,GAAG,CAAC,IAAI,CACb,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,GAAG,CAChC,CAAC,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE,EAAE,CAC9B,GAAG,CAAA,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,QAAQ,CACrD,IAAI,CAAC,MAAM,EACX,WAAW,CACZ,EAAE,CACN,EACD,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,MAAM,CACpB,IAAU,EACV,SAA0B,EAC1B,KAAY;IAEZ,QAAQ,SAAS,CAAC,EAAE,EAAE,CAAC;QACrB,KAAK,IAAI,CAAC;QACV,KAAK,GAAG,CAAC;QACT,KAAK,IAAI,CAAC;QACV,KAAK,GAAG,CAAC;QACT,KAAK,GAAG,CAAC;QACT,KAAK,IAAI,CAAC;QACV,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,UAAU;YACb,OAAO,GAAG,CAAA,GAAG,eAAe,CAC1B,IAAI,EACJ,SAAS,CAAC,IAAI,EACd,KAAK,EACL,SAAS,CAAC,KAAK,EACf,KAAK,CACN,IAAI,GAAG,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,eAAe,CAC7D,IAAI,EACJ,SAAS,CAAC,KAAK,EACf,KAAK,EACL,SAAS,CAAC,IAAI,EACd,KAAK,CACN,EAAE,CAAC;QACN,KAAK,QAAQ,CAAC;QACd,KAAK,IAAI;YACP,OAAO,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACrC,KAAK,IAAI,CAAC;QACV,KAAK,QAAQ;YACX,OAAO,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,GAAG,CACjB,IAAU,EACV,SAA0B,EAC1B,KAAY;IAEZ,OAAO,GAAG,CAAA,GAAG,SAAS,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAA,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA,EAAE;;QAEnD,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;SACnE,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC;MACtE,CAAC;AACP,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,IAAU,EACV,SAA0B,EAC1B,KAAY;IAEZ,OAAO,GAAG,CAAA,GAAG,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,IAC/E,SAAS,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAA,sBAAsB,CAAC,CAAC,CAAC,GAAG,CAAA,kBACzD,IAAI,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;AAC7E,CAAC;AAED,SAAS,eAAe,CACtB,IAAU,EACV,QAAuB,EACvB,KAAY,EACZ,aAA4B,EAC5B,MAAe;IAEf,MAAM,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;IACnC,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,kBAAkB,GAAG,eAAe,CACxC,IAAI,CAAC,MAAM,EACX,KAAK,EACL,QAAQ,CAAC,IAAI,CACd,CAAC;YACF,MAAM,SAAS,GAAoB;gBACjC,KAAK;gBACL,GAAG,EAAE,QAAQ,CAAC,IAAI;aACnB,CAAC;YACF,IAAI,kBAAkB,CAAC,IAAI,KAAK,MAAM,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBACpE,OAAO,GAAG,CAAA,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC;YACxD,CAAC;YACD,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC1C,CAAC;QACD,KAAK,SAAS;YACZ,OAAO,sBAAsB,CAC3B,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,aAAa,EACb,MAAM,CACP,CAAC;QACJ,KAAK,QAAQ;YACX,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;QACJ;YACE,WAAW,CAAC,YAAY,CAAC,CAAC;YAC1B,MAAM;IACV,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAU,EACV,QAA0B,EAC1B,KAAY,EACZ,aAA4B,EAC5B,MAAe;IAEf,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC;IACrC,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,mBAAmB,CACxB,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,EACvD,QAAQ,CAAC,KAAK,EACd,MAAM,EACN,IAAI,CACL,CAAC;QACJ,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,uDAAuD;oBACvD,UAAU;oBACV,OAAO,0BAA0B,CAC/B,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAsB,EAC7C,QAAQ,CAAC,KAA4B,CACtC,CAAC;gBACJ,CAAC;gBACD,0DAA0D;gBAC1D,oEAAoE;gBACpE,yBAAyB;gBACzB,IAAI,aAAa,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;oBACjC,OAAO,0BAA0B,CAC/B,OAAO,aAAa,CAAC,KAA0B,EAC/C,EAAE,CACH,CAAC;gBACJ,CAAC;gBACD,iEAAiE;gBACjE,mDAAmD;gBACnD,OAAO,0BAA0B,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClD,CAAC;YACD,IACE,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;gBAClC,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;gBAClC,OAAO,QAAQ,CAAC,KAAK,KAAK,SAAS,EACnC,CAAC;gBACD,OAAO,4BAA4B,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACtD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,+BAA+B,QAAQ,CAAC,KAAK,YAAY,OAAO,QAAQ,CAAC,KAAK,EAAE,CACjF,CAAC;QACJ,CAAC;QACD,KAAK,QAAQ;YACX,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;QACJ;YACE,WAAW,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAU,EACV,YAAgC;IAKhC,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACtE,MAAM,KAAK,GAAe,EAAE,CAAC;IAE7B,KAAK,MAAM,EAAC,KAAK,EAAC,IAAI,mBAAmB,EAAE,CAAC;QAC1C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;YAC1C,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CACR,GAAG,CAAA,SAAS,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,cAAc,CAC5D,IAAI,EACJ,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAClE,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK;YAClD,GAAG,EAAE,CAAC;SACP,CAAC,CAAC,EACH,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,UAAU,CACzD,CAAC,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,CAC7C,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,GAAG,CAAA,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE;QACjC,mBAAmB;QACnB,wEAAwE;QACxE,wEAAwE;KACzE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,IAAU,EACV,YAAgC;IAShC,MAAM,CACJ,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,EAC3C,6CAA6C,CAC9C,CAAC;IACF,MAAM,iBAAiB,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3D,MAAM,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO;QACL;YACE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;YACnD,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK;SACnC;QACD;YACE,KAAK,EAAE,SAAS,CAAC,IAAI,EAAE,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC;YACxD,WAAW,EAAE,iBAAiB,CAAC,WAAW;YAC1C,KAAK,EAAE,iBAAiB,CAAC,QAAQ,CAAC,KAAK;SACxC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,KAAa,EAAE,QAAQ,GAAG,KAAK;IAC7C,OAAO,GAAG,CAAA,GACR,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAA,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA,mBACxB,gBAAgB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAA,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA,eAAe,EAAE,CAAC;AAC/E,CAAC;AAED,SAAS,WAAW,CAAC,MAAkB,EAAE,MAAuB;IAC9D,MAAM,kBAAkB,GACtB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CACtD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CACvD,CAAC;IACJ,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC3C,IACE,CAAC,kBAAkB,CAAC,MAAM;QAC1B,CAAC,UAAU,KAAK,MAAM;YACpB,UAAU,KAAK,WAAW;YAC1B,UAAU,KAAK,6BAA6B;YAC5C,UAAU,KAAK,aAAa;YAC5B,UAAU,KAAK,0BAA0B,CAAC,EAC5C,CAAC;QACD,IAAI,kBAAkB,CAAC,OAAO,EAAE,CAAC;YAC/B,yDAAyD;YACzD,OAAO,GAAG,CAAA,0CAA0C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACvH,CAAC;QACD,OAAO,GAAG,CAAA,sBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IACjG,CAAC;IACD,OAAO,GAAG,CAAA,GAAG,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;AACtE,CAAC;AAED,SAAS,QAAQ,CAAC,MAAkB,EAAE,MAAuB;IAC3D,OAAO,GAAG,CAAC,KAAK,CACd,MAAM,CAAC,KAAK,CAAC,KAAK,EAClB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,MAAkB,EAAE,KAAY;IACjD,OAAO,GAAG,CAAA,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;AAC5F,CAAC;AAED,SAAS,eAAe,CAAC,IAAgB,EAAE,KAAY,EAAE,SAAiB;IACxE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAClD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,gBAAgB,CAAC,QAAoB;IACnD,MAAM,UAAU,GAAoB,eAAe,CACjD,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAC5B,CAAC;IACF,eAAe,CAAC,UAAU,CAAC,CAAC;IAC5B,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,eAAe,CAAC,CAAkB;IACzC,MAAM,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAkB;IAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC;IACzB,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,EAAE,CAAC;QACnB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAClC,MAAM,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpC,IAAI,IAAI,EAAE,CAAC;wBACT,OAAO,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;oBACzB,CAAC;gBACH,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,MAAM,CAAC,GAAG,CAAoC,CAAC;YAC/C,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClB,IAAI,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;oBACjB,MAAM,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpC,IAAI,IAAI,EAAE,CAAC;wBACT,OAAO,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC3B,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC;QACnB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC"}
@@ -2,12 +2,12 @@
2
2
  /* eslint-disable no-console */
3
3
  import "../../shared/src/dotenv.js";
4
4
  import { resolver } from '@rocicorp/resolver';
5
- import chalk from 'chalk';
6
5
  import { watch } from 'chokidar';
7
6
  import { spawn } from 'node:child_process';
8
7
  import { parseOptionsAdvanced } from "../../shared/src/options.js";
9
8
  import { ZERO_ENV_VAR_PREFIX, zeroOptions, } from "../../zero-cache/src/config/zero-config.js";
10
9
  import { deployPermissionsOptions } from "../../zero-cache/src/scripts/permissions.js";
10
+ import { createLogContext } from "../../shared/src/logging.js";
11
11
  const deployPermissionsScript = 'zero-deploy-permissions';
12
12
  const zeroCacheScript = 'zero-cache';
13
13
  function killProcess(childProcess) {
@@ -21,20 +21,17 @@ function killProcess(childProcess) {
21
21
  childProcess.kill('SIGQUIT');
22
22
  return promise;
23
23
  }
24
- function log(msg) {
25
- console.log(chalk.green('> ' + msg));
26
- }
27
- function logWarn(msg) {
28
- console.log(chalk.yellow('> ' + msg));
29
- }
30
- function logError(msg) {
31
- console.error(chalk.red('> ' + msg));
32
- }
33
24
  async function main() {
34
25
  const { config } = parseOptionsAdvanced({
35
26
  ...deployPermissionsOptions,
36
27
  ...zeroOptions,
37
28
  }, process.argv.slice(2), ZERO_ENV_VAR_PREFIX, false, true);
29
+ const lc = createLogContext(config);
30
+ process.on('unhandledRejection', reason => {
31
+ lc.error?.('Unexpected unhandled rejection.', reason);
32
+ lc.error?.('Exiting');
33
+ process.exit(-1);
34
+ });
38
35
  const { unknown: zeroCacheArgs } = parseOptionsAdvanced(deployPermissionsOptions, process.argv.slice(2), ZERO_ENV_VAR_PREFIX, true);
39
36
  const { unknown: deployPermissionsArgs } = parseOptionsAdvanced(zeroOptions, process.argv.slice(2), ZERO_ENV_VAR_PREFIX, true);
40
37
  const { path } = config.schema;
@@ -47,13 +44,13 @@ async function main() {
47
44
  });
48
45
  async function deployPermissions() {
49
46
  if (config.upstream.type !== 'pg') {
50
- logWarn(`Skipping permissions deployment for ${config.upstream.type} upstream`);
47
+ lc.warn?.(`Skipping permissions deployment for ${config.upstream.type} upstream`);
51
48
  return true;
52
49
  }
53
50
  permissionsProcess?.removeAllListeners('exit');
54
51
  await killProcess(permissionsProcess);
55
52
  permissionsProcess = undefined;
56
- log(`Running ${deployPermissionsScript}.`);
53
+ lc.info?.(`Running ${deployPermissionsScript}.`);
57
54
  permissionsProcess = spawn(deployPermissionsScript, deployPermissionsArgs ?? [], {
58
55
  stdio: 'inherit',
59
56
  shell: true,
@@ -61,10 +58,10 @@ async function main() {
61
58
  const { promise: code, resolve } = resolver();
62
59
  permissionsProcess.on('exit', resolve);
63
60
  if ((await code) === 0) {
64
- log(`${deployPermissionsScript} completed successfully.`);
61
+ lc.info?.(`${deployPermissionsScript} completed successfully.`);
65
62
  return true;
66
63
  }
67
- logError(`Failed to deploy permissions from ${path}.`);
64
+ lc.error?.(`Failed to deploy permissions from ${path}.`);
68
65
  return false;
69
66
  }
70
67
  async function deployPermissionsAndStartZeroCache() {
@@ -72,7 +69,7 @@ async function main() {
72
69
  await killProcess(zeroCacheProcess);
73
70
  zeroCacheProcess = undefined;
74
71
  if (await deployPermissions()) {
75
- log(`Running ${zeroCacheScript} at\n\n\thttp://localhost:${config.port}\n`);
72
+ lc.info?.(`Running ${zeroCacheScript} at\n\n\thttp://localhost:${config.port}\n`);
76
73
  const env = {
77
74
  // Set some low defaults so as to use fewer resources and not trip up,
78
75
  // e.g. developers sharing a database.
@@ -83,7 +80,7 @@ async function main() {
83
80
  ...process.env,
84
81
  };
85
82
  if (process.env.OTEL_EXPORTER_OTLP_ENDPOINT) {
86
- log('Starting OpenTelemetry auto instrumentation.');
83
+ lc.info?.('Starting OpenTelemetry auto instrumentation.');
87
84
  env['NODE_OPTIONS'] =
88
85
  (env['NODE_OPTIONS'] || '') +
89
86
  ' --require @opentelemetry/auto-instrumentations-node/register';
@@ -94,7 +91,7 @@ async function main() {
94
91
  shell: true,
95
92
  });
96
93
  zeroCacheProcess.on('exit', () => {
97
- logError(`${zeroCacheScript} exited. Exiting.`);
94
+ lc.error?.(`${zeroCacheScript} exited. Exiting.`);
98
95
  process.exit(-1);
99
96
  });
100
97
  }
@@ -106,23 +103,12 @@ async function main() {
106
103
  awaitWriteFinish: { stabilityThreshold: 500, pollInterval: 100 },
107
104
  });
108
105
  const onFileChange = async () => {
109
- log(`Detected ${path} change.`);
106
+ lc.info?.(`Detected ${path} change.`);
110
107
  await deployPermissions();
111
108
  };
112
109
  watcher.on('add', onFileChange);
113
110
  watcher.on('change', onFileChange);
114
111
  watcher.on('unlink', onFileChange);
115
112
  }
116
- process.on('unhandledRejection', reason => {
117
- logError('Unexpected unhandled rejection.');
118
- console.error(reason);
119
- logError('Exiting');
120
- process.exit(-1);
121
- });
122
- main().catch(e => {
123
- logError(`Unexpected unhandled error.`);
124
- console.error(e);
125
- logError('Exiting.');
126
- process.exit(-1);
127
- });
113
+ void main();
128
114
  //# sourceMappingURL=zero-cache-dev.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"zero-cache-dev.js","sourceRoot":"","sources":["../../../src/zero-cache-dev.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zero-cache-dev.js","sourceRoot":"","sources":["../../../src/zero-cache-dev.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { resolver } from '@rocicorp/resolver';
2
2
  import { assert } from "../../../shared/src/asserts.js";
3
3
  import { Queue } from "../../../shared/src/queue.js";
4
4
  import { promiseVoid } from "../../../shared/src/resolved-promises.js";
5
- import { stringify } from "../types/bigint-json.js";
5
+ import { stringify } from "../../../shared/src/bigint-json.js";
6
6
  import * as Mode from "./mode-enum.js";
7
7
  /**
8
8
  * A TransactionPool is a pool of one or more {@link postgres.TransactionSql}
@@ -1 +1 @@
1
- {"version":3,"file":"transaction-pool.js","sourceRoot":"","sources":["../../../../../zero-cache/src/db/transaction-pool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"transaction-pool.js","sourceRoot":"","sources":["../../../../../zero-cache/src/db/transaction-pool.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,4 @@
1
1
  import "../../../shared/src/dotenv.js";
2
- import { consoleLogSink, LogContext } from '@rocicorp/logger';
3
2
  import { writeFile } from 'node:fs/promises';
4
3
  import { ident as id, literal } from 'pg-format';
5
4
  import { parseOptions } from "../../../shared/src/options.js";
@@ -14,10 +13,11 @@ import { liteTableName } from "../types/names.js";
14
13
  import { pgClient } from "../types/pg.js";
15
14
  import { appSchema, getShardID, upstreamSchema } from "../types/shards.js";
16
15
  import { deployPermissionsOptions, loadSchemaAndPermissions, } from "./permissions.js";
16
+ import { createLogContext } from "../../../shared/src/logging.js";
17
17
  const config = parseOptions(deployPermissionsOptions, process.argv.slice(2), ZERO_ENV_VAR_PREFIX);
18
18
  const shard = getShardID(config);
19
19
  const app = appSchema(shard);
20
- const lc = new LogContext(config.log.level, {}, consoleLogSink);
20
+ const lc = createLogContext(config);
21
21
  async function validatePermissions(db, permissions) {
22
22
  const schema = upstreamSchema(shard);
23
23
  // Check if the shardConfig table has been initialized.
@@ -121,7 +121,7 @@ async function writePermissionsFile(perms, file, format) {
121
121
  const ret = await loadSchemaAndPermissions(lc, config.schema.path, true);
122
122
  if (!ret) {
123
123
  lc.warn?.(`No schema found at ${config.schema.path}, so could not deploy ` +
124
- `permissions. Replicating data, but no tables will be syncable.` +
124
+ `permissions. Replicating data, but no tables will be syncable. ` +
125
125
  `Create a schema file with permissions to be able to sync data.`);
126
126
  }
127
127
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"deploy-permissions.js","sourceRoot":"","sources":["../../../../../zero-cache/src/scripts/deploy-permissions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy-permissions.js","sourceRoot":"","sources":["../../../../../zero-cache/src/scripts/deploy-permissions.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,8 @@
1
- import { LogContext, type LogLevel } from '@rocicorp/logger';
2
- export type LogConfig = {
3
- level: LogLevel;
4
- format: 'text' | 'json';
5
- };
1
+ import { LogContext } from '@rocicorp/logger';
2
+ import { type LogConfig } from '../../../shared/src/logging.ts';
6
3
  export declare function createLogContext({ log }: {
7
4
  log: LogConfig;
8
5
  }, context: {
9
6
  worker: string;
10
7
  }): LogContext;
11
- export declare function errorOrObject(v: unknown): object | undefined;
12
8
  //# sourceMappingURL=logging.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAGV,KAAK,QAAQ,EAEd,MAAM,kBAAkB,CAAC;AAK1B,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,QAAQ,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB,CAAC;AAYF,wBAAgB,gBAAgB,CAC9B,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,SAAS,CAAA;CAAC,EACvB,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GACxB,UAAU,CAOZ;AA2CD,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAc5D"}
1
+ {"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIX,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,gCAAgC,CAAC;AAE1E,wBAAgB,gBAAgB,CAC9B,EAAC,GAAG,EAAC,EAAE;IAAC,GAAG,EAAE,SAAS,CAAA;CAAC,EACvB,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GACxB,UAAU,CAEZ"}