@xyo-network/metamask-connector 4.0.3 → 4.1.0

package/{dist/types → build/browser}/MetaMaskConnector.d.ts

@@ -1,5 +1,9 @@
+import type { MetaMaskInpageProvider } from '@metamask/providers';
 import type { Listener } from 'ethers';
 import { BrowserProvider } from 'ethers';
+declare global {
+    var ethereum: MetaMaskInpageProvider | undefined;
+}
 export declare class MetaMaskConnector {
     private account;
     private ethereum;
@@ -7,10 +11,10 @@ export declare class MetaMaskConnector {
     private provider;
     private providerListeners;
     constructor(provider?: BrowserProvider);
-    get chainId(): string | null;
-    get currentAccount(): string | null;
+    get chainId(): string | null | undefined;
+    get currentAccount(): string | null | undefined;
     connectWallet(): Promise<void>;
-    isMetaMaskInstalled(): true;
+    isMetaMaskInstalled(): true | undefined;
     isWalletIsConnected: () => boolean;
     /**
      * EIP-1193 Event Listeners

package/build/browser/MetaMaskConnector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAGjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAExC,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;CACjD;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAsB;IAEtC,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,8BAEV;IAED,IAAI,cAAc,8BAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAWjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAOvD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAOnE,2BAA2B,IAAI,IAAI;IAMnC,OAAO,CAAC,kBAAkB;CAG3B"}

package/dist/browser/index.d.ts

@@ -0,0 +1,40 @@
+import { MetaMaskInpageProvider } from '@metamask/providers';
+import { BrowserProvider, Listener } from 'ethers';
+
+declare global {
+    var ethereum: MetaMaskInpageProvider | undefined;
+}
+declare class MetaMaskConnector {
+    private account;
+    private ethereum;
+    private listeners;
+    private provider;
+    private providerListeners;
+    constructor(provider?: BrowserProvider);
+    get chainId(): string | null | undefined;
+    get currentAccount(): string | null | undefined;
+    connectWallet(): Promise<void>;
+    isMetaMaskInstalled(): true | undefined;
+    isWalletIsConnected: () => boolean;
+    /**
+     * EIP-1193 Event Listeners
+     *
+     * .on in Web3Provider does not understand EIP-1193 events
+     * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893
+     */
+    providerOnAccountsChanged(listener: Listener): void;
+    providerOnChainChanged(listener: Listener): void;
+    providerOnConnect(listener: Listener): void;
+    providerOnDisconnect(listener: Listener): void;
+    providerRemoveListener(event: string, listener: Listener): void;
+    providerRemoveListeners(): void;
+    requestAccounts(): Promise<string[] | null>;
+    signMessage(message: string): Promise<string | undefined>;
+    /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */
+    web3ProviderOn(event: string, listener: Listener): void;
+    web3ProviderRemoveListener(event: string, listener: Listener): void;
+    web3ProviderRemoveListeners(): void;
+    private logProviderMissing;
+}
+
+export { MetaMaskConnector };

package/dist/browser/index.mjs

@@ -1,5 +1,6 @@
 // src/MetaMaskConnector.ts
 import { forget } from "@xylabs/forget";
+import { isString } from "@xylabs/typeof";
 import { BrowserProvider } from "ethers";
 var MetaMaskConnector = class {
   account = "";
@@ -11,7 +12,7 @@ var MetaMaskConnector = class {
     if (provider) {
       this.provider = provider;
     } else if (this.ethereum) {
-      this.provider = new BrowserProvider(globalThis.ethereum);
+      this.provider = new BrowserProvider(this.ethereum);
     }
   }
   get chainId() {
@@ -37,7 +38,7 @@ var MetaMaskConnector = class {
     return this.ethereum && this.ethereum.isMetaMask;
   }
   isWalletIsConnected = () => {
-    if (this.currentAccount) {
+    if (isString(this.currentAccount)) {
       console.log("Found an authorized account:", this.ethereum?.selectedAddress);
       return true;
     }

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/MetaMaskConnector.ts"],"sourcesContent":["import type { MetaMaskInpageProvider } from '@metamask/providers'\nimport { forget } from '@xylabs/forget'\nimport type { Listener } from 'ethers'\nimport { BrowserProvider } from 'ethers'\n\nexport class MetaMaskConnector {\n  private account = ''\n  private ethereum = globalThis.ethereum as MetaMaskInpageProvider\n\n  private listeners: Listener[] = []\n  private provider: BrowserProvider | undefined\n  private providerListeners: [event: string, listener: Listener][] = []\n\n  constructor(provider?: BrowserProvider) {\n    if (provider) {\n      this.provider = provider\n    } else if (this.ethereum) {\n      this.provider = new BrowserProvider(globalThis.ethereum)\n    }\n  }\n\n  get chainId() {\n    return this.ethereum?.networkVersion\n  }\n\n  get currentAccount() {\n    return this.ethereum?.selectedAddress\n  }\n\n  async connectWallet() {\n    if (!this.provider) {\n      this.logProviderMissing()\n      return\n    }\n\n    const accounts = await this.provider.send('eth_requestAccounts', [])\n    // We could have multiple accounts. Check for one.\n    if (accounts.length > 0) {\n      this.account = accounts[0]\n      console.log('Connected:', this.account)\n    } else {\n      console.log('No authorized account found.')\n    }\n  }\n\n  isMetaMaskInstalled() {\n    return this.ethereum && this.ethereum.isMetaMask\n  }\n\n  isWalletIsConnected = () => {\n    if (this.currentAccount) {\n      console.log('Found an authorized account:', this.ethereum?.selectedAddress)\n      return true\n    }\n    return false\n  }\n\n  /**\n   * EIP-1193 Event Listeners\n   *\n   * .on in Web3Provider does not understand EIP-1193 events\n   * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893\n   */\n  providerOnAccountsChanged(listener: Listener) {\n    this.ethereum?.on('accountsChanged', listener)\n    this.providerListeners.push(['accountsChanged', listener])\n  }\n\n  providerOnChainChanged(listener: Listener) {\n    this.ethereum?.on('chainChanged', listener)\n    this.providerListeners.push(['chainChanged', listener])\n  }\n\n  providerOnConnect(listener: Listener) {\n    this.ethereum?.on('connect', listener)\n    this.providerListeners.push(['connect', listener])\n  }\n\n  providerOnDisconnect(listener: Listener) {\n    this.ethereum?.on('disconnect', listener)\n    this.providerListeners.push(['disconnect', listener])\n  }\n\n  providerRemoveListener(event: string, listener: Listener) {\n    // this.ethereum?.removeListener(event, listener)\n    this.providerListeners = this.providerListeners.filter(([, savedListener]) => listener !== savedListener)\n  }\n\n  providerRemoveListeners() {\n    // for (const [event, listener] of this.providerListeners) this.ethereum?.removeListener(event, listener)\n  }\n\n  async requestAccounts(): Promise<string[] | null> {\n    if (!this.provider) {\n      this.logProviderMissing()\n      return null\n    }\n\n    return await this.provider.send('eth_requestAccounts', [])\n  }\n\n  async signMessage(message: string) {\n    if (!this.provider) {\n      this.logProviderMissing()\n      return\n    }\n\n    const signer = await this.provider.getSigner()\n    await signer.getAddress()\n    return await signer.signMessage(message)\n  }\n\n  /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */\n  web3ProviderOn(event: string, listener: Listener): void {\n    if (this.provider) {\n      forget(this.provider.on(event, listener))\n    }\n    this.listeners.push(listener)\n  }\n\n  web3ProviderRemoveListener(event: string, listener: Listener): void {\n    if (this.provider) {\n      forget(this.provider.removeListener(event, listener))\n    }\n    this.listeners = this.listeners.filter(savedListener => listener !== savedListener)\n  }\n\n  web3ProviderRemoveListeners(): void {\n    if (this.provider) {\n      forget(this.provider.removeAllListeners())\n    }\n  }\n\n  private logProviderMissing(): void {\n    console.warn('Cannot call this method because there is no web3 provider connected.  Please confirm that metamask is installed')\n  }\n}\n"],"mappings":";AACA,SAAS,cAAc;AAEvB,SAAS,uBAAuB;AAEzB,IAAM,oBAAN,MAAwB;AAAA,EACrB,UAAU;AAAA,EACV,WAAW,WAAW;AAAA,EAEtB,YAAwB,CAAC;AAAA,EACzB;AAAA,EACA,oBAA2D,CAAC;AAAA,EAEpE,YAAY,UAA4B;AACtC,QAAI,UAAU;AACZ,WAAK,WAAW;AAAA,IAClB,WAAW,KAAK,UAAU;AACxB,WAAK,WAAW,IAAI,gBAAgB,WAAW,QAAQ;AAAA,IACzD;AAAA,EACF;AAAA,EAEA,IAAI,UAAU;AACZ,WAAO,KAAK,UAAU;AAAA,EACxB;AAAA,EAEA,IAAI,iBAAiB;AACnB,WAAO,KAAK,UAAU;AAAA,EACxB;AAAA,EAEA,MAAM,gBAAgB;AACpB,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,mBAAmB;AACxB;AAAA,IACF;AAEA,UAAM,WAAW,MAAM,KAAK,SAAS,KAAK,uBAAuB,CAAC,CAAC;AAEnE,QAAI,SAAS,SAAS,GAAG;AACvB,WAAK,UAAU,SAAS,CAAC;AACzB,cAAQ,IAAI,cAAc,KAAK,OAAO;AAAA,IACxC,OAAO;AACL,cAAQ,IAAI,8BAA8B;AAAA,IAC5C;AAAA,EACF;AAAA,EAEA,sBAAsB;AACpB,WAAO,KAAK,YAAY,KAAK,SAAS;AAAA,EACxC;AAAA,EAEA,sBAAsB,MAAM;AAC1B,QAAI,KAAK,gBAAgB;AACvB,cAAQ,IAAI,gCAAgC,KAAK,UAAU,eAAe;AAC1E,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,0BAA0B,UAAoB;AAC5C,SAAK,UAAU,GAAG,mBAAmB,QAAQ;AAC7C,SAAK,kBAAkB,KAAK,CAAC,mBAAmB,QAAQ,CAAC;AAAA,EAC3D;AAAA,EAEA,uBAAuB,UAAoB;AACzC,SAAK,UAAU,GAAG,gBAAgB,QAAQ;AAC1C,SAAK,kBAAkB,KAAK,CAAC,gBAAgB,QAAQ,CAAC;AAAA,EACxD;AAAA,EAEA,kBAAkB,UAAoB;AACpC,SAAK,UAAU,GAAG,WAAW,QAAQ;AACrC,SAAK,kBAAkB,KAAK,CAAC,WAAW,QAAQ,CAAC;AAAA,EACnD;AAAA,EAEA,qBAAqB,UAAoB;AACvC,SAAK,UAAU,GAAG,cAAc,QAAQ;AACxC,SAAK,kBAAkB,KAAK,CAAC,cAAc,QAAQ,CAAC;AAAA,EACtD;AAAA,EAEA,uBAAuB,OAAe,UAAoB;AAExD,SAAK,oBAAoB,KAAK,kBAAkB,OAAO,CAAC,CAAC,EAAE,aAAa,MAAM,aAAa,aAAa;AAAA,EAC1G;AAAA,EAEA,0BAA0B;AAAA,EAE1B;AAAA,EAEA,MAAM,kBAA4C;AAChD,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,mBAAmB;AACxB,aAAO;AAAA,IACT;AAEA,WAAO,MAAM,KAAK,SAAS,KAAK,uBAAuB,CAAC,CAAC;AAAA,EAC3D;AAAA,EAEA,MAAM,YAAY,SAAiB;AACjC,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,mBAAmB;AACxB;AAAA,IACF;AAEA,UAAM,SAAS,MAAM,KAAK,SAAS,UAAU;AAC7C,UAAM,OAAO,WAAW;AACxB,WAAO,MAAM,OAAO,YAAY,OAAO;AAAA,EACzC;AAAA;AAAA,EAGA,eAAe,OAAe,UAA0B;AACtD,QAAI,KAAK,UAAU;AACjB,aAAO,KAAK,SAAS,GAAG,OAAO,QAAQ,CAAC;AAAA,IAC1C;AACA,SAAK,UAAU,KAAK,QAAQ;AAAA,EAC9B;AAAA,EAEA,2BAA2B,OAAe,UAA0B;AAClE,QAAI,KAAK,UAAU;AACjB,aAAO,KAAK,SAAS,eAAe,OAAO,QAAQ,CAAC;AAAA,IACtD;AACA,SAAK,YAAY,KAAK,UAAU,OAAO,mBAAiB,aAAa,aAAa;AAAA,EACpF;AAAA,EAEA,8BAAoC;AAClC,QAAI,KAAK,UAAU;AACjB,aAAO,KAAK,SAAS,mBAAmB,CAAC;AAAA,IAC3C;AAAA,EACF;AAAA,EAEQ,qBAA2B;AACjC,YAAQ,KAAK,iHAAiH;AAAA,EAChI;AACF;","names":[]}
+{"version":3,"sources":["../../src/MetaMaskConnector.ts"],"sourcesContent":["import type { MetaMaskInpageProvider } from '@metamask/providers'\nimport { forget } from '@xylabs/forget'\nimport { isString } from '@xylabs/typeof'\nimport type { Listener } from 'ethers'\nimport { BrowserProvider } from 'ethers'\n\ndeclare global {\n  var ethereum: MetaMaskInpageProvider | undefined\n}\n\nexport class MetaMaskConnector {\n  private account = ''\n  private ethereum = globalThis.ethereum\n\n  private listeners: Listener[] = []\n  private provider: BrowserProvider | undefined\n  private providerListeners: [event: string, listener: Listener][] = []\n\n  constructor(provider?: BrowserProvider) {\n    if (provider) {\n      this.provider = provider\n    } else if (this.ethereum) {\n      this.provider = new BrowserProvider(this.ethereum)\n    }\n  }\n\n  get chainId() {\n    return this.ethereum?.networkVersion\n  }\n\n  get currentAccount() {\n    return this.ethereum?.selectedAddress\n  }\n\n  async connectWallet() {\n    if (!this.provider) {\n      this.logProviderMissing()\n      return\n    }\n\n    const accounts = await this.provider.send('eth_requestAccounts', [])\n    // We could have multiple accounts. Check for one.\n    if (accounts.length > 0) {\n      this.account = accounts[0]\n      console.log('Connected:', this.account)\n    } else {\n      console.log('No authorized account found.')\n    }\n  }\n\n  isMetaMaskInstalled() {\n    return this.ethereum && this.ethereum.isMetaMask\n  }\n\n  isWalletIsConnected = () => {\n    if (isString(this.currentAccount)) {\n      console.log('Found an authorized account:', this.ethereum?.selectedAddress)\n      return true\n    }\n    return false\n  }\n\n  /**\n   * EIP-1193 Event Listeners\n   *\n   * .on in Web3Provider does not understand EIP-1193 events\n   * see - https://github.com/ethers-io/ethers.js/discussions/1560#discussioncomment-730893\n   */\n  providerOnAccountsChanged(listener: Listener) {\n    this.ethereum?.on('accountsChanged', listener)\n    this.providerListeners.push(['accountsChanged', listener])\n  }\n\n  providerOnChainChanged(listener: Listener) {\n    this.ethereum?.on('chainChanged', listener)\n    this.providerListeners.push(['chainChanged', listener])\n  }\n\n  providerOnConnect(listener: Listener) {\n    this.ethereum?.on('connect', listener)\n    this.providerListeners.push(['connect', listener])\n  }\n\n  providerOnDisconnect(listener: Listener) {\n    this.ethereum?.on('disconnect', listener)\n    this.providerListeners.push(['disconnect', listener])\n  }\n\n  providerRemoveListener(event: string, listener: Listener) {\n    // this.ethereum?.removeListener(event, listener)\n    this.providerListeners = this.providerListeners.filter(([, savedListener]) => listener !== savedListener)\n  }\n\n  providerRemoveListeners() {\n    // for (const [event, listener] of this.providerListeners) this.ethereum?.removeListener(event, listener)\n  }\n\n  async requestAccounts(): Promise<string[] | null> {\n    if (!this.provider) {\n      this.logProviderMissing()\n      return null\n    }\n\n    return await this.provider.send('eth_requestAccounts', [])\n  }\n\n  async signMessage(message: string) {\n    if (!this.provider) {\n      this.logProviderMissing()\n      return\n    }\n\n    const signer = await this.provider.getSigner()\n    await signer.getAddress()\n    return await signer.signMessage(message)\n  }\n\n  /** Web3Provider Listeners - https://docs.ethers.org/v5/api/providers/provider/#Provider--events */\n  web3ProviderOn(event: string, listener: Listener): void {\n    if (this.provider) {\n      forget(this.provider.on(event, listener))\n    }\n    this.listeners.push(listener)\n  }\n\n  web3ProviderRemoveListener(event: string, listener: Listener): void {\n    if (this.provider) {\n      forget(this.provider.removeListener(event, listener))\n    }\n    this.listeners = this.listeners.filter(savedListener => listener !== savedListener)\n  }\n\n  web3ProviderRemoveListeners(): void {\n    if (this.provider) {\n      forget(this.provider.removeAllListeners())\n    }\n  }\n\n  private logProviderMissing(): void {\n    console.warn('Cannot call this method because there is no web3 provider connected.  Please confirm that metamask is installed')\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/metamask-connector",
-  "version": "4.0.3",
+  "version": "4.1.0",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -21,21 +21,22 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
+      "types": "./dist/browser/index.d.ts",
       "default": "./dist/browser/index.mjs"
     },
     "./package.json": "./package.json"
   },
   "module": "dist/browser/index.mjs",
-  "types": "dist/types/index.d.ts",
+  "types": "dist/browser/index.d.ts",
   "dependencies": {
-    "@xylabs/forget": "^4.13.4",
+    "@xylabs/forget": "^4.13.15",
+    "@xylabs/typeof": "^4.13.15",
     "ethers": "^6.15.0"
   },
   "devDependencies": {
     "@metamask/providers": "^22.1.0",
-    "@xylabs/ts-scripts-yarn3": "^6.5.18",
-    "@xylabs/tsconfig-dom": "^6.5.18",
+    "@xylabs/ts-scripts-yarn3": "^7.0.0-rc.20",
+    "@xylabs/tsconfig-dom": "^7.0.0-rc.20",
     "typescript": "^5.8.3"
   },
   "publishConfig": {

package/src/MetaMaskConnector.ts

@@ -1,11 +1,16 @@
 import type { MetaMaskInpageProvider } from '@metamask/providers'
 import { forget } from '@xylabs/forget'
+import { isString } from '@xylabs/typeof'
 import type { Listener } from 'ethers'
 import { BrowserProvider } from 'ethers'
 
+declare global {
+  var ethereum: MetaMaskInpageProvider | undefined
+}
+
 export class MetaMaskConnector {
   private account = ''
-  private ethereum = globalThis.ethereum as MetaMaskInpageProvider
+  private ethereum = globalThis.ethereum
 
   private listeners: Listener[] = []
   private provider: BrowserProvider | undefined
@@ -15,7 +20,7 @@ export class MetaMaskConnector {
     if (provider) {
       this.provider = provider
     } else if (this.ethereum) {
-      this.provider = new BrowserProvider(globalThis.ethereum)
+      this.provider = new BrowserProvider(this.ethereum)
     }
   }
 
@@ -48,7 +53,7 @@ export class MetaMaskConnector {
   }
 
   isWalletIsConnected = () => {
-    if (this.currentAccount) {
+    if (isString(this.currentAccount)) {
       console.log('Found an authorized account:', this.ethereum?.selectedAddress)
       return true
     }

package/dist/types/MetaMaskConnector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MetaMaskConnector.d.ts","sourceRoot":"","sources":["../../src/MetaMaskConnector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAExC,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAgD;IAEhE,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,iBAAiB,CAA4C;gBAEzD,QAAQ,CAAC,EAAE,eAAe;IAQtC,IAAI,OAAO,kBAEV;IAED,IAAI,cAAc,kBAEjB;IAEK,aAAa;IAgBnB,mBAAmB;IAInB,mBAAmB,gBAMlB;IAED;;;;;OAKG;IACH,yBAAyB,CAAC,QAAQ,EAAE,QAAQ;IAK5C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ;IAKzC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ;IAKpC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ;IAKvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKxD,uBAAuB;IAIjB,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC;IAS3C,WAAW,CAAC,OAAO,EAAE,MAAM;IAWjC,mGAAmG;IACnG,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAOvD,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAOnE,2BAA2B,IAAI,IAAI;IAMnC,OAAO,CAAC,kBAAkB;CAG3B"}