Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
refactor: support dispose and reload a unit (#2091)
Wenzhao Hu73733513bcbc
diff --git a/common/shared/eslint/index.js b/common/shared/eslint/index.jsindex 2f023cc1e4..47adbcc37e 100644--- a/common/shared/eslint/index.js+++ b/common/shared/eslint/index.js@@ -1,5 +1,6 @@exports.baseRules = {curly: ['error', 'multi-line'],+ 'no-empty-function': ['error'],'eol-last': ['error', 'always'],'import/no-cycle': 'error','import/no-self-import': 'error',diff --git a/examples/src/plugins/debugger/commands/commands/unit.command.ts b/examples/src/plugins/debugger/commands/commands/unit.command.tsnew file mode 100644index 0000000000..4b6c6c73ce--- /dev/null+++ b/examples/src/plugins/debugger/commands/commands/unit.command.ts@@ -0,0 +1,39 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { CommandType, type ICommand, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';++export const DisposeCurrentUnitCommand: ICommand = {+ id: 'debugger.command.dispose-current-unit',+ type: CommandType.COMMAND,+ handler: async (accessor) => {+ const univerInstanceService = accessor.get(IUniverInstanceService);+ const focused = univerInstanceService.getFocusedUnit();+ if (!focused) return false;++ return univerInstanceService.disposeUnit(focused.getUnitId());+ },+};++export const CreateEmptySheetCommand: ICommand = {+ id: 'debugger.command.create-empty-sheet',+ type: CommandType.COMMAND,+ handler: async (accessor) => {+ const univerInstanceService = accessor.get(IUniverInstanceService);+ univerInstanceService.createUnit(UniverInstanceType.UNIVER_SHEET, {});+ return true;+ },+};diff --git a/examples/src/plugins/debugger/controllers/debugger.controller.ts b/examples/src/plugins/debugger/controllers/debugger.controller.tsindex f947f6c375..db76435c84 100644--- a/examples/src/plugins/debugger/controllers/debugger.controller.ts+++ b/examples/src/plugins/debugger/controllers/debugger.controller.ts@@ -15,6 +15,7 @@*/import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';+import type { IMenuItemFactory } from '@univerjs/ui';import { ComponentManager, IMenuService } from '@univerjs/ui';import { Inject, Injector } from '@wendellhu/redi';@@ -34,9 +35,12 @@ import { TEST_EDITOR_CONTAINER_COMPONENT } from '../views/test-editor/component-// @ts-ignoreimport VueI18nIcon from '../components/VueI18nIcon.vue';+import { CreateEmptySheetCommand, DisposeCurrentUnitCommand } from '../commands/commands/unit.command';import {ConfirmMenuItemFactory,+ CreateEmptySheetMenuItemFactory,DialogMenuItemFactory,+ DisposeCurrentUnitMenuItemFactory,LocaleMenuItemFactory,MessageMenuItemFactory,NotificationMenuItemFactory,@@ -44,6 +48,7 @@ import {SetEditableMenuItemFactory,SidebarMenuItemFactory,ThemeMenuItemFactory,+ UnitMenuItemFactory,} from './menu';export class DebuggerController extends Disposable {@@ -69,6 +74,8 @@ export class DebuggerController extends Disposable {SidebarOperation,SetEditable,SaveSnapshotOptions,+ DisposeCurrentUnitCommand,+ CreateEmptySheetCommand,].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));this._injector.add([ExportController]);@@ -76,7 +83,7 @@ export class DebuggerController extends Disposable {}private _initializeContextMenu() {- [+ ([LocaleMenuItemFactory,ThemeMenuItemFactory,NotificationMenuItemFactory,@@ -86,7 +93,10 @@ export class DebuggerController extends Disposable {SidebarMenuItemFactory,SetEditableMenuItemFactory,SaveSnapshotSetEditableMenuItemFactory,- ].forEach((factory) => {+ UnitMenuItemFactory,+ DisposeCurrentUnitMenuItemFactory,+ CreateEmptySheetMenuItemFactory,+ ] as IMenuItemFactory[]).forEach((factory) => {this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory)));});}diff --git a/examples/src/plugins/debugger/controllers/menu.ts b/examples/src/plugins/debugger/controllers/menu.tsindex 8ac1a1096e..c86fd627ab 100644--- a/examples/src/plugins/debugger/controllers/menu.ts+++ b/examples/src/plugins/debugger/controllers/menu.ts@@ -16,7 +16,7 @@import { LocaleType } from '@univerjs/core';import { defaultTheme, greenTheme } from '@univerjs/design';-import type { IMenuSelectorItem } from '@univerjs/ui';+import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';import { MenuItemType, MenuPosition } from '@univerjs/ui';import type { IAccessor } from '@wendellhu/redi';@@ -29,6 +29,7 @@ import { SaveSnapshotOptions } from '../commands/operations/save-snapshot.operatimport { SetEditable } from '../commands/operations/set.editable.operation';import { SidebarOperation } from '../commands/operations/sidebar.operation';import { ThemeOperation } from '../commands/operations/theme.operation';+import { CreateEmptySheetCommand, DisposeCurrentUnitCommand } from '../commands/commands/unit.command';export function LocaleMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {return {@@ -170,6 +171,7 @@ export function SidebarMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {};}+export function SetEditableMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {return {id: SetEditable.id,@@ -212,3 +214,37 @@ export function SaveSnapshotSetEditableMenuItemFactory(accessor: IAccessor): IMe],};}++const UNIT_ITEM_MENU_ID = 'debugger.unit-menu-item';++export function UnitMenuItemFactory(): IMenuSelectorItem {+ return {+ id: UNIT_ITEM_MENU_ID,+ title: 'Unit',+ tooltip: 'Unit Commands',+ type: MenuItemType.SUBITEMS,+ positions: [MenuPosition.TOOLBAR_OTHERS],+ };+}++export function DisposeCurrentUnitMenuItemFactory(): IMenuButtonItem {+ return {+ id: DisposeCurrentUnitCommand.id,+ title: 'Dispose Current Unit',+ tooltip: 'Dispose Current Unit',+ icon: 'DS',+ type: MenuItemType.BUTTON,+ positions: [UNIT_ITEM_MENU_ID],+ };+}++export function CreateEmptySheetMenuItemFactory(): IMenuButtonItem {+ return {+ id: CreateEmptySheetCommand.id,+ title: 'Create Another Sheet',+ tooltip: 'Create Another Sheet',+ icon: 'CR',+ type: MenuItemType.BUTTON,+ positions: [UNIT_ITEM_MENU_ID],+ };+}diff --git a/examples/src/plugins/debugger/controllers/performance-monitor.controller.ts b/examples/src/plugins/debugger/controllers/performance-monitor.controller.tsindex 85e1ffddbc..bb077b9575 100644--- a/examples/src/plugins/debugger/controllers/performance-monitor.controller.ts+++ b/examples/src/plugins/debugger/controllers/performance-monitor.controller.ts@@ -16,7 +16,6 @@import { IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, UniverInstanceType } from '@univerjs/core';import { DocCanvasView } from '@univerjs/docs-ui';-import { SheetCanvasView } from '@univerjs/sheets-ui';import { Inject, Injector } from '@wendellhu/redi';import { interval, takeUntil, throttle } from 'rxjs';@@ -94,14 +93,16 @@ export class PerformanceMonitorController extends RxDisposable {.subscribe((fps) => {container.innerText = `FPS: ${fps}`;});- } else if (this._documentType === UniverInstanceType.UNIVER_SHEET) {- this._injector- .get(SheetCanvasView)- .fps$.pipe(takeUntil(this.dispose$))- .pipe(throttle(() => interval(THROTTLE_TIME)))- .subscribe((fps) => {- container.innerText = `FPS: ${fps}`;- });}+ // TODO@wzhudev: restore fps monitor+ // else if (this._documentType === UniverInstanceType.UNIVER_SHEET) {+ // this._injector+ // .get(SheetCanvasView)+ // .fps$.pipe(takeUntil(this.dispose$))+ // .pipe(throttle(() => interval(THROTTLE_TIME)))+ // .subscribe((fps) => {+ // container.innerText = `FPS: ${fps}`;+ // });+ // }}}diff --git a/examples/src/plugins/local-save/controller/record.controller.ts b/examples/src/plugins/local-save/controller/record.controller.tsindex 2cd41e06bb..e8e6a3f8b1 100644--- a/examples/src/plugins/local-save/controller/record.controller.ts+++ b/examples/src/plugins/local-save/controller/record.controller.ts@@ -19,7 +19,9 @@ import { Inject } from '@wendellhu/redi';import { Observable } from 'rxjs';export class RecordController {- constructor(@Inject(ICommandService) private _commandService: ICommandService) {}+ constructor(@Inject(ICommandService) private _commandService: ICommandService) {+ // empty+ }record() {return new Observable<{ type: 'start' } | { type: 'finish'; data: Blob }>((subscribe) => {diff --git a/package.json b/package.jsonindex 83da31191c..026f34a9b5 100644--- a/package.json+++ b/package.json@@ -72,7 +72,8 @@"release-it": "^17.2.0","serve": "^14.2.2","turbo": "^1.13.2",- "typescript": "^5.4.5"+ "typescript": "^5.4.5",+ "vitest": "^1.5.0"},"lint-staged": {"*": "eslint --fix"diff --git a/packages/core/src/docs/data-model/document-data-model.ts b/packages/core/src/docs/data-model/document-data-model.tsindex 2998e08913..42f5f8fd8c 100644--- a/packages/core/src/docs/data-model/document-data-model.ts+++ b/packages/core/src/docs/data-model/document-data-model.ts@@ -98,10 +98,6 @@ class DocumentDataModelSimple extends UnitModel<IDocumentData, UniverInstanceTypreturn this.snapshot.container;}- getParentRenderUnitId() {- return this.snapshot.parentRenderUnitId;- }-getSnapshot() {return this.snapshot;}diff --git a/packages/core/src/docs/data-model/text-x/action-iterator.ts b/packages/core/src/docs/data-model/text-x/action-iterator.tsindex 9ed28f276d..03b70eb0ef 100644--- a/packages/core/src/docs/data-model/text-x/action-iterator.ts+++ b/packages/core/src/docs/data-model/text-x/action-iterator.ts@@ -23,7 +23,9 @@ export class ActionIterator {private _index = 0;private _offset = 0;- constructor(private _actions: TextXAction[]) {}+ constructor(private _actions: TextXAction[]) {+ // empty+ }hasNext() {return this.peekLength() < Number.POSITIVE_INFINITY;diff --git a/packages/core/src/observer/observable.ts b/packages/core/src/observer/observable.tsindex ed63973f2e..41c1ff7597 100644--- a/packages/core/src/observer/observable.ts+++ b/packages/core/src/observer/observable.ts@@ -98,7 +98,9 @@ export class Observer<T = void> {*/public callback: (eventData: T, eventState: EventState) => void,public observable: Observable<T>- ) {}+ ) {+ // empty+ }}/**diff --git a/packages/core/src/services/instance/instance.service.ts b/packages/core/src/services/instance/instance.service.tsindex 1025e49dd3..04232ac3cc 100644--- a/packages/core/src/services/instance/instance.service.ts+++ b/packages/core/src/services/instance/instance.service.ts@@ -148,10 +148,11 @@ export class UniverInstanceService extends Disposable implements IUniverInstanceif (!this._unitsByType.has(type)) {this._unitsByType.set(type, []);}+this._unitsByType.get(type)!.push(unit);- this._unitAdded$.next(unit);this._currentUnits$.next({ ...this._currentUnits$.getValue(), [type]: unit });+ this._unitAdded$.next(unit);}private _unitDisposed$ = new Subject<UnitModel>();diff --git a/packages/core/src/services/plugin/plugin.ts b/packages/core/src/services/plugin/plugin.tsindex 28ac433613..2accf2f527 100644--- a/packages/core/src/services/plugin/plugin.ts+++ b/packages/core/src/services/plugin/plugin.ts@@ -30,14 +30,21 @@ export abstract class Plugin extends Disposable {protected abstract _injector: Injector;- // eslint-disable-next-line unused-imports/no-unused-vars- onStarting(injector: Injector): void {}+ onStarting(_injector: Injector): void {+ // empty+ }- onReady(): void {}+ onReady(): void {+ // empty+ }- onRendered(): void {}+ onRendered(): void {+ // empty+ }- onSteady(): void {}+ onSteady(): void {+ // empty+ }getUniverInstanceType(): UniverInstanceType {return (this.constructor as typeof Plugin).type;diff --git a/packages/core/src/services/undoredo/undoredo.service.ts b/packages/core/src/services/undoredo/undoredo.service.tsindex 185f65f68a..81236f4cbd 100644--- a/packages/core/src/services/undoredo/undoredo.service.ts+++ b/packages/core/src/services/undoredo/undoredo.service.ts@@ -91,7 +91,9 @@ export interface IUndoRedoStatus {const STACK_CAPACITY = 20;abstract class MultiImplementationCommand implements IDisposable {- dispose(): void { }+ dispose(): void {+ // empty+ }async dispatchToHandlers(): Promise<boolean> {return false;diff --git a/packages/core/src/shared/lifecycle.ts b/packages/core/src/shared/lifecycle.tsindex 311626d2b3..e149eb3b28 100644--- a/packages/core/src/shared/lifecycle.ts+++ b/packages/core/src/shared/lifecycle.ts@@ -34,7 +34,9 @@ export function toDisposable(v: DisposableLike): IDisposable {let disposed = false;if (!v) {- return toDisposable(() => { });+ return toDisposable(() => {+ // empty+ });}if (isSubscription(v)) {diff --git a/packages/core/src/sheets/workbook.ts b/packages/core/src/sheets/workbook.tsindex fd797cd2e0..3709c9e571 100644--- a/packages/core/src/sheets/workbook.ts+++ b/packages/core/src/sheets/workbook.ts@@ -173,10 +173,6 @@ export class Workbook extends UnitModel<IWorkbookData, UniverInstanceType.UNIVERreturn true;}- getParentRenderUnitId() {- return this._snapshot.parentRenderUnitId;- }-getSheetOrders(): Readonly<string[]> {return this._snapshot.sheetOrder;}diff --git a/packages/core/src/slides/slide-model.ts b/packages/core/src/slides/slide-model.tsindex f699140780..02ccc40069 100644--- a/packages/core/src/slides/slide-model.ts+++ b/packages/core/src/slides/slide-model.ts@@ -38,10 +38,6 @@ export class SlideDataModel extends UnitModel<ISlideData, UniverInstanceType.UNIreturn this._snapshot.container;}- getParentRenderUnitId() {- return this._snapshot.parentRenderUnitId;- }-getSnapshot() {return this._snapshot;}diff --git a/packages/core/src/types/interfaces/i-extra-model-data.ts b/packages/core/src/types/interfaces/i-extra-model-data.tsindex 62c5995094..b4d502c0bd 100644--- a/packages/core/src/types/interfaces/i-extra-model-data.ts+++ b/packages/core/src/types/interfaces/i-extra-model-data.ts@@ -27,11 +27,4 @@ export interface IExtraModelData {* default is null*/container?: string;-- /**- * Specify the unitID of the parent render. In this case, the scene will enter- * the sceneViewer and become a child application of the parent scene.- * default is null- */- parentRenderUnitId?: string;}diff --git a/packages/data-validation/src/validators/base-data-validator.ts b/packages/data-validation/src/validators/base-data-validator.tsindex b62078d389..a4aea2ae54 100644--- a/packages/data-validation/src/validators/base-data-validator.ts+++ b/packages/data-validation/src/validators/base-data-validator.ts@@ -73,7 +73,9 @@ export abstract class BaseDataValidator<DataType = CellValue> {constructor(@Inject(LocaleService) readonly localeService: LocaleService,@Inject(Injector) readonly injector: Injector- ) { }+ ) {+ // empty+ }get operatorNames() {return this.operators.map((operator) => this.localeService.t(operatorNameMap[operator]));diff --git a/packages/design/src/components/dialog/Dialog.tsx b/packages/design/src/components/dialog/Dialog.tsxindex 78debcb17b..56844255c1 100644--- a/packages/design/src/components/dialog/Dialog.tsx+++ b/packages/design/src/components/dialog/Dialog.tsx@@ -124,8 +124,12 @@ export function Dialog(props: IDialogProps) {onMouseOut={() => {setDragDisabled(true);}}- onFocus={() => {}}- onBlur={() => {}}+ onFocus={() => {+ // empty+ }}+ onBlur={() => {+ // empty+ }}>{title}</div>diff --git a/packages/design/src/components/form-layout/FormLayout.stories.tsx b/packages/design/src/components/form-layout/FormLayout.stories.tsxindex 6360df4c94..7ac650019d 100644--- a/packages/design/src/components/form-layout/FormLayout.stories.tsx+++ b/packages/design/src/components/form-layout/FormLayout.stories.tsx@@ -39,7 +39,7 @@ function PagerDemo() {<Input placeholder="请输入" /></FormLayout><FormLayout label="行标题与列标题" desc="转到“查看”>“冻结”可选择要在所有页面重复的行/列" error="123">- <Select value="" onChange={() => {}} />+ <Select value="" onChange={() => { /* empty */ }} /></FormLayout></>);diff --git a/packages/design/src/components/popup/RectPopup.tsx b/packages/design/src/components/popup/RectPopup.tsxindex 41a2855227..032552c7f0 100644--- a/packages/design/src/components/popup/RectPopup.tsx+++ b/packages/design/src/components/popup/RectPopup.tsx@@ -78,9 +78,9 @@ const calcPopupPosition = (layout: IPopupLayoutInfo) => {};function RectPopup(props: IRectPopupProps) {- const { children, anchorRect, direction = 'vertical', onClickOutside, excludeOutside, closeOnSelfTarget } = props;+ const { children, anchorRect, direction = 'vertical', onClickOutside, excludeOutside } = props;const nodeRef = useRef<HTMLElement>(null);- const clickOtherFn = useEvent(onClickOutside ?? (() => { }));+ const clickOtherFn = useEvent(onClickOutside ?? (() => { /* empty */ }));const [position, setPosition] = useState<Partial<IAbsolutePosition>>({top: -9999,diff --git a/packages/docs-ui/src/controllers/doc-container-ui-controller.ts b/packages/docs-ui/src/controllers/doc-container-ui-controller.tsindex f61eca560d..81312203db 100644--- a/packages/docs-ui/src/controllers/doc-container-ui-controller.ts+++ b/packages/docs-ui/src/controllers/doc-container-ui-controller.ts@@ -28,7 +28,9 @@ export class DocContainerUIController {private readonly _config: IUniverDocsUIConfig,@Inject(LocaleService) private readonly _localeService: LocaleService,@Inject(Injector) private readonly _injector: Injector- ) {}+ ) {+ // empty+ }getUIConfig() {const config = {diff --git a/packages/docs-ui/src/views/doc-canvas-view.ts b/packages/docs-ui/src/views/doc-canvas-view.tsindex 74606f53db..46975d82be 100644--- a/packages/docs-ui/src/views/doc-canvas-view.ts+++ b/packages/docs-ui/src/views/doc-canvas-view.ts@@ -84,25 +84,12 @@ export class DocCanvasView extends RxDisposable {}}- // eslint-disable-next-line max-lines-per-function+private _addNewRender() {const documentModel = this._currentDocumentModel;const unitId = documentModel.getUnitId();-- const container = documentModel.getContainer();-- const parentRenderUnitId = documentModel.getParentRenderUnitId();-- if (container != null && parentRenderUnitId != null) {- throw new Error('container or parentRenderUnitId can only exist one');- }-- if (container == null && parentRenderUnitId != null) {- this._renderManagerService.createRenderWithParent(unitId, parentRenderUnitId);- } else {- this._renderManagerService.createRender(unitId);- }+ this._renderManagerService.createRender(unitId);const currentRender = this._renderManagerService.getRenderById(unitId);diff --git a/packages/docs/src/commands/commands/__tests__/mock-text-selection-render-manager.ts b/packages/docs/src/commands/commands/__tests__/mock-text-selection-render-manager.tsindex 506084e39c..6cb3004d46 100644--- a/packages/docs/src/commands/commands/__tests__/mock-text-selection-render-manager.ts+++ b/packages/docs/src/commands/commands/__tests__/mock-text-selection-render-manager.ts@@ -23,8 +23,14 @@ export class TextSelectionRenderManager {private readonly _textSelectionInner$ = new BehaviorSubject<Nullable<ITextSelectionInnerParam>>(null);readonly textSelectionInner$ = this._textSelectionInner$.asObservable();- removeAllTextRanges() {}- addTextRanges() {}++ removeAllTextRanges() {+ // empty+ }++ addTextRanges() {+ // empty+ }}export const ITextSelectionRenderManager = createIdentifier<TextSelectionRenderManager>(diff --git a/packages/docs/src/controllers/move-cursor.controller.ts b/packages/docs/src/controllers/move-cursor.controller.tsindex 1929cd03a5..6c73c4ee63 100644--- a/packages/docs/src/controllers/move-cursor.controller.ts+++ b/packages/docs/src/controllers/move-cursor.controller.ts@@ -53,17 +53,15 @@ export class MoveCursorController extends Disposable {) {super();- this._initialize();-this._commandExecutedListener();}override dispose(): void {+ super.dispose();+this._onInputSubscription?.unsubscribe();}- private _initialize() { }-private _commandExecutedListener() {const updateCommandList = [MoveCursorOperation.id, MoveSelectionOperation.id];diff --git a/packages/docs/src/controllers/normal-input.controller.ts b/packages/docs/src/controllers/normal-input.controller.tsindex 2d937a3438..51ad4d939f 100644--- a/packages/docs/src/controllers/normal-input.controller.ts+++ b/packages/docs/src/controllers/normal-input.controller.ts@@ -20,7 +20,6 @@ import { IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/enimport { Inject } from '@wendellhu/redi';import type { Subscription } from 'rxjs';-import { getDocObject } from '../basics/component-tools';import { InsertCommand } from '../commands/commands/core-editing.command';import { DocSkeletonManagerService } from '../services/doc-skeleton-manager.service';@@ -37,16 +36,16 @@ export class NormalInputController extends Disposable {) {super();- this._initialize();-- this._commandExecutedListener();+ this._init();}override dispose(): void {+ super.dispose();+this._onInputSubscription?.unsubscribe();}- private _initialize() {+ private _init() {this._initialNormalInput();}@@ -100,10 +99,4 @@ export class NormalInputController extends Disposable {});});}-- private _commandExecutedListener() { }-- private _getDocObject() {- return getDocObject(this._univerInstanceService, this._renderManagerService);- }}diff --git a/packages/docs/src/doc-plugin.ts b/packages/docs/src/doc-plugin.tsindex c7d95db1b8..63007198f3 100644--- a/packages/docs/src/doc-plugin.ts+++ b/packages/docs/src/doc-plugin.ts@@ -63,33 +63,23 @@ export interface IUniverDocsConfig {hasScroll?: boolean;}-const DEFAULT_DOCUMENT_PLUGIN_DATA = {- hasScroll: true,-};-const PLUGIN_NAME = 'docs';export class UniverDocsPlugin extends Plugin {static override pluginName = PLUGIN_NAME;static override type = UniverInstanceType.UNIVER_DOC;- private _config: IUniverDocsConfig;-constructor(- config: Partial<IUniverDocsConfig> = {},+ _config: Partial<IUniverDocsConfig> = {},@Inject(Injector) override _injector: Injector) {super();- this._config = Object.assign(DEFAULT_DOCUMENT_PLUGIN_DATA, config);-this._initializeDependencies(_injector);this._initializeCommands();}- initialize(): void {}-private _initializeCommands(): void {([@@ -136,10 +126,6 @@ export class UniverDocsPlugin extends Plugin {});}- override onReady(): void {- this.initialize();- }-private _initializeDependencies(docInjector: Injector) {([diff --git a/packages/engine-formula/src/engine/ast-node/base-ast-node-factory.ts b/packages/engine-formula/src/engine/ast-node/base-ast-node-factory.tsindex 23e0a1c80a..d4a0b81761 100644--- a/packages/engine-formula/src/engine/ast-node/base-ast-node-factory.ts+++ b/packages/engine-formula/src/engine/ast-node/base-ast-node-factory.ts@@ -22,7 +22,7 @@ import { BaseAstNode } from './base-ast-node';export const DEFAULT_AST_NODE_FACTORY_Z_INDEX = 100;-export class BaseAstNodeFactory extends Disposable {+export abstract class BaseAstNodeFactory extends Disposable {get zIndex() {return 0;}@@ -37,5 +37,5 @@ export class BaseAstNodeFactory extends Disposable {return new BaseAstNode(token);}- checkAndCreateNodeType(param: LexerNode | string): Nullable<BaseAstNode> {}+ abstract checkAndCreateNodeType(param: LexerNode | string): Nullable<BaseAstNode>;}diff --git a/packages/engine-formula/src/engine/dependency/formula-dependency.ts b/packages/engine-formula/src/engine/dependency/formula-dependency.tsindex ed46bb298b..03f9e564e6 100644--- a/packages/engine-formula/src/engine/dependency/formula-dependency.ts+++ b/packages/engine-formula/src/engine/dependency/formula-dependency.ts@@ -44,14 +44,14 @@ import { FormulaDependencyTree, FormulaDependencyTreeCache } from './dependency-const FORMULA_CACHE_LRU_COUNT = 100000;-export const FormulaASTCache = new FormulaAstLRU<AstRootNode>(FORMULA_CACHE_LRU_COUNT);-@OnLifecycle(LifecycleStages.Rendered, FormulaDependencyGenerator)export class FormulaDependencyGenerator extends Disposable {private _updateRangeFlattenCache = new Map<string, Map<string, IRange[]>>();private _dirtyUnitSheetNameMap: IDirtyUnitSheetNameMap = {};+ private _formulaASTCache = new FormulaAstLRU<AstRootNode>(FORMULA_CACHE_LRU_COUNT);+constructor(@IFormulaCurrentConfigService private readonly _currentConfigService: IFormulaCurrentConfigService,@IFormulaRuntimeService private readonly _runtimeService: IFormulaRuntimeService,@@ -68,7 +68,7 @@ export class FormulaDependencyGenerator extends Disposable {override dispose(): void {this._updateRangeFlattenCache.clear();- FormulaASTCache.clear();+ this._formulaASTCache.clear();this._dirtyUnitSheetNameMap = {};}@@ -158,7 +158,7 @@ export class FormulaDependencyGenerator extends Disposable {const forceCalculate = this._currentConfigService.isForceCalculate();if (forceCalculate) {this._dependencyManagerService.reset();- FormulaASTCache.clear();+ this._formulaASTCache.clear();}@@ -266,7 +266,7 @@ export class FormulaDependencyGenerator extends Disposable {const { f: formulaString } = formulaDataItem;- const node = this._generateAstNode(formulaString);+ const node = this._generateAstNode(unitId, formulaString);const FDtree = new FormulaDependencyTree();@@ -312,7 +312,7 @@ export class FormulaDependencyGenerator extends Disposable {return true;}- const node = this._generateAstNode(formulaString, x, y);+ const node = this._generateAstNode(unitId, formulaString, x, y);const FDtree = new FormulaDependencyTree();@@ -358,8 +358,8 @@ export class FormulaDependencyGenerator extends Disposable {this._dirtyUnitSheetNameMap = this._currentConfigService.getDirtyNameMap();}- private _generateAstNode(formulaString: string, refOffsetX: number = 0, refOffsetY: number = 0) {- let astNode: Nullable<AstRootNode> = FormulaASTCache.get(`${formulaString}##${refOffsetX}${refOffsetY}`);+ private _generateAstNode(unitId: string, formulaString: string, refOffsetX: number = 0, refOffsetY: number = 0) {+ let astNode: Nullable<AstRootNode> = this._formulaASTCache.get(`${unitId}${formulaString}##${refOffsetX}${refOffsetY}`);if (astNode && !this._isDirtyDefinedForNode(astNode)) {return astNode;@@ -379,7 +379,7 @@ export class FormulaDependencyGenerator extends Disposable {throw new Error('astNode is null');}- FormulaASTCache.set(`${formulaString}##${refOffsetX}${refOffsetY}`, astNode);+ this._formulaASTCache.set(`${unitId}${formulaString}##${refOffsetX}${refOffsetY}`, astNode);return astNode;}diff --git a/packages/engine-formula/src/engine/interpreter/interpreter.ts b/packages/engine-formula/src/engine/interpreter/interpreter.tsindex 80b84cfdc3..23dcbb73d8 100644--- a/packages/engine-formula/src/engine/interpreter/interpreter.ts+++ b/packages/engine-formula/src/engine/interpreter/interpreter.ts@@ -32,8 +32,6 @@ export class Interpreter extends Disposable {super();}- override dispose(): void {}-async executeAsync(node: BaseAstNode): Promise<FunctionVariantType> {// if (!this._interpreterCalculateProps) {// return ErrorValueObject.create(ErrorType.ERROR);diff --git a/packages/engine-formula/src/models/formula-data.model.ts b/packages/engine-formula/src/models/formula-data.model.tsindex bd789181b0..1b9261374b 100644--- a/packages/engine-formula/src/models/formula-data.model.ts+++ b/packages/engine-formula/src/models/formula-data.model.ts@@ -262,6 +262,7 @@ export class FormulaDataModel extends Disposable {* @returns*/initFormulaData() {+ // TODO@Dushusir: load doc/slide formula data// Load formula data from workbook config data.const allSheets = this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET);if (allSheets.length === 0) {@@ -556,7 +557,7 @@ export function initSheetFormulaData(unitId: string,sheetId: string,cellMatrix: ObjectMatrix<Nullable<ICellData>>-) {+): IFormulaData {const formulaIdMap = new Map<string, { f: string; r: number; c: number }>(); // Connect the formula and IDconst sheetFormulaDataMatrix = new ObjectMatrix<IFormulaDataItem>();cellMatrix.forValue((r, c, cell) => {diff --git a/packages/engine-formula/src/services/calculate-formula.service.ts b/packages/engine-formula/src/services/calculate-formula.service.tsindex 88bf077feb..7754ef85f0 100644--- a/packages/engine-formula/src/services/calculate-formula.service.ts+++ b/packages/engine-formula/src/services/calculate-formula.service.ts@@ -78,8 +78,6 @@ export class CalculateFormulaService extends Disposable {super();}- override dispose(): void {}-/*** Stop the execution of the formula.*/diff --git a/packages/engine-render/docs/render-unit.excalidraw b/packages/engine-render/docs/render-unit.excalidrawnew file mode 100644index 0000000000..1a4177b63c--- /dev/null+++ b/packages/engine-render/docs/render-unit.excalidraw@@ -0,0 +1,1881 @@+{+ "type": "excalidraw",+ "version": 2,+ "source": "https://marketplace.visualstudio.com/items?itemName=pomdtr.excalidraw-editor",+ "elements": [+ {+ "id": "IBVejM0r0TQVE-0-p3RxE",+ "type": "rectangle",+ "x": 91.83155737142101,+ "y": 220.13715350011813,+ "width": 829.3333740234375,+ "height": 489.99999999999994,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "dashed",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "seed": 1879243605,+ "version": 92,+ "versionNonce": 1266388603,+ "isDeleted": false,+ "boundElements": [+ {+ "id": "jc7ODye4ptpQd167_PYRv",+ "type": "arrow"+ }+ ],+ "updated": 1714274868727,+ "link": null,+ "locked": false+ },+ {+ "id": "KEWFTg8JZggzBDocaVvJd",+ "type": "rectangle",+ "x": 131.7574267833137,+ "y": 631.2482646112292,+ "width": 745.9260050455729,+ "height": 45.92597113715283,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "seed": 929366709,+ "version": 90,+ "versionNonce": 1086797883,+ "isDeleted": false,+ "boundElements": [+ {+ "type": "text",+ "id": "Up3wzUquRvDnRNpQUaVzr"+ },+ {+ "id": "tDllldNgZGPRuDlBspG4N",+ "type": "arrow"+ },+ {+ "id": "44g_3EKFT_LBf3pYbhcrW",+ "type": "arrow"+ },+ {+ "id": "qfOjrJlcQr4ehDYe3G_RI",+ "type": "arrow"+ },+ {+ "id": "AT2cJA5Y8I3o21KUGizN1",+ "type": "arrow"+ }+ ],+ "updated": 1714274866577,+ "link": null,+ "locked": false+ },+ {+ "id": "Up3wzUquRvDnRNpQUaVzr",+ "type": "text",+ "x": 392.6805199433072,+ "y": 641.7112501798056,+ "width": 224.07981872558594,+ "height": 25,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "seed": 1638851125,+ "version": 67,+ "versionNonce": 1500764085,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866443,+ "link": null,+ "locked": false,+ "text": "IRenderManagerService",+ "fontSize": 20,+ "fontFamily": 1,+ "textAlign": "center",+ "verticalAlign": "middle",+ "baseline": 17,+ "containerId": "KEWFTg8JZggzBDocaVvJd",+ "originalText": "IRenderManagerService",+ "lineHeight": 1.25+ },+ {+ "id": "MRTrbIVi5I2EBhrQxSsSb",+ "type": "ellipse",+ "x": 519.9055188748937,+ "y": 549.026042500118,+ "width": 121.48145887586801,+ "height": 48.888888888888914,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 1697074453,+ "version": 385,+ "versionNonce": 1964234037,+ "isDeleted": false,+ "boundElements": [+ {+ "type": "text",+ "id": "Kwe2mTHNGPbwifimOXvPM"+ },+ {+ "id": "oxHm_eWq5qrkzaArcOFdh",+ "type": "arrow"+ },+ {+ "id": "tDllldNgZGPRuDlBspG4N",+ "type": "arrow"+ }+ ],+ "updated": 1714274866443,+ "link": null,+ "locked": false+ },+ {+ "id": "Kwe2mTHNGPbwifimOXvPM",+ "type": "text",+ "x": 542.8660953195706,+ "y": 561.185654515558,+ "width": 75.65994262695312,+ "height": 25,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "seed": 397215797,+ "version": 512,+ "versionNonce": 1856857749,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866443,+ "link": null,+ "locked": false,+ "text": "IRender",+ "fontSize": 20,+ "fontFamily": 1,+ "textAlign": "center",+ "verticalAlign": "middle",+ "baseline": 17,+ "containerId": "MRTrbIVi5I2EBhrQxSsSb",+ "originalText": "IRender",+ "lineHeight": 1.25+ },+ {+ "type": "ellipse",+ "version": 396,+ "versionNonce": 269030069,+ "isDeleted": false,+ "id": "za2rn7AFBmFoI-51I40Jl",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 613.238885659182,+ "y": 490.507467356455,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 121.48145887586801,+ "height": 48.888888888888914,+ "seed": 449360437,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [+ {+ "type": "text",+ "id": "wTCVfYSq9-lJ3Q7XOZnTf"+ },+ {+ "id": "jcyX81arBvRpKolPh3ECc",+ "type": "arrow"+ },+ {+ "id": "44g_3EKFT_LBf3pYbhcrW",+ "type": "arrow"+ }+ ],+ "updated": 1714274866443,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 523,+ "versionNonce": 1126102037,+ "isDeleted": false,+ "id": "wTCVfYSq9-lJ3Q7XOZnTf",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 636.1994621038589,+ "y": 502.66707937189494,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 75.65994262695312,+ "height": 25,+ "seed": 599696277,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274866443,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "IRender",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "za2rn7AFBmFoI-51I40Jl",+ "originalText": "IRender",+ "lineHeight": 1.25,+ "baseline": 17+ },+ {+ "type": "ellipse",+ "version": 405,+ "versionNonce": 900960309,+ "isDeleted": false,+ "id": "tRUJ3yhRUAChJJdmoboEM",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 689.5352045610916,+ "y": 558.65569462425,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 121.48145887586801,+ "height": 48.888888888888914,+ "seed": 278855643,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [+ {+ "type": "text",+ "id": "kCW2Dq4fbHGYXL9zFlh5R"+ },+ {+ "id": "AT2cJA5Y8I3o21KUGizN1",+ "type": "arrow"+ }+ ],+ "updated": 1714274866443,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 533,+ "versionNonce": 429769109,+ "isDeleted": false,+ "id": "kCW2Dq4fbHGYXL9zFlh5R",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 712.4957810057685,+ "y": 570.81530663969,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 75.65994262695312,+ "height": 25,+ "seed": 302533755,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274866443,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "IRender",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "tRUJ3yhRUAChJJdmoboEM",+ "originalText": "IRender",+ "lineHeight": 1.25,+ "baseline": 17+ },+ {+ "type": "ellipse",+ "version": 436,+ "versionNonce": 1129324629,+ "isDeleted": false,+ "id": "vmPLfAnG1ul50xcKUSwOR",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 765.831455646161,+ "y": 500.50756908171536,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 121.48145887586801,+ "height": 48.888888888888914,+ "seed": 1777031381,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [+ {+ "type": "text",+ "id": "CQMwkK1CaPE6YOPDK9aPm"+ },+ {+ "id": "qfOjrJlcQr4ehDYe3G_RI",+ "type": "arrow"+ }+ ],+ "updated": 1714274866443,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 564,+ "versionNonce": 1098075573,+ "isDeleted": false,+ "id": "CQMwkK1CaPE6YOPDK9aPm",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 788.7920320908379,+ "y": 512.6671810971553,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 75.65994262695312,+ "height": 25,+ "seed": 1360229941,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274866443,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "IRender",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "vmPLfAnG1ul50xcKUSwOR",+ "originalText": "IRender",+ "lineHeight": 1.25,+ "baseline": 17+ },+ {+ "id": "PlFtNF4_Nc-UXjNYQGGpd",+ "type": "rectangle",+ "x": 147.3130162472894,+ "y": 283.84086850662857,+ "width": 285.18520779079864,+ "height": 40.00000000000001,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "seed": 1440702741,+ "version": 99,+ "versionNonce": 839459957,+ "isDeleted": false,+ "boundElements": [+ {+ "type": "text",+ "id": "OY0qyzruohmafJysXk5-Q"+ },+ {+ "id": "oxHm_eWq5qrkzaArcOFdh",+ "type": "arrow"+ },+ {+ "id": "jcyX81arBvRpKolPh3ECc",+ "type": "arrow"+ }+ ],+ "updated": 1714274866443,+ "link": null,+ "locked": false+ },+ {+ "id": "OY0qyzruohmafJysXk5-Q",+ "type": "text",+ "x": 178.3357272593879,+ "y": 291.34086850662857,+ "width": 223.13978576660156,+ "height": 25,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "seed": 718783541,+ "version": 85,+ "versionNonce": 1454820821,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866443,+ "link": null,+ "locked": false,+ "text": "ColumnHeaderController",+ "fontSize": 20,+ "fontFamily": 1,+ "textAlign": "center",+ "verticalAlign": "middle",+ "baseline": 17,+ "containerId": "PlFtNF4_Nc-UXjNYQGGpd",+ "originalText": "ColumnHeaderController",+ "lineHeight": 1.25+ },+ {+ "id": "oxHm_eWq5qrkzaArcOFdh",+ "type": "arrow",+ "x": 284.84668982491235,+ "y": 331.2482646112292,+ "width": 244.50896265486745,+ "height": 217.95199990563327,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 168572437,+ "version": 222,+ "versionNonce": 1155310971,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866578,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ 244.50896265486745,+ 217.95199990563327+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "PlFtNF4_Nc-UXjNYQGGpd",+ "focus": 0.21696632056354012,+ "gap": 7.40739610460065+ },+ "endBinding": {+ "elementId": "MRTrbIVi5I2EBhrQxSsSb",+ "focus": -0.3610680050675144,+ "gap": 9.77747106069502+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "id": "jcyX81arBvRpKolPh3ECc",+ "type": "arrow",+ "x": 376.61412424297396,+ "y": 331.2482646112292,+ "width": 261.04444411996496,+ "height": 153.97031788335522,+ "angle": 0,+ "strokeColor": "#e03131",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 1657708219,+ "version": 160,+ "versionNonce": 99074747,+ "isDeleted": false,+ "boundElements": [+ {+ "type": "text",+ "id": "v-DFW4N_zizeBk587RJpL"+ }+ ],+ "updated": 1714274866578,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ 261.04444411996496,+ 153.97031788335522+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "PlFtNF4_Nc-UXjNYQGGpd",+ "focus": -0.2279955211858477,+ "gap": 7.40739610460065+ },+ "endBinding": {+ "elementId": "za2rn7AFBmFoI-51I40Jl",+ "focus": 0.19160883165664302,+ "gap": 9.75451902242311+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "id": "v-DFW4N_zizeBk587RJpL",+ "type": "text",+ "x": 582.4548514925706,+ "y": 363.6240478305666,+ "width": 165.6998748779297,+ "height": 25,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "seed": 600446363,+ "version": 35,+ "versionNonce": 1782639605,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274835999,+ "link": null,+ "locked": false,+ "text": "Fails to connect!",+ "fontSize": 20,+ "fontFamily": 1,+ "textAlign": "center",+ "verticalAlign": "middle",+ "baseline": 17,+ "containerId": "jcyX81arBvRpKolPh3ECc",+ "originalText": "Fails to connect!",+ "lineHeight": 1.25+ },+ {+ "id": "tDllldNgZGPRuDlBspG4N",+ "type": "arrow",+ "x": 525.4460507435656,+ "y": 594.9362583896415,+ "width": 27.65038433606469,+ "height": 31.12679843078911,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 207098427,+ "version": 191,+ "versionNonce": 641503227,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866578,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ -27.65038433606469,+ 31.12679843078911+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "MRTrbIVi5I2EBhrQxSsSb",+ "focus": 0.5601365346114884,+ "gap": 9.177568135052454+ },+ "endBinding": {+ "elementId": "KEWFTg8JZggzBDocaVvJd",+ "focus": -0.08117017349776119,+ "gap": 5.185207790798586+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "id": "44g_3EKFT_LBf3pYbhcrW",+ "type": "arrow",+ "x": 671.2470009506276,+ "y": 543.1191954377834,+ "width": 13.479010020929422,+ "height": 79.24018028455691,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 1935129269,+ "version": 205,+ "versionNonce": 1127157051,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866578,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ -13.479010020929422,+ 79.24018028455691+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "za2rn7AFBmFoI-51I40Jl",+ "focus": -0.03381461850579168,+ "gap": 3.7469883444286403+ },+ "endBinding": {+ "elementId": "KEWFTg8JZggzBDocaVvJd",+ "focus": 0.39172610019025456,+ "gap": 8.8888888888888+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "id": "AT2cJA5Y8I3o21KUGizN1",+ "type": "arrow",+ "x": 749.5352384695116,+ "y": 608.2852790426529,+ "width": 3.7037489149304292,+ "height": 14.814860026041629,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 541526165,+ "version": 88,+ "versionNonce": 99593691,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866578,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ -3.7037489149304292,+ 14.814860026041629+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "tRUJ3yhRUAChJJdmoboEM",+ "focus": -0.09100549654888022,+ "gap": 1+ },+ "endBinding": {+ "elementId": "KEWFTg8JZggzBDocaVvJd",+ "focus": 0.6161364379120247,+ "gap": 8.148125542534672+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "id": "qfOjrJlcQr4ehDYe3G_RI",+ "type": "arrow",+ "x": 843.247909510083,+ "y": 550.6099093825718,+ "width": 0.1595555161794664,+ "height": 70.26800746390052,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 1244445787,+ "version": 155,+ "versionNonce": 492581659,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274866578,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ 0.1595555161794664,+ 70.26800746390052+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "vmPLfAnG1ul50xcKUSwOR",+ "focus": -0.2735801332226862,+ "gap": 2.138854545565671+ },+ "endBinding": {+ "elementId": "KEWFTg8JZggzBDocaVvJd",+ "focus": 0.9081741861799392,+ "gap": 10.370347764756843+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "type": "rectangle",+ "version": 156,+ "versionNonce": 1050700731,+ "isDeleted": false,+ "id": "rz9Fdsy8H7oWjot8Dsnpr",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "dashed",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1164.9868614449183,+ "y": 185.85964676285744,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 829.3333740234375,+ "height": 570.868021082176,+ "seed": 695485173,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "boundElements": [+ {+ "id": "jc7ODye4ptpQd167_PYRv",+ "type": "arrow"+ }+ ],+ "updated": 1714274868727,+ "link": null,+ "locked": false+ },+ {+ "type": "rectangle",+ "version": 120,+ "versionNonce": 2061898773,+ "isDeleted": false,+ "id": "78JwqCbYWieixUBaq4vy9",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1203.7234584263397,+ "y": 598.1600303044397,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 745.9260050455729,+ "height": 45.92597113715283,+ "seed": 540679253,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "boundElements": [+ {+ "type": "text",+ "id": "fKa9_Y7NiiFZWnvyPKaMq"+ },+ {+ "id": "SjFTcsbt6plduhRD6v2eU",+ "type": "arrow"+ },+ {+ "id": "v5cTF76fez4IUzEl4KJWK",+ "type": "arrow"+ },+ {+ "id": "T22CXB2qfbQGxs0PBPsb2",+ "type": "arrow"+ },+ {+ "id": "jgLPxPPq25tNHGNudN4zK",+ "type": "arrow"+ }+ ],+ "updated": 1714274835999,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 97,+ "versionNonce": 491037627,+ "isDeleted": false,+ "id": "fKa9_Y7NiiFZWnvyPKaMq",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1464.6465515863333,+ "y": 608.6230158730161,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 224.07981872558594,+ "height": 25,+ "seed": 1740491189,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274835999,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "IRenderManagerService",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "78JwqCbYWieixUBaq4vy9",+ "originalText": "IRenderManagerService",+ "lineHeight": 1.25,+ "baseline": 17+ },+ {+ "type": "ellipse",+ "version": 501,+ "versionNonce": 1100269941,+ "isDeleted": false,+ "id": "8Mc9DL9Lrv2JSQwI2_b_5",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1258.5382462489465,+ "y": 254.03307535292674,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 291.0052974640376,+ "height": 197.46031746031753,+ "seed": 1361365781,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [+ {+ "type": "text",+ "id": "onIL1G2FDTSi6QmEqtmpI"+ },+ {+ "id": "SjFTcsbt6plduhRD6v2eU",+ "type": "arrow"+ }+ ],+ "updated": 1714274835999,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 639,+ "versionNonce": 1712223323,+ "isDeleted": false,+ "id": "onIL1G2FDTSi6QmEqtmpI",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1352.1250247496264,+ "y": 287.95046933736603,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 104.05992126464844,+ "height": 25,+ "seed": 1826922613,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "RenderUnit",+ "textAlign": "center",+ "verticalAlign": "top",+ "containerId": "8Mc9DL9Lrv2JSQwI2_b_5",+ "originalText": "RenderUnit",+ "lineHeight": 1.25,+ "baseline": 17+ },+ {+ "type": "ellipse",+ "version": 492,+ "versionNonce": 528863957,+ "isDeleted": false,+ "id": "EATsYMKTgP7uvlNEQ4cdt",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1603.3001844618063,+ "y": 315.5145002092638,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 121.48145887586801,+ "height": 85,+ "seed": 549636565,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [+ {+ "type": "text",+ "id": "Iamvp-3VSUg2kE4tvqRgE"+ },+ {+ "id": "v5cTF76fez4IUzEl4KJWK",+ "type": "arrow"+ }+ ],+ "updated": 1714274836000,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 628,+ "versionNonce": 1653944571,+ "isDeleted": false,+ "id": "Iamvp-3VSUg2kE4tvqRgE",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1631.7107578547254,+ "y": 332.96246200883553,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 64.75994873046875,+ "height": 50,+ "seed": 2111096629,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "Render\nUnit",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "EATsYMKTgP7uvlNEQ4cdt",+ "originalText": "RenderUnit",+ "lineHeight": 1.25,+ "baseline": 42+ },+ {+ "type": "ellipse",+ "version": 473,+ "versionNonce": 558805045,+ "isDeleted": false,+ "id": "5To1jdAnBtcc5zszQBkYM",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1735.7868632967516,+ "y": 409.3770131913443,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 121.48145887586801,+ "height": 85,+ "seed": 1451235477,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [+ {+ "type": "text",+ "id": "-ScLYn7Ifj8Rqb0FvM8FW"+ },+ {+ "id": "jgLPxPPq25tNHGNudN4zK",+ "type": "arrow"+ }+ ],+ "updated": 1714274836000,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 611,+ "versionNonce": 1683708315,+ "isDeleted": false,+ "id": "-ScLYn7Ifj8Rqb0FvM8FW",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1764.1974366896707,+ "y": 426.824974990916,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 64.75994873046875,+ "height": 50,+ "seed": 343555573,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "Render\nUnit",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "5To1jdAnBtcc5zszQBkYM",+ "originalText": "RenderUnit",+ "lineHeight": 1.25,+ "baseline": 42+ },+ {+ "type": "ellipse",+ "version": 521,+ "versionNonce": 617931157,+ "isDeleted": false,+ "id": "UwXy1GEREQwLvgJHn7QrF",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1828.273561507937,+ "y": 297.8954961867562,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 121.48145887586801,+ "height": 85,+ "seed": 1321776981,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [+ {+ "type": "text",+ "id": "cfg0GfbnR_Umv8teYzGnK"+ },+ {+ "id": "T22CXB2qfbQGxs0PBPsb2",+ "type": "arrow"+ }+ ],+ "updated": 1714274836000,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 659,+ "versionNonce": 1754492475,+ "isDeleted": false,+ "id": "cfg0GfbnR_Umv8teYzGnK",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1856.6841349008562,+ "y": 315.3434579863279,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 64.75994873046875,+ "height": 50,+ "seed": 532743349,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "Render\nUnit",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "UwXy1GEREQwLvgJHn7QrF",+ "originalText": "RenderUnit",+ "lineHeight": 1.25,+ "baseline": 42+ },+ {+ "type": "arrow",+ "version": 447,+ "versionNonce": 154154011,+ "isDeleted": false,+ "id": "SjFTcsbt6plduhRD6v2eU",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1403.8732253847531,+ "y": 460.6708975523097,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 116.18427633471083,+ "height": 132.3039249613313,+ "seed": 1838495989,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "startBinding": {+ "elementId": "8Mc9DL9Lrv2JSQwI2_b_5",+ "gap": 9.177568135052496,+ "focus": 0.5601365346114884+ },+ "endBinding": {+ "elementId": "78JwqCbYWieixUBaq4vy9",+ "gap": 5.1852077907986995,+ "focus": -0.08117017349776107+ },+ "lastCommittedPoint": null,+ "startArrowhead": null,+ "endArrowhead": "arrow",+ "points": [+ [+ 0,+ 0+ ],+ [+ 116.18427633471083,+ 132.3039249613313+ ]+ ]+ },+ {+ "type": "arrow",+ "version": 419,+ "versionNonce": 137424661,+ "isDeleted": false,+ "id": "v5cTF76fez4IUzEl4KJWK",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1676.2196961376676,+ "y": 403.42927957067013,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 41.46618498778844,+ "height": 185.84186184488078,+ "seed": 1624003157,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "startBinding": {+ "elementId": "EATsYMKTgP7uvlNEQ4cdt",+ "focus": -0.03381461850579475,+ "gap": 3.746988344428633+ },+ "endBinding": {+ "elementId": "78JwqCbYWieixUBaq4vy9",+ "focus": 0.39172610019025556,+ "gap": 8.8888888888888+ },+ "lastCommittedPoint": null,+ "startArrowhead": null,+ "endArrowhead": "arrow",+ "points": [+ [+ 0,+ 0+ ],+ [+ 41.46618498778844,+ 185.84186184488078+ ]+ ]+ },+ {+ "type": "arrow",+ "version": 220,+ "versionNonce": 48822459,+ "isDeleted": false,+ "id": "jgLPxPPq25tNHGNudN4zK",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1803.2577809280156,+ "y": 495.1177946347682,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 2.7357477831142205,+ "height": 94.89411012713674,+ "seed": 77152181,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "startBinding": {+ "elementId": "5To1jdAnBtcc5zszQBkYM",+ "focus": -0.09100549654888396,+ "gap": 1+ },+ "endBinding": {+ "elementId": "78JwqCbYWieixUBaq4vy9",+ "focus": 0.6161364379120272,+ "gap": 8.148125542534785+ },+ "lastCommittedPoint": null,+ "startArrowhead": null,+ "endArrowhead": "arrow",+ "points": [+ [+ 0,+ 0+ ],+ [+ 2.7357477831142205,+ 94.89411012713674+ ]+ ]+ },+ {+ "type": "arrow",+ "version": 349,+ "versionNonce": 919356533,+ "isDeleted": false,+ "id": "T22CXB2qfbQGxs0PBPsb2",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1907.243294893115,+ "y": 383.11737610058196,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 7.689693996358983,+ "height": 204.6723064391008,+ "seed": 1864466709,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "startBinding": {+ "elementId": "UwXy1GEREQwLvgJHn7QrF",+ "focus": -0.27358013322268926,+ "gap": 2.138854545565696+ },+ "endBinding": {+ "elementId": "78JwqCbYWieixUBaq4vy9",+ "focus": 0.9081741861799406,+ "gap": 10.370347764756957+ },+ "lastCommittedPoint": null,+ "startArrowhead": null,+ "endArrowhead": "arrow",+ "points": [+ [+ 0,+ 0+ ],+ [+ 7.689693996358983,+ 204.6723064391008+ ]+ ]+ },+ {+ "id": "FYEC6rDC9nUZULAzb_Udx",+ "type": "rectangle",+ "x": 1345.4068936588428,+ "y": 390.71230615036853,+ "width": 115.19066323718017,+ "height": 35,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "seed": 1348360853,+ "version": 90,+ "versionNonce": 2038012533,+ "isDeleted": false,+ "boundElements": [+ {+ "type": "text",+ "id": "0CSQ5x3TO5y-e-KhjNq1k"+ },+ {+ "id": "WQheXZ0KSf53P5JJBTthX",+ "type": "arrow"+ },+ {+ "id": "Ght2mBCL-EhNs7QN7zdf5",+ "type": "arrow"+ }+ ],+ "updated": 1714274854921,+ "link": null,+ "locked": false+ },+ {+ "id": "0CSQ5x3TO5y-e-KhjNq1k",+ "type": "text",+ "x": 1363.622258541593,+ "y": 395.71230615036853,+ "width": 78.75993347167969,+ "height": 25,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "seed": 1993298965,+ "version": 78,+ "versionNonce": 370535893,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "text": "Injector",+ "fontSize": 20,+ "fontFamily": 1,+ "textAlign": "center",+ "verticalAlign": "middle",+ "baseline": 17,+ "containerId": "FYEC6rDC9nUZULAzb_Udx",+ "originalText": "Injector",+ "lineHeight": 1.25+ },+ {+ "type": "rectangle",+ "version": 180,+ "versionNonce": 1894270459,+ "isDeleted": false,+ "id": "9V7ArbFM639eE6aUF98GS",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1270.9159358672216,+ "y": 327.3544313949746,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 265.0491995424694,+ "height": 35,+ "seed": 1156396149,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "boundElements": [+ {+ "type": "text",+ "id": "RB266YIk77btv51U9KXln"+ },+ {+ "id": "WQheXZ0KSf53P5JJBTthX",+ "type": "arrow"+ }+ ],+ "updated": 1714274836000,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 248,+ "versionNonce": 623078197,+ "isDeleted": false,+ "id": "RB266YIk77btv51U9KXln",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1291.8706427551556,+ "y": 332.3544313949746,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 223.13978576660156,+ "height": 25,+ "seed": 312008149,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "ColumnHeaderController",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "9V7ArbFM639eE6aUF98GS",+ "originalText": "ColumnHeaderController",+ "lineHeight": 1.25,+ "baseline": 17+ },+ {+ "id": "WQheXZ0KSf53P5JJBTthX",+ "type": "arrow",+ "x": 1410.9939243055246,+ "y": 367.8166577043984,+ "width": 12.085344415948612,+ "height": 14.50243542809892,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 1989669787,+ "version": 21,+ "versionNonce": 1099157147,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274836000,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ -12.085344415948612,+ 14.50243542809892+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "9V7ArbFM639eE6aUF98GS",+ "focus": -0.18142156941575915,+ "gap": 5.462226309423784+ },+ "endBinding": {+ "elementId": "FYEC6rDC9nUZULAzb_Udx",+ "focus": -0.35566324078294237,+ "gap": 8.393213017871233+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "type": "rectangle",+ "version": 183,+ "versionNonce": 284377397,+ "isDeleted": false,+ "id": "1lAbYsIz1BiAQDeEHbDvK",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1437.9603733629324,+ "y": 688.2085225711124,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 287.1669168175475,+ "height": 41.19731883037922,+ "seed": 1031358971,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 3+ },+ "boundElements": [+ {+ "type": "text",+ "id": "8DUwBNi3bEBiu1fgANZEL"+ },+ {+ "id": "Ght2mBCL-EhNs7QN7zdf5",+ "type": "arrow"+ }+ ],+ "updated": 1714274854921,+ "link": null,+ "locked": false+ },+ {+ "type": "text",+ "version": 226,+ "versionNonce": 1008018485,+ "isDeleted": false,+ "id": "8DUwBNi3bEBiu1fgANZEL",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "angle": 0,+ "x": 1513.16388792405,+ "y": 696.307181986302,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "width": 136.7598876953125,+ "height": 25,+ "seed": 1565807259,+ "groupIds": [],+ "frameId": null,+ "roundness": null,+ "boundElements": [],+ "updated": 1714274852240,+ "link": null,+ "locked": false,+ "fontSize": 20,+ "fontFamily": 1,+ "text": "UniverInjector",+ "textAlign": "center",+ "verticalAlign": "middle",+ "containerId": "1lAbYsIz1BiAQDeEHbDvK",+ "originalText": "UniverInjector",+ "lineHeight": 1.25,+ "baseline": 17+ },+ {+ "id": "Ght2mBCL-EhNs7QN7zdf5",+ "type": "arrow",+ "x": 1377.563521804376,+ "y": 429.27638895879215,+ "width": 88.31213021694543,+ "height": 247.1190546866485,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "dashed",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 660912699,+ "version": 88,+ "versionNonce": 544735707,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274858282,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ 1.5493119768557335,+ 131.6935038755122+ ],+ [+ 88.31213021694543,+ 247.1190546866485+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "FYEC6rDC9nUZULAzb_Udx",+ "focus": 0.4443940202958461,+ "gap": 3.5640828084236205+ },+ "endBinding": {+ "elementId": "1lAbYsIz1BiAQDeEHbDvK",+ "focus": -0.574003345337201,+ "gap": 11.813078925671846+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ },+ {+ "id": "jc7ODye4ptpQd167_PYRv",+ "type": "arrow",+ "x": 939.5978622448522,+ "y": 475.79750665693257,+ "width": 210.49479640200855,+ "height": 20.08024719798857,+ "angle": 0,+ "strokeColor": "#1e1e1e",+ "backgroundColor": "transparent",+ "fillStyle": "solid",+ "strokeWidth": 2,+ "strokeStyle": "solid",+ "roughness": 1,+ "opacity": 100,+ "groupIds": [],+ "frameId": null,+ "roundness": {+ "type": 2+ },+ "seed": 546149749,+ "version": 114,+ "versionNonce": 745813269,+ "isDeleted": false,+ "boundElements": null,+ "updated": 1714274878142,+ "link": null,+ "locked": false,+ "points": [+ [+ 0,+ 0+ ],+ [+ 111.64626603040938,+ -20.08024719798857+ ],+ [+ 210.49479640200855,+ -2.3784359831222446+ ]+ ],+ "lastCommittedPoint": null,+ "startBinding": {+ "elementId": "IBVejM0r0TQVE-0-p3RxE",+ "focus": 0.2771006535957784,+ "gap": 18.43293084999368+ },+ "endBinding": {+ "elementId": "rz9Fdsy8H7oWjot8Dsnpr",+ "focus": -0.21977447144204101,+ "gap": 14.89420279805745+ },+ "startArrowhead": null,+ "endArrowhead": "arrow"+ }+ ],+ "appState": {+ "gridSize": null,+ "viewBackgroundColor": "#ffffff"+ },+ "files": {}+}\ No newline at end of filediff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.tsindex e42edb8d07..017bbef799 100644--- a/packages/engine-render/src/base-object.ts+++ b/packages/engine-render/src/base-object.ts@@ -15,7 +15,7 @@*/import type { EventState, IKeyValue, Nullable, Observer } from '@univerjs/core';-import { Observable } from '@univerjs/core';+import { Disposable, Observable } from '@univerjs/core';import type { EVENT_TYPE } from './basics/const';import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';@@ -43,7 +43,7 @@ export const BASE_OBJECT_ARRAY = ['strokeWidth',];-export abstract class BaseObject {+export abstract class BaseObject extends Disposable {groupKey?: string;isInGroup: boolean = false;@@ -133,6 +133,8 @@ export abstract class BaseObject {private _layer: Nullable<Layer>; // TODO: @DR-Univer. Belong to layerconstructor(key?: string) {+ super();+if (key) {this._oKey = key;} else {@@ -668,7 +670,9 @@ export abstract class BaseObject {return true;}- dispose() {+ override dispose() {+ super.dispose();+this.onTransformChangeObservable.clear();this.onPointerDownObserver.clear();this.onPointerMoveObserver.clear();diff --git a/packages/engine-render/src/basics/path2.ts b/packages/engine-render/src/basics/path2.tsindex 14faec3b9f..7cd33ffaf9 100644--- a/packages/engine-render/src/basics/path2.ts+++ b/packages/engine-render/src/basics/path2.ts@@ -26,7 +26,9 @@ interface Line {}export class Path2 {- constructor(private _lines: Vector2[] = INITIAL_Path2) {}+ constructor(private _lines: Vector2[] = INITIAL_Path2) {+ // empty+ }intersection(lines: Vector2[]): Nullable<Vector2[]> {if (this._lines.length < 1 || lines.length < 1) {diff --git a/packages/engine-render/src/basics/vector2.ts b/packages/engine-render/src/basics/vector2.tsindex 12f84190a5..ca56c230e3 100644--- a/packages/engine-render/src/basics/vector2.ts+++ b/packages/engine-render/src/basics/vector2.ts@@ -32,7 +32,9 @@ export class Vector2 implements IPoint {public x: number = 0,/** defines the second coordinate */public y: number = 0- ) {}+ ) {+ // empty+ }// Staticsdiff --git a/packages/engine-render/src/components/component.ts b/packages/engine-render/src/components/component.tsindex 27b0b92e58..819145d587 100644--- a/packages/engine-render/src/components/component.ts+++ b/packages/engine-render/src/components/component.ts@@ -15,7 +15,6 @@*/import { DisposableCollection, sortRules, toDisposable } from '@univerjs/core';-import type { IDisposable } from '@wendellhu/redi';import { BaseObject } from '../base-object';import type { IViewportBound } from '../basics/vector2';@@ -38,10 +37,13 @@ export class RenderComponent<T, U, V> extends BaseObject {disposableCollection.add(toDisposable(() => {this._extensions.delete(extension.uKey);+ extension.parent = null;}));}+ this.disposeWithMe(disposableCollection);+return disposableCollection;}diff --git a/packages/engine-render/src/components/docs/doc-component.ts b/packages/engine-render/src/components/docs/doc-component.tsindex e01373e188..8a1f0d0b0a 100644--- a/packages/engine-render/src/components/docs/doc-component.ts+++ b/packages/engine-render/src/components/docs/doc-component.ts@@ -14,12 +14,10 @@* limitations under the License.*/-import type { Nullable } from '@univerjs/core';import { RENDER_CLASS_TYPE } from '../../basics/const';import type { IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage } from '../../basics/i-document-skeleton-cached';import { PageLayoutType } from '../../basics/i-document-skeleton-cached';-import type { INodeInfo } from '../../basics/interfaces';import type { IBoundRectNoAngle, IViewportBound } from '../../basics/vector2';import type { UniverRenderingContext } from '../../context';import { RenderComponent } from '../component';@@ -36,7 +34,7 @@ export interface IDocumentsConfig extends IPageMarginLayout {hasEditor?: boolean;}-export class DocComponent extends RenderComponent<+export abstract class DocComponent extends RenderComponent<IDocumentSkeletonGlyph | IDocumentSkeletonLine,DOCS_EXTENSION_TYPE,IBoundRectNoAngle[]@@ -149,19 +147,5 @@ export class DocComponent extends RenderComponent<return false;}- scrollBySelection() {}-- syncSelection() {}-- remainActiveSelection() {}-- findNodeByCoord(offsetX: number, offsetY: number): Nullable<INodeInfo> {}-- findCoordByNode(glyph: IDocumentSkeletonGlyph) {}-- protected _getBounding(bounds?: IViewportBound) {}-- protected _draw(ctx: UniverRenderingContext, bounds?: IViewportBound) {- /* abstract */- }+ protected abstract _draw(ctx: UniverRenderingContext, bounds?: IViewportBound): void;}diff --git a/packages/engine-render/src/components/docs/layout/block/section.ts b/packages/engine-render/src/components/docs/layout/block/section.tsindex 5c7cc58cb5..6080edfd3e 100644--- a/packages/engine-render/src/components/docs/layout/block/section.ts+++ b/packages/engine-render/src/components/docs/layout/block/section.ts@@ -166,6 +166,3 @@ function _pushPage(allCurrentSkeletonPages: IDocumentSkeletonPage[], blockSkeletallCurrentSkeletonPages.push(...blockSkeletonPages);}--// 当本节有多个列,且下一节为连续节类型的时候,需要按照列数分割,重新计算lines-export function dealWidthBlocksByMultiColumnAndContinuous() {}diff --git a/packages/engine-render/src/components/docs/layout/linebreak/__tests__/linebreak.spec.ts b/packages/engine-render/src/components/docs/layout/linebreak/__tests__/linebreak.spec.tsindex 0309058241..d14c9de8f3 100644--- a/packages/engine-render/src/components/docs/layout/linebreak/__tests__/linebreak.spec.ts+++ b/packages/engine-render/src/components/docs/layout/linebreak/__tests__/linebreak.spec.ts@@ -68,7 +68,7 @@ describe('unicode line break tests', () => {});if (skip.includes(rowNumber)) {- it.skip(cols, () => {});+ it.skip(cols, () => { /* empty */ });return;}diff --git a/packages/engine-render/src/components/docs/layout/linebreak/break.ts b/packages/engine-render/src/components/docs/layout/linebreak/break.tsindex 467286aaac..885fb7125d 100644--- a/packages/engine-render/src/components/docs/layout/linebreak/break.ts+++ b/packages/engine-render/src/components/docs/layout/linebreak/break.ts@@ -18,5 +18,7 @@ export class Break {constructor(public position: number,public required = false- ) {}+ ) {+ // empty+ }}diff --git a/packages/engine-render/src/components/docs/layout/linebreak/linebreaker.ts b/packages/engine-render/src/components/docs/layout/linebreak/linebreaker.tsindex 27acfdf2f0..c8ac9085ca 100644--- a/packages/engine-render/src/components/docs/layout/linebreak/linebreaker.ts+++ b/packages/engine-render/src/components/docs/layout/linebreak/linebreaker.ts@@ -72,7 +72,9 @@ export class LineBreaker {private _LB30a: number = 0;private _rule: Rule = new Rule();- constructor(public string: string) {}+ constructor(public string: string) {+ // empty+ }use(extension: ILineBreakExtension) {extension(this);diff --git a/packages/engine-render/src/components/docs/layout/model/line.ts b/packages/engine-render/src/components/docs/layout/model/line.tsindex c21e28d027..ee7e012723 100644--- a/packages/engine-render/src/components/docs/layout/model/line.ts+++ b/packages/engine-render/src/components/docs/layout/model/line.ts@@ -233,9 +233,6 @@ export function setLineMarginBottom(line: IDocumentSkeletonLine, marginBottom: nline.marginBottom = marginBottom;}-// 获得文字内容后的行信息计算-export function updateDivideInLine(line: IDocumentSkeletonLine) {}-export function collisionDetection(drawing: IDocumentSkeletonDrawing,lineHeight: number,diff --git a/packages/engine-render/src/components/docs/layout/model/page.ts b/packages/engine-render/src/components/docs/layout/model/page.tsindex 16f627bf41..c1a40d5923 100644--- a/packages/engine-render/src/components/docs/layout/model/page.ts+++ b/packages/engine-render/src/components/docs/layout/model/page.ts@@ -152,9 +152,6 @@ export function createSkeletonPage(return page;}-// 检测是否溢出了一页-function checkPageOverflow(page: IDocumentSkeletonPage) { }-function _getNullPage() {return {sections: [],diff --git a/packages/engine-render/src/components/docs/text-selection/convert-cursor.ts b/packages/engine-render/src/components/docs/text-selection/convert-cursor.tsindex ef1ee8be6f..6fa02d2d7c 100644--- a/packages/engine-render/src/components/docs/text-selection/convert-cursor.ts+++ b/packages/engine-render/src/components/docs/text-selection/convert-cursor.ts@@ -203,7 +203,9 @@ export class NodePositionConvertToCursor {constructor(private _documentOffsetConfig: IDocumentOffsetConfig,private _docSkeleton: DocumentSkeleton- ) {}+ ) {+ // super+ }getRangePointData(startOrigin: Nullable<INodePosition>, endOrigin: Nullable<INodePosition>) {const borderBoxPointGroup: IPoint[][] = [];diff --git a/packages/engine-render/src/components/docs/view-model/data-stream-tree-node.ts b/packages/engine-render/src/components/docs/view-model/data-stream-tree-node.tsindex b0507a0f4d..e2df925f5a 100644--- a/packages/engine-render/src/components/docs/view-model/data-stream-tree-node.ts+++ b/packages/engine-render/src/components/docs/view-model/data-stream-tree-node.ts@@ -41,7 +41,9 @@ export class DataStreamTreeNode {constructor(public nodeType: DataStreamTreeNodeType,public content?: string- ) {}+ ) {+ // empty+ }static create(nodeType: DataStreamTreeNodeType, content?: string) {return new DataStreamTreeNode(nodeType, content);diff --git a/packages/engine-render/src/components/docs/view-model/document-view-model.ts b/packages/engine-render/src/components/docs/view-model/document-view-model.tsindex b21ed9a29f..96717a9a18 100644--- a/packages/engine-render/src/components/docs/view-model/document-view-model.ts+++ b/packages/engine-render/src/components/docs/view-model/document-view-model.ts@@ -55,7 +55,9 @@ export class DocumentViewModel implements IDisposable {});}- selfPlus(len: number, index: number) {}+ selfPlus(len: number, index: number) {+ // empty+ }getPositionInParent() {return 0;diff --git a/packages/engine-render/src/components/sheets/column-header.ts b/packages/engine-render/src/components/sheets/column-header.tsindex c9168cb578..05330caa0f 100644--- a/packages/engine-render/src/components/sheets/column-header.ts+++ b/packages/engine-render/src/components/sheets/column-header.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import type { Nullable } from '@univerjs/core';import type { IViewportBound, Vector2 } from '../../basics/vector2';import type { UniverRenderingContext } from '../../context';import { SheetColumnHeaderExtensionRegistry } from '../extension';@@ -22,6 +23,18 @@ import { SpreadsheetHeader } from './sheet-component';import type { SpreadsheetSkeleton } from './sheet-skeleton';export class SpreadsheetColumnHeader extends SpreadsheetHeader {+ override getDocuments() {+ throw new Error('Method not implemented.');+ }++ override getNoMergeCellPositionByIndex(rowIndex: number, columnIndex: number): Nullable<{ startY: number; startX: number; endX: number; endY: number }> {+ throw new Error('Method not implemented.');+ }++ override getSelectionBounding(startRow: number, startColumn: number, endRow: number, endColumn: number): Nullable<{ startRow: number; startColumn: number; endRow: number; endColumn: number }> {+ throw new Error('Method not implemented.');+ }+private _columnHeaderLayoutExtension!: ColumnHeaderLayout;constructor(oKey: string, spreadsheetSkeleton?: SpreadsheetSkeleton) {diff --git a/packages/engine-render/src/components/sheets/row-header.ts b/packages/engine-render/src/components/sheets/row-header.tsindex 9dab4453b8..75cc065526 100644--- a/packages/engine-render/src/components/sheets/row-header.ts+++ b/packages/engine-render/src/components/sheets/row-header.ts@@ -14,6 +14,7 @@* limitations under the License.*/+import type { Nullable } from '@univerjs/core';import type { IViewportBound, Vector2 } from '../../basics/vector2';import type { UniverRenderingContext } from '../../context';import { SheetRowHeaderExtensionRegistry } from '../extension';@@ -22,6 +23,18 @@ import { SpreadsheetHeader } from './sheet-component';import type { SpreadsheetSkeleton } from './sheet-skeleton';export class SpreadsheetRowHeader extends SpreadsheetHeader {+ override getDocuments() {+ throw new Error('Method not implemented.');+ }++ override getNoMergeCellPositionByIndex(rowIndex: number, columnIndex: number): Nullable<{ startY: number; startX: number; endX: number; endY: number }> {+ throw new Error('Method not implemented.');+ }++ override getSelectionBounding(startRow: number, startColumn: number, endRow: number, endColumn: number): Nullable<{ startRow: number; startColumn: number; endRow: number; endColumn: number }> {+ throw new Error('Method not implemented.');+ }+private _rowHeaderLayoutExtension!: RowHeaderLayout;constructor(oKey: string, spreadsheetSkeleton?: SpreadsheetSkeleton) {diff --git a/packages/engine-render/src/components/sheets/sheet-component.ts b/packages/engine-render/src/components/sheets/sheet-component.tsindex 03becca9a7..d3f5e39302 100644--- a/packages/engine-render/src/components/sheets/sheet-component.ts+++ b/packages/engine-render/src/components/sheets/sheet-component.ts@@ -23,7 +23,7 @@ import { RenderComponent } from '../component';import type { SHEET_EXTENSION_TYPE } from './extensions/sheet-extension';import type { SpreadsheetSkeleton } from './sheet-skeleton';-export class SheetComponent extends RenderComponent<SpreadsheetSkeleton, SHEET_EXTENSION_TYPE, IRange[]> {+export abstract class SheetComponent extends RenderComponent<SpreadsheetSkeleton, SHEET_EXTENSION_TYPE, IRange[]> {constructor(oKey: string,private _skeleton?: SpreadsheetSkeleton@@ -64,27 +64,25 @@ export class SheetComponent extends RenderComponent<SpreadsheetSkeleton, SHEET_E};}- getDocuments(): any {}+ abstract getDocuments(): any;- getNoMergeCellPositionByIndex(+ abstract getNoMergeCellPositionByIndex(rowIndex: number,columnIndex: number- ): Nullable<{ startY: number; startX: number; endX: number; endY: number }> {}+ ): Nullable<{ startY: number; startX: number; endX: number; endY: number }>;getScrollXYByRelativeCoords(coord: Vector2) {return { x: 0, y: 0 };}- getSelectionBounding(+ abstract getSelectionBounding(startRow: number,startColumn: number,endRow: number,endColumn: number- ): Nullable<{ startRow: number; startColumn: number; endRow: number; endColumn: number }> {}+ ): Nullable<{ startRow: number; startColumn: number; endRow: number; endColumn: number }>;- protected _draw(ctx: UniverRenderingContext, bounds?: IViewportBound) {- /* abstract */- }+ protected abstract _draw(ctx: UniverRenderingContext, bounds?: IViewportBound): void;/*** TODO: DR-Univer, fix as unknown as@@ -95,7 +93,7 @@ export class SheetComponent extends RenderComponent<SpreadsheetSkeleton, SHEET_E}}-export class SpreadsheetHeader extends SheetComponent {+export abstract class SpreadsheetHeader extends SheetComponent {protected override _draw(ctx: UniverRenderingContext, bounds?: IViewportBound): void {this.draw(ctx, bounds);}diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.tsindex b640f4697c..8051481a4f 100644--- a/packages/engine-render/src/components/sheets/spreadsheet.ts+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts@@ -116,7 +116,7 @@ export class Spreadsheet extends SheetComponent {*/override dispose() {super.dispose();- this._documents.dispose();+ this._documents?.dispose();this._documents = null as unknown as Documents;this._cacheCanvas?.dispose();this._cacheCanvas = null as unknown as Canvas;diff --git a/packages/engine-render/src/context.ts b/packages/engine-render/src/context.tsindex 2f66c2c83f..ab049a13e6 100644--- a/packages/engine-render/src/context.ts+++ b/packages/engine-render/src/context.ts@@ -985,7 +985,11 @@ export class UniverPrintingContext extends UniverRenderingContext2D {this._context.restore();}- override clearRectForTexture(x: number, y: number, width: number, height: number) { }+ override clearRectForTexture(x: number, y: number, width: number, height: number) {+ // empty+ }- override setGlobalCompositeOperation(val: GlobalCompositeOperation) { }+ override setGlobalCompositeOperation(val: GlobalCompositeOperation) {+ // empty+ }}diff --git a/packages/engine-render/src/custom/custom-object.ts b/packages/engine-render/src/custom/custom-object.tsindex 1f9436f782..853b49d5ee 100644--- a/packages/engine-render/src/custom/custom-object.ts+++ b/packages/engine-render/src/custom/custom-object.ts@@ -21,7 +21,7 @@ import type { UniverRenderingContext } from '../context';export class CustomObject extends BaseObject {constructor(key?: string,- private _render = (mainCtx: UniverRenderingContext) => {},+ private _render = (mainCtx: UniverRenderingContext) => { /* empty */ },private _isHitCustom?: (coord: Vector2) => boolean) {super(key);diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.tsindex edd3809c46..b93b8a5ca5 100644--- a/packages/engine-render/src/engine.ts+++ b/packages/engine-render/src/engine.ts@@ -48,7 +48,7 @@ export class Engine extends ThinEngine<Scene> {private _activeRenderLoops = new Array<() => void>();- private _renderFunction = () => { };+ private _renderFunction = () => { /* empty */ };private _requestNewFrameHandler: number = -1;@@ -168,6 +168,7 @@ export class Engine extends ThinEngine<Scene> {this.resize();this._resizeObserver?.unobserve(this._container as HTMLElement);+ this._resizeObserver = null;let timer: number | undefined;this._resizeObserver = new ResizeObserver(() => {@@ -180,11 +181,10 @@ export class Engine extends ThinEngine<Scene> {});this._resizeObserver.observe(this._container);- this.disposeWithMe(- toDisposable(() => {- this._resizeObserver?.unobserve(this._container as HTMLElement);- })- );+ this.disposeWithMe(() => {+ this._resizeObserver?.unobserve(this._container as HTMLElement);+ if (timer !== undefined) window.cancelIdleCallback(timer);+ });}}@@ -237,7 +237,8 @@ export class Engine extends ThinEngine<Scene> {this._activeRenderLoops = [];this.getCanvas().dispose();- this._canvas = null;+ // this._canvas = null; // 不应该这么做, 上面已经调用了 _canvas 的 dispose 方法+ // 并且 idleCallback --> resize 时需要 _canvas 对象this.onBeginFrameObservable.clear();this.onEndFrameObservable.clear();this.onTransformChangeObservable.clear();@@ -679,7 +680,7 @@ export class Engine extends ThinEngine<Scene> {// IE11 only supports captureEvent:boolean, not options:object, and it defaults to false.// Feature detection technique copied from: https://github.com/github/eventlistener-polyfill (MIT license)let passiveSupported = false;- const noop = () => { };+ const noop = () => { /* empty */ };try {const options: object = {diff --git a/packages/engine-render/src/group.ts b/packages/engine-render/src/group.tsindex 1c3059cce2..13e610cfbd 100644--- a/packages/engine-render/src/group.ts+++ b/packages/engine-render/src/group.ts@@ -147,9 +147,6 @@ export class Group extends BaseObject {return true;}- // 判断被选中的唯一对象- pick(coord: Vector2) {}-private _clear() {this._objects = [];}diff --git a/packages/engine-render/src/layer.ts b/packages/engine-render/src/layer.tsindex 001b43b43d..ef8c092a59 100644--- a/packages/engine-render/src/layer.ts+++ b/packages/engine-render/src/layer.ts@@ -186,6 +186,7 @@ export class Layer extends Disposable {if (this._debounceDirtyFunc) {this._debounceDirtyFunc();}+// To prevent multiple refreshes caused by setting values for multiple object instances at once.this._debounceDirtyFunc = requestImmediateMacroTask(() => {this.makeDirty(state);diff --git a/packages/engine-render/src/render-manager/render-manager.service.ts b/packages/engine-render/src/render-manager/render-manager.service.tsindex ebc4b81781..3b122f3590 100644--- a/packages/engine-render/src/render-manager/render-manager.service.ts+++ b/packages/engine-render/src/render-manager/render-manager.service.ts@@ -27,7 +27,6 @@ import type { SheetComponent } from '../components/sheets/sheet-component';import type { Slide } from '../components/slides/slide';import { Engine } from '../engine';import { Scene } from '../scene';-import { SceneViewer } from '../scene-viewer';import { type IRender, type IRenderControllerCtor, RenderUnit } from './render-unit';export type RenderComponentType = SheetComponent | DocComponent | Slide | BaseObject;@@ -35,9 +34,7 @@ export type RenderComponentType = SheetComponent | DocComponent | Slide | BaseObexport interface IRenderManagerService extends IDisposable {currentRender$: Observable<Nullable<string>>;createRender$: Observable<Nullable<string>>;- createRenderWithParent(unitId: string, parentUnitId: string): IRender;createRender(unitId: string): IRender;- addRenderItem(unitId: string, item: IRender): void;removeRender(unitId: string): void;setCurrent(unitId: string): void;getRenderById(unitId: string): Nullable<IRender>;@@ -48,7 +45,7 @@ export interface IRenderManagerService extends IDisposable {getFirst(): Nullable<IRender>;has(unitId: string): boolean;- registerRenderControllers<T extends UnitModel>(type: UnitType, ctor: IRenderControllerCtor<T>): IDisposable;+ registerRenderController<T extends UnitModel>(type: UnitType, ctor: IRenderControllerCtor<T>): IDisposable;}const DEFAULT_SCENE_SIZE = { width: 1500, height: 1000 };@@ -98,7 +95,7 @@ export class RenderManagerService extends Disposable implements IRenderManagerSethis._currentRender$.complete();}- registerRenderControllers(type: UnitType, ctor: IRenderControllerCtor): IDisposable {+ registerRenderController(type: UnitType, ctor: IRenderControllerCtor): IDisposable {if (!this._renderControllers.has(type)) {this._renderControllers.set(type, new Set());}@@ -120,23 +117,6 @@ export class RenderManagerService extends Disposable implements IRenderManagerSereturn Array.from(this._renderControllers.get(type) ?? []);}- createRenderWithParent(unitId: string, parentUnitId: string): IRender {- const parent = this.getRenderById(parentUnitId);- if (parent == null) {- throw new Error('parent render is null');- }-- const { scene, engine } = parent;- const current = this._createRender(unitId, engine, false);- const currentScene = current.scene;- const sv = new SceneViewer(unitId);-- sv.addSubScene(currentScene);- scene.addObject(sv);-- return current;- }-createRenderWithEngine(unitId: string, engine: Engine): IRender {return this._createRender(unitId, engine, false);}@@ -146,9 +126,7 @@ export class RenderManagerService extends Disposable implements IRenderManagerSe}createRender(unitId: string): IRender {- const engine = new Engine();-- return this._createRender(unitId, engine);+ return this._createRender(unitId, new Engine());}private _createRender(unitId: string, engine: Engine, isMainScene: boolean = true): IRender {@@ -194,14 +172,18 @@ export class RenderManagerService extends Disposable implements IRenderManagerSemainComponent: null,components: new Map(),isMainScene,+ // @ts-ignore+ with(_dependency) {+ return null;+ },};}- this.addRenderItem(unitId, renderUnit);+ this._addRenderUnit(unitId, renderUnit);return renderUnit;}- addRenderItem(unitId: string, item: IRender) {+ private _addRenderUnit(unitId: string, item: IRender) {this._renderMap.set(unitId, item);}@@ -209,7 +191,6 @@ export class RenderManagerService extends Disposable implements IRenderManagerSeconst item = this._renderMap.get(unitId);if (item != null) {this._disposeItem(item);- (item as RenderUnit).dispose?.();}this._renderMap.delete(unitId);@@ -245,17 +226,26 @@ export class RenderManagerService extends Disposable implements IRenderManagerSeif (item == null) {return;}- const { engine, scene, components, mainComponent } = item;- components?.forEach((component) => {- component.dispose();- });- mainComponent?.dispose();++ const { engine, scene, components } = item;++ // `mainComponent` is one of the `components` so it does not to be disposed again+ components?.forEach((component) => component.dispose());scene.dispose();+ if (isDisposable(item)) {+ item.dispose();+ }+if (shouldDestroyEngine) {engine.dispose();}}}-export const IRenderManagerService = createIdentifier<RenderManagerService>('engine-render.render-manager.service');+export const IRenderManagerService = createIdentifier<IRenderManagerService>('engine-render.render-manager.service');++export function isDisposable(thing: unknown): thing is IDisposable {+ // eslint-disable-next-line ts/no-explicit-any+ return !!thing && typeof (thing as any).dispose === 'function';+}diff --git a/packages/engine-render/src/render-manager/render-unit.ts b/packages/engine-render/src/render-manager/render-unit.tsindex cd10565ac8..0294c82004 100644--- a/packages/engine-render/src/render-manager/render-unit.ts+++ b/packages/engine-render/src/render-manager/render-unit.ts@@ -16,7 +16,7 @@import type { Nullable, UnitModel, UnitType } from '@univerjs/core';import { Disposable } from '@univerjs/core';-import type { IDisposable, Injector } from '@wendellhu/redi';+import type { DependencyIdentifier, IDisposable, Injector } from '@wendellhu/redi';import type { Engine } from '../engine';import type { Scene } from '../scene';import type { RenderComponentType } from './render-manager.service';@@ -28,6 +28,8 @@ export interface IRender {mainComponent: Nullable<RenderComponentType>;components: Map<string, RenderComponentType>;isMainScene: boolean;++ with<T>(dependency: DependencyIdentifier<T>): T;}// eslint-disable-next-line ts/no-explicit-any@@ -37,7 +39,7 @@ export interface IRenderController extends IDisposable {}/*** This object encapsulates methods or properties to render each element.*/-export interface IRenderContext<T extends UnitModel = UnitModel> extends IRender {+export interface IRenderContext<T extends UnitModel = UnitModel> extends Omit<IRender, 'with'> {unit: T;type: UnitType;}@@ -52,9 +54,9 @@ export class RenderUnit extends Disposable implements IRender {get type(): UnitType { return this._renderContext.type; }private readonly _injector: Injector;- private readonly _renderControllers: IRenderController[] = [];private _renderContext: IRenderContext<UnitModel>;+set isMainScene(is: boolean) { this._renderContext.isMainScene = is; }get isMainScene(): boolean { return this._renderContext.isMainScene; }set engine(engine: Engine) { this._renderContext.engine = engine; }@@ -74,7 +76,7 @@ export class RenderUnit extends Disposable implements IRender {this._injector = parentInjector.createChild();this._renderContext = {- unit: init.unit,+ unit: init.unit, // modelunitId: init.unit.getUnitId(),type: init.unit.type,components: new Map(),@@ -86,8 +88,16 @@ export class RenderUnit extends Disposable implements IRender {}override dispose() {- this._renderControllers.forEach((controller) => controller.dispose());- this._renderControllers.length = 0;+ this._injector.dispose();++ super.dispose();+ }++ /**+ * Get render controller hold by this render unit.+ */+ with<T>(dependency: DependencyIdentifier<T>): T {+ return this._injector.get(dependency);}addRenderControllers(ctors: IRenderControllerCtor[]) {@@ -95,8 +105,9 @@ export class RenderUnit extends Disposable implements IRender {}private _initControllers(ctors: IRenderControllerCtor[]): void {- ctors- .map((ctor) => this._injector.createInstance(ctor, this._renderContext))- .forEach((controller) => this._renderControllers.push(controller));+ const j = this._injector;++ ctors.forEach((ctor) => j.add([ctor, { useFactory: () => j.createInstance(ctor, this._renderContext) }]));+ ctors.forEach((ctor) => j.get(ctor));}}diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.tsindex aa33dd52d1..5f4993d190 100644--- a/packages/engine-render/src/scene.ts+++ b/packages/engine-render/src/scene.ts@@ -479,15 +479,6 @@ export class Scene extends ThinScene {}}- changeObjectOrder() {}-- // override renderObjects(ctx: UniverRenderingContext, bounds?: IViewportBound) {- // this.getAllObjectsByOrder().forEach((o) => {- // o.render(ctx, bounds);- // });- // return this;- // }-override render(parentCtx?: UniverRenderingContext) {if (!this.isDirty()) {return;diff --git a/packages/engine-render/src/shape/base-scroll-bar.ts b/packages/engine-render/src/shape/base-scroll-bar.tsindex 56a7e6f54b..be044ba46b 100644--- a/packages/engine-render/src/shape/base-scroll-bar.ts+++ b/packages/engine-render/src/shape/base-scroll-bar.ts@@ -38,7 +38,7 @@ export interface IScrollBarProps {mainScene?: ThinScene;}-export class BaseScrollBar extends Disposable {+export abstract class BaseScrollBar extends Disposable {enableHorizontal: boolean = true;enableVertical: boolean = true;@@ -193,14 +193,14 @@ export class BaseScrollBar extends Disposable {return this.verticalThumbRect?.visible || false;}- resize(- parentWidth: Nullable<number> = 0,- parentHeight: Nullable<number> = 0,- contentWidth: number = 0,- contentHeight: number = 0- ) {}+ abstract resize(+ parentWidth: Nullable<number>,+ parentHeight: Nullable<number>,+ contentWidth: number,+ contentHeight: number+ ): void;- makeDirty(state: boolean) {}+ abstract makeDirty(state: boolean): void;- render(ctx: UniverRenderingContext, left: number = 0, top: number = 0) {}+ abstract render(ctx: UniverRenderingContext, left?: number, top?: number): void;}diff --git a/packages/engine-render/src/shape/shape.ts b/packages/engine-render/src/shape/shape.tsindex 27feac1fa9..9c92fa7ad8 100644--- a/packages/engine-render/src/shape/shape.ts+++ b/packages/engine-render/src/shape/shape.ts@@ -269,7 +269,7 @@ export abstract class Shape<T> extends BaseObject {* @param {UniverRenderingContext} ctx SheetContext to render on*/private static _renderStroke(ctx: UniverRenderingContext, props: IShapeProps) {- const { stroke, strokeWidth, shadowEnabled, shadowForStrokeEnabled, strokeScaleEnabled, parent } = props;+ const { stroke, strokeWidth, strokeScaleEnabled } = props;// let { scaleX, scaleY } = props;let { scaleX, scaleY } = ctx.getScale();@@ -277,28 +277,19 @@ export abstract class Shape<T> extends BaseObject {return;}- if (shadowEnabled && !shadowForStrokeEnabled) {- this._removeShadow(ctx);- }-ctx.save();if (strokeScaleEnabled === false) {scaleX = scaleX ?? 1;scaleY = scaleY ?? 1;ctx.scale(1 / scaleX, 1 / scaleY);}- this._setLineDash(ctx);+this._setStrokeStyles(ctx, props);+ctx.stroke();ctx.restore();}- private static _getObjectScaling() {- return { scaleX: 1, scaleY: 1 };- }-- private static _removeShadow(ctx: UniverRenderingContext) {}-private static _setFillStyles(ctx: UniverRenderingContext, props: IShapeProps) {ctx.fillStyle = props.fill!;}@@ -313,7 +304,6 @@ export abstract class Shape<T> extends BaseObject {ctx.strokeStyle = stroke!;}- private static _setLineDash(ctx: UniverRenderingContext) {}override render(mainCtx: UniverRenderingContext, bounds?: IViewportBound) {if (!this.visible) {diff --git a/packages/engine-render/src/thin-engine.ts b/packages/engine-render/src/thin-engine.tsindex af15e317ca..d568a68ad8 100644--- a/packages/engine-render/src/thin-engine.ts+++ b/packages/engine-render/src/thin-engine.ts@@ -23,7 +23,8 @@ import type { IEvent } from './basics/i-events';import type { ITransformChangeState } from './basics/interfaces';import type { Canvas } from './canvas';-// FIXME: T should extends something that is disposable+// FIXME: ThinEngine and ThinScene should be removed+export abstract class ThinEngine<T extends IDisposable> extends Disposable {onInputChangedObservable = new Observable<IEvent>();@@ -79,7 +80,7 @@ export abstract class ThinEngine<T extends IDisposable> extends Disposable {return scene;}- setRemainCapture() {}+ abstract setRemainCapture(): void;hasActiveScene(): boolean {return this._activeScene != null;diff --git a/packages/engine-render/src/thin-scene.ts b/packages/engine-render/src/thin-scene.tsindex 762e9fe4f3..d18fd2530d 100644--- a/packages/engine-render/src/thin-scene.ts+++ b/packages/engine-render/src/thin-scene.ts@@ -23,7 +23,7 @@ import { RENDER_CLASS_TYPE } from './basics/const';import type { IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEvent } from './basics/i-events';import type { ITransformChangeState } from './basics/interfaces';import { Transform } from './basics/transform';-import type { IViewportBound, Vector2 } from './basics/vector2';+import type { Vector2 } from './basics/vector2';import type { UniverRenderingContext } from './context';export abstract class ThinScene extends Disposable {@@ -162,33 +162,31 @@ export abstract class ThinScene extends Disposable {// }}- triggerPointerUp(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerPointerUp(evt: IPointerEvent | IMouseEvent): void;- triggerMouseWheel(evt: IWheelEvent) {}+ abstract triggerMouseWheel(evt: IWheelEvent): void;- triggerPointerMove(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerPointerMove(evt: IPointerEvent | IMouseEvent): void;- triggerDblclick(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerDblclick(evt: IPointerEvent | IMouseEvent): void;- triggerTripleClick(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerTripleClick(evt: IPointerEvent | IMouseEvent): void;- triggerPointerDown(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerPointerDown(evt: IPointerEvent | IMouseEvent): void;- triggerPointerOut(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerPointerOut(evt: IPointerEvent | IMouseEvent): void;- triggerPointerLeave(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerPointerLeave(evt: IPointerEvent | IMouseEvent): void;- triggerPointerOver(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerPointerOver(evt: IPointerEvent | IMouseEvent): void;- triggerPointerEnter(evt: IPointerEvent | IMouseEvent) {}+ abstract triggerPointerEnter(evt: IPointerEvent | IMouseEvent): void;- renderObjects(ctx: UniverRenderingContext, bounds?: IViewportBound) {}+ abstract render(parentCtx?: UniverRenderingContext): void;- render(parentCtx?: UniverRenderingContext) {}+ abstract getParent(): any;- getParent(): any {}-- override dispose() {+ override dispose(): void {this.onTransformChangeObservable.clear();this.onFileLoadedObservable.clear();this.onPointerDownObserver.clear();@@ -201,22 +199,23 @@ export abstract class ThinScene extends Disposable {this.onMouseWheelObserver.clear();this.onKeyDownObservable.clear();this.onKeyUpObservable.clear();+super.dispose();}- getObject(oKey: string): Nullable<BaseObject> {}+ abstract getObject(oKey: string): Nullable<BaseObject>;- addObject(o: BaseObject, zIndex: number = 1) {}+ abstract addObject(o: BaseObject, zIndex?: number): void;- addObjects(objects: BaseObject[], zIndex: number = 1) {}+ abstract addObjects(objects: BaseObject[], zIndex?: number): void;- getEngine(): any {}+ abstract getEngine(): any;- setObjectBehavior(o: BaseObject) {}+ abstract setObjectBehavior(o: BaseObject): void;- applyTransformer(o: BaseObject) {}+ abstract applyTransformer(o: BaseObject): void;- makeDirtyNoParent(state: boolean = true) {+ makeDirtyNoParent(state: boolean = true): ThinScene {return this;}@@ -224,15 +223,15 @@ export abstract class ThinScene extends Disposable {return this;}- pick(coord: Vector2): Nullable<BaseObject | ThinScene> {}+ abstract pick(coord: Vector2): Nullable<BaseObject | ThinScene>;getViewports(): any[] {return [];}- addViewport(...viewport: any[]) {}+ abstract addViewport(...viewport: any[]): void;- removeViewport(key: string) {}+ abstract removeViewport(key: string): void;getAncestorScale() {return {@@ -248,11 +247,7 @@ export abstract class ThinScene extends Disposable {};}- setCursor(val: CURSOR_TYPE) {-- }-- resetCursor() {+ abstract setCursor(val: CURSOR_TYPE): void;- }+ abstract resetCursor(): void;}diff --git a/packages/facade/src/apis/__tests__/create-test-bed.ts b/packages/facade/src/apis/__tests__/create-test-bed.tsindex 6dabe32c2f..5107b36bda 100644--- a/packages/facade/src/apis/__tests__/create-test-bed.ts+++ b/packages/facade/src/apis/__tests__/create-test-bed.ts@@ -43,7 +43,7 @@ import type { Dependency } from '@wendellhu/redi';import { Inject, Injector } from '@wendellhu/redi';import { Engine, IRenderingEngine, IRenderManagerService, RenderManagerService } from '@univerjs/engine-render';-import { ISelectionRenderService, SelectionRenderService, SheetCanvasView, SheetSkeletonManagerService } from '@univerjs/sheets-ui';+import { ISelectionRenderService, SelectionRenderService, SheetCanvasView, SheetRenderController, SheetSkeletonManagerService } from '@univerjs/sheets-ui';import { DesktopPlatformService, DesktopShortcutService, IPlatformService, IShortcutService } from '@univerjs/ui';import { SheetsConditionalFormattingPlugin } from '@univerjs/sheets-conditional-formatting';import { FUniver } from '../facade';@@ -105,7 +105,8 @@ export interface ITestBed {injector: Injector;}-export function createTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): ITestBed {++export function createFacadeTestBed(workbookData?: IWorkbookData, dependencies?: Dependency[]): ITestBed {const univer = new Univer();const injector = univer.__getInjector();@@ -131,22 +132,30 @@ export function createTestBed(workbookData?: IWorkbookData, dependencies?: DepenuseFactory: () => this._injector.createInstance(DescriptionService, undefined),},]);+injector.add([IFunctionService, { useClass: FunctionService }]);injector.add([IFormulaCustomFunctionService, { useClass: FormulaCustomFunctionService }]);injector.add([ISocketService, { useClass: WebSocketService }]);injector.add([IRenderingEngine, { useFactory: () => new Engine() }]);injector.add([IRenderManagerService, { useClass: RenderManagerService }]);injector.add([ISelectionRenderService, { useClass: SelectionRenderService }]);- injector.add([SheetCanvasView]);+ injector.add([SheetRenderController]);injector.add([IShortcutService, { useClass: DesktopShortcutService }]);injector.add([IPlatformService, { useClass: DesktopPlatformService }]);injector.add([SheetSkeletonManagerService]);injector.add([FormulaDataModel]);injector.add([LexerTreeBuilder]);+SheetsConditionalFormattingPlugin.dependencyList.forEach((d) => {injector.add(d);});+dependencies?.forEach((d) => injector.add(d));++ const renderManagerService = injector.get(IRenderManagerService);+ ([+ SheetCanvasView,+ ]).forEach((renderController) => renderManagerService.registerRenderController(UniverInstanceType.UNIVER_SHEET, renderController));}}diff --git a/packages/facade/src/apis/__tests__/facade.spec.ts b/packages/facade/src/apis/__tests__/facade.spec.tsindex e6f2821eb0..be63dad663 100644--- a/packages/facade/src/apis/__tests__/facade.spec.ts+++ b/packages/facade/src/apis/__tests__/facade.spec.ts@@ -26,7 +26,7 @@ import { SHEET_VIEW_KEY } from '@univerjs/sheets-ui';import { RegisterFunctionMutation, SetFormulaCalculationStartMutation, UnregisterFunctionMutation } from '@univerjs/engine-formula';import { IDescriptionService } from '@univerjs/sheets-formula';import type { FUniver } from '../facade';-import { createTestBed } from './create-test-bed';+import { createFacadeTestBed } from './create-test-bed';import { COLUMN_UNIQUE_KEY, ColumnHeaderCustomExtension, MAIN_UNIQUE_KEY, MainCustomExtension, ROW_UNIQUE_KEY, RowHeaderCustomExtension } from './utils/sheet-extension-util';describe('Test FUniver', () => {@@ -49,7 +49,7 @@ describe('Test FUniver', () => {let getSheetRenderComponent: (unitId: string, viewKey: SHEET_VIEW_KEY) => Nullable<RenderComponentType>;beforeEach(() => {- const testBed = createTestBed();+ const testBed = createFacadeTestBed();get = testBed.get;univerAPI = testBed.univerAPI;@@ -88,7 +88,6 @@ describe('Test FUniver', () => {getSheetRenderComponent = (unitId: string, viewKey: SHEET_VIEW_KEY): Nullable<RenderComponentType> => {const render = get(IRenderManagerService).getRenderById(unitId);-if (!render) {throw new Error('Render not found');}diff --git a/packages/facade/src/apis/__tests__/utils/sheet-extension-util.ts b/packages/facade/src/apis/__tests__/utils/sheet-extension-util.tsindex 0f198393e9..e9a117095f 100644--- a/packages/facade/src/apis/__tests__/utils/sheet-extension-util.ts+++ b/packages/facade/src/apis/__tests__/utils/sheet-extension-util.ts@@ -29,6 +29,7 @@ export class ColumnHeaderCustomExtension extends SheetExtension {}override draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton) {+ // empty}}@@ -43,6 +44,7 @@ export class RowHeaderCustomExtension extends SheetExtension {}override draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton) {+ // empty}}@@ -57,5 +59,6 @@ export class MainCustomExtension extends SheetExtension {}override draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton) {+ // empty}}diff --git a/packages/facade/src/apis/facade.ts b/packages/facade/src/apis/facade.tsindex 5d7b08ea25..a54c1ce1ff 100644--- a/packages/facade/src/apis/facade.ts+++ b/packages/facade/src/apis/facade.ts@@ -113,6 +113,15 @@ export class FUniver {return this._injector.createInstance(FDocument, document);}+ /**+ * Dispose the UniverSheet by the `unitId`. The UniverSheet would be unload from the application.+ * @param unitId The `unitId` of the UniverSheet.+ * @returns If the UniverSheet is disposed successfully, return `true`, otherwise return `false`.+ */+ disposeUnit(unitId: string): boolean {+ return this._univerInstanceService.disposeUnit(unitId);+ }+/*** Get the spreadsheet API handler by the spreadsheet id.* @param id The spreadsheet id.@@ -196,7 +205,6 @@ export class FUniver {*/registerSheetRowHeaderExtension(unitId: string, ...extensions: SheetExtension[]): IDisposable {const sheetComponent = this._getSheetRenderComponent(unitId, SHEET_VIEW_KEY.ROW) as SheetComponent;-const registerDisposable = sheetComponent.register(...extensions);return toDisposable(() => {@@ -255,10 +263,6 @@ export class FUniver {// #endregion- // #region editing-- // #callback-// #region listeners/**@@ -328,7 +332,6 @@ export class FUniver {*/private _getSheetRenderComponent(unitId: string, viewKey: SHEET_VIEW_KEY): Nullable<RenderComponentType> {const render = this._renderManagerService.getRenderById(unitId);-if (!render) {throw new Error('Render not found');}@@ -336,7 +339,6 @@ export class FUniver {const { components } = render;const renderComponent = components.get(viewKey);-if (!renderComponent) {throw new Error('Render component not found');}diff --git a/packages/facade/src/apis/sheets/__tests__/f-range.spec.ts b/packages/facade/src/apis/sheets/__tests__/f-range.spec.tsindex 4cb107062e..046ff42852 100644--- a/packages/facade/src/apis/sheets/__tests__/f-range.spec.ts+++ b/packages/facade/src/apis/sheets/__tests__/f-range.spec.ts@@ -22,7 +22,7 @@ import { beforeEach, describe, expect, it } from 'vitest';import { FormulaDataModel } from '@univerjs/engine-formula';import type { FUniver } from '../../facade';-import { createTestBed } from '../../__tests__/create-test-bed';+import { createFacadeTestBed } from '../../__tests__/create-test-bed';describe('Test FRange', () => {let get: Injector['get'];@@ -42,7 +42,7 @@ describe('Test FRange', () => {) => Nullable<IStyleData>;beforeEach(() => {- const testBed = createTestBed();+ const testBed = createFacadeTestBed();get = testBed.get;univerAPI = testBed.univerAPI;diff --git a/packages/facade/src/apis/sheets/__tests__/f-sheet-hooks.spec.ts b/packages/facade/src/apis/sheets/__tests__/f-sheet-hooks.spec.tsindex 61a64fdbe6..518e3bd22e 100644--- a/packages/facade/src/apis/sheets/__tests__/f-sheet-hooks.spec.ts+++ b/packages/facade/src/apis/sheets/__tests__/f-sheet-hooks.spec.ts@@ -24,7 +24,7 @@ import { Subject } from 'rxjs';import type { IHoverCellPosition } from '@univerjs/sheets-ui';import { HoverManagerService } from '@univerjs/sheets-ui';import type { FUniver } from '../../facade';-import { createTestBed } from '../../__tests__/create-test-bed';+import { createFacadeTestBed } from '../../__tests__/create-test-bed';import { FSheetHooks } from '../f-sheet-hooks';describe('Test FSheetHooks', () => {@@ -59,7 +59,7 @@ describe('Test FSheetHooks', () => {currentCell$: currentCell$.asObservable(),};- const testBed = createTestBed(undefined, [+ const testBed = createFacadeTestBed(undefined, [[HoverManagerService, { useValue: mockHoverManagerService }],]);get = testBed.get;diff --git a/packages/facade/src/apis/sheets/__tests__/f-workbook.spec.ts b/packages/facade/src/apis/sheets/__tests__/f-workbook.spec.tsindex d26808b32e..00d62f6c07 100644--- a/packages/facade/src/apis/sheets/__tests__/f-workbook.spec.ts+++ b/packages/facade/src/apis/sheets/__tests__/f-workbook.spec.ts@@ -21,7 +21,7 @@ import type { Injector } from '@wendellhu/redi';import { beforeEach, describe, expect, it } from 'vitest';import type { FUniver } from '../../facade';-import { createTestBed } from '../../__tests__/create-test-bed';+import { createFacadeTestBed } from '../../__tests__/create-test-bed';describe('Test FWorkbook', () => {let get: Injector['get'];@@ -41,7 +41,7 @@ describe('Test FWorkbook', () => {) => Nullable<IStyleData>;beforeEach(() => {- const testBed = createTestBed();+ const testBed = createFacadeTestBed();get = testBed.get;univerAPI = testBed.univerAPI;diff --git a/packages/facade/src/apis/sheets/__tests__/f-worksheet.spec.ts b/packages/facade/src/apis/sheets/__tests__/f-worksheet.spec.tsindex 961cfd1117..b12d3f7073 100644--- a/packages/facade/src/apis/sheets/__tests__/f-worksheet.spec.ts+++ b/packages/facade/src/apis/sheets/__tests__/f-worksheet.spec.ts@@ -21,7 +21,7 @@ import type { Injector } from '@wendellhu/redi';import { beforeEach, describe, expect, it } from 'vitest';import type { FUniver } from '../../facade';-import { createTestBed } from '../../__tests__/create-test-bed';+import { createFacadeTestBed } from '../../__tests__/create-test-bed';describe('Test FWorksheet', () => {let get: Injector['get'];@@ -41,7 +41,7 @@ describe('Test FWorksheet', () => {) => Nullable<IStyleData>;beforeEach(() => {- const testBed = createTestBed();+ const testBed = createFacadeTestBed();get = testBed.get;univerAPI = testBed.univerAPI;diff --git a/packages/facade/src/apis/sheets/f-selection.ts b/packages/facade/src/apis/sheets/f-selection.tsindex a776039911..fa4acc81ac 100644--- a/packages/facade/src/apis/sheets/f-selection.ts+++ b/packages/facade/src/apis/sheets/f-selection.ts@@ -26,7 +26,9 @@ export class FSelection {private readonly _worksheet: Worksheet,private readonly _selections: Readonly<ISelectionWithStyle[]>,@Inject(Injector) private readonly _injector: Injector- ) {}+ ) {+ // empty+ }getActiveRange(): FRange | null {const active = this._selections.find((selection) => !!selection.primary);diff --git a/packages/facade/src/apis/sheets/f-sheet-hooks.ts b/packages/facade/src/apis/sheets/f-sheet-hooks.tsindex d3a94af982..c2a3b80d26 100644--- a/packages/facade/src/apis/sheets/f-sheet-hooks.ts+++ b/packages/facade/src/apis/sheets/f-sheet-hooks.ts@@ -24,11 +24,13 @@ import { HoverManagerService } from '@univerjs/sheets-ui';export class FSheetHooks {constructor(@Inject(HoverManagerService) private readonly _hoverManagerService: HoverManagerService- ) { }+ ) {+ // empty+ }/*** Subscribe to the location information of the currently hovered cell- * @returns+ * @returns a disposable object that can be used to unsubscribe from the event*/onCellPointerMove(callback: (cellPos: Nullable<IHoverCellPosition>) => void): IDisposable {return toDisposable(this._hoverManagerService.currentCell$.subscribe(callback));diff --git a/packages/facade/src/apis/sheets/f-worksheet.ts b/packages/facade/src/apis/sheets/f-worksheet.tsindex 89af947c65..c6745ecf48 100644--- a/packages/facade/src/apis/sheets/f-worksheet.ts+++ b/packages/facade/src/apis/sheets/f-worksheet.ts@@ -29,7 +29,9 @@ export class FWorksheet {@Inject(Injector) private readonly _injector: Injector,@Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,@ICommandService private readonly _commandService: ICommandService- ) {}+ ) {+ // empty+ }/*** Returns the worksheet iddiff --git a/packages/image/src/models/image-model.ts b/packages/image/src/models/image-model.tsindex 3cbfb6b73c..1946282c36 100644--- a/packages/image/src/models/image-model.ts+++ b/packages/image/src/models/image-model.ts@@ -24,7 +24,9 @@ export interface IImageData {export class ImageModel {private _imageShapeKey: Nullable<string>;- constructor(private _imageData: IImageData) {}+ constructor(private _imageData: IImageData) {+ // empty+ }getImageData() {return this._imageData;diff --git a/packages/image/src/plugin.ts b/packages/image/src/plugin.tsindex b42bf9e679..ba1aa98bf4 100644--- a/packages/image/src/plugin.ts+++ b/packages/image/src/plugin.ts@@ -41,8 +41,6 @@ export class UniverImagePlugin extends Plugin {this._mockAddImage();}- override onReady(): void {}-private _mockAddImage(): void {/*** TODO: @DR-Univer Before the loading process is completed, mock some data for testing.diff --git a/packages/network/src/services/http/params.ts b/packages/network/src/services/http/params.tsindex 2421eeed74..33c4213581 100644--- a/packages/network/src/services/http/params.ts+++ b/packages/network/src/services/http/params.ts@@ -15,7 +15,9 @@*/export class HTTPParams {- constructor(readonly params?: { [key: string]: string | number | boolean }) {}+ constructor(readonly params?: { [key: string]: string | number | boolean }) {+ // empty+ }toString(): string {if (!this.params) {diff --git a/packages/network/src/services/http/response.ts b/packages/network/src/services/http/response.tsindex 1f714c96ae..2735cb9c30 100644--- a/packages/network/src/services/http/response.ts+++ b/packages/network/src/services/http/response.ts@@ -75,5 +75,7 @@ export class ResponseHeader {readonly headers: HTTPHeaders,readonly status: number,readonly statusText: string- ) {}+ ) {+ // empty+ }}diff --git a/packages/rpc/src/services/remote-instance/remote-instance.service.ts b/packages/rpc/src/services/remote-instance/remote-instance.service.tsindex 8afb82abf2..c1bbc614a1 100644--- a/packages/rpc/src/services/remote-instance/remote-instance.service.ts+++ b/packages/rpc/src/services/remote-instance/remote-instance.service.ts@@ -34,7 +34,9 @@ export interface IRemoteSyncService {syncMutation(params: { mutationInfo: IMutationInfo }): Promise<boolean>;}export class RemoteSyncPrimaryService implements IRemoteSyncService {- constructor(@ICommandService private readonly _commandService: ICommandService) { }+ constructor(@ICommandService private readonly _commandService: ICommandService) {+ // empty+ }async syncMutation(params: { mutationInfo: IMutationInfo }): Promise<boolean> {return this._commandService.syncExecuteCommand(params.mutationInfo.id, params.mutationInfo.params, {@@ -68,7 +70,9 @@ export class WebWorkerRemoteInstanceService implements IRemoteInstanceService {@IUniverInstanceService protected readonly _univerInstanceService: IUniverInstanceService,@ICommandService protected readonly _commandService: ICommandService,@ILogService protected readonly _logService: ILogService- ) { }+ ) {+ // empty+ }whenReady(): Promise<true> {return Promise.resolve(true);diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.menu.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.menu.controller.tsindex a2441cec1e..767a081276 100644--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.menu.controller.ts+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.menu.controller.ts@@ -14,8 +14,9 @@* limitations under the License.*/+import type { IDisposable } from '@wendellhu/redi';import { Inject, Injector } from '@wendellhu/redi';-import { Disposable, LifecycleStages, LocaleService, OnLifecycle } from '@univerjs/core';+import { Disposable, IUniverInstanceService, LifecycleStages, LocaleService, OnLifecycle, UniverInstanceType } from '@univerjs/core';import { ComponentManager, IMenuService, ISidebarService } from '@univerjs/ui';import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';import { FactoryManageConditionalFormattingRule } from '../menu/manage-rule';@@ -24,17 +25,26 @@ import { ConditionFormattingPanel } from '../components/panel';const CF_PANEL_KEY = 'sheet.conditional.formatting.panel';@OnLifecycle(LifecycleStages.Ready, ConditionalFormattingMenuController)export class ConditionalFormattingMenuController extends Disposable {+ private _sidebarDisposable: IDisposable | null = null;+constructor(+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@Inject(Injector) private _injector: Injector,@Inject(ComponentManager) private _componentManager: ComponentManager,@Inject(IMenuService) private _menuService: IMenuService,@Inject(ISidebarService) private _sidebarService: ISidebarService,@Inject(LocaleService) private _localeService: LocaleService-) {super();+this._initMenu();this._initPanel();++ this.disposeWithMe(+ this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).subscribe((sheet) => {+ if (!sheet) this._sidebarDisposable?.dispose();+ })+ );}openPanel(rule?: IConditionFormattingRule) {@@ -44,8 +54,10 @@ export class ConditionalFormattingMenuController extends Disposable {label: CF_PANEL_KEY,rule,},+ onClose: () => this._sidebarDisposable = null,};- this._sidebarService.open(props);++ this._sidebarDisposable = this._sidebarService.open(props);}private _initMenu() {diff --git a/packages/sheets-conditional-formatting/src/models/conditional-formatting-rule-model.ts b/packages/sheets-conditional-formatting/src/models/conditional-formatting-rule-model.tsindex c46bbf60c9..ca0326fd36 100644--- a/packages/sheets-conditional-formatting/src/models/conditional-formatting-rule-model.ts+++ b/packages/sheets-conditional-formatting/src/models/conditional-formatting-rule-model.ts@@ -32,11 +32,11 @@ export class ConditionalFormattingRuleModel {private _ruleChange$ = new Subject<{ rule: IConditionFormattingRule; unitId: string; subUnitId: string; type: RuleOperatorType }>();$ruleChange = this._ruleChange$.asObservable();- constructor(@Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,+ constructor(+ @Inject(ConditionalFormattingViewModel) private _conditionalFormattingViewModel: ConditionalFormattingViewModel,@Inject(Injector) private _injector: Injector-) {-+ // empty}private _ensureList(unitId: string, subUnitId: string) {diff --git a/packages/sheets-conditional-formatting/src/services/__test__/test.util.ts b/packages/sheets-conditional-formatting/src/services/__test__/test.util.tsindex 6615a565bb..145786b4ea 100644--- a/packages/sheets-conditional-formatting/src/services/__test__/test.util.ts+++ b/packages/sheets-conditional-formatting/src/services/__test__/test.util.ts@@ -80,7 +80,7 @@ export const createTestBed = (dependencies?: Dependency[]) => {this._injector.add([ConditionalFormattingFormulaService]);this._injector.add([ConditionalFormattingRuleModel]);this._injector.add([ConditionalFormattingViewModel]);- this._injector.add([IActiveDirtyManagerService, { useFactory: () => ({ register: () => { } } as any) }]);+ this._injector.add([IActiveDirtyManagerService, { useFactory: () => ({ register: () => { /* empty */ } } as any) }]);this._injector.get(ConditionalFormattingService);}}diff --git a/packages/sheets-data-validation/src/commands/operations/data-validation.operation.ts b/packages/sheets-data-validation/src/commands/operations/data-validation.operation.tsindex 00c346e064..1a2e6be648 100644--- a/packages/sheets-data-validation/src/commands/operations/data-validation.operation.ts+++ b/packages/sheets-data-validation/src/commands/operations/data-validation.operation.ts@@ -51,11 +51,16 @@ export const OpenValidationPanelOperation: ICommand<IOpenValidationPanelOperatiosubUnitId,rule,});- sidebarService.open({++ const disposable = sidebarService.open({header: { title: isAdd ? 'dataValidation.panel.addTitle' : 'dataValidation.panel.title' },children: { label: DATA_VALIDATION_PANEL },width: 312,+ onClose: () => dataValidationPanelService.close(),});++ dataValidationPanelService.setCloseDisposable(disposable);+return true;},};diff --git a/packages/sheets-data-validation/src/controllers/dv-render.controller.ts b/packages/sheets-data-validation/src/controllers/dv-render.controller.tsindex 60aad5bdd4..bd3230dc9f 100644--- a/packages/sheets-data-validation/src/controllers/dv-render.controller.ts+++ b/packages/sheets-data-validation/src/controllers/dv-render.controller.ts@@ -165,7 +165,7 @@ export class DataValidationRenderController extends RxDisposable {worksheet,},componentKey: validator.dropdown,- onHide: () => { },+ onHide: () => { /* empty */ },});}}));diff --git a/packages/sheets-data-validation/src/services/data-validation-panel.service.ts b/packages/sheets-data-validation/src/services/data-validation-panel.service.tsindex 6e1b8cdd5b..259115c3b4 100644--- a/packages/sheets-data-validation/src/services/data-validation-panel.service.ts+++ b/packages/sheets-data-validation/src/services/data-validation-panel.service.ts@@ -15,16 +15,18 @@*/import type { IDataValidationRule, Nullable } from '@univerjs/core';-import { Disposable } from '@univerjs/core';-import { BehaviorSubject, distinctUntilChanged } from 'rxjs';+import { Disposable, IUniverInstanceService, toDisposable, UniverInstanceType } from '@univerjs/core';+import { ISidebarService } from '@univerjs/ui';+import type { IDisposable } from '@wendellhu/redi';+import { BehaviorSubject, distinctUntilChanged, filter } from 'rxjs';export class DataValidationPanelService extends Disposable {private _open$ = new BehaviorSubject<boolean>(false);+ readonly open$ = this._open$.pipe(distinctUntilChanged());+private _activeRule: Nullable<{ unitId: string; subUnitId: string; rule: IDataValidationRule }> = undefined;private _activeRule$ = new BehaviorSubject<Nullable<{ unitId: string; subUnitId: string; rule: IDataValidationRule }>>(undefined);-- open$ = this._open$.pipe(distinctUntilChanged());- activeRule$ = this._activeRule$.asObservable();+ readonly activeRule$ = this._activeRule$.asObservable();get activeRule() {return this._activeRule;@@ -34,9 +36,29 @@ export class DataValidationPanelService extends Disposable {return this._open$.getValue();}+ private _closeDisposable: Nullable<IDisposable> = null;++ constructor(+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,+ @ISidebarService private readonly _sidebarService: ISidebarService+ ) {+ super();++ this.disposeWithMe(+ this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET)+ .pipe(filter((sheet) => !sheet)).subscribe(() => {+ this.close();+ })+ );+ }+override dispose(): void {+ super.dispose();+this._open$.next(false);this._open$.complete();++ this._closeDisposable?.dispose();}open(): void {@@ -45,6 +67,14 @@ export class DataValidationPanelService extends Disposable {close(): void {this._open$.next(false);+ this._closeDisposable?.dispose();+ }++ setCloseDisposable(disposable: IDisposable): void {+ this._closeDisposable = toDisposable(() => {+ disposable.dispose();+ this._closeDisposable = null;+ });}setActiveRule(rule: Nullable<{ unitId: string; subUnitId: string; rule: IDataValidationRule }>): void {diff --git a/packages/sheets-data-validation/src/services/dv.service.ts b/packages/sheets-data-validation/src/services/dv.service.tsindex 47bae410df..9ec56f4cf4 100644--- a/packages/sheets-data-validation/src/services/dv.service.ts+++ b/packages/sheets-data-validation/src/services/dv.service.ts@@ -39,7 +39,9 @@ export class SheetDataValidationService {constructor(@Inject(DataValidationModel) private _dataValidationModel: DataValidationModel- ) { }+ ) {+ // empty+ }private _ensureManager(unitId: string, subUnitId: string) {return this._dataValidationModel.ensureManager(unitId, subUnitId) as SheetDataValidationManager;diff --git a/packages/sheets-data-validation/src/views/formula-input/list-formula-input.tsx b/packages/sheets-data-validation/src/views/formula-input/list-formula-input.tsxindex 68f5976c2f..59518a6204 100644--- a/packages/sheets-data-validation/src/views/formula-input/list-formula-input.tsx+++ b/packages/sheets-data-validation/src/views/formula-input/list-formula-input.tsx@@ -143,7 +143,7 @@ const Template = (props: { item: IDropdownItem; commonProps: any; style?: React.export function ListFormulaInput(props: IFormulaInputProps) {- const { value, onChange: _onChange = () => { }, unitId, subUnitId, validResult, showError, ruleId } = props;+ const { value, onChange: _onChange = () => { /* empty */ }, unitId, subUnitId, validResult, showError, ruleId } = props;const { formula1 = '', formula2 = '' } = value || {};const containerRef = useRef<HTMLDivElement>(null);const [isFormulaStr, setIsFormulaStr] = useState(() => isFormulaString(formula1) ? '1' : '0');diff --git a/packages/sheets-data-validation/src/views/list/index.tsx b/packages/sheets-data-validation/src/views/list/index.tsxindex 686a27db1f..4fffc52c21 100644--- a/packages/sheets-data-validation/src/views/list/index.tsx+++ b/packages/sheets-data-validation/src/views/list/index.tsx@@ -14,7 +14,7 @@* limitations under the License.*/-import React, { memo, useEffect, useState } from 'react';+import React, { useEffect, useState } from 'react';import { Injector } from '@wendellhu/redi';import { useDependency } from '@wendellhu/redi/react-bindings';import type { ISheetDataValidationRule, Workbook } from '@univerjs/core';@@ -28,21 +28,30 @@ import { AddSheetDataValidationCommand } from '../../commands/commands/data-valiimport { DataValidationPanelService } from '../../services/data-validation-panel.service';import styles from './index.module.less';-export const DataValidationList = memo(() => {+export function DataValidationList() {const univerInstanceService = useDependency(IUniverInstanceService);- const dataValidationModel = useDependency(DataValidationModel);- const commandService = useDependency(ICommandService);- const injector = useDependency(Injector);- const dataValidationPanelService = useDependency(DataValidationPanelService);const workbook = useObservable(() => univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET),undefined,- true,+ undefined,[]- ) as Workbook;+ );++ if (!workbook) return null;+ return <DataValidationListWithWorkbook workbook={workbook} />;+}++function DataValidationListWithWorkbook(props: { workbook: Workbook }) {+ const dataValidationModel = useDependency(DataValidationModel);+ const commandService = useDependency(ICommandService);+ const injector = useDependency(Injector);+ const dataValidationPanelService = useDependency(DataValidationPanelService);+const localeService = useDependency(LocaleService);const [rules, setRules] = useState<ISheetDataValidationRule[]>([]);- const worksheet = useObservable(workbook.activeSheet$, workbook.getActiveSheet()) ?? workbook.getActiveSheet();++ const { workbook } = props;+ const worksheet = useObservable(workbook.activeSheet$, undefined, true)!;const unitId = workbook.getUnitId();const subUnitId = worksheet.getSheetId();const manager = dataValidationModel.ensureManager(unitId, subUnitId);@@ -110,4 +119,4 @@ export const DataValidationList = memo(() => {</div></div>);-});+};diff --git a/packages/sheets-data-validation/src/widgets/checkbox-widget.ts b/packages/sheets-data-validation/src/widgets/checkbox-widget.tsindex 18d0e008a7..70cf1e7bca 100644--- a/packages/sheets-data-validation/src/widgets/checkbox-widget.ts+++ b/packages/sheets-data-validation/src/widgets/checkbox-widget.ts@@ -74,7 +74,9 @@ export class CheckboxRender implements IBaseDataValidationWidget {@ICommandService private readonly _commandService: ICommandService,@Inject(DataValidationFormulaService) private readonly _formulaService: DataValidationFormulaService,@Inject(ThemeService) private readonly _themeService: ThemeService- ) {}+ ) {+ // super+ }calcCellAutoHeight(): number | undefined {return undefined;diff --git a/packages/sheets-data-validation/src/widgets/dropdown-multiple-widget.ts b/packages/sheets-data-validation/src/widgets/dropdown-multiple-widget.tsindex fda3230b4d..8bf6031697 100644--- a/packages/sheets-data-validation/src/widgets/dropdown-multiple-widget.ts+++ b/packages/sheets-data-validation/src/widgets/dropdown-multiple-widget.ts@@ -33,7 +33,9 @@ export class DropdownMultipleWidget implements IBaseDataValidationWidget {constructor(@ICommandService private readonly _commandService: ICommandService- ) {}+ ) {+ // empty+ }private _ensureMap(subUnitId: string) {let map = this._dropdownInfoMap.get(subUnitId);diff --git a/packages/sheets-data-validation/src/widgets/dropdown-widget.ts b/packages/sheets-data-validation/src/widgets/dropdown-widget.tsindex ec56f92cca..ad7ac869f7 100644--- a/packages/sheets-data-validation/src/widgets/dropdown-widget.ts+++ b/packages/sheets-data-validation/src/widgets/dropdown-widget.ts@@ -130,7 +130,9 @@ export class DropdownWidget implements IBaseDataValidationWidget {constructor(@Inject(LocaleService) private readonly _localeService: LocaleService,@ICommandService private readonly _commandService: ICommandService- ) { }+ ) {+ // super+ }zIndex?: number | undefined;onPointerEnter?: ((info: ICellRenderContext) => void) | undefined;diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-render.controller.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter-render.controller.tsindex a57b548e27..4fd908bc9a 100644--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-render.controller.ts+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter-render.controller.ts@@ -14,9 +14,9 @@* limitations under the License.*/-import type { IRange } from '@univerjs/core';-import { CommandType, fromCallback, ICommandService, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, ThemeService } from '@univerjs/core';-import type { SpreadsheetSkeleton } from '@univerjs/engine-render';+import type { IRange, Workbook } from '@univerjs/core';+import { CommandType, fromCallback, ICommandService, RxDisposable, ThemeService } from '@univerjs/core';+import type { IRenderContext, IRenderController, SpreadsheetSkeleton } from '@univerjs/engine-render';import { IRenderManagerService } from '@univerjs/engine-render';import type { ISelectionStyle, ISheetCommandSharedParams } from '@univerjs/sheets';import { INTERCEPTOR_POINT, SheetInterceptorService } from '@univerjs/sheets';@@ -42,13 +42,13 @@ interface ISheetsFilterRenderParams {skeleton: SpreadsheetSkeleton;}-@OnLifecycle(LifecycleStages.Ready, SheetsFilterRenderController)-export class SheetsFilterRenderController extends RxDisposable {+export class SheetsFilterRenderController extends RxDisposable implements IRenderController {private _filterRangeShape: SelectionShape | null = null;private _buttonRenderDisposable: IDisposable | null = null;private _filterButtonShapes: SheetsFilterButtonShape[] = [];constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(Injector) private readonly _injector: Injector,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,@Inject(SheetsFilterService) private readonly _sheetsFilterService: SheetsFilterService,@@ -56,7 +56,6 @@ export class SheetsFilterRenderController extends RxDisposable {@Inject(SheetInterceptorService) private readonly _sheetInterceptorService: SheetInterceptorService,@Inject(SheetRenderController) private _sheetRenderController: SheetRenderController,@ICommandService private readonly _commandService: ICommandService,- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@ISelectionRenderService private readonly _selectionRenderService: ISelectionRenderService) {@@ -77,16 +76,11 @@ export class SheetsFilterRenderController extends RxDisposable {this._sheetSkeletonManagerService.currentSkeleton$.pipe(switchMap((skeletonParams) => {- if (!skeletonParams) {- return of(null);- }+ if (!skeletonParams) return of(null);const { unitId } = skeletonParams;- const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);- if (!workbook) {- return of(null);- }+ const workbook = this._context.unit;const worksheetId = workbook.getActiveSheet().getSheetId();const filterModel = this._sheetsFilterService.getFilterModel(unitId, worksheetId) ?? undefined;const getParams = (): ISheetsFilterRenderParams => ({@@ -131,7 +125,7 @@ export class SheetsFilterRenderController extends RxDisposable {}const { scene } = renderer;- const { rangeWithCoord, style } = this._selectionRenderService.convertSelectionRangeToData({+ const { rangeWithCoord, style } = this._selectionRenderService.convertSelectionToCoord({range,primary: null,style: null,diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-ui.controller.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui.controller.tsindex fed6616efa..4021ab69e4 100644--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-ui.controller.ts+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui.controller.ts@@ -15,7 +15,7 @@*/import type { Nullable } from '@univerjs/core';-import { ICommandService, IContextService, LifecycleStages, OnLifecycle, RxDisposable } from '@univerjs/core';+import { ICommandService, IContextService, LifecycleStages, OnLifecycle, RxDisposable, UniverInstanceType } from '@univerjs/core';import type { IMenuItemFactory } from '@univerjs/ui';import { ComponentManager, IMenuService, IShortcutService } from '@univerjs/ui';import type { IDisposable } from '@wendellhu/redi';@@ -25,12 +25,14 @@ import { distinctUntilChanged } from 'rxjs';import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';import { FilterSingle } from '@univerjs/icons';+import { IRenderManagerService } from '@univerjs/engine-render';import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SetSheetsFilterCriteriaCommand, SmartToggleSheetsFilterCommand } from '../commands/sheets-filter.command';import { FilterPanel } from '../views/components/SheetsFilterPanel';import { ChangeFilterByOperation, CloseFilterPanelOperation, FILTER_PANEL_OPENED_KEY, OpenFilterPanelOperation } from '../commands/sheets-filter.operation';import { SheetsFilterPanelService } from '../services/sheets-filter-panel.service';import { SmartToggleFilterShortcut } from './sheets-filter.shortcut';import { ClearFilterCriteriaMenuItemFactory, ReCalcFilterMenuItemFactory, SmartToggleFilterMenuItemFactory } from './sheets-filter.menu';+import { SheetsFilterRenderController } from './sheets-filter-render.controller';export const FILTER_PANEL_POPUP_KEY = 'FILTER_PANEL_POPUP';@@ -44,6 +46,7 @@ export class SheetsFilterUIController extends RxDisposable {@Inject(ComponentManager) private readonly _componentManager: ComponentManager,@Inject(SheetsFilterPanelService) private readonly _sheetsFilterPanelService: SheetsFilterPanelService,@Inject(SheetCanvasPopManagerService) private _sheetCanvasPopupService: SheetCanvasPopManagerService,+ @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@IShortcutService private readonly _shortcutService: IShortcutService,@ICommandService private readonly _commandService: ICommandService,@IMenuService private readonly _menuService: IMenuService,@@ -55,6 +58,7 @@ export class SheetsFilterUIController extends RxDisposable {this._initShortcuts();this._initMenuItems();this._initUI();+ this._initRenderControllers();}override dispose(): void {@@ -109,6 +113,10 @@ export class SheetsFilterUIController extends RxDisposable {}));}+ private _initRenderControllers(): void {+ this.disposeWithMe(this._renderManagerService.registerRenderController(UniverInstanceType.UNIVER_SHEET, SheetsFilterRenderController));+ }+private _popupDisposable?: Nullable<IDisposable>;private _openFilterPopup(): void {const currentFilterModel = this._sheetsFilterPanelService.filterModel;diff --git a/packages/sheets-filter-ui/src/plugin.ts b/packages/sheets-filter-ui/src/plugin.tsindex ec5b2d38c0..8741e96d63 100644--- a/packages/sheets-filter-ui/src/plugin.ts+++ b/packages/sheets-filter-ui/src/plugin.ts@@ -21,7 +21,6 @@ import { Inject, Injector } from '@wendellhu/redi';import { zhCN } from './locale';import { SheetsFilterUIController } from './controllers/sheets-filter-ui.controller';import { SheetsFilterPanelService } from './services/sheets-filter-panel.service';-import { SheetsFilterRenderController } from './controllers/sheets-filter-render.controller';const NAME = 'UNIVER_SHEETS_FILTER_UI_PLUGIN';@@ -45,7 +44,6 @@ export class UniverSheetsFilterUIPlugin extends Plugin {([[SheetsFilterPanelService],[SheetsFilterUIController],- [SheetsFilterRenderController],] as Dependency[]).forEach((d) => injector.add(d));}}diff --git a/packages/sheets-filter/src/models/__tests__/filter-model.spec.ts b/packages/sheets-filter/src/models/__tests__/filter-model.spec.tsindex da3aeeb25f..c0a9648c45 100644--- a/packages/sheets-filter/src/models/__tests__/filter-model.spec.ts+++ b/packages/sheets-filter/src/models/__tests__/filter-model.spec.ts@@ -254,12 +254,10 @@ describe('Test filter model and related utils', () => {});// TODO@wzhudev: not implemented yet-- describe('Test serialization and deserialization', () => {- it('should serialize return a correct object', () => { });-- it('should deserialize return a correct instance', () => { });- });+ // describe('Test serialization and deserialization', () => {+ // it('should serialize return a correct object', () => { });+ // it('should deserialize return a correct instance', () => { });+ // });});});diff --git a/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts b/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.tsindex 4223056f22..bbf4356c82 100644--- a/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts+++ b/packages/sheets-formula/src/controllers/__tests__/formula-auto-fill.controller.spec.ts@@ -32,6 +32,7 @@ import {SetSelectionsOperation,} from '@univerjs/sheets';import {+ AutoFillCommand,AutoFillController,AutoFillService,IAutoFillService,@@ -81,6 +82,7 @@ describe('Test auto fill with formula', () => {commandService.registerCommand(SetSelectionsOperation);commandService.registerCommand(AddWorksheetMergeMutation);commandService.registerCommand(RemoveWorksheetMergeMutation);+ commandService.registerCommand(AutoFillCommand);getValues = (startRow: number,diff --git a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts b/packages/sheets-formula/src/controllers/formula-editor-show.controller.tsindex 3388940d4c..e1fc74f2da 100644--- a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts+++ b/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts@@ -14,15 +14,13 @@* limitations under the License.*/-import type { ICellDataForSheetInterceptor, ICommandInfo, IRange, Nullable } from '@univerjs/core';+import type { ICellDataForSheetInterceptor, ICommandInfo, IRange, Nullable, Workbook } from '@univerjs/core';import {CellValueType,ColorKit,Disposable,ICommandService,- LifecycleStages,ObjectMatrix,- OnLifecycle,ThemeService,toDisposable,} from '@univerjs/core';@@ -33,6 +31,7 @@ import {SetArrayFormulaDataMutation,SetFormulaCalculationResultMutation,} from '@univerjs/engine-formula';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';import { IRenderManagerService } from '@univerjs/engine-render';import { INTERCEPTOR_POINT, SheetInterceptorService } from '@univerjs/sheets';import {@@ -43,11 +42,11 @@ import {} from '@univerjs/sheets-ui';import { Inject } from '@wendellhu/redi';-@OnLifecycle(LifecycleStages.Rendered, FormulaEditorShowController)-export class FormulaEditorShowController extends Disposable {+export class FormulaEditorShowController extends Disposable implements IRenderController {private _previousShape: Nullable<SelectionShape>;constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(IEditorBridgeService) private _editorBridgeService: IEditorBridgeService,@Inject(FormulaDataModel) private readonly _formulaDataModel: FormulaDataModel,@Inject(LexerTreeBuilder) private readonly _lexerTreeBuilder: LexerTreeBuilder,@@ -192,16 +191,12 @@ export class FormulaEditorShowController extends Disposable {}private _commandExecutedListener() {- this.disposeWithMe(- this._commandService.onCommandExecuted((command: ICommandInfo, options) => {- if (- command.id === SetFormulaCalculationResultMutation.id ||- (command.id === SetArrayFormulaDataMutation.id && options && options.remove)- ) {- this._removeArrayFormulaRangeShape();- }- })- );+ this.disposeWithMe(this._commandService.onCommandExecuted((command: ICommandInfo, options) => {+ if (command.id === SetFormulaCalculationResultMutation.id || (command.id === SetArrayFormulaDataMutation.id && options && options.remove)+ ) {+ this._removeArrayFormulaRangeShape();+ }+ }));}private _createArrayFormulaRangeShape(arrayRange: IRange, unitId: string) {@@ -221,7 +216,7 @@ export class FormulaEditorShowController extends Disposable {};const { scene } = this._renderManagerService.getRenderById(unitId) || {};- const { rangeWithCoord, primaryWithCoord } = this._selectionRenderService.convertSelectionRangeToData({+ const { rangeWithCoord, primaryWithCoord } = this._selectionRenderService.convertSelectionToCoord({range: arrayRange,primary: null,style,diff --git a/packages/sheets-formula/src/controllers/formula-ui.controller.ts b/packages/sheets-formula/src/controllers/formula-ui.controller.tsindex 1b61d35ce4..0dfe445613 100644--- a/packages/sheets-formula/src/controllers/formula-ui.controller.ts+++ b/packages/sheets-formula/src/controllers/formula-ui.controller.ts@@ -14,12 +14,13 @@* limitations under the License.*/-import { Disposable, ICommandService, LifecycleStages, OnLifecycle } from '@univerjs/core';+import { Disposable, ICommandService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';import type { IDesktopUIController } from '@univerjs/ui';import { ComponentManager, DesktopUIPart, IMenuService, IShortcutService, IUIController } from '@univerjs/ui';import { Inject, Injector } from '@wendellhu/redi';import { connectInjector } from '@wendellhu/redi/react-bindings';+import { IRenderManagerService } from '@univerjs/engine-render';import { SheetOnlyPasteFormulaCommand } from '../commands/commands/formula-clipboard.command';import { InsertFunctionCommand } from '../commands/commands/insert-function.command';import { SelectEditorFormulaOperation } from '../commands/operations/editor-formula.operation';@@ -41,6 +42,7 @@ import {promptSelectionShortcutItemShift,singleEditorPromptSelectionShortcutItem,} from './shortcuts/prompt.shortcut';+import { FormulaEditorShowController } from './formula-editor-show.controller';@OnLifecycle(LifecycleStages.Ready, FormulaUIController)export class FormulaUIController extends Disposable {@@ -50,6 +52,7 @@ export class FormulaUIController extends Disposable {@ICommandService private readonly _commandService: ICommandService,@IShortcutService private readonly _shortcutService: IShortcutService,@IUIController private readonly _uiController: IDesktopUIController,+ @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@Inject(ComponentManager) private readonly _componentManager: ComponentManager) {super();@@ -62,6 +65,7 @@ export class FormulaUIController extends Disposable {this._registerMenus();this._registerShortcuts();this._registerComponents();+ this._registerRenderControllers();}private _registerMenus(): void {@@ -101,9 +105,13 @@ export class FormulaUIController extends Disposable {private _registerComponents(): void {this.disposeWithMe(- this.disposeWithMe(this._uiController.registerComponent(DesktopUIPart.CONTENT, () => connectInjector(RenderFormulaPromptContent, this._injector)))+ this._uiController.registerComponent(DesktopUIPart.CONTENT, () => connectInjector(RenderFormulaPromptContent, this._injector)));this._componentManager.register(MORE_FUNCTIONS_COMPONENT, MoreFunctions);}++ private _registerRenderControllers(): void {+ this.disposeWithMe(this._renderManagerService.registerRenderController(UniverInstanceType.UNIVER_SHEET, FormulaEditorShowController));+ }}diff --git a/packages/sheets-formula/src/controllers/update-formula.controller.ts b/packages/sheets-formula/src/controllers/update-formula.controller.tsindex de6648a32b..e978084cdc 100644--- a/packages/sheets-formula/src/controllers/update-formula.controller.ts+++ b/packages/sheets-formula/src/controllers/update-formula.controller.ts@@ -15,11 +15,13 @@*/import type {+ DocumentDataModel,ICommandInfo,IExecutionOptions,IRange,IUnitRange,Nullable,+ SlideDataModel,Workbook,} from '@univerjs/core';import {@@ -32,6 +34,7 @@ import {OnLifecycle,RANGE_TYPE,Rectangle,+ toDisposable,Tools,UniverInstanceType,} from '@univerjs/core';@@ -103,6 +106,7 @@ import {} from '@univerjs/sheets';import { Inject, Injector } from '@wendellhu/redi';+import { map, merge } from 'rxjs';import type { IRefRangeWithPosition } from './utils/offset-formula-data';import { removeFormulaData } from './utils/offset-formula-data';import { getFormulaReferenceMoveUndoRedo } from './utils/ref-range-formula';@@ -202,12 +206,34 @@ export class UpdateFormulaController extends Disposable {}this._handleSetRangeValuesMutation(params as ISetRangeValuesMutationParams);} else if (command.id === RemoveSheetMutation.id) {- this._handleRemoveSheetMutation(command.params as IRemoveSheetMutationParams);+ const { subUnitId: sheetId, unitId } = command.params as IRemoveSheetMutationParams;+ this._handleRemoveSheetMutation(unitId, sheetId);} else if (command.id === InsertSheetMutation.id) {this._handleInsertSheetMutation(command.params as IInsertSheetMutationParams);}}));++ // When a unit is added or removed, update the formula data+ this.disposeWithMe(+ toDisposable(+ merge(+ this._univerInstanceService.getTypeOfUnitAdded$<Workbook>(UniverInstanceType.UNIVER_SHEET),+ this._univerInstanceService.getTypeOfUnitAdded$<DocumentDataModel>(UniverInstanceType.UNIVER_DOC),+ this._univerInstanceService.getTypeOfUnitAdded$<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE)+ ).subscribe((unit) => this._handleUnitAdded(unit))+ )+ );++ this.disposeWithMe(+ toDisposable(+ merge(+ this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(map((sheet) => sheet.getUnitId())),+ this._univerInstanceService.getTypeOfUnitDisposed$<DocumentDataModel>(UniverInstanceType.UNIVER_DOC).pipe(map((doc) => doc.getUnitId())),+ this._univerInstanceService.getTypeOfUnitDisposed$<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE).pipe(map((slide) => slide.getUnitId()))+ ).subscribe((id) => this._handleRemoveSheetMutation(id))+ )+ );}private _handleSetRangeValuesMutation(params: ISetRangeValuesMutationParams) {@@ -250,9 +276,7 @@ export class UpdateFormulaController extends Disposable {);}- private _handleRemoveSheetMutation(params: IRemoveSheetMutationParams) {- const { subUnitId: sheetId, unitId } = params;-+ private _handleRemoveSheetMutation(unitId: string, sheetId?: string) {const formulaData = this._formulaDataModel.getFormulaData();const newFormulaData = removeFormulaData(formulaData, unitId, sheetId);@@ -307,6 +331,41 @@ export class UpdateFormulaController extends Disposable {);}+ private _handleUnitAdded(unit: Workbook | DocumentDataModel | SlideDataModel) {+ const formulaData = this._formulaDataModel.getFormulaData();+ const unitId = unit.getUnitId();+ const unitType = unit.type;+ const newFormulaData: IFormulaData = {+ [unitId]: {},+ };++ if (unitType === UniverInstanceType.UNIVER_SHEET) {+ const worksheets = unit.getSheets();+ worksheets.forEach((worksheet) => {+ const cellMatrix = worksheet.getCellMatrix();+ const sheetId = worksheet.getSheetId();++ const currentSheetData = initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);++ newFormulaData[unitId]![sheetId] = currentSheetData[unitId]?.[sheetId];+ });+ } else if (unitType === UniverInstanceType.UNIVER_DOC) {+ // TODO@Dushusir add doc formula data+ } else if (unitType === UniverInstanceType.UNIVER_SLIDE) {+ // TODO@Dushusir add slide formula data+ }++ this._commandService.executeCommand(+ SetFormulaDataMutation.id,+ {+ formulaData: newFormulaData,+ },+ {+ onlyLocal: true,+ }+ );+ }+private _getUpdateFormula(command: ICommandInfo) {const { id } = command;let result: Nullable<IFormulaReferenceMoveParam> = null;diff --git a/packages/sheets-formula/src/controllers/utils/__tests__/offset-formula-data.spec.ts b/packages/sheets-formula/src/controllers/utils/__tests__/offset-formula-data.spec.tsindex cea55150f5..497e6ae93a 100644--- a/packages/sheets-formula/src/controllers/utils/__tests__/offset-formula-data.spec.ts+++ b/packages/sheets-formula/src/controllers/utils/__tests__/offset-formula-data.spec.ts@@ -20,7 +20,7 @@ import { describe, expect, it } from 'vitest';import { removeFormulaData } from '../offset-formula-data';describe('Utils offset formula data test', () => {- describe('function removeFormulaData', () => {+ describe('function removeFormulaData, remove sheet', () => {it('remove data', () => {const unitId = 'workbook-01';const sheetId = 'sheet-0011';@@ -82,4 +82,54 @@ describe('Utils offset formula data test', () => {expect(formulaData).toStrictEqual({});});});++ describe('function removeUnitFormulaData, remove unit', () => {+ it('remove data', () => {+ const unitId = 'workbook-01';+ const sheetId = 'sheet-0011';+ const formulaData = {+ [unitId]: {+ [sheetId]: {+ 0: {+ 0: {+ f: '=SUM(A1)',+ },+ },+ },+ },+ 'unit-2': {+ },+ };++ removeFormulaData(formulaData, unitId);++ expect(formulaData).toStrictEqual({+ 'unit-2': {},+ });+ });++ it('remove blank workbook', () => {+ const unitId = 'workbook-01';+ const formulaData = {+ [unitId]: {},+ 'unit-2': {},+ };++ removeFormulaData(formulaData, unitId);++ expect(formulaData).toStrictEqual({+ 'unit-2': {},+ });+ });+++ it('remove blank object', () => {+ const unitId = 'workbook-01';+ const formulaData = {};++ removeFormulaData(formulaData, unitId);++ expect(formulaData).toStrictEqual({});+ });+ });});diff --git a/packages/sheets-formula/src/controllers/utils/offset-formula-data.ts b/packages/sheets-formula/src/controllers/utils/offset-formula-data.tsindex e5b5db3a06..66680a9e79 100644--- a/packages/sheets-formula/src/controllers/utils/offset-formula-data.ts+++ b/packages/sheets-formula/src/controllers/utils/offset-formula-data.ts@@ -31,13 +31,22 @@ export function checkFormulaDataNull(formulaData: IFormulaData, unitId: string,return false;}-export function removeFormulaData(formulaData: IFormulaData | IArrayFormulaRangeType | IArrayFormulaUnitCellType, unitId: string, sheetId: string) {- if (formulaData && formulaData[unitId] && formulaData[unitId]?.[sheetId]) {- delete formulaData[unitId]![sheetId];- return {- [unitId]: {- [sheetId]: null,- },- };+export function removeFormulaData(formulaData: IFormulaData | IArrayFormulaRangeType | IArrayFormulaUnitCellType, unitId: string, sheetId?: string) {+ if (sheetId) {+ if (formulaData && formulaData[unitId] && formulaData[unitId]?.[sheetId]) {+ delete formulaData[unitId]![sheetId];+ return {+ [unitId]: {+ [sheetId]: null,+ },+ };+ }+ } else {+ if (formulaData && formulaData[unitId]) {+ delete formulaData[unitId];+ return {+ [unitId]: null,+ };+ }}}diff --git a/packages/sheets-formula/src/formula-ui-plugin.ts b/packages/sheets-formula/src/formula-ui-plugin.tsindex e96bc23c0b..60e2c80906 100644--- a/packages/sheets-formula/src/formula-ui-plugin.ts+++ b/packages/sheets-formula/src/formula-ui-plugin.ts@@ -63,7 +63,11 @@ export class UniverSheetsFormulaPlugin extends Plugin {super();}- initialize(): void {+ override onStarting(): void {+ this._init();+ }++ _init(): void {this._localeService.load({zhCN,});@@ -100,8 +104,4 @@ export class UniverSheetsFormulaPlugin extends Plugin {dependencies.forEach((dependency) => this._injector.add(dependency));}-- override onStarting(): void {- this.initialize();- }}diff --git a/packages/sheets-formula/src/views/more-functions/MoreFunctions.tsx b/packages/sheets-formula/src/views/more-functions/MoreFunctions.tsxindex 31334dbe1b..6ea8175a2d 100644--- a/packages/sheets-formula/src/views/more-functions/MoreFunctions.tsx+++ b/packages/sheets-formula/src/views/more-functions/MoreFunctions.tsx@@ -17,22 +17,22 @@import { LocaleService } from '@univerjs/core';import { Button } from '@univerjs/design';import type { IFunctionInfo } from '@univerjs/engine-formula';-import { IEditorService, ISidebarService } from '@univerjs/ui';+import { IEditorService } from '@univerjs/ui';import { useDependency } from '@wendellhu/redi/react-bindings';import React, { useState } from 'react';-+import { useActiveWorkbook } from '@univerjs/sheets-ui';import styles from './index.module.less';import { InputParams } from './input-params/InputParams';import { SelectFunction } from './select-function/SelectFunction';export function MoreFunctions() {+ const workbook = useActiveWorkbook();const [selectFunction, setSelectFunction] = useState<boolean>(true);const [inputParams, setInputParams] = useState<boolean>(false);const [params, setParams] = useState<string[]>([]);const [functionInfo, setFunctionInfo] = useState<IFunctionInfo | null>(null);const localeService = useDependency(LocaleService);- const sidebarService = useDependency(ISidebarService);const editorService = useDependency(IEditorService);function handleClickNextPrev() {@@ -65,7 +65,7 @@ export function MoreFunctions() {{localeService.t('formula.moreFunctions.prev')}</Button>)}- {selectFunction && (+ {selectFunction && !!workbook && (<Button type="primary" size="small" onClick={handleConfirm}>{localeService.t('formula.moreFunctions.confirm')}</Button>diff --git a/packages/sheets-numfmt/src/components/stories/Panel.stories.tsx b/packages/sheets-numfmt/src/components/stories/Panel.stories.tsxindex 26fa12408a..6863e7fa24 100644--- a/packages/sheets-numfmt/src/components/stories/Panel.stories.tsx+++ b/packages/sheets-numfmt/src/components/stories/Panel.stories.tsx@@ -58,7 +58,9 @@ export const Test: StoryObj<ISheetNumfmtPanelProps> = {<RediContext.Provider value={{ injector: inject }}><SheetNumfmtPanelvalue={{ defaultPattern: '', defaultValue: 123123, row: 2, col: 3 }}- onChange={(_pattern) => {}}+ onChange={(_pattern) => {+ // empty+ }}/></RediContext.Provider>);diff --git a/packages/sheets-numfmt/src/controllers/numfmt.controller.ts b/packages/sheets-numfmt/src/controllers/numfmt.controller.tsindex 1584d5ec38..2897ed9c39 100644--- a/packages/sheets-numfmt/src/controllers/numfmt.controller.ts+++ b/packages/sheets-numfmt/src/controllers/numfmt.controller.ts@@ -41,6 +41,7 @@ import {} from '@univerjs/sheets';import { SheetSkeletonManagerService } from '@univerjs/sheets-ui';import { ComponentManager, ISidebarService } from '@univerjs/ui';+import type { IDisposable } from '@wendellhu/redi';import { Inject } from '@wendellhu/redi';import { combineLatest, merge, Observable } from 'rxjs';import { debounceTime, map, switchMap, tap } from 'rxjs/operators';@@ -71,24 +72,26 @@ export class NumfmtController extends Disposable implements INumfmtController {constructor(@Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,@Inject(ThemeService) private _themeService: ThemeService,- @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,+ @IUniverInstanceService private _univerInstanceService: IUniverInstanceService,@Inject(SheetSkeletonManagerService) private _sheetSkeletonManagerService: SheetSkeletonManagerService,- @Inject(ICommandService) private _commandService: ICommandService,+ @ICommandService private _commandService: ICommandService,@Inject(SelectionManagerService) private _selectionManagerService: SelectionManagerService,- @Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,- @Inject(INumfmtService) private _numfmtService: INumfmtService,+ @IRenderManagerService private _renderManagerService: IRenderManagerService,+ @INumfmtService private _numfmtService: INumfmtService,@Inject(ComponentManager) private _componentManager: ComponentManager,- @Inject(ISidebarService) private _sidebarService: ISidebarService,+ @ISidebarService private _sidebarService: ISidebarService,@Inject(LocaleService) private _localeService: LocaleService) {super();+this._initRealTimeRenderingInterceptor();this._initPanel();this._initCommands();+ this._initCloseListener();this._commandExecutedListener();}- openPanel = () => {+ openPanel(): boolean {const sidebarService = this._sidebarService;const selectionManagerService = this._selectionManagerService;const commandService = this._commandService;@@ -102,6 +105,7 @@ export class NumfmtController extends Disposable implements INumfmtController {if (!range) {return false;}+const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;const sheet = workbook.getActiveSheet();@@ -148,7 +152,7 @@ export class NumfmtController extends Disposable implements INumfmtController {value: { defaultPattern: pattern, defaultValue, row: range.startRow, col: range.startColumn },};- sidebarService.open({+ this._sidebarDisposable = sidebarService.open({header: { title: localeService.t('sheet.numfmt.title') },children: {label: SHEET_NUMFMT_PLUGIN,@@ -160,6 +164,8 @@ export class NumfmtController extends Disposable implements INumfmtController {commandService.executeCommand(CloseNumfmtPanelOperator.id);},});++ return true;};private _initCommands() {@@ -181,13 +187,13 @@ export class NumfmtController extends Disposable implements INumfmtController {}private _initRealTimeRenderingInterceptor() {- const isPanelOpenObserver = new Observable<boolean>((subscribe) => {+ const isPanelOpenObserver = new Observable<boolean>((subscriber) => {this._commandService.onCommandExecuted((commandInfo) => {if (commandInfo.id === OpenNumfmtPanelOperator.id) {- subscribe.next(true);+ subscriber.next(true);}if (commandInfo.id === CloseNumfmtPanelOperator.id) {- subscribe.next(false);+ subscriber.next(false);}});});@@ -306,4 +312,14 @@ export class NumfmtController extends Disposable implements INumfmtController {));}++ private _sidebarDisposable: IDisposable | null = null;+ private _initCloseListener(): void {+ this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).subscribe((unit) => {+ if (!unit) {+ this._sidebarDisposable?.dispose();+ this._sidebarDisposable = null;+ }+ });+ }}diff --git a/packages/sheets-numfmt/src/controllers/user-habit.controller.ts b/packages/sheets-numfmt/src/controllers/user-habit.controller.tsindex 920b3aa55c..e9caf20f22 100644--- a/packages/sheets-numfmt/src/controllers/user-habit.controller.ts+++ b/packages/sheets-numfmt/src/controllers/user-habit.controller.ts@@ -26,7 +26,10 @@ interface IUserHabitController {}export class UserHabitController implements IUserHabitController {- constructor(@Inject(ILocalStorageService) private _localStorageService: ILocalStorageService) {}+ constructor(@Inject(ILocalStorageService) private _localStorageService: ILocalStorageService) {+ // super+ }+private _getKey(habit: string) {return `userHabitController_${habit}`;}diff --git a/packages/sheets-ui/src/commands/commands/__tests__/auto-fill.controller.spec.ts b/packages/sheets-ui/src/commands/commands/__tests__/auto-fill.controller.spec.tsindex 3883ddfa55..5d5fcaf4f8 100644--- a/packages/sheets-ui/src/commands/commands/__tests__/auto-fill.controller.spec.ts+++ b/packages/sheets-ui/src/commands/commands/__tests__/auto-fill.controller.spec.ts@@ -45,6 +45,7 @@ import { EditorBridgeService, IEditorBridgeService } from '../../../services/ediimport { ISelectionRenderService, SelectionRenderService } from '../../../services/selection/selection-render.service';import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-manager.service';import { RefillCommand } from '../refill.command';+import { AutoClearContentCommand, AutoFillCommand } from '../auto-fill.command';import { createCommandTestBed } from './create-command-test-bed';const theme = {@@ -303,6 +304,8 @@ describe('Test auto fill rules in controller', () => {commandService.registerCommand(RemoveWorksheetMergeMutation);commandService.registerCommand(AddWorksheetMergeMutation);commandService.registerCommand(RefillCommand);+ commandService.registerCommand(AutoClearContentCommand);+ commandService.registerCommand(AutoFillCommand);getValues = (startRow: number,diff --git a/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.ts b/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.tsindex a3543dbda7..787bc670f6 100644--- a/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.ts+++ b/packages/sheets-ui/src/commands/commands/__tests__/set-format-painter.command.spec.ts@@ -184,11 +184,11 @@ class MarkSelectionService extends Disposable implements IMarkSelectionService {return null;}- refreshShapes() {}+ refreshShapes() { /* TODO document why this method 'refreshShapes' is empty */ }- removeShape(id: string): void {}+ removeShape(id: string): void { /* TODO document why this method 'removeShape' is empty */ }- removeAllShapes(): void {}+ removeAllShapes(): void { /* TODO document why this method 'removeAllShapes' is empty */ }getShapeMap(): Map<string, any> {return new Map();diff --git a/packages/sheets-ui/src/commands/commands/auto-fill.command.ts b/packages/sheets-ui/src/commands/commands/auto-fill.command.tsindex ef954db21e..be23a34c16 100644--- a/packages/sheets-ui/src/commands/commands/auto-fill.command.ts+++ b/packages/sheets-ui/src/commands/commands/auto-fill.command.ts@@ -21,15 +21,20 @@ import { getSheetCommandTarget, SetRangeValuesMutation, SetRangeValuesUndoMutatiimport type { IAccessor } from '@wendellhu/redi';import { generateNullCellValue } from '../../services/auto-fill/tools';+import { IAutoFillService } from '../../services/auto-fill/auto-fill.service';-export interface IAutoFillCommandParams { }+export interface IAutoFillCommandParams {+ unitId: string;+ subUnitId: string;+}export const AutoFillCommand: ICommand = {type: CommandType.COMMAND,id: 'sheet.command.auto-fill',handler: async (accessor: IAccessor, params: IAutoFillCommandParams) => {- return true;+ const autoFillService = accessor.get(IAutoFillService);+ return autoFillService.fillData(params.unitId, params.subUnitId); ;},};diff --git a/packages/sheets-ui/src/commands/commands/set-scroll.command.ts b/packages/sheets-ui/src/commands/commands/set-scroll.command.tsindex d357a7c497..687ca9effa 100644--- a/packages/sheets-ui/src/commands/commands/set-scroll.command.ts+++ b/packages/sheets-ui/src/commands/commands/set-scroll.command.ts@@ -15,12 +15,13 @@*/import type { ICommand, IRange } from '@univerjs/core';-import { CommandType, ICommandService, IUniverInstanceService } from '@univerjs/core';+import { CommandType, ICommandService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { getSheetCommandTarget } from '@univerjs/sheets';+import { IRenderManagerService } from '@univerjs/engine-render';import { ScrollManagerService } from '../../services/scroll-manager.service';import { SetScrollOperation } from '../operations/scroll.operation';-import { ScrollController } from '../../controllers/scroll.controller';+import { SheetsScrollRenderController } from '../../controllers/render-controllers/scroll.render-controller';export interface ISetScrollRelativeCommandParams {offsetX?: number;@@ -127,7 +128,11 @@ export const ScrollToCellCommand: ICommand<IScrollToCellCommandParams> = {id: 'sheet.command.scroll-to-cell',type: CommandType.COMMAND,handler: (accessor, params) => {- const scrollController = accessor.get(ScrollController);+ const instanceService = accessor.get(IUniverInstanceService);+ const renderManagerService = accessor.get(IRenderManagerService);+ const scrollController = renderManagerService+ .getRenderById(instanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)!.getUnitId())!+ .with(SheetsScrollRenderController);return scrollController.scrollToRange(params!.range);},};diff --git a/packages/sheets-ui/src/commands/operations/set-zoom-ratio.operation.ts b/packages/sheets-ui/src/commands/operations/set-zoom-ratio.operation.tsindex 0b1901aa0d..acc4ba0ace 100644--- a/packages/sheets-ui/src/commands/operations/set-zoom-ratio.operation.ts+++ b/packages/sheets-ui/src/commands/operations/set-zoom-ratio.operation.ts@@ -16,7 +16,9 @@import type { IOperation } from '@univerjs/core';import { CommandType, IUniverInstanceService, Tools } from '@univerjs/core';+import { IRenderManagerService } from '@univerjs/engine-render';import type { IAccessor } from '@wendellhu/redi';+import { SheetsZoomRenderController } from '../../controllers/render-controllers/zoom.render-controller';export interface ISetZoomRatioOperationParams {zoomRatio: number;@@ -41,15 +43,10 @@ export const SetZoomRatioOperation: IOperation<ISetZoomRatioOperationParams> = {id: 'sheet.operation.set-zoom-ratio',type: CommandType.OPERATION,handler: (accessor, params: ISetZoomRatioOperationParams) => {- const workbook = accessor.get(IUniverInstanceService).getUniverSheetInstance(params.unitId);+ const renderManagerService = accessor.get(IRenderManagerService);+ const renderUnit = renderManagerService.getRenderById(params.unitId);- const worksheet = workbook?.getSheetBySheetId(params.subUnitId);- if (worksheet == null) {- return false;- }-- worksheet.getConfig().zoomRatio = params.zoomRatio;-- return true;+ if (!renderUnit) return false;+ return renderUnit.with(SheetsZoomRenderController).updateZoom(params.subUnitId, params.zoomRatio);},};diff --git a/packages/ui/src/views/hooks/active.ts b/packages/sheets-ui/src/components/hook.tssimilarity index 50%rename from packages/ui/src/views/hooks/active.tsrename to packages/sheets-ui/src/components/hook.tsindex 766c2b8304..34f88a6e97 100644--- a/packages/ui/src/views/hooks/active.ts+++ b/packages/sheets-ui/src/components/hook.ts@@ -14,26 +14,18 @@* limitations under the License.*/-import type { Nullable, Workbook, Worksheet } from '@univerjs/core';-import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';+import { IUniverInstanceService, UniverInstanceType, type Workbook } from '@univerjs/core';+import { useObservable } from '@univerjs/ui';import { useDependency } from '@wendellhu/redi/react-bindings';+import { of } from 'rxjs';-import { useObservable } from '../../components/hooks/observable';--/**- * A react hooks to get the active workbook.- */-export function useActiveWorkbook(): Nullable<Workbook> {+export function useActiveWorkbook(): Workbook | null {const univerInstanceService = useDependency(IUniverInstanceService);- const activeWorkbook = useObservable(univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET));- return activeWorkbook;+ const workbook = useObservable(() => univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET), undefined, undefined, []);+ return workbook ?? null;}-/**- * A react hooks to get the active worksheet.- */-export function useActiveWorksheet(): Nullable<Worksheet> {- const activeWorkbook = useActiveWorkbook();- const activeWorksheet = useObservable(activeWorkbook?.activeSheet$, null);- return activeWorksheet;+export function useActiveWorksheet(workbook?: Workbook | null) {+ const worksheet = useObservable(() => workbook?.activeSheet$ ?? of(null), undefined, undefined, [workbook]);+ return worksheet;}diff --git a/packages/sheets-ui/src/controllers/auto-fill.controller.ts b/packages/sheets-ui/src/controllers/auto-fill.controller.tsindex 2370f4b03d..ffbd21f636 100644--- a/packages/sheets-ui/src/controllers/auto-fill.controller.ts+++ b/packages/sheets-ui/src/controllers/auto-fill.controller.ts@@ -14,18 +14,16 @@* limitations under the License.*/-import type { ICellData, ICommandInfo, IMutationInfo, IRange, Nullable, Workbook } from '@univerjs/core';+import type { ICellData, ICommandInfo, IExecutionOptions, IMutationCommonParams, IMutationInfo, IRange, Nullable, UnitModel, Workbook } from '@univerjs/core';import {Direction,Disposable,DisposableCollection,ICommandService,- IUndoRedoService,IUniverInstanceService,LifecycleStages,ObjectMatrix,OnLifecycle,- RANGE_TYPE,Rectangle,toDisposable,Tools,@@ -34,6 +32,7 @@ import {import { DeviceInputEventType, getCellInfoInMergeData } from '@univerjs/engine-render';import type {IAddWorksheetMergeMutationParams,+ IRemoveSheetMutationParams,IRemoveWorksheetMergeMutationParams,ISetRangeValuesMutationParams,} from '@univerjs/sheets';@@ -42,13 +41,24 @@ import {AddWorksheetMergeMutation,ClearSelectionContentCommand,getAddMergeMutationRangeByType,+ InsertColMutation,+ InsertRowMutation,+ MoveColsMutation,+ MoveRangeMutation,+ MoveRowsMutation,NORMAL_SELECTION_PLUGIN_NAME,+ RemoveColMutation,RemoveMergeUndoMutationFactory,+ RemoveRowMutation,+ RemoveSheetMutation,RemoveWorksheetMergeMutation,SelectionManagerService,SetRangeValuesMutation,SetRangeValuesUndoMutationFactory,SetSelectionsOperation,+ SetWorksheetActiveOperation,+ SetWorksheetColWidthMutation,+ SetWorksheetRowHeightMutation,SheetInterceptorService,} from '@univerjs/sheets';import { Inject, Injector } from '@wendellhu/redi';@@ -68,12 +78,15 @@ import type {import { APPLY_TYPE, AutoFillHookType, DATA_TYPE } from '../services/auto-fill/type';import { IEditorBridgeService } from '../services/editor-bridge.service';import { ISelectionRenderService } from '../services/selection/selection-render.service';+import { SetCellEditVisibleOperation } from '../commands/operations/cell-edit.operation';+import { SetZoomRatioOperation } from '../commands/operations/set-zoom-ratio.operation';import type { IDiscreteRange } from './utils/range-tools';import { discreteRangeToRange, generateNullCellValue, rangeToDiscreteRange } from './utils/range-tools';@OnLifecycle(LifecycleStages.Steady, AutoFillController)export class AutoFillController extends Disposable {private _beforeApplyData: Array<Array<Nullable<ICellData>>> = [];+ private _currentLocation: Nullable<IAutoFillLocation> = null;private _copyData: ICopyDataPiece[] = [];private _defaultHook: ISheetAutoFillHook;@@ -81,7 +94,6 @@ export class AutoFillController extends Disposable {@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@ISelectionRenderService private readonly _selectionRenderService: ISelectionRenderService,@ICommandService private readonly _commandService: ICommandService,- @IUndoRedoService private readonly _undoRedoService: IUndoRedoService,@IAutoFillService private readonly _autoFillService: IAutoFillService,@IEditorBridgeService private readonly _editorBridgeService: IEditorBridgeService,@Inject(SheetInterceptorService) private readonly _sheetInterceptorService: SheetInterceptorService,@@ -107,15 +119,57 @@ export class AutoFillController extends Disposable {this._initDefaultHook();this._onSelectionControlFillChanged();this._onApplyTypeChanged();- [AutoFillCommand, AutoClearContentCommand].forEach((command) => {- this.disposeWithMe(this._commandService.registerCommand(command));- });+ this._initQuitListener();}private _initDefaultHook() {- this._autoFillService.addHook(this._defaultHook);+ this.disposeWithMe(this._autoFillService.addHook(this._defaultHook));+ }++ private _initQuitListener() {+ const quitCommands = [+ SetCellEditVisibleOperation.id,+ AutoClearContentCommand.id,+ SetZoomRatioOperation.id,+ SetWorksheetActiveOperation.id,+ SetRangeValuesMutation.id,+ MoveRangeMutation.id,+ RemoveRowMutation.id,+ RemoveColMutation.id,+ InsertRowMutation.id,+ InsertColMutation.id,+ MoveRowsMutation.id,+ MoveColsMutation.id,+ SetWorksheetColWidthMutation.id,+ SetWorksheetRowHeightMutation.id,+ ];+ this.disposeWithMe(this._commandService.onCommandExecuted((command: ICommandInfo, options?: IExecutionOptions) => {+ const fromCollab = options?.fromCollab;+ if (quitCommands.includes(command.id) && !fromCollab && (command.params as IMutationCommonParams).trigger !== AutoFillCommand.id) {+ this._quit();+ }+ if (command.id === RemoveSheetMutation.id) {+ if ((command.params as IRemoveSheetMutationParams).unitId === this._currentLocation?.unitId &&+ (command.params as IRemoveSheetMutationParams).subUnitId === this._currentLocation?.subUnitId) {+ this._quit();+ }+ }+ }));+ this.disposeWithMe(this._univerInstanceService.unitDisposed$.subscribe((unit: UnitModel) => {+ if (unit.getUnitId() === this._currentLocation?.unitId) {+ this._quit();+ }+ }));}+ private _quit() {+ this._currentLocation = null;+ this._beforeApplyData = [];+ this._copyData = [];+ this._autoFillService.setShowMenu(false);+ }++private _onSelectionControlFillChanged() {const disposableCollection = new DisposableCollection();const addListener = (disposableCollection: DisposableCollection) => {@@ -367,62 +421,10 @@ export class AutoFillController extends Disposable {}private _handleFillData() {- const {- source,- target,- unitId = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId(),- subUnitId = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getActiveSheet().getSheetId(),- } = this._autoFillService.autoFillLocation || {};- const direction = this._autoFillService.direction;- if (!source || !target) {+ if (!this._currentLocation) {return;}-- const selection = Rectangle.union(discreteRangeToRange(source), discreteRangeToRange(target));- const applyType = this._autoFillService.applyType;- const activeHooks = this._autoFillService.getActiveHooks();-- this._commandService.syncExecuteCommand(SetSelectionsOperation.id, {- selections: [- {- primary: { ...(this._selectionManagerService.getLast()?.primary ?? selection) },- range: {- ...selection,- rangeType: RANGE_TYPE.NORMAL,- },- },- ],- unitId,- subUnitId,- });-- const undos: IMutationInfo[] = [];- const redos: IMutationInfo[] = [];- activeHooks.forEach((hook) => {- const { undos: hookUndos, redos: hookRedos } =- hook.onFillData?.({ source, target, unitId, subUnitId }, direction, applyType) || {};- if (hookUndos) {- undos.push(...hookUndos);- }- if (hookRedos) {- redos.push(...hookRedos);- }- });-- const result = redos.every((m) => this._commandService.syncExecuteCommand(m.id, m.params));- if (result) {- // add to undo redo services- this._undoRedoService.pushUndoRedo({- unitID: unitId,- undoMutations: undos,- redoMutations: redos,- });- }- // this._commandService.executeCommand(AutoFillCommand.id);- activeHooks.forEach((hook) => {- hook.onAfterFillData?.({ source, target, unitId, subUnitId }, direction, applyType);- });- this._autoFillService.setShowMenu(true);+ this._commandService.executeCommand(AutoFillCommand.id, { unitId: this._currentLocation?.unitId, subUnitId: this._currentLocation?.subUnitId });}// calc apply data according to copy data and direction@@ -697,6 +699,7 @@ export class AutoFillController extends Disposable {});this._beforeApplyData = applyData;this._copyData = this._getCopyData(source, direction);+ this._currentLocation = location;if (this._hasSeries(this._copyData)) {this._autoFillService.setDisableApplyType(APPLY_TYPE.SERIES, false);} else {diff --git a/packages/sheets-ui/src/controllers/cell-alert.controller.ts b/packages/sheets-ui/src/controllers/cell-alert.controller.tsindex 4f3faef517..af3cc1dbe5 100644--- a/packages/sheets-ui/src/controllers/cell-alert.controller.ts+++ b/packages/sheets-ui/src/controllers/cell-alert.controller.ts@@ -14,15 +14,18 @@* limitations under the License.*/+import type { Workbook } from '@univerjs/core';import { Disposable, LifecycleStages, OnLifecycle } from '@univerjs/core';import { ComponentManager } from '@univerjs/ui';import { Inject } from '@wendellhu/redi';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';import { CellAlert } from '../views/cell-alert/CellAlertPopup';import { CELL_ALERT_KEY } from '../views/cell-alert';-@OnLifecycle(LifecycleStages.Starting, CellAlertController)-export class CellAlertController extends Disposable {+@OnLifecycle(LifecycleStages.Starting, CellAlertRenderController)+export class CellAlertRenderController extends Disposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(ComponentManager) private _componentManager: ComponentManager) {super();diff --git a/packages/sheets-ui/src/controllers/cell-custom-render.controller.ts b/packages/sheets-ui/src/controllers/cell-custom-render.controller.tsindex ad1a94b5b7..5aedc89d53 100644--- a/packages/sheets-ui/src/controllers/cell-custom-render.controller.ts+++ b/packages/sheets-ui/src/controllers/cell-custom-render.controller.ts@@ -14,156 +14,157 @@* limitations under the License.*/-import type { ICellCustomRender, ICellRenderContext, Nullable, Workbook } from '@univerjs/core';-import { Disposable, DisposableCollection, IUniverInstanceService, LifecycleStages, OnLifecycle, sortRules, UniverInstanceType } from '@univerjs/core';-import type { IMouseEvent, IPointerEvent, Spreadsheet } from '@univerjs/engine-render';+import type { ICellCustomRender, ICellRenderContext, Nullable, UniverInstanceService, Workbook } from '@univerjs/core';+import { Disposable, DisposableCollection, IUniverInstanceService, LifecycleStages, OnLifecycle, sortRules } from '@univerjs/core';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController, RenderManagerService, Spreadsheet } from '@univerjs/engine-render';import { IRenderManagerService, Vector2 } from '@univerjs/engine-render';import { Inject } from '@wendellhu/redi';import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';+/*** @todo RenderUnit*/@OnLifecycle(LifecycleStages.Rendered, CellCustomRenderController)-export class CellCustomRenderController extends Disposable {+export class CellCustomRenderController extends Disposable implements IRenderController {private _enterActiveRender: Nullable<{render: ICellCustomRender;cellContext: ICellRenderContext;}>;constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService+ @IRenderManagerService private readonly _renderManagerService: RenderManagerService,+ @IUniverInstanceService private readonly _univerInstanceService: UniverInstanceService) {super();-this._initEventBinding();}+// eslint-disable-next-line max-lines-per-functionprivate _initEventBinding() {const disposableCollection = new DisposableCollection();- // eslint-disable-next-line max-lines-per-function- this._univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {- disposableCollection.dispose();- if (workbook) {- const unitId = workbook.getUnitId();-- const currentRender = this._renderManagerService.getRenderById(workbook.getUnitId());- if (currentRender && currentRender.mainComponent) {- const spreadsheet = currentRender.mainComponent as Spreadsheet;- const getActiveRender = (evt: IPointerEvent | IMouseEvent) => {- const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton!;- const { offsetX, offsetY } = evt;- const scene = currentRender.scene;- const worksheet = workbook.getActiveSheet();- const activeViewport = scene.getActiveViewportByCoord(- Vector2.FromArray([offsetX, offsetY])- );-- if (!activeViewport) {- return;- }-- const { scaleX, scaleY } = scene.getAncestorScale();- const scrollXY = {- x: activeViewport.actualScrollX,- y: activeViewport.actualScrollY,- };-- const cellPos = skeleton.getCellPositionByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY);-- const mergeCell = skeleton.mergeData.find((range) => {- const { startColumn, startRow, endColumn, endRow } = range;- return cellPos.row >= startRow && cellPos.column >= startColumn && cellPos.row <= endRow && cellPos.column <= endColumn;- });-- const cellIndex = {- actualRow: mergeCell ? mergeCell.startRow : cellPos.row,- actualCol: mergeCell ? mergeCell.startColumn : cellPos.column,- mergeCell,- row: cellPos.row,- col: cellPos.column,- };+ const workbook = this._context.unit;+ disposableCollection.dispose();+ if (workbook) {+ const unitId = workbook.getUnitId();++ const currentRender = this._renderManagerService.getRenderById(workbook.getUnitId());+ if (currentRender && currentRender.mainComponent) {+ const spreadsheet = currentRender.mainComponent as Spreadsheet;+ const getActiveRender = (evt: IPointerEvent | IMouseEvent) => {+ const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton!;+ const { offsetX, offsetY } = evt;+ const scene = currentRender.scene;+ const worksheet = workbook.getActiveSheet();+ const activeViewport = scene.getActiveViewportByCoord(+ Vector2.FromArray([offsetX, offsetY])+ );++ if (!activeViewport) {+ return;+ }++ const { scaleX, scaleY } = scene.getAncestorScale();++ const scrollXY = {+ x: activeViewport.actualScrollX,+ y: activeViewport.actualScrollY,+ };- if (!cellIndex || !skeleton) {- return;- }+ const cellPos = skeleton.getCellPositionByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY);- const cellData = worksheet.getCell(cellIndex.actualRow, cellIndex.actualCol);- if (!cellData) {- return;- }+ const mergeCell = skeleton.mergeData.find((range) => {+ const { startColumn, startRow, endColumn, endRow } = range;+ return cellPos.row >= startRow && cellPos.column >= startColumn && cellPos.row <= endRow && cellPos.column <= endColumn;+ });- const renders = cellData.customRender;+ const cellIndex = {+ actualRow: mergeCell ? mergeCell.startRow : cellPos.row,+ actualCol: mergeCell ? mergeCell.startColumn : cellPos.column,+ mergeCell,+ row: cellPos.row,+ col: cellPos.column,+ };- if (!renders?.length) {- return;- }- const row = cellIndex.actualRow;- const col = cellIndex.actualCol;- const sortedRenders = renders.sort(sortRules);- const subUnitId = workbook.getActiveSheet().getSheetId();- const info: ICellRenderContext = {- data: cellData,- style: skeleton.getsStyles().getStyleByCell(cellData),- primaryWithCoord: skeleton.getCellByIndex(cellIndex.actualRow, cellIndex.actualCol),- unitId,- subUnitId,- row,- col,- };-- const position = {- x: scrollXY.x + (offsetX / scaleX),- y: scrollXY.y + (offsetY / scaleY),- };-- const activeRender = sortedRenders.find((render) => render.isHit?.(position, info));- if (!activeRender) {- return;- }- return [activeRender, info] as const;+ if (!cellIndex || !skeleton) {+ return;+ }++ const cellData = worksheet.getCell(cellIndex.actualRow, cellIndex.actualCol);+ if (!cellData) {+ return;+ }++ const renders = cellData.customRender;++ if (!renders?.length) {+ return;+ }+ const row = cellIndex.actualRow;+ const col = cellIndex.actualCol;+ const sortedRenders = renders.sort(sortRules);+ const subUnitId = workbook.getActiveSheet().getSheetId();+ const info: ICellRenderContext = {+ data: cellData,+ style: skeleton.getsStyles().getStyleByCell(cellData),+ primaryWithCoord: skeleton.getCellByIndex(cellIndex.actualRow, cellIndex.actualCol),+ unitId,+ subUnitId,+ row,+ col,};- const disposable = spreadsheet.onPointerDownObserver.add((evt) => {- const activeRenderInfo = getActiveRender(evt);- if (activeRenderInfo) {- const [activeRender, cellContext] = activeRenderInfo;- activeRender.onPointerDown?.(cellContext, evt);- }- });+ const position = {+ x: scrollXY.x + (offsetX / scaleX),+ y: scrollXY.y + (offsetY / scaleY),+ };- const moveDisposable = spreadsheet.onPointerMoveObserver.add((evt) => {- const activeRenderInfo = getActiveRender(evt);- if (activeRenderInfo) {- const [activeRender, cellContext] = activeRenderInfo;- if (this._enterActiveRender) {- if (this._enterActiveRender.render !== activeRender) {- this._enterActiveRender.render.onPointerLeave?.(this._enterActiveRender.cellContext, evt);- this._enterActiveRender = {- render: activeRender,- cellContext,- };- activeRender.onPointerEnter?.(cellContext, evt);- }- } else {+ const activeRender = sortedRenders.find((render) => render.isHit?.(position, info));+ if (!activeRender) {+ return;+ }+ return [activeRender, info] as const;+ };++ const disposable = spreadsheet.onPointerDownObserver.add((evt) => {+ const activeRenderInfo = getActiveRender(evt);+ if (activeRenderInfo) {+ const [activeRender, cellContext] = activeRenderInfo;+ activeRender.onPointerDown?.(cellContext, evt);+ }+ });++ const moveDisposable = spreadsheet.onPointerMoveObserver.add((evt) => {+ const activeRenderInfo = getActiveRender(evt);+ if (activeRenderInfo) {+ const [activeRender, cellContext] = activeRenderInfo;+ if (this._enterActiveRender) {+ if (this._enterActiveRender.render !== activeRender) {+ this._enterActiveRender.render.onPointerLeave?.(this._enterActiveRender.cellContext, evt);this._enterActiveRender = {render: activeRender,cellContext,};activeRender.onPointerEnter?.(cellContext, evt);}+ } else {+ this._enterActiveRender = {+ render: activeRender,+ cellContext,+ };+ activeRender.onPointerEnter?.(cellContext, evt);}- });+ }+ });- disposable && disposableCollection.add(disposable);- moveDisposable && disposableCollection.add(moveDisposable);- }+ disposable && disposableCollection.add(disposable);+ moveDisposable && disposableCollection.add(moveDisposable);}- });+ }this.disposeWithMe(disposableCollection);}diff --git a/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts b/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.tsindex 0113d4f0da..08530eb841 100644--- a/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts+++ b/packages/sheets-ui/src/controllers/clipboard/clipboard.controller.ts@@ -63,7 +63,7 @@ import {SetWorksheetColWidthMutation,SetWorksheetRowHeightMutation,} from '@univerjs/sheets';-import { IClipboardInterfaceService, IMessageService, textTrim } from '@univerjs/ui';+import { IMessageService, textTrim } from '@univerjs/ui';import { Inject, Injector, Optional } from '@wendellhu/redi';import { ITextSelectionRenderManager, ptToPx } from '@univerjs/engine-render';@@ -109,7 +109,6 @@ export class SheetClipboardController extends RxDisposable {@IContextService private readonly _contextService: IContextService,@IConfigService private readonly _configService: IConfigService,@ISheetClipboardService private readonly _sheetClipboardService: ISheetClipboardService,- @IClipboardInterfaceService private readonly _clipboardInterfaceService: IClipboardInterfaceService,@IMessageService private readonly _messageService: IMessageService,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,@Inject(LocaleService) private readonly _localService: LocaleService,@@ -526,6 +525,7 @@ export class SheetClipboardController extends RxDisposable {if (currentSkeleton == null) {return null;}+const { skeleton } = currentSkeleton;const documentModel = skeleton.getBlankCellDocumentModel()?.documentModel;const p = documentModel?.getSnapshot();diff --git a/packages/sheets-ui/src/controllers/editor/editing.controller.ts b/packages/sheets-ui/src/controllers/editor/editing.controller.tsindex d431474cb3..476ff568c0 100644--- a/packages/sheets-ui/src/controllers/editor/editing.controller.ts+++ b/packages/sheets-ui/src/controllers/editor/editing.controller.ts@@ -14,8 +14,7 @@* limitations under the License.*/-import type {- Workbook } from '@univerjs/core';+import type { Workbook } from '@univerjs/core';import {DOCS_NORMAL_EDITOR_UNIT_ID_KEY,IUndoRedoService,@@ -26,9 +25,7 @@ import {RxDisposable,UniverInstanceType,} from '@univerjs/core';-import { getDocObject } from '@univerjs/docs';import type { ISheetData } from '@univerjs/engine-formula';-import { IRenderManagerService } from '@univerjs/engine-render';import { Inject } from '@wendellhu/redi';import { takeUntil } from 'rxjs';@@ -36,14 +33,11 @@ import { takeUntil } from 'rxjs';export class EditingController extends RxDisposable {constructor(@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@Inject(IUndoRedoService) private readonly _undoRedoService: IUndoRedoService) {super();this._initialize();-- this._commandExecutedListener();}private _initialize() {@@ -96,54 +90,5 @@ export class EditingController extends RxDisposable {columnData: sheetConfig.columnData,};});-- const formulaData = {- 'workbook-01': {- 'sheet-0011': {- 9: {- 8: {- f: '=sum(A1:C3)',- },- },- 20: {- 8: {- f: '=1+(3*4=4)*5+1',- },- },- 22: {- 8: {- f: '=1--1',- },- },- 23: {- 8: {- f: '=1--1%',- },- },- },- },- };-- // this._formulaEngineService- // .execute('workbook-01', {- // unitData: {- // 'workbook-01': sheetData,- // },- // formulaData,- // sheetNameMap: {},- // forceCalculate: true,- // dirtyRanges: [],- // })- // .then((res) => {- // console.log(res.sheetData, res.arrayFormulaRange);- // });-- // console.log('calculate', this._formulaEngineService.calculate(`= -@A4:B5`, false));- }-- private _commandExecutedListener() {}-- private _getDocObject() {- return getDocObject(this._univerInstanceService, this._renderManagerService);}}diff --git a/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts b/packages/sheets-ui/src/controllers/editor/formula-editor.controller.tsindex 41c815f347..9652679017 100644--- a/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts+++ b/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts@@ -218,34 +218,31 @@ export class FormulaEditorController extends RxDisposable {// Listen to changes in the size of the formula editor container to set the size of the editor.private _syncEditorSize() {this._formulaEditorManagerService.position$.pipe(takeUntil(this.dispose$)).subscribe((position) => {- if (position == null) {- return;- }+ if (!position) return this._clearScheduledCallback();+const editorObject = getEditorObject(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, this._renderManagerService);const formulaEditorDataModel = this._univerInstanceService.getUniverDocInstance(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);- if (editorObject == null || formulaEditorDataModel == null) {- return;- }+ if (editorObject == null || formulaEditorDataModel == null) return this._clearScheduledCallback();const { width, height } = position;+ if (width === 0 || height === 0) return this._clearScheduledCallback();const { engine } = editorObject;-- // Update page size when container resized.formulaEditorDataModel.updateDocumentDataPageSize(width);-this._autoScroll();-- // resize canvas- requestIdleCallback(() => {- engine.resizeBySize(width, height);- });+ this._scheduledCallback = requestIdleCallback(() => engine.resizeBySize(width, height));});}+ private _scheduledCallback: number = -1;+ private _clearScheduledCallback(): void {+ if (this._scheduledCallback !== -1) cancelIdleCallback(this._scheduledCallback);+ this._scheduledCallback = -1;+ }+// Sync cell content to formula editor bar when sheet selection changed.private _syncFormulaEditorContent() {this._editorBridgeService.currentEditCellState$.pipe(takeUntil(this.dispose$)).subscribe((editCellState) => {diff --git a/packages/sheets-ui/src/controllers/editor/start-edit.controller.ts b/packages/sheets-ui/src/controllers/editor/start-edit.controller.tsindex f4db10b07d..ad602d913d 100644--- a/packages/sheets-ui/src/controllers/editor/start-edit.controller.ts+++ b/packages/sheets-ui/src/controllers/editor/start-edit.controller.ts@@ -57,7 +57,7 @@ import {import { IEditorService, KeyCode, SetEditorResizeOperation } from '@univerjs/ui';import { Inject } from '@wendellhu/redi';-import { filter } from 'rxjs';+import { delay, filter } from 'rxjs';import { getEditorObject } from '../../basics/editor/get-editor-object';import { SetCellEditVisibleOperation } from '../../commands/operations/cell-edit.operation';import { ICellEditorManagerService } from '../../services/editor/cell-editor-manager.service';@@ -156,25 +156,23 @@ export class StartEditController extends Disposable {private _initialEditFocusListener() {this.disposeWithMe(- this._editorBridgeService.currentEditCellState$.subscribe((editCellState) => {+ // Delay for sometime until the `editorObject` is ready.+ // FIXME: this solution is hacking. There shouldn't be so many modules to+ // deal with sheet editors hence create so many time-sequence problems.+ this._editorBridgeService.currentEditCellState$.pipe(delay(16)).subscribe((editCellState) => {if (editCellState == null || this._editorBridgeService.isForceKeepVisible()) {return;}const { position, documentLayoutObject, scaleX, editorUnitId } = editCellState;-const editorObject = this._getEditorObject();-if (editorObject == null) {return;}const { startX, endX } = position;-const { textRotation, wrapStrategy, documentModel } = documentLayoutObject;-const { vertexAngle: angle } = convertTextRotation(textRotation);-documentModel!.updateDocumentId(editorUnitId);if (wrapStrategy === WrapStrategy.WRAP && angle === 0) {@@ -459,113 +457,112 @@ export class StartEditController extends Disposable {// You can double-click on the cell or input content by keyboard to put the cell into the edit state.// eslint-disable-next-line max-lines-per-functionprivate _initialStartEdit() {- this.disposeWithMe(- // eslint-disable-next-line max-lines-per-function- this._editorBridgeService.visible$.subscribe((param) => {- const { visible, eventType, keycode } = param;+ // eslint-disable-next-line max-lines-per-function+ this.disposeWithMe(this._editorBridgeService.visible$.subscribe((param) => {+ const { visible, eventType, keycode } = param;- if (visible === this._editorVisiblePrevious) {- return;- }-- this._editorVisiblePrevious = visible;-- if (visible === false) {- this._setOpenForCurrent(null, null);- return;- }+ if (visible === this._editorVisiblePrevious) {+ return;+ }- const editCellState = this._editorBridgeService.getEditCellState();+ this._editorVisiblePrevious = visible;- if (editCellState == null) {- return;- }+ if (visible === false) {+ this._setOpenForCurrent(null, null);+ return;+ }- const {- position,- documentLayoutObject,- canvasOffset,- scaleX,- scaleY,- editorUnitId,- unitId,- sheetId,- isInArrayFormulaRange = false,- } = editCellState;+ const editCellState = this._editorBridgeService.getEditCellState();- const editorObject = this._getEditorObject();+ if (editCellState == null) {+ return;+ }- if (editorObject == null) {- return;- }+ const {+ position,+ documentLayoutObject,+ canvasOffset,+ scaleX,+ scaleY,+ editorUnitId,+ unitId,+ sheetId,+ isInArrayFormulaRange = false,+ } = editCellState;++ const editorObject = this._getEditorObject();++ if (editorObject == null) {+ return;+ }- this._setOpenForCurrent(unitId, sheetId);+ this._setOpenForCurrent(unitId, sheetId);- const { document, scene } = editorObject;+ const { document, scene } = editorObject;- this._contextService.setContextValue(EDITOR_ACTIVATED, true);+ this._contextService.setContextValue(EDITOR_ACTIVATED, true);- const { documentModel: documentDataModel } = documentLayoutObject;+ const { documentModel: documentDataModel } = documentLayoutObject;- const docParam = this._docSkeletonManagerService.getSkeletonByUnitId(editorUnitId);+ const docParam = this._docSkeletonManagerService.getSkeletonByUnitId(editorUnitId);- if (docParam == null || documentDataModel == null) {- return;- }+ if (docParam == null || documentDataModel == null) {+ return;+ }- const { skeleton } = docParam;+ const { skeleton } = docParam;- this._fitTextSize(position, canvasOffset, skeleton, documentLayoutObject, scaleX, scaleY);+ this._fitTextSize(position, canvasOffset, skeleton, documentLayoutObject, scaleX, scaleY);// move selection- if (- eventType === DeviceInputEventType.Keyboard ||+ if (+ eventType === DeviceInputEventType.Keyboard ||(eventType === DeviceInputEventType.Dblclick && isInArrayFormulaRange)- ) {- const snapshot = Tools.deepClone(documentDataModel.snapshot) as IDocumentData;- const documentViewModel = this._docViewModelManagerService.getViewModel(editorUnitId);+ ) {+ const snapshot = Tools.deepClone(documentDataModel.snapshot) as IDocumentData;+ const documentViewModel = this._docViewModelManagerService.getViewModel(editorUnitId);- if (documentViewModel == null) {- return;- }+ if (documentViewModel == null) {+ return;+ }- this._resetBodyStyle(snapshot.body!, !!isInArrayFormulaRange);+ this._resetBodyStyle(snapshot.body!, !!isInArrayFormulaRange);- documentDataModel.reset(snapshot);- documentViewModel.reset(documentDataModel);+ documentDataModel.reset(snapshot);+ documentViewModel.reset(documentDataModel);- document.makeDirty();+ document.makeDirty();// @JOCS, Why calculate here?- if (keycode === KeyCode.BACKSPACE || eventType === DeviceInputEventType.Dblclick) {- skeleton.calculate();- this._editorBridgeService.changeEditorDirty(true);- }+ if (keycode === KeyCode.BACKSPACE || eventType === DeviceInputEventType.Dblclick) {+ skeleton.calculate();+ this._editorBridgeService.changeEditorDirty(true);+ }- this._textSelectionManagerService.replaceTextRanges([- {- startOffset: 0,- endOffset: 0,- },- ]);- } else if (eventType === DeviceInputEventType.Dblclick) {+ this._textSelectionManagerService.replaceTextRanges([+ {+ startOffset: 0,+ endOffset: 0,+ },+ ]);+ } else if (eventType === DeviceInputEventType.Dblclick) {// TODO: @JOCS, Get the position close to the cursor after clicking on the cell.- const cursor = documentDataModel.getBody()!.dataStream.length - 2 || 0;-- scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)?.scrollTo({- y: Number.POSITIVE_INFINITY,- });-- this._textSelectionManagerService.replaceTextRanges([- {- startOffset: cursor,- endOffset: cursor,- },- ]);- }+ const cursor = documentDataModel.getBody()!.dataStream.length - 2 || 0;- this._renderManagerService.getRenderById(unitId)?.scene.resetCursor();- })+ scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)?.scrollTo({+ y: Number.POSITIVE_INFINITY,+ });++ this._textSelectionManagerService.replaceTextRanges([+ {+ startOffset: cursor,+ endOffset: cursor,+ },+ ]);+ }++ this._renderManagerService.getRenderById(unitId)?.scene.resetCursor();+ }));}@@ -683,7 +680,7 @@ export class StartEditController extends Disposable {private _setOpenForCurrent(unitId: Nullable<string>, sheetId: Nullable<string>) {const sheetEditors = this._editorService.getAllEditor();- for (const [id, sheetEditor] of sheetEditors) {+ for (const [_, sheetEditor] of sheetEditors) {if (!sheetEditor.isSheetEditor()) {continue;}diff --git a/packages/sheets-ui/src/controllers/force-string-alert.controller.ts b/packages/sheets-ui/src/controllers/force-string-alert-render.controller.tssimilarity index 87%rename from packages/sheets-ui/src/controllers/force-string-alert.controller.tsrename to packages/sheets-ui/src/controllers/force-string-alert-render.controller.tsindex c45b418827..25745e1970 100644--- a/packages/sheets-ui/src/controllers/force-string-alert.controller.ts+++ b/packages/sheets-ui/src/controllers/force-string-alert-render.controller.ts@@ -15,17 +15,19 @@*/import type { Workbook } from '@univerjs/core';-import { CellValueType, Disposable, isRealNum, IUniverInstanceService, LifecycleStages, LocaleService, OnLifecycle, UniverInstanceType } from '@univerjs/core';+import { CellValueType, Disposable, isRealNum, IUniverInstanceService, LifecycleStages, LocaleService, OnLifecycle } from '@univerjs/core';import { Inject } from '@wendellhu/redi';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';import { HoverManagerService } from '../services/hover-manager.service';import { CellAlertManagerService, CellAlertType } from '../services/cell-alert-manager.service';const ALERT_KEY = 'SHEET_FORCE_STRING_ALERT';-@OnLifecycle(LifecycleStages.Rendered, ForceStringAlertController)-export class ForceStringAlertController extends Disposable {+@OnLifecycle(LifecycleStages.Rendered, ForceStringAlertRenderController)+export class ForceStringAlertRenderController extends Disposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(HoverManagerService) private readonly _hoverManagerService: HoverManagerService,@Inject(CellAlertManagerService) private readonly _cellAlertManagerService: CellAlertManagerService,@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@@ -42,7 +44,7 @@ export class ForceStringAlertController extends Disposable {private _initCellAlertPopup() {this.disposeWithMe(this._hoverManagerService.currentCell$.subscribe((cellPos) => {if (cellPos) {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const workbook = this._context.unit;const worksheet = workbook.getActiveSheet();const cellData = worksheet.getCell(cellPos.location.row, cellPos.location.col);diff --git a/packages/sheets-ui/src/controllers/force-string-render.controller.ts b/packages/sheets-ui/src/controllers/force-string-render.controller.tsindex a1c2216dd8..4c730c1009 100644--- a/packages/sheets-ui/src/controllers/force-string-render.controller.ts+++ b/packages/sheets-ui/src/controllers/force-string-render.controller.ts@@ -16,16 +16,19 @@import { CellValueType, isRealNum, LifecycleStages, OnLifecycle, RxDisposable } from '@univerjs/core';+import type { Workbook } from '@univerjs/core';import { Inject } from '@wendellhu/redi';import { INTERCEPTOR_POINT, SheetInterceptorService } from '@univerjs/sheets';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';/*** @todo RenderUnit*/@OnLifecycle(LifecycleStages.Rendered, ForceStringRenderController)-export class ForceStringRenderController extends RxDisposable {+export class ForceStringRenderController extends RxDisposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,@Inject(SheetInterceptorService) private readonly _sheetInterceptorService: SheetInterceptorService) {super();@@ -36,7 +39,6 @@ export class ForceStringRenderController extends RxDisposable {this._initViewModelIntercept();}-private _initViewModelIntercept() {const FORCE_STRING_MARK = {tl: {diff --git a/packages/sheets-ui/src/controllers/format-painter/format-painter.controller.ts b/packages/sheets-ui/src/controllers/format-painter/format-painter.controller.tsindex e48f643d7a..59be8c2d3e 100644--- a/packages/sheets-ui/src/controllers/format-painter/format-painter.controller.ts+++ b/packages/sheets-ui/src/controllers/format-painter/format-painter.controller.ts@@ -24,7 +24,6 @@ import {toDisposable,UniverInstanceType,} from '@univerjs/core';-import { CURSOR_TYPE, IRenderManagerService } from '@univerjs/engine-render';import type { IApplyFormatPainterCommandParams } from '../../commands/commands/set-format-painter.command';import {@@ -33,7 +32,6 @@ import {} from '../../commands/commands/set-format-painter.command';import { FormatPainterStatus, IFormatPainterService } from '../../services/format-painter/format-painter.service';import { ISelectionRenderService } from '../../services/selection/selection-render.service';-import { getSheetObject } from '../utils/component-tools';@OnLifecycle(LifecycleStages.Rendered, FormatPainterController)export class FormatPainterController extends Disposable {@@ -41,7 +39,6 @@ export class FormatPainterController extends Disposable {@ICommandService private readonly _commandService: ICommandService,@IFormatPainterService private readonly _formatPainterService: IFormatPainterService,@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@ISelectionRenderService private readonly _selectionRenderService: ISelectionRenderService) {super();@@ -51,20 +48,8 @@ export class FormatPainterController extends Disposable {private _initialize() {this._commandExecutedListener();- this._bindFormatPainterStatus();}- private _bindFormatPainterStatus() {- this._formatPainterService.status$.subscribe((status) => {- const { scene } = this._getSheetObject() || {};- if (!scene) return;- if (status !== FormatPainterStatus.OFF) {- scene.setDefaultCursor(CURSOR_TYPE.CELL);- } else {- scene.setDefaultCursor(CURSOR_TYPE.DEFAULT);- }- });- }private _commandExecutedListener() {this.disposeWithMe(@@ -147,8 +132,4 @@ export class FormatPainterController extends Disposable {await this._commandService.executeCommand(ApplyFormatPainterCommand.id, ApplyFormatPainterCommandParams);}-- private _getSheetObject() {- return getSheetObject(this._univerInstanceService, this._renderManagerService);- }}diff --git a/packages/sheets-ui/src/controllers/hover.controller.ts b/packages/sheets-ui/src/controllers/hover-render.controller.tssimilarity index 87%rename from packages/sheets-ui/src/controllers/hover.controller.tsrename to packages/sheets-ui/src/controllers/hover-render.controller.tsindex c11b74e6f7..42db6c34de 100644--- a/packages/sheets-ui/src/controllers/hover.controller.ts+++ b/packages/sheets-ui/src/controllers/hover-render.controller.ts@@ -16,13 +16,15 @@import type { Workbook } from '@univerjs/core';import { Disposable, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';import { IRenderManagerService } from '@univerjs/engine-render';import { Inject } from '@wendellhu/redi';import { HoverManagerService } from '../services/hover-manager.service';-@OnLifecycle(LifecycleStages.Rendered, HoverController)-export class HoverController extends Disposable {+@OnLifecycle(LifecycleStages.Rendered, HoverRenderController)+export class HoverRenderController extends Disposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@IRenderManagerService private _renderManagerService: IRenderManagerService,@Inject(HoverManagerService) private _hoverManagerService: HoverManagerService,@IUniverInstanceService private _univerInstanceService: IUniverInstanceService@@ -32,10 +34,6 @@ export class HoverController extends Disposable {this._initPointerEvent();}- private _initScrollEvent() {- // this.- }-private _initPointerEvent() {const currentRender = this._renderManagerService.getRenderById(this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId()diff --git a/packages/sheets-ui/src/controllers/mark-selection.controller.ts b/packages/sheets-ui/src/controllers/mark-selection.controller.tsindex e10515f240..107303311e 100644--- a/packages/sheets-ui/src/controllers/mark-selection.controller.ts+++ b/packages/sheets-ui/src/controllers/mark-selection.controller.ts@@ -14,17 +14,18 @@* limitations under the License.*/-import type { ICommandInfo } from '@univerjs/core';-import { Disposable, ICommandService, LifecycleStages, OnLifecycle, toDisposable } from '@univerjs/core';+import type { ICommandInfo, Workbook } from '@univerjs/core';+import { Disposable, ICommandService } from '@univerjs/core';import { Inject } from '@wendellhu/redi';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';import { SetCellEditVisibleOperation } from '../commands/operations/cell-edit.operation';import { IMarkSelectionService } from '../services/mark-selection/mark-selection.service';import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-@OnLifecycle(LifecycleStages.Steady, MarkSelectionController)-export class MarkSelectionController extends Disposable {+export class MarkSelectionRenderController extends Disposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(IMarkSelectionService) private _markSelectionService: IMarkSelectionService,@ICommandService private _commandService: ICommandService,@Inject(SheetSkeletonManagerService) private _sheetSkeletonManagerService: SheetSkeletonManagerService@@ -57,14 +58,10 @@ export class MarkSelectionController extends Disposable {}private _addRefreshListener() {- this.disposeWithMe(- toDisposable(- this._sheetSkeletonManagerService.currentSkeleton$.subscribe((skeleton) => {- if (skeleton) {- this._markSelectionService.refreshShapes();- }- })- )- );+ this.disposeWithMe(this._sheetSkeletonManagerService.currentSkeleton$.subscribe((skeleton) => {+ if (skeleton) {+ this._markSelectionService.refreshShapes();+ }+ }));}}diff --git a/packages/sheets-ui/src/controllers/contextmenu/contextmenu.controller.ts b/packages/sheets-ui/src/controllers/render-controllers/contextmenu.render-controller.tssimilarity index 77%rename from packages/sheets-ui/src/controllers/contextmenu/contextmenu.controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/contextmenu.render-controller.tsindex 13fa32ba56..2864ddb9ca 100644--- a/packages/sheets-ui/src/controllers/contextmenu/contextmenu.controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/contextmenu.render-controller.ts@@ -18,21 +18,17 @@ import type {Workbook } from '@univerjs/core';import {Disposable,- IUniverInstanceService,- LifecycleStages,- OnLifecycle,RANGE_TYPE,toDisposable,- UniverInstanceType,} from '@univerjs/core';-import { IRenderManagerService } from '@univerjs/engine-render';+import type { IRenderContext, IRenderController, Spreadsheet, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';import { SelectionManagerService } from '@univerjs/sheets';import { IContextMenuService, MenuPosition } from '@univerjs/ui';import { Inject } from '@wendellhu/redi';import { ISelectionRenderService } from '../../services/selection/selection-render.service';import { SheetMenuPosition } from '../menu/menu';-import { getSheetObject } from '../utils/component-tools';+import { SHEET_VIEW_KEY } from '../../common/keys';/*** This controller subscribe to context menu events in@@ -41,31 +37,20 @@ import { getSheetObject } from '../utils/component-tools';** @todo RenderUnit*/-@OnLifecycle(LifecycleStages.Rendered, SheetContextMenuController)-export class SheetContextMenuController extends Disposable {+export class SheetContextMenuRenderController extends Disposable implements IRenderController {constructor(- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,+ private readonly _context: IRenderContext<Workbook>,@IContextMenuService private readonly _contextMenuService: IContextMenuService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@Inject(SelectionManagerService)private readonly _selectionManagerService: SelectionManagerService,@ISelectionRenderService private readonly _selectionRenderService: ISelectionRenderService) {super();- this._univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {- if (workbook) {- this._addListeners();- }- });+ this._addListeners();}private _addListeners(): void {- const objects = getSheetObject(this._univerInstanceService, this._renderManagerService);- if (!objects) {- return;- }-- const spreadsheetPointerDownObserver = objects.spreadsheet.onPointerDownObserver;+ const spreadsheetPointerDownObserver = (this._context?.mainComponent as Spreadsheet)?.onPointerDownObserver;const spreadsheetObserver = spreadsheetPointerDownObserver.add((event) => {if (event.button === 2) {const selections = this._selectionManagerService.getSelections();@@ -74,7 +59,7 @@ export class SheetContextMenuController extends Disposable {return;}const rangeType = currentSelection.range.rangeType;- const range = this._selectionRenderService.convertSelectionRangeToData(currentSelection).rangeWithCoord;+ const range = this._selectionRenderService.convertSelectionToCoord(currentSelection).rangeWithCoord;const isPointerInRange = () => {if (!range) {return false;@@ -107,7 +92,9 @@ export class SheetContextMenuController extends Disposable {});this.disposeWithMe(toDisposable(() => spreadsheetPointerDownObserver.remove(spreadsheetObserver)));- const rowHeaderPointerDownObserver = objects.spreadsheetRowHeader.onPointerDownObserver;+ const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;+ const rowHeaderPointerDownObserver = spreadsheetRowHeader.onPointerDownObserver;const rowHeaderObserver = rowHeaderPointerDownObserver.add((event) => {if (event.button === 2) {this._contextMenuService.triggerContextMenu(event, SheetMenuPosition.ROW_HEADER_CONTEXT_MENU);@@ -115,7 +102,7 @@ export class SheetContextMenuController extends Disposable {});this.disposeWithMe(toDisposable(() => spreadsheetPointerDownObserver.remove(rowHeaderObserver)));- const colHeaderPointerDownObserver = objects.spreadsheetColumnHeader.onPointerDownObserver;+ const colHeaderPointerDownObserver = spreadsheetColumnHeader.onPointerDownObserver;const colHeaderObserver = colHeaderPointerDownObserver.add((event) => {if (event.button === 2) {this._contextMenuService.triggerContextMenu(event, SheetMenuPosition.COL_HEADER_CONTEXT_MENU);diff --git a/packages/sheets-ui/src/controllers/editor-bridge.controller.ts b/packages/sheets-ui/src/controllers/render-controllers/editor-bridge.render-controller.tssimilarity index 61%rename from packages/sheets-ui/src/controllers/editor-bridge.controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/editor-bridge.render-controller.tsindex 71265cce8c..b08260a669 100644--- a/packages/sheets-ui/src/controllers/editor-bridge.controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/editor-bridge.render-controller.ts@@ -14,9 +14,10 @@* limitations under the License.*/-import type { ICommandInfo, IExecutionOptions, Nullable, Workbook } from '@univerjs/core';-import { FOCUSING_DOC, FOCUSING_SHEET, ICommandService, IContextService, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, UniverInstanceType } from '@univerjs/core';-import { DeviceInputEventType, IRenderManagerService, ITextSelectionRenderManager } from '@univerjs/engine-render';+import type { ICommandInfo, IExecutionOptions, ISelectionCell, Nullable, Workbook } from '@univerjs/core';+import { ICommandService, IContextService, RxDisposable } from '@univerjs/core';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';+import { DeviceInputEventType } from '@univerjs/engine-render';import type { ISelectionWithStyle } from '@univerjs/sheets';import {COMMAND_LISTENER_SKELETON_CHANGE,@@ -24,25 +25,21 @@ import {SelectionManagerService,SetWorksheetActiveOperation,} from '@univerjs/sheets';-import { Inject, Injector, Quantity } from '@wendellhu/redi';+import { Inject, Injector } from '@wendellhu/redi';import { merge, takeUntil } from 'rxjs';import { IEditorService, ILayoutService, IRangeSelectorService } from '@univerjs/ui';--import { SetZoomRatioCommand } from '../commands/commands/set-zoom-ratio.command';-import { SetActivateCellEditOperation } from '../commands/operations/activate-cell-edit.operation';-import { SetCellEditVisibleOperation } from '../commands/operations/cell-edit.operation';-import { IEditorBridgeService } from '../services/editor-bridge.service';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import { getSheetObject } from './utils/component-tools';--@OnLifecycle(LifecycleStages.Rendered, EditorBridgeController)-export class EditorBridgeController extends RxDisposable {+import { SetZoomRatioCommand } from '../../commands/commands/set-zoom-ratio.command';+import { SetActivateCellEditOperation } from '../../commands/operations/activate-cell-edit.operation';+import { SetCellEditVisibleOperation } from '../../commands/operations/cell-edit.operation';+import type { ICurrentEditCellParam } from '../../services/editor-bridge.service';+import { IEditorBridgeService } from '../../services/editor-bridge.service';+import { getSheetObject } from '../utils/component-tools';++export class EditorBridgeRenderController extends RxDisposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(Injector) private readonly _injector: Injector,- @Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@ICommandService private readonly _commandService: ICommandService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@IEditorBridgeService private readonly _editorBridgeService: IEditorBridgeService,@ILayoutService private readonly _layoutService: ILayoutService,@IEditorService private readonly _editorService: IEditorService,@@ -57,77 +54,53 @@ export class EditorBridgeController extends RxDisposable {this._commandExecutedListener();}- override dispose(): void {}-private _initialize() {this._initSelectionChangeListener();- this._initialEventListener();- this._initialChangeEditorListener();+ this._initEventListener();+ // this._initialChangeEditorListener();this._initialRangeSelector();}private _initSelectionChangeListener() {- merge(this._selectionManagerService.selectionMoveEnd$, this._selectionManagerService.selectionMoveStart$)+ merge(+ this._selectionManagerService.selectionMoveEnd$,+ this._selectionManagerService.selectionMoveStart$+ ).pipe(takeUntil(this.dispose$))- .subscribe((params) => this._handleSelectionListener(params));+ .subscribe((params) => this._handleSelectionChange(params));}- private _handleSelectionListener(params: Nullable<ISelectionWithStyle[]>) {- const current = this._selectionManagerService.getCurrent();-- // The editor only responds to regular selections.- if (current?.pluginName !== NORMAL_SELECTION_PLUGIN_NAME) {- return;- }-- if (this._editorBridgeService.isVisible().visible === true) {- return;- }-- const textSelectionRenderManager = this._injector.get(ITextSelectionRenderManager, Quantity.OPTIONAL);-- if (!this._layoutService.checkCanvasIsFocused() && textSelectionRenderManager && !textSelectionRenderManager!.hasFocus()) {- return;- }-- const currentSkeleton = this._sheetSkeletonManagerService.getCurrent();- if (currentSkeleton == null) {- return;- }-- if (params == null || params.length === 0 || params[params.length - 1] == null) {- return;- }-- const { primary } = params[params.length - 1];- if (primary == null) {- return;- }-+ private _updateEditorPosition(cell: ISelectionCell): void {const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-- const { unitId, sheetId } = currentSkeleton;const { scene, engine } = sheetObject;- this._commandService.executeCommand(SetActivateCellEditOperation.id, {+ const unitId = this._context.unitId;+ const sheetId = this._context.unit.getActiveSheet().getSheetId();++ this._commandService.executeCommand<ICurrentEditCellParam>(SetActivateCellEditOperation.id, {scene,engine,- primary,+ primary: cell,unitId,sheetId,});}- private _initialEventListener() {- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;+ private _handleSelectionChange(params: Nullable<ISelectionWithStyle[]>) {+ const current = this._selectionManagerService.getCurrent();++ // The editor only responds to regular selections.+ if (current?.pluginName !== NORMAL_SELECTION_PLUGIN_NAME) return;+ if (this._editorBridgeService.isVisible().visible) return;++ const primary = params?.[params.length - 1]?.primary;+ if (primary) {+ this._updateEditorPosition(primary);}+ }- const { spreadsheet, spreadsheetColumnHeader, spreadsheetLeftTopPlaceholder, spreadsheetRowHeader } =- sheetObject;+ private _initEventListener() {+ const sheetObject = this._getSheetObject();+ const { spreadsheet, spreadsheetColumnHeader, spreadsheetLeftTopPlaceholder, spreadsheetRowHeader } = sheetObject;spreadsheet.onDblclickObserver.add((evt) => {// No need to enter edit status when user click the right button.@@ -153,37 +126,30 @@ export class EditorBridgeController extends RxDisposable {spreadsheetRowHeader.onPointerDownObserver.add(this._keepVisibleHideEditor.bind(this));}- private _initialChangeEditorListener() {- this.disposeWithMe(- this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_DOC).subscribe((documentDataModel) => {- if (documentDataModel == null) {- return;- }-- const editorId = documentDataModel.getUnitId();-- if (!this._editorService.isEditor(editorId)) {- return;- }-- if (this._editorService.isSheetEditor(editorId)) {- this._contextService.setContextValue(FOCUSING_DOC, false);- // this._contextService.setContextValue(FOCUSING_FORMULA_EDITOR, true);- this._contextService.setContextValue(FOCUSING_SHEET, true);- } else {- // this._contextService.setContextValue(FOCUSING_EDITOR_INPUT_FORMULA, false);- // this._contextService.setContextValue(EDITOR_ACTIVATED, false);- // this._contextService.setContextValue(FOCUSING_EDITOR_BUT_HIDDEN, false);- // this._contextService.setContextValue(FOCUSING_FORMULA_EDITOR, false);-- this._contextService.setContextValue(FOCUSING_SHEET, false);- this._contextService.setContextValue(FOCUSING_DOC, true);-- this._hideEditor();- }- })- );- }+ // Move to another controller+ // private _initialChangeEditorListener() {+ // this.disposeWithMe(+ // this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_DOC).subscribe((documentDataModel) => {+ // if (documentDataModel == null) {+ // return;+ // }++ // const editorId = documentDataModel.getUnitId();+ // if (!this._editorService.isEditor(editorId)) {+ // return;+ // }++ // if (this._editorService.isSheetEditor(editorId)) {+ // this._contextService.setContextValue(FOCUSING_DOC, false);+ // this._contextService.setContextValue(FOCUSING_SHEET, true);+ // } else {+ // this._contextService.setContextValue(FOCUSING_SHEET, false);+ // this._contextService.setContextValue(FOCUSING_DOC, true);+ // this._hideEditor();+ // }+ // })+ // );+ // }/*** In the activated state of formula editing,@@ -193,6 +159,7 @@ export class EditorBridgeController extends RxDisposable {if (this._editorBridgeService.isForceKeepVisible()) {return;}+this._hideEditor();}@@ -223,13 +190,8 @@ export class EditorBridgeController extends RxDisposable {}private _initialRangeSelector() {- this.disposeWithMe(- this._selectionManagerService.selectionMoving$.subscribe(this._rangeSelector.bind(this))- );-- this.disposeWithMe(- this._selectionManagerService.selectionMoveStart$.subscribe(this._rangeSelector.bind(this))- );+ this.disposeWithMe(this._selectionManagerService.selectionMoving$.subscribe(this._rangeSelector.bind(this)));+ this.disposeWithMe(this._selectionManagerService.selectionMoveStart$.subscribe(this._rangeSelector.bind(this)));/*** pro/issues/388@@ -267,7 +229,7 @@ export class EditorBridgeController extends RxDisposable {}private _getCurrentUnitIdAndSheetId() {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const workbook = this._context.unit;const worksheet = workbook.getActiveSheet();return {unitId: workbook.getUnitId(),@@ -277,7 +239,7 @@ export class EditorBridgeController extends RxDisposable {}private _getSheetObject() {- return getSheetObject(this._univerInstanceService, this._renderManagerService);+ return getSheetObject(this._context.unit, this._context)!;}private _commandExecutedListener() {diff --git a/packages/sheets-ui/src/controllers/render-controllers/format-painter.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/format-painter.render-controller.tsnew file mode 100644index 0000000000..931c081867--- /dev/null+++ b/packages/sheets-ui/src/controllers/render-controllers/format-painter.render-controller.ts@@ -0,0 +1,52 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { Workbook } from '@univerjs/core';+import {+ Disposable,+ toDisposable,+} from '@univerjs/core';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';+import { CURSOR_TYPE } from '@univerjs/engine-render';++import { FormatPainterStatus, IFormatPainterService } from '../../services/format-painter/format-painter.service';++export class FormatPainterRenderController extends Disposable implements IRenderController {+ constructor(+ private readonly _context: IRenderContext<Workbook>,+ @IFormatPainterService private readonly _formatPainterService: IFormatPainterService+ ) {+ super();+ this._initialize();+ }++ private _initialize() {+ this._bindFormatPainterStatus();+ }++ private _bindFormatPainterStatus() {+ this.disposeWithMe(+ toDisposable(this._formatPainterService.status$.subscribe((status) => {+ const scene = this._context.scene;+ if (!scene) return;+ if (status !== FormatPainterStatus.OFF) {+ scene.setDefaultCursor(CURSOR_TYPE.CELL);+ } else {+ scene.setDefaultCursor(CURSOR_TYPE.DEFAULT);+ }+ })));+ }+}diff --git a/packages/sheets-ui/src/controllers/freeze.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.tssimilarity index 99%rename from packages/sheets-ui/src/controllers/freeze.render-controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.tsindex 0fe1bbf741..2462314f73 100644--- a/packages/sheets-ui/src/controllers/freeze.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/freeze.render-controller.ts@@ -63,12 +63,12 @@ import {} from '@univerjs/sheets';import { Inject, Injector } from '@wendellhu/redi';-import { ScrollCommand } from '../commands/commands/set-scroll.command';-import { SetZoomRatioOperation } from '../commands/operations/set-zoom-ratio.operation';-import { SHEET_COMPONENT_HEADER_LAYER_INDEX, VIEWPORT_KEY } from '../common/keys';-import { ScrollManagerService } from '../services/scroll-manager.service';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import { getCoordByOffset, getSheetObject } from './utils/component-tools';+import { ScrollCommand } from '../../commands/commands/set-scroll.command';+import { SetZoomRatioOperation } from '../../commands/operations/set-zoom-ratio.operation';+import { SHEET_COMPONENT_HEADER_LAYER_INDEX, VIEWPORT_KEY } from '../../common/keys';+import { ScrollManagerService } from '../../services/scroll-manager.service';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';+import { getCoordByOffset, getSheetObject } from '../utils/component-tools';enum FREEZE_DIRECTION_TYPE {ROW,diff --git a/packages/sheets-ui/src/controllers/header-menu.controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-menu.render-controller.tssimilarity index 77%rename from packages/sheets-ui/src/controllers/header-menu.controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/header-menu.render-controller.tsindex 6b8fb68fc0..39a89c15d9 100644--- a/packages/sheets-ui/src/controllers/header-menu.controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/header-menu.render-controller.ts@@ -18,24 +18,20 @@ import type { Nullable, Observer, Workbook } from '@univerjs/core';import {Disposable,ICommandService,- IUniverInstanceService,- LifecycleStages,- OnLifecycle,RANGE_TYPE,- UniverInstanceType,} from '@univerjs/core';-import type { IMouseEvent, IPointerEvent } from '@univerjs/engine-render';-import { CURSOR_TYPE, IRenderManagerService, Rect } from '@univerjs/engine-render';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';+import { CURSOR_TYPE, Rect } from '@univerjs/engine-render';import type { ISetSelectionsOperationParams } from '@univerjs/sheets';import { NORMAL_SELECTION_PLUGIN_NAME, SelectionManagerService, SetSelectionsOperation } from '@univerjs/sheets';import { IContextMenuService } from '@univerjs/ui';import { Inject } from '@wendellhu/redi';-import { SHEET_COMPONENT_HEADER_LAYER_INDEX } from '../common/keys';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import { HEADER_MENU_SHAPE_TYPE, HeaderMenuShape } from '../views/header-menu-shape';-import { SheetMenuPosition } from './menu/menu';-import { getCoordByOffset, getSheetObject } from './utils/component-tools';+import { SHEET_COMPONENT_HEADER_LAYER_INDEX, SHEET_VIEW_KEY } from '../../common/keys';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';+import { HEADER_MENU_SHAPE_TYPE, HeaderMenuShape } from '../../views/header-menu-shape';+import { SheetMenuPosition } from '../menu/menu';+import { getCoordByOffset } from '../utils/component-tools';const HEADER_MENU_CONTROLLER_SHAPE = '__SpreadsheetHeaderMenuSHAPEControllerShape__';@@ -52,8 +48,7 @@ enum HEADER_HOVER_TYPE {* header highlight* column menu: show, hover and mousedown event*/-@OnLifecycle(LifecycleStages.Rendered, HeaderMenuController)-export class HeaderMenuController extends Disposable {+export class HeaderMenuRenderController extends Disposable implements IRenderController {private _hoverRect: Nullable<Rect>;private _hoverMenu: Nullable<HeaderMenuShape>;@@ -63,13 +58,11 @@ export class HeaderMenuController extends Disposable {private _observers: Array<Nullable<Observer<IPointerEvent | IMouseEvent>>> = [];constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@IContextMenuService private readonly _contextMenuService: IContextMenuService,@ICommandService private readonly _commandService: ICommandService,- @Inject(SelectionManagerService)- private readonly _selectionManagerService: SelectionManagerService+ @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService) {super();@@ -80,12 +73,9 @@ export class HeaderMenuController extends Disposable {this._hoverRect?.dispose();this._hoverMenu?.dispose();- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }+ const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;- const { spreadsheetRowHeader, spreadsheetColumnHeader } = sheetObject;this._observers.forEach((observer) => {spreadsheetRowHeader.onPointerEnterObserver.remove(observer);@@ -98,12 +88,7 @@ export class HeaderMenuController extends Disposable {}private _initialize() {- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-- const { scene } = sheetObject;+ const scene = this._context.scene;this._hoverRect = new Rect(HEADER_MENU_CONTROLLER_SHAPE, {fill: HEADER_MENU_CONTROLLER_SHAPE_COLOR,@@ -122,12 +107,9 @@ export class HeaderMenuController extends Disposable {}private _initialHover(initialType: HEADER_HOVER_TYPE = HEADER_HOVER_TYPE.ROW) {- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }+ const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;- const { spreadsheetColumnHeader, spreadsheetRowHeader } = sheetObject;const eventBindingObject =initialType === HEADER_HOVER_TYPE.ROW ? spreadsheetRowHeader : spreadsheetColumnHeader;@@ -145,17 +127,12 @@ export class HeaderMenuController extends Disposable {return;}- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-const { rowHeaderWidth, columnHeaderHeight } = skeleton;const { startX, startY, endX, endY, column } = getCoordByOffset(evt.offsetX,evt.offsetY,- sheetObject.scene,+ this._context.scene,skeleton);@@ -217,17 +194,12 @@ export class HeaderMenuController extends Disposable {return;}- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-this._hoverMenu.setProps({mode: HEADER_MENU_SHAPE_TYPE.HIGHLIGHT,visible: true,});- sheetObject.scene.setCursor(CURSOR_TYPE.POINTER);+ this._context.scene.setCursor(CURSOR_TYPE.POINTER);});this._hoverMenu.onPointerLeaveObserver.add(() => {@@ -235,25 +207,15 @@ export class HeaderMenuController extends Disposable {return;}- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-this._hoverMenu.setProps({mode: HEADER_MENU_SHAPE_TYPE.NORMAL,visible: false,});- sheetObject.scene.resetCursor();+ this._context.scene.resetCursor();});this._hoverMenu.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent) => {- const sheetObject = this._getSheetObject();- if (!sheetObject) {- return;- }-const currentColumn = this._currentColumn;const currentSelectionDatas = this._selectionManagerService.getSelectionRanges();const menuInSelections: boolean = !!currentSelectionDatas@@ -280,12 +242,8 @@ export class HeaderMenuController extends Disposable {});}- private _getSheetObject() {- return getSheetObject(this._univerInstanceService, this._renderManagerService);- }-private _getSelectionOnColumn(column: number): ISetSelectionsOperationParams {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const workbook = this._context.unit;const worksheet = workbook.getActiveSheet();return {diff --git a/packages/sheets-ui/src/controllers/header-move.controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.tssimilarity index 90%rename from packages/sheets-ui/src/controllers/header-move.controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.tsindex 3af4fcce26..f76424d03f 100644--- a/packages/sheets-ui/src/controllers/header-move.controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/header-move.render-controller.ts@@ -14,19 +14,15 @@* limitations under the License.*/-import type { Nullable, Observer } from '@univerjs/core';+import type { Nullable, Observer, Workbook } from '@univerjs/core';import {Disposable,ICommandService,- IUniverInstanceService,- LifecycleStages,- OnLifecycle,RANGE_TYPE,} from '@univerjs/core';-import type { IMouseEvent, IPointerEvent } from '@univerjs/engine-render';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';import {CURSOR_TYPE,- IRenderManagerService,Rect,ScrollTimer,ScrollTimerType,@@ -41,11 +37,10 @@ import {} from '@univerjs/sheets';import { Inject } from '@wendellhu/redi';-import { SHEET_COMPONENT_HEADER_LAYER_INDEX, VIEWPORT_KEY } from '../common/keys';-import { ISelectionRenderService } from '../services/selection/selection-render.service';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import type { ISheetObjectParam } from './utils/component-tools';-import { getCoordByOffset, getSheetObject } from './utils/component-tools';+import { SHEET_COMPONENT_HEADER_LAYER_INDEX, SHEET_VIEW_KEY, VIEWPORT_KEY } from '../../common/keys';+import { ISelectionRenderService } from '../../services/selection/selection-render.service';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';+import { getCoordByOffset } from '../utils/component-tools';const HEADER_MOVE_CONTROLLER_BACKGROUND = '__SpreadsheetHeaderMoveControllerBackground__';@@ -62,8 +57,7 @@ enum HEADER_MOVE_TYPE {COLUMN,}-@OnLifecycle(LifecycleStages.Rendered, HeaderMoveController)-export class HeaderMoveController extends Disposable {+export class HeaderMoveRenderController extends Disposable implements IRenderController {private _startOffsetX: number = Number.NEGATIVE_INFINITY;private _startOffsetY: number = Number.NEGATIVE_INFINITY;@@ -72,8 +66,6 @@ export class HeaderMoveController extends Disposable {private _moveHelperLineShape: Nullable<Rect>;- private _sheetObject!: ISheetObjectParam;-private _rowOrColumnDownObservers: Array<Nullable<Observer<IPointerEvent | IMouseEvent>>> = [];private _rowOrColumnMoveObservers: Array<Nullable<Observer<IPointerEvent | IMouseEvent>>> = [];@@ -84,7 +76,7 @@ export class HeaderMoveController extends Disposable {private _upObserver: Nullable<Observer<IPointerEvent | IMouseEvent>>;- private _scrollTimer!: ScrollTimer;+ private _scrollTimer: Nullable<ScrollTimer>;private _changeFromColumn = -1;@@ -98,12 +90,9 @@ export class HeaderMoveController extends Disposable {this._moveHelperBackgroundShape?.dispose();this._moveHelperLineShape?.dispose();- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-- const { spreadsheetRowHeader, spreadsheetColumnHeader, scene } = sheetObject;+ const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;+ const scene = this._context.scene;[...this._rowOrColumnDownObservers,@@ -115,16 +104,14 @@ export class HeaderMoveController extends Disposable {});scene.onPointerMoveObserver.remove(this._moveObserver);-scene.onPointerUpObserver.remove(this._upObserver);- this._scrollTimer.dispose();+ this._scrollTimer?.dispose();}constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@ICommandService private readonly _commandService: ICommandService,@ISelectionRenderService private readonly _selectionRenderService: ISelectionRenderService,@Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService@@ -135,21 +122,15 @@ export class HeaderMoveController extends Disposable {}private _initialize() {- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-- this._sheetObject = sheetObject;-this._initialRowOrColumn(HEADER_MOVE_TYPE.ROW);this._initialRowOrColumn(HEADER_MOVE_TYPE.COLUMN);}private _initialRowOrColumn(initialType: HEADER_MOVE_TYPE = HEADER_MOVE_TYPE.ROW) {- const { spreadsheetColumnHeader, spreadsheetRowHeader, scene } = this._sheetObject;-+ const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;+ const scene = this._context.scene;const eventBindingObject =initialType === HEADER_MOVE_TYPE.ROW ? spreadsheetRowHeader : spreadsheetColumnHeader;@@ -262,7 +243,7 @@ export class HeaderMoveController extends Disposable {Vector2.FromArray([moveOffsetX, moveOffsetY]));- scene.setCursor(CURSOR_TYPE.GRABBING);+ // scene.setCursor(CURSOR_TYPE.GRABBING);this._rowColumnMoving(newMoveOffsetX,@@ -357,8 +338,7 @@ export class HeaderMoveController extends Disposable {},initialType: HEADER_MOVE_TYPE) {- const { scene } = this._sheetObject;-+ const scene = this._context.scene;const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;if (skeleton == null) {return;@@ -466,7 +446,7 @@ export class HeaderMoveController extends Disposable {}private _checkInHeaderRange(rowOrColumn: number, type: HEADER_MOVE_TYPE = HEADER_MOVE_TYPE.ROW) {- const rangeDatas = this._selectionManagerService.getSelections();+ const selections = this._selectionManagerService.getSelections();const pluginName = this._selectionManagerService.getCurrent()?.pluginName;@@ -474,7 +454,7 @@ export class HeaderMoveController extends Disposable {return false;}- const matchSelectionData = rangeDatas?.find((data) => {+ const matchSelectionData = selections?.find((data) => {const range = data.range;const { startRow, endRow, startColumn, endColumn, rangeType } = range;if (type === HEADER_MOVE_TYPE.COLUMN) {@@ -506,7 +486,7 @@ export class HeaderMoveController extends Disposable {}private _clearObserverEvent() {- const { scene } = this._sheetObject;+ const scene = this._context.scene;scene.onPointerMoveObserver.remove(this._moveObserver);scene.onPointerUpObserver.remove(this._upObserver);this._moveObserver = null;@@ -514,7 +494,7 @@ export class HeaderMoveController extends Disposable {}private _newBackgroundAndLine() {- const { scene } = this._sheetObject;+ const scene = this._context.scene;this._moveHelperBackgroundShape = new Rect(HEADER_MOVE_CONTROLLER_BACKGROUND, {fill: HEADER_MOVE_CONTROLLER_BACKGROUND_FILL,evented: false,@@ -536,8 +516,4 @@ export class HeaderMoveController extends Disposable {this._moveHelperBackgroundShape?.dispose();this._moveHelperLineShape?.dispose();}-- private _getSheetObject() {- return getSheetObject(this._univerInstanceService, this._renderManagerService);- }}diff --git a/packages/sheets-ui/src/controllers/header-resize.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.tssimilarity index 91%rename from packages/sheets-ui/src/controllers/header-resize.render-controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.tsindex 0b8389f265..baed180401 100644--- a/packages/sheets-ui/src/controllers/header-resize.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/header-resize.render-controller.ts@@ -22,7 +22,7 @@ import {ICommandService,toDisposable,} from '@univerjs/core';-import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController } from '@univerjs/engine-render';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController, SpreadsheetColumnHeader, SpreadsheetHeader } from '@univerjs/engine-render';import { CURSOR_TYPE, DeviceInputEventType, Rect, Vector2 } from '@univerjs/engine-render';import type {IDeltaColumnWidthCommandParams,@@ -32,16 +32,16 @@ import type {import { DeltaColumnWidthCommand, DeltaRowHeightCommand, SetWorksheetRowIsAutoHeightCommand } from '@univerjs/sheets';import { Inject } from '@wendellhu/redi';-import { SHEET_COMPONENT_HEADER_LAYER_INDEX, VIEWPORT_KEY } from '../common/keys';-import { IEditorBridgeService } from '../services/editor-bridge.service';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';+import { SHEET_COMPONENT_HEADER_LAYER_INDEX, SHEET_VIEW_KEY, VIEWPORT_KEY } from '../../common/keys';+import { IEditorBridgeService } from '../../services/editor-bridge.service';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';import {HEADER_MENU_SHAPE_THUMB_SIZE,HEADER_MENU_SHAPE_WIDTH_HEIGHT,HEADER_RESIZE_SHAPE_TYPE,HeaderMenuResizeShape,-} from '../views/header-resize-shape';-import { getCoordByOffset, getSheetObject, getTransformCoord } from './utils/component-tools';+} from '../../views/header-resize-shape';+import { getCoordByOffset, getTransformCoord } from '../utils/component-tools';const HEADER_RESIZE_CONTROLLER_SHAPE_ROW = '__SpreadsheetHeaderResizeControllerShapeRow__';@@ -60,7 +60,7 @@ enum HEADER_RESIZE_TYPE {}-export class HeaderResizeController extends Disposable implements IRenderController {+export class HeaderResizeRenderController extends Disposable implements IRenderController {private _currentRow: number = 0;private _currentColumn: number = 0;@@ -99,13 +99,8 @@ export class HeaderResizeController extends Disposable implements IRenderControlthis._columnResizeRect?.dispose();this._columnResizeRect = null;- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-- const { spreadsheetRowHeader, spreadsheetColumnHeader } = sheetObject;-+ const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;this._observers.forEach((observer) => {spreadsheetRowHeader.onPointerMoveObserver.remove(observer);spreadsheetRowHeader.onPointerLeaveObserver.remove(observer);@@ -117,12 +112,7 @@ export class HeaderResizeController extends Disposable implements IRenderControl}private _init() {- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-- const { scene } = sheetObject;+ const scene = this._context.scene;this._rowResizeRect = new HeaderMenuResizeShape(HEADER_RESIZE_CONTROLLER_SHAPE_ROW, {visible: false,@@ -148,12 +138,9 @@ export class HeaderResizeController extends Disposable implements IRenderControl}private _initialHover(initialType: HEADER_RESIZE_TYPE = HEADER_RESIZE_TYPE.ROW) {- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }-- const { spreadsheetRowHeader, spreadsheetColumnHeader, scene } = sheetObject;+ const spreadsheetColumnHeader = this._context.components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetRowHeader = this._context.components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetHeader;+ const scene = this._context.scene;const eventBindingObject =initialType === HEADER_RESIZE_TYPE.ROW ? spreadsheetRowHeader : spreadsheetColumnHeader;@@ -263,8 +250,7 @@ export class HeaderResizeController extends Disposable implements IRenderControl}private _initialHoverResize(initialType: HEADER_RESIZE_TYPE = HEADER_RESIZE_TYPE.ROW) {- const sheetObject = this._getSheetObject()!;- const { scene } = sheetObject;+ const scene = this._context.scene;const eventBindingObject =initialType === HEADER_RESIZE_TYPE.ROW ? this._rowResizeRect : this._columnResizeRect;@@ -310,8 +296,8 @@ export class HeaderResizeController extends Disposable implements IRenderControlconst skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;if (skeleton == null) return;- const sheetObject = this._getSheetObject();- const { scene } = sheetObject;+ const scene = this._context.scene;+const engine = scene.getEngine();const canvasMaxHeight = engine?.height || 0;const canvasMaxWidth = engine?.width || 0;@@ -455,17 +441,13 @@ export class HeaderResizeController extends Disposable implements IRenderControl});this._upObserver = scene.onPointerUpObserver.add((upEvt: IPointerEvent | IMouseEvent) => {- const sheetObject = this._getSheetObject();+ const scene = this._context.scene;- if (sheetObject == null) {- return;- }this._clearObserverEvent();this._resizeHelperShape?.dispose();this._resizeHelperShape = null;- const { scene } = sheetObject;scene.enableEvent();if (isStartMove) {@@ -498,8 +480,8 @@ export class HeaderResizeController extends Disposable implements IRenderControltoDisposable(eventBindingObject.onDblclickObserver.add(() => {if (initialType === HEADER_RESIZE_TYPE.ROW) {- const sheetObject = this._getSheetObject();- const { scene } = sheetObject;+ const scene = this._context.scene;+scene.resetCursor();this._commandService.executeCommand<ISetWorksheetRowIsAutoHeightCommandParams>(@@ -517,15 +499,11 @@ export class HeaderResizeController extends Disposable implements IRenderControl}private _clearObserverEvent() {- const sheetObject = this._getSheetObject();- const { scene } = sheetObject;+ const scene = this._context.scene;+scene.onPointerMoveObserver.remove(this._moveObserver);scene.onPointerUpObserver.remove(this._upObserver);this._moveObserver = null;this._upObserver = null;}-- private _getSheetObject() {- return getSheetObject(this._context.unit, this._context)!;- }}diff --git a/packages/sheets-ui/src/controllers/header-unhide.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/header-unhide.render-controller.tssimilarity index 83%rename from packages/sheets-ui/src/controllers/header-unhide.render-controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/header-unhide.render-controller.tsindex e057cb1673..a9c6d8fd8d 100644--- a/packages/sheets-ui/src/controllers/header-unhide.render-controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/header-unhide.render-controller.ts@@ -38,10 +38,10 @@ import {import { Inject } from '@wendellhu/redi';import { takeUntil } from 'rxjs';-import { SHEET_COMPONENT_UNHIDE_LAYER_INDEX } from '../common/keys';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import { HeaderUnhideShape, HeaderUnhideShapeType, UNHIDE_ICON_SIZE } from '../views/header-unhide-shape';-import { getCoordByCell, getSheetObject } from './utils/component-tools';+import { SHEET_COMPONENT_UNHIDE_LAYER_INDEX } from '../../common/keys';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';+import { HeaderUnhideShape, HeaderUnhideShapeType, UNHIDE_ICON_SIZE } from '../../views/header-unhide-shape';+import { getCoordByCell, getSheetObject } from '../utils/component-tools';const HEADER_UNHIDE_CONTROLLER_SHAPE = '__SpreadsheetHeaderUnhideSHAPEControllerShape__';@@ -84,38 +84,33 @@ export class HeaderUnhideRenderController extends RxDisposable {private _init(): void {let activeSheetId: string = '';- this._context.unit.activeSheet$.pipe(takeUntil(this.dispose$))- .subscribe((worksheet) => {- this._clearShapes();+ this._context.unit.activeSheet$.pipe(takeUntil(this.dispose$)).subscribe((worksheet) => {+ this._clearShapes();- if (!worksheet) {- activeSheetId = '';- return;- };+ if (!worksheet) {+ activeSheetId = '';+ return;+ };- activeSheetId = worksheet.getSheetId();- this._update(this._workbook, worksheet);- });+ activeSheetId = worksheet.getSheetId();+ this._update(this._workbook, worksheet);+ });// Re-render hidden rows / cols when specific commands are executed.- this.disposeWithMe(- this._commandService.onCommandExecuted((command) => {- if (- !RENDER_COMMANDS.includes(command.id) ||- !command.params ||- !(command.params as ISheetCommandSharedParams).unitId ||- (command.params as ISheetCommandSharedParams).subUnitId !== activeSheetId- ) {- return;- }-- const workbook = this._workbook;- const worksheet = workbook.getSheetBySheetId((command.params as ISheetCommandSharedParams).subUnitId);- if (worksheet) {- this._update(workbook, worksheet);- }- })- );+ this.disposeWithMe(this._commandService.onCommandExecuted((command) => {+ if (!RENDER_COMMANDS.includes(command.id) ||+ !command.params ||+ !(command.params as ISheetCommandSharedParams).unitId ||+ (command.params as ISheetCommandSharedParams).subUnitId !== activeSheetId) {+ return;+ }++ const workbook = this._workbook;+ const worksheet = workbook.getSheetBySheetId((command.params as ISheetCommandSharedParams).subUnitId);+ if (worksheet) {+ this._update(workbook, worksheet);+ }+ }));}private _update(workbook: Workbook, worksheet: Worksheet): void {@@ -188,6 +183,7 @@ export class HeaderUnhideRenderController extends RxDisposable {scene.addObjects(colShapes, SHEET_COMPONENT_UNHIDE_LAYER_INDEX);scene.addObjects(rowShapes, SHEET_COMPONENT_UNHIDE_LAYER_INDEX);+// 3. clear the previous shapes and update the shapesthis._clearShapes();this._shapes = { cols: colShapes, rows: rowShapes };diff --git a/packages/sheets-ui/src/controllers/scroll.controller.ts b/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.tssimilarity index 91%rename from packages/sheets-ui/src/controllers/scroll.controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.tsindex c9c808b1d2..d39750558f 100644--- a/packages/sheets-ui/src/controllers/scroll.controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/scroll.render-controller.ts@@ -20,32 +20,30 @@ import {Disposable,ICommandService,IUniverInstanceService,- LifecycleStages,- OnLifecycle,toDisposable,- UniverInstanceType,} from '@univerjs/core';+import type { IRenderContext, IRenderController } from '@univerjs/engine-render';import { IRenderManagerService } from '@univerjs/engine-render';import { ScrollToCellOperation, SelectionManagerService } from '@univerjs/sheets';import { Inject } from '@wendellhu/redi';-import { ScrollCommand } from '../commands/commands/set-scroll.command';-import { VIEWPORT_KEY } from '../common/keys';-import { ScrollManagerService } from '../services/scroll-manager.service';-import type { ISheetSkeletonManagerParam } from '../services/sheet-skeleton-manager.service';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import type { IExpandSelectionCommandParams } from '../commands/commands/set-selection.command';-import { ExpandSelectionCommand, MoveSelectionCommand, MoveSelectionEnterAndTabCommand } from '../commands/commands/set-selection.command';-import { getSheetObject } from './utils/component-tools';+import { ScrollCommand } from '../../commands/commands/set-scroll.command';+import { VIEWPORT_KEY } from '../../common/keys';+import { ScrollManagerService } from '../../services/scroll-manager.service';+import type { ISheetSkeletonManagerParam } from '../../services/sheet-skeleton-manager.service';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';+import type { IExpandSelectionCommandParams } from '../../commands/commands/set-selection.command';+import { ExpandSelectionCommand, MoveSelectionCommand, MoveSelectionEnterAndTabCommand } from '../../commands/commands/set-selection.command';+import { getSheetObject } from '../utils/component-tools';const SHEET_NAVIGATION_COMMANDS = [MoveSelectionCommand.id, MoveSelectionEnterAndTabCommand.id];/*** This controller handles scroll logic in sheet interaction.*/-@OnLifecycle(LifecycleStages.Rendered, ScrollController)-export class ScrollController extends Disposable {+export class SheetsScrollRenderController extends Disposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@ICommandService private readonly _commandService: ICommandService,@@ -306,7 +304,7 @@ export class ScrollController extends Disposable {}private _getSheetObject() {- return getSheetObject(this._univerInstanceService, this._renderManagerService);+ return getSheetObject(this._context.unit, this._context);}private _scrollToSelectionByDirection(range: IRange) {@@ -381,31 +379,18 @@ export class ScrollController extends Disposable {private _scrollToCell(row: number, column: number): boolean {const { rowHeightAccumulation, columnWidthAccumulation } = this._sheetSkeletonManagerService.getCurrent()?.skeleton ?? {};- if (rowHeightAccumulation == null || columnWidthAccumulation == null) {- return false;- }+ if (rowHeightAccumulation == null || columnWidthAccumulation == null) return false;const scene = this._getSheetObject()?.scene;- if (scene == null) {- return false;- }+ if (scene == null) return false;const viewport = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);- if (viewport == null) {- return false;- }-- const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return false;- }+ if (viewport == null) return false;const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;- if (skeleton == null) {- return false;- }+ if (skeleton == null) return false;- const worksheet = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getActiveSheet();+ const worksheet = this._context.unit.getActiveSheet();const {startColumn: freezeStartColumn,startRow: freezeStartRow,@@ -414,9 +399,8 @@ export class ScrollController extends Disposable {} = worksheet.getFreeze();const bounds = this._getViewportBounding();- if (bounds == null) {- return false;- }+ if (bounds == null) return false;+const {startRow: viewportStartRow,startColumn: viewportStartColumn,@@ -464,9 +448,7 @@ export class ScrollController extends Disposable {}}- if (startSheetViewRow === undefined && startSheetViewColumn === undefined) {- return false;- }+ if (startSheetViewRow === undefined && startSheetViewColumn === undefined) return false;const { offsetX, offsetY } = this._scrollManagerService.getCurrentScroll() || {};return this._commandService.syncExecuteCommand(ScrollCommand.id, {diff --git a/packages/sheets-ui/src/controllers/selection.controller.ts b/packages/sheets-ui/src/controllers/render-controllers/selection.render-controller.tssimilarity index 67%rename from packages/sheets-ui/src/controllers/selection.controller.tsrename to packages/sheets-ui/src/controllers/render-controllers/selection.render-controller.tsindex 7297216d4f..21a4100abf 100644--- a/packages/sheets-ui/src/controllers/selection.controller.ts+++ b/packages/sheets-ui/src/controllers/render-controllers/selection.render-controller.ts@@ -18,16 +18,12 @@ import type { ICommandInfo, Workbook } from '@univerjs/core';import {Disposable,ICommandService,- IUniverInstanceService,- LifecycleStages,- OnLifecycle,RANGE_TYPE,ThemeService,toDisposable,- UniverInstanceType,} from '@univerjs/core';-import type { IMouseEvent, IPointerEvent, SpreadsheetSkeleton } from '@univerjs/engine-render';-import { IRenderManagerService, ScrollTimerType, Vector2 } from '@univerjs/engine-render';+import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderController, SpreadsheetSkeleton } from '@univerjs/engine-render';+import { ScrollTimerType, Vector2 } from '@univerjs/engine-render';import type { ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';import {convertSelectionDataToRange,@@ -44,39 +40,42 @@ import {import { Inject } from '@wendellhu/redi';import { deserializeRangeWithSheet, IDefinedNamesService, isReferenceStrings, operatorToken } from '@univerjs/engine-formula';-import type { ISetZoomRatioOperationParams } from '../commands/operations/set-zoom-ratio.operation';-import { SetZoomRatioOperation } from '../commands/operations/set-zoom-ratio.operation';-import { VIEWPORT_KEY } from '../common/keys';-import { ISelectionRenderService } from '../services/selection/selection-render.service';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import type { ISheetObjectParam } from './utils/component-tools';-import { getSheetObject } from './utils/component-tools';--@OnLifecycle(LifecycleStages.Rendered, SelectionController)-export class SelectionController extends Disposable {+import type { ISetZoomRatioOperationParams } from '../../commands/operations/set-zoom-ratio.operation';+import { SetZoomRatioOperation } from '../../commands/operations/set-zoom-ratio.operation';+import { VIEWPORT_KEY } from '../../common/keys';+import { ISelectionRenderService } from '../../services/selection/selection-render.service';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';+import type { ISheetObjectParam } from '../utils/component-tools';+import { getSheetObject } from '../utils/component-tools';++export class SelectionRenderController extends Disposable implements IRenderController {constructor(+ private readonly _context: IRenderContext<Workbook>,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@ICommandService private readonly _commandService: ICommandService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,- @ISelectionRenderService- private readonly _selectionRenderService: ISelectionRenderService,+ // TODO@wzhudev: it is really necessary to split the selection services?+ @ISelectionRenderService private readonly _selectionRenderService: ISelectionRenderService,@Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,@Inject(ThemeService) private readonly _themeService: ThemeService,@IDefinedNamesService private readonly _definedNamesService: IDefinedNamesService) {super();- this._initialize();+ this._init();}- private _initialize() {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ override dispose(): void {+ super.dispose();++ this._selectionRenderService.changeRuntime(null, null);+ this._selectionRenderService.reset();+ this._selectionManagerService.reset();+ }++ private _init() {+ const workbook = this._context.unit;const worksheet = workbook.getActiveSheet();const sheetObject = this._getSheetObject();- if (sheetObject == null) {- return;- }this._initViewMainListener(sheetObject);this._initRowHeader(sheetObject);@@ -100,40 +99,38 @@ export class SelectionController extends Disposable {private _initDefinedNameListener() {this.disposeWithMe(- toDisposable(- this._definedNamesService.focusRange$.subscribe(async (item) => {- if (item == null) {- return;- }+ this._definedNamesService.focusRange$.subscribe(async (item) => {+ if (item == null) {+ return;+ }- const { unitId } = item;- let { formulaOrRefString } = item;+ const { unitId } = item;+ let { formulaOrRefString } = item;- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const workbook = this._context.unit;- if (unitId !== workbook.getUnitId()) {- return;- }+ if (unitId !== workbook.getUnitId()) {+ return;+ }- if (formulaOrRefString.substring(0, 1) === operatorToken.EQUALS) {- formulaOrRefString = formulaOrRefString.substring(1);- }+ if (formulaOrRefString.substring(0, 1) === operatorToken.EQUALS) {+ formulaOrRefString = formulaOrRefString.substring(1);+ }- const result = isReferenceStrings(formulaOrRefString);+ const result = isReferenceStrings(formulaOrRefString);- if (!result) {- return;- }+ if (!result) {+ return;+ }- const selections = await this._getSelections(workbook, unitId, formulaOrRefString);+ const selections = await this._getSelections(workbook, unitId, formulaOrRefString);- this._selectionManagerService.replace(selections);+ this._selectionManagerService.replace(selections);- this._commandService.executeCommand(ScrollToCellOperation.id, selections[0].range);- })- )+ this._commandService.executeCommand(ScrollToCellOperation.id, selections[0].range);+ }));}@@ -236,7 +233,7 @@ export class SelectionController extends Disposable {private _refreshSelection(params: readonly ISelectionWithStyle[]) {const selections = params.map((selectionWithStyle) => {- const selectionData = this._selectionRenderService.convertSelectionRangeToData(selectionWithStyle);+ const selectionData = this._selectionRenderService.convertSelectionToCoord(selectionWithStyle);selectionData.style = getNormalSelectionStyle(this._themeService);return selectionData;});@@ -248,22 +245,20 @@ export class SelectionController extends Disposable {const { spreadsheetRowHeader, spreadsheet } = sheetObject;this.disposeWithMe(- toDisposable(- spreadsheetRowHeader?.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent, state) => {- this._selectionRenderService.disableDetectMergedCell();- this._selectionRenderService.eventTrigger(- evt,- (spreadsheet?.zIndex || 1) + 1,- RANGE_TYPE.ROW,- this._getActiveViewport(evt),- ScrollTimerType.Y- );-- if (evt.button !== 2) {- state.stopPropagation();- }- })- )+ spreadsheetRowHeader?.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent, state) => {+ this._selectionRenderService.disableDetectMergedCell();+ this._selectionRenderService.eventTrigger(+ evt,+ (spreadsheet?.zIndex || 1) + 1,+ RANGE_TYPE.ROW,+ this._getActiveViewport(evt),+ ScrollTimerType.Y+ );++ if (evt.button !== 2) {+ state.stopPropagation();+ }+ }));// spreadsheetRowHeader?.onPointerMoveObserver.add((evt: IPointerEvent | IMouseEvent, state) => {});@@ -273,52 +268,48 @@ export class SelectionController extends Disposable {const { spreadsheetColumnHeader, spreadsheet } = sheetObject;this.disposeWithMe(- toDisposable(- spreadsheetColumnHeader?.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent, state) => {- this._selectionRenderService.disableDetectMergedCell();-- this._selectionRenderService.eventTrigger(- evt,- (spreadsheet?.zIndex || 1) + 1,- RANGE_TYPE.COLUMN,- this._getActiveViewport(evt),- ScrollTimerType.X- );-- if (evt.button !== 2) {- state.stopPropagation();- }- })- )+ spreadsheetColumnHeader?.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent, state) => {+ this._selectionRenderService.disableDetectMergedCell();++ this._selectionRenderService.eventTrigger(+ evt,+ (spreadsheet?.zIndex || 1) + 1,+ RANGE_TYPE.COLUMN,+ this._getActiveViewport(evt),+ ScrollTimerType.X+ );++ if (evt.button !== 2) {+ state.stopPropagation();+ }+ }));}private _initLeftTop(sheetObject: ISheetObjectParam) {const { spreadsheetLeftTopPlaceholder } = sheetObject;this.disposeWithMe(- toDisposable(- spreadsheetLeftTopPlaceholder?.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent, state) => {- const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;- if (skeleton == null) {- return;- }+ spreadsheetLeftTopPlaceholder?.onPointerDownObserver.add((evt: IPointerEvent | IMouseEvent, state) => {+ const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;+ if (skeleton == null) {+ return;+ }- this._selectionRenderService.reset();+ this._selectionRenderService.reset();- const selectionWithStyle = this._getAllRange(skeleton);+ const selectionWithStyle = this._getAllRange(skeleton);- const selectionData = this._selectionRenderService.convertSelectionRangeToData(selectionWithStyle);- this._selectionRenderService.addControlToCurrentByRangeData(selectionData);+ const selectionData = this._selectionRenderService.convertSelectionToCoord(selectionWithStyle);+ this._selectionRenderService.addControlToCurrentByRangeData(selectionData);- this._selectionRenderService.refreshSelectionMoveStart();+ this._selectionRenderService.refreshSelectionMoveStart();// this._selectionManagerService.replace([selectionWithStyle]);- if (evt.button !== 2) {- state.stopPropagation();- }- })- )+ if (evt.button !== 2) {+ state.stopPropagation();+ }+ }));}@@ -336,7 +327,7 @@ export class SelectionController extends Disposable {continue;}const selectionData =- this._selectionRenderService.convertSelectionRangeToData(selectionWithStyle);+ this._selectionRenderService.convertSelectionToCoord(selectionWithStyle);this._selectionRenderService.addControlToCurrentByRangeData(selectionData);}@@ -376,7 +367,7 @@ export class SelectionController extends Disposable {}const lastSelection = params[params.length - 1];- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const workbook = this._context.unit;const worksheet = workbook.getActiveSheet();this._definedNamesService.setCurrentRange({@@ -387,21 +378,21 @@ export class SelectionController extends Disposable {}private _initUserActionSyncListener() {- this._selectionRenderService.selectionMoveStart$.subscribe((params) => {+ this.disposeWithMe(this._selectionRenderService.selectionMoveStart$.subscribe((params) => {this._move(params, SelectionMoveType.MOVE_START);- });+ }));- this._selectionRenderService.selectionMoving$.subscribe((params) => {+ this.disposeWithMe(this._selectionRenderService.selectionMoving$.subscribe((params) => {this._move(params, SelectionMoveType.MOVING);- });+ }));- this._selectionRenderService.selectionMoveEnd$.subscribe((params) => {+ this.disposeWithMe(this._selectionRenderService.selectionMoveEnd$.subscribe((params) => {this._move(params, SelectionMoveType.MOVE_END);- });+ }));}private _move(selectionDataWithStyleList: ISelectionWithCoordAndStyle[], type: SelectionMoveType) {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);+ const workbook = this._context.unit;if (!workbook) return;const unitId = workbook.getUnitId();@@ -424,44 +415,37 @@ export class SelectionController extends Disposable {}private _getSheetObject() {- return getSheetObject(this._univerInstanceService, this._renderManagerService);+ return getSheetObject(this._context.unit, this._context)!;}private _initCommandListener() {const updateCommandList = [SetZoomRatioOperation.id];- this.disposeWithMe(- this._commandService.onCommandExecuted((command: ICommandInfo) => {- if (updateCommandList.includes(command.id)) {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;- const worksheet = workbook.getActiveSheet();-- const params = command.params as ISetZoomRatioOperationParams;- const { unitId, subUnitId } = params;- if (!(unitId === workbook.getUnitId() && subUnitId === worksheet.getSheetId())) {- return;- }+ this.disposeWithMe(this._commandService.onCommandExecuted((command: ICommandInfo) => {+ if (updateCommandList.includes(command.id)) {+ const workbook = this._context.unit;+ const worksheet = workbook.getActiveSheet();- this._selectionManagerService.refreshSelection();+ const params = command.params as ISetZoomRatioOperationParams;+ const { unitId, subUnitId } = params;+ if (!(unitId === workbook.getUnitId() && subUnitId === worksheet.getSheetId())) {+ return;}- })- );++ this._selectionManagerService.refreshSelection();+ }+ }));}private _initSkeletonChangeListener() {- this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {+ this.disposeWithMe(this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {if (param == null) {+ this._selectionRenderService.changeRuntime(null, null);return;}- const { unitId, sheetId, skeleton } = param;- const currentRender = this._renderManagerService.getRenderById(unitId);-- if (currentRender == null) {- return;- }-- const { scene } = currentRender;+ const { unitId, sheetId, skeleton } = param;+ const { scene } = this._context;const viewportMain = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);@@ -495,7 +479,7 @@ export class SelectionController extends Disposable {this._selectionManagerService.add([this._getZeroRange(skeleton)]);}}- });+ }));}private _getAllRange(skeleton: SpreadsheetSkeleton): ISelectionWithStyle {diff --git a/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.tsnew file mode 100644index 0000000000..cf732b1e13--- /dev/null+++ b/packages/sheets-ui/src/controllers/render-controllers/sheet.render-controller.ts@@ -0,0 +1,16 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+diff --git a/packages/sheets-ui/src/controllers/render-controllers/zoom.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/zoom.render-controller.tsnew file mode 100644index 0000000000..56af895471--- /dev/null+++ b/packages/sheets-ui/src/controllers/render-controllers/zoom.render-controller.ts@@ -0,0 +1,108 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { Workbook } from '@univerjs/core';+import { Disposable, ICommandService } from '@univerjs/core';+import type { IRenderContext, IRenderController, IWheelEvent } from '@univerjs/engine-render';+import { Inject } from '@wendellhu/redi';+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';+import { getSheetObject } from '../utils/component-tools';+import { SetZoomRatioCommand } from '../../commands/commands/set-zoom-ratio.command';++export class SheetsZoomRenderController extends Disposable implements IRenderController {+ constructor(+ private readonly _context: IRenderContext<Workbook>,+ @Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,+ @ICommandService private readonly _commandService: ICommandService+ ) {+ super();++ this._skeletonListener();+ this._zoomEventBinding();+ }++ updateZoom(worksheetId: string, zoomRatio: number): boolean {+ const worksheet = this._context.unit.getSheetBySheetId(worksheetId);+ if (!worksheet) return false;++ worksheet.getConfig().zoomRatio = zoomRatio;+ if (worksheet === this._context.unit.getActiveSheet()) {+ this._updateViewZoom(zoomRatio);+ }++ return true;+ }++ private _zoomEventBinding() {+ const scene = this._getSheetObject()?.scene;+ if (scene == null) {+ return;+ }++ this.disposeWithMe(+ scene.onMouseWheelObserver.add((e: IWheelEvent) => {+ if (!e.ctrlKey) {+ return;+ }++ const deltaFactor = Math.abs(e.deltaX);+ let ratioDelta = deltaFactor < 40 ? 0.2 : deltaFactor < 80 ? 0.4 : 0.2;+ ratioDelta *= e.deltaY > 0 ? -1 : 1;+ if (scene.scaleX < 1) {+ ratioDelta /= 2;+ }++ const workbook = this._context.unit;+ const sheet = workbook.getActiveSheet();+ const currentRatio = sheet.getZoomRatio();+ let nextRatio = +Number.parseFloat(`${currentRatio + ratioDelta}`).toFixed(1);+ nextRatio = nextRatio >= 4 ? 4 : nextRatio <= 0.1 ? 0.1 : nextRatio;++ this._commandService.executeCommand(SetZoomRatioCommand.id, {+ zoomRatio: Math.round(nextRatio * 10) / 10,+ unitId: workbook.getUnitId(),+ subUnitId: sheet.getSheetId(),+ });++ e.preventDefault();+ })+ );+ }++ private _skeletonListener() {+ this.disposeWithMe(this._sheetSkeletonManagerService.currentSkeletonBefore$.subscribe((param) => {+ if (param == null) {+ return;+ }++ const workbook = this._context.unit;+ const worksheet = workbook.getActiveSheet();+ const zoomRatio = worksheet.getZoomRatio() || 1;+ this._updateViewZoom(zoomRatio);+ }));+ }+++ private _updateViewZoom(zoomRatio: number) {+ const sheetObject = this._getSheetObject();+ sheetObject?.scene.scale(zoomRatio, zoomRatio);+ sheetObject?.spreadsheet.makeForceDirty();+ }++ private _getSheetObject() {+ return getSheetObject(this._context.unit, this._context);+ }+}diff --git a/packages/sheets-ui/src/controllers/sheet-render.controller.ts b/packages/sheets-ui/src/controllers/sheet-render.controller.tsindex 51400785c0..6a674d2362 100644--- a/packages/sheets-ui/src/controllers/sheet-render.controller.ts+++ b/packages/sheets-ui/src/controllers/sheet-render.controller.ts@@ -14,9 +14,9 @@* limitations under the License.*/-import type { ICommandInfo, Workbook } from '@univerjs/core';-import {- CommandType,+import type { ICommandInfo,+ Workbook } from '@univerjs/core';+import { CommandType,ICommandService,IContextService,IUniverInstanceService,@@ -57,8 +57,7 @@ export class SheetRenderController extends RxDisposable {@ICommandService private readonly _commandService: ICommandService) {super();-- this._init();+ Promise.resolve().then(() => this._init());}/**@@ -78,50 +77,64 @@ export class SheetRenderController extends RxDisposable {private _init() {this._initialRenderRefresh();- this._initSheetDisposeListener();+ this._initWorkbookListener();this._initCommandListener();this._initContextListener();}private _initialRenderRefresh(): void {- this.disposeWithMe(- this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {- if (!param) return null;-- const { skeleton: spreadsheetSkeleton, unitId, sheetId } = param;- const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);- const worksheet = workbook?.getSheetBySheetId(sheetId);- if (workbook == null || worksheet == null) return;-- const currentRender = this._renderManagerService.getRenderById(unitId);- if (currentRender == null) return;-- const { mainComponent, components } = currentRender;- const spreadsheet = mainComponent as Spreadsheet;- const spreadsheetRowHeader = components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetRowHeader;- const spreadsheetColumnHeader = components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;- const spreadsheetLeftTopPlaceholder = components.get(SHEET_VIEW_KEY.LEFT_TOP) as Rect;- const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;-- spreadsheet?.updateSkeleton(spreadsheetSkeleton);- spreadsheetRowHeader?.updateSkeleton(spreadsheetSkeleton);- spreadsheetColumnHeader?.updateSkeleton(spreadsheetSkeleton);- spreadsheetLeftTopPlaceholder?.transformByState({- width: rowHeaderWidth,- height: columnHeaderHeight,- });- })- );+ this.disposeWithMe(this._sheetSkeletonManagerService.currentSkeleton$.subscribe((param) => {+ if (!param) return null;++ const { skeleton: spreadsheetSkeleton, unitId, sheetId } = param;+ const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);+ const worksheet = workbook?.getSheetBySheetId(sheetId);+ if (workbook == null || worksheet == null) return;++ const currentRender = this._renderManagerService.getRenderById(unitId);+ if (currentRender == null) return;++ const { mainComponent, components } = currentRender;+ const spreadsheet = mainComponent as Spreadsheet;+ const spreadsheetRowHeader = components.get(SHEET_VIEW_KEY.ROW) as SpreadsheetRowHeader;+ const spreadsheetColumnHeader = components.get(SHEET_VIEW_KEY.COLUMN) as SpreadsheetColumnHeader;+ const spreadsheetLeftTopPlaceholder = components.get(SHEET_VIEW_KEY.LEFT_TOP) as Rect;+ const { rowHeaderWidth, columnHeaderHeight } = spreadsheetSkeleton;++ spreadsheet?.updateSkeleton(spreadsheetSkeleton);+ spreadsheetRowHeader?.updateSkeleton(spreadsheetSkeleton);+ spreadsheetColumnHeader?.updateSkeleton(spreadsheetSkeleton);+ spreadsheetLeftTopPlaceholder?.transformByState({+ width: rowHeaderWidth,+ height: columnHeaderHeight,+ });+ }));}- private _initSheetDisposeListener(): void {+ private _initWorkbookListener(): void {+ this._univerInstanceService.getTypeOfUnitAdded$<Workbook>(UniverInstanceType.UNIVER_SHEET)+ .pipe(takeUntil(this.dispose$))+ .subscribe((workbook) => this._createSheetRenderer(workbook));+this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => {const unitId = workbook.getUnitId();this._sheetSkeletonManagerService.removeSkeleton({ unitId });+ this._renderManagerService.removeRender(unitId);});++ this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET)+ .forEach((workbook) => this._createSheetRenderer(workbook));+ }++ private _createSheetRenderer(workbook: Workbook): void {+ const unitId = workbook.getUnitId();+ this._renderManagerService.createRender(unitId);+ this._renderManagerService.setCurrent(unitId);+ const sheetId = workbook.getActiveSheet().getSheetId();+ this._sheetSkeletonManagerService.setCurrent({ sheetId, unitId });}private _initCommandListener(): void {diff --git a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/sheet-ui.controller.tsindex c33e363a14..ce9ed92900 100644--- a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts+++ b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts@@ -99,6 +99,7 @@ import { RenderSheetContent, RenderSheetFooter, RenderSheetHeader } from '../vieimport { DEFINED_NAME_CONTAINER } from '../views/defined-name/component-name';import { DefinedNameContainer } from '../views/defined-name/DefinedNameContainer';import { SidebarDefinedNameOperation } from '../commands/operations/sidebar-defined-name.operation';+import { AutoClearContentCommand, AutoFillCommand } from '../commands/commands/auto-fill.command';import { CellBorderSelectorMenuItemFactory } from './menu/border.menu';import {ClearSelectionAllMenuItemFactory,@@ -320,6 +321,8 @@ export class SheetUIController extends Disposable {InsertRangeMoveRightConfirmCommand,DeleteRangeMoveLeftConfirmCommand,SidebarDefinedNameOperation,+ AutoFillCommand,+ AutoClearContentCommand,].forEach((c) => {this.disposeWithMe(this._commandService.registerCommand(c));});diff --git a/packages/sheets-ui/src/controllers/status-bar.controller.ts b/packages/sheets-ui/src/controllers/status-bar.controller.tsindex ee2fd36bd7..bf3a7c25e7 100644--- a/packages/sheets-ui/src/controllers/status-bar.controller.ts+++ b/packages/sheets-ui/src/controllers/status-bar.controller.ts@@ -114,12 +114,21 @@ export class StatusBarController extends Disposable {);}+ private _clearResult(): void {+ this._statusBarService.setState(null);+ }+private _calculateSelection(selections: IRange[], primary: Nullable<ISelectionCell>) {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);+ if (!workbook) {+ return this._clearResult();+ }+const unitId = workbook.getUnitId();const sheetId = workbook.getActiveSheet().getSheetId();const sheetData: ISheetData = {};const arrayFormulaMatrixCell = this._formulaDataModel.getArrayFormulaCellData();+this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getSheets()@@ -133,6 +142,7 @@ export class StatusBarController extends Disposable {columnData: sheetConfig.columnData,};});+if (selections?.length) {const refs = selections.map((s) => new RangeReferenceObject(s, sheetId, unitId));refs.forEach((ref) => {@@ -180,11 +190,7 @@ export class StatusBarController extends Disposable {};this._statusBarService.setState(newState as IStatusBarServiceStatus);} else {- this._statusBarService.setState(null);+ this._clearResult();}}-- private _isSingleCell(range: IRange) {- return range.startRow === range.endRow && range.startColumn === range.endColumn;- }}diff --git a/packages/sheets-ui/src/controllers/utils/component-tools.ts b/packages/sheets-ui/src/controllers/utils/component-tools.tsindex a9cdff35b9..3c7eefc976 100644--- a/packages/sheets-ui/src/controllers/utils/component-tools.ts+++ b/packages/sheets-ui/src/controllers/utils/component-tools.ts@@ -45,6 +45,13 @@ function isRenderManagerService(renderManagerService: IRenderManagerService | IRreturn typeof (renderManagerService as IRenderContext).isMainScene === 'undefined';}+/**+ * @deprecated+ *+ * @param univerInstanceService+ * @param renderManagerService+ * @returns+ */export function getSheetObject(univerInstanceService: IUniverInstanceService | Workbook,renderManagerService: IRenderManagerService | IRenderContextdiff --git a/packages/sheets-ui/src/controllers/zoom.controller.ts b/packages/sheets-ui/src/controllers/zoom.controller.tsdeleted file mode 100644index 32880100e0..0000000000--- a/packages/sheets-ui/src/controllers/zoom.controller.ts+++ /dev/null@@ -1,164 +0,0 @@-/**- * Copyright 2023-present DreamNum Inc.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { ICommandInfo, Workbook } from '@univerjs/core';-import {- Disposable,- ICommandService,- IUniverInstanceService,- LifecycleStages,- OnLifecycle,- toDisposable,- UniverInstanceType,-} from '@univerjs/core';-import type { IWheelEvent } from '@univerjs/engine-render';-import { IRenderManagerService } from '@univerjs/engine-render';-import { SelectionManagerService } from '@univerjs/sheets';-import { Inject } from '@wendellhu/redi';--import { SetZoomRatioCommand } from '../commands/commands/set-zoom-ratio.command';-import { SetZoomRatioOperation } from '../commands/operations/set-zoom-ratio.operation';-import { VIEWPORT_KEY } from '../common/keys';-import { ScrollManagerService } from '../services/scroll-manager.service';-import { ISelectionRenderService } from '../services/selection/selection-render.service';-import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-import { getSheetObject } from './utils/component-tools';--interface ISetWorksheetMutationParams {- unitId: string;- subUnitId: string;-}--@OnLifecycle(LifecycleStages.Rendered, ZoomController)-export class ZoomController extends Disposable {- constructor(- @Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService,- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,- @ICommandService private readonly _commandService: ICommandService,- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,- @ISelectionRenderService- private readonly _selectionRenderService: ISelectionRenderService,-- @Inject(SelectionManagerService) private readonly _selectionManagerService: SelectionManagerService,- @Inject(ScrollManagerService) private readonly _scrollManagerService: ScrollManagerService- ) {- super();-- this._initialize();- }-- override dispose(): void {- super.dispose();- }-- private _initialize() {- this._skeletonListener();- this._commandExecutedListener();- this._zoomEventBinding();- }-- private _zoomEventBinding() {- const scene = this._getSheetObject()?.scene;- if (scene == null) {- return;- }-- const viewportMain = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);- this.disposeWithMe(- toDisposable(- scene.onMouseWheelObserver.add((e: IWheelEvent, state) => {- if (!e.ctrlKey) {- return;- }-- const deltaFactor = Math.abs(e.deltaX);- let ratioDelta = deltaFactor < 40 ? 0.2 : deltaFactor < 80 ? 0.4 : 0.2;- ratioDelta *= e.deltaY > 0 ? -1 : 1;- if (scene.scaleX < 1) {- ratioDelta /= 2;- }-- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;- const sheet = workbook.getActiveSheet();- const currentRatio = sheet.getZoomRatio();- let nextRatio = +Number.parseFloat(`${currentRatio + ratioDelta}`).toFixed(1);- nextRatio = nextRatio >= 4 ? 4 : nextRatio <= 0.1 ? 0.1 : nextRatio;-- this._commandService.executeCommand(SetZoomRatioCommand.id, {- zoomRatio: Math.round(nextRatio * 10) / 10,- unitId: workbook.getUnitId(),- subUnitId: sheet.getSheetId(),- });-- e.preventDefault();- })- )- );- }-- private _skeletonListener() {- this.disposeWithMe(- toDisposable(- this._sheetSkeletonManagerService.currentSkeletonBefore$.subscribe((param) => {- if (param == null) {- return;- }-- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;-- const worksheet = workbook.getActiveSheet();-- const zoomRatio = worksheet.getZoomRatio() || 1;-- this._updateViewZoom(zoomRatio);- })- )- );- }-- private _commandExecutedListener() {- const updateCommandList = [SetZoomRatioOperation.id];-- this.disposeWithMe(- this._commandService.onCommandExecuted((command: ICommandInfo) => {- if (updateCommandList.includes(command.id)) {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;- const worksheet = workbook.getActiveSheet();-- const params = command.params;- const { unitId, subUnitId } = params as ISetWorksheetMutationParams;- if (!(unitId === workbook.getUnitId() && subUnitId === worksheet.getSheetId())) {- return;- }-- const zoomRatio = worksheet.getConfig().zoomRatio || 1;-- this._updateViewZoom(zoomRatio);- }- })- );- }-- private _updateViewZoom(zoomRatio: number) {- const sheetObject = this._getSheetObject();- sheetObject?.scene.scale(zoomRatio, zoomRatio);- sheetObject?.spreadsheet.makeForceDirty();- }-- private _getSheetObject() {- return getSheetObject(this._univerInstanceService, this._renderManagerService);- }-}diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.tsindex 228aae00f2..fbbf0c5215 100644--- a/packages/sheets-ui/src/index.ts+++ b/packages/sheets-ui/src/index.ts@@ -23,7 +23,7 @@ export { expandToContinuousRange } from './commands/commands/utils/selection-utiexport { ExpandSelectionCommand, JumpOver, MoveSelectionCommand } from './commands/commands/set-selection.command';export { SetCellEditVisibleArrowOperation, SetCellEditVisibleOperation } from './commands/operations/cell-edit.operation';export { SetScrollOperation } from './commands/operations/scroll.operation';-export { ScrollController } from './controllers/scroll.controller';+export { SheetsScrollRenderController } from './controllers/render-controllers/scroll.render-controller';export { deriveStateFromActiveSheet$ } from './controllers/menu/menu-util';export { SheetRenderController } from './controllers/sheet-render.controller';export { SetZoomRatioOperation } from './commands/operations/set-zoom-ratio.operation';@@ -47,6 +47,7 @@ export {getSheetObject,getTransformCoord,} from './controllers/utils/component-tools';+export { useActiveWorkbook, useActiveWorksheet } from './components/hook';export { whenSheetEditorFocused } from './controllers/shortcuts/utils';export type { IEditorBridgeServiceParam } from './services/editor-bridge.service';export { enUS, zhCN } from './locale';@@ -81,7 +82,7 @@ export { UniverSheetsUIPlugin } from './sheets-ui-plugin';export { SheetCanvasView } from './views/sheet-canvas-view';export { HoverManagerService } from './services/hover-manager.service';export { CellAlertManagerService, CellAlertType, type ICellAlert } from './services/cell-alert-manager.service';-export { HoverController } from './controllers/hover.controller';+export { HoverRenderController } from './controllers/hover-render.controller';export { SHEET_VIEW_KEY } from './common/keys';export { SheetCanvasPopManagerService } from './services/canvas-pop-manager.service';export { mergeSetRangeValues } from './services/clipboard/utils';diff --git a/packages/sheets-ui/src/services/auto-fill/auto-fill.service.ts b/packages/sheets-ui/src/services/auto-fill/auto-fill.service.tsindex 65db1dddbf..f7029d981c 100644--- a/packages/sheets-ui/src/services/auto-fill/auto-fill.service.ts+++ b/packages/sheets-ui/src/services/auto-fill/auto-fill.service.ts@@ -14,21 +14,27 @@* limitations under the License.*/-import type { Nullable } from '@univerjs/core';+import type { IMutationInfo, Nullable, Workbook } from '@univerjs/core';import {Direction,Disposable,+ ICommandService,+ IUndoRedoService,IUniverInstanceService,LifecycleStages,OnLifecycle,+ RANGE_TYPE,+ Rectangle,toDisposable,+ UniverInstanceType,} from '@univerjs/core';-import { SelectionManagerService, SheetInterceptorService } from '@univerjs/sheets';+import { SelectionManagerService, SetSelectionsOperation } from '@univerjs/sheets';import type { IDisposable } from '@wendellhu/redi';import { createIdentifier, Inject } from '@wendellhu/redi';import type { Observable } from 'rxjs';import { BehaviorSubject } from 'rxjs';+import { discreteRangeToRange } from '../../controllers/utils/range-tools';import {chnNumberRule,chnWeek2Rule,@@ -67,6 +73,7 @@ export interface IAutoFillService {getAllHooks(): ISheetAutoFillHook[];getActiveHooks(): ISheetAutoFillHook[];addHook(hook: ISheetAutoFillHook): IDisposable;+ fillData(triggerUnitId: string, triggerSubUnitId: string): boolean;}export interface IApplyMenuItem {@@ -119,9 +126,10 @@ export class AutoFillService extends Disposable implements IAutoFillService {readonly menu$ = this._menu$.asObservable();constructor(- @Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,@Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,- @Inject(SelectionManagerService) private _selectionManagerService: SelectionManagerService+ @Inject(SelectionManagerService) private _selectionManagerService: SelectionManagerService,+ @ICommandService private _commandService: ICommandService,+ @IUndoRedoService private _undoRedoService: IUndoRedoService) {super();this._init();@@ -261,6 +269,67 @@ export class AutoFillService extends Disposable implements IAutoFillService {setShowMenu(show: boolean) {this._showMenu$.next(show);}++ fillData(triggerUnitId: string, triggerSubUnitId: string) {+ const {+ source,+ target,+ unitId = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId(),+ subUnitId = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getActiveSheet().getSheetId(),+ } = this.autoFillLocation || {};+ const direction = this.direction;+ if (!source || !target || unitId !== triggerUnitId || subUnitId !== triggerSubUnitId) {+ return false;+ }++ const selection = Rectangle.union(discreteRangeToRange(source), discreteRangeToRange(target));+ const applyType = this.applyType;+ const activeHooks = this.getActiveHooks();++ this._commandService.syncExecuteCommand(SetSelectionsOperation.id, {+ selections: [+ {+ primary: { ...(this._selectionManagerService.getLast()?.primary ?? selection) },+ range: {+ ...selection,+ rangeType: RANGE_TYPE.NORMAL,+ },+ },+ ],+ unitId,+ subUnitId,+ });++ const undos: IMutationInfo[] = [];+ const redos: IMutationInfo[] = [];+ activeHooks.forEach((hook) => {+ const { undos: hookUndos, redos: hookRedos } =+ hook.onFillData?.({ source, target, unitId, subUnitId }, direction, applyType) || {};+ if (hookUndos) {+ undos.push(...hookUndos);+ }+ if (hookRedos) {+ redos.push(...hookRedos);+ }+ });+++ const result = redos.every((m) => this._commandService.syncExecuteCommand(m.id, m.params));+ if (result) {+ // add to undo redo services+ this._undoRedoService.pushUndoRedo({+ unitID: unitId,+ undoMutations: undos,+ redoMutations: redos,+ });+ }+ // this._commandService.executeCommand(AutoFillCommand.id);+ activeHooks.forEach((hook) => {+ hook.onAfterFillData?.({ source, target, unitId, subUnitId }, direction, applyType);+ });+ this.setShowMenu(true);+ return true;+ }}export const IAutoFillService = createIdentifier<AutoFillService>('univer.auto-fill-service');diff --git a/packages/sheets-ui/src/services/auto-fill/type.ts b/packages/sheets-ui/src/services/auto-fill/type.tsindex bf253fe102..b34a7cb626 100644--- a/packages/sheets-ui/src/services/auto-fill/type.ts+++ b/packages/sheets-ui/src/services/auto-fill/type.ts@@ -33,6 +33,7 @@ export interface ISheetAutoFillHook {id: string;priority?: number;type?: AutoFillHookType;+ bindUnit?: string;disable?: (location: IAutoFillLocation, direction: Direction, applyType: APPLY_TYPE) => boolean;onBeforeFillData?(location: IAutoFillLocation, direction: Direction): boolean | void;onFillData?(diff --git a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts b/packages/sheets-ui/src/services/canvas-pop-manager.service.tsindex 273d535340..b4e698e956 100644--- a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts+++ b/packages/sheets-ui/src/services/canvas-pop-manager.service.ts@@ -194,10 +194,11 @@ export class SheetCanvasPopManagerService extends Disposable {sheetId: subUnitId,});const currentRender = this._renderManagerService.getRenderById(unitId);-if (!currentRender || !skeleton) {return {- dispose: () => { },+ dispose: () => {+ // empty+ },};}diff --git a/packages/sheets-ui/src/services/cell-alert-manager.service.ts b/packages/sheets-ui/src/services/cell-alert-manager.service.tsindex 24ba327a16..1fecc82ba3 100644--- a/packages/sheets-ui/src/services/cell-alert-manager.service.ts+++ b/packages/sheets-ui/src/services/cell-alert-manager.service.ts@@ -51,7 +51,9 @@ export class CellAlertManagerService {constructor(@IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@Inject(SheetCanvasPopManagerService) private readonly _canvasPopManagerService: SheetCanvasPopManagerService- ) {}+ ) {+ // empty+ }showAlert(alert: ICellAlert) {let lastPopup = this._currentAlert.get(alert.key);@@ -62,7 +64,9 @@ export class CellAlertManagerService {lastPopup = {alert,dispose: {- dispose() {},+ dispose() {+ // empty+ },},};this._currentAlert.set(alert.key, lastPopup);diff --git a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.tsindex 5067b1a652..cb78145edb 100644--- a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts+++ b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts@@ -486,11 +486,17 @@ export class testMarkSelectionService {return null;}- removeShape(id: string): void {}+ removeShape(id: string): void {+ // empty+ }- removeAllShapes(): void {}+ removeAllShapes(): void {+ // empty+ }- refreshShapes(): void {}+ refreshShapes(): void {+ // empty+ }getShapeMap(): Map<string, any> {return new Map();@@ -500,7 +506,7 @@ export class testMarkSelectionService {export class testNotificationService {show(): IDisposable {return {- dispose: () => {},+ dispose: () => { /* empty */ },};}}diff --git a/packages/sheets-ui/src/services/clipboard/__tests__/mock-clipboard.ts b/packages/sheets-ui/src/services/clipboard/__tests__/mock-clipboard.tsindex b332365da5..0fddb12c3e 100644--- a/packages/sheets-ui/src/services/clipboard/__tests__/mock-clipboard.ts+++ b/packages/sheets-ui/src/services/clipboard/__tests__/mock-clipboard.ts@@ -49,7 +49,10 @@ interface IMockClipboardProps {}export class MockClipboard {- constructor(private props: IMockClipboardProps) {}+ constructor(private props: IMockClipboardProps) {+ // empty+ }+read(): Promise<IClipboardItem[]> {// Here you can return the simulated IClipboardItem arrayconst clipboardItems: IClipboardItem[] = [new MockClipboardItem(this.props)];diff --git a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts b/packages/sheets-ui/src/services/clipboard/clipboard.service.tsindex 5846aa2453..9f5c30a8f4 100644--- a/packages/sheets-ui/src/services/clipboard/clipboard.service.ts+++ b/packages/sheets-ui/src/services/clipboard/clipboard.service.ts@@ -240,6 +240,7 @@ export class SheetClipboardService extends Disposable implements ISheetClipboardthis._logService.error('[SheetClipboardService]', 'hook already exists', hook.id);return { dispose: () => { /* empty */ } };}+// hook added should be ordered at meaning whileconst insertIndex = this._clipboardHooks.findIndex((existingHook) => {const existingHookPriority = existingHook.priority || 0;diff --git a/packages/sheets-ui/src/services/editor-bridge.service.ts b/packages/sheets-ui/src/services/editor-bridge.service.tsindex 588a6bc211..1df64ecd9f 100644--- a/packages/sheets-ui/src/services/editor-bridge.service.ts+++ b/packages/sheets-ui/src/services/editor-bridge.service.ts@@ -133,39 +133,25 @@ export class EditorBridgeService extends Disposable implements IEditorBridgeServ) {super();- this.disposeWithMe(- toDisposable(() => {- this._currentEditCellState$.complete();- this._currentEditCell = null;- })- );-- this.disposeWithMe(- toDisposable(- this.interceptor.intercept(this.interceptor.getInterceptPoints().AFTER_CELL_EDIT, {- priority: -1,- handler: (_value) => _value,- })- )- );-- this.disposeWithMe(- toDisposable(- this.interceptor.intercept(this.interceptor.getInterceptPoints().BEFORE_CELL_EDIT, {- priority: -1,- handler: (_value) => _value,- })- )- );-- this.disposeWithMe(- toDisposable(- this.interceptor.intercept(this.interceptor.getInterceptPoints().AFTER_CELL_EDIT_ASYNC, {- priority: -1,- handler: (_value) => _value,- })- )- );+ this.disposeWithMe(toDisposable(() => {+ this._currentEditCellState$.complete();+ this._currentEditCell = null;+ }));++ this.disposeWithMe(this.interceptor.intercept(this.interceptor.getInterceptPoints().AFTER_CELL_EDIT, {+ priority: -1,+ handler: (_value) => _value,+ }));++ this.disposeWithMe(this.interceptor.intercept(this.interceptor.getInterceptPoints().BEFORE_CELL_EDIT, {+ priority: -1,+ handler: (_value) => _value,+ }));++ this.disposeWithMe(this.interceptor.intercept(this.interceptor.getInterceptPoints().AFTER_CELL_EDIT_ASYNC, {+ priority: -1,+ handler: (_value) => _value,+ }));}refreshEditCellState() {@@ -221,8 +207,6 @@ export class EditorBridgeService extends Disposable implements IEditorBridgeServconst { scaleX, scaleY } = scene.getAncestorScale();- const { scaleX: precisionScaleX, scaleY: precisionScaleY } = scene.getPrecisionScale();-const scrollXY = scene.getScrollXY(this._selectionRenderService.getViewPort());startX = skeleton.convertTransformToOffsetX(startX, scaleX, scrollXY);startY = skeleton.convertTransformToOffsetY(startY, scaleY, scrollXY);diff --git a/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts b/packages/sheets-ui/src/services/mark-selection/mark-selection.service.tsindex 191e6a24a4..bbd9932f9a 100644--- a/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts+++ b/packages/sheets-ui/src/services/mark-selection/mark-selection.service.ts@@ -88,7 +88,7 @@ export class MarkSelectionService extends Disposable implements IMarkSelectionSeconst { style } = selection;const { scene } = this._renderManagerService.getRenderById(unitId) || {};const { rangeWithCoord, primaryWithCoord } =- this._selectionRenderService.convertSelectionRangeToData(selection);+ this._selectionRenderService.convertSelectionToCoord(selection);const skeleton = this._sheetSkeletonManagerService.getCurrent()?.skeleton;if (!scene || !skeleton) return;const { rowHeaderWidth, columnHeaderHeight } = skeleton;diff --git a/packages/sheets-ui/src/services/selection/__test__/selection-render.test.ts b/packages/sheets-ui/src/services/selection/__test__/selection-render.test.tsindex 1c5fb85f89..7ff5a70c79 100644--- a/packages/sheets-ui/src/services/selection/__test__/selection-render.test.ts+++ b/packages/sheets-ui/src/services/selection/__test__/selection-render.test.ts@@ -137,8 +137,14 @@ const mockEvent: IMouseEvent = {},};-class Engine extends ThinEngine<Scene> {- clearCanvas() {}+class MockEngine extends ThinEngine<Scene> {+ setRemainCapture(): void {+ // empty+ }++ clearCanvas() {+ // empty+ }getCanvas() {return 1 as any;@@ -148,7 +154,9 @@ class Engine extends ThinEngine<Scene> {return 1 as any;}- setCanvasCursor(val: CURSOR_TYPE) {}+ setCanvasCursor(val: CURSOR_TYPE) {+ // empty+ }getPixelRatio() {return 1;@@ -202,7 +210,7 @@ describe('Test indirect', () => {contextService);- const scene = new Scene('', new Engine());+ const scene = new Scene('', new MockEngine());selectionRenderService.changeRuntime(skeleton, scene);diff --git a/packages/sheets-ui/src/services/selection/selection-render.service.ts b/packages/sheets-ui/src/services/selection/selection-render.service.tsindex 037a6c9da9..73ec52a988 100644--- a/packages/sheets-ui/src/services/selection/selection-render.service.ts+++ b/packages/sheets-ui/src/services/selection/selection-render.service.ts@@ -68,14 +68,16 @@ export interface ISelectionRenderService {addControlToCurrentByRangeData(data: ISelectionWithCoordAndStyle): void;updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;- changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport): void;+ changeRuntime(skeleton: Nullable<SpreadsheetSkeleton>, scene: Nullable<Scene>, viewport?: Viewport): void;++ /** @deprecated This should not be provided by the selection render service. */getViewPort(): Viewport;getCurrentControls(): SelectionShape[];getActiveSelections(): Nullable<ISelection[]>;getActiveRange(): Nullable<IRange>;getActiveSelection(): Nullable<SelectionShape>;getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];- convertSelectionRangeToData(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;+ convertSelectionToCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;convertRangeDataToSelection(range: IRange): Nullable<IRangeWithCoord>;convertCellRangeToInfo(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithCoord>;eventTrigger(@@ -105,6 +107,8 @@ export interface ISelectionRenderService {* you can adjust the style and performance of each selection area.* This service is used in conjunction with the SelectionManagerService* to implement functions related to the selection area in univer.+ *+ * @todo Refactor it to RenderController.*/export class SelectionRenderService implements ISelectionRenderService {hasSelection: boolean = false;@@ -188,7 +192,7 @@ export class SelectionRenderService implements ISelectionRenderService {*/readonly selectionMoveStart$ = this._selectionMoveStart$.asObservable();- private _activeViewport!: Viewport;+ private _activeViewport: Nullable<Viewport>;constructor(@Inject(ThemeService) private readonly _themeService: ThemeService,@@ -264,7 +268,7 @@ export class SelectionRenderService implements ISelectionRenderService {}getViewPort() {- return this._activeViewport;+ return this._activeViewport!;}/**@@ -344,10 +348,10 @@ export class SelectionRenderService implements ISelectionRenderService {this._selectionMoveStart$.next(this.getSelectionDataWithStyle());}- changeRuntime(skeleton: SpreadsheetSkeleton, scene: Scene, viewport?: Viewport) {+ changeRuntime(skeleton: Nullable<SpreadsheetSkeleton>, scene: Nullable<Scene>, viewport?: Viewport) {this._skeleton = skeleton;this._scene = scene;- this._activeViewport = viewport || scene.getViewports()[0];+ this._activeViewport = viewport || scene?.getViewports()[0];}getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[] {@@ -901,7 +905,7 @@ export class SelectionRenderService implements ISelectionRenderService {this._shortcutService.setDisable(true);}- convertSelectionRangeToData(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle {+ convertSelectionToCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle {const { range, primary, style } = selectionWithStyle;let rangeWithCoord = this.convertRangeDataToSelection(range);if (rangeWithCoord == null) {@@ -1211,6 +1215,9 @@ export class SelectionRenderService implements ISelectionRenderService {}}+/**+ * @deprecated Should be refactored to RenderUnit.+ */export const ISelectionRenderService = createIdentifier<SelectionRenderService>('deprecated.univer.sheet.selection-render-service');diff --git a/packages/sheets-ui/src/services/sheet-skeleton-manager.service.ts b/packages/sheets-ui/src/services/sheet-skeleton-manager.service.tsindex 923dab714c..f40a41f426 100644--- a/packages/sheets-ui/src/services/sheet-skeleton-manager.service.ts+++ b/packages/sheets-ui/src/services/sheet-skeleton-manager.service.ts@@ -15,7 +15,7 @@*/import type { Nullable, Workbook, Worksheet } from '@univerjs/core';-import { IUniverInstanceService, LocaleService } from '@univerjs/core';+import { IUniverInstanceService } from '@univerjs/core';import { SpreadsheetSkeleton } from '@univerjs/engine-render';import type { IDisposable } from '@wendellhu/redi';import { Inject, Injector } from '@wendellhu/redi';@@ -35,12 +35,17 @@ export interface ISheetSkeletonManagerSearch {commandId?: string; // WTF: why?}++// TODO@wzhudev: this should be moved to a `RenderUnit` as well.+/*** This service manages the drawing of the sheet's viewModel (skeleton).* Each time there is a content change, it will trigger the viewModel of the render to recalculate.* Each application and sub-table has its own viewModel (skeleton).* The viewModel is also a temporary storage variable, which does not need to be persisted,* so it is managed uniformly through the service.+ *+ * @todo RenderUnit - We should move this to RenderUnit as well after all dependents have been moved.*/export class SheetSkeletonManagerService implements IDisposable {private _currentSkeleton: ISheetSkeletonManagerSearch = {@@ -61,9 +66,10 @@ export class SheetSkeletonManagerService implements IDisposable {constructor(@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,- @Inject(Injector) private readonly _injector: Injector,- @Inject(LocaleService) private readonly _localeService: LocaleService- ) { }+ @Inject(Injector) private readonly _injector: Injector+ ) {+ // empty+ }dispose(): void {this._currentSkeletonBefore$.complete();diff --git a/packages/sheets-ui/src/services/shortcut-experience.service.ts b/packages/sheets-ui/src/services/shortcut-experience.service.tsindex 3cb6a8340c..2baf48612b 100644--- a/packages/sheets-ui/src/services/shortcut-experience.service.ts+++ b/packages/sheets-ui/src/services/shortcut-experience.service.ts@@ -43,7 +43,9 @@ export class ShortcutExperienceService implements IDisposable {constructor(@IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,@Inject(LocaleService) private readonly _localeService: LocaleService- ) {}+ ) {+ // empty+ }dispose(): void {this._shortcutParam = [];diff --git a/packages/sheets-ui/src/sheets-ui-plugin.ts b/packages/sheets-ui/src/sheets-ui-plugin.tsindex 11af7f48dd..25294e8d6a 100644--- a/packages/sheets-ui/src/sheets-ui-plugin.ts+++ b/packages/sheets-ui/src/sheets-ui-plugin.ts@@ -22,29 +22,23 @@ import { filter } from 'rxjs/operators';import { IRenderManagerService } from '@univerjs/engine-render';import { ActiveWorksheetController } from './controllers/active-worksheet/active-worksheet.controller';-import { AutoFillController } from './controllers/auto-fill.controller';import { AutoHeightController } from './controllers/auto-height.controller';import { SheetClipboardController } from './controllers/clipboard/clipboard.controller';-import { SheetContextMenuController } from './controllers/contextmenu/contextmenu.controller';import { EditingController } from './controllers/editor/editing.controller';import { EndEditController } from './controllers/editor/end-edit.controller';import { FormulaEditorController } from './controllers/editor/formula-editor.controller';import { StartEditController } from './controllers/editor/start-edit.controller';-import { EditorBridgeController } from './controllers/editor-bridge.controller';-import { FormatPainterController } from './controllers/format-painter/format-painter.controller';-import { HeaderFreezeRenderController } from './controllers/freeze.render-controller';-import { HeaderMenuController } from './controllers/header-menu.controller';-import { HeaderMoveController } from './controllers/header-move.controller';-import { HeaderResizeController } from './controllers/header-resize.render-controller';-import { HeaderUnhideRenderController } from './controllers/header-unhide.render-controller';-import { MarkSelectionController } from './controllers/mark-selection.controller';-import { MoveRangeController } from './controllers/move-range.controller';-import { ScrollController } from './controllers/scroll.controller';-import { SelectionController } from './controllers/selection.controller';+import { FormatPainterRenderController } from './controllers/render-controllers/format-painter.render-controller';+import { HeaderFreezeRenderController } from './controllers/render-controllers/freeze.render-controller';+import { HeaderMenuRenderController } from './controllers/render-controllers/header-menu.render-controller';+import { HeaderMoveRenderController } from './controllers/render-controllers/header-move.render-controller';+import { HeaderResizeRenderController } from './controllers/render-controllers/header-resize.render-controller';+import { HeaderUnhideRenderController } from './controllers/render-controllers/header-unhide.render-controller';+import { MarkSelectionRenderController } from './controllers/mark-selection.controller';+import { SelectionRenderController } from './controllers/render-controllers/selection.render-controller';import { SheetRenderController } from './controllers/sheet-render.controller';import { SheetUIController } from './controllers/sheet-ui.controller';import { StatusBarController } from './controllers/status-bar.controller';-import { ZoomController } from './controllers/zoom.controller';import { zhCN } from './locale';import { AutoFillService, IAutoFillService } from './services/auto-fill/auto-fill.service';import { ISheetClipboardService, SheetClipboardService } from './services/clipboard/clipboard.service';@@ -63,14 +57,20 @@ import { SheetSkeletonManagerService } from './services/sheet-skeleton-manager.simport { ShortcutExperienceService } from './services/shortcut-experience.service';import { IStatusBarService, StatusBarService } from './services/status-bar.service';import { SheetCanvasView } from './views/sheet-canvas-view';-import { HoverController } from './controllers/hover.controller';+import { HoverRenderController } from './controllers/hover-render.controller';import { HoverManagerService } from './services/hover-manager.service';import { CellAlertManagerService } from './services/cell-alert-manager.service';-import { CellAlertController } from './controllers/cell-alert.controller';+import { CellAlertRenderController } from './controllers/cell-alert.controller';import { CellCustomRenderController } from './controllers/cell-custom-render.controller';import { SheetCanvasPopManagerService } from './services/canvas-pop-manager.service';import { ForceStringRenderController } from './controllers/force-string-render.controller';-import { ForceStringAlertController } from './controllers/force-string-alert.controller';+import { ForceStringAlertRenderController } from './controllers/force-string-alert-render.controller';+import { SheetsZoomRenderController } from './controllers/render-controllers/zoom.render-controller';+import { SheetsScrollRenderController } from './controllers/render-controllers/scroll.render-controller';+import { SheetContextMenuRenderController } from './controllers/render-controllers/contextmenu.render-controller';+import { EditorBridgeRenderController } from './controllers/render-controllers/editor-bridge.render-controller';+import { AutoFillController } from './controllers/auto-fill.controller';+import { FormatPainterController } from './controllers/format-painter/format-painter.controller';export class UniverSheetsUIPlugin extends Plugin {static override pluginName = 'SHEET_UI_PLUGIN_NAME';@@ -93,9 +93,6 @@ export class UniverSheetsUIPlugin extends Plugin {override onStarting(injector: Injector): void {([- // views- [SheetCanvasView],-// services[ShortcutExperienceService],[IEditorBridgeService, { useClass: EditorBridgeService }],@@ -105,14 +102,10 @@ export class UniverSheetsUIPlugin extends Plugin {[ICellEditorManagerService, { useClass: CellEditorManagerService }],[IFormulaEditorManagerService, { useClass: FormulaEditorManagerService }],[IAutoFillService, { useClass: AutoFillService }],+[ScrollManagerService],[SheetSkeletonManagerService],- [- ISelectionRenderService,- {- useClass: SelectionRenderService,- },- ],+ [ISelectionRenderService, { useClass: SelectionRenderService }],[IStatusBarService, { useClass: StatusBarService }],[IMarkSelectionService, { useClass: MarkSelectionService }],[HoverManagerService],@@ -122,32 +115,17 @@ export class UniverSheetsUIPlugin extends Plugin {// controllers[ActiveWorksheetController],[AutoHeightController],- [EditorBridgeController],[EndEditController],[FormulaEditorController],- [FormatPainterController],[HeaderFreezeRenderController],- [HeaderMenuController],- [HeaderMoveController],- [HeaderResizeController],- [MoveRangeController],- [ScrollController],- [SelectionController],[SheetClipboardController],- [SheetContextMenuController],[SheetRenderController],[SheetUIController],[StartEditController],- [ZoomController],- [AutoFillController],[StatusBarController],[EditingController],- [MarkSelectionController],- [HoverController],- [CellAlertController],- [CellCustomRenderController],- [ForceStringRenderController],- [ForceStringAlertController],+ [AutoFillController],+ [FormatPainterController],] as Dependency[]).forEach((d) => injector.add(d));}@@ -158,15 +136,40 @@ export class UniverSheetsUIPlugin extends Plugin {}private _registerRenderControllers(): void {- ([HeaderFreezeRenderController, HeaderUnhideRenderController, HeaderResizeController]).forEach((controller) => {- this.disposeWithMe(this._renderManagerService.registerRenderControllers(UniverInstanceType.UNIVER_SHEET, controller));+ ([+ SheetCanvasView,+ // https://github.com/dream-num/univer-pro/issues/669+ // HeaderMoveRenderController must be initialized before SelectionRenderController.+ // Before HMRC expected selections remain unchanged when user clicks on the header. If we don't initialize HMRC before SRC,+ // the selections will be changed by SRC first. Maybe we should merge row/col header related render controllers to one class.+ HeaderMoveRenderController,+ SelectionRenderController,+ HeaderFreezeRenderController,+ HeaderUnhideRenderController,+ HeaderResizeRenderController,+ SheetsZoomRenderController,+ SheetsScrollRenderController,+ FormatPainterRenderController,+ HeaderMenuRenderController,+ CellAlertRenderController,+ ForceStringAlertRenderController,+ MarkSelectionRenderController,+ HoverRenderController,+ ForceStringRenderController,+ CellCustomRenderController,+ SheetContextMenuRenderController,+ EditorBridgeRenderController,+ ]).forEach((controller) => {+ this.disposeWithMe(this._renderManagerService.registerRenderController(UniverInstanceType.UNIVER_SHEET, controller));});}private _markSheetAsFocused() {const univerInstanceService = this._univerInstanceService;- univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(filter((v) => !!v)).subscribe((workbook) => {- univerInstanceService.focusUnit(workbook!.getUnitId());- });+ univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET)+ .pipe(filter((v) => !!v))+ .subscribe((workbook) => {+ univerInstanceService.focusUnit(workbook!.getUnitId());+ });}}diff --git a/packages/sheets-ui/src/views/count-bar/ZoomSlider.tsx b/packages/sheets-ui/src/views/count-bar/ZoomSlider.tsxindex 51de2137ce..8c1c41d6c0 100644--- a/packages/sheets-ui/src/views/count-bar/ZoomSlider.tsx+++ b/packages/sheets-ui/src/views/count-bar/ZoomSlider.tsx@@ -21,7 +21,7 @@ import {UniverInstanceType,} from '@univerjs/core';import { Slider } from '@univerjs/design';-import { SetWorksheetActivateCommand } from '@univerjs/sheets';+import { SetWorksheetActiveOperation } from '@univerjs/sheets';import { useDependency } from '@wendellhu/redi/react-bindings';import React, { useCallback, useEffect, useState } from 'react';@@ -44,7 +44,7 @@ export function ZoomSlider() {useEffect(() => {const disposable = commandService.onCommandExecuted((commandInfo) => {- if (commandInfo.id === SetZoomRatioOperation.id || commandInfo.id === SetWorksheetActivateCommand.id) {+ if (commandInfo.id === SetZoomRatioOperation.id || commandInfo.id === SetWorksheetActiveOperation.id) {const currentZoom = getCurrentZoom();setZoom(currentZoom);}diff --git a/packages/sheets-ui/src/views/operate-container/AutoFillPopupMenu.tsx b/packages/sheets-ui/src/views/operate-container/AutoFillPopupMenu.tsxindex aa80b3b1ff..4b4dd3d8c8 100644--- a/packages/sheets-ui/src/views/operate-container/AutoFillPopupMenu.tsx+++ b/packages/sheets-ui/src/views/operate-container/AutoFillPopupMenu.tsx@@ -19,16 +19,12 @@ import { ICommandService, IUniverInstanceService, LocaleService, toDisposable }import { Dropdown } from '@univerjs/design';import { IRenderManagerService } from '@univerjs/engine-render';import { Autofill, CheckMarkSingle, MoreDownSingle } from '@univerjs/icons';-import { InsertColMutation, InsertRowMutation, MoveColsMutation, MoveRangeMutation, MoveRowsMutation, RemoveColMutation, RemoveRowMutation, SetRangeValuesMutation, SetWorksheetActiveOperation, SetWorksheetColWidthMutation, SetWorksheetRowHeightMutation } from '@univerjs/sheets';import { useDependency } from '@wendellhu/redi/react-bindings';import clsx from 'clsx';import React, { useCallback, useEffect, useState } from 'react';-import { AutoClearContentCommand } from '../../commands/commands/auto-fill.command';import { RefillCommand } from '../../commands/commands/refill.command';-import { SetCellEditVisibleOperation } from '../../commands/operations/cell-edit.operation';import { SetScrollOperation } from '../../commands/operations/scroll.operation';-import { SetZoomRatioOperation } from '../../commands/operations/set-zoom-ratio.operation';import { getSheetObject } from '../../controllers/utils/component-tools';import { IAutoFillService } from '../../services/auto-fill/auto-fill.service';import { APPLY_TYPE } from '../../services/auto-fill/type';@@ -79,30 +75,10 @@ export const AutoFillPopupMenu: React.FC<{}> = () => {useEffect(() => {- const endCommands = [- SetCellEditVisibleOperation.id,- AutoClearContentCommand.id,- SetZoomRatioOperation.id,- SetWorksheetActiveOperation.id,- SetRangeValuesMutation.id,- MoveRangeMutation.id,- RemoveRowMutation.id,- RemoveColMutation.id,- InsertRowMutation.id,- InsertColMutation.id,- MoveRowsMutation.id,- MoveColsMutation.id,- SetWorksheetColWidthMutation.id,- SetWorksheetRowHeightMutation.id,- ];const disposable = commandService.onCommandExecuted((command: ICommandInfo, options?: IExecutionOptions) => {if (command.id === SetScrollOperation.id) {forceUpdate();}- const fromCollab = options?.fromCollab;- if (endCommands.includes(command.id) && !fromCollab) {- setAnchor({ row: -1, col: -1 });- }});return disposable.dispose;}, [forceUpdate, commandService]);@@ -134,6 +110,8 @@ export const AutoFillPopupMenu: React.FC<{}> = () => {const lastRow = Math.max(source.rows[source.rows.length - 1], target.rows[target.rows.length - 1]);const lastCol = Math.max(source.cols[source.cols.length - 1], target.cols[target.cols.length - 1]);setAnchor({ row: lastRow, col: lastCol });+ } else {+ setAnchor({ row: -1, col: -1 });}}));diff --git a/packages/sheets-ui/src/views/sheet-canvas-view.ts b/packages/sheets-ui/src/views/sheet-canvas-view.tsindex 2dd77de25e..eaa011c2aa 100644--- a/packages/sheets-ui/src/views/sheet-canvas-view.ts+++ b/packages/sheets-ui/src/views/sheet-canvas-view.ts@@ -14,9 +14,9 @@* limitations under the License.*/-import type { Nullable, Workbook, Worksheet } from '@univerjs/core';-import { ICommandService, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, toDisposable, UniverInstanceType } from '@univerjs/core';-import type { IRender, IWheelEvent, Scene } from '@univerjs/engine-render';+import type { Workbook, Worksheet } from '@univerjs/core';+import { ICommandService, RxDisposable, toDisposable } from '@univerjs/core';+import type { IRenderContext, IRenderController, IWheelEvent } from '@univerjs/engine-render';import {IRenderManagerService,Layer,@@ -30,7 +30,7 @@ import {Viewport,} from '@univerjs/engine-render';import { Inject } from '@wendellhu/redi';-import { BehaviorSubject, takeUntil } from 'rxjs';+import { BehaviorSubject } from 'rxjs';import { SetScrollRelativeCommand } from '../commands/commands/set-scroll.command';import {@@ -41,106 +41,44 @@ import {} from '../common/keys';import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';-/**- * @todo RenderUnit- */-@OnLifecycle(LifecycleStages.Ready, SheetCanvasView)-export class SheetCanvasView extends RxDisposable {- private _scene!: Scene;-+export class SheetCanvasView extends RxDisposable implements IRenderController {private readonly _fps$ = new BehaviorSubject<string>('');-readonly fps$ = this._fps$.asObservable();constructor(- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,+ private readonly _context: IRenderContext<Workbook>,@ICommandService private readonly _commandService: ICommandService,@IRenderManagerService private readonly _renderManagerService: IRenderManagerService,@Inject(SheetSkeletonManagerService) private readonly _sheetSkeletonManagerService: SheetSkeletonManagerService) {super();- this._initialize();- }- private _initialize() {- this._init();+ this._addNewRender(this._context.unit);}override dispose(): void {this._fps$.complete();}- private _init() {- this._univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => this._create(workbook));- this._univerInstanceService.getTypeOfUnitDisposed$<Workbook>(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => this._dispose(workbook));- this._univerInstanceService.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET).forEach((workbook) => this._create(workbook));- }-- private _dispose(workbook: Workbook) {- const unitId = workbook.getUnitId();- this._renderManagerService.removeRender(unitId);- }-- private _create(workbook: Nullable<Workbook>) {- if (!workbook) {- return;- }-- const unitId = workbook.getUnitId();- if (!this._renderManagerService.has(unitId)) {- this._addNewRender(workbook);- }- }-private _addNewRender(workbook: Workbook) {- const unitId = workbook.getUnitId();- const container = workbook.getContainer();-- const parentRenderUnitId = workbook.getParentRenderUnitId();-- if (container != null && parentRenderUnitId != null) {- throw new Error('container or parentRenderUnitId can only exist one');- }-- const isAddedToExistedScene = container == null && parentRenderUnitId != null;- if (isAddedToExistedScene) {- this._renderManagerService.createRenderWithParent(unitId, parentRenderUnitId);- } else {- this._renderManagerService.createRender(unitId);- }-- const currentRender = this._renderManagerService.getRenderById(unitId);-- if (currentRender == null) {- return;- }-- const { scene, engine } = currentRender;+ const { scene, engine } = this._context;scene.openTransformer();-- this._scene = scene;-scene.addLayer(new Layer(scene, [], 0), new Layer(scene, [], 2));- if (currentRender != null) {- this._addComponent(currentRender, workbook);- }+ this._addComponent(workbook);const should = workbook.getShouldRenderLoopImmediately();-- if (should && !isAddedToExistedScene) {+ if (should) {engine.runRenderLoop(() => {scene.render();this._fps$.next(Math.round(engine.getFps()).toString());});}-- this._renderManagerService.setCurrent(unitId);}- private _addComponent(renderUnit: IRender, workbook: Workbook) {- const scene = this._scene;+ private _addComponent(workbook: Workbook) {+ const { scene, components } = this._context;const worksheet = workbook.getActiveSheet();@@ -148,7 +86,7 @@ export class SheetCanvasView extends RxDisposable {const sheetId = worksheet.getSheetId();- const _viewMain = this._addViewport(worksheet);+ this._addViewport(worksheet);const spreadsheet = new Spreadsheet(SHEET_VIEW_KEY.MAIN);const spreadsheetRowHeader = new SpreadsheetRowHeader(SHEET_VIEW_KEY.ROW);@@ -162,11 +100,11 @@ export class SheetCanvasView extends RxDisposable {strokeWidth: 1,});- renderUnit.mainComponent = spreadsheet;- renderUnit.components.set(SHEET_VIEW_KEY.MAIN, spreadsheet);- renderUnit.components.set(SHEET_VIEW_KEY.ROW, spreadsheetRowHeader);- renderUnit.components.set(SHEET_VIEW_KEY.COLUMN, spreadsheetColumnHeader);- renderUnit.components.set(SHEET_VIEW_KEY.LEFT_TOP, SpreadsheetLeftTopPlaceholder);+ this._context.mainComponent = spreadsheet;+ components.set(SHEET_VIEW_KEY.MAIN, spreadsheet);+ components.set(SHEET_VIEW_KEY.ROW, spreadsheetRowHeader);+ components.set(SHEET_VIEW_KEY.COLUMN, spreadsheetColumnHeader);+ components.set(SHEET_VIEW_KEY.LEFT_TOP, SpreadsheetLeftTopPlaceholder);scene.addObjects([spreadsheet], SHEET_COMPONENT_MAIN_LAYER_INDEX);scene.addObjects(@@ -175,19 +113,10 @@ export class SheetCanvasView extends RxDisposable {);scene.enableLayerCache(SHEET_COMPONENT_MAIN_LAYER_INDEX, SHEET_COMPONENT_HEADER_LAYER_INDEX);-- this._sheetSkeletonManagerService.setCurrent({ sheetId, unitId });-- // viewMain?.onScrollStopObserver.add(() => {- // spreadsheet.makeForceDirty();- // });}private _addViewport(worksheet: Worksheet) {- const scene = this._scene;- if (scene == null) {- return;- }+ const scene = this._context.scene;const { rowHeader, columnHeader } = worksheet.getConfig();@@ -326,12 +255,8 @@ export class SheetCanvasView extends RxDisposable {}}}- if (evt.inputIndex === PointerInput.MouseWheelZ) {- // TODO- // ...- }- this._scene.makeDirty(true);+ this._context.scene.makeDirty(true);})));diff --git a/packages/sheets/src/services/selection-manager.service.ts b/packages/sheets/src/services/selection-manager.service.tsindex 2ed4eb4382..22020774a3 100644--- a/packages/sheets/src/services/selection-manager.service.ts+++ b/packages/sheets/src/services/selection-manager.service.ts@@ -75,7 +75,9 @@ export class SelectionManagerService implements IDisposable {private _dirty: boolean = true;// FIMXE: this dependency is not correct!- constructor(@Inject(ThemeService) private readonly _themeService: ThemeService) {}+ constructor(@Inject(ThemeService) private readonly _themeService: ThemeService) {+ // empty+ }getCurrent() {return this._currentSelection;diff --git a/packages/slides-ui/src/model/info-bar-model.ts b/packages/slides-ui/src/model/info-bar-model.tsindex 43c3be0fe6..6a470ded82 100644--- a/packages/slides-ui/src/model/info-bar-model.ts+++ b/packages/slides-ui/src/model/info-bar-model.ts@@ -15,7 +15,9 @@*/export class InfoBarModel {- constructor(private _name: string) {}+ constructor(private _name: string) {+ // super+ }get name(): string {return this._name;diff --git a/packages/slides/src/model/info-bar-model.ts b/packages/slides/src/model/info-bar-model.tsindex 43c3be0fe6..67bf0bb5f8 100644--- a/packages/slides/src/model/info-bar-model.ts+++ b/packages/slides/src/model/info-bar-model.ts@@ -15,7 +15,9 @@*/export class InfoBarModel {- constructor(private _name: string) {}+ constructor(private _name: string) {+ // empty+ }get name(): string {return this._name;diff --git a/packages/slides/src/views/render/adaptor.ts b/packages/slides/src/views/render/adaptor.tsindex a88821b0c4..b1e6e53a02 100644--- a/packages/slides/src/views/render/adaptor.ts+++ b/packages/slides/src/views/render/adaptor.ts@@ -19,7 +19,7 @@ import { Registry } from '@univerjs/core';import type { Scene } from '@univerjs/engine-render';import type { Injector } from '@wendellhu/redi';-export class ObjectAdaptor {+export abstract class ObjectAdaptor {zIndex = 0;viewKey: PageElementType | null = null;@@ -31,9 +31,12 @@ export class ObjectAdaptor {return this;}- convert(pageElement: IPageElement, mainScene: Scene) {}+ abstract convert(pageElement: IPageElement, mainScene: Scene): void;- create(injector: Injector) {}+ create(injector: Injector): void {+ // FIXME: should not be empty+ // empty+ }}export const CanvasObjectProviderRegistry = Registry.create();diff --git a/packages/slides/src/views/render/canvas-view.ts b/packages/slides/src/views/render/canvas-view.tsindex c4f0b28d9d..5af53eb31d 100644--- a/packages/slides/src/views/render/canvas-view.ts+++ b/packages/slides/src/views/render/canvas-view.ts@@ -144,19 +144,7 @@ export class CanvasView extends RxDisposable {return;}- const container = slideDataModel.getContainer();-- const parentRenderUnitId = slideDataModel.getParentRenderUnitId();-- if (container != null && parentRenderUnitId != null) {- throw new Error('container or parentRenderUnitId can only exist one');- }-- if (container == null && parentRenderUnitId != null) {- this._renderManagerService.createRenderWithParent(unitId, parentRenderUnitId);- } else {- this._renderManagerService.createRender(unitId);- }+ this._renderManagerService.createRender(unitId);const currentRender = this._renderManagerService.getRenderById(unitId);diff --git a/packages/ui/src/components/editor/TextEditor.tsx b/packages/ui/src/components/editor/TextEditor.tsxindex 68f2b1589b..69566541f3 100644--- a/packages/ui/src/components/editor/TextEditor.tsx+++ b/packages/ui/src/components/editor/TextEditor.tsx@@ -219,14 +219,11 @@ export function TextEditor(props: ITextEditorProps & Omit<MyComponentProps, 'onCvalueChange(editor);});- // Clean up on unmountreturn () => {resizeObserver.unobserve(editor);-+ resizeObserver.disconnect();registerSubscription.dispose();-focusStyleSubscription?.unsubscribe();-valueChangeSubscription?.unsubscribe();};}, []);diff --git a/packages/ui/src/components/hooks/observable.ts b/packages/ui/src/components/hooks/observable.tsindex d6b1f911c7..337618e4e6 100644--- a/packages/ui/src/components/hooks/observable.ts+++ b/packages/ui/src/components/hooks/observable.ts@@ -41,7 +41,7 @@ function showArrayNotEqual(arr1: unknown[], arr2: unknown[]): boolean {export function useObservable<T>(observable: ObservableOrFn<T>, defaultValue: T | undefined, shouldHaveSyncValue?: true): T;export function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue: T): T;export function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue?: undefined): T | undefined;-export function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue?: T, shouldHaveSyncValue?: true, deps?: any[]): T | undefined;+export function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue?: T, shouldHaveSyncValue?: true, deps?: any[]): T;export function useObservable<T>(observable: Nullable<ObservableOrFn<T>>, defaultValue?: T, shouldHaveSyncValue?: boolean, deps?: any[]): T | undefined;/*** A hook to subscribe to an observable and get the latest value.diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex c7675620c1..2576e60993 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -83,7 +83,6 @@ export { SetEditorResizeOperation } from './commands/operations/editor/set-editoexport { RangeSelector } from './components/range-selector/RangeSelector';export { IRangeSelectorService } from './services/range-selector/range-selector.service';export { DesktopLocalStorageService } from './services/local-storage/local-storage.service';-export { useActiveWorkbook, useActiveWorksheet } from './views/hooks/active';export { CanvasPopupService, ICanvasPopupService } from './services/popup/canvas-popup.service';export { ProgressBar } from './components/progress-bar/ProgressBar';export { IProgressService } from './services/progress/progress.service';diff --git a/packages/ui/src/services/__tests__/progress.service.spec.ts b/packages/ui/src/services/__tests__/progress.service.spec.tsindex 0c4765d514..875265aeaa 100644--- a/packages/ui/src/services/__tests__/progress.service.spec.ts+++ b/packages/ui/src/services/__tests__/progress.service.spec.ts@@ -144,14 +144,14 @@ describe('ProgressService', () => {let visibleCompleted = false;const changeSubscription = result.current.progressChange$.subscribe({- next: (step) => {},+ next: (step) => { /* empty */ },complete: () => {changeCompleted = true;},});const visibleSubscription = result.current.progressVisible$.subscribe({- next: (visible) => {},+ next: (visible) => { /* empty */ },complete: () => {visibleCompleted = true;},diff --git a/packages/ui/src/services/global-zone/desktop-global-zone.service.ts b/packages/ui/src/services/global-zone/desktop-global-zone.service.tsindex 887709bea6..350bdbae51 100644--- a/packages/ui/src/services/global-zone/desktop-global-zone.service.ts+++ b/packages/ui/src/services/global-zone/desktop-global-zone.service.ts@@ -31,7 +31,9 @@ export class DesktopGlobalZoneService implements IGlobalZoneService {constructor(@Inject(ComponentManager)private readonly _componentManager: ComponentManager- ) {}+ ) {+ // empty+ }get componentKey() {return this._componentKey;diff --git a/packages/ui/src/services/message/__testing__/mock-message.service.ts b/packages/ui/src/services/message/__testing__/mock-message.service.tsindex edc1bdb89a..da3d59181f 100644--- a/packages/ui/src/services/message/__testing__/mock-message.service.ts+++ b/packages/ui/src/services/message/__testing__/mock-message.service.ts@@ -25,8 +25,10 @@ import type { IMessageService } from '../message.service';*/export class MockMessageService implements IMessageService {show(_options: IMessageMethodOptions & Omit<IMessageProps, 'key'>): IDisposable {- return toDisposable(() => {});+ return toDisposable(() => { /* empty */ });}- setContainer(): void {}+ setContainer(): void {+ // empty+ }}diff --git a/packages/ui/src/services/notification/desktop-notification.service.ts b/packages/ui/src/services/notification/desktop-notification.service.tsindex 8aa4d500e2..b64c34a4f5 100644--- a/packages/ui/src/services/notification/desktop-notification.service.ts+++ b/packages/ui/src/services/notification/desktop-notification.service.ts@@ -25,6 +25,6 @@ export class DesktopNotificationService implements INotificationService {show(params: INotificationMethodOptions): IDisposable {notification.show(params);- return toDisposable(() => {});+ return toDisposable(() => { /* empty */ });}}diff --git a/packages/ui/src/services/shortcut/shortcut-panel.service.ts b/packages/ui/src/services/shortcut/shortcut-panel.service.tsindex 2d11fca0d2..44b233e6ad 100644--- a/packages/ui/src/services/shortcut/shortcut-panel.service.ts+++ b/packages/ui/src/services/shortcut/shortcut-panel.service.ts@@ -25,6 +25,8 @@ export class ShortcutPanelService extends Disposable {}override dispose(): void {+ super.dispose();+this._open$.next(false);this._open$.complete();}diff --git a/packages/ui/src/services/sidebar/desktop-sidebar.service.ts b/packages/ui/src/services/sidebar/desktop-sidebar.service.tsindex d7a3c77d33..714adf5627 100644--- a/packages/ui/src/services/sidebar/desktop-sidebar.service.ts+++ b/packages/ui/src/services/sidebar/desktop-sidebar.service.ts@@ -34,18 +34,10 @@ export class DesktopSidebarService implements ISidebarService {this.sidebarOptions$.next(this._sidebarOptions);return toDisposable(() => {- this.sidebarOptions$.complete();+ this.close();});}- set(params: ISidebarMethodOptions): void {- this._sidebarOptions = {- ...params,- };-- this.sidebarOptions$.next(this._sidebarOptions);- }-close() {this._sidebarOptions = {...this._sidebarOptions,diff --git a/packages/ui/src/services/sidebar/sidebar.service.ts b/packages/ui/src/services/sidebar/sidebar.service.tsindex c1e48fffe1..4b6303a7c7 100644--- a/packages/ui/src/services/sidebar/sidebar.service.ts+++ b/packages/ui/src/services/sidebar/sidebar.service.ts@@ -26,8 +26,5 @@ export interface ISidebarService {readonly sidebarOptions$: Subject<ISidebarMethodOptions>;open(params: ISidebarMethodOptions): IDisposable;-- set(params: ISidebarMethodOptions): void;-close(): void;}diff --git a/packages/ui/src/services/zen-zone/desktop-zen-zone.service.ts b/packages/ui/src/services/zen-zone/desktop-zen-zone.service.tsindex 8d91d395de..e1b08906af 100644--- a/packages/ui/src/services/zen-zone/desktop-zen-zone.service.ts+++ b/packages/ui/src/services/zen-zone/desktop-zen-zone.service.ts@@ -26,7 +26,9 @@ export class DesktopZenZoneService implements IZenZoneService {readonly visible$ = new Subject<boolean>();readonly componentKey$ = new Subject<string>();- constructor(@Inject(ComponentManager) private readonly _componentManager: ComponentManager) {}+ constructor(@Inject(ComponentManager) private readonly _componentManager: ComponentManager) {+ // super+ }set(key: string, component: ForwardRefExoticComponent<any>): IDisposable {this._componentManager.register(key, component);diff --git a/packages/ui/src/views/components/sidebar/interface.ts b/packages/ui/src/views/components/sidebar/interface.tsindex 233d51753e..603a5a53a2 100644--- a/packages/ui/src/views/components/sidebar/interface.ts+++ b/packages/ui/src/views/components/sidebar/interface.ts@@ -18,9 +18,7 @@ import type { ICustomLabelProps } from '../../../components/custom-label/CustomLexport interface ISidebarMethodOptions {header?: ICustomLabelProps;-children?: ICustomLabelProps;-footer?: ICustomLabelProps;visible?: boolean;@@ -28,6 +26,5 @@ export interface ISidebarMethodOptions {width?: number | string;onClose?: () => void;-onOpen?: () => void;}diff --git a/packages/uniscript/src/services/script-panel.service.ts b/packages/uniscript/src/services/script-panel.service.tsindex 86f4e94f3d..c70ce8ccb4 100644--- a/packages/uniscript/src/services/script-panel.service.ts+++ b/packages/uniscript/src/services/script-panel.service.ts@@ -25,6 +25,8 @@ export class ScriptPanelService extends Disposable {}override dispose(): void {+ super.dispose();+this._open$.next(false);this._open$.complete();}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1fab561ac1..9e1730145a 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -10,7 +10,7 @@ importers:devDependencies:'@antfu/eslint-config':specifier: ^2.15.0- version: 2.16.0(@eslint-react/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))(@vue/[email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))+ version: 2.15.0(@eslint-react/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))(@vue/[email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))'@commitlint/cli':specifier: ^19.3.0version: 19.3.0(@types/[email protected])([email protected])@@ -25,10 +25,10 @@ importers:version: 1.43.1'@release-it-plugins/workspaces':specifier: ^4.2.0- version: 4.2.0([email protected]([email protected]))+ version: 4.2.0([email protected]([email protected]))'@release-it/conventional-changelog':specifier: ^8.0.1- version: 8.0.1([email protected]([email protected]))+ version: 8.0.1([email protected]([email protected]))'@storybook/react':specifier: 8.0.9@@ -37,7 +37,7 @@ importers:version: 20.12.7'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/design':specifier: workspace:*version: link:packages/design@@ -82,7 +82,7 @@ importers:version: 18.2.0([email protected])release-it:specifier: ^17.2.0- version: 17.2.1([email protected])+ version: 17.2.0([email protected])serve:specifier: ^14.2.2version: 14.2.2@@ -92,6 +92,9 @@ importers:typescript:specifier: ^5.4.5version: 5.4.5+ vitest:+ specifier: ^1.5.0+ version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])common/shared:dependencies:@@ -103,7 +106,7 @@ importers:version: 4.2.1([email protected](@types/[email protected])([email protected])([email protected])([email protected]))'@vitest/coverage-istanbul':specifier: ^1.5.2- version: 1.5.2([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))+ version: 1.6.0([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))happy-dom:specifier: 13.3.8version: 13.3.8@@ -115,7 +118,7 @@ importers:vite-plugin-dts:specifier: ^3.9.0- version: 3.9.0(@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))+ version: 3.9.0(@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected]))vitest:specifier: ^1.5.2version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])@@ -127,7 +130,7 @@ importers:version: 1.3.3([email protected])'@storybook/addon-essentials':specifier: 8.0.9'@storybook/addon-interactions':specifier: 8.0.9version: 8.0.9([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))@@ -142,7 +145,7 @@ importers:'@storybook/blocks':specifier: 8.0.9'@storybook/icons':specifier: ^1.2.9@@ -293,7 +296,7 @@ importers:version: 18.2.0([email protected])react-mosaic-component:specifier: ^6.1.0- version: 6.1.0(@types/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))([email protected])+ version: 6.1.0(@types/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))([email protected])rxjs:specifier: ^7.8.1version: 7.8.1@@ -303,10 +306,10 @@ importers:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@types/react-dom':specifier: ^18.2.25- version: 18.3.0+ version: 18.2.25'@univerjs/shared':specifier: workspace:*version: link:../common/shared@@ -339,7 +342,7 @@ importers:dependencies:'@univerjs/protocol':specifier: ^0.1.20- version: 0.1.23(@grpc/[email protected])([email protected])+ version: 0.1.20(@grpc/[email protected])([email protected])nanoid:specifier: 5.0.7version: 5.0.7@@ -370,7 +373,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/data-validation:devDependencies:@@ -397,7 +400,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/design:dependencies:@@ -458,10 +461,10 @@ importers:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@types/react-dom':specifier: ^18.2.25- version: 18.3.0+ version: 18.2.25'@types/react-grid-layout':specifier: ^1.3.5version: 1.3.5@@ -494,7 +497,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/docs:devDependencies:@@ -521,13 +524,13 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/docs-ui:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/core':specifier: workspace:*version: link:../core@@ -566,7 +569,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/engine-formula:dependencies:@@ -600,7 +603,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/engine-numfmt:dependencies:@@ -619,7 +622,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/engine-render:dependencies:@@ -653,7 +656,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/facade:devDependencies:@@ -710,10 +713,10 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])vitest-canvas-mock:specifier: ^0.3.3- version: 0.3.3([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))+ version: 0.3.3([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))packages/find-replace:dependencies:@@ -723,7 +726,7 @@ importers:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/core':specifier: workspace:*version: link:../core@@ -762,7 +765,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/image:dependencies:@@ -808,7 +811,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/network:devDependencies:@@ -832,7 +835,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/rpc:devDependencies:@@ -856,7 +859,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets:devDependencies:@@ -889,7 +892,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-conditional-formatting:devDependencies:@@ -931,7 +934,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-conditional-formatting-ui:dependencies:@@ -1016,7 +1019,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-data-validation:dependencies:@@ -1080,7 +1083,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-filter:devDependencies:@@ -1207,7 +1210,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-formula:dependencies:@@ -1217,7 +1220,7 @@ importers:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/core':specifier: workspace:*version: link:../core@@ -1271,7 +1274,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-numfmt:dependencies:@@ -1281,7 +1284,7 @@ importers:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/core':specifier: workspace:*version: link:../core@@ -1329,7 +1332,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-ui:dependencies:@@ -1342,7 +1345,7 @@ importers:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/core':specifier: workspace:*version: link:../core@@ -1393,7 +1396,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/sheets-zen-editor:dependencies:@@ -1445,7 +1448,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/slides:devDependencies:@@ -1472,13 +1475,13 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/slides-ui:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/core':specifier: workspace:*version: link:../core@@ -1520,7 +1523,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/ui:dependencies:@@ -1539,20 +1542,20 @@ importers:optionalDependencies:vue:specifier: '>=3.0.0'- version: 3.4.21([email protected])+ version: 3.4.24([email protected])devDependencies:'@testing-library/react':specifier: ^14.2.2'@testing-library/react-hooks':specifier: ^8.0.1'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@types/react-dom':specifier: ^18.2.25- version: 18.3.0+ version: 18.2.25'@types/react-transition-group':specifier: ^4.4.10version: 4.4.10@@ -1597,7 +1600,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages/umd:dependencies:@@ -1639,7 +1642,7 @@ importers:version: link:../network'@univerjs/protocol':specifier: ^0.1.20- version: 0.1.23(@grpc/[email protected])([email protected])+ version: 0.1.20(@grpc/[email protected])([email protected])'@univerjs/rpc':specifier: workspace:*version: link:../rpc@@ -1718,7 +1721,7 @@ importers:devDependencies:'@types/react':specifier: ^18.2.79- version: 18.3.1+ version: 18.2.79'@univerjs/core':specifier: workspace:*version: link:../core@@ -1754,7 +1757,7 @@ importers:vitest:specifier: ^1.5.0- version: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])packages:@@ -1769,8 +1772,8 @@ packages:resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}engines: {node: '>=6.0.0'}- '@antfu/[email protected]':- resolution: {integrity: sha512-K56svKb2tRtJcONE548tyvZJ8ZQPJiHp+20Aez1Dy77nVKQbPiCDFYGHxuk3fn1+NSL6PUxbVm/IEhqIWtZFCQ==}+ '@antfu/[email protected]':+ resolution: {integrity: sha512-qoqw+0N8bqz0vBIigGJamaIf1LdzXcmCDuleygJAF3EtACLieKyIMvpOdc2TU9AnuPbMBFCkN40340UWRChELw==}hasBin: truepeerDependencies:'@eslint-react/eslint-plugin': ^1.5.8@@ -1951,6 +1954,11 @@ packages:engines: {node: '>=6.0.0'}hasBin: true+ '@babel/[email protected]':+ resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==}+ engines: {node: '>=6.0.0'}+ hasBin: true+'@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.1':resolution: {integrity: sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==}engines: {node: '>=6.9.0'}@@ -1975,29 +1983,34 @@ packages:peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}+ '@babel/plugin-syntax-async-generators@https://r2.cnpmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz':+ resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz}+ version: 7.8.4peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}+ '@babel/plugin-syntax-class-properties@https://r2.cnpmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz':+ resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz}+ version: 7.12.13peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}+ '@babel/plugin-syntax-class-static-block@https://r2.cnpmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz':+ resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz}+ version: 7.14.5engines: {node: '>=6.9.0'}peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}+ '@babel/plugin-syntax-dynamic-import@https://r2.cnpmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz':+ resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz}+ version: 7.8.3peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}+ '@babel/plugin-syntax-export-namespace-from@https://r2.cnpmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz':+ resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz}+ version: 7.8.3peerDependencies:'@babel/core': ^7.0.0-0@@ -2019,13 +2032,15 @@ packages:peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}+ '@babel/plugin-syntax-import-meta@https://r2.cnpmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz':+ resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz}+ version: 7.10.4peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}+ '@babel/plugin-syntax-json-strings@https://r2.cnpmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz':+ resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz}+ version: 7.8.3peerDependencies:'@babel/core': ^7.0.0-0@@ -2035,44 +2050,52 @@ packages:peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}+ '@babel/plugin-syntax-logical-assignment-operators@https://r2.cnpmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz':+ resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz}+ version: 7.10.4peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}+ '@babel/plugin-syntax-nullish-coalescing-operator@https://r2.cnpmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz':+ resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz}+ version: 7.8.3peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}+ '@babel/plugin-syntax-numeric-separator@https://r2.cnpmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz':+ resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz}+ version: 7.10.4peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}+ '@babel/plugin-syntax-object-rest-spread@https://r2.cnpmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz':+ resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz}+ version: 7.8.3peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}+ '@babel/plugin-syntax-optional-catch-binding@https://r2.cnpmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz':+ resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz}+ version: 7.8.3peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}+ '@babel/plugin-syntax-optional-chaining@https://r2.cnpmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz':+ resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz}+ version: 7.8.3peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}+ '@babel/plugin-syntax-private-property-in-object@https://r2.cnpmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz':+ resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz}+ version: 7.14.5engines: {node: '>=6.9.0'}peerDependencies:'@babel/core': ^7.0.0-0- '@babel/[email protected]':- resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}+ '@babel/plugin-syntax-top-level-await@https://r2.cnpmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz':+ resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==, tarball: https://r2.cnpmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz}+ version: 7.14.5engines: {node: '>=6.9.0'}peerDependencies:'@babel/core': ^7.0.0-0@@ -2449,8 +2472,9 @@ packages:resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}engines: {node: '>=6.9.0'}- '@base2/[email protected]':- resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}+ '@base2/pretty-print-object@https://r2.cnpmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz':+ resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==, tarball: https://r2.cnpmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz}+ version: 1.0.1'@chromatic-com/[email protected]':resolution: {integrity: sha512-1y9r691T5vVGDZ0HY3YrCXUnvtrT2YrhDuvDZSvYSNUVpM/Imz6i1dnNMKb3eoI1qRsH55mI4zCt+Iq94NLedQ==}@@ -2757,11 +2781,12 @@ packages:resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}- '@fal-works/[email protected]':- resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}+ '@fal-works/esbuild-plugin-global-externals@https://r2.cnpmjs.org/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz':+ resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==, tarball: https://r2.cnpmjs.org/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz}+ version: 2.1.2- '@grpc/[email protected]':- resolution: {integrity: sha512-MqBisuxTkYvPFnEiu+dag3xG/NBUDzSbAFAWlzfkGnQkjVZ6by3h4atbBc+Ikqup1z5BfB4BN18gKWR1YyppNw==}+ '@grpc/[email protected]':+ resolution: {integrity: sha512-xP58G7wDQ4TCmN/cMUHh00DS7SRDv/+lC+xFLrTkMIN8h55X5NhZMLYbvy7dSELP15qlI6hPhNCRWVMtZMwqLA==}engines: {node: '>=12.10.0'}'@grpc/[email protected]':@@ -2784,8 +2809,9 @@ packages:resolution: {integrity: sha512-e5+YUKENATs1JgYHMzTr2MW/NDcXGfYFAuOQU8gJgF/kEh4EqKgfGrfLI67bMD4tbhZVlkigz/9YYwWcbOFthg==}engines: {node: '>=10.13.0'}- '@iarna/[email protected]':- resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}+ '@iarna/toml@https://r2.cnpmjs.org/@iarna/toml/-/toml-2.2.5.tgz':+ resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==, tarball: https://r2.cnpmjs.org/@iarna/toml/-/toml-2.2.5.tgz}+ version: 2.2.5'@img/[email protected]':resolution: {integrity: sha512-FaNiGX1MrOuJ3hxuNzWgsT/mg5OHG/Izh59WW2mk1UwYHUwtfbhk5QNKYZgxf0pLOhx9ctGiGa2OykD71vOnSw==}@@ -2912,10 +2938,6 @@ packages:cpu: [x64]os: [win32]- '@inquirer/[email protected]':- resolution: {integrity: sha512-mtup3wVKia3ZwULPHcbs4Mor8Voi+iIXEWD7wCNbIO6lYR62oPCTQyrddi5OMYVXHzeCSoneZwJuS8sBvlEwDw==}- engines: {node: '>=18'}-'@isaacs/[email protected]':resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}engines: {node: '>=12'}@@ -3184,78 +3206,92 @@ packages:rollup:optional: true- '@rollup/[email protected]':- resolution: {integrity: sha512-3XFIDKWMFZrMnao1mJhnOT1h2g0169Os848NhhmGweEcfJ4rCi+3yMCOLG4zA61rbJdkcrM/DjVZm9Hg5p5w7g==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==}cpu: [arm]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-GdxxXbAuM7Y/YQM9/TwwP+L0omeE/lJAR1J+olu36c3LqqZEBdsIWeQ91KBe6nxwOnb06Xh7JS2U5ooWU5/LgQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==}cpu: [arm64]os: [android]- '@rollup/[email protected]':- resolution: {integrity: sha512-mCMlpzlBgOTdaFs83I4XRr8wNPveJiJX1RLfv4hggyIVhfB5mJfN4P8Z6yKh+oE4Luz+qq1P3kVdWrCKcMYrrA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==}cpu: [arm64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-yUoEvnH0FBef/NbB1u6d3HNGyruAKnN74LrPAfDQL3O32e3k3OSfLrPgSJmgb3PJrBZWfPyt6m4ZhAFa2nZp2A==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==}cpu: [x64]os: [darwin]- '@rollup/[email protected]':- resolution: {integrity: sha512-GYbLs5ErswU/Xs7aGXqzc3RrdEjKdmoCrgzhJWyFL0r5fL3qd1NPcDKDowDnmcoSiGJeU68/Vy+OMUluRxPiLQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==}+ cpu: [arm]+ os: [linux]+ libc: [glibc]++ '@rollup/[email protected]':+ resolution: {integrity: sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==}cpu: [arm]os: [linux]+ libc: [musl]- '@rollup/[email protected]':- resolution: {integrity: sha512-L1+D8/wqGnKQIlh4Zre9i4R4b4noxzH5DDciyahX4oOz62CphY7WDWqJoQ66zNR4oScLNOqQJfNSIAe/6TPUmQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==}cpu: [arm64]os: [linux]+ libc: [glibc]- '@rollup/[email protected]':- resolution: {integrity: sha512-tK5eoKFkXdz6vjfkSTCupUzCo40xueTOiOO6PeEIadlNBkadH1wNOH8ILCPIl8by/Gmb5AGAeQOFeLev7iZDOA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==}cpu: [arm64]os: [linux]+ libc: [musl]- '@rollup/[email protected]':- resolution: {integrity: sha512-zvXvAUGGEYi6tYhcDmb9wlOckVbuD+7z3mzInCSTACJ4DQrdSLPNUeDIcAQW39M3q6PDquqLWu7pnO39uSMRzQ==}- cpu: [ppc64le]+ '@rollup/[email protected]':+ resolution: {integrity: sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==}+ cpu: [ppc64]os: [linux]+ libc: [glibc]- '@rollup/[email protected]':- resolution: {integrity: sha512-C3GSKvMtdudHCN5HdmAMSRYR2kkhgdOfye4w0xzyii7lebVr4riCgmM6lRiSCnJn2w1Xz7ZZzHKuLrjx5620kw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==}cpu: [riscv64]os: [linux]+ libc: [glibc]- '@rollup/[email protected]':- resolution: {integrity: sha512-l4U0KDFwzD36j7HdfJ5/TveEQ1fUTjFFQP5qIt9gBqBgu1G8/kCaq5Ok05kd5TG9F8Lltf3MoYsUMw3rNlJ0Yg==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==}cpu: [s390x]os: [linux]+ libc: [glibc]- '@rollup/[email protected]':- resolution: {integrity: sha512-xXMLUAMzrtsvh3cZ448vbXqlUa7ZL8z0MwHp63K2IIID2+DeP5iWIT6g1SN7hg1VxPzqx0xZdiDM9l4n9LRU1A==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==}cpu: [x64]os: [linux]+ libc: [glibc]- '@rollup/[email protected]':- resolution: {integrity: sha512-M/JYAWickafUijWPai4ehrjzVPKRCyDb1SLuO+ZyPfoXgeCEAlgPkNXewFZx0zcnoIe3ay4UjXIMdXQXOZXWqA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==}cpu: [x64]os: [linux]+ libc: [musl]- '@rollup/[email protected]':- resolution: {integrity: sha512-2YWwoVg9KRkIKaXSh0mz3NmfurpmYoBBTAXA9qt7VXk0Xy12PoOP40EFuau+ajgALbbhi4uTj3tSG3tVseCjuA==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==}cpu: [arm64]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-2FSsE9aQ6OWD20E498NYKEQLneShWes0NGMPQwxWOdws35qQXH+FplabOSP5zEe1pVjurSDOGEVCE2agFwSEsw==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==}cpu: [ia32]os: [win32]- '@rollup/[email protected]':- resolution: {integrity: sha512-7h7J2nokcdPePdKykd8wtc8QqqkqxIrUz7MHj6aNr8waBRU//NLDVnNjQnqQO6fqtjrtCdftpbTuOKAyrAQETQ==}+ '@rollup/[email protected]':+ resolution: {integrity: sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==}cpu: [x64]os: [win32]@@ -3401,8 +3437,8 @@ packages:'@storybook/[email protected]':resolution: {integrity: sha512-PiNMhL97giLytTdQwuhsZ92buVk4gy9H/8DtrDhUc45/1OmF95gogm6T2Yap729SIFwgpOcuq/U3aVo6d6swVQ==}- '@storybook/[email protected]':- resolution: {integrity: sha512-pW7Dtk/bE2JGrAe/KuBY4Io02NBe/2CLP2DkgVgWlSwvEVdm/rbQyiwy8RaL0lQlJCv9CsGBY+n9HQG8d4bZjQ==}+ '@storybook/[email protected]':+ resolution: {integrity: sha512-B9UI/lsQMjF+oEfZCI6YXNoeuBcGZoOP5x8yKbe2tIEmsMjSztFKkpPzi5nLCnBk/MBtl6QJeI3ksJnbsWPkOw==}'@storybook/[email protected]':resolution: {integrity: sha512-NmiGXl2HU33zpwTv1XORe9XG9H+dRUC1Jl11u92L4xr062pZtrShLmD4VKIsOQujxhhOrbxpwhNOt+6TdhyIdQ==}@@ -3617,8 +3653,9 @@ packages:'@swc/[email protected]':resolution: {integrity: sha512-/JLo/l2JsT/LRd80C3HfbmVpxOAJ11FO2RCEslFrgzLltoP9j8XIbsyDcfCt2WWyX+CM96rBoNM+IToAkFOugg==}- '@szmarczak/[email protected]':- resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}+ '@szmarczak/http-timer@https://r2.cnpmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz':+ resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==, tarball: https://r2.cnpmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz}+ version: 5.0.1engines: {node: '>=14.16'}'@testing-library/[email protected]':@@ -3678,8 +3715,9 @@ packages:'@tootallnate/[email protected]':resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==}- '@types/[email protected]':- resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==}+ '@types/argparse@https://r2.cnpmjs.org/@types/argparse/-/argparse-1.0.38.tgz':+ resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==, tarball: https://r2.cnpmjs.org/@types/argparse/-/argparse-1.0.38.tgz}+ version: 1.0.38'@types/[email protected]':resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}@@ -3714,20 +3752,22 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-Rf3/lB9WkDfIL9eEKaSYKc+1L/rNVYBjThk22JTqQw0YozXarX8YljFAz+HCoC6h4B4KwCMsBPZHaFezwT4BNA==}- '@types/[email protected]':- resolution: {integrity: sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==}-'@types/[email protected]':resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==}+ '@types/doctrine@https://r2.cnpmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz':+ resolution: {integrity: sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==, tarball: https://r2.cnpmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz}+ version: 0.0.3+'@types/[email protected]':resolution: {integrity: sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==}'@types/[email protected]':resolution: {integrity: sha512-TB/6hBkYQJxsZHSqyeuO1Jt0AB/bW6G7rHt9g7lML7SOF6lbgcHvw/Lr+69iqN0qxgXLhWKScAon73JNnptuDw==}- '@types/[email protected]':- resolution: {integrity: sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==}+ '@types/escodegen@https://r2.cnpmjs.org/@types/escodegen/-/escodegen-0.0.6.tgz':+ resolution: {integrity: sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==, tarball: https://r2.cnpmjs.org/@types/escodegen/-/escodegen-0.0.6.tgz}+ version: 0.0.6'@types/[email protected]':resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}@@ -3753,8 +3793,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}- '@types/[email protected]':- resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==}+ '@types/html-minifier-terser@https://r2.cnpmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz':+ resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==, tarball: https://r2.cnpmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz}+ version: 6.1.0'@types/[email protected]':resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}@@ -3823,8 +3864,8 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}- '@types/[email protected]':- resolution: {integrity: sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==}+ '@types/[email protected]':+ resolution: {integrity: sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==}'@types/[email protected]':resolution: {integrity: sha512-WH/po1gcEcoR6y857yAnPGug+ZhkF4PaTUxgAbwfeSH/QOgVSakKHBXoPGad/sEznmkiaK3pqHk+etdWisoeBQ==}@@ -3832,8 +3873,8 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==}- '@types/[email protected]':- resolution: {integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==}+ '@types/[email protected]':+ resolution: {integrity: sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==}'@types/[email protected]':resolution: {integrity: sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==}@@ -4027,8 +4068,8 @@ packages:react: '*'react-dom: '*'- '@univerjs/[email protected]':- resolution: {integrity: sha512-xOilOZjr+qA3RtKsgcVhRXp5Bo45JryPutrcVNeM06PoGmljWBfbQZhHZ0HjHxN1iYZNl9AO4LPuouLEeB4IZQ==}+ '@univerjs/[email protected]':+ resolution: {integrity: sha512-obplLf02e+x+E/Hezh3ES9H/JsFtHgYla7C1G1ffTVbbrqmRssebQ5birqgMcVx1Sj3WG5vsCJ0forISNRjkLg==}engines: {node: '>=16.0.0', npm: '>=8.0.0'}peerDependencies:'@grpc/grpc-js': ^1.9.14@@ -4040,28 +4081,37 @@ packages:peerDependencies:vite: ^4.2.0 || ^5.0.0- '@vitest/[email protected]':- resolution: {integrity: sha512-YGC+QSWOL8cQ2HQaTEFttmG9v3DGLy7lMZIGdqjtTgaW6omW17/uZPxuh6m2t69T0rFLqImduVthm5o/gYYWTQ==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-h/BwpXehkkS0qsNCS00QxiupAqVkNi0WT19BR0dQvlge5oHghoSVLx63fABYFoKxVb7Ue7+k6V2KokmQ1zdMpg==}peerDependencies:- vitest: 1.5.2+ vitest: 1.6.0'@vitest/[email protected]':resolution: {integrity: sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==}+'@vitest/[email protected]':resolution: {integrity: sha512-rf7MTD1WCoDlN3FfYJ9Llfp0PbdtOMZ3FIF0AVkDnKbp3oiMW1c8AmvRZBcqbAhDUAvF52e9zx4WQM1r3oraVA==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==}+'@vitest/[email protected]':resolution: {integrity: sha512-7IJ7sJhMZrqx7HIEpv3WrMYcq8ZNz9L6alo81Y6f8hV5mIE6yVZsFoivLZmr0D777klm1ReqonE9LyChdcmw6g==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==}+'@vitest/[email protected]':resolution: {integrity: sha512-CTEp/lTYos8fuCc9+Z55Ga5NVPKUgExritjF5VY7heRFUfheoAqBneUlvXSUJHUZPjnPmyZA96yLRJDP1QATFQ==}'@vitest/[email protected]':resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==}- '@vitest/[email protected]':- resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==}'@vitest/[email protected]':resolution: {integrity: sha512-xCcPvI8JpCtgikT9nLpHPL1/81AYqZy1GCy4+MCHBE7xi8jgsYkULpW5hrx5PGLgOQjUpb6fd15lqcriJ40tfQ==}@@ -4069,8 +4119,8 @@ packages:'@vitest/[email protected]':resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==}- '@vitest/[email protected]':- resolution: {integrity: sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==}'@vitest/[email protected]':resolution: {integrity: sha512-sWOmyofuXLJ85VvXNsroZur7mOJGiQeM0JN3/0D1uU8U9bGFM69X1iqHaRXl6R8BwaLY6yPCogP257zxTzkUdA==}@@ -4087,15 +4137,27 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==}+'@vue/[email protected]':resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==}+'@vue/[email protected]':resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==}+'@vue/[email protected]':resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==}+'@vue/[email protected]':resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}peerDependencies:@@ -4107,20 +4169,37 @@ packages:'@vue/[email protected]':resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-nup3fSYg4i4LtNvu9slF/HF/0dkMQYfepUdORBcMSsankzRPzE7ypAFurpwyRBfU1i7Dn1kcwpYsE1wETSh91g==}+'@vue/[email protected]':resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-c7iMfj6cJMeAG3s5yOn9Rc5D9e2/wIuaozmGf/ICGCY3KV5H7mbTVdvEkd4ZshTq7RUZqj2k7LMJWVx+EBiY1g==}+'@vue/[email protected]':resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-uXKzuh/Emfad2Y7Qm0ABsLZZV6H3mAJ5ZVqmAOlrNQRf+T5mxpPGZBfec1hkP41t6h6FwF6RSGCs/gd8WbuySQ==}+'@vue/[email protected]':resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==}peerDependencies:vue: 3.4.21+ '@vue/[email protected]':+ resolution: {integrity: sha512-H+DLK4sQF6sRgzKyofmlEVBIV/9KrQU6HIV7nt6yIwSGGKvSwlV8pqJlebUKLpbXaNHugdSfAbP6YmXF69lxow==}+ peerDependencies:+ vue: 3.4.24+'@vue/[email protected]':resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==}+ '@vue/[email protected]':+ resolution: {integrity: sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==}+'@webassemblyjs/[email protected]':resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}@@ -4169,11 +4248,13 @@ packages:'@wendellhu/[email protected]':resolution: {integrity: sha512-Fsk+L7zVs+R56GnymqLEgH+WaliLhHFwxrKkIppEAQB10uH7YQLRja+jvXKTbaQpNWZvF5jiK5qJHyTkURv8Pg==}- '@xtuc/[email protected]':- resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}+ '@xtuc/ieee754@https://r2.cnpmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz':+ resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==, tarball: https://r2.cnpmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz}+ version: 1.2.0- '@xtuc/[email protected]':- resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}+ '@xtuc/long@https://r2.cnpmjs.org/@xtuc/long/-/long-4.2.2.tgz':+ resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==, tarball: https://r2.cnpmjs.org/@xtuc/long/-/long-4.2.2.tgz}+ version: 4.2.2'@yarnpkg/[email protected]':resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}@@ -4210,18 +4291,20 @@ packages:peerDependencies:acorn: ^6.0.0 || ^7.0.0 || ^8.0.0- resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}- engines: {node: '>=0.4.0'}+ acorn-jsx@https://r2.cnpmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz:+ resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==, tarball: https://r2.cnpmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz}+ version: 5.3.2+ peerDependencies:+ acorn: ^6.0.0 || ^7.0.0 || ^8.0.0resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}engines: {node: '>=0.4.0'}- resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}+ acorn-walk@https://r2.cnpmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz:+ resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==, tarball: https://r2.cnpmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz}+ version: 7.2.0engines: {node: '>=0.4.0'}- hasBin: trueresolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==}@@ -4233,6 +4316,12 @@ packages:engines: {node: '>=0.4.0'}hasBin: true+ acorn@https://r2.cnpmjs.org/acorn/-/acorn-7.4.1.tgz:+ resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==, tarball: https://r2.cnpmjs.org/acorn/-/acorn-7.4.1.tgz}+ version: 7.4.1+ engines: {node: '>=0.4.0'}+ hasBin: true+resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}@@ -4248,21 +4337,24 @@ packages:resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}engines: {node: '>=8'}- resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}+ ajv-formats@https://r2.cnpmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz:+ resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==, tarball: https://r2.cnpmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz}+ version: 2.1.1peerDependencies:ajv: ^8.0.0peerDependenciesMeta:ajv:optional: true- resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}+ ajv-keywords@https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz:+ resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==, tarball: https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz}+ version: 3.5.2peerDependencies:ajv: ^6.9.1- resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}+ ajv-keywords@https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz:+ resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==, tarball: https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz}+ version: 5.1.0peerDependencies:ajv: ^8.8.2@@ -4272,19 +4364,29 @@ packages:resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}+ ajv@https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz:+ resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==, tarball: https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz}+ version: 6.12.6+resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==}- resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}- engines: {node: '>=8'}+ ansi-align@https://r2.cnpmjs.org/ansi-align/-/ansi-align-3.0.1.tgz:+ resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==, tarball: https://r2.cnpmjs.org/ansi-align/-/ansi-align-3.0.1.tgz}+ version: 3.0.1resolution: {integrity: sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==}engines: {node: '>=14.16'}- resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==}+ ansi-escapes@https://r2.cnpmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz:+ resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==, tarball: https://r2.cnpmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz}+ version: 4.3.2+ engines: {node: '>=8'}++ ansi-html-community@https://r2.cnpmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz:+ resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==, tarball: https://r2.cnpmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz}+ version: 0.0.8engines: {'0': node >= 0.8.0}hasBin: true@@ -4296,6 +4398,11 @@ packages:resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}engines: {node: '>=12'}+ ansi-regex@https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz:+ resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==, tarball: https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz}+ version: 5.0.1+ engines: {node: '>=8'}+resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}engines: {node: '>=4'}@@ -4312,12 +4419,23 @@ packages:resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}engines: {node: '>=12'}+ ansi-styles@https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz:+ resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==, tarball: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz}+ version: 4.3.0+ engines: {node: '>=8'}++ ansi-styles@https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz:+ resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==, tarball: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz}+ version: 5.2.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}engines: {node: '>= 8'}- resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==}+ app-root-dir@https://r2.cnpmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz:+ resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==, tarball: https://r2.cnpmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz}+ version: 1.0.2resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}@@ -4329,12 +4447,17 @@ packages:resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}- resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}-resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}+ argparse@https://r2.cnpmjs.org/argparse/-/argparse-1.0.10.tgz:+ resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==, tarball: https://r2.cnpmjs.org/argparse/-/argparse-1.0.10.tgz}+ version: 1.0.10++ argparse@https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz:+ resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==, tarball: https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz}+ version: 2.0.1+resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}@@ -4349,8 +4472,9 @@ packages:resolution: {integrity: sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==}engines: {node: '>=8'}- resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}+ array-flatten@https://r2.cnpmjs.org/array-flatten/-/array-flatten-1.1.1.tgz:+ resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==, tarball: https://r2.cnpmjs.org/array-flatten/-/array-flatten-1.1.1.tgz}+ version: 1.1.1resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}@@ -4402,16 +4526,18 @@ packages:resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}- resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}- engines: {node: '>=4'}-resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}engines: {node: '>=4'}- resolution: {integrity: sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==}+ ast-types@https://r2.cnpmjs.org/ast-types/-/ast-types-0.13.4.tgz:+ resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==, tarball: https://r2.cnpmjs.org/ast-types/-/ast-types-0.13.4.tgz}+ version: 0.13.4+ engines: {node: '>=4'}++ async-retry@https://r2.cnpmjs.org/async-retry/-/async-retry-1.3.3.tgz:+ resolution: {integrity: sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==, tarball: https://r2.cnpmjs.org/async-retry/-/async-retry-1.3.3.tgz}+ version: 1.3.3resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==}@@ -4423,8 +4549,9 @@ packages:resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}+ babel-core@https://r2.cnpmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz:+ resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==, tarball: https://r2.cnpmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz}+ version: 7.0.0-bridge.0peerDependencies:'@babel/core': ^7.0.0-0@@ -4446,6 +4573,10 @@ packages:resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}+ balanced-match@https://r2.cnpmjs.org/balanced-match/-/balanced-match-1.0.2.tgz:+ resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==, tarball: https://r2.cnpmjs.org/balanced-match/-/balanced-match-1.0.2.tgz}+ version: 1.0.2+resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}@@ -4471,15 +4602,17 @@ packages:resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}engines: {node: '>=8'}- resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}+ bl@https://r2.cnpmjs.org/bl/-/bl-4.1.0.tgz:+ resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==, tarball: https://r2.cnpmjs.org/bl/-/bl-4.1.0.tgz}+ version: 4.1.0resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}- resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}+ boolbase@https://r2.cnpmjs.org/boolbase/-/boolbase-1.0.0.tgz:+ resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==, tarball: https://r2.cnpmjs.org/boolbase/-/boolbase-1.0.0.tgz}+ version: 1.0.0resolution: {integrity: sha512-j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg==}@@ -4489,8 +4622,9 @@ packages:resolution: {integrity: sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==}engines: {node: '>=14.16'}- resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}+ bplist-parser@https://r2.cnpmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz:+ resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==, tarball: https://r2.cnpmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz}+ version: 0.2.0engines: {node: '>= 5.10.0'}@@ -4499,15 +4633,25 @@ packages:resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}+ brace-expansion@https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz:+ resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==, tarball: https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz}+ version: 1.1.11++ brace-expansion@https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz:+ resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==, tarball: https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz}+ version: 2.0.1+resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}engines: {node: '>=8'}- resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==}+ browser-assert@https://r2.cnpmjs.org/browser-assert/-/browser-assert-1.2.1.tgz:+ resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==, tarball: https://r2.cnpmjs.org/browser-assert/-/browser-assert-1.2.1.tgz}+ version: 1.2.1- resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==}+ browserify-zlib@https://r2.cnpmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz:+ resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==, tarball: https://r2.cnpmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz}+ version: 0.1.4resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}@@ -4517,6 +4661,10 @@ packages:resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}+ buffer-from@https://r2.cnpmjs.org/buffer-from/-/buffer-from-1.1.2.tgz:+ resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==, tarball: https://r2.cnpmjs.org/buffer-from/-/buffer-from-1.1.2.tgz}+ version: 1.1.2+resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}@@ -4556,8 +4704,14 @@ packages:resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}engines: {node: '>=6'}- resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}+ callsites@https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz:+ resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==, tarball: https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz}+ version: 3.1.0+ engines: {node: '>=6'}++ camel-case@https://r2.cnpmjs.org/camel-case/-/camel-case-4.1.2.tgz:+ resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==, tarball: https://r2.cnpmjs.org/camel-case/-/camel-case-4.1.2.tgz}+ version: 4.1.2resolution: {integrity: sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==}@@ -4566,8 +4720,9 @@ packages:resolution: {integrity: sha512-iL2iSS0eDILMb9n5yKQoTBim9jMZ0Yrk8g0N9K7UzYyWnfIKzXBZD5ngpM37ZcL/cv0Mli8XtVMRYMQAfFpi5Q==}- resolution: {integrity: sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==}+ case-sensitive-paths-webpack-plugin@https://r2.cnpmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz:+ resolution: {integrity: sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==, tarball: https://r2.cnpmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz}+ version: 2.4.0engines: {node: '>=4'}@@ -4582,10 +4737,6 @@ packages:resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}engines: {node: '>=4'}- resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}- engines: {node: '>=8'}-resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}engines: {node: '>=10'}@@ -4598,6 +4749,16 @@ packages:resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}+ chalk@https://r2.cnpmjs.org/chalk/-/chalk-3.0.0.tgz:+ resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==, tarball: https://r2.cnpmjs.org/chalk/-/chalk-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=8'}++ chalk@https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz:+ resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==, tarball: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz}+ version: 4.1.2+ engines: {node: '>=10'}+resolution: {integrity: sha512-TfxnA/DcZXRTA4OekA2zL9GH8qscbbl6X0ZqU4tXhGveVY/mXWvEQLt5GwZcYXTEyEFflVtj+pG8nc8EwSm1RQ==}@@ -4605,17 +4766,21 @@ packages:resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}engines: {node: '>=10'}- resolution: {integrity: sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==}+ character-entities-legacy@https://r2.cnpmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz:+ resolution: {integrity: sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==, tarball: https://r2.cnpmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz}+ version: 1.1.4- resolution: {integrity: sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==}+ character-entities@https://r2.cnpmjs.org/character-entities/-/character-entities-1.2.4.tgz:+ resolution: {integrity: sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==, tarball: https://r2.cnpmjs.org/character-entities/-/character-entities-1.2.4.tgz}+ version: 1.2.4- resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}+ character-reference-invalid@https://r2.cnpmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz:+ resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==, tarball: https://r2.cnpmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz}+ version: 1.1.4- resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}+ chardet@https://r2.cnpmjs.org/chardet/-/chardet-0.7.0.tgz:+ resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==, tarball: https://r2.cnpmjs.org/chardet/-/chardet-0.7.0.tgz}+ version: 0.7.0resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}@@ -4627,11 +4792,13 @@ packages:resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}engines: {node: '>= 8.10.0'}- resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}+ chownr@https://r2.cnpmjs.org/chownr/-/chownr-1.1.4.tgz:+ resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==, tarball: https://r2.cnpmjs.org/chownr/-/chownr-1.1.4.tgz}+ version: 1.1.4- resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}+ chownr@https://r2.cnpmjs.org/chownr/-/chownr-2.0.0.tgz:+ resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==, tarball: https://r2.cnpmjs.org/chownr/-/chownr-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=10'}@@ -4646,8 +4813,9 @@ packages:'@chromatic-com/playwright':optional: true- resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}+ chrome-trace-event@https://r2.cnpmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz:+ resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==, tarball: https://r2.cnpmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz}+ version: 1.0.3engines: {node: '>=6.0'}@@ -4678,8 +4846,9 @@ packages:resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==}engines: {node: '>= 10.0'}- resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==}+ clean-regexp@https://r2.cnpmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz:+ resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==, tarball: https://r2.cnpmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz}+ version: 1.0.0engines: {node: '>=4'}@@ -4690,14 +4859,25 @@ packages:resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==}engines: {node: '>=10'}- resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}- engines: {node: '>=8'}+ cli-boxes@https://r2.cnpmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz:+ resolution: {integrity: sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==, tarball: https://r2.cnpmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=10'}resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ cli-cursor@https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz:+ resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==, tarball: https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz}+ version: 3.1.0+ engines: {node: '>=8'}++ cli-cursor@https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz:+ resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==, tarball: https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz}+ version: 4.0.0+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}engines: {node: '>=6'}@@ -4722,12 +4902,14 @@ packages:resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}engines: {node: '>=12'}- resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}+ clone-deep@https://r2.cnpmjs.org/clone-deep/-/clone-deep-4.0.1.tgz:+ resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==, tarball: https://r2.cnpmjs.org/clone-deep/-/clone-deep-4.0.1.tgz}+ version: 4.0.1engines: {node: '>=6'}- resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}+ clone@https://r2.cnpmjs.org/clone/-/clone-1.0.4.tgz:+ resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==, tarball: https://r2.cnpmjs.org/clone/-/clone-1.0.4.tgz}+ version: 1.0.4engines: {node: '>=0.8'}@@ -4745,12 +4927,21 @@ packages:resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}engines: {node: '>=7.0.0'}+ color-convert@https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz:+ resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==, tarball: https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz}+ version: 2.0.1+ engines: {node: '>=7.0.0'}+resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}+ color-name@https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz:+ resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==, tarball: https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz}+ version: 1.1.4+resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}@@ -4773,27 +4964,31 @@ packages:resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}engines: {node: '>=16'}- resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}+ resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}+ engines: {node: ^12.20.0 || >=14}++ commander@https://r2.cnpmjs.org/commander/-/commander-2.20.3.tgz:+ resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==, tarball: https://r2.cnpmjs.org/commander/-/commander-2.20.3.tgz}+ version: 2.20.3- resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}+ commander@https://r2.cnpmjs.org/commander/-/commander-6.2.1.tgz:+ resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==, tarball: https://r2.cnpmjs.org/commander/-/commander-6.2.1.tgz}+ version: 6.2.1engines: {node: '>= 6'}- resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}+ commander@https://r2.cnpmjs.org/commander/-/commander-8.3.0.tgz:+ resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==, tarball: https://r2.cnpmjs.org/commander/-/commander-8.3.0.tgz}+ version: 8.3.0engines: {node: '>= 12'}- resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}- engines: {node: ^12.20.0 || >=14}-resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==}engines: {node: '>= 12.0.0'}- resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}+ commondir@https://r2.cnpmjs.org/commondir/-/commondir-1.0.1.tgz:+ resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==, tarball: https://r2.cnpmjs.org/commondir/-/commondir-1.0.1.tgz}+ version: 1.0.1resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}@@ -4812,30 +5007,38 @@ packages:resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}+ concat-map@https://r2.cnpmjs.org/concat-map/-/concat-map-0.0.1.tgz:+ resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==, tarball: https://r2.cnpmjs.org/concat-map/-/concat-map-0.0.1.tgz}+ version: 0.0.1+resolution: {integrity: sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==}engines: {'0': node >= 6.0}- resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}+ config-chain@https://r2.cnpmjs.org/config-chain/-/config-chain-1.1.13.tgz:+ resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==, tarball: https://r2.cnpmjs.org/config-chain/-/config-chain-1.1.13.tgz}+ version: 1.1.13- resolution: {integrity: sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==}+ configstore@https://r2.cnpmjs.org/configstore/-/configstore-6.0.0.tgz:+ resolution: {integrity: sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==, tarball: https://r2.cnpmjs.org/configstore/-/configstore-6.0.0.tgz}+ version: 6.0.0engines: {node: '>=12'}resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}engines: {node: ^14.18.0 || >=16.10.0}- resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}+ constants-browserify@https://r2.cnpmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz:+ resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==, tarball: https://r2.cnpmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz}+ version: 1.0.0resolution: {integrity: sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==}engines: {node: '>= 0.6'}- resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}+ content-disposition@https://r2.cnpmjs.org/content-disposition/-/content-disposition-0.5.4.tgz:+ resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==, tarball: https://r2.cnpmjs.org/content-disposition/-/content-disposition-0.5.4.tgz}+ version: 0.5.4engines: {node: '>= 0.6'}@@ -4912,8 +5115,9 @@ packages:resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}- resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}+ cookie-signature@https://r2.cnpmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz:+ resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==, tarball: https://r2.cnpmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz}+ version: 1.0.6resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}@@ -4925,8 +5129,9 @@ packages:resolution: {integrity: sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA==}- resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}+ core-util-is@https://r2.cnpmjs.org/core-util-is/-/core-util-is-1.0.3.tgz:+ resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==, tarball: https://r2.cnpmjs.org/core-util-is/-/core-util-is-1.0.3.tgz}+ version: 1.0.3resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==}@@ -4953,15 +5158,22 @@ packages:resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}engines: {node: '>= 8'}+ cross-spawn@https://r2.cnpmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz:+ resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==, tarball: https://r2.cnpmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz}+ version: 7.0.3+ engines: {node: '>= 8'}+resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}- resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}+ crypto-random-string@https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz:+ resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==, tarball: https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=8'}- resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==}+ crypto-random-string@https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz:+ resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==, tarball: https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz}+ version: 4.0.0engines: {node: '>=12'}@@ -4983,8 +5195,9 @@ packages:resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}engines: {node: '>= 6'}- resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}+ css.escape@https://r2.cnpmjs.org/css.escape/-/css.escape-1.5.1.tgz:+ resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==, tarball: https://r2.cnpmjs.org/css.escape/-/css.escape-1.5.1.tgz}+ version: 1.5.1resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}@@ -5032,28 +5245,31 @@ packages:resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}- resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}+ de-indent@https://r2.cnpmjs.org/de-indent/-/de-indent-1.0.2.tgz:+ resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==, tarball: https://r2.cnpmjs.org/de-indent/-/de-indent-1.0.2.tgz}+ version: 1.0.2- resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}+ resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}+ engines: {node: '>=6.0'}peerDependencies:supports-color: '*'peerDependenciesMeta:supports-color:optional: true- resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}+ debug@https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgz:+ resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==, tarball: https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgz}+ version: 2.6.9peerDependencies:supports-color: '*'peerDependenciesMeta:supports-color:optional: true- resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}- engines: {node: '>=6.0'}+ debug@https://r2.cnpmjs.org/debug/-/debug-3.2.7.tgz:+ resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==, tarball: https://r2.cnpmjs.org/debug/-/debug-3.2.7.tgz}+ version: 3.2.7peerDependencies:supports-color: '*'peerDependenciesMeta:@@ -5063,12 +5279,14 @@ packages:resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}- resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}+ decompress-response@https://r2.cnpmjs.org/decompress-response/-/decompress-response-6.0.0.tgz:+ resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==, tarball: https://r2.cnpmjs.org/decompress-response/-/decompress-response-6.0.0.tgz}+ version: 6.0.0engines: {node: '>=10'}- resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}+ dedent@https://r2.cnpmjs.org/dedent/-/dedent-0.7.0.tgz:+ resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==, tarball: https://r2.cnpmjs.org/dedent/-/dedent-0.7.0.tgz}+ version: 0.7.0resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}@@ -5082,6 +5300,11 @@ packages:resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}engines: {node: '>=4.0.0'}+ deep-extend@https://r2.cnpmjs.org/deep-extend/-/deep-extend-0.6.0.tgz:+ resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==, tarball: https://r2.cnpmjs.org/deep-extend/-/deep-extend-0.6.0.tgz}+ version: 0.6.0+ engines: {node: '>=4.0.0'}+resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}@@ -5093,14 +5316,15 @@ packages:resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==}- engines: {node: '>=12'}-resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==}engines: {node: '>=18'}+ default-browser-id@https://r2.cnpmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz:+ resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==, tarball: https://r2.cnpmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=12'}+resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==}engines: {node: '>=18'}@@ -5108,20 +5332,23 @@ packages:resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}- resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}+ defer-to-connect@https://r2.cnpmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz:+ resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==, tarball: https://r2.cnpmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz}+ version: 2.0.1engines: {node: '>=10'}resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}+ define-lazy-prop@https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz:+ resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==, tarball: https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=8'}- resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}+ define-lazy-prop@https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz:+ resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==, tarball: https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz}+ version: 3.0.0engines: {node: '>=12'}@@ -5143,12 +5370,14 @@ packages:resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}engines: {node: '>=0.4.0'}- resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}+ depd@https://r2.cnpmjs.org/depd/-/depd-2.0.0.tgz:+ resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==, tarball: https://r2.cnpmjs.org/depd/-/depd-2.0.0.tgz}+ version: 2.0.0engines: {node: '>= 0.8'}- resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==}+ deprecation@https://r2.cnpmjs.org/deprecation/-/deprecation-2.3.1.tgz:+ resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==, tarball: https://r2.cnpmjs.org/deprecation/-/deprecation-2.3.1.tgz}+ version: 2.3.1resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}@@ -5162,6 +5391,11 @@ packages:resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}engines: {node: '>=8'}+ detect-indent@https://r2.cnpmjs.org/detect-indent/-/detect-indent-6.1.0.tgz:+ resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==, tarball: https://r2.cnpmjs.org/detect-indent/-/detect-indent-6.1.0.tgz}+ version: 6.1.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}engines: {node: '>=8'}@@ -5170,8 +5404,9 @@ packages:resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}engines: {node: '>=8'}- resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}+ detect-package-manager@https://r2.cnpmjs.org/detect-package-manager/-/detect-package-manager-2.0.1.tgz:+ resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==, tarball: https://r2.cnpmjs.org/detect-package-manager/-/detect-package-manager-2.0.1.tgz}+ version: 2.0.1engines: {node: '>=12'}@@ -5202,14 +5437,20 @@ packages:resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}engines: {node: '>=6.0.0'}+ doctrine@https://r2.cnpmjs.org/doctrine/-/doctrine-3.0.0.tgz:+ resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==, tarball: https://r2.cnpmjs.org/doctrine/-/doctrine-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=6.0.0'}+resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}- resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==}+ dom-converter@https://r2.cnpmjs.org/dom-converter/-/dom-converter-0.2.0.tgz:+ resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==, tarball: https://r2.cnpmjs.org/dom-converter/-/dom-converter-0.2.0.tgz}+ version: 0.2.0resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}@@ -5224,18 +5465,21 @@ packages:resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}engines: {node: '>= 4'}- resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}+ domutils@https://r2.cnpmjs.org/domutils/-/domutils-2.8.0.tgz:+ resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==, tarball: https://r2.cnpmjs.org/domutils/-/domutils-2.8.0.tgz}+ version: 2.8.0- resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}+ dot-case@https://r2.cnpmjs.org/dot-case/-/dot-case-3.0.4.tgz:+ resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==, tarball: https://r2.cnpmjs.org/dot-case/-/dot-case-3.0.4.tgz}+ version: 3.0.4resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}engines: {node: '>=8'}- resolution: {integrity: sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==}+ dot-prop@https://r2.cnpmjs.org/dot-prop/-/dot-prop-6.0.1.tgz:+ resolution: {integrity: sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==, tarball: https://r2.cnpmjs.org/dot-prop/-/dot-prop-6.0.1.tgz}+ version: 6.0.1engines: {node: '>=10'}@@ -5246,14 +5490,16 @@ packages:resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}engines: {node: '>=12'}- resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}+ duplexify@https://r2.cnpmjs.org/duplexify/-/duplexify-3.7.1.tgz:+ resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==, tarball: https://r2.cnpmjs.org/duplexify/-/duplexify-3.7.1.tgz}+ version: 3.7.1resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}- resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}+ ee-first@https://r2.cnpmjs.org/ee-first/-/ee-first-1.1.1.tgz:+ resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==, tarball: https://r2.cnpmjs.org/ee-first/-/ee-first-1.1.1.tgz}+ version: 1.1.1resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==}@@ -5272,15 +5518,22 @@ packages:resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}- resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}+ emoji-regex@https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz:+ resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==, tarball: https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz}+ version: 8.0.0++ encodeurl@https://r2.cnpmjs.org/encodeurl/-/encodeurl-1.0.2.tgz:+ resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==, tarball: https://r2.cnpmjs.org/encodeurl/-/encodeurl-1.0.2.tgz}+ version: 1.0.2engines: {node: '>= 0.8'}- resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}+ end-of-stream@https://r2.cnpmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz:+ resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==, tarball: https://r2.cnpmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz}+ version: 1.4.4- resolution: {integrity: sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==}+ endent@https://r2.cnpmjs.org/endent/-/endent-2.1.0.tgz:+ resolution: {integrity: sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==, tarball: https://r2.cnpmjs.org/endent/-/endent-2.1.0.tgz}+ version: 2.1.0resolution: {integrity: sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==}@@ -5289,15 +5542,17 @@ packages:resolution: {integrity: sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==}- resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}-resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}engines: {node: '>=0.12'}- resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}+ entities@https://r2.cnpmjs.org/entities/-/entities-2.2.0.tgz:+ resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==, tarball: https://r2.cnpmjs.org/entities/-/entities-2.2.0.tgz}+ version: 2.2.0++ env-paths@https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz:+ resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==, tarball: https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz}+ version: 2.2.1engines: {node: '>=6'}@@ -5312,12 +5567,17 @@ packages:resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}+ error-ex@https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz:+ resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==, tarball: https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz}+ version: 1.3.2+resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}+ es-array-method-boxes-properly@https://r2.cnpmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz:+ resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==, tarball: https://r2.cnpmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz}+ version: 1.0.0resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}@@ -5451,8 +5711,9 @@ packages:cpu: [x64]os: [openbsd]- resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==}+ esbuild-plugin-alias@https://r2.cnpmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz:+ resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==, tarball: https://r2.cnpmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz}+ version: 0.2.1resolution: {integrity: sha512-ul606g0wX6oeobBgi3EqpZtCBCwNwCDivvnshsNS5pUsRylKoxUnDqK0ZIyPinlMbP6s8Opc9y2zOeY1Plhe8Q==}@@ -5528,12 +5789,14 @@ packages:resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}engines: {node: '>=6'}- resolution: {integrity: sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==}+ escape-goat@https://r2.cnpmjs.org/escape-goat/-/escape-goat-4.0.0.tgz:+ resolution: {integrity: sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==, tarball: https://r2.cnpmjs.org/escape-goat/-/escape-goat-4.0.0.tgz}+ version: 4.0.0engines: {node: '>=12'}- resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}+ escape-html@https://r2.cnpmjs.org/escape-html/-/escape-html-1.0.3.tgz:+ resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==, tarball: https://r2.cnpmjs.org/escape-html/-/escape-html-1.0.3.tgz}+ version: 1.0.3resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}@@ -5543,6 +5806,16 @@ packages:resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}engines: {node: '>=10'}+ escape-string-regexp@https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz:+ resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==, tarball: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz}+ version: 1.0.5+ engines: {node: '>=0.8.0'}++ escape-string-regexp@https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz:+ resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==, tarball: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz}+ version: 4.0.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}engines: {node: '>=6.0'}@@ -5557,8 +5830,8 @@ packages:resolution: {integrity: sha512-hEZLwuZjDBGDERA49c2q7vxc8sCGv8EdBp6PQYzGOMcHIgrfG9YOM6s/4jx24zhD+wnK9AI8mgN5RxSss5nClQ==}- resolution: {integrity: sha512-k7MJkSIfF0bs5eQu1KXyV0AhsvdsqSt1pQfZNLwf6qkozuHQV6aNHg5f8+3Ya+WTzpB+e7I3hMhs4qBwx7nEkw==}+ resolution: {integrity: sha512-tfrMNXZfuN4q7sFi1Cr//BN3qdI7c8fLJhbshlp8l9PZIqZ7eVeeyd2Regtu/P9kjOlv18lRlBALzsZaF7ByUg==}resolution: {integrity: sha512-k9RdyTqxqN/wNYVaTk/ds5B5rA8lgoAmvceYN7bcZMBwU7TuXx5ntewJv81eF3pIL/CiJE+pJZm36llG8yhyyw==}@@ -5581,19 +5854,15 @@ packages:peerDependencies:eslint: '*'- resolution: {integrity: sha512-LxP9coE/GwLvF4JMFyJxqjyMxOASxl8Y3UPWyjjfaIBz4X0yWGqidX0gbAeVuZ9xkaBNWIWZtlPtLPlN/wckOA==}- peerDependencies:- eslint: '*'-resolution: {integrity: sha512-I0AmeNgevgaTR7y2lrVCJmGYF0rjoznpDvqV/kIkZSZbZ8Rw3eu4cGlvBBULScfkSOCzqKbff5LR4CNrV7mZHA==}engines: {node: ^14.18.0 || >=16.0.0}peerDependencies:eslint: '>=8'- resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==}+ eslint-plugin-eslint-comments@https://r2.cnpmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz:+ resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==, tarball: https://r2.cnpmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz}+ version: 3.2.0engines: {node: '>=6.5.0'}peerDependencies:eslint: '>=4.19.1'@@ -5632,8 +5901,8 @@ packages:peerDependencies:eslint: '>=8'- resolution: {integrity: sha512-25+HTtKe1F8U/M4ERmdzbz/xkm/gaY0OYC8Fcv1z/WvpLJ8Xfh9LzJ13JV5uj4QyCUD8kOPJrNjn/3y+tc57Vw==}+ resolution: {integrity: sha512-BvjwT22+zLsmSTq6Ea4FNK7O2XFrkahDKZSfE6Qo3CEy7cLgVkM1iDsHK9BU69oRmY1aQ4IoyCmfWLN+P52J9A==}engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}peerDependencies:eslint: '>=8.23.0'@@ -5648,8 +5917,8 @@ packages:resolution: {integrity: sha512-Lf4YW/bL6Un1R6A76pRZyE1dl1vr31G/ev8UzIc/geCgFWyrKil8hVjYqWVKGB/UIGmb6Slzs9T0wNezdSVegw==}engines: {node: '>=5.0.0'}- resolution: {integrity: sha512-P+tdrkHeMWBc55+DZsoDOAftV1WCsEoHaKm6JC7zajFus/syfT4vUPBFb3atGFSuyaVnGQGHlcKpP9X3Q0gH/w==}+ resolution: {integrity: sha512-ipFtDrqtF99qVVo+FE1fo6aHyLLp7hg6PNGfzY5KxQjcl0XCbyEFvjtR1NfkHDTN9rdFeEDxg59LLOv3VOAHAw==}peerDependencies:astro-eslint-parser: ^0.16.0eslint: '>=8.0.0'@@ -5768,14 +6037,11 @@ packages:'@vue/compiler-sfc': ^3.3.0eslint: ^8.50.0 || ^9.0.0- resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==}+ eslint-rule-composer@https://r2.cnpmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz:+ resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==, tarball: https://r2.cnpmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz}+ version: 0.3.0engines: {node: '>=4.0.0'}- resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}- engines: {node: '>=8.0.0'}-resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}@@ -5784,6 +6050,11 @@ packages:resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}+ eslint-scope@https://r2.cnpmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz:+ resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==, tarball: https://r2.cnpmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz}+ version: 5.1.1+ engines: {node: '>=8.0.0'}+resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}@@ -5806,6 +6077,12 @@ packages:engines: {node: '>=4'}hasBin: true+ esprima@https://r2.cnpmjs.org/esprima/-/esprima-4.0.1.tgz:+ resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==, tarball: https://r2.cnpmjs.org/esprima/-/esprima-4.0.1.tgz}+ version: 4.0.1+ engines: {node: '>=4'}+ hasBin: true+resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}engines: {node: '>=0.10'}@@ -5814,24 +6091,44 @@ packages:resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}engines: {node: '>=4.0'}- resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}+ esrecurse@https://r2.cnpmjs.org/esrecurse/-/esrecurse-4.3.0.tgz:+ resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==, tarball: https://r2.cnpmjs.org/esrecurse/-/esrecurse-4.3.0.tgz}+ version: 4.3.0engines: {node: '>=4.0'}resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}engines: {node: '>=4.0'}+ estraverse@https://r2.cnpmjs.org/estraverse/-/estraverse-4.3.0.tgz:+ resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==, tarball: https://r2.cnpmjs.org/estraverse/-/estraverse-4.3.0.tgz}+ version: 4.3.0+ engines: {node: '>=4.0'}++ estraverse@https://r2.cnpmjs.org/estraverse/-/estraverse-5.3.0.tgz:+ resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==, tarball: https://r2.cnpmjs.org/estraverse/-/estraverse-5.3.0.tgz}+ version: 5.3.0+ engines: {node: '>=4.0'}+resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}+ estree-walker@https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz:+ resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, tarball: https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz}+ version: 2.0.2+resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}engines: {node: '>=0.10.0'}+ esutils@https://r2.cnpmjs.org/esutils/-/esutils-2.0.3.tgz:+ resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==, tarball: https://r2.cnpmjs.org/esutils/-/esutils-2.0.3.tgz}+ version: 2.0.3+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}engines: {node: '>= 0.6'}@@ -5839,8 +6136,9 @@ packages:resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}- resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}+ events@https://r2.cnpmjs.org/events/-/events-3.3.0.tgz:+ resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==, tarball: https://r2.cnpmjs.org/events/-/events-3.3.0.tgz}+ version: 3.3.0engines: {node: '>=0.8.x'}@@ -5851,17 +6149,27 @@ packages:resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}engines: {node: '>=16.17'}+ execa@https://r2.cnpmjs.org/execa/-/execa-5.1.1.tgz:+ resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==, tarball: https://r2.cnpmjs.org/execa/-/execa-5.1.1.tgz}+ version: 5.1.1+ engines: {node: '>=10'}+resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}engines: {node: '>= 0.10.0'}- resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}+ external-editor@https://r2.cnpmjs.org/external-editor/-/external-editor-3.1.0.tgz:+ resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==, tarball: https://r2.cnpmjs.org/external-editor/-/external-editor-3.1.0.tgz}+ version: 3.1.0engines: {node: '>=4'}resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}+ fast-deep-equal@https://r2.cnpmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz:+ resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==, tarball: https://r2.cnpmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz}+ version: 3.1.3+resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}@@ -5872,12 +6180,17 @@ packages:resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}engines: {node: '>=8.6.0'}- resolution: {integrity: sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==}+ fast-json-parse@https://r2.cnpmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz:+ resolution: {integrity: sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==, tarball: https://r2.cnpmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz}+ version: 1.0.3resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}+ fast-json-stable-stringify@https://r2.cnpmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz:+ resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==, tarball: https://r2.cnpmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz}+ version: 2.1.0+resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}@@ -5894,6 +6207,11 @@ packages:resolution: {integrity: sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ==}+ figures@https://r2.cnpmjs.org/figures/-/figures-3.2.0.tgz:+ resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==, tarball: https://r2.cnpmjs.org/figures/-/figures-3.2.0.tgz}+ version: 3.2.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}engines: {node: ^10.12.0 || >=12.0.0}@@ -5916,20 +6234,14 @@ packages:resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}engines: {node: '>= 0.8'}- resolution: {integrity: sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==}- engines: {node: '>=6'}-- resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}- engines: {node: '>=8'}-- resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}+ find-cache-dir@https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz:+ resolution: {integrity: sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==, tarball: https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz}+ version: 2.1.0engines: {node: '>=6'}- resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}+ find-cache-dir@https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz:+ resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==, tarball: https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz}+ version: 3.3.2engines: {node: '>=8'}@@ -5944,6 +6256,21 @@ packages:resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==}engines: {node: '>=18'}+ find-up@https://r2.cnpmjs.org/find-up/-/find-up-3.0.0.tgz:+ resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==, tarball: https://r2.cnpmjs.org/find-up/-/find-up-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=6'}++ find-up@https://r2.cnpmjs.org/find-up/-/find-up-4.1.0.tgz:+ resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==, tarball: https://r2.cnpmjs.org/find-up/-/find-up-4.1.0.tgz}+ version: 4.1.0+ engines: {node: '>=8'}++ find-up@https://r2.cnpmjs.org/find-up/-/find-up-5.0.0.tgz:+ resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==, tarball: https://r2.cnpmjs.org/find-up/-/find-up-5.0.0.tgz}+ version: 5.0.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}engines: {node: ^10.12.0 || >=12.0.0}@@ -5977,20 +6304,24 @@ packages:resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}engines: {node: '>= 6'}- resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}+ formdata-polyfill@https://r2.cnpmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz:+ resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==, tarball: https://r2.cnpmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz}+ version: 4.0.10engines: {node: '>=12.20.0'}- resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}+ forwarded@https://r2.cnpmjs.org/forwarded/-/forwarded-0.2.0.tgz:+ resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==, tarball: https://r2.cnpmjs.org/forwarded/-/forwarded-0.2.0.tgz}+ version: 0.2.0engines: {node: '>= 0.6'}- resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}+ fresh@https://r2.cnpmjs.org/fresh/-/fresh-0.5.2.tgz:+ resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==, tarball: https://r2.cnpmjs.org/fresh/-/fresh-0.5.2.tgz}+ version: 0.5.2engines: {node: '>= 0.6'}- resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}+ fs-constants@https://r2.cnpmjs.org/fs-constants/-/fs-constants-1.0.0.tgz:+ resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==, tarball: https://r2.cnpmjs.org/fs-constants/-/fs-constants-1.0.0.tgz}+ version: 1.0.0resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}@@ -6004,12 +6335,14 @@ packages:resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}engines: {node: '>=14.14'}- resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}+ fs-extra@https://r2.cnpmjs.org/fs-extra/-/fs-extra-7.0.1.tgz:+ resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==, tarball: https://r2.cnpmjs.org/fs-extra/-/fs-extra-7.0.1.tgz}+ version: 7.0.1engines: {node: '>=6 <7 || >=8'}- resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}+ fs-minipass@https://r2.cnpmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz:+ resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==, tarball: https://r2.cnpmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz}+ version: 2.1.0engines: {node: '>= 8'}@@ -6045,8 +6378,9 @@ packages:resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}engines: {node: '>=6.9.0'}- resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}+ get-caller-file@https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz:+ resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==, tarball: https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz}+ version: 2.0.5engines: {node: 6.* || 8.* || >= 10.*}@@ -6072,6 +6406,11 @@ packages:resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}engines: {node: '>=16'}+ get-stream@https://r2.cnpmjs.org/get-stream/-/get-stream-6.0.1.tgz:+ resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==, tarball: https://r2.cnpmjs.org/get-stream/-/get-stream-6.0.1.tgz}+ version: 6.0.1+ engines: {node: '>=10'}+resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}engines: {node: '>= 0.4'}@@ -6114,8 +6453,9 @@ packages:resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}engines: {node: '>=10.13.0'}- resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}+ glob-to-regexp@https://r2.cnpmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz:+ resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==, tarball: https://r2.cnpmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz}+ version: 0.4.1resolution: {integrity: sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==}@@ -6145,6 +6485,11 @@ packages:resolution: {integrity: sha512-m/C/yR4mjO6pXDTm9/R/SpYTAIyaUB4EOzcaaMEl7mds7Mshct9GfejiJNQGjHHbdMPey13Kpu4TMbYi9ex1pw==}engines: {node: '>=18'}+ globals@https://r2.cnpmjs.org/globals/-/globals-11.12.0.tgz:+ resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==, tarball: https://r2.cnpmjs.org/globals/-/globals-11.12.0.tgz}+ version: 11.12.0+ engines: {node: '>=4'}+resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}engines: {node: '>= 0.4'}@@ -6177,8 +6522,9 @@ packages:resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}- resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==}+ gunzip-maybe@https://r2.cnpmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz:+ resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==, tarball: https://r2.cnpmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz}+ version: 1.4.2hasBin: true@@ -6201,6 +6547,11 @@ packages:resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}engines: {node: '>=8'}+ has-flag@https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz:+ resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==, tarball: https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz}+ version: 4.0.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}@@ -6229,20 +6580,22 @@ packages:resolution: {integrity: sha512-OGkAxX1Ua3cbcW6EJ5pT/tslVb90uViVkcJ4ZZIMW/R33DX/AkcJcRrPebPwJkHYwlDHXz4aIwvAAaAdtrACFA==}- resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}+ he@https://r2.cnpmjs.org/he/-/he-1.2.0.tgz:+ resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==, tarball: https://r2.cnpmjs.org/he/-/he-1.2.0.tgz}+ version: 1.2.0hasBin: trueresolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}- resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}-resolution: {integrity: sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==}engines: {node: ^16.14.0 || >=18.0.0}+ hosted-git-info@https://r2.cnpmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz:+ resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==, tarball: https://r2.cnpmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz}+ version: 2.8.9+resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}engines: {node: '>=18'}@@ -6253,8 +6606,9 @@ packages:resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}- resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==}+ html-minifier-terser@https://r2.cnpmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz:+ resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==, tarball: https://r2.cnpmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz}+ version: 6.1.0engines: {node: '>=12'}hasBin: true@@ -6274,14 +6628,16 @@ packages:webpack:optional: true- resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}+ htmlparser2@https://r2.cnpmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz:+ resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==, tarball: https://r2.cnpmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz}+ version: 6.1.0resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}- resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}+ http-errors@https://r2.cnpmjs.org/http-errors/-/http-errors-2.0.0.tgz:+ resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==, tarball: https://r2.cnpmjs.org/http-errors/-/http-errors-2.0.0.tgz}+ version: 2.0.0engines: {node: '>= 0.8'}@@ -6304,27 +6660,39 @@ packages:resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}engines: {node: '>=16.17.0'}+ human-signals@https://r2.cnpmjs.org/human-signals/-/human-signals-2.1.0.tgz:+ resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==, tarball: https://r2.cnpmjs.org/human-signals/-/human-signals-2.1.0.tgz}+ version: 2.1.0+ engines: {node: '>=10.17.0'}+resolution: {integrity: sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==}engines: {node: '>=18'}hasBin: true- resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}- engines: {node: '>=0.10.0'}-resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}engines: {node: '>=0.10.0'}+ iconv-lite@https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz:+ resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==, tarball: https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz}+ version: 0.4.24+ engines: {node: '>=0.10.0'}++ iconv-lite@https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz:+ resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==, tarball: https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz}+ version: 0.6.3+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}engines: {node: ^10 || ^12 || >= 14}peerDependencies:postcss: ^8.1.0- resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}+ ieee754@https://r2.cnpmjs.org/ieee754/-/ieee754-1.2.1.tgz:+ resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==, tarball: https://r2.cnpmjs.org/ieee754/-/ieee754-1.2.1.tgz}+ version: 1.2.1resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}@@ -6348,8 +6716,14 @@ packages:resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}engines: {node: '>=6'}- resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}+ import-fresh@https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz:+ resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, tarball: https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz}+ version: 3.3.0+ engines: {node: '>=6'}++ import-lazy@https://r2.cnpmjs.org/import-lazy/-/import-lazy-4.0.0.tgz:+ resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==, tarball: https://r2.cnpmjs.org/import-lazy/-/import-lazy-4.0.0.tgz}+ version: 4.0.0engines: {node: '>=8'}@@ -6359,37 +6733,57 @@ packages:resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}engines: {node: '>=0.8.19'}+ imurmurhash@https://r2.cnpmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz:+ resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==, tarball: https://r2.cnpmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz}+ version: 0.1.4+ engines: {node: '>=0.8.19'}+resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}engines: {node: '>=8'}+ indent-string@https://r2.cnpmjs.org/indent-string/-/indent-string-4.0.0.tgz:+ resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==, tarball: https://r2.cnpmjs.org/indent-string/-/indent-string-4.0.0.tgz}+ version: 4.0.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}+ inherits@https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz:+ resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==, tarball: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz}+ version: 2.0.4+resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}- resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}- engines: {node: '>=10'}-resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}- resolution: {integrity: sha512-WpxOT71HGsFya6/mj5PUue0sWwbpbiPfAR+332zLj/siB0QA1PZM8v3GepegFV1Op189UxHUCF6y8AySdtOMVA==}+ ini@https://r2.cnpmjs.org/ini/-/ini-1.3.8.tgz:+ resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==, tarball: https://r2.cnpmjs.org/ini/-/ini-1.3.8.tgz}+ version: 1.3.8++ ini@https://r2.cnpmjs.org/ini/-/ini-2.0.0.tgz:+ resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==, tarball: https://r2.cnpmjs.org/ini/-/ini-2.0.0.tgz}+ version: 2.0.0+ engines: {node: '>=10'}++ resolution: {integrity: sha512-Vr3Ia2ud5sGnioURkE69endl4SkeJcMzTF6SosKcX5GALJfId7C+JvO5ZZb6y1LOXnEofCPbwzoQ1q0e8Gaduw==}engines: {node: '>=18'}resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}+ interpret@https://r2.cnpmjs.org/interpret/-/interpret-1.4.0.tgz:+ resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==, tarball: https://r2.cnpmjs.org/interpret/-/interpret-1.4.0.tgz}+ version: 1.4.0engines: {node: '>= 0.10'}@@ -6402,24 +6796,33 @@ packages:resolution: {integrity: sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==}- resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}+ ipaddr.js@https://r2.cnpmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz:+ resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==, tarball: https://r2.cnpmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz}+ version: 1.9.1engines: {node: '>= 0.10'}- resolution: {integrity: sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==}+ is-absolute-url@https://r2.cnpmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz:+ resolution: {integrity: sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==, tarball: https://r2.cnpmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz}+ version: 4.0.1engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}- resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==}+ is-alphabetical@https://r2.cnpmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz:+ resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==, tarball: https://r2.cnpmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz}+ version: 1.0.4- resolution: {integrity: sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==}+ is-alphanumerical@https://r2.cnpmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz:+ resolution: {integrity: sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==, tarball: https://r2.cnpmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz}+ version: 1.0.4resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}engines: {node: '>= 0.4'}+ is-arguments@https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz:+ resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==, tarball: https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz}+ version: 1.1.1+ engines: {node: '>= 0.4'}+resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}engines: {node: '>= 0.4'}@@ -6430,6 +6833,10 @@ packages:resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}+ is-arrayish@https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz:+ resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==, tarball: https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz}+ version: 0.2.1+resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}engines: {node: '>= 0.4'}@@ -6456,8 +6863,9 @@ packages:resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}+ is-ci@https://r2.cnpmjs.org/is-ci/-/is-ci-3.0.1.tgz:+ resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==, tarball: https://r2.cnpmjs.org/is-ci/-/is-ci-3.0.1.tgz}+ version: 3.0.1hasBin: true@@ -6471,19 +6879,28 @@ packages:resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==}+ is-decimal@https://r2.cnpmjs.org/is-decimal/-/is-decimal-1.0.4.tgz:+ resolution: {integrity: sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==, tarball: https://r2.cnpmjs.org/is-decimal/-/is-decimal-1.0.4.tgz}+ version: 1.0.4- resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==}+ is-deflate@https://r2.cnpmjs.org/is-deflate/-/is-deflate-1.0.0.tgz:+ resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==, tarball: https://r2.cnpmjs.org/is-deflate/-/is-deflate-1.0.0.tgz}+ version: 1.0.0resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}engines: {node: '>=8'}hasBin: true- resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}+ is-docker@https://r2.cnpmjs.org/is-docker/-/is-docker-2.2.1.tgz:+ resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==, tarball: https://r2.cnpmjs.org/is-docker/-/is-docker-2.2.1.tgz}+ version: 2.2.1+ engines: {node: '>=8'}+ hasBin: true++ is-docker@https://r2.cnpmjs.org/is-docker/-/is-docker-3.0.0.tgz:+ resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==, tarball: https://r2.cnpmjs.org/is-docker/-/is-docker-3.0.0.tgz}+ version: 3.0.0engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}hasBin: true@@ -6491,6 +6908,11 @@ packages:resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}engines: {node: '>=0.10.0'}+ is-extglob@https://r2.cnpmjs.org/is-extglob/-/is-extglob-2.1.1.tgz:+ resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==, tarball: https://r2.cnpmjs.org/is-extglob/-/is-extglob-2.1.1.tgz}+ version: 2.1.1+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}@@ -6506,20 +6928,37 @@ packages:resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}engines: {node: '>=18'}+ is-fullwidth-code-point@https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz:+ resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==, tarball: https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}engines: {node: '>= 0.4'}+ is-generator-function@https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz:+ resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==, tarball: https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz}+ version: 1.0.10+ engines: {node: '>= 0.4'}+resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==}+ is-glob@https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgz:+ resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==, tarball: https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgz}+ version: 4.0.3engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}+ is-gzip@https://r2.cnpmjs.org/is-gzip/-/is-gzip-1.0.0.tgz:+ resolution: {integrity: sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==, tarball: https://r2.cnpmjs.org/is-gzip/-/is-gzip-1.0.0.tgz}+ version: 1.0.0+ engines: {node: '>=0.10.0'}++ is-hexadecimal@https://r2.cnpmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz:+ resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==, tarball: https://r2.cnpmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz}+ version: 1.0.4resolution: {integrity: sha512-d9PXLEY0v1iJ64xLiQMJ51J128EYHAaOR4yZqQi8aHGfw6KgifM3/Viw1oZZ1GCVmb3gBuyhLyHj0HgR2DhSXQ==}@@ -6531,16 +6970,19 @@ packages:engines: {node: '>=14.16'}hasBin: true- resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}+ is-installed-globally@https://r2.cnpmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz:+ resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==, tarball: https://r2.cnpmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz}+ version: 0.4.0engines: {node: '>=10'}- resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}+ is-interactive@https://r2.cnpmjs.org/is-interactive/-/is-interactive-1.0.0.tgz:+ resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==, tarball: https://r2.cnpmjs.org/is-interactive/-/is-interactive-1.0.0.tgz}+ version: 1.0.0engines: {node: '>=8'}- resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}+ is-interactive@https://r2.cnpmjs.org/is-interactive/-/is-interactive-2.0.0.tgz:+ resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==, tarball: https://r2.cnpmjs.org/is-interactive/-/is-interactive-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=12'}@@ -6551,12 +6993,18 @@ packages:resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}engines: {node: '>= 0.4'}+ is-nan@https://r2.cnpmjs.org/is-nan/-/is-nan-1.3.2.tgz:+ resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==, tarball: https://r2.cnpmjs.org/is-nan/-/is-nan-1.3.2.tgz}+ version: 1.3.2+ engines: {node: '>= 0.4'}+resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==}+ is-npm@https://r2.cnpmjs.org/is-npm/-/is-npm-6.0.0.tgz:+ resolution: {integrity: sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==, tarball: https://r2.cnpmjs.org/is-npm/-/is-npm-6.0.0.tgz}+ version: 6.0.0engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}@@ -6571,6 +7019,11 @@ packages:resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}engines: {node: '>=8'}+ is-obj@https://r2.cnpmjs.org/is-obj/-/is-obj-2.0.0.tgz:+ resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==, tarball: https://r2.cnpmjs.org/is-obj/-/is-obj-2.0.0.tgz}+ version: 2.0.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}engines: {node: '>=6'}@@ -6579,12 +7032,19 @@ packages:resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}engines: {node: '>=8'}- resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}+ is-path-inside@https://r2.cnpmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz:+ resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==, tarball: https://r2.cnpmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz}+ version: 3.0.3+ engines: {node: '>=8'}++ is-plain-object@https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz:+ resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==, tarball: https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz}+ version: 2.0.4engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}+ is-plain-object@https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz:+ resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==, tarball: https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz}+ version: 5.0.0engines: {node: '>=0.10.0'}@@ -6617,10 +7077,20 @@ packages:resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ is-stream@https://r2.cnpmjs.org/is-stream/-/is-stream-2.0.1.tgz:+ resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==, tarball: https://r2.cnpmjs.org/is-stream/-/is-stream-2.0.1.tgz}+ version: 2.0.1+ engines: {node: '>=8'}+resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}engines: {node: '>= 0.4'}+ is-string@https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz:+ resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==, tarball: https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz}+ version: 1.0.7+ engines: {node: '>= 0.4'}+resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}engines: {node: '>= 0.4'}@@ -6633,12 +7103,9 @@ packages:resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}-- resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}- engines: {node: '>=10'}+ is-typedarray@https://r2.cnpmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz:+ resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==, tarball: https://r2.cnpmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz}+ version: 1.0.0resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}@@ -6648,6 +7115,11 @@ packages:resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==}engines: {node: '>=18'}+ is-unicode-supported@https://r2.cnpmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz:+ resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==, tarball: https://r2.cnpmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz}+ version: 0.1.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}engines: {node: '>= 0.4'}@@ -6659,8 +7131,9 @@ packages:resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==}+ is-what@https://r2.cnpmjs.org/is-what/-/is-what-3.14.1.tgz:+ resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==, tarball: https://r2.cnpmjs.org/is-what/-/is-what-3.14.1.tgz}+ version: 3.14.1resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}@@ -6670,17 +7143,32 @@ packages:resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}engines: {node: '>=16'}- resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}+ is-wsl@https://r2.cnpmjs.org/is-wsl/-/is-wsl-2.2.0.tgz:+ resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==, tarball: https://r2.cnpmjs.org/is-wsl/-/is-wsl-2.2.0.tgz}+ version: 2.2.0+ engines: {node: '>=8'}resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}+ isarray@https://r2.cnpmjs.org/isarray/-/isarray-1.0.0.tgz:+ resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==, tarball: https://r2.cnpmjs.org/isarray/-/isarray-1.0.0.tgz}+ version: 1.0.0++ isarray@https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgz:+ resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==, tarball: https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgz}+ version: 2.0.5+resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}- resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}+ isexe@https://r2.cnpmjs.org/isexe/-/isexe-2.0.0.tgz:+ resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==, tarball: https://r2.cnpmjs.org/isexe/-/isexe-2.0.0.tgz}+ version: 2.0.0++ isobject@https://r2.cnpmjs.org/isobject/-/isobject-3.0.1.tgz:+ resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==, tarball: https://r2.cnpmjs.org/isobject/-/isobject-3.0.1.tgz}+ version: 3.0.1engines: {node: '>=0.10.0'}@@ -6707,11 +7195,13 @@ packages:resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}engines: {node: '>=8'}- resolution: {integrity: sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw==}+ iterate-iterator@https://r2.cnpmjs.org/iterate-iterator/-/iterate-iterator-1.0.2.tgz:+ resolution: {integrity: sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw==, tarball: https://r2.cnpmjs.org/iterate-iterator/-/iterate-iterator-1.0.2.tgz}+ version: 1.0.2- resolution: {integrity: sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==}+ iterate-value@https://r2.cnpmjs.org/iterate-value/-/iterate-value-1.0.2.tgz:+ resolution: {integrity: sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==, tarball: https://r2.cnpmjs.org/iterate-value/-/iterate-value-1.0.2.tgz}+ version: 1.0.2resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}@@ -6741,8 +7231,9 @@ packages:resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}hasBin: true- resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}+ jju@https://r2.cnpmjs.org/jju/-/jju-1.4.0.tgz:+ resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==, tarball: https://r2.cnpmjs.org/jju/-/jju-1.4.0.tgz}+ version: 1.4.0resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==}@@ -6754,10 +7245,19 @@ packages:resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==}+ js-tokens@https://r2.cnpmjs.org/js-tokens/-/js-tokens-4.0.0.tgz:+ resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==, tarball: https://r2.cnpmjs.org/js-tokens/-/js-tokens-4.0.0.tgz}+ version: 4.0.0+resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}hasBin: true+ js-yaml@https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz:+ resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==, tarball: https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz}+ version: 4.1.0+ hasBin: true+resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}@@ -6783,36 +7283,43 @@ packages:canvas:optional: true- resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}- hasBin: true-resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}engines: {node: '>=4'}hasBin: true- resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}+ jsesc@https://r2.cnpmjs.org/jsesc/-/jsesc-0.5.0.tgz:+ resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==, tarball: https://r2.cnpmjs.org/jsesc/-/jsesc-0.5.0.tgz}+ version: 0.5.0+ hasBin: true++ jsesc@https://r2.cnpmjs.org/jsesc/-/jsesc-3.0.2.tgz:+ resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==, tarball: https://r2.cnpmjs.org/jsesc/-/jsesc-3.0.2.tgz}+ version: 3.0.2engines: {node: '>=6'}hasBin: trueresolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}- resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}-resolution: {integrity: sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==}engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}+ json-parse-even-better-errors@https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz:+ resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==, tarball: https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz}+ version: 2.3.1+resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}+ json-schema-traverse@https://r2.cnpmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz:+ resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==, tarball: https://r2.cnpmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz}+ version: 0.4.1+resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}@@ -6831,12 +7338,17 @@ packages:resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}- resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}-resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}+ jsonfile@https://r2.cnpmjs.org/jsonfile/-/jsonfile-4.0.0.tgz:+ resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==, tarball: https://r2.cnpmjs.org/jsonfile/-/jsonfile-4.0.0.tgz}+ version: 4.0.0++ jsonfile@https://r2.cnpmjs.org/jsonfile/-/jsonfile-6.1.0.tgz:+ resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==, tarball: https://r2.cnpmjs.org/jsonfile/-/jsonfile-6.1.0.tgz}+ version: 6.1.0+resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}engines: {'0': node >= 0.2.0}@@ -6848,12 +7360,14 @@ packages:resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}- resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}+ kind-of@https://r2.cnpmjs.org/kind-of/-/kind-of-6.0.3.tgz:+ resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==, tarball: https://r2.cnpmjs.org/kind-of/-/kind-of-6.0.3.tgz}+ version: 6.0.3engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}+ kleur@https://r2.cnpmjs.org/kleur/-/kleur-3.0.3.tgz:+ resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==, tarball: https://r2.cnpmjs.org/kleur/-/kleur-3.0.3.tgz}+ version: 3.0.3engines: {node: '>=6'}@@ -6885,8 +7399,9 @@ packages:engines: {node: '>=6'}hasBin: true- resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}+ leven@https://r2.cnpmjs.org/leven/-/leven-3.1.0.tgz:+ resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==, tarball: https://r2.cnpmjs.org/leven/-/leven-3.1.0.tgz}+ version: 3.1.0engines: {node: '>=6'}@@ -6897,8 +7412,8 @@ packages:resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}engines: {node: '>= 0.8.0'}- resolution: {integrity: sha512-TsQsyzDttDvvzWNkbp/i0fVbzTGJIG0mUu/uNalIaRQEYeJxVQ/FPg+EJgSqfSXezREjM0V3RZ8cLVsKYhhw0Q==}+ resolution: {integrity: sha512-8gX0ZAdOvJxN4UudGdsOkoCU5DGVrOptye7uQpjR01iys3wfB9RWdkZg/M4hGp63tKe94TR7ntDlacg50+zjxA==}resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}@@ -6907,13 +7422,14 @@ packages:resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==}engines: {node: '>=14'}- resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}-resolution: {integrity: sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ lines-and-columns@https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz:+ resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==, tarball: https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz}+ version: 1.2.4+resolution: {integrity: sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==}engines: {node: '>=18.12.0'}@@ -6938,14 +7454,6 @@ packages:resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}- resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}- engines: {node: '>=6'}-- resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}- engines: {node: '>=8'}-resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}engines: {node: '>=10'}@@ -6954,72 +7462,110 @@ packages:resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ locate-path@https://r2.cnpmjs.org/locate-path/-/locate-path-3.0.0.tgz:+ resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==, tarball: https://r2.cnpmjs.org/locate-path/-/locate-path-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=6'}++ locate-path@https://r2.cnpmjs.org/locate-path/-/locate-path-5.0.0.tgz:+ resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==, tarball: https://r2.cnpmjs.org/locate-path/-/locate-path-5.0.0.tgz}+ version: 5.0.0+ engines: {node: '>=8'}++ locate-path@https://r2.cnpmjs.org/locate-path/-/locate-path-6.0.0.tgz:+ resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==, tarball: https://r2.cnpmjs.org/locate-path/-/locate-path-6.0.0.tgz}+ version: 6.0.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}- resolution: {integrity: sha512-kZzYOKspf8XVX5AvmQF94gQW0lejFVgb80G85bU4ZWzoJ6C03PQg3coYAUpSTpQWelrZELd3XWgHzw4Ck5kaIw==}+ lodash.camelcase@https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz:+ resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==, tarball: https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz}+ version: 4.3.0- resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}+ lodash.capitalize@https://r2.cnpmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz:+ resolution: {integrity: sha512-kZzYOKspf8XVX5AvmQF94gQW0lejFVgb80G85bU4ZWzoJ6C03PQg3coYAUpSTpQWelrZELd3XWgHzw4Ck5kaIw==, tarball: https://r2.cnpmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz}+ version: 4.2.1- resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}+ lodash.debounce@https://r2.cnpmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz:+ resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==, tarball: https://r2.cnpmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz}+ version: 4.0.8- resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}+ lodash.escaperegexp@https://r2.cnpmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz:+ resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==, tarball: https://r2.cnpmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz}+ version: 4.1.2lodash.get@https://r2.cnpmjs.org/lodash.get/-/lodash.get-4.4.2.tgz:resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==, tarball: https://r2.cnpmjs.org/lodash.get/-/lodash.get-4.4.2.tgz}version: 4.4.2- resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}+ lodash.isequal@https://r2.cnpmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz:+ resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==, tarball: https://r2.cnpmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz}+ version: 4.5.0- resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}+ lodash.isplainobject@https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz:+ resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==, tarball: https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz}+ version: 4.0.6- resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}+ lodash.isstring@https://r2.cnpmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz:+ resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==, tarball: https://r2.cnpmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz}+ version: 4.0.1- resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==}+ lodash.kebabcase@https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz:+ resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==, tarball: https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz}+ version: 4.1.1resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}- resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}+ lodash.merge@https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz:+ resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==, tarball: https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz}+ version: 4.6.2++ lodash.mergewith@https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz:+ resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==, tarball: https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz}+ version: 4.6.2resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}- resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}+ lodash.snakecase@https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz:+ resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==, tarball: https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz}+ version: 4.1.1- resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}+ lodash.startcase@https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz:+ resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==, tarball: https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz}+ version: 4.4.0- resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}+ lodash.uniq@https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz:+ resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==, tarball: https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz}+ version: 4.5.0- resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==}+ lodash.uniqby@https://r2.cnpmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz:+ resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==, tarball: https://r2.cnpmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz}+ version: 4.7.0- resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}+ lodash.upperfirst@https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz:+ resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==, tarball: https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz}+ version: 4.3.1resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}- resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}- engines: {node: '>=10'}+ lodash@https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz:+ resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, tarball: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz}+ version: 4.17.21resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}engines: {node: '>=18'}+ log-symbols@https://r2.cnpmjs.org/log-symbols/-/log-symbols-4.1.0.tgz:+ resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==, tarball: https://r2.cnpmjs.org/log-symbols/-/log-symbols-4.1.0.tgz}+ version: 4.1.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==}engines: {node: '>=18'}@@ -7031,14 +7577,21 @@ packages:resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}hasBin: true+ loose-envify@https://r2.cnpmjs.org/loose-envify/-/loose-envify-1.4.0.tgz:+ resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==, tarball: https://r2.cnpmjs.org/loose-envify/-/loose-envify-1.4.0.tgz}+ version: 1.4.0+ hasBin: true+resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}- resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}+ lower-case@https://r2.cnpmjs.org/lower-case/-/lower-case-2.0.2.tgz:+ resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==, tarball: https://r2.cnpmjs.org/lower-case/-/lower-case-2.0.2.tgz}+ version: 2.0.2- resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==}+ lowercase-keys@https://r2.cnpmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz:+ resolution: {integrity: sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==, tarball: https://r2.cnpmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz}+ version: 3.0.0engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}@@ -7048,10 +7601,6 @@ packages:resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}- resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}- engines: {node: '>=10'}-resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}engines: {node: '>=12'}@@ -7069,6 +7618,9 @@ packages:resolution: {integrity: sha512-fSErXALFNsnowREYZ49XCdOHF8wOPWuFOGQrAhP7x5J/BqQv+B02cNsTykGpDgRVx43EKg++6ANmTaGTtW+hUA==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}+resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}engines: {node: '>=12'}@@ -7080,16 +7632,23 @@ packages:resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}engines: {node: '>=6'}- resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}- engines: {node: '>=8'}-resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}engines: {node: '>=10'}- resolution: {integrity: sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==}+ make-dir@https://r2.cnpmjs.org/make-dir/-/make-dir-2.1.0.tgz:+ resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==, tarball: https://r2.cnpmjs.org/make-dir/-/make-dir-2.1.0.tgz}+ version: 2.1.0+ engines: {node: '>=6'}++ make-dir@https://r2.cnpmjs.org/make-dir/-/make-dir-3.1.0.tgz:+ resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==, tarball: https://r2.cnpmjs.org/make-dir/-/make-dir-3.1.0.tgz}+ version: 3.1.0+ engines: {node: '>=8'}++ map-or-similar@https://r2.cnpmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz:+ resolution: {integrity: sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==, tarball: https://r2.cnpmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz}+ version: 1.5.0resolution: {integrity: sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==}@@ -7104,46 +7663,57 @@ packages:resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}- resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==}+ mdast-util-from-markdown@https://r2.cnpmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz:+ resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==, tarball: https://r2.cnpmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz}+ version: 0.8.5- resolution: {integrity: sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==}+ mdast-util-to-string@https://r2.cnpmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz:+ resolution: {integrity: sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==, tarball: https://r2.cnpmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz}+ version: 2.0.0- resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}+ media-typer@https://r2.cnpmjs.org/media-typer/-/media-typer-0.3.0.tgz:+ resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==, tarball: https://r2.cnpmjs.org/media-typer/-/media-typer-0.3.0.tgz}+ version: 0.3.0engines: {node: '>= 0.6'}resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==}engines: {node: '>= 4.0.0'}- resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==}+ memoizerific@https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgz:+ resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==, tarball: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgz}+ version: 1.11.3resolution: {integrity: sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==}engines: {node: '>=16.10'}- resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}+ merge-descriptors@https://r2.cnpmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz:+ resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==, tarball: https://r2.cnpmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz}+ version: 1.0.1resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}+ merge-stream@https://r2.cnpmjs.org/merge-stream/-/merge-stream-2.0.0.tgz:+ resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==, tarball: https://r2.cnpmjs.org/merge-stream/-/merge-stream-2.0.0.tgz}+ version: 2.0.0+resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}engines: {node: '>= 8'}- resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}+ methods@https://r2.cnpmjs.org/methods/-/methods-1.1.2.tgz:+ resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==, tarball: https://r2.cnpmjs.org/methods/-/methods-1.1.2.tgz}+ version: 1.1.2engines: {node: '>= 0.6'}resolution: {integrity: sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g==}- resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==}+ micromark@https://r2.cnpmjs.org/micromark/-/micromark-2.11.4.tgz:+ resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==, tarball: https://r2.cnpmjs.org/micromark/-/micromark-2.11.4.tgz}+ version: 2.11.4resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}@@ -7175,6 +7745,12 @@ packages:engines: {node: '>=16'}hasBin: true+ mime@https://r2.cnpmjs.org/mime/-/mime-1.6.0.tgz:+ resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==, tarball: https://r2.cnpmjs.org/mime/-/mime-1.6.0.tgz}+ version: 1.6.0+ engines: {node: '>=4'}+ hasBin: true+resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}engines: {node: '>=6'}@@ -7183,16 +7759,24 @@ packages:resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}engines: {node: '>=12'}- resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}+ mimic-fn@https://r2.cnpmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz:+ resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==, tarball: https://r2.cnpmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz}+ version: 2.1.0+ engines: {node: '>=6'}++ mimic-response@https://r2.cnpmjs.org/mimic-response/-/mimic-response-3.1.0.tgz:+ resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==, tarball: https://r2.cnpmjs.org/mimic-response/-/mimic-response-3.1.0.tgz}+ version: 3.1.0engines: {node: '>=10'}- resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==}+ mimic-response@https://r2.cnpmjs.org/mimic-response/-/mimic-response-4.0.0.tgz:+ resolution: {integrity: sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==, tarball: https://r2.cnpmjs.org/mimic-response/-/mimic-response-4.0.0.tgz}+ version: 4.0.0engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}- resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}+ min-indent@https://r2.cnpmjs.org/min-indent/-/min-indent-1.0.1.tgz:+ resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==, tarball: https://r2.cnpmjs.org/min-indent/-/min-indent-1.0.1.tgz}+ version: 1.0.1engines: {node: '>=4'}@@ -7228,20 +7812,23 @@ packages:resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==}engines: {node: '>=16 || 14 >=14.17'}- resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}+ minizlib@https://r2.cnpmjs.org/minizlib/-/minizlib-2.1.2.tgz:+ resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==, tarball: https://r2.cnpmjs.org/minizlib/-/minizlib-2.1.2.tgz}+ version: 2.1.2engines: {node: '>= 8'}- resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}+ mkdirp-classic@https://r2.cnpmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz:+ resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==, tarball: https://r2.cnpmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz}+ version: 0.5.3- resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}+ resolution: {integrity: sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==}engines: {node: '>=10'}hasBin: true- resolution: {integrity: sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==}+ mkdirp@https://r2.cnpmjs.org/mkdirp/-/mkdirp-1.0.4.tgz:+ resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==, tarball: https://r2.cnpmjs.org/mkdirp/-/mkdirp-1.0.4.tgz}+ version: 1.0.4engines: {node: '>=10'}hasBin: true@@ -7257,14 +7844,17 @@ packages:resolution: {integrity: sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==}- resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}+ ms@https://r2.cnpmjs.org/ms/-/ms-2.0.0.tgz:+ resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==, tarball: https://r2.cnpmjs.org/ms/-/ms-2.0.0.tgz}+ version: 2.0.0- resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}+ ms@https://r2.cnpmjs.org/ms/-/ms-2.1.2.tgz:+ resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==, tarball: https://r2.cnpmjs.org/ms/-/ms-2.1.2.tgz}+ version: 2.1.2- resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}+ ms@https://r2.cnpmjs.org/ms/-/ms-2.1.3.tgz:+ resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==, tarball: https://r2.cnpmjs.org/ms/-/ms-2.1.3.tgz}+ version: 2.1.3resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}@@ -7287,12 +7877,17 @@ packages:engines: {node: ^18 || >=20}hasBin: true- resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}+ natural-compare-lite@https://r2.cnpmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz:+ resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==, tarball: https://r2.cnpmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz}+ version: 1.4.0resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}+ natural-compare@https://r2.cnpmjs.org/natural-compare/-/natural-compare-1.4.0.tgz:+ resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==, tarball: https://r2.cnpmjs.org/natural-compare/-/natural-compare-1.4.0.tgz}+ version: 1.4.0+resolution: {integrity: sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==}engines: {node: '>= 4.4.x'}@@ -7305,26 +7900,35 @@ packages:resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}- resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}+ neo-async@https://r2.cnpmjs.org/neo-async/-/neo-async-2.6.2.tgz:+ resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==, tarball: https://r2.cnpmjs.org/neo-async/-/neo-async-2.6.2.tgz}+ version: 2.6.2++ netmask@https://r2.cnpmjs.org/netmask/-/netmask-2.0.2.tgz:+ resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==, tarball: https://r2.cnpmjs.org/netmask/-/netmask-2.0.2.tgz}+ version: 2.0.2engines: {node: '>= 0.4.0'}- resolution: {integrity: sha512-NHDDGYudnvRutt/VhKFlX26IotXe1w0cmkDm6JGquh5bz/bDTw0LufSmH/GxTjEdpHEO+bVKFTwdrcGa/9XlKQ==}+ new-github-release-url@https://r2.cnpmjs.org/new-github-release-url/-/new-github-release-url-2.0.0.tgz:+ resolution: {integrity: sha512-NHDDGYudnvRutt/VhKFlX26IotXe1w0cmkDm6JGquh5bz/bDTw0LufSmH/GxTjEdpHEO+bVKFTwdrcGa/9XlKQ==, tarball: https://r2.cnpmjs.org/new-github-release-url/-/new-github-release-url-2.0.0.tgz}+ version: 2.0.0engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}- resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}+ no-case@https://r2.cnpmjs.org/no-case/-/no-case-3.0.4.tgz:+ resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==, tarball: https://r2.cnpmjs.org/no-case/-/no-case-3.0.4.tgz}+ version: 3.0.4resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}- resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==}+ node-dir@https://r2.cnpmjs.org/node-dir/-/node-dir-0.1.17.tgz:+ resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==, tarball: https://r2.cnpmjs.org/node-dir/-/node-dir-0.1.17.tgz}+ version: 0.1.17engines: {node: '>= 0.10.5'}- resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}+ node-domexception@https://r2.cnpmjs.org/node-domexception/-/node-domexception-1.0.0.tgz:+ resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==, tarball: https://r2.cnpmjs.org/node-domexception/-/node-domexception-1.0.0.tgz}+ version: 1.0.0engines: {node: '>=10.5.0'}@@ -7346,13 +7950,14 @@ packages:resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}- resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}-resolution: {integrity: sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==}engines: {node: ^16.14.0 || >=18.0.0}+ normalize-package-data@https://r2.cnpmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz:+ resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==, tarball: https://r2.cnpmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz}+ version: 2.5.0+resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}engines: {node: '>=0.10.0'}@@ -7369,6 +7974,11 @@ packages:resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ npm-run-path@https://r2.cnpmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz:+ resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==, tarball: https://r2.cnpmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz}+ version: 4.0.1+ engines: {node: '>=8'}+resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}@@ -7421,8 +8031,9 @@ packages:resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==}+ objectorarray@https://r2.cnpmjs.org/objectorarray/-/objectorarray-1.0.5.tgz:+ resolution: {integrity: sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==, tarball: https://r2.cnpmjs.org/objectorarray/-/objectorarray-1.0.5.tgz}+ version: 1.0.5resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==}@@ -7438,6 +8049,10 @@ packages:resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}+ once@https://r2.cnpmjs.org/once/-/once-1.4.0.tgz:+ resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==, tarball: https://r2.cnpmjs.org/once/-/once-1.4.0.tgz}+ version: 1.4.0+resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}engines: {node: '>=6'}@@ -7446,6 +8061,11 @@ packages:resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}engines: {node: '>=12'}+ onetime@https://r2.cnpmjs.org/onetime/-/onetime-5.1.2.tgz:+ resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==, tarball: https://r2.cnpmjs.org/onetime/-/onetime-5.1.2.tgz}+ version: 5.1.2+ engines: {node: '>=6'}+resolution: {integrity: sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==}engines: {node: '>=18'}@@ -7471,30 +8091,29 @@ packages:resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}engines: {node: '>= 0.8.0'}- resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}- engines: {node: '>=10'}-resolution: {integrity: sha512-ANIvzobt1rls2BDny5fWZ3ZVKyD6nscLvfFRpQgfWsythlcsVUC9kL0zq6j2Z5z9wwp1kd7wpsD/T9qNPVLCaQ==}engines: {node: '>=18'}+ ora@https://r2.cnpmjs.org/ora/-/ora-5.4.1.tgz:+ resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==, tarball: https://r2.cnpmjs.org/ora/-/ora-5.4.1.tgz}+ version: 5.4.1+ engines: {node: '>=10'}+resolution: {integrity: sha512-YEIoAnM6zFmzw3PQ201gCVCIWbXNyKObGlVvpAVvraAeOHnlYVKFssbA/riRX5R40WA6kKrZ7Dr7dWzO3nKSeQ==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}- resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}+ os-tmpdir@https://r2.cnpmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz:+ resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==, tarball: https://r2.cnpmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz}+ version: 1.0.2engines: {node: '>=0.10.0'}- resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==}+ p-cancelable@https://r2.cnpmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz:+ resolution: {integrity: sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==, tarball: https://r2.cnpmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz}+ version: 3.0.0engines: {node: '>=12.20'}- resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}- engines: {node: '>=6'}-resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}engines: {node: '>=10'}@@ -7507,13 +8126,15 @@ packages:resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}engines: {node: '>=18'}- resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}+ p-limit@https://r2.cnpmjs.org/p-limit/-/p-limit-2.3.0.tgz:+ resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==, tarball: https://r2.cnpmjs.org/p-limit/-/p-limit-2.3.0.tgz}+ version: 2.3.0engines: {node: '>=6'}- resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}- engines: {node: '>=8'}+ p-limit@https://r2.cnpmjs.org/p-limit/-/p-limit-3.1.0.tgz:+ resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==, tarball: https://r2.cnpmjs.org/p-limit/-/p-limit-3.1.0.tgz}+ version: 3.1.0+ engines: {node: '>=10'}resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}@@ -7523,12 +8144,28 @@ packages:resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ p-locate@https://r2.cnpmjs.org/p-locate/-/p-locate-3.0.0.tgz:+ resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==, tarball: https://r2.cnpmjs.org/p-locate/-/p-locate-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=6'}++ p-locate@https://r2.cnpmjs.org/p-locate/-/p-locate-4.1.0.tgz:+ resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==, tarball: https://r2.cnpmjs.org/p-locate/-/p-locate-4.1.0.tgz}+ version: 4.1.0+ engines: {node: '>=8'}++ p-locate@https://r2.cnpmjs.org/p-locate/-/p-locate-5.0.0.tgz:+ resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==, tarball: https://r2.cnpmjs.org/p-locate/-/p-locate-5.0.0.tgz}+ version: 5.0.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}engines: {node: '>=10'}- resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}+ p-try@https://r2.cnpmjs.org/p-try/-/p-try-2.2.0.tgz:+ resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==, tarball: https://r2.cnpmjs.org/p-try/-/p-try-2.2.0.tgz}+ version: 2.2.0engines: {node: '>=6'}@@ -7546,30 +8183,39 @@ packages:resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}- resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}+ param-case@https://r2.cnpmjs.org/param-case/-/param-case-3.0.4.tgz:+ resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==, tarball: https://r2.cnpmjs.org/param-case/-/param-case-3.0.4.tgz}+ version: 3.0.4resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}engines: {node: '>=6'}- resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==}+ parent-module@https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz:+ resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==, tarball: https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz}+ version: 1.0.1+ engines: {node: '>=6'}++ parse-entities@https://r2.cnpmjs.org/parse-entities/-/parse-entities-2.0.0.tgz:+ resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==, tarball: https://r2.cnpmjs.org/parse-entities/-/parse-entities-2.0.0.tgz}+ version: 2.0.0resolution: {integrity: sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog==}engines: {node: '>=14'}- resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}- engines: {node: '>=8'}-resolution: {integrity: sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==}engines: {node: '>=16'}- resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}+ parse-json@https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz:+ resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==, tarball: https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz}+ version: 5.2.0+ engines: {node: '>=8'}++ parse-node-version@https://r2.cnpmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz:+ resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==, tarball: https://r2.cnpmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz}+ version: 1.0.1engines: {node: '>= 0.10'}@@ -7581,19 +8227,18 @@ packages:resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}- resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}+ parseurl@https://r2.cnpmjs.org/parseurl/-/parseurl-1.3.3.tgz:+ resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==, tarball: https://r2.cnpmjs.org/parseurl/-/parseurl-1.3.3.tgz}+ version: 1.3.3engines: {node: '>= 0.8'}- resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}-- resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}+ pascal-case@https://r2.cnpmjs.org/pascal-case/-/pascal-case-3.1.2.tgz:+ resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==, tarball: https://r2.cnpmjs.org/pascal-case/-/pascal-case-3.1.2.tgz}+ version: 3.1.2- resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}- engines: {node: '>=4'}+ path-browserify@https://r2.cnpmjs.org/path-browserify/-/path-browserify-1.0.1.tgz:+ resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==, tarball: https://r2.cnpmjs.org/path-browserify/-/path-browserify-1.0.1.tgz}+ version: 1.0.1resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}@@ -7603,6 +8248,21 @@ packages:resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-3.0.0.tgz:+ resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==, tarball: https://r2.cnpmjs.org/path-exists/-/path-exists-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=4'}++ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-4.0.0.tgz:+ resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==, tarball: https://r2.cnpmjs.org/path-exists/-/path-exists-4.0.0.tgz}+ version: 4.0.0+ engines: {node: '>=8'}++ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgz:+ resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==, tarball: https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgz}+ version: 5.0.0+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}engines: {node: '>=0.10.0'}@@ -7618,9 +8278,18 @@ packages:resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}engines: {node: '>=12'}+ path-key@https://r2.cnpmjs.org/path-key/-/path-key-3.1.1.tgz:+ resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==, tarball: https://r2.cnpmjs.org/path-key/-/path-key-3.1.1.tgz}+ version: 3.1.1+ engines: {node: '>=8'}+resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}+ path-parse@https://r2.cnpmjs.org/path-parse/-/path-parse-1.0.7.tgz:+ resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==, tarball: https://r2.cnpmjs.org/path-parse/-/path-parse-1.0.7.tgz}+ version: 1.0.7+resolution: {integrity: sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==}engines: {node: '>=0.10.0'}@@ -7633,18 +8302,25 @@ packages:resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==}engines: {node: '>=16 || 14 >=14.17'}- resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}-resolution: {integrity: sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==}+ path-to-regexp@https://r2.cnpmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz:+ resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==, tarball: https://r2.cnpmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz}+ version: 0.1.7+resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}engines: {node: '>=8'}- resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}+ path-type@https://r2.cnpmjs.org/path-type/-/path-type-4.0.0.tgz:+ resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==, tarball: https://r2.cnpmjs.org/path-type/-/path-type-4.0.0.tgz}+ version: 4.0.0+ engines: {node: '>=8'}++ path-type@https://r2.cnpmjs.org/path-type/-/path-type-5.0.0.tgz:+ resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==, tarball: https://r2.cnpmjs.org/path-type/-/path-type-5.0.0.tgz}+ version: 5.0.0engines: {node: '>=12'}@@ -7653,8 +8329,9 @@ packages:resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}- resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==}+ peek-stream@https://r2.cnpmjs.org/peek-stream/-/peek-stream-1.1.3.tgz:+ resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==, tarball: https://r2.cnpmjs.org/peek-stream/-/peek-stream-1.1.3.tgz}+ version: 1.1.3resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}@@ -7676,24 +8353,28 @@ packages:engines: {node: '>=0.10'}hasBin: true- resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}+ pify@https://r2.cnpmjs.org/pify/-/pify-4.0.1.tgz:+ resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==, tarball: https://r2.cnpmjs.org/pify/-/pify-4.0.1.tgz}+ version: 4.0.1engines: {node: '>=6'}resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}engines: {node: '>= 6'}- resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==}+ pkg-dir@https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz:+ resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==, tarball: https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz}+ version: 3.0.0engines: {node: '>=6'}- resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}+ pkg-dir@https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz:+ resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==, tarball: https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz}+ version: 4.2.0engines: {node: '>=8'}- resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}+ pkg-dir@https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz:+ resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==, tarball: https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz}+ version: 5.0.0engines: {node: '>=10'}@@ -7709,8 +8390,9 @@ packages:engines: {node: '>=16'}hasBin: true- resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}+ pluralize@https://r2.cnpmjs.org/pluralize/-/pluralize-8.0.0.tgz:+ resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==, tarball: https://r2.cnpmjs.org/pluralize/-/pluralize-8.0.0.tgz}+ version: 8.0.0engines: {node: '>=4'}@@ -7769,8 +8451,9 @@ packages:resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}- resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}+ prettier-linter-helpers@https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz:+ resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==, tarball: https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz}+ version: 1.0.0engines: {node: '>=6.0.0'}@@ -7778,8 +8461,9 @@ packages:engines: {node: '>=14'}hasBin: true- resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==}+ pretty-error@https://r2.cnpmjs.org/pretty-error/-/pretty-error-4.0.0.tgz:+ resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==, tarball: https://r2.cnpmjs.org/pretty-error/-/pretty-error-4.0.0.tgz}+ version: 4.0.0resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}@@ -7789,30 +8473,39 @@ packages:resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}- resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}+ pretty-hrtime@https://r2.cnpmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz:+ resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==, tarball: https://r2.cnpmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz}+ version: 1.0.3engines: {node: '>= 0.8'}- resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}+ process-nextick-args@https://r2.cnpmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz:+ resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==, tarball: https://r2.cnpmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz}+ version: 2.0.1resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}engines: {node: '>= 0.6.0'}+ process@https://r2.cnpmjs.org/process/-/process-0.11.10.tgz:+ resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==, tarball: https://r2.cnpmjs.org/process/-/process-0.11.10.tgz}+ version: 0.11.10+ engines: {node: '>= 0.6.0'}+resolution: {integrity: sha512-hezvKvQQmsFkOdrZfYxUxkyxl8mgFQeT259Ajj9PXdbg9VzBCWrItOev72JyWxkCD5VSSqAeHmlN3tWx4DlmsA==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}+ prompts@https://r2.cnpmjs.org/prompts/-/prompts-2.4.2.tgz:+ resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==, tarball: https://r2.cnpmjs.org/prompts/-/prompts-2.4.2.tgz}+ version: 2.4.2engines: {node: '>= 6'}resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}- resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}+ proto-list@https://r2.cnpmjs.org/proto-list/-/proto-list-1.2.4.tgz:+ resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==, tarball: https://r2.cnpmjs.org/proto-list/-/proto-list-1.2.4.tgz}+ version: 1.2.4resolution: {integrity: sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==}@@ -7821,31 +8514,37 @@ packages:resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==}- resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}+ proxy-addr@https://r2.cnpmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz:+ resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==, tarball: https://r2.cnpmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz}+ version: 2.0.7engines: {node: '>= 0.10'}resolution: {integrity: sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==}engines: {node: '>= 14'}- resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}+ proxy-from-env@https://r2.cnpmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz:+ resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==, tarball: https://r2.cnpmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz}+ version: 1.1.0- resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}+ prr@https://r2.cnpmjs.org/prr/-/prr-1.0.1.tgz:+ resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==, tarball: https://r2.cnpmjs.org/prr/-/prr-1.0.1.tgz}+ version: 1.0.1resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}- resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}+ pump@https://r2.cnpmjs.org/pump/-/pump-2.0.1.tgz:+ resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==, tarball: https://r2.cnpmjs.org/pump/-/pump-2.0.1.tgz}+ version: 2.0.1- resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}+ pump@https://r2.cnpmjs.org/pump/-/pump-3.0.0.tgz:+ resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==, tarball: https://r2.cnpmjs.org/pump/-/pump-3.0.0.tgz}+ version: 3.0.0- resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}+ pumpify@https://r2.cnpmjs.org/pumpify/-/pumpify-1.5.1.tgz:+ resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==, tarball: https://r2.cnpmjs.org/pumpify/-/pumpify-1.5.1.tgz}+ version: 1.5.1resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}@@ -7854,8 +8553,13 @@ packages:resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}engines: {node: '>=6'}- resolution: {integrity: sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==}+ punycode@https://r2.cnpmjs.org/punycode/-/punycode-1.4.1.tgz:+ resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==, tarball: https://r2.cnpmjs.org/punycode/-/punycode-1.4.1.tgz}+ version: 1.4.1++ pupa@https://r2.cnpmjs.org/pupa/-/pupa-3.1.0.tgz:+ resolution: {integrity: sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==, tarball: https://r2.cnpmjs.org/pupa/-/pupa-3.1.0.tgz}+ version: 3.1.0engines: {node: '>=12.20'}@@ -7872,22 +8576,25 @@ packages:resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}- resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}+ quick-lru@https://r2.cnpmjs.org/quick-lru/-/quick-lru-5.1.1.tgz:+ resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==, tarball: https://r2.cnpmjs.org/quick-lru/-/quick-lru-5.1.1.tgz}+ version: 5.1.1engines: {node: '>=10'}resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}- resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}+ randombytes@https://r2.cnpmjs.org/randombytes/-/randombytes-2.1.0.tgz:+ resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==, tarball: https://r2.cnpmjs.org/randombytes/-/randombytes-2.1.0.tgz}+ version: 2.1.0resolution: {integrity: sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A==}engines: {node: '>= 0.6'}- resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}+ range-parser@https://r2.cnpmjs.org/range-parser/-/range-parser-1.2.1.tgz:+ resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==, tarball: https://r2.cnpmjs.org/range-parser/-/range-parser-1.2.1.tgz}+ version: 1.2.1engines: {node: '>= 0.6'}@@ -8018,6 +8725,11 @@ packages:resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}hasBin: true+ rc@https://r2.cnpmjs.org/rc/-/rc-1.2.8.tgz:+ resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==, tarball: https://r2.cnpmjs.org/rc/-/rc-1.2.8.tgz}+ version: 1.2.8+ hasBin: true+resolution: {integrity: sha512-VfIbLjlL9NAnZzc2M5fGPCNkDyK12+ahgILGO5RjS7jkgUlxwB0c/XvxVQNfY/2ocg7isTY/G7tqxJk5fSTZAA==}@@ -8068,8 +8780,9 @@ packages:'@types/react':optional: true- resolution: {integrity: sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==}+ react-docgen-typescript@https://r2.cnpmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz:+ resolution: {integrity: sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==, tarball: https://r2.cnpmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz}+ version: 2.2.2peerDependencies:typescript: '>= 4.3.x'@@ -8109,15 +8822,16 @@ packages:resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}- resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}-resolution: {integrity: sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==}resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}+ react-is@https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgz:+ resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==, tarball: https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgz}+ version: 17.0.2+resolution: {integrity: sha512-iWrNUSdW6HK9SB6kaj7/auvIGZWlyEFR8ulQKC9lskY047uluo5ur4fiuZTNroUTZvGqL02AiLzBBj1+et8RZA==}peerDependencies:@@ -8146,18 +8860,20 @@ packages:resolution: {integrity: sha512-aNtBq4jR8NawpKJQldrQcSW9y/d+KWH4v24HWkHljOZ7H0av+YTGANBzRh9A5pw7v/bLVsLVPpOhJ7gHNVy8lA==}engines: {node: '>=16'}- resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}- engines: {node: '>=8'}-- resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}+ read-pkg-up@https://r2.cnpmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz:+ resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==, tarball: https://r2.cnpmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz}+ version: 7.0.1engines: {node: '>=8'}resolution: {integrity: sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==}engines: {node: '>=16'}+ read-pkg@https://r2.cnpmjs.org/read-pkg/-/read-pkg-5.2.0.tgz:+ resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==, tarball: https://r2.cnpmjs.org/read-pkg/-/read-pkg-5.2.0.tgz}+ version: 5.2.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}@@ -8173,12 +8889,14 @@ packages:resolution: {integrity: sha512-9FHoNjX1yjuesMwuthAmPKabxYQdOgihFYmT5ebXfYGBcnqXZf3WOVz+5foEZ8Y83P4ZY6yQD5GMmtV+pgCCAQ==}engines: {node: '>= 4'}- resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}+ rechoir@https://r2.cnpmjs.org/rechoir/-/rechoir-0.6.2.tgz:+ resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==, tarball: https://r2.cnpmjs.org/rechoir/-/rechoir-0.6.2.tgz}+ version: 0.6.2engines: {node: '>= 0.10'}- resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}+ redent@https://r2.cnpmjs.org/redent/-/redent-3.0.0.tgz:+ resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==, tarball: https://r2.cnpmjs.org/redent/-/redent-3.0.0.tgz}+ version: 3.0.0engines: {node: '>=8'}@@ -8195,8 +8913,9 @@ packages:resolution: {integrity: sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==}engines: {node: '>=4'}- resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}+ regenerate@https://r2.cnpmjs.org/regenerate/-/regenerate-1.4.2.tgz:+ resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==, tarball: https://r2.cnpmjs.org/regenerate/-/regenerate-1.4.2.tgz}+ version: 1.4.2resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}@@ -8249,20 +8968,23 @@ packages:resolution: {integrity: sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==}- resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}+ relateurl@https://r2.cnpmjs.org/relateurl/-/relateurl-0.2.7.tgz:+ resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==, tarball: https://r2.cnpmjs.org/relateurl/-/relateurl-0.2.7.tgz}+ version: 0.2.7engines: {node: '>= 0.10'}- resolution: {integrity: sha512-zBOpaHyjrXC3g/9rHyQlvuDw9yCn9AGphrlL+t3gWNEhbZKEQ62WNY45JxllcJMNx9orQUxBZ3o7pVCqkeuTbg==}+ resolution: {integrity: sha512-Cidaq5W4apZSpdEDQd2TJhH7GZAwfaG+ewe60p7B7+txyCHYR/T6lGvkKinJmePpdHsM0fzA05yGGXKCiHJHmA==}engines: {node: ^18.18.0 || ^20.8.0 || ^21.0.0}hasBin: true- resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==}+ renderkid@https://r2.cnpmjs.org/renderkid/-/renderkid-3.0.0.tgz:+ resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==, tarball: https://r2.cnpmjs.org/renderkid/-/renderkid-3.0.0.tgz}+ version: 3.0.0- resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}+ require-directory@https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz:+ resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==, tarball: https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz}+ version: 2.1.1engines: {node: '>=0.10.0'}@@ -8283,15 +9005,22 @@ packages:resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==, tarball: https://r2.cnpmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz}version: 1.5.1- resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}+ resolve-alpn@https://r2.cnpmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz:+ resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==, tarball: https://r2.cnpmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz}+ version: 1.2.1resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}engines: {node: '>=4'}- resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}+ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz:+ resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==, tarball: https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz}+ version: 4.0.0+ engines: {node: '>=4'}++ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz:+ resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==, tarball: https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz}+ version: 5.0.0engines: {node: '>=8'}@@ -8301,9 +9030,6 @@ packages:resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}- resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==}-resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}hasBin: true@@ -8312,20 +9038,31 @@ packages:resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==}hasBin: true+ resolve@https://r2.cnpmjs.org/resolve/-/resolve-1.19.0.tgz:+ resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==, tarball: https://r2.cnpmjs.org/resolve/-/resolve-1.19.0.tgz}+ version: 1.19.0+resolution: {integrity: sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==}engines: {node: '>=14.16'}- resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}- engines: {node: '>=8'}-resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}- resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==}+ restore-cursor@https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz:+ resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==, tarball: https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz}+ version: 3.1.0+ engines: {node: '>=8'}++ restore-cursor@https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz:+ resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==, tarball: https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz}+ version: 4.0.0+ engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}++ retry@https://r2.cnpmjs.org/retry/-/retry-0.13.1.tgz:+ resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==, tarball: https://r2.cnpmjs.org/retry/-/retry-0.13.1.tgz}+ version: 0.13.1engines: {node: '>= 4'}@@ -8335,16 +9072,17 @@ packages:resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==}- resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}- hasBin: true-resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}hasBin: true- resolution: {integrity: sha512-MIlLgsdMprDBXC+4hsPgzWUasLO9CE4zOkj/u6j+Z6j5A4zRY+CtiXAdJyPtgCsc42g658Aeh1DlrdVEJhsL2g==}+ rimraf@https://r2.cnpmjs.org/rimraf/-/rimraf-2.6.3.tgz:+ resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==, tarball: https://r2.cnpmjs.org/rimraf/-/rimraf-2.6.3.tgz}+ version: 2.6.3+ hasBin: true++ resolution: {integrity: sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==}engines: {node: '>=18.0.0', npm: '>=8.0.0'}hasBin: true@@ -8375,6 +9113,14 @@ packages:resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}+ safe-buffer@https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz:+ resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==, tarball: https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz}+ version: 5.1.2++ safe-buffer@https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz:+ resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==, tarball: https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz}+ version: 5.2.1+resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}engines: {node: '>= 0.4'}@@ -8382,6 +9128,10 @@ packages:resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}+ safer-buffer@https://r2.cnpmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz:+ resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==, tarball: https://r2.cnpmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz}+ version: 2.1.2+resolution: {integrity: sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==}engines: {node: '>=14.0.0'}@@ -8405,8 +9155,9 @@ packages:resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==}engines: {node: '>= 12.13.0'}- resolution: {integrity: sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==}+ semver-diff@https://r2.cnpmjs.org/semver-diff/-/semver-diff-4.0.0.tgz:+ resolution: {integrity: sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==, tarball: https://r2.cnpmjs.org/semver-diff/-/semver-diff-4.0.0.tgz}+ version: 4.0.0engines: {node: '>=12'}@@ -8454,11 +9205,13 @@ packages:resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}+ setprototypeof@https://r2.cnpmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz:+ resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==, tarball: https://r2.cnpmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz}+ version: 1.2.0- resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}+ shallow-clone@https://r2.cnpmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz:+ resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==, tarball: https://r2.cnpmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz}+ version: 3.0.1engines: {node: '>=8'}@@ -8469,10 +9222,20 @@ packages:resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}engines: {node: '>=8'}+ shebang-command@https://r2.cnpmjs.org/shebang-command/-/shebang-command-2.0.0.tgz:+ resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==, tarball: https://r2.cnpmjs.org/shebang-command/-/shebang-command-2.0.0.tgz}+ version: 2.0.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}engines: {node: '>=8'}+ shebang-regex@https://r2.cnpmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz:+ resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==, tarball: https://r2.cnpmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz}+ version: 3.0.0+ engines: {node: '>=8'}+resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}engines: {node: '>=4'}@@ -8486,8 +9249,9 @@ packages:resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}+ siginfo@https://r2.cnpmjs.org/siginfo/-/siginfo-2.0.0.tgz:+ resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==, tarball: https://r2.cnpmjs.org/siginfo/-/siginfo-2.0.0.tgz}+ version: 2.0.0resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}@@ -8499,8 +9263,9 @@ packages:resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}- resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}+ sisteransi@https://r2.cnpmjs.org/sisteransi/-/sisteransi-1.0.5.tgz:+ resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==, tarball: https://r2.cnpmjs.org/sisteransi/-/sisteransi-1.0.5.tgz}+ version: 1.0.5resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}@@ -8518,8 +9283,9 @@ packages:resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}engines: {node: '>=18'}- resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}+ smart-buffer@https://r2.cnpmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz:+ resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==, tarball: https://r2.cnpmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz}+ version: 4.2.0engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}@@ -8537,10 +9303,19 @@ packages:resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}+ source-map-support@https://r2.cnpmjs.org/source-map-support/-/source-map-support-0.5.21.tgz:+ resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==, tarball: https://r2.cnpmjs.org/source-map-support/-/source-map-support-0.5.21.tgz}+ version: 0.5.21+resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}engines: {node: '>=0.10.0'}+ source-map@https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgz:+ resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==, tarball: https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgz}+ version: 0.6.1+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}@@ -8556,6 +9331,10 @@ packages:resolution: {integrity: sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==}+ spdx-expression-parse@https://r2.cnpmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz:+ resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==, tarball: https://r2.cnpmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz}+ version: 3.0.1+resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==}@@ -8563,17 +9342,20 @@ packages:resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}engines: {node: '>= 10.x'}- resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}-resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}- resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}+ sprintf-js@https://r2.cnpmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz:+ resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==, tarball: https://r2.cnpmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz}+ version: 1.0.3++ stackback@https://r2.cnpmjs.org/stackback/-/stackback-0.0.2.tgz:+ resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==, tarball: https://r2.cnpmjs.org/stackback/-/stackback-0.0.2.tgz}+ version: 0.0.2- resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}+ statuses@https://r2.cnpmjs.org/statuses/-/statuses-2.0.1.tgz:+ resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==, tarball: https://r2.cnpmjs.org/statuses/-/statuses-2.0.1.tgz}+ version: 2.0.1engines: {node: '>= 0.8'}@@ -8634,6 +9416,11 @@ packages:resolution: {integrity: sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==}engines: {node: '>=18'}+ string-width@https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz:+ resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==, tarball: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz}+ version: 4.2.3+ engines: {node: '>=8'}+resolution: {integrity: sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==}@@ -8652,12 +9439,13 @@ packages:resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}-resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}+ string_decoder@https://r2.cnpmjs.org/string_decoder/-/string_decoder-1.1.1.tgz:+ resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==, tarball: https://r2.cnpmjs.org/string_decoder/-/string_decoder-1.1.1.tgz}+ version: 1.1.1+resolution: {integrity: sha512-KlywLT+MZ+v0IRepfMxRtnSvDCMc3nR1qqCs3m/qIbSOWkNZYT8XHQA31rS3TnKp0c5xjZu3M4GY/2aRKSi/6A==}@@ -8669,6 +9457,11 @@ packages:resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}engines: {node: '>=12'}+ strip-ansi@https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz:+ resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==, tarball: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz}+ version: 6.0.1+ engines: {node: '>=8'}+resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}engines: {node: '>=4'}@@ -8681,12 +9474,19 @@ packages:resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}engines: {node: '>=12'}- resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}+ strip-final-newline@https://r2.cnpmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz:+ resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==, tarball: https://r2.cnpmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz}+ version: 2.0.0+ engines: {node: '>=6'}++ strip-indent@https://r2.cnpmjs.org/strip-indent/-/strip-indent-3.0.0.tgz:+ resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==, tarball: https://r2.cnpmjs.org/strip-indent/-/strip-indent-3.0.0.tgz}+ version: 3.0.0engines: {node: '>=8'}- resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==}+ strip-indent@https://r2.cnpmjs.org/strip-indent/-/strip-indent-4.0.0.tgz:+ resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==, tarball: https://r2.cnpmjs.org/strip-indent/-/strip-indent-4.0.0.tgz}+ version: 4.0.0engines: {node: '>=12'}@@ -8697,6 +9497,16 @@ packages:resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}engines: {node: '>=8'}+ strip-json-comments@https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz:+ resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==, tarball: https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz}+ version: 2.0.1+ engines: {node: '>=0.10.0'}++ strip-json-comments@https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz:+ resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==, tarball: https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz}+ version: 3.1.1+ engines: {node: '>=8'}+resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==}@@ -8714,8 +9524,14 @@ packages:resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}engines: {node: '>=8'}- resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}+ supports-color@https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz:+ resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==, tarball: https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz}+ version: 7.2.0+ engines: {node: '>=8'}++ supports-color@https://r2.cnpmjs.org/supports-color/-/supports-color-8.1.1.tgz:+ resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==, tarball: https://r2.cnpmjs.org/supports-color/-/supports-color-8.1.1.tgz}+ version: 8.1.1engines: {node: '>=10'}@@ -8749,11 +9565,18 @@ packages:resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}engines: {node: '>=6'}- resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}+ tapable@https://r2.cnpmjs.org/tapable/-/tapable-2.2.1.tgz:+ resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==, tarball: https://r2.cnpmjs.org/tapable/-/tapable-2.2.1.tgz}+ version: 2.2.1+ engines: {node: '>=6'}++ tar-fs@https://r2.cnpmjs.org/tar-fs/-/tar-fs-2.1.1.tgz:+ resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==, tarball: https://r2.cnpmjs.org/tar-fs/-/tar-fs-2.1.1.tgz}+ version: 2.1.1- resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}+ tar-stream@https://r2.cnpmjs.org/tar-stream/-/tar-stream-2.2.0.tgz:+ resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==, tarball: https://r2.cnpmjs.org/tar-stream/-/tar-stream-2.2.0.tgz}+ version: 2.2.0engines: {node: '>=6'}@@ -8763,16 +9586,19 @@ packages:resolution: {integrity: sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==}- resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}+ temp-dir@https://r2.cnpmjs.org/temp-dir/-/temp-dir-2.0.0.tgz:+ resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==, tarball: https://r2.cnpmjs.org/temp-dir/-/temp-dir-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=8'}- resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}+ temp@https://r2.cnpmjs.org/temp/-/temp-0.8.4.tgz:+ resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==, tarball: https://r2.cnpmjs.org/temp/-/temp-0.8.4.tgz}+ version: 0.8.4engines: {node: '>=6.0.0'}- resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}+ tempy@https://r2.cnpmjs.org/tempy/-/tempy-1.0.1.tgz:+ resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==, tarball: https://r2.cnpmjs.org/tempy/-/tempy-1.0.1.tgz}+ version: 1.0.1engines: {node: '>=10'}@@ -8807,8 +9633,9 @@ packages:resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}- resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}+ through2@https://r2.cnpmjs.org/through2/-/through2-2.0.5.tgz:+ resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==, tarball: https://r2.cnpmjs.org/through2/-/through2-2.0.5.tgz}+ version: 2.0.5resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}@@ -8819,19 +9646,20 @@ packages:resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}- resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==}+ resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==}- resolution: {integrity: sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==}+ resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==}engines: {node: '>=14.0.0'}resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==}engines: {node: '>=14.0.0'}- resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}+ tmp@https://r2.cnpmjs.org/tmp/-/tmp-0.0.33.tgz:+ resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==, tarball: https://r2.cnpmjs.org/tmp/-/tmp-0.0.33.tgz}+ version: 0.0.33engines: {node: '>=0.6.0'}@@ -8845,8 +9673,9 @@ packages:resolution: {integrity: sha512-kE5wyCQJ40hqUaRVkyQ4z5+4juzYsv/eK+aqD97N62YH0TxFhzJvo22RUQQZdO3YnXAk42ZOfOpjVdy+Z0YokA==}- resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}+ toidentifier@https://r2.cnpmjs.org/toidentifier/-/toidentifier-1.0.1.tgz:+ resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==, tarball: https://r2.cnpmjs.org/toidentifier/-/toidentifier-1.0.1.tgz}+ version: 1.0.1engines: {node: '>=0.6'}@@ -8857,21 +9686,23 @@ packages:resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}engines: {node: '>=6'}- resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}-resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}engines: {node: '>=18'}+ tr46@https://r2.cnpmjs.org/tr46/-/tr46-0.0.3.tgz:+ resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==, tarball: https://r2.cnpmjs.org/tr46/-/tr46-0.0.3.tgz}+ version: 0.0.3+resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}engines: {node: '>=16'}peerDependencies:typescript: '>=4.2.0'- resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}+ ts-dedent@https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz:+ resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==, tarball: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz}+ version: 2.2.0engines: {node: '>=6.10'}@@ -8925,8 +9756,9 @@ packages:resolution: {integrity: sha512-rX/d9f4MgRT3yK6cERPAkfavIxbpBZowDQpgvkYwGMGDQ0Nvw1nc0NVjruE76GrzXQqoxR1UpnmEP54vBARFHQ==}hasBin: true- resolution: {integrity: sha512-PZBtLYcCLtEcjL14Fzb1gSxPBeL7nWvGhO5ZFPGqziCcr8uvHp0NDmdjBchp6KHL+tExcg0m3NISmKxhU394dA==}+ tween-functions@https://r2.cnpmjs.org/tween-functions/-/tween-functions-1.2.0.tgz:+ resolution: {integrity: sha512-PZBtLYcCLtEcjL14Fzb1gSxPBeL7nWvGhO5ZFPGqziCcr8uvHp0NDmdjBchp6KHL+tExcg0m3NISmKxhU394dA==, tarball: https://r2.cnpmjs.org/tween-functions/-/tween-functions-1.2.0.tgz}+ version: 1.2.0resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}@@ -8940,30 +9772,10 @@ packages:resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}engines: {node: '>=4'}- resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}- engines: {node: '>=10'}-resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}engines: {node: '>=10'}- resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}- engines: {node: '>=10'}-- resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}- engines: {node: '>=8'}-- resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}- engines: {node: '>=8'}-- resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}- engines: {node: '>=10'}-resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}engines: {node: '>=12.20'}@@ -8976,8 +9788,34 @@ packages:resolution: {integrity: sha512-on5/Cw89wwqGZQu+yWO0gGMGu8VNxsaW9SB2HE8yJjllEk7IDTwnSN1dUVldYILhYPN5HzD7WAaw2cc/jBfn0Q==}engines: {node: '>=16'}- resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}+ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.16.0.tgz:+ resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==, tarball: https://r2.cnpmjs.org/type-fest/-/type-fest-0.16.0.tgz}+ version: 0.16.0+ engines: {node: '>=10'}++ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.21.3.tgz:+ resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==, tarball: https://r2.cnpmjs.org/type-fest/-/type-fest-0.21.3.tgz}+ version: 0.21.3+ engines: {node: '>=10'}++ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.6.0.tgz:+ resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==, tarball: https://r2.cnpmjs.org/type-fest/-/type-fest-0.6.0.tgz}+ version: 0.6.0+ engines: {node: '>=8'}++ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.8.1.tgz:+ resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==, tarball: https://r2.cnpmjs.org/type-fest/-/type-fest-0.8.1.tgz}+ version: 0.8.1+ engines: {node: '>=8'}++ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-1.4.0.tgz:+ resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==, tarball: https://r2.cnpmjs.org/type-fest/-/type-fest-1.4.0.tgz}+ version: 1.4.0+ engines: {node: '>=10'}++ type-is@https://r2.cnpmjs.org/type-is/-/type-is-1.6.18.tgz:+ resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==, tarball: https://r2.cnpmjs.org/type-is/-/type-is-1.6.18.tgz}+ version: 1.6.18engines: {node: '>= 0.6'}@@ -8996,8 +9834,9 @@ packages:resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}engines: {node: '>= 0.4'}- resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}+ typedarray-to-buffer@https://r2.cnpmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz:+ resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==, tarball: https://r2.cnpmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz}+ version: 3.1.5resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}@@ -9031,12 +9870,14 @@ packages:resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}- resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}+ unicode-canonical-property-names-ecmascript@https://r2.cnpmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz:+ resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==, tarball: https://r2.cnpmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=4'}- resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}+ unicode-match-property-ecmascript@https://r2.cnpmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz:+ resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==, tarball: https://r2.cnpmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=4'}@@ -9055,19 +9896,22 @@ packages:resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}engines: {node: '>=18'}- resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==}+ unique-string@https://r2.cnpmjs.org/unique-string/-/unique-string-2.0.0.tgz:+ resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==, tarball: https://r2.cnpmjs.org/unique-string/-/unique-string-2.0.0.tgz}+ version: 2.0.0engines: {node: '>=8'}- resolution: {integrity: sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==}+ unique-string@https://r2.cnpmjs.org/unique-string/-/unique-string-3.0.0.tgz:+ resolution: {integrity: sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==, tarball: https://r2.cnpmjs.org/unique-string/-/unique-string-3.0.0.tgz}+ version: 3.0.0engines: {node: '>=12'}resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}- resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==}+ unist-util-stringify-position@https://r2.cnpmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz:+ resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==, tarball: https://r2.cnpmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz}+ version: 2.0.3resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}@@ -9078,10 +9922,6 @@ packages:resolution: {integrity: sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==}- resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}- engines: {node: '>= 4.0.0'}-resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}engines: {node: '>= 4.0.0'}@@ -9090,16 +9930,23 @@ packages:resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}engines: {node: '>= 10.0.0'}- resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}+ universalify@https://r2.cnpmjs.org/universalify/-/universalify-0.1.2.tgz:+ resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==, tarball: https://r2.cnpmjs.org/universalify/-/universalify-0.1.2.tgz}+ version: 0.1.2+ engines: {node: '>= 4.0.0'}++ unpipe@https://r2.cnpmjs.org/unpipe/-/unpipe-1.0.0.tgz:+ resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==, tarball: https://r2.cnpmjs.org/unpipe/-/unpipe-1.0.0.tgz}+ version: 1.0.0engines: {node: '>= 0.8'}resolution: {integrity: sha512-d6Mhq8RJeGA8UfKCu54Um4lFA0eSaRa3XxdAJg8tIdxbu1ubW0hBCZUL7yI2uGyYCRndvbK8FLHzqy2XKfeMsg==}engines: {node: '>=14.0.0'}- resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}+ untildify@https://r2.cnpmjs.org/untildify/-/untildify-4.0.0.tgz:+ resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==, tarball: https://r2.cnpmjs.org/untildify/-/untildify-4.0.0.tgz}+ version: 4.0.0engines: {node: '>=8'}@@ -9118,6 +9965,10 @@ packages:resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}+ uri-js@https://r2.cnpmjs.org/uri-js/-/uri-js-4.4.1.tgz:+ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==, tarball: https://r2.cnpmjs.org/uri-js/-/uri-js-4.4.1.tgz}+ version: 4.4.1+resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==}@@ -9134,14 +9985,20 @@ packages:resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}+ util-deprecate@https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz:+ resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==, tarball: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz}+ version: 1.0.2+resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}- resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==}+ utila@https://r2.cnpmjs.org/utila/-/utila-0.4.0.tgz:+ resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==, tarball: https://r2.cnpmjs.org/utila/-/utila-0.4.0.tgz}+ version: 0.4.0- resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}+ utils-merge@https://r2.cnpmjs.org/utils-merge/-/utils-merge-1.0.1.tgz:+ resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==, tarball: https://r2.cnpmjs.org/utils-merge/-/utils-merge-1.0.1.tgz}+ version: 1.0.1engines: {node: '>= 0.4.0'}@@ -9151,6 +10008,10 @@ packages:resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}+ validate-npm-package-license@https://r2.cnpmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz:+ resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==, tarball: https://r2.cnpmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz}+ version: 3.0.4+resolution: {integrity: sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==}@@ -9162,6 +10023,16 @@ packages:resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}engines: {node: '>= 0.8'}+ vary@https://r2.cnpmjs.org/vary/-/vary-1.1.2.tgz:+ resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==, tarball: https://r2.cnpmjs.org/vary/-/vary-1.1.2.tgz}+ version: 1.1.2+ engines: {node: '>= 0.8'}++ resolution: {integrity: sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==}+ engines: {node: ^18.0.0 || >=20.0.0}+ hasBin: true+resolution: {integrity: sha512-Y8p91kz9zU+bWtF7HGt6DVw2JbhyuB2RlZix3FPYAYmUyZ3n7iTp8eSyLyY6sxtPegvxQtmlTMhfPhUfCUF93A==}engines: {node: ^18.0.0 || >=20.0.0}@@ -9210,6 +10081,31 @@ packages:peerDependencies:vitest: '*'+ resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==}+ engines: {node: ^18.0.0 || >=20.0.0}+ hasBin: true+ peerDependencies:+ '@edge-runtime/vm': '*'+ '@types/node': ^18.0.0 || >=20.0.0+ '@vitest/browser': 1.5.0+ '@vitest/ui': 1.5.0+ happy-dom: '*'+ jsdom: '*'+ peerDependenciesMeta:+ '@edge-runtime/vm':+ optional: true+ '@types/node':+ optional: true+ '@vitest/browser':+ optional: true+ '@vitest/ui':+ optional: true+ happy-dom:+ optional: true+ jsdom:+ optional: true+resolution: {integrity: sha512-l9gwIkq16ug3xY7BxHwcBQovLZG75zZL0PlsiYQbf76Rz6QGs54416UWMtC0jXeihvHvcHrf2ROEjkQRVpoZYw==}engines: {node: ^18.0.0 || >=20.0.0}@@ -9258,6 +10154,14 @@ packages:typescript:optional: true+ resolution: {integrity: sha512-NPdx7dLGyHmKHGRRU5bMRYVE+rechR+KDU5R2tSTNG36PuMwbfAJ+amEvOAw7BPfZp5sQulNELSLm5YUkau+Sg==}+ peerDependencies:+ typescript: '*'+ peerDependenciesMeta:+ typescript:+ optional: true+resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}engines: {node: '>=18'}@@ -9270,20 +10174,22 @@ packages:resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==}engines: {node: '>=10.13.0'}- resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}+ wcwidth@https://r2.cnpmjs.org/wcwidth/-/wcwidth-1.0.1.tgz:+ resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==, tarball: https://r2.cnpmjs.org/wcwidth/-/wcwidth-1.0.1.tgz}+ version: 1.0.1resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}engines: {node: '>= 8'}- resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}-resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}engines: {node: '>=12'}+ webidl-conversions@https://r2.cnpmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz:+ resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==, tarball: https://r2.cnpmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz}+ version: 3.0.1+resolution: {integrity: sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==}engines: {node: '>= 14.15.0'}@@ -9332,8 +10238,9 @@ packages:resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}engines: {node: '>=18'}- resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}+ whatwg-url@https://r2.cnpmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz:+ resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==, tarball: https://r2.cnpmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz}+ version: 5.0.0resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}@@ -9355,6 +10262,12 @@ packages:engines: {node: '>= 8'}hasBin: true+ which@https://r2.cnpmjs.org/which/-/which-2.0.2.tgz:+ resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==, tarball: https://r2.cnpmjs.org/which/-/which-2.0.2.tgz}+ version: 2.0.2+ engines: {node: '>= 8'}+ hasBin: true+resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==}engines: {node: '>=8'}@@ -9364,6 +10277,11 @@ packages:resolution: {integrity: sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==}engines: {node: '>=12'}+ widest-line@https://r2.cnpmjs.org/widest-line/-/widest-line-4.0.1.tgz:+ resolution: {integrity: sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==, tarball: https://r2.cnpmjs.org/widest-line/-/widest-line-4.0.1.tgz}+ version: 4.0.1+ engines: {node: '>=12'}+resolution: {integrity: sha512-a95hPUk+BNzSGLntNXYxsjz2Hooi5oL7xOfJR6CKwSsSALh7vUNuTlzsrZowtYy38JNduYFRVhFv19ocqNOZlg==}@@ -9378,10 +10296,6 @@ packages:resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}- resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}- engines: {node: '>=8'}-resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}engines: {node: '>=10'}@@ -9394,14 +10308,30 @@ packages:resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}engines: {node: '>=18'}+ wrap-ansi@https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz:+ resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==, tarball: https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz}+ version: 6.2.0+ engines: {node: '>=8'}++ wrap-ansi@https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz:+ resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==, tarball: https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz}+ version: 7.0.0+ engines: {node: '>=10'}+resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}- resolution: {integrity: sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==}+ wrappy@https://r2.cnpmjs.org/wrappy/-/wrappy-1.0.2.tgz:+ resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==, tarball: https://r2.cnpmjs.org/wrappy/-/wrappy-1.0.2.tgz}+ version: 1.0.2++ write-file-atomic@https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz:+ resolution: {integrity: sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==, tarball: https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz}+ version: 2.4.3- resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}+ write-file-atomic@https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz:+ resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==, tarball: https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz}+ version: 3.0.3resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==}@@ -9415,35 +10345,36 @@ packages:utf-8-validate:optional: true- resolution: {integrity: sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==}- engines: {node: '>=12'}-- resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}+ xdg-basedir@https://r2.cnpmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz:+ resolution: {integrity: sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==, tarball: https://r2.cnpmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz}+ version: 5.1.0engines: {node: '>=12'}resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}engines: {node: '>=18'}+ xml-name-validator@https://r2.cnpmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz:+ resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==, tarball: https://r2.cnpmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz}+ version: 4.0.0+ engines: {node: '>=12'}+resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}- resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}+ xtend@https://r2.cnpmjs.org/xtend/-/xtend-4.0.2.tgz:+ resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==, tarball: https://r2.cnpmjs.org/xtend/-/xtend-4.0.2.tgz}+ version: 4.0.2engines: {node: '>=0.4'}- resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}+ y18n@https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgz:+ resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==, tarball: https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgz}+ version: 5.0.8engines: {node: '>=10'}resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}- resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}-yallist@https://r2.cnpmjs.org/yallist/-/yallist-4.0.0.tgz:resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==, tarball: https://r2.cnpmjs.org/yallist/-/yallist-4.0.0.tgz}version: 4.0.0@@ -9452,10 +10383,6 @@ packages:resolution: {integrity: sha512-pEwzfsKbTrB8G3xc/sN7aw1v6A6c/pKxLAkjclnAyo5g5qOh6eL9WGu0o3cSDQZKrTNk4KL4lQSwZW+nBkANEg==}engines: {node: ^14.17.0 || >=16.0.0}- resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}- engines: {node: '>= 6'}-resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==}engines: {node: '>= 14'}@@ -9465,6 +10392,11 @@ packages:engines: {node: '>= 14'}hasBin: true+ yaml@https://r2.cnpmjs.org/yaml/-/yaml-1.10.2.tgz:+ resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==, tarball: https://r2.cnpmjs.org/yaml/-/yaml-1.10.2.tgz}+ version: 1.10.2+ engines: {node: '>= 6'}+resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}engines: {node: '>=12'}@@ -9481,6 +10413,16 @@ packages:resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}engines: {node: '>=12.20'}+ yocto-queue@https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz:+ resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==, tarball: https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz}+ version: 0.1.0+ engines: {node: '>=10'}++ yocto-queue@https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz:+ resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==, tarball: https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz}+ version: 1.0.0+ engines: {node: '>=12.20'}+resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}engines: {node: '>=8.0.0'}@@ -9497,7 +10439,7 @@ snapshots:'@jridgewell/gen-mapping': 0.3.5'@jridgewell/trace-mapping': 0.3.25- '@antfu/[email protected](@eslint-react/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))(@vue/[email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))':+ '@antfu/[email protected](@eslint-react/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))(@vue/[email protected])([email protected]([email protected]))([email protected]([email protected]))([email protected]([email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))':dependencies:'@antfu/install-pkg': 0.3.2'@clack/prompts': 0.7.0@@ -9506,30 +10448,29 @@ snapshots:'@typescript-eslint/parser': 7.7.1([email protected])([email protected])eslint: 8.57.0eslint-config-flat-gitignore: 0.1.5- eslint-flat-config-utils: 0.2.4+ eslint-flat-config-utils: 0.2.3eslint-merge-processors: 0.1.0([email protected])eslint-plugin-antfu: 2.1.2([email protected])- eslint-plugin-command: 0.1.2([email protected])- eslint-plugin-eslint-comments: 3.2.0([email protected])+ eslint-plugin-eslint-comments: https://r2.cnpmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz([email protected])eslint-plugin-import-x: 0.5.0([email protected])([email protected])eslint-plugin-jsdoc: 48.2.3([email protected])eslint-plugin-jsonc: 2.15.1([email protected])eslint-plugin-markdown: 4.0.1([email protected])- eslint-plugin-n: 17.3.1([email protected])+ eslint-plugin-n: 17.3.0([email protected])eslint-plugin-no-only-tests: 3.1.0- eslint-plugin-perfectionist: 2.10.0([email protected])([email protected])([email protected]([email protected]))+ eslint-plugin-perfectionist: 2.9.0([email protected])([email protected])([email protected]([email protected]))eslint-plugin-toml: 0.11.0([email protected])eslint-plugin-unicorn: 52.0.0([email protected])eslint-plugin-unused-imports: 3.1.0(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])eslint-plugin-vitest: 0.5.4(@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))eslint-plugin-vue: 9.25.0([email protected])eslint-plugin-yml: 1.14.0([email protected])- eslint-processor-vue-blocks: 0.1.2(@vue/[email protected])([email protected])+ eslint-processor-vue-blocks: 0.1.2(@vue/[email protected])([email protected])globals: 15.0.0jsonc-eslint-parser: 2.4.0local-pkg: 0.5.0parse-gitignore: 2.0.0- picocolors: 1.0.0+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgztoml-eslint-parser: 0.9.3vue-eslint-parser: 9.4.2([email protected])yaml-eslint-parser: 1.2.2@@ -9552,7 +10493,7 @@ snapshots:'@aw-web-design/[email protected]':dependencies:- default-browser-id: 3.0.0+ default-browser-id: https://r2.cnpmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz'@babel/[email protected]':dependencies:@@ -9630,7 +10571,7 @@ snapshots:'@babel/helper-compilation-targets': 7.23.6'@babel/helper-plugin-utils': 7.24.0debug: 4.3.4- lodash.debounce: 4.0.8+ lodash.debounce: https://r2.cnpmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgzresolve: 1.22.8transitivePeerDependencies:- supports-color@@ -9719,13 +10660,17 @@ snapshots:dependencies:'@babel/helper-validator-identifier': 7.22.20chalk: 2.4.2- js-tokens: 4.0.0- picocolors: 1.0.0+ js-tokens: https://r2.cnpmjs.org/js-tokens/-/js-tokens-4.0.0.tgz+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz'@babel/[email protected]':dependencies:'@babel/types': 7.24.0+ '@babel/[email protected]':+ dependencies:+ '@babel/types': 7.24.0+'@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.1(@babel/[email protected])':dependencies:'@babel/core': 7.24.3@@ -9748,27 +10693,27 @@ snapshots:dependencies:'@babel/core': 7.24.3- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-async-generators@https://r2.cnpmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-class-properties@https://r2.cnpmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-class-static-block@https://r2.cnpmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-dynamic-import@https://r2.cnpmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-export-namespace-from@https://r2.cnpmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0@@ -9788,12 +10733,12 @@ snapshots:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-import-meta@https://r2.cnpmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-json-strings@https://r2.cnpmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0@@ -9803,42 +10748,42 @@ snapshots:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-logical-assignment-operators@https://r2.cnpmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-nullish-coalescing-operator@https://r2.cnpmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-numeric-separator@https://r2.cnpmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-object-rest-spread@https://r2.cnpmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-optional-catch-binding@https://r2.cnpmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-optional-chaining@https://r2.cnpmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-private-property-in-object@https://r2.cnpmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/[email protected](@babel/[email protected])':+ '@babel/plugin-syntax-top-level-await@https://r2.cnpmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz(@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0@@ -9865,7 +10810,7 @@ snapshots:'@babel/helper-environment-visitor': 7.22.20'@babel/helper-plugin-utils': 7.24.0'@babel/helper-remap-async-to-generator': 7.22.20(@babel/[email protected])- '@babel/plugin-syntax-async-generators': 7.8.4(@babel/[email protected])+ '@babel/plugin-syntax-async-generators': https://r2.cnpmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -9895,7 +10840,7 @@ snapshots:'@babel/core': 7.24.3'@babel/helper-create-class-features-plugin': 7.24.1(@babel/[email protected])'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/[email protected])+ '@babel/plugin-syntax-class-static-block': https://r2.cnpmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -9907,7 +10852,7 @@ snapshots:'@babel/helper-plugin-utils': 7.24.0'@babel/helper-replace-supers': 7.24.1(@babel/[email protected])'@babel/helper-split-export-declaration': 7.22.6- globals: 11.12.0+ globals: https://r2.cnpmjs.org/globals/-/globals-11.12.0.tgz'@babel/[email protected](@babel/[email protected])':dependencies:@@ -9935,7 +10880,7 @@ snapshots:dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-dynamic-import': https://r2.cnpmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -9947,7 +10892,7 @@ snapshots:dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-export-namespace-from': https://r2.cnpmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -9972,7 +10917,7 @@ snapshots:dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-json-strings': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-json-strings': https://r2.cnpmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -9983,7 +10928,7 @@ snapshots:dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/[email protected])+ '@babel/plugin-syntax-logical-assignment-operators': https://r2.cnpmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -10032,20 +10977,20 @@ snapshots:dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-nullish-coalescing-operator': https://r2.cnpmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/[email protected])+ '@babel/plugin-syntax-numeric-separator': https://r2.cnpmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-compilation-targets': 7.23.6'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-object-rest-spread': https://r2.cnpmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz(@babel/[email protected])'@babel/plugin-transform-parameters': 7.24.1(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':@@ -10058,14 +11003,14 @@ snapshots:dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-optional-catch-binding': https://r2.cnpmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0'@babel/helper-skip-transparent-expression-wrappers': 7.22.5- '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-optional-chaining': https://r2.cnpmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -10084,7 +11029,7 @@ snapshots:'@babel/helper-annotate-as-pure': 7.22.5'@babel/helper-create-class-features-plugin': 7.24.1(@babel/[email protected])'@babel/helper-plugin-utils': 7.24.0- '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/[email protected])+ '@babel/plugin-syntax-private-property-in-object': https://r2.cnpmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz(@babel/[email protected])'@babel/[email protected](@babel/[email protected])':dependencies:@@ -10180,23 +11125,23 @@ snapshots:'@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.1(@babel/[email protected])'@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.24.1(@babel/[email protected])'@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/[email protected])- '@babel/plugin-syntax-async-generators': 7.8.4(@babel/[email protected])- '@babel/plugin-syntax-class-properties': 7.12.13(@babel/[email protected])- '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/[email protected])- '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/[email protected])- '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/[email protected])+ '@babel/plugin-syntax-async-generators': https://r2.cnpmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz(@babel/[email protected])+ '@babel/plugin-syntax-class-properties': https://r2.cnpmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz(@babel/[email protected])+ '@babel/plugin-syntax-class-static-block': https://r2.cnpmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz(@babel/[email protected])+ '@babel/plugin-syntax-dynamic-import': https://r2.cnpmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz(@babel/[email protected])+ '@babel/plugin-syntax-export-namespace-from': https://r2.cnpmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz(@babel/[email protected])'@babel/plugin-syntax-import-assertions': 7.24.1(@babel/[email protected])'@babel/plugin-syntax-import-attributes': 7.24.1(@babel/[email protected])- '@babel/plugin-syntax-import-meta': 7.10.4(@babel/[email protected])- '@babel/plugin-syntax-json-strings': 7.8.3(@babel/[email protected])- '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/[email protected])- '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/[email protected])- '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/[email protected])- '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/[email protected])- '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/[email protected])- '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/[email protected])- '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/[email protected])- '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/[email protected])+ '@babel/plugin-syntax-import-meta': https://r2.cnpmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz(@babel/[email protected])+ '@babel/plugin-syntax-json-strings': https://r2.cnpmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz(@babel/[email protected])+ '@babel/plugin-syntax-logical-assignment-operators': https://r2.cnpmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz(@babel/[email protected])+ '@babel/plugin-syntax-nullish-coalescing-operator': https://r2.cnpmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz(@babel/[email protected])+ '@babel/plugin-syntax-numeric-separator': https://r2.cnpmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz(@babel/[email protected])+ '@babel/plugin-syntax-object-rest-spread': https://r2.cnpmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz(@babel/[email protected])+ '@babel/plugin-syntax-optional-catch-binding': https://r2.cnpmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz(@babel/[email protected])+ '@babel/plugin-syntax-optional-chaining': https://r2.cnpmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz(@babel/[email protected])+ '@babel/plugin-syntax-private-property-in-object': https://r2.cnpmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz(@babel/[email protected])+ '@babel/plugin-syntax-top-level-await': https://r2.cnpmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz(@babel/[email protected])'@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/[email protected])'@babel/plugin-transform-arrow-functions': 7.24.1(@babel/[email protected])'@babel/plugin-transform-async-generator-functions': 7.24.3(@babel/[email protected])@@ -10267,7 +11212,7 @@ snapshots:'@babel/core': 7.24.3'@babel/helper-plugin-utils': 7.24.0'@babel/types': 7.24.0- esutils: 2.0.3+ esutils: https://r2.cnpmjs.org/esutils/-/esutils-2.0.3.tgz'@babel/[email protected](@babel/[email protected])':dependencies:@@ -10281,11 +11226,11 @@ snapshots:'@babel/[email protected](@babel/[email protected])':dependencies:'@babel/core': 7.24.3- clone-deep: 4.0.1- find-cache-dir: 2.1.0- make-dir: 2.1.0+ clone-deep: https://r2.cnpmjs.org/clone-deep/-/clone-deep-4.0.1.tgz+ find-cache-dir: https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz+ make-dir: https://r2.cnpmjs.org/make-dir/-/make-dir-2.1.0.tgzpirates: 4.0.6- source-map-support: 0.5.21+ source-map-support: https://r2.cnpmjs.org/source-map-support/-/source-map-support-0.5.21.tgz'@babel/[email protected]': {}@@ -10320,13 +11265,13 @@ snapshots:'@babel/helper-validator-identifier': 7.22.20to-fast-properties: 2.0.0- '@base2/[email protected]': {}+ '@base2/pretty-print-object@https://r2.cnpmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz': {}'@chromatic-com/[email protected]([email protected])':dependencies:chromatic: 11.3.0filesize: 10.1.1- jsonfile: 6.1.0+ jsonfile: https://r2.cnpmjs.org/jsonfile/-/jsonfile-6.1.0.tgzreact-confetti: 6.1.0([email protected])strip-ansi: 7.1.0transitivePeerDependencies:@@ -10336,14 +11281,14 @@ snapshots:'@clack/[email protected]':dependencies:- picocolors: 1.0.0- sisteransi: 1.0.5+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz+ sisteransi: https://r2.cnpmjs.org/sisteransi/-/sisteransi-1.0.5.tgz'@clack/[email protected]':dependencies:'@clack/core': 0.3.4- picocolors: 1.0.0- sisteransi: 1.0.5+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz+ sisteransi: https://r2.cnpmjs.org/sisteransi/-/sisteransi-1.0.5.tgz'@colors/[email protected]':optional: true@@ -10374,11 +11319,11 @@ snapshots:'@commitlint/[email protected]':dependencies:'@commitlint/types': 19.0.3- lodash.camelcase: 4.3.0- lodash.kebabcase: 4.1.1- lodash.snakecase: 4.1.1- lodash.startcase: 4.4.0- lodash.upperfirst: 4.3.1+ lodash.camelcase: https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz+ lodash.kebabcase: https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz+ lodash.snakecase: https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz+ lodash.startcase: https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz+ lodash.upperfirst: https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz'@commitlint/[email protected]': {}@@ -10408,9 +11353,9 @@ snapshots:chalk: 5.3.0cosmiconfig: 9.0.0([email protected])cosmiconfig-typescript-loader: 5.0.0(@types/[email protected])([email protected]([email protected]))([email protected])- lodash.isplainobject: 4.0.6- lodash.merge: 4.6.2- lodash.uniq: 4.5.0+ lodash.isplainobject: https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz+ lodash.merge: https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz+ lodash.uniq: https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgztransitivePeerDependencies:- '@types/node'- typescript@@ -10437,8 +11382,8 @@ snapshots:'@commitlint/types': 19.0.3global-directory: 4.0.1import-meta-resolve: 4.0.0- lodash.mergewith: 4.6.2- resolve-from: 5.0.0+ lodash.mergewith: https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz+ resolve-from: https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz'@commitlint/[email protected]':dependencies:@@ -10680,9 +11625,9 @@ snapshots:'@eslint/[email protected]': {}- '@fal-works/[email protected]': {}+ '@fal-works/esbuild-plugin-global-externals@https://r2.cnpmjs.org/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz': {}- '@grpc/[email protected]':+ '@grpc/[email protected]':dependencies:'@grpc/proto-loader': 0.7.12'@js-sdsl/ordered-map': 4.4.2@@ -10708,7 +11653,7 @@ snapshots:'@hutson/[email protected]': {}- '@iarna/[email protected]': {}+ '@iarna/toml@https://r2.cnpmjs.org/@iarna/toml/-/toml-2.2.5.tgz': {}'@img/[email protected]':optionalDependencies:@@ -10785,8 +11730,6 @@ snapshots:'@img/[email protected]':optional: true- '@inquirer/[email protected]': {}-'@isaacs/[email protected]':dependencies:string-width: 5.1.2@@ -10841,10 +11784,10 @@ snapshots:dependencies:call-bind: 1.0.7dependencies:'@types/mdx': 2.0.12- '@types/react': 18.3.1+ '@types/react': 18.2.79react: 18.2.0'@microsoft/[email protected](@types/[email protected])':@@ -10864,11 +11807,11 @@ snapshots:'@rushstack/rig-package': 0.5.2'@rushstack/terminal': 0.10.0(@types/[email protected])'@rushstack/ts-command-line': 4.19.1(@types/[email protected])- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzminimatch: 3.0.8resolve: 1.22.8semver: 7.5.4- source-map: 0.6.1+ source-map: https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgztypescript: 5.4.2transitivePeerDependencies:- '@types/node'@@ -10876,17 +11819,17 @@ snapshots:'@microsoft/[email protected]':dependencies:'@microsoft/tsdoc': 0.14.2- ajv: 6.12.6- jju: 1.4.0- resolve: 1.19.0+ ajv: https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz+ jju: https://r2.cnpmjs.org/jju/-/jju-1.4.0.tgz+ resolve: https://r2.cnpmjs.org/resolve/-/resolve-1.19.0.tgz'@microsoft/[email protected]': {}'@ndelangen/[email protected]':dependencies:- gunzip-maybe: 1.4.2- pump: 3.0.0- tar-fs: 2.1.1+ gunzip-maybe: https://r2.cnpmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz+ pump: https://r2.cnpmjs.org/pump/-/pump-3.0.0.tgz+ tar-fs: https://r2.cnpmjs.org/tar-fs/-/tar-fs-2.1.1.tgz'@nodelib/[email protected]':dependencies:@@ -10942,8 +11885,8 @@ snapshots:'@octokit/[email protected]':dependencies:'@octokit/types': 12.6.0- deprecation: 2.3.1- once: 1.4.0+ deprecation: https://r2.cnpmjs.org/deprecation/-/deprecation-2.3.1.tgz+ once: https://r2.cnpmjs.org/once/-/once-1.4.0.tgz'@octokit/[email protected]':dependencies:@@ -10982,7 +11925,7 @@ snapshots:dependencies:'@pnpm/config.env-replace': 1.1.0'@pnpm/network.ca-file': 1.0.2- config-chain: 1.1.13+ config-chain: https://r2.cnpmjs.org/config-chain/-/config-chain-1.1.13.tgz'@protobufjs/[email protected]': {}@@ -11007,20 +11950,20 @@ snapshots:'@protobufjs/[email protected]': {}dependencies:'@babel/runtime': 7.24.1react: 18.2.0optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.2.79dependencies:'@babel/runtime': 7.24.1- '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])react: 18.2.0optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.2.79dependencies:@@ -11071,83 +12014,86 @@ snapshots:'@react-dnd/[email protected]': {}dependencies:detect-indent: 6.1.0detect-newline: 3.1.0- release-it: 17.2.1([email protected])+ release-it: 17.2.0([email protected])semver: 7.6.0url-join: 4.0.1validate-peer-dependencies: 1.2.0walk-sync: 2.2.0yaml: 2.4.1dependencies:concat-stream: 2.0.0conventional-changelog: 5.1.0conventional-recommended-bump: 9.0.0- release-it: 17.2.1([email protected])+ release-it: 17.2.0([email protected])semver: 7.6.0- '@rollup/[email protected]([email protected])':+ '@rollup/[email protected]([email protected])':dependencies:'@types/estree': 1.0.5- estree-walker: 2.0.2+ estree-walker: https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgzpicomatch: 2.3.1optionalDependencies:- rollup: 4.13.2+ rollup: 4.16.4- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':optional: true- '@rollup/[email protected]':+ '@rollup/[email protected]':+ optional: true++ '@rollup/[email protected]':optional: true'@rushstack/[email protected](@types/[email protected])':dependencies:- fs-extra: 7.0.1- import-lazy: 4.0.0- jju: 1.4.0+ fs-extra: https://r2.cnpmjs.org/fs-extra/-/fs-extra-7.0.1.tgz+ import-lazy: https://r2.cnpmjs.org/import-lazy/-/import-lazy-4.0.0.tgz+ jju: https://r2.cnpmjs.org/jju/-/jju-1.4.0.tgzresolve: 1.22.8semver: 7.5.4z-schema: 5.0.5@@ -11157,20 +12103,20 @@ snapshots:'@rushstack/[email protected]':dependencies:resolve: 1.22.8- strip-json-comments: 3.1.1+ strip-json-comments: https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz'@rushstack/[email protected](@types/[email protected])':dependencies:'@rushstack/node-core-library': 4.0.2(@types/[email protected])- supports-color: 8.1.1+ supports-color: https://r2.cnpmjs.org/supports-color/-/supports-color-8.1.1.tgzoptionalDependencies:'@types/node': 20.12.7'@rushstack/[email protected](@types/[email protected])':dependencies:'@rushstack/terminal': 0.10.0(@types/[email protected])- '@types/argparse': 1.0.38- argparse: 1.0.10+ '@types/argparse': https://r2.cnpmjs.org/@types/argparse/-/argparse-1.0.38.tgz+ argparse: https://r2.cnpmjs.org/argparse/-/argparse-1.0.10.tgzstring-argv: 0.3.2transitivePeerDependencies:- '@types/node'@@ -11193,14 +12139,14 @@ snapshots:'@storybook/[email protected]':dependencies:'@storybook/global': 5.0.0- memoizerific: 1.11.3- ts-dedent: 2.2.0+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgz+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz- '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:- '@storybook/blocks': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])- lodash: 4.17.21- ts-dedent: 2.2.0+ '@storybook/blocks': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- '@types/react'- encoding@@ -11211,10 +12157,10 @@ snapshots:'@storybook/[email protected]':dependencies:'@babel/core': 7.24.3- '@mdx-js/react': 3.0.1(@types/[email protected])([email protected])- '@storybook/blocks': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])+ '@mdx-js/react': 3.0.1(@types/[email protected])([email protected])+ '@storybook/blocks': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])'@storybook/client-logger': 8.0.9- '@storybook/components': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])+ '@storybook/components': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])'@storybook/csf-plugin': 8.0.9'@storybook/csf-tools': 8.0.9'@storybook/global': 5.0.0@@ -11223,22 +12169,22 @@ snapshots:'@storybook/types': 8.0.9- '@types/react': 18.3.1+ '@types/react': 18.2.79fs-extra: 11.2.0react: 18.2.0react-dom: 18.2.0([email protected])rehype-external-links: 3.0.0rehype-slug: 6.0.0- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- encoding- supports-color- '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@storybook/addon-actions': 8.0.9'@storybook/addon-backgrounds': 8.0.9- '@storybook/addon-controls': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])+ '@storybook/addon-controls': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])'@storybook/addon-docs': 8.0.9'@storybook/addon-highlight': 8.0.9'@storybook/addon-measure': 8.0.9@@ -11249,7 +12195,7 @@ snapshots:'@storybook/node-logger': 8.0.9'@storybook/preview-api': 8.0.9- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- '@types/react'- encoding@@ -11268,7 +12214,7 @@ snapshots:'@storybook/test': 8.0.9([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))'@storybook/types': 8.0.9polished: 4.3.1- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- '@jest/globals'- '@types/bun'@@ -11278,9 +12224,9 @@ snapshots:'@storybook/[email protected]([email protected])':dependencies:- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/global': 5.0.0- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgzoptionalDependencies:react: 18.2.0@@ -11292,7 +12238,7 @@ snapshots:'@storybook/[email protected]':dependencies:'@storybook/global': 5.0.0- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgzdependencies:@@ -11303,7 +12249,7 @@ snapshots:'@storybook/[email protected]':dependencies:- memoizerific: 1.11.3+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgzdependencies:@@ -11313,13 +12259,13 @@ snapshots:- '@swc/helpers'- webpack- '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@storybook/channels': 8.0.9'@storybook/client-logger': 8.0.9- '@storybook/components': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])+ '@storybook/components': 8.0.9(@types/[email protected])([email protected]([email protected]))([email protected])'@storybook/core-events': 8.0.9- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/docs-tools': 8.0.9'@storybook/global': 5.0.0@@ -11328,17 +12274,17 @@ snapshots:'@storybook/types': 8.0.9'@types/lodash': 4.17.0- color-convert: 2.0.1+ color-convert: https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgzdequal: 2.0.3- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzmarkdown-to-jsx: 7.3.2([email protected])- memoizerific: 1.11.3+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgzpolished: 4.3.1telejson: 7.2.0tocbot: 4.25.0- ts-dedent: 2.2.0- util-deprecate: 1.0.2+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz+ util-deprecate: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgzoptionalDependencies:react: 18.2.0react-dom: 18.2.0([email protected])@@ -11349,19 +12295,19 @@ snapshots:'@storybook/[email protected]':dependencies:- '@fal-works/esbuild-plugin-global-externals': 2.1.2+ '@fal-works/esbuild-plugin-global-externals': https://r2.cnpmjs.org/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz'@storybook/core-common': 8.0.9'@storybook/manager': 8.0.9'@storybook/node-logger': 8.0.9'@types/ejs': 3.1.5'@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15([email protected])- browser-assert: 1.2.1+ browser-assert: https://r2.cnpmjs.org/browser-assert/-/browser-assert-1.2.1.tgzejs: 3.1.9esbuild: 0.20.2- esbuild-plugin-alias: 0.2.1+ esbuild-plugin-alias: https://r2.cnpmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgzexpress: 4.19.2fs-extra: 11.2.0- process: 0.11.10+ process: https://r2.cnpmjs.org/process/-/process-0.11.10.tgzutil: 0.12.5transitivePeerDependencies:- encoding@@ -11379,26 +12325,26 @@ snapshots:'@storybook/preview-api': 8.0.9'@types/node': 18.19.28'@types/semver': 7.5.8- browser-assert: 1.2.1- case-sensitive-paths-webpack-plugin: 2.4.0+ browser-assert: https://r2.cnpmjs.org/browser-assert/-/browser-assert-1.2.1.tgz+ case-sensitive-paths-webpack-plugin: https://r2.cnpmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgzcjs-module-lexer: 1.2.3- constants-browserify: 1.0.0+ constants-browserify: https://r2.cnpmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgzes-module-lexer: 1.5.0express: 4.19.2fork-ts-checker-webpack-plugin: 8.0.0([email protected])([email protected](@swc/[email protected])([email protected]))fs-extra: 11.2.0- magic-string: 0.30.8- path-browserify: 1.0.1- process: 0.11.10+ magic-string: 0.30.10+ path-browserify: https://r2.cnpmjs.org/path-browserify/-/path-browserify-1.0.1.tgz+ process: https://r2.cnpmjs.org/process/-/process-0.11.10.tgzsemver: 7.6.0terser-webpack-plugin: 5.3.10(@swc/[email protected])([email protected])([email protected](@swc/[email protected])([email protected]))- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgzurl: 0.11.3util: 0.12.5- util-deprecate: 1.0.2+ util-deprecate: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgzwebpack: 5.91.0(@swc/[email protected])([email protected])webpack-hot-middleware: 2.26.1@@ -11438,28 +12384,28 @@ snapshots:'@types/semver': 7.5.8'@yarnpkg/fslib': 2.10.3'@yarnpkg/libzip': 2.3.0- chalk: 4.1.2- commander: 6.2.1- cross-spawn: 7.0.3- detect-indent: 6.1.0+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz+ commander: https://r2.cnpmjs.org/commander/-/commander-6.2.1.tgz+ cross-spawn: https://r2.cnpmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz+ detect-indent: https://r2.cnpmjs.org/detect-indent/-/detect-indent-6.1.0.tgzenvinfo: 7.11.1- execa: 5.1.1- find-up: 5.0.0+ execa: https://r2.cnpmjs.org/execa/-/execa-5.1.1.tgz+ find-up: https://r2.cnpmjs.org/find-up/-/find-up-5.0.0.tgzfs-extra: 11.2.0get-npm-tarball-url: 2.1.0giget: 1.2.3globby: 11.1.0jscodeshift: 0.15.2(@babel/[email protected](@babel/[email protected]))- leven: 3.1.0- ora: 5.4.1+ leven: https://r2.cnpmjs.org/leven/-/leven-3.1.0.tgz+ ora: https://r2.cnpmjs.org/ora/-/ora-5.4.1.tgzprettier: 3.2.5- prompts: 2.4.2- read-pkg-up: 7.0.1+ prompts: https://r2.cnpmjs.org/prompts/-/prompts-2.4.2.tgz+ read-pkg-up: https://r2.cnpmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgzsemver: 7.6.0- strip-json-comments: 3.1.1- tempy: 1.0.1+ strip-json-comments: https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz+ tempy: https://r2.cnpmjs.org/tempy/-/tempy-1.0.1.tgztiny-invariant: 1.3.3- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- '@babel/preset-env'- bufferutil@@ -11478,34 +12424,34 @@ snapshots:'@babel/core': 7.24.3'@babel/preset-env': 7.24.3(@babel/[email protected])'@babel/types': 7.24.0- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/csf-tools': 8.0.9'@storybook/node-logger': 8.0.9'@storybook/types': 8.0.9'@types/cross-spawn': 6.0.6- cross-spawn: 7.0.3+ cross-spawn: https://r2.cnpmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgzglobby: 11.1.0jscodeshift: 0.15.2(@babel/[email protected](@babel/[email protected]))- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzprettier: 3.2.5recast: 0.23.6tiny-invariant: 1.3.3transitivePeerDependencies:- supports-color- '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@storybook/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:- '@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])+ '@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])'@storybook/client-logger': 8.0.9- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/global': 5.0.0'@storybook/types': 8.0.9- memoizerific: 1.11.3+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgzreact: 18.2.0react-dom: 18.2.0([email protected])- util-deprecate: 1.0.2+ util-deprecate: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgztransitivePeerDependencies:- '@types/react'@@ -11517,27 +12463,27 @@ snapshots:'@storybook/types': 8.0.9'@yarnpkg/fslib': 2.10.3'@yarnpkg/libzip': 2.3.0- chalk: 4.1.2- cross-spawn: 7.0.3+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz+ cross-spawn: https://r2.cnpmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgzesbuild: 0.20.2esbuild-register: 3.5.0([email protected])- execa: 5.1.1+ execa: https://r2.cnpmjs.org/execa/-/execa-5.1.1.tgzfile-system-cache: 2.3.0- find-cache-dir: 3.3.2- find-up: 5.0.0+ find-cache-dir: https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz+ find-up: https://r2.cnpmjs.org/find-up/-/find-up-5.0.0.tgzfs-extra: 11.2.0glob: 10.3.12handlebars: 4.7.8lazy-universal-dotenv: 4.0.0node-fetch: 2.7.0picomatch: 2.3.1- pkg-dir: 5.0.0- pretty-hrtime: 1.0.3- resolve-from: 5.0.0+ pkg-dir: https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz+ pretty-hrtime: https://r2.cnpmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz+ resolve-from: https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgzsemver: 7.6.0- tempy: 1.0.1+ tempy: https://r2.cnpmjs.org/tempy/-/tempy-1.0.1.tgztiny-invariant: 1.3.3- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgzutil: 0.12.5transitivePeerDependencies:- encoding@@ -11545,7 +12491,7 @@ snapshots:'@storybook/[email protected]':dependencies:- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgzdependencies:@@ -11556,7 +12502,7 @@ snapshots:'@storybook/channels': 8.0.9'@storybook/core-common': 8.0.9'@storybook/core-events': 8.0.9- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/csf-tools': 8.0.9'@storybook/docs-mdx': 3.0.0'@storybook/global': 5.0.0@@ -11571,7 +12517,7 @@ snapshots:'@types/pretty-hrtime': 1.0.3'@types/semver': 7.5.8better-opn: 3.0.2- chalk: 4.1.2+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgzcli-table3: 0.6.4compression: 1.7.4detect-port: 1.5.1@@ -11579,17 +12525,17 @@ snapshots:fs-extra: 11.2.0globby: 11.1.0ip: 2.0.1- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzopen: 8.4.2- pretty-hrtime: 1.0.3- prompts: 2.4.2- read-pkg-up: 7.0.1+ pretty-hrtime: https://r2.cnpmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz+ prompts: https://r2.cnpmjs.org/prompts/-/prompts-2.4.2.tgz+ read-pkg-up: https://r2.cnpmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgzsemver: 7.6.0telejson: 7.2.0tiny-invariant: 1.3.3- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgzutil: 0.12.5- util-deprecate: 1.0.2+ util-deprecate: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgzwatchpack: 2.4.1ws: 8.16.0transitivePeerDependencies:@@ -11606,7 +12552,7 @@ snapshots:'@storybook/node-logger': 8.0.9'@storybook/types': 8.0.9'@types/node': 18.19.28- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- encoding- supports-color@@ -11621,18 +12567,18 @@ snapshots:'@storybook/[email protected]':dependencies:'@babel/generator': 7.24.1- '@babel/parser': 7.24.1+ '@babel/parser': 7.24.4'@babel/traverse': 7.24.1'@babel/types': 7.24.0- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/types': 8.0.9fs-extra: 11.2.0recast: 0.23.6- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- supports-color- '@storybook/[email protected]':+ '@storybook/[email protected]':dependencies:type-fest: 2.19.0@@ -11644,10 +12590,10 @@ snapshots:'@storybook/core-events': 8.0.9'@storybook/preview-api': 8.0.9'@storybook/types': 8.0.9- '@types/doctrine': 0.0.3+ '@types/doctrine': https://r2.cnpmjs.org/@types/doctrine/-/doctrine-0.0.3.tgzassert: 2.1.0- doctrine: 3.0.0- lodash: 4.17.21+ doctrine: https://r2.cnpmjs.org/doctrine/-/doctrine-3.0.0.tgz+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgztransitivePeerDependencies:- encoding- supports-color@@ -11666,7 +12612,7 @@ snapshots:'@storybook/core-events': 8.0.9'@storybook/global': 5.0.0'@storybook/preview-api': 8.0.9- '@vitest/utils': 1.4.0+ '@vitest/utils': 1.5.0util: 0.12.5@@ -11674,18 +12620,18 @@ snapshots:'@storybook/channels': 8.0.9'@storybook/client-logger': 8.0.9'@storybook/core-events': 8.0.9- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/global': 5.0.0'@storybook/router': 8.0.9'@storybook/types': 8.0.9dequal: 2.0.3- lodash: 4.17.21- memoizerific: 1.11.3+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgzstore2: 2.14.3telejson: 7.2.0- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztransitivePeerDependencies:- react- react-dom@@ -11705,9 +12651,9 @@ snapshots:'@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0([email protected])([email protected](@swc/[email protected])([email protected]))'@types/node': 18.19.28'@types/semver': 7.5.8- find-up: 5.0.0+ find-up: https://r2.cnpmjs.org/find-up/-/find-up-5.0.0.tgzfs-extra: 11.2.0- magic-string: 0.30.8+ magic-string: 0.30.10react: 18.2.0react-docgen: 7.0.3react-dom: 18.2.0([email protected])@@ -11730,28 +12676,28 @@ snapshots:'@storybook/channels': 8.0.9'@storybook/client-logger': 8.0.9'@storybook/core-events': 8.0.9- '@storybook/csf': 0.1.5+ '@storybook/csf': 0.1.4'@storybook/global': 5.0.0'@storybook/types': 8.0.9'@types/qs': 6.9.14dequal: 2.0.3- lodash: 4.17.21- memoizerific: 1.11.3+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgzqs: 6.12.0tiny-invariant: 1.3.3- ts-dedent: 2.2.0- util-deprecate: 1.0.2+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz+ util-deprecate: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz'@storybook/[email protected]': {}'@storybook/[email protected]([email protected])([email protected](@swc/[email protected])([email protected]))':dependencies:debug: 4.3.4- endent: 2.1.0- find-cache-dir: 3.3.2+ endent: https://r2.cnpmjs.org/endent/-/endent-2.1.0.tgz+ find-cache-dir: https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgzflat-cache: 3.2.0micromatch: 4.0.5- react-docgen-typescript: 2.2.2([email protected])+ react-docgen-typescript: https://r2.cnpmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz([email protected])tslib: 2.6.2typescript: 5.4.5webpack: 5.91.0(@swc/[email protected])([email protected])@@ -11790,23 +12736,23 @@ snapshots:'@storybook/preview-api': 8.0.9'@storybook/types': 8.0.9- '@types/escodegen': 0.0.6+ '@types/escodegen': https://r2.cnpmjs.org/@types/escodegen/-/escodegen-0.0.6.tgz'@types/estree': 0.0.51'@types/node': 18.19.28- acorn: 7.4.1- acorn-jsx: 5.3.2([email protected])- acorn-walk: 7.2.0+ acorn: https://r2.cnpmjs.org/acorn/-/acorn-7.4.1.tgz+ acorn-jsx: https://r2.cnpmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz(acorn@https://r2.cnpmjs.org/acorn/-/acorn-7.4.1.tgz)+ acorn-walk: https://r2.cnpmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgzescodegen: 2.1.0html-tags: 3.3.1- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzprop-types: 15.8.1react: 18.2.0react-dom: 18.2.0([email protected])semver: 7.6.0- ts-dedent: 2.2.0+ ts-dedent: https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgztype-fest: 2.19.0- util-deprecate: 1.0.2+ util-deprecate: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgzoptionalDependencies:typescript: 5.4.5transitivePeerDependencies:@@ -11816,7 +12762,7 @@ snapshots:'@storybook/[email protected]':dependencies:'@storybook/client-logger': 8.0.9- memoizerific: 1.11.3+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgzqs: 6.12.0'@storybook/[email protected]':@@ -11824,11 +12770,11 @@ snapshots:'@storybook/client-logger': 8.0.9'@storybook/core-common': 8.0.9'@storybook/csf-tools': 8.0.9- chalk: 4.1.2- detect-package-manager: 2.0.1+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz+ detect-package-manager: https://r2.cnpmjs.org/detect-package-manager/-/detect-package-manager-2.0.1.tgzfetch-retry: 5.0.6fs-extra: 11.2.0- read-pkg-up: 7.0.1+ read-pkg-up: https://r2.cnpmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgztransitivePeerDependencies:- encoding- supports-color@@ -11843,7 +12789,7 @@ snapshots:'@testing-library/jest-dom': 6.4.2([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))'@testing-library/user-event': 14.5.2(@testing-library/[email protected])'@vitest/expect': 1.3.1- '@vitest/spy': 1.4.0+ '@vitest/spy': 1.5.0util: 0.12.5transitivePeerDependencies:- '@jest/globals'@@ -11857,7 +12803,7 @@ snapshots:'@emotion/use-insertion-effect-with-fallbacks': 1.0.1([email protected])'@storybook/client-logger': 8.0.9'@storybook/global': 5.0.0- memoizerific: 1.11.3+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgzoptionalDependencies:react: 18.2.0react-dom: 18.2.0([email protected])@@ -11872,7 +12818,7 @@ snapshots:dependencies:'@types/eslint': 8.56.10acorn: 8.11.3- escape-string-regexp: 4.0.0+ escape-string-regexp: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgzeslint: 8.57.0eslint-visitor-keys: 3.4.3espree: 9.6.1@@ -11882,7 +12828,7 @@ snapshots:'@stylistic/eslint-plugin-js': 1.7.2([email protected])'@types/eslint': 8.56.10eslint: 8.57.0- estraverse: 5.3.0+ estraverse: https://r2.cnpmjs.org/estraverse/-/estraverse-5.3.0.tgzpicomatch: 4.0.2@@ -11968,9 +12914,9 @@ snapshots:dependencies:'@swc/counter': 0.1.3- '@szmarczak/[email protected]':+ '@szmarczak/http-timer@https://r2.cnpmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz':dependencies:- defer-to-connect: 2.0.1+ defer-to-connect: https://r2.cnpmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz'@testing-library/[email protected]':dependencies:@@ -11978,7 +12924,7 @@ snapshots:'@babel/runtime': 7.24.1'@types/aria-query': 5.0.4aria-query: 5.1.3- chalk: 4.1.2+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgzdom-accessibility-api: 0.5.16lz-string: 1.5.0pretty-format: 27.5.1@@ -11988,28 +12934,28 @@ snapshots:'@adobe/css-tools': 4.3.3'@babel/runtime': 7.24.1aria-query: 5.3.0- chalk: 3.0.0- css.escape: 1.5.1+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-3.0.0.tgz+ css.escape: https://r2.cnpmjs.org/css.escape/-/css.escape-1.5.1.tgzdom-accessibility-api: 0.6.3- lodash: 4.17.21- redent: 3.0.0+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ redent: https://r2.cnpmjs.org/redent/-/redent-3.0.0.tgzoptionalDependencies:vitest: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])- '@testing-library/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':+ '@testing-library/[email protected](@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@babel/runtime': 7.24.1react: 18.2.0react-error-boundary: 3.1.4([email protected])optionalDependencies:- '@types/react': 18.3.1+ '@types/react': 18.2.79react-dom: 18.2.0([email protected])dependencies:'@babel/runtime': 7.24.1'@testing-library/dom': 9.3.4- '@types/react-dom': 18.3.0+ '@types/react-dom': 18.2.25react: 18.2.0react-dom: 18.2.0([email protected])@@ -12019,7 +12965,7 @@ snapshots:'@tootallnate/[email protected]': {}- '@types/[email protected]': {}+ '@types/argparse@https://r2.cnpmjs.org/@types/argparse/-/argparse-1.0.38.tgz': {}'@types/[email protected]': {}@@ -12065,15 +13011,15 @@ snapshots:'@types/[email protected]': {}- '@types/[email protected]': {}-'@types/[email protected]': {}+ '@types/doctrine@https://r2.cnpmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz': {}+'@types/[email protected]': {}'@types/[email protected]': {}- '@types/[email protected]': {}+ '@types/escodegen@https://r2.cnpmjs.org/@types/escodegen/-/escodegen-0.0.6.tgz': {}'@types/[email protected]':dependencies:@@ -12112,7 +13058,7 @@ snapshots:dependencies:'@types/unist': 3.0.2- '@types/[email protected]': {}+ '@types/html-minifier-terser@https://r2.cnpmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz': {}'@types/[email protected]': {}@@ -12170,19 +13116,19 @@ snapshots:'@types/[email protected]': {}- '@types/[email protected]':+ '@types/[email protected]':dependencies:- '@types/react': 18.3.1+ '@types/react': 18.2.79'@types/[email protected]':dependencies:- '@types/react': 18.3.1+ '@types/react': 18.2.79'@types/[email protected]':dependencies:- '@types/react': 18.3.1+ '@types/react': 18.2.79- '@types/[email protected]':+ '@types/[email protected]':dependencies:'@types/prop-types': 15.7.12csstype: 3.1.3@@ -12230,7 +13176,7 @@ snapshots:eslint: 8.57.0graphemer: 1.4.0ignore: 5.3.1- natural-compare: 1.4.0+ natural-compare: https://r2.cnpmjs.org/natural-compare/-/natural-compare-1.4.0.tgzsemver: 7.6.0ts-api-utils: 1.3.0([email protected])optionalDependencies:@@ -12309,7 +13255,7 @@ snapshots:'@typescript-eslint/visitor-keys': 6.21.0debug: 4.3.4globby: 11.1.0- is-glob: 4.0.3+ is-glob: https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgzminimatch: 9.0.3semver: 7.6.0ts-api-utils: 1.3.0([email protected])@@ -12324,7 +13270,7 @@ snapshots:'@typescript-eslint/visitor-keys': 7.6.0debug: 4.3.4globby: 11.1.0- is-glob: 4.0.3+ is-glob: https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgzminimatch: 9.0.4semver: 7.6.0ts-api-utils: 1.3.0([email protected])@@ -12339,7 +13285,7 @@ snapshots:'@typescript-eslint/visitor-keys': 7.7.0debug: 4.3.4globby: 11.1.0- is-glob: 4.0.3+ is-glob: https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgzminimatch: 9.0.4semver: 7.6.0ts-api-utils: 1.3.0([email protected])@@ -12354,7 +13300,7 @@ snapshots:'@typescript-eslint/visitor-keys': 7.7.1debug: 4.3.4globby: 11.1.0- is-glob: 4.0.3+ is-glob: https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgzminimatch: 9.0.4semver: 7.6.0ts-api-utils: 1.3.0([email protected])@@ -12448,9 +13394,9 @@ snapshots:react: 18.2.0react-dom: 18.2.0([email protected])dependencies:- '@grpc/grpc-js': 1.10.4+ '@grpc/grpc-js': 1.10.6rxjs: 7.8.1'@vitejs/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected]))':@@ -12464,7 +13410,7 @@ snapshots:transitivePeerDependencies:- supports-color- '@vitest/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))':+ '@vitest/[email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))':dependencies:debug: 4.3.4istanbul-lib-coverage: 3.2.2@@ -12485,21 +13431,39 @@ snapshots:'@vitest/utils': 1.3.1chai: 4.4.1+ '@vitest/[email protected]':+ dependencies:+ '@vitest/spy': 1.5.0+ '@vitest/utils': 1.5.0+ chai: 4.4.1+'@vitest/[email protected]':dependencies:'@vitest/spy': 1.5.2'@vitest/utils': 1.5.2chai: 4.4.1+ '@vitest/[email protected]':+ dependencies:+ '@vitest/utils': 1.5.0+ p-limit: 5.0.0+ pathe: 1.1.2+'@vitest/[email protected]':dependencies:'@vitest/utils': 1.5.2p-limit: 5.0.0pathe: 1.1.2+ '@vitest/[email protected]':+ dependencies:+ magic-string: 0.30.10+ pathe: 1.1.2+ pretty-format: 29.7.0+'@vitest/[email protected]':dependencies:- magic-string: 0.30.8+ magic-string: 0.30.10pathe: 1.1.2pretty-format: 29.7.0@@ -12507,7 +13471,7 @@ snapshots:dependencies:tinyspy: 2.2.1- '@vitest/[email protected]':+ '@vitest/[email protected]':dependencies:tinyspy: 2.2.1@@ -12522,7 +13486,7 @@ snapshots:loupe: 2.3.7pretty-format: 29.7.0- '@vitest/[email protected]':+ '@vitest/[email protected]':dependencies:diff-sequences: 29.6.3estree-walker: 3.0.3@@ -12547,7 +13511,7 @@ snapshots:'@volar/[email protected]':dependencies:'@volar/language-core': 1.11.1- path-browserify: 1.0.1+ path-browserify: https://r2.cnpmjs.org/path-browserify/-/path-browserify-1.0.1.tgz'@vue/[email protected]':dependencies:@@ -12557,11 +13521,24 @@ snapshots:estree-walker: 2.0.2source-map-js: 1.2.0+ '@vue/[email protected]':+ dependencies:+ '@babel/parser': 7.24.4+ '@vue/shared': 3.4.24+ entities: 4.5.0+ estree-walker: https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz+ source-map-js: 1.2.0+'@vue/[email protected]':dependencies:'@vue/compiler-core': 3.4.21'@vue/shared': 3.4.21+ '@vue/[email protected]':+ dependencies:+ '@vue/compiler-core': 3.4.24+ '@vue/shared': 3.4.24+'@vue/[email protected]':dependencies:'@babel/parser': 7.24.1@@ -12574,21 +13551,38 @@ snapshots:postcss: 8.4.38source-map-js: 1.2.0+ '@vue/[email protected]':+ dependencies:+ '@babel/parser': 7.24.4+ '@vue/compiler-core': 3.4.24+ '@vue/compiler-dom': 3.4.24+ '@vue/compiler-ssr': 3.4.24+ '@vue/shared': 3.4.24+ estree-walker: https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz+ magic-string: 0.30.10+ postcss: 8.4.38+ source-map-js: 1.2.0+'@vue/[email protected]':dependencies:'@vue/compiler-dom': 3.4.21'@vue/shared': 3.4.21+ '@vue/[email protected]':+ dependencies:+ '@vue/compiler-dom': 3.4.24+ '@vue/shared': 3.4.24+'@vue/[email protected]([email protected])':dependencies:'@volar/language-core': 1.11.1'@volar/source-map': 1.11.1- '@vue/compiler-dom': 3.4.21- '@vue/shared': 3.4.21+ '@vue/compiler-dom': 3.4.24+ '@vue/shared': 3.4.24computeds: 0.0.1minimatch: 9.0.4muggle-string: 0.3.1- path-browserify: 1.0.1+ path-browserify: https://r2.cnpmjs.org/path-browserify/-/path-browserify-1.0.1.tgzvue-template-compiler: 2.7.16optionalDependencies:typescript: 5.4.5@@ -12597,25 +13591,52 @@ snapshots:dependencies:'@vue/shared': 3.4.21+ '@vue/[email protected]':+ dependencies:+ '@vue/shared': 3.4.24+ optional: true+'@vue/[email protected]':dependencies:'@vue/reactivity': 3.4.21'@vue/shared': 3.4.21+ '@vue/[email protected]':+ dependencies:+ '@vue/reactivity': 3.4.24+ '@vue/shared': 3.4.24+ optional: true+'@vue/[email protected]':dependencies:'@vue/runtime-core': 3.4.21'@vue/shared': 3.4.21csstype: 3.1.3+ '@vue/[email protected]':+ dependencies:+ '@vue/runtime-core': 3.4.24+ '@vue/shared': 3.4.24+ csstype: 3.1.3+ optional: true+dependencies:'@vue/compiler-ssr': 3.4.21'@vue/shared': 3.4.21vue: 3.4.21([email protected])+ dependencies:+ '@vue/compiler-ssr': 3.4.24+ '@vue/shared': 3.4.24+ vue: 3.4.24([email protected])+ optional: true+'@vue/[email protected]': {}+ '@vue/[email protected]': {}+'@webassemblyjs/[email protected]':dependencies:'@webassemblyjs/helper-numbers': 1.11.6@@ -12631,7 +13652,7 @@ snapshots:dependencies:'@webassemblyjs/floating-point-hex-parser': 1.11.6'@webassemblyjs/helper-api-error': 1.11.6- '@xtuc/long': 4.2.2+ '@xtuc/long': https://r2.cnpmjs.org/@xtuc/long/-/long-4.2.2.tgz'@webassemblyjs/[email protected]': {}@@ -12644,11 +13665,11 @@ snapshots:'@webassemblyjs/[email protected]':dependencies:- '@xtuc/ieee754': 1.2.0+ '@xtuc/ieee754': https://r2.cnpmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz'@webassemblyjs/[email protected]':dependencies:- '@xtuc/long': 4.2.2+ '@xtuc/long': https://r2.cnpmjs.org/@xtuc/long/-/long-4.2.2.tgz'@webassemblyjs/[email protected]': {}@@ -12690,13 +13711,13 @@ snapshots:'@webassemblyjs/[email protected]':dependencies:'@webassemblyjs/ast': 1.12.1- '@xtuc/long': 4.2.2+ '@xtuc/long': https://r2.cnpmjs.org/@xtuc/long/-/long-4.2.2.tgz'@wendellhu/[email protected]': {}- '@xtuc/[email protected]': {}+ '@xtuc/ieee754@https://r2.cnpmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz': {}- '@xtuc/[email protected]': {}+ '@xtuc/long@https://r2.cnpmjs.org/@xtuc/long/-/long-4.2.2.tgz': {}'@yarnpkg/[email protected]([email protected])':dependencies:@@ -12729,24 +13750,24 @@ snapshots:dependencies:acorn: 8.11.3- dependencies:- acorn: 7.4.1-dependencies:acorn: 8.11.3- [email protected]: {}+ acorn-jsx@https://r2.cnpmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz(acorn@https://r2.cnpmjs.org/acorn/-/acorn-7.4.1.tgz):+ dependencies:+ acorn: https://r2.cnpmjs.org/acorn/-/acorn-7.4.1.tgz- [email protected]: {}+ acorn-walk@https://r2.cnpmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz: {}+ acorn@https://r2.cnpmjs.org/acorn/-/acorn-7.4.1.tgz: {}+@@ -12762,18 +13783,18 @@ snapshots:clean-stack: 2.2.0indent-string: 4.0.0+ ajv-formats@https://r2.cnpmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz([email protected]):optionalDependencies:ajv: 8.12.0+ ajv-keywords@https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz(ajv@https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz):dependencies:- ajv: 6.12.6+ ajv: https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz+ ajv-keywords@https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz([email protected]):dependencies:ajv: 8.12.0- fast-deep-equal: 3.1.3+ fast-deep-equal: https://r2.cnpmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgzdependencies:@@ -12789,22 +13810,35 @@ snapshots:require-from-string: 2.0.2uri-js: 4.4.1+ ajv@https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz:+ dependencies:+ fast-deep-equal: https://r2.cnpmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz+ fast-json-stable-stringify: https://r2.cnpmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz+ json-schema-traverse: https://r2.cnpmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz+ uri-js: https://r2.cnpmjs.org/uri-js/-/uri-js-4.4.1.tgz+dependencies:string-width: 4.2.3+ ansi-align@https://r2.cnpmjs.org/ansi-align/-/ansi-align-3.0.1.tgz:dependencies:- type-fest: 0.21.3+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz- [email protected]: {}+ ansi-escapes@https://r2.cnpmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz:+ dependencies:+ type-fest: https://r2.cnpmjs.org/type-fest/-/type-fest-0.21.3.tgz++ ansi-html-community@https://r2.cnpmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz: {}+ ansi-regex@https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz: {}+dependencies:color-convert: 1.9.3@@ -12817,12 +13851,18 @@ snapshots:+ ansi-styles@https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz:+ dependencies:+ color-convert: https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz++ ansi-styles@https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz: {}+dependencies:normalize-path: 3.0.0picomatch: 2.3.1- [email protected]: {}+ app-root-dir@https://r2.cnpmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz: {}@@ -12830,11 +13870,13 @@ snapshots:+ [email protected]: {}++ argparse@https://r2.cnpmjs.org/argparse/-/argparse-1.0.10.tgz:dependencies:- sprintf-js: 1.0.3+ sprintf-js: https://r2.cnpmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz- [email protected]: {}+ argparse@https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz: {}dependencies:@@ -12851,7 +13893,7 @@ snapshots:- [email protected]: {}+ array-flatten@https://r2.cnpmjs.org/array-flatten/-/array-flatten-1.1.1.tgz: {}@@ -12894,9 +13936,9 @@ snapshots:call-bind: 1.0.7define-properties: 1.2.1es-abstract: 1.23.3- es-array-method-boxes-properly: 1.0.0+ es-array-method-boxes-properly: https://r2.cnpmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgzes-object-atoms: 1.0.0- is-string: 1.0.7+ is-string: https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgzdependencies:@@ -12936,24 +13978,24 @@ snapshots:dependencies:call-bind: 1.0.7- is-nan: 1.3.2+ is-nan: https://r2.cnpmjs.org/is-nan/-/is-nan-1.3.2.tgzobject-is: 1.1.6object.assign: 4.1.5util: 0.12.5dependencies:tslib: 2.6.2+ ast-types@https://r2.cnpmjs.org/ast-types/-/ast-types-0.13.4.tgz:dependencies:tslib: 2.6.2+ async-retry@https://r2.cnpmjs.org/async-retry/-/async-retry-1.3.3.tgz:dependencies:- retry: 0.13.1+ retry: https://r2.cnpmjs.org/retry/-/retry-0.13.1.tgz@@ -12963,7 +14005,7 @@ snapshots:dependencies:possible-typed-array-names: 1.0.0- [email protected](@babel/[email protected]):+ babel-core@https://r2.cnpmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz(@babel/[email protected]):dependencies:'@babel/core': 7.24.3@@ -12993,6 +14035,8 @@ snapshots:+ balanced-match@https://r2.cnpmjs.org/balanced-match/-/balanced-match-1.0.2.tgz: {}+@@ -13009,30 +14053,30 @@ snapshots:+ bl@https://r2.cnpmjs.org/bl/-/bl-4.1.0.tgz:dependencies:buffer: 5.7.1- inherits: 2.0.4+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgzreadable-stream: 3.6.2dependencies:bytes: 3.1.2content-type: 1.0.5- debug: 2.6.9- depd: 2.0.0+ debug: https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgz+ depd: https://r2.cnpmjs.org/depd/-/depd-2.0.0.tgzdestroy: 1.2.0- http-errors: 2.0.0- iconv-lite: 0.4.24+ http-errors: https://r2.cnpmjs.org/http-errors/-/http-errors-2.0.0.tgz+ iconv-lite: https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgzon-finished: 2.4.1qs: 6.11.0raw-body: 2.5.2- type-is: 1.6.18- unpipe: 1.0.0+ type-is: https://r2.cnpmjs.org/type-is/-/type-is-1.6.18.tgz+ unpipe: https://r2.cnpmjs.org/unpipe/-/unpipe-1.0.0.tgztransitivePeerDependencies:- supports-color- [email protected]: {}+ boolbase@https://r2.cnpmjs.org/boolbase/-/boolbase-1.0.0.tgz: {}dependencies:@@ -13047,16 +14091,16 @@ snapshots:dependencies:- ansi-align: 3.0.1+ ansi-align: https://r2.cnpmjs.org/ansi-align/-/ansi-align-3.0.1.tgzcamelcase: 7.0.1chalk: 5.3.0- cli-boxes: 3.0.0+ cli-boxes: https://r2.cnpmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgzstring-width: 5.1.2type-fest: 2.19.0- widest-line: 4.0.1+ widest-line: https://r2.cnpmjs.org/widest-line/-/widest-line-4.0.1.tgzwrap-ansi: 8.1.0+ bplist-parser@https://r2.cnpmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz:dependencies:big-integer: 1.6.52@@ -13069,13 +14113,22 @@ snapshots:dependencies:balanced-match: 1.0.2+ brace-expansion@https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz:+ dependencies:+ balanced-match: https://r2.cnpmjs.org/balanced-match/-/balanced-match-1.0.2.tgz+ concat-map: https://r2.cnpmjs.org/concat-map/-/concat-map-0.0.1.tgz++ brace-expansion@https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz:+ dependencies:+ balanced-match: https://r2.cnpmjs.org/balanced-match/-/balanced-match-1.0.2.tgz+dependencies:fill-range: 7.0.1- [email protected]: {}+ browser-assert@https://r2.cnpmjs.org/browser-assert/-/browser-assert-1.2.1.tgz: {}+ browserify-zlib@https://r2.cnpmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz:dependencies:pako: 0.2.9@@ -13088,10 +14141,12 @@ snapshots:+ buffer-from@https://r2.cnpmjs.org/buffer-from/-/buffer-from-1.1.2.tgz: {}+dependencies:base64-js: 1.5.1- ieee754: 1.2.1+ ieee754: https://r2.cnpmjs.org/ieee754/-/ieee754-1.2.1.tgz@@ -13110,10 +14165,10 @@ snapshots:dependencies:'@types/http-cache-semantics': 4.0.4- get-stream: 6.0.1+ get-stream: https://r2.cnpmjs.org/get-stream/-/get-stream-6.0.1.tgzhttp-cache-semantics: 4.1.1keyv: 4.5.4- mimic-response: 4.0.0+ mimic-response: https://r2.cnpmjs.org/mimic-response/-/mimic-response-4.0.0.tgznormalize-url: 8.0.1responselike: 3.0.0@@ -13127,16 +14182,18 @@ snapshots:+ callsites@https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz: {}++ camel-case@https://r2.cnpmjs.org/camel-case/-/camel-case-4.1.2.tgz:dependencies:- pascal-case: 3.1.2+ pascal-case: https://r2.cnpmjs.org/pascal-case/-/pascal-case-3.1.2.tgztslib: 2.6.2- [email protected]: {}+ case-sensitive-paths-webpack-plugin@https://r2.cnpmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz: {}dependencies:@@ -13158,11 +14215,6 @@ snapshots:escape-string-regexp: 1.0.5supports-color: 5.5.0- dependencies:- ansi-styles: 4.3.0- supports-color: 7.2.0-dependencies:ansi-styles: 4.3.0@@ -13172,17 +14224,27 @@ snapshots:+ chalk@https://r2.cnpmjs.org/chalk/-/chalk-3.0.0.tgz:+ dependencies:+ ansi-styles: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz+ supports-color: https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz++ chalk@https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz:+ dependencies:+ ansi-styles: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz+ supports-color: https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz+- [email protected]: {}+ character-entities-legacy@https://r2.cnpmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz: {}- [email protected]: {}+ character-entities@https://r2.cnpmjs.org/character-entities/-/character-entities-1.2.4.tgz: {}- [email protected]: {}+ character-reference-invalid@https://r2.cnpmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz: {}- [email protected]: {}+ chardet@https://r2.cnpmjs.org/chardet/-/chardet-0.7.0.tgz: {}@@ -13202,13 +14264,13 @@ snapshots:optionalDependencies:fsevents: 2.3.3- [email protected]: {}+ chownr@https://r2.cnpmjs.org/chownr/-/chownr-1.1.4.tgz: {}- [email protected]: {}+ chownr@https://r2.cnpmjs.org/chownr/-/chownr-2.0.0.tgz: {}- [email protected]: {}+ chrome-trace-event@https://r2.cnpmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz: {}@@ -13228,36 +14290,42 @@ snapshots:dependencies:'@types/validator': 13.11.9- libphonenumber-js: 1.10.61+ libphonenumber-js: 1.11.0validator: 13.11.0dependencies:- source-map: 0.6.1+ source-map: https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgz+ clean-regexp@https://r2.cnpmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz:dependencies:- escape-string-regexp: 1.0.5+ escape-string-regexp: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz- dependencies:- restore-cursor: 3.1.0+ cli-boxes@https://r2.cnpmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz: {}dependencies:restore-cursor: 4.0.0+ cli-cursor@https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz:+ dependencies:+ restore-cursor: https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz++ cli-cursor@https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz:+ dependencies:+ restore-cursor: https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz+dependencies:- string-width: 4.2.3+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgzoptionalDependencies:'@colors/colors': 1.5.0@@ -13276,17 +14344,17 @@ snapshots:dependencies:- string-width: 4.2.3- strip-ansi: 6.0.1- wrap-ansi: 7.0.0+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz+ wrap-ansi: https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz+ clone-deep@https://r2.cnpmjs.org/clone-deep/-/clone-deep-4.0.1.tgz:dependencies:- is-plain-object: 2.0.4- kind-of: 6.0.3- shallow-clone: 3.0.1+ is-plain-object: https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz+ kind-of: https://r2.cnpmjs.org/kind-of/-/kind-of-6.0.3.tgz+ shallow-clone: https://r2.cnpmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz- [email protected]: {}+ clone@https://r2.cnpmjs.org/clone/-/clone-1.0.4.tgz: {}@@ -13300,18 +14368,24 @@ snapshots:dependencies:color-name: 1.1.4+ color-convert@https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgz:+ dependencies:+ color-name: https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz++ color-name@https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgz: {}+dependencies:- color-name: 1.1.4+ color-name: https://r2.cnpmjs.org/color-name/-/color-name-1.1.4.tgzsimple-swizzle: 0.2.2dependencies:- color-convert: 2.0.1+ color-convert: https://r2.cnpmjs.org/color-convert/-/color-convert-2.0.1.tgzcolor-string: 1.9.1@@ -13324,18 +14398,18 @@ snapshots:- [email protected]: {}+ optional: true- [email protected]: {}+ commander@https://r2.cnpmjs.org/commander/-/commander-2.20.3.tgz: {}- [email protected]: {}+ commander@https://r2.cnpmjs.org/commander/-/commander-6.2.1.tgz: {}- optional: true+ commander@https://r2.cnpmjs.org/commander/-/commander-8.3.0.tgz: {}- [email protected]: {}+ commondir@https://r2.cnpmjs.org/commondir/-/commondir-1.0.1.tgz: {}dependencies:@@ -13351,7 +14425,7 @@ snapshots:accepts: 1.3.8bytes: 3.0.0compressible: 2.0.18- debug: 2.6.9+ debug: https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgzon-headers: 1.0.2safe-buffer: 5.1.2vary: 1.1.2@@ -13362,6 +14436,8 @@ snapshots:+ concat-map@https://r2.cnpmjs.org/concat-map/-/concat-map-0.0.1.tgz: {}+dependencies:buffer-from: 1.1.2@@ -13369,28 +14445,28 @@ snapshots:readable-stream: 3.6.2typedarray: 0.0.6+ config-chain@https://r2.cnpmjs.org/config-chain/-/config-chain-1.1.13.tgz:dependencies:- ini: 1.3.8- proto-list: 1.2.4+ ini: https://r2.cnpmjs.org/ini/-/ini-1.3.8.tgz+ proto-list: https://r2.cnpmjs.org/proto-list/-/proto-list-1.2.4.tgz+ configstore@https://r2.cnpmjs.org/configstore/-/configstore-6.0.0.tgz:dependencies:- dot-prop: 6.0.1+ dot-prop: https://r2.cnpmjs.org/dot-prop/-/dot-prop-6.0.1.tgzgraceful-fs: 4.2.11- unique-string: 3.0.0- write-file-atomic: 3.0.3- xdg-basedir: 5.1.0+ unique-string: https://r2.cnpmjs.org/unique-string/-/unique-string-3.0.0.tgz+ write-file-atomic: https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz+ xdg-basedir: https://r2.cnpmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz- [email protected]: {}+ constants-browserify@https://r2.cnpmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz: {}+ content-disposition@https://r2.cnpmjs.org/content-disposition/-/content-disposition-0.5.4.tgz:dependencies:- safe-buffer: 5.2.1+ safe-buffer: https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz@@ -13476,19 +14552,19 @@ snapshots:- [email protected]: {}+ cookie-signature@https://r2.cnpmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz: {}dependencies:- is-what: 3.14.1+ is-what: https://r2.cnpmjs.org/is-what/-/is-what-3.14.1.tgzdependencies:browserslist: 4.23.0- [email protected]: {}+ core-util-is@https://r2.cnpmjs.org/core-util-is/-/core-util-is-1.0.3.tgz: {}[email protected](@types/[email protected])([email protected]([email protected]))([email protected]):dependencies:@@ -13500,17 +14576,17 @@ snapshots:dependencies:'@types/parse-json': 4.0.2- import-fresh: 3.3.0- parse-json: 5.2.0- path-type: 4.0.0- yaml: 1.10.2+ import-fresh: https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz+ parse-json: https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz+ path-type: https://r2.cnpmjs.org/path-type/-/path-type-4.0.0.tgz+ yaml: https://r2.cnpmjs.org/yaml/-/yaml-1.10.2.tgzdependencies:- env-paths: 2.2.1- import-fresh: 3.3.0- js-yaml: 4.1.0- parse-json: 5.2.0+ env-paths: https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz+ import-fresh: https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz+ js-yaml: https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz+ parse-json: https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgzoptionalDependencies:typescript: 5.4.5@@ -13520,13 +14596,19 @@ snapshots:shebang-command: 2.0.0which: 2.0.2+ cross-spawn@https://r2.cnpmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz:+ dependencies:+ path-key: https://r2.cnpmjs.org/path-key/-/path-key-3.1.1.tgz+ shebang-command: https://r2.cnpmjs.org/shebang-command/-/shebang-command-2.0.0.tgz+ which: https://r2.cnpmjs.org/which/-/which-2.0.2.tgz+- [email protected]: {}+ crypto-random-string@https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz: {}+ crypto-random-string@https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz:dependencies:- type-fest: 1.4.0+ type-fest: https://r2.cnpmjs.org/type-fest/-/type-fest-1.4.0.tgzdependencies:@@ -13543,15 +14625,15 @@ snapshots:dependencies:- boolbase: 1.0.0+ boolbase: https://r2.cnpmjs.org/boolbase/-/boolbase-1.0.0.tgzcss-what: 6.1.0domhandler: 4.3.1- domutils: 2.8.0+ domutils: https://r2.cnpmjs.org/domutils/-/domutils-2.8.0.tgznth-check: 2.1.1- [email protected]: {}+ css.escape@https://r2.cnpmjs.org/css.escape/-/css.escape-1.5.1.tgz: {}@@ -13594,27 +14676,27 @@ snapshots:- [email protected]: {}+ de-indent@https://r2.cnpmjs.org/de-indent/-/de-indent-1.0.2.tgz: {}dependencies:- ms: 2.0.0+ ms: https://r2.cnpmjs.org/ms/-/ms-2.1.2.tgz+ debug@https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgz:dependencies:- ms: 2.1.3+ ms: https://r2.cnpmjs.org/ms/-/ms-2.0.0.tgz+ debug@https://r2.cnpmjs.org/debug/-/debug-3.2.7.tgz:dependencies:- ms: 2.1.2+ ms: https://r2.cnpmjs.org/ms/-/ms-2.1.3.tgz+ decompress-response@https://r2.cnpmjs.org/decompress-response/-/decompress-response-6.0.0.tgz:dependencies:- mimic-response: 3.1.0+ mimic-response: https://r2.cnpmjs.org/mimic-response/-/mimic-response-3.1.0.tgz- [email protected]: {}+ dedent@https://r2.cnpmjs.org/dedent/-/dedent-0.7.0.tgz: {}dependencies:@@ -13643,19 +14725,21 @@ snapshots:+ deep-extend@https://r2.cnpmjs.org/deep-extend/-/deep-extend-0.6.0.tgz: {}+- dependencies:- bplist-parser: 0.2.0- untildify: 4.0.0-+ default-browser-id@https://r2.cnpmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz:+ dependencies:+ bplist-parser: https://r2.cnpmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz+ untildify: https://r2.cnpmjs.org/untildify/-/untildify-4.0.0.tgz+dependencies:bundle-name: 4.1.0@@ -13663,9 +14747,9 @@ snapshots:dependencies:- clone: 1.0.4+ clone: https://r2.cnpmjs.org/clone/-/clone-1.0.4.tgz- [email protected]: {}+ defer-to-connect@https://r2.cnpmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz: {}dependencies:@@ -13673,9 +14757,9 @@ snapshots:es-errors: 1.3.0gopd: 1.0.1- [email protected]: {}+ define-lazy-prop@https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz: {}- [email protected]: {}+ define-lazy-prop@https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz: {}dependencies:@@ -13687,9 +14771,9 @@ snapshots:dependencies:- ast-types: 0.13.4+ ast-types: https://r2.cnpmjs.org/ast-types/-/ast-types-0.13.4.tgzescodegen: 2.1.0- esprima: 4.0.1+ esprima: https://r2.cnpmjs.org/esprima/-/esprima-4.0.1.tgzdependencies:@@ -13704,9 +14788,9 @@ snapshots:- [email protected]: {}+ depd@https://r2.cnpmjs.org/depd/-/depd-2.0.0.tgz: {}- [email protected]: {}+ deprecation@https://r2.cnpmjs.org/deprecation/-/deprecation-2.3.1.tgz: {}@@ -13714,13 +14798,15 @@ snapshots:+ detect-indent@https://r2.cnpmjs.org/detect-indent/-/detect-indent-6.1.0.tgz: {}++ detect-package-manager@https://r2.cnpmjs.org/detect-package-manager/-/detect-package-manager-2.0.1.tgz:dependencies:- execa: 5.1.1+ execa: https://r2.cnpmjs.org/execa/-/execa-5.1.1.tgzdependencies:@@ -13753,13 +14839,17 @@ snapshots:dependencies:esutils: 2.0.3+ doctrine@https://r2.cnpmjs.org/doctrine/-/doctrine-3.0.0.tgz:+ dependencies:+ esutils: https://r2.cnpmjs.org/esutils/-/esutils-2.0.3.tgz++ dom-converter@https://r2.cnpmjs.org/dom-converter/-/dom-converter-0.2.0.tgz:dependencies:- utila: 0.4.0+ utila: https://r2.cnpmjs.org/utila/-/utila-0.4.0.tgzdependencies:@@ -13770,7 +14860,7 @@ snapshots:dependencies:domelementtype: 2.3.0domhandler: 4.3.1- entities: 2.2.0+ entities: https://r2.cnpmjs.org/entities/-/entities-2.2.0.tgz@@ -13778,39 +14868,39 @@ snapshots:dependencies:domelementtype: 2.3.0+ domutils@https://r2.cnpmjs.org/domutils/-/domutils-2.8.0.tgz:dependencies:dom-serializer: 1.4.1domelementtype: 2.3.0domhandler: 4.3.1+ dot-case@https://r2.cnpmjs.org/dot-case/-/dot-case-3.0.4.tgz:dependencies:- no-case: 3.0.4+ no-case: https://r2.cnpmjs.org/no-case/-/no-case-3.0.4.tgztslib: 2.6.2dependencies:is-obj: 2.0.0+ dot-prop@https://r2.cnpmjs.org/dot-prop/-/dot-prop-6.0.1.tgz:dependencies:- is-obj: 2.0.0+ is-obj: https://r2.cnpmjs.org/is-obj/-/is-obj-2.0.0.tgz+ duplexify@https://r2.cnpmjs.org/duplexify/-/duplexify-3.7.1.tgz:dependencies:- end-of-stream: 1.4.4- inherits: 2.0.4+ end-of-stream: https://r2.cnpmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgzreadable-stream: 2.3.8stream-shift: 1.0.3- [email protected]: {}+ ee-first@https://r2.cnpmjs.org/ee-first/-/ee-first-1.1.1.tgz: {}dependencies:@@ -13824,17 +14914,19 @@ snapshots:- [email protected]: {}+ emoji-regex@https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz: {}+ encodeurl@https://r2.cnpmjs.org/encodeurl/-/encodeurl-1.0.2.tgz: {}++ end-of-stream@https://r2.cnpmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz:dependencies:- once: 1.4.0+ once: https://r2.cnpmjs.org/once/-/once-1.4.0.tgz+ endent@https://r2.cnpmjs.org/endent/-/endent-2.1.0.tgz:dependencies:- dedent: 0.7.0- fast-json-parse: 1.0.3- objectorarray: 1.0.5+ dedent: https://r2.cnpmjs.org/dedent/-/dedent-0.7.0.tgz+ fast-json-parse: https://r2.cnpmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz+ objectorarray: https://r2.cnpmjs.org/objectorarray/-/objectorarray-1.0.5.tgzdependencies:@@ -13843,23 +14935,27 @@ snapshots:- [email protected]: {}-- [email protected]: {}+ entities@https://r2.cnpmjs.org/entities/-/entities-2.2.0.tgz: {}++ env-paths@https://r2.cnpmjs.org/env-paths/-/env-paths-2.2.1.tgz: {}dependencies:- prr: 1.0.1+ prr: https://r2.cnpmjs.org/prr/-/prr-1.0.1.tgzoptional: truedependencies:is-arrayish: 0.2.1+ error-ex@https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz:+ dependencies:+ is-arrayish: https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz+dependencies:array-buffer-byte-length: 1.0.1@@ -13909,7 +15005,7 @@ snapshots:unbox-primitive: 1.0.2which-typed-array: 1.1.15- [email protected]: {}+ es-array-method-boxes-properly@https://r2.cnpmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz: {}dependencies:@@ -13922,11 +15018,11 @@ snapshots:call-bind: 1.0.7get-intrinsic: 1.2.4has-symbols: 1.0.3- is-arguments: 1.1.1+ is-arguments: https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgzis-map: 2.0.3is-set: 2.0.3- is-string: 1.0.7- isarray: 2.0.5+ is-string: https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz+ isarray: https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgzstop-iteration-iterator: 1.0.0@@ -14018,7 +15114,7 @@ snapshots:optional: true- [email protected]: {}+ esbuild-plugin-alias@https://r2.cnpmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz: {}dependencies:@@ -14122,19 +15218,23 @@ snapshots:- [email protected]: {}+ escape-goat@https://r2.cnpmjs.org/escape-goat/-/escape-goat-4.0.0.tgz: {}- [email protected]: {}+ escape-html@https://r2.cnpmjs.org/escape-html/-/escape-html-1.0.3.tgz: {}+ escape-string-regexp@https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz: {}++ escape-string-regexp@https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz: {}+dependencies:- esprima: 4.0.1- estraverse: 5.3.0- esutils: 2.0.3+ esprima: https://r2.cnpmjs.org/esprima/-/esprima-4.0.1.tgz+ estraverse: https://r2.cnpmjs.org/estraverse/-/estraverse-5.3.0.tgz+ esutils: https://r2.cnpmjs.org/esutils/-/esutils-2.0.3.tgzoptionalDependencies:source-map: 0.6.1@@ -14148,7 +15248,7 @@ snapshots:find-up: 7.0.0parse-gitignore: 2.0.0dependencies:'@types/eslint': 8.56.10pathe: 1.1.2@@ -14156,11 +15256,11 @@ snapshots:dependencies:eslint: 8.57.0- prettier-linter-helpers: 1.0.0+ prettier-linter-helpers: https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgzdependencies:- debug: 3.2.7+ debug: https://r2.cnpmjs.org/debug/-/debug-3.2.7.tgzis-core-module: 2.13.1resolve: 1.22.8transitivePeerDependencies:@@ -14176,10 +15276,6 @@ snapshots:dependencies:eslint: 8.57.0- dependencies:- eslint: 8.57.0-dependencies:'@eslint-community/eslint-utils': 4.4.0([email protected])@@ -14187,9 +15283,9 @@ snapshots:eslint: 8.57.0eslint-compat-utils: 0.5.0([email protected])+ eslint-plugin-eslint-comments@https://r2.cnpmjs.org/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz([email protected]):dependencies:- escape-string-regexp: 1.0.5+ escape-string-regexp: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgzeslint: 8.57.0ignore: 5.3.1@@ -14212,11 +15308,11 @@ snapshots:dependencies:'@typescript-eslint/utils': 7.6.0([email protected])([email protected])debug: 4.3.4- doctrine: 3.0.0+ doctrine: https://r2.cnpmjs.org/doctrine/-/doctrine-3.0.0.tgzeslint: 8.57.0eslint-import-resolver-node: 0.3.9get-tsconfig: 4.7.3- is-glob: 4.0.3+ is-glob: https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgzminimatch: 9.0.4semver: 7.6.0transitivePeerDependencies:@@ -14229,7 +15325,7 @@ snapshots:are-docs-informative: 0.0.2comment-parser: 1.4.1debug: 4.3.4- escape-string-regexp: 4.0.0+ escape-string-regexp: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgzeslint: 8.57.0esquery: 1.5.0is-builtin-module: 3.2.1@@ -14246,17 +15342,17 @@ snapshots:espree: 9.6.1graphemer: 1.4.0jsonc-eslint-parser: 2.4.0- natural-compare: 1.4.0+ natural-compare: https://r2.cnpmjs.org/natural-compare/-/natural-compare-1.4.0.tgzsynckit: 0.6.2dependencies:eslint: 8.57.0- mdast-util-from-markdown: 0.8.5+ mdast-util-from-markdown: https://r2.cnpmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgztransitivePeerDependencies:- supports-colordependencies:'@eslint-community/eslint-utils': 4.4.0([email protected])enhanced-resolve: 5.16.0@@ -14275,12 +15371,12 @@ snapshots:dependencies:- '@typescript-eslint/utils': 7.6.0([email protected])([email protected])+ '@typescript-eslint/utils': 6.21.0([email protected])([email protected])eslint: 8.57.0minimatch: 9.0.4- natural-compare-lite: 1.4.0+ natural-compare-lite: https://r2.cnpmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgzoptionalDependencies:vue-eslint-parser: 9.4.2([email protected])transitivePeerDependencies:@@ -14401,7 +15497,7 @@ snapshots:debug: 4.3.4eslint: 8.57.0eslint-compat-utils: 0.5.0([email protected])- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgztoml-eslint-parser: 0.9.3transitivePeerDependencies:- supports-color@@ -14412,26 +15508,26 @@ snapshots:'@eslint-community/eslint-utils': 4.4.0([email protected])'@eslint/eslintrc': 2.1.4ci-info: 4.0.0- clean-regexp: 1.0.0+ clean-regexp: https://r2.cnpmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgzcore-js-compat: 3.36.1eslint: 8.57.0esquery: 1.5.0- indent-string: 4.0.0+ indent-string: https://r2.cnpmjs.org/indent-string/-/indent-string-4.0.0.tgzis-builtin-module: 3.2.1- jsesc: 3.0.2- pluralize: 8.0.0- read-pkg-up: 7.0.1+ jsesc: https://r2.cnpmjs.org/jsesc/-/jsesc-3.0.2.tgz+ pluralize: https://r2.cnpmjs.org/pluralize/-/pluralize-8.0.0.tgz+ read-pkg-up: https://r2.cnpmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgzregexp-tree: 0.1.27regjsparser: 0.10.0semver: 7.6.0- strip-indent: 3.0.0+ strip-indent: https://r2.cnpmjs.org/strip-indent/-/strip-indent-3.0.0.tgztransitivePeerDependencies:- supports-color[email protected](@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]):dependencies:eslint: 8.57.0- eslint-rule-composer: 0.3.0+ eslint-rule-composer: https://r2.cnpmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgzoptionalDependencies:'@typescript-eslint/eslint-plugin': 7.7.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])@@ -14451,12 +15547,12 @@ snapshots:'@eslint-community/eslint-utils': 4.4.0([email protected])eslint: 8.57.0globals: 13.24.0- natural-compare: 1.4.0+ natural-compare: https://r2.cnpmjs.org/natural-compare/-/natural-compare-1.4.0.tgznth-check: 2.1.1postcss-selector-parser: 6.0.16semver: 7.6.0vue-eslint-parser: 9.4.2([email protected])- xml-name-validator: 4.0.0+ xml-name-validator: https://r2.cnpmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgztransitivePeerDependencies:- supports-color@@ -14465,23 +15561,18 @@ snapshots:debug: 4.3.4eslint: 8.57.0eslint-compat-utils: 0.5.0([email protected])- lodash: 4.17.21- natural-compare: 1.4.0+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ natural-compare: https://r2.cnpmjs.org/natural-compare/-/natural-compare-1.4.0.tgzyaml-eslint-parser: 1.2.2transitivePeerDependencies:- supports-colordependencies:- '@vue/compiler-sfc': 3.4.21+ '@vue/compiler-sfc': 3.4.24eslint: 8.57.0- [email protected]: {}-- dependencies:- esrecurse: 4.3.0- estraverse: 4.3.0+ eslint-rule-composer@https://r2.cnpmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz: {}dependencies:@@ -14493,6 +15584,11 @@ snapshots:esrecurse: 4.3.0estraverse: 5.3.0+ eslint-scope@https://r2.cnpmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz:+ dependencies:+ esrecurse: https://r2.cnpmjs.org/esrecurse/-/esrecurse-4.3.0.tgz+ estraverse: https://r2.cnpmjs.org/estraverse/-/estraverse-4.3.0.tgz+@@ -14548,6 +15644,8 @@ snapshots:+ esprima@https://r2.cnpmjs.org/esprima/-/esprima-4.0.1.tgz: {}+dependencies:estraverse: 5.3.0@@ -14556,23 +15654,33 @@ snapshots:dependencies:estraverse: 5.3.0- [email protected]: {}+ esrecurse@https://r2.cnpmjs.org/esrecurse/-/esrecurse-4.3.0.tgz:+ dependencies:+ estraverse: https://r2.cnpmjs.org/estraverse/-/estraverse-5.3.0.tgz+ estraverse@https://r2.cnpmjs.org/estraverse/-/estraverse-4.3.0.tgz: {}++ estraverse@https://r2.cnpmjs.org/estraverse/-/estraverse-5.3.0.tgz: {}+dependencies:'@types/estree': 1.0.5+ estree-walker@https://r2.cnpmjs.org/estree-walker/-/estree-walker-2.0.2.tgz: {}++ esutils@https://r2.cnpmjs.org/esutils/-/esutils-2.0.3.tgz: {}+- [email protected]: {}+ events@https://r2.cnpmjs.org/events/-/events-3.3.0.tgz: {}dependencies:@@ -14598,50 +15706,64 @@ snapshots:signal-exit: 4.1.0strip-final-newline: 3.0.0+ execa@https://r2.cnpmjs.org/execa/-/execa-5.1.1.tgz:+ dependencies:+ cross-spawn: https://r2.cnpmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz+ get-stream: https://r2.cnpmjs.org/get-stream/-/get-stream-6.0.1.tgz+ human-signals: https://r2.cnpmjs.org/human-signals/-/human-signals-2.1.0.tgz+ is-stream: https://r2.cnpmjs.org/is-stream/-/is-stream-2.0.1.tgz+ merge-stream: https://r2.cnpmjs.org/merge-stream/-/merge-stream-2.0.0.tgz+ npm-run-path: https://r2.cnpmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz+ onetime: https://r2.cnpmjs.org/onetime/-/onetime-5.1.2.tgz+ signal-exit: 3.0.7+ strip-final-newline: https://r2.cnpmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz+dependencies:accepts: 1.3.8- array-flatten: 1.1.1+ array-flatten: https://r2.cnpmjs.org/array-flatten/-/array-flatten-1.1.1.tgzbody-parser: 1.20.2- content-disposition: 0.5.4+ content-disposition: https://r2.cnpmjs.org/content-disposition/-/content-disposition-0.5.4.tgzcontent-type: 1.0.5cookie: 0.6.0- cookie-signature: 1.0.6- debug: 2.6.9- depd: 2.0.0- encodeurl: 1.0.2- escape-html: 1.0.3+ cookie-signature: https://r2.cnpmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz+ debug: https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgz+ depd: https://r2.cnpmjs.org/depd/-/depd-2.0.0.tgz+ encodeurl: https://r2.cnpmjs.org/encodeurl/-/encodeurl-1.0.2.tgz+ escape-html: https://r2.cnpmjs.org/escape-html/-/escape-html-1.0.3.tgzetag: 1.8.1finalhandler: 1.2.0- fresh: 0.5.2- http-errors: 2.0.0- merge-descriptors: 1.0.1- methods: 1.1.2+ fresh: https://r2.cnpmjs.org/fresh/-/fresh-0.5.2.tgz+ http-errors: https://r2.cnpmjs.org/http-errors/-/http-errors-2.0.0.tgz+ merge-descriptors: https://r2.cnpmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz+ methods: https://r2.cnpmjs.org/methods/-/methods-1.1.2.tgzon-finished: 2.4.1- parseurl: 1.3.3- path-to-regexp: 0.1.7- proxy-addr: 2.0.7+ parseurl: https://r2.cnpmjs.org/parseurl/-/parseurl-1.3.3.tgz+ path-to-regexp: https://r2.cnpmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz+ proxy-addr: https://r2.cnpmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgzqs: 6.11.0- range-parser: 1.2.1- safe-buffer: 5.2.1+ range-parser: https://r2.cnpmjs.org/range-parser/-/range-parser-1.2.1.tgz+ safe-buffer: https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgzsend: 0.18.0serve-static: 1.15.0- setprototypeof: 1.2.0- statuses: 2.0.1- type-is: 1.6.18- utils-merge: 1.0.1- vary: 1.1.2+ setprototypeof: https://r2.cnpmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz+ statuses: https://r2.cnpmjs.org/statuses/-/statuses-2.0.1.tgz+ type-is: https://r2.cnpmjs.org/type-is/-/type-is-1.6.18.tgz+ utils-merge: https://r2.cnpmjs.org/utils-merge/-/utils-merge-1.0.1.tgz+ vary: https://r2.cnpmjs.org/vary/-/vary-1.1.2.tgztransitivePeerDependencies:- supports-color+ external-editor@https://r2.cnpmjs.org/external-editor/-/external-editor-3.1.0.tgz:dependencies:- chardet: 0.7.0- iconv-lite: 0.4.24- tmp: 0.0.33+ chardet: https://r2.cnpmjs.org/chardet/-/chardet-0.7.0.tgz+ iconv-lite: https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz+ tmp: https://r2.cnpmjs.org/tmp/-/tmp-0.0.33.tgz+ fast-deep-equal@https://r2.cnpmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz: {}+@@ -14654,10 +15776,12 @@ snapshots:merge2: 1.4.1micromatch: 4.0.5- [email protected]: {}+ fast-json-parse@https://r2.cnpmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz: {}+ fast-json-stable-stringify@https://r2.cnpmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz: {}+@@ -14670,11 +15794,15 @@ snapshots:dependencies:- node-domexception: 1.0.0+ node-domexception: https://r2.cnpmjs.org/node-domexception/-/node-domexception-1.0.0.tgzweb-streams-polyfill: 3.3.3+ figures@https://r2.cnpmjs.org/figures/-/figures-3.2.0.tgz:+ dependencies:+ escape-string-regexp: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz+dependencies:flat-cache: 3.2.0@@ -14696,36 +15824,27 @@ snapshots:dependencies:- debug: 2.6.9- encodeurl: 1.0.2- escape-html: 1.0.3+ debug: https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgz+ encodeurl: https://r2.cnpmjs.org/encodeurl/-/encodeurl-1.0.2.tgz+ escape-html: https://r2.cnpmjs.org/escape-html/-/escape-html-1.0.3.tgzon-finished: 2.4.1- parseurl: 1.3.3- statuses: 2.0.1- unpipe: 1.0.0+ parseurl: https://r2.cnpmjs.org/parseurl/-/parseurl-1.3.3.tgz+ statuses: https://r2.cnpmjs.org/statuses/-/statuses-2.0.1.tgz+ unpipe: https://r2.cnpmjs.org/unpipe/-/unpipe-1.0.0.tgztransitivePeerDependencies:- supports-color- dependencies:- commondir: 1.0.1- make-dir: 2.1.0- pkg-dir: 3.0.0-- dependencies:- commondir: 1.0.1- make-dir: 3.1.0- pkg-dir: 4.2.0-+ find-cache-dir@https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz:dependencies:- locate-path: 3.0.0+ commondir: https://r2.cnpmjs.org/commondir/-/commondir-1.0.1.tgz+ make-dir: https://r2.cnpmjs.org/make-dir/-/make-dir-2.1.0.tgz+ pkg-dir: https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz+ find-cache-dir@https://r2.cnpmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz:dependencies:- locate-path: 5.0.0- path-exists: 4.0.0+ commondir: https://r2.cnpmjs.org/commondir/-/commondir-1.0.1.tgz+ make-dir: https://r2.cnpmjs.org/make-dir/-/make-dir-3.1.0.tgz+ pkg-dir: https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgzdependencies:@@ -14740,13 +15859,27 @@ snapshots:dependencies:locate-path: 7.2.0- path-exists: 5.0.0+ path-exists: https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgzunicorn-magic: 0.1.0+ find-up@https://r2.cnpmjs.org/find-up/-/find-up-3.0.0.tgz:dependencies:- flatted: 3.3.1- keyv: 4.5.4+ locate-path: https://r2.cnpmjs.org/locate-path/-/locate-path-3.0.0.tgz++ find-up@https://r2.cnpmjs.org/find-up/-/find-up-4.1.0.tgz:+ dependencies:+ locate-path: https://r2.cnpmjs.org/locate-path/-/locate-path-5.0.0.tgz+ path-exists: https://r2.cnpmjs.org/path-exists/-/path-exists-4.0.0.tgz++ find-up@https://r2.cnpmjs.org/find-up/-/find-up-5.0.0.tgz:+ dependencies:+ locate-path: https://r2.cnpmjs.org/locate-path/-/locate-path-6.0.0.tgz+ path-exists: https://r2.cnpmjs.org/path-exists/-/path-exists-4.0.0.tgz++ dependencies:+ flatted: 3.3.1+ keyv: 4.5.4rimraf: 3.0.2@@ -14765,7 +15898,7 @@ snapshots:dependencies:'@babel/code-frame': 7.24.2- chalk: 4.1.2+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgzchokidar: 3.6.0cosmiconfig: 7.1.0deepmerge: 4.3.1@@ -14775,7 +15908,7 @@ snapshots:node-abort-controller: 3.1.1schema-utils: 3.3.0semver: 7.6.0- tapable: 2.2.1+ tapable: https://r2.cnpmjs.org/tapable/-/tapable-2.2.1.tgztypescript: 5.4.5webpack: 5.91.0(@swc/[email protected])([email protected])@@ -14787,15 +15920,15 @@ snapshots:combined-stream: 1.0.8mime-types: 2.1.35+ formdata-polyfill@https://r2.cnpmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz:dependencies:fetch-blob: 3.2.0- [email protected]: {}+ forwarded@https://r2.cnpmjs.org/forwarded/-/forwarded-0.2.0.tgz: {}- [email protected]: {}+ fresh@https://r2.cnpmjs.org/fresh/-/fresh-0.5.2.tgz: {}- [email protected]: {}+ fs-constants@https://r2.cnpmjs.org/fs-constants/-/fs-constants-1.0.0.tgz: {}dependencies:@@ -14806,22 +15939,22 @@ snapshots:dependencies:graceful-fs: 4.2.11- jsonfile: 6.1.0+ jsonfile: https://r2.cnpmjs.org/jsonfile/-/jsonfile-6.1.0.tgzuniversalify: 2.0.1dependencies:graceful-fs: 4.2.11- jsonfile: 6.1.0+ jsonfile: https://r2.cnpmjs.org/jsonfile/-/jsonfile-6.1.0.tgzuniversalify: 2.0.1+ fs-extra@https://r2.cnpmjs.org/fs-extra/-/fs-extra-7.0.1.tgz:dependencies:graceful-fs: 4.2.11- jsonfile: 4.0.0- universalify: 0.1.2+ jsonfile: https://r2.cnpmjs.org/jsonfile/-/jsonfile-4.0.0.tgz+ universalify: https://r2.cnpmjs.org/universalify/-/universalify-0.1.2.tgz+ fs-minipass@https://r2.cnpmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz:dependencies:minipass: 3.3.6@@ -14852,7 +15985,7 @@ snapshots:- [email protected]: {}+ get-caller-file@https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz: {}@@ -14872,6 +16005,8 @@ snapshots:+ get-stream@https://r2.cnpmjs.org/get-stream/-/get-stream-6.0.1.tgz: {}+dependencies:call-bind: 1.0.7@@ -14932,7 +16067,7 @@ snapshots:dependencies:is-glob: 4.0.3- [email protected]: {}+ glob-to-regexp@https://r2.cnpmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz: {}dependencies:@@ -14957,7 +16092,7 @@ snapshots:dependencies:- ini: 2.0.0+ ini: https://r2.cnpmjs.org/ini/-/ini-2.0.0.tgz@@ -14967,6 +16102,8 @@ snapshots:+ globals@https://r2.cnpmjs.org/globals/-/globals-11.12.0.tgz: {}+dependencies:define-properties: 1.2.1@@ -14985,7 +16122,7 @@ snapshots:'@sindresorhus/merge-streams': 2.3.0fast-glob: 3.3.2ignore: 5.3.1- path-type: 5.0.0+ path-type: https://r2.cnpmjs.org/path-type/-/path-type-5.0.0.tgzslash: 5.1.0unicorn-magic: 0.1.0@@ -14996,29 +16133,29 @@ snapshots:dependencies:'@sindresorhus/is': 5.6.0- '@szmarczak/http-timer': 5.0.1+ '@szmarczak/http-timer': https://r2.cnpmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgzcacheable-lookup: 7.0.0cacheable-request: 10.2.14- decompress-response: 6.0.0+ decompress-response: https://r2.cnpmjs.org/decompress-response/-/decompress-response-6.0.0.tgzform-data-encoder: 2.1.4- get-stream: 6.0.1+ get-stream: https://r2.cnpmjs.org/get-stream/-/get-stream-6.0.1.tgzhttp2-wrapper: 2.2.1- lowercase-keys: 3.0.0- p-cancelable: 3.0.0+ lowercase-keys: https://r2.cnpmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz+ p-cancelable: https://r2.cnpmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgzresponselike: 3.0.0dependencies:'@sindresorhus/is': 5.6.0- '@szmarczak/http-timer': 5.0.1+ '@szmarczak/http-timer': https://r2.cnpmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgzcacheable-lookup: 7.0.0cacheable-request: 10.2.14- decompress-response: 6.0.0+ decompress-response: https://r2.cnpmjs.org/decompress-response/-/decompress-response-6.0.0.tgzform-data-encoder: 2.1.4- get-stream: 6.0.1+ get-stream: https://r2.cnpmjs.org/get-stream/-/get-stream-6.0.1.tgzhttp2-wrapper: 2.2.1- lowercase-keys: 3.0.0- p-cancelable: 3.0.0+ lowercase-keys: https://r2.cnpmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz+ p-cancelable: https://r2.cnpmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgzresponselike: 3.0.0@@ -15027,20 +16164,20 @@ snapshots:+ gunzip-maybe@https://r2.cnpmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz:dependencies:- browserify-zlib: 0.1.4- is-deflate: 1.0.0- is-gzip: 1.0.0- peek-stream: 1.1.3- pumpify: 1.5.1- through2: 2.0.5+ browserify-zlib: https://r2.cnpmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz+ is-deflate: https://r2.cnpmjs.org/is-deflate/-/is-deflate-1.0.0.tgz+ is-gzip: https://r2.cnpmjs.org/is-gzip/-/is-gzip-1.0.0.tgz+ peek-stream: https://r2.cnpmjs.org/peek-stream/-/peek-stream-1.1.3.tgz+ pumpify: https://r2.cnpmjs.org/pumpify/-/pumpify-1.5.1.tgz+ through2: https://r2.cnpmjs.org/through2/-/through2-2.0.5.tgzdependencies:minimist: 1.2.8neo-async: 2.6.2- source-map: 0.6.1+ source-map: https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgzwordwrap: 1.0.0optionalDependencies:uglify-js: 3.17.4@@ -15057,6 +16194,8 @@ snapshots:+ has-flag@https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz: {}+dependencies:es-define-property: 1.0.0@@ -15085,18 +16224,18 @@ snapshots:dependencies:'@types/hast': 3.0.4- [email protected]: {}+ he@https://r2.cnpmjs.org/he/-/he-1.2.0.tgz: {}dependencies:react-is: 16.13.1- [email protected]: {}-dependencies:lru-cache: 10.2.0+ hosted-git-info@https://r2.cnpmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz: {}+dependencies:whatwg-encoding: 3.1.1@@ -15105,44 +16244,44 @@ snapshots:+ html-minifier-terser@https://r2.cnpmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz:dependencies:- camel-case: 4.1.2+ camel-case: https://r2.cnpmjs.org/camel-case/-/camel-case-4.1.2.tgzclean-css: 5.3.3- commander: 8.3.0- he: 1.2.0- param-case: 3.0.4- relateurl: 0.2.7+ commander: https://r2.cnpmjs.org/commander/-/commander-8.3.0.tgz+ he: https://r2.cnpmjs.org/he/-/he-1.2.0.tgz+ param-case: https://r2.cnpmjs.org/param-case/-/param-case-3.0.4.tgz+ relateurl: https://r2.cnpmjs.org/relateurl/-/relateurl-0.2.7.tgzterser: 5.30.0dependencies:- '@types/html-minifier-terser': 6.1.0- html-minifier-terser: 6.1.0- lodash: 4.17.21- pretty-error: 4.0.0- tapable: 2.2.1+ '@types/html-minifier-terser': https://r2.cnpmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz+ html-minifier-terser: https://r2.cnpmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ pretty-error: https://r2.cnpmjs.org/pretty-error/-/pretty-error-4.0.0.tgz+ tapable: https://r2.cnpmjs.org/tapable/-/tapable-2.2.1.tgzoptionalDependencies:webpack: 5.91.0(@swc/[email protected])([email protected])+ htmlparser2@https://r2.cnpmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz:dependencies:domelementtype: 2.3.0domhandler: 4.3.1- domutils: 2.8.0- entities: 2.2.0+ domutils: https://r2.cnpmjs.org/domutils/-/domutils-2.8.0.tgz+ entities: https://r2.cnpmjs.org/entities/-/entities-2.2.0.tgz+ http-errors@https://r2.cnpmjs.org/http-errors/-/http-errors-2.0.0.tgz:dependencies:- depd: 2.0.0- inherits: 2.0.4- setprototypeof: 1.2.0- statuses: 2.0.1- toidentifier: 1.0.1+ depd: https://r2.cnpmjs.org/depd/-/depd-2.0.0.tgz+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz+ setprototypeof: https://r2.cnpmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz+ statuses: https://r2.cnpmjs.org/statuses/-/statuses-2.0.1.tgz+ toidentifier: https://r2.cnpmjs.org/toidentifier/-/toidentifier-1.0.1.tgzdependencies:@@ -15153,8 +16292,8 @@ snapshots:dependencies:- quick-lru: 5.1.1- resolve-alpn: 1.2.1+ quick-lru: https://r2.cnpmjs.org/quick-lru/-/quick-lru-5.1.1.tgz+ resolve-alpn: https://r2.cnpmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgzdependencies:@@ -15167,21 +16306,28 @@ snapshots:+ human-signals@https://r2.cnpmjs.org/human-signals/-/human-signals-2.1.0.tgz: {}+dependencies:safer-buffer: 2.1.2+ iconv-lite@https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz:dependencies:- safer-buffer: 2.1.2+ safer-buffer: https://r2.cnpmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz++ iconv-lite@https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz:+ dependencies:+ safer-buffer: https://r2.cnpmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz+ optional: truedependencies:postcss: 8.4.38- [email protected]: {}+ ieee754@https://r2.cnpmjs.org/ieee754/-/ieee754-1.2.1.tgz: {}@@ -15199,14 +16345,23 @@ snapshots:parent-module: 1.0.1resolve-from: 4.0.0- [email protected]: {}+ import-fresh@https://r2.cnpmjs.org/import-fresh/-/import-fresh-3.3.0.tgz:+ dependencies:+ parent-module: https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz+ resolve-from: https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz++ import-lazy@https://r2.cnpmjs.org/import-lazy/-/import-lazy-4.0.0.tgz: {}+ imurmurhash@https://r2.cnpmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz: {}++ indent-string@https://r2.cnpmjs.org/indent-string/-/indent-string-4.0.0.tgz: {}+dependencies:once: 1.4.0@@ -15214,29 +16369,33 @@ snapshots:- [email protected]: {}+ inherits@https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz: {}- [email protected]: {}+ [email protected]: {}+ ini@https://r2.cnpmjs.org/ini/-/ini-1.3.8.tgz: {}++ ini@https://r2.cnpmjs.org/ini/-/ini-2.0.0.tgz: {}+dependencies:- '@inquirer/figures': 1.0.1'@ljharb/through': 2.3.13- ansi-escapes: 4.3.2+ ansi-escapes: https://r2.cnpmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgzchalk: 5.3.0- cli-cursor: 3.1.0+ cli-cursor: https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgzcli-width: 4.1.0- external-editor: 3.1.0- lodash: 4.17.21+ external-editor: https://r2.cnpmjs.org/external-editor/-/external-editor-3.1.0.tgz+ figures: https://r2.cnpmjs.org/figures/-/figures-3.2.0.tgz+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzmute-stream: 1.0.0- ora: 5.4.1+ ora: https://r2.cnpmjs.org/ora/-/ora-5.4.1.tgzrun-async: 3.0.0rxjs: 7.8.1- string-width: 4.2.3- strip-ansi: 6.0.1- wrap-ansi: 6.2.0+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz+ wrap-ansi: https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgzdependencies:@@ -15244,7 +16403,7 @@ snapshots:hasown: 2.0.2side-channel: 1.0.6- [email protected]: {}+ interpret@https://r2.cnpmjs.org/interpret/-/interpret-1.4.0.tgz: {}@@ -15255,22 +16414,27 @@ snapshots:- [email protected]: {}+ ipaddr.js@https://r2.cnpmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz: {}- [email protected]: {}+ is-absolute-url@https://r2.cnpmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz: {}- [email protected]: {}+ is-alphabetical@https://r2.cnpmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz: {}+ is-alphanumerical@https://r2.cnpmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz:dependencies:- is-alphabetical: 1.0.4- is-decimal: 1.0.4+ is-alphabetical: https://r2.cnpmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz+ is-decimal: https://r2.cnpmjs.org/is-decimal/-/is-decimal-1.0.4.tgzdependencies:call-bind: 1.0.7has-tostringtag: 1.0.2+ is-arguments@https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz:+ dependencies:+ call-bind: 1.0.7+ has-tostringtag: 1.0.2+dependencies:call-bind: 1.0.7@@ -15280,6 +16444,8 @@ snapshots:+ is-arrayish@https://r2.cnpmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz: {}+dependencies:has-tostringtag: 1.0.2@@ -15305,7 +16471,7 @@ snapshots:+ is-ci@https://r2.cnpmjs.org/is-ci/-/is-ci-3.0.1.tgz:dependencies:ci-info: 3.9.0@@ -15321,16 +16487,20 @@ snapshots:dependencies:has-tostringtag: 1.0.2- [email protected]: {}+ is-decimal@https://r2.cnpmjs.org/is-decimal/-/is-decimal-1.0.4.tgz: {}- [email protected]: {}+ is-deflate@https://r2.cnpmjs.org/is-deflate/-/is-deflate-1.0.0.tgz: {}- [email protected]: {}+ is-docker@https://r2.cnpmjs.org/is-docker/-/is-docker-2.2.1.tgz: {}++ is-docker@https://r2.cnpmjs.org/is-docker/-/is-docker-3.0.0.tgz: {}+ is-extglob@https://r2.cnpmjs.org/is-extglob/-/is-extglob-2.1.1.tgz: {}+dependencies:call-bind: 1.0.7@@ -15343,32 +16513,42 @@ snapshots:dependencies:get-east-asian-width: 1.2.0+ is-fullwidth-code-point@https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz: {}+dependencies:has-tostringtag: 1.0.2+ is-generator-function@https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz:+ dependencies:+ has-tostringtag: 1.0.2+dependencies:is-extglob: 2.1.1- [email protected]: {}+ is-glob@https://r2.cnpmjs.org/is-glob/-/is-glob-4.0.3.tgz:+ dependencies:+ is-extglob: https://r2.cnpmjs.org/is-extglob/-/is-extglob-2.1.1.tgz++ is-gzip@https://r2.cnpmjs.org/is-gzip/-/is-gzip-1.0.0.tgz: {}- [email protected]: {}+ is-hexadecimal@https://r2.cnpmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz: {}dependencies:- is-docker: 3.0.0+ is-docker: https://r2.cnpmjs.org/is-docker/-/is-docker-3.0.0.tgz+ is-installed-globally@https://r2.cnpmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz:dependencies:global-dirs: 3.0.1- is-path-inside: 3.0.3+ is-path-inside: https://r2.cnpmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz- [email protected]: {}+ is-interactive@https://r2.cnpmjs.org/is-interactive/-/is-interactive-1.0.0.tgz: {}- [email protected]: {}+ is-interactive@https://r2.cnpmjs.org/is-interactive/-/is-interactive-2.0.0.tgz: {}@@ -15377,9 +16557,14 @@ snapshots:call-bind: 1.0.7define-properties: 1.2.1+ is-nan@https://r2.cnpmjs.org/is-nan/-/is-nan-1.3.2.tgz:+ dependencies:+ call-bind: 1.0.7+ define-properties: 1.2.1+- [email protected]: {}+ is-npm@https://r2.cnpmjs.org/is-npm/-/is-npm-6.0.0.tgz: {}dependencies:@@ -15389,15 +16574,19 @@ snapshots:+ is-obj@https://r2.cnpmjs.org/is-obj/-/is-obj-2.0.0.tgz: {}++ is-path-inside@https://r2.cnpmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz: {}++ is-plain-object@https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz:dependencies:- isobject: 3.0.1+ isobject: https://r2.cnpmjs.org/isobject/-/isobject-3.0.1.tgz- [email protected]: {}+ is-plain-object@https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz: {}@@ -15422,10 +16611,16 @@ snapshots:+ is-stream@https://r2.cnpmjs.org/is-stream/-/is-stream-2.0.1.tgz: {}+dependencies:has-tostringtag: 1.0.2+ is-string@https://r2.cnpmjs.org/is-string/-/is-string-1.0.7.tgz:+ dependencies:+ has-tostringtag: 1.0.2+dependencies:has-symbols: 1.0.3@@ -15438,14 +16633,14 @@ snapshots:dependencies:which-typed-array: 1.1.15- [email protected]: {}-- [email protected]: {}+ is-typedarray@https://r2.cnpmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz: {}+ is-unicode-supported@https://r2.cnpmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz: {}+@@ -15457,7 +16652,7 @@ snapshots:call-bind: 1.0.7get-intrinsic: 1.2.4- [email protected]: {}+ is-what@https://r2.cnpmjs.org/is-what/-/is-what-3.14.1.tgz: {}dependencies:@@ -15467,28 +16662,36 @@ snapshots:dependencies:is-inside-container: 1.0.0- [email protected]: {}+ is-wsl@https://r2.cnpmjs.org/is-wsl/-/is-wsl-2.2.0.tgz:+ dependencies:+ is-docker: https://r2.cnpmjs.org/is-docker/-/is-docker-2.2.1.tgz+ isarray@https://r2.cnpmjs.org/isarray/-/isarray-1.0.0.tgz: {}++ isarray@https://r2.cnpmjs.org/isarray/-/isarray-2.0.5.tgz: {}+- [email protected]: {}+ isexe@https://r2.cnpmjs.org/isexe/-/isexe-2.0.0.tgz: {}++ isobject@https://r2.cnpmjs.org/isobject/-/isobject-3.0.1.tgz: {}dependencies:- lodash.capitalize: 4.2.1- lodash.escaperegexp: 4.1.2- lodash.isplainobject: 4.0.6- lodash.isstring: 4.0.1- lodash.uniqby: 4.7.0+ lodash.capitalize: https://r2.cnpmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz+ lodash.escaperegexp: https://r2.cnpmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz+ lodash.isplainobject: https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz+ lodash.isstring: https://r2.cnpmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz+ lodash.uniqby: https://r2.cnpmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgzdependencies:'@babel/core': 7.24.3- '@babel/parser': 7.24.1+ '@babel/parser': 7.24.4'@istanbuljs/schema': 0.1.3istanbul-lib-coverage: 3.2.2semver: 7.6.0@@ -15514,12 +16717,12 @@ snapshots:html-escaper: 2.0.2istanbul-lib-report: 3.0.1- [email protected]: {}+ iterate-iterator@https://r2.cnpmjs.org/iterate-iterator/-/iterate-iterator-1.0.2.tgz: {}+ iterate-value@https://r2.cnpmjs.org/iterate-value/-/iterate-value-1.0.2.tgz:dependencies:es-get-iterator: 1.1.3- iterate-iterator: 1.0.2+ iterate-iterator: https://r2.cnpmjs.org/iterate-iterator/-/iterate-iterator-1.0.2.tgzdependencies:@@ -15538,7 +16741,7 @@ snapshots:dependencies:async: 3.2.5- chalk: 4.1.2+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgzfilelist: 1.0.4minimatch: 3.1.2@@ -15576,12 +16779,12 @@ snapshots:dependencies:'@types/node': 20.12.7- merge-stream: 2.0.0- supports-color: 8.1.1+ merge-stream: https://r2.cnpmjs.org/merge-stream/-/merge-stream-2.0.0.tgz+ supports-color: https://r2.cnpmjs.org/supports-color/-/supports-color-8.1.1.tgz- [email protected]: {}+ jju@https://r2.cnpmjs.org/jju/-/jju-1.4.0.tgz: {}@@ -15589,16 +16792,22 @@ snapshots:+ js-tokens@https://r2.cnpmjs.org/js-tokens/-/js-tokens-4.0.0.tgz: {}+dependencies:argparse: 2.0.1+ js-yaml@https://r2.cnpmjs.org/js-yaml/-/js-yaml-4.1.0.tgz:+ dependencies:+ argparse: https://r2.cnpmjs.org/argparse/-/argparse-2.0.1.tgz+dependencies:'@babel/core': 7.24.3- '@babel/parser': 7.24.1+ '@babel/parser': 7.24.4'@babel/plugin-transform-class-properties': 7.24.1(@babel/[email protected])'@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/[email protected])'@babel/plugin-transform-nullish-coalescing-operator': 7.24.1(@babel/[email protected])@@ -15607,16 +16816,16 @@ snapshots:'@babel/preset-flow': 7.24.1(@babel/[email protected])'@babel/preset-typescript': 7.24.1(@babel/[email protected])'@babel/register': 7.23.7(@babel/[email protected])- babel-core: 7.0.0-bridge.0(@babel/[email protected])- chalk: 4.1.2+ babel-core: https://r2.cnpmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz(@babel/[email protected])+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgzflow-parser: 0.232.0graceful-fs: 4.2.11micromatch: 4.0.5- neo-async: 2.6.2- node-dir: 0.1.17+ neo-async: https://r2.cnpmjs.org/neo-async/-/neo-async-2.6.2.tgz+ node-dir: https://r2.cnpmjs.org/node-dir/-/node-dir-0.1.17.tgzrecast: 0.23.6- temp: 0.8.4- write-file-atomic: 2.4.3+ temp: https://r2.cnpmjs.org/temp/-/temp-0.8.4.tgz+ write-file-atomic: https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgzoptionalDependencies:'@babel/preset-env': 7.24.3(@babel/[email protected])transitivePeerDependencies:@@ -15652,22 +16861,24 @@ snapshots:- supports-color- utf-8-validate- [email protected]: {}-- [email protected]: {}+ jsesc@https://r2.cnpmjs.org/jsesc/-/jsesc-0.5.0.tgz: {}- [email protected]: {}+ jsesc@https://r2.cnpmjs.org/jsesc/-/jsesc-3.0.2.tgz: {}- [email protected]: {}+ [email protected]: {}+ json-parse-even-better-errors@https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz: {}++ json-schema-traverse@https://r2.cnpmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz: {}+@@ -15683,11 +16894,17 @@ snapshots:+ dependencies:+ universalify: 2.0.1optionalDependencies:graceful-fs: 4.2.11+ jsonfile@https://r2.cnpmjs.org/jsonfile/-/jsonfile-4.0.0.tgz:+ optionalDependencies:+ graceful-fs: 4.2.11++ jsonfile@https://r2.cnpmjs.org/jsonfile/-/jsonfile-6.1.0.tgz:dependencies:universalify: 2.0.1optionalDependencies:@@ -15706,9 +16923,9 @@ snapshots:dependencies:json-buffer: 3.0.1- [email protected]: {}+ kind-of@https://r2.cnpmjs.org/kind-of/-/kind-of-6.0.3.tgz: {}- [email protected]: {}+ kleur@https://r2.cnpmjs.org/kleur/-/kleur-3.0.3.tgz: {}@@ -15718,7 +16935,7 @@ snapshots:dependencies:- app-root-dir: 1.0.2+ app-root-dir: https://r2.cnpmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgzdotenv: 16.4.5dotenv-expand: 10.0.0@@ -15731,7 +16948,7 @@ snapshots:dependencies:copy-anything: 2.0.6- parse-node-version: 1.0.1+ parse-node-version: https://r2.cnpmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgztslib: 2.6.2optionalDependencies:errno: 0.1.8@@ -15742,7 +16959,7 @@ snapshots:needle: 3.3.1source-map: 0.6.1- [email protected]: {}+ leven@https://r2.cnpmjs.org/leven/-/leven-3.1.0.tgz: {}dependencies:@@ -15754,7 +16971,7 @@ snapshots:prelude-ls: 1.2.1type-check: 0.4.0- [email protected]: {}+ [email protected]: {}dependencies:@@ -15762,10 +16979,10 @@ snapshots:- [email protected]: {}-+ lines-and-columns@https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz: {}+dependencies:chalk: 5.3.0@@ -15803,15 +17020,6 @@ snapshots:dependencies:lie: 3.1.1- dependencies:- p-locate: 3.0.0- path-exists: 3.0.0-- dependencies:- p-locate: 4.1.0-dependencies:p-locate: 5.0.0@@ -15820,54 +17028,71 @@ snapshots:dependencies:p-locate: 6.0.0+ locate-path@https://r2.cnpmjs.org/locate-path/-/locate-path-3.0.0.tgz:+ dependencies:+ p-locate: https://r2.cnpmjs.org/p-locate/-/p-locate-3.0.0.tgz+ path-exists: https://r2.cnpmjs.org/path-exists/-/path-exists-3.0.0.tgz++ locate-path@https://r2.cnpmjs.org/locate-path/-/locate-path-5.0.0.tgz:+ dependencies:+ p-locate: https://r2.cnpmjs.org/p-locate/-/p-locate-4.1.0.tgz++ locate-path@https://r2.cnpmjs.org/locate-path/-/locate-path-6.0.0.tgz:+ dependencies:+ p-locate: https://r2.cnpmjs.org/p-locate/-/p-locate-5.0.0.tgz+- [email protected]: {}+ lodash.camelcase@https://r2.cnpmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz: {}- [email protected]: {}+ lodash.capitalize@https://r2.cnpmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz: {}- [email protected]: {}+ lodash.debounce@https://r2.cnpmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz: {}- [email protected]: {}+ lodash.escaperegexp@https://r2.cnpmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz: {}lodash.get@https://r2.cnpmjs.org/lodash.get/-/lodash.get-4.4.2.tgz: {}- [email protected]: {}+ lodash.isequal@https://r2.cnpmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz: {}- [email protected]: {}+ lodash.isplainobject@https://r2.cnpmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz: {}- [email protected]: {}+ lodash.isstring@https://r2.cnpmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz: {}- [email protected]: {}+ lodash.kebabcase@https://r2.cnpmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz: {}- [email protected]: {}+ lodash.merge@https://r2.cnpmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz: {}++ lodash.mergewith@https://r2.cnpmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz: {}- [email protected]: {}+ lodash.snakecase@https://r2.cnpmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz: {}- [email protected]: {}+ lodash.startcase@https://r2.cnpmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz: {}- [email protected]: {}+ lodash.uniq@https://r2.cnpmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz: {}- [email protected]: {}+ lodash.uniqby@https://r2.cnpmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz: {}- [email protected]: {}+ lodash.upperfirst@https://r2.cnpmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz: {}- dependencies:- chalk: 4.1.2- is-unicode-supported: 0.1.0+ lodash@https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz: {}dependencies:chalk: 5.3.0is-unicode-supported: 1.3.0+ log-symbols@https://r2.cnpmjs.org/log-symbols/-/log-symbols-4.1.0.tgz:+ dependencies:+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz+ is-unicode-supported: https://r2.cnpmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz+dependencies:ansi-escapes: 6.2.1@@ -15882,15 +17107,19 @@ snapshots:dependencies:js-tokens: 4.0.0+ loose-envify@https://r2.cnpmjs.org/loose-envify/-/loose-envify-1.4.0.tgz:+ dependencies:+ js-tokens: https://r2.cnpmjs.org/js-tokens/-/js-tokens-4.0.0.tgz+dependencies:get-func-name: 2.0.2+ lower-case@https://r2.cnpmjs.org/lower-case/-/lower-case-2.0.2.tgz:dependencies:tslib: 2.6.2- [email protected]: {}+ lowercase-keys@https://r2.cnpmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz: {}@@ -15898,10 +17127,6 @@ snapshots:dependencies:yallist: 3.1.1- dependencies:- yallist: 4.0.0-lru-cache@https://r2.cnpmjs.org/lru-cache/-/lru-cache-6.0.0.tgz:@@ -15912,30 +17137,40 @@ snapshots:+ dependencies:+ '@jridgewell/sourcemap-codec': 1.4.15+dependencies:'@jridgewell/sourcemap-codec': 1.4.15dependencies:- '@babel/parser': 7.24.1+ '@babel/parser': 7.24.4'@babel/types': 7.24.0source-map-js: 1.2.0dependencies:- pify: 4.0.1+ pify: https://r2.cnpmjs.org/pify/-/pify-4.0.1.tgzsemver: 5.7.2-- dependencies:- semver: 6.3.1+ optional: truedependencies:semver: 7.6.0- [email protected]: {}+ make-dir@https://r2.cnpmjs.org/make-dir/-/make-dir-2.1.0.tgz:+ dependencies:+ pify: https://r2.cnpmjs.org/pify/-/pify-4.0.1.tgz+ semver: 5.7.2++ make-dir@https://r2.cnpmjs.org/make-dir/-/make-dir-3.1.0.tgz:+ dependencies:+ semver: 6.3.1++ map-or-similar@https://r2.cnpmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz: {}dependencies:@@ -15952,44 +17187,46 @@ snapshots:crypt: 0.0.2is-buffer: 1.1.6+ mdast-util-from-markdown@https://r2.cnpmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz:dependencies:'@types/mdast': 3.0.15- mdast-util-to-string: 2.0.0- micromark: 2.11.4- parse-entities: 2.0.0- unist-util-stringify-position: 2.0.3+ mdast-util-to-string: https://r2.cnpmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz+ micromark: https://r2.cnpmjs.org/micromark/-/micromark-2.11.4.tgz+ parse-entities: https://r2.cnpmjs.org/parse-entities/-/parse-entities-2.0.0.tgz+ unist-util-stringify-position: https://r2.cnpmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgztransitivePeerDependencies:- supports-color- [email protected]: {}+ mdast-util-to-string@https://r2.cnpmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz: {}- [email protected]: {}+ media-typer@https://r2.cnpmjs.org/media-typer/-/media-typer-0.3.0.tgz: {}dependencies:fs-monkey: 1.0.5+ memoizerific@https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgz:dependencies:- map-or-similar: 1.5.0+ map-or-similar: https://r2.cnpmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz- [email protected]: {}+ merge-descriptors@https://r2.cnpmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz: {}+ merge-stream@https://r2.cnpmjs.org/merge-stream/-/merge-stream-2.0.0.tgz: {}+- [email protected]: {}+ methods@https://r2.cnpmjs.org/methods/-/methods-1.1.2.tgz: {}+ micromark@https://r2.cnpmjs.org/micromark/-/micromark-2.11.4.tgz:dependencies:debug: 4.3.4- parse-entities: 2.0.0+ parse-entities: https://r2.cnpmjs.org/parse-entities/-/parse-entities-2.0.0.tgztransitivePeerDependencies:- supports-color@@ -16010,23 +17247,28 @@ snapshots:dependencies:mime-db: 1.52.0- [email protected]: {}+ optional: true+ mime@https://r2.cnpmjs.org/mime/-/mime-1.6.0.tgz: {}+- [email protected]: {}+ mimic-fn@https://r2.cnpmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz: {}- [email protected]: {}+ mimic-response@https://r2.cnpmjs.org/mimic-response/-/mimic-response-3.1.0.tgz: {}- [email protected]: {}+ mimic-response@https://r2.cnpmjs.org/mimic-response/-/mimic-response-4.0.0.tgz: {}++ min-indent@https://r2.cnpmjs.org/min-indent/-/min-indent-1.0.1.tgz: {}dependencies:- brace-expansion: 1.1.11+ brace-expansion: https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgzdependencies:@@ -16034,11 +17276,11 @@ snapshots:dependencies:- brace-expansion: 2.0.1+ brace-expansion: https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgzdependencies:- brace-expansion: 2.0.1+ brace-expansion: https://r2.cnpmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgzdependencies:@@ -16048,23 +17290,23 @@ snapshots:dependencies:- yallist: 4.0.0+ yallist: https://r2.cnpmjs.org/yallist/-/yallist-4.0.0.tgz+ minizlib@https://r2.cnpmjs.org/minizlib/-/minizlib-2.1.2.tgz:dependencies:minipass: 3.3.6- yallist: 4.0.0-- [email protected]: {}+ yallist: https://r2.cnpmjs.org/yallist/-/yallist-4.0.0.tgz- [email protected]: {}+ mkdirp-classic@https://r2.cnpmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz: {}+ mkdirp@https://r2.cnpmjs.org/mkdirp/-/mkdirp-1.0.4.tgz: {}+dependencies:acorn: 8.11.3@@ -16080,11 +17322,11 @@ snapshots:dependencies:color-name: 1.1.4- [email protected]: {}+ ms@https://r2.cnpmjs.org/ms/-/ms-2.0.0.tgz: {}- [email protected]: {}+ ms@https://r2.cnpmjs.org/ms/-/ms-2.1.2.tgz: {}- [email protected]: {}+ ms@https://r2.cnpmjs.org/ms/-/ms-2.1.3.tgz: {}@@ -16102,13 +17344,15 @@ snapshots:- [email protected]: {}+ natural-compare-lite@https://r2.cnpmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz: {}+ natural-compare@https://r2.cnpmjs.org/natural-compare/-/natural-compare-1.4.0.tgz: {}+dependencies:- iconv-lite: 0.6.3+ iconv-lite: https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgzsax: 1.3.0optional: true@@ -16116,46 +17360,41 @@ snapshots:- [email protected]: {}+ neo-async@https://r2.cnpmjs.org/neo-async/-/neo-async-2.6.2.tgz: {}++ netmask@https://r2.cnpmjs.org/netmask/-/netmask-2.0.2.tgz: {}+ new-github-release-url@https://r2.cnpmjs.org/new-github-release-url/-/new-github-release-url-2.0.0.tgz:dependencies:type-fest: 2.19.0+ no-case@https://r2.cnpmjs.org/no-case/-/no-case-3.0.4.tgz:dependencies:- lower-case: 2.0.2+ lower-case: https://r2.cnpmjs.org/lower-case/-/lower-case-2.0.2.tgztslib: 2.6.2+ node-dir@https://r2.cnpmjs.org/node-dir/-/node-dir-0.1.17.tgz:dependencies:minimatch: 3.1.2- [email protected]: {}+ node-domexception@https://r2.cnpmjs.org/node-domexception/-/node-domexception-1.0.0.tgz: {}dependencies:- whatwg-url: 5.0.0+ whatwg-url: https://r2.cnpmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgzdependencies:data-uri-to-buffer: 4.0.1fetch-blob: 3.2.0- formdata-polyfill: 4.0.10+ formdata-polyfill: https://r2.cnpmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz- dependencies:- hosted-git-info: 2.8.9- resolve: 1.22.8- semver: 5.7.2- validate-npm-package-license: 3.0.4-dependencies:hosted-git-info: 7.0.1@@ -16163,6 +17402,13 @@ snapshots:semver: 7.6.0validate-npm-package-license: 3.0.4+ normalize-package-data@https://r2.cnpmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz:+ dependencies:+ hosted-git-info: https://r2.cnpmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz+ resolve: 1.22.8+ semver: 5.7.2+ validate-npm-package-license: https://r2.cnpmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz+@@ -16175,9 +17421,13 @@ snapshots:dependencies:path-key: 4.0.0+ npm-run-path@https://r2.cnpmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz:+ dependencies:+ path-key: https://r2.cnpmjs.org/path-key/-/path-key-3.1.1.tgz+dependencies:- boolbase: 1.0.0+ boolbase: https://r2.cnpmjs.org/boolbase/-/boolbase-1.0.0.tgz@@ -16236,13 +17486,13 @@ snapshots:define-properties: 1.2.1es-object-atoms: 1.0.0- [email protected]: {}+ objectorarray@https://r2.cnpmjs.org/objectorarray/-/objectorarray-1.0.5.tgz: {}dependencies:- ee-first: 1.1.1+ ee-first: https://r2.cnpmjs.org/ee-first/-/ee-first-1.1.1.tgz@@ -16250,6 +17500,10 @@ snapshots:dependencies:wrappy: 1.0.2+ once@https://r2.cnpmjs.org/once/-/once-1.4.0.tgz:+ dependencies:+ wrappy: https://r2.cnpmjs.org/wrappy/-/wrappy-1.0.2.tgz+dependencies:mimic-fn: 2.1.0@@ -16258,18 +17512,22 @@ snapshots:dependencies:mimic-fn: 4.0.0+ onetime@https://r2.cnpmjs.org/onetime/-/onetime-5.1.2.tgz:+ dependencies:+ mimic-fn: https://r2.cnpmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz+dependencies:default-browser: 5.2.1- define-lazy-prop: 3.0.0+ define-lazy-prop: https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgzis-inside-container: 1.0.0is-wsl: 3.1.0dependencies:- define-lazy-prop: 2.0.0- is-docker: 2.2.1- is-wsl: 2.2.0+ define-lazy-prop: https://r2.cnpmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz+ is-docker: https://r2.cnpmjs.org/is-docker/-/is-docker-2.2.1.tgz+ is-wsl: https://r2.cnpmjs.org/is-wsl/-/is-wsl-2.2.0.tgz@@ -16296,42 +17554,38 @@ snapshots:prelude-ls: 1.2.1type-check: 0.4.0- dependencies:- bl: 4.1.0- chalk: 4.1.2- cli-cursor: 3.1.0- cli-spinners: 2.9.2- is-interactive: 1.0.0- is-unicode-supported: 0.1.0- log-symbols: 4.1.0- strip-ansi: 6.0.1- wcwidth: 1.0.1-dependencies:chalk: 5.3.0- cli-cursor: 4.0.0+ cli-cursor: https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgzcli-spinners: 2.9.2- is-interactive: 2.0.0+ is-interactive: https://r2.cnpmjs.org/is-interactive/-/is-interactive-2.0.0.tgzis-unicode-supported: 2.0.0log-symbols: 6.0.0stdin-discarder: 0.2.2string-width: 7.1.0strip-ansi: 7.1.0+ ora@https://r2.cnpmjs.org/ora/-/ora-5.4.1.tgz:+ dependencies:+ bl: https://r2.cnpmjs.org/bl/-/bl-4.1.0.tgz+ chalk: https://r2.cnpmjs.org/chalk/-/chalk-4.1.2.tgz+ cli-cursor: https://r2.cnpmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz+ cli-spinners: 2.9.2+ is-interactive: https://r2.cnpmjs.org/is-interactive/-/is-interactive-1.0.0.tgz+ is-unicode-supported: https://r2.cnpmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz+ log-symbols: https://r2.cnpmjs.org/log-symbols/-/log-symbols-4.1.0.tgz+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz+ wcwidth: https://r2.cnpmjs.org/wcwidth/-/wcwidth-1.0.1.tgz+dependencies:macos-release: 3.2.0windows-release: 5.1.1- [email protected]: {}-- [email protected]: {}+ os-tmpdir@https://r2.cnpmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz: {}- dependencies:- p-try: 2.2.0+ p-cancelable@https://r2.cnpmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz: {}dependencies:@@ -16343,15 +17597,15 @@ snapshots:dependencies:- yocto-queue: 1.0.0+ yocto-queue: https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz+ p-limit@https://r2.cnpmjs.org/p-limit/-/p-limit-2.3.0.tgz:dependencies:- p-limit: 2.3.0+ p-try: https://r2.cnpmjs.org/p-try/-/p-try-2.2.0.tgz+ p-limit@https://r2.cnpmjs.org/p-limit/-/p-limit-3.1.0.tgz:dependencies:- p-limit: 2.3.0+ yocto-queue: https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgzdependencies:@@ -16361,11 +17615,23 @@ snapshots:dependencies:p-limit: 4.0.0+ p-locate@https://r2.cnpmjs.org/p-locate/-/p-locate-3.0.0.tgz:+ dependencies:+ p-limit: https://r2.cnpmjs.org/p-limit/-/p-limit-2.3.0.tgz++ p-locate@https://r2.cnpmjs.org/p-locate/-/p-locate-4.1.0.tgz:+ dependencies:+ p-limit: https://r2.cnpmjs.org/p-limit/-/p-limit-2.3.0.tgz++ p-locate@https://r2.cnpmjs.org/p-locate/-/p-locate-5.0.0.tgz:+ dependencies:+ p-limit: https://r2.cnpmjs.org/p-limit/-/p-limit-3.1.0.tgz+dependencies:aggregate-error: 3.1.0- [email protected]: {}+ p-try@https://r2.cnpmjs.org/p-try/-/p-try-2.2.0.tgz: {}dependencies:@@ -16383,7 +17649,7 @@ snapshots:dependencies:degenerator: 5.0.1- netmask: 2.0.2+ netmask: https://r2.cnpmjs.org/netmask/-/netmask-2.0.2.tgzdependencies:@@ -16394,32 +17660,29 @@ snapshots:+ param-case@https://r2.cnpmjs.org/param-case/-/param-case-3.0.4.tgz:dependencies:- dot-case: 3.0.4+ dot-case: https://r2.cnpmjs.org/dot-case/-/dot-case-3.0.4.tgztslib: 2.6.2dependencies:callsites: 3.1.0+ parent-module@https://r2.cnpmjs.org/parent-module/-/parent-module-1.0.1.tgz:dependencies:- character-entities: 1.2.4- character-entities-legacy: 1.1.4- character-reference-invalid: 1.1.4- is-alphanumerical: 1.0.4- is-decimal: 1.0.4- is-hexadecimal: 1.0.4-- [email protected]: {}+ callsites: https://r2.cnpmjs.org/callsites/-/callsites-3.1.0.tgz+ parse-entities@https://r2.cnpmjs.org/parse-entities/-/parse-entities-2.0.0.tgz:dependencies:- '@babel/code-frame': 7.24.2- error-ex: 1.3.2- json-parse-even-better-errors: 2.3.1- lines-and-columns: 1.2.4+ character-entities: https://r2.cnpmjs.org/character-entities/-/character-entities-1.2.4.tgz+ character-entities-legacy: https://r2.cnpmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz+ character-reference-invalid: https://r2.cnpmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz+ is-alphanumerical: https://r2.cnpmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz+ is-decimal: https://r2.cnpmjs.org/is-decimal/-/is-decimal-1.0.4.tgz+ is-hexadecimal: https://r2.cnpmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz++ [email protected]: {}dependencies:@@ -16429,7 +17692,14 @@ snapshots:lines-and-columns: 2.0.4type-fest: 3.13.1- [email protected]: {}+ parse-json@https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz:+ dependencies:+ '@babel/code-frame': 7.24.2+ error-ex: https://r2.cnpmjs.org/error-ex/-/error-ex-1.3.2.tgz+ json-parse-even-better-errors: https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz+ lines-and-columns: https://r2.cnpmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz++ parse-node-version@https://r2.cnpmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz: {}dependencies:@@ -16443,21 +17713,25 @@ snapshots:dependencies:entities: 4.5.0- [email protected]: {}+ parseurl@https://r2.cnpmjs.org/parseurl/-/parseurl-1.3.3.tgz: {}+ pascal-case@https://r2.cnpmjs.org/pascal-case/-/pascal-case-3.1.2.tgz:dependencies:- no-case: 3.0.4+ no-case: https://r2.cnpmjs.org/no-case/-/no-case-3.0.4.tgztslib: 2.6.2- [email protected]: {}-- [email protected]: {}+ path-browserify@https://r2.cnpmjs.org/path-browserify/-/path-browserify-1.0.1.tgz: {}+ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-3.0.0.tgz: {}++ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-4.0.0.tgz: {}++ path-exists@https://r2.cnpmjs.org/path-exists/-/path-exists-5.0.0.tgz: {}+@@ -16466,8 +17740,12 @@ snapshots:+ path-key@https://r2.cnpmjs.org/path-key/-/path-key-3.1.1.tgz: {}++ path-parse@https://r2.cnpmjs.org/path-parse/-/path-parse-1.0.7.tgz: {}+@@ -16479,23 +17757,25 @@ snapshots:lru-cache: 10.2.0minipass: 7.0.4- [email protected]: {}-+ path-to-regexp@https://r2.cnpmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz: {}+- [email protected]: {}+ path-type@https://r2.cnpmjs.org/path-type/-/path-type-4.0.0.tgz: {}++ path-type@https://r2.cnpmjs.org/path-type/-/path-type-5.0.0.tgz: {}+ peek-stream@https://r2.cnpmjs.org/peek-stream/-/peek-stream-1.1.3.tgz:dependencies:- buffer-from: 1.1.2- duplexify: 3.7.1- through2: 2.0.5+ buffer-from: https://r2.cnpmjs.org/buffer-from/-/buffer-from-1.1.2.tgz+ duplexify: https://r2.cnpmjs.org/duplexify/-/duplexify-3.7.1.tgz+ through2: https://r2.cnpmjs.org/through2/-/through2-2.0.5.tgz@@ -16507,21 +17787,21 @@ snapshots:- [email protected]: {}+ pify@https://r2.cnpmjs.org/pify/-/pify-4.0.1.tgz: {}+ pkg-dir@https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz:dependencies:- find-up: 3.0.0+ find-up: https://r2.cnpmjs.org/find-up/-/find-up-3.0.0.tgz+ pkg-dir@https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz:dependencies:- find-up: 4.1.0+ find-up: https://r2.cnpmjs.org/find-up/-/find-up-4.1.0.tgz+ pkg-dir@https://r2.cnpmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz:dependencies:- find-up: 5.0.0+ find-up: https://r2.cnpmjs.org/find-up/-/find-up-5.0.0.tgzdependencies:@@ -16537,7 +17817,7 @@ snapshots:optionalDependencies:fsevents: 2.3.2- [email protected]: {}+ pluralize@https://r2.cnpmjs.org/pluralize/-/pluralize-8.0.0.tgz: {}dependencies:@@ -16595,35 +17875,37 @@ snapshots:+ prettier-linter-helpers@https://r2.cnpmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz:dependencies:fast-diff: 1.3.0+ pretty-error@https://r2.cnpmjs.org/pretty-error/-/pretty-error-4.0.0.tgz:dependencies:- lodash: 4.17.21- renderkid: 3.0.0+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ renderkid: https://r2.cnpmjs.org/renderkid/-/renderkid-3.0.0.tgzdependencies:ansi-regex: 5.0.1ansi-styles: 5.2.0- react-is: 17.0.2+ react-is: https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgzdependencies:'@jest/schemas': 29.6.3- ansi-styles: 5.2.0+ ansi-styles: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgzreact-is: 18.2.0- [email protected]: {}+ pretty-hrtime@https://r2.cnpmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz: {}- [email protected]: {}+ process-nextick-args@https://r2.cnpmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz: {}+ process@https://r2.cnpmjs.org/process/-/process-0.11.10.tgz: {}+dependencies:array.prototype.map: 1.0.7@@ -16631,20 +17913,20 @@ snapshots:define-properties: 1.2.1es-abstract: 1.23.3get-intrinsic: 1.2.4- iterate-value: 1.0.2+ iterate-value: https://r2.cnpmjs.org/iterate-value/-/iterate-value-1.0.2.tgz+ prompts@https://r2.cnpmjs.org/prompts/-/prompts-2.4.2.tgz:dependencies:- kleur: 3.0.3- sisteransi: 1.0.5+ kleur: https://r2.cnpmjs.org/kleur/-/kleur-3.0.3.tgz+ sisteransi: https://r2.cnpmjs.org/sisteransi/-/sisteransi-1.0.5.tgzdependencies:- loose-envify: 1.4.0+ loose-envify: https://r2.cnpmjs.org/loose-envify/-/loose-envify-1.4.0.tgzobject-assign: 4.1.1react-is: 16.13.1- [email protected]: {}+ proto-list@https://r2.cnpmjs.org/proto-list/-/proto-list-1.2.4.tgz: {}dependencies:@@ -16663,10 +17945,10 @@ snapshots:+ proxy-addr@https://r2.cnpmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz:dependencies:- forwarded: 0.2.0- ipaddr.js: 1.9.1+ forwarded: https://r2.cnpmjs.org/forwarded/-/forwarded-0.2.0.tgz+ ipaddr.js: https://r2.cnpmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgzdependencies:@@ -16676,41 +17958,43 @@ snapshots:https-proxy-agent: 7.0.4lru-cache: 7.18.3pac-proxy-agent: 7.0.1- proxy-from-env: 1.1.0+ proxy-from-env: https://r2.cnpmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgzsocks-proxy-agent: 8.0.3transitivePeerDependencies:- supports-color- [email protected]: {}+ proxy-from-env@https://r2.cnpmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz: {}+ prr@https://r2.cnpmjs.org/prr/-/prr-1.0.1.tgz:optional: true+ pump@https://r2.cnpmjs.org/pump/-/pump-2.0.1.tgz:dependencies:- end-of-stream: 1.4.4- once: 1.4.0+ end-of-stream: https://r2.cnpmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz+ once: https://r2.cnpmjs.org/once/-/once-1.4.0.tgz+ pump@https://r2.cnpmjs.org/pump/-/pump-3.0.0.tgz:dependencies:- end-of-stream: 1.4.4- once: 1.4.0+ end-of-stream: https://r2.cnpmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz+ once: https://r2.cnpmjs.org/once/-/once-1.4.0.tgz+ pumpify@https://r2.cnpmjs.org/pumpify/-/pumpify-1.5.1.tgz:dependencies:- duplexify: 3.7.1- inherits: 2.0.4- pump: 2.0.1+ duplexify: https://r2.cnpmjs.org/duplexify/-/duplexify-3.7.1.tgz+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz+ pump: https://r2.cnpmjs.org/pump/-/pump-2.0.1.tgz+ punycode@https://r2.cnpmjs.org/punycode/-/punycode-1.4.1.tgz: {}++ pupa@https://r2.cnpmjs.org/pupa/-/pupa-3.1.0.tgz:dependencies:- escape-goat: 4.0.0+ escape-goat: https://r2.cnpmjs.org/escape-goat/-/escape-goat-4.0.0.tgzdependencies:@@ -16724,24 +18008,24 @@ snapshots:- [email protected]: {}+ quick-lru@https://r2.cnpmjs.org/quick-lru/-/quick-lru-5.1.1.tgz: {}+ randombytes@https://r2.cnpmjs.org/randombytes/-/randombytes-2.1.0.tgz:dependencies:- safe-buffer: 5.2.1+ safe-buffer: https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz- [email protected]: {}+ range-parser@https://r2.cnpmjs.org/range-parser/-/range-parser-1.2.1.tgz: {}dependencies:bytes: 3.1.2- http-errors: 2.0.0- iconv-lite: 0.4.24- unpipe: 1.0.0+ http-errors: https://r2.cnpmjs.org/http-errors/-/http-errors-2.0.0.tgz+ iconv-lite: https://r2.cnpmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz+ unpipe: https://r2.cnpmjs.org/unpipe/-/unpipe-1.0.0.tgzdependencies:@@ -16910,6 +18194,13 @@ snapshots:minimist: 1.2.8strip-json-comments: 2.0.1+ rc@https://r2.cnpmjs.org/rc/-/rc-1.2.8.tgz:+ dependencies:+ deep-extend: https://r2.cnpmjs.org/deep-extend/-/deep-extend-0.6.0.tgz+ ini: https://r2.cnpmjs.org/ini/-/ini-1.3.8.tgz+ minimist: 1.2.8+ strip-json-comments: https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz+dependencies:dnd-multi-backend: 8.0.3([email protected])@@ -16926,32 +18217,32 @@ snapshots:dependencies:react: 18.2.0- tween-functions: 1.2.0+ tween-functions: https://r2.cnpmjs.org/tween-functions/-/tween-functions-1.2.0.tgzdependencies:dnd-core: 16.0.1- [email protected]([email protected])([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected]([email protected]))([email protected]):+ [email protected]([email protected])([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected]([email protected]))([email protected]):dependencies:dnd-core: 16.0.1dnd-multi-backend: 8.0.3([email protected])react: 18.2.0- react-dnd-preview: 8.0.3([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected])+ react-dnd-preview: 8.0.3([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected])react-dom: 18.2.0([email protected])- [email protected]([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected]):+ [email protected]([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected]):dependencies:react: 18.2.0dependencies:'@react-dnd/invariant': 4.0.2dnd-core: 16.0.1dependencies:'@react-dnd/invariant': 4.0.2'@react-dnd/shallowequal': 4.0.2@@ -16961,9 +18252,9 @@ snapshots:react: 18.2.0optionalDependencies:'@types/node': 20.12.7- '@types/react': 18.3.1+ '@types/react': 18.2.79+ react-docgen-typescript@https://r2.cnpmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz([email protected]):dependencies:typescript: 5.4.5@@ -16976,9 +18267,9 @@ snapshots:'@types/babel__traverse': 7.20.5'@types/doctrine': 0.0.9'@types/resolve': 1.20.6- doctrine: 3.0.0+ doctrine: https://r2.cnpmjs.org/doctrine/-/doctrine-3.0.0.tgzresolve: 1.22.8- strip-indent: 4.0.0+ strip-indent: https://r2.cnpmjs.org/strip-indent/-/strip-indent-4.0.0.tgztransitivePeerDependencies:- supports-color@@ -16997,8 +18288,8 @@ snapshots:dependencies:- '@base2/pretty-print-object': 1.0.1- is-plain-object: 5.0.0+ '@base2/pretty-print-object': https://r2.cnpmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz+ is-plain-object: https://r2.cnpmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgzreact: 18.2.0react-dom: 18.2.0([email protected])react-is: 18.1.0@@ -17021,13 +18312,13 @@ snapshots:- [email protected]: {}-- [email protected](@types/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))([email protected]):+ react-is@https://r2.cnpmjs.org/react-is/-/react-is-17.0.2.tgz: {}++ [email protected](@types/[email protected])(@types/[email protected])([email protected])([email protected]([email protected]))([email protected]):dependencies:classnames: 2.5.1immutability-helper: 3.1.1@@ -17035,9 +18326,9 @@ snapshots:prop-types: 15.8.1rdndmb-html5-to-touch: 8.0.3([email protected])react: 18.2.0react-dnd-html5-backend: 16.0.1- react-dnd-multi-backend: 8.0.3([email protected])([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected]([email protected]))([email protected])+ react-dnd-multi-backend: 8.0.3([email protected])([email protected](@types/[email protected])(@types/[email protected])([email protected]))([email protected]([email protected]))([email protected])react-dnd-touch-backend: 16.0.1uuid: 9.0.1transitivePeerDependencies:@@ -17076,18 +18367,11 @@ snapshots:read-pkg: 8.1.0type-fest: 4.14.0- dependencies:- find-up: 4.1.0- read-pkg: 5.2.0- type-fest: 0.8.1-+ read-pkg-up@https://r2.cnpmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz:dependencies:- '@types/normalize-package-data': 2.4.4- normalize-package-data: 2.5.0- parse-json: 5.2.0- type-fest: 0.6.0+ find-up: https://r2.cnpmjs.org/find-up/-/find-up-4.1.0.tgz+ read-pkg: https://r2.cnpmjs.org/read-pkg/-/read-pkg-5.2.0.tgz+ type-fest: https://r2.cnpmjs.org/type-fest/-/type-fest-0.8.1.tgzdependencies:@@ -17096,15 +18380,22 @@ snapshots:parse-json: 7.1.1type-fest: 4.14.0+ read-pkg@https://r2.cnpmjs.org/read-pkg/-/read-pkg-5.2.0.tgz:+ dependencies:+ '@types/normalize-package-data': 2.4.4+ normalize-package-data: https://r2.cnpmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz+ parse-json: https://r2.cnpmjs.org/parse-json/-/parse-json-5.2.0.tgz+ type-fest: https://r2.cnpmjs.org/type-fest/-/type-fest-0.6.0.tgz+dependencies:- core-util-is: 1.0.3- inherits: 2.0.4- isarray: 1.0.0- process-nextick-args: 2.0.1- safe-buffer: 5.1.2- string_decoder: 1.1.1- util-deprecate: 1.0.2+ core-util-is: https://r2.cnpmjs.org/core-util-is/-/core-util-is-1.0.3.tgz+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz+ isarray: https://r2.cnpmjs.org/isarray/-/isarray-1.0.0.tgz+ process-nextick-args: https://r2.cnpmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz+ safe-buffer: https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz+ string_decoder: https://r2.cnpmjs.org/string_decoder/-/string_decoder-1.1.1.tgz+ util-deprecate: https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgzdependencies:@@ -17119,19 +18410,19 @@ snapshots:dependencies:ast-types: 0.16.1- esprima: 4.0.1- source-map: 0.6.1+ esprima: https://r2.cnpmjs.org/esprima/-/esprima-4.0.1.tgz+ source-map: https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgztiny-invariant: 1.3.3tslib: 2.6.2+ rechoir@https://r2.cnpmjs.org/rechoir/-/rechoir-0.6.2.tgz:dependencies:resolve: 1.22.8+ redent@https://r2.cnpmjs.org/redent/-/redent-3.0.0.tgz:dependencies:- indent-string: 4.0.0- strip-indent: 3.0.0+ indent-string: https://r2.cnpmjs.org/indent-string/-/indent-string-4.0.0.tgz+ strip-indent: https://r2.cnpmjs.org/strip-indent/-/strip-indent-3.0.0.tgzdependencies:@@ -17151,9 +18442,9 @@ snapshots:dependencies:- regenerate: 1.4.2+ regenerate: https://r2.cnpmjs.org/regenerate/-/regenerate-1.4.2.tgz- [email protected]: {}+ regenerate@https://r2.cnpmjs.org/regenerate/-/regenerate-1.4.2.tgz: {}@@ -17177,10 +18468,10 @@ snapshots:dependencies:'@babel/regjsgen': 0.8.0- regenerate: 1.4.2+ regenerate: https://r2.cnpmjs.org/regenerate/-/regenerate-1.4.2.tgzregenerate-unicode-properties: 10.1.1regjsparser: 0.9.1- unicode-match-property-ecmascript: 2.0.0+ unicode-match-property-ecmascript: https://r2.cnpmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgzunicode-match-property-value-ecmascript: 2.1.0@@ -17198,22 +18489,22 @@ snapshots:dependencies:- rc: 1.2.8+ rc: https://r2.cnpmjs.org/rc/-/rc-1.2.8.tgzdependencies:- jsesc: 0.5.0+ jsesc: https://r2.cnpmjs.org/jsesc/-/jsesc-0.5.0.tgzdependencies:- jsesc: 0.5.0+ jsesc: https://r2.cnpmjs.org/jsesc/-/jsesc-0.5.0.tgzdependencies:'@types/hast': 3.0.4'@ungap/structured-clone': 1.2.0hast-util-is-element: 3.0.0- is-absolute-url: 4.0.1+ is-absolute-url: https://r2.cnpmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgzspace-separated-tokens: 2.0.2unist-util-visit: 5.0.0@@ -17225,25 +18516,25 @@ snapshots:hast-util-to-string: 3.0.0unist-util-visit: 5.0.0- [email protected]: {}+ relateurl@https://r2.cnpmjs.org/relateurl/-/relateurl-0.2.7.tgz: {}dependencies:- '@iarna/toml': 2.2.5+ '@iarna/toml': https://r2.cnpmjs.org/@iarna/toml/-/toml-2.2.5.tgz'@octokit/rest': 20.1.0- async-retry: 1.3.3+ async-retry: https://r2.cnpmjs.org/async-retry/-/async-retry-1.3.3.tgzchalk: 5.3.0cosmiconfig: 9.0.0([email protected])execa: 8.0.1git-url-parse: 14.0.0globby: 14.0.1got: 13.0.0- inquirer: 9.2.19- is-ci: 3.0.1+ inquirer: 9.2.17+ is-ci: https://r2.cnpmjs.org/is-ci/-/is-ci-3.0.1.tgzissue-parser: 7.0.0- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzmime-types: 2.1.35- new-github-release-url: 2.0.0+ new-github-release-url: https://r2.cnpmjs.org/new-github-release-url/-/new-github-release-url-2.0.0.tgznode-fetch: 3.3.2open: 10.1.0ora: 8.0.1@@ -17260,15 +18551,15 @@ snapshots:- supports-color- typescript+ renderkid@https://r2.cnpmjs.org/renderkid/-/renderkid-3.0.0.tgz:dependencies:css-select: 4.3.0- dom-converter: 0.2.0- htmlparser2: 6.1.0- lodash: 4.17.21- strip-ansi: 6.0.1+ dom-converter: https://r2.cnpmjs.org/dom-converter/-/dom-converter-0.2.0.tgz+ htmlparser2: https://r2.cnpmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgz+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz- [email protected]: {}+ require-directory@https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz: {}@@ -17280,11 +18571,13 @@ snapshots:resize-observer-polyfill@https://r2.cnpmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz: {}- [email protected]: {}+ resolve-alpn@https://r2.cnpmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz: {}- [email protected]: {}+ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-4.0.0.tgz: {}++ resolve-from@https://r2.cnpmjs.org/resolve-from/-/resolve-from-5.0.0.tgz: {}dependencies:@@ -17293,11 +18586,6 @@ snapshots:- dependencies:- is-core-module: 2.13.1- path-parse: 1.0.7-dependencies:is-core-module: 2.13.1@@ -17310,53 +18598,64 @@ snapshots:path-parse: 1.0.7supports-preserve-symlinks-flag: 1.0.0+ resolve@https://r2.cnpmjs.org/resolve/-/resolve-1.19.0.tgz:+ dependencies:+ is-core-module: 2.13.1+ path-parse: https://r2.cnpmjs.org/path-parse/-/path-parse-1.0.7.tgz+dependencies:- lowercase-keys: 3.0.0+ lowercase-keys: https://r2.cnpmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgzdependencies:onetime: 5.1.2signal-exit: 3.0.7+ restore-cursor@https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz:dependencies:- onetime: 5.1.2+ onetime: https://r2.cnpmjs.org/onetime/-/onetime-5.1.2.tgz+ signal-exit: 3.0.7++ restore-cursor@https://r2.cnpmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz:+ dependencies:+ onetime: https://r2.cnpmjs.org/onetime/-/onetime-5.1.2.tgzsignal-exit: 3.0.7- [email protected]: {}+ retry@https://r2.cnpmjs.org/retry/-/retry-0.13.1.tgz: {}dependencies:glob: 7.2.3+ rimraf@https://r2.cnpmjs.org/rimraf/-/rimraf-2.6.3.tgz:dependencies:glob: 7.2.3dependencies:'@types/estree': 1.0.5optionalDependencies:- '@rollup/rollup-android-arm-eabi': 4.13.2- '@rollup/rollup-android-arm64': 4.13.2- '@rollup/rollup-darwin-arm64': 4.13.2- '@rollup/rollup-darwin-x64': 4.13.2- '@rollup/rollup-linux-arm-gnueabihf': 4.13.2- '@rollup/rollup-linux-arm64-gnu': 4.13.2- '@rollup/rollup-linux-arm64-musl': 4.13.2- '@rollup/rollup-linux-powerpc64le-gnu': 4.13.2- '@rollup/rollup-linux-riscv64-gnu': 4.13.2- '@rollup/rollup-linux-s390x-gnu': 4.13.2- '@rollup/rollup-linux-x64-gnu': 4.13.2- '@rollup/rollup-linux-x64-musl': 4.13.2- '@rollup/rollup-win32-arm64-msvc': 4.13.2- '@rollup/rollup-win32-ia32-msvc': 4.13.2- '@rollup/rollup-win32-x64-msvc': 4.13.2+ '@rollup/rollup-android-arm-eabi': 4.16.4+ '@rollup/rollup-android-arm64': 4.16.4+ '@rollup/rollup-darwin-arm64': 4.16.4+ '@rollup/rollup-darwin-x64': 4.16.4+ '@rollup/rollup-linux-arm-gnueabihf': 4.16.4+ '@rollup/rollup-linux-arm-musleabihf': 4.16.4+ '@rollup/rollup-linux-arm64-gnu': 4.16.4+ '@rollup/rollup-linux-arm64-musl': 4.16.4+ '@rollup/rollup-linux-powerpc64le-gnu': 4.16.4+ '@rollup/rollup-linux-riscv64-gnu': 4.16.4+ '@rollup/rollup-linux-s390x-gnu': 4.16.4+ '@rollup/rollup-linux-x64-gnu': 4.16.4+ '@rollup/rollup-linux-x64-musl': 4.16.4+ '@rollup/rollup-win32-arm64-msvc': 4.16.4+ '@rollup/rollup-win32-ia32-msvc': 4.16.4+ '@rollup/rollup-win32-x64-msvc': 4.16.4fsevents: 2.3.3@@ -17384,6 +18683,10 @@ snapshots:+ safe-buffer@https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz: {}++ safe-buffer@https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz: {}+dependencies:call-bind: 1.0.7@@ -17392,6 +18695,8 @@ snapshots:+ safer-buffer@https://r2.cnpmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz: {}+dependencies:chokidar: 3.6.0@@ -17412,17 +18717,17 @@ snapshots:dependencies:'@types/json-schema': 7.0.15- ajv: 6.12.6- ajv-keywords: 3.5.2([email protected])+ ajv: https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz+ ajv-keywords: https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz(ajv@https://r2.cnpmjs.org/ajv/-/ajv-6.12.6.tgz)dependencies:'@types/json-schema': 7.0.15ajv: 8.12.0- ajv-formats: 2.1.1([email protected])- ajv-keywords: 5.1.0([email protected])+ ajv-formats: https://r2.cnpmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz([email protected])+ ajv-keywords: https://r2.cnpmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz([email protected])+ semver-diff@https://r2.cnpmjs.org/semver-diff/-/semver-diff-4.0.0.tgz:dependencies:semver: 7.6.0@@ -17432,7 +18737,7 @@ snapshots:dependencies:- lru-cache: 6.0.0+ lru-cache: https://r2.cnpmjs.org/lru-cache/-/lru-cache-6.0.0.tgzdependencies:@@ -17440,25 +18745,25 @@ snapshots:dependencies:- debug: 2.6.9- depd: 2.0.0+ debug: https://r2.cnpmjs.org/debug/-/debug-2.6.9.tgz+ depd: https://r2.cnpmjs.org/depd/-/depd-2.0.0.tgzdestroy: 1.2.0- encodeurl: 1.0.2- escape-html: 1.0.3+ encodeurl: https://r2.cnpmjs.org/encodeurl/-/encodeurl-1.0.2.tgz+ escape-html: https://r2.cnpmjs.org/escape-html/-/escape-html-1.0.3.tgzetag: 1.8.1- fresh: 0.5.2- http-errors: 2.0.0- mime: 1.6.0- ms: 2.1.3+ fresh: https://r2.cnpmjs.org/fresh/-/fresh-0.5.2.tgz+ http-errors: https://r2.cnpmjs.org/http-errors/-/http-errors-2.0.0.tgz+ mime: https://r2.cnpmjs.org/mime/-/mime-1.6.0.tgz+ ms: https://r2.cnpmjs.org/ms/-/ms-2.1.3.tgzon-finished: 2.4.1- range-parser: 1.2.1- statuses: 2.0.1+ range-parser: https://r2.cnpmjs.org/range-parser/-/range-parser-1.2.1.tgz+ statuses: https://r2.cnpmjs.org/statuses/-/statuses-2.0.1.tgztransitivePeerDependencies:- supports-colordependencies:- randombytes: 2.1.0+ randombytes: https://r2.cnpmjs.org/randombytes/-/randombytes-2.1.0.tgzdependencies:@@ -17473,9 +18778,9 @@ snapshots:dependencies:- encodeurl: 1.0.2- escape-html: 1.0.3- parseurl: 1.3.3+ encodeurl: https://r2.cnpmjs.org/encodeurl/-/encodeurl-1.0.2.tgz+ escape-html: https://r2.cnpmjs.org/escape-html/-/escape-html-1.0.3.tgz+ parseurl: https://r2.cnpmjs.org/parseurl/-/parseurl-1.3.3.tgzsend: 0.18.0transitivePeerDependencies:- supports-color@@ -17512,11 +18817,11 @@ snapshots:functions-have-names: 1.2.3has-property-descriptors: 1.0.2- [email protected]: {}+ setprototypeof@https://r2.cnpmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz: {}+ shallow-clone@https://r2.cnpmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz:dependencies:- kind-of: 6.0.3+ kind-of: https://r2.cnpmjs.org/kind-of/-/kind-of-6.0.3.tgzdependencies:@@ -17548,13 +18853,19 @@ snapshots:dependencies:shebang-regex: 3.0.0+ shebang-command@https://r2.cnpmjs.org/shebang-command/-/shebang-command-2.0.0.tgz:+ dependencies:+ shebang-regex: https://r2.cnpmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz++ shebang-regex@https://r2.cnpmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz: {}+dependencies:glob: 7.2.3- interpret: 1.4.0- rechoir: 0.6.2+ interpret: https://r2.cnpmjs.org/interpret/-/interpret-1.4.0.tgz+ rechoir: https://r2.cnpmjs.org/rechoir/-/rechoir-0.6.2.tgz@@ -17565,7 +18876,7 @@ snapshots:get-intrinsic: 1.2.4object-inspect: 1.13.1- [email protected]: {}+ siginfo@https://r2.cnpmjs.org/siginfo/-/siginfo-2.0.0.tgz: {}@@ -17575,7 +18886,7 @@ snapshots:dependencies:is-arrayish: 0.3.2- [email protected]: {}+ sisteransi@https://r2.cnpmjs.org/sisteransi/-/sisteransi-1.0.5.tgz: {}@@ -17591,7 +18902,7 @@ snapshots:ansi-styles: 6.2.1is-fullwidth-code-point: 5.0.0- [email protected]: {}+ smart-buffer@https://r2.cnpmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz: {}dependencies:@@ -17604,7 +18915,7 @@ snapshots:dependencies:ip-address: 9.0.5- smart-buffer: 4.2.0+ smart-buffer: https://r2.cnpmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz@@ -17613,8 +18924,15 @@ snapshots:buffer-from: 1.1.2source-map: 0.6.1+ source-map-support@https://r2.cnpmjs.org/source-map-support/-/source-map-support-0.5.21.tgz:+ dependencies:+ buffer-from: https://r2.cnpmjs.org/buffer-from/-/buffer-from-1.1.2.tgz+ source-map: https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgz++ source-map@https://r2.cnpmjs.org/source-map/-/source-map-0.6.1.tgz: {}+@@ -17634,17 +18952,22 @@ snapshots:spdx-exceptions: 2.5.0spdx-license-ids: 3.0.17+ spdx-expression-parse@https://r2.cnpmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz:+ dependencies:+ spdx-exceptions: 2.5.0+ spdx-license-ids: 3.0.17+- [email protected]: {}-- [email protected]: {}+ sprintf-js@https://r2.cnpmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz: {}- [email protected]: {}+ stackback@https://r2.cnpmjs.org/stackback/-/stackback-0.0.2.tgz: {}++ statuses@https://r2.cnpmjs.org/statuses/-/statuses-2.0.1.tgz: {}@@ -17706,6 +19029,12 @@ snapshots:get-east-asian-width: 1.2.0strip-ansi: 7.1.0+ string-width@https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz:+ dependencies:+ emoji-regex: https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz+ is-fullwidth-code-point: https://r2.cnpmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz+@@ -17742,14 +19071,14 @@ snapshots:define-properties: 1.2.1es-object-atoms: 1.0.0- dependencies:- safe-buffer: 5.1.2-dependencies:safe-buffer: 5.2.1+ string_decoder@https://r2.cnpmjs.org/string_decoder/-/string_decoder-1.1.1.tgz:+ dependencies:+ safe-buffer: https://r2.cnpmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz+dependencies:char-regex: 1.0.2@@ -17762,24 +19091,34 @@ snapshots:dependencies:ansi-regex: 6.0.1+ strip-ansi@https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz:+ dependencies:+ ansi-regex: https://r2.cnpmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz++ strip-final-newline@https://r2.cnpmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz: {}++ strip-indent@https://r2.cnpmjs.org/strip-indent/-/strip-indent-3.0.0.tgz:dependencies:- min-indent: 1.0.1+ min-indent: https://r2.cnpmjs.org/min-indent/-/min-indent-1.0.1.tgz+ strip-indent@https://r2.cnpmjs.org/strip-indent/-/strip-indent-4.0.0.tgz:dependencies:- min-indent: 1.0.1+ min-indent: https://r2.cnpmjs.org/min-indent/-/min-indent-1.0.1.tgz+ strip-json-comments@https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz: {}++ strip-json-comments@https://r2.cnpmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz: {}+dependencies:js-tokens: 9.0.0@@ -17796,9 +19135,13 @@ snapshots:dependencies:has-flag: 4.0.0+ supports-color@https://r2.cnpmjs.org/supports-color/-/supports-color-7.2.0.tgz:dependencies:- has-flag: 4.0.0+ has-flag: https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz++ supports-color@https://r2.cnpmjs.org/supports-color/-/supports-color-8.1.1.tgz:+ dependencies:+ has-flag: https://r2.cnpmjs.org/has-flag/-/has-flag-4.0.0.tgz@@ -17826,47 +19169,49 @@ snapshots:+ tapable@https://r2.cnpmjs.org/tapable/-/tapable-2.2.1.tgz: {}++ tar-fs@https://r2.cnpmjs.org/tar-fs/-/tar-fs-2.1.1.tgz:dependencies:- chownr: 1.1.4- mkdirp-classic: 0.5.3- pump: 3.0.0- tar-stream: 2.2.0+ chownr: https://r2.cnpmjs.org/chownr/-/chownr-1.1.4.tgz+ mkdirp-classic: https://r2.cnpmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz+ pump: https://r2.cnpmjs.org/pump/-/pump-3.0.0.tgz+ tar-stream: https://r2.cnpmjs.org/tar-stream/-/tar-stream-2.2.0.tgz+ tar-stream@https://r2.cnpmjs.org/tar-stream/-/tar-stream-2.2.0.tgz:dependencies:- bl: 4.1.0- end-of-stream: 1.4.4- fs-constants: 1.0.0- inherits: 2.0.4+ bl: https://r2.cnpmjs.org/bl/-/bl-4.1.0.tgz+ end-of-stream: https://r2.cnpmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz+ fs-constants: https://r2.cnpmjs.org/fs-constants/-/fs-constants-1.0.0.tgz+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgzreadable-stream: 3.6.2dependencies:- chownr: 2.0.0- fs-minipass: 2.1.0+ chownr: https://r2.cnpmjs.org/chownr/-/chownr-2.0.0.tgz+ fs-minipass: https://r2.cnpmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgzminipass: 5.0.0- minizlib: 2.1.2- mkdirp: 1.0.4- yallist: 4.0.0+ minizlib: https://r2.cnpmjs.org/minizlib/-/minizlib-2.1.2.tgz+ mkdirp: https://r2.cnpmjs.org/mkdirp/-/mkdirp-1.0.4.tgz+ yallist: https://r2.cnpmjs.org/yallist/-/yallist-4.0.0.tgzdependencies:- memoizerific: 1.11.3+ memoizerific: https://r2.cnpmjs.org/memoizerific/-/memoizerific-1.11.3.tgz- [email protected]: {}+ temp-dir@https://r2.cnpmjs.org/temp-dir/-/temp-dir-2.0.0.tgz: {}+ temp@https://r2.cnpmjs.org/temp/-/temp-0.8.4.tgz:dependencies:- rimraf: 2.6.3+ rimraf: https://r2.cnpmjs.org/rimraf/-/rimraf-2.6.3.tgz+ tempy@https://r2.cnpmjs.org/tempy/-/tempy-1.0.1.tgz:dependencies:del: 6.1.1- is-stream: 2.0.1- temp-dir: 2.0.0- type-fest: 0.16.0- unique-string: 2.0.0+ is-stream: https://r2.cnpmjs.org/is-stream/-/is-stream-2.0.1.tgz+ temp-dir: https://r2.cnpmjs.org/temp-dir/-/temp-dir-2.0.0.tgz+ type-fest: https://r2.cnpmjs.org/type-fest/-/type-fest-0.16.0.tgz+ unique-string: https://r2.cnpmjs.org/unique-string/-/unique-string-2.0.0.tgz[email protected](@swc/[email protected])([email protected])([email protected](@swc/[email protected])([email protected])):dependencies:@@ -17884,8 +19229,8 @@ snapshots:dependencies:'@jridgewell/source-map': 0.3.6acorn: 8.11.3- commander: 2.20.3- source-map-support: 0.5.21+ commander: https://r2.cnpmjs.org/commander/-/commander-2.20.3.tgz+ source-map-support: https://r2.cnpmjs.org/source-map-support/-/source-map-support-0.5.21.tgzdependencies:@@ -17897,10 +19242,10 @@ snapshots:+ through2@https://r2.cnpmjs.org/through2/-/through2-2.0.5.tgz:dependencies:readable-stream: 2.3.8- xtend: 4.0.2+ xtend: https://r2.cnpmjs.org/xtend/-/xtend-4.0.2.tgz@@ -17908,15 +19253,15 @@ snapshots:- [email protected]: {}+ [email protected]: {}- [email protected]: {}+ [email protected]: {}+ tmp@https://r2.cnpmjs.org/tmp/-/tmp-0.0.33.tgz:dependencies:- os-tmpdir: 1.0.2+ os-tmpdir: https://r2.cnpmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz@@ -17926,7 +19271,7 @@ snapshots:- [email protected]: {}+ toidentifier@https://r2.cnpmjs.org/toidentifier/-/toidentifier-1.0.1.tgz: {}dependencies:@@ -17939,17 +19284,17 @@ snapshots:universalify: 0.2.0url-parse: 1.5.10- [email protected]: {}-dependencies:punycode: 2.3.1+ tr46@https://r2.cnpmjs.org/tr46/-/tr46-0.0.3.tgz: {}+dependencies:typescript: 5.4.5- [email protected]: {}+ ts-dedent@https://r2.cnpmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz: {}dependencies:@@ -17996,7 +19341,7 @@ snapshots:turbo-windows-64: 1.13.2turbo-windows-arm64: 1.13.2- [email protected]: {}+ tween-functions@https://r2.cnpmjs.org/tween-functions/-/tween-functions-1.2.0.tgz: {}dependencies:@@ -18008,27 +19353,27 @@ snapshots:- [email protected]: {}-- [email protected]: {}+ [email protected]: {}- [email protected]: {}+ [email protected]: {}- [email protected]: {}+ [email protected]: {}- [email protected]: {}+ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.16.0.tgz: {}- [email protected]: {}+ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.21.3.tgz: {}- [email protected]: {}+ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.6.0.tgz: {}- [email protected]: {}+ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-0.8.1.tgz: {}+ type-fest@https://r2.cnpmjs.org/type-fest/-/type-fest-1.4.0.tgz: {}++ type-is@https://r2.cnpmjs.org/type-is/-/type-is-1.6.18.tgz:dependencies:- media-typer: 0.3.0+ media-typer: https://r2.cnpmjs.org/media-typer/-/media-typer-0.3.0.tgzmime-types: 2.1.35@@ -18063,9 +19408,9 @@ snapshots:is-typed-array: 1.1.13possible-typed-array-names: 1.0.0+ typedarray-to-buffer@https://r2.cnpmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz:dependencies:- is-typedarray: 1.0.0+ is-typedarray: https://r2.cnpmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz@@ -18089,11 +19434,11 @@ snapshots:- [email protected]: {}+ unicode-canonical-property-names-ecmascript@https://r2.cnpmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz: {}+ unicode-match-property-ecmascript@https://r2.cnpmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz:dependencies:- unicode-canonical-property-names-ecmascript: 2.0.0+ unicode-canonical-property-names-ecmascript: https://r2.cnpmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgzunicode-property-aliases-ecmascript: 2.1.0@@ -18106,19 +19451,19 @@ snapshots:+ unique-string@https://r2.cnpmjs.org/unique-string/-/unique-string-2.0.0.tgz:dependencies:- crypto-random-string: 2.0.0+ crypto-random-string: https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz+ unique-string@https://r2.cnpmjs.org/unique-string/-/unique-string-3.0.0.tgz:dependencies:- crypto-random-string: 4.0.0+ crypto-random-string: https://r2.cnpmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgzdependencies:'@types/unist': 3.0.2+ unist-util-stringify-position@https://r2.cnpmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz:dependencies:'@types/unist': 2.0.10@@ -18135,13 +19480,13 @@ snapshots:- [email protected]: {}-- [email protected]: {}+ universalify@https://r2.cnpmjs.org/universalify/-/universalify-0.1.2.tgz: {}++ unpipe@https://r2.cnpmjs.org/unpipe/-/unpipe-1.0.0.tgz: {}dependencies:@@ -18150,7 +19495,7 @@ snapshots:webpack-sources: 3.2.3webpack-virtual-modules: 0.6.1- [email protected]: {}+ untildify@https://r2.cnpmjs.org/untildify/-/untildify-4.0.0.tgz: {}dependencies:@@ -18167,21 +19512,25 @@ snapshots:dependencies:boxen: 7.1.1chalk: 5.3.0- configstore: 6.0.0- import-lazy: 4.0.0+ configstore: https://r2.cnpmjs.org/configstore/-/configstore-6.0.0.tgz+ import-lazy: https://r2.cnpmjs.org/import-lazy/-/import-lazy-4.0.0.tgzis-in-ci: 0.1.0- is-installed-globally: 0.4.0- is-npm: 6.0.0+ is-installed-globally: https://r2.cnpmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz+ is-npm: https://r2.cnpmjs.org/is-npm/-/is-npm-6.0.0.tgzlatest-version: 7.0.0- pupa: 3.1.0+ pupa: https://r2.cnpmjs.org/pupa/-/pupa-3.1.0.tgzsemver: 7.6.0- semver-diff: 4.0.0- xdg-basedir: 5.1.0+ semver-diff: https://r2.cnpmjs.org/semver-diff/-/semver-diff-4.0.0.tgz+ xdg-basedir: https://r2.cnpmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgzdependencies:punycode: 2.3.1+ uri-js@https://r2.cnpmjs.org/uri-js/-/uri-js-4.4.1.tgz:+ dependencies:+ punycode: 2.3.1+@@ -18193,22 +19542,24 @@ snapshots:dependencies:- punycode: 1.4.1+ punycode: https://r2.cnpmjs.org/punycode/-/punycode-1.4.1.tgzqs: 6.12.0+ util-deprecate@https://r2.cnpmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz: {}+dependencies:- inherits: 2.0.4- is-arguments: 1.1.1- is-generator-function: 1.0.10+ inherits: https://r2.cnpmjs.org/inherits/-/inherits-2.0.4.tgz+ is-arguments: https://r2.cnpmjs.org/is-arguments/-/is-arguments-1.1.1.tgz+ is-generator-function: https://r2.cnpmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgzis-typed-array: 1.1.13which-typed-array: 1.1.15- [email protected]: {}+ utila@https://r2.cnpmjs.org/utila/-/utila-0.4.0.tgz: {}- [email protected]: {}+ utils-merge@https://r2.cnpmjs.org/utils-merge/-/utils-merge-1.0.1.tgz: {}@@ -18217,6 +19568,11 @@ snapshots:spdx-correct: 3.2.0spdx-expression-parse: 3.0.1+ validate-npm-package-license@https://r2.cnpmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz:+ dependencies:+ spdx-correct: 3.2.0+ spdx-expression-parse: https://r2.cnpmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz+dependencies:resolve-package-path: 3.1.0@@ -18226,6 +19582,25 @@ snapshots:+ vary@https://r2.cnpmjs.org/vary/-/vary-1.1.2.tgz: {}++ [email protected](@types/[email protected])([email protected])([email protected])([email protected]):+ dependencies:+ cac: 6.7.14+ debug: 4.3.4+ pathe: 1.1.2+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz+ transitivePeerDependencies:+ - '@types/node'+ - less+ - lightningcss+ - sass+ - stylus+ - sugarss+ - supports-color+ - terser+[email protected](@types/[email protected])([email protected])([email protected])([email protected]):dependencies:cac: 6.7.14@@ -18243,14 +19618,14 @@ snapshots:- supports-color- terser- [email protected](@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])):+ [email protected](@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])):dependencies:'@microsoft/api-extractor': 7.43.0(@types/[email protected])- '@rollup/pluginutils': 5.1.0([email protected])+ '@rollup/pluginutils': 5.1.0([email protected])'@vue/language-core': 1.8.27([email protected])debug: 4.3.4kolorist: 1.8.0- magic-string: 0.30.8+ magic-string: 0.30.10typescript: 5.4.5vue-tsc: 1.8.27([email protected])optionalDependencies:@@ -18264,7 +19639,7 @@ snapshots:dependencies:esbuild: 0.20.2postcss: 8.4.38- rollup: 4.13.2+ rollup: 4.16.4optionalDependencies:'@types/node': 20.12.7fsevents: 2.3.3@@ -18272,10 +19647,45 @@ snapshots:sass: 1.72.0terser: 5.30.0- [email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])):+ [email protected]([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])):dependencies:jest-canvas-mock: 2.5.2- vitest: 1.5.2(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])+ vitest: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])++ [email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):+ dependencies:+ '@vitest/expect': 1.5.0+ '@vitest/runner': 1.5.0+ '@vitest/snapshot': 1.5.0+ '@vitest/spy': 1.5.0+ '@vitest/utils': 1.5.0+ acorn-walk: 8.3.2+ chai: 4.4.1+ debug: 4.3.4+ execa: 8.0.1+ local-pkg: 0.5.0+ magic-string: 0.30.10+ pathe: 1.1.2+ picocolors: https://r2.cnpmjs.org/picocolors/-/picocolors-1.0.0.tgz+ std-env: 3.7.0+ strip-literal: 2.1.0+ tinybench: 2.8.0+ tinypool: 0.8.4+ vite-node: 1.5.0(@types/[email protected])([email protected])([email protected])([email protected])+ why-is-node-running: 2.2.2+ optionalDependencies:+ '@types/node': 20.12.7+ happy-dom: 13.3.8+ jsdom: 24.0.0+ transitivePeerDependencies:+ - less+ - lightningcss+ - sass+ - stylus+ - sugarss+ - supports-color+ - terser[email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]):dependencies:@@ -18289,13 +19699,13 @@ snapshots:debug: 4.3.4execa: 8.0.1local-pkg: 0.5.0- magic-string: 0.30.8+ magic-string: 0.30.10pathe: 1.1.2picocolors: 1.0.0std-env: 3.7.0strip-literal: 2.1.0- tinybench: 2.6.0- tinypool: 0.8.3+ tinybench: 2.8.0+ tinypool: 0.8.4why-is-node-running: 2.2.2@@ -18320,15 +19730,15 @@ snapshots:eslint-visitor-keys: 3.4.3espree: 9.6.1esquery: 1.5.0- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzsemver: 7.6.0transitivePeerDependencies:- supports-colordependencies:- de-indent: 1.0.2- he: 1.2.0+ de-indent: https://r2.cnpmjs.org/de-indent/-/de-indent-1.0.2.tgz+ he: https://r2.cnpmjs.org/he/-/he-1.2.0.tgzdependencies:@@ -18347,6 +19757,17 @@ snapshots:optionalDependencies:typescript: 5.4.5+ dependencies:+ '@vue/compiler-dom': 3.4.24+ '@vue/compiler-sfc': 3.4.24+ '@vue/runtime-dom': 3.4.24+ '@vue/server-renderer': 3.4.24([email protected]([email protected]))+ '@vue/shared': 3.4.24+ optionalDependencies:+ typescript: 5.4.5+ optional: true+dependencies:xml-name-validator: 5.0.0@@ -18360,34 +19781,34 @@ snapshots:dependencies:- glob-to-regexp: 0.4.1+ glob-to-regexp: https://r2.cnpmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgzgraceful-fs: 4.2.11+ wcwidth@https://r2.cnpmjs.org/wcwidth/-/wcwidth-1.0.1.tgz:dependencies:defaults: 1.0.4- [email protected]: {}-+ webidl-conversions@https://r2.cnpmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz: {}+dependencies:colorette: 2.0.20memfs: 3.5.3mime-types: 2.1.35- range-parser: 1.2.1+ range-parser: https://r2.cnpmjs.org/range-parser/-/range-parser-1.2.1.tgzschema-utils: 4.2.0optionalDependencies:webpack: 5.91.0(@swc/[email protected])([email protected])dependencies:- ansi-html-community: 0.0.8+ ansi-html-community: https://r2.cnpmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgzhtml-entities: 2.5.2- strip-ansi: 6.0.1+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz@@ -18405,19 +19826,19 @@ snapshots:acorn: 8.11.3acorn-import-assertions: 1.9.0([email protected])browserslist: 4.23.0- chrome-trace-event: 1.0.3+ chrome-trace-event: https://r2.cnpmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgzenhanced-resolve: 5.16.0es-module-lexer: 1.5.0- eslint-scope: 5.1.1- events: 3.3.0- glob-to-regexp: 0.4.1+ eslint-scope: https://r2.cnpmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz+ events: https://r2.cnpmjs.org/events/-/events-3.3.0.tgz+ glob-to-regexp: https://r2.cnpmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgzgraceful-fs: 4.2.11- json-parse-even-better-errors: 2.3.1+ json-parse-even-better-errors: https://r2.cnpmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgzloader-runner: 4.3.0mime-types: 2.1.35- neo-async: 2.6.2+ neo-async: https://r2.cnpmjs.org/neo-async/-/neo-async-2.6.2.tgzschema-utils: 3.3.0- tapable: 2.2.1+ tapable: https://r2.cnpmjs.org/tapable/-/tapable-2.2.1.tgzterser-webpack-plugin: 5.3.10(@swc/[email protected])([email protected])([email protected](@swc/[email protected])([email protected]))watchpack: 2.4.1webpack-sources: 3.2.3@@ -18439,10 +19860,10 @@ snapshots:tr46: 5.0.0webidl-conversions: 7.0.0+ whatwg-url@https://r2.cnpmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz:dependencies:- tr46: 0.0.3- webidl-conversions: 3.0.1+ tr46: https://r2.cnpmjs.org/tr46/-/tr46-0.0.3.tgz+ webidl-conversions: https://r2.cnpmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgzdependencies:@@ -18486,31 +19907,33 @@ snapshots:dependencies:isexe: 2.0.0+ which@https://r2.cnpmjs.org/which/-/which-2.0.2.tgz:+ dependencies:+ isexe: https://r2.cnpmjs.org/isexe/-/isexe-2.0.0.tgz+dependencies:- siginfo: 2.0.0- stackback: 0.0.2+ siginfo: https://r2.cnpmjs.org/siginfo/-/siginfo-2.0.0.tgz+ stackback: https://r2.cnpmjs.org/stackback/-/stackback-0.0.2.tgzdependencies:string-width: 5.1.2+ widest-line@https://r2.cnpmjs.org/widest-line/-/widest-line-4.0.1.tgz:+ dependencies:+ string-width: 5.1.2+dependencies:- execa: 5.1.1+ execa: https://r2.cnpmjs.org/execa/-/execa-5.1.1.tgz- dependencies:- ansi-styles: 4.3.0- string-width: 4.2.3- strip-ansi: 6.0.1-dependencies:ansi-styles: 4.3.0@@ -18529,73 +19952,89 @@ snapshots:string-width: 7.1.0strip-ansi: 7.1.0+ wrap-ansi@https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz:+ dependencies:+ ansi-styles: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz++ wrap-ansi@https://r2.cnpmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz:+ dependencies:+ ansi-styles: https://r2.cnpmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz+ strip-ansi: https://r2.cnpmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz++ wrappy@https://r2.cnpmjs.org/wrappy/-/wrappy-1.0.2.tgz: {}++ write-file-atomic@https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz:dependencies:graceful-fs: 4.2.11- imurmurhash: 0.1.4+ imurmurhash: https://r2.cnpmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgzsignal-exit: 3.0.7+ write-file-atomic@https://r2.cnpmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz:dependencies:- imurmurhash: 0.1.4- is-typedarray: 1.0.0+ imurmurhash: https://r2.cnpmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz+ is-typedarray: https://r2.cnpmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgzsignal-exit: 3.0.7- typedarray-to-buffer: 3.1.5+ typedarray-to-buffer: https://r2.cnpmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz- [email protected]: {}-- [email protected]: {}+ xdg-basedir@https://r2.cnpmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz: {}+ xml-name-validator@https://r2.cnpmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz: {}+- [email protected]: {}+ xtend@https://r2.cnpmjs.org/xtend/-/xtend-4.0.2.tgz: {}- [email protected]: {}+ y18n@https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgz: {}- [email protected]: {}-yallist@https://r2.cnpmjs.org/yallist/-/yallist-4.0.0.tgz: {}dependencies:eslint-visitor-keys: 3.4.3- lodash: 4.17.21+ lodash: https://r2.cnpmjs.org/lodash/-/lodash-4.17.21.tgzyaml: 2.4.1- [email protected]: {}-+ yaml@https://r2.cnpmjs.org/yaml/-/yaml-1.10.2.tgz: {}+dependencies:cliui: 8.0.1escalade: 3.1.2- get-caller-file: 2.0.5- require-directory: 2.1.1- string-width: 4.2.3- y18n: 5.0.8+ get-caller-file: https://r2.cnpmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz+ require-directory: https://r2.cnpmjs.org/require-directory/-/require-directory-2.1.1.tgz+ string-width: https://r2.cnpmjs.org/string-width/-/string-width-4.2.3.tgz+ y18n: https://r2.cnpmjs.org/y18n/-/y18n-5.0.8.tgzyargs-parser: 21.1.1+ yocto-queue@https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz: {}++ yocto-queue@https://r2.cnpmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz: {}+dependencies:- lodash.get: 4.4.2- lodash.isequal: 4.5.0+ lodash.get: https://r2.cnpmjs.org/lodash.get/-/lodash.get-4.4.2.tgz+ lodash.isequal: https://r2.cnpmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgzvalidator: 13.11.0optionalDependencies:commander: 9.5.0diff --git a/vitest.workspace.js b/vitest.workspace.jsnew file mode 100644index 0000000000..041060e1f1--- /dev/null+++ b/vitest.workspace.js@@ -0,0 +1,32 @@+import { defineWorkspace } from 'vitest/config';++export default defineWorkspace([+ './packages/network/vite.config.ts',+ './packages/slides-ui/vite.config.ts',+ './packages/engine-formula/vite.config.ts',+ './packages/rpc/vite.config.ts',+ './packages/design/vite.config.ts',+ './packages/core/vite.config.ts',+ './packages/sheets-zen-editor/vite.config.ts',+ './packages/sheets-filter/vite.config.ts',+ './packages/sheets-ui/vite.config.ts',+ './packages/engine-numfmt/vite.config.ts',+ './packages/sheets-formula/vite.config.ts',+ './packages/sheets-filter-ui/vite.config.ts',+ './packages/docs-ui/vite.config.ts',+ './packages/sheets-find-replace/vite.config.ts',+ './packages/image/vite.config.ts',+ './packages/sheets-data-validation/vite.config.ts',+ './packages/docs/vite.config.ts',+ './packages/facade/vite.config.ts',+ './packages/ui/vite.config.ts',+ './packages/uniscript/vite.config.ts',+ './packages/engine-render/vite.config.ts',+ './packages/sheets/vite.config.ts',+ './packages/sheets-conditional-formatting/vite.config.ts',+ './packages/find-replace/vite.config.ts',+ './packages/data-validation/vite.config.ts',+ './packages/slides/vite.config.ts',+ './packages/sheets-conditional-formatting-ui/vite.config.ts',+ './packages/sheets-numfmt/vite.config.ts',+]);