@milaboratories/pf-driver 1.4.12 → 1.4.13

package/dist/ptable_def_pool.cjs

@@ -40,6 +40,21 @@ var PTableDefPool = class extends _milaboratories_helpers.RefCountPoolBase {
 		}
 		return resource;
 	}
+	/**
+	* Acquire a def from a legacy `PTableDef` + column specs map.
+	* Lowers the input via WASM-spec and stores the resulting
+	* `{ tableSpec, dataQuery }` shape. Returns the lowered def
+	* alongside the pool entry — callers that need `tableSpec`
+	* (e.g. `calculateTableData`) read it from `def.tableSpec`
+	* without re-deriving.
+	*/
+	acquireFromLegacy(opts) {
+		const def = require_ptable_shared.buildFullPTableDefFromLegacy(opts);
+		return {
+			def,
+			entry: this.acquire(def)
+		};
+	}
 };
 //#endregion
 exports.PTableDefPool = PTableDefPool;

package/dist/ptable_def_pool.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_def_pool.cjs","names":["logPFrames","RefCountPoolBase","stableKeyFromFullPTableDef","PFrameDriverError"],"sources":["../src/ptable_def_pool.ts"],"sourcesContent":["import { PFrameDriverError, type PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { FullPTableDef } from \"./ptable_shared\";\nimport { stableKeyFromFullPTableDef } from \"./ptable_shared\";\n\nexport class PTableDefHolder implements Disposable {\n  private readonly abortController = new AbortController();\n\n  constructor(\n    public readonly def: FullPTableDef,\n    private readonly pTableHandle: PTableHandle,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition saved (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition disposed (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n}\n\nexport class PTableDefPool extends RefCountPoolBase<FullPTableDef, PTableHandle, PTableDefHolder> {\n  constructor(private readonly logger: PFrameInternal.Logger) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableDefHolder {\n    return new PTableDefHolder(params, key, this.logger);\n  }\n\n  public getByKey(key: PTableHandle): PTableDefHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable definition for handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n"],"mappings":";;;;;;AAOA,IAAa,kBAAb,MAAmD;CACjD,kBAAmC,IAAI,iBAAiB;CAExD,YACE,KACA,cACA,QACA;AAHgB,OAAA,MAAA;AACC,OAAA,eAAA;AACA,OAAA,SAAA;AAEjB,MAAIA,gBAAAA,YAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,KAAK,aAAa,GAAG;;CAIxF,IAAW,gBAA6B;AACtC,SAAO,KAAK,gBAAgB;;CAG9B,CAAC,OAAO,WAAiB;AACvB,OAAK,gBAAgB,OAAO;AAC5B,MAAIA,gBAAAA,YAAY,CACd,MAAK,OAAO,QAAQ,8CAA8C,KAAK,aAAa,GAAG;;;AAK7F,IAAa,gBAAb,cAAmCC,wBAAAA,iBAA+D;CAChG,YAAY,QAAgD;AAC1D,SAAO;AADoB,OAAA,SAAA;;CAI7B,mBAA6B,QAAqC;AAChE,SAAOC,sBAAAA,2BAA2B,OAAO;;CAG3C,kBAA4B,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,SAAgB,KAAoC;EAClD,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIC,gCAAAA,kBAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,gCAAgC,IAAI,YAAY;AACxE,SAAM;;AAER,SAAO"}
+{"version":3,"file":"ptable_def_pool.cjs","names":["logPFrames","RefCountPoolBase","stableKeyFromFullPTableDef","PFrameDriverError","buildFullPTableDefFromLegacy"],"sources":["../src/ptable_def_pool.ts"],"sourcesContent":["import {\n  PFrameDriverError,\n  type PFrameHandle,\n  type PObjectId,\n  type PTableDef,\n  type PTableHandle,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { FullPTableDef } from \"./ptable_shared\";\nimport { buildFullPTableDefFromLegacy, stableKeyFromFullPTableDef } from \"./ptable_shared\";\n\nexport class PTableDefHolder implements Disposable {\n  private readonly abortController = new AbortController();\n\n  constructor(\n    public readonly def: FullPTableDef,\n    private readonly pTableHandle: PTableHandle,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition saved (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition disposed (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n}\n\nexport class PTableDefPool extends RefCountPoolBase<FullPTableDef, PTableHandle, PTableDefHolder> {\n  constructor(private readonly logger: PFrameInternal.Logger) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableDefHolder {\n    return new PTableDefHolder(params, key, this.logger);\n  }\n\n  public getByKey(key: PTableHandle): PTableDefHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable definition for handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n\n  /**\n   * Acquire a def from a legacy `PTableDef` + column specs map.\n   * Lowers the input via WASM-spec and stores the resulting\n   * `{ tableSpec, dataQuery }` shape. Returns the lowered def\n   * alongside the pool entry — callers that need `tableSpec`\n   * (e.g. `calculateTableData`) read it from `def.tableSpec`\n   * without re-deriving.\n   */\n  public acquireFromLegacy(opts: {\n    pFrameHandle: PFrameHandle;\n    def: PTableDef<PObjectId>;\n    pFrameSpec: PFrameInternal.PFrameWasmV3;\n  }): { def: FullPTableDef; entry: PoolEntry<PTableHandle> } {\n    const def = buildFullPTableDefFromLegacy(opts);\n    return { def, entry: this.acquire(def) };\n  }\n}\n"],"mappings":";;;;;;AAaA,IAAa,kBAAb,MAAmD;CACjD,kBAAmC,IAAI,iBAAiB;CAExD,YACE,KACA,cACA,QACA;AAHgB,OAAA,MAAA;AACC,OAAA,eAAA;AACA,OAAA,SAAA;AAEjB,MAAIA,gBAAAA,YAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,KAAK,aAAa,GAAG;;CAIxF,IAAW,gBAA6B;AACtC,SAAO,KAAK,gBAAgB;;CAG9B,CAAC,OAAO,WAAiB;AACvB,OAAK,gBAAgB,OAAO;AAC5B,MAAIA,gBAAAA,YAAY,CACd,MAAK,OAAO,QAAQ,8CAA8C,KAAK,aAAa,GAAG;;;AAK7F,IAAa,gBAAb,cAAmCC,wBAAAA,iBAA+D;CAChG,YAAY,QAAgD;AAC1D,SAAO;AADoB,OAAA,SAAA;;CAI7B,mBAA6B,QAAqC;AAChE,SAAOC,sBAAAA,2BAA2B,OAAO;;CAG3C,kBAA4B,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,SAAgB,KAAoC;EAClD,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIC,gCAAAA,kBAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,gCAAgC,IAAI,YAAY;AACxE,SAAM;;AAER,SAAO;;;;;;;;;;CAWT,kBAAyB,MAIkC;EACzD,MAAM,MAAMC,sBAAAA,6BAA6B,KAAK;AAC9C,SAAO;GAAE;GAAK,OAAO,KAAK,QAAQ,IAAI;GAAE"}

