refactor buffer storage 3

Author: bmschmidt

src/regl_rendering.ts

@@ -104,8 +104,10 @@ export class ReglRenderer extends Renderer {
     this.initialize_textures();
 
     // Not the right way, for sure.
-    (this._initializations = this.deeptable.promise.then(() => {
+    (this._initializations = this.deeptable.promise.then(async () => {
       this.remake_renderer();
+      // hack--get around a potential race condition.
+      await this.wait_for_zoom_attachment();
       this._webgl_scale_history = [
         this.default_webgl_scale,
         this.default_webgl_scale,

src/rendering.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
 /* eslint-disable no-underscore-dangle */
-import { BaseType, select } from 'd3-selection';
+import { BaseType, select, Selection } from 'd3-selection';
 import { min } from 'd3-array';
 import type { Scatterplot } from './scatterplot';
 import type { Tile } from './tile';
@@ -123,7 +123,7 @@ class RenderProps {
 export class Renderer {
   // A renderer handles drawing to a display element.
   public scatterplot: Scatterplot;
-  public holder: d3.Selection<Element, unknown, BaseType, unknown>;
+  public holder: Selection<Element, unknown, BaseType, unknown>;
   public canvas: HTMLCanvasElement;
   public deeptable: Deeptable;
   public width: number;
@@ -264,6 +264,21 @@ export class Renderer {
     return this;
   }
 
+  async wait_for_zoom_attachment() {
+    let t = 0;
+    const timeout = 2; // milliseconds.
+    while (this._zoom === undefined) {
+      await new Promise<void>((resolve) => {
+        setTimeout(() => resolve(), timeout)
+      })
+      t += timeout
+      if (t > 1000) {
+        console.warn('after 1 second, still no zoom state; this is likely a bug');
+        t = 0;
+      }
+    }
+  }
+
   async initialize() {
     // Asynchronously wait for the basic elements to be done.
     // await this._initializations;

src/types.ts

@@ -498,7 +498,7 @@ export type DataSpec = { tileProxy?: TileProxy } & (
  * zoom events & recieve the zoom transform. For example, a consumer
  * might update annotations on zoom events to keep them in sync.
  */
-export type onZoomCallback = (transform: d3.ZoomTransform) => null;
+export type onZoomCallback = (transform: ZoomTransform) => null;
 
 export type Label = {
   x: number; // in data space.

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "include": ["src/**/*.ts", "src/types.ts"],
-  "exclude": ["node_modules/**/*"],
+  "exclude": ["node_modules"],
   "compilerOptions": {
     "declarationMap": true,
     "declaration": true,
@@ -18,7 +18,8 @@
     "lib": ["DOM"],
     "types": ["@webgpu/types"],
     "noEmitOnError": true,
-    "emitDeclarationOnly": true
+    "emitDeclarationOnly": true,
+    "skipLibCheck": true
   },
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "Recommended"