durable-actors 0.7.16 → 0.8.1

package/dist/templates/actor/README.md

@@ -1,25 +1,23 @@
 # Actors
 
-Requires Node.js 22.19.0+, pnpm, and Bun 1.3.9+ on your PATH.
+Requires Bun 1.4.2+ on your PATH.
 
 ```sh
-pnpm install
-# Or with npm:
-npm install
-npx durable-actors dev
+bun install
+bunx durable-actors dev
 ```
 
 Define your actors in `src/actors.ts`. The starter contains a counter with persisted state and `read()` and `increment()` methods. Each counter ID has its own saved value.
 
-`npx durable-actors dev` watches your actor source and stores local state in `.durable-actors/`. It defaults to project ID `local`; choose another with `DURABLE_ACTORS_PROJECT_ID=my-project npx durable-actors dev`.
+`bunx durable-actors dev` watches your actor source and stores local state in `.durable-actors/`. It defaults to project ID `local`; choose another with `DURABLE_ACTORS_PROJECT_ID=my-project bunx durable-actors dev`.
 
 ## Connect your application
 
 In your separate application project's directory:
 
-1. Run `pnpm install --save-dev durable-actors` or `npm install --save-dev durable-actors`.
+1. Run `bun add --dev durable-actors`.
 2. Use the local defaults: project `local`, URL `http://127.0.0.1:7100`, and no secret. If you configure a different project, port, or optional secret on the actor server, put matching settings in your application’s `.env` or `.env.local` file.
-3. Run `npx durable-actors generate`; the CLI loads both environment files automatically. Exported environment variables take precedence over `.env.local`, which takes precedence over `.env`.
+3. Run `bunx durable-actors generate`; the CLI loads both environment files automatically. Exported environment variables take precedence over `.env.local`, which takes precedence over `.env`.
 
 Your application backend can then use the generated client:
 
@@ -30,4 +28,4 @@ const counter = actors.Counter.get("example")
 console.log(await counter.increment())
 ```
 
-Use `pnpm check` to check types. Production deployment integrations register actor images through `PUT /v1/projects/{project_id}/deployment`; see the [HTTP API](https://github.com/TerseAI/durable-actors/blob/main/docs/reference/openapi.yaml).
+Use `bun run --bun check` to check types. Production deployment integrations register actor images through `PUT /v1/projects/{project_id}/deployment`; see the [HTTP API](https://github.com/TerseAI/durable-actors/blob/main/docs/reference/openapi.yaml).

package/dist/templates/actor/bunfig

@@ -0,0 +1,2 @@
+[run]
+bun = true

package/dist/templates/actor/package.json

@@ -3,17 +3,20 @@
     "private": true,
     "type": "module",
     "engines": {
-        "node": ">=22.19.0"
+        "bun": ">=1.4.2"
     },
     "scripts": {
         "dev": "durable-actors dev",
         "check": "tsc --noEmit"
     },
     "dependencies": {
-        "durable-actors": "0.7.16"
+        "durable-actors": "0.8.1"
     },
     "devDependencies": {
         "@types/node": "^22.0.0",
         "typescript": "~5.9.3"
-    }
+    },
+    "trustedDependencies": [
+        "esbuild"
+    ]
 }

package/dist/templates/ai-chat/README.md

@@ -4,25 +4,25 @@ An Express + React app that streams replies with the Vercel AI SDK and saves con
 
 ## Run locally
 
-Requires Node.js 22.19+, Bun 1.3.9+, and an OpenAI API key.
+Requires Bun 1.4.2+ and an OpenAI API key.
 
 ```sh
-npx durable-actors init ai-chat-example --template ai-chat
+bunx durable-actors init ai-chat-example --template ai-chat
 cd ai-chat-example
-npm install
+bun install
 cp .env.example .env
 ```
 
-Already in the example directory? Start at `npm install`. Add `OPENAI_API_KEY` to `.env`, then start the actors:
+Already in the example directory? Start at `bun install`. Add `OPENAI_API_KEY` to `.env`, then start the actors:
 
 ```sh