package/dist/ptable_def_pool.d.ts

@@ -1,3 +1,3 @@
-import { PTableHandle } from "@milaboratories/pl-model-common";
-import { RefCountPoolBase } from "@milaboratories/helpers";
+import { PFrameHandle, PObjectId, PTableDef, PTableHandle } from "@milaboratories/pl-model-common";
+import { PoolEntry, RefCountPoolBase } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";

package/dist/ptable_def_pool.js

@@ -1,5 +1,5 @@
 import { logPFrames } from "./logging.js";
-import { stableKeyFromFullPTableDef } from "./ptable_shared.js";
+import { buildFullPTableDefFromLegacy, stableKeyFromFullPTableDef } from "./ptable_shared.js";
 import { PFrameDriverError } from "@milaboratories/pl-model-common";
 import { RefCountPoolBase } from "@milaboratories/helpers";
 //#region src/ptable_def_pool.ts
@@ -39,6 +39,21 @@ var PTableDefPool = class extends RefCountPoolBase {
 		}
 		return resource;
 	}
+	/**
+	* Acquire a def from a legacy `PTableDef` + column specs map.
+	* Lowers the input via WASM-spec and stores the resulting
+	* `{ tableSpec, dataQuery }` shape. Returns the lowered def
+	* alongside the pool entry — callers that need `tableSpec`
+	* (e.g. `calculateTableData`) read it from `def.tableSpec`
+	* without re-deriving.
+	*/
+	acquireFromLegacy(opts) {
+		const def = buildFullPTableDefFromLegacy(opts);
+		return {
+			def,
+			entry: this.acquire(def)
+		};
+	}
 };
 //#endregion
 export { PTableDefPool };

package/dist/ptable_def_pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_def_pool.js","names":[],"sources":["../src/ptable_def_pool.ts"],"sourcesContent":["import { PFrameDriverError, type PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { FullPTableDef } from \"./ptable_shared\";\nimport { stableKeyFromFullPTableDef } from \"./ptable_shared\";\n\nexport class PTableDefHolder implements Disposable {\n  private readonly abortController = new AbortController();\n\n  constructor(\n    public readonly def: FullPTableDef,\n    private readonly pTableHandle: PTableHandle,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition saved (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition disposed (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n}\n\nexport class PTableDefPool extends RefCountPoolBase<FullPTableDef, PTableHandle, PTableDefHolder> {\n  constructor(private readonly logger: PFrameInternal.Logger) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableDefHolder {\n    return new PTableDefHolder(params, key, this.logger);\n  }\n\n  public getByKey(key: PTableHandle): PTableDefHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable definition for handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n"],"mappings":";;;;;AAOA,IAAa,kBAAb,MAAmD;CACjD,kBAAmC,IAAI,iBAAiB;CAExD,YACE,KACA,cACA,QACA;AAHgB,OAAA,MAAA;AACC,OAAA,eAAA;AACA,OAAA,SAAA;AAEjB,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,KAAK,aAAa,GAAG;;CAIxF,IAAW,gBAA6B;AACtC,SAAO,KAAK,gBAAgB;;CAG9B,CAAC,OAAO,WAAiB;AACvB,OAAK,gBAAgB,OAAO;AAC5B,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,8CAA8C,KAAK,aAAa,GAAG;;;AAK7F,IAAa,gBAAb,cAAmC,iBAA+D;CAChG,YAAY,QAAgD;AAC1D,SAAO;AADoB,OAAA,SAAA;;CAI7B,mBAA6B,QAAqC;AAChE,SAAO,2BAA2B,OAAO;;CAG3C,kBAA4B,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,SAAgB,KAAoC;EAClD,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAI,kBAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,gCAAgC,IAAI,YAAY;AACxE,SAAM;;AAER,SAAO"}
+{"version":3,"file":"ptable_def_pool.js","names":[],"sources":["../src/ptable_def_pool.ts"],"sourcesContent":["import {\n  PFrameDriverError,\n  type PFrameHandle,\n  type PObjectId,\n  type PTableDef,\n  type PTableHandle,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { FullPTableDef } from \"./ptable_shared\";\nimport { buildFullPTableDefFromLegacy, stableKeyFromFullPTableDef } from \"./ptable_shared\";\n\nexport class PTableDefHolder implements Disposable {\n  private readonly abortController = new AbortController();\n\n  constructor(\n    public readonly def: FullPTableDef,\n    private readonly pTableHandle: PTableHandle,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition saved (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    if (logPFrames()) {\n      this.logger(\"info\", `PTable definition disposed (pTableHandle = ${this.pTableHandle})`);\n    }\n  }\n}\n\nexport class PTableDefPool extends RefCountPoolBase<FullPTableDef, PTableHandle, PTableDefHolder> {\n  constructor(private readonly logger: PFrameInternal.Logger) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableDefHolder {\n    return new PTableDefHolder(params, key, this.logger);\n  }\n\n  public getByKey(key: PTableHandle): PTableDefHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable definition for handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n\n  /**\n   * Acquire a def from a legacy `PTableDef` + column specs map.\n   * Lowers the input via WASM-spec and stores the resulting\n   * `{ tableSpec, dataQuery }` shape. Returns the lowered def\n   * alongside the pool entry — callers that need `tableSpec`\n   * (e.g. `calculateTableData`) read it from `def.tableSpec`\n   * without re-deriving.\n   */\n  public acquireFromLegacy(opts: {\n    pFrameHandle: PFrameHandle;\n    def: PTableDef<PObjectId>;\n    pFrameSpec: PFrameInternal.PFrameWasmV3;\n  }): { def: FullPTableDef; entry: PoolEntry<PTableHandle> } {\n    const def = buildFullPTableDefFromLegacy(opts);\n    return { def, entry: this.acquire(def) };\n  }\n}\n"],"mappings":";;;;;AAaA,IAAa,kBAAb,MAAmD;CACjD,kBAAmC,IAAI,iBAAiB;CAExD,YACE,KACA,cACA,QACA;AAHgB,OAAA,MAAA;AACC,OAAA,eAAA;AACA,OAAA,SAAA;AAEjB,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,KAAK,aAAa,GAAG;;CAIxF,IAAW,gBAA6B;AACtC,SAAO,KAAK,gBAAgB;;CAG9B,CAAC,OAAO,WAAiB;AACvB,OAAK,gBAAgB,OAAO;AAC5B,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,8CAA8C,KAAK,aAAa,GAAG;;;AAK7F,IAAa,gBAAb,cAAmC,iBAA+D;CAChG,YAAY,QAAgD;AAC1D,SAAO;AADoB,OAAA,SAAA;;CAI7B,mBAA6B,QAAqC;AAChE,SAAO,2BAA2B,OAAO;;CAG3C,kBAA4B,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,SAAgB,KAAoC;EAClD,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAI,kBAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,gCAAgC,IAAI,YAAY;AACxE,SAAM;;AAER,SAAO;;;;;;;;;;CAWT,kBAAyB,MAIkC;EACzD,MAAM,MAAM,6BAA6B,KAAK;AAC9C,SAAO;GAAE;GAAK,OAAO,KAAK,QAAQ,IAAI;GAAE"}

