@netless/appliance-plugin 1.1.35 → 1.1.36-beta.1

package/dist/undo/index.d.ts

@@ -3,6 +3,8 @@ import { BaseCollectorReducerAction, ISerializableUndoDataType, ISerializableUnd
 import type { Room } from "../plugin/types";
 import { BaseSubWorkModuleProps, ApplianceManagerLike } from "../plugin/types";
 import { MasterController } from "../core/mainEngine";
+import { Collector } from "../collector/collector";
+import { AckMeta, ExpectedAcks } from "./timing";
 export interface ILocalStorageDataItem extends ISerializableUndoDataType {
     key: WorkId;
 }
@@ -31,16 +33,53 @@ export declare class UndoRedoMethod {
     private scenePath?;
     private tickStartStorerCache?;
     private excludeIds;
+    private pendingState;
+    private tickStartCaches;
+    private tickStartExcludeIds;
+    private readonly timingFix;
+    private readonly ackTimeout;
+    private readonly gracePeriodTimeout;
+    private readonly doingFallbackTimeout;
+    private isGlobalStackTransaction;
+    private pendingGlobalServiceData?;
+    private pendingArrayChanges;
     constructor(props: UndoRedoMethodProps);
+    private reportStackLength;
+    private emitUndoStepsUpdate;
+    private emitRedoStepsUpdate;
+    private beginGlobalStackTransaction;
+    private flushPendingArrayChanges;
+    private endGlobalStackTransaction;
+    /** 主控侧（baseViewContainerManager）会调用 ackRender / ackStorage 把双脚事件路由到这里。 */
+    ackRender(id: number, scenePath: string, meta?: AckMeta): void;
+    ackStorage(id: number, scenePath: string, workId?: string, meta?: AckMeta): void;
+    collectExpectedWorkIds(id: number, scenePath: string, workIds: string[]): void;
+    reopenStorageAck(id: number, scenePath: string, workIds: string[]): void;
+    /**
+     * 标记当前 ticker 期望收到哪些 workId 的 storage ack；多元素入口（paste/delete/多选）应在 undoTickerStart 之后调用。
+     * 单元素入口可以不调；不调则退化为"任一 storage ack 即收尾"。
+     */
+    finalizeRequested(id: number, scenePath: string, workIds: string[]): void;
+    private mergeMeta;
+    private armAckTimeout;
+    private tryEnd;
+    private forceFlushPending;
+    private hasAnyAck;
+    private clearPendingState;
+    cancelUndoTicker(id: number, viewId: string, scenePath: string): void;
+    private getStartCache;
+    private getExcludeIds;
+    private resetLegacyTicker;
     private handleArrayChange;
-    get collector(): import("../collector").Collector | undefined;
+    get collector(): Collector | undefined;
     get undoTickerId(): number | undefined;
     get tmpTickStartStorerCache(): Map<string, BaseCollectorReducerAction | undefined> | undefined;
     get uid(): string;
     addExcludeIds(ids: string[]): void;
-    undoTickerStart(id: number, scenePath: string): void;
-    undoTickerEnd(id: number, scenePath: string): void;
-    undoTickerEndSync(id: number, viewId: string, scenePath: string, isEmit?: boolean): void;
+    undoTickerStart(id: number, scenePath: string, expectedAcks?: ExpectedAcks): void;
+    private legacyUndoTickerStart;
+    undoTickerEnd(id: number, scenePath: string, forceIds?: string[]): void;
+    undoTickerEndSync(id: number, viewId: string, scenePath: string, isEmit?: boolean, forceIds?: string[]): void;
     private transformToUndoStackItem;
     pullServiceData(serviceData?: ISerializableUndoRedoStackData): void;
     undo(scenePath: string): number;
@@ -53,6 +92,8 @@ export declare class UndoRedoMethod {
     onChangeScene: import("lodash").DebouncedFunc<() => void>;
     onFocusView(): void;
     private especialDiff;
+    private normalizeUndoSnapshotValue;
+    private getTextDebugOpt;
     private diffFun;
     private isDrawEffectiveScene;
     private isDeleteEffectiveScene;

package/dist/undo/timing.d.ts

@@ -0,0 +1,50 @@
+import type { BaseCollectorReducerAction } from "../collector/types";
+export declare const UndoScope_ClearAll = "__undo_scope_clear_all__";
+export type ExpectedAcks = {
+    render: boolean;
+    storage: boolean;
+    scopeMode?: "static" | "dynamic";
+    copyAck?: boolean;
+    isWritable?: boolean;
+    workIds?: Array<string | number>;
+};
+export type AckMeta = {
+    requestId?: string;
+    emitEventType?: string;
+};
+export type PendingUndoTickerState = {
+    viewId: string;
+    scenePath: string;
+    expectedRender: boolean;
+    expectedStorage: boolean;
+    gotRender: boolean;
+    gotStorage: boolean;
+    scopeMode: "static" | "dynamic";
+    finalizeRequested: boolean;
+    collectedScopeKeys: Set<string>;
+    scopeKeys: Set<string>;
+    ackedStorageKeys: Set<string>;
+    meta: AckMeta & Pick<ExpectedAcks, "copyAck" | "isWritable">;
+    ackTimer?: number;
+    graceTimer?: number;
+    fallbackTimer?: number;
+};
+export type ScopeCollector = {
+    isLocalId(id: string): boolean;
+    transformKey(id: string | number): string;
+    getLocalId(id: string): string | undefined;
+    getStorageData(viewId: string, scenePath: string): Record<string, Pick<BaseCollectorReducerAction, "selectIds"> | undefined> | undefined;
+};
+export declare function createPendingUndoTickerState(params: {
+    viewId: string;
+    scenePath: string;
+    expectedAcks: ExpectedAcks;
+    fallbackTimer?: number;
+}): PendingUndoTickerState;
+export declare function mergeAckMeta(state: PendingUndoTickerState, meta?: AckMeta): void;
+export declare function isPendingStateComplete(state: PendingUndoTickerState): boolean;
+export declare function shouldStartAckTimer(state: PendingUndoTickerState): boolean;
+export declare function shouldAcceptStorageAck(scopeKeys: Set<string>, workId?: string): boolean;
+export declare function normalizeStorageKey(collector: ScopeCollector, id: string | number): string;
+export declare function buildScopeStorageKeys(collector: ScopeCollector | undefined, viewId: string, scenePath: string, ids: Array<string | number>): Set<string>;
+export declare function shouldIncludeDiffKey(key: string, excludeIds: Set<string>, scopeKeys?: Set<string>): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/appliance-plugin",
-  "version": "1.1.35",
+  "version": "1.1.36-beta.1",
   "files": [
     "dist",
     "cdn",
@@ -42,6 +42,11 @@
     "ci:check": "pnpm lint && pnpm test:auto-shape && pnpm build && pnpm example:typecheck",
     "test:text-editor-focus": "tsx scripts/textEditorFocus.test.ts",
     "test:auto-shape": "tsx test/autoShape.test.ts",
+    "test:undo-timing": "tsx test/undoTiming.test.ts",
+    "test:undo-timing:coverage": "c8 --reporter=text --reporter=html --include=src/undo/timing.ts --check-coverage --statements 90 --lines 90 --branches 90 --functions 90 tsx test/undoTiming.test.ts",
+    "test:selector-api": "tsx test/selectorApi.test.ts",
+    "test:selector-api:coverage": "c8 --reporter=text --reporter=html --include=src/plugin/selectorApi.ts --check-coverage --statements 90 --lines 90 --functions 100 tsx test/selectorApi.test.ts",
+    "test:selector-api:coverage:context": "c8 --reporter=text --reporter=html --include=src/plugin/selectorApi.ts --include=src/core/mainEngine.ts --include=src/plugin/applianceSinglePlugin.ts --include=src/plugin/applianceMultiPlugin.ts tsx test/selectorApi.test.ts",
     "types:bundler": "tsc --emitDeclarationOnly",
     "build:bridge": "vite build --config vite.config.bridge.js",
     "build:bundler": "vite build --config vite.config.bundler.js && yarn build:bridge && yarn types:bundler",
@@ -56,21 +61,27 @@
     "@babel/plugin-transform-object-rest-spread": "^7.28.4",
     "@babel/preset-env": "^7.24.7",
     "@netless/window-manager": "^1.0.11",
+    "@playwright/test": "^1.61.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@types/dom-to-image": "^2.6.7",
     "@types/lodash": "^4.14.202",
+    "@types/node": "^26.0.0",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
     "@typescript-eslint/eslint-plugin": "^8.39.0",
     "@typescript-eslint/parser": "^8.39.0",
+    "@vitest/coverage-v8": "^4.1.9",
+    "c8": "^11.0.0",
     "cross-env": "^7.0.3",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
+    "jsdom": "^29.1.1",
     "less": "^4.2.0",
     "prettier": "^3.6.2",
     "tsx": "^4.21.0",
     "typescript": "^5.2.2",
     "vite": "^5.0.0",
+    "vitest": "^4.1.9",
     "white-web-sdk": "^2.16.54"
   },
   "peerDependencies": {