@milaboratories/pf-driver 1.1.1 → 1.3.0

package/src/driver_impl.ts

@@ -32,9 +32,14 @@ import {
   collectSpecQueryColumns,
   sortSpecQuery,
   sortPTableDef,
+  resolveAnnotationParents,
 } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import { ConcurrencyLimitingExecutor, type PoolEntry } from "@milaboratories/ts-helpers";
+import {
+  ConcurrencyLimitingExecutor,
+  PoolEntryGuard,
+  type PoolEntry,
+} from "@milaboratories/ts-helpers";
 import { PFrameFactory } from "@milaboratories/pframes-rs-node";
 import { tmpdir } from "node:os";
 import type { AbstractInternalPFrameDriver } from "./driver_decl";
@@ -58,9 +63,8 @@ import {
 } from "./ptable_cache_plain";
 import { createPFrame as createSpecFrame } from "@milaboratories/pframes-rs-wasm";
 
-export interface LocalBlobProvider<
-  TreeEntry extends JsonSerializable,
-> extends PoolLocalBlobProvider<TreeEntry> {}
+export interface LocalBlobProvider<TreeEntry extends JsonSerializable>
+  extends PoolLocalBlobProvider<TreeEntry>, AsyncDisposable {}
 
 export interface RemoteBlobProvider<TreeEntry extends JsonSerializable>
   extends PoolRemoteBlobProvider<TreeEntry>, AsyncDisposable {}