package/dist/ptable_pool.cjs

@@ -34,50 +34,16 @@ var PTablePool = class extends _milaboratories_helpers.RefCountPoolBase {
 	}
 	createNewResource(params, key) {
 		if (require_logging.logPFrames()) this.logger("info", `PTable creation (pTableHandle = ${key}): ${JSON.stringify(params, _milaboratories_pl_model_common.bigintReplacer)}`);
-		switch (params.type) {
-			case "v1": return this.createNewResourceV1(params, key);
-			case "v2": return this.createNewResourceV2(params, key);
-			default: throw new _milaboratories_pl_model_common.PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);
-		}
-	}
-	createNewResourceV1(params, key) {
-		const { def, pFrameHandle } = params;
-		const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);
+		const { pFrameHandle } = params;
+		const { pFrameDataPromise: pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);
 		const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;
 		const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));
-		if (def.sorting.length > 0) {
-			const predecessor = this.acquire({
-				...params,
-				def: {
-					...def,
-					sorting: []
-				}
-			});
-			const { resource: { pTablePromise } } = predecessor;
-			return new PTableHolder(pFrameHandle, combinedSignal, pTablePromise.then((pTable) => pTable.sort(key, def.sorting)), predecessor);
-		}
-		if (!hasArtificialColumns(def.src) && def.filters.length > 0) {
-			const predecessor = this.acquire({
-				...params,
-				def: {
-					...def,
-					filters: []
-				}
-			});
-			const { resource: { pTablePromise } } = predecessor;
-			return new PTableHolder(pFrameHandle, combinedSignal, pTablePromise.then((pTable) => pTable.filter(key, def.filters)), predecessor);
-		}
-		return new PTableHolder(pFrameHandle, combinedSignal, pFramePromise.then((pFrame) => pFrame.createTable(key, {
-			src: joinEntryToInternal(def.src),
-			filters: [...def.partitionFilters, ...def.filters]
+		const { tableSpec, dataQuery } = params;
+		return new PTableHolder(pFrameHandle, combinedSignal, pFramePromise.then((pFrame) => pFrame.createTableV2(key, {
+			tableSpec,
+			dataQuery
 		})));
 	}
-	createNewResourceV2(params, key) {
-		const { pFrameHandle } = params;
-		const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);
-		const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;
-		return new PTableHolder(pFrameHandle, AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s)), pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def)));
-	}
 	getByKey(key) {
 		const resource = super.tryGetByKey(key);
 		if (!resource) {
@@ -87,64 +53,20 @@ var PTablePool = class extends _milaboratories_helpers.RefCountPoolBase {
 		}
 		return resource;
 	}
-};
-function hasArtificialColumns(entry) {
-	switch (entry.type) {
-		case "column":
-		case "slicedColumn":
-		case "inlineColumn": return false;
-		case "artificialColumn": return true;
-		case "full":
-		case "inner": return entry.entries.some(hasArtificialColumns);
-		case "outer": return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);
-		default: (0, _milaboratories_pl_model_common.assertNever)(entry);
-	}
-}
-function joinEntryToInternal(entry) {
-	const type = entry.type;
-	switch (type) {
-		case "column": return {
-			type: "column",
-			columnId: entry.column
-		};
-		case "slicedColumn": return {
-			type: "slicedColumn",
-			columnId: entry.column,
-			newId: entry.newId,
-			axisFilters: entry.axisFilters
-		};
-		case "artificialColumn": return {
-			type: "artificialColumn",
-			columnId: entry.column,
-			newId: entry.newId,
-			axesIndices: entry.axesIndices
+	/**
+	* Acquire a PTable from a legacy `PTableDef` + column specs map.
+	* Lowers the input via WASM-spec and stores the resulting
+	* `{ tableSpec, dataQuery }` shape. Returns the lowered def
+	* alongside the pool entry.
+	*/
+	acquireFromLegacy(opts) {
+		const def = require_ptable_shared.buildFullPTableDefFromLegacy(opts);
+		return {
+			def,
+			entry: this.acquire(def)
 		};
-		case "inlineColumn": return {
-			type: "inlineColumn",
-			newId: entry.column.id,
-			spec: entry.column.spec,
-			dataInfo: {
-				type: "Json",
-				keyLength: entry.column.spec.axesSpec.length,
-				data: entry.column.data.reduce((acc, row) => {
-					acc[JSON.stringify(row.key)] = row.val;
-					return acc;
-				}, {})
-			}
-		};
-		case "inner":
-		case "full": return {
-			type: entry.type,
-			entries: entry.entries.map((col) => joinEntryToInternal(col))
-		};
-		case "outer": return {
-			type: "outer",
-			primary: joinEntryToInternal(entry.primary),
-			secondary: entry.secondary.map((col) => joinEntryToInternal(col))
-		};
-		default: throw new _milaboratories_pl_model_common.PFrameDriverError(`unsupported PFrame join entry type: ${type}`);
 	}
-}
+};
 //#endregion
 exports.PTablePool = PTablePool;
 

package/dist/ptable_pool.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_pool.cjs","names":["RefCountPoolBase","stableKeyFromFullPTableDef","logPFrames","bigintReplacer","PFrameDriverError"],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableHandle,\n  type JoinEntry,\n  type JsonSerializable,\n  type PColumnValue,\n  type PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  FullPTableDefV1,\n  FullPTableDefV2,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    switch (params.type) {\n      case \"v1\":\n        return this.createNewResourceV1(params, key);\n      case \"v2\":\n        return this.createNewResourceV2(params, key);\n      default:\n        // @ts-expect-error `params.type` is a string, but we want to make sure all cases are handled\n        throw new PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);\n    }\n  }\n\n  protected createNewResourceV1(params: FullPTableDefV1, key: PTableHandle): PTableHolder {\n    const { def, pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    // 3. Sort\n    if (def.sorting.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          sorting: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const sortedTable = pTablePromise.then((pTable) => pTable.sort(key, def.sorting));\n      return new PTableHolder(pFrameHandle, combinedSignal, sortedTable, predecessor);\n    }\n\n    // 2. Filter (except the case with artificial columns where cartesian creates too many rows)\n    if (!hasArtificialColumns(def.src) && def.filters.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          filters: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const filteredTable = pTablePromise.then((pTable) => pTable.filter(key, def.filters));\n      return new PTableHolder(pFrameHandle, combinedSignal, filteredTable, predecessor);\n    }\n\n    // 1. Join\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTable(key, {\n        src: joinEntryToInternal(def.src),\n        // `def.filters` would be non-empty only when join has artificial columns\n        filters: [...def.partitionFilters, ...def.filters],\n      }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  protected createNewResourceV2(params: FullPTableDefV2, key: PTableHandle): PTableHolder {\n    const { pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const table = pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def));\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction hasArtificialColumns<T>(entry: JoinEntry<T>): boolean {\n  switch (entry.type) {\n    case \"column\":\n    case \"slicedColumn\":\n    case \"inlineColumn\":\n      return false;\n    case \"artificialColumn\":\n      return true;\n    case \"full\":\n    case \"inner\":\n      return entry.entries.some(hasArtificialColumns);\n    case \"outer\":\n      return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);\n    default:\n      assertNever(entry);\n  }\n}\n\nfunction joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntryV4 {\n  const type = entry.type;\n  switch (type) {\n    case \"column\":\n      return {\n        type: \"column\",\n        columnId: entry.column,\n      };\n    case \"slicedColumn\":\n      return {\n        type: \"slicedColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axisFilters: entry.axisFilters,\n      };\n    case \"artificialColumn\":\n      return {\n        type: \"artificialColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axesIndices: entry.axesIndices,\n      };\n    case \"inlineColumn\":\n      return {\n        type: \"inlineColumn\",\n        newId: entry.column.id,\n        spec: entry.column.spec,\n        dataInfo: {\n          type: \"Json\",\n          keyLength: entry.column.spec.axesSpec.length,\n          data: entry.column.data.reduce(\n            (acc, row) => {\n              acc[JSON.stringify(row.key)] = row.val;\n              return acc;\n            },\n            {} as Record<string, PColumnValue>,\n          ),\n        },\n      };\n    case \"inner\":\n    case \"full\":\n      return {\n        type: entry.type,\n        entries: entry.entries.map((col) => joinEntryToInternal(col)),\n      };\n    case \"outer\":\n      return {\n        type: \"outer\",\n        primary: joinEntryToInternal(entry.primary),\n        secondary: entry.secondary.map((col) => joinEntryToInternal(col)),\n      };\n    default:\n      throw new PFrameDriverError(`unsupported PFrame join entry type: ${type satisfies never}`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"ptable_pool.cjs","names":["RefCountPoolBase","stableKeyFromFullPTableDef","logPFrames","bigintReplacer","PFrameDriverError","buildFullPTableDefFromLegacy"],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableDef,\n  type PTableHandle,\n  type JsonSerializable,\n  type PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  buildFullPTableDefFromLegacy,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    const { pFrameHandle } = params;\n    const { pFrameDataPromise: pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const { tableSpec, dataQuery } = params;\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTableV2(key, { tableSpec, dataQuery }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n\n  /**\n   * Acquire a PTable from a legacy `PTableDef` + column specs map.\n   * Lowers the input via WASM-spec and stores the resulting\n   * `{ tableSpec, dataQuery }` shape. Returns the lowered def\n   * alongside the pool entry.\n   */\n  public acquireFromLegacy(opts: {\n    pFrameHandle: PFrameHandle;\n    def: PTableDef<PObjectId>;\n    pFrameSpec: PFrameInternal.PFrameWasmV3;\n  }): { def: FullPTableDef; entry: PoolEntry<PTableHandle, PTableHolder> } {\n    const def = buildFullPTableDefFromLegacy(opts);\n    return { def, entry: this.acquire(def) };\n  }\n}\n"],"mappings":";;;;;;AAoBA,IAAa,eAAb,MAAgD;CAC9C,kBAAmC,IAAI,iBAAiB;CACxD;CAEA,YACE,QACA,qBACA,eACA,aACA;AAJgB,OAAA,SAAA;AAEA,OAAA,gBAAA;AACC,OAAA,cAAA;AAEjB,OAAK,wBAAwB,YAAY,IAAI,CAC3C,qBACA,KAAK,gBAAgB,OACtB,CAAC;;CAGJ,IAAW,gBAA6B;AACtC,SAAO,KAAK;;CAGd,CAAC,OAAO,WAAiB;AACvB,OAAK,gBAAgB,OAAO;AAC5B,OAAK,aAAa,OAAO;AACpB,OAAK,cACP,MAAM,WAAW,OAAO,SAAS,CAAC,CAClC,YAAY,GAEX;;;AAIR,IAAa,aAAb,cAAoEA,wBAAAA,iBAIlE;CACA,YACE,SACA,YACA,QACA;AACA,SAAO;AAJU,OAAA,UAAA;AACA,OAAA,aAAA;AACA,OAAA,SAAA;;CAKnB,mBAA6B,QAAqC;AAChE,SAAOC,sBAAAA,2BAA2B,OAAO;;CAG3C,kBAA4B,QAAuB,KAAiC;AAClF,MAAIC,gBAAAA,YAAY,CACd,MAAK,OACH,QACA,mCAAmC,IAAI,KAAU,KAAK,UAAU,QAAQC,gCAAAA,eAAe,GACxF;EAGH,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,mBAAmB,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE/F,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;EAC3D,MAAM,iBAAiB,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;EAE5F,MAAM,EAAE,WAAW,cAAc;AAIjC,SAAO,IAAI,aAAa,cAAc,gBAHxB,cAAc,MAAM,WAChC,OAAO,cAAc,KAAK;GAAE;GAAW;GAAW,CAAC,CACpD,CAC2D;;CAG9D,SAAgB,KAAiC;EAC/C,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIC,gCAAAA,kBAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,sBAAsB,IAAI,YAAY;AAC9D,SAAM;;AAER,SAAO;;;;;;;;CAST,kBAAyB,MAIgD;EACvE,MAAM,MAAMC,sBAAAA,6BAA6B,KAAK;AAC9C,SAAO;GAAE;GAAK,OAAO,KAAK,QAAQ,IAAI;GAAE"}

