@milaboratories/pf-driver 1.3.2 → 1.3.3

package/dist/driver_decl.d.ts

@@ -1,5 +1,5 @@
 import { CalculateTableDataRequest, CalculateTableDataResponse, PColumn, PFrameDef, PFrameDriver, PFrameHandle, PObjectId, PTableDef, PTableDefV2, PTableHandle, PTableShape, PTableVector, TableRange, UniqueValuesRequest, UniqueValuesResponse } from "@milaboratories/pl-model-common";
-import { PoolEntry } from "@milaboratories/ts-helpers";
+import { PoolEntry } from "@milaboratories/helpers";
 
 //#region src/driver_decl.d.ts
 /**

package/dist/driver_double.cjs

@@ -2,7 +2,7 @@ const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
 const require_driver_impl = require('./driver_impl.cjs');
 const require_data_info_helpers = require('./data_info_helpers.cjs');
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
-let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 let _milaboratories_pframes_rs_node = require("@milaboratories/pframes-rs-node");
 let node_os = require("node:os");
 let _milaboratories_pl_model_middle_layer = require("@milaboratories/pl-model-middle-layer");
@@ -23,7 +23,7 @@ function makeFolderPath(dataFolder) {
 function makeBlobId(res) {
 	return res;
 }
-var LocalBlobProviderImpl = class extends _milaboratories_ts_helpers.RefCountPoolBase {
+var LocalBlobProviderImpl = class extends _milaboratories_helpers.RefCountPoolBase {
 	constructor(dataFolder) {
 		super();
 		this.dataFolder = dataFolder;

package/dist/driver_double.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"driver_double.cjs","names":["fs","PFrameDriverError","RefCountPoolBase","path","HttpHelpers","PFrameInternal","makeJsonDataInfo","AbstractPFrameDriver"],"sources":["../src/driver_double.ts"],"sourcesContent":["import {\n  isDataInfo,\n  PFrameDriverError,\n  type Branded,\n  type PColumnSpec,\n  type PColumnValues,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { HttpHelpers } from \"@milaboratories/pframes-rs-node\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport {\n  AbstractPFrameDriver,\n  type LocalBlobProvider,\n  type RemoteBlobProvider,\n} from \"./driver_impl\";\nimport { makeJsonDataInfo } from \"./data_info_helpers\";\n\nexport type FileName = Branded<string, \"FileName\">;\nexport type FilePath = Branded<string, \"FilePath\">;\nexport type FolderPath = Branded<string, \"FolderPath\">;\n\nexport function makeFolderPath(dataFolder: string): FolderPath {\n  if (!fs.statSync(dataFolder, { throwIfNoEntry: false })?.isDirectory()) {\n    const error = new PFrameDriverError(`Invalid data folder`);\n    error.cause = new Error(`Folder ${dataFolder} does not exist`);\n    throw error;\n  }\n  return dataFolder as FolderPath;\n}\n\nfunction makeBlobId(res: FileName): PFrameInternal.PFrameBlobId {\n  return res as string as PFrameInternal.PFrameBlobId;\n}\n\nclass LocalBlobProviderImpl\n  extends RefCountPoolBase<FileName, PFrameInternal.PFrameBlobId, FilePath>\n  implements LocalBlobProvider<FileName>\n{\n  constructor(private readonly dataFolder: FolderPath) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FileName): PFrameInternal.PFrameBlobId {\n    return makeBlobId(params);\n  }\n\n  protected createNewResource(params: FileName, _key: PFrameInternal.PFrameBlobId): FilePath {\n    const filePath = path.join(this.dataFolder, params);\n    if (!fs.statSync(filePath, { throwIfNoEntry: false })?.isFile()) {\n      const error = new PFrameDriverError(`Invalid file name`);\n      error.cause = new Error(`File ${filePath} does not exist`);\n      throw error;\n    }\n    return filePath as FilePath;\n  }\n\n  public getByKey(blobId: PFrameInternal.PFrameBlobId): FilePath {\n    const resource = super.tryGetByKey(blobId);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid blob id`);\n      error.cause = new Error(`Blob with id ${blobId} not found.`);\n      throw error;\n    }\n    return resource;\n  }\n\n  public makeDataSource(\n    signal: AbortSignal,\n  ): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\"> {\n    return {\n      preloadBlob: async (_blobIds: PFrameInternal.PFrameBlobId[]) => {},\n      resolveBlobContent: async (blobId: PFrameInternal.PFrameBlobId) => {\n        const filePath = this.getByKey(blobId);\n        return await fs.promises.readFile(filePath, { signal });\n      },\n    };\n  }\n}\n\nclass RemoteBlobProviderImpl implements RemoteBlobProvider<FileName> {\n  constructor(\n    private readonly pool: LocalBlobProviderImpl,\n    private readonly server: PFrameInternal.HttpServer,\n  ) {}\n\n  public static async init(\n    dataFolder: FolderPath,\n    logger: PFrameInternal.Logger,\n    serverOptions: Omit<PFrameInternal.HttpServerOptions, \"handler\">,\n  ): Promise<RemoteBlobProviderImpl> {\n    const pool = new LocalBlobProviderImpl(dataFolder);\n\n    const underlyingStore = await HttpHelpers.createFsStore({ rootDir: dataFolder, logger });\n    const store: PFrameInternal.ObjectStore = {\n      request: (filename, params) => {\n        const blobId = filename.slice(0, -PFrameInternal.ParquetExtension.length);\n        return underlyingStore.request(blobId as PFrameInternal.ParquetFileName, params);\n      },\n    };\n\n    const handler = HttpHelpers.createRequestHandler({ store });\n    const server = await HttpHelpers.createHttpServer({ ...serverOptions, handler });\n\n    return new RemoteBlobProviderImpl(pool, server);\n  }\n\n  public acquire(params: FileName): PoolEntry<PFrameInternal.PFrameBlobId> {\n    return this.pool.acquire(params);\n  }\n\n  public httpServerInfo(): PFrameInternal.HttpServerInfo {\n    return this.server.info;\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    await this.server.stop();\n    await this.pool[Symbol.asyncDispose]();\n  }\n}\n\nexport type InternalPFrameDriverDouble = AbstractInternalPFrameDriver<\n  PFrameInternal.DataInfo<FileName> | PColumnValues\n>;\n\n// It's mock for testing purposes, not a real test!\nexport async function createPFrameDriverDouble({\n  dataFolder = tmpdir() as FolderPath,\n  logger = console.log,\n}: {\n  dataFolder?: FolderPath;\n  logger?: PFrameInternal.Logger;\n}): Promise<InternalPFrameDriverDouble> {\n  const localBlobProvider = new LocalBlobProviderImpl(dataFolder);\n  const remoteBlobProvider = await RemoteBlobProviderImpl.init(dataFolder, logger, {});\n\n  const resolveDataInfo = (\n    spec: PColumnSpec,\n    data: PFrameInternal.DataInfo<FileName> | PColumnValues,\n  ) => (isDataInfo(data) ? data : makeJsonDataInfo(spec, data));\n\n  return new AbstractPFrameDriver({\n    logger,\n    localBlobProvider,\n    remoteBlobProvider,\n    resolveDataInfo,\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;AAyBA,SAAgB,eAAe,YAAgC;AAC7D,KAAI,CAACA,gBAAG,SAAS,YAAY,EAAE,gBAAgB,OAAO,CAAC,EAAE,aAAa,EAAE;EACtE,MAAM,QAAQ,IAAIC,kDAAkB,sBAAsB;AAC1D,QAAM,wBAAQ,IAAI,MAAM,UAAU,WAAW,iBAAiB;AAC9D,QAAM;;AAER,QAAO;;AAGT,SAAS,WAAW,KAA4C;AAC9D,QAAO;;AAGT,IAAM,wBAAN,cACUC,4CAEV;CACE,YAAY,AAAiB,YAAwB;AACnD,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAA+C;AAC1E,SAAO,WAAW,OAAO;;CAG3B,AAAU,kBAAkB,QAAkB,MAA6C;EACzF,MAAM,WAAWC,kBAAK,KAAK,KAAK,YAAY,OAAO;AACnD,MAAI,CAACH,gBAAG,SAAS,UAAU,EAAE,gBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE;GAC/D,MAAM,QAAQ,IAAIC,kDAAkB,oBAAoB;AACxD,SAAM,wBAAQ,IAAI,MAAM,QAAQ,SAAS,iBAAiB;AAC1D,SAAM;;AAER,SAAO;;CAGT,AAAO,SAAS,QAA+C;EAC7D,MAAM,WAAW,MAAM,YAAY,OAAO;AAC1C,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIA,kDAAkB,kBAAkB;AACtD,SAAM,wBAAQ,IAAI,MAAM,gBAAgB,OAAO,aAAa;AAC5D,SAAM;;AAER,SAAO;;CAGT,AAAO,eACL,QAC0D;AAC1D,SAAO;GACL,aAAa,OAAO,aAA4C;GAChE,oBAAoB,OAAO,WAAwC;IACjE,MAAM,WAAW,KAAK,SAAS,OAAO;AACtC,WAAO,MAAMD,gBAAG,SAAS,SAAS,UAAU,EAAE,QAAQ,CAAC;;GAE1D;;;AAIL,IAAM,yBAAN,MAAM,uBAA+D;CACnE,YACE,AAAiB,MACjB,AAAiB,QACjB;EAFiB;EACA;;CAGnB,aAAoB,KAClB,YACA,QACA,eACiC;EACjC,MAAM,OAAO,IAAI,sBAAsB,WAAW;EAElD,MAAM,kBAAkB,MAAMI,4CAAY,cAAc;GAAE,SAAS;GAAY;GAAQ,CAAC;EAQxF,MAAM,UAAUA,4CAAY,qBAAqB,EAAE,OAPT,EACxC,UAAU,UAAU,WAAW;GAC7B,MAAM,SAAS,SAAS,MAAM,GAAG,CAACC,qDAAe,iBAAiB,OAAO;AACzE,UAAO,gBAAgB,QAAQ,QAA0C,OAAO;KAEnF,EAEyD,CAAC;AAG3D,SAAO,IAAI,uBAAuB,MAFnB,MAAMD,4CAAY,iBAAiB;GAAE,GAAG;GAAe;GAAS,CAAC,CAEjC;;CAGjD,AAAO,QAAQ,QAA0D;AACvE,SAAO,KAAK,KAAK,QAAQ,OAAO;;CAGlC,AAAO,iBAAgD;AACrD,SAAO,KAAK,OAAO;;CAGrB,OAAO,OAAO,gBAA+B;AAC3C,QAAM,KAAK,OAAO,MAAM;AACxB,QAAM,KAAK,KAAK,OAAO,eAAe;;;AAS1C,eAAsB,yBAAyB,EAC7C,kCAAqB,EACrB,SAAS,QAAQ,OAIqB;CACtC,MAAM,oBAAoB,IAAI,sBAAsB,WAAW;CAC/D,MAAM,qBAAqB,MAAM,uBAAuB,KAAK,YAAY,QAAQ,EAAE,CAAC;CAEpF,MAAM,mBACJ,MACA,yDACe,KAAK,GAAG,OAAOE,2CAAiB,MAAM,KAAK;AAE5D,QAAO,IAAIC,yCAAqB;EAC9B;EACA;EACA;EACA;EACD,CAAC"}
+{"version":3,"file":"driver_double.cjs","names":["fs","PFrameDriverError","RefCountPoolBase","path","HttpHelpers","PFrameInternal","makeJsonDataInfo","AbstractPFrameDriver"],"sources":["../src/driver_double.ts"],"sourcesContent":["import {\n  isDataInfo,\n  PFrameDriverError,\n  type Branded,\n  type PColumnSpec,\n  type PColumnValues,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { HttpHelpers } from \"@milaboratories/pframes-rs-node\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport {\n  AbstractPFrameDriver,\n  type LocalBlobProvider,\n  type RemoteBlobProvider,\n} from \"./driver_impl\";\nimport { makeJsonDataInfo } from \"./data_info_helpers\";\n\nexport type FileName = Branded<string, \"FileName\">;\nexport type FilePath = Branded<string, \"FilePath\">;\nexport type FolderPath = Branded<string, \"FolderPath\">;\n\nexport function makeFolderPath(dataFolder: string): FolderPath {\n  if (!fs.statSync(dataFolder, { throwIfNoEntry: false })?.isDirectory()) {\n    const error = new PFrameDriverError(`Invalid data folder`);\n    error.cause = new Error(`Folder ${dataFolder} does not exist`);\n    throw error;\n  }\n  return dataFolder as FolderPath;\n}\n\nfunction makeBlobId(res: FileName): PFrameInternal.PFrameBlobId {\n  return res as string as PFrameInternal.PFrameBlobId;\n}\n\nclass LocalBlobProviderImpl\n  extends RefCountPoolBase<FileName, PFrameInternal.PFrameBlobId, FilePath>\n  implements LocalBlobProvider<FileName>\n{\n  constructor(private readonly dataFolder: FolderPath) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FileName): PFrameInternal.PFrameBlobId {\n    return makeBlobId(params);\n  }\n\n  protected createNewResource(params: FileName, _key: PFrameInternal.PFrameBlobId): FilePath {\n    const filePath = path.join(this.dataFolder, params);\n    if (!fs.statSync(filePath, { throwIfNoEntry: false })?.isFile()) {\n      const error = new PFrameDriverError(`Invalid file name`);\n      error.cause = new Error(`File ${filePath} does not exist`);\n      throw error;\n    }\n    return filePath as FilePath;\n  }\n\n  public getByKey(blobId: PFrameInternal.PFrameBlobId): FilePath {\n    const resource = super.tryGetByKey(blobId);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid blob id`);\n      error.cause = new Error(`Blob with id ${blobId} not found.`);\n      throw error;\n    }\n    return resource;\n  }\n\n  public makeDataSource(\n    signal: AbortSignal,\n  ): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\"> {\n    return {\n      preloadBlob: async (_blobIds: PFrameInternal.PFrameBlobId[]) => {},\n      resolveBlobContent: async (blobId: PFrameInternal.PFrameBlobId) => {\n        const filePath = this.getByKey(blobId);\n        return await fs.promises.readFile(filePath, { signal });\n      },\n    };\n  }\n}\n\nclass RemoteBlobProviderImpl implements RemoteBlobProvider<FileName> {\n  constructor(\n    private readonly pool: LocalBlobProviderImpl,\n    private readonly server: PFrameInternal.HttpServer,\n  ) {}\n\n  public static async init(\n    dataFolder: FolderPath,\n    logger: PFrameInternal.Logger,\n    serverOptions: Omit<PFrameInternal.HttpServerOptions, \"handler\">,\n  ): Promise<RemoteBlobProviderImpl> {\n    const pool = new LocalBlobProviderImpl(dataFolder);\n\n    const underlyingStore = await HttpHelpers.createFsStore({ rootDir: dataFolder, logger });\n    const store: PFrameInternal.ObjectStore = {\n      request: (filename, params) => {\n        const blobId = filename.slice(0, -PFrameInternal.ParquetExtension.length);\n        return underlyingStore.request(blobId as PFrameInternal.ParquetFileName, params);\n      },\n    };\n\n    const handler = HttpHelpers.createRequestHandler({ store });\n    const server = await HttpHelpers.createHttpServer({ ...serverOptions, handler });\n\n    return new RemoteBlobProviderImpl(pool, server);\n  }\n\n  public acquire(params: FileName): PoolEntry<PFrameInternal.PFrameBlobId> {\n    return this.pool.acquire(params);\n  }\n\n  public httpServerInfo(): PFrameInternal.HttpServerInfo {\n    return this.server.info;\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    await this.server.stop();\n    await this.pool[Symbol.asyncDispose]();\n  }\n}\n\nexport type InternalPFrameDriverDouble = AbstractInternalPFrameDriver<\n  PFrameInternal.DataInfo<FileName> | PColumnValues\n>;\n\n// It's mock for testing purposes, not a real test!\nexport async function createPFrameDriverDouble({\n  dataFolder = tmpdir() as FolderPath,\n  logger = console.log,\n}: {\n  dataFolder?: FolderPath;\n  logger?: PFrameInternal.Logger;\n}): Promise<InternalPFrameDriverDouble> {\n  const localBlobProvider = new LocalBlobProviderImpl(dataFolder);\n  const remoteBlobProvider = await RemoteBlobProviderImpl.init(dataFolder, logger, {});\n\n  const resolveDataInfo = (\n    spec: PColumnSpec,\n    data: PFrameInternal.DataInfo<FileName> | PColumnValues,\n  ) => (isDataInfo(data) ? data : makeJsonDataInfo(spec, data));\n\n  return new AbstractPFrameDriver({\n    logger,\n    localBlobProvider,\n    remoteBlobProvider,\n    resolveDataInfo,\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;AAyBA,SAAgB,eAAe,YAAgC;AAC7D,KAAI,CAACA,gBAAG,SAAS,YAAY,EAAE,gBAAgB,OAAO,CAAC,EAAE,aAAa,EAAE;EACtE,MAAM,QAAQ,IAAIC,kDAAkB,sBAAsB;AAC1D,QAAM,wBAAQ,IAAI,MAAM,UAAU,WAAW,iBAAiB;AAC9D,QAAM;;AAER,QAAO;;AAGT,SAAS,WAAW,KAA4C;AAC9D,QAAO;;AAGT,IAAM,wBAAN,cACUC,yCAEV;CACE,YAAY,AAAiB,YAAwB;AACnD,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAA+C;AAC1E,SAAO,WAAW,OAAO;;CAG3B,AAAU,kBAAkB,QAAkB,MAA6C;EACzF,MAAM,WAAWC,kBAAK,KAAK,KAAK,YAAY,OAAO;AACnD,MAAI,CAACH,gBAAG,SAAS,UAAU,EAAE,gBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE;GAC/D,MAAM,QAAQ,IAAIC,kDAAkB,oBAAoB;AACxD,SAAM,wBAAQ,IAAI,MAAM,QAAQ,SAAS,iBAAiB;AAC1D,SAAM;;AAER,SAAO;;CAGT,AAAO,SAAS,QAA+C;EAC7D,MAAM,WAAW,MAAM,YAAY,OAAO;AAC1C,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIA,kDAAkB,kBAAkB;AACtD,SAAM,wBAAQ,IAAI,MAAM,gBAAgB,OAAO,aAAa;AAC5D,SAAM;;AAER,SAAO;;CAGT,AAAO,eACL,QAC0D;AAC1D,SAAO;GACL,aAAa,OAAO,aAA4C;GAChE,oBAAoB,OAAO,WAAwC;IACjE,MAAM,WAAW,KAAK,SAAS,OAAO;AACtC,WAAO,MAAMD,gBAAG,SAAS,SAAS,UAAU,EAAE,QAAQ,CAAC;;GAE1D;;;AAIL,IAAM,yBAAN,MAAM,uBAA+D;CACnE,YACE,AAAiB,MACjB,AAAiB,QACjB;EAFiB;EACA;;CAGnB,aAAoB,KAClB,YACA,QACA,eACiC;EACjC,MAAM,OAAO,IAAI,sBAAsB,WAAW;EAElD,MAAM,kBAAkB,MAAMI,4CAAY,cAAc;GAAE,SAAS;GAAY;GAAQ,CAAC;EAQxF,MAAM,UAAUA,4CAAY,qBAAqB,EAAE,OAPT,EACxC,UAAU,UAAU,WAAW;GAC7B,MAAM,SAAS,SAAS,MAAM,GAAG,CAACC,qDAAe,iBAAiB,OAAO;AACzE,UAAO,gBAAgB,QAAQ,QAA0C,OAAO;KAEnF,EAEyD,CAAC;AAG3D,SAAO,IAAI,uBAAuB,MAFnB,MAAMD,4CAAY,iBAAiB;GAAE,GAAG;GAAe;GAAS,CAAC,CAEjC;;CAGjD,AAAO,QAAQ,QAA0D;AACvE,SAAO,KAAK,KAAK,QAAQ,OAAO;;CAGlC,AAAO,iBAAgD;AACrD,SAAO,KAAK,OAAO;;CAGrB,OAAO,OAAO,gBAA+B;AAC3C,QAAM,KAAK,OAAO,MAAM;AACxB,QAAM,KAAK,KAAK,OAAO,eAAe;;;AAS1C,eAAsB,yBAAyB,EAC7C,kCAAqB,EACrB,SAAS,QAAQ,OAIqB;CACtC,MAAM,oBAAoB,IAAI,sBAAsB,WAAW;CAC/D,MAAM,qBAAqB,MAAM,uBAAuB,KAAK,YAAY,QAAQ,EAAE,CAAC;CAEpF,MAAM,mBACJ,MACA,yDACe,KAAK,GAAG,OAAOE,2CAAiB,MAAM,KAAK;AAE5D,QAAO,IAAIC,yCAAqB;EAC9B;EACA;EACA;EACA;EACD,CAAC"}

package/dist/driver_double.js

@@ -1,7 +1,7 @@
 import { AbstractPFrameDriver } from "./driver_impl.js";
 import { makeJsonDataInfo } from "./data_info_helpers.js";
 import { PFrameDriverError, isDataInfo } from "@milaboratories/pl-model-common";
-import { RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase } from "@milaboratories/helpers";
 import { HttpHelpers } from "@milaboratories/pframes-rs-node";
 import { tmpdir } from "node:os";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";

package/dist/driver_double.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver_double.js","names":[],"sources":["../src/driver_double.ts"],"sourcesContent":["import {\n  isDataInfo,\n  PFrameDriverError,\n  type Branded,\n  type PColumnSpec,\n  type PColumnValues,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { HttpHelpers } from \"@milaboratories/pframes-rs-node\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport {\n  AbstractPFrameDriver,\n  type LocalBlobProvider,\n  type RemoteBlobProvider,\n} from \"./driver_impl\";\nimport { makeJsonDataInfo } from \"./data_info_helpers\";\n\nexport type FileName = Branded<string, \"FileName\">;\nexport type FilePath = Branded<string, \"FilePath\">;\nexport type FolderPath = Branded<string, \"FolderPath\">;\n\nexport function makeFolderPath(dataFolder: string): FolderPath {\n  if (!fs.statSync(dataFolder, { throwIfNoEntry: false })?.isDirectory()) {\n    const error = new PFrameDriverError(`Invalid data folder`);\n    error.cause = new Error(`Folder ${dataFolder} does not exist`);\n    throw error;\n  }\n  return dataFolder as FolderPath;\n}\n\nfunction makeBlobId(res: FileName): PFrameInternal.PFrameBlobId {\n  return res as string as PFrameInternal.PFrameBlobId;\n}\n\nclass LocalBlobProviderImpl\n  extends RefCountPoolBase<FileName, PFrameInternal.PFrameBlobId, FilePath>\n  implements LocalBlobProvider<FileName>\n{\n  constructor(private readonly dataFolder: FolderPath) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FileName): PFrameInternal.PFrameBlobId {\n    return makeBlobId(params);\n  }\n\n  protected createNewResource(params: FileName, _key: PFrameInternal.PFrameBlobId): FilePath {\n    const filePath = path.join(this.dataFolder, params);\n    if (!fs.statSync(filePath, { throwIfNoEntry: false })?.isFile()) {\n      const error = new PFrameDriverError(`Invalid file name`);\n      error.cause = new Error(`File ${filePath} does not exist`);\n      throw error;\n    }\n    return filePath as FilePath;\n  }\n\n  public getByKey(blobId: PFrameInternal.PFrameBlobId): FilePath {\n    const resource = super.tryGetByKey(blobId);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid blob id`);\n      error.cause = new Error(`Blob with id ${blobId} not found.`);\n      throw error;\n    }\n    return resource;\n  }\n\n  public makeDataSource(\n    signal: AbortSignal,\n  ): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\"> {\n    return {\n      preloadBlob: async (_blobIds: PFrameInternal.PFrameBlobId[]) => {},\n      resolveBlobContent: async (blobId: PFrameInternal.PFrameBlobId) => {\n        const filePath = this.getByKey(blobId);\n        return await fs.promises.readFile(filePath, { signal });\n      },\n    };\n  }\n}\n\nclass RemoteBlobProviderImpl implements RemoteBlobProvider<FileName> {\n  constructor(\n    private readonly pool: LocalBlobProviderImpl,\n    private readonly server: PFrameInternal.HttpServer,\n  ) {}\n\n  public static async init(\n    dataFolder: FolderPath,\n    logger: PFrameInternal.Logger,\n    serverOptions: Omit<PFrameInternal.HttpServerOptions, \"handler\">,\n  ): Promise<RemoteBlobProviderImpl> {\n    const pool = new LocalBlobProviderImpl(dataFolder);\n\n    const underlyingStore = await HttpHelpers.createFsStore({ rootDir: dataFolder, logger });\n    const store: PFrameInternal.ObjectStore = {\n      request: (filename, params) => {\n        const blobId = filename.slice(0, -PFrameInternal.ParquetExtension.length);\n        return underlyingStore.request(blobId as PFrameInternal.ParquetFileName, params);\n      },\n    };\n\n    const handler = HttpHelpers.createRequestHandler({ store });\n    const server = await HttpHelpers.createHttpServer({ ...serverOptions, handler });\n\n    return new RemoteBlobProviderImpl(pool, server);\n  }\n\n  public acquire(params: FileName): PoolEntry<PFrameInternal.PFrameBlobId> {\n    return this.pool.acquire(params);\n  }\n\n  public httpServerInfo(): PFrameInternal.HttpServerInfo {\n    return this.server.info;\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    await this.server.stop();\n    await this.pool[Symbol.asyncDispose]();\n  }\n}\n\nexport type InternalPFrameDriverDouble = AbstractInternalPFrameDriver<\n  PFrameInternal.DataInfo<FileName> | PColumnValues\n>;\n\n// It's mock for testing purposes, not a real test!\nexport async function createPFrameDriverDouble({\n  dataFolder = tmpdir() as FolderPath,\n  logger = console.log,\n}: {\n  dataFolder?: FolderPath;\n  logger?: PFrameInternal.Logger;\n}): Promise<InternalPFrameDriverDouble> {\n  const localBlobProvider = new LocalBlobProviderImpl(dataFolder);\n  const remoteBlobProvider = await RemoteBlobProviderImpl.init(dataFolder, logger, {});\n\n  const resolveDataInfo = (\n    spec: PColumnSpec,\n    data: PFrameInternal.DataInfo<FileName> | PColumnValues,\n  ) => (isDataInfo(data) ? data : makeJsonDataInfo(spec, data));\n\n  return new AbstractPFrameDriver({\n    logger,\n    localBlobProvider,\n    remoteBlobProvider,\n    resolveDataInfo,\n  });\n}\n"],"mappings":";;;;;;;;;;;AAyBA,SAAgB,eAAe,YAAgC;AAC7D,KAAI,CAAC,GAAG,SAAS,YAAY,EAAE,gBAAgB,OAAO,CAAC,EAAE,aAAa,EAAE;EACtE,MAAM,QAAQ,IAAI,kBAAkB,sBAAsB;AAC1D,QAAM,wBAAQ,IAAI,MAAM,UAAU,WAAW,iBAAiB;AAC9D,QAAM;;AAER,QAAO;;AAGT,SAAS,WAAW,KAA4C;AAC9D,QAAO;;AAGT,IAAM,wBAAN,cACU,iBAEV;CACE,YAAY,AAAiB,YAAwB;AACnD,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAA+C;AAC1E,SAAO,WAAW,OAAO;;CAG3B,AAAU,kBAAkB,QAAkB,MAA6C;EACzF,MAAM,WAAW,KAAK,KAAK,KAAK,YAAY,OAAO;AACnD,MAAI,CAAC,GAAG,SAAS,UAAU,EAAE,gBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE;GAC/D,MAAM,QAAQ,IAAI,kBAAkB,oBAAoB;AACxD,SAAM,wBAAQ,IAAI,MAAM,QAAQ,SAAS,iBAAiB;AAC1D,SAAM;;AAER,SAAO;;CAGT,AAAO,SAAS,QAA+C;EAC7D,MAAM,WAAW,MAAM,YAAY,OAAO;AAC1C,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAI,kBAAkB,kBAAkB;AACtD,SAAM,wBAAQ,IAAI,MAAM,gBAAgB,OAAO,aAAa;AAC5D,SAAM;;AAER,SAAO;;CAGT,AAAO,eACL,QAC0D;AAC1D,SAAO;GACL,aAAa,OAAO,aAA4C;GAChE,oBAAoB,OAAO,WAAwC;IACjE,MAAM,WAAW,KAAK,SAAS,OAAO;AACtC,WAAO,MAAM,GAAG,SAAS,SAAS,UAAU,EAAE,QAAQ,CAAC;;GAE1D;;;AAIL,IAAM,yBAAN,MAAM,uBAA+D;CACnE,YACE,AAAiB,MACjB,AAAiB,QACjB;EAFiB;EACA;;CAGnB,aAAoB,KAClB,YACA,QACA,eACiC;EACjC,MAAM,OAAO,IAAI,sBAAsB,WAAW;EAElD,MAAM,kBAAkB,MAAM,YAAY,cAAc;GAAE,SAAS;GAAY;GAAQ,CAAC;EAQxF,MAAM,UAAU,YAAY,qBAAqB,EAAE,OAPT,EACxC,UAAU,UAAU,WAAW;GAC7B,MAAM,SAAS,SAAS,MAAM,GAAG,CAAC,eAAe,iBAAiB,OAAO;AACzE,UAAO,gBAAgB,QAAQ,QAA0C,OAAO;KAEnF,EAEyD,CAAC;AAG3D,SAAO,IAAI,uBAAuB,MAFnB,MAAM,YAAY,iBAAiB;GAAE,GAAG;GAAe;GAAS,CAAC,CAEjC;;CAGjD,AAAO,QAAQ,QAA0D;AACvE,SAAO,KAAK,KAAK,QAAQ,OAAO;;CAGlC,AAAO,iBAAgD;AACrD,SAAO,KAAK,OAAO;;CAGrB,OAAO,OAAO,gBAA+B;AAC3C,QAAM,KAAK,OAAO,MAAM;AACxB,QAAM,KAAK,KAAK,OAAO,eAAe;;;AAS1C,eAAsB,yBAAyB,EAC7C,aAAa,QAAQ,EACrB,SAAS,QAAQ,OAIqB;CACtC,MAAM,oBAAoB,IAAI,sBAAsB,WAAW;CAC/D,MAAM,qBAAqB,MAAM,uBAAuB,KAAK,YAAY,QAAQ,EAAE,CAAC;CAEpF,MAAM,mBACJ,MACA,SACI,WAAW,KAAK,GAAG,OAAO,iBAAiB,MAAM,KAAK;AAE5D,QAAO,IAAI,qBAAqB;EAC9B;EACA;EACA;EACA;EACD,CAAC"}
+{"version":3,"file":"driver_double.js","names":[],"sources":["../src/driver_double.ts"],"sourcesContent":["import {\n  isDataInfo,\n  PFrameDriverError,\n  type Branded,\n  type PColumnSpec,\n  type PColumnValues,\n} from \"@milaboratories/pl-model-common\";\nimport { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { HttpHelpers } from \"@milaboratories/pframes-rs-node\";\nimport fs from \"node:fs\";\nimport path from \"node:path\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport {\n  AbstractPFrameDriver,\n  type LocalBlobProvider,\n  type RemoteBlobProvider,\n} from \"./driver_impl\";\nimport { makeJsonDataInfo } from \"./data_info_helpers\";\n\nexport type FileName = Branded<string, \"FileName\">;\nexport type FilePath = Branded<string, \"FilePath\">;\nexport type FolderPath = Branded<string, \"FolderPath\">;\n\nexport function makeFolderPath(dataFolder: string): FolderPath {\n  if (!fs.statSync(dataFolder, { throwIfNoEntry: false })?.isDirectory()) {\n    const error = new PFrameDriverError(`Invalid data folder`);\n    error.cause = new Error(`Folder ${dataFolder} does not exist`);\n    throw error;\n  }\n  return dataFolder as FolderPath;\n}\n\nfunction makeBlobId(res: FileName): PFrameInternal.PFrameBlobId {\n  return res as string as PFrameInternal.PFrameBlobId;\n}\n\nclass LocalBlobProviderImpl\n  extends RefCountPoolBase<FileName, PFrameInternal.PFrameBlobId, FilePath>\n  implements LocalBlobProvider<FileName>\n{\n  constructor(private readonly dataFolder: FolderPath) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FileName): PFrameInternal.PFrameBlobId {\n    return makeBlobId(params);\n  }\n\n  protected createNewResource(params: FileName, _key: PFrameInternal.PFrameBlobId): FilePath {\n    const filePath = path.join(this.dataFolder, params);\n    if (!fs.statSync(filePath, { throwIfNoEntry: false })?.isFile()) {\n      const error = new PFrameDriverError(`Invalid file name`);\n      error.cause = new Error(`File ${filePath} does not exist`);\n      throw error;\n    }\n    return filePath as FilePath;\n  }\n\n  public getByKey(blobId: PFrameInternal.PFrameBlobId): FilePath {\n    const resource = super.tryGetByKey(blobId);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid blob id`);\n      error.cause = new Error(`Blob with id ${blobId} not found.`);\n      throw error;\n    }\n    return resource;\n  }\n\n  public makeDataSource(\n    signal: AbortSignal,\n  ): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\"> {\n    return {\n      preloadBlob: async (_blobIds: PFrameInternal.PFrameBlobId[]) => {},\n      resolveBlobContent: async (blobId: PFrameInternal.PFrameBlobId) => {\n        const filePath = this.getByKey(blobId);\n        return await fs.promises.readFile(filePath, { signal });\n      },\n    };\n  }\n}\n\nclass RemoteBlobProviderImpl implements RemoteBlobProvider<FileName> {\n  constructor(\n    private readonly pool: LocalBlobProviderImpl,\n    private readonly server: PFrameInternal.HttpServer,\n  ) {}\n\n  public static async init(\n    dataFolder: FolderPath,\n    logger: PFrameInternal.Logger,\n    serverOptions: Omit<PFrameInternal.HttpServerOptions, \"handler\">,\n  ): Promise<RemoteBlobProviderImpl> {\n    const pool = new LocalBlobProviderImpl(dataFolder);\n\n    const underlyingStore = await HttpHelpers.createFsStore({ rootDir: dataFolder, logger });\n    const store: PFrameInternal.ObjectStore = {\n      request: (filename, params) => {\n        const blobId = filename.slice(0, -PFrameInternal.ParquetExtension.length);\n        return underlyingStore.request(blobId as PFrameInternal.ParquetFileName, params);\n      },\n    };\n\n    const handler = HttpHelpers.createRequestHandler({ store });\n    const server = await HttpHelpers.createHttpServer({ ...serverOptions, handler });\n\n    return new RemoteBlobProviderImpl(pool, server);\n  }\n\n  public acquire(params: FileName): PoolEntry<PFrameInternal.PFrameBlobId> {\n    return this.pool.acquire(params);\n  }\n\n  public httpServerInfo(): PFrameInternal.HttpServerInfo {\n    return this.server.info;\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    await this.server.stop();\n    await this.pool[Symbol.asyncDispose]();\n  }\n}\n\nexport type InternalPFrameDriverDouble = AbstractInternalPFrameDriver<\n  PFrameInternal.DataInfo<FileName> | PColumnValues\n>;\n\n// It's mock for testing purposes, not a real test!\nexport async function createPFrameDriverDouble({\n  dataFolder = tmpdir() as FolderPath,\n  logger = console.log,\n}: {\n  dataFolder?: FolderPath;\n  logger?: PFrameInternal.Logger;\n}): Promise<InternalPFrameDriverDouble> {\n  const localBlobProvider = new LocalBlobProviderImpl(dataFolder);\n  const remoteBlobProvider = await RemoteBlobProviderImpl.init(dataFolder, logger, {});\n\n  const resolveDataInfo = (\n    spec: PColumnSpec,\n    data: PFrameInternal.DataInfo<FileName> | PColumnValues,\n  ) => (isDataInfo(data) ? data : makeJsonDataInfo(spec, data));\n\n  return new AbstractPFrameDriver({\n    logger,\n    localBlobProvider,\n    remoteBlobProvider,\n    resolveDataInfo,\n  });\n}\n"],"mappings":";;;;;;;;;;;AAyBA,SAAgB,eAAe,YAAgC;AAC7D,KAAI,CAAC,GAAG,SAAS,YAAY,EAAE,gBAAgB,OAAO,CAAC,EAAE,aAAa,EAAE;EACtE,MAAM,QAAQ,IAAI,kBAAkB,sBAAsB;AAC1D,QAAM,wBAAQ,IAAI,MAAM,UAAU,WAAW,iBAAiB;AAC9D,QAAM;;AAER,QAAO;;AAGT,SAAS,WAAW,KAA4C;AAC9D,QAAO;;AAGT,IAAM,wBAAN,cACU,iBAEV;CACE,YAAY,AAAiB,YAAwB;AACnD,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAA+C;AAC1E,SAAO,WAAW,OAAO;;CAG3B,AAAU,kBAAkB,QAAkB,MAA6C;EACzF,MAAM,WAAW,KAAK,KAAK,KAAK,YAAY,OAAO;AACnD,MAAI,CAAC,GAAG,SAAS,UAAU,EAAE,gBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE;GAC/D,MAAM,QAAQ,IAAI,kBAAkB,oBAAoB;AACxD,SAAM,wBAAQ,IAAI,MAAM,QAAQ,SAAS,iBAAiB;AAC1D,SAAM;;AAER,SAAO;;CAGT,AAAO,SAAS,QAA+C;EAC7D,MAAM,WAAW,MAAM,YAAY,OAAO;AAC1C,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAI,kBAAkB,kBAAkB;AACtD,SAAM,wBAAQ,IAAI,MAAM,gBAAgB,OAAO,aAAa;AAC5D,SAAM;;AAER,SAAO;;CAGT,AAAO,eACL,QAC0D;AAC1D,SAAO;GACL,aAAa,OAAO,aAA4C;GAChE,oBAAoB,OAAO,WAAwC;IACjE,MAAM,WAAW,KAAK,SAAS,OAAO;AACtC,WAAO,MAAM,GAAG,SAAS,SAAS,UAAU,EAAE,QAAQ,CAAC;;GAE1D;;;AAIL,IAAM,yBAAN,MAAM,uBAA+D;CACnE,YACE,AAAiB,MACjB,AAAiB,QACjB;EAFiB;EACA;;CAGnB,aAAoB,KAClB,YACA,QACA,eACiC;EACjC,MAAM,OAAO,IAAI,sBAAsB,WAAW;EAElD,MAAM,kBAAkB,MAAM,YAAY,cAAc;GAAE,SAAS;GAAY;GAAQ,CAAC;EAQxF,MAAM,UAAU,YAAY,qBAAqB,EAAE,OAPT,EACxC,UAAU,UAAU,WAAW;GAC7B,MAAM,SAAS,SAAS,MAAM,GAAG,CAAC,eAAe,iBAAiB,OAAO;AACzE,UAAO,gBAAgB,QAAQ,QAA0C,OAAO;KAEnF,EAEyD,CAAC;AAG3D,SAAO,IAAI,uBAAuB,MAFnB,MAAM,YAAY,iBAAiB;GAAE,GAAG;GAAe;GAAS,CAAC,CAEjC;;CAGjD,AAAO,QAAQ,QAA0D;AACvE,SAAO,KAAK,KAAK,QAAQ,OAAO;;CAGlC,AAAO,iBAAgD;AACrD,SAAO,KAAK,OAAO;;CAGrB,OAAO,OAAO,gBAA+B;AAC3C,QAAM,KAAK,OAAO,MAAM;AACxB,QAAM,KAAK,KAAK,OAAO,eAAe;;;AAS1C,eAAsB,yBAAyB,EAC7C,aAAa,QAAQ,EACrB,SAAS,QAAQ,OAIqB;CACtC,MAAM,oBAAoB,IAAI,sBAAsB,WAAW;CAC/D,MAAM,qBAAqB,MAAM,uBAAuB,KAAK,YAAY,QAAQ,EAAE,CAAC;CAEpF,MAAM,mBACJ,MACA,SACI,WAAW,KAAK,GAAG,OAAO,iBAAiB,MAAM,KAAK;AAE5D,QAAO,IAAI,qBAAqB;EAC9B;EACA;EACA;EACA;EACD,CAAC"}

package/dist/driver_impl.cjs

@@ -8,6 +8,7 @@ const require_ptable_cache_plain = require('./ptable_cache_plain.cjs');
 const require_usingCtx = require('./_virtual/_@oxc-project_runtime@0.114.0/helpers/usingCtx.cjs');
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 let _milaboratories_pframes_rs_node = require("@milaboratories/pframes-rs-node");
 let node_os = require("node:os");
 let _milaboratories_pframes_rs_wasm = require("@milaboratories/pframes-rs-wasm");
@@ -70,7 +71,7 @@ var AbstractPFrameDriver = class {
 	createPTable(rawDef) {
 		try {
 			var _usingCtx$1 = require_usingCtx._usingCtx();
-			const pFrameGuard = _usingCtx$1.u(new _milaboratories_ts_helpers.PoolEntryGuard(this.createPFrame((0, _milaboratories_pl_model_common.extractAllColumns)(rawDef.src))));
+			const pFrameGuard = _usingCtx$1.u(new _milaboratories_helpers.PoolEntryGuard(this.createPFrame((0, _milaboratories_pl_model_common.extractAllColumns)(rawDef.src))));
 			const sortedDef = (0, _milaboratories_pl_model_common.sortPTableDef)(migrateTableFilter((0, _milaboratories_pl_model_common.mapPTableDef)(rawDef, (c) => c.id), this.logger));
 			const pTableEntry = this.pTableDefs.acquire({
 				type: "v1",
@@ -100,7 +101,7 @@ var AbstractPFrameDriver = class {
 			var _usingCtx3 = require_usingCtx._usingCtx();
 			const columns = (0, _milaboratories_pl_model_common.uniqueBy)((0, _milaboratories_pl_model_common.collectSpecQueryColumns)(def.query), (c) => c.id);
 			const columnsMap = columns.reduce((acc, col) => (acc[col.id] = col.spec, acc), {});
-			const pFrameGuard = _usingCtx3.u(new _milaboratories_ts_helpers.PoolEntryGuard(this.createPFrame(columns)));
+			const pFrameGuard = _usingCtx3.u(new _milaboratories_helpers.PoolEntryGuard(this.createPFrame(columns)));
 			const ValueTypes = new Set(Object.values(_milaboratories_pl_model_common.ValueType));
 			const specFrame = (0, _milaboratories_pframes_rs_wasm.createPFrame)(Object.fromEntries(Object.entries(columnsMap).filter(([, spec]) => ValueTypes.has(spec.valueType)).map(([id, spec]) => [id, (0, _milaboratories_pl_model_common.resolveAnnotationParents)(spec)])));
 			const sortedQuery = (0, _milaboratories_pl_model_common.sortSpecQuery)((0, _milaboratories_pl_model_common.mapSpecQueryColumns)(def.query, (c) => c.id));
@@ -154,7 +155,7 @@ var AbstractPFrameDriver = class {
 		try {
 			var _usingCtx4 = require_usingCtx._usingCtx();
 			if (require_logging.logPFrames()) this.logger("info", `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, _milaboratories_pl_model_common.bigintReplacer)}`);
-			const tableGuard = _usingCtx4.u(new _milaboratories_ts_helpers.PoolEntryGuard(this.pTables.acquire({
+			const tableGuard = _usingCtx4.u(new _milaboratories_helpers.PoolEntryGuard(this.pTables.acquire({
 				type: "v1",
 				pFrameHandle: handle,
 				def: (0, _milaboratories_pl_model_common.sortPTableDef)(migrateTableFilter(request, this.logger))
@@ -209,7 +210,7 @@ var AbstractPFrameDriver = class {
 		try {
 			var _usingCtx6 = require_usingCtx._usingCtx();
 			const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-			const tableGuard = _usingCtx6.u(new _milaboratories_ts_helpers.PoolEntryGuard(this.pTables.acquire(def)));
+			const tableGuard = _usingCtx6.u(new _milaboratories_helpers.PoolEntryGuard(this.pTables.acquire(def)));
 			const { pTablePromise, disposeSignal } = tableGuard.resource;
 			const pTable = await pTablePromise;
 			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
@@ -231,7 +232,7 @@ var AbstractPFrameDriver = class {
 		try {
 			var _usingCtx7 = require_usingCtx._usingCtx();
 			const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-			const tableGuard = _usingCtx7.u(new _milaboratories_ts_helpers.PoolEntryGuard(this.pTables.acquire(def)));
+			const tableGuard = _usingCtx7.u(new _milaboratories_helpers.PoolEntryGuard(this.pTables.acquire(def)));
 			const { pTablePromise, disposeSignal } = tableGuard.resource;
 			const pTable = await pTablePromise;
 			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));

package/dist/driver_impl.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"driver_impl.cjs","names":["PTableCachePerFrameOpsDefaults","PTableCachePlainOpsDefaults","PFrameFactory","ConcurrencyLimitingExecutor","PFramePool","PTableDefPool","PTablePool","PTableCachePerFrame","PTableCachePlain","ValueType","PoolEntryGuard","logPFrames","bigintReplacer"],"sources":["../src/driver_impl.ts"],"sourcesContent":["import {\n  mapPObjectData,\n  mapPTableDef,\n  extractAllColumns,\n  uniqueBy,\n  canonicalizeJson,\n  bigintReplacer,\n  ValueType,\n  type CalculateTableDataRequest,\n  type CalculateTableDataResponse,\n  type FindColumnsRequest,\n  type FindColumnsResponse,\n  type PColumnIdAndSpec,\n  type PColumnSpec,\n  type PFrameHandle,\n  type PObjectId,\n  type PTableColumnSpec,\n  type PTableHandle,\n  type PTableShape,\n  type PTableVector,\n  type TableRange,\n  type UniqueValuesRequest,\n  type UniqueValuesResponse,\n  type PColumn,\n  type PFrameDef,\n  type PTableDef,\n  type PTableRecordSingleValueFilterV2,\n  type PTableRecordFilter,\n  type JsonSerializable,\n  type PTableDefV2,\n  mapSpecQueryColumns,\n  collectSpecQueryColumns,\n  sortSpecQuery,\n  sortPTableDef,\n  resolveAnnotationParents,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport {\n  ConcurrencyLimitingExecutor,\n  PoolEntryGuard,\n  type PoolEntry,\n} from \"@milaboratories/ts-helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport { logPFrames } from \"./logging\";\nimport {\n  PFramePool,\n  type LocalBlobProvider as PoolLocalBlobProvider,\n  type RemoteBlobProvider as PoolRemoteBlobProvider,\n} from \"./pframe_pool\";\nimport { PTableDefPool } from \"./ptable_def_pool\";\nimport { PTablePool } from \"./ptable_pool\";\nimport {\n  PTableCachePerFrame,\n  PTableCachePerFrameOpsDefaults,\n  type PTableCachePerFrameOps,\n} from \"./ptable_cache_per_frame\";\nimport {\n  PTableCachePlain,\n  PTableCachePlainOpsDefaults,\n  type PTableCachePlainOps,\n} from \"./ptable_cache_plain\";\nimport { createPFrame as createSpecFrame } from \"@milaboratories/pframes-rs-wasm\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolLocalBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolRemoteBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport type AbstractPFrameDriverOps = PTableCachePerFrameOps &\n  PTableCachePlainOps & {\n    /** Concurrency limits for `getUniqueValues` and `calculateTableData` requests */\n    pFrameConcurrency: number;\n    /** Concurrency limits for `getShape` and `getData` requests */\n    pTableConcurrency: number;\n  };\n\nexport const AbstractPFrameDriverOpsDefaults: AbstractPFrameDriverOps = {\n  ...PTableCachePerFrameOpsDefaults,\n  ...PTableCachePlainOpsDefaults,\n  pFrameConcurrency: 1, // 1 join is executed in parallel and utilize all RAM and CPU cores\n  pTableConcurrency: 1, // 1 joined table is read from disk at a time, which matches 1 table the user can view in the UI\n};\n\nexport type DataInfoResolver<PColumnData, TreeEntry extends JsonSerializable> = (\n  spec: PColumnSpec,\n  data: PColumnData,\n) => PFrameInternal.DataInfo<TreeEntry>;\n\nexport class AbstractPFrameDriver<\n  PColumnData,\n  TreeEntry extends JsonSerializable,\n> implements AbstractInternalPFrameDriver<PColumnData> {\n  private readonly logger: PFrameInternal.Logger;\n\n  private readonly localBlobProvider: LocalBlobProvider<TreeEntry>;\n  private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n\n  private readonly resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n\n  private readonly pFrames: PFramePool<TreeEntry>;\n  private readonly pTableDefs: PTableDefPool;\n  private readonly pTables: PTablePool<TreeEntry>;\n\n  private readonly pTableCachePerFrame: PTableCachePerFrame;\n  private readonly pTableCachePlain: PTableCachePlain;\n\n  private readonly frameConcurrencyLimiter: ConcurrencyLimitingExecutor;\n  private readonly tableConcurrencyLimiter: ConcurrencyLimitingExecutor;\n\n  public async pprofDump(): Promise<Uint8Array> {\n    return await PFrameFactory.pprofDump();\n  }\n\n  public constructor({\n    logger = () => {},\n    localBlobProvider,\n    remoteBlobProvider,\n    spillPath = tmpdir(),\n    options = AbstractPFrameDriverOpsDefaults,\n    resolveDataInfo,\n  }: {\n    logger?: PFrameInternal.Logger;\n    localBlobProvider: LocalBlobProvider<TreeEntry>;\n    remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n    spillPath?: string;\n    options?: AbstractPFrameDriverOps;\n    resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n  }) {\n    this.logger = logger;\n\n    this.localBlobProvider = localBlobProvider;\n    this.remoteBlobProvider = remoteBlobProvider;\n\n    this.resolveDataInfo = resolveDataInfo;\n\n    this.frameConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pFrameConcurrency);\n    this.tableConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pTableConcurrency);\n\n    this.pFrames = new PFramePool(\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      spillPath,\n    );\n    this.pTableDefs = new PTableDefPool(this.logger);\n    this.pTables = new PTablePool(this.pFrames, this.pTableDefs, this.logger);\n\n    this.pTableCachePerFrame = new PTableCachePerFrame(this.logger, options);\n    this.pTableCachePlain = new PTableCachePlain(this.logger, options);\n  }\n\n  async dispose(): Promise<void> {\n    void (await Promise.allSettled([\n      this.pTables[Symbol.asyncDispose](),\n      this.pTableDefs[Symbol.asyncDispose](),\n      this.pFrames[Symbol.asyncDispose](),\n      this.localBlobProvider[Symbol.asyncDispose](),\n      this.remoteBlobProvider[Symbol.asyncDispose](),\n    ]));\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    return await this.dispose();\n  }\n\n  //\n  // Internal / Config API Methods\n  //\n\n  public createPFrame(def: PFrameDef<PColumn<PColumnData>>): PoolEntry<PFrameHandle> {\n    const ValueTypes = new Set(Object.values(ValueType));\n    const supportedColumns = def\n      .filter((column) => ValueTypes.has(column.spec.valueType))\n      .map((c) => ({ ...c, spec: resolveAnnotationParents(c.spec) }));\n    const uniqueColumns = uniqueBy(supportedColumns, (column) => column.id);\n    const columns = uniqueColumns.map((c) =>\n      mapPObjectData(c, (d) => this.resolveDataInfo(c.spec, d)),\n    );\n\n    return this.pFrames.acquire(columns);\n  }\n\n  public createPTable(rawDef: PTableDef<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(extractAllColumns(rawDef.src)));\n    const sortedDef = sortPTableDef(\n      migrateTableFilter(\n        mapPTableDef(rawDef, (c) => c.id),\n        this.logger,\n      ),\n    );\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v1\",\n      def: sortedDef,\n      pFrameHandle: pFrameGuard.key,\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  public createPTableV2(def: PTableDefV2<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    const columns = uniqueBy(collectSpecQueryColumns(def.query), (c) => c.id);\n    const columnsMap = columns.reduce(\n      (acc, col) => ((acc[col.id] = col.spec), acc),\n      {} as Record<string, PColumnSpec>,\n    );\n\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(columns));\n    const ValueTypes = new Set(Object.values(ValueType));\n    const specColumnsMap = Object.fromEntries(\n      Object.entries(columnsMap)\n        .filter(([, spec]) => ValueTypes.has(spec.valueType))\n        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),\n    );\n    const specFrame = createSpecFrame(specColumnsMap);\n    const sortedQuery = sortSpecQuery(mapSpecQueryColumns(def.query, (c) => c.id));\n    const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);\n\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v2\",\n      pFrameHandle: pFrameGuard.key,\n      def: {\n        tableSpec,\n        dataQuery,\n      },\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  //\n  // PFrame instance methods\n  //\n\n  public async findColumns(\n    handle: PFrameHandle,\n    request: FindColumnsRequest,\n  ): Promise<FindColumnsResponse> {\n    const iRequest: PFrameInternal.FindColumnsRequest = {\n      ...request,\n      compatibleWith:\n        request.compatibleWith.length !== 0\n          ? [\n              {\n                axesSpec: [\n                  ...new Map(\n                    request.compatibleWith.map((item) => [canonicalizeJson(item), item] as const),\n                  ).values(),\n                ],\n                qualifications: [],\n              },\n            ]\n          : [],\n    };\n\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const response = await pFrame.findColumns(iRequest);\n    return {\n      hits: response.hits\n        .filter(\n          (h) =>\n            // only exactly matching columns\n            h.mappingVariants.length === 0 ||\n            h.mappingVariants.some(\n              (v) =>\n                v.qualifications.forHit.length === 0 &&\n                v.qualifications.forQueries.every((q) => q.length === 0),\n            ),\n        )\n        .map((h) => h.hit),\n    };\n  }\n\n  public async getColumnSpec(\n    handle: PFrameHandle,\n    columnId: PObjectId,\n  ): Promise<PColumnSpec | null> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.getColumnSpec(columnId);\n  }\n\n  public async listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.listColumns();\n  }\n\n  public async calculateTableData(\n    handle: PFrameHandle,\n    request: CalculateTableDataRequest<PObjectId>,\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<CalculateTableDataResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    using tableGuard = new PoolEntryGuard(\n      this.pTables.acquire({\n        type: \"v1\",\n        pFrameHandle: handle,\n        def: sortPTableDef(migrateTableFilter(request, this.logger)),\n      }),\n    );\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      // TODO: throw error when more then 150k rows is requested\n      // after pf-plots migration to stream API\n\n      const spec = pTable.getSpec();\n      const data = await pTable.getData([...spec.keys()], {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n      this.pTableCachePerFrame.cache(tableGuard.keep(), overallSize);\n\n      return spec.map((spec, i) => ({\n        spec: spec,\n        data: data[i],\n      }));\n    });\n  }\n\n  public async getUniqueValues(\n    handle: PFrameHandle,\n    request: UniqueValuesRequest,\n    signal?: AbortSignal,\n  ): Promise<UniqueValuesResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      return await pFrame.getUniqueValues(\n        {\n          ...request,\n          filters: migrateFilters(request.filters, this.logger),\n        },\n        {\n          signal: combinedSignal,\n        },\n      );\n    });\n  }\n\n  //\n  // PTable instance methods\n  //\n\n  public async getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {\n    const { def } = this.pTableDefs.getByKey(handle);\n    using table = this.pTables.acquire(def);\n\n    const { pTablePromise } = table.resource;\n    const pTable = await pTablePromise;\n\n    return pTable.getSpec();\n  }\n\n  public async getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const shape = await pTable.getShape({\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { shape, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return shape;\n  }\n\n  public async getData(\n    handle: PTableHandle,\n    columnIndices: number[],\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<PTableVector[]> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const data = await pTable.getData(columnIndices, {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { data, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return data;\n  }\n}\n\nfunction migrateFilters(\n  filters: PTableRecordFilter[],\n  logger: PFrameInternal.Logger,\n): PTableRecordFilter[] {\n  const filtersV1 = [];\n  const filtersV2: PTableRecordSingleValueFilterV2[] = [];\n  for (const filter of filters) {\n    if ((filter.type as unknown) === \"bySingleColumn\") {\n      filtersV1.push(filter);\n      filtersV2.push({\n        ...filter,\n        type: \"bySingleColumnV2\",\n      });\n    } else {\n      filtersV2.push(filter);\n    }\n  }\n  if (filtersV1.length > 0) {\n    const filtersV1Json = JSON.stringify(filtersV1);\n    logger(\n      \"warn\",\n      `type overwritten from 'bySingleColumn' to 'bySingleColumnV2' for filters: ${filtersV1Json}`,\n    );\n  }\n  return filtersV2;\n}\n\nfunction migrateTableFilter<T>(\n  def: Omit<PTableDef<T>, \"partitionFilters\"> | PTableDef<T>,\n  logger: PFrameInternal.Logger,\n): PTableDef<T> {\n  if (!(\"partitionFilters\" in def)) {\n    // For old blocks assume all axes filters to be partition filters\n    return {\n      ...def,\n      partitionFilters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"axis\"),\n        logger,\n      ),\n      filters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"column\"),\n        logger,\n      ),\n    };\n  }\n  return {\n    ...def,\n    partitionFilters: migrateFilters(def.partitionFilters, logger),\n    filters: migrateFilters(def.filters, logger),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"driver_impl.cjs","names":["PTableCachePerFrameOpsDefaults","PTableCachePlainOpsDefaults","PFrameFactory","ConcurrencyLimitingExecutor","PFramePool","PTableDefPool","PTablePool","PTableCachePerFrame","PTableCachePlain","ValueType","PoolEntryGuard","logPFrames","bigintReplacer"],"sources":["../src/driver_impl.ts"],"sourcesContent":["import {\n  mapPObjectData,\n  mapPTableDef,\n  extractAllColumns,\n  uniqueBy,\n  canonicalizeJson,\n  bigintReplacer,\n  ValueType,\n  type CalculateTableDataRequest,\n  type CalculateTableDataResponse,\n  type FindColumnsRequest,\n  type FindColumnsResponse,\n  type PColumnIdAndSpec,\n  type PColumnSpec,\n  type PFrameHandle,\n  type PObjectId,\n  type PTableColumnSpec,\n  type PTableHandle,\n  type PTableShape,\n  type PTableVector,\n  type TableRange,\n  type UniqueValuesRequest,\n  type UniqueValuesResponse,\n  type PColumn,\n  type PFrameDef,\n  type PTableDef,\n  type PTableRecordSingleValueFilterV2,\n  type PTableRecordFilter,\n  type JsonSerializable,\n  type PTableDefV2,\n  mapSpecQueryColumns,\n  collectSpecQueryColumns,\n  sortSpecQuery,\n  sortPTableDef,\n  resolveAnnotationParents,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { ConcurrencyLimitingExecutor } from \"@milaboratories/ts-helpers\";\nimport { PoolEntryGuard, type PoolEntry } from \"@milaboratories/helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport { logPFrames } from \"./logging\";\nimport {\n  PFramePool,\n  type LocalBlobProvider as PoolLocalBlobProvider,\n  type RemoteBlobProvider as PoolRemoteBlobProvider,\n} from \"./pframe_pool\";\nimport { PTableDefPool } from \"./ptable_def_pool\";\nimport { PTablePool } from \"./ptable_pool\";\nimport {\n  PTableCachePerFrame,\n  PTableCachePerFrameOpsDefaults,\n  type PTableCachePerFrameOps,\n} from \"./ptable_cache_per_frame\";\nimport {\n  PTableCachePlain,\n  PTableCachePlainOpsDefaults,\n  type PTableCachePlainOps,\n} from \"./ptable_cache_plain\";\nimport { createPFrame as createSpecFrame } from \"@milaboratories/pframes-rs-wasm\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolLocalBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolRemoteBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport type AbstractPFrameDriverOps = PTableCachePerFrameOps &\n  PTableCachePlainOps & {\n    /** Concurrency limits for `getUniqueValues` and `calculateTableData` requests */\n    pFrameConcurrency: number;\n    /** Concurrency limits for `getShape` and `getData` requests */\n    pTableConcurrency: number;\n  };\n\nexport const AbstractPFrameDriverOpsDefaults: AbstractPFrameDriverOps = {\n  ...PTableCachePerFrameOpsDefaults,\n  ...PTableCachePlainOpsDefaults,\n  pFrameConcurrency: 1, // 1 join is executed in parallel and utilize all RAM and CPU cores\n  pTableConcurrency: 1, // 1 joined table is read from disk at a time, which matches 1 table the user can view in the UI\n};\n\nexport type DataInfoResolver<PColumnData, TreeEntry extends JsonSerializable> = (\n  spec: PColumnSpec,\n  data: PColumnData,\n) => PFrameInternal.DataInfo<TreeEntry>;\n\nexport class AbstractPFrameDriver<\n  PColumnData,\n  TreeEntry extends JsonSerializable,\n> implements AbstractInternalPFrameDriver<PColumnData> {\n  private readonly logger: PFrameInternal.Logger;\n\n  private readonly localBlobProvider: LocalBlobProvider<TreeEntry>;\n  private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n\n  private readonly resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n\n  private readonly pFrames: PFramePool<TreeEntry>;\n  private readonly pTableDefs: PTableDefPool;\n  private readonly pTables: PTablePool<TreeEntry>;\n\n  private readonly pTableCachePerFrame: PTableCachePerFrame;\n  private readonly pTableCachePlain: PTableCachePlain;\n\n  private readonly frameConcurrencyLimiter: ConcurrencyLimitingExecutor;\n  private readonly tableConcurrencyLimiter: ConcurrencyLimitingExecutor;\n\n  public async pprofDump(): Promise<Uint8Array> {\n    return await PFrameFactory.pprofDump();\n  }\n\n  public constructor({\n    logger = () => {},\n    localBlobProvider,\n    remoteBlobProvider,\n    spillPath = tmpdir(),\n    options = AbstractPFrameDriverOpsDefaults,\n    resolveDataInfo,\n  }: {\n    logger?: PFrameInternal.Logger;\n    localBlobProvider: LocalBlobProvider<TreeEntry>;\n    remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n    spillPath?: string;\n    options?: AbstractPFrameDriverOps;\n    resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n  }) {\n    this.logger = logger;\n\n    this.localBlobProvider = localBlobProvider;\n    this.remoteBlobProvider = remoteBlobProvider;\n\n    this.resolveDataInfo = resolveDataInfo;\n\n    this.frameConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pFrameConcurrency);\n    this.tableConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pTableConcurrency);\n\n    this.pFrames = new PFramePool(\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      spillPath,\n    );\n    this.pTableDefs = new PTableDefPool(this.logger);\n    this.pTables = new PTablePool(this.pFrames, this.pTableDefs, this.logger);\n\n    this.pTableCachePerFrame = new PTableCachePerFrame(this.logger, options);\n    this.pTableCachePlain = new PTableCachePlain(this.logger, options);\n  }\n\n  async dispose(): Promise<void> {\n    void (await Promise.allSettled([\n      this.pTables[Symbol.asyncDispose](),\n      this.pTableDefs[Symbol.asyncDispose](),\n      this.pFrames[Symbol.asyncDispose](),\n      this.localBlobProvider[Symbol.asyncDispose](),\n      this.remoteBlobProvider[Symbol.asyncDispose](),\n    ]));\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    return await this.dispose();\n  }\n\n  //\n  // Internal / Config API Methods\n  //\n\n  public createPFrame(def: PFrameDef<PColumn<PColumnData>>): PoolEntry<PFrameHandle> {\n    const ValueTypes = new Set(Object.values(ValueType));\n    const supportedColumns = def\n      .filter((column) => ValueTypes.has(column.spec.valueType))\n      .map((c) => ({ ...c, spec: resolveAnnotationParents(c.spec) }));\n    const uniqueColumns = uniqueBy(supportedColumns, (column) => column.id);\n    const columns = uniqueColumns.map((c) =>\n      mapPObjectData(c, (d) => this.resolveDataInfo(c.spec, d)),\n    );\n\n    return this.pFrames.acquire(columns);\n  }\n\n  public createPTable(rawDef: PTableDef<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(extractAllColumns(rawDef.src)));\n    const sortedDef = sortPTableDef(\n      migrateTableFilter(\n        mapPTableDef(rawDef, (c) => c.id),\n        this.logger,\n      ),\n    );\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v1\",\n      def: sortedDef,\n      pFrameHandle: pFrameGuard.key,\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  public createPTableV2(def: PTableDefV2<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    const columns = uniqueBy(collectSpecQueryColumns(def.query), (c) => c.id);\n    const columnsMap = columns.reduce(\n      (acc, col) => ((acc[col.id] = col.spec), acc),\n      {} as Record<string, PColumnSpec>,\n    );\n\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(columns));\n    const ValueTypes = new Set(Object.values(ValueType));\n    const specColumnsMap = Object.fromEntries(\n      Object.entries(columnsMap)\n        .filter(([, spec]) => ValueTypes.has(spec.valueType))\n        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),\n    );\n    const specFrame = createSpecFrame(specColumnsMap);\n    const sortedQuery = sortSpecQuery(mapSpecQueryColumns(def.query, (c) => c.id));\n    const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);\n\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v2\",\n      pFrameHandle: pFrameGuard.key,\n      def: {\n        tableSpec,\n        dataQuery,\n      },\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  //\n  // PFrame instance methods\n  //\n\n  public async findColumns(\n    handle: PFrameHandle,\n    request: FindColumnsRequest,\n  ): Promise<FindColumnsResponse> {\n    const iRequest: PFrameInternal.FindColumnsRequest = {\n      ...request,\n      compatibleWith:\n        request.compatibleWith.length !== 0\n          ? [\n              {\n                axesSpec: [\n                  ...new Map(\n                    request.compatibleWith.map((item) => [canonicalizeJson(item), item] as const),\n                  ).values(),\n                ],\n                qualifications: [],\n              },\n            ]\n          : [],\n    };\n\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const response = await pFrame.findColumns(iRequest);\n    return {\n      hits: response.hits\n        .filter(\n          (h) =>\n            // only exactly matching columns\n            h.mappingVariants.length === 0 ||\n            h.mappingVariants.some(\n              (v) =>\n                v.qualifications.forHit.length === 0 &&\n                v.qualifications.forQueries.every((q) => q.length === 0),\n            ),\n        )\n        .map((h) => h.hit),\n    };\n  }\n\n  public async getColumnSpec(\n    handle: PFrameHandle,\n    columnId: PObjectId,\n  ): Promise<PColumnSpec | null> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.getColumnSpec(columnId);\n  }\n\n  public async listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.listColumns();\n  }\n\n  public async calculateTableData(\n    handle: PFrameHandle,\n    request: CalculateTableDataRequest<PObjectId>,\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<CalculateTableDataResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    using tableGuard = new PoolEntryGuard(\n      this.pTables.acquire({\n        type: \"v1\",\n        pFrameHandle: handle,\n        def: sortPTableDef(migrateTableFilter(request, this.logger)),\n      }),\n    );\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      // TODO: throw error when more then 150k rows is requested\n      // after pf-plots migration to stream API\n\n      const spec = pTable.getSpec();\n      const data = await pTable.getData([...spec.keys()], {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n      this.pTableCachePerFrame.cache(tableGuard.keep(), overallSize);\n\n      return spec.map((spec, i) => ({\n        spec: spec,\n        data: data[i],\n      }));\n    });\n  }\n\n  public async getUniqueValues(\n    handle: PFrameHandle,\n    request: UniqueValuesRequest,\n    signal?: AbortSignal,\n  ): Promise<UniqueValuesResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      return await pFrame.getUniqueValues(\n        {\n          ...request,\n          filters: migrateFilters(request.filters, this.logger),\n        },\n        {\n          signal: combinedSignal,\n        },\n      );\n    });\n  }\n\n  //\n  // PTable instance methods\n  //\n\n  public async getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {\n    const { def } = this.pTableDefs.getByKey(handle);\n    using table = this.pTables.acquire(def);\n\n    const { pTablePromise } = table.resource;\n    const pTable = await pTablePromise;\n\n    return pTable.getSpec();\n  }\n\n  public async getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const shape = await pTable.getShape({\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { shape, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return shape;\n  }\n\n  public async getData(\n    handle: PTableHandle,\n    columnIndices: number[],\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<PTableVector[]> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const data = await pTable.getData(columnIndices, {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { data, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return data;\n  }\n}\n\nfunction migrateFilters(\n  filters: PTableRecordFilter[],\n  logger: PFrameInternal.Logger,\n): PTableRecordFilter[] {\n  const filtersV1 = [];\n  const filtersV2: PTableRecordSingleValueFilterV2[] = [];\n  for (const filter of filters) {\n    if ((filter.type as unknown) === \"bySingleColumn\") {\n      filtersV1.push(filter);\n      filtersV2.push({\n        ...filter,\n        type: \"bySingleColumnV2\",\n      });\n    } else {\n      filtersV2.push(filter);\n    }\n  }\n  if (filtersV1.length > 0) {\n    const filtersV1Json = JSON.stringify(filtersV1);\n    logger(\n      \"warn\",\n      `type overwritten from 'bySingleColumn' to 'bySingleColumnV2' for filters: ${filtersV1Json}`,\n    );\n  }\n  return filtersV2;\n}\n\nfunction migrateTableFilter<T>(\n  def: Omit<PTableDef<T>, \"partitionFilters\"> | PTableDef<T>,\n  logger: PFrameInternal.Logger,\n): PTableDef<T> {\n  if (!(\"partitionFilters\" in def)) {\n    // For old blocks assume all axes filters to be partition filters\n    return {\n      ...def,\n      partitionFilters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"axis\"),\n        logger,\n      ),\n      filters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"column\"),\n        logger,\n      ),\n    };\n  }\n  return {\n    ...def,\n    partitionFilters: migrateFilters(def.partitionFilters, logger),\n    filters: migrateFilters(def.filters, logger),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA4EA,MAAa,kCAA2D;CACtE,GAAGA;CACH,GAAGC;CACH,mBAAmB;CACnB,mBAAmB;CACpB;AAOD,IAAa,uBAAb,MAGuD;CACrD,AAAiB;CAEjB,AAAiB;CACjB,AAAiB;CAEjB,AAAiB;CAEjB,AAAiB;CACjB,AAAiB;CACjB,AAAiB;CAEjB,AAAiB;CACjB,AAAiB;CAEjB,AAAiB;CACjB,AAAiB;CAEjB,MAAa,YAAiC;AAC5C,SAAO,MAAMC,8CAAc,WAAW;;CAGxC,AAAO,YAAY,EACjB,eAAe,IACf,mBACA,oBACA,iCAAoB,EACpB,UAAU,iCACV,mBAQC;AACD,OAAK,SAAS;AAEd,OAAK,oBAAoB;AACzB,OAAK,qBAAqB;AAE1B,OAAK,kBAAkB;AAEvB,OAAK,0BAA0B,IAAIC,uDAA4B,QAAQ,kBAAkB;AACzF,OAAK,0BAA0B,IAAIA,uDAA4B,QAAQ,kBAAkB;AAEzF,OAAK,UAAU,IAAIC,+BACjB,KAAK,mBACL,KAAK,oBACL,KAAK,QACL,UACD;AACD,OAAK,aAAa,IAAIC,sCAAc,KAAK,OAAO;AAChD,OAAK,UAAU,IAAIC,+BAAW,KAAK,SAAS,KAAK,YAAY,KAAK,OAAO;AAEzE,OAAK,sBAAsB,IAAIC,mDAAoB,KAAK,QAAQ,QAAQ;AACxE,OAAK,mBAAmB,IAAIC,4CAAiB,KAAK,QAAQ,QAAQ;;CAGpE,MAAM,UAAyB;AAC7B,EAAM,MAAM,QAAQ,WAAW;GAC7B,KAAK,QAAQ,OAAO,eAAe;GACnC,KAAK,WAAW,OAAO,eAAe;GACtC,KAAK,QAAQ,OAAO,eAAe;GACnC,KAAK,kBAAkB,OAAO,eAAe;GAC7C,KAAK,mBAAmB,OAAO,eAAe;GAC/C,CAAC;;CAGJ,OAAO,OAAO,gBAA+B;AAC3C,SAAO,MAAM,KAAK,SAAS;;CAO7B,AAAO,aAAa,KAA+D;EACjF,MAAM,aAAa,IAAI,IAAI,OAAO,OAAOC,0CAAU,CAAC;EAKpD,MAAM,wDAJmB,IACtB,QAAQ,WAAW,WAAW,IAAI,OAAO,KAAK,UAAU,CAAC,CACzD,KAAK,OAAO;GAAE,GAAG;GAAG,oEAA+B,EAAE,KAAK;GAAE,EAAE,GACf,WAAW,OAAO,GAAG,CACzC,KAAK,0DAClB,IAAI,MAAM,KAAK,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAC1D;AAED,SAAO,KAAK,QAAQ,QAAQ,QAAQ;;CAGtC,AAAO,aAAa,QAAkE;;;GACpF,MAAM,4BAAc,IAAIC,uCAAe,KAAK,oEAA+B,OAAO,IAAI,CAAC,CAAC;GACxF,MAAM,+DACJ,qEACe,SAAS,MAAM,EAAE,GAAG,EACjC,KAAK,OACN,CACF;GACD,MAAM,cAAc,KAAK,WAAW,QAAQ;IAC1C,MAAM;IACN,KAAK;IACL,cAAc,YAAY;IAC3B,CAAC;AACF,OAAIC,4BAAY,CACd,MAAK,OACH,QACA,sCAAsC,YAAY,IAAI,mBAAmB,YAAY,IAAI,GAC1F;GAGH,MAAM,cAAc,YAAY,MAAM;GACtC,MAAM,cAAc;AAClB,gBAAY,OAAO;AACnB,gBAAY,OAAO;;AAErB,UAAO;IACL,KAAK,YAAY;IACjB,UAAU,YAAY;IACtB;KACC,OAAO,UAAU;IACnB;;;;;;;CAGH,AAAO,eAAe,KAAiE;;;GACrF,MAAM,qHAA2C,IAAI,MAAM,GAAG,MAAM,EAAE,GAAG;GACzE,MAAM,aAAa,QAAQ,QACxB,KAAK,SAAU,IAAI,IAAI,MAAM,IAAI,MAAO,MACzC,EAAE,CACH;GAED,MAAM,2BAAc,IAAID,uCAAe,KAAK,aAAa,QAAQ,CAAC;GAClE,MAAM,aAAa,IAAI,IAAI,OAAO,OAAOD,0CAAU,CAAC;GAMpD,MAAM,8DALiB,OAAO,YAC5B,OAAO,QAAQ,WAAW,CACvB,QAAQ,GAAG,UAAU,WAAW,IAAI,KAAK,UAAU,CAAC,CACpD,KAAK,CAAC,IAAI,UAAU,CAAC,kEAA6B,KAAK,CAAC,CAAC,CAC7D,CACgD;GACjD,MAAM,0HAAgD,IAAI,QAAQ,MAAM,EAAE,GAAG,CAAC;GAC9E,MAAM,EAAE,WAAW,cAAc,UAAU,cAAc,YAAY;GAErE,MAAM,cAAc,KAAK,WAAW,QAAQ;IAC1C,MAAM;IACN,cAAc,YAAY;IAC1B,KAAK;KACH;KACA;KACD;IACF,CAAC;AACF,OAAIE,4BAAY,CACd,MAAK,OACH,QACA,sCAAsC,YAAY,IAAI,mBAAmB,YAAY,IAAI,GAC1F;GAGH,MAAM,cAAc,YAAY,MAAM;GACtC,MAAM,cAAc;AAClB,gBAAY,OAAO;AACnB,gBAAY,OAAO;;AAErB,UAAO;IACL,KAAK,YAAY;IACjB,UAAU,YAAY;IACtB;KACC,OAAO,UAAU;IACnB;;;;;;;CAOH,MAAa,YACX,QACA,SAC8B;EAC9B,MAAM,WAA8C;GAClD,GAAG;GACH,gBACE,QAAQ,eAAe,WAAW,IAC9B,CACE;IACE,UAAU,CACR,GAAG,IAAI,IACL,QAAQ,eAAe,KAAK,SAAS,uDAAkB,KAAK,EAAE,KAAK,CAAU,CAC9E,CAAC,QAAQ,CACX;IACD,gBAAgB,EAAE;IACnB,CACF,GACD,EAAE;GACT;EAED,MAAM,EAAE,kBAAkB,KAAK,QAAQ,SAAS,OAAO;AAIvD,SAAO,EACL,OAFe,OAFF,MAAM,eAES,YAAY,SAAS,EAElC,KACZ,QACE,MAEC,EAAE,gBAAgB,WAAW,KAC7B,EAAE,gBAAgB,MACf,MACC,EAAE,eAAe,OAAO,WAAW,KACnC,EAAE,eAAe,WAAW,OAAO,MAAM,EAAE,WAAW,EAAE,CAC3D,CACJ,CACA,KAAK,MAAM,EAAE,IAAI,EACrB;;CAGH,MAAa,cACX,QACA,UAC6B;EAC7B,MAAM,EAAE,kBAAkB,KAAK,QAAQ,SAAS,OAAO;AAEvD,SAAO,OADQ,MAAM,eACD,cAAc,SAAS;;CAG7C,MAAa,YAAY,QAAmD;EAC1E,MAAM,EAAE,kBAAkB,KAAK,QAAQ,SAAS,OAAO;AAEvD,SAAO,OADQ,MAAM,eACD,aAAa;;CAGnC,MAAa,mBACX,QACA,SACA,OACA,QACqC;;;AACrC,OAAIA,4BAAY,CACd,MAAK,OACH,QACA,qCAAqC,OAAO,cAAc,KAAK,UAAU,SAASC,+CAAe,GAClG;GAGH,MAAM,0BAAa,IAAIF,uCACrB,KAAK,QAAQ,QAAQ;IACnB,MAAM;IACN,cAAc;IACd,wDAAmB,mBAAmB,SAAS,KAAK,OAAO,CAAC;IAC7D,CAAC,CACH;GACD,MAAM,EAAE,eAAe,kBAAkB,WAAW;GACpD,MAAM,SAAS,MAAM;GAErB,MAAM,iBAAiB,YAAY,IAAI,CAAC,QAAQ,cAAc,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;AAClF,UAAO,MAAM,KAAK,wBAAwB,IAAI,YAAY;IAIxD,MAAM,OAAO,OAAO,SAAS;IAC7B,MAAM,OAAO,MAAM,OAAO,QAAQ,CAAC,GAAG,KAAK,MAAM,CAAC,EAAE;KAClD;KACA,QAAQ;KACT,CAAC;IAEF,MAAM,cAAc,MAAM,OAAO,aAAa,EAC5C,QAAQ,gBACT,CAAC;AACF,SAAK,oBAAoB,MAAM,WAAW,MAAM,EAAE,YAAY;AAE9D,WAAO,KAAK,KAAK,MAAM,OAAO;KACtB;KACN,MAAM,KAAK;KACZ,EAAE;KACH;;;;;;;CAGJ,MAAa,gBACX,QACA,SACA,QAC+B;AAC/B,MAAIC,4BAAY,CACd,MAAK,OACH,QACA,kCAAkC,OAAO,cAAc,KAAK,UAAU,SAASC,+CAAe,GAC/F;EAGH,MAAM,EAAE,eAAe,kBAAkB,KAAK,QAAQ,SAAS,OAAO;EACtE,MAAM,SAAS,MAAM;EAErB,MAAM,iBAAiB,YAAY,IAAI,CAAC,QAAQ,cAAc,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;AAClF,SAAO,MAAM,KAAK,wBAAwB,IAAI,YAAY;AACxD,UAAO,MAAM,OAAO,gBAClB;IACE,GAAG;IACH,SAAS,eAAe,QAAQ,SAAS,KAAK,OAAO;IACtD,EACD,EACE,QAAQ,gBACT,CACF;IACD;;CAOJ,MAAa,QAAQ,QAAmD;;;GACtE,MAAM,EAAE,QAAQ,KAAK,WAAW,SAAS,OAAO;GAGhD,MAAM,EAAE,+BAFM,KAAK,QAAQ,QAAQ,IAAI,EAEP;AAGhC,WAFe,MAAM,eAEP,SAAS;;;;;;;CAGzB,MAAa,SAAS,QAAsB,QAA4C;;;GACtF,MAAM,EAAE,KAAK,eAAe,qBAAqB,KAAK,WAAW,SAAS,OAAO;GACjF,MAAM,0BAAa,IAAIF,uCAAe,KAAK,QAAQ,QAAQ,IAAI,CAAC;GAEhE,MAAM,EAAE,eAAe,kBAAkB,WAAW;GACpD,MAAM,SAAS,MAAM;GAErB,MAAM,iBAAiB,YAAY,IAAI,CAAC,QAAQ,cAAc,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;GAClF,MAAM,EAAE,OAAO,gBAAgB,MAAM,KAAK,wBAAwB,IAAI,YAAY;AAShF,WAAO;KAAE,OARK,MAAM,OAAO,SAAS,EAClC,QAAQ,gBACT,CAAC;KAMc,aAJI,MAAM,OAAO,aAAa,EAC5C,QAAQ,gBACT,CAAC;KAE2B;KAC7B;AAEF,QAAK,iBAAiB,MAAM,WAAW,MAAM,EAAE,aAAa,iBAAiB;AAC7E,UAAO;;;;;;;CAGT,MAAa,QACX,QACA,eACA,OACA,QACyB;;;GACzB,MAAM,EAAE,KAAK,eAAe,qBAAqB,KAAK,WAAW,SAAS,OAAO;GACjF,MAAM,0BAAa,IAAIA,uCAAe,KAAK,QAAQ,QAAQ,IAAI,CAAC;GAEhE,MAAM,EAAE,eAAe,kBAAkB,WAAW;GACpD,MAAM,SAAS,MAAM;GAErB,MAAM,iBAAiB,YAAY,IAAI,CAAC,QAAQ,cAAc,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;GAClF,MAAM,EAAE,MAAM,gBAAgB,MAAM,KAAK,wBAAwB,IAAI,YAAY;AAU/E,WAAO;KAAE,MATI,MAAM,OAAO,QAAQ,eAAe;MAC/C;MACA,QAAQ;MACT,CAAC;KAMa,aAJK,MAAM,OAAO,aAAa,EAC5C,QAAQ,gBACT,CAAC;KAE0B;KAC5B;AAEF,QAAK,iBAAiB,MAAM,WAAW,MAAM,EAAE,aAAa,iBAAiB;AAC7E,UAAO;;;;;;;;AAIX,SAAS,eACP,SACA,QACsB;CACtB,MAAM,YAAY,EAAE;CACpB,MAAM,YAA+C,EAAE;AACvD,MAAK,MAAM,UAAU,QACnB,KAAK,OAAO,SAAqB,kBAAkB;AACjD,YAAU,KAAK,OAAO;AACtB,YAAU,KAAK;GACb,GAAG;GACH,MAAM;GACP,CAAC;OAEF,WAAU,KAAK,OAAO;AAG1B,KAAI,UAAU,SAAS,EAErB,QACE,QACA,6EAHoB,KAAK,UAAU,UAAU,GAI9C;AAEH,QAAO;;AAGT,SAAS,mBACP,KACA,QACc;AACd,KAAI,EAAE,sBAAsB,KAE1B,QAAO;EACL,GAAG;EACH,kBAAkB,eAChB,IAAI,QAAQ,QAAQ,MAAM,EAAE,OAAO,SAAS,OAAO,EACnD,OACD;EACD,SAAS,eACP,IAAI,QAAQ,QAAQ,MAAM,EAAE,OAAO,SAAS,SAAS,EACrD,OACD;EACF;AAEH,QAAO;EACL,GAAG;EACH,kBAAkB,eAAe,IAAI,kBAAkB,OAAO;EAC9D,SAAS,eAAe,IAAI,SAAS,OAAO;EAC7C"}

package/dist/driver_impl.d.ts

@@ -3,7 +3,7 @@ import { LocalBlobProvider as LocalBlobProvider$1, RemoteBlobProvider as RemoteB
 import { PTableCachePerFrameOps } from "./ptable_cache_per_frame.js";
 import { PTableCachePlainOps } from "./ptable_cache_plain.js";
 import { CalculateTableDataRequest, CalculateTableDataResponse, FindColumnsRequest, FindColumnsResponse, JsonSerializable, PColumn, PColumnIdAndSpec, PColumnSpec, PFrameDef, PFrameHandle, PObjectId, PTableColumnSpec, PTableDef, PTableDefV2, PTableHandle, PTableShape, PTableVector, TableRange, UniqueValuesRequest, UniqueValuesResponse } from "@milaboratories/pl-model-common";
-import { PoolEntry } from "@milaboratories/ts-helpers";
+import { PoolEntry } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 
 //#region src/driver_impl.d.ts

package/dist/driver_impl.js

@@ -6,7 +6,8 @@ import { PTableCachePerFrame, PTableCachePerFrameOpsDefaults } from "./ptable_ca
 import { PTableCachePlain, PTableCachePlainOpsDefaults } from "./ptable_cache_plain.js";
 import { _usingCtx } from "./_virtual/_@oxc-project_runtime@0.114.0/helpers/usingCtx.js";
 import { ValueType, bigintReplacer, canonicalizeJson, collectSpecQueryColumns, extractAllColumns, mapPObjectData, mapPTableDef, mapSpecQueryColumns, resolveAnnotationParents, sortPTableDef, sortSpecQuery, uniqueBy } from "@milaboratories/pl-model-common";
-import { ConcurrencyLimitingExecutor, PoolEntryGuard } from "@milaboratories/ts-helpers";
+import { ConcurrencyLimitingExecutor } from "@milaboratories/ts-helpers";
+import { PoolEntryGuard } from "@milaboratories/helpers";
 import { PFrameFactory } from "@milaboratories/pframes-rs-node";
 import { tmpdir } from "node:os";
 import { createPFrame } from "@milaboratories/pframes-rs-wasm";

package/dist/driver_impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver_impl.js","names":["createSpecFrame"],"sources":["../src/driver_impl.ts"],"sourcesContent":["import {\n  mapPObjectData,\n  mapPTableDef,\n  extractAllColumns,\n  uniqueBy,\n  canonicalizeJson,\n  bigintReplacer,\n  ValueType,\n  type CalculateTableDataRequest,\n  type CalculateTableDataResponse,\n  type FindColumnsRequest,\n  type FindColumnsResponse,\n  type PColumnIdAndSpec,\n  type PColumnSpec,\n  type PFrameHandle,\n  type PObjectId,\n  type PTableColumnSpec,\n  type PTableHandle,\n  type PTableShape,\n  type PTableVector,\n  type TableRange,\n  type UniqueValuesRequest,\n  type UniqueValuesResponse,\n  type PColumn,\n  type PFrameDef,\n  type PTableDef,\n  type PTableRecordSingleValueFilterV2,\n  type PTableRecordFilter,\n  type JsonSerializable,\n  type PTableDefV2,\n  mapSpecQueryColumns,\n  collectSpecQueryColumns,\n  sortSpecQuery,\n  sortPTableDef,\n  resolveAnnotationParents,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport {\n  ConcurrencyLimitingExecutor,\n  PoolEntryGuard,\n  type PoolEntry,\n} from \"@milaboratories/ts-helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport { logPFrames } from \"./logging\";\nimport {\n  PFramePool,\n  type LocalBlobProvider as PoolLocalBlobProvider,\n  type RemoteBlobProvider as PoolRemoteBlobProvider,\n} from \"./pframe_pool\";\nimport { PTableDefPool } from \"./ptable_def_pool\";\nimport { PTablePool } from \"./ptable_pool\";\nimport {\n  PTableCachePerFrame,\n  PTableCachePerFrameOpsDefaults,\n  type PTableCachePerFrameOps,\n} from \"./ptable_cache_per_frame\";\nimport {\n  PTableCachePlain,\n  PTableCachePlainOpsDefaults,\n  type PTableCachePlainOps,\n} from \"./ptable_cache_plain\";\nimport { createPFrame as createSpecFrame } from \"@milaboratories/pframes-rs-wasm\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolLocalBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolRemoteBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport type AbstractPFrameDriverOps = PTableCachePerFrameOps &\n  PTableCachePlainOps & {\n    /** Concurrency limits for `getUniqueValues` and `calculateTableData` requests */\n    pFrameConcurrency: number;\n    /** Concurrency limits for `getShape` and `getData` requests */\n    pTableConcurrency: number;\n  };\n\nexport const AbstractPFrameDriverOpsDefaults: AbstractPFrameDriverOps = {\n  ...PTableCachePerFrameOpsDefaults,\n  ...PTableCachePlainOpsDefaults,\n  pFrameConcurrency: 1, // 1 join is executed in parallel and utilize all RAM and CPU cores\n  pTableConcurrency: 1, // 1 joined table is read from disk at a time, which matches 1 table the user can view in the UI\n};\n\nexport type DataInfoResolver<PColumnData, TreeEntry extends JsonSerializable> = (\n  spec: PColumnSpec,\n  data: PColumnData,\n) => PFrameInternal.DataInfo<TreeEntry>;\n\nexport class AbstractPFrameDriver<\n  PColumnData,\n  TreeEntry extends JsonSerializable,\n> implements AbstractInternalPFrameDriver<PColumnData> {\n  private readonly logger: PFrameInternal.Logger;\n\n  private readonly localBlobProvider: LocalBlobProvider<TreeEntry>;\n  private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n\n  private readonly resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n\n  private readonly pFrames: PFramePool<TreeEntry>;\n  private readonly pTableDefs: PTableDefPool;\n  private readonly pTables: PTablePool<TreeEntry>;\n\n  private readonly pTableCachePerFrame: PTableCachePerFrame;\n  private readonly pTableCachePlain: PTableCachePlain;\n\n  private readonly frameConcurrencyLimiter: ConcurrencyLimitingExecutor;\n  private readonly tableConcurrencyLimiter: ConcurrencyLimitingExecutor;\n\n  public async pprofDump(): Promise<Uint8Array> {\n    return await PFrameFactory.pprofDump();\n  }\n\n  public constructor({\n    logger = () => {},\n    localBlobProvider,\n    remoteBlobProvider,\n    spillPath = tmpdir(),\n    options = AbstractPFrameDriverOpsDefaults,\n    resolveDataInfo,\n  }: {\n    logger?: PFrameInternal.Logger;\n    localBlobProvider: LocalBlobProvider<TreeEntry>;\n    remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n    spillPath?: string;\n    options?: AbstractPFrameDriverOps;\n    resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n  }) {\n    this.logger = logger;\n\n    this.localBlobProvider = localBlobProvider;\n    this.remoteBlobProvider = remoteBlobProvider;\n\n    this.resolveDataInfo = resolveDataInfo;\n\n    this.frameConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pFrameConcurrency);\n    this.tableConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pTableConcurrency);\n\n    this.pFrames = new PFramePool(\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      spillPath,\n    );\n    this.pTableDefs = new PTableDefPool(this.logger);\n    this.pTables = new PTablePool(this.pFrames, this.pTableDefs, this.logger);\n\n    this.pTableCachePerFrame = new PTableCachePerFrame(this.logger, options);\n    this.pTableCachePlain = new PTableCachePlain(this.logger, options);\n  }\n\n  async dispose(): Promise<void> {\n    void (await Promise.allSettled([\n      this.pTables[Symbol.asyncDispose](),\n      this.pTableDefs[Symbol.asyncDispose](),\n      this.pFrames[Symbol.asyncDispose](),\n      this.localBlobProvider[Symbol.asyncDispose](),\n      this.remoteBlobProvider[Symbol.asyncDispose](),\n    ]));\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    return await this.dispose();\n  }\n\n  //\n  // Internal / Config API Methods\n  //\n\n  public createPFrame(def: PFrameDef<PColumn<PColumnData>>): PoolEntry<PFrameHandle> {\n    const ValueTypes = new Set(Object.values(ValueType));\n    const supportedColumns = def\n      .filter((column) => ValueTypes.has(column.spec.valueType))\n      .map((c) => ({ ...c, spec: resolveAnnotationParents(c.spec) }));\n    const uniqueColumns = uniqueBy(supportedColumns, (column) => column.id);\n    const columns = uniqueColumns.map((c) =>\n      mapPObjectData(c, (d) => this.resolveDataInfo(c.spec, d)),\n    );\n\n    return this.pFrames.acquire(columns);\n  }\n\n  public createPTable(rawDef: PTableDef<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(extractAllColumns(rawDef.src)));\n    const sortedDef = sortPTableDef(\n      migrateTableFilter(\n        mapPTableDef(rawDef, (c) => c.id),\n        this.logger,\n      ),\n    );\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v1\",\n      def: sortedDef,\n      pFrameHandle: pFrameGuard.key,\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  public createPTableV2(def: PTableDefV2<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    const columns = uniqueBy(collectSpecQueryColumns(def.query), (c) => c.id);\n    const columnsMap = columns.reduce(\n      (acc, col) => ((acc[col.id] = col.spec), acc),\n      {} as Record<string, PColumnSpec>,\n    );\n\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(columns));\n    const ValueTypes = new Set(Object.values(ValueType));\n    const specColumnsMap = Object.fromEntries(\n      Object.entries(columnsMap)\n        .filter(([, spec]) => ValueTypes.has(spec.valueType))\n        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),\n    );\n    const specFrame = createSpecFrame(specColumnsMap);\n    const sortedQuery = sortSpecQuery(mapSpecQueryColumns(def.query, (c) => c.id));\n    const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);\n\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v2\",\n      pFrameHandle: pFrameGuard.key,\n      def: {\n        tableSpec,\n        dataQuery,\n      },\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  //\n  // PFrame instance methods\n  //\n\n  public async findColumns(\n    handle: PFrameHandle,\n    request: FindColumnsRequest,\n  ): Promise<FindColumnsResponse> {\n    const iRequest: PFrameInternal.FindColumnsRequest = {\n      ...request,\n      compatibleWith:\n        request.compatibleWith.length !== 0\n          ? [\n              {\n                axesSpec: [\n                  ...new Map(\n                    request.compatibleWith.map((item) => [canonicalizeJson(item), item] as const),\n                  ).values(),\n                ],\n                qualifications: [],\n              },\n            ]\n          : [],\n    };\n\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const response = await pFrame.findColumns(iRequest);\n    return {\n      hits: response.hits\n        .filter(\n          (h) =>\n            // only exactly matching columns\n            h.mappingVariants.length === 0 ||\n            h.mappingVariants.some(\n              (v) =>\n                v.qualifications.forHit.length === 0 &&\n                v.qualifications.forQueries.every((q) => q.length === 0),\n            ),\n        )\n        .map((h) => h.hit),\n    };\n  }\n\n  public async getColumnSpec(\n    handle: PFrameHandle,\n    columnId: PObjectId,\n  ): Promise<PColumnSpec | null> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.getColumnSpec(columnId);\n  }\n\n  public async listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.listColumns();\n  }\n\n  public async calculateTableData(\n    handle: PFrameHandle,\n    request: CalculateTableDataRequest<PObjectId>,\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<CalculateTableDataResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    using tableGuard = new PoolEntryGuard(\n      this.pTables.acquire({\n        type: \"v1\",\n        pFrameHandle: handle,\n        def: sortPTableDef(migrateTableFilter(request, this.logger)),\n      }),\n    );\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      // TODO: throw error when more then 150k rows is requested\n      // after pf-plots migration to stream API\n\n      const spec = pTable.getSpec();\n      const data = await pTable.getData([...spec.keys()], {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n      this.pTableCachePerFrame.cache(tableGuard.keep(), overallSize);\n\n      return spec.map((spec, i) => ({\n        spec: spec,\n        data: data[i],\n      }));\n    });\n  }\n\n  public async getUniqueValues(\n    handle: PFrameHandle,\n    request: UniqueValuesRequest,\n    signal?: AbortSignal,\n  ): Promise<UniqueValuesResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      return await pFrame.getUniqueValues(\n        {\n          ...request,\n          filters: migrateFilters(request.filters, this.logger),\n        },\n        {\n          signal: combinedSignal,\n        },\n      );\n    });\n  }\n\n  //\n  // PTable instance methods\n  //\n\n  public async getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {\n    const { def } = this.pTableDefs.getByKey(handle);\n    using table = this.pTables.acquire(def);\n\n    const { pTablePromise } = table.resource;\n    const pTable = await pTablePromise;\n\n    return pTable.getSpec();\n  }\n\n  public async getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const shape = await pTable.getShape({\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { shape, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return shape;\n  }\n\n  public async getData(\n    handle: PTableHandle,\n    columnIndices: number[],\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<PTableVector[]> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const data = await pTable.getData(columnIndices, {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { data, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return data;\n  }\n}\n\nfunction migrateFilters(\n  filters: PTableRecordFilter[],\n  logger: PFrameInternal.Logger,\n): PTableRecordFilter[] {\n  const filtersV1 = [];\n  const filtersV2: PTableRecordSingleValueFilterV2[] = [];\n  for (const filter of filters) {\n    if ((filter.type as unknown) === \"bySingleColumn\") {\n      filtersV1.push(filter);\n      filtersV2.push({\n        ...filter,\n        type: \"bySingleColumnV2\",\n      });\n    } else {\n      filtersV2.push(filter);\n    }\n  }\n  if (filtersV1.length > 0) {\n    const filtersV1Json = JSON.stringify(filtersV1);\n    logger(\n      \"warn\",\n      `type overwritten from 'bySingleColumn' to 'bySingleColumnV2' for filters: ${filtersV1Json}`,\n    );\n  }\n  return filtersV2;\n}\n\nfunction migrateTableFilter<T>(\n  def: Omit<PTableDef<T>, \"partitionFilters\"> | PTableDef<T>,\n  logger: PFrameInternal.Logger,\n): PTableDef<T> {\n  if (!(\"partitionFilters\" in def)) {\n    // For old blocks assume all axes filters to be partition filters\n    return {\n      ...def,\n      partitionFilters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"axis\"),\n        logger,\n      ),\n      filters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"column\"),\n        logger,\n      ),\n    };\n  }\n  return {\n    ...def,\n    partitionFilters: migrateFilters(def.partitionFilters, logger),\n    filters: migrateFilters(def.filters, logger),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"driver_impl.js","names":["createSpecFrame"],"sources":["../src/driver_impl.ts"],"sourcesContent":["import {\n  mapPObjectData,\n  mapPTableDef,\n  extractAllColumns,\n  uniqueBy,\n  canonicalizeJson,\n  bigintReplacer,\n  ValueType,\n  type CalculateTableDataRequest,\n  type CalculateTableDataResponse,\n  type FindColumnsRequest,\n  type FindColumnsResponse,\n  type PColumnIdAndSpec,\n  type PColumnSpec,\n  type PFrameHandle,\n  type PObjectId,\n  type PTableColumnSpec,\n  type PTableHandle,\n  type PTableShape,\n  type PTableVector,\n  type TableRange,\n  type UniqueValuesRequest,\n  type UniqueValuesResponse,\n  type PColumn,\n  type PFrameDef,\n  type PTableDef,\n  type PTableRecordSingleValueFilterV2,\n  type PTableRecordFilter,\n  type JsonSerializable,\n  type PTableDefV2,\n  mapSpecQueryColumns,\n  collectSpecQueryColumns,\n  sortSpecQuery,\n  sortPTableDef,\n  resolveAnnotationParents,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { ConcurrencyLimitingExecutor } from \"@milaboratories/ts-helpers\";\nimport { PoolEntryGuard, type PoolEntry } from \"@milaboratories/helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { tmpdir } from \"node:os\";\nimport type { AbstractInternalPFrameDriver } from \"./driver_decl\";\nimport { logPFrames } from \"./logging\";\nimport {\n  PFramePool,\n  type LocalBlobProvider as PoolLocalBlobProvider,\n  type RemoteBlobProvider as PoolRemoteBlobProvider,\n} from \"./pframe_pool\";\nimport { PTableDefPool } from \"./ptable_def_pool\";\nimport { PTablePool } from \"./ptable_pool\";\nimport {\n  PTableCachePerFrame,\n  PTableCachePerFrameOpsDefaults,\n  type PTableCachePerFrameOps,\n} from \"./ptable_cache_per_frame\";\nimport {\n  PTableCachePlain,\n  PTableCachePlainOpsDefaults,\n  type PTableCachePlainOps,\n} from \"./ptable_cache_plain\";\nimport { createPFrame as createSpecFrame } from \"@milaboratories/pframes-rs-wasm\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolLocalBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable>\n  extends PoolRemoteBlobProvider<TreeEntry>, AsyncDisposable {}\n\nexport type AbstractPFrameDriverOps = PTableCachePerFrameOps &\n  PTableCachePlainOps & {\n    /** Concurrency limits for `getUniqueValues` and `calculateTableData` requests */\n    pFrameConcurrency: number;\n    /** Concurrency limits for `getShape` and `getData` requests */\n    pTableConcurrency: number;\n  };\n\nexport const AbstractPFrameDriverOpsDefaults: AbstractPFrameDriverOps = {\n  ...PTableCachePerFrameOpsDefaults,\n  ...PTableCachePlainOpsDefaults,\n  pFrameConcurrency: 1, // 1 join is executed in parallel and utilize all RAM and CPU cores\n  pTableConcurrency: 1, // 1 joined table is read from disk at a time, which matches 1 table the user can view in the UI\n};\n\nexport type DataInfoResolver<PColumnData, TreeEntry extends JsonSerializable> = (\n  spec: PColumnSpec,\n  data: PColumnData,\n) => PFrameInternal.DataInfo<TreeEntry>;\n\nexport class AbstractPFrameDriver<\n  PColumnData,\n  TreeEntry extends JsonSerializable,\n> implements AbstractInternalPFrameDriver<PColumnData> {\n  private readonly logger: PFrameInternal.Logger;\n\n  private readonly localBlobProvider: LocalBlobProvider<TreeEntry>;\n  private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n\n  private readonly resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n\n  private readonly pFrames: PFramePool<TreeEntry>;\n  private readonly pTableDefs: PTableDefPool;\n  private readonly pTables: PTablePool<TreeEntry>;\n\n  private readonly pTableCachePerFrame: PTableCachePerFrame;\n  private readonly pTableCachePlain: PTableCachePlain;\n\n  private readonly frameConcurrencyLimiter: ConcurrencyLimitingExecutor;\n  private readonly tableConcurrencyLimiter: ConcurrencyLimitingExecutor;\n\n  public async pprofDump(): Promise<Uint8Array> {\n    return await PFrameFactory.pprofDump();\n  }\n\n  public constructor({\n    logger = () => {},\n    localBlobProvider,\n    remoteBlobProvider,\n    spillPath = tmpdir(),\n    options = AbstractPFrameDriverOpsDefaults,\n    resolveDataInfo,\n  }: {\n    logger?: PFrameInternal.Logger;\n    localBlobProvider: LocalBlobProvider<TreeEntry>;\n    remoteBlobProvider: RemoteBlobProvider<TreeEntry>;\n    spillPath?: string;\n    options?: AbstractPFrameDriverOps;\n    resolveDataInfo: DataInfoResolver<PColumnData, TreeEntry>;\n  }) {\n    this.logger = logger;\n\n    this.localBlobProvider = localBlobProvider;\n    this.remoteBlobProvider = remoteBlobProvider;\n\n    this.resolveDataInfo = resolveDataInfo;\n\n    this.frameConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pFrameConcurrency);\n    this.tableConcurrencyLimiter = new ConcurrencyLimitingExecutor(options.pTableConcurrency);\n\n    this.pFrames = new PFramePool(\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      spillPath,\n    );\n    this.pTableDefs = new PTableDefPool(this.logger);\n    this.pTables = new PTablePool(this.pFrames, this.pTableDefs, this.logger);\n\n    this.pTableCachePerFrame = new PTableCachePerFrame(this.logger, options);\n    this.pTableCachePlain = new PTableCachePlain(this.logger, options);\n  }\n\n  async dispose(): Promise<void> {\n    void (await Promise.allSettled([\n      this.pTables[Symbol.asyncDispose](),\n      this.pTableDefs[Symbol.asyncDispose](),\n      this.pFrames[Symbol.asyncDispose](),\n      this.localBlobProvider[Symbol.asyncDispose](),\n      this.remoteBlobProvider[Symbol.asyncDispose](),\n    ]));\n  }\n\n  async [Symbol.asyncDispose](): Promise<void> {\n    return await this.dispose();\n  }\n\n  //\n  // Internal / Config API Methods\n  //\n\n  public createPFrame(def: PFrameDef<PColumn<PColumnData>>): PoolEntry<PFrameHandle> {\n    const ValueTypes = new Set(Object.values(ValueType));\n    const supportedColumns = def\n      .filter((column) => ValueTypes.has(column.spec.valueType))\n      .map((c) => ({ ...c, spec: resolveAnnotationParents(c.spec) }));\n    const uniqueColumns = uniqueBy(supportedColumns, (column) => column.id);\n    const columns = uniqueColumns.map((c) =>\n      mapPObjectData(c, (d) => this.resolveDataInfo(c.spec, d)),\n    );\n\n    return this.pFrames.acquire(columns);\n  }\n\n  public createPTable(rawDef: PTableDef<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(extractAllColumns(rawDef.src)));\n    const sortedDef = sortPTableDef(\n      migrateTableFilter(\n        mapPTableDef(rawDef, (c) => c.id),\n        this.logger,\n      ),\n    );\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v1\",\n      def: sortedDef,\n      pFrameHandle: pFrameGuard.key,\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  public createPTableV2(def: PTableDefV2<PColumn<PColumnData>>): PoolEntry<PTableHandle> {\n    const columns = uniqueBy(collectSpecQueryColumns(def.query), (c) => c.id);\n    const columnsMap = columns.reduce(\n      (acc, col) => ((acc[col.id] = col.spec), acc),\n      {} as Record<string, PColumnSpec>,\n    );\n\n    using pFrameGuard = new PoolEntryGuard(this.createPFrame(columns));\n    const ValueTypes = new Set(Object.values(ValueType));\n    const specColumnsMap = Object.fromEntries(\n      Object.entries(columnsMap)\n        .filter(([, spec]) => ValueTypes.has(spec.valueType))\n        .map(([id, spec]) => [id, resolveAnnotationParents(spec)]),\n    );\n    const specFrame = createSpecFrame(specColumnsMap);\n    const sortedQuery = sortSpecQuery(mapSpecQueryColumns(def.query, (c) => c.id));\n    const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);\n\n    const pTableEntry = this.pTableDefs.acquire({\n      type: \"v2\",\n      pFrameHandle: pFrameGuard.key,\n      def: {\n        tableSpec,\n        dataQuery,\n      },\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\n    const pFrameEntry = pFrameGuard.keep();\n    const unref = () => {\n      pTableEntry.unref();\n      pFrameEntry.unref();\n    };\n    return {\n      key: pTableEntry.key,\n      resource: pTableEntry.resource,\n      unref,\n      [Symbol.dispose]: unref,\n    };\n  }\n\n  //\n  // PFrame instance methods\n  //\n\n  public async findColumns(\n    handle: PFrameHandle,\n    request: FindColumnsRequest,\n  ): Promise<FindColumnsResponse> {\n    const iRequest: PFrameInternal.FindColumnsRequest = {\n      ...request,\n      compatibleWith:\n        request.compatibleWith.length !== 0\n          ? [\n              {\n                axesSpec: [\n                  ...new Map(\n                    request.compatibleWith.map((item) => [canonicalizeJson(item), item] as const),\n                  ).values(),\n                ],\n                qualifications: [],\n              },\n            ]\n          : [],\n    };\n\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const response = await pFrame.findColumns(iRequest);\n    return {\n      hits: response.hits\n        .filter(\n          (h) =>\n            // only exactly matching columns\n            h.mappingVariants.length === 0 ||\n            h.mappingVariants.some(\n              (v) =>\n                v.qualifications.forHit.length === 0 &&\n                v.qualifications.forQueries.every((q) => q.length === 0),\n            ),\n        )\n        .map((h) => h.hit),\n    };\n  }\n\n  public async getColumnSpec(\n    handle: PFrameHandle,\n    columnId: PObjectId,\n  ): Promise<PColumnSpec | null> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.getColumnSpec(columnId);\n  }\n\n  public async listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]> {\n    const { pFramePromise } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n    return await pFrame.listColumns();\n  }\n\n  public async calculateTableData(\n    handle: PFrameHandle,\n    request: CalculateTableDataRequest<PObjectId>,\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<CalculateTableDataResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    using tableGuard = new PoolEntryGuard(\n      this.pTables.acquire({\n        type: \"v1\",\n        pFrameHandle: handle,\n        def: sortPTableDef(migrateTableFilter(request, this.logger)),\n      }),\n    );\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      // TODO: throw error when more then 150k rows is requested\n      // after pf-plots migration to stream API\n\n      const spec = pTable.getSpec();\n      const data = await pTable.getData([...spec.keys()], {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n      this.pTableCachePerFrame.cache(tableGuard.keep(), overallSize);\n\n      return spec.map((spec, i) => ({\n        spec: spec,\n        data: data[i],\n      }));\n    });\n  }\n\n  public async getUniqueValues(\n    handle: PFrameHandle,\n    request: UniqueValuesRequest,\n    signal?: AbortSignal,\n  ): Promise<UniqueValuesResponse> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,\n      );\n    }\n\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(handle);\n    const pFrame = await pFramePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    return await this.frameConcurrencyLimiter.run(async () => {\n      return await pFrame.getUniqueValues(\n        {\n          ...request,\n          filters: migrateFilters(request.filters, this.logger),\n        },\n        {\n          signal: combinedSignal,\n        },\n      );\n    });\n  }\n\n  //\n  // PTable instance methods\n  //\n\n  public async getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {\n    const { def } = this.pTableDefs.getByKey(handle);\n    using table = this.pTables.acquire(def);\n\n    const { pTablePromise } = table.resource;\n    const pTable = await pTablePromise;\n\n    return pTable.getSpec();\n  }\n\n  public async getShape(handle: PTableHandle, signal?: AbortSignal): Promise<PTableShape> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const shape = await pTable.getShape({\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { shape, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return shape;\n  }\n\n  public async getData(\n    handle: PTableHandle,\n    columnIndices: number[],\n    range: TableRange | undefined,\n    signal?: AbortSignal,\n  ): Promise<PTableVector[]> {\n    const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);\n    using tableGuard = new PoolEntryGuard(this.pTables.acquire(def));\n\n    const { pTablePromise, disposeSignal } = tableGuard.resource;\n    const pTable = await pTablePromise;\n\n    const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));\n    const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {\n      const data = await pTable.getData(columnIndices, {\n        range,\n        signal: combinedSignal,\n      });\n\n      const overallSize = await pTable.getFootprint({\n        signal: combinedSignal,\n      });\n\n      return { data, overallSize };\n    });\n\n    this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);\n    return data;\n  }\n}\n\nfunction migrateFilters(\n  filters: PTableRecordFilter[],\n  logger: PFrameInternal.Logger,\n): PTableRecordFilter[] {\n  const filtersV1 = [];\n  const filtersV2: PTableRecordSingleValueFilterV2[] = [];\n  for (const filter of filters) {\n    if ((filter.type as unknown) === \"bySingleColumn\") {\n      filtersV1.push(filter);\n      filtersV2.push({\n        ...filter,\n        type: \"bySingleColumnV2\",\n      });\n    } else {\n      filtersV2.push(filter);\n    }\n  }\n  if (filtersV1.length > 0) {\n    const filtersV1Json = JSON.stringify(filtersV1);\n    logger(\n      \"warn\",\n      `type overwritten from 'bySingleColumn' to 'bySingleColumnV2' for filters: ${filtersV1Json}`,\n    );\n  }\n  return filtersV2;\n}\n\nfunction migrateTableFilter<T>(\n  def: Omit<PTableDef<T>, \"partitionFilters\"> | PTableDef<T>,\n  logger: PFrameInternal.Logger,\n): PTableDef<T> {\n  if (!(\"partitionFilters\" in def)) {\n    // For old blocks assume all axes filters to be partition filters\n    return {\n      ...def,\n      partitionFilters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"axis\"),\n        logger,\n      ),\n      filters: migrateFilters(\n        def.filters.filter((f) => f.column.type === \"column\"),\n        logger,\n      ),\n    };\n  }\n  return {\n    ...def,\n    partitionFilters: migrateFilters(def.partitionFilters, logger),\n    filters: migrateFilters(def.filters, logger),\n  };\n}\n"],"mappings":"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"}

package/dist/pframe_pool.cjs

@@ -1,7 +1,7 @@
 const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
 const require_logging = require('./logging.cjs');
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
-let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 let _milaboratories_pframes_rs_node = require("@milaboratories/pframes-rs-node");
 let _milaboratories_pl_model_middle_layer = require("@milaboratories/pl-model-middle-layer");
 let es_toolkit = require("es-toolkit");
@@ -95,7 +95,7 @@ var PFrameHolder = class {
 		this.pFramePromise.then((pFrame) => pFrame.dispose()).catch(() => {});
 	}
 };
-var PFramePool = class extends _milaboratories_ts_helpers.RefCountPoolBase {
+var PFramePool = class extends _milaboratories_helpers.RefCountPoolBase {
 	constructor(localBlobProvider, remoteBlobProvider, logger, spillPath) {
 		super();
 		this.localBlobProvider = localBlobProvider;

package/dist/pframe_pool.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"pframe_pool.cjs","names":["PFrameInternal","PFrameFactory","PFrameDriverError","RefCountPoolBase","logPFrames","bigintReplacer"],"sources":["../src/pframe_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  canonicalizeJson,\n  ensureError,\n  mapPObjectData,\n  PFrameDriverError,\n  type JsonSerializable,\n  type PColumn,\n  type PFrameHandle,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson, PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { mapValues } from \"es-toolkit\";\nimport { logPFrames } from \"./logging\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  makeDataSource(signal: AbortSignal): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\">;\n}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  httpServerInfo(): PFrameInternal.HttpServerInfo;\n}\n\nexport class PFrameHolder<TreeEntry extends JsonSerializable> implements Disposable {\n  public readonly pFramePromise: Promise<PFrameInternal.PFrameV13>;\n  private readonly abortController = new AbortController();\n\n  private readonly localBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n  private readonly remoteBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n\n  constructor(\n    frameId: PFrameInternal.PFrameId,\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n    columns: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ) {\n    const makeLocalBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const localBlob = this.localBlobProvider.acquire(blob);\n      this.localBlobs.push(localBlob);\n      return localBlob.key;\n    };\n\n    const makeRemoteBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const remoteBlob = this.remoteBlobProvider.acquire(blob);\n      this.remoteBlobs.push(remoteBlob);\n      return `${remoteBlob.key}${PFrameInternal.ParquetExtension}` as PFrameInternal.PFrameBlobId;\n    };\n\n    const mapColumnData = (\n      data: PFrameInternal.DataInfo<TreeEntry>,\n    ): PFrameInternal.DataInfo<PFrameInternal.PFrameBlobId> => {\n      switch (data.type) {\n        case \"Json\":\n          return { ...data };\n        case \"JsonPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, makeLocalBlobId),\n          };\n        case \"BinaryPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              index: makeLocalBlobId(v.index),\n              values: makeLocalBlobId(v.values),\n            })),\n          };\n        case \"ParquetPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              ...v,\n              data: makeRemoteBlobId(v.data),\n            })),\n          };\n        default:\n          assertNever(data);\n      }\n    };\n\n    const jsonifiedColumns = columns.map((column) => ({\n      ...column,\n      data: mapColumnData(column.data),\n    }));\n\n    try {\n      const pFrame = PFrameFactory.createPFrame({ frameId, spillPath: this.spillPath, logger });\n      pFrame.setDataSource({\n        ...this.localBlobProvider.makeDataSource(this.disposeSignal),\n        parquetServer: this.remoteBlobProvider.httpServerInfo(),\n      });\n\n      const promises: Promise<void>[] = [];\n      for (const column of jsonifiedColumns) {\n        pFrame.addColumnSpec(column.id, column.spec);\n        promises.push(pFrame.setColumnData(column.id, column.data, { signal: this.disposeSignal }));\n      }\n\n      this.pFramePromise = Promise.all(promises)\n        .then(() => pFrame)\n        .catch((err) => {\n          this.dispose();\n          pFrame.dispose();\n          const error = new PFrameDriverError(\"PFrame creation failed asynchronously\");\n          error.cause = new Error(\n            `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n            { cause: ensureError(err) },\n          );\n          throw error;\n        });\n    } catch (err: unknown) {\n      const error = new PFrameDriverError(\"PFrame creation failed synchronously\");\n      error.cause = new Error(\n        `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n        { cause: ensureError(err) },\n      );\n      throw error;\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  private dispose(): void {\n    this.abortController.abort();\n    this.localBlobs.forEach((entry) => entry.unref());\n    this.remoteBlobs.forEach((entry) => entry.unref());\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n    void this.pFramePromise\n      .then((pFrame) => pFrame.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PFramePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  PFrameHandle,\n  PFrameHolder<TreeEntry>\n> {\n  constructor(\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    private readonly logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ): PFrameHandle {\n    return stableKeyFromPFrameData(params);\n  }\n\n  protected createNewResource(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n    key: PFrameHandle,\n  ): PFrameHolder<TreeEntry> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PFrame creation (pFrameHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n    return new PFrameHolder(\n      key,\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      this.spillPath,\n      params,\n    );\n  }\n\n  public getByKey(key: PFrameHandle): PFrameHolder<TreeEntry> {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PFrame handle`);\n      error.cause = new Error(`PFrame with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction stableKeyFromPFrameData<TreeEntry extends JsonSerializable>(\n  data: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n): PFrameHandle {\n  const orderedData = [...data].map((column) =>\n    mapPObjectData(column, (r) => {\n      let result: {\n        type: string;\n        keyLength: number;\n        payload: {\n          key: string;\n          value: null | number | string | [string, string];\n        }[];\n      };\n      const type = r.type;\n      switch (type) {\n        case \"Json\":\n          result = {\n            type: r.type,\n            keyLength: r.keyLength,\n            payload: Object.entries(r.data).map(([part, value]) => ({\n              key: part,\n              value,\n            })),\n          };\n          break;\n        case \"JsonPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: canonicalizeJson(info),\n            })),\n          };\n          break;\n        case \"BinaryPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: [canonicalizeJson(info.index), canonicalizeJson(info.values)] as const,\n            })),\n          };\n          break;\n        case \"ParquetPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value:\n                info.dataDigest ||\n                ([\n                  canonicalizeJson(info.data),\n                  JSON.stringify({ axes: info.axes, column: info.column }),\n                ] as const),\n            })),\n          };\n          break;\n        default:\n          throw new PFrameDriverError(\n            `unsupported resource type: ${JSON.stringify(type satisfies never)}`,\n          );\n      }\n      result.payload.sort((lhs, rhs) => (lhs.key < rhs.key ? -1 : 1));\n      return result;\n    }),\n  );\n  orderedData.sort((lhs, rhs) => (lhs.id < rhs.id ? -1 : 1));\n  return hashJson(orderedData) as string as PFrameHandle;\n}\n"],"mappings":";;;;;;;;;AA2BA,IAAa,eAAb,MAAoF;CAClF,AAAgB;CAChB,AAAiB,kBAAkB,IAAI,iBAAiB;CAExD,AAAiB,aAAuD,EAAE;CAC1E,AAAiB,cAAwD,EAAE;CAE3E,YACE,SACA,AAAiB,mBACjB,AAAiB,oBACjB,QACA,AAAiB,WACjB,SACA;EALiB;EACA;EAEA;EAGjB,MAAM,mBAAmB,SAAiD;GACxE,MAAM,YAAY,KAAK,kBAAkB,QAAQ,KAAK;AACtD,QAAK,WAAW,KAAK,UAAU;AAC/B,UAAO,UAAU;;EAGnB,MAAM,oBAAoB,SAAiD;GACzE,MAAM,aAAa,KAAK,mBAAmB,QAAQ,KAAK;AACxD,QAAK,YAAY,KAAK,WAAW;AACjC,UAAO,GAAG,WAAW,MAAMA,qDAAe;;EAG5C,MAAM,iBACJ,SACyD;AACzD,WAAQ,KAAK,MAAb;IACE,KAAK,OACH,QAAO,EAAE,GAAG,MAAM;IACpB,KAAK,kBACH,QAAO;KACL,GAAG;KACH,iCAAiB,KAAK,OAAO,gBAAgB;KAC9C;IACH,KAAK,oBACH,QAAO;KACL,GAAG;KACH,iCAAiB,KAAK,QAAQ,OAAO;MACnC,OAAO,gBAAgB,EAAE,MAAM;MAC/B,QAAQ,gBAAgB,EAAE,OAAO;MAClC,EAAE;KACJ;IACH,KAAK,qBACH,QAAO;KACL,GAAG;KACH,iCAAiB,KAAK,QAAQ,OAAO;MACnC,GAAG;MACH,MAAM,iBAAiB,EAAE,KAAK;MAC/B,EAAE;KACJ;IACH,QACE,kDAAY,KAAK;;;EAIvB,MAAM,mBAAmB,QAAQ,KAAK,YAAY;GAChD,GAAG;GACH,MAAM,cAAc,OAAO,KAAK;GACjC,EAAE;AAEH,MAAI;GACF,MAAM,SAASC,8CAAc,aAAa;IAAE;IAAS,WAAW,KAAK;IAAW;IAAQ,CAAC;AACzF,UAAO,cAAc;IACnB,GAAG,KAAK,kBAAkB,eAAe,KAAK,cAAc;IAC5D,eAAe,KAAK,mBAAmB,gBAAgB;IACxD,CAAC;GAEF,MAAM,WAA4B,EAAE;AACpC,QAAK,MAAM,UAAU,kBAAkB;AACrC,WAAO,cAAc,OAAO,IAAI,OAAO,KAAK;AAC5C,aAAS,KAAK,OAAO,cAAc,OAAO,IAAI,OAAO,MAAM,EAAE,QAAQ,KAAK,eAAe,CAAC,CAAC;;AAG7F,QAAK,gBAAgB,QAAQ,IAAI,SAAS,CACvC,WAAW,OAAO,CAClB,OAAO,QAAQ;AACd,SAAK,SAAS;AACd,WAAO,SAAS;IAChB,MAAM,QAAQ,IAAIC,kDAAkB,wCAAwC;AAC5E,UAAM,QAAQ,IAAI,MAChB,0CAA0C,KAAK,UAAU,iBAAiB,IAC1E,EAAE,wDAAmB,IAAI,EAAE,CAC5B;AACD,UAAM;KACN;WACG,KAAc;GACrB,MAAM,QAAQ,IAAIA,kDAAkB,uCAAuC;AAC3E,SAAM,QAAQ,IAAI,MAChB,0CAA0C,KAAK,UAAU,iBAAiB,IAC1E,EAAE,wDAAmB,IAAI,EAAE,CAC5B;AACD,SAAM;;;CAIV,IAAW,gBAA6B;AACtC,SAAO,KAAK,gBAAgB;;CAG9B,AAAQ,UAAgB;AACtB,OAAK,gBAAgB,OAAO;AAC5B,OAAK,WAAW,SAAS,UAAU,MAAM,OAAO,CAAC;AACjD,OAAK,YAAY,SAAS,UAAU,MAAM,OAAO,CAAC;;CAGpD,CAAC,OAAO,WAAiB;AACvB,OAAK,SAAS;AACd,EAAK,KAAK,cACP,MAAM,WAAW,OAAO,SAAS,CAAC,CAClC,YAAY,GAEX;;;AAIR,IAAa,aAAb,cAAoEC,4CAIlE;CACA,YACE,AAAiB,mBACjB,AAAiB,oBACjB,AAAiB,QACjB,AAAiB,WACjB;AACA,SAAO;EALU;EACA;EACA;EACA;;CAKnB,AAAU,mBACR,QACc;AACd,SAAO,wBAAwB,OAAO;;CAGxC,AAAU,kBACR,QACA,KACyB;AACzB,MAAIC,4BAAY,CACd,MAAK,OACH,QACA,mCAAmC,IAAI,KAAU,KAAK,UAAU,QAAQC,+CAAe,GACxF;AAEH,SAAO,IAAI,aACT,KACA,KAAK,mBACL,KAAK,oBACL,KAAK,QACL,KAAK,WACL,OACD;;CAGH,AAAO,SAAS,KAA4C;EAC1D,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIH,kDAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,sBAAsB,IAAI,YAAY;AAC9D,SAAM;;AAER,SAAO;;;AAIX,SAAS,wBACP,MACc;CACd,MAAM,cAAc,CAAC,GAAG,KAAK,CAAC,KAAK,+DAClB,SAAS,MAAM;EAC5B,IAAI;EAQJ,MAAM,OAAO,EAAE;AACf,UAAQ,MAAR;GACE,KAAK;AACH,aAAS;KACP,MAAM,EAAE;KACR,WAAW,EAAE;KACb,SAAS,OAAO,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,YAAY;MACtD,KAAK;MACL;MACD,EAAE;KACJ;AACD;GACF,KAAK;AACH,aAAS;KACP,MAAM,EAAE;KACR,WAAW,EAAE;KACb,SAAS,OAAO,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW;MACtD,KAAK;MACL,6DAAwB,KAAK;MAC9B,EAAE;KACJ;AACD;GACF,KAAK;AACH,aAAS;KACP,MAAM,EAAE;KACR,WAAW,EAAE;KACb,SAAS,OAAO,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW;MACtD,KAAK;MACL,OAAO,uDAAkB,KAAK,MAAM,wDAAmB,KAAK,OAAO,CAAC;MACrE,EAAE;KACJ;AACD;GACF,KAAK;AACH,aAAS;KACP,MAAM,EAAE;KACR,WAAW,EAAE;KACb,SAAS,OAAO,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW;MACtD,KAAK;MACL,OACE,KAAK,cACJ,uDACkB,KAAK,KAAK,EAC3B,KAAK,UAAU;OAAE,MAAM,KAAK;OAAM,QAAQ,KAAK;OAAQ,CAAC,CACzD;MACJ,EAAE;KACJ;AACD;GACF,QACE,OAAM,IAAIA,kDACR,8BAA8B,KAAK,UAAU,KAAqB,GACnE;;AAEL,SAAO,QAAQ,MAAM,KAAK,QAAS,IAAI,MAAM,IAAI,MAAM,KAAK,EAAG;AAC/D,SAAO;GACP,CACH;AACD,aAAY,MAAM,KAAK,QAAS,IAAI,KAAK,IAAI,KAAK,KAAK,EAAG;AAC1D,4DAAgB,YAAY"}
+{"version":3,"file":"pframe_pool.cjs","names":["PFrameInternal","PFrameFactory","PFrameDriverError","RefCountPoolBase","logPFrames","bigintReplacer"],"sources":["../src/pframe_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  canonicalizeJson,\n  ensureError,\n  mapPObjectData,\n  PFrameDriverError,\n  type JsonSerializable,\n  type PColumn,\n  type PFrameHandle,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson, PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { mapValues } from \"es-toolkit\";\nimport { logPFrames } from \"./logging\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  makeDataSource(signal: AbortSignal): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\">;\n}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  httpServerInfo(): PFrameInternal.HttpServerInfo;\n}\n\nexport class PFrameHolder<TreeEntry extends JsonSerializable> implements Disposable {\n  public readonly pFramePromise: Promise<PFrameInternal.PFrameV13>;\n  private readonly abortController = new AbortController();\n\n  private readonly localBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n  private readonly remoteBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n\n  constructor(\n    frameId: PFrameInternal.PFrameId,\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n    columns: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ) {\n    const makeLocalBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const localBlob = this.localBlobProvider.acquire(blob);\n      this.localBlobs.push(localBlob);\n      return localBlob.key;\n    };\n\n    const makeRemoteBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const remoteBlob = this.remoteBlobProvider.acquire(blob);\n      this.remoteBlobs.push(remoteBlob);\n      return `${remoteBlob.key}${PFrameInternal.ParquetExtension}` as PFrameInternal.PFrameBlobId;\n    };\n\n    const mapColumnData = (\n      data: PFrameInternal.DataInfo<TreeEntry>,\n    ): PFrameInternal.DataInfo<PFrameInternal.PFrameBlobId> => {\n      switch (data.type) {\n        case \"Json\":\n          return { ...data };\n        case \"JsonPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, makeLocalBlobId),\n          };\n        case \"BinaryPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              index: makeLocalBlobId(v.index),\n              values: makeLocalBlobId(v.values),\n            })),\n          };\n        case \"ParquetPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              ...v,\n              data: makeRemoteBlobId(v.data),\n            })),\n          };\n        default:\n          assertNever(data);\n      }\n    };\n\n    const jsonifiedColumns = columns.map((column) => ({\n      ...column,\n      data: mapColumnData(column.data),\n    }));\n\n    try {\n      const pFrame = PFrameFactory.createPFrame({ frameId, spillPath: this.spillPath, logger });\n      pFrame.setDataSource({\n        ...this.localBlobProvider.makeDataSource(this.disposeSignal),\n        parquetServer: this.remoteBlobProvider.httpServerInfo(),\n      });\n\n      const promises: Promise<void>[] = [];\n      for (const column of jsonifiedColumns) {\n        pFrame.addColumnSpec(column.id, column.spec);\n        promises.push(pFrame.setColumnData(column.id, column.data, { signal: this.disposeSignal }));\n      }\n\n      this.pFramePromise = Promise.all(promises)\n        .then(() => pFrame)\n        .catch((err) => {\n          this.dispose();\n          pFrame.dispose();\n          const error = new PFrameDriverError(\"PFrame creation failed asynchronously\");\n          error.cause = new Error(\n            `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n            { cause: ensureError(err) },\n          );\n          throw error;\n        });\n    } catch (err: unknown) {\n      const error = new PFrameDriverError(\"PFrame creation failed synchronously\");\n      error.cause = new Error(\n        `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n        { cause: ensureError(err) },\n      );\n      throw error;\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  private dispose(): void {\n    this.abortController.abort();\n    this.localBlobs.forEach((entry) => entry.unref());\n    this.remoteBlobs.forEach((entry) => entry.unref());\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n    void this.pFramePromise\n      .then((pFrame) => pFrame.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PFramePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  PFrameHandle,\n  PFrameHolder<TreeEntry>\n> {\n  constructor(\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    private readonly logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ): PFrameHandle {\n    return stableKeyFromPFrameData(params);\n  }\n\n  protected createNewResource(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n    key: PFrameHandle,\n  ): PFrameHolder<TreeEntry> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PFrame creation (pFrameHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n    return new PFrameHolder(\n      key,\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      this.spillPath,\n      params,\n    );\n  }\n\n  public getByKey(key: PFrameHandle): PFrameHolder<TreeEntry> {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PFrame handle`);\n      error.cause = new Error(`PFrame with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction stableKeyFromPFrameData<TreeEntry extends JsonSerializable>(\n  data: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n): PFrameHandle {\n  const orderedData = [...data].map((column) =>\n    mapPObjectData(column, (r) => {\n      let result: {\n        type: string;\n        keyLength: number;\n        payload: {\n          key: string;\n          value: null | number | string | [string, string];\n        }[];\n      };\n      const type = r.type;\n      switch (type) {\n        case \"Json\":\n          result = {\n            type: r.type,\n            keyLength: r.keyLength,\n            payload: Object.entries(r.data).map(([part, value]) => ({\n              key: part,\n              value,\n            })),\n          };\n          break;\n        case \"JsonPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: canonicalizeJson(info),\n            })),\n          };\n          break;\n        case \"BinaryPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: [canonicalizeJson(info.index), canonicalizeJson(info.values)] as const,\n            })),\n          };\n          break;\n        case \"ParquetPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value:\n                info.dataDigest ||\n                ([\n                  canonicalizeJson(info.data),\n                  JSON.stringify({ axes: info.axes, column: info.column }),\n                ] as const),\n            })),\n          };\n          break;\n        default:\n          throw new PFrameDriverError(\n            `unsupported resource type: ${JSON.stringify(type satisfies never)}`,\n          );\n      }\n      result.payload.sort((lhs, rhs) => (lhs.key < rhs.key ? -1 : 1));\n      return result;\n    }),\n  );\n  orderedData.sort((lhs, rhs) => (lhs.id < rhs.id ? -1 : 1));\n  return hashJson(orderedData) as string as PFrameHandle;\n}\n"],"mappings":"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"}

package/dist/pframe_pool.d.ts

@@ -1,5 +1,5 @@
 import { JsonSerializable, PColumn, PFrameHandle } from "@milaboratories/pl-model-common";
-import { PoolEntry, RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { PoolEntry, RefCountPoolBase } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 
 //#region src/pframe_pool.d.ts

package/dist/pframe_pool.js

@@ -1,6 +1,6 @@
 import { logPFrames } from "./logging.js";
 import { PFrameDriverError, assertNever, bigintReplacer, canonicalizeJson, ensureError, mapPObjectData } from "@milaboratories/pl-model-common";
-import { RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase } from "@milaboratories/helpers";
 import { PFrameFactory } from "@milaboratories/pframes-rs-node";
 import { PFrameInternal, hashJson } from "@milaboratories/pl-model-middle-layer";
 import { mapValues } from "es-toolkit";

package/dist/pframe_pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"pframe_pool.js","names":[],"sources":["../src/pframe_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  canonicalizeJson,\n  ensureError,\n  mapPObjectData,\n  PFrameDriverError,\n  type JsonSerializable,\n  type PColumn,\n  type PFrameHandle,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson, PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { mapValues } from \"es-toolkit\";\nimport { logPFrames } from \"./logging\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  makeDataSource(signal: AbortSignal): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\">;\n}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  httpServerInfo(): PFrameInternal.HttpServerInfo;\n}\n\nexport class PFrameHolder<TreeEntry extends JsonSerializable> implements Disposable {\n  public readonly pFramePromise: Promise<PFrameInternal.PFrameV13>;\n  private readonly abortController = new AbortController();\n\n  private readonly localBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n  private readonly remoteBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n\n  constructor(\n    frameId: PFrameInternal.PFrameId,\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n    columns: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ) {\n    const makeLocalBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const localBlob = this.localBlobProvider.acquire(blob);\n      this.localBlobs.push(localBlob);\n      return localBlob.key;\n    };\n\n    const makeRemoteBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const remoteBlob = this.remoteBlobProvider.acquire(blob);\n      this.remoteBlobs.push(remoteBlob);\n      return `${remoteBlob.key}${PFrameInternal.ParquetExtension}` as PFrameInternal.PFrameBlobId;\n    };\n\n    const mapColumnData = (\n      data: PFrameInternal.DataInfo<TreeEntry>,\n    ): PFrameInternal.DataInfo<PFrameInternal.PFrameBlobId> => {\n      switch (data.type) {\n        case \"Json\":\n          return { ...data };\n        case \"JsonPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, makeLocalBlobId),\n          };\n        case \"BinaryPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              index: makeLocalBlobId(v.index),\n              values: makeLocalBlobId(v.values),\n            })),\n          };\n        case \"ParquetPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              ...v,\n              data: makeRemoteBlobId(v.data),\n            })),\n          };\n        default:\n          assertNever(data);\n      }\n    };\n\n    const jsonifiedColumns = columns.map((column) => ({\n      ...column,\n      data: mapColumnData(column.data),\n    }));\n\n    try {\n      const pFrame = PFrameFactory.createPFrame({ frameId, spillPath: this.spillPath, logger });\n      pFrame.setDataSource({\n        ...this.localBlobProvider.makeDataSource(this.disposeSignal),\n        parquetServer: this.remoteBlobProvider.httpServerInfo(),\n      });\n\n      const promises: Promise<void>[] = [];\n      for (const column of jsonifiedColumns) {\n        pFrame.addColumnSpec(column.id, column.spec);\n        promises.push(pFrame.setColumnData(column.id, column.data, { signal: this.disposeSignal }));\n      }\n\n      this.pFramePromise = Promise.all(promises)\n        .then(() => pFrame)\n        .catch((err) => {\n          this.dispose();\n          pFrame.dispose();\n          const error = new PFrameDriverError(\"PFrame creation failed asynchronously\");\n          error.cause = new Error(\n            `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n            { cause: ensureError(err) },\n          );\n          throw error;\n        });\n    } catch (err: unknown) {\n      const error = new PFrameDriverError(\"PFrame creation failed synchronously\");\n      error.cause = new Error(\n        `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n        { cause: ensureError(err) },\n      );\n      throw error;\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  private dispose(): void {\n    this.abortController.abort();\n    this.localBlobs.forEach((entry) => entry.unref());\n    this.remoteBlobs.forEach((entry) => entry.unref());\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n    void this.pFramePromise\n      .then((pFrame) => pFrame.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PFramePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  PFrameHandle,\n  PFrameHolder<TreeEntry>\n> {\n  constructor(\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    private readonly logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ): PFrameHandle {\n    return stableKeyFromPFrameData(params);\n  }\n\n  protected createNewResource(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n    key: PFrameHandle,\n  ): PFrameHolder<TreeEntry> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PFrame creation (pFrameHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n    return new PFrameHolder(\n      key,\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      this.spillPath,\n      params,\n    );\n  }\n\n  public getByKey(key: PFrameHandle): PFrameHolder<TreeEntry> {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PFrame handle`);\n      error.cause = new Error(`PFrame with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction stableKeyFromPFrameData<TreeEntry extends JsonSerializable>(\n  data: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n): PFrameHandle {\n  const orderedData = [...data].map((column) =>\n    mapPObjectData(column, (r) => {\n      let result: {\n        type: string;\n        keyLength: number;\n        payload: {\n          key: string;\n          value: null | number | string | [string, string];\n        }[];\n      };\n      const type = r.type;\n      switch (type) {\n        case \"Json\":\n          result = {\n            type: r.type,\n            keyLength: r.keyLength,\n            payload: Object.entries(r.data).map(([part, value]) => ({\n              key: part,\n              value,\n            })),\n          };\n          break;\n        case \"JsonPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: canonicalizeJson(info),\n            })),\n          };\n          break;\n        case \"BinaryPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: [canonicalizeJson(info.index), canonicalizeJson(info.values)] as const,\n            })),\n          };\n          break;\n        case \"ParquetPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value:\n                info.dataDigest ||\n                ([\n                  canonicalizeJson(info.data),\n                  JSON.stringify({ axes: info.axes, column: info.column }),\n                ] as const),\n            })),\n          };\n          break;\n        default:\n          throw new PFrameDriverError(\n            `unsupported resource type: ${JSON.stringify(type satisfies never)}`,\n          );\n      }\n      result.payload.sort((lhs, rhs) => (lhs.key < rhs.key ? -1 : 1));\n      return result;\n    }),\n  );\n  orderedData.sort((lhs, rhs) => (lhs.id < rhs.id ? -1 : 1));\n  return hashJson(orderedData) as string as PFrameHandle;\n}\n"],"mappings":"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"}
+{"version":3,"file":"pframe_pool.js","names":[],"sources":["../src/pframe_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  canonicalizeJson,\n  ensureError,\n  mapPObjectData,\n  PFrameDriverError,\n  type JsonSerializable,\n  type PColumn,\n  type PFrameHandle,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson, PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/helpers\";\nimport { PFrameFactory } from \"@milaboratories/pframes-rs-node\";\nimport { mapValues } from \"es-toolkit\";\nimport { logPFrames } from \"./logging\";\n\nexport interface LocalBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  makeDataSource(signal: AbortSignal): Omit<PFrameInternal.PFrameDataSourceV2, \"parquetServer\">;\n}\n\nexport interface RemoteBlobProvider<TreeEntry extends JsonSerializable> {\n  acquire(params: TreeEntry): PoolEntry<PFrameInternal.PFrameBlobId>;\n  httpServerInfo(): PFrameInternal.HttpServerInfo;\n}\n\nexport class PFrameHolder<TreeEntry extends JsonSerializable> implements Disposable {\n  public readonly pFramePromise: Promise<PFrameInternal.PFrameV13>;\n  private readonly abortController = new AbortController();\n\n  private readonly localBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n  private readonly remoteBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];\n\n  constructor(\n    frameId: PFrameInternal.PFrameId,\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n    columns: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ) {\n    const makeLocalBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const localBlob = this.localBlobProvider.acquire(blob);\n      this.localBlobs.push(localBlob);\n      return localBlob.key;\n    };\n\n    const makeRemoteBlobId = (blob: TreeEntry): PFrameInternal.PFrameBlobId => {\n      const remoteBlob = this.remoteBlobProvider.acquire(blob);\n      this.remoteBlobs.push(remoteBlob);\n      return `${remoteBlob.key}${PFrameInternal.ParquetExtension}` as PFrameInternal.PFrameBlobId;\n    };\n\n    const mapColumnData = (\n      data: PFrameInternal.DataInfo<TreeEntry>,\n    ): PFrameInternal.DataInfo<PFrameInternal.PFrameBlobId> => {\n      switch (data.type) {\n        case \"Json\":\n          return { ...data };\n        case \"JsonPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, makeLocalBlobId),\n          };\n        case \"BinaryPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              index: makeLocalBlobId(v.index),\n              values: makeLocalBlobId(v.values),\n            })),\n          };\n        case \"ParquetPartitioned\":\n          return {\n            ...data,\n            parts: mapValues(data.parts, (v) => ({\n              ...v,\n              data: makeRemoteBlobId(v.data),\n            })),\n          };\n        default:\n          assertNever(data);\n      }\n    };\n\n    const jsonifiedColumns = columns.map((column) => ({\n      ...column,\n      data: mapColumnData(column.data),\n    }));\n\n    try {\n      const pFrame = PFrameFactory.createPFrame({ frameId, spillPath: this.spillPath, logger });\n      pFrame.setDataSource({\n        ...this.localBlobProvider.makeDataSource(this.disposeSignal),\n        parquetServer: this.remoteBlobProvider.httpServerInfo(),\n      });\n\n      const promises: Promise<void>[] = [];\n      for (const column of jsonifiedColumns) {\n        pFrame.addColumnSpec(column.id, column.spec);\n        promises.push(pFrame.setColumnData(column.id, column.data, { signal: this.disposeSignal }));\n      }\n\n      this.pFramePromise = Promise.all(promises)\n        .then(() => pFrame)\n        .catch((err) => {\n          this.dispose();\n          pFrame.dispose();\n          const error = new PFrameDriverError(\"PFrame creation failed asynchronously\");\n          error.cause = new Error(\n            `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n            { cause: ensureError(err) },\n          );\n          throw error;\n        });\n    } catch (err: unknown) {\n      const error = new PFrameDriverError(\"PFrame creation failed synchronously\");\n      error.cause = new Error(\n        `PFrame cannot be created from columns: ${JSON.stringify(jsonifiedColumns)}`,\n        { cause: ensureError(err) },\n      );\n      throw error;\n    }\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.abortController.signal;\n  }\n\n  private dispose(): void {\n    this.abortController.abort();\n    this.localBlobs.forEach((entry) => entry.unref());\n    this.remoteBlobs.forEach((entry) => entry.unref());\n  }\n\n  [Symbol.dispose](): void {\n    this.dispose();\n    void this.pFramePromise\n      .then((pFrame) => pFrame.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PFramePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  PFrameHandle,\n  PFrameHolder<TreeEntry>\n> {\n  constructor(\n    private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,\n    private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,\n    private readonly logger: PFrameInternal.Logger,\n    private readonly spillPath: string,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n  ): PFrameHandle {\n    return stableKeyFromPFrameData(params);\n  }\n\n  protected createNewResource(\n    params: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n    key: PFrameHandle,\n  ): PFrameHolder<TreeEntry> {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PFrame creation (pFrameHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n    return new PFrameHolder(\n      key,\n      this.localBlobProvider,\n      this.remoteBlobProvider,\n      this.logger,\n      this.spillPath,\n      params,\n    );\n  }\n\n  public getByKey(key: PFrameHandle): PFrameHolder<TreeEntry> {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PFrame handle`);\n      error.cause = new Error(`PFrame with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction stableKeyFromPFrameData<TreeEntry extends JsonSerializable>(\n  data: PColumn<PFrameInternal.DataInfo<TreeEntry>>[],\n): PFrameHandle {\n  const orderedData = [...data].map((column) =>\n    mapPObjectData(column, (r) => {\n      let result: {\n        type: string;\n        keyLength: number;\n        payload: {\n          key: string;\n          value: null | number | string | [string, string];\n        }[];\n      };\n      const type = r.type;\n      switch (type) {\n        case \"Json\":\n          result = {\n            type: r.type,\n            keyLength: r.keyLength,\n            payload: Object.entries(r.data).map(([part, value]) => ({\n              key: part,\n              value,\n            })),\n          };\n          break;\n        case \"JsonPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: canonicalizeJson(info),\n            })),\n          };\n          break;\n        case \"BinaryPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value: [canonicalizeJson(info.index), canonicalizeJson(info.values)] as const,\n            })),\n          };\n          break;\n        case \"ParquetPartitioned\":\n          result = {\n            type: r.type,\n            keyLength: r.partitionKeyLength,\n            payload: Object.entries(r.parts).map(([part, info]) => ({\n              key: part,\n              value:\n                info.dataDigest ||\n                ([\n                  canonicalizeJson(info.data),\n                  JSON.stringify({ axes: info.axes, column: info.column }),\n                ] as const),\n            })),\n          };\n          break;\n        default:\n          throw new PFrameDriverError(\n            `unsupported resource type: ${JSON.stringify(type satisfies never)}`,\n          );\n      }\n      result.payload.sort((lhs, rhs) => (lhs.key < rhs.key ? -1 : 1));\n      return result;\n    }),\n  );\n  orderedData.sort((lhs, rhs) => (lhs.id < rhs.id ? -1 : 1));\n  return hashJson(orderedData) as string as PFrameHandle;\n}\n"],"mappings":"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"}

package/dist/ptable_cache_per_frame.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_cache_per_frame.cjs","names":["LRUCache","logPFrames"],"sources":["../src/ptable_cache_per_frame.ts"],"sourcesContent":["import type { PFrameHandle, PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePerFrameOps = {\n  /** Maximum number of `calculateTableData` results cached for each PFrame */\n  pFrameCacheMaxCount: number;\n  /**\n   * Maximum size of `calculateTableData` results cached for PFrames overall.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pFramesCacheMaxSize: number;\n};\n\nexport const PTableCachePerFrameOpsDefaults: PTableCachePerFrameOps = {\n  pFrameCacheMaxCount: 18, // SHM trees create 3 PTables per graphic, we want to cache 6 graphics per PFrame\n  pFramesCacheMaxSize: 8 * 1024 * 1024 * 1024, // 8 GB, same as blob driver cache (must be at least 2GB)\n};\n\nexport class PTableCachePerFrame {\n  private readonly perFrame = new Map<\n    PFrameHandle,\n    LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>\n  >();\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    private readonly ops: PTableCachePerFrameOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: this.ops.pFramesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        if (reason === \"evict\") {\n          this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        }\n\n        if (this.perFrame.get(resource.resource.pFrame)?.size === 0) {\n          this.perFrame.delete(resource.resource.pFrame);\n        }\n\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `calculateTableData cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(resource: PoolEntry<PTableHandle, PTableHolder>, size: number): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `calculateTableData cache - added PTable ${key} with size ${size}`);\n    }\n\n    this.global.set(key, resource, { size: Math.max(size, 1) }); // 1 is minimum size to avoid cache evictions\n\n    let perFrame = this.perFrame.get(resource.resource.pFrame);\n    if (!perFrame) {\n      perFrame = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n        max: this.ops.pFrameCacheMaxCount,\n        dispose: (_resource, key, reason) => {\n          if (reason === \"evict\") {\n            this.global.delete(key);\n          }\n        },\n      });\n      this.perFrame.set(resource.resource.pFrame, perFrame);\n    }\n    perFrame.set(key, resource);\n\n    if (!this.disposeListeners.has(key)) {\n      const disposeListener = () => {\n        this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        this.global.delete(key);\n\n        this.disposeListeners.delete(key);\n        resource.resource.disposeSignal.removeEventListener(\"abort\", disposeListener);\n      };\n      this.disposeListeners.add(key);\n      resource.resource.disposeSignal.addEventListener(\"abort\", disposeListener);\n    }\n  }\n}\n"],"mappings":";;;;;AAkBA,MAAa,iCAAyD;CACpE,qBAAqB;CACrB,qBAAqB,IAAI,OAAO,OAAO;CACxC;AAED,IAAa,sBAAb,MAAiC;CAC/B,AAAiB,2BAAW,IAAI,KAG7B;CACH,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,AAAiB,KACjB;EAFiB;EACA;AAEjB,OAAK,SAAS,IAAIA,mBAA8D;GAC9E,SAAS,KAAK,IAAI;GAClB,UAAU,UAAU,KAAK,WAAW;AAClC,QAAI,WAAW,QACb,MAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AAG1D,QAAI,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,SAAS,EACxD,MAAK,SAAS,OAAO,SAAS,SAAS,OAAO;AAGhD,aAAS,OAAO;AAChB,QAAIC,4BAAY,CACd,QAAO,QAAQ,6CAA6C,IAAI,YAAY,OAAO,GAAG;;GAG3F,CAAC;;CAGJ,AAAO,MAAM,UAAiD,MAAoB;EAChF,MAAM,MAAM,SAAS;AACrB,MAAIA,4BAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,IAAI,aAAa,OAAO;AAGzF,OAAK,OAAO,IAAI,KAAK,UAAU,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,EAAE,CAAC;EAE3D,IAAI,WAAW,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO;AAC1D,MAAI,CAAC,UAAU;AACb,cAAW,IAAID,mBAA8D;IAC3E,KAAK,KAAK,IAAI;IACd,UAAU,WAAW,KAAK,WAAW;AACnC,SAAI,WAAW,QACb,MAAK,OAAO,OAAO,IAAI;;IAG5B,CAAC;AACF,QAAK,SAAS,IAAI,SAAS,SAAS,QAAQ,SAAS;;AAEvD,WAAS,IAAI,KAAK,SAAS;AAE3B,MAAI,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AACxD,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,aAAS,SAAS,cAAc,oBAAoB,SAAS,gBAAgB;;AAE/E,QAAK,iBAAiB,IAAI,IAAI;AAC9B,YAAS,SAAS,cAAc,iBAAiB,SAAS,gBAAgB"}
+{"version":3,"file":"ptable_cache_per_frame.cjs","names":["LRUCache","logPFrames"],"sources":["../src/ptable_cache_per_frame.ts"],"sourcesContent":["import type { PFrameHandle, PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePerFrameOps = {\n  /** Maximum number of `calculateTableData` results cached for each PFrame */\n  pFrameCacheMaxCount: number;\n  /**\n   * Maximum size of `calculateTableData` results cached for PFrames overall.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pFramesCacheMaxSize: number;\n};\n\nexport const PTableCachePerFrameOpsDefaults: PTableCachePerFrameOps = {\n  pFrameCacheMaxCount: 18, // SHM trees create 3 PTables per graphic, we want to cache 6 graphics per PFrame\n  pFramesCacheMaxSize: 8 * 1024 * 1024 * 1024, // 8 GB, same as blob driver cache (must be at least 2GB)\n};\n\nexport class PTableCachePerFrame {\n  private readonly perFrame = new Map<\n    PFrameHandle,\n    LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>\n  >();\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    private readonly ops: PTableCachePerFrameOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: this.ops.pFramesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        if (reason === \"evict\") {\n          this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        }\n\n        if (this.perFrame.get(resource.resource.pFrame)?.size === 0) {\n          this.perFrame.delete(resource.resource.pFrame);\n        }\n\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `calculateTableData cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(resource: PoolEntry<PTableHandle, PTableHolder>, size: number): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `calculateTableData cache - added PTable ${key} with size ${size}`);\n    }\n\n    this.global.set(key, resource, { size: Math.max(size, 1) }); // 1 is minimum size to avoid cache evictions\n\n    let perFrame = this.perFrame.get(resource.resource.pFrame);\n    if (!perFrame) {\n      perFrame = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n        max: this.ops.pFrameCacheMaxCount,\n        dispose: (_resource, key, reason) => {\n          if (reason === \"evict\") {\n            this.global.delete(key);\n          }\n        },\n      });\n      this.perFrame.set(resource.resource.pFrame, perFrame);\n    }\n    perFrame.set(key, resource);\n\n    if (!this.disposeListeners.has(key)) {\n      const disposeListener = () => {\n        this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        this.global.delete(key);\n\n        this.disposeListeners.delete(key);\n        resource.resource.disposeSignal.removeEventListener(\"abort\", disposeListener);\n      };\n      this.disposeListeners.add(key);\n      resource.resource.disposeSignal.addEventListener(\"abort\", disposeListener);\n    }\n  }\n}\n"],"mappings":";;;;;AAkBA,MAAa,iCAAyD;CACpE,qBAAqB;CACrB,qBAAqB,IAAI,OAAO,OAAO;CACxC;AAED,IAAa,sBAAb,MAAiC;CAC/B,AAAiB,2BAAW,IAAI,KAG7B;CACH,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,AAAiB,KACjB;EAFiB;EACA;AAEjB,OAAK,SAAS,IAAIA,mBAA8D;GAC9E,SAAS,KAAK,IAAI;GAClB,UAAU,UAAU,KAAK,WAAW;AAClC,QAAI,WAAW,QACb,MAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AAG1D,QAAI,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,SAAS,EACxD,MAAK,SAAS,OAAO,SAAS,SAAS,OAAO;AAGhD,aAAS,OAAO;AAChB,QAAIC,4BAAY,CACd,QAAO,QAAQ,6CAA6C,IAAI,YAAY,OAAO,GAAG;;GAG3F,CAAC;;CAGJ,AAAO,MAAM,UAAiD,MAAoB;EAChF,MAAM,MAAM,SAAS;AACrB,MAAIA,4BAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,IAAI,aAAa,OAAO;AAGzF,OAAK,OAAO,IAAI,KAAK,UAAU,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,EAAE,CAAC;EAE3D,IAAI,WAAW,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO;AAC1D,MAAI,CAAC,UAAU;AACb,cAAW,IAAID,mBAA8D;IAC3E,KAAK,KAAK,IAAI;IACd,UAAU,WAAW,KAAK,WAAW;AACnC,SAAI,WAAW,QACb,MAAK,OAAO,OAAO,IAAI;;IAG5B,CAAC;AACF,QAAK,SAAS,IAAI,SAAS,SAAS,QAAQ,SAAS;;AAEvD,WAAS,IAAI,KAAK,SAAS;AAE3B,MAAI,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AACxD,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,aAAS,SAAS,cAAc,oBAAoB,SAAS,gBAAgB;;AAE/E,QAAK,iBAAiB,IAAI,IAAI;AAC9B,YAAS,SAAS,cAAc,iBAAiB,SAAS,gBAAgB"}

package/dist/ptable_cache_per_frame.d.ts

@@ -1,6 +1,6 @@
 import "./ptable_pool.js";
 import { PTableHandle } from "@milaboratories/pl-model-common";
-import { PoolEntry } from "@milaboratories/ts-helpers";
+import { PoolEntry } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 
 //#region src/ptable_cache_per_frame.d.ts

package/dist/ptable_cache_per_frame.js.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_cache_per_frame.js","names":[],"sources":["../src/ptable_cache_per_frame.ts"],"sourcesContent":["import type { PFrameHandle, PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePerFrameOps = {\n  /** Maximum number of `calculateTableData` results cached for each PFrame */\n  pFrameCacheMaxCount: number;\n  /**\n   * Maximum size of `calculateTableData` results cached for PFrames overall.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pFramesCacheMaxSize: number;\n};\n\nexport const PTableCachePerFrameOpsDefaults: PTableCachePerFrameOps = {\n  pFrameCacheMaxCount: 18, // SHM trees create 3 PTables per graphic, we want to cache 6 graphics per PFrame\n  pFramesCacheMaxSize: 8 * 1024 * 1024 * 1024, // 8 GB, same as blob driver cache (must be at least 2GB)\n};\n\nexport class PTableCachePerFrame {\n  private readonly perFrame = new Map<\n    PFrameHandle,\n    LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>\n  >();\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    private readonly ops: PTableCachePerFrameOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: this.ops.pFramesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        if (reason === \"evict\") {\n          this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        }\n\n        if (this.perFrame.get(resource.resource.pFrame)?.size === 0) {\n          this.perFrame.delete(resource.resource.pFrame);\n        }\n\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `calculateTableData cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(resource: PoolEntry<PTableHandle, PTableHolder>, size: number): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `calculateTableData cache - added PTable ${key} with size ${size}`);\n    }\n\n    this.global.set(key, resource, { size: Math.max(size, 1) }); // 1 is minimum size to avoid cache evictions\n\n    let perFrame = this.perFrame.get(resource.resource.pFrame);\n    if (!perFrame) {\n      perFrame = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n        max: this.ops.pFrameCacheMaxCount,\n        dispose: (_resource, key, reason) => {\n          if (reason === \"evict\") {\n            this.global.delete(key);\n          }\n        },\n      });\n      this.perFrame.set(resource.resource.pFrame, perFrame);\n    }\n    perFrame.set(key, resource);\n\n    if (!this.disposeListeners.has(key)) {\n      const disposeListener = () => {\n        this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        this.global.delete(key);\n\n        this.disposeListeners.delete(key);\n        resource.resource.disposeSignal.removeEventListener(\"abort\", disposeListener);\n      };\n      this.disposeListeners.add(key);\n      resource.resource.disposeSignal.addEventListener(\"abort\", disposeListener);\n    }\n  }\n}\n"],"mappings":";;;;AAkBA,MAAa,iCAAyD;CACpE,qBAAqB;CACrB,qBAAqB,IAAI,OAAO,OAAO;CACxC;AAED,IAAa,sBAAb,MAAiC;CAC/B,AAAiB,2BAAW,IAAI,KAG7B;CACH,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,AAAiB,KACjB;EAFiB;EACA;AAEjB,OAAK,SAAS,IAAI,SAA8D;GAC9E,SAAS,KAAK,IAAI;GAClB,UAAU,UAAU,KAAK,WAAW;AAClC,QAAI,WAAW,QACb,MAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AAG1D,QAAI,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,SAAS,EACxD,MAAK,SAAS,OAAO,SAAS,SAAS,OAAO;AAGhD,aAAS,OAAO;AAChB,QAAI,YAAY,CACd,QAAO,QAAQ,6CAA6C,IAAI,YAAY,OAAO,GAAG;;GAG3F,CAAC;;CAGJ,AAAO,MAAM,UAAiD,MAAoB;EAChF,MAAM,MAAM,SAAS;AACrB,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,IAAI,aAAa,OAAO;AAGzF,OAAK,OAAO,IAAI,KAAK,UAAU,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,EAAE,CAAC;EAE3D,IAAI,WAAW,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO;AAC1D,MAAI,CAAC,UAAU;AACb,cAAW,IAAI,SAA8D;IAC3E,KAAK,KAAK,IAAI;IACd,UAAU,WAAW,KAAK,WAAW;AACnC,SAAI,WAAW,QACb,MAAK,OAAO,OAAO,IAAI;;IAG5B,CAAC;AACF,QAAK,SAAS,IAAI,SAAS,SAAS,QAAQ,SAAS;;AAEvD,WAAS,IAAI,KAAK,SAAS;AAE3B,MAAI,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AACxD,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,aAAS,SAAS,cAAc,oBAAoB,SAAS,gBAAgB;;AAE/E,QAAK,iBAAiB,IAAI,IAAI;AAC9B,YAAS,SAAS,cAAc,iBAAiB,SAAS,gBAAgB"}
+{"version":3,"file":"ptable_cache_per_frame.js","names":[],"sources":["../src/ptable_cache_per_frame.ts"],"sourcesContent":["import type { PFrameHandle, PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePerFrameOps = {\n  /** Maximum number of `calculateTableData` results cached for each PFrame */\n  pFrameCacheMaxCount: number;\n  /**\n   * Maximum size of `calculateTableData` results cached for PFrames overall.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pFramesCacheMaxSize: number;\n};\n\nexport const PTableCachePerFrameOpsDefaults: PTableCachePerFrameOps = {\n  pFrameCacheMaxCount: 18, // SHM trees create 3 PTables per graphic, we want to cache 6 graphics per PFrame\n  pFramesCacheMaxSize: 8 * 1024 * 1024 * 1024, // 8 GB, same as blob driver cache (must be at least 2GB)\n};\n\nexport class PTableCachePerFrame {\n  private readonly perFrame = new Map<\n    PFrameHandle,\n    LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>\n  >();\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    private readonly ops: PTableCachePerFrameOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: this.ops.pFramesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        if (reason === \"evict\") {\n          this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        }\n\n        if (this.perFrame.get(resource.resource.pFrame)?.size === 0) {\n          this.perFrame.delete(resource.resource.pFrame);\n        }\n\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `calculateTableData cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(resource: PoolEntry<PTableHandle, PTableHolder>, size: number): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `calculateTableData cache - added PTable ${key} with size ${size}`);\n    }\n\n    this.global.set(key, resource, { size: Math.max(size, 1) }); // 1 is minimum size to avoid cache evictions\n\n    let perFrame = this.perFrame.get(resource.resource.pFrame);\n    if (!perFrame) {\n      perFrame = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n        max: this.ops.pFrameCacheMaxCount,\n        dispose: (_resource, key, reason) => {\n          if (reason === \"evict\") {\n            this.global.delete(key);\n          }\n        },\n      });\n      this.perFrame.set(resource.resource.pFrame, perFrame);\n    }\n    perFrame.set(key, resource);\n\n    if (!this.disposeListeners.has(key)) {\n      const disposeListener = () => {\n        this.perFrame.get(resource.resource.pFrame)?.delete(key);\n        this.global.delete(key);\n\n        this.disposeListeners.delete(key);\n        resource.resource.disposeSignal.removeEventListener(\"abort\", disposeListener);\n      };\n      this.disposeListeners.add(key);\n      resource.resource.disposeSignal.addEventListener(\"abort\", disposeListener);\n    }\n  }\n}\n"],"mappings":";;;;AAkBA,MAAa,iCAAyD;CACpE,qBAAqB;CACrB,qBAAqB,IAAI,OAAO,OAAO;CACxC;AAED,IAAa,sBAAb,MAAiC;CAC/B,AAAiB,2BAAW,IAAI,KAG7B;CACH,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,AAAiB,KACjB;EAFiB;EACA;AAEjB,OAAK,SAAS,IAAI,SAA8D;GAC9E,SAAS,KAAK,IAAI;GAClB,UAAU,UAAU,KAAK,WAAW;AAClC,QAAI,WAAW,QACb,MAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AAG1D,QAAI,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,SAAS,EACxD,MAAK,SAAS,OAAO,SAAS,SAAS,OAAO;AAGhD,aAAS,OAAO;AAChB,QAAI,YAAY,CACd,QAAO,QAAQ,6CAA6C,IAAI,YAAY,OAAO,GAAG;;GAG3F,CAAC;;CAGJ,AAAO,MAAM,UAAiD,MAAoB;EAChF,MAAM,MAAM,SAAS;AACrB,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,2CAA2C,IAAI,aAAa,OAAO;AAGzF,OAAK,OAAO,IAAI,KAAK,UAAU,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,EAAE,CAAC;EAE3D,IAAI,WAAW,KAAK,SAAS,IAAI,SAAS,SAAS,OAAO;AAC1D,MAAI,CAAC,UAAU;AACb,cAAW,IAAI,SAA8D;IAC3E,KAAK,KAAK,IAAI;IACd,UAAU,WAAW,KAAK,WAAW;AACnC,SAAI,WAAW,QACb,MAAK,OAAO,OAAO,IAAI;;IAG5B,CAAC;AACF,QAAK,SAAS,IAAI,SAAS,SAAS,QAAQ,SAAS;;AAEvD,WAAS,IAAI,KAAK,SAAS;AAE3B,MAAI,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,SAAS,IAAI,SAAS,SAAS,OAAO,EAAE,OAAO,IAAI;AACxD,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,aAAS,SAAS,cAAc,oBAAoB,SAAS,gBAAgB;;AAE/E,QAAK,iBAAiB,IAAI,IAAI;AAC9B,YAAS,SAAS,cAAc,iBAAiB,SAAS,gBAAgB"}

package/dist/ptable_cache_plain.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_cache_plain.cjs","names":["LRUCache","logPFrames"],"sources":["../src/ptable_cache_plain.ts"],"sourcesContent":["import type { PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePlainOps = {\n  /**\n   * Maximum size of `createPTable` results cached on disk.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pTablesCacheMaxSize: number;\n};\n\nexport const PTableCachePlainOpsDefaults: PTableCachePlainOps = {\n  pTablesCacheMaxSize: 32 * 1024 * 1024 * 1024, // 32 GB (must be at least 8GB)\n};\n\nexport class PTableCachePlain {\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    ops: PTableCachePlainOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: ops.pTablesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `createPTable cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(\n    resource: PoolEntry<PTableHandle, PTableHolder>,\n    size: number,\n    defDisposeSignal: AbortSignal,\n  ): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `createPTable cache - added PTable ${key} with size ${size}`);\n    }\n\n    const status: LRUCache.Status<PoolEntry<PTableHandle, PTableHolder>> = {};\n    this.global.set(key, resource, { size: Math.max(size, 1), status }); // 1 is minimum size to avoid cache evictions\n\n    if (status.maxEntrySizeExceeded) {\n      resource.unref();\n      if (logPFrames()) {\n        this.logger(\"info\", `createPTable cache - removed PTable ${key} (maxEntrySizeExceeded)`);\n      }\n    } else {\n      if (!this.disposeListeners.has(key)) {\n        const disposeListener = () => {\n          this.global.delete(key);\n\n          this.disposeListeners.delete(key);\n          defDisposeSignal.removeEventListener(\"abort\", disposeListener);\n        };\n        this.disposeListeners.add(key);\n        defDisposeSignal.addEventListener(\"abort\", disposeListener);\n      }\n    }\n  }\n}\n"],"mappings":";;;;;AAgBA,MAAa,8BAAmD,EAC9D,qBAAqB,KAAK,OAAO,OAAO,MACzC;AAED,IAAa,mBAAb,MAA8B;CAC5B,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,KACA;EAFiB;AAGjB,OAAK,SAAS,IAAIA,mBAA8D;GAC9E,SAAS,IAAI;GACb,UAAU,UAAU,KAAK,WAAW;AAClC,aAAS,OAAO;AAChB,QAAIC,4BAAY,CACd,QAAO,QAAQ,uCAAuC,IAAI,YAAY,OAAO,GAAG;;GAGrF,CAAC;;CAGJ,AAAO,MACL,UACA,MACA,kBACM;EACN,MAAM,MAAM,SAAS;AACrB,MAAIA,4BAAY,CACd,MAAK,OAAO,QAAQ,qCAAqC,IAAI,aAAa,OAAO;EAGnF,MAAM,SAAiE,EAAE;AACzE,OAAK,OAAO,IAAI,KAAK,UAAU;GAAE,MAAM,KAAK,IAAI,MAAM,EAAE;GAAE;GAAQ,CAAC;AAEnE,MAAI,OAAO,sBAAsB;AAC/B,YAAS,OAAO;AAChB,OAAIA,4BAAY,CACd,MAAK,OAAO,QAAQ,uCAAuC,IAAI,yBAAyB;aAGtF,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,qBAAiB,oBAAoB,SAAS,gBAAgB;;AAEhE,QAAK,iBAAiB,IAAI,IAAI;AAC9B,oBAAiB,iBAAiB,SAAS,gBAAgB"}
+{"version":3,"file":"ptable_cache_plain.cjs","names":["LRUCache","logPFrames"],"sources":["../src/ptable_cache_plain.ts"],"sourcesContent":["import type { PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePlainOps = {\n  /**\n   * Maximum size of `createPTable` results cached on disk.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pTablesCacheMaxSize: number;\n};\n\nexport const PTableCachePlainOpsDefaults: PTableCachePlainOps = {\n  pTablesCacheMaxSize: 32 * 1024 * 1024 * 1024, // 32 GB (must be at least 8GB)\n};\n\nexport class PTableCachePlain {\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    ops: PTableCachePlainOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: ops.pTablesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `createPTable cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(\n    resource: PoolEntry<PTableHandle, PTableHolder>,\n    size: number,\n    defDisposeSignal: AbortSignal,\n  ): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `createPTable cache - added PTable ${key} with size ${size}`);\n    }\n\n    const status: LRUCache.Status<PoolEntry<PTableHandle, PTableHolder>> = {};\n    this.global.set(key, resource, { size: Math.max(size, 1), status }); // 1 is minimum size to avoid cache evictions\n\n    if (status.maxEntrySizeExceeded) {\n      resource.unref();\n      if (logPFrames()) {\n        this.logger(\"info\", `createPTable cache - removed PTable ${key} (maxEntrySizeExceeded)`);\n      }\n    } else {\n      if (!this.disposeListeners.has(key)) {\n        const disposeListener = () => {\n          this.global.delete(key);\n\n          this.disposeListeners.delete(key);\n          defDisposeSignal.removeEventListener(\"abort\", disposeListener);\n        };\n        this.disposeListeners.add(key);\n        defDisposeSignal.addEventListener(\"abort\", disposeListener);\n      }\n    }\n  }\n}\n"],"mappings":";;;;;AAgBA,MAAa,8BAAmD,EAC9D,qBAAqB,KAAK,OAAO,OAAO,MACzC;AAED,IAAa,mBAAb,MAA8B;CAC5B,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,KACA;EAFiB;AAGjB,OAAK,SAAS,IAAIA,mBAA8D;GAC9E,SAAS,IAAI;GACb,UAAU,UAAU,KAAK,WAAW;AAClC,aAAS,OAAO;AAChB,QAAIC,4BAAY,CACd,QAAO,QAAQ,uCAAuC,IAAI,YAAY,OAAO,GAAG;;GAGrF,CAAC;;CAGJ,AAAO,MACL,UACA,MACA,kBACM;EACN,MAAM,MAAM,SAAS;AACrB,MAAIA,4BAAY,CACd,MAAK,OAAO,QAAQ,qCAAqC,IAAI,aAAa,OAAO;EAGnF,MAAM,SAAiE,EAAE;AACzE,OAAK,OAAO,IAAI,KAAK,UAAU;GAAE,MAAM,KAAK,IAAI,MAAM,EAAE;GAAE;GAAQ,CAAC;AAEnE,MAAI,OAAO,sBAAsB;AAC/B,YAAS,OAAO;AAChB,OAAIA,4BAAY,CACd,MAAK,OAAO,QAAQ,uCAAuC,IAAI,yBAAyB;aAGtF,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,qBAAiB,oBAAoB,SAAS,gBAAgB;;AAEhE,QAAK,iBAAiB,IAAI,IAAI;AAC9B,oBAAiB,iBAAiB,SAAS,gBAAgB"}

package/dist/ptable_cache_plain.d.ts

@@ -1,6 +1,6 @@
 import "./ptable_pool.js";
 import { PTableHandle } from "@milaboratories/pl-model-common";
-import { PoolEntry } from "@milaboratories/ts-helpers";
+import { PoolEntry } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 
 //#region src/ptable_cache_plain.d.ts

package/dist/ptable_cache_plain.js.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_cache_plain.js","names":[],"sources":["../src/ptable_cache_plain.ts"],"sourcesContent":["import type { PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePlainOps = {\n  /**\n   * Maximum size of `createPTable` results cached on disk.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pTablesCacheMaxSize: number;\n};\n\nexport const PTableCachePlainOpsDefaults: PTableCachePlainOps = {\n  pTablesCacheMaxSize: 32 * 1024 * 1024 * 1024, // 32 GB (must be at least 8GB)\n};\n\nexport class PTableCachePlain {\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    ops: PTableCachePlainOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: ops.pTablesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `createPTable cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(\n    resource: PoolEntry<PTableHandle, PTableHolder>,\n    size: number,\n    defDisposeSignal: AbortSignal,\n  ): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `createPTable cache - added PTable ${key} with size ${size}`);\n    }\n\n    const status: LRUCache.Status<PoolEntry<PTableHandle, PTableHolder>> = {};\n    this.global.set(key, resource, { size: Math.max(size, 1), status }); // 1 is minimum size to avoid cache evictions\n\n    if (status.maxEntrySizeExceeded) {\n      resource.unref();\n      if (logPFrames()) {\n        this.logger(\"info\", `createPTable cache - removed PTable ${key} (maxEntrySizeExceeded)`);\n      }\n    } else {\n      if (!this.disposeListeners.has(key)) {\n        const disposeListener = () => {\n          this.global.delete(key);\n\n          this.disposeListeners.delete(key);\n          defDisposeSignal.removeEventListener(\"abort\", disposeListener);\n        };\n        this.disposeListeners.add(key);\n        defDisposeSignal.addEventListener(\"abort\", disposeListener);\n      }\n    }\n  }\n}\n"],"mappings":";;;;AAgBA,MAAa,8BAAmD,EAC9D,qBAAqB,KAAK,OAAO,OAAO,MACzC;AAED,IAAa,mBAAb,MAA8B;CAC5B,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,KACA;EAFiB;AAGjB,OAAK,SAAS,IAAI,SAA8D;GAC9E,SAAS,IAAI;GACb,UAAU,UAAU,KAAK,WAAW;AAClC,aAAS,OAAO;AAChB,QAAI,YAAY,CACd,QAAO,QAAQ,uCAAuC,IAAI,YAAY,OAAO,GAAG;;GAGrF,CAAC;;CAGJ,AAAO,MACL,UACA,MACA,kBACM;EACN,MAAM,MAAM,SAAS;AACrB,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,qCAAqC,IAAI,aAAa,OAAO;EAGnF,MAAM,SAAiE,EAAE;AACzE,OAAK,OAAO,IAAI,KAAK,UAAU;GAAE,MAAM,KAAK,IAAI,MAAM,EAAE;GAAE;GAAQ,CAAC;AAEnE,MAAI,OAAO,sBAAsB;AAC/B,YAAS,OAAO;AAChB,OAAI,YAAY,CACd,MAAK,OAAO,QAAQ,uCAAuC,IAAI,yBAAyB;aAGtF,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,qBAAiB,oBAAoB,SAAS,gBAAgB;;AAEhE,QAAK,iBAAiB,IAAI,IAAI;AAC9B,oBAAiB,iBAAiB,SAAS,gBAAgB"}
+{"version":3,"file":"ptable_cache_plain.js","names":[],"sources":["../src/ptable_cache_plain.ts"],"sourcesContent":["import type { PTableHandle } from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport type { PoolEntry } from \"@milaboratories/helpers\";\nimport { LRUCache } from \"lru-cache\";\nimport { logPFrames } from \"./logging\";\nimport type { PTableHolder } from \"./ptable_pool\";\n\nexport type PTableCachePlainOps = {\n  /**\n   * Maximum size of `createPTable` results cached on disk.\n   * The limit is soft, as the same table could be materialized with other requests and will not be deleted in such case.\n   * Also each table has predecessors, overlapping predecessors will be counted twice, so the effective limit is smaller.\n   */\n  pTablesCacheMaxSize: number;\n};\n\nexport const PTableCachePlainOpsDefaults: PTableCachePlainOps = {\n  pTablesCacheMaxSize: 32 * 1024 * 1024 * 1024, // 32 GB (must be at least 8GB)\n};\n\nexport class PTableCachePlain {\n  private readonly global: LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>;\n  private readonly disposeListeners = new Set<PTableHandle>();\n\n  constructor(\n    private readonly logger: PFrameInternal.Logger,\n    ops: PTableCachePlainOps,\n  ) {\n    this.global = new LRUCache<PTableHandle, PoolEntry<PTableHandle, PTableHolder>>({\n      maxSize: ops.pTablesCacheMaxSize,\n      dispose: (resource, key, reason) => {\n        resource.unref();\n        if (logPFrames()) {\n          logger(\"info\", `createPTable cache - removed PTable ${key} (reason: ${reason})`);\n        }\n      },\n    });\n  }\n\n  public cache(\n    resource: PoolEntry<PTableHandle, PTableHolder>,\n    size: number,\n    defDisposeSignal: AbortSignal,\n  ): void {\n    const key = resource.key;\n    if (logPFrames()) {\n      this.logger(\"info\", `createPTable cache - added PTable ${key} with size ${size}`);\n    }\n\n    const status: LRUCache.Status<PoolEntry<PTableHandle, PTableHolder>> = {};\n    this.global.set(key, resource, { size: Math.max(size, 1), status }); // 1 is minimum size to avoid cache evictions\n\n    if (status.maxEntrySizeExceeded) {\n      resource.unref();\n      if (logPFrames()) {\n        this.logger(\"info\", `createPTable cache - removed PTable ${key} (maxEntrySizeExceeded)`);\n      }\n    } else {\n      if (!this.disposeListeners.has(key)) {\n        const disposeListener = () => {\n          this.global.delete(key);\n\n          this.disposeListeners.delete(key);\n          defDisposeSignal.removeEventListener(\"abort\", disposeListener);\n        };\n        this.disposeListeners.add(key);\n        defDisposeSignal.addEventListener(\"abort\", disposeListener);\n      }\n    }\n  }\n}\n"],"mappings":";;;;AAgBA,MAAa,8BAAmD,EAC9D,qBAAqB,KAAK,OAAO,OAAO,MACzC;AAED,IAAa,mBAAb,MAA8B;CAC5B,AAAiB;CACjB,AAAiB,mCAAmB,IAAI,KAAmB;CAE3D,YACE,AAAiB,QACjB,KACA;EAFiB;AAGjB,OAAK,SAAS,IAAI,SAA8D;GAC9E,SAAS,IAAI;GACb,UAAU,UAAU,KAAK,WAAW;AAClC,aAAS,OAAO;AAChB,QAAI,YAAY,CACd,QAAO,QAAQ,uCAAuC,IAAI,YAAY,OAAO,GAAG;;GAGrF,CAAC;;CAGJ,AAAO,MACL,UACA,MACA,kBACM;EACN,MAAM,MAAM,SAAS;AACrB,MAAI,YAAY,CACd,MAAK,OAAO,QAAQ,qCAAqC,IAAI,aAAa,OAAO;EAGnF,MAAM,SAAiE,EAAE;AACzE,OAAK,OAAO,IAAI,KAAK,UAAU;GAAE,MAAM,KAAK,IAAI,MAAM,EAAE;GAAE;GAAQ,CAAC;AAEnE,MAAI,OAAO,sBAAsB;AAC/B,YAAS,OAAO;AAChB,OAAI,YAAY,CACd,MAAK,OAAO,QAAQ,uCAAuC,IAAI,yBAAyB;aAGtF,CAAC,KAAK,iBAAiB,IAAI,IAAI,EAAE;GACnC,MAAM,wBAAwB;AAC5B,SAAK,OAAO,OAAO,IAAI;AAEvB,SAAK,iBAAiB,OAAO,IAAI;AACjC,qBAAiB,oBAAoB,SAAS,gBAAgB;;AAEhE,QAAK,iBAAiB,IAAI,IAAI;AAC9B,oBAAiB,iBAAiB,SAAS,gBAAgB"}

package/dist/ptable_def_pool.cjs

@@ -2,7 +2,7 @@ const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
 const require_logging = require('./logging.cjs');
 const require_ptable_shared = require('./ptable_shared.cjs');
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
-let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 
 //#region src/ptable_def_pool.ts
 var PTableDefHolder = class {
@@ -21,7 +21,7 @@ var PTableDefHolder = class {
 		if (require_logging.logPFrames()) this.logger("info", `PTable definition disposed (pTableHandle = ${this.pTableHandle})`);
 	}
 };
-var PTableDefPool = class extends _milaboratories_ts_helpers.RefCountPoolBase {
+var PTableDefPool = class extends _milaboratories_helpers.RefCountPoolBase {
 	constructor(logger) {
 		super();
 		this.logger = logger;

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/ts-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,AAAiB,kBAAkB,IAAI,iBAAiB;CAExD,YACE,AAAgB,KAChB,AAAiB,cACjB,AAAiB,QACjB;EAHgB;EACC;EACA;AAEjB,MAAIA,4BAAY,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,4BAAY,CACd,MAAK,OAAO,QAAQ,8CAA8C,KAAK,aAAa,GAAG;;;AAK7F,IAAa,gBAAb,cAAmCC,4CAA+D;CAChG,YAAY,AAAiB,QAA+B;AAC1D,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAAqC;AAChE,SAAOC,iDAA2B,OAAO;;CAG3C,AAAU,kBAAkB,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,AAAO,SAAS,KAAoC;EAClD,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIC,kDAAkB,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"],"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,AAAiB,kBAAkB,IAAI,iBAAiB;CAExD,YACE,AAAgB,KAChB,AAAiB,cACjB,AAAiB,QACjB;EAHgB;EACC;EACA;AAEjB,MAAIA,4BAAY,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,4BAAY,CACd,MAAK,OAAO,QAAQ,8CAA8C,KAAK,aAAa,GAAG;;;AAK7F,IAAa,gBAAb,cAAmCC,yCAA+D;CAChG,YAAY,AAAiB,QAA+B;AAC1D,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAAqC;AAChE,SAAOC,iDAA2B,OAAO;;CAG3C,AAAU,kBAAkB,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,AAAO,SAAS,KAAoC;EAClD,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIC,kDAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,gCAAgC,IAAI,YAAY;AACxE,SAAM;;AAER,SAAO"}

package/dist/ptable_def_pool.d.ts

@@ -1,4 +1,4 @@
 import "./ptable_shared.js";
 import { PTableHandle } from "@milaboratories/pl-model-common";
-import { RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";

package/dist/ptable_def_pool.js

@@ -1,7 +1,7 @@
 import { logPFrames } from "./logging.js";
 import { stableKeyFromFullPTableDef } from "./ptable_shared.js";
 import { PFrameDriverError } from "@milaboratories/pl-model-common";
-import { RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase } from "@milaboratories/helpers";
 
 //#region src/ptable_def_pool.ts
 var PTableDefHolder = class {

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/ts-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,AAAiB,kBAAkB,IAAI,iBAAiB;CAExD,YACE,AAAgB,KAChB,AAAiB,cACjB,AAAiB,QACjB;EAHgB;EACC;EACA;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,AAAiB,QAA+B;AAC1D,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAAqC;AAChE,SAAO,2BAA2B,OAAO;;CAG3C,AAAU,kBAAkB,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,AAAO,SAAS,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 { 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,AAAiB,kBAAkB,IAAI,iBAAiB;CAExD,YACE,AAAgB,KAChB,AAAiB,cACjB,AAAiB,QACjB;EAHgB;EACC;EACA;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,AAAiB,QAA+B;AAC1D,SAAO;EADoB;;CAI7B,AAAU,mBAAmB,QAAqC;AAChE,SAAO,2BAA2B,OAAO;;CAG3C,AAAU,kBAAkB,QAAuB,KAAoC;AACrF,SAAO,IAAI,gBAAgB,QAAQ,KAAK,KAAK,OAAO;;CAGtD,AAAO,SAAS,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"}

package/dist/ptable_pool.cjs

@@ -2,7 +2,7 @@ const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
 const require_logging = require('./logging.cjs');
 const require_ptable_shared = require('./ptable_shared.cjs');
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
-let _milaboratories_ts_helpers = require("@milaboratories/ts-helpers");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 
 //#region src/ptable_pool.ts
 var PTableHolder = class {
@@ -23,7 +23,7 @@ var PTableHolder = class {
 		this.pTablePromise.then((pTable) => pTable.dispose()).catch(() => {});
 	}
 };
-var PTablePool = class extends _milaboratories_ts_helpers.RefCountPoolBase {
+var PTablePool = class extends _milaboratories_helpers.RefCountPoolBase {
 	constructor(pFrames, pTableDefs, logger) {
 		super();
 		this.pFrames = pFrames;

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/ts-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"],"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":";;;;;;;AAuBA,IAAa,eAAb,MAAgD;CAC9C,AAAiB,kBAAkB,IAAI,iBAAiB;CACxD,AAAiB;CAEjB,YACE,AAAgB,QAChB,qBACA,AAAgB,eAChB,AAAiB,aACjB;EAJgB;EAEA;EACC;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;AACzB,EAAK,KAAK,cACP,MAAM,WAAW,OAAO,SAAS,CAAC,CAClC,YAAY,GAEX;;;AAIR,IAAa,aAAb,cAAoEA,yCAIlE;CACA,YACE,AAAiB,SACjB,AAAiB,YACjB,AAAiB,QACjB;AACA,SAAO;EAJU;EACA;EACA;;CAKnB,AAAU,mBAAmB,QAAqC;AAChE,SAAOC,iDAA2B,OAAO;;CAG3C,AAAU,kBAAkB,QAAuB,KAAiC;AAClF,MAAIC,4BAAY,CACd,MAAK,OACH,QACA,mCAAmC,IAAI,KAAU,KAAK,UAAU,QAAQC,+CAAe,GACxF;AAGH,UAAQ,OAAO,MAAf;GACE,KAAK,KACH,QAAO,KAAK,oBAAoB,QAAQ,IAAI;GAC9C,KAAK,KACH,QAAO,KAAK,oBAAoB,QAAQ,IAAI;GAC9C,QAEE,OAAM,IAAIC,kDAAkB,mCAAmC,OAAO,OAAO;;;CAInF,AAAU,oBAAoB,QAAyB,KAAiC;EACtF,MAAM,EAAE,KAAK,iBAAiB;EAC9B,MAAM,EAAE,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE5E,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;EAC3D,MAAM,iBAAiB,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;AAG5F,MAAI,IAAI,QAAQ,SAAS,GAAG;GAC1B,MAAM,cAAc,KAAK,QAAQ;IAC/B,GAAG;IACH,KAAK;KACH,GAAG;KACH,SAAS,EAAE;KACZ;IACF,CAAC;GACF,MAAM,EACJ,UAAU,EAAE,oBACV;AAEJ,UAAO,IAAI,aAAa,cAAc,gBADlB,cAAc,MAAM,WAAW,OAAO,KAAK,KAAK,IAAI,QAAQ,CAAC,EACd,YAAY;;AAIjF,MAAI,CAAC,qBAAqB,IAAI,IAAI,IAAI,IAAI,QAAQ,SAAS,GAAG;GAC5D,MAAM,cAAc,KAAK,QAAQ;IAC/B,GAAG;IACH,KAAK;KACH,GAAG;KACH,SAAS,EAAE;KACZ;IACF,CAAC;GACF,MAAM,EACJ,UAAU,EAAE,oBACV;AAEJ,UAAO,IAAI,aAAa,cAAc,gBADhB,cAAc,MAAM,WAAW,OAAO,OAAO,KAAK,IAAI,QAAQ,CAAC,EAChB,YAAY;;AAWnF,SAAO,IAAI,aAAa,cAAc,gBAPxB,cAAc,MAAM,WAChC,OAAO,YAAY,KAAK;GACtB,KAAK,oBAAoB,IAAI,IAAI;GAEjC,SAAS,CAAC,GAAG,IAAI,kBAAkB,GAAG,IAAI,QAAQ;GACnD,CAAC,CACH,CAC2D;;CAG9D,AAAU,oBAAoB,QAAyB,KAAiC;EACtF,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE5E,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;AAI3D,SAAO,IAAI,aAAa,cAHD,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC,EAE9E,cAAc,MAAM,WAAW,OAAO,cAAc,KAAK,OAAO,IAAI,CAAC,CACvB;;CAG9D,AAAO,SAAS,KAAiC;EAC/C,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIA,kDAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,sBAAsB,IAAI,YAAY;AAC9D,SAAM;;AAER,SAAO;;;AAIX,SAAS,qBAAwB,OAA8B;AAC7D,SAAQ,MAAM,MAAd;EACE,KAAK;EACL,KAAK;EACL,KAAK,eACH,QAAO;EACT,KAAK,mBACH,QAAO;EACT,KAAK;EACL,KAAK,QACH,QAAO,MAAM,QAAQ,KAAK,qBAAqB;EACjD,KAAK,QACH,QAAO,qBAAqB,MAAM,QAAQ,IAAI,MAAM,UAAU,KAAK,qBAAqB;EAC1F,QACE,kDAAY,MAAM;;;AAIxB,SAAS,oBAAoB,OAAyD;CACpF,MAAM,OAAO,MAAM;AACnB,SAAQ,MAAR;EACE,KAAK,SACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GACjB;EACH,KAAK,eACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GAChB,OAAO,MAAM;GACb,aAAa,MAAM;GACpB;EACH,KAAK,mBACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GAChB,OAAO,MAAM;GACb,aAAa,MAAM;GACpB;EACH,KAAK,eACH,QAAO;GACL,MAAM;GACN,OAAO,MAAM,OAAO;GACpB,MAAM,MAAM,OAAO;GACnB,UAAU;IACR,MAAM;IACN,WAAW,MAAM,OAAO,KAAK,SAAS;IACtC,MAAM,MAAM,OAAO,KAAK,QACrB,KAAK,QAAQ;AACZ,SAAI,KAAK,UAAU,IAAI,IAAI,IAAI,IAAI;AACnC,YAAO;OAET,EAAE,CACH;IACF;GACF;EACH,KAAK;EACL,KAAK,OACH,QAAO;GACL,MAAM,MAAM;GACZ,SAAS,MAAM,QAAQ,KAAK,QAAQ,oBAAoB,IAAI,CAAC;GAC9D;EACH,KAAK,QACH,QAAO;GACL,MAAM;GACN,SAAS,oBAAoB,MAAM,QAAQ;GAC3C,WAAW,MAAM,UAAU,KAAK,QAAQ,oBAAoB,IAAI,CAAC;GAClE;EACH,QACE,OAAM,IAAIA,kDAAkB,uCAAuC,OAAuB"}

package/dist/ptable_pool.d.ts

@@ -2,5 +2,5 @@ import "./pframe_pool.js";
 import "./ptable_shared.js";
 import "./ptable_def_pool.js";
 import { JsonSerializable, PFrameHandle, PTableHandle } from "@milaboratories/pl-model-common";
-import { PoolEntry, RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { PoolEntry, RefCountPoolBase } from "@milaboratories/helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";

package/dist/ptable_pool.js

@@ -1,7 +1,7 @@
 import { logPFrames } from "./logging.js";
 import { stableKeyFromFullPTableDef } from "./ptable_shared.js";
 import { PFrameDriverError, assertNever, bigintReplacer } from "@milaboratories/pl-model-common";
-import { RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase } from "@milaboratories/helpers";
 
 //#region src/ptable_pool.ts
 var PTableHolder = class {

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/ts-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  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":";;;;;;AAuBA,IAAa,eAAb,MAAgD;CAC9C,AAAiB,kBAAkB,IAAI,iBAAiB;CACxD,AAAiB;CAEjB,YACE,AAAgB,QAChB,qBACA,AAAgB,eAChB,AAAiB,aACjB;EAJgB;EAEA;EACC;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;AACzB,EAAK,KAAK,cACP,MAAM,WAAW,OAAO,SAAS,CAAC,CAClC,YAAY,GAEX;;;AAIR,IAAa,aAAb,cAAoE,iBAIlE;CACA,YACE,AAAiB,SACjB,AAAiB,YACjB,AAAiB,QACjB;AACA,SAAO;EAJU;EACA;EACA;;CAKnB,AAAU,mBAAmB,QAAqC;AAChE,SAAO,2BAA2B,OAAO;;CAG3C,AAAU,kBAAkB,QAAuB,KAAiC;AAClF,MAAI,YAAY,CACd,MAAK,OACH,QACA,mCAAmC,IAAI,KAAU,KAAK,UAAU,QAAQ,eAAe,GACxF;AAGH,UAAQ,OAAO,MAAf;GACE,KAAK,KACH,QAAO,KAAK,oBAAoB,QAAQ,IAAI;GAC9C,KAAK,KACH,QAAO,KAAK,oBAAoB,QAAQ,IAAI;GAC9C,QAEE,OAAM,IAAI,kBAAkB,mCAAmC,OAAO,OAAO;;;CAInF,AAAU,oBAAoB,QAAyB,KAAiC;EACtF,MAAM,EAAE,KAAK,iBAAiB;EAC9B,MAAM,EAAE,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE5E,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;EAC3D,MAAM,iBAAiB,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;AAG5F,MAAI,IAAI,QAAQ,SAAS,GAAG;GAC1B,MAAM,cAAc,KAAK,QAAQ;IAC/B,GAAG;IACH,KAAK;KACH,GAAG;KACH,SAAS,EAAE;KACZ;IACF,CAAC;GACF,MAAM,EACJ,UAAU,EAAE,oBACV;AAEJ,UAAO,IAAI,aAAa,cAAc,gBADlB,cAAc,MAAM,WAAW,OAAO,KAAK,KAAK,IAAI,QAAQ,CAAC,EACd,YAAY;;AAIjF,MAAI,CAAC,qBAAqB,IAAI,IAAI,IAAI,IAAI,QAAQ,SAAS,GAAG;GAC5D,MAAM,cAAc,KAAK,QAAQ;IAC/B,GAAG;IACH,KAAK;KACH,GAAG;KACH,SAAS,EAAE;KACZ;IACF,CAAC;GACF,MAAM,EACJ,UAAU,EAAE,oBACV;AAEJ,UAAO,IAAI,aAAa,cAAc,gBADhB,cAAc,MAAM,WAAW,OAAO,OAAO,KAAK,IAAI,QAAQ,CAAC,EAChB,YAAY;;AAWnF,SAAO,IAAI,aAAa,cAAc,gBAPxB,cAAc,MAAM,WAChC,OAAO,YAAY,KAAK;GACtB,KAAK,oBAAoB,IAAI,IAAI;GAEjC,SAAS,CAAC,GAAG,IAAI,kBAAkB,GAAG,IAAI,QAAQ;GACnD,CAAC,CACH,CAC2D;;CAG9D,AAAU,oBAAoB,QAAyB,KAAiC;EACtF,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE5E,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;AAI3D,SAAO,IAAI,aAAa,cAHD,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC,EAE9E,cAAc,MAAM,WAAW,OAAO,cAAc,KAAK,OAAO,IAAI,CAAC,CACvB;;CAG9D,AAAO,SAAS,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;;;AAIX,SAAS,qBAAwB,OAA8B;AAC7D,SAAQ,MAAM,MAAd;EACE,KAAK;EACL,KAAK;EACL,KAAK,eACH,QAAO;EACT,KAAK,mBACH,QAAO;EACT,KAAK;EACL,KAAK,QACH,QAAO,MAAM,QAAQ,KAAK,qBAAqB;EACjD,KAAK,QACH,QAAO,qBAAqB,MAAM,QAAQ,IAAI,MAAM,UAAU,KAAK,qBAAqB;EAC1F,QACE,aAAY,MAAM;;;AAIxB,SAAS,oBAAoB,OAAyD;CACpF,MAAM,OAAO,MAAM;AACnB,SAAQ,MAAR;EACE,KAAK,SACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GACjB;EACH,KAAK,eACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GAChB,OAAO,MAAM;GACb,aAAa,MAAM;GACpB;EACH,KAAK,mBACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GAChB,OAAO,MAAM;GACb,aAAa,MAAM;GACpB;EACH,KAAK,eACH,QAAO;GACL,MAAM;GACN,OAAO,MAAM,OAAO;GACpB,MAAM,MAAM,OAAO;GACnB,UAAU;IACR,MAAM;IACN,WAAW,MAAM,OAAO,KAAK,SAAS;IACtC,MAAM,MAAM,OAAO,KAAK,QACrB,KAAK,QAAQ;AACZ,SAAI,KAAK,UAAU,IAAI,IAAI,IAAI,IAAI;AACnC,YAAO;OAET,EAAE,CACH;IACF;GACF;EACH,KAAK;EACL,KAAK,OACH,QAAO;GACL,MAAM,MAAM;GACZ,SAAS,MAAM,QAAQ,KAAK,QAAQ,oBAAoB,IAAI,CAAC;GAC9D;EACH,KAAK,QACH,QAAO;GACL,MAAM;GACN,SAAS,oBAAoB,MAAM,QAAQ;GAC3C,WAAW,MAAM,UAAU,KAAK,QAAQ,oBAAoB,IAAI,CAAC;GAClE;EACH,QACE,OAAM,IAAI,kBAAkB,uCAAuC,OAAuB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pf-driver",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "PFrameDriver implementation abstracted from Middle Layer",
   "keywords": [],
   "license": "UNLICENSED",
@@ -24,17 +24,18 @@
     "@milaboratories/pframes-rs-wasm": "1.1.17",
     "es-toolkit": "^1.39.10",
     "lru-cache": "^11.2.2",
-    "@milaboratories/pl-model-common": "1.31.0",
-    "@milaboratories/ts-helpers": "1.8.0",
-    "@milaboratories/pl-model-middle-layer": "1.16.2"
+    "@milaboratories/helpers": "1.14.1",
+    "@milaboratories/pl-model-middle-layer": "1.16.3",
+    "@milaboratories/pl-model-common": "1.31.1",
+    "@milaboratories/ts-helpers": "1.8.1"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",
     "@vitest/coverage-istanbul": "^4.0.18",
     "typescript": "~5.9.3",
     "vitest": "^4.0.18",
-    "@milaboratories/ts-builder": "1.3.0",
     "@milaboratories/build-configs": "1.5.2",
+    "@milaboratories/ts-builder": "1.3.0",
     "@milaboratories/ts-configs": "1.2.2"
   },
   "engines": {

package/src/driver_decl.ts

@@ -15,7 +15,7 @@ import type {
   UniqueValuesRequest,
   UniqueValuesResponse,
 } from "@milaboratories/pl-model-common";
-import type { PoolEntry } from "@milaboratories/ts-helpers";
+import type { PoolEntry } from "@milaboratories/helpers";
 
 /**
  * Extends public and safe SDK's driver API with methods used internally in the middle

package/src/driver_double.ts

@@ -6,7 +6,7 @@ import {
   type PColumnValues,
 } from "@milaboratories/pl-model-common";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import { RefCountPoolBase, type PoolEntry } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase, type PoolEntry } from "@milaboratories/helpers";
 import { HttpHelpers } from "@milaboratories/pframes-rs-node";
 import fs from "node:fs";
 import path from "node:path";

package/src/driver_impl.ts

@@ -35,11 +35,8 @@ import {
   resolveAnnotationParents,
 } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import {
-  ConcurrencyLimitingExecutor,
-  PoolEntryGuard,
-  type PoolEntry,
-} from "@milaboratories/ts-helpers";
+import { ConcurrencyLimitingExecutor } from "@milaboratories/ts-helpers";
+import { PoolEntryGuard, type PoolEntry } from "@milaboratories/helpers";
 import { PFrameFactory } from "@milaboratories/pframes-rs-node";
 import { tmpdir } from "node:os";
 import type { AbstractInternalPFrameDriver } from "./driver_decl";

package/src/pframe_pool.ts

@@ -10,7 +10,7 @@ import {
   type PFrameHandle,
 } from "@milaboratories/pl-model-common";
 import { hashJson, PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import { RefCountPoolBase, type PoolEntry } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase, type PoolEntry } from "@milaboratories/helpers";
 import { PFrameFactory } from "@milaboratories/pframes-rs-node";
 import { mapValues } from "es-toolkit";
 import { logPFrames } from "./logging";

package/src/ptable_cache_per_frame.ts

@@ -1,6 +1,6 @@
 import type { PFrameHandle, PTableHandle } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import type { PoolEntry } from "@milaboratories/ts-helpers";
+import type { PoolEntry } from "@milaboratories/helpers";
 import { LRUCache } from "lru-cache";
 import { logPFrames } from "./logging";
 import type { PTableHolder } from "./ptable_pool";

package/src/ptable_cache_plain.ts

@@ -1,6 +1,6 @@
 import type { PTableHandle } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import type { PoolEntry } from "@milaboratories/ts-helpers";
+import type { PoolEntry } from "@milaboratories/helpers";
 import { LRUCache } from "lru-cache";
 import { logPFrames } from "./logging";
 import type { PTableHolder } from "./ptable_pool";

package/src/ptable_def_pool.ts

@@ -1,6 +1,6 @@
 import { PFrameDriverError, type PTableHandle } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import { RefCountPoolBase } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase } from "@milaboratories/helpers";
 import { logPFrames } from "./logging";
 import type { FullPTableDef } from "./ptable_shared";
 import { stableKeyFromFullPTableDef } from "./ptable_shared";

package/src/ptable_pool.ts

@@ -10,7 +10,7 @@ import {
   type PObjectId,
 } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
-import { RefCountPoolBase, type PoolEntry } from "@milaboratories/ts-helpers";
+import { RefCountPoolBase, type PoolEntry } from "@milaboratories/helpers";
 import { logPFrames } from "./logging";
 import type { PFramePool } from "./pframe_pool";
 import {