@xyo-network/xl1-driver-cloudflare-r2 4.3.3 → 4.4.1

package/README.md

@@ -5,104 +5,31 @@
 [![npm-badge][]][npm-link]
 [![license-badge][]][license-link]
 
-> Cloudflare R2 and S3-compatible map driver for XL1 protocol storage.
+> Deprecated compatibility package for `@xyo-network/xl1-driver-s3`.
 
 ## Description
 
-XL1 is the XYO Layer One blockchain protocol. This package provides `R2Map`, an
-S3-compatible `AsyncIterableMap` for Cloudflare R2 buckets. It stores each value
-as JSON under a deterministic object key and can optionally use an in-memory
-read-through cache.
+XL1 is the XYO Layer One blockchain protocol. This package is a compatibility
+stub. It re-exports `@xyo-network/xl1-driver-s3` — with the former `R2Map` /
+`R2MapParams` names aliased to `S3Map` / `S3MapParams` — so older imports keep
+working after the package rename.
 
-Use it for durable object-storage-backed maps in Node services and publishers.
+New code should install and import `@xyo-network/xl1-driver-s3` directly.
 
 ## Install
 
-Using npm:
+Use the renamed package for new code:
 
 ```sh
-npm i --save @xyo-network/xl1-driver-cloudflare-r2
+pnpm add @xyo-network/xl1-driver-s3
 ```
 
-Using yarn:
-
-```sh
-yarn add @xyo-network/xl1-driver-cloudflare-r2
-```
-
-Using pnpm:
+Install this package only to keep legacy imports compiling:
 
 ```sh
 pnpm add @xyo-network/xl1-driver-cloudflare-r2
 ```
 