package/dist/ptable_pool.d.ts

@@ -1,3 +1,3 @@
-import { JsonSerializable, PFrameHandle, PTableHandle } from "@milaboratories/pl-model-common";
+import { JsonSerializable, PFrameHandle, PObjectId, PTableDef, PTableHandle } from "@milaboratories/pl-model-common";
 import { PoolEntry, RefCountPoolBase } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";

package/dist/ptable_pool.js

@@ -1,6 +1,6 @@
 import { logPFrames } from "./logging.js";
-import { stableKeyFromFullPTableDef } from "./ptable_shared.js";
-import { PFrameDriverError, assertNever, bigintReplacer } from "@milaboratories/pl-model-common";
+import { buildFullPTableDefFromLegacy, stableKeyFromFullPTableDef } from "./ptable_shared.js";
+import { PFrameDriverError, bigintReplacer } from "@milaboratories/pl-model-common";
 import { RefCountPoolBase } from "@milaboratories/helpers";
 //#region src/ptable_pool.ts
 var PTableHolder = class {
@@ -33,50 +33,16 @@ var PTablePool = class extends RefCountPoolBase {
 	}
 	createNewResource(params, key) {
 		if (logPFrames()) this.logger("info", `PTable creation (pTableHandle = ${key}): ${JSON.stringify(params, bigintReplacer)}`);
-		switch (params.type) {
-			case "v1": return this.createNewResourceV1(params, key);
-			case "v2": return this.createNewResourceV2(params, key);
-			default: throw new PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);
-		}
-	}
-	createNewResourceV1(params, key) {
-		const { def, pFrameHandle } = params;
-		const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);
+		const { pFrameHandle } = params;
+		const { pFrameDataPromise: pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);
 		const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;
 		const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));