-npm run dev:actors
+bun run dev:actors
 ```
 
 Wait for `Ready`. In another terminal in the same directory:
 
 ```sh
-npm run dev
+bun run dev
 ```
 
 Open [localhost:3000](http://127.0.0.1:3000), send a message, and reload after the reply finishes. The conversation survives server restarts.
@@ -37,6 +37,6 @@ The lobby is shared and has no authentication. Add authentication and chat owner
 
 ## Development
 
-Both processes read `.env`; actor state lives in `.durable-actors/`. Actor code reloads automatically; restart `npm run dev` after editing the actor class imported by the backend. For multiple examples, set distinct `PORT`, `DURABLE_ACTORS_PORT`, and matching control-plane URLs; see [Run the examples together](https://github.com/TerseAI/durable-actors/tree/main/examples#run-the-examples-together).
+Both processes read `.env`; actor state lives in `.durable-actors/`. Actor code reloads automatically; restart `bun run dev` after editing the actor class imported by the backend. For multiple examples, set distinct `PORT`, `DURABLE_ACTORS_PORT`, and matching control-plane URLs; see [Run the examples together](https://github.com/TerseAI/durable-actors/tree/main/examples#run-the-examples-together).
 
-`npm run build` checks TypeScript and builds the frontend.
+`bun run build` checks TypeScript and builds the frontend.

package/dist/templates/ai-chat/bunfig

@@ -0,0 +1,2 @@
+[run]
+bun = true

package/dist/templates/ai-chat/package.json

@@ -3,10 +3,10 @@
     "private": true,
     "type": "module",
     "engines": {
-        "node": ">=22.19.0"
+        "bun": ">=1.4.2"
     },
     "scripts": {
-        "dev": "tsx --env-file=.env src/backend.ts",
+        "dev": "bun src/backend.ts",
         "dev:actors": "durable-actors dev",
         "build": "tsc --noEmit && vite build"
     },
@@ -15,7 +15,7 @@
         "@ai-sdk/react": "^4.0.100",
         "ai": "^7.0.97",
         "express": "^5.2.1",
-        "durable-actors": "0.7.16",
+        "durable-actors": "0.8.1",
         "react": "^19.3.0",
         "react-dom": "^19.3.0"
     },
@@ -24,8 +24,10 @@
         "@types/node": "^22.0.0",
         "@types/react": "^19.0.0",
         "@types/react-dom": "^19.0.0",
-        "tsx": "^4.0.0",
         "typescript": "~5.9.3",
         "vite": "^8.3.0"
-    }
+    },
+    "trustedDependencies": [
+        "esbuild"
+    ]
 }

package/dist/templates/ai-chat/src/actors.ts

@@ -9,6 +9,6 @@ export class ChatHistory extends Actor {
     }
 
     async append(...messages: UIMessage[]) {
-        this.messages.push(...messages)
+        this.messages = [...this.messages, ...messages]
     }
 }

package/dist/templates/chat/README.md

@@ -6,22 +6,22 @@ An Express + React chatroom with shared messages and persistent history.
 
 ## Run locally
 
-Requires Node.js 22.19+ and Bun 1.3.9+.
+Requires Bun 1.4.2+.
 
 ```sh
-npx durable-actors init chat-example --template chat
+bunx durable-actors init chat-example --template chat
 cd chat-example
-npm install
+bun install
 cp .env.example .env
-npm run dev:actors
+bun run dev:actors
 ```
 
-Already in the example directory? Start at `npm install`.
+Already in the example directory? Start at `bun install`.
 
 Wait for `Ready`. In another terminal in the same directory:
 
 ```sh
-npm run dev
+bun run dev
 ```
 
 Open [localhost:3000](http://127.0.0.1:3000) in two tabs; messages stay saved after an actor server restart.
@@ -69,8 +69,8 @@ The demo joins as a guest; add authentication and room access checks before issu
 
 ## Development
 
-Actors reload automatically; restart `npm run dev` after changing public actor types. See [port settings](../README.md#run-the-examples-together) to run multiple examples.
+Actors reload automatically; restart `bun run dev` after changing public actor types. See [port settings](../README.md#run-the-examples-together) to run multiple examples.
 
 ```sh