@@ -149,7 +153,13 @@ export class AbstractPFrameDriver<
   }
 
   async dispose(): Promise<void> {
-    return await this.remoteBlobProvider[Symbol.asyncDispose]();
+    void (await Promise.allSettled([
+      this.pTables[Symbol.asyncDispose](),
+      this.pTableDefs[Symbol.asyncDispose](),
+      this.pFrames[Symbol.asyncDispose](),
+      this.localBlobProvider[Symbol.asyncDispose](),
+      this.remoteBlobProvider[Symbol.asyncDispose](),
+    ]));
   }
 
   async [Symbol.asyncDispose](): Promise<void> {
@@ -162,8 +172,9 @@ export class AbstractPFrameDriver<
 
   public createPFrame(def: PFrameDef<PColumn<PColumnData>>): PoolEntry<PFrameHandle> {
     const ValueTypes = new Set(Object.values(ValueType));
-
-    const supportedColumns = def.filter((column) => ValueTypes.has(column.spec.valueType));
+    const supportedColumns = def
+      .filter((column) => ValueTypes.has(column.spec.valueType))
+      .map((c) => ({ ...c, spec: resolveAnnotationParents(c.spec) }));
     const uniqueColumns = uniqueBy(supportedColumns, (column) => column.id);
     const columns = uniqueColumns.map((c) =>
       mapPObjectData(c, (d) => this.resolveDataInfo(c.spec, d)),
@@ -173,7 +184,7 @@ export class AbstractPFrameDriver<
   }
 
   public createPTable(rawDef: PTableDef<PColumn<PColumnData>>): PoolEntry<PTableHandle> {
-    const pFrameEntry = this.createPFrame(extractAllColumns(rawDef.src));
+    using pFrameGuard = new PoolEntryGuard(this.createPFrame(extractAllColumns(rawDef.src)));
     const sortedDef = sortPTableDef(
       migrateTableFilter(
         mapPTableDef(rawDef, (c) => c.id),
@@ -183,15 +194,16 @@ export class AbstractPFrameDriver<
     const pTableEntry = this.pTableDefs.acquire({
       type: "v1",
       def: sortedDef,
-      pFrameHandle: pFrameEntry.key,
+      pFrameHandle: pFrameGuard.key,
     });
     if (logPFrames()) {
       this.logger(
         "info",
-        `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`,
+        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,
       );
     }
 
+    const pFrameEntry = pFrameGuard.keep();
     const unref = () => {
       pTableEntry.unref();
       pFrameEntry.unref();
@@ -211,14 +223,20 @@ export class AbstractPFrameDriver<
       {} as Record<string, PColumnSpec>,
     );
 
-    const pFrameEntry = this.createPFrame(columns);
-    const specFrame = createSpecFrame(columnsMap);
+    using pFrameGuard = new PoolEntryGuard(this.createPFrame(columns));
+    const ValueTypes = new Set(Object.values(ValueType));
+    const specColumnsMap = Object.fromEntries(
+      Object.entries(columnsMap)
+        .filter(([, spec]) => ValueTypes.has(spec.valueType))
+        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),
+    );
+    const specFrame = createSpecFrame(specColumnsMap);
     const sortedQuery = sortSpecQuery(mapSpecQueryColumns(def.query, (c) => c.id));
     const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);
 
     const pTableEntry = this.pTableDefs.acquire({
       type: "v2",
-      pFrameHandle: pFrameEntry.key,
+      pFrameHandle: pFrameGuard.key,
       def: {
         tableSpec,
         dataQuery,
@@ -227,10 +245,11 @@ export class AbstractPFrameDriver<
     if (logPFrames()) {
       this.logger(
         "info",
-        `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`,
+        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,
       );
     }
 
+    const pFrameEntry = pFrameGuard.keep();
     const unref = () => {
       pTableEntry.unref();
       pFrameEntry.unref();
@@ -316,39 +335,36 @@ export class AbstractPFrameDriver<
       );
     }
 
-    const table = this.pTables.acquire({
-      type: "v1",
-      pFrameHandle: handle,
-      def: sortPTableDef(migrateTableFilter(request, this.logger)),
-    });
-    const { pTablePromise, disposeSignal } = table.resource;
+    using tableGuard = new PoolEntryGuard(
+      this.pTables.acquire({
+        type: "v1",
+        pFrameHandle: handle,
+        def: sortPTableDef(migrateTableFilter(request, this.logger)),
+      }),
+    );
+    const { pTablePromise, disposeSignal } = tableGuard.resource;
     const pTable = await pTablePromise;
 
     const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
     return await this.frameConcurrencyLimiter.run(async () => {
-      try {
-        // TODO: throw error when more then 150k rows is requested
-        // after pf-plots migration to stream API
+      // TODO: throw error when more then 150k rows is requested
+      // after pf-plots migration to stream API
 
-        const spec = pTable.getSpec();
-        const data = await pTable.getData([...spec.keys()], {
-          range,
-          signal: combinedSignal,
-        });
+      const spec = pTable.getSpec();
+      const data = await pTable.getData([...spec.keys()], {
+        range,
+        signal: combinedSignal,
+      });
 
-        const overallSize = await pTable.getFootprint({
-          signal: combinedSignal,
-        });
-        this.pTableCachePerFrame.cache(table, overallSize);
-
-        return spec.map((spec, i) => ({
-          spec: spec,
-          data: data[i],
-        }));
-      } catch (err: unknown) {
-        table.unref();
-        throw err;
-      }
+      const overallSize = await pTable.getFootprint({
+        signal: combinedSignal,
+      });
+      this.pTableCachePerFrame.cache(tableGuard.keep(), overallSize);
+
+      return spec.map((spec, i) => ({
+        spec: spec,
+        data: data[i],
+      }));
     });
   }
 
@@ -397,9 +413,9 @@ export class AbstractPFrameDriver<
 
   public async getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape> {
     const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-    const table = this.pTables.acquire(def);
+    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));
 
-    const { pTablePromise, disposeSignal } = table.resource;
+    const { pTablePromise, disposeSignal } = tableGuard.resource;
     const pTable = await pTablePromise;
 
     const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
@@ -415,7 +431,7 @@ export class AbstractPFrameDriver<
       return { shape, overallSize };
     });
 
-    this.pTableCachePlain.cache(table, overallSize, defDisposeSignal);
+    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);
     return shape;
   }
 