-		if (def.sorting.length > 0) {
-			const predecessor = this.acquire({
-				...params,
-				def: {
-					...def,
-					sorting: []
-				}
-			});
-			const { resource: { pTablePromise } } = predecessor;
-			return new PTableHolder(pFrameHandle, combinedSignal, pTablePromise.then((pTable) => pTable.sort(key, def.sorting)), predecessor);
-		}
-		if (!hasArtificialColumns(def.src) && def.filters.length > 0) {
-			const predecessor = this.acquire({
-				...params,
-				def: {
-					...def,
-					filters: []
-				}
-			});
-			const { resource: { pTablePromise } } = predecessor;
-			return new PTableHolder(pFrameHandle, combinedSignal, pTablePromise.then((pTable) => pTable.filter(key, def.filters)), predecessor);
-		}
-		return new PTableHolder(pFrameHandle, combinedSignal, pFramePromise.then((pFrame) => pFrame.createTable(key, {
-			src: joinEntryToInternal(def.src),
-			filters: [...def.partitionFilters, ...def.filters]
+		const { tableSpec, dataQuery } = params;
+		return new PTableHolder(pFrameHandle, combinedSignal, pFramePromise.then((pFrame) => pFrame.createTableV2(key, {
+			tableSpec,
+			dataQuery
 		})));
 	}
-	createNewResourceV2(params, key) {
-		const { pFrameHandle } = params;
-		const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);
-		const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;
-		return new PTableHolder(pFrameHandle, AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s)), pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def)));
-	}
 	getByKey(key) {
 		const resource = super.tryGetByKey(key);
 		if (!resource) {
@@ -86,64 +52,20 @@ var PTablePool = class extends RefCountPoolBase {
 		}
 		return resource;
 	}
-};
-function hasArtificialColumns(entry) {
-	switch (entry.type) {
-		case "column":
-		case "slicedColumn":
-		case "inlineColumn": return false;
-		case "artificialColumn": return true;
-		case "full":
-		case "inner": return entry.entries.some(hasArtificialColumns);
-		case "outer": return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);
-		default: assertNever(entry);
-	}
-}
-function joinEntryToInternal(entry) {
-	const type = entry.type;
-	switch (type) {
-		case "column": return {
-			type: "column",
-			columnId: entry.column
-		};
-		case "slicedColumn": return {
-			type: "slicedColumn",
-			columnId: entry.column,
-			newId: entry.newId,
-			axisFilters: entry.axisFilters
-		};
-		case "artificialColumn": return {
-			type: "artificialColumn",
-			columnId: entry.column,
-			newId: entry.newId,
-			axesIndices: entry.axesIndices
+	/**
+	* Acquire a PTable from a legacy `PTableDef` + column specs map.
+	* Lowers the input via WASM-spec and stores the resulting
+	* `{ tableSpec, dataQuery }` shape. Returns the lowered def
+	* alongside the pool entry.
+	*/
+	acquireFromLegacy(opts) {
+		const def = buildFullPTableDefFromLegacy(opts);
+		return {
+			def,
+			entry: this.acquire(def)
 		};
-		case "inlineColumn": return {
-			type: "inlineColumn",
-			newId: entry.column.id,
-			spec: entry.column.spec,
-			dataInfo: {
-				type: "Json",
-				keyLength: entry.column.spec.axesSpec.length,
-				data: entry.column.data.reduce((acc, row) => {
-					acc[JSON.stringify(row.key)] = row.val;
-					return acc;
-				}, {})
-			}
-		};
-		case "inner":
-		case "full": return {
-			type: entry.type,
-			entries: entry.entries.map((col) => joinEntryToInternal(col))
-		};
-		case "outer": return {
-			type: "outer",
-			primary: joinEntryToInternal(entry.primary),
-			secondary: entry.secondary.map((col) => joinEntryToInternal(col))
-		};
-		default: throw new PFrameDriverError(`unsupported PFrame join entry type: ${type}`);
 	}
-}
+};
 //#endregion
 export { PTablePool };
 

package/dist/ptable_pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_pool.js","names":[],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableHandle,\n  type JoinEntry,\n  type JsonSerializable,\n  type PColumnValue,\n  type PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  FullPTableDefV1,\n  FullPTableDefV2,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    switch (params.type) {\n      case \"v1\":\n        return this.createNewResourceV1(params, key);\n      case \"v2\":\n        return this.createNewResourceV2(params, key);\n      default:\n        // @ts-expect-error `params.type` is a string, but we want to make sure all cases are handled\n        throw new PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);\n    }\n  }\n\n  protected createNewResourceV1(params: FullPTableDefV1, key: PTableHandle): PTableHolder {\n    const { def, pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    // 3. Sort\n    if (def.sorting.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          sorting: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const sortedTable = pTablePromise.then((pTable) => pTable.sort(key, def.sorting));\n      return new PTableHolder(pFrameHandle, combinedSignal, sortedTable, predecessor);\n    }\n\n    // 2. Filter (except the case with artificial columns where cartesian creates too many rows)\n    if (!hasArtificialColumns(def.src) && def.filters.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          filters: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const filteredTable = pTablePromise.then((pTable) => pTable.filter(key, def.filters));\n      return new PTableHolder(pFrameHandle, combinedSignal, filteredTable, predecessor);\n    }\n\n    // 1. Join\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTable(key, {\n        src: joinEntryToInternal(def.src),\n        // `def.filters` would be non-empty only when join has artificial columns\n        filters: [...def.partitionFilters, ...def.filters],\n      }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  protected createNewResourceV2(params: FullPTableDefV2, key: PTableHandle): PTableHolder {\n    const { pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const table = pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def));\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction hasArtificialColumns<T>(entry: JoinEntry<T>): boolean {\n  switch (entry.type) {\n    case \"column\":\n    case \"slicedColumn\":\n    case \"inlineColumn\":\n      return false;\n    case \"artificialColumn\":\n      return true;\n    case \"full\":\n    case \"inner\":\n      return entry.entries.some(hasArtificialColumns);\n    case \"outer\":\n      return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);\n    default:\n      assertNever(entry);\n  }\n}\n\nfunction joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntryV4 {\n  const type = entry.type;\n  switch (type) {\n    case \"column\":\n      return {\n        type: \"column\",\n        columnId: entry.column,\n      };\n    case \"slicedColumn\":\n      return {\n        type: \"slicedColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axisFilters: entry.axisFilters,\n      };\n    case \"artificialColumn\":\n      return {\n        type: \"artificialColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axesIndices: entry.axesIndices,\n      };\n    case \"inlineColumn\":\n      return {\n        type: \"inlineColumn\",\n        newId: entry.column.id,\n        spec: entry.column.spec,\n        dataInfo: {\n          type: \"Json\",\n          keyLength: entry.column.spec.axesSpec.length,\n          data: entry.column.data.reduce(\n            (acc, row) => {\n              acc[JSON.stringify(row.key)] = row.val;\n              return acc;\n            },\n            {} as Record<string, PColumnValue>,\n          ),\n        },\n      };\n    case \"inner\":\n    case \"full\":\n      return {\n        type: entry.type,\n        entries: entry.entries.map((col) => joinEntryToInternal(col)),\n      };\n    case \"outer\":\n      return {\n        type: \"outer\",\n        primary: joinEntryToInternal(entry.primary),\n        secondary: entry.secondary.map((col) => joinEntryToInternal(col)),\n      };\n    default:\n      throw new PFrameDriverError(`unsupported PFrame join entry type: ${type satisfies never}`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"ptable_pool.js","names":[],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableDef,\n  type PTableHandle,\n  type JsonSerializable,\n  type PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  buildFullPTableDefFromLegacy,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    const { pFrameHandle } = params;\n    const { pFrameDataPromise: pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const { tableSpec, dataQuery } = params;\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTableV2(key, { tableSpec, dataQuery }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n\n  /**\n   * Acquire a PTable from a legacy `PTableDef` + column specs map.\n   * Lowers the input via WASM-spec and stores the resulting\n   * `{ tableSpec, dataQuery }` shape. Returns the lowered def\n   * alongside the pool entry.\n   */\n  public acquireFromLegacy(opts: {\n    pFrameHandle: PFrameHandle;\n    def: PTableDef<PObjectId>;\n    pFrameSpec: PFrameInternal.PFrameWasmV3;\n  }): { def: FullPTableDef; entry: PoolEntry<PTableHandle, PTableHolder> } {\n    const def = buildFullPTableDefFromLegacy(opts);\n    return { def, entry: this.acquire(def) };\n  }\n}\n"],"mappings":";;;;;AAoBA,IAAa,eAAb,MAAgD;CAC9C,kBAAmC,IAAI,iBAAiB;CACxD;CAEA,YACE,QACA,qBACA,eACA,aACA;AAJgB,OAAA,SAAA;AAEA,OAAA,gBAAA;AACC,OAAA,cAAA;AAEjB,OAAK,wBAAwB,YAAY,IAAI,CAC3C,qBACA,KAAK,gBAAgB,OACtB,CAAC;;CAGJ,IAAW,gBAA6B;AACtC,SAAO,KAAK;;CAGd,CAAC,OAAO,WAAiB;AACvB,OAAK,gBAAgB,OAAO;AAC5B,OAAK,aAAa,OAAO;AACpB,OAAK,cACP,MAAM,WAAW,OAAO,SAAS,CAAC,CAClC,YAAY,GAEX;;;AAIR,IAAa,aAAb,cAAoE,iBAIlE;CACA,YACE,SACA,YACA,QACA;AACA,SAAO;AAJU,OAAA,UAAA;AACA,OAAA,aAAA;AACA,OAAA,SAAA;;CAKnB,mBAA6B,QAAqC;AAChE,SAAO,2BAA2B,OAAO;;CAG3C,kBAA4B,QAAuB,KAAiC;AAClF,MAAI,YAAY,CACd,MAAK,OACH,QACA,mCAAmC,IAAI,KAAU,KAAK,UAAU,QAAQ,eAAe,GACxF;EAGH,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,mBAAmB,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE/F,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;EAC3D,MAAM,iBAAiB,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;EAE5F,MAAM,EAAE,WAAW,cAAc;AAIjC,SAAO,IAAI,aAAa,cAAc,gBAHxB,cAAc,MAAM,WAChC,OAAO,cAAc,KAAK;GAAE;GAAW;GAAW,CAAC,CACpD,CAC2D;;CAG9D,SAAgB,KAAiC;EAC/C,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAI,kBAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,sBAAsB,IAAI,YAAY;AAC9D,SAAM;;AAER,SAAO;;;;;;;;CAST,kBAAyB,MAIgD;EACvE,MAAM,MAAM,6BAA6B,KAAK;AAC9C,SAAO;GAAE;GAAK,OAAO,KAAK,QAAQ,IAAI;GAAE"}

