@nordicsemiconductor/pc-nrfconnect-shared 184.0.0 → 185.0.0
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.
- package/Changelog.md +19 -0
- package/nrfutil/sandbox.ts +14 -9
- package/package.json +1 -1
- package/src/Device/DeviceSelector/DeviceSelector.tsx +39 -29
- package/src/Device/deviceAutoSelectSlice.ts +2 -0
- package/typings/generated/nrfutil/sandbox.d.ts.map +1 -1
- package/typings/generated/src/Device/DeviceSelector/DeviceSelector.d.ts +1 -1
- package/typings/generated/src/Device/DeviceSelector/DeviceSelector.d.ts.map +1 -1
- package/typings/generated/src/Device/deviceAutoSelectSlice.d.ts +1 -0
- package/typings/generated/src/Device/deviceAutoSelectSlice.d.ts.map +1 -1
package/Changelog.md
CHANGED
|
@@ -7,6 +7,25 @@ This project does _not_ adhere to
|
|
|
7
7
|
[Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
|
|
8
8
|
every new version is a new major version.
|
|
9
9
|
|
|
10
|
+
## 185.0.0 - 2024-09-20
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
|
|
14
|
+
- Extended `waitForDevice` to allow apps to hook into when the wait was
|
|
15
|
+
canceled.
|
|
16
|
+
- Logging on device events Selecting, Selected and Deselected
|
|
17
|
+
|
|
18
|
+
### Fixed
|
|
19
|
+
|
|
20
|
+
- Stop nrfutil sandbox from starting to run an aborted command.
|
|
21
|
+
- Device setup event call order when autoreconnecting at the same time as
|
|
22
|
+
selecting.
|
|
23
|
+
|
|
24
|
+
### Steps to upgrade when using this package
|
|
25
|
+
|
|
26
|
+
- Clean up any logging in `onDeviceSelected` and `onDeviceDeselected` to avoid
|
|
27
|
+
logging multiple times.
|
|
28
|
+
|
|
10
29
|
## 184.0.0 - 2024-09-11
|
|
11
30
|
|
|
12
31
|
### Fixed
|
package/nrfutil/sandbox.ts
CHANGED
|
@@ -376,6 +376,16 @@ export class NrfutilSandbox {
|
|
|
376
376
|
editEnv: (env: NodeJS.ProcessEnv) => NodeJS.ProcessEnv = env => env
|
|
377
377
|
) =>
|
|
378
378
|
new Promise<void>((resolve, reject) => {
|
|
379
|
+
if (controller?.signal.aborted) {
|
|
380
|
+
reject(
|
|
381
|
+
new Error(
|
|
382
|
+
`Aborted before start executing ${path.basename(
|
|
383
|
+
command
|
|
384
|
+
)} ${JSON.stringify(args)}`
|
|
385
|
+
)
|
|
386
|
+
);
|
|
387
|
+
return;
|
|
388
|
+
}
|
|
379
389
|
let aborting = false;
|
|
380
390
|
telemetry.sendEvent(`running nrfutil ${this.module}`, {
|
|
381
391
|
args,
|
|
@@ -386,11 +396,6 @@ export class NrfutilSandbox {
|
|
|
386
396
|
});
|
|
387
397
|
|
|
388
398
|
const listener = () => {
|
|
389
|
-
getNrfutilLogger()?.info(
|
|
390
|
-
`Aborting ongoing nrfutil ${
|
|
391
|
-
this.module
|
|
392
|
-
} ${command} ${JSON.stringify(args)}`
|
|
393
|
-
);
|
|
394
399
|
aborting = true;
|
|
395
400
|
if (nrfutil.pid) {
|
|
396
401
|
treeKill(nrfutil.pid);
|
|
@@ -428,9 +433,9 @@ export class NrfutilSandbox {
|
|
|
428
433
|
if (aborting) {
|
|
429
434
|
reject(
|
|
430
435
|
new Error(
|
|
431
|
-
`Aborted ongoing
|
|
432
|
-
|
|
433
|
-
}`
|
|
436
|
+
`Aborted ongoing ${path.basename(
|
|
437
|
+
command
|
|
438
|
+
)} ${JSON.stringify(args)}`
|
|
434
439
|
)
|
|
435
440
|
);
|
|
436
441
|
return;
|
|
@@ -598,7 +603,7 @@ export class NrfutilSandbox {
|
|
|
598
603
|
if (aborting) {
|
|
599
604
|
reject(
|
|
600
605
|
new Error(
|
|
601
|
-
`Aborted ongoing
|
|
606
|
+
`Aborted ongoing ${path.basename(command)} ${
|
|
602
607
|
args[0] ?? ''
|
|
603
608
|
}`
|
|
604
609
|
)
|
package/package.json
CHANGED
|
@@ -41,7 +41,11 @@ import SelectedDevice from './SelectedDevice';
|
|
|
41
41
|
export interface Props {
|
|
42
42
|
deviceListing: DeviceTraits;
|
|
43
43
|
deviceSetupConfig?: DeviceSetupConfig;
|
|
44
|
-
onDeviceSelected?: (
|
|
44
|
+
onDeviceSelected?: (
|
|
45
|
+
device: Device,
|
|
46
|
+
autoReselected: boolean,
|
|
47
|
+
abortController: AbortController
|
|
48
|
+
) => void;
|
|
45
49
|
onDeviceDeselected?: () => void;
|
|
46
50
|
onDeviceConnected?: (device: Device) => void;
|
|
47
51
|
onDeviceDisconnected?: (device: Device) => void;
|
|
@@ -79,6 +83,7 @@ export default ({
|
|
|
79
83
|
|
|
80
84
|
dispatch(clearWaitForDevice());
|
|
81
85
|
dispatch(setAutoSelectDevice(undefined));
|
|
86
|
+
logger.info(`Device deselected`);
|
|
82
87
|
onDeviceDeselected();
|
|
83
88
|
dispatch(deselectDevice());
|
|
84
89
|
},
|
|
@@ -92,20 +97,22 @@ export default ({
|
|
|
92
97
|
// will have a side effect to stop and start the hotplug events
|
|
93
98
|
const doSelectDevice = useCallback(
|
|
94
99
|
async (device: Device, autoReselected: boolean) => {
|
|
100
|
+
logger.info(`Selecting device SN: ${device.serialNumber}`);
|
|
101
|
+
abortController.current?.abort();
|
|
102
|
+
const controller = new AbortController();
|
|
103
|
+
abortController.current = controller;
|
|
104
|
+
|
|
95
105
|
dispatch(clearWaitForDevice());
|
|
96
106
|
setDeviceListVisible(false);
|
|
97
107
|
dispatch(selectDevice(device));
|
|
98
108
|
dispatch(setAutoSelectDevice(device));
|
|
99
109
|
|
|
100
|
-
abortController.current?.abort();
|
|
101
|
-
abortController.current = new AbortController();
|
|
102
110
|
const deviceInfo = await NrfutilDeviceLib.deviceInfo(
|
|
103
111
|
device,
|
|
104
112
|
undefined,
|
|
105
113
|
undefined,
|
|
106
|
-
|
|
114
|
+
controller
|
|
107
115
|
);
|
|
108
|
-
abortController.current = undefined;
|
|
109
116
|
|
|
110
117
|
// Modem might be set to false when using external jLink or custom PCBs
|
|
111
118
|
if (!device.traits.modem && hasModem(device, deviceInfo)) {
|
|
@@ -117,30 +124,33 @@ export default ({
|
|
|
117
124
|
dispatch(setAutoSelectDevice(newDevice));
|
|
118
125
|
}
|
|
119
126
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
127
|
+
if (!controller.signal.aborted) {
|
|
128
|
+
dispatch(setSelectedDeviceInfo(deviceInfo));
|
|
129
|
+
logger.info(`Selected device SN: ${device.serialNumber}`);
|
|
130
|
+
onDeviceSelected(device, autoReselected, controller);
|
|
131
|
+
|
|
132
|
+
telemetry.sendEvent('device selected', {
|
|
133
|
+
device: simplifyDevice(device),
|
|
134
|
+
deviceInfo,
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
if (deviceSetupConfig) {
|
|
138
|
+
if (isDeviceWithSerialNumber(device)) {
|
|
139
|
+
dispatch(
|
|
140
|
+
setupDevice(
|
|
141
|
+
device,
|
|
142
|
+
deviceSetupConfig,
|
|
143
|
+
onDeviceIsReady,
|
|
144
|
+
doDeselectDevice,
|
|
145
|
+
deviceInfo
|
|
146
|
+
)
|
|
147
|
+
);
|
|
148
|
+
} else {
|
|
149
|
+
logger.warn(
|
|
150
|
+
`Selected device has no serial number. Device setup is not supported`
|
|
151
|
+
);
|
|
152
|
+
onDeviceIsReady(device);
|
|
153
|
+
}
|
|
144
154
|
}
|
|
145
155
|
}
|
|
146
156
|
},
|
|
@@ -23,6 +23,7 @@ export interface WaitForDevice {
|
|
|
23
23
|
skipRefetchDeviceInfo?: boolean;
|
|
24
24
|
onSuccess?: (device: Device) => void;
|
|
25
25
|
onFail?: (reason?: string) => void;
|
|
26
|
+
onCanceled?: () => void;
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
export interface DeviceAutoSelectState {
|
|
@@ -152,6 +153,7 @@ export const getArrivedButWrongWhen = (state: RootState) =>
|
|
|
152
153
|
export const clearWaitForDevice = (): AppThunk => (dispatch, getState) => {
|
|
153
154
|
if (getState().deviceAutoSelect.autoReconnectTimeout) {
|
|
154
155
|
getState().deviceAutoSelect.onCancelTimeout?.();
|
|
156
|
+
getState().deviceAutoSelect.waitForDevice?.onCanceled?.();
|
|
155
157
|
}
|
|
156
158
|
dispatch(clearWaitForDeviceTimeout(true));
|
|
157
159
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../nrfutil/sandbox.ts"],"names":[],"mappings":";AAiBA,OAAO,EACH,cAAc,EACd,QAAQ,EACR,UAAU,EACV,aAAa,EAGb,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,EACV,MAAM,gBAAgB,CAAC;AAmBxB,QAAA,MAAM,UAAU,YAAa,MAAM,UAAU,MAAM,WAAW,MAAM;;;;;;;;;;;CA0BnE,CAAC;AAiDF,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAM;IACxE,QAAQ,EAAE,QAAQ,CAAmC;IACrD,GAAG,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;gBAEvB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ5D,OAAO,CAAC,kBAAkB,CASxB;IAEK,gBAAgB,+BAUrB;IAEK,cAAc,+BAQnB;IAEK,kBAAkB,yBAmBvB;IAEK,cAAc,4BACO,QAAQ,SAAS,IAAI,KAAK,IAAI,gCAiCxD;IAEK,iBAAiB,4BACI,QAAQ,SAAS,IAAI,KAAK,IAAI,gCAQxD;IAEK,iBAAiB,eAA4C;IAE7D,sBAAsB,oBAChB,MAAM,QACT,MAAM,EAAE,2BACU,QAAQ,SAAS,IAAI,KAAK,IAAI,0CAC5B,SAAS,KAAK,IAAI,0DACF,IAAI,4BACjC,eAAe,mBACZ,OAAO,UAAU,KAAK,OAAO,UAAU;;;OAUrD;IAEN,OAAO,CAAC,mBAAmB,CAsBrB;IAEN,OAAO,CAAC,YAAY,CAmFlB;IAEK,YAAY,YACN,MAAM,QACT,MAAM,EAAE,iBACC,MAAM,QAAQ,MAAM,KAAK,MAAM,GAAG,SAAS,qBACvC,MAAM,QAAQ,MAAM,KAAK,IAAI,eACnC,eAAe,kBACb,OAAO,UAAU,KAAK,OAAO,UAAU,
|
|
1
|
+
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../nrfutil/sandbox.ts"],"names":[],"mappings":";AAiBA,OAAO,EACH,cAAc,EACd,QAAQ,EACR,UAAU,EACV,aAAa,EAGb,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,EACV,MAAM,gBAAgB,CAAC;AAmBxB,QAAA,MAAM,UAAU,YAAa,MAAM,UAAU,MAAM,WAAW,MAAM;;;;;;;;;;;CA0BnE,CAAC;AAiDF,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAM;IACxE,QAAQ,EAAE,QAAQ,CAAmC;IACrD,GAAG,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;gBAEvB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ5D,OAAO,CAAC,kBAAkB,CASxB;IAEK,gBAAgB,+BAUrB;IAEK,cAAc,+BAQnB;IAEK,kBAAkB,yBAmBvB;IAEK,cAAc,4BACO,QAAQ,SAAS,IAAI,KAAK,IAAI,gCAiCxD;IAEK,iBAAiB,4BACI,QAAQ,SAAS,IAAI,KAAK,IAAI,gCAQxD;IAEK,iBAAiB,eAA4C;IAE7D,sBAAsB,oBAChB,MAAM,QACT,MAAM,EAAE,2BACU,QAAQ,SAAS,IAAI,KAAK,IAAI,0CAC5B,SAAS,KAAK,IAAI,0DACF,IAAI,4BACjC,eAAe,mBACZ,OAAO,UAAU,KAAK,OAAO,UAAU;;;OAUrD;IAEN,OAAO,CAAC,mBAAmB,CAsBrB;IAEN,OAAO,CAAC,YAAY,CAmFlB;IAEK,YAAY,YACN,MAAM,QACT,MAAM,EAAE,iBACC,MAAM,QAAQ,MAAM,KAAK,MAAM,GAAG,SAAS,qBACvC,MAAM,QAAQ,MAAM,KAAK,IAAI,eACnC,eAAe,kBACb,OAAO,UAAU,KAAK,OAAO,UAAU,mBA0EnD;IAEA,qBAAqB,oBACf,MAAM,QACT,MAAM,EAAE,2BACU,QAAQ,SAAS,IAAI,KAAK,IAAI,0CAC5B,SAAS,KAAK,IAAI,0DACF,IAAI,4BACjC,eAAe,mBACZ,OAAO,UAAU,KAAK,OAAO,UAAU;;;OAUrD;IAEN,OAAO,CAAC,kBAAkB,CAmFxB;IAEK,WAAW,YACL,MAAM,QACT,MAAM,EAAE,iBACC,MAAM,QAAQ,MAAM,KAAK,IAAI,qBACzB,MAAM,QAAQ,MAAM,KAAK,IAAI,eACnC,eAAe,kBACb,OAAO,UAAU,KAAK,OAAO,UAAU,mBA0DnD;IAEA,yBAAyB,oBACnB,MAAM,QACT,MAAM,EAAE,uDAEE,OAAO,UAAU,KAAK,OAAO,UAAU;yBA4ClC,MAAM,IAAI;;qCAKE,KAAK,KAAK,IAAI,qBA7Cf,KAAK,KAAK,IAAI;MAoDhD;IAEK,8BAA8B,eACxB,MAAM,2BACS,QAAQ,SAAS,IAAI,KAAK,IAAI,4BACzC,eAAe,SACtB,MAAM,EAAE,sCAahB;IAEK,kCAAkC,sBAC5B,MAAM,2BACS,QAAQ,SAAS,IAAI,KAAK,IAAI,4BACzC,eAAe,SACtB,MAAM,EAAE,gBAehB;IAEK,+BAA+B,sBACzB,MAAM,eACF,eAAe,SACtB,MAAM,EAAE,gBAehB;IAEK,SAAS,sBACO,UAAU,QAAQ,MAAM,KAAK,IAAI,sBA1mB1B,UAAU,QAAQ,MAAM,KAAK,IAAI,IAmnB7D;IAEK,WAAW,UAAW,QAAQ,UAEnC;CACL;kCAGY,MAAM,UACP,MAAM,YACJ,MAAM,2BACQ,QAAQ,SAAS,IAAI,KAAK,IAAI;AAJ1D,wBAwBE"}
|
|
@@ -5,7 +5,7 @@ import { Device } from '../deviceSlice';
|
|
|
5
5
|
export interface Props {
|
|
6
6
|
deviceListing: DeviceTraits;
|
|
7
7
|
deviceSetupConfig?: DeviceSetupConfig;
|
|
8
|
-
onDeviceSelected?: (device: Device, autoReselected: boolean) => void;
|
|
8
|
+
onDeviceSelected?: (device: Device, autoReselected: boolean, abortController: AbortController) => void;
|
|
9
9
|
onDeviceDeselected?: () => void;
|
|
10
10
|
onDeviceConnected?: (device: Device) => void;
|
|
11
11
|
onDeviceDisconnected?: (device: Device) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceSelector.d.ts","sourceRoot":"","sources":["../../../../../src/Device/DeviceSelector/DeviceSelector.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAe9D,OAAO,EAAE,iBAAiB,EAAe,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAEH,MAAM,EAMT,MAAM,gBAAgB,CAAC;AAKxB,MAAM,WAAW,KAAK;IAClB,aAAa,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"DeviceSelector.d.ts","sourceRoot":"","sources":["../../../../../src/Device/DeviceSelector/DeviceSelector.tsx"],"names":[],"mappings":";AAUA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAe9D,OAAO,EAAE,iBAAiB,EAAe,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAEH,MAAM,EAMT,MAAM,gBAAgB,CAAC;AAKxB,MAAM,WAAW,KAAK;IAClB,aAAa,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,gBAAgB,CAAC,EAAE,CACf,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,EACvB,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;IACV,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;CAC9C;8KAYE,KAAK;AATR,wBA+KE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceAutoSelectSlice.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceAutoSelectSlice.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,MAAM,iBAAiB,GACvB,QAAQ,GACR,iBAAiB,GACjB,mBAAmB,GACnB,YAAY,GACZ,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;AAEpC,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"deviceAutoSelectSlice.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceAutoSelectSlice.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,MAAM,iBAAiB,GACvB,QAAQ,GACR,iBAAiB,GACjB,mBAAmB,GACnB,YAAY,GACZ,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;AAEpC,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IAClC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC;AA4ED,eAAO,MACH,OAAO,6EAEH,uBAAuB,2GACvB,yBAAyB,8GACzB,mBAAmB,2HACnB,mBAAmB,2HACnB,eAAe,oGACf,gBAAgB,2GAChB,sBAAsB,8HACtB,sBAAsB,+HACtB,kBAAkB,4DAjBsC,IAAI,wCAmB3D,CAAC;AAEV,eAAO,MAAM,qBAAqB,UAAW,SAAS,uBACrB,CAAC;AAElC,eAAO,MAAM,eAAe,UAAW,SAAS,YACT,CAAC;AAExC,eAAO,MAAM,wBAAwB,UAAW,SAAS,YAElB,CAAC;AAExC,eAAO,MAAM,0BAA0B,UAAW,SAAS,YACE,CAAC;AAE9D,eAAO,MAAM,oBAAoB,UAAW,SAAS,uBACT,CAAC;AAE7C,eAAO,MAAM,gBAAgB,UAAW,SAAS,8BACT,CAAC;AAEzC,eAAO,MAAM,sBAAsB,UAAW,SAAS,uBACT,CAAC;AAC/C,eAAO,MAAM,sBAAsB,UAAW,SAAS,wBACT,CAAC;AAE/C,eAAO,MAAM,kBAAkB,QAAO,QAMrC,CAAC"}
|