@milaboratories/pf-spec-driver 1.1.0 → 1.2.0

package/dist/logging.cjs

@@ -0,0 +1,10 @@
+
+//#region src/logging.ts
+const LogPFrames = Boolean(process.env.MI_LOG_PFRAMES);
+function logPFrames() {
+	return LogPFrames;
+}
+
+//#endregion
+exports.logPFrames = logPFrames;
+//# sourceMappingURL=logging.cjs.map

package/dist/logging.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.cjs","names":[],"sources":["../src/logging.ts"],"sourcesContent":["const LogPFrames = Boolean(process.env.MI_LOG_PFRAMES);\n\nexport function logPFrames(): boolean {\n  return LogPFrames;\n}\n"],"mappings":";;AAAA,MAAM,aAAa,QAAQ,QAAQ,IAAI,eAAe;AAEtD,SAAgB,aAAsB;AACpC,QAAO"}

package/dist/logging.js

@@ -0,0 +1,9 @@
+//#region src/logging.ts
+const LogPFrames = Boolean(process.env.MI_LOG_PFRAMES);
+function logPFrames() {
+	return LogPFrames;
+}
+
+//#endregion
+export { logPFrames };
+//# sourceMappingURL=logging.js.map

package/dist/logging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","names":[],"sources":["../src/logging.ts"],"sourcesContent":["const LogPFrames = Boolean(process.env.MI_LOG_PFRAMES);\n\nexport function logPFrames(): boolean {\n  return LogPFrames;\n}\n"],"mappings":";AAAA,MAAM,aAAa,QAAQ,QAAQ,IAAI,eAAe;AAEtD,SAAgB,aAAsB;AACpC,QAAO"}

package/dist/pframe_pool.cjs

@@ -0,0 +1,34 @@
+const require_logging = require('./logging.cjs');
+let _milaboratories_pframes_rs_wasm = require("@milaboratories/pframes-rs-wasm");
+let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
+let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
+let _noble_hashes_blake3_js = require("@noble/hashes/blake3.js");
+let _noble_hashes_utils_js = require("@noble/hashes/utils.js");
+
+//#region src/pframe_pool.ts
+var PFramePool = class extends _milaboratories_ts_helpers.RefCountPoolBase {
+	constructor(logger) {
+		super();
+		this.logger = logger;
+	}
+	calculateParamsKey(params) {
+		return (0, _noble_hashes_utils_js.bytesToHex)((0, _noble_hashes_blake3_js.blake3)(new TextEncoder().encode((0, _milaboratories_pl_model_common.canonicalizeJson)(params))));
+	}
+	createNewResource(params, key) {
+		if (require_logging.logPFrames()) this.logger.info(`Creating SpecFrame for handle = ${key}, columns: ` + (0, _milaboratories_pl_model_common.stringifyJson)(params));
+		return (0, _milaboratories_pframes_rs_wasm.createPFrame)(params);
+	}
+	getByKey(key) {
+		const resource = super.tryGetByKey(key);
+		if (!resource) {
+			const error = new _milaboratories_pl_model_common.PFrameDriverError(`Invalid SpecFrame handle`);
+			error.cause = /* @__PURE__ */ new Error(`SpecFrame with handle ${key} not found`);
+			throw error;
+		}
+		return resource;
+	}
+};
+
+//#endregion
+exports.PFramePool = PFramePool;
+//# sourceMappingURL=pframe_pool.cjs.map

package/dist/pframe_pool.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"pframe_pool.cjs","names":["RefCountPoolBase","logPFrames","PFrameDriverError"],"sources":["../src/pframe_pool.ts"],"sourcesContent":["import {\n  PFrameDriverError,\n  PColumnSpec,\n  SpecFrameHandle,\n  stringifyJson,\n  canonicalizeJson,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { MiLogger, RefCountPoolBase } from \"@milaboratories/ts-helpers\";\nimport { logPFrames } from \"./logging\";\nimport { createPFrame } from \"@milaboratories/pframes-rs-wasm\";\nimport { blake3 } from \"@noble/hashes/blake3.js\";\nimport { bytesToHex } from \"@noble/hashes/utils.js\";\n\nexport class PFramePool extends RefCountPoolBase<\n  Record<string, PColumnSpec>,\n  SpecFrameHandle,\n  PFrameInternal.PFrameWasmV2\n> {\n  constructor(private readonly logger: MiLogger) {\n    super();\n  }\n\n  protected calculateParamsKey(params: Record<string, PColumnSpec>): SpecFrameHandle {\n    return bytesToHex(\n      blake3(new TextEncoder().encode(canonicalizeJson(params))),\n    ) as SpecFrameHandle;\n  }\n\n  protected createNewResource(\n    params: Record<string, PColumnSpec>,\n    key: SpecFrameHandle,\n  ): PFrameInternal.PFrameWasmV2 {\n    if (logPFrames()) {\n      this.logger.info(`Creating SpecFrame for handle = ${key}, columns: ` + stringifyJson(params));\n    }\n    return createPFrame(params);\n  }\n\n  public getByKey(key: SpecFrameHandle): PFrameInternal.PFrameWasmV2 {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid SpecFrame handle`);\n      error.cause = new Error(`SpecFrame with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n"],"mappings":";;;;;;;;AAcA,IAAa,aAAb,cAAgCA,4CAI9B;CACA,YAAY,AAAiB,QAAkB;AAC7C,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAAsD;AACjF,oFACS,IAAI,aAAa,CAAC,6DAAwB,OAAO,CAAC,CAAC,CAC3D;;CAGH,AAAU,kBACR,QACA,KAC6B;AAC7B,MAAIC,4BAAY,CACd,MAAK,OAAO,KAAK,mCAAmC,IAAI,kEAA6B,OAAO,CAAC;AAE/F,2DAAoB,OAAO;;CAG7B,AAAO,SAAS,KAAmD;EACjE,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIC,kDAAkB,2BAA2B;AAC/D,SAAM,wBAAQ,IAAI,MAAM,yBAAyB,IAAI,YAAY;AACjE,SAAM;;AAER,SAAO"}

package/dist/pframe_pool.js