package/dist/ptable_shared.cjs

@@ -4,7 +4,33 @@ let _milaboratories_pl_model_middle_layer = require("@milaboratories/pl-model-mi
 function stableKeyFromFullPTableDef(data) {
 	return (0, _milaboratories_pl_model_middle_layer.hashJson)(data);
 }
+/**
+* Lower a legacy `PTableDef<PObjectId>` to the data layer. Returns
+* the output `tableSpec` and the lowered `dataQuery`. Routes through
+* `rewriteLegacyQuery` + `evaluateQuery` on the caller-supplied
+* WASM-spec frame.
+*/
+function lowerLegacyPTableDef(pFrameSpec, legacyDef) {
+	const legacy = {
+		src: legacyDef.src,
+		filters: [...legacyDef.partitionFilters, ...legacyDef.filters],
+		sorting: legacyDef.sorting
+	};
+	return pFrameSpec.evaluateQuery(pFrameSpec.rewriteLegacyQuery(legacy));
+}
+/**
+* Build a `FullPTableDef` from a legacy `PTableDef` plus the
+* PFrame's WASM-spec frame. Used by pool `acquireFromLegacy` methods
+* to keep lowering off the call site.
+*/
+function buildFullPTableDefFromLegacy(opts) {
+	return {
+		pFrameHandle: opts.pFrameHandle,
+		...lowerLegacyPTableDef(opts.pFrameSpec, opts.def)
+	};
+}
 //#endregion
+exports.buildFullPTableDefFromLegacy = buildFullPTableDefFromLegacy;
 exports.stableKeyFromFullPTableDef = stableKeyFromFullPTableDef;
 
 //# sourceMappingURL=ptable_shared.cjs.map

package/dist/ptable_shared.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_shared.cjs","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  PObjectId,\n  PFrameHandle,\n  PTableDef,\n  PTableHandle,\n  DataQuery,\n  PTableColumnSpec,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson } from \"@milaboratories/pl-model-middle-layer\";\n\nexport type FullPTableDefV1 = {\n  type: \"v1\";\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n};\n\nexport type FullPTableDefV2 = {\n  type: \"v2\";\n  pFrameHandle: PFrameHandle;\n  def: {\n    tableSpec: PTableColumnSpec[];\n    dataQuery: DataQuery;\n  };\n};\n\nexport type FullPTableDef = FullPTableDefV1 | FullPTableDefV2;\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n"],"mappings":";;;AA2BA,SAAgB,2BAA2B,MAAmC;AAC5E,SAAA,GAAA,sCAAA,UAAgB,KAAK"}
+{"version":3,"file":"ptable_shared.cjs","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  DataQuery,\n  PFrameHandle,\n  PObjectId,\n  PTableColumnSpec,\n  PTableDef,\n  PTableHandle,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson, PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\n\n/**\n * PTable definition stored in the def / table pools. Always\n * carries a pre-lowered data query plus the corresponding output\n * `tableSpec`. Legacy `PTableDef<PObjectId>` inputs are lowered to\n * this shape via WASM-spec at acquire time.\n */\nexport type FullPTableDef = {\n  pFrameHandle: PFrameHandle;\n  tableSpec: PTableColumnSpec[];\n  dataQuery: DataQuery;\n};\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n\n/**\n * Lower a legacy `PTableDef<PObjectId>` to the data layer. Returns\n * the output `tableSpec` and the lowered `dataQuery`. Routes through\n * `rewriteLegacyQuery` + `evaluateQuery` on the caller-supplied\n * WASM-spec frame.\n */\nexport function lowerLegacyPTableDef(\n  pFrameSpec: PFrameInternal.PFrameWasmV3,\n  legacyDef: PTableDef<PObjectId>,\n): { tableSpec: PTableColumnSpec[]; dataQuery: DataQuery } {\n  const legacy: PFrameInternal.LegacyQuery = {\n    src: legacyDef.src,\n    filters: [...legacyDef.partitionFilters, ...legacyDef.filters],\n    sorting: legacyDef.sorting,\n  };\n  return pFrameSpec.evaluateQuery(pFrameSpec.rewriteLegacyQuery(legacy));\n}\n\n/**\n * Build a `FullPTableDef` from a legacy `PTableDef` plus the\n * PFrame's WASM-spec frame. Used by pool `acquireFromLegacy` methods\n * to keep lowering off the call site.\n */\nexport function buildFullPTableDefFromLegacy(opts: {\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n  pFrameSpec: PFrameInternal.PFrameWasmV3;\n}): FullPTableDef {\n  return {\n    pFrameHandle: opts.pFrameHandle,\n    ...lowerLegacyPTableDef(opts.pFrameSpec, opts.def),\n  };\n}\n"],"mappings":";;;AAsBA,SAAgB,2BAA2B,MAAmC;AAC5E,SAAA,GAAA,sCAAA,UAAgB,KAAK;;;;;;;;AASvB,SAAgB,qBACd,YACA,WACyD;CACzD,MAAM,SAAqC;EACzC,KAAK,UAAU;EACf,SAAS,CAAC,GAAG,UAAU,kBAAkB,GAAG,UAAU,QAAQ;EAC9D,SAAS,UAAU;EACpB;AACD,QAAO,WAAW,cAAc,WAAW,mBAAmB,OAAO,CAAC;;;;;;;AAQxE,SAAgB,6BAA6B,MAI3B;AAChB,QAAO;EACL,cAAc,KAAK;EACnB,GAAG,qBAAqB,KAAK,YAAY,KAAK,IAAI;EACnD"}

