Revert some naming, etc.

Author: aganders3

src/core/layer.ts

@@ -61,11 +61,11 @@ export abstract class Layer {
 
   public onEvent(_: EventContext): void {}
 
-  // Synchronous attach/detach. The source must be opened before a layer is attached
-  // (see ChunkManager.viewFor) so creating the layer's view needs no async step.
-  public attach(_context: IdetikContext): void {}
+  // called when a layer is added to a viewport
+  public onAttached(_context: IdetikContext): void {}
 
-  public detach(): void {}
+  // called when a layer is removed from a viewport
+  public onDetached(_context: IdetikContext): void {}
 
   public get objects() {
     return this.objects_;

src/core/viewport.ts

@@ -29,7 +29,7 @@ export class Viewport {
   public readonly events: EventDispatcher;
   public cameraControls?: CameraControls;
 
-  // Carried only to relay to `layer.attach` / `layer.detach`.
+  // Carried only to relay to `layer.onAttached` / `layer.onDetached`.
   // To be removed when the chunk-infrastructure refactor folds chunk management
   // into the source and the attach lifecycle goes away.
   private readonly context_: IdetikContext;
@@ -72,7 +72,7 @@ export class Viewport {
 
   public addLayer(layer: Layer): void {
     this.layers_.push(layer);
-    layer.attach(this.context_);
+    layer.onAttached(this.context_);
   }
 
   public removeLayer(layer: Layer): void {
@@ -81,12 +81,12 @@ export class Viewport {
       throw new Error(`Layer to remove not found: ${layer}`);
     }
     this.layers_.splice(index, 1);
-    layer.detach();
+    layer.onDetached(this.context_);
   }
 
   public removeAllLayers(): void {
     for (const layer of this.layers_) {
-      layer.detach();
+      layer.onDetached(this.context_);
     }
     this.layers_ = [];
   }

src/data/chunk.ts

@@ -99,7 +99,6 @@ export type SliceCoordinates = {
 };
 
 export type ChunkSource = {
-  /** The source's loader. Sources are opened by their factory, so this is synchronous. */
   getLoader(): ChunkLoader;
 };
 

src/data/chunk_manager.ts

@@ -25,11 +25,8 @@ export class ChunkManager {
     return chunkMemoryStats();
   }
 
-  /**
-   * Creates a view for a source. The source is opened by its factory
-   * (`OmeZarrImageSource.fromHttp(...)` / `fromFileSystem(...)`), so this is synchronous.
-   */
-  public viewFor(
+  /** Adds a view onto `source`'s store, creating the store on first use. */
+  public addView(
     source: ChunkSource,
     policy: ImageSourcePolicy
   ): ChunkStoreView {
@@ -38,7 +35,7 @@ export class ChunkManager {
       store = new ChunkStore(source.getLoader());
       this.stores_.set(source, store);
     }
-    return store.createView(policy);
+    return store.addView(policy);
   }
 
   public update() {

src/data/chunk_store.ts

@@ -126,7 +126,7 @@ export class ChunkStore {
     return this.loader_.loadChunkData(chunk, signal);
   }
 
-  public createView(policy: ImageSourcePolicy): ChunkStoreView {
+  public addView(policy: ImageSourcePolicy): ChunkStoreView {
     const view = new ChunkStoreView(this, policy);
     this.views_.push(view);
     this.hasHadViews_ = true;

src/data/ome_zarr/image_source.ts

@@ -38,12 +38,9 @@ export class OmeZarrImageSource {
   private readonly loader_: OmeZarrImageLoader;
 
   /**
-   * Construct only via a static factory (`fromHttp`/`fromFileSystem`). A factory must
-   * fully open the data up front — e.g. via {@link openLoader}, which resolves to a
-   * ready loader or throws — and pass that loader in. The constructor therefore always
-   * receives an opened loader, so a source instance is never in a half-open state
-   * (`getLoader`/`getDimensions` cannot fail). To add a new factory, open the loader
-   * first, then `new OmeZarrImageSource({ location, version, loader })`.
+   * Private: construct via a static factory (`fromHttp`/`fromFileSystem`). Factories open
+   * the loader up front and pass it in, so a source's loader is non-null.
+   * errors opening a source surface early, and `getLoader`/`getDimensions` always succeed
    */
   private constructor(props: OmeZarrImageSourceProps) {
     this.location = props.location;
@@ -96,7 +93,6 @@ export class OmeZarrImageSource {
     return this.getDimensions().c?.lods[0].size ?? 1;
   }
 
-  /** The source's loader, for synchronous view creation by the chunk manager. */
   public getLoader(): OmeZarrImageLoader {
     return this.loader_;
   }

src/layers/image_layer.ts

@@ -73,13 +73,13 @@ export class ImageLayer extends Layer implements ChannelsEnabled {
     this.onPickValue_ = onPickValue;
   }
 
-  public attach(context: IdetikContext): void {
+  public onAttached(context: IdetikContext): void {
     if (this.chunkStoreView_) {
       throw new Error(
         "ImageLayer cannot be attached to multiple viewports simultaneously."
       );
     }
-    this.chunkStoreView_ = context.chunkManager.viewFor(
+    this.chunkStoreView_ = context.chunkManager.addView(
       this.source_,
       this.policy_
     );
@@ -100,7 +100,7 @@ export class ImageLayer extends Layer implements ChannelsEnabled {
     }
   }
 
-  public detach(): void {
+  public onDetached(_context: IdetikContext): void {
     if (!this.chunkStoreView_) return;
     this.releaseAndRemoveChunks(this.visibleChunks_.keys());
     this.clearObjects();

src/layers/label_layer.ts

@@ -66,13 +66,13 @@ export class LabelLayer extends Layer {
     this.outlineSelected_ = outlineSelected;
   }
 
-  public attach(context: IdetikContext): void {
+  public onAttached(context: IdetikContext): void {
     if (this.chunkStoreView_) {
       throw new Error(
         "LabelLayer cannot be attached to multiple viewports simultaneously."
       );
     }
-    this.chunkStoreView_ = context.chunkManager.viewFor(
+    this.chunkStoreView_ = context.chunkManager.addView(
       this.source_,
       this.policy_
     );
@@ -86,7 +86,7 @@ export class LabelLayer extends Layer {
     }
   }
 
-  public detach(): void {
+  public onDetached(_context: IdetikContext): void {
     if (!this.chunkStoreView_) return;
     this.releaseAndRemoveChunks(this.visibleChunks_.keys());
     this.clearObjects();

src/layers/volume_layer.ts

@@ -130,8 +130,13 @@ export class VolumeLayer extends Layer implements ChannelsEnabled {
     return volume;
   }
 
-  public attach(context: IdetikContext): void {
-    this.chunkStoreView_ = context.chunkManager.viewFor(
+  public onAttached(context: IdetikContext): void {
+    if (this.chunkStoreView_) {
+      throw new Error(
+        "VolumeLayer cannot be attached to multiple viewports simultaneously."
+      );
+    }
+    this.chunkStoreView_ = context.chunkManager.addView(
       this.source_,
       this.sourcePolicy_
     );
@@ -142,7 +147,7 @@ export class VolumeLayer extends Layer implements ChannelsEnabled {
     );
   }
 
-  public detach(): void {
+  public onDetached(_context: IdetikContext): void {
     if (!this.chunkStoreView_) return;
     for (const volume of this.currentVolumes_.values()) {
       this.releaseAndRemoveVolume(volume);

test/chunk_store_view.test.ts

@@ -9,7 +9,7 @@ describe("ChunkStoreView disposal", () => {
     const loader = createMockLoader();
     const store = new ChunkStore(loader);
     const policy = createNoPrefetchPolicy();
-    const view = store.createView(policy);
+    const view = store.addView(policy);
     const viewport = createTestViewport();
 
     // mark some chunks as visible/needed
@@ -44,8 +44,8 @@ describe("ChunkStoreView disposal", () => {
     const store = new ChunkStore(loader);
     const policy = createNoPrefetchPolicy();
 
-    const view1 = store.createView(policy);
-    const view2 = store.createView(policy);
+    const view1 = store.addView(policy);
+    const view2 = store.addView(policy);
     const viewport = createTestViewport();
 
     // Both views mark same chunks as needed