@@ -0,0 +1,34 @@
+import { logPFrames } from "./logging.js";
+import { createPFrame } from "@milaboratories/pframes-rs-wasm";
+import { PFrameDriverError, canonicalizeJson, stringifyJson } from "@milaboratories/pl-model-common";
+import { RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { blake3 } from "@noble/hashes/blake3.js";
+import { bytesToHex } from "@noble/hashes/utils.js";
+
+//#region src/pframe_pool.ts
+var PFramePool = class extends RefCountPoolBase {
+	constructor(logger) {
+		super();
+		this.logger = logger;
+	}
+	calculateParamsKey(params) {
+		return bytesToHex(blake3(new TextEncoder().encode(canonicalizeJson(params))));
+	}
+	createNewResource(params, key) {
+		if (logPFrames()) this.logger.info(`Creating SpecFrame for handle = ${key}, columns: ` + stringifyJson(params));
+		return createPFrame(params);
+	}
+	getByKey(key) {
+		const resource = super.tryGetByKey(key);
+		if (!resource) {
+			const error = new PFrameDriverError(`Invalid SpecFrame handle`);
+			error.cause = /* @__PURE__ */ new Error(`SpecFrame with handle ${key} not found`);
+			throw error;
+		}
+		return resource;
+	}
+};
+
+//#endregion
+export { PFramePool };
+//# sourceMappingURL=pframe_pool.js.map

package/dist/pframe_pool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pframe_pool.js","names":[],"sources":["../src/pframe_pool.ts"],"sourcesContent":["import {\n  PFrameDriverError,\n  PColumnSpec,\n  SpecFrameHandle,\n  stringifyJson,\n  canonicalizeJson,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { MiLogger, RefCountPoolBase } from \"@milaboratories/ts-helpers\";\nimport { logPFrames } from \"./logging\";\nimport { createPFrame } from \"@milaboratories/pframes-rs-wasm\";\nimport { blake3 } from \"@noble/hashes/blake3.js\";\nimport { bytesToHex } from \"@noble/hashes/utils.js\";\n\nexport class PFramePool extends RefCountPoolBase<\n  Record<string, PColumnSpec>,\n  SpecFrameHandle,\n  PFrameInternal.PFrameWasmV2\n> {\n  constructor(private readonly logger: MiLogger) {\n    super();\n  }\n\n  protected calculateParamsKey(params: Record<string, PColumnSpec>): SpecFrameHandle {\n    return bytesToHex(\n      blake3(new TextEncoder().encode(canonicalizeJson(params))),\n    ) as SpecFrameHandle;\n  }\n\n  protected createNewResource(\n    params: Record<string, PColumnSpec>,\n    key: SpecFrameHandle,\n  ): PFrameInternal.PFrameWasmV2 {\n    if (logPFrames()) {\n      this.logger.info(`Creating SpecFrame for handle = ${key}, columns: ` + stringifyJson(params));\n    }\n    return createPFrame(params);\n  }\n\n  public getByKey(key: SpecFrameHandle): PFrameInternal.PFrameWasmV2 {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid SpecFrame handle`);\n      error.cause = new Error(`SpecFrame with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n"],"mappings":";;;;;;;;AAcA,IAAa,aAAb,cAAgC,iBAI9B;CACA,YAAY,AAAiB,QAAkB;AAC7C,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAAsD;AACjF,SAAO,WACL,OAAO,IAAI,aAAa,CAAC,OAAO,iBAAiB,OAAO,CAAC,CAAC,CAC3D;;CAGH,AAAU,kBACR,QACA,KAC6B;AAC7B,MAAI,YAAY,CACd,MAAK,OAAO,KAAK,mCAAmC,IAAI,eAAe,cAAc,OAAO,CAAC;AAE/F,SAAO,aAAa,OAAO;;CAG7B,AAAO,SAAS,KAAmD;EACjE,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAI,kBAAkB,2BAA2B;AAC/D,SAAM,wBAAQ,IAAI,MAAM,yBAAyB,IAAI,YAAY;AACjE,SAAM;;AAER,SAAO"}

package/dist/spec_driver.cjs

@@ -1,5 +1,8 @@
+const require_logging = require('./logging.cjs');
+const require_pframe_pool = require('./pframe_pool.cjs');
 let _milaboratories_pframes_rs_wasm = require("@milaboratories/pframes-rs-wasm");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
+let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
 
 //#region src/spec_driver.ts
 /**
@@ -8,50 +11,101 @@ let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common")
 * All operations are synchronous — WASM computes results immediately.
 */
 var SpecDriver = class {
-	frames = /* @__PURE__ */ new Map();
+	logger;
+	frames;
+	constructor(options) {
+		this.logger = options?.logger ?? new _milaboratories_ts_helpers.ConsoleLoggerAdapter();
+		this.frames = new require_pframe_pool.PFramePool(this.logger);
+	}
 	createSpecFrame(specs) {
-		const frame = (0, _milaboratories_pframes_rs_wasm.createPFrame)(specs);
-		const handle = crypto.randomUUID();
-		this.frames.set(handle, frame);
-		return handle;
+		const ValueTypes = new Set(Object.values(_milaboratories_pl_model_common.ValueType));
+		const filtered = Object.fromEntries(Object.entries(specs).filter(([, spec]) => ValueTypes.has(spec.valueType)).map(([id, spec]) => [id, (0, _milaboratories_pl_model_common.resolveAnnotationParents)(spec)]));
+		try {
+			if (require_logging.logPFrames()) this.logger.info(`createSpecFrame: ${Object.keys(filtered).length} columns`);
+			return this.frames.acquire(filtered);
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`createSpecFrame failed`);
+			error.cause = (0, _milaboratories_pl_model_common.ensureError)(err);
+			throw error;
+		}
+	}
+	discoverColumns(handle, request) {
+		const pframe = this.frames.getByKey(handle);
+		try {
+			if (require_logging.logPFrames()) this.logger.info(`discoverColumns: handle = ${handle}, request: ${JSON.stringify(request)}`);
+			return pframe.discoverColumns(request);
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`discoverColumns failed`);
+			error.cause = /* @__PURE__ */ new Error(`handle: ${handle}, request: ${JSON.stringify(request)}, error:\n${(0, _milaboratories_pl_model_common.ensureError)(err)}`);
+			throw error;
+		}
 	}
-	specFrameDiscoverColumns(handle, request) {
-		return this.getFrame(handle).discoverColumns(request);
+	deleteColumn(handle, request) {
+		const pframe = this.frames.getByKey(handle);
+		try {
+			if (require_logging.logPFrames()) this.logger.info(`deleteColumn: handle = ${handle}, request: ${JSON.stringify(request)}`);
+			return { axes: pframe.deleteColumns({
+				columns: request.axes,
+				delete: request.delete
+			}).columns };
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`deleteColumn failed`);
+			error.cause = /* @__PURE__ */ new Error(`handle: ${handle}, request: ${JSON.stringify(request)}, error:\n${(0, _milaboratories_pl_model_common.ensureError)(err)}`);
+			throw error;
+		}
 	}
-	disposeSpecFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame) {
-			frame[Symbol.dispose]();
-			this.frames.delete(handle);
+	evaluateQuery(handle, request) {
+		const pframe = this.frames.getByKey(handle);
+		try {
+			if (require_logging.logPFrames()) this.logger.info(`evaluateQuery: handle = ${handle}, request: ${JSON.stringify(request)}`);
+			return pframe.evaluateQuery(request);
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`evaluateQuery failed`);
+			error.cause = /* @__PURE__ */ new Error(`handle: ${handle}, request: ${JSON.stringify(request)}, error:\n${(0, _milaboratories_pl_model_common.ensureError)(err)}`);
+			throw error;
 		}
 	}
 	expandAxes(spec) {
-		return (0, _milaboratories_pframes_rs_wasm.expandAxes)(spec);
+		try {
+			return (0, _milaboratories_pframes_rs_wasm.expandAxes)(spec);
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`expandAxes failed`);
+			error.cause = /* @__PURE__ */ new Error(`spec: ${JSON.stringify(spec)}, error:\n${(0, _milaboratories_pl_model_common.ensureError)(err)}`);
+			throw error;
+		}
 	}
 	collapseAxes(ids) {
-		return (0, _milaboratories_pframes_rs_wasm.collapseAxes)(ids);
+		try {
+			return (0, _milaboratories_pframes_rs_wasm.collapseAxes)(ids);
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`collapseAxes failed`);
+			error.cause = /* @__PURE__ */ new Error(`ids: ${JSON.stringify(ids)}, error:\n${(0, _milaboratories_pl_model_common.ensureError)(err)}`);
+			throw error;
+		}
 	}
 	findAxis(spec, selector) {
-		return (0, _milaboratories_pframes_rs_wasm.findAxis)(spec, selector);
+		try {
+			return (0, _milaboratories_pframes_rs_wasm.findAxis)(spec, selector);
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`findAxis failed`);
+			error.cause = /* @__PURE__ */ new Error(`spec: ${JSON.stringify(spec)}, selector: ${JSON.stringify(selector)}, error:\n${(0, _milaboratories_pl_model_common.ensureError)(err)}`);
+			throw error;
+		}
 	}
 	findTableColumn(tableSpec, selector) {
-		return (0, _milaboratories_pframes_rs_wasm.findTableColumn)(tableSpec, selector);
-	}
-	/** Dispose all managed spec frames. */
-	dispose() {
 		try {
-			for (const frame of this.frames.values()) frame[Symbol.dispose]();
-		} finally {
-			this.frames.clear();
+			return (0, _milaboratories_pframes_rs_wasm.findTableColumn)(tableSpec, selector);
+		} catch (err) {
+			const error = new _milaboratories_pl_model_common.PFrameSpecDriverError(`findTableColumn failed`);
+			error.cause = /* @__PURE__ */ new Error(`selector: ${JSON.stringify(selector)}, error:\n${(0, _milaboratories_pl_model_common.ensureError)(err)}`);
+			throw error;
 		}
 	}
