alchemy 0.20.0 → 0.20.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cloudflare/durable-object-namespace.d.ts +2 -0
- package/lib/cloudflare/durable-object-namespace.d.ts.map +1 -1
- package/lib/cloudflare/durable-object-namespace.js +3 -0
- package/lib/cloudflare/durable-object-namespace.js.map +1 -1
- package/lib/cloudflare/worker-metadata.d.ts.map +1 -1
- package/lib/cloudflare/worker-metadata.js +9 -2
- package/lib/cloudflare/worker-metadata.js.map +1 -1
- package/lib/cloudflare/worker.d.ts +31 -8
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +15 -1
- package/lib/cloudflare/worker.js.map +1 -1
- package/package.json +1 -1
- package/src/cloudflare/durable-object-namespace.ts +10 -0
- package/src/cloudflare/worker-metadata.ts +11 -2
- package/src/cloudflare/worker.ts +59 -11
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Binding } from "./bindings.js";
|
|
1
2
|
/**
|
|
2
3
|
* Properties for creating a Durable Object Namespace
|
|
3
4
|
*/
|
|
@@ -8,6 +9,7 @@ export interface DurableObjectNamespaceInput {
|
|
|
8
9
|
sqlite?: boolean | undefined;
|
|
9
10
|
namespaceId?: string | undefined;
|
|
10
11
|
}
|
|
12
|
+
export declare function isDurableObjectNamespace(binding: Binding): binding is DurableObjectNamespace;
|
|
11
13
|
/**
|
|
12
14
|
* @example
|
|
13
15
|
* // Create a basic Durable Object namespace for stateful chat rooms
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"durable-object-namespace.d.ts","sourceRoot":"","sources":["../../src/cloudflare/durable-object-namespace.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,sBAAsB,CACjC,CAAC,SAAS,GAAG,CAAC,oBAAoB,GAAG,SAAS,GAAG,SAAS,CAC1D,YAAW,2BAA2B;aAcpB,EAAE,EAAE,MAAM;IAZ5B,SAAgB,IAAI,EAAG,0BAA0B,CAAU;IAE3D,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChD,SAAgB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,SAAgB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7C,SAAgB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;gBAGhB,EAAE,EAAE,MAAM,EAC1B,KAAK,EAAE,2BAA2B;CAOrC"}
|
|
1
|
+
{"version":3,"file":"durable-object-namespace.d.ts","sourceRoot":"","sources":["../../src/cloudflare/durable-object-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,OAAO,GACf,OAAO,IAAI,sBAAsB,CAInC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,sBAAsB,CACjC,CAAC,SAAS,GAAG,CAAC,oBAAoB,GAAG,SAAS,GAAG,SAAS,CAC1D,YAAW,2BAA2B;aAcpB,EAAE,EAAE,MAAM;IAZ5B,SAAgB,IAAI,EAAG,0BAA0B,CAAU;IAE3D,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChD,SAAgB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,SAAgB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7C,SAAgB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;gBAGhB,EAAE,EAAE,MAAM,EAC1B,KAAK,EAAE,2BAA2B;CAOrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"durable-object-namespace.js","sourceRoot":"","sources":["../../src/cloudflare/durable-object-namespace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"durable-object-namespace.js","sourceRoot":"","sources":["../../src/cloudflare/durable-object-namespace.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,wBAAwB,CACtC,OAAgB;IAEhB,OAAO,CACL,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,0BAA0B,CAC3E,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,OAAO,sBAAsB;IAgBf;IAZF,IAAI,GAAG,0BAAmC,CAAC;IAC3D,6DAA6D;IAC7C,SAAS,CAAS;IAClB,UAAU,CAAsB;IAChC,WAAW,CAAsB;IACjC,MAAM,CAAuB;IAC7B,WAAW,CAAsB;IAEjD,4BAA4B;IACT,WAAW,CAAI;IAElC,YACkB,EAAU,EAC1B,KAAkC;QADlB,OAAE,GAAF,EAAE,CAAQ;QAG1B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC7B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-metadata.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-metadata.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"worker-metadata.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,9 @@ export async function prepareWorkerMetadata(ctx, oldBindings, props, assetUpload
|
|
|
7
7
|
.flatMap(([_, binding]) => {
|
|
8
8
|
if (binding &&
|
|
9
9
|
typeof binding === "object" &&
|
|
10
|
-
binding.type === "durable_object_namespace"
|
|
10
|
+
binding.type === "durable_object_namespace" &&
|
|
11
|
+
(binding.scriptName === undefined ||
|
|
12
|
+
binding.scriptName === props.workerName)) {
|
|
11
13
|
return [binding.className];
|
|
12
14
|
}
|
|
13
15
|
return [];
|
|
@@ -98,7 +100,12 @@ export async function prepareWorkerMetadata(ctx, oldBindings, props, assetUpload
|
|
|
98
100
|
environment: binding.environment,
|
|
99
101
|
namespace_id: binding.namespaceId,
|
|
100
102
|
});
|
|
101
|
-
|
|
103
|
+
if (binding.scriptName === undefined ||
|
|
104
|
+
// TODO(sam): not sure if Cloudflare Api would like us using `this` worker name here
|
|
105
|
+
binding.scriptName === props.workerName) {
|
|
106
|
+
// we do not need configure class migrations for cross-script bindings
|
|
107
|
+
configureClassMigration(binding, binding.id, binding.className);
|
|
108
|
+
}
|
|
102
109
|
}
|
|
103
110
|
else if (binding.type === "r2_bucket") {
|
|
104
111
|
meta.bindings.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-metadata.js","sourceRoot":"","sources":["../../src/cloudflare/worker-metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAyC,MAAM,eAAe,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAA0B,MAAM,oBAAoB,CAAC;AAsL/E,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,GAAuB,EACvB,WAAiC,EACjC,KAIC,EACD,iBAAqC;IAErC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;SACrD,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;SACzC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE;QACxB,IACE,OAAO;YACP,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,IAAI,KAAK,0BAA0B,
|
|
1
|
+
{"version":3,"file":"worker-metadata.js","sourceRoot":"","sources":["../../src/cloudflare/worker-metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ export interface AssetsConfig {
|
|
|
42
42
|
*/
|
|
43
43
|
serve_directly?: boolean;
|
|
44
44
|
}
|
|
45
|
-
export interface BaseWorkerProps<B extends Bindings =
|
|
45
|
+
export interface BaseWorkerProps<B extends Bindings | undefined = undefined> extends CloudflareApiOptions {
|
|
46
46
|
/**
|
|
47
47
|
* Bundle options when using entryPoint
|
|
48
48
|
*
|
|
@@ -136,18 +136,18 @@ export interface BaseWorkerProps<B extends Bindings = Bindings> extends Cloudfla
|
|
|
136
136
|
*/
|
|
137
137
|
eventSources?: EventSource[];
|
|
138
138
|
}
|
|
139
|
-
export interface InlineWorkerProps<B extends Bindings = Bindings> extends BaseWorkerProps<B> {
|
|
139
|
+
export interface InlineWorkerProps<B extends Bindings | undefined = Bindings> extends BaseWorkerProps<B> {
|
|
140
140
|
script: string;
|
|
141
141
|
entrypoint?: undefined;
|
|
142
142
|
}
|
|
143
|
-
export interface EntrypointWorkerProps<B extends Bindings = Bindings> extends BaseWorkerProps<B> {
|
|
143
|
+
export interface EntrypointWorkerProps<B extends Bindings | undefined = Bindings> extends BaseWorkerProps<B> {
|
|
144
144
|
entrypoint: string;
|
|
145
145
|
script?: undefined;
|
|
146
146
|
}
|
|
147
147
|
/**
|
|
148
148
|
* Properties for creating or updating a Worker
|
|
149
149
|
*/
|
|
150
|
-
export type WorkerProps<B extends Bindings = Bindings> = InlineWorkerProps<B> | EntrypointWorkerProps<B>;
|
|
150
|
+
export type WorkerProps<B extends Bindings | undefined = Bindings> = InlineWorkerProps<B> | EntrypointWorkerProps<B>;
|
|
151
151
|
export type FetchWorkerProps<B extends Bindings = Bindings, E extends EventSource[] = EventSource[]> = Omit<WorkerProps<B>, "entrypoint" | "eventSources"> & {
|
|
152
152
|
/**
|
|
153
153
|
* A function that will be used to fetch the worker script.
|
|
@@ -173,7 +173,7 @@ export declare function isWorker(resource: Resource): resource is Worker<any>;
|
|
|
173
173
|
/**
|
|
174
174
|
* Output returned after Worker creation/update
|
|
175
175
|
*/
|
|
176
|
-
export type Worker<B extends Bindings = Bindings> = Resource<"cloudflare::Worker"> & Omit<WorkerProps<B>, "url" | "script"> & globalThis.Service & {
|
|
176
|
+
export type Worker<B extends Bindings | undefined = Bindings | undefined> = Resource<"cloudflare::Worker"> & Omit<WorkerProps<B>, "url" | "script"> & globalThis.Service & {
|
|
177
177
|
type: "service";
|
|
178
178
|
/**
|
|
179
179
|
* The ID of the worker
|
|
@@ -199,14 +199,14 @@ export type Worker<B extends Bindings = Bindings> = Resource<"cloudflare::Worker
|
|
|
199
199
|
/**
|
|
200
200
|
* The bindings that were created
|
|
201
201
|
*/
|
|
202
|
-
bindings: B
|
|
202
|
+
bindings: B;
|
|
203
203
|
/**
|
|
204
204
|
* Configuration for static assets
|
|
205
205
|
*/
|
|
206
206
|
assets?: AssetsConfig;
|
|
207
|
-
Env: {
|
|
207
|
+
Env: B extends Bindings ? {
|
|
208
208
|
[bindingName in keyof B]: Bound<B[bindingName]>;
|
|
209
|
-
};
|
|
209
|
+
} : undefined;
|
|
210
210
|
/**
|
|
211
211
|
* The compatibility date for the worker
|
|
212
212
|
*/
|
|
@@ -305,6 +305,29 @@ export type Worker<B extends Bindings = Bindings> = Resource<"cloudflare::Worker
|
|
|
305
305
|
* crons: ['* 15 * * *', '0 0 * * *', '0 12 * * MON']
|
|
306
306
|
* })
|
|
307
307
|
*
|
|
308
|
+
* @example
|
|
309
|
+
* // Create cross-script durable object binding where one worker
|
|
310
|
+
* // defines the durable object and another worker accesses it:
|
|
311
|
+
* const dataWorker = await Worker("data-worker", {
|
|
312
|
+
* name: "data-worker",
|
|
313
|
+
* entrypoint: "./src/data.ts",
|
|
314
|
+
* bindings: {
|
|
315
|
+
* // Bind to its own durable object
|
|
316
|
+
* STORAGE: new DurableObjectNamespace("storage", {
|
|
317
|
+
* className: "DataStorage"
|
|
318
|
+
* })
|
|
319
|
+
* }
|
|
320
|
+
* });
|
|
321
|
+
*
|
|
322
|
+
* const apiWorker = await Worker("api-worker", {
|
|
323
|
+
* name: "api-worker",
|
|
324
|
+
* entrypoint: "./src/api.ts",
|
|
325
|
+
* bindings: {
|
|
326
|
+
* // Cross-script binding to the data worker's durable object
|
|
327
|
+
* SHARED_STORAGE: dataWorker.bindings.STORAGE
|
|
328
|
+
* }
|
|
329
|
+
* });
|
|
330
|
+
*
|
|
308
331
|
* @see
|
|
309
332
|
* https://developers.cloudflare.com/workers/
|
|
310
333
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAsB,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAU5E,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAE1B,MAAM,UAAU,CAAC;AAElB,OAAO,EAAgB,KAAK,QAAQ,EAAQ,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"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"}
|
package/lib/cloudflare/worker.js
CHANGED
|
@@ -14,6 +14,7 @@ import { Json } from "./bindings.js";
|
|
|
14
14
|
import { isBucket } from "./bucket.js";
|
|
15
15
|
import { bundleWorkerScript } from "./bundle/bundle-worker.js";
|
|
16
16
|
import { isD1Database } from "./d1-database.js";
|
|
17
|
+
import { DurableObjectNamespace, isDurableObjectNamespace, } from "./durable-object-namespace.js";
|
|
17
18
|
import { isQueueEventSource, } from "./event-source.js";
|
|
18
19
|
import { isKVNamespace } from "./kv-namespace.js";
|
|
19
20
|
import { isPipeline } from "./pipeline.js";
|
|
@@ -305,6 +306,19 @@ export const _Worker = Resource("cloudflare::Worker", {
|
|
|
305
306
|
}
|
|
306
307
|
}
|
|
307
308
|
const { scriptMetadata, workerUrl, now } = await uploadWorkerScript(props);
|
|
309
|
+
function exportBindings() {
|
|
310
|
+
return Object.fromEntries(Object.entries(props.bindings ?? {}).map(([bindingName, binding]) => [
|
|
311
|
+
bindingName,
|
|
312
|
+
isDurableObjectNamespace(binding) &&
|
|
313
|
+
binding.scriptName === undefined
|
|
314
|
+
? new DurableObjectNamespace(binding.id, {
|
|
315
|
+
...binding,
|
|
316
|
+
// re-export this binding mapping to the host worker (this worker)
|
|
317
|
+
scriptName: workerName,
|
|
318
|
+
})
|
|
319
|
+
: binding,
|
|
320
|
+
]));
|
|
321
|
+
}
|
|
308
322
|
// Construct the output
|
|
309
323
|
return this({
|
|
310
324
|
...props,
|
|
@@ -315,7 +329,7 @@ export const _Worker = Resource("cloudflare::Worker", {
|
|
|
315
329
|
compatibilityDate,
|
|
316
330
|
compatibilityFlags,
|
|
317
331
|
format: props.format || "esm", // Include format in the output
|
|
318
|
-
bindings:
|
|
332
|
+
bindings: exportBindings(),
|
|
319
333
|
env: props.env,
|
|
320
334
|
observability: scriptMetadata.observability,
|
|
321
335
|
createdAt: now,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cloudflare/worker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAGL,mBAAmB,GACpB,MAAM,UAAU,CAAC;AAElB,OAAO,EAA+B,IAAI,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGL,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAsB,OAAO,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAA0B,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAGL,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAiB,cAAc,EAAE,MAAM,eAAe,CAAC;AAuN9D,MAAM,UAAU,QAAQ,CAAC,QAAkB;IACzC,OAAO,QAAQ,CAAC,YAAY,CAAC,KAAK,oBAAoB,CAAC;AACzD,CAAC;AA6LD,MAAM,UAAU,MAAM,CACpB,GAAG,IAE2D;IAE9D,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,GACrB,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,IAAI,CAAC,OAAO,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;QAE5B,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAEpC,yCAAyC;QACzC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE;YACpC,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,CAAC,CAAC;QAEH,KAAK,UAAU,gBAAgB,CAC7B,KAAwB;YAExB,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;gBAC3D,CAAC,MAAM,QAAQ,CAAa;gBAC5B,GAAG,CAAC,MAAM,gBAAgB,CAAC,MAAM,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;aAChE,CAAC,CACH,CACF,CAAC,IAAI,EAAE,CAAC;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;YACtC,MAAM,YAAY,GAA4B,EAAE,CAAC;YACjD,KAAK,MAAM,QAAQ,IAAI,MAAM,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1D,IACE,OAAO,CAAC,QAAQ,CAAC;oBACjB,YAAY,CAAC,QAAQ,CAAC;oBACtB,QAAQ,CAAC,QAAQ,CAAC;oBAClB,YAAY,CAAC,QAAQ,CAAC;oBACtB,QAAQ,CAAC,QAAQ,CAAC;oBAClB,UAAU,CAAC,QAAQ,CAAC;oBACpB,gBAAgB,CAAC,QAAQ,CAAC;oBAC1B,aAAa,CAAC,QAAQ,CAAC,EACvB,CAAC;oBACD,yCAAyC;oBACzC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,GAAG,QAAQ,CAAC;gBAChD,CAAC;YACH,CAAC;YAED,0CAA0C;YAC1C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC;gBAClC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;YACrC,CAAC;YAED,MAAM,QAAQ,GAAG;gBACf,GAAG,KAAK,CAAC,QAAQ;gBACjB,uBAAuB,EAAE,UAAU;gBACnC,4BAA4B,EAAE,IAAI,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC/D,aAAa,EAAE,KAAK,CAAC,KAAK;gBAC1B,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;gBACxC,sCAAsC;gBACtC,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,OAAO,CAAC,EAAE,EAAE;gBACjB,GAAI,KAAa;gBACjB,GAAG,EAAE,IAAI;gBACT,kBAAkB,EAAE;oBAClB,eAAe;oBACf,GAAG,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC;iBACpC;gBACD,UAAU,EAAE,IAAK,CAAC,QAAQ;gBAC1B,IAAI,EAAE,UAAU;gBAChB,2DAA2D;gBAC3D,KAAK,EAAE,IAAI;gBACX,QAAQ;gBACR,MAAM,EAAE;oBACN,GAAG,KAAK,CAAC,MAAM;oBACf,OAAO,EAAE,CAAC,eAAe,CAAC;oBAC1B,QAAQ,EAAE;wBACR,cAAc;wBACd,YAAY;wBACZ,QAAQ;wBACR,SAAS;wBACT,qDAAqD;wBACrD,QAAQ;wBACR,6EAA6E;wBAC7E,IAAI;wBACJ,WAAW;qBACZ;oBACD,MAAM,EAAE;wBACN,EAAE,EAAE,iCAAiC;qBACtC;oBACD,MAAM,EAAE;wBACN,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC;wBAC/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC;qBAC/D;iBACF;aACF,CAAC,CAAC;QACL,CAAC,CAAuB,CAAC;QAEzB,uEAAuE;QACvE,gFAAgF;QAChF,kGAAkG;QAClG,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAChD,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAQrB,CAAC;QAEF,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,GAAG,KAAK,EACnB,OAAgB,EAChB,GAAwB,EACxB,GAAqB,EACrB,EAAE;oBACF,IAAI,CAAC;wBACH,OAAO,MAAM,KAAK,CAAC,KAAM,CAAC,OAAO,EAAE,GAAU,EAAE,GAAG,CAAC,CAAC;oBACtD,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,KAAK,EAAE;4BAC3C,MAAM,EAAE,GAAG;yBACZ,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC;YACJ,CAAC;YACD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,GAAG,KAAK,EACnB,KAAsB,EACtB,GAAwB,EACxB,GAAqB,EACrB,EAAE;oBACF,OAAO,MAAM,KAAK,CAAC,KAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;gBAC7C,CAAC,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,GAAG,KAAK,EACnB,OAA+B,EAC/B,IAAkB,EAClB,EAAE;gBACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC5D,CAAC;gBACD,IAAI,OAAO,YAAY,OAAO,EAAE,CAAC;oBAC/B,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;wBAC1C,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;wBACxC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBACtB,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,GAAG,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,EACxD,MAAM,CACP,CAAC;oBAEF,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;oBAEjC,IAAI,CAAC;wBACH,OAAO,MAAM,KAAK,CAChB,IAAI,OAAO,CAAC,QAAQ,EAAE;4BACpB,MAAM,EAAE,OAAO,CAAC,MAAM;4BACtB,IAAI,EAAE,OAAO,CAAC,IAAI;4BAClB,OAAO;4BACP,+CAA+C;4BAC/C,sBAAsB;yBACvB,CAAC,CACH,CAAC;oBACJ,CAAC;oBAAC,OAAO,GAAQ,EAAE,CAAC;wBAClB,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,IAAI,aAAa,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC3D,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC,CAAC;oBAC/C,CAAC;oBACD,OAAO,MAAM,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,OAAO,CAAC,EAAE,EAAE,KAAuB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAChE,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,CAAC,OAAO,GAAG,CAAC,OAAsB,EAAE,OAAsB,EAAE,EAAE,CAClE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAC7B,oBAAoB,EACpB;IACE,YAAY,EAAE,IAAI;CACnB,EACD,KAAK,WAEH,EAAU,EACV,KAAqB;IAErB,gEAAgE;IAChE,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE7C,wBAAwB;IACxB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;IAEpC,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,IAAI,YAAY,CAAC;IAClE,MAAM,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC;IAE1D,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAqB,EAAE,EAAE;QACzD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAW,UAAU,CAAC,CAAC;QAEzD,oEAAoE;QACpE,MAAM,aAAa,GACjB,KAAK,CAAC,MAAM;YACZ,CAAC,MAAM,kBAAkB,CAAC;gBACxB,GAAG,KAAK;gBACR,iBAAiB;gBACjB,kBAAkB;aACnB,CAAC,CAAC,CAAC;QAEN,2BAA2B;QAC3B,MAAM,cAAc,GAAuC,EAAE,CAAC;QAC9D,MAAM,iBAAiB,GAAe,EAAE,CAAC;QAEzC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpE,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAChC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC9B,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC9D,CAAC;yBAAM,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACvC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,8CAA8C;QAC9C,IAAI,iBAAgD,CAAC;QACrD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,4CAA4C;YAC5C,kEAAkE;YAClE,MAAM,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAEvC,iDAAiD;YACjD,iBAAiB,GAAG,MAAM,YAAY,CACpC,GAAG,EACH,UAAU,EACV,YAAY,CAAC,MAAM,EACnB,KAAK,CAAC,MAAM,CACb,CAAC;QACJ,CAAC;QAED,iCAAiC;QACjC,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAChD,IAAI,EACJ,WAAW,EACX;YACE,GAAG,KAAK;YACR,iBAAiB;YACjB,kBAAkB;YAClB,UAAU;SACX,EACD,iBAAiB,CAClB,CAAC;QAEF,MAAM,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;QAEhE,6EAA6E;QAC7E,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE3C,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;YACzC,MAAM,cAAc,CAAC,GAAG,EAAE;gBACxB,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;YACtC,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC5D,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;oBAChC,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC;gBACtB,OAAO,aAAa,CAAC,GAAG,KAAK,CAAC,EAAE,WAAW,EAAE;oBAC3C,KAAK;oBACL,UAAU,EAAE,UAAU;oBACtB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,QAAQ,EAAE,kBAAkB,CAAC,WAAW,CAAC;wBACvC,CAAC,CAAC,WAAW,CAAC,QAAQ;wBACtB,CAAC,CAAC,SAAS;iBACd,CAAC,CAAC;YACL,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,EAAE,CAAC,CAAC;QACnE,CAAC,CAAC,IAAI,EAAE,CACT,CAAC;QAEF,iCAAiC;QACjC,MAAM,SAAS,GAAG,MAAM,YAAY,CAClC,IAAI,EACJ,GAAG,EACH,UAAU,EACV,KAAK,CAAC,GAAG,IAAI,KAAK,CACnB,CAAC;QAEF,wBAAwB;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,uBAAuB;QACvB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CACvB,aAAa,GAAG,CAAC,SAAS,oBAAoB,UAAU,YAAY,EACpE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CACtC,CAAC;YAEF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,MAAM,cAAc,CAClB,GAAG,EACH,wBAAwB,EACxB,QAAQ,EACR,UAAU,CACX,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;IAC3D,CAAC,CAAC;IAEF,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,2DAA2D;QAC3D,MAAM,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAElD,MAAM,kBAAkB,CAAC;YACvB,GAAG,KAAK;YACR,UAAU,EAAE,SAAS;YACrB,MAAM,EACJ,KAAK,CAAC,MAAM,KAAK,KAAK;gBACpB,CAAC,CAAC,0FAA0F;gBAC5F,CAAC,CAAC,2EAA2E;YACjF,QAAQ,EAAE,EAAO;YACjB,6EAA6E;YAC7E,qDAAqD;YACrD,YAAY,EAAE,SAAS;SACxB,CAAC,CAAC;QAEH,MAAM,sBAAsB,CAC1B,GAAG,EAAE,CACH,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE;YACtB,GAAG,KAAK;YACR,UAAU;SACX,CAAC,EACJ,CAAC,GAAG,EAAE,EAAE,CACN,CAAC,GAAG,CAAC,MAAM,KAAK,GAAG;YACjB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAClB,oDAAoD,CACrD,CAAC;YACJ,GAAG,CAAC,MAAM,KAAK,GAAG;YAClB,GAAG,CAAC,MAAM,KAAK,GAAG,EACpB,EAAE,EACF,GAAG,CACJ,CAAC;QAEF,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IACD,gEAAgE;IAChE,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,wBAAwB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE3E,SAAS,cAAc;QACrB,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAK,EAAQ,CAAC,CAAC,GAAG,CAC7C,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YAC1B,WAAW;YACX,wBAAwB,CAAC,OAAO,CAAC;gBACjC,OAAO,CAAC,UAAU,KAAK,SAAS;gBAC9B,CAAC,CAAC,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,EAAE;oBACrC,GAAG,OAAO;oBACV,kEAAkE;oBAClE,UAAU,EAAE,UAAU;iBACvB,CAAC;gBACJ,CAAC,CAAC,OAAO;SACZ,CACF,CACF,CAAC;IACJ,CAAC;IAED,uBAAuB;IACvB,OAAO,IAAI,CAAC;QACV,GAAG,KAAK;QACR,IAAI,EAAE,SAAS;QACf,EAAE;QACF,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,IAAI,EAAE,UAAU;QAChB,iBAAiB;QACjB,kBAAkB;QAClB,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,KAAK,EAAE,+BAA+B;QAC9D,QAAQ,EAAE,cAAc,EAAE;QAC1B,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,aAAa,EAAE,cAAc,CAAC,aAAa;QAC3C,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;QACd,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,GAAG,EAAE,SAAS;QACd,6CAA6C;QAC7C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,sCAAsC;QACtC,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,mBAAmB;QACnB,GAAG,EAAE,SAAU;KACQ,CAAC,CAAC;AAC7B,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAuB,EACvB,GAAkB,EAClB,KAA8C;IAE9C,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;IAEpC,gBAAgB;IAChB,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,MAAM,CACrC,aAAa,GAAG,CAAC,SAAS,oBAAoB,UAAU,EAAE,CAC3D,CAAC;IAEF,sCAAsC;IACtC,IAAI,CAAC,cAAc,CAAC,EAAE,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QACxD,MAAM,cAAc,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACvE,CAAC;IAED,oCAAoC;IACpC,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,IAAI,CACZ,aAAa,GAAG,CAAC,SAAS,oBAAoB,UAAU,YAAY,EACpE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAClC;gBACE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;aAChD,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,+CAA+C,EAAE,KAAK,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,0CAA0C;IAC1C,OAAO;AACT,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAkB,EAClB,UAAkB,EAClB,aAAqB,EACrB,cAA8B;IAE9B,OAAO,sBAAsB,CAC3B,KAAK,IAAI,EAAE;QACT,MAAM,UAAU,GACd,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,SAAU,CAAC;QAE1D,iCAAiC;QACjC,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;QAEhC,qDAAqD;QACrD,QAAQ,CAAC,MAAM,CACb,UAAU,EACV,IAAI,IAAI,CAAC,CAAC,aAAa,CAAC,EAAE;YACxB,IAAI,EAAE,cAAc,CAAC,WAAW;gBAC9B,CAAC,CAAC,+BAA+B;gBACjC,CAAC,CAAC,wBAAwB;SAC7B,CAAC,EACF,UAAU,CACX,CAAC;QAEF,uBAAuB;QACvB,QAAQ,CAAC,MAAM,CACb,UAAU,EACV,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE;YACzC,IAAI,EAAE,kBAAkB;SACzB,CAAC,CACH,CAAC;QAEF,qCAAqC;QACrC,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,GAAG,CAClC,aAAa,GAAG,CAAC,SAAS,oBAAoB,UAAU,EAAE,EAC1D,QAAQ,EACR;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,qBAAqB;aACtC;SACF,CACF,CAAC;QAEF,qCAAqC;QACrC,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC;YACvB,MAAM,cAAc,CAClB,cAAc,EACd,yBAAyB,EACzB,QAAQ,EACR,UAAU,CACX,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EACvE,EAAE,EACF,GAAG,CACJ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,GAAuB,EACvB,GAAkB,EAClB,UAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,oBAAoB,UAAU,EAAE,CAC3D,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACb,+CAA+C,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CACxF,CAAC;QACJ,CAAC;QAED,IACE,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAChD,cAAc,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CACjC,EACD,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,KAAK,CACb,qBAAqB,UAAU,6CAA6C,CAC7E,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CACb,oCAAoC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CACtG,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAuB,EACvB,GAAkB,EAClB,UAAkB,EAClB,GAAY;IAEZ,IAAI,SAAS,CAAC;IACd,IAAI,GAAG,EAAE,CAAC;QACR,mDAAmD;QACnD,MAAM,GAAG,CAAC,IAAI,CACZ,aAAa,GAAG,CAAC,SAAS,oBAAoB,UAAU,YAAY,EACpE,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,EACzC;YACE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CACF,CAAC;QAEF,0CAA0C;QAC1C,MAAM,iBAAiB,GAAG,MAAM,GAAG,CAAC,GAAG,CACrC,aAAa,GAAG,CAAC,SAAS,oBAAoB,CAC/C,CAAC;QAEF,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CACb,0CAA0C,iBAAiB,CAAC,MAAM,IAAI,iBAAiB,CAAC,UAAU,EAAE,CACrG,CAAC;QACJ,CAAC;QACD,MAAM,aAAa,GAIf,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC;QAElD,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,GAAG,WAAW,UAAU,IAAI,SAAS,cAAc,CAAC;YAE7D,mDAAmD;YACnD,yDAAyD;YACzD,yDAAyD;YACzD,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;gBAC/C,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QAC5C,sDAAsD;QACtD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAC7B,aAAa,GAAG,CAAC,SAAS,oBAAoB,UAAU,YAAY,EACpE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAClC;YACE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,iCAAiC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC1E,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,GAAkB,EAClB,UAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,qBAAqB,UAAU,EAAE,CAC5D,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,yCAAyC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAClF,CAAC;IACJ,CAAC;IACD,OAAQ,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAS,CAAC,MAA8B,CAAC;AACzE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAkB,EAClB,UAAkB,EAClB,WAAW,GAAG,YAAY;IAE1B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,qBAAqB,UAAU,iBAAiB,WAAW,WAAW,EAChG;QACE,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;YAC3D,cAAc,EAAE,kBAAkB;SACnC;KACF,CACF,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,6BAA6B,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CACtE,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAExC,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,oBAAoB,CACjC,GAAuB,EACvB,GAAkB,EAClB,UAAkB;IAElB,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,IAAI,EAAE,CAAC;IAEpD,uCAAuC;IACvC,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACpD,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,iDAAiD;IACjD,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC;YACH,oCAAoC;YACpC,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAEzD,kCAAkC;YAClC,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CACtC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,KAAK,UAAU,CACjD,CAAC;YAEF,mDAAmD;YACnD,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACrC,OAAO,CAAC,GAAG,CACT,2BAA2B,QAAQ,CAAC,EAAE,eAAe,UAAU,EAAE,CAClE,CAAC;gBACF,8DAA8D;gBAC9D,MAAM,mBAAmB,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;YAChE,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,kBAAkB,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC5D,aAAa;YACf,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { Binding } from "./bindings.js";
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* Properties for creating a Durable Object Namespace
|
|
3
5
|
*/
|
|
@@ -9,6 +11,14 @@ export interface DurableObjectNamespaceInput {
|
|
|
9
11
|
namespaceId?: string | undefined;
|
|
10
12
|
}
|
|
11
13
|
|
|
14
|
+
export function isDurableObjectNamespace(
|
|
15
|
+
binding: Binding,
|
|
16
|
+
): binding is DurableObjectNamespace {
|
|
17
|
+
return (
|
|
18
|
+
typeof binding === "object" && binding.type === "durable_object_namespace"
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
|
|
12
22
|
/**
|
|
13
23
|
* @example
|
|
14
24
|
* // Create a basic Durable Object namespace for stateful chat rooms
|
|
@@ -200,7 +200,9 @@ export async function prepareWorkerMetadata<B extends Bindings>(
|
|
|
200
200
|
if (
|
|
201
201
|
binding &&
|
|
202
202
|
typeof binding === "object" &&
|
|
203
|
-
binding.type === "durable_object_namespace"
|
|
203
|
+
binding.type === "durable_object_namespace" &&
|
|
204
|
+
(binding.scriptName === undefined ||
|
|
205
|
+
binding.scriptName === props.workerName)
|
|
204
206
|
) {
|
|
205
207
|
return [binding.className];
|
|
206
208
|
}
|
|
@@ -295,7 +297,14 @@ export async function prepareWorkerMetadata<B extends Bindings>(
|
|
|
295
297
|
environment: binding.environment,
|
|
296
298
|
namespace_id: binding.namespaceId,
|
|
297
299
|
});
|
|
298
|
-
|
|
300
|
+
if (
|
|
301
|
+
binding.scriptName === undefined ||
|
|
302
|
+
// TODO(sam): not sure if Cloudflare Api would like us using `this` worker name here
|
|
303
|
+
binding.scriptName === props.workerName
|
|
304
|
+
) {
|
|
305
|
+
// we do not need configure class migrations for cross-script bindings
|
|
306
|
+
configureClassMigration(binding, binding.id, binding.className);
|
|
307
|
+
}
|
|
299
308
|
} else if (binding.type === "r2_bucket") {
|
|
300
309
|
meta.bindings.push({
|
|
301
310
|
type: "r2_bucket",
|
package/src/cloudflare/worker.ts
CHANGED
|
@@ -22,6 +22,10 @@ import type { Bound } from "./bound.js";
|
|
|
22
22
|
import { isBucket } from "./bucket.js";
|
|
23
23
|
import { bundleWorkerScript } from "./bundle/bundle-worker.js";
|
|
24
24
|
import { isD1Database } from "./d1-database.js";
|
|
25
|
+
import {
|
|
26
|
+
DurableObjectNamespace,
|
|
27
|
+
isDurableObjectNamespace,
|
|
28
|
+
} from "./durable-object-namespace.js";
|
|
25
29
|
import {
|
|
26
30
|
type EventSource,
|
|
27
31
|
type QueueEventSource,
|
|
@@ -90,7 +94,7 @@ export interface AssetsConfig {
|
|
|
90
94
|
serve_directly?: boolean;
|
|
91
95
|
}
|
|
92
96
|
|
|
93
|
-
export interface BaseWorkerProps<B extends Bindings =
|
|
97
|
+
export interface BaseWorkerProps<B extends Bindings | undefined = undefined>
|
|
94
98
|
extends CloudflareApiOptions {
|
|
95
99
|
/**
|
|
96
100
|
* Bundle options when using entryPoint
|
|
@@ -200,14 +204,15 @@ export interface BaseWorkerProps<B extends Bindings = Bindings>
|
|
|
200
204
|
eventSources?: EventSource[];
|
|
201
205
|
}
|
|
202
206
|
|
|
203
|
-
export interface InlineWorkerProps<B extends Bindings = Bindings>
|
|
207
|
+
export interface InlineWorkerProps<B extends Bindings | undefined = Bindings>
|
|
204
208
|
extends BaseWorkerProps<B> {
|
|
205
209
|
script: string;
|
|
206
210
|
entrypoint?: undefined;
|
|
207
211
|
}
|
|
208
212
|
|
|
209
|
-
export interface EntrypointWorkerProps<
|
|
210
|
-
extends
|
|
213
|
+
export interface EntrypointWorkerProps<
|
|
214
|
+
B extends Bindings | undefined = Bindings,
|
|
215
|
+
> extends BaseWorkerProps<B> {
|
|
211
216
|
entrypoint: string;
|
|
212
217
|
script?: undefined;
|
|
213
218
|
}
|
|
@@ -215,7 +220,7 @@ export interface EntrypointWorkerProps<B extends Bindings = Bindings>
|
|
|
215
220
|
/**
|
|
216
221
|
* Properties for creating or updating a Worker
|
|
217
222
|
*/
|
|
218
|
-
export type WorkerProps<B extends Bindings = Bindings> =
|
|
223
|
+
export type WorkerProps<B extends Bindings | undefined = Bindings> =
|
|
219
224
|
| InlineWorkerProps<B>
|
|
220
225
|
| EntrypointWorkerProps<B>;
|
|
221
226
|
|
|
@@ -265,7 +270,7 @@ export function isWorker(resource: Resource): resource is Worker<any> {
|
|
|
265
270
|
/**
|
|
266
271
|
* Output returned after Worker creation/update
|
|
267
272
|
*/
|
|
268
|
-
export type Worker<B extends Bindings = Bindings> =
|
|
273
|
+
export type Worker<B extends Bindings | undefined = Bindings | undefined> =
|
|
269
274
|
Resource<"cloudflare::Worker"> &
|
|
270
275
|
Omit<WorkerProps<B>, "url" | "script"> &
|
|
271
276
|
globalThis.Service & {
|
|
@@ -300,7 +305,7 @@ export type Worker<B extends Bindings = Bindings> =
|
|
|
300
305
|
/**
|
|
301
306
|
* The bindings that were created
|
|
302
307
|
*/
|
|
303
|
-
bindings: B
|
|
308
|
+
bindings: B;
|
|
304
309
|
|
|
305
310
|
/**
|
|
306
311
|
* Configuration for static assets
|
|
@@ -308,9 +313,11 @@ export type Worker<B extends Bindings = Bindings> =
|
|
|
308
313
|
assets?: AssetsConfig;
|
|
309
314
|
|
|
310
315
|
// phantom property (for typeof myWorker.Env)
|
|
311
|
-
Env:
|
|
312
|
-
|
|
313
|
-
|
|
316
|
+
Env: B extends Bindings
|
|
317
|
+
? {
|
|
318
|
+
[bindingName in keyof B]: Bound<B[bindingName]>;
|
|
319
|
+
}
|
|
320
|
+
: undefined;
|
|
314
321
|
|
|
315
322
|
/**
|
|
316
323
|
* The compatibility date for the worker
|
|
@@ -412,6 +419,29 @@ export type Worker<B extends Bindings = Bindings> =
|
|
|
412
419
|
* crons: ['* 15 * * *', '0 0 * * *', '0 12 * * MON']
|
|
413
420
|
* })
|
|
414
421
|
*
|
|
422
|
+
* @example
|
|
423
|
+
* // Create cross-script durable object binding where one worker
|
|
424
|
+
* // defines the durable object and another worker accesses it:
|
|
425
|
+
* const dataWorker = await Worker("data-worker", {
|
|
426
|
+
* name: "data-worker",
|
|
427
|
+
* entrypoint: "./src/data.ts",
|
|
428
|
+
* bindings: {
|
|
429
|
+
* // Bind to its own durable object
|
|
430
|
+
* STORAGE: new DurableObjectNamespace("storage", {
|
|
431
|
+
* className: "DataStorage"
|
|
432
|
+
* })
|
|
433
|
+
* }
|
|
434
|
+
* });
|
|
435
|
+
*
|
|
436
|
+
* const apiWorker = await Worker("api-worker", {
|
|
437
|
+
* name: "api-worker",
|
|
438
|
+
* entrypoint: "./src/api.ts",
|
|
439
|
+
* bindings: {
|
|
440
|
+
* // Cross-script binding to the data worker's durable object
|
|
441
|
+
* SHARED_STORAGE: dataWorker.bindings.STORAGE
|
|
442
|
+
* }
|
|
443
|
+
* });
|
|
444
|
+
*
|
|
415
445
|
* @see
|
|
416
446
|
* https://developers.cloudflare.com/workers/
|
|
417
447
|
*/
|
|
@@ -816,6 +846,24 @@ export const _Worker = Resource(
|
|
|
816
846
|
|
|
817
847
|
const { scriptMetadata, workerUrl, now } = await uploadWorkerScript(props);
|
|
818
848
|
|
|
849
|
+
function exportBindings() {
|
|
850
|
+
return Object.fromEntries(
|
|
851
|
+
Object.entries(props.bindings ?? ({} as B)).map(
|
|
852
|
+
([bindingName, binding]) => [
|
|
853
|
+
bindingName,
|
|
854
|
+
isDurableObjectNamespace(binding) &&
|
|
855
|
+
binding.scriptName === undefined
|
|
856
|
+
? new DurableObjectNamespace(binding.id, {
|
|
857
|
+
...binding,
|
|
858
|
+
// re-export this binding mapping to the host worker (this worker)
|
|
859
|
+
scriptName: workerName,
|
|
860
|
+
})
|
|
861
|
+
: binding,
|
|
862
|
+
],
|
|
863
|
+
),
|
|
864
|
+
);
|
|
865
|
+
}
|
|
866
|
+
|
|
819
867
|
// Construct the output
|
|
820
868
|
return this({
|
|
821
869
|
...props,
|
|
@@ -826,7 +874,7 @@ export const _Worker = Resource(
|
|
|
826
874
|
compatibilityDate,
|
|
827
875
|
compatibilityFlags,
|
|
828
876
|
format: props.format || "esm", // Include format in the output
|
|
829
|
-
bindings:
|
|
877
|
+
bindings: exportBindings(),
|
|
830
878
|
env: props.env,
|
|
831
879
|
observability: scriptMetadata.observability,
|
|
832
880
|
createdAt: now,
|