@libp2p/keychain 4.1.6-dd7b329c4 → 4.1.6-e1ca9cced

package/dist/src/index.d.ts

@@ -50,9 +50,8 @@
  *
  * A key benefit is that now the key chain can be used in browser with the [js-datastore-level](https://github.com/ipfs/js-datastore-level) implementation.
  */
-import type { ComponentLogger, KeyType, PeerId } from '@libp2p/interface';
+import type { ComponentLogger, PrivateKey } from '@libp2p/interface';
 import type { Datastore } from 'interface-datastore';
-import type { Multibase } from 'multiformats/bases/interface.js';
 export interface DEKConfig {
     hash: string;
     salt: string;
@@ -79,68 +78,60 @@ export interface KeyInfo {
 }
 export interface Keychain {
     /**
-     * Export an existing key as a PEM encrypted PKCS #8 string.
+     * Find a key by name
      *
      * @example
      *
      * ```TypeScript
-     * await libp2p.services.keychain.createKey('keyTest', 'RSA', 4096)
-     * const pemKey = await libp2p.services.keychain.exportKey('keyTest', 'password123')
-     * ```
-     */
-    exportKey(name: string, password: string): Promise<Multibase<'m'>>;
-    /**
-     * Import a new key from a PEM encoded PKCS #8 string.
+     * import { generateKeyPair } from '@libp2p/crypto/keys'
      *
-     * @example
-     *
-     * ```TypeScript
-     * await libp2p.services.keychain.createKey('keyTest', 'RSA', 4096)
-     * const pemKey = await libp2p.services.keychain.exportKey('keyTest', 'password123')
-     * const keyInfo = await libp2p.services.keychain.importKey('keyTestImport', pemKey, 'password123')
+     * const key = await generateKeyPair('Ed25519')
+     * const keyInfo = await libp2p.keychain.importKey('my-key', key)
+     * const keyInfo2 = await libp2p.keychain.findKeyByName(keyInfo.name)
      * ```
      */
-    importKey(name: string, pem: string, password: string): Promise<KeyInfo>;
+    findKeyByName(name: string): Promise<KeyInfo>;
     /**
-     * Import a new key from a PeerId with a private key component
+     * Find a key by id
      *
      * @example
      *
      * ```TypeScript
-     * const keyInfo = await libp2p.services.keychain.importPeer('keyTestImport', peerIdFromString('12D3Foo...'))
-     * ```
-     */
-    importPeer(name: string, peerId: PeerId): Promise<KeyInfo>;
-    /**
-     * Export an existing key as a PeerId
+     * import { generateKeyPair } from '@libp2p/crypto/keys'
      *
-     * @example
-     *
-     * ```TypeScript
-     * const peerId = await libp2p.services.keychain.exportPeerId('key-name')
+     * const key = await generateKeyPair('Ed25519')
+     * const keyInfo = await libp2p.keychain.importKey('my-key', key)
+     * const keyInfo2 = await libp2p.keychain.findKeyById(keyInfo.id)
      * ```
      */
-    exportPeerId(name: string): Promise<PeerId>;
+    findKeyById(id: string): Promise<KeyInfo>;
     /**
-     * Create a key in the keychain.
+     * Import a new private key.
      *
      * @example
      *
      * ```TypeScript
-     * const keyInfo = await libp2p.services.keychain.createKey('keyTest', 'RSA', 4096)
+     * import { generateKeyPair } from '@libp2p/crypto/keys'
+     *
+     * const key = await generateKeyPair('Ed25519')
+     * const keyInfo = await libp2p.keychain.importKey('my-key', key)
      * ```
      */
-    createKey(name: string, type: KeyType, size?: number): Promise<KeyInfo>;
+    importKey(name: string, key: PrivateKey): Promise<KeyInfo>;
     /**
-     * List all the keys.
+     * Export an existing private key.
      *
      * @example
      *
      * ```TypeScript
-     * const keyInfos = await libp2p.services.keychain.listKeys()
+     * import { generateKeyPair } from '@libp2p/crypto/keys'
+     *
+     * const key = await generateKeyPair('Ed25519')
+     * const keyInfo = await libp2p.keychain.importKey('my-key', key)
+     * const key = await libp2p.keychain.exportKey(keyInfo.id)
      * ```
      */
-    listKeys(): Promise<KeyInfo[]>;
+    exportKey(name: string): Promise<PrivateKey>;
     /**
      * Removes a key from the keychain.
      *
@@ -153,7 +144,8 @@ export interface Keychain {
      */
     removeKey(name: string): Promise<KeyInfo>;
     /**
-     * Rename a key in the keychain.
+     * Rename a key in the keychain. This is done in a batch commit with rollback
+     * so errors thrown during the operation will not cause key loss.
      *
      * @example
      *
@@ -164,27 +156,15 @@ export interface Keychain {
      */
     renameKey(oldName: string, newName: string): Promise<KeyInfo>;
     /**
-     * Find a key by it's id.
-     *
-     * @example
-     *
-     * ```TypeScript
-     * const keyInfo = await libp2p.services.keychain.createKey('keyTest', 'RSA', 4096)
-     * const keyInfo2 = await libp2p.services.keychain.findKeyById(keyInfo.id)
-     * ```
-     */
-    findKeyById(id: string): Promise<KeyInfo>;
-    /**
-     * Find a key by it's name.
+     * List all the keys.
      *
      * @example
      *
      * ```TypeScript
-     * const keyInfo = await libp2p.services.keychain.createKey('keyTest', 'RSA', 4096)
-     * const keyInfo2 = await libp2p.services.keychain.findKeyByName('keyTest')
+     * const keyInfos = await libp2p.keychain.listKeys()
      * ```
      */
-    findKeyByName(name: string): Promise<KeyInfo>;
+    listKeys(): Promise<KeyInfo[]>;
     /**
      * Rotate keychain password and re-encrypt all associated keys
      *

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAEhE,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,SAAS,CAAA;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IAEV;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,QAAQ;IACvB;;;;;;;;;OASG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAElE;;;;;;;;;;OAUG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAExE;;;;;;;;OAQG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAE1D;;;;;;;;OAQG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAE3C;;;;;;;;OAQG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAEvE;;;;;;;;OAQG;IACH,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAE9B;;;;;;;;;OASG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAEzC;;;;;;;;;OASG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAE7D;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAEzC;;;;;;;;;OASG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAE7C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpE;AAED,wBAAgB,QAAQ,CAAE,IAAI,GAAE,YAAiB,GAAG,CAAC,UAAU,EAAE,kBAAkB,KAAK,QAAQ,CAI/F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,SAAS,CAAA;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,MAAM,WAAW,OAAO;IACtB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAA;IAEV;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,QAAQ;IACvB;;;;;;;;;;;;OAYG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAE7C;;;;;;;;;;;;OAYG;IACH,WAAW,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAE1C;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAE1D;;;;;;;;;;;;OAYG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAE5C;;;;;;;;;OASG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAEzC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAE7D;;;;;;;;OAQG;IACH,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAE9B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpE;AAED,wBAAgB,QAAQ,CAAE,IAAI,GAAE,YAAiB,GAAG,CAAC,UAAU,EAAE,kBAAkB,KAAK,QAAQ,CAI/F"}

package/dist/src/index.js

@@ -50,10 +50,10 @@
  *
  * A key benefit is that now the key chain can be used in browser with the [js-datastore-level](https://github.com/ipfs/js-datastore-level) implementation.
  */
-import { DefaultKeychain } from './keychain.js';
+import { Keychain as KeychainClass } from './keychain.js';
 export function keychain(init = {}) {
     return (components) => {
-        return new DefaultKeychain(components, init);
+        return new KeychainClass(components, init);
     };
 }
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAoK/C,MAAM,UAAU,QAAQ,CAAE,OAAqB,EAAE;IAC/C,OAAO,CAAC,UAA8B,EAAE,EAAE;QACxC,OAAO,IAAI,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAC9C,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AAEH,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,eAAe,CAAA;AA6IzD,MAAM,UAAU,QAAQ,CAAE,OAAqB,EAAE;IAC/C,OAAO,CAAC,UAA8B,EAAE,EAAE;QACxC,OAAO,IAAI,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IAC5C,CAAC,CAAA;AACH,CAAC"}

package/dist/src/keychain.d.ts

@@ -1,6 +1,6 @@
 import { serviceCapabilities } from '@libp2p/interface';
-import type { KeychainComponents, KeychainInit, Keychain, KeyInfo } from './index.js';
-import type { KeyType, PeerId } from '@libp2p/interface';
+import type { KeychainComponents, KeychainInit, Keychain as KeychainInterface, KeyInfo } from './index.js';
+import type { PrivateKey } from '@libp2p/interface';
 declare const defaultOptions: {
     dek: {
         keyLength: number;
@@ -9,6 +9,7 @@ declare const defaultOptions: {
         hash: string;
     };
 };
+export declare function keyId(key: PrivateKey): Promise<string>;
 /**
  * Manages the lifecycle of a key. Keys are encrypted at rest using PKCS #8.
  *
@@ -17,7 +18,7 @@ declare const defaultOptions: {
  * - '/pkcs8/*key-name*', contains the PKCS #8 for the key
  *
  */
-export declare class DefaultKeychain implements Keychain {
+export declare class Keychain implements KeychainInterface {
     private readonly components;
     private readonly init;
     private readonly log;
@@ -40,38 +41,17 @@ export declare class DefaultKeychain implements Keychain {
      * @returns {object}
      */
     static get options(): typeof defaultOptions;
-    /**
-     * Create a new key.
-     *
-     * @param {string} name - The local key name; cannot already exist.
-     * @param {string} type - One of the key types; 'rsa'.
-     * @param {number} [size = 2048] - The key size in bits. Used for rsa keys only
-     */
-    createKey(name: string, type: KeyType, size?: number): Promise<KeyInfo>;
+    findKeyByName(name: string): Promise<KeyInfo>;
+    findKeyById(id: string): Promise<KeyInfo>;
+    importKey(name: string, key: PrivateKey): Promise<KeyInfo>;
+    exportKey(name: string): Promise<PrivateKey>;
+    removeKey(name: string): Promise<KeyInfo>;
     /**
      * List all the keys.
      *
      * @returns {Promise<KeyInfo[]>}
      */
     listKeys(): Promise<KeyInfo[]>;
-    /**
-     * Find a key by it's id
-     */
-    findKeyById(id: string): Promise<KeyInfo>;
-    /**
-     * Find a key by it's name.
-     *
-     * @param {string} name - The local key name.
-     * @returns {Promise<KeyInfo>}
-     */
-    findKeyByName(name: string): Promise<KeyInfo>;
-    /**
-     * Remove an existing key.
-     *
-     * @param {string} name - The local key name; must already exist.
-     * @returns {Promise<KeyInfo>}
-     */
-    removeKey(name: string): Promise<KeyInfo>;
     /**
      * Rename a key
      *
@@ -80,31 +60,6 @@ export declare class DefaultKeychain implements Keychain {
      * @returns {Promise<KeyInfo>}
      */
     renameKey(oldName: string, newName: string): Promise<KeyInfo>;
-    /**
-     * Export an existing key as a PEM encrypted PKCS #8 string
-     */
-    exportKey(name: string, password: string): Promise<string>;
-    /**
-     * Export an existing key as a PeerId
-     */
-    exportPeerId(name: string): Promise<PeerId>;
-    /**
-     * Import a new key from a PEM encoded PKCS #8 string
-     *
-     * @param {string} name - The local key name; must not already exist.
-     * @param {string} pem - The PEM encoded PKCS #8 string
-     * @param {string} password - The password.
-     * @returns {Promise<KeyInfo>}
-     */
-    importKey(name: string, pem: string, password: string): Promise<KeyInfo>;
-    /**
-     * Import a peer key
-     */
-    importPeer(name: string, peer: PeerId): Promise<KeyInfo>;
-    /**
-     * Gets the private key as PEM encoded PKCS #8 string
-     */
-    getPrivateKey(name: string): Promise<string>;
     /**
      * Rotate keychain password and re-encrypt all associated keys
      */

package/dist/src/keychain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../src/keychain.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAQlE,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACrF,OAAO,KAAK,EAAU,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAahE,QAAA,MAAM,cAAc;;;;;;;CAQnB,CAAA;AAwCD;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,QAAQ;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;IAC/C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAE5B;;OAEG;gBACU,UAAU,EAAE,kBAAkB,EAAE,IAAI,EAAE,YAAY;IA+B/D,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,sBAAqB;IAElD,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAEvC;IAED;;;;OAIG;IACH,MAAM,CAAC,eAAe,IAAK,YAAY;IAOvC;;;;;OAKG;IACH,MAAM,KAAK,OAAO,IAAK,OAAO,cAAc,CAE3C;IAED;;;;;;OAMG;IACG,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,SAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA0D5E;;;;OAIG;IACG,QAAQ,IAAK,OAAO,CAAC,OAAO,EAAE,CAAC;IAarC;;OAEG;IACG,WAAW,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBhD;;;;;OAKG;IACG,aAAa,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBpD;;;;;OAKG;IACG,SAAS,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAchD;;;;;;OAMG;IACG,SAAS,CAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCpE;;OAEG;IACG,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA+BjE;;OAEG;IACG,YAAY,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQlD;;;;;;;OAOG;IACG,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAoD/E;;OAEG;IACG,UAAU,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4C/D;;OAEG;IACG,aAAa,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBnD;;OAEG;IACG,kBAAkB,CAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAmD3E"}
+{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../src/keychain.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyC,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAU9F,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,QAAQ,IAAI,iBAAiB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAC1G,OAAO,KAAK,EAAU,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAa3D,QAAA,MAAM,cAAc;;;;;;;CAQnB,CAAA;AAwCD,wBAAsB,KAAK,CAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAK7D;AAED;;;;;;;GAOG;AACH,qBAAa,QAAS,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;IAC/C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAE5B;;OAEG;gBACU,UAAU,EAAE,kBAAkB,EAAE,IAAI,EAAE,YAAY;IA+B/D,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,sBAAqB;IAElD,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAEvC;IAED;;;;OAIG;IACH,MAAM,CAAC,eAAe,IAAK,YAAY;IAOvC;;;;;OAKG;IACH,MAAM,KAAK,OAAO,IAAK,OAAO,cAAc,CAE3C;IAEK,aAAa,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB9C,WAAW,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB1C,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IA6C3D,SAAS,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAyB7C,SAAS,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBhD;;;;OAIG;IACG,QAAQ,IAAK,OAAO,CAAC,OAAO,EAAE,CAAC;IAarC;;;;;;OAMG;IACG,SAAS,CAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAuCpE;;OAEG;IACG,kBAAkB,CAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAmD3E"}