-	[Symbol.dispose]() {
-		this.dispose();
+	async dispose() {
+		await this.frames.dispose();
 	}
-	getFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame === void 0) throw new _milaboratories_pl_model_common.PFrameSpecDriverError(`No such spec frame: ${handle}`);
-		return frame;
+	async [Symbol.asyncDispose]() {
+		await this.dispose();
 	}
 };
 

package/dist/spec_driver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"spec_driver.cjs","names":["PFrameSpecDriverError"],"sources":["../src/spec_driver.ts"],"sourcesContent":["import {\n  createPFrame,\n  expandAxes,\n  collapseAxes,\n  findAxis,\n  findTableColumn,\n} from \"@milaboratories/pframes-rs-wasm\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type {\n  AxesId,\n  AxesSpec,\n  PColumnSpec,\n  PFrameSpecDriver,\n  PTableColumnId,\n  PTableColumnSpec,\n  SingleAxisSelector,\n  SpecFrameHandle,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameSpecDriverError } from \"@milaboratories/pl-model-common\";\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 PFrameSpecDriver, Disposable {\n  private readonly frames = new Map<SpecFrameHandle, PFrameInternal.PFrameWasmV2>();\n\n  createSpecFrame(specs: Record<string, PColumnSpec>): SpecFrameHandle {\n    // Explicit annotation ensures a WASM version mismatch surfaces at compile time\n    // (skipLibCheck won't validate .d.ts in node_modules, but this assignment will)\n    const frame: PFrameInternal.PFrameWasmV2 = createPFrame(specs);\n    const handle = crypto.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  expandAxes(spec: AxesSpec): AxesId {\n    return expandAxes(spec);\n  }\n\n  collapseAxes(ids: AxesId): AxesSpec {\n    return collapseAxes(ids);\n  }\n\n  findAxis(spec: AxesSpec, selector: SingleAxisSelector): number {\n    return findAxis(spec, selector);\n  }\n\n  findTableColumn(tableSpec: PTableColumnSpec[], selector: PTableColumnId): number {\n    return findTableColumn(tableSpec, selector);\n  }\n\n  /** Dispose all managed spec frames. */\n  dispose(): void {\n    try {\n      for (const frame of this.frames.values()) {\n        frame[Symbol.dispose]();\n      }\n    } finally {\n      this.frames.clear();\n    }\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  private getFrame(handle: SpecFrameHandle): PFrameInternal.PFrameWasmV2 {\n    const frame = this.frames.get(handle);\n    if (frame === undefined) throw new PFrameSpecDriverError(`No such spec frame: ${handle}`);\n    return frame;\n  }\n}\n"],"mappings":";;;;;;;;;AA2BA,IAAa,aAAb,MAAgE;CAC9D,AAAiB,yBAAS,IAAI,KAAmD;CAEjF,gBAAgB,OAAqD;EAGnE,MAAM,0DAAkD,MAAM;EAC9D,MAAM,SAAS,OAAO,YAAY;AAClC,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;;;CAI9B,WAAW,MAAwB;AACjC,yDAAkB,KAAK;;CAGzB,aAAa,KAAuB;AAClC,2DAAoB,IAAI;;CAG1B,SAAS,MAAgB,UAAsC;AAC7D,uDAAgB,MAAM,SAAS;;CAGjC,gBAAgB,WAA+B,UAAkC;AAC/E,8DAAuB,WAAW,SAAS;;;CAI7C,UAAgB;AACd,MAAI;AACF,QAAK,MAAM,SAAS,KAAK,OAAO,QAAQ,CACtC,OAAM,OAAO,UAAU;YAEjB;AACR,QAAK,OAAO,OAAO;;;CAIvB,CAAC,OAAO,WAAiB;AACvB,OAAK,SAAS;;CAGhB,AAAQ,SAAS,QAAsD;EACrE,MAAM,QAAQ,KAAK,OAAO,IAAI,OAAO;AACrC,MAAI,UAAU,OAAW,OAAM,IAAIA,sDAAsB,uBAAuB,SAAS;AACzF,SAAO"}
+{"version":3,"file":"spec_driver.cjs","names":["ConsoleLoggerAdapter","PFramePool","ValueType","logPFrames","PFrameSpecDriverError"],"sources":["../src/spec_driver.ts"],"sourcesContent":["import {\n  expandAxes,\n  collapseAxes,\n  findAxis,\n  findTableColumn,\n} from \"@milaboratories/pframes-rs-wasm\";\nimport type {\n  AxesId,\n  AxesSpec,\n  PColumnSpec,\n  PFrameSpecDriver,\n  PTableColumnId,\n  PTableColumnSpec,\n  SingleAxisSelector,\n  SpecFrameHandle,\n  PoolEntry,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n  DeleteColumnRequest,\n  DeleteColumnResponse,\n  EvaluateQueryResponse,\n  SpecQuery,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  PFrameSpecDriverError,\n  ValueType,\n  ensureError,\n  resolveAnnotationParents,\n} from \"@milaboratories/pl-model-common\";\nimport { type MiLogger, ConsoleLoggerAdapter } from \"@milaboratories/ts-helpers\";\nimport { PFramePool } from \"./pframe_pool\";\nimport { logPFrames } from \"./logging\";\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 PFrameSpecDriver, AsyncDisposable {\n  private readonly logger: MiLogger;\n  private readonly frames: PFramePool;\n\n  public constructor(options?: { logger?: MiLogger }) {\n    this.logger = options?.logger ?? new ConsoleLoggerAdapter();\n    this.frames = new PFramePool(this.logger);\n  }\n\n  createSpecFrame(specs: Record<string, PColumnSpec>): PoolEntry<SpecFrameHandle> {\n    const ValueTypes = new Set(Object.values(ValueType));\n    const filtered = Object.fromEntries(\n      Object.entries(specs)\n        .filter(([, spec]) => ValueTypes.has(spec.valueType))\n        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),\n    );\n    try {\n      if (logPFrames()) {\n        this.logger.info(`createSpecFrame: ${Object.keys(filtered).length} columns`);\n      }\n      return this.frames.acquire(filtered);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`createSpecFrame failed`);\n      error.cause = ensureError(err);\n      throw error;\n    }\n  }\n\n  discoverColumns(\n    handle: SpecFrameHandle,\n    request: DiscoverColumnsRequest,\n  ): DiscoverColumnsResponse {\n    const pframe = this.frames.getByKey(handle);\n    try {\n      if (logPFrames()) {\n        this.logger.info(\n          `discoverColumns: handle = ${handle}, request: ${JSON.stringify(request)}`,\n        );\n      }\n      const result = pframe.discoverColumns(request);\n      return result;\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`discoverColumns failed`);\n      error.cause = new Error(\n        `handle: ${handle}, ` +\n          `request: ${JSON.stringify(request)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  deleteColumn(handle: SpecFrameHandle, request: DeleteColumnRequest): DeleteColumnResponse {\n    const pframe = this.frames.getByKey(handle);\n    try {\n      if (logPFrames()) {\n        this.logger.info(`deleteColumn: handle = ${handle}, request: ${JSON.stringify(request)}`);\n      }\n      const result = {\n        axes: pframe.deleteColumns({ columns: request.axes, delete: request.delete }).columns,\n      };\n      return result;\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`deleteColumn failed`);\n      error.cause = new Error(\n        `handle: ${handle}, ` +\n          `request: ${JSON.stringify(request)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  evaluateQuery(handle: SpecFrameHandle, request: SpecQuery): EvaluateQueryResponse {\n    const pframe = this.frames.getByKey(handle);\n    try {\n      if (logPFrames()) {\n        this.logger.info(`evaluateQuery: handle = ${handle}, request: ${JSON.stringify(request)}`);\n      }\n      const result = pframe.evaluateQuery(request);\n      return result;\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`evaluateQuery failed`);\n      error.cause = new Error(\n        `handle: ${handle}, ` +\n          `request: ${JSON.stringify(request)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  expandAxes(spec: AxesSpec): AxesId {\n    try {\n      return expandAxes(spec);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`expandAxes failed`);\n      error.cause = new Error(`spec: ${JSON.stringify(spec)}, ` + `error:\\n${ensureError(err)}`);\n      throw error;\n    }\n  }\n\n  collapseAxes(ids: AxesId): AxesSpec {\n    try {\n      return collapseAxes(ids);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`collapseAxes failed`);\n      error.cause = new Error(`ids: ${JSON.stringify(ids)}, ` + `error:\\n${ensureError(err)}`);\n      throw error;\n    }\n  }\n\n  findAxis(spec: AxesSpec, selector: SingleAxisSelector): number {\n    try {\n      return findAxis(spec, selector);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`findAxis failed`);\n      error.cause = new Error(\n        `spec: ${JSON.stringify(spec)}, ` +\n          `selector: ${JSON.stringify(selector)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  findTableColumn(tableSpec: PTableColumnSpec[], selector: PTableColumnId): number {\n    try {\n      return findTableColumn(tableSpec, selector);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`findTableColumn failed`);\n      error.cause = new Error(\n        `selector: ${JSON.stringify(selector)}, ` + `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  async dispose(): Promise<void> {\n    await this.frames.dispose();\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    await this.dispose();\n  }\n}\n"],"mappings":"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"}

