Fix some review comments

Author: dasathyakuma

examples/marko/grid/src/data.ts

@@ -1,4 +1,4 @@
 export const ROW_COUNT = 1000
 export const COL_COUNT = 1000
-export const rowSizes = Array.from({ length: ROW_COUNT }, () => 30 + Math.round(Math.random() * 20))
-export const colSizes = Array.from({ length: COL_COUNT }, () => 80 + Math.round(Math.random() * 80))
+export const rowSizes = Array.from({ length: ROW_COUNT }, (_, i) => 30 + ((i * 7 + 13) % 20))
+export const colSizes = Array.from({ length: COL_COUNT }, (_, i) => 80 + ((i * 11 + 17) % 80))

packages/marko-virtual/README.md

@@ -12,7 +12,7 @@ npm install @tanstack/marko-virtual
 pnpm add @tanstack/marko-virtual
 ```
 
-**Peer dependency:** `marko >= 6.0.0`
+**Peer dependency:** `marko ^6.0.0`
 
 ## Setup
 

packages/marko-virtual/src/marko.d.ts

@@ -13,11 +13,20 @@ declare module "*.marko" {
   export default template
 }
 
-// Type declaration for @marko/vite plugin.
-// The actual package may ship its own types; this is a fallback.
+// Type declarations for @marko/vite and @marko/run/vite.
+// Both export the same Vite plugin factory; @marko/run/vite re-exports from
+// @marko/vite. Users may import from either path depending on their setup.
+// The actual packages may ship their own types; these are fallbacks.
 declare module "@marko/vite" {
   import type { Plugin } from "vite"
 
+  function marko(options?: Record<string, unknown>): Plugin
+  export default marko
+}
+
+declare module "@marko/run/vite" {
+  import type { Plugin } from "vite"
+
   function marko(options?: Record<string, unknown>): Plugin
   export default marko
 }

packages/marko-virtual/src/tags/virtualizer/index.marko

@@ -99,8 +99,11 @@ export interface Input {
   onDestroy() {
     const entry = getInstance(id)
     if (entry) {
-      entry.cleanup()
-      deleteInstance(id)
+      try {
+        entry.cleanup()
+      } finally {
+        deleteInstance(id)
+      }
     }
   }
 />

packages/marko-virtual/src/tags/window-virtualizer/index.marko

@@ -86,13 +86,17 @@ export interface Input {
     })
 
     v._willUpdate()
+    notify()
   }
 
   onDestroy() {
     const entry = getInstance(id)
     if (entry) {
-      entry.cleanup()
-      deleteInstance(id)
+      try {
+        entry.cleanup()
+      } finally {
+        deleteInstance(id)
+      }
     }
   }
 />

packages/marko-virtual/tests/index.test.ts

@@ -10,17 +10,17 @@
  * Marko compilation pipeline. Those are not set up here but should be added
  * as e2e tests using @marko/run's test utilities in a future iteration.
  */
-import { describe, test, expect, beforeEach, vi } from 'vitest'
+import { beforeEach, describe, expect, test, vi } from 'vitest'
 import {
-  Virtualizer,
+  defaultKeyExtractor,
+  defaultRangeExtractor,
   elementScroll,
-  observeElementRect,
   observeElementOffset,
-  observeWindowRect,
+  observeElementRect,
   observeWindowOffset,
+  observeWindowRect,
+  Virtualizer,
   windowScroll,
-  defaultRangeExtractor,
-  defaultKeyExtractor,
 } from '../src/index'
 
 // ---------------------------------------------------------------------------
@@ -167,9 +167,11 @@ describe('row virtualizer', () => {
       onChange,
     })
 
-    v._didMount()
+    const cleanup = v._didMount()
     v._willUpdate()
     expect(onChange).toHaveBeenCalled()
+
+    cleanup()
   })
 })
 

packages/marko-virtual/tests/tags.test.ts

@@ -37,15 +37,20 @@ const WindowVirtualizer = WindowVirtualizerFixture as any
 // Test helpers
 // ---------------------------------------------------------------------------
 
+const instances: Array<{ destroy(): void }> = []
+
 function mountFixture(Template: any, input: Record<string, unknown> = {}) {
   const container = document.createElement("div")
   document.body.appendChild(container)
-  Template.mount(input, container)
+  const instance = Template.mount(input, container)
+  instances.push(instance)
   return container
 }
 
 afterEach(() => {
-  // Reset DOM between tests
+  // Destroy Marko instances to run onDestroy lifecycle (cleans up store entries)
+  instances.forEach((i) => i.destroy())
+  instances.length = 0
   document.body.innerHTML = ""
 })