Fix deprecated windows build

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

.github/actions/install-deps/action.yaml

@@ -64,6 +64,17 @@ runs:
           with:
               cmake-version: "3.29.6"
 
+        - name: Setup MSVC environment (Windows)
+          if: ${{ runner.os == 'Windows' }}
+          uses: ilammy/msvc-dev-cmd@v1
+          with:
+              arch: ${{ inputs.arch == 'aarch64' && 'amd64_arm64' || 'x64' }}
+
+        - name: Force Ninja generator (Windows)
+          if: ${{ runner.os == 'Windows' }}
+          shell: bash
+          run: echo "CMAKE_GENERATOR=Ninja" >> "$GITHUB_ENV"
+
         - name: Install pnpm
           uses: pnpm/action-setup@v3
           with:

Cargo.lock

@@ -17,7 +17,7 @@
     "llvm": "17.0.6",
     "pyodide": "0.29.3",
     "engines": {
-        "node": ">=16 <23"
+        "node": ">=16 <24"
     },
     "workspaces": [
         "tools/test",

package.json

@@ -68,6 +68,8 @@ export class WebGLContextManager {
      */
     private _yieldChannel: MessageChannel | null = null;
 
+    private _pendingYieldResolve: (() => void) | null = null;
+
     /**
      * @param source A raw canvas (manager constructs and **owns** a
      *   private {@link GLContext}) or an existing shared `GLContext`
@@ -350,6 +352,10 @@ export class WebGLContextManager {
 
                 flags = 0;
                 await this._yieldToTask();
+
+                if (this._destroyed) {
+                    return;
+                }
             }
         } finally {
             gl.deleteSync(fence);
@@ -375,9 +381,15 @@ export class WebGLContextManager {
 
         return new Promise<void>((resolve) => {
             const ch = this._yieldChannel!;
-            ch.port1.addEventListener("message", () => resolve(), {
-                once: true,
-            });
+            this._pendingYieldResolve = resolve;
+            ch.port1.addEventListener(
+                "message",
+                () => {
+                    this._pendingYieldResolve = null;
+                    resolve();
+                },
+                { once: true },
+            );
             ch.port2.postMessage(null);
         });
     }
@@ -387,6 +399,12 @@ export class WebGLContextManager {
         this._frameCallback = null;
         this._disposeRestore();
         this._buffers.releaseAll();
+        if (this._pendingYieldResolve) {
+            const resolve = this._pendingYieldResolve;
+            this._pendingYieldResolve = null;
+            resolve();
+        }
+
         if (this._yieldChannel) {
             this._yieldChannel.port1.close();
             this._yieldChannel.port2.close();

packages/viewer-charts/src/ts/webgl/context-manager.ts

@@ -27,7 +27,7 @@ const SCATTER = {
 };
 
 const TABLE_NAME = "load-viewer-csv";
-const TOGGLE_COUNT = 24;
+const TOGGLE_COUNT = 12;
 
 function collectLeakErrors(page: Page): string[] {
     const hits: string[] = [];
@@ -48,10 +48,9 @@ async function toggleSecondViewer(page: Page, cfg: object): Promise<void> {
             const worker = (window as any).__TEST_WORKER__;
             const table = await worker.open_table(tableName);
             const v = document.createElement("perspective-viewer");
-            v.setAttribute("data-toggle", "1");
             document.body.appendChild(v);
-            await (v as any).load(table);
-            await (v as any).restore(cfg);
+            await v.load(table);
+            await v.restore(cfg);
         },
         { cfg, tableName: TABLE_NAME },
     );
@@ -72,11 +71,9 @@ async function toggleSecondViewerRacingInit(
             const worker = (window as any).__TEST_WORKER__;
             const table = await worker.open_table(tableName);
             const v = document.createElement("perspective-viewer");
-            v.setAttribute("data-toggle", "1");
             document.body.appendChild(v);
             await v.load(table);
             v.restore(cfg).catch(() => {});
-
             await new Promise<void>((resolve) =>
                 setTimeout(() => {
                     v.remove();
@@ -99,13 +96,11 @@ test.describe("WebGL context leak", () => {
     test("repeated full toggles never evict the first chart's context", async ({
         page,
     }) => {
-        test.setTimeout(180_000);
+        // test.setTimeout(180_000);
         const leakErrors = collectLeakErrors(page);
-
         const baseline = await calibratePlotBaseline(page);
         expect(baseline).toBeGreaterThan(0);
         const threshold = Math.max(1, Math.floor(baseline * 0.5));
-
         for (let i = 0; i < TOGGLE_COUNT; i++) {
             await toggleSecondViewer(page, SCATTER);
         }
@@ -126,7 +121,7 @@ test.describe("WebGL context leak", () => {
     test("toggling during renderer init never leaks a context", async ({
         page,
     }) => {
-        test.setTimeout(180_000);
+        // test.setTimeout(180_000);
         const leakErrors = collectLeakErrors(page);
         const baseline = await calibratePlotBaseline(page);
         expect(baseline).toBeGreaterThan(0);

packages/viewer-charts/test/ts/context-leak.spec.ts

@@ -36,21 +36,14 @@ export async function gotoBasic(page: Page): Promise<void> {
     });
 }
 
-/**
- * Restore the viewer with `config`, then wait one animation frame so
- * the chart's scheduled render (`requestRender` → scheduler RAF →
- * `_fullRender`) has fired. By the time this returns, WebGL draw
- * commands have been issued to the GL context and `page.screenshot()`
- * will capture them.
- */
 export async function restoreChart(
     page: Page,
     config: ViewerConfigUpdate,
 ): Promise<void> {
     await page.evaluate(
         async (c) => {
             const viewer = document.querySelector("perspective-viewer")!;
-            await (viewer as any).restore(c);
+            await viewer.restore(c);
         },
         config as unknown as Record<string, unknown>,
     );

packages/viewer-charts/test/ts/helpers.ts

@@ -10,13 +10,7 @@
 // ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-import {
-    PageView as PspViewer,
-    compareNodes,
-    expect,
-    test,
-} from "@perspective-dev/test";
-import { SymbolPair } from "@perspective-dev/test/src/js/models/column_settings";
+import { PageView as PspViewer, expect, test } from "@perspective-dev/test";
 import { Page } from "@playwright/test";
 
 const symbols = [

packages/viewer-charts/test/ts/xy_symbols.spec.ts

@@ -52,9 +52,9 @@ impl From<Aggregate> for view_config::AggList {
     fn from(value: Aggregate) -> Self {
         view_config::AggList {
             aggregations: match value {
-                Aggregate::SingleAggregate(x) => vec![format!("{}", x)],
+                Aggregate::SingleAggregate(x) => vec![x],
                 Aggregate::MultiAggregate(x, y) => {
-                    vec![format!("{}", x), format!("{}", y.join(","))]
+                    vec![x, y.join(",")]
                 },
             },
         }

rust/perspective-client/src/rust/config/aggregates.rs

@@ -51,7 +51,7 @@ protobuf-src = ["perspective-client/protobuf-src"]
 crate-type = ["cdylib"]
 
 [build-dependencies]
-cmake = "0.1.50"
+cmake = "0.1.58"
 num_cpus = "^1.16.0"
 pyo3-build-config = "0.25.1"
 python-config-rs = "0.1.2"

rust/perspective-python/Cargo.toml

@@ -39,7 +39,7 @@ python = []
 disable-cpp = []
 
 [build-dependencies]
-cmake = "0.1.50"
+cmake = "0.1.58"
 num_cpus = "^1.15.0"
 shlex = "1.3.0"
 protobuf-src = { version = "2.1.1" }