@milaboratories/pf-driver 1.2.0 → 1.3.1

package/dist/driver_double.cjs

@@ -87,6 +87,7 @@ var RemoteBlobProviderImpl = class RemoteBlobProviderImpl {
 	}
 	async [Symbol.asyncDispose]() {
 		await this.server.stop();
+		await this.pool[Symbol.asyncDispose]();
 	}
 };
 async function createPFrameDriverDouble({ dataFolder = (0, node_os.tmpdir)(), logger = console.log }) {

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  }\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;;;AAS5B,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/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"}

package/dist/driver_double.js

@@ -84,6 +84,7 @@ var RemoteBlobProviderImpl = class RemoteBlobProviderImpl {
 	}
 	async [Symbol.asyncDispose]() {
 		await this.server.stop();
+		await this.pool[Symbol.asyncDispose]();
 	}
 };
 async function createPFrameDriverDouble({ dataFolder = tmpdir(), logger = console.log }) {

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  }\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;;;AAS5B,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/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"}

package/dist/driver_impl.cjs

@@ -48,62 +48,88 @@ var AbstractPFrameDriver = class {
 		this.pTableCachePlain = new require_ptable_cache_plain.PTableCachePlain(this.logger, options);
 	}
 	async dispose() {
-		return await this.remoteBlobProvider[Symbol.asyncDispose]();
+		await Promise.allSettled([
+			this.pTables[Symbol.asyncDispose](),
+			this.pTableDefs[Symbol.asyncDispose](),
+			this.pFrames[Symbol.asyncDispose](),
+			this.localBlobProvider[Symbol.asyncDispose](),
+			this.remoteBlobProvider[Symbol.asyncDispose]()
+		]);
 	}
 	async [Symbol.asyncDispose]() {
 		return await this.dispose();
 	}
 	createPFrame(def) {
 		const ValueTypes = new Set(Object.values(_milaboratories_pl_model_common.ValueType));
-		const columns = (0, _milaboratories_pl_model_common.uniqueBy)(def.filter((column) => ValueTypes.has(column.spec.valueType)), (column) => column.id).map((c) => (0, _milaboratories_pl_model_common.mapPObjectData)(c, (d) => this.resolveDataInfo(c.spec, d)));
+		const columns = (0, _milaboratories_pl_model_common.uniqueBy)(def.filter((column) => ValueTypes.has(column.spec.valueType)).map((c) => ({
+			...c,
+			spec: (0, _milaboratories_pl_model_common.resolveAnnotationParents)(c.spec)
+		})), (column) => column.id).map((c) => (0, _milaboratories_pl_model_common.mapPObjectData)(c, (d) => this.resolveDataInfo(c.spec, d)));
 		return this.pFrames.acquire(columns);
 	}
 	createPTable(rawDef) {
-		const pFrameEntry = 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",
-			def: sortedDef,
-			pFrameHandle: pFrameEntry.key
-		});
-		if (require_logging.logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`);
-		const unref = () => {
-			pTableEntry.unref();
-			pFrameEntry.unref();
-		};
-		return {
-			key: pTableEntry.key,
-			resource: pTableEntry.resource,
-			unref,
-			[Symbol.dispose]: unref
-		};
+		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 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",
+				def: sortedDef,
+				pFrameHandle: pFrameGuard.key
+			});
+			if (require_logging.logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`);
+			const pFrameEntry = pFrameGuard.keep();
+			const unref = () => {
+				pTableEntry.unref();
+				pFrameEntry.unref();
+			};
+			return {
+				key: pTableEntry.key,
+				resource: pTableEntry.resource,
+				unref,
+				[Symbol.dispose]: unref
+			};
+		} catch (_) {
+			_usingCtx$1.e = _;
+		} finally {
+			_usingCtx$1.d();
+		}
 	}
 	createPTableV2(def) {
-		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 pFrameEntry = this.createPFrame(columns);
-		const specFrame = (0, _milaboratories_pframes_rs_wasm.createPFrame)(columnsMap);
-		const sortedQuery = (0, _milaboratories_pl_model_common.sortSpecQuery)((0, _milaboratories_pl_model_common.mapSpecQueryColumns)(def.query, (c) => c.id));
-		const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);
-		const pTableEntry = this.pTableDefs.acquire({
-			type: "v2",
-			pFrameHandle: pFrameEntry.key,
-			def: {
-				tableSpec,
-				dataQuery
-			}
-		});
-		if (require_logging.logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`);
-		const unref = () => {
-			pTableEntry.unref();
-			pFrameEntry.unref();
-		};
-		return {
-			key: pTableEntry.key,
-			resource: pTableEntry.resource,
-			unref,
-			[Symbol.dispose]: unref
-		};
+		try {
+			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 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));
+			const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);
+			const pTableEntry = this.pTableDefs.acquire({
+				type: "v2",
+				pFrameHandle: pFrameGuard.key,
+				def: {
+					tableSpec,
+					dataQuery
+				}
+			});
+			if (require_logging.logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`);
+			const pFrameEntry = pFrameGuard.keep();
+			const unref = () => {
+				pTableEntry.unref();
+				pFrameEntry.unref();
+			};
+			return {
+				key: pTableEntry.key,
+				resource: pTableEntry.resource,
+				unref,
+				[Symbol.dispose]: unref
+			};
+		} catch (_) {
+			_usingCtx3.e = _;
+		} finally {
+			_usingCtx3.d();
+		}
 	}
 	async findColumns(handle, request) {
 		const iRequest = {
@@ -125,33 +151,35 @@ var AbstractPFrameDriver = class {
 		return await (await pFramePromise).listColumns();
 	}
 	async calculateTableData(handle, request, range, signal) {
-		if (require_logging.logPFrames()) this.logger("info", `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, _milaboratories_pl_model_common.bigintReplacer)}`);
-		const table = this.pTables.acquire({
-			type: "v1",
-			pFrameHandle: handle,
-			def: (0, _milaboratories_pl_model_common.sortPTableDef)(migrateTableFilter(request, this.logger))
-		});
-		const { pTablePromise, disposeSignal } = table.resource;
-		const pTable = await pTablePromise;
-		const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
-		return await this.frameConcurrencyLimiter.run(async () => {
-			try {
+		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({
+				type: "v1",
+				pFrameHandle: handle,
+				def: (0, _milaboratories_pl_model_common.sortPTableDef)(migrateTableFilter(request, this.logger))
+			})));
+			const { pTablePromise, disposeSignal } = tableGuard.resource;
+			const pTable = await pTablePromise;
+			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
+			return await this.frameConcurrencyLimiter.run(async () => {
 				const spec = pTable.getSpec();
 				const data = await pTable.getData([...spec.keys()], {
 					range,
 					signal: combinedSignal
 				});
 				const overallSize = await pTable.getFootprint({ signal: combinedSignal });
-				this.pTableCachePerFrame.cache(table, overallSize);
+				this.pTableCachePerFrame.cache(tableGuard.keep(), overallSize);
 				return spec.map((spec, i) => ({
 					spec,
 					data: data[i]
 				}));
-			} catch (err) {
-				table.unref();
-				throw err;
-			}
-		});
+			});
+		} catch (_) {
+			_usingCtx4.e = _;
+		} finally {
+			_usingCtx4.d();
+		}
 	}
 	async getUniqueValues(handle, request, signal) {
 		if (require_logging.logPFrames()) this.logger("info", `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, _milaboratories_pl_model_common.bigintReplacer)}`);
@@ -167,48 +195,62 @@ var AbstractPFrameDriver = class {
 	}
 	async getSpec(handle) {
 		try {
-			var _usingCtx$1 = require_usingCtx._usingCtx();
+			var _usingCtx5 = require_usingCtx._usingCtx();
 			const { def } = this.pTableDefs.getByKey(handle);
-			const { pTablePromise } = _usingCtx$1.u(this.pTables.acquire(def)).resource;
+			const { pTablePromise } = _usingCtx5.u(this.pTables.acquire(def)).resource;
 			return (await pTablePromise).getSpec();
 		} catch (_) {
-			_usingCtx$1.e = _;
+			_usingCtx5.e = _;
 		} finally {
-			_usingCtx$1.d();
+			_usingCtx5.d();
 		}
 	}
 	async getShape(handle, signal) {
-		const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-		const table = this.pTables.acquire(def);
-		const { pTablePromise, disposeSignal } = table.resource;
-		const pTable = await pTablePromise;
-		const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
-		const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
-			return {
-				shape: await pTable.getShape({ signal: combinedSignal }),
-				overallSize: await pTable.getFootprint({ signal: combinedSignal })
-			};
-		});
-		this.pTableCachePlain.cache(table, overallSize, defDisposeSignal);
-		return shape;
+		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 { pTablePromise, disposeSignal } = tableGuard.resource;
+			const pTable = await pTablePromise;
+			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
+			const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
+				return {
+					shape: await pTable.getShape({ signal: combinedSignal }),
+					overallSize: await pTable.getFootprint({ signal: combinedSignal })
+				};
+			});
+			this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);
+			return shape;
+		} catch (_) {
+			_usingCtx6.e = _;
+		} finally {
+			_usingCtx6.d();
+		}
 	}
 	async getData(handle, columnIndices, range, signal) {
-		const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-		const table = this.pTables.acquire(def);
-		const { pTablePromise, disposeSignal } = table.resource;
-		const pTable = await pTablePromise;
-		const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
-		const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
-			return {
-				data: await pTable.getData(columnIndices, {
-					range,
-					signal: combinedSignal
-				}),
-				overallSize: await pTable.getFootprint({ signal: combinedSignal })
-			};
-		});
-		this.pTableCachePlain.cache(table, overallSize, defDisposeSignal);
-		return data;
+		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 { pTablePromise, disposeSignal } = tableGuard.resource;
+			const pTable = await pTablePromise;
+			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
+			const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
+				return {
+					data: await pTable.getData(columnIndices, {
+						range,
+						signal: combinedSignal
+					}),
+					overallSize: await pTable.getFootprint({ signal: combinedSignal })
+				};
+			});
+			this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);
+			return data;
+		} catch (_) {
+			_usingCtx7.e = _;
+		} finally {
+			_usingCtx7.d();
+		}
 	}
 };
 function migrateFilters(filters, logger) {

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","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} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { ConcurrencyLimitingExecutor, type PoolEntry } 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<\n  TreeEntry extends JsonSerializable,\n> extends PoolLocalBlobProvider<TreeEntry> {}\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    return await this.remoteBlobProvider[Symbol.asyncDispose]();\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\n    const supportedColumns = def.filter((column) => ValueTypes.has(column.spec.valueType));\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    const pFrameEntry = 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: pFrameEntry.key,\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\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    const pFrameEntry = this.createPFrame(columns);\n    const specFrame = createSpecFrame(columnsMap);\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: pFrameEntry.key,\n      def: {\n        tableSpec,\n        dataQuery,\n      },\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\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    const table = this.pTables.acquire({\n      type: \"v1\",\n      pFrameHandle: handle,\n      def: sortPTableDef(migrateTableFilter(request, this.logger)),\n    });\n    const { pTablePromise, disposeSignal } = table.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      try {\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(table, overallSize);\n\n        return spec.map((spec, i) => ({\n          spec: spec,\n          data: data[i],\n        }));\n      } catch (err: unknown) {\n        table.unref();\n        throw err;\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    const table = this.pTables.acquire(def);\n\n    const { pTablePromise, disposeSignal } = table.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(table, 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    const table = this.pTables.acquire(def);\n\n    const { pTablePromise, disposeSignal } = table.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(table, 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 {\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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"}

package/dist/driver_impl.d.ts

@@ -7,7 +7,7 @@ import { PoolEntry } from "@milaboratories/ts-helpers";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 
 //#region src/driver_impl.d.ts
-interface LocalBlobProvider<TreeEntry extends JsonSerializable> extends LocalBlobProvider$1<TreeEntry> {}
+interface LocalBlobProvider<TreeEntry extends JsonSerializable> extends LocalBlobProvider$1<TreeEntry>, AsyncDisposable {}
 interface RemoteBlobProvider<TreeEntry extends JsonSerializable> extends RemoteBlobProvider$1<TreeEntry>, AsyncDisposable {}
 type AbstractPFrameDriverOps = PTableCachePerFrameOps & PTableCachePlainOps & {
   /** Concurrency limits for `getUniqueValues` and `calculateTableData` requests */pFrameConcurrency: number; /** Concurrency limits for `getShape` and `getData` requests */

package/dist/driver_impl.js

@@ -5,8 +5,8 @@ import { PTablePool } from "./ptable_pool.js";
 import { PTableCachePerFrame, PTableCachePerFrameOpsDefaults } from "./ptable_cache_per_frame.js";
 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, sortPTableDef, sortSpecQuery, uniqueBy } from "@milaboratories/pl-model-common";
-import { ConcurrencyLimitingExecutor } from "@milaboratories/ts-helpers";
+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 { PFrameFactory } from "@milaboratories/pframes-rs-node";
 import { tmpdir } from "node:os";
 import { createPFrame } from "@milaboratories/pframes-rs-wasm";
@@ -47,62 +47,88 @@ var AbstractPFrameDriver = class {
 		this.pTableCachePlain = new PTableCachePlain(this.logger, options);
 	}
 	async dispose() {
-		return await this.remoteBlobProvider[Symbol.asyncDispose]();
+		await Promise.allSettled([
+			this.pTables[Symbol.asyncDispose](),
+			this.pTableDefs[Symbol.asyncDispose](),
+			this.pFrames[Symbol.asyncDispose](),
+			this.localBlobProvider[Symbol.asyncDispose](),
+			this.remoteBlobProvider[Symbol.asyncDispose]()
+		]);
 	}
 	async [Symbol.asyncDispose]() {
 		return await this.dispose();
 	}
 	createPFrame(def) {
 		const ValueTypes = new Set(Object.values(ValueType));
-		const columns = uniqueBy(def.filter((column) => ValueTypes.has(column.spec.valueType)), (column) => column.id).map((c) => mapPObjectData(c, (d) => this.resolveDataInfo(c.spec, d)));
+		const columns = uniqueBy(def.filter((column) => ValueTypes.has(column.spec.valueType)).map((c) => ({
+			...c,
+			spec: resolveAnnotationParents(c.spec)
+		})), (column) => column.id).map((c) => mapPObjectData(c, (d) => this.resolveDataInfo(c.spec, d)));
 		return this.pFrames.acquire(columns);
 	}
 	createPTable(rawDef) {
-		const pFrameEntry = this.createPFrame(extractAllColumns(rawDef.src));
-		const sortedDef = sortPTableDef(migrateTableFilter(mapPTableDef(rawDef, (c) => c.id), this.logger));
-		const pTableEntry = this.pTableDefs.acquire({
-			type: "v1",
-			def: sortedDef,
-			pFrameHandle: pFrameEntry.key
-		});
-		if (logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`);
-		const unref = () => {
-			pTableEntry.unref();
-			pFrameEntry.unref();
-		};
-		return {
-			key: pTableEntry.key,
-			resource: pTableEntry.resource,
-			unref,
-			[Symbol.dispose]: unref
-		};
+		try {
+			var _usingCtx$1 = _usingCtx();
+			const pFrameGuard = _usingCtx$1.u(new PoolEntryGuard(this.createPFrame(extractAllColumns(rawDef.src))));
+			const sortedDef = sortPTableDef(migrateTableFilter(mapPTableDef(rawDef, (c) => c.id), this.logger));
+			const pTableEntry = this.pTableDefs.acquire({
+				type: "v1",
+				def: sortedDef,
+				pFrameHandle: pFrameGuard.key
+			});
+			if (logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`);
+			const pFrameEntry = pFrameGuard.keep();
+			const unref = () => {
+				pTableEntry.unref();
+				pFrameEntry.unref();
+			};
+			return {
+				key: pTableEntry.key,
+				resource: pTableEntry.resource,
+				unref,
+				[Symbol.dispose]: unref
+			};
+		} catch (_) {
+			_usingCtx$1.e = _;
+		} finally {
+			_usingCtx$1.d();
+		}
 	}
 	createPTableV2(def) {
-		const columns = uniqueBy(collectSpecQueryColumns(def.query), (c) => c.id);
-		const columnsMap = columns.reduce((acc, col) => (acc[col.id] = col.spec, acc), {});
-		const pFrameEntry = this.createPFrame(columns);
-		const specFrame = createPFrame(columnsMap);
-		const sortedQuery = sortSpecQuery(mapSpecQueryColumns(def.query, (c) => c.id));
-		const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);
-		const pTableEntry = this.pTableDefs.acquire({
-			type: "v2",
-			pFrameHandle: pFrameEntry.key,
-			def: {
-				tableSpec,
-				dataQuery
-			}
-		});
-		if (logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`);
-		const unref = () => {
-			pTableEntry.unref();
-			pFrameEntry.unref();
-		};
-		return {
-			key: pTableEntry.key,
-			resource: pTableEntry.resource,
-			unref,
-			[Symbol.dispose]: unref
-		};
+		try {
+			var _usingCtx3 = _usingCtx();
+			const columns = uniqueBy(collectSpecQueryColumns(def.query), (c) => c.id);
+			const columnsMap = columns.reduce((acc, col) => (acc[col.id] = col.spec, acc), {});
+			const pFrameGuard = _usingCtx3.u(new PoolEntryGuard(this.createPFrame(columns)));
+			const ValueTypes = new Set(Object.values(ValueType));
+			const specFrame = createPFrame(Object.fromEntries(Object.entries(columnsMap).filter(([, spec]) => ValueTypes.has(spec.valueType)).map(([id, spec]) => [id, resolveAnnotationParents(spec)])));
+			const sortedQuery = sortSpecQuery(mapSpecQueryColumns(def.query, (c) => c.id));
+			const { tableSpec, dataQuery } = specFrame.evaluateQuery(sortedQuery);
+			const pTableEntry = this.pTableDefs.acquire({
+				type: "v2",
+				pFrameHandle: pFrameGuard.key,
+				def: {
+					tableSpec,
+					dataQuery
+				}
+			});
+			if (logPFrames()) this.logger("info", `Create PTable call (pFrameHandle = ${pFrameGuard.key}; pTableHandle = ${pTableEntry.key})`);
+			const pFrameEntry = pFrameGuard.keep();
+			const unref = () => {
+				pTableEntry.unref();
+				pFrameEntry.unref();
+			};
+			return {
+				key: pTableEntry.key,
+				resource: pTableEntry.resource,
+				unref,
+				[Symbol.dispose]: unref
+			};
+		} catch (_) {
+			_usingCtx3.e = _;
+		} finally {
+			_usingCtx3.d();
+		}
 	}
 	async findColumns(handle, request) {
 		const iRequest = {
@@ -124,33 +150,35 @@ var AbstractPFrameDriver = class {
 		return await (await pFramePromise).listColumns();
 	}
 	async calculateTableData(handle, request, range, signal) {
-		if (logPFrames()) this.logger("info", `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`);
-		const table = this.pTables.acquire({
-			type: "v1",
-			pFrameHandle: handle,
-			def: sortPTableDef(migrateTableFilter(request, this.logger))
-		});
-		const { pTablePromise, disposeSignal } = table.resource;
-		const pTable = await pTablePromise;
-		const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
-		return await this.frameConcurrencyLimiter.run(async () => {
-			try {
+		try {
+			var _usingCtx4 = _usingCtx();
+			if (logPFrames()) this.logger("info", `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`);
+			const tableGuard = _usingCtx4.u(new PoolEntryGuard(this.pTables.acquire({
+				type: "v1",
+				pFrameHandle: handle,
+				def: sortPTableDef(migrateTableFilter(request, this.logger))
+			})));
+			const { pTablePromise, disposeSignal } = tableGuard.resource;
+			const pTable = await pTablePromise;
+			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
+			return await this.frameConcurrencyLimiter.run(async () => {
 				const spec = pTable.getSpec();
 				const data = await pTable.getData([...spec.keys()], {
 					range,
 					signal: combinedSignal
 				});
 				const overallSize = await pTable.getFootprint({ signal: combinedSignal });
-				this.pTableCachePerFrame.cache(table, overallSize);
+				this.pTableCachePerFrame.cache(tableGuard.keep(), overallSize);
 				return spec.map((spec, i) => ({
 					spec,
 					data: data[i]
 				}));
-			} catch (err) {
-				table.unref();
-				throw err;
-			}
-		});
+			});
+		} catch (_) {
+			_usingCtx4.e = _;
+		} finally {
+			_usingCtx4.d();
+		}
 	}
 	async getUniqueValues(handle, request, signal) {
 		if (logPFrames()) this.logger("info", `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`);
@@ -166,48 +194,62 @@ var AbstractPFrameDriver = class {
 	}
 	async getSpec(handle) {
 		try {
-			var _usingCtx$1 = _usingCtx();
+			var _usingCtx5 = _usingCtx();
 			const { def } = this.pTableDefs.getByKey(handle);
-			const { pTablePromise } = _usingCtx$1.u(this.pTables.acquire(def)).resource;
+			const { pTablePromise } = _usingCtx5.u(this.pTables.acquire(def)).resource;
 			return (await pTablePromise).getSpec();
 		} catch (_) {
-			_usingCtx$1.e = _;
+			_usingCtx5.e = _;
 		} finally {
-			_usingCtx$1.d();
+			_usingCtx5.d();
 		}
 	}
 	async getShape(handle, signal) {
-		const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-		const table = this.pTables.acquire(def);
-		const { pTablePromise, disposeSignal } = table.resource;
-		const pTable = await pTablePromise;
-		const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
-		const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
-			return {
-				shape: await pTable.getShape({ signal: combinedSignal }),
-				overallSize: await pTable.getFootprint({ signal: combinedSignal })
-			};
-		});
-		this.pTableCachePlain.cache(table, overallSize, defDisposeSignal);
-		return shape;
+		try {
+			var _usingCtx6 = _usingCtx();
+			const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
+			const tableGuard = _usingCtx6.u(new PoolEntryGuard(this.pTables.acquire(def)));
+			const { pTablePromise, disposeSignal } = tableGuard.resource;
+			const pTable = await pTablePromise;
+			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
+			const { shape, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
+				return {
+					shape: await pTable.getShape({ signal: combinedSignal }),
+					overallSize: await pTable.getFootprint({ signal: combinedSignal })
+				};
+			});
+			this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);
+			return shape;
+		} catch (_) {
+			_usingCtx6.e = _;
+		} finally {
+			_usingCtx6.d();
+		}
 	}
 	async getData(handle, columnIndices, range, signal) {
-		const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
-		const table = this.pTables.acquire(def);
-		const { pTablePromise, disposeSignal } = table.resource;
-		const pTable = await pTablePromise;
-		const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
-		const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
-			return {
-				data: await pTable.getData(columnIndices, {
-					range,
-					signal: combinedSignal
-				}),
-				overallSize: await pTable.getFootprint({ signal: combinedSignal })
-			};
-		});
-		this.pTableCachePlain.cache(table, overallSize, defDisposeSignal);
-		return data;
+		try {
+			var _usingCtx7 = _usingCtx();
+			const { def, disposeSignal: defDisposeSignal } = this.pTableDefs.getByKey(handle);
+			const tableGuard = _usingCtx7.u(new PoolEntryGuard(this.pTables.acquire(def)));
+			const { pTablePromise, disposeSignal } = tableGuard.resource;
+			const pTable = await pTablePromise;
+			const combinedSignal = AbortSignal.any([signal, disposeSignal].filter((s) => !!s));
+			const { data, overallSize } = await this.tableConcurrencyLimiter.run(async () => {
+				return {
+					data: await pTable.getData(columnIndices, {
+						range,
+						signal: combinedSignal
+					}),
+					overallSize: await pTable.getFootprint({ signal: combinedSignal })
+				};
+			});
+			this.pTableCachePlain.cache(tableGuard.keep(), overallSize, defDisposeSignal);
+			return data;
+		} catch (_) {
+			_usingCtx7.e = _;
+		} finally {
+			_usingCtx7.d();
+		}
 	}
 };
 function migrateFilters(filters, logger) {

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} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { ConcurrencyLimitingExecutor, type PoolEntry } 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<\n  TreeEntry extends JsonSerializable,\n> extends PoolLocalBlobProvider<TreeEntry> {}\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    return await this.remoteBlobProvider[Symbol.asyncDispose]();\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\n    const supportedColumns = def.filter((column) => ValueTypes.has(column.spec.valueType));\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    const pFrameEntry = 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: pFrameEntry.key,\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\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    const pFrameEntry = this.createPFrame(columns);\n    const specFrame = createSpecFrame(columnsMap);\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: pFrameEntry.key,\n      def: {\n        tableSpec,\n        dataQuery,\n      },\n    });\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `Create PTable call (pFrameHandle = ${pFrameEntry.key}; pTableHandle = ${pTableEntry.key})`,\n      );\n    }\n\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    const table = this.pTables.acquire({\n      type: \"v1\",\n      pFrameHandle: handle,\n      def: sortPTableDef(migrateTableFilter(request, this.logger)),\n    });\n    const { pTablePromise, disposeSignal } = table.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      try {\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(table, overallSize);\n\n        return spec.map((spec, i) => ({\n          spec: spec,\n          data: data[i],\n        }));\n      } catch (err: unknown) {\n        table.unref();\n        throw err;\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    const table = this.pTables.acquire(def);\n\n    const { pTablePromise, disposeSignal } = table.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(table, 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    const table = this.pTables.acquire(def);\n\n    const { pTablePromise, disposeSignal } = table.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(table, 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 {\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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pf-driver",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "PFrameDriver implementation abstracted from Middle Layer",
   "keywords": [],
   "license": "UNLICENSED",
@@ -20,22 +20,22 @@
     }
   },
   "dependencies": {
-    "@milaboratories/pframes-rs-node": "1.1.15",
-    "@milaboratories/pframes-rs-wasm": "1.1.15",
+    "@milaboratories/pframes-rs-node": "1.1.17",
+    "@milaboratories/pframes-rs-wasm": "1.1.17",
     "es-toolkit": "^1.39.10",
     "lru-cache": "^11.2.2",
-    "@milaboratories/pl-model-common": "1.29.0",
-    "@milaboratories/pl-model-middle-layer": "1.16.0",
-    "@milaboratories/ts-helpers": "1.7.3"
+    "@milaboratories/pl-model-common": "1.30.0",
+    "@milaboratories/ts-helpers": "1.8.0",
+    "@milaboratories/pl-model-middle-layer": "1.16.1"
   },
   "devDependencies": {
     "@types/node": "~24.5.2",
     "@vitest/coverage-istanbul": "^4.0.18",
     "typescript": "~5.9.3",
     "vitest": "^4.0.18",
-    "@milaboratories/build-configs": "1.5.2",
     "@milaboratories/ts-builder": "1.3.0",
-    "@milaboratories/ts-configs": "1.2.2"
+    "@milaboratories/ts-configs": "1.2.2",
+    "@milaboratories/build-configs": "1.5.2"
   },
   "engines": {
     "node": ">=22.19.0"

package/src/driver_double.ts

@@ -118,6 +118,7 @@ class RemoteBlobProviderImpl implements RemoteBlobProvider<FileName> {
 
   async [Symbol.asyncDispose](): Promise<void> {
     await this.server.stop();
+    await this.pool[Symbol.asyncDispose]();
   }
 }
 

package/src/driver_impl.ts

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