@@ -426,9 +442,9 @@ export class AbstractPFrameDriver<
     signal?: AbortSignal,
   ): Promise<PTableVector[]> {
     const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-    const table = this.pTables.acquire(def);
+    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));
 
-    const { pTablePromise, disposeSignal } = table.resource;
+    const { pTablePromise, disposeSignal } = tableGuard.resource;
     const pTable = await pTablePromise;
 
     const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
@@ -445,7 +461,7 @@ export class AbstractPFrameDriver<
       return { data, overallSize };
     });
 
-    this.pTableCachePlain.cache(table, overallSize, defDisposeSignal);
+    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);
     return data;
   }
 }

package/src/index.ts

@@ -2,4 +2,3 @@ export * from "./driver_decl";
 export * from "./driver_impl";
 export * from "./data_info_helpers";
 export * from "./driver_double";
-export * from "../../pl-middle-layer/src/js_render/spec_driver";

package/dist/pl-middle-layer/src/js_render/spec_driver.cjs

@@ -1,43 +0,0 @@
-const require_runtime = require('../../../_virtual/_rolldown/runtime.cjs');
-let _milaboratories_pframes_rs_wasm = require("@milaboratories/pframes-rs-wasm");
-let node_crypto = require("node:crypto");
-
-//#region ../pl-middle-layer/src/js_render/spec_driver.ts
-/**
-* Manages spec-only PFrame instances (WASM) with handle-based lifecycle.
-*
-* All operations are synchronous — WASM computes results immediately.
-*/
-var SpecDriver = class {
-	frames = /* @__PURE__ */ new Map();
-	createSpecFrame(specs) {
-		const frame = (0, _milaboratories_pframes_rs_wasm.createPFrame)(specs);
-		const handle = (0, node_crypto.randomUUID)();
-		this.frames.set(handle, frame);
-		return handle;
-	}
-	specFrameDiscoverColumns(handle, request) {
-		return this.getFrame(handle).discoverColumns(request);
-	}
-	disposeSpecFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame) {
-			frame[Symbol.dispose]();
-			this.frames.delete(handle);
-		}
-	}
-	/** Dispose all managed spec frames. */
-	disposeAll() {
-		for (const frame of this.frames.values()) frame[Symbol.dispose]();
-		this.frames.clear();
-	}
-	getFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame === void 0) throw new Error(`No such spec frame: ${handle}`);
-		return frame;
-	}
-};
-
-//#endregion
-exports.SpecDriver = SpecDriver;
-//# sourceMappingURL=spec_driver.cjs.map