-npm run build
+bun run build
 ```

package/dist/templates/chat/bunfig

@@ -0,0 +1,2 @@
+[run]
+bun = true

package/dist/templates/chat/package.json

@@ -3,16 +3,16 @@
     "private": true,
     "type": "module",
     "engines": {
-        "node": ">=22.19.0"
+        "bun": ">=1.4.2"
     },
     "scripts": {
-        "dev": "durable-actors generate && tsx --env-file=.env src/backend.ts",
+        "dev": "durable-actors generate && bun src/backend.ts",
         "dev:actors": "durable-actors dev",
         "build": "durable-actors generate src/actors.ts && tsc --noEmit && vite build"
     },
     "dependencies": {
         "express": "^5.2.1",
-        "durable-actors": "0.7.16",
+        "durable-actors": "0.8.1",
         "react": "^19.3.0",
         "react-dom": "^19.3.0"
     },
@@ -21,8 +21,10 @@
         "@types/node": "^22.0.0",
         "@types/react": "^19.0.0",
         "@types/react-dom": "^19.0.0",
-        "tsx": "^4.0.0",
         "typescript": "~5.9.3",
         "vite": "^8.3.0"
-    }
+    },
+    "trustedDependencies": [
+        "esbuild"
+    ]
 }

package/dist/templates/chat/src/actors.ts

@@ -9,7 +9,7 @@ export class ChatRoom extends Actor<Member, string, ChatMessage[]> {
     }
 
     async onMessage(socket: ActorSocket<Member, ChatMessage[]>, text: string) {
-        this.history.push({ name: socket.metadata.name, text })
+        this.history = [...this.history, { name: socket.metadata.name, text }]
         this.broadcast(this.history)
     }
 }

package/dist/templates/documents/README.md

@@ -4,22 +4,22 @@ A Tiptap editor with Yjs for concurrent edits and durable actors for saved docum
 
 ## Run locally
 
-Requires Node.js 22.19+ and Bun 1.3.9+.
+Requires Bun 1.4.2+.
 
 ```sh
-npx durable-actors init documents-example --template documents
+bunx durable-actors init documents-example --template documents
 cd documents-example
-npm install
+bun install
 cp .env.example .env
-npm run dev:actors
+bun run dev:actors
 ```
 
-Already in the example directory? Start at `npm install`.
+Already in the example directory? Start at `bun install`.
 
 Wait for `Ready`. In another terminal in the same directory:
 
 ```sh