package/dist/ptable_shared.d.ts

@@ -1 +1,2 @@
-import { PFrameHandle, PObjectId, PTableColumnSpec, PTableDef, PTableHandle } from "@milaboratories/pl-model-common";
+import { PFrameHandle, PObjectId, PTableColumnSpec, PTableDef, PTableHandle } from "@milaboratories/pl-model-common";
+import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";

package/dist/ptable_shared.js

@@ -3,7 +3,32 @@ import { hashJson } from "@milaboratories/pl-model-middle-layer";
 function stableKeyFromFullPTableDef(data) {
 	return hashJson(data);
 }
+/**
+* Lower a legacy `PTableDef<PObjectId>` to the data layer. Returns
+* the output `tableSpec` and the lowered `dataQuery`. Routes through
+* `rewriteLegacyQuery` + `evaluateQuery` on the caller-supplied
+* WASM-spec frame.
+*/
+function lowerLegacyPTableDef(pFrameSpec, legacyDef) {
+	const legacy = {
+		src: legacyDef.src,
+		filters: [...legacyDef.partitionFilters, ...legacyDef.filters],
+		sorting: legacyDef.sorting
+	};
+	return pFrameSpec.evaluateQuery(pFrameSpec.rewriteLegacyQuery(legacy));
+}
+/**
+* Build a `FullPTableDef` from a legacy `PTableDef` plus the
+* PFrame's WASM-spec frame. Used by pool `acquireFromLegacy` methods
+* to keep lowering off the call site.
+*/
+function buildFullPTableDefFromLegacy(opts) {
+	return {
+		pFrameHandle: opts.pFrameHandle,
+		...lowerLegacyPTableDef(opts.pFrameSpec, opts.def)
+	};
+}
 //#endregion