package/dist/pl-middle-layer/src/js_render/spec_driver.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"spec_driver.cjs","names":[],"sources":["../../../../../pl-middle-layer/src/js_render/spec_driver.ts"],"sourcesContent":["import { createPFrame } from \"@milaboratories/pframes-rs-wasm\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type {\n  PColumnSpec,\n  PSpecDriver,\n  SpecFrameHandle,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n} from \"@milaboratories/pl-model-common\";\nimport { randomUUID } from \"node:crypto\";\n\n/**\n * Manages spec-only PFrame instances (WASM) with handle-based lifecycle.\n *\n * All operations are synchronous — WASM computes results immediately.\n */\nexport class SpecDriver implements PSpecDriver {\n  private readonly frames = new Map<string, PFrameInternal.PFrameWasm>();\n\n  createSpecFrame(specs: Record<string, PColumnSpec>): SpecFrameHandle {\n    const frame = createPFrame(specs);\n    const handle = randomUUID() as SpecFrameHandle;\n    this.frames.set(handle, frame);\n    return handle;\n  }\n\n  specFrameDiscoverColumns(\n    handle: SpecFrameHandle,\n    request: DiscoverColumnsRequest,\n  ): DiscoverColumnsResponse {\n    return this.getFrame(handle).discoverColumns(request);\n  }\n\n  disposeSpecFrame(handle: SpecFrameHandle): void {\n    const frame = this.frames.get(handle);\n    if (frame) {\n      frame[Symbol.dispose]();\n      this.frames.delete(handle);\n    }\n  }\n\n  /** Dispose all managed spec frames. */\n  disposeAll(): void {\n    for (const frame of this.frames.values()) {\n      frame[Symbol.dispose]();\n    }\n    this.frames.clear();\n  }\n\n  private getFrame(handle: string): PFrameInternal.PFrameWasm {\n    const frame = this.frames.get(handle);\n    if (frame === undefined) throw new Error(`No such spec frame: ${handle}`);\n    return frame;\n  }\n}\n"],"mappings":";;;;;;;;;;AAgBA,IAAa,aAAb,MAA+C;CAC7C,AAAiB,yBAAS,IAAI,KAAwC;CAEtE,gBAAgB,OAAqD;EACnE,MAAM,0DAAqB,MAAM;EACjC,MAAM,sCAAqB;AAC3B,OAAK,OAAO,IAAI,QAAQ,MAAM;AAC9B,SAAO;;CAGT,yBACE,QACA,SACyB;AACzB,SAAO,KAAK,SAAS,OAAO,CAAC,gBAAgB,QAAQ;;CAGvD,iBAAiB,QAA+B;EAC9C,MAAM,QAAQ,KAAK,OAAO,IAAI,OAAO;AACrC,MAAI,OAAO;AACT,SAAM,OAAO,UAAU;AACvB,QAAK,OAAO,OAAO,OAAO;;;;CAK9B,aAAmB;AACjB,OAAK,MAAM,SAAS,KAAK,OAAO,QAAQ,CACtC,OAAM,OAAO,UAAU;AAEzB,OAAK,OAAO,OAAO;;CAGrB,AAAQ,SAAS,QAA2C;EAC1D,MAAM,QAAQ,KAAK,OAAO,IAAI,OAAO;AACrC,MAAI,UAAU,OAAW,OAAM,IAAI,MAAM,uBAAuB,SAAS;AACzE,SAAO"}

package/dist/pl-middle-layer/src/js_render/spec_driver.d.ts

@@ -1,20 +0,0 @@
-import { DiscoverColumnsRequest, DiscoverColumnsResponse, PColumnSpec, PSpecDriver, SpecFrameHandle } from "@milaboratories/pl-model-common";
-
-//#region ../pl-middle-layer/src/js_render/spec_driver.d.ts
-/**
- * Manages spec-only PFrame instances (WASM) with handle-based lifecycle.
- *
- * All operations are synchronous — WASM computes results immediately.
- */
-declare class SpecDriver implements PSpecDriver {
-  private readonly frames;
-  createSpecFrame(specs: Record<string, PColumnSpec>): SpecFrameHandle;
-  specFrameDiscoverColumns(handle: SpecFrameHandle, request: DiscoverColumnsRequest): DiscoverColumnsResponse;
-  disposeSpecFrame(handle: SpecFrameHandle): void;
-  /** Dispose all managed spec frames. */
-  disposeAll(): void;
-  private getFrame;
-}
-//#endregion
-export { SpecDriver };
-//# sourceMappingURL=spec_driver.d.ts.map

package/dist/pl-middle-layer/src/js_render/spec_driver.js

@@ -1,42 +0,0 @@
-import { createPFrame } from "@milaboratories/pframes-rs-wasm";
-import { randomUUID } from "node:crypto";
-
-//#region ../pl-middle-layer/src/js_render/spec_driver.ts
-/**
-* Manages spec-only PFrame instances (WASM) with handle-based lifecycle.
-*
-* All operations are synchronous — WASM computes results immediately.
-*/
-var SpecDriver = class {
-	frames = /* @__PURE__ */ new Map();
-	createSpecFrame(specs) {
-		const frame = createPFrame(specs);
-		const handle = randomUUID();
-		this.frames.set(handle, frame);
-		return handle;
-	}
-	specFrameDiscoverColumns(handle, request) {
-		return this.getFrame(handle).discoverColumns(request);
-	}
-	disposeSpecFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame) {
-			frame[Symbol.dispose]();
-			this.frames.delete(handle);
-		}
-	}
-	/** Dispose all managed spec frames. */
-	disposeAll() {
-		for (const frame of this.frames.values()) frame[Symbol.dispose]();
-		this.frames.clear();
-	}
-	getFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame === void 0) throw new Error(`No such spec frame: ${handle}`);
-		return frame;
-	}
-};
-
-//#endregion
-export { SpecDriver };
-//# sourceMappingURL=spec_driver.js.map