-Using bun:
-
-```sh
-bun add @xyo-network/xl1-driver-cloudflare-r2
-```
-
-This package expects an `@aws-sdk/client-s3` `S3Client` configured for your R2
-or S3-compatible endpoint.
-
-## Usage
-
-```ts
-import { S3Client } from '@aws-sdk/client-s3'
-import { R2Map } from '@xyo-network/xl1-driver-cloudflare-r2'
-
-const client = new S3Client({
-  region: 'auto',
-  endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
-  credentials: { accessKeyId, secretAccessKey },
-})
-
-const map = await R2Map.create({
-  bucket: 'xl1-cache',
-  client,
-  prefix: 'blocks/',
-  getCache: { enabled: true },
-})
-
-await map.start()
-await map.set('head', { block: 42 })
-```
-
-## Documentation
-
-`R2Map` implements async `get`, `set`, `has`, `getMany`, `setMany`, `delete`,
-`clear`, and `for await...of` iteration over the matching object prefix.
-
-Use `@xyo-network/xl1-s3-publishers` when you need to publish the complete XL1
-static REST layout rather than a generic map abstraction.
-
-## AI Agent Skills
-
-Install the recommended XL1/XYO skills with [Skills.sh](https://skills.sh):
-
-```sh
-npx skills add XYOracleNetwork/xyo-skills --all
-```
-
-In XY toolchain repos, the equivalent convenience command is:
-
-```sh
-pnpm xy skills defaults
-pnpm xy skills lint --fix
-```
-
-For XL1 work, ask your agent to use `xyo-knowledge`, `xl1-knowledge`, and
-`xl1-patterns`. These skills cover XYO primitives, XL1 chain and gateway APIs,
-and application patterns for XL1 dApps.
-
-## Building Locally
-
-```sh
-pnpm xy build @xyo-network/xl1-driver-cloudflare-r2
-pnpm xy test @xyo-network/xl1-driver-cloudflare-r2
-pnpm xy lint @xyo-network/xl1-driver-cloudflare-r2
-```
-
 ## License
 
 See the [LICENSE](./LICENSE) file for license rights and limitations

package/dist/neutral/index.d.ts

@@ -1,2 +1,16 @@
-export * from './R2Map.ts';
+import type { S3MapParams } from '@xyo-network/xl1-driver-s3';
+import { S3Map } from '@xyo-network/xl1-driver-s3';
+/**
+ * @deprecated `@xyo-network/xl1-driver-cloudflare-r2` has been renamed to
+ * `@xyo-network/xl1-driver-s3` — import from there instead. This package
+ * is a compatibility stub that re-exports the renamed package and will be
+ * removed in a future major version.
+ */
+export * from '@xyo-network/xl1-driver-s3';
+/** @deprecated Renamed to `S3Map` in `@xyo-network/xl1-driver-s3`. */
+export declare const R2Map: typeof S3Map;
+/** @deprecated Renamed to `S3Map` in `@xyo-network/xl1-driver-s3`. */
+export type R2Map<K extends string = string, V extends {} = {}> = S3Map<K, V>;
+/** @deprecated Renamed to `S3MapParams` in `@xyo-network/xl1-driver-s3`. */
+export type R2MapParams = S3MapParams;
 //# sourceMappingURL=index.d.ts.map

package/dist/neutral/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD;;;;;GAKG;AACH,cAAc,4BAA4B,CAAA;AAE1C,sEAAsE;AACtE,eAAO,MAAM,KAAK,cAAQ,CAAA;AAC1B,sEAAsE;AACtE,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAC7E,4EAA4E;AAC5E,MAAM,MAAM,WAAW,GAAG,WAAW,CAAA"}

package/dist/neutral/index.mjs

@@ -1,168 +1,7 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-
-// src/R2Map.ts
-import {
-  AbstractCreatable,
-  assertEx,
-  creatable,
-  isDefined
-} from "@ariestools/sdk";
-import {
-  DeleteObjectCommand,
-  DeleteObjectsCommand,
-  GetObjectCommand,
-  HeadObjectCommand,
-  ListObjectsV2Command,
-  PutObjectCommand
-} from "@aws-sdk/client-s3";
-import { LruCacheMap } from "@xyo-network/xl1-sdk/driver-memory";
-var isNotFoundError = (error) => {
-  if (typeof error !== "object" || error === null) return false;
-  const { name, $metadata } = error;
-  return name === "NoSuchKey" || name === "NotFound" || $metadata?.httpStatusCode === 404;
-};
-var R2Map = class extends AbstractCreatable {
-  _getCache;
-  get bucket() {
-    return assertEx(this.params.bucket, () => "No bucket specified");
-  }
-  get client() {
-    return assertEx(this.params.client, () => "No client specified");
-  }
-  get prefix() {
-    return this.params.prefix ?? "";
-  }
-  /**
-   * Enable `for await...of` iteration over all entries in the map.
-   * Pages through ListObjectsV2 so no fixed result limit is applied.
-   */
-  [Symbol.asyncIterator]() {
-    let pageKeys = [];
-    let continuationToken;
-    let exhausted = false;
-    const loadNextPage = async () => {
-      const response = await this.client.send(new ListObjectsV2Command({
-        Bucket: this.bucket,
-        Prefix: this.prefix === "" ? void 0 : this.prefix,
-        ContinuationToken: continuationToken
-      }));
-      pageKeys = (response.Contents ?? []).map((object) => object.Key).filter(isDefined).map((key) => key.slice(this.prefix.length));
-      continuationToken = response.NextContinuationToken;
-      exhausted = continuationToken === void 0;
-    };
-    return {
-      next: async () => {
-        for (; ; ) {
-          while (pageKeys.length === 0) {
-            if (exhausted) return { value: void 0, done: true };
-            await loadNextPage();
-          }
-          const key = pageKeys.shift();
-          const value = await this.get(key);
-          if (value === void 0) continue;
-          return { value: [key, value], done: false };
-        }
-      }
-    };
-  }
-  async clear() {
-    await this._getCache?.clear();
-    let continuationToken;
-    do {
-      const response = await this.client.send(new ListObjectsV2Command({
-        Bucket: this.bucket,
-        Prefix: this.prefix === "" ? void 0 : this.prefix,
-        ContinuationToken: continuationToken
-      }));
-      const keys = (response.Contents ?? []).map((object) => object.Key).filter(isDefined);
-      if (keys.length > 0) {
-        await this.client.send(new DeleteObjectsCommand({
-          Bucket: this.bucket,
-          Delete: { Objects: keys.map((key) => ({ Key: key })) }
-        }));
-      }
-      continuationToken = response.NextContinuationToken;
-    } while (continuationToken !== void 0);
-  }
-  async delete(id) {
-    await this._getCache?.delete(id);
-    const existed = await this.has(id);
-    await this.client.send(new DeleteObjectCommand({ Bucket: this.bucket, Key: this.objectKey(id) }));
-    return existed;
-  }
-  async get(id) {
-    if (this._getCache) {
-      const getCacheResult = await this._getCache.get(id);
-      if (getCacheResult) {
-        return getCacheResult;
-      }
-    }
-    try {
-      const response = await this.client.send(new GetObjectCommand({ Bucket: this.bucket, Key: this.objectKey(id) }));
-      const body = await response.Body?.transformToString();
-      if (body === void 0) return void 0;
-      const value = JSON.parse(body);
-      await this._getCache?.set(id, value);
-      return value;
-    } catch (error) {
-      if (isNotFoundError(error)) return void 0;
-      throw error;
-    }
-  }
-  async getMany(ids) {
-    const results = await Promise.all(ids.map((id) => this.get(id)));
-    return results.filter(isDefined);
-  }
-  async has(id) {
-    if (this._getCache) {
-      const getCacheResult = await this._getCache.has(id);
-      if (getCacheResult) return getCacheResult;
-    }
-    try {
-      await this.client.send(new HeadObjectCommand({ Bucket: this.bucket, Key: this.objectKey(id) }));
-      return true;
-    } catch (error) {
-      if (isNotFoundError(error)) return false;
-      throw error;
-    }
-  }
-  async set(id, data) {
-    await this.client.send(new PutObjectCommand({
-      Bucket: this.bucket,
-      Key: this.objectKey(id),
-      Body: JSON.stringify(data),
-      ContentType: "application/json"
-    }));
-    await this._getCache?.set(id, data);
-  }
-  async setMany(entries) {
-    for (const [key, value] of entries) {
-      await this.set(key, value);
-    }
-  }
-  async startHandler() {
-    await super.startHandler();
-    if (this.params.getCache?.enabled === true) {
-      const maxEntries = this.params.getCache?.maxEntries ?? 5e3;
-      this._getCache = new LruCacheMap({ max: maxEntries });
-    }
-  }
-  objectKey(id) {
-    return `${this.prefix}${id}`;
-  }
-};
-R2Map = __decorateClass([
-  creatable()
-], R2Map);
+// src/index.ts
+import { S3Map } from "@xyo-network/xl1-driver-s3";
+export * from "@xyo-network/xl1-driver-s3";
+var R2Map = S3Map;
 export {
   R2Map
 };

package/dist/neutral/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../src/R2Map.ts"],
-  "sourcesContent": ["import type { CreatableParams } from '@ariestools/sdk'\nimport {\n  AbstractCreatable, assertEx, creatable, isDefined,\n} from '@ariestools/sdk'\nimport type { S3Client } from '@aws-sdk/client-s3'\nimport {\n  DeleteObjectCommand, DeleteObjectsCommand, GetObjectCommand, HeadObjectCommand, ListObjectsV2Command, PutObjectCommand,\n} from '@aws-sdk/client-s3'\nimport type { AsyncIterableMap, MapType } from '@xyo-network/xl1-protocol/protocol-lib'\nimport { LruCacheMap } from '@xyo-network/xl1-sdk/driver-memory'\n\nexport interface R2MapParams extends CreatableParams {\n  bucket: string\n  /**\n   * S3-compatible client pointed at the Cloudflare R2 endpoint\n   * (`https://<account-id>.r2.cloudflarestorage.com`).\n   */\n  client: S3Client\n  getCache?: {\n    enabled: boolean\n    maxEntries?: number\n  }\n  /** Optional key prefix, allowing multiple maps to share one bucket. */\n  prefix?: string\n}\n\nconst isNotFoundError = (error: unknown): boolean => {\n  if (typeof error !== 'object' || error === null) return false\n  const { name, $metadata } = error as { $metadata?: { httpStatusCode?: number }; name?: string }\n  return name === 'NoSuchKey' || name === 'NotFound' || $metadata?.httpStatusCode === 404\n}\n\n@creatable()\nexport class R2Map<K extends string = string, V extends {} = {}>\n  extends AbstractCreatable<R2MapParams>\n  implements AsyncIterableMap<K, V> {\n  private _getCache: MapType<K, V> | undefined\n\n  get bucket(): string {\n    return assertEx(this.params.bucket, () => 'No bucket specified')\n  }\n\n  get client(): S3Client {\n    return assertEx(this.params.client, () => 'No client specified')\n  }\n\n  get prefix(): string {\n    return this.params.prefix ?? ''\n  }\n\n  /**\n   * Enable `for await...of` iteration over all entries in the map.\n   * Pages through ListObjectsV2 so no fixed result limit is applied.\n   */\n  [Symbol.asyncIterator](): AsyncIterator<[K, V]> {\n    // Keys from the current page, drained front-to-back as the iterator advances.\n    let pageKeys: K[] = []\n    // Continuation token for the next page; undefined once the final page is consumed.\n    let continuationToken: string | undefined\n    let exhausted = false\n\n    const loadNextPage = async (): Promise<void> => {\n      const response = await this.client.send(new ListObjectsV2Command({\n        Bucket: this.bucket,\n        Prefix: this.prefix === '' ? undefined : this.prefix,\n        ContinuationToken: continuationToken,\n      }))\n      pageKeys = (response.Contents ?? [])\n        .map(object => object.Key)\n        .filter(isDefined)\n        .map(key => key.slice(this.prefix.length) as K)\n      continuationToken = response.NextContinuationToken\n      exhausted = continuationToken === undefined\n    }\n\n    return {\n      next: async (): Promise<IteratorResult<[K, V]>> => {\n        for (;;) {\n          // Refill from the next page whenever the current one is drained.\n          while (pageKeys.length === 0) {\n            if (exhausted) return { value: undefined, done: true }\n            await loadNextPage()\n          }\n\n          const key = pageKeys.shift()!\n          const value = await this.get(key)\n          // The object may have been deleted between listing and reading; skip it.\n          if (value === undefined) continue\n\n          // Yield the entry to the async iterator consumer (get() already populated the cache).\n          return { value: [key, value], done: false }\n        }\n      },\n    }\n  }\n\n  async clear(): Promise<void> {\n    await this._getCache?.clear()\n    // DeleteObjects accepts at most 1000 keys per request; page through the bucket until empty.\n    let continuationToken: string | undefined\n    do {\n      const response = await this.client.send(new ListObjectsV2Command({\n        Bucket: this.bucket,\n        Prefix: this.prefix === '' ? undefined : this.prefix,\n        ContinuationToken: continuationToken,\n      }))\n      const keys = (response.Contents ?? []).map(object => object.Key).filter(isDefined)\n      if (keys.length > 0) {\n        await this.client.send(new DeleteObjectsCommand({\n          Bucket: this.bucket,\n          Delete: { Objects: keys.map(key => ({ Key: key })) },\n        }))\n      }\n      continuationToken = response.NextContinuationToken\n    } while (continuationToken !== undefined)\n  }\n\n  async delete(id: K): Promise<boolean> {\n    await this._getCache?.delete(id)\n\n    // S3-style deletes are idempotent and do not report prior existence, so check first.\n    const existed = await this.has(id)\n    await this.client.send(new DeleteObjectCommand({ Bucket: this.bucket, Key: this.objectKey(id) }))\n    return existed\n  }\n\n  async get(id: K): Promise<V | undefined> {\n    if (this._getCache) {\n      const getCacheResult = await this._getCache.get(id)\n      if (getCacheResult) {\n        return getCacheResult\n      }\n    }\n    try {\n      const response = await this.client.send(new GetObjectCommand({ Bucket: this.bucket, Key: this.objectKey(id) }))\n      const body = await response.Body?.transformToString()\n      if (body === undefined) return undefined\n      const value = JSON.parse(body) as V\n      await this._getCache?.set(id, value)\n      return value\n    } catch (error) {\n      if (isNotFoundError(error)) return undefined\n      throw error\n    }\n  }\n\n  async getMany(ids: K[]): Promise<V[]> {\n    const results = await Promise.all(ids.map(id => this.get(id)))\n    return results.filter(isDefined)\n  }\n\n  async has(id: K): Promise<boolean> {\n    if (this._getCache) {\n      const getCacheResult = await this._getCache.has(id)\n      if (getCacheResult) return getCacheResult\n    }\n    try {\n      await this.client.send(new HeadObjectCommand({ Bucket: this.bucket, Key: this.objectKey(id) }))\n      return true\n    } catch (error) {\n      if (isNotFoundError(error)) return false\n      throw error\n    }\n  }\n\n  async set(id: K, data: V): Promise<void> {\n    await this.client.send(new PutObjectCommand({\n      Bucket: this.bucket,\n      Key: this.objectKey(id),\n      Body: JSON.stringify(data),\n      ContentType: 'application/json',\n    }))\n    await this._getCache?.set(id, data)\n  }\n\n  async setMany(entries: [K, V][]): Promise<void> {\n    // TODO: Optimize with bounded concurrency\n    for (const [key, value] of entries) {\n      await this.set(key, value)\n    }\n  }\n\n  override async startHandler(): Promise<void> {\n    await super.startHandler()\n    if (this.params.getCache?.enabled === true) {\n      const maxEntries = this.params.getCache?.maxEntries ?? 5000\n      this._getCache = new LruCacheMap<K, V>({ max: maxEntries })\n    }\n  }\n\n  private objectKey(id: K): string {\n    return `${this.prefix}${id}`\n  }\n}\n"],
-  "mappings": "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",
+  "sources": ["../../src/index.ts"],
+  "sourcesContent": ["import type { S3MapParams } from '@xyo-network/xl1-driver-s3'\nimport { S3Map } from '@xyo-network/xl1-driver-s3'\n\n/**\n * @deprecated `@xyo-network/xl1-driver-cloudflare-r2` has been renamed to\n * `@xyo-network/xl1-driver-s3` \u2014 import from there instead. This package\n * is a compatibility stub that re-exports the renamed package and will be\n * removed in a future major version.\n */\nexport * from '@xyo-network/xl1-driver-s3'\n\n/** @deprecated Renamed to `S3Map` in `@xyo-network/xl1-driver-s3`. */\nexport const R2Map = S3Map\n/** @deprecated Renamed to `S3Map` in `@xyo-network/xl1-driver-s3`. */\nexport type R2Map<K extends string = string, V extends {} = {}> = S3Map<K, V>\n/** @deprecated Renamed to `S3MapParams` in `@xyo-network/xl1-driver-s3`. */\nexport type R2MapParams = S3MapParams\n"],
+  "mappings": ";AACA,SAAS,aAAa;AAQtB,cAAc;AAGP,IAAM,QAAQ;",
   "names": []
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-driver-cloudflare-r2",
-  "version": "4.3.3",
-  "description": "XYO Layer One SDK Protocol Cloudflare R2 Driver",
+  "version": "4.4.1",
+  "description": "DEPRECATED: renamed to @xyo-network/xl1-driver-s3 — this package re-exports it (with R2Map aliased to S3Map) for backward compatibility",
   "homepage": "https://xylabs.com",
   "bugs": {
     "url": "https://github.com/XYOracleNetwork/xl1-protocol/issues",
@@ -35,31 +35,23 @@
     "README.md"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "~3.1086.0",
-    "@xyo-network/xl1-protocol": "~4.3.3",
-    "@xyo-network/xl1-sdk": "~4.3.3"
+    "@xyo-network/xl1-driver-s3": "~4.4.1"
   },
   "devDependencies": {
     "@ariestools/sdk": "~8.1.0",
-    "@ariestools/toolchain": "~8.7.11",
-    "@ariestools/tsconfig": "~8.7.11",
+    "@ariestools/toolchain": "~8.7.12",
+    "@ariestools/tsconfig": "~8.7.12",
     "@metamask/json-rpc-engine": "~10.5.0",
     "@opentelemetry/api": "~1.9.1",
-    "@xyo-network/sdk": "~7.1.1",
-    "@xyo-network/sdk-protocol": "~7.1.0",
+    "@xyo-network/sdk": "~7.2.0",
+    "@xyo-network/sdk-protocol": "~7.2.0",
     "ajv": "~8.20.0",
     "async-mutex": "~0.5.0",
     "eslint": "~10.7.0",
     "ethers": "~6.17.0",
-    "tslib": "~2.8.1",
     "typescript": "~6.0.3",
-    "vite": "~8.1.4",
-    "vitest": "~4.1.10",
     "zod": "~4.4.3"
   },
-  "peerDependencies": {
-    "@ariestools/sdk": "^8.1"
-  },
   "engines": {
     "node": ">=22.3"
   },

package/dist/neutral/R2Map.d.ts

@@ -1,39 +0,0 @@
-import type { CreatableParams } from '@ariestools/sdk';
-import { AbstractCreatable } from '@ariestools/sdk';
-import type { S3Client } from '@aws-sdk/client-s3';
-import type { AsyncIterableMap } from '@xyo-network/xl1-protocol/protocol-lib';
-export interface R2MapParams extends CreatableParams {
-    bucket: string;
-    /**
-     * S3-compatible client pointed at the Cloudflare R2 endpoint
-     * (`https://<account-id>.r2.cloudflarestorage.com`).
-     */
-    client: S3Client;
-    getCache?: {
-        enabled: boolean;
-        maxEntries?: number;
-    };
-    /** Optional key prefix, allowing multiple maps to share one bucket. */
-    prefix?: string;
-}
-export declare class R2Map<K extends string = string, V extends {} = {}> extends AbstractCreatable<R2MapParams> implements AsyncIterableMap<K, V> {
-    private _getCache;
-    get bucket(): string;
-    get client(): S3Client;
-    get prefix(): string;
-    /**
-     * Enable `for await...of` iteration over all entries in the map.
-     * Pages through ListObjectsV2 so no fixed result limit is applied.
-     */
-    [Symbol.asyncIterator](): AsyncIterator<[K, V]>;
-    clear(): Promise<void>;
-    delete(id: K): Promise<boolean>;
-    get(id: K): Promise<V | undefined>;
-    getMany(ids: K[]): Promise<V[]>;
-    has(id: K): Promise<boolean>;
-    set(id: K, data: V): Promise<void>;
-    setMany(entries: [K, V][]): Promise<void>;
-    startHandler(): Promise<void>;
-    private objectKey;
-}
-//# sourceMappingURL=R2Map.d.ts.map

package/dist/neutral/R2Map.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"R2Map.d.ts","sourceRoot":"","sources":["../../src/R2Map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,EACL,iBAAiB,EAClB,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAIlD,OAAO,KAAK,EAAE,gBAAgB,EAAW,MAAM,wCAAwC,CAAA;AAGvF,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,MAAM,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,MAAM,EAAE,QAAQ,CAAA;IAChB,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAA;QAChB,UAAU,CAAC,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAQD,qBACa,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAC7D,SAAQ,iBAAiB,CAAC,WAAW,CACrC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC;IACjC,OAAO,CAAC,SAAS,CAA2B;IAE5C,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,QAAQ,CAErB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IA0CzC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBtB,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAS/B,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAoBlC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAK/B,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAc5B,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C,OAAO,CAAC,SAAS;CAGlB"}