pmx-canvas 0.1.18 → 0.1.20

package/src/server/canvas-state.ts

@@ -32,6 +32,12 @@ function normalizePositiveInteger(value: number | undefined): number | undefined
   return Math.floor(value);
 }
 
+function normalizeSnapshotTimestamp(value: string | undefined): string | undefined {
+  if (!value) return undefined;
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? new Date(parsed).toISOString() : undefined;
+}
+
 export const PMX_CANVAS_DIR = '.pmx-canvas';
 const STATE_FILENAME = 'state.json';
 const SNAPSHOTS_SUBDIR = 'snapshots';
@@ -89,6 +95,8 @@ export interface CanvasSnapshot {
 export interface CanvasSnapshotListOptions {
   limit?: number;
   query?: string;
+  before?: string;
+  after?: string;
   all?: boolean;
 }
 
@@ -154,11 +162,12 @@ export interface CanvasAnnotationPoint {
 
 export interface CanvasAnnotation {
   id: string;
-  type: 'freehand';
+  type: 'freehand' | 'text';
   points: CanvasAnnotationPoint[];
   bounds: { x: number; y: number; width: number; height: number };
   color: string;
   width: number;
+  text?: string;
   label?: string;
   createdAt: string;
 }
@@ -193,6 +202,10 @@ interface GroupNodesOptions {
   keepGroupFrame?: boolean;
 }
 
+interface ApplyUpdatesOptions {
+  skipGroupChildTranslation?: boolean;
+}
+
 function formatBatchUpdateDescription(updates: CanvasNodeUpdate[]): string {
   let moved = 0;
   let resized = 0;
@@ -856,11 +869,16 @@ class CanvasStateManager {
         }
       }
       const query = options.query?.trim().toLowerCase();
-      const filtered = query
-        ? snapshots.filter((snapshot) =>
-          snapshot.id.toLowerCase().includes(query) || snapshot.name.toLowerCase().includes(query),
-        )
-        : snapshots;
+      const before = normalizeSnapshotTimestamp(options.before);
+      const after = normalizeSnapshotTimestamp(options.after);
+      const filtered = snapshots.filter((snapshot) => {
+        if (query && !snapshot.id.toLowerCase().includes(query) && !snapshot.name.toLowerCase().includes(query)) {
+          return false;
+        }
+        if (before && snapshot.createdAt > before) return false;
+        if (after && snapshot.createdAt < after) return false;
+        return true;
+      });
       const sorted = filtered.sort((a, b) => b.createdAt.localeCompare(a.createdAt));
       const limit = options.all ? undefined : (normalizePositiveInteger(options.limit) ?? 20);
       return limit === undefined ? sorted : sorted.slice(0, limit);
@@ -1203,7 +1221,7 @@ class CanvasStateManager {
     };
   }
 
-  applyUpdates(updates: CanvasNodeUpdate[]): { applied: number; skipped: number } {
+  applyUpdates(updates: CanvasNodeUpdate[], options: ApplyUpdatesOptions = {}): { applied: number; skipped: number } {
     let applied = 0;
     let skipped = 0;
     const touchedParentGroups = new Map<string, { compact: boolean }>();
@@ -1246,7 +1264,7 @@ class CanvasStateManager {
       }
       oldSnapshots.set(update.id, structuredClone(existing));
       appliedUpdates.push({ id: update.id, ...structuredClone(nextPatch) });
-      if (existing.type === 'group' && nextPatch.position) {
+      if (existing.type === 'group' && nextPatch.position && options.skipGroupChildTranslation !== true) {
         this.translateGroupChildren(
           update.id,
           nextPatch.position.x - existing.position.x,
@@ -1284,7 +1302,7 @@ class CanvasStateManager {
         operationType: 'batch',
         description: formatBatchUpdateDescription(appliedUpdates),
         forward: this.suppressed(() => {
-          this.applyUpdates(appliedUpdates.map((update) => structuredClone(update)));
+          this.applyUpdates(appliedUpdates.map((update) => structuredClone(update)), options);
         }),
         inverse: this.suppressed(() => {
           for (const snapshot of inverseSnapshots) {