package/dist/pl-middle-layer/src/js_render/spec_driver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"spec_driver.js","names":[],"sources":["../../../../../pl-middle-layer/src/js_render/spec_driver.ts"],"sourcesContent":["import { createPFrame } from \"@milaboratories/pframes-rs-wasm\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type {\n  PColumnSpec,\n  PSpecDriver,\n  SpecFrameHandle,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n} from \"@milaboratories/pl-model-common\";\nimport { randomUUID } from \"node:crypto\";\n\n/**\n * Manages spec-only PFrame instances (WASM) with handle-based lifecycle.\n *\n * All operations are synchronous — WASM computes results immediately.\n */\nexport class SpecDriver implements PSpecDriver {\n  private readonly frames = new Map<string, PFrameInternal.PFrameWasm>();\n\n  createSpecFrame(specs: Record<string, PColumnSpec>): SpecFrameHandle {\n    const frame = createPFrame(specs);\n    const handle = randomUUID() as SpecFrameHandle;\n    this.frames.set(handle, frame);\n    return handle;\n  }\n\n  specFrameDiscoverColumns(\n    handle: SpecFrameHandle,\n    request: DiscoverColumnsRequest,\n  ): DiscoverColumnsResponse {\n    return this.getFrame(handle).discoverColumns(request);\n  }\n\n  disposeSpecFrame(handle: SpecFrameHandle): void {\n    const frame = this.frames.get(handle);\n    if (frame) {\n      frame[Symbol.dispose]();\n      this.frames.delete(handle);\n    }\n  }\n\n  /** Dispose all managed spec frames. */\n  disposeAll(): void {\n    for (const frame of this.frames.values()) {\n      frame[Symbol.dispose]();\n    }\n    this.frames.clear();\n  }\n\n  private getFrame(handle: string): PFrameInternal.PFrameWasm {\n    const frame = this.frames.get(handle);\n    if (frame === undefined) throw new Error(`No such spec frame: ${handle}`);\n    return frame;\n  }\n}\n"],"mappings":";;;;;;;;;AAgBA,IAAa,aAAb,MAA+C;CAC7C,AAAiB,yBAAS,IAAI,KAAwC;CAEtE,gBAAgB,OAAqD;EACnE,MAAM,QAAQ,aAAa,MAAM;EACjC,MAAM,SAAS,YAAY;AAC3B,OAAK,OAAO,IAAI,QAAQ,MAAM;AAC9B,SAAO;;CAGT,yBACE,QACA,SACyB;AACzB,SAAO,KAAK,SAAS,OAAO,CAAC,gBAAgB,QAAQ;;CAGvD,iBAAiB,QAA+B;EAC9C,MAAM,QAAQ,KAAK,OAAO,IAAI,OAAO;AACrC,MAAI,OAAO;AACT,SAAM,OAAO,UAAU;AACvB,QAAK,OAAO,OAAO,OAAO;;;;CAK9B,aAAmB;AACjB,OAAK,MAAM,SAAS,KAAK,OAAO,QAAQ,CACtC,OAAM,OAAO,UAAU;AAEzB,OAAK,OAAO,OAAO;;CAGrB,AAAQ,SAAS,QAA2C;EAC1D,MAAM,QAAQ,KAAK,OAAO,IAAI,OAAO;AACrC,MAAI,UAAU,OAAW,OAAM,IAAI,MAAM,uBAAuB,SAAS;AACzE,SAAO"}