-npm run dev
+bun run dev
 ```
 
 Open [localhost:3000](http://127.0.0.1:3000) in two tabs. Edit **Welcome** from both, add another document, and switch between them. Restart the servers and reload to restore saved documents.
@@ -48,6 +48,6 @@ Editing pauses while disconnected. Reload to reconnect; unsaved edits are not st
 
 ## Development
 
-Both processes read `.env`; saved state lives in `.durable-actors/`. Actor code reloads automatically. After changing public actor types, restart `npm run dev` to regenerate the client. For multiple examples, set distinct `PORT`, `DURABLE_ACTORS_PORT`, and matching control-plane URLs; see [Run the examples together](https://github.com/TerseAI/durable-actors/tree/main/examples#run-the-examples-together).
+Both processes read `.env`; saved state lives in `.durable-actors/`. Actor code reloads automatically. After changing public actor types, restart `bun run dev` to regenerate the client. For multiple examples, set distinct `PORT`, `DURABLE_ACTORS_PORT`, and matching control-plane URLs; see [Run the examples together](https://github.com/TerseAI/durable-actors/tree/main/examples#run-the-examples-together).
 
-`npm run build` generates clients, checks TypeScript, and builds the frontend.
+`bun run build` generates clients, checks TypeScript, and builds the frontend.

package/dist/templates/documents/bunfig

@@ -0,0 +1,2 @@
+[run]
+bun = true

package/dist/templates/documents/package.json

@@ -3,10 +3,10 @@
     "private": true,
     "type": "module",
     "engines": {
-        "node": ">=22.19.0"
+        "bun": ">=1.4.2"
     },
     "scripts": {
-        "dev": "durable-actors generate && tsx --env-file=.env src/backend.ts",
+        "dev": "durable-actors generate && bun src/backend.ts",
         "dev:actors": "durable-actors dev",
         "build": "durable-actors generate src/actors.ts && tsc --noEmit && vite build"
     },
@@ -19,7 +19,7 @@
         "@tiptap/y-tiptap": "^3.0.7",
         "express": "^5.2.1",
         "lib0": "^0.2.117",
-        "durable-actors": "0.7.16",
+        "durable-actors": "0.8.1",
         "react": "^19.3.0",
         "react-dom": "^19.3.0",
         "yjs": "^13.6.32"
@@ -29,8 +29,10 @@
         "@types/node": "^22.0.0",
         "@types/react": "^19.0.0",
         "@types/react-dom": "^19.0.0",
-        "tsx": "^4.0.0",
         "typescript": "~5.9.3",
         "vite": "^8.3.0"
-    }
+    },
+    "trustedDependencies": [
+        "esbuild"
+    ]
 }

package/dist/templates/documents/src/actors.ts

@@ -11,7 +11,7 @@ export class Workspace extends Actor<null, DocumentInfo, DocumentInfo[]> {
     }
 
     async onMessage(_socket: ActorSocket<null, DocumentInfo[]>, document: DocumentInfo) {
-        if (!this.documents.some(item => item.id === document.id)) this.documents.push(document)
+        if (!this.documents.some(item => item.id === document.id)) this.documents = [...this.documents, document]
         this.broadcast(this.documents)
     }
 }

package/package.json

@@ -1,116 +1,118 @@
 {
-  "name": "durable-actors",
-  "version": "0.7.16",
-  "description": "Provider-neutral actors for sandbox compute",
-  "type": "module",
-  "license": "MIT",
-  "sideEffects": false,
-  "engines": {
-    "node": "^20.19.0 || >=22.12.0"
-  },
-  "keywords": [
-    "actors",
-    "distributed-systems",
-    "durable-actors",
-    "kubernetes",
-    "serverless"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/TerseAI/durable-actors.git",
-    "directory": "sdk"
-  },
-  "homepage": "https://github.com/TerseAI/durable-actors#readme",
-  "bugs": {
-    "url": "https://github.com/TerseAI/durable-actors/issues"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "bin": {
-    "durable-actors": "dist/cli.js"
-  },
-  "exports": {
-    "./backend": {
-      "types": "./dist/backend.d.ts",
-      "import": "./dist/backend.js",
-      "default": "./dist/backend.js"
+    "name": "durable-actors",
+    "version": "0.8.1",
+    "description": "Provider-neutral actors for sandbox compute",
+    "type": "module",
+    "license": "MIT",
+    "sideEffects": false,
+    "engines": {
+        "bun": ">=1.4.2"
     },
-    "./dev": {
-      "types": "./dist/localRuntime.d.ts",
-      "import": "./dist/localRuntime.js",
-      "default": "./dist/localRuntime.js"
+    "packageManager": "bun@1.4.2",
+    "keywords": [
+        "actors",
+        "distributed-systems",
+        "durable-actors",
+        "kubernetes",
+        "serverless"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/TerseAI/durable-actors.git",
+        "directory": "sdk"
     },
-    "./proxy": {
-      "types": "./dist/proxy.d.ts",
-      "import": "./dist/proxy.js",
-      "default": "./dist/proxy.js"
+    "homepage": "https://github.com/TerseAI/durable-actors#readme",
+    "bugs": {
+        "url": "https://github.com/TerseAI/durable-actors/issues"
     },
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
+    "publishConfig": {
+        "access": "public"
     },
-    "./host": {
-      "types": "./dist/host.d.ts",
-      "import": "./dist/host.js",
-      "default": "./dist/host.js"
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "bin": {
+        "durable-actors": "bin/durable-actors.js"
     },
-    "./compiler": {
-      "types": "./dist/compiler/actor-compiler.d.ts",
-      "import": "./dist/compiler/actor-compiler.js",
-      "default": "./dist/compiler/actor-compiler.js"
+    "exports": {
+        "./backend": {
+            "types": "./dist/backend.d.ts",
+            "import": "./dist/backend.js",
+            "default": "./dist/backend.js"
+        },
+        "./dev": {
+            "types": "./dist/localRuntime.d.ts",
+            "import": "./dist/localRuntime.js",
+            "default": "./dist/localRuntime.js"
+        },
+        "./proxy": {
+            "types": "./dist/proxy.d.ts",
+            "import": "./dist/proxy.js",
+            "default": "./dist/proxy.js"
+        },
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js",
+            "default": "./dist/index.js"
+        },
+        "./host": {
+            "types": "./dist/host.d.ts",
+            "import": "./dist/host.js",
+            "default": "./dist/host.js"
+        },
+        "./compiler": {
+            "types": "./dist/compiler/actor-compiler.d.ts",
+            "import": "./dist/compiler/actor-compiler.js",
+            "default": "./dist/compiler/actor-compiler.js"
+        },
+        "./codegen": {
+            "types": "./dist/compiler/generators/client-artifacts.d.ts",
+            "import": "./dist/compiler/generators/client-artifacts.js",
+            "default": "./dist/compiler/generators/client-artifacts.js"
+        }
     },
-    "./codegen": {
-      "types": "./dist/compiler/generators/client-artifacts.d.ts",
-      "import": "./dist/compiler/generators/client-artifacts.js",
-      "default": "./dist/compiler/generators/client-artifacts.js"
+    "files": [
+        "bin",
+        "dist",
+        "README.md",
+        "LICENSE.md"
+    ],
+    "scripts": {
+        "build": "bun run --bun build:observer && bun run --bun build:client && tsc -p tsconfig.build.json && bun run --bun build:declarations && bun scripts/build-template.mjs",
+        "check": "bun run --bun format:check && bun run --bun test && bun run --bun package:check",
+        "clean": "rm -rf dist .test-dist",
+        "package:check": "bun test --timeout 60000 tests/scripts/codegen-api.test.mjs tests/scripts/build-artifact.test.mjs tests/scripts/standalone-client.test.mjs tests/scripts/host-runtime.test.mjs",
+        "prepack": "bun run --bun clean && bun run --bun build && bun run --bun package:check",
+        "test": "bun run --bun clean && bun run --bun build && bun tests/prepare.mjs && tsc -p tsconfig.test.json && bun test --parallel=1 --timeout 60000 ./.test-dist/tests",
+        "format": "prettier --config ../.prettierrc --write \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/*.mjs\" \"tests/**/*.mjs\"",
+        "format:check": "prettier --config ../.prettierrc --check \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/*.mjs\" \"tests/**/*.mjs\"",
+        "build:observer": "bun run --bun --cwd ../packages/observer-ui build",
+        "docs": "typedoc --options typedoc.json",
+        "build:client": "bun scripts/build-client-runtime.mjs",
+        "build:declarations": "bun scripts/build-declaration-compiler.mjs"
+    },
+    "dependencies": {
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^8.20.0",
+        "commander": "^14.0.3",
+        "durable-actors-observer": "0.8.1",
+        "esbuild": "^0.28.2",
+        "import-meta-resolve": "^4.2.0",
+        "open": "^10.2.0",
+        "prettier": "^3.9.6",
+        "tar": "^7.5.22",
+        "typescript": "~5.9.3",
+        "typescript-json-schema": "^0.68.0",
+        "validate-npm-package-name": "^6.0.2",
+        "vite": "^8.3.0",
+        "ws": "^8.18.3",
+        "zod": "^4.3.6"
+    },
+    "devDependencies": {
+        "@types/node": "^22.0.0",
+        "@types/validate-npm-package-name": "^4.0.2",
+        "@types/ws": "^8.18.1",
+        "dts-bundle-generator": "9.5.1",
+        "typedoc": "^0.28.20",
+        "typedoc-plugin-missing-exports": "^4.1.4"
     }
-  },
-  "files": [
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
-  "dependencies": {
-    "@types/json-schema": "^7.0.15",
-    "ajv": "^8.20.0",
-    "chokidar": "^4.0.3",
-    "commander": "^14.0.3",
-    "dotenv": "^18.0.0",
-    "dts-bundle-generator": "9.5.1",
-    "esbuild": "^0.28.2",
-    "import-meta-resolve": "^4.2.0",
-    "open": "^10.2.0",
-    "prettier": "^3.9.6",
-    "tar": "^7.5.22",
-    "typescript": "~5.9.3",
-    "typescript-json-schema": "^0.68.0",
-    "validate-npm-package-name": "^6.0.2",
-    "vite": "^8.3.0",
-    "ws": "^8.18.3",
-    "zod": "^4.3.6",
-    "durable-actors-observer": "0.7.16"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/validate-npm-package-name": "^4.0.2",
-    "@types/ws": "^8.18.1",
-    "typedoc": "^0.28.20",
-    "typedoc-plugin-missing-exports": "^4.1.4"
-  },
-  "scripts": {
-    "build": "pnpm run build:observer && pnpm run build:client && tsc -p tsconfig.build.json && node scripts/build-template.mjs && pnpm --dir .. install --offline --frozen-lockfile --ignore-scripts",
-    "check": "pnpm run format:check && pnpm run test && pnpm run package:check",
-    "clean": "rm -rf dist .test-dist",
-    "package:check": "node --test tests/scripts/codegen-api.test.mjs tests/scripts/build-artifact.test.mjs tests/scripts/standalone-client.test.mjs",
-    "test": "pnpm run clean && pnpm run build && node tests/prepare.mjs && tsc -p tsconfig.test.json && node scripts/test.mjs",
-    "format": "prettier --config ../.prettierrc --write \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/*.mjs\" \"tests/**/*.mjs\"",
-    "format:check": "prettier --config ../.prettierrc --check \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/*.mjs\" \"tests/**/*.mjs\"",
-    "build:observer": "pnpm --filter durable-actors-observer build",
-    "docs": "typedoc --options typedoc.json",
-    "build:client": "node scripts/build-client-runtime.mjs"
-  }
-}
+}

package/dist/cli/actor-source-watcher.d.ts

@@ -1,25 +0,0 @@
-import { watch } from "chokidar";
-interface ActorSourceWatcherOptions {
-    projectDirectory: string;
-    dataDirectory?: string;
-}
-declare function watchActorSources(options: ActorSourceWatcherOptions, refresh: () => Promise<void>): Promise<ActorSourceWatcher>;
-declare class ActorSourceWatcher {
-    private readonly options;
-    private readonly refresh;
-    private readonly createWatcher;
-    private readonly warn;
-    private watcher?;
-    private timer?;
-    private updates;
-    private closing?;
-    private disabled;
-    constructor(options: ActorSourceWatcherOptions, refresh: () => Promise<void>, createWatcher: typeof watch, warn: (message: string) => void);
-    start(): Promise<void>;
-    close(): Promise<void>;
-    private scheduleRefresh;
-    private waitUntilReady;
-    private disable;
-}
-export { ActorSourceWatcher, watchActorSources };
-//# sourceMappingURL=actor-source-watcher.d.ts.map

package/dist/cli/actor-source-watcher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"actor-source-watcher.d.ts","sourceRoot":"","sources":["../../src/cli/actor-source-watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,EAAE,MAAM,UAAU,CAAA;AAIhD,UAAU,yBAAyB;IAC/B,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,iBAAe,iBAAiB,CAC5B,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CAI7B;AAED,cAAM,kBAAkB;IAQhB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAVzB,OAAO,CAAC,OAAO,CAAC,CAAW;IAC3B,OAAO,CAAC,KAAK,CAAC,CAA+B;IAC7C,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,OAAO,CAAC,CAAe;IAC/B,OAAO,CAAC,QAAQ,CAAQ;gBAGH,OAAO,EAAE,yBAAyB,EAClC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAC5B,aAAa,EAAE,OAAO,KAAK,EAC3B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI;IAG9C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAY5B,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,cAAc;YAgBR,OAAO;CAUxB;AA0CD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAA"}