package/dist/spec_driver.d.ts

@@ -1,4 +1,5 @@
-import { AxesId, AxesSpec, DiscoverColumnsRequest, DiscoverColumnsResponse, PColumnSpec, PFrameSpecDriver, PTableColumnId, PTableColumnSpec, SingleAxisSelector, SpecFrameHandle } from "@milaboratories/pl-model-common";
+import { AxesId, AxesSpec, DeleteColumnRequest, DeleteColumnResponse, DiscoverColumnsRequest, DiscoverColumnsResponse, EvaluateQueryResponse, PColumnSpec, PFrameSpecDriver, PTableColumnId, PTableColumnSpec, PoolEntry, SingleAxisSelector, SpecFrameHandle, SpecQuery } from "@milaboratories/pl-model-common";
+import { MiLogger } from "@milaboratories/ts-helpers";
 
 //#region src/spec_driver.d.ts
 /**
@@ -6,19 +7,22 @@ import { AxesId, AxesSpec, DiscoverColumnsRequest, DiscoverColumnsResponse, PCol
  *
  * All operations are synchronous — WASM computes results immediately.
  */
-declare class SpecDriver implements PFrameSpecDriver, Disposable {
+declare class SpecDriver implements PFrameSpecDriver, AsyncDisposable {
+  private readonly logger;
   private readonly frames;
-  createSpecFrame(specs: Record<string, PColumnSpec>): SpecFrameHandle;
-  specFrameDiscoverColumns(handle: SpecFrameHandle, request: DiscoverColumnsRequest): DiscoverColumnsResponse;
-  disposeSpecFrame(handle: SpecFrameHandle): void;
+  constructor(options?: {
+    logger?: MiLogger;
+  });
+  createSpecFrame(specs: Record<string, PColumnSpec>): PoolEntry<SpecFrameHandle>;
+  discoverColumns(handle: SpecFrameHandle, request: DiscoverColumnsRequest): DiscoverColumnsResponse;
+  deleteColumn(handle: SpecFrameHandle, request: DeleteColumnRequest): DeleteColumnResponse;
+  evaluateQuery(handle: SpecFrameHandle, request: SpecQuery): EvaluateQueryResponse;
   expandAxes(spec: AxesSpec): AxesId;
   collapseAxes(ids: AxesId): AxesSpec;
   findAxis(spec: AxesSpec, selector: SingleAxisSelector): number;
   findTableColumn(tableSpec: PTableColumnSpec[], selector: PTableColumnId): number;
-  /** Dispose all managed spec frames. */
-  dispose(): void;
-  [Symbol.dispose](): void;
-  private getFrame;
+  dispose(): Promise<void>;
+  [Symbol.asyncDispose](): Promise<void>;
 }
 //#endregion
 export { SpecDriver };

package/dist/spec_driver.js

@@ -1,5 +1,8 @@
-import { collapseAxes, createPFrame, expandAxes, findAxis, findTableColumn } from "@milaboratories/pframes-rs-wasm";
-import { PFrameSpecDriverError } from "@milaboratories/pl-model-common";
+import { logPFrames } from "./logging.js";
+import { PFramePool } from "./pframe_pool.js";
+import { collapseAxes, expandAxes, findAxis, findTableColumn } from "@milaboratories/pframes-rs-wasm";
+import { PFrameSpecDriverError, ValueType, ensureError, resolveAnnotationParents } from "@milaboratories/pl-model-common";
+import { ConsoleLoggerAdapter } from "@milaboratories/ts-helpers";
 
 //#region src/spec_driver.ts
 /**
@@ -8,50 +11,101 @@ import { PFrameSpecDriverError } from "@milaboratories/pl-model-common";
 * All operations are synchronous — WASM computes results immediately.
 */
 var SpecDriver = class {
-	frames = /* @__PURE__ */ new Map();
+	logger;
+	frames;
+	constructor(options) {
+		this.logger = options?.logger ?? new ConsoleLoggerAdapter();
+		this.frames = new PFramePool(this.logger);
+	}
 	createSpecFrame(specs) {
-		const frame = createPFrame(specs);
-		const handle = crypto.randomUUID();
-		this.frames.set(handle, frame);
-		return handle;
+		const ValueTypes = new Set(Object.values(ValueType));
+		const filtered = Object.fromEntries(Object.entries(specs).filter(([, spec]) => ValueTypes.has(spec.valueType)).map(([id, spec]) => [id, resolveAnnotationParents(spec)]));
+		try {
+			if (logPFrames()) this.logger.info(`createSpecFrame: ${Object.keys(filtered).length} columns`);
+			return this.frames.acquire(filtered);
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`createSpecFrame failed`);
+			error.cause = ensureError(err);
+			throw error;
+		}
+	}
+	discoverColumns(handle, request) {
+		const pframe = this.frames.getByKey(handle);
+		try {
+			if (logPFrames()) this.logger.info(`discoverColumns: handle = ${handle}, request: ${JSON.stringify(request)}`);
+			return pframe.discoverColumns(request);
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`discoverColumns failed`);
+			error.cause = /* @__PURE__ */ new Error(`handle: ${handle}, request: ${JSON.stringify(request)}, error:\n${ensureError(err)}`);
+			throw error;
+		}
 	}
