stackswap-front-api-test-02 1.3.1 → 1.3.2

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.
Files changed (9) hide show
  1. package/dist/esm/index.d.ts +1 -2
  2. package/dist/esm/index.js +52 -71
  3. package/dist/esm/index.js.map +1 -1
  4. package/dist/index.d.ts +1 -2
  5. package/dist/index.js +51 -70
  6. package/dist/index.js.map +1 -1
  7. package/dist/index.umd.js +2 -2
  8. package/package.json +1 -1
  9. package/src/index.ts +65 -71
package/dist/esm/index.d.ts CHANGED
@@ -14,7 +14,6 @@ import { PoolManager } from "./stackswap/manager/pool.manager";
14
14
  import { PoxlManager } from "./stackswap/manager/poxl.manager";
15
15
  import { StakingManager } from "./stackswap/manager/staking.manager";
16
16
  import { SwapManager } from "./stackswap/manager/swap.manager";
17
- import { UserSession } from "@stacks/connect";
18
17
  import { LBTCStakingManager } from "./stackswap/manager/lbtcstaking.manager";
19
18
  import { GroupFarmManager } from "./stackswap/manager/groupfarm.manager";
20
19
  import { BridgeManager } from "./stackswap/manager/bridge.manager";
@@ -90,7 +89,7 @@ export declare class StackswapMainnetAPI implements StackswapAPI {
90
89
  }>;
91
90
  getQualifiedAddress(address: string): string;
92
91
  walletConnect(callback: (err: any, result: any) => void): void;
93
- walletConnect2(userSession: UserSession, callback: (err: any, result: any) => void): void;
92
+ walletConnect2(_userSession: any, callback: (err: any, result: any) => void): void;
94
93
  getConnectedWallet(callback: (err: any, result: any) => void): void;
95
94
  signOut(callback: (err: any, result: any) => void): void;
96
95
  isConnected(): boolean;
package/dist/esm/index.js CHANGED
@@ -15,7 +15,7 @@ import { PoolManager } from "./stackswap/manager/pool.manager";
15
15
  import { PoxlManager } from "./stackswap/manager/poxl.manager";
16
16
  import { StakingManager } from "./stackswap/manager/staking.manager";
17
17
  import { SwapManager } from "./stackswap/manager/swap.manager";
18
- import { AppConfig, showConnect, UserSession } from "@stacks/connect";
18
+ import { connect, disconnect, isConnected as isWalletConnected, getLocalStorage } from "@stacks/connect";
19
19
  import { LBTCStakingManager } from "./stackswap/manager/lbtcstaking.manager";
20
20
  import { GroupFarmManager } from "./stackswap/manager/groupfarm.manager";
21
21
  import { BridgeManager } from "./stackswap/manager/bridge.manager";
@@ -71,72 +71,47 @@ export class StackswapMainnetAPI {
71
71
  return this.config.STACKSWAP_ADDRESS() + '.' + address;
72
72
  }
73
73
  walletConnect(callback) {
74
- try {
75
- const appConfig = new AppConfig(['store_write', 'publish_data']);
76
- const userSession = new UserSession({ appConfig });
77
- showConnect({
78
- userSession,
79
- appDetails: {
80
- name: 'Stackswap',
81
- icon: 'https://app.stackswap.org/favicon.ico',
82
- },
83
- redirectTo: '/',
84
- onFinish: () => {
85
- const profile = userSession.loadUserData().profile.stxAddress;
86
- if (this.config.isMainnet()) {
87
- this.senderAdderss = profile.mainnet;
88
- }
89
- else {
90
- this.senderAdderss = profile.testnet;
91
- }
92
- this.connected = true;
93
- callback(null, this.senderAdderss);
94
- },
95
- });
96
- }
97
- catch (e) {
74
+ connect()
75
+ .then((result) => {
76
+ const stxAddresses = result.addresses.filter(a => a.address.startsWith('SP') || a.address.startsWith('ST'));
77
+ const address = this.config.isMainnet()
78
+ ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
79
+ : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
80
+ if (address) {
81
+ this.senderAdderss = address;
82
+ this.connected = true;
83
+ callback(null, this.senderAdderss);
84
+ }
85
+ else {
86
+ callback(new Error('No STX address found'), null);
87
+ }
88
+ })
89
+ .catch((e) => {
98
90
  callback(e, null);
99
- }
91
+ });
100
92
  }
