From 1149cff68ea5ac747767ab441ee5901d9472a99b Mon Sep 17 00:00:00 2001 From: lumix Date: Sun, 29 Sep 2024 15:26:01 +0800 Subject: [PATCH] fix: formula show editor selection when using filter (#3621) --- .../__tests__/sheets-filter.menu.spec.ts | 4 +- packages/sheets-filter/src/utils.ts | 2 +- packages/sheets-formula/package.json | 1 + .../formula-editor-show.controller.ts | 42 +++++-------------- .../ref-selections.render-service.ts | 6 +-- packages/sheets-ui/src/index.ts | 2 +- .../mark-selection/mark-selection.service.ts | 8 ++-- .../base-selection-render.service.ts | 12 +++--- .../selection/mobile-selection-shape.ts | 6 +-- ...election-shape.ts => selection-control.ts} | 0 .../selection/selection-shape-extension.ts | 2 +- pnpm-lock.yaml | 28 ++----------- 12 files changed, 36 insertions(+), 77 deletions(-) rename packages/sheets-ui/src/services/selection/{selection-shape.ts => selection-control.ts} (100%) diff --git a/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts b/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts index 106734fe76d..f2415e4e591 100644 --- a/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts +++ b/packages/sheets-filter-ui/src/controllers/__tests__/sheets-filter.menu.spec.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import type { IWorkbookData } from '@univerjs/core'; import { AuthzIoLocalService, DisposableCollection, IAuthzIoService, ICommandService, Inject, Injector, LocaleType, Plugin, Univer, UniverInstanceType } from '@univerjs/core'; import { ExclusiveRangeService, IExclusiveRangeService, RangeProtectionRuleModel, RefRangeService, SetWorksheetActiveOperation, SheetInterceptorService, SheetsSelectionsService, WorkbookPermissionService, WorksheetPermissionService, WorksheetProtectionPointModel, WorksheetProtectionRuleModel } from '@univerjs/sheets'; -import type { ISetSheetsFilterCriteriaMutationParams, ISetSheetsFilterRangeMutationParams } from '@univerjs/sheets-filter'; import { RemoveSheetsFilterMutation, SetSheetsFilterCriteriaMutation, SetSheetsFilterRangeMutation, UniverSheetsFilterPlugin } from '@univerjs/sheets-filter'; import { IMenuManagerService, IPlatformService, IShortcutService, MenuManagerService, PlatformService, ShortcutService } from '@univerjs/ui'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; +import type { IWorkbookData } from '@univerjs/core'; +import type { ISetSheetsFilterCriteriaMutationParams, ISetSheetsFilterRangeMutationParams } from '@univerjs/sheets-filter'; import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SmartToggleSheetsFilterCommand } from '../../commands/commands/sheets-filter.command'; import { CloseFilterPanelOperation, OpenFilterPanelOperation } from '../../commands/operations/sheets-filter.operation'; import { ClearFilterCriteriaMenuItemFactory, ReCalcFilterMenuItemFactory, SmartToggleFilterMenuItemFactory } from '../sheets-filter.menu'; diff --git a/packages/sheets-filter/src/utils.ts b/packages/sheets-filter/src/utils.ts index 94964a59bc5..14d8afc131c 100644 --- a/packages/sheets-filter/src/utils.ts +++ b/packages/sheets-filter/src/utils.ts @@ -15,8 +15,8 @@ */ import type { IMutationInfo, Nullable } from '@univerjs/core'; -import type { ISetSheetsFilterCriteriaMutationParams } from './commands/mutations/sheets-filter.mutation'; import { SetSheetsFilterCriteriaMutation } from './commands/mutations/sheets-filter.mutation'; +import type { ISetSheetsFilterCriteriaMutationParams } from './commands/mutations/sheets-filter.mutation'; interface ILine { start: number; diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.json index 31718a8b029..1ed4ee42d54 100644 --- a/packages/sheets-formula/package.json +++ b/packages/sheets-formula/package.json @@ -84,6 +84,7 @@ "@univerjs/icons": "^0.1.78", "@univerjs/rpc": "workspace:*", "@univerjs/sheets": "workspace:*", + "@univerjs/sheets-filter": "workspace:*", "@univerjs/sheets-numfmt": "workspace:*", "@univerjs/sheets-ui": "workspace:*", "@univerjs/ui": "workspace:*" diff --git a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts b/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts index 711365ee2df..28826626614 100644 --- a/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts +++ b/packages/sheets-formula/src/controllers/formula-editor-show.controller.ts @@ -14,14 +14,12 @@ * limitations under the License. */ -import type { ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IRange, IRowAutoHeightInfo, Nullable, Workbook, Worksheet } from '@univerjs/core'; import { ColorKit, Disposable, ICommandService, ILogService, Inject, ObjectMatrix, - Rectangle, ThemeService, toDisposable, } from '@univerjs/core'; @@ -31,10 +29,9 @@ import { SetArrayFormulaDataMutation, SetFormulaCalculationResultMutation, } from '@univerjs/engine-formula'; -import type { IRenderContext, IRenderModule, SpreadsheetSkeleton } from '@univerjs/engine-render'; import { IRenderManagerService } from '@univerjs/engine-render'; -import type { ISetColHiddenMutationParams, ISetColVisibleMutationParams, ISetRowHiddenMutationParams, ISetRowVisibleMutationParams, ISetWorksheetColWidthMutationParams, ISetWorksheetRowAutoHeightMutationParams, ISetWorksheetRowHeightMutationParams } from '@univerjs/sheets'; import { SetColHiddenMutation, SetColVisibleMutation, SetRowHiddenMutation, SetRowVisibleMutation, SetWorksheetColWidthMutation, SetWorksheetRowAutoHeightMutation, SetWorksheetRowHeightMutation } from '@univerjs/sheets'; +import { ReCalcSheetsFilterMutation, RemoveSheetsFilterMutation, SetSheetsFilterCriteriaMutation, SetSheetsFilterRangeMutation } from '@univerjs/sheets-filter'; import { IEditorBridgeService, ISheetSelectionRenderService, @@ -42,6 +39,9 @@ import { SelectionShape, SheetSkeletonManagerService, } from '@univerjs/sheets-ui'; +import type { ICellDataForSheetInterceptor, ICommandInfo, IObjectMatrixPrimitiveType, IRange, IRowAutoHeightInfo, Nullable, Workbook, Worksheet } from '@univerjs/core'; +import type { IRenderContext, IRenderModule, SpreadsheetSkeleton } from '@univerjs/engine-render'; +import type { ISetColHiddenMutationParams, ISetColVisibleMutationParams, ISetRowHiddenMutationParams, ISetRowVisibleMutationParams, ISetWorksheetColWidthMutationParams, ISetWorksheetRowAutoHeightMutationParams, ISetWorksheetRowHeightMutationParams } from '@univerjs/sheets'; const REFRESH_ARRAY_SHAPE_MUTATIONS = [ SetWorksheetRowHeightMutation.id, @@ -50,6 +50,10 @@ const REFRESH_ARRAY_SHAPE_MUTATIONS = [ SetColVisibleMutation.id, SetRowHiddenMutation.id, SetRowVisibleMutation.id, + SetSheetsFilterRangeMutation.id, + SetSheetsFilterCriteriaMutation.id, + RemoveSheetsFilterMutation.id, + ReCalcSheetsFilterMutation.id, ]; export class FormulaEditorShowController extends Disposable implements IRenderModule { @@ -273,7 +277,7 @@ export class FormulaEditorShowController extends Disposable implements IRenderMo this._previousShape = null; } - private _refreshArrayFormulaRangeShape(unitId: string, range: IRange): void { + private _refreshArrayFormulaRangeShape(unitId: string, _range?: IRange): void { if (this._previousShape) { const { startRow, endRow, startColumn, endColumn } = this._previousShape.getRange(); const range = { startRow, endRow, startColumn, endColumn }; @@ -296,34 +300,10 @@ export class FormulaEditorShowController extends Disposable implements IRenderMo return false; } - private _refreshArrayFormulaRangeShapeByRanges(unitId: string, subUnitId: string, ranges: IRange[]): void { + private _refreshArrayFormulaRangeShapeByRanges(unitId: string, subUnitId: string, ranges?: IRange[]): void { if (!this._checkCurrentSheet(unitId, subUnitId)) return; - if (!this._previousShape) return; - - const { startRow: shapeStartRow, endRow: shapeEndRow, startColumn: shapeStartColumn, endColumn: shapeEndColumn } = this._previousShape.getRange(); - - for (let i = 0; i < ranges.length; i++) { - const range = ranges[i]; - const { startRow, endRow, startColumn, endColumn } = range; - if (Rectangle.intersects( - { - startRow, endRow, startColumn, endColumn, - }, - { - startRow: shapeStartRow, endRow: shapeEndRow, startColumn: shapeStartColumn, endColumn: shapeEndColumn, - } - ) || shapeStartRow >= endRow || startColumn >= endColumn) { - const shapeRange = { - startRow: shapeStartRow, - endRow: shapeEndRow, - startColumn: shapeStartColumn, - endColumn: shapeEndColumn, - }; - this._refreshArrayFormulaRangeShape(unitId, shapeRange); - break; - } - } + this._refreshArrayFormulaRangeShape(unitId); } private _refreshArrayFormulaRangeShapeByRow(unitId: string, subUnitId: string, rowAutoHeightInfo: IRowAutoHeightInfo[]): void { diff --git a/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts b/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts index 223b833666d..285dfcde599 100644 --- a/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts +++ b/packages/sheets-formula/src/services/render-services/ref-selections.render-service.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import type { IDisposable, Nullable, Workbook } from '@univerjs/core'; import { DisposableCollection, Inject, Injector, RANGE_TYPE, ThemeService, toDisposable } from '@univerjs/core'; -import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Viewport } from '@univerjs/engine-render'; import { ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render'; -import type { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle, SheetsSelectionsService, WorkbookSelections } from '@univerjs/sheets'; import { convertSelectionDataToRange, getNormalSelectionStyle, IRefSelectionsService, SelectionMoveType } from '@univerjs/sheets'; import { attachSelectionWithCoord, BaseSelectionRenderService, checkInHeaderRanges, getAllSelection, getCoordByOffset, getSheetObject, SheetSkeletonManagerService } from '@univerjs/sheets-ui'; import { IShortcutService } from '@univerjs/ui'; +import type { IDisposable, Nullable, Workbook } from '@univerjs/core'; +import type { IMouseEvent, IPointerEvent, IRenderContext, IRenderModule, Viewport } from '@univerjs/engine-render'; +import type { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle, SheetsSelectionsService, WorkbookSelections } from '@univerjs/sheets'; /** * This service extends the existing `SelectionRenderService` to provide the rendering of prompt selections diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.ts index 8ffeb857457..aa9b6d5826c 100644 --- a/packages/sheets-ui/src/index.ts +++ b/packages/sheets-ui/src/index.ts @@ -62,7 +62,7 @@ export { IMarkSelectionService } from './services/mark-selection/mark-selection. export { SheetSelectionRenderService } from './services/selection/selection-render.service'; export { getAllSelection, getTopLeftSelection } from './services/selection/base-selection-render.service'; export { BaseSelectionRenderService, ISheetSelectionRenderService } from './services/selection/base-selection-render.service'; -export { SelectionControl as SelectionShape } from './services/selection/selection-shape'; +export { SelectionControl as SelectionShape } from './services/selection/selection-control'; export type { ISheetSkeletonManagerParam } from './services/sheet-skeleton-manager.service'; export { attachRangeWithCoord, SheetSkeletonManagerService } from './services/sheet-skeleton-manager.service'; export { UniverSheetsUIPlugin } from './sheets-ui-plugin'; 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.ts index 0b314d53812..e854b3c0f4b 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 @@ -14,16 +14,16 @@ * limitations under the License. */ -import type { Workbook } from '@univerjs/core'; import { createIdentifier, Disposable, Inject, IUniverInstanceService, ThemeService, Tools, UniverInstanceType } from '@univerjs/core'; import { IRenderManagerService } from '@univerjs/engine-render'; +import type { Workbook } from '@univerjs/core'; import type { ISelectionWithStyle } from '@univerjs/sheets'; -// import { ISheetSelectionRenderService } from '../selection/base-selection-render.service'; -import { SelectionControl } from '../selection/selection-shape'; -import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service'; import { ISheetSelectionRenderService } from '../selection/base-selection-render.service'; import { SELECTION_SHAPE_DEPTH } from '../selection/const'; +// import { ISheetSelectionRenderService } from '../selection/base-selection-render.service'; +import { SelectionControl } from '../selection/selection-control'; +import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service'; export interface IMarkSelectionService { addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null; diff --git a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts b/packages/sheets-ui/src/services/selection/base-selection-render.service.ts index 615bc8e417a..8beb9edaf43 100644 --- a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts +++ b/packages/sheets-ui/src/services/selection/base-selection-render.service.ts @@ -14,10 +14,6 @@ * limitations under the License. */ -import { createIdentifier, Disposable, InterceptorManager, makeCellToSelection, RANGE_TYPE } from '@univerjs/core'; -import { ScrollTimer, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render'; -import { getNormalSelectionStyle as getDefaultNormalSelectionStyle, transformCellDataToSelectionData } from '@univerjs/sheets'; -import { BehaviorSubject, Subject } from 'rxjs'; import type { IDisposable, IFreeze, @@ -35,14 +31,18 @@ import type { IMouseEvent, IPointerEvent, IRenderModule, Scene, SpreadsheetSkele import type { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets'; import type { IShortcutService } from '@univerjs/ui'; import type { Observable, Subscription } from 'rxjs'; +import type { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service'; +import { createIdentifier, Disposable, InterceptorManager, makeCellToSelection, RANGE_TYPE } from '@univerjs/core'; +import { ScrollTimer, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render'; +import { getNormalSelectionStyle as getDefaultNormalSelectionStyle, transformCellDataToSelectionData } from '@univerjs/sheets'; +import { BehaviorSubject, Subject } from 'rxjs'; import { SHEET_COMPONENT_SELECTION_LAYER_INDEX } from '../../common/keys'; import { RANGE_FILL_PERMISSION_CHECK, RANGE_MOVE_PERMISSION_CHECK } from './const'; +import { SelectionControl } from './selection-control'; import { SelectionLayer } from './selection-layer'; -import { SelectionControl } from './selection-shape'; import { SelectionShapeExtension } from './selection-shape-extension'; import { attachPrimaryWithCoord, attachSelectionWithCoord } from './util'; -import type { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service'; export interface IControlFillConfig { oldRange: IRange; diff --git a/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts b/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts index 7d544b97ae6..27516e0913b 100644 --- a/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts +++ b/packages/sheets-ui/src/services/selection/mobile-selection-shape.ts @@ -14,14 +14,14 @@ * limitations under the License. */ -import { RANGE_TYPE } from '@univerjs/core'; -import { Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render'; import type { ThemeService } from '@univerjs/core'; import type { BaseObject, IRectProps, Scene } from '@univerjs/engine-render'; import type { ISelectionStyle } from '@univerjs/sheets'; +import { RANGE_TYPE } from '@univerjs/core'; +import { Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render'; import { SHEET_COMPONENT_SELECTION_LAYER_INDEX } from '../../common/keys'; -import { SELECTION_MANAGER_KEY, SelectionControl } from './selection-shape'; +import { SELECTION_MANAGER_KEY, SelectionControl } from './selection-control'; export class MobileSelectionControl extends SelectionControl { /** diff --git a/packages/sheets-ui/src/services/selection/selection-shape.ts b/packages/sheets-ui/src/services/selection/selection-control.ts similarity index 100% rename from packages/sheets-ui/src/services/selection/selection-shape.ts rename to packages/sheets-ui/src/services/selection/selection-control.ts diff --git a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts index b77496682b1..894358ea22c 100644 --- a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts +++ b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts @@ -22,10 +22,10 @@ import type { IFreeze, Injector, IRangeWithCoord, Nullable, ThemeService } from import type { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport } from '@univerjs/engine-render'; import type { Subscription } from 'rxjs'; +import type { SelectionControl } from './selection-control'; import { SheetSkeletonManagerService } from '../sheet-skeleton-manager.service'; import { ISheetSelectionRenderService } from './base-selection-render.service'; import { RANGE_FILL_PERMISSION_CHECK, RANGE_MOVE_PERMISSION_CHECK } from './const'; -import type { SelectionControl } from './selection-shape'; const HELPER_SELECTION_TEMP_NAME = '__SpreadsheetHelperSelectionTempRect'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 25c2a7b1f4d..5081f021788 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2208,6 +2208,9 @@ importers: '@univerjs/sheets': specifier: workspace:* version: link:../sheets + '@univerjs/sheets-filter': + specifier: workspace:* + version: link:../sheets-filter '@univerjs/sheets-numfmt': specifier: workspace:* version: link:../sheets-numfmt @@ -4137,79 +4140,67 @@ packages: resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==} cpu: [arm64] os: [linux] - libc: [glibc] '@img/sharp-libvips-linux-arm@1.0.5': resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==} cpu: [arm] os: [linux] - libc: [glibc] '@img/sharp-libvips-linux-s390x@1.0.4': resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==} cpu: [s390x] os: [linux] - libc: [glibc] '@img/sharp-libvips-linux-x64@1.0.4': resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==} cpu: [x64] os: [linux] - libc: [glibc] '@img/sharp-libvips-linuxmusl-arm64@1.0.4': resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==} cpu: [arm64] os: [linux] - libc: [musl] '@img/sharp-libvips-linuxmusl-x64@1.0.4': resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==} cpu: [x64] os: [linux] - libc: [musl] '@img/sharp-linux-arm64@0.33.5': resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [arm64] os: [linux] - libc: [glibc] '@img/sharp-linux-arm@0.33.5': resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [arm] os: [linux] - libc: [glibc] '@img/sharp-linux-s390x@0.33.5': resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [s390x] os: [linux] - libc: [glibc] '@img/sharp-linux-x64@0.33.5': resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [x64] os: [linux] - libc: [glibc] '@img/sharp-linuxmusl-arm64@0.33.5': resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [arm64] os: [linux] - libc: [musl] '@img/sharp-linuxmusl-x64@0.33.5': resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [x64] os: [linux] - libc: [musl] '@img/sharp-wasm32@0.33.5': resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==} @@ -4491,55 +4482,46 @@ packages: resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==} cpu: [arm] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.22.4': resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==} cpu: [arm] os: [linux] - libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.22.4': resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==} cpu: [arm64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.22.4': resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==} cpu: [arm64] os: [linux] - libc: [musl] '@rollup/rollup-linux-powerpc64le-gnu@4.22.4': resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==} cpu: [ppc64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.22.4': resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==} cpu: [riscv64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.22.4': resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==} cpu: [s390x] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.22.4': resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==} cpu: [x64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-musl@4.22.4': resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==} cpu: [x64] os: [linux] - libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.22.4': resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==} @@ -4825,28 +4807,24 @@ packages: engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [glibc] '@swc/core-linux-arm64-musl@1.7.5': resolution: {integrity: sha512-5ArGdqvFMszNHdi4a67vopeYq8d1K+FuTWDrblHrAvZFhAyv+GQz2PnKqYOgl0sWmQxsNPfNwBFtxACpUO3Jzg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [musl] '@swc/core-linux-x64-gnu@1.7.5': resolution: {integrity: sha512-mSVVV/PFzCGtI1nVQQyx34NwCMgSurF6ZX/me8pUAX054vsE/pSFL66xN+kQOe/1Z/LOd4UmXFkZ/EzOSnYcSg==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [glibc] '@swc/core-linux-x64-musl@1.7.5': resolution: {integrity: sha512-09hY3ZKMUORXVunESKS9yuP78+gQbr759GKHo8wyCdtAx8lCZdEjfI5NtC7/1VqwfeE32/U6u+5MBTVhZTt0AA==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [musl] '@swc/core-win32-arm64-msvc@1.7.5': resolution: {integrity: sha512-B/UDtPI3RlYRFW42xQxOpl6kI/9LtkD7No+XeRIKQTPe15EP2o+rUlv7CmKljVBXgJ8KmaQbZlaEh1YP+QZEEQ==}