-export { stableKeyFromFullPTableDef };
+export { buildFullPTableDefFromLegacy, stableKeyFromFullPTableDef };
 
 //# sourceMappingURL=ptable_shared.js.map

package/dist/ptable_shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_shared.js","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  PObjectId,\n  PFrameHandle,\n  PTableDef,\n  PTableHandle,\n  DataQuery,\n  PTableColumnSpec,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson } from \"@milaboratories/pl-model-middle-layer\";\n\nexport type FullPTableDefV1 = {\n  type: \"v1\";\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n};\n\nexport type FullPTableDefV2 = {\n  type: \"v2\";\n  pFrameHandle: PFrameHandle;\n  def: {\n    tableSpec: PTableColumnSpec[];\n    dataQuery: DataQuery;\n  };\n};\n\nexport type FullPTableDef = FullPTableDefV1 | FullPTableDefV2;\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n"],"mappings":";;AA2BA,SAAgB,2BAA2B,MAAmC;AAC5E,QAAO,SAAS,KAAK"}
+{"version":3,"file":"ptable_shared.js","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  DataQuery,\n  PFrameHandle,\n  PObjectId,\n  PTableColumnSpec,\n  PTableDef,\n  PTableHandle,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson, PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\n\n/**\n * PTable definition stored in the def / table pools. Always\n * carries a pre-lowered data query plus the corresponding output\n * `tableSpec`. Legacy `PTableDef<PObjectId>` inputs are lowered to\n * this shape via WASM-spec at acquire time.\n */\nexport type FullPTableDef = {\n  pFrameHandle: PFrameHandle;\n  tableSpec: PTableColumnSpec[];\n  dataQuery: DataQuery;\n};\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n\n/**\n * Lower a legacy `PTableDef<PObjectId>` to the data layer. Returns\n * the output `tableSpec` and the lowered `dataQuery`. Routes through\n * `rewriteLegacyQuery` + `evaluateQuery` on the caller-supplied\n * WASM-spec frame.\n */\nexport function lowerLegacyPTableDef(\n  pFrameSpec: PFrameInternal.PFrameWasmV3,\n  legacyDef: PTableDef<PObjectId>,\n): { tableSpec: PTableColumnSpec[]; dataQuery: DataQuery } {\n  const legacy: PFrameInternal.LegacyQuery = {\n    src: legacyDef.src,\n    filters: [...legacyDef.partitionFilters, ...legacyDef.filters],\n    sorting: legacyDef.sorting,\n  };\n  return pFrameSpec.evaluateQuery(pFrameSpec.rewriteLegacyQuery(legacy));\n}\n\n/**\n * Build a `FullPTableDef` from a legacy `PTableDef` plus the\n * PFrame's WASM-spec frame. Used by pool `acquireFromLegacy` methods\n * to keep lowering off the call site.\n */\nexport function buildFullPTableDefFromLegacy(opts: {\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n  pFrameSpec: PFrameInternal.PFrameWasmV3;\n}): FullPTableDef {\n  return {\n    pFrameHandle: opts.pFrameHandle,\n    ...lowerLegacyPTableDef(opts.pFrameSpec, opts.def),\n  };\n}\n"],"mappings":";;AAsBA,SAAgB,2BAA2B,MAAmC;AAC5E,QAAO,SAAS,KAAK;;;;;;;;AASvB,SAAgB,qBACd,YACA,WACyD;CACzD,MAAM,SAAqC;EACzC,KAAK,UAAU;EACf,SAAS,CAAC,GAAG,UAAU,kBAAkB,GAAG,UAAU,QAAQ;EAC9D,SAAS,UAAU;EACpB;AACD,QAAO,WAAW,cAAc,WAAW,mBAAmB,OAAO,CAAC;;;;;;;AAQxE,SAAgB,6BAA6B,MAI3B;AAChB,QAAO;EACL,cAAc,KAAK;EACnB,GAAG,qBAAqB,KAAK,YAAY,KAAK,IAAI;EACnD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pf-driver",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "description": "PFrameDriver implementation abstracted from Middle Layer",
   "keywords": [],
   "license": "UNLICENSED",
@@ -26,8 +26,8 @@
     "lru-cache": "^11.2.2",
     "@milaboratories/helpers": "1.14.2",
     "@milaboratories/pl-model-common": "1.42.0",
-    "@milaboratories/ts-helpers": "1.8.2",
-    "@milaboratories/pl-model-middle-layer": "1.20.0"
+    "@milaboratories/pl-model-middle-layer": "1.21.0",
+    "@milaboratories/ts-helpers": "1.8.2"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",
@@ -35,9 +35,9 @@
     "fast-csv": "5.0.5",
     "typescript": "~5.9.3",
     "vitest": "^4.1.3",
-    "@milaboratories/ts-builder": "1.5.0",
+    "@milaboratories/ts-configs": "1.2.3",
     "@milaboratories/build-configs": "2.0.0",
-    "@milaboratories/ts-configs": "1.2.3"
+    "@milaboratories/ts-builder": "1.5.0"
   },
   "engines": {
     "node": ">=22.19.0"