101
- walletConnect2(userSession, callback) {
102
- try {
103
- showConnect({
104
- appDetails: {
105
- name: 'Stackswap',
106
- icon: 'https://app.stackswap.org/favicon.ico',
107
- },
108
- redirectTo: '/',
109
- onFinish: () => {
110
- const profile = userSession.loadUserData().profile.stxAddress;
111
- if (this.config.isMainnet()) {
112
- this.senderAdderss = profile.mainnet;
113
- }
114
- else {
115
- this.senderAdderss = profile.testnet;
116
- }
117
- this.connected = true;
118
- callback(null, this.senderAdderss);
119
- },
120
- userSession
121
- });
122
- }
123
- catch (e) {
124
- callback(e, null);
125
- }
93
+ walletConnect2(_userSession, callback) {
94
+ this.walletConnect(callback);
126
95
  }
127
96
  getConnectedWallet(callback) {
128
97
  try {
129
- const appConfig = new AppConfig(['store_write', 'publish_data']);
130
- const userSession = new UserSession({ appConfig });
131
- const profile = userSession.loadUserData().profile.stxAddress;
132
- if (this.config.isMainnet()) {
133
- this.senderAdderss = profile.mainnet;
98
+ const storage = getLocalStorage();
99
+ if (!storage || !storage.addresses?.stx?.length) {
100
+ callback(new Error('No connected wallet'), null);
101
+ return;
102
+ }
103
+ const stxAddresses = storage.addresses.stx;
104
+ const address = this.config.isMainnet()
105
+ ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
106
+ : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
107
+ if (address) {
108
+ this.senderAdderss = address;
109
+ this.connected = true;
110
+ callback(null, this.senderAdderss);
134
111
  }
135
112
  else {
136
- this.senderAdderss = profile.testnet;
113
+ callback(new Error('No STX address found'), null);
137
114
  }
138
- this.connected = true;
139
- callback(null, this.senderAdderss);
140
115
  }
141
116
  catch (e) {
142
117
  callback(e, null);
@@ -144,9 +119,9 @@ export class StackswapMainnetAPI {
144
119
  }
145
120
  signOut(callback) {
146
121
  try {
147
- const appConfig = new AppConfig(['store_write', 'publish_data']);
148
- const userSession = new UserSession({ appConfig });
149
- userSession.signUserOut();
122
+ disconnect();
123
+ this.connected = false;
124
+ this.senderAdderss = '';
150
125
  callback(null, 'success');
151
126
  }
152
127
  catch (e) {
@@ -155,17 +130,23 @@ export class StackswapMainnetAPI {
155
130
  }
156
131
  isConnected() {
157
132
  try {
158
- const appConfig = new AppConfig(['store_write', 'publish_data']);
159
- const userSession = new UserSession({ appConfig });
160
- const profile = userSession.loadUserData().profile.stxAddress;
161
- if (this.config.isMainnet()) {
162
- this.senderAdderss = profile.mainnet;
133
+ if (!isWalletConnected()) {
134
+ return false;
163
135
  }
164
- else {
165
- this.senderAdderss = profile.testnet;
136
+ const storage = getLocalStorage();
137
+ if (!storage || !storage.addresses?.stx?.length) {
138
+ return false;
166
139
  }
167
- this.connected = true;
168
- return true;
140
+ const stxAddresses = storage.addresses.stx;
141
+ const address = this.config.isMainnet()
142
+ ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
143
+ : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
144
+ if (address) {
145
+ this.senderAdderss = address;
146
+ this.connected = true;
147
+ return true;
148
+ }
149
+ return false;
169
150
  }
170
151
  catch (e) {
171
152
  return false;
package/dist/esm/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -14,7 +14,6 @@ import { PoolManager } from "./stackswap/manager/pool.manager";
14
14
  import { PoxlManager } from "./stackswap/manager/poxl.manager";
15
15
  import { StakingManager } from "./stackswap/manager/staking.manager";
16
16
  import { SwapManager } from "./stackswap/manager/swap.manager";
17
- import { UserSession } from "@stacks/connect";
18
17
  import { LBTCStakingManager } from "./stackswap/manager/lbtcstaking.manager";
19
18
  import { GroupFarmManager } from "./stackswap/manager/groupfarm.manager";
20
19
  import { BridgeManager } from "./stackswap/manager/bridge.manager";
@@ -90,7 +89,7 @@ export declare class StackswapMainnetAPI implements StackswapAPI {
90
89
  }>;
91
90
  getQualifiedAddress(address: string): string;
92
91
  walletConnect(callback: (err: any, result: any) => void): void;
93
- walletConnect2(userSession: UserSession, callback: (err: any, result: any) => void): void;
92
+ walletConnect2(_userSession: any, callback: (err: any, result: any) => void): void;
94
93
  getConnectedWallet(callback: (err: any, result: any) => void): void;
95
94
  signOut(callback: (err: any, result: any) => void): void;
96
95
  isConnected(): boolean;
package/dist/index.js CHANGED
@@ -77,72 +77,47 @@ class StackswapMainnetAPI {
77
77
  return this.config.STACKSWAP_ADDRESS() + '.' + address;
78
78
  }
79
79
  walletConnect(callback) {
80
- try {
81
- const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
82
- const userSession = new connect_1.UserSession({ appConfig });
83
- (0, connect_1.showConnect)({
84
- userSession,
85
- appDetails: {
86
- name: 'Stackswap',
87
- icon: 'https://app.stackswap.org/favicon.ico',
88
- },
89
- redirectTo: '/',
90
- onFinish: () => {
91
- const profile = userSession.loadUserData().profile.stxAddress;
92
- if (this.config.isMainnet()) {
93
- this.senderAdderss = profile.mainnet;
94
- }
95
- else {
96
- this.senderAdderss = profile.testnet;
97
- }
98
- this.connected = true;
99
- callback(null, this.senderAdderss);
100
- },
101
- });
102
- }
103
- catch (e) {
80
+ (0, connect_1.connect)()
81
+ .then((result) => {
82
+ const stxAddresses = result.addresses.filter(a => a.address.startsWith('SP') || a.address.startsWith('ST'));
83
+ const address = this.config.isMainnet()
84
+ ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
85
+ : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
86
+ if (address) {
87
+ this.senderAdderss = address;
88
+ this.connected = true;
89
+ callback(null, this.senderAdderss);
90
+ }
91
+ else {
92
+ callback(new Error('No STX address found'), null);
93
+ }
94
+ })
95
+ .catch((e) => {
104
96
  callback(e, null);
105
- }
97
+ });
106
98
  }
107
- walletConnect2(userSession, callback) {
108
- try {
109
- (0, connect_1.showConnect)({
110
- appDetails: {
111
- name: 'Stackswap',
112
- icon: 'https://app.stackswap.org/favicon.ico',
113
- },
114
- redirectTo: '/',
115
- onFinish: () => {
116
- const profile = userSession.loadUserData().profile.stxAddress;
117
- if (this.config.isMainnet()) {
118
- this.senderAdderss = profile.mainnet;
119
- }
120
- else {
121
- this.senderAdderss = profile.testnet;
122
- }
123
- this.connected = true;
124
- callback(null, this.senderAdderss);
125
- },
126
- userSession
127
- });
128
- }
129
- catch (e) {
130
- callback(e, null);
131
- }
99
+ walletConnect2(_userSession, callback) {
100
+ this.walletConnect(callback);
132
101
  }
133
102
  getConnectedWallet(callback) {
134
103
  try {
135
- const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
136
- const userSession = new connect_1.UserSession({ appConfig });
137
- const profile = userSession.loadUserData().profile.stxAddress;
138
- if (this.config.isMainnet()) {
139
- this.senderAdderss = profile.mainnet;
104
+ const storage = (0, connect_1.getLocalStorage)();
105
+ if (!storage || !storage.addresses?.stx?.length) {
106
+ callback(new Error('No connected wallet'), null);
107
+ return;
108
+ }
109
+ const stxAddresses = storage.addresses.stx;
110
+ const address = this.config.isMainnet()
111
+ ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
112
+ : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
113
+ if (address) {
114
+ this.senderAdderss = address;
115
+ this.connected = true;
116
+ callback(null, this.senderAdderss);
140
117
  }
141
118
  else {
142
- this.senderAdderss = profile.testnet;
119
+ callback(new Error('No STX address found'), null);
143
120
  }
144
- this.connected = true;
145
- callback(null, this.senderAdderss);
146
121
  }
147
122
  catch (e) {
148
123
  callback(e, null);
@@ -150,9 +125,9 @@ class StackswapMainnetAPI {
150
125
  }
151
126
  signOut(callback) {
152
127
  try {
153
- const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
154
- const userSession = new connect_1.UserSession({ appConfig });
155
- userSession.signUserOut();
128
+ (0, connect_1.disconnect)();
129
+ this.connected = false;
130
+ this.senderAdderss = '';
156
131
  callback(null, 'success');
157
132
  }
158
133
  catch (e) {
@@ -161,17 +136,23 @@ class StackswapMainnetAPI {
161
136
  }
162
137
  isConnected() {
163
138
  try {
164
- const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
165
- const userSession = new connect_1.UserSession({ appConfig });
166
- const profile = userSession.loadUserData().profile.stxAddress;
167
- if (this.config.isMainnet()) {
168
- this.senderAdderss = profile.mainnet;
139
+ if (!(0, connect_1.isConnected)()) {
140
+ return false;
169
141
  }
170
- else {
171
- this.senderAdderss = profile.testnet;
142
+ const storage = (0, connect_1.getLocalStorage)();
143
+ if (!storage || !storage.addresses?.stx?.length) {
144
+ return false;
172
145
  }
173
- this.connected = true;
174
- return true;
146
+ const stxAddresses = storage.addresses.stx;
147
+ const address = this.config.isMainnet()
148
+ ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
149
+ : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
150
+ if (address) {
151
+ this.senderAdderss = address;
152
+ this.connected = true;
153
+ return true;
154
+ }
155
+ return false;
175
156
  }
176
157
  catch (e) {
177
158
  return false;
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA8F;AAC9F,kDAA0B;AAC1B,+CAK4B;AAC5B,qEAA+D;AAC/D,iEAA2D;AAC3D,mEAA6D;AAC7D,qEAA+D;AAC/D,+EAAyE;AACzE,6EAAuE;AACvE,mEAA6D;AAC7D,2EAAqE;AACrE,2EAAqE;AACrE,qEAA+D;AAC/D,mEAA6D;AAC7D,mEAA6D;AAC7D,yEAAmE;AACnE,mEAA6D;AAC7D,6CAAuG;AACvG,iFAA2E;AAC3E,6EAAuE;AACvE,uEAAiE;AACjE,qEAA+D;AAkC/D,MAAa,mBAAmB;IA0B9B,YAAY,iBAAyB,EAAE,EAAE,qBAAkC,IAAI,EAAE,OAAqB,EAAE,sBAAmC,IAAI,EAAE,iBAA8B,IAAI;QArBnL,cAAS,GAAa,KAAK,CAAC;QAoD5B,yBAAoB,GAAsB,KAAK,IAAI,EAAE;YACnD,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC;YAC9E,OAAO,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC;QACvC,CAAC,CAAA;QAED,uBAAkB,GAAsB,KAAK,IAAI,EAAE;YACjD,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;YAE9E,OAAO,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAC3C,CAAC,CAAA;QAED,oBAAe,GAAuB,KAAK,IAAI,EAAE;YAE/C,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC;YAC9E,OAAO,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAC3C,CAAC,CAAC;QA7CA,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAE7C,IAAI,CAAC,MAAM,GAAG,IAAI,8BAAqB,CAAC,cAAc,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAC7F,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,wBAAc,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,CAAA,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,EAAE,CAAC;QAC3G,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAChD,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC3C,CAAC,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,eAAe,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,cAAc,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,kBAAkB,GAAG,IAAI,wCAAkB,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,kBAAkB,CAAA,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IAC/E,CAAC;IAmBD,KAAK,CAAC,gBAAgB;QACpB,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC;QAC9E,OAAO,EAAC,YAAY,EAAG,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,EAAG,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,EAAG,UAAU,CAAC,IAAI,CAAC,aAAa,EAAC,CAAC;IACxK,CAAC;IAED,mBAAmB,CAAC,OAAe;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,GAAG,GAAG,OAAO,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,QAAyC;QACrD,IAAA,iBAAO,GAAE;aACN,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YAEf,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CACzD,CAAC;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO;gBAC7D,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;YAEhE,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;gBAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,EAAE,IAAI,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACP,CAAC;IAID,cAAc,CAAC,YAAiB,EAAE,QAAyC;QAEzE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAGD,kBAAkB,CAAC,QAAyC;QAC1D,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAA,yBAAe,GAAE,CAAC;YAClC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;gBAChD,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,CAAC;gBACjD,OAAO;YACT,CAAC;YAED,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;YAE3C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO;gBAC7D,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;YAEhE,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;gBAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,EAAE,IAAI,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,CAAC,QAAyC;QAC/C,IAAI,CAAC;YACH,IAAA,oBAAU,GAAE,CAAC;YACb,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;YACxB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,WAAW;QACT,IAAI,CAAC;YACH,IAAI,CAAC,IAAA,qBAAiB,GAAE,EAAE,CAAC;gBACzB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,OAAO,GAAG,IAAA,yBAAe,GAAE,CAAC;YAClC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;gBAChD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;YAE3C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO;gBAC7D,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC;YAEhE,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;gBAC7B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CAEF;AArLD,kDAqLC;AAED,MAAa,mBAAoB,SAAQ,mBAAmB;IAE1D,YAAY,iBAAyB,OAAO,EAAE,qBAAkC,IAAI,EAAE,OAAqB;QACzG,KAAK,CAAC,cAAc,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,IAAI,+BAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,wBAAc,CAAC;IAChC,CAAC;CAEF;AARD,kDAQC;AAGD,MAAa,kBAAmB,SAAQ,mBAAmB;IAEzD,YAAY,iBAAyB,OAAO,EAAE,qBAAkC,IAAI,EAAE,OAAqB;QACzG,KAAK,CAAC,cAAc,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,IAAI,8BAAqB,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,wBAAc,CAAC;IAChC,CAAC;CAEF;AARD,gDAQC;AAED,MAAa,kBAAmB,SAAQ,mBAAmB;IAEzD,YAAY,MAAuB,EAAE,iBAAyB,OAAO,EAAE,qBAAkC,IAAI,EAAE,OAAqB;QAClI,KAAK,CAAC,cAAc,EAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CAEF;AAPD,gDAOC"}