-	specFrameDiscoverColumns(handle, request) {
-		return this.getFrame(handle).discoverColumns(request);
+	deleteColumn(handle, request) {
+		const pframe = this.frames.getByKey(handle);
+		try {
+			if (logPFrames()) this.logger.info(`deleteColumn: handle = ${handle}, request: ${JSON.stringify(request)}`);
+			return { axes: pframe.deleteColumns({
+				columns: request.axes,
+				delete: request.delete
+			}).columns };
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`deleteColumn failed`);
+			error.cause = /* @__PURE__ */ new Error(`handle: ${handle}, request: ${JSON.stringify(request)}, error:\n${ensureError(err)}`);
+			throw error;
+		}
 	}
-	disposeSpecFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame) {
-			frame[Symbol.dispose]();
-			this.frames.delete(handle);
+	evaluateQuery(handle, request) {
+		const pframe = this.frames.getByKey(handle);
+		try {
+			if (logPFrames()) this.logger.info(`evaluateQuery: handle = ${handle}, request: ${JSON.stringify(request)}`);
+			return pframe.evaluateQuery(request);
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`evaluateQuery failed`);
+			error.cause = /* @__PURE__ */ new Error(`handle: ${handle}, request: ${JSON.stringify(request)}, error:\n${ensureError(err)}`);
+			throw error;
 		}
 	}
 	expandAxes(spec) {
-		return expandAxes(spec);
+		try {
+			return expandAxes(spec);
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`expandAxes failed`);
+			error.cause = /* @__PURE__ */ new Error(`spec: ${JSON.stringify(spec)}, error:\n${ensureError(err)}`);
+			throw error;
+		}
 	}
 	collapseAxes(ids) {
-		return collapseAxes(ids);
+		try {
+			return collapseAxes(ids);
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`collapseAxes failed`);
+			error.cause = /* @__PURE__ */ new Error(`ids: ${JSON.stringify(ids)}, error:\n${ensureError(err)}`);
+			throw error;
+		}
 	}
 	findAxis(spec, selector) {
-		return findAxis(spec, selector);
+		try {
+			return findAxis(spec, selector);
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`findAxis failed`);
+			error.cause = /* @__PURE__ */ new Error(`spec: ${JSON.stringify(spec)}, selector: ${JSON.stringify(selector)}, error:\n${ensureError(err)}`);
+			throw error;
+		}
 	}
 	findTableColumn(tableSpec, selector) {
-		return findTableColumn(tableSpec, selector);
-	}
-	/** Dispose all managed spec frames. */
-	dispose() {
 		try {
-			for (const frame of this.frames.values()) frame[Symbol.dispose]();
-		} finally {
-			this.frames.clear();
+			return findTableColumn(tableSpec, selector);
+		} catch (err) {
+			const error = new PFrameSpecDriverError(`findTableColumn failed`);
+			error.cause = /* @__PURE__ */ new Error(`selector: ${JSON.stringify(selector)}, error:\n${ensureError(err)}`);
+			throw error;
 		}
 	}
-	[Symbol.dispose]() {
-		this.dispose();
+	async dispose() {
+		await this.frames.dispose();
 	}
-	getFrame(handle) {
-		const frame = this.frames.get(handle);
-		if (frame === void 0) throw new PFrameSpecDriverError(`No such spec frame: ${handle}`);
-		return frame;
+	async [Symbol.asyncDispose]() {
+		await this.dispose();
 	}
 };
 

package/dist/spec_driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"spec_driver.js","names":[],"sources":["../src/spec_driver.ts"],"sourcesContent":["import {\n  createPFrame,\n  expandAxes,\n  collapseAxes,\n  findAxis,\n  findTableColumn,\n} from \"@milaboratories/pframes-rs-wasm\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type {\n  AxesId,\n  AxesSpec,\n  PColumnSpec,\n  PFrameSpecDriver,\n  PTableColumnId,\n  PTableColumnSpec,\n  SingleAxisSelector,\n  SpecFrameHandle,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameSpecDriverError } from \"@milaboratories/pl-model-common\";\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 PFrameSpecDriver, Disposable {\n  private readonly frames = new Map<SpecFrameHandle, PFrameInternal.PFrameWasmV2>();\n\n  createSpecFrame(specs: Record<string, PColumnSpec>): SpecFrameHandle {\n    // Explicit annotation ensures a WASM version mismatch surfaces at compile time\n    // (skipLibCheck won't validate .d.ts in node_modules, but this assignment will)\n    const frame: PFrameInternal.PFrameWasmV2 = createPFrame(specs);\n    const handle = crypto.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  expandAxes(spec: AxesSpec): AxesId {\n    return expandAxes(spec);\n  }\n\n  collapseAxes(ids: AxesId): AxesSpec {\n    return collapseAxes(ids);\n  }\n\n  findAxis(spec: AxesSpec, selector: SingleAxisSelector): number {\n    return findAxis(spec, selector);\n  }\n\n  findTableColumn(tableSpec: PTableColumnSpec[], selector: PTableColumnId): number {\n    return findTableColumn(tableSpec, selector);\n  }\n\n  /** Dispose all managed spec frames. */\n  dispose(): void {\n    try {\n      for (const frame of this.frames.values()) {\n        frame[Symbol.dispose]();\n      }\n    } finally {\n      this.frames.clear();\n    }\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n  }\n\n  private getFrame(handle: SpecFrameHandle): PFrameInternal.PFrameWasmV2 {\n    const frame = this.frames.get(handle);\n    if (frame === undefined) throw new PFrameSpecDriverError(`No such spec frame: ${handle}`);\n    return frame;\n  }\n}\n"],"mappings":";;;;;;;;;AA2BA,IAAa,aAAb,MAAgE;CAC9D,AAAiB,yBAAS,IAAI,KAAmD;CAEjF,gBAAgB,OAAqD;EAGnE,MAAM,QAAqC,aAAa,MAAM;EAC9D,MAAM,SAAS,OAAO,YAAY;AAClC,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;;;CAI9B,WAAW,MAAwB;AACjC,SAAO,WAAW,KAAK;;CAGzB,aAAa,KAAuB;AAClC,SAAO,aAAa,IAAI;;CAG1B,SAAS,MAAgB,UAAsC;AAC7D,SAAO,SAAS,MAAM,SAAS;;CAGjC,gBAAgB,WAA+B,UAAkC;AAC/E,SAAO,gBAAgB,WAAW,SAAS;;;CAI7C,UAAgB;AACd,MAAI;AACF,QAAK,MAAM,SAAS,KAAK,OAAO,QAAQ,CACtC,OAAM,OAAO,UAAU;YAEjB;AACR,QAAK,OAAO,OAAO;;;CAIvB,CAAC,OAAO,WAAiB;AACvB,OAAK,SAAS;;CAGhB,AAAQ,SAAS,QAAsD;EACrE,MAAM,QAAQ,KAAK,OAAO,IAAI,OAAO;AACrC,MAAI,UAAU,OAAW,OAAM,IAAI,sBAAsB,uBAAuB,SAAS;AACzF,SAAO"}
+{"version":3,"file":"spec_driver.js","names":[],"sources":["../src/spec_driver.ts"],"sourcesContent":["import {\n  expandAxes,\n  collapseAxes,\n  findAxis,\n  findTableColumn,\n} from \"@milaboratories/pframes-rs-wasm\";\nimport type {\n  AxesId,\n  AxesSpec,\n  PColumnSpec,\n  PFrameSpecDriver,\n  PTableColumnId,\n  PTableColumnSpec,\n  SingleAxisSelector,\n  SpecFrameHandle,\n  PoolEntry,\n  DiscoverColumnsRequest,\n  DiscoverColumnsResponse,\n  DeleteColumnRequest,\n  DeleteColumnResponse,\n  EvaluateQueryResponse,\n  SpecQuery,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  PFrameSpecDriverError,\n  ValueType,\n  ensureError,\n  resolveAnnotationParents,\n} from \"@milaboratories/pl-model-common\";\nimport { type MiLogger, ConsoleLoggerAdapter } from \"@milaboratories/ts-helpers\";\nimport { PFramePool } from \"./pframe_pool\";\nimport { logPFrames } from \"./logging\";\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 PFrameSpecDriver, AsyncDisposable {\n  private readonly logger: MiLogger;\n  private readonly frames: PFramePool;\n\n  public constructor(options?: { logger?: MiLogger }) {\n    this.logger = options?.logger ?? new ConsoleLoggerAdapter();\n    this.frames = new PFramePool(this.logger);\n  }\n\n  createSpecFrame(specs: Record<string, PColumnSpec>): PoolEntry<SpecFrameHandle> {\n    const ValueTypes = new Set(Object.values(ValueType));\n    const filtered = Object.fromEntries(\n      Object.entries(specs)\n        .filter(([, spec]) => ValueTypes.has(spec.valueType))\n        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),\n    );\n    try {\n      if (logPFrames()) {\n        this.logger.info(`createSpecFrame: ${Object.keys(filtered).length} columns`);\n      }\n      return this.frames.acquire(filtered);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`createSpecFrame failed`);\n      error.cause = ensureError(err);\n      throw error;\n    }\n  }\n\n  discoverColumns(\n    handle: SpecFrameHandle,\n    request: DiscoverColumnsRequest,\n  ): DiscoverColumnsResponse {\n    const pframe = this.frames.getByKey(handle);\n    try {\n      if (logPFrames()) {\n        this.logger.info(\n          `discoverColumns: handle = ${handle}, request: ${JSON.stringify(request)}`,\n        );\n      }\n      const result = pframe.discoverColumns(request);\n      return result;\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`discoverColumns failed`);\n      error.cause = new Error(\n        `handle: ${handle}, ` +\n          `request: ${JSON.stringify(request)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  deleteColumn(handle: SpecFrameHandle, request: DeleteColumnRequest): DeleteColumnResponse {\n    const pframe = this.frames.getByKey(handle);\n    try {\n      if (logPFrames()) {\n        this.logger.info(`deleteColumn: handle = ${handle}, request: ${JSON.stringify(request)}`);\n      }\n      const result = {\n        axes: pframe.deleteColumns({ columns: request.axes, delete: request.delete }).columns,\n      };\n      return result;\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`deleteColumn failed`);\n      error.cause = new Error(\n        `handle: ${handle}, ` +\n          `request: ${JSON.stringify(request)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  evaluateQuery(handle: SpecFrameHandle, request: SpecQuery): EvaluateQueryResponse {\n    const pframe = this.frames.getByKey(handle);\n    try {\n      if (logPFrames()) {\n        this.logger.info(`evaluateQuery: handle = ${handle}, request: ${JSON.stringify(request)}`);\n      }\n      const result = pframe.evaluateQuery(request);\n      return result;\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`evaluateQuery failed`);\n      error.cause = new Error(\n        `handle: ${handle}, ` +\n          `request: ${JSON.stringify(request)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  expandAxes(spec: AxesSpec): AxesId {\n    try {\n      return expandAxes(spec);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`expandAxes failed`);\n      error.cause = new Error(`spec: ${JSON.stringify(spec)}, ` + `error:\\n${ensureError(err)}`);\n      throw error;\n    }\n  }\n\n  collapseAxes(ids: AxesId): AxesSpec {\n    try {\n      return collapseAxes(ids);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`collapseAxes failed`);\n      error.cause = new Error(`ids: ${JSON.stringify(ids)}, ` + `error:\\n${ensureError(err)}`);\n      throw error;\n    }\n  }\n\n  findAxis(spec: AxesSpec, selector: SingleAxisSelector): number {\n    try {\n      return findAxis(spec, selector);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`findAxis failed`);\n      error.cause = new Error(\n        `spec: ${JSON.stringify(spec)}, ` +\n          `selector: ${JSON.stringify(selector)}, ` +\n          `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  findTableColumn(tableSpec: PTableColumnSpec[], selector: PTableColumnId): number {\n    try {\n      return findTableColumn(tableSpec, selector);\n    } catch (err: unknown) {\n      const error = new PFrameSpecDriverError(`findTableColumn failed`);\n      error.cause = new Error(\n        `selector: ${JSON.stringify(selector)}, ` + `error:\\n${ensureError(err)}`,\n      );\n      throw error;\n    }\n  }\n\n  async dispose(): Promise<void> {\n    await this.frames.dispose();\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    await this.dispose();\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pf-spec-driver",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "PSpecDriver implementation: spec-only PFrame operations via WASM",
   "keywords": [],
   "license": "UNLICENSED",
@@ -20,17 +20,19 @@
     }
   },
   "dependencies": {
-    "@milaboratories/pframes-rs-wasm": "1.1.15",
-    "@milaboratories/pl-model-middle-layer": "1.16.0",
-    "@milaboratories/pl-model-common": "1.29.0"
+    "@milaboratories/pframes-rs-wasm": "1.1.16",
+    "@noble/hashes": "^2.0.1",
+    "@milaboratories/pl-model-middle-layer": "1.16.1",
+    "@milaboratories/pl-model-common": "1.30.0",
+    "@milaboratories/ts-helpers": "1.8.0"
   },
   "devDependencies": {
     "@vitest/coverage-istanbul": "^4.0.18",
     "typescript": "~5.9.3",
     "vitest": "^4.0.18",
-    "@milaboratories/ts-configs": "1.2.2",
     "@milaboratories/build-configs": "1.5.2",
-    "@milaboratories/ts-builder": "1.3.0"
+    "@milaboratories/ts-builder": "1.3.0",
+    "@milaboratories/ts-configs": "1.2.2"
   },
   "scripts": {
     "build": "ts-builder build --target node",

package/src/logging.ts

@@ -0,0 +1,5 @@
+const LogPFrames = Boolean(process.env.MI_LOG_PFRAMES);
+
+export function logPFrames(): boolean {
+  return LogPFrames;
+}

package/src/pframe_pool.ts

@@ -0,0 +1,49 @@
+import {
+  PFrameDriverError,
+  PColumnSpec,
+  SpecFrameHandle,
+  stringifyJson,
+  canonicalizeJson,
+} from "@milaboratories/pl-model-common";
+import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
+import { MiLogger, RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { logPFrames } from "./logging";
+import { createPFrame } from "@milaboratories/pframes-rs-wasm";
+import { blake3 } from "@noble/hashes/blake3.js";
+import { bytesToHex } from "@noble/hashes/utils.js";
+
+export class PFramePool extends RefCountPoolBase<
+  Record<string, PColumnSpec>,
+  SpecFrameHandle,
+  PFrameInternal.PFrameWasmV2
+> {
+  constructor(private readonly logger: MiLogger) {
+    super();
+  }
+
+  protected calculateParamsKey(params: Record<string, PColumnSpec>): SpecFrameHandle {
+    return bytesToHex(
+      blake3(new TextEncoder().encode(canonicalizeJson(params))),
+    ) as SpecFrameHandle;
+  }
+
+  protected createNewResource(
+    params: Record<string, PColumnSpec>,
+    key: SpecFrameHandle,
+  ): PFrameInternal.PFrameWasmV2 {
+    if (logPFrames()) {
+      this.logger.info(`Creating SpecFrame for handle = ${key}, columns: ` + stringifyJson(params));
+    }
+    return createPFrame(params);
+  }
+
+  public getByKey(key: SpecFrameHandle): PFrameInternal.PFrameWasmV2 {
+    const resource = super.tryGetByKey(key);
+    if (!resource) {
+      const error = new PFrameDriverError(`Invalid SpecFrame handle`);
+      error.cause = new Error(`SpecFrame with handle ${key} not found`);
+      throw error;
+    }
+    return resource;
+  }
+}

package/src/spec_driver.test.ts

@@ -2,25 +2,30 @@ import type { AxisSpec, PColumnSpec } from "@milaboratories/pl-model-common";
 import { describe, expect, test } from "vitest";
 import { SpecDriver } from "./spec_driver";
 
-function createSpec(name: string, axesSpec?: AxisSpec[]): PColumnSpec {
+function createSpec(
+  name: string,
+  axesSpec?: AxisSpec[],
+  extra?: Partial<PColumnSpec>,
+): PColumnSpec {
   return {
     kind: "PColumn",
     name,
     valueType: "Int",
     axesSpec: axesSpec ?? [{ name: "id", type: "String" } as AxisSpec],
     annotations: {},
+    ...extra,
   } as PColumnSpec;
 }
 
 describe("SpecDriver", () => {
-  test("discoverColumns returns all columns with no filters", () => {
-    using driver = new SpecDriver();
-    const handle = driver.createSpecFrame({
+  test("discoverColumns returns all columns with no filters", async () => {
+    await using driver = new SpecDriver();
+    const { key: handle } = driver.createSpecFrame({
       col1: createSpec("col1"),
       col2: createSpec("col2"),
     });
 
-    const response = driver.specFrameDiscoverColumns(handle, {
+    const response = driver.discoverColumns(handle, {
       axes: [],
       maxHops: 0,
       constraints: {
@@ -35,4 +40,82 @@ describe("SpecDriver", () => {
     const names = response.hits.map((h) => h.hit.spec.name).sort();
     expect(names).toEqual(["col1", "col2"]);
   });
+
+  test("createSpecFrame converts pl7.app/parents annotation to numeric parentAxes", async () => {
+    await using driver = new SpecDriver();
+    const linkerAxes: AxisSpec[] = [
+      { name: "pl7.app/sampleId", type: "String" },
+      {
+        name: "pl7.app/sc/cellId",
+        type: "String",
+        annotations: {
+          "pl7.app/parents": '["pl7.app/sampleId"]',
+          "pl7.app/label": "Cell ID",
+        },
+      },
+      { name: "pl7.app/vdj/scClonotypeKey", type: "String" },
+    ];
+    const linkerSpec = createSpec("pl7.app/sc/cellLinker", linkerAxes, {
+      annotations: { "pl7.app/isLinkerColumn": "true" },
+    });
+
+    expect(() => driver.createSpecFrame({ linker: linkerSpec })).not.toThrow();
+  });
+
+  test("createSpecFrame works with numeric parentAxes (no annotation)", async () => {
+    await using driver = new SpecDriver();
+    const linkerAxes: AxisSpec[] = [
+      { name: "pl7.app/sampleId", type: "String" },
+      {
+        name: "pl7.app/sc/cellId",
+        type: "String",
+        parentAxes: [0],
+        annotations: { "pl7.app/label": "Cell ID" },
+      },
+      { name: "pl7.app/vdj/scClonotypeKey", type: "String" },
+    ];
+    const linkerSpec = createSpec("pl7.app/sc/cellLinker", linkerAxes, {
+      annotations: { "pl7.app/isLinkerColumn": "true" },
+    });
+
+    expect(() => driver.createSpecFrame({ linker: linkerSpec })).not.toThrow();
+  });
+
+  test("createSpecFrame preserves non-parent annotations after conversion", async () => {
+    await using driver = new SpecDriver();
+    const axes: AxisSpec[] = [
+      { name: "sample", type: "String" },
+      {
+        name: "cell",
+        type: "String",
+        annotations: {
+          "pl7.app/parents": '["sample"]',
+          "pl7.app/label": "Cell",
+          "pl7.app/table/visibility": "default",
+        },
+      },
+    ];
+    const spec = createSpec("data-col", axes);
+
+    const { key: handle } = driver.createSpecFrame({ col: spec });
+    expect(handle).toBeDefined();
+
+    const response = driver.discoverColumns(handle, {
+      axes: [],
+      maxHops: 0,
+      constraints: {
+        allowFloatingSourceAxes: true,
+        allowFloatingHitAxes: true,
+        allowSourceQualifications: false,
+        allowHitQualifications: false,
+      },
+    });
+    expect(response.hits).toHaveLength(1);
+    const hitAxes = response.hits[0].hit.spec.axesSpec;
+    const cellAxis = hitAxes.find((a: AxisSpec) => a.name === "cell");
+    expect(cellAxis).toBeDefined();
+    expect(cellAxis!.annotations?.["pl7.app/label"]).toBe("Cell");
+    expect(cellAxis!.annotations?.["pl7.app/parents"]).toBe('["sample"]');
+    expect(cellAxis!.parentAxes).toEqual([0]);
+  });
 });

package/src/spec_driver.ts

@@ -1,11 +1,9 @@
 import {
-  createPFrame,
   expandAxes,
   collapseAxes,
   findAxis,
   findTableColumn,
 } from "@milaboratories/pframes-rs-wasm";
-import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import type {
   AxesId,
   AxesSpec,
@@ -15,77 +13,172 @@ import type {
   PTableColumnSpec,
   SingleAxisSelector,
   SpecFrameHandle,
+  PoolEntry,
   DiscoverColumnsRequest,
   DiscoverColumnsResponse,
+  DeleteColumnRequest,
+  DeleteColumnResponse,
+  EvaluateQueryResponse,
+  SpecQuery,
 } from "@milaboratories/pl-model-common";
-import { PFrameSpecDriverError } from "@milaboratories/pl-model-common";
+import {
+  PFrameSpecDriverError,
+  ValueType,
+  ensureError,
+  resolveAnnotationParents,
+} from "@milaboratories/pl-model-common";
+import { type MiLogger, ConsoleLoggerAdapter } from "@milaboratories/ts-helpers";
+import { PFramePool } from "./pframe_pool";
+import { logPFrames } from "./logging";
 
 /**
  * Manages spec-only PFrame instances (WASM) with handle-based lifecycle.
  *
  * All operations are synchronous — WASM computes results immediately.
  */
-export class SpecDriver implements PFrameSpecDriver, Disposable {
-  private readonly frames = new Map<SpecFrameHandle, PFrameInternal.PFrameWasmV2>();
+export class SpecDriver implements PFrameSpecDriver, AsyncDisposable {
+  private readonly logger: MiLogger;
+  private readonly frames: PFramePool;
+
+  public constructor(options?: { logger?: MiLogger }) {
+    this.logger = options?.logger ?? new ConsoleLoggerAdapter();
+    this.frames = new PFramePool(this.logger);
+  }
 
-  createSpecFrame(specs: Record<string, PColumnSpec>): SpecFrameHandle {
-    // Explicit annotation ensures a WASM version mismatch surfaces at compile time
-    // (skipLibCheck won't validate .d.ts in node_modules, but this assignment will)
-    const frame: PFrameInternal.PFrameWasmV2 = createPFrame(specs);
-    const handle = crypto.randomUUID() as SpecFrameHandle;
-    this.frames.set(handle, frame);
-    return handle;
+  createSpecFrame(specs: Record<string, PColumnSpec>): PoolEntry<SpecFrameHandle> {
+    const ValueTypes = new Set(Object.values(ValueType));
+    const filtered = Object.fromEntries(
+      Object.entries(specs)
+        .filter(([, spec]) => ValueTypes.has(spec.valueType))
+        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),
+    );
+    try {
+      if (logPFrames()) {
+        this.logger.info(`createSpecFrame: ${Object.keys(filtered).length} columns`);
+      }
+      return this.frames.acquire(filtered);
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`createSpecFrame failed`);
+      error.cause = ensureError(err);
+      throw error;
+    }
   }
 
-  specFrameDiscoverColumns(
+  discoverColumns(
     handle: SpecFrameHandle,
     request: DiscoverColumnsRequest,
   ): DiscoverColumnsResponse {
-    return this.getFrame(handle).discoverColumns(request);
+    const pframe = this.frames.getByKey(handle);
+    try {
+      if (logPFrames()) {
+        this.logger.info(
+          `discoverColumns: handle = ${handle}, request: ${JSON.stringify(request)}`,
+        );
+      }
+      const result = pframe.discoverColumns(request);
+      return result;
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`discoverColumns failed`);
+      error.cause = new Error(
+        `handle: ${handle}, ` +
+          `request: ${JSON.stringify(request)}, ` +
+          `error:\n${ensureError(err)}`,
+      );
+      throw error;
+    }
+  }
+
+  deleteColumn(handle: SpecFrameHandle, request: DeleteColumnRequest): DeleteColumnResponse {
+    const pframe = this.frames.getByKey(handle);
+    try {
+      if (logPFrames()) {
+        this.logger.info(`deleteColumn: handle = ${handle}, request: ${JSON.stringify(request)}`);
+      }
+      const result = {
+        axes: pframe.deleteColumns({ columns: request.axes, delete: request.delete }).columns,
+      };
+      return result;
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`deleteColumn failed`);
+      error.cause = new Error(
+        `handle: ${handle}, ` +
+          `request: ${JSON.stringify(request)}, ` +
+          `error:\n${ensureError(err)}`,
+      );
+      throw error;
+    }
   }
 
-  disposeSpecFrame(handle: SpecFrameHandle): void {
-    const frame = this.frames.get(handle);
-    if (frame) {
-      frame[Symbol.dispose]();
-      this.frames.delete(handle);
+  evaluateQuery(handle: SpecFrameHandle, request: SpecQuery): EvaluateQueryResponse {
+    const pframe = this.frames.getByKey(handle);
+    try {
+      if (logPFrames()) {
+        this.logger.info(`evaluateQuery: handle = ${handle}, request: ${JSON.stringify(request)}`);
+      }
+      const result = pframe.evaluateQuery(request);
+      return result;
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`evaluateQuery failed`);
+      error.cause = new Error(
+        `handle: ${handle}, ` +
+          `request: ${JSON.stringify(request)}, ` +
+          `error:\n${ensureError(err)}`,
+      );
+      throw error;
     }
   }
 
   expandAxes(spec: AxesSpec): AxesId {
-    return expandAxes(spec);
+    try {
+      return expandAxes(spec);
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`expandAxes failed`);
+      error.cause = new Error(`spec: ${JSON.stringify(spec)}, ` + `error:\n${ensureError(err)}`);
+      throw error;
+    }
   }
 
   collapseAxes(ids: AxesId): AxesSpec {
-    return collapseAxes(ids);
+    try {
+      return collapseAxes(ids);
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`collapseAxes failed`);
+      error.cause = new Error(`ids: ${JSON.stringify(ids)}, ` + `error:\n${ensureError(err)}`);
+      throw error;
+    }
   }
 
   findAxis(spec: AxesSpec, selector: SingleAxisSelector): number {
-    return findAxis(spec, selector);
+    try {
+      return findAxis(spec, selector);
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`findAxis failed`);
+      error.cause = new Error(
+        `spec: ${JSON.stringify(spec)}, ` +
+          `selector: ${JSON.stringify(selector)}, ` +
+          `error:\n${ensureError(err)}`,
+      );
+      throw error;
+    }
   }
 
   findTableColumn(tableSpec: PTableColumnSpec[], selector: PTableColumnId): number {
-    return findTableColumn(tableSpec, selector);
-  }
-
-  /** Dispose all managed spec frames. */
-  dispose(): void {
     try {
-      for (const frame of this.frames.values()) {
-        frame[Symbol.dispose]();
-      }
-    } finally {
-      this.frames.clear();
+      return findTableColumn(tableSpec, selector);
+    } catch (err: unknown) {
+      const error = new PFrameSpecDriverError(`findTableColumn failed`);
+      error.cause = new Error(
+        `selector: ${JSON.stringify(selector)}, ` + `error:\n${ensureError(err)}`,
+      );
+      throw error;
     }
   }
 
-  [Symbol.dispose](): void {
-    this.dispose();
+  async dispose(): Promise<void> {
+    await this.frames.dispose();
   }
 
-  private getFrame(handle: SpecFrameHandle): PFrameInternal.PFrameWasmV2 {
-    const frame = this.frames.get(handle);
-    if (frame === undefined) throw new PFrameSpecDriverError(`No such spec frame: ${handle}`);
-    return frame;
+  async [Symbol.asyncDispose](): Promise<void> {
+    await this.dispose();
   }
 }