@milaboratories/pf-driver 1.0.68 → 1.1.1

package/dist/ptable_pool.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_pool.cjs","names":["RefCountPoolBase","stableKeyFromFullPTableDef","logPFrames","bigintReplacer","PFrameDriverError"],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableHandle,\n  type JoinEntry,\n  type JsonSerializable,\n  type PColumnValue,\n  type PObjectId,\n} from \"@platforma-sdk/model\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  FullPTableDefV1,\n  FullPTableDefV2,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    switch (params.type) {\n      case \"v1\":\n        return this.createNewResourceV1(params, key);\n      case \"v2\":\n        return this.createNewResourceV2(params, key);\n      default:\n        // @ts-expect-error `params.type` is a string, but we want to make sure all cases are handled\n        throw new PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);\n    }\n  }\n\n  protected createNewResourceV1(params: FullPTableDefV1, key: PTableHandle): PTableHolder {\n    const { def, pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    // 3. Sort\n    if (def.sorting.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          sorting: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const sortedTable = pTablePromise.then((pTable) => pTable.sort(key, def.sorting));\n      return new PTableHolder(pFrameHandle, combinedSignal, sortedTable, predecessor);\n    }\n\n    // 2. Filter (except the case with artificial columns where cartesian creates too many rows)\n    if (!hasArtificialColumns(def.src) && def.filters.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          filters: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const filteredTable = pTablePromise.then((pTable) => pTable.filter(key, def.filters));\n      return new PTableHolder(pFrameHandle, combinedSignal, filteredTable, predecessor);\n    }\n\n    // 1. Join\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTable(key, {\n        src: joinEntryToInternal(def.src),\n        // `def.filters` would be non-empty only when join has artificial columns\n        filters: [...def.partitionFilters, ...def.filters],\n      }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  protected createNewResourceV2(params: FullPTableDefV2, key: PTableHandle): PTableHolder {\n    const { pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const table = pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def));\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction hasArtificialColumns<T>(entry: JoinEntry<T>): boolean {\n  switch (entry.type) {\n    case \"column\":\n    case \"slicedColumn\":\n    case \"inlineColumn\":\n      return false;\n    case \"artificialColumn\":\n      return true;\n    case \"full\":\n    case \"inner\":\n      return entry.entries.some(hasArtificialColumns);\n    case \"outer\":\n      return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);\n    default:\n      assertNever(entry);\n  }\n}\n\nfunction joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntryV4 {\n  const type = entry.type;\n  switch (type) {\n    case \"column\":\n      return {\n        type: \"column\",\n        columnId: entry.column,\n      };\n    case \"slicedColumn\":\n      return {\n        type: \"slicedColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axisFilters: entry.axisFilters,\n      };\n    case \"artificialColumn\":\n      return {\n        type: \"artificialColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axesIndices: entry.axesIndices,\n      };\n    case \"inlineColumn\":\n      return {\n        type: \"inlineColumn\",\n        newId: entry.column.id,\n        spec: entry.column.spec,\n        dataInfo: {\n          type: \"Json\",\n          keyLength: entry.column.spec.axesSpec.length,\n          data: entry.column.data.reduce(\n            (acc, row) => {\n              acc[JSON.stringify(row.key)] = row.val;\n              return acc;\n            },\n            {} as Record<string, PColumnValue>,\n          ),\n        },\n      };\n    case \"inner\":\n    case \"full\":\n      return {\n        type: entry.type,\n        entries: entry.entries.map((col) => joinEntryToInternal(col)),\n      };\n    case \"outer\":\n      return {\n        type: \"outer\",\n        primary: joinEntryToInternal(entry.primary),\n        secondary: entry.secondary.map((col) => joinEntryToInternal(col)),\n      };\n    default:\n      throw new PFrameDriverError(`unsupported PFrame join entry type: ${type satisfies never}`);\n  }\n}\n"],"mappings":";;;;;;;AAuBA,IAAa,eAAb,MAAgD;CAC9C,AAAiB,kBAAkB,IAAI,iBAAiB;CACxD,AAAiB;CAEjB,YACE,AAAgB,QAChB,qBACA,AAAgB,eAChB,AAAiB,aACjB;EAJgB;EAEA;EACC;AAEjB,OAAK,wBAAwB,YAAY,IAAI,CAC3C,qBACA,KAAK,gBAAgB,OACtB,CAAC;;CAGJ,IAAW,gBAA6B;AACtC,SAAO,KAAK;;CAGd,CAAC,OAAO,WAAiB;AACvB,OAAK,gBAAgB,OAAO;AAC5B,OAAK,aAAa,OAAO;AACzB,EAAK,KAAK,cACP,MAAM,WAAW,OAAO,SAAS,CAAC,CAClC,YAAY,GAEX;;;AAIR,IAAa,aAAb,cAAoEA,4CAIlE;CACA,YACE,AAAiB,SACjB,AAAiB,YACjB,AAAiB,QACjB;AACA,SAAO;EAJU;EACA;EACA;;CAKnB,AAAU,mBAAmB,QAAqC;AAChE,SAAOC,iDAA2B,OAAO;;CAG3C,AAAU,kBAAkB,QAAuB,KAAiC;AAClF,MAAIC,4BAAY,CACd,MAAK,OACH,QACA,mCAAmC,IAAI,KAAU,KAAK,UAAU,QAAQC,oCAAe,GACxF;AAGH,UAAQ,OAAO,MAAf;GACE,KAAK,KACH,QAAO,KAAK,oBAAoB,QAAQ,IAAI;GAC9C,KAAK,KACH,QAAO,KAAK,oBAAoB,QAAQ,IAAI;GAC9C,QAEE,OAAM,IAAIC,uCAAkB,mCAAmC,OAAO,OAAO;;;CAInF,AAAU,oBAAoB,QAAyB,KAAiC;EACtF,MAAM,EAAE,KAAK,iBAAiB;EAC9B,MAAM,EAAE,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE5E,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;EAC3D,MAAM,iBAAiB,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC;AAG5F,MAAI,IAAI,QAAQ,SAAS,GAAG;GAC1B,MAAM,cAAc,KAAK,QAAQ;IAC/B,GAAG;IACH,KAAK;KACH,GAAG;KACH,SAAS,EAAE;KACZ;IACF,CAAC;GACF,MAAM,EACJ,UAAU,EAAE,oBACV;AAEJ,UAAO,IAAI,aAAa,cAAc,gBADlB,cAAc,MAAM,WAAW,OAAO,KAAK,KAAK,IAAI,QAAQ,CAAC,EACd,YAAY;;AAIjF,MAAI,CAAC,qBAAqB,IAAI,IAAI,IAAI,IAAI,QAAQ,SAAS,GAAG;GAC5D,MAAM,cAAc,KAAK,QAAQ;IAC/B,GAAG;IACH,KAAK;KACH,GAAG;KACH,SAAS,EAAE;KACZ;IACF,CAAC;GACF,MAAM,EACJ,UAAU,EAAE,oBACV;AAEJ,UAAO,IAAI,aAAa,cAAc,gBADhB,cAAc,MAAM,WAAW,OAAO,OAAO,KAAK,IAAI,QAAQ,CAAC,EAChB,YAAY;;AAWnF,SAAO,IAAI,aAAa,cAAc,gBAPxB,cAAc,MAAM,WAChC,OAAO,YAAY,KAAK;GACtB,KAAK,oBAAoB,IAAI,IAAI;GAEjC,SAAS,CAAC,GAAG,IAAI,kBAAkB,GAAG,IAAI,QAAQ;GACnD,CAAC,CACH,CAC2D;;CAG9D,AAAU,oBAAoB,QAAyB,KAAiC;EACtF,MAAM,EAAE,iBAAiB;EACzB,MAAM,EAAE,eAAe,kBAAkB,KAAK,QAAQ,SAAS,aAAa;EAE5E,MAAM,mBAAmB,KAAK,WAAW,YAAY,IAAI,EAAE;AAI3D,SAAO,IAAI,aAAa,cAHD,YAAY,IAAI,CAAC,eAAe,iBAAiB,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,CAAC,EAE9E,cAAc,MAAM,WAAW,OAAO,cAAc,KAAK,OAAO,IAAI,CAAC,CACvB;;CAG9D,AAAO,SAAS,KAAiC;EAC/C,MAAM,WAAW,MAAM,YAAY,IAAI;AACvC,MAAI,CAAC,UAAU;GACb,MAAM,QAAQ,IAAIA,uCAAkB,wBAAwB;AAC5D,SAAM,wBAAQ,IAAI,MAAM,sBAAsB,IAAI,YAAY;AAC9D,SAAM;;AAER,SAAO;;;AAIX,SAAS,qBAAwB,OAA8B;AAC7D,SAAQ,MAAM,MAAd;EACE,KAAK;EACL,KAAK;EACL,KAAK,eACH,QAAO;EACT,KAAK,mBACH,QAAO;EACT,KAAK;EACL,KAAK,QACH,QAAO,MAAM,QAAQ,KAAK,qBAAqB;EACjD,KAAK,QACH,QAAO,qBAAqB,MAAM,QAAQ,IAAI,MAAM,UAAU,KAAK,qBAAqB;EAC1F,QACE,uCAAY,MAAM;;;AAIxB,SAAS,oBAAoB,OAAyD;CACpF,MAAM,OAAO,MAAM;AACnB,SAAQ,MAAR;EACE,KAAK,SACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GACjB;EACH,KAAK,eACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GAChB,OAAO,MAAM;GACb,aAAa,MAAM;GACpB;EACH,KAAK,mBACH,QAAO;GACL,MAAM;GACN,UAAU,MAAM;GAChB,OAAO,MAAM;GACb,aAAa,MAAM;GACpB;EACH,KAAK,eACH,QAAO;GACL,MAAM;GACN,OAAO,MAAM,OAAO;GACpB,MAAM,MAAM,OAAO;GACnB,UAAU;IACR,MAAM;IACN,WAAW,MAAM,OAAO,KAAK,SAAS;IACtC,MAAM,MAAM,OAAO,KAAK,QACrB,KAAK,QAAQ;AACZ,SAAI,KAAK,UAAU,IAAI,IAAI,IAAI,IAAI;AACnC,YAAO;OAET,EAAE,CACH;IACF;GACF;EACH,KAAK;EACL,KAAK,OACH,QAAO;GACL,MAAM,MAAM;GACZ,SAAS,MAAM,QAAQ,KAAK,QAAQ,oBAAoB,IAAI,CAAC;GAC9D;EACH,KAAK,QACH,QAAO;GACL,MAAM;GACN,SAAS,oBAAoB,MAAM,QAAQ;GAC3C,WAAW,MAAM,UAAU,KAAK,QAAQ,oBAAoB,IAAI,CAAC;GAClE;EACH,QACE,OAAM,IAAIA,uCAAkB,uCAAuC,OAAuB"}
+{"version":3,"file":"ptable_pool.cjs","names":["RefCountPoolBase","stableKeyFromFullPTableDef","logPFrames","bigintReplacer","PFrameDriverError"],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableHandle,\n  type JoinEntry,\n  type JsonSerializable,\n  type PColumnValue,\n  type PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  FullPTableDefV1,\n  FullPTableDefV2,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    switch (params.type) {\n      case \"v1\":\n        return this.createNewResourceV1(params, key);\n      case \"v2\":\n        return this.createNewResourceV2(params, key);\n      default:\n        // @ts-expect-error `params.type` is a string, but we want to make sure all cases are handled\n        throw new PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);\n    }\n  }\n\n  protected createNewResourceV1(params: FullPTableDefV1, key: PTableHandle): PTableHolder {\n    const { def, pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    // 3. Sort\n    if (def.sorting.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          sorting: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const sortedTable = pTablePromise.then((pTable) => pTable.sort(key, def.sorting));\n      return new PTableHolder(pFrameHandle, combinedSignal, sortedTable, predecessor);\n    }\n\n    // 2. Filter (except the case with artificial columns where cartesian creates too many rows)\n    if (!hasArtificialColumns(def.src) && def.filters.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          filters: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const filteredTable = pTablePromise.then((pTable) => pTable.filter(key, def.filters));\n      return new PTableHolder(pFrameHandle, combinedSignal, filteredTable, predecessor);\n    }\n\n    // 1. Join\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTable(key, {\n        src: joinEntryToInternal(def.src),\n        // `def.filters` would be non-empty only when join has artificial columns\n        filters: [...def.partitionFilters, ...def.filters],\n      }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  protected createNewResourceV2(params: FullPTableDefV2, key: PTableHandle): PTableHolder {\n    const { pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const table = pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def));\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction hasArtificialColumns<T>(entry: JoinEntry<T>): boolean {\n  switch (entry.type) {\n    case \"column\":\n    case \"slicedColumn\":\n    case \"inlineColumn\":\n      return false;\n    case \"artificialColumn\":\n      return true;\n    case \"full\":\n    case \"inner\":\n      return entry.entries.some(hasArtificialColumns);\n    case \"outer\":\n      return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);\n    default:\n      assertNever(entry);\n  }\n}\n\nfunction joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntryV4 {\n  const type = entry.type;\n  switch (type) {\n    case \"column\":\n      return {\n        type: \"column\",\n        columnId: entry.column,\n      };\n    case \"slicedColumn\":\n      return {\n        type: \"slicedColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axisFilters: entry.axisFilters,\n      };\n    case \"artificialColumn\":\n      return {\n        type: \"artificialColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axesIndices: entry.axesIndices,\n      };\n    case \"inlineColumn\":\n      return {\n        type: \"inlineColumn\",\n        newId: entry.column.id,\n        spec: entry.column.spec,\n        dataInfo: {\n          type: \"Json\",\n          keyLength: entry.column.spec.axesSpec.length,\n          data: entry.column.data.reduce(\n            (acc, row) => {\n              acc[JSON.stringify(row.key)] = row.val;\n              return acc;\n            },\n            {} as Record<string, PColumnValue>,\n          ),\n        },\n      };\n    case \"inner\":\n    case \"full\":\n      return {\n        type: entry.type,\n        entries: entry.entries.map((col) => joinEntryToInternal(col)),\n      };\n    case \"outer\":\n      return {\n        type: \"outer\",\n        primary: joinEntryToInternal(entry.primary),\n        secondary: entry.secondary.map((col) => joinEntryToInternal(col)),\n      };\n    default:\n      throw new PFrameDriverError(`unsupported PFrame join entry type: ${type satisfies never}`);\n  }\n}\n"],"mappings":"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"}

package/dist/ptable_pool.d.ts

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

package/dist/ptable_pool.js

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

package/dist/ptable_pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_pool.js","names":[],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableHandle,\n  type JoinEntry,\n  type JsonSerializable,\n  type PColumnValue,\n  type PObjectId,\n} from \"@platforma-sdk/model\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  FullPTableDefV1,\n  FullPTableDefV2,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    switch (params.type) {\n      case \"v1\":\n        return this.createNewResourceV1(params, key);\n      case \"v2\":\n        return this.createNewResourceV2(params, key);\n      default:\n        // @ts-expect-error `params.type` is a string, but we want to make sure all cases are handled\n        throw new PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);\n    }\n  }\n\n  protected createNewResourceV1(params: FullPTableDefV1, key: PTableHandle): PTableHolder {\n    const { def, pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    // 3. Sort\n    if (def.sorting.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          sorting: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const sortedTable = pTablePromise.then((pTable) => pTable.sort(key, def.sorting));\n      return new PTableHolder(pFrameHandle, combinedSignal, sortedTable, predecessor);\n    }\n\n    // 2. Filter (except the case with artificial columns where cartesian creates too many rows)\n    if (!hasArtificialColumns(def.src) && def.filters.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          filters: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const filteredTable = pTablePromise.then((pTable) => pTable.filter(key, def.filters));\n      return new PTableHolder(pFrameHandle, combinedSignal, filteredTable, predecessor);\n    }\n\n    // 1. Join\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTable(key, {\n        src: joinEntryToInternal(def.src),\n        // `def.filters` would be non-empty only when join has artificial columns\n        filters: [...def.partitionFilters, ...def.filters],\n      }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  protected createNewResourceV2(params: FullPTableDefV2, key: PTableHandle): PTableHolder {\n    const { pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const table = pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def));\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction hasArtificialColumns<T>(entry: JoinEntry<T>): boolean {\n  switch (entry.type) {\n    case \"column\":\n    case \"slicedColumn\":\n    case \"inlineColumn\":\n      return false;\n    case \"artificialColumn\":\n      return true;\n    case \"full\":\n    case \"inner\":\n      return entry.entries.some(hasArtificialColumns);\n    case \"outer\":\n      return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);\n    default:\n      assertNever(entry);\n  }\n}\n\nfunction joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntryV4 {\n  const type = entry.type;\n  switch (type) {\n    case \"column\":\n      return {\n        type: \"column\",\n        columnId: entry.column,\n      };\n    case \"slicedColumn\":\n      return {\n        type: \"slicedColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axisFilters: entry.axisFilters,\n      };\n    case \"artificialColumn\":\n      return {\n        type: \"artificialColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axesIndices: entry.axesIndices,\n      };\n    case \"inlineColumn\":\n      return {\n        type: \"inlineColumn\",\n        newId: entry.column.id,\n        spec: entry.column.spec,\n        dataInfo: {\n          type: \"Json\",\n          keyLength: entry.column.spec.axesSpec.length,\n          data: entry.column.data.reduce(\n            (acc, row) => {\n              acc[JSON.stringify(row.key)] = row.val;\n              return acc;\n            },\n            {} as Record<string, PColumnValue>,\n          ),\n        },\n      };\n    case \"inner\":\n    case \"full\":\n      return {\n        type: entry.type,\n        entries: entry.entries.map((col) => joinEntryToInternal(col)),\n      };\n    case \"outer\":\n      return {\n        type: \"outer\",\n        primary: joinEntryToInternal(entry.primary),\n        secondary: entry.secondary.map((col) => joinEntryToInternal(col)),\n      };\n    default:\n      throw new PFrameDriverError(`unsupported PFrame join entry type: ${type satisfies never}`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"ptable_pool.js","names":[],"sources":["../src/ptable_pool.ts"],"sourcesContent":["import {\n  assertNever,\n  bigintReplacer,\n  PFrameDriverError,\n  type PFrameHandle,\n  type PTableHandle,\n  type JoinEntry,\n  type JsonSerializable,\n  type PColumnValue,\n  type PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport type { PFrameInternal } from \"@milaboratories/pl-model-middle-layer\";\nimport { RefCountPoolBase, type PoolEntry } from \"@milaboratories/ts-helpers\";\nimport { logPFrames } from \"./logging\";\nimport type { PFramePool } from \"./pframe_pool\";\nimport {\n  FullPTableDefV1,\n  FullPTableDefV2,\n  stableKeyFromFullPTableDef,\n  type FullPTableDef,\n} from \"./ptable_shared\";\nimport type { PTableDefPool } from \"./ptable_def_pool\";\n\nexport class PTableHolder implements Disposable {\n  private readonly abortController = new AbortController();\n  private readonly combinedDisposeSignal: AbortSignal;\n\n  constructor(\n    public readonly pFrame: PFrameHandle,\n    pFrameDisposeSignal: AbortSignal,\n    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,\n    private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,\n  ) {\n    this.combinedDisposeSignal = AbortSignal.any([\n      pFrameDisposeSignal,\n      this.abortController.signal,\n    ]);\n  }\n\n  public get disposeSignal(): AbortSignal {\n    return this.combinedDisposeSignal;\n  }\n\n  [Symbol.dispose](): void {\n    this.abortController.abort();\n    this.predecessor?.unref();\n    void this.pTablePromise\n      .then((pTable) => pTable.dispose())\n      .catch(() => {\n        /* mute error */\n      });\n  }\n}\n\nexport class PTablePool<TreeEntry extends JsonSerializable> extends RefCountPoolBase<\n  FullPTableDef,\n  PTableHandle,\n  PTableHolder\n> {\n  constructor(\n    private readonly pFrames: PFramePool<TreeEntry>,\n    private readonly pTableDefs: PTableDefPool,\n    private readonly logger: PFrameInternal.Logger,\n  ) {\n    super();\n  }\n\n  protected calculateParamsKey(params: FullPTableDef): PTableHandle {\n    return stableKeyFromFullPTableDef(params);\n  }\n\n  protected createNewResource(params: FullPTableDef, key: PTableHandle): PTableHolder {\n    if (logPFrames()) {\n      this.logger(\n        \"info\",\n        `PTable creation (pTableHandle = ${key}): ` + `${JSON.stringify(params, bigintReplacer)}`,\n      );\n    }\n\n    switch (params.type) {\n      case \"v1\":\n        return this.createNewResourceV1(params, key);\n      case \"v2\":\n        return this.createNewResourceV2(params, key);\n      default:\n        // @ts-expect-error `params.type` is a string, but we want to make sure all cases are handled\n        throw new PFrameDriverError(`Unsupported FullPTableDef type: ${params.type}`);\n    }\n  }\n\n  protected createNewResourceV1(params: FullPTableDefV1, key: PTableHandle): PTableHolder {\n    const { def, pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    // 3. Sort\n    if (def.sorting.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          sorting: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const sortedTable = pTablePromise.then((pTable) => pTable.sort(key, def.sorting));\n      return new PTableHolder(pFrameHandle, combinedSignal, sortedTable, predecessor);\n    }\n\n    // 2. Filter (except the case with artificial columns where cartesian creates too many rows)\n    if (!hasArtificialColumns(def.src) && def.filters.length > 0) {\n      const predecessor = this.acquire({\n        ...params,\n        def: {\n          ...def,\n          filters: [],\n        },\n      });\n      const {\n        resource: { pTablePromise },\n      } = predecessor;\n      const filteredTable = pTablePromise.then((pTable) => pTable.filter(key, def.filters));\n      return new PTableHolder(pFrameHandle, combinedSignal, filteredTable, predecessor);\n    }\n\n    // 1. Join\n    const table = pFramePromise.then((pFrame) =>\n      pFrame.createTable(key, {\n        src: joinEntryToInternal(def.src),\n        // `def.filters` would be non-empty only when join has artificial columns\n        filters: [...def.partitionFilters, ...def.filters],\n      }),\n    );\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  protected createNewResourceV2(params: FullPTableDefV2, key: PTableHandle): PTableHolder {\n    const { pFrameHandle } = params;\n    const { pFramePromise, disposeSignal } = this.pFrames.getByKey(pFrameHandle);\n\n    const defDisposeSignal = this.pTableDefs.tryGetByKey(key)?.disposeSignal;\n    const combinedSignal = AbortSignal.any([disposeSignal, defDisposeSignal].filter((s) => !!s));\n\n    const table = pFramePromise.then((pFrame) => pFrame.createTableV2(key, params.def));\n    return new PTableHolder(pFrameHandle, combinedSignal, table);\n  }\n\n  public getByKey(key: PTableHandle): PTableHolder {\n    const resource = super.tryGetByKey(key);\n    if (!resource) {\n      const error = new PFrameDriverError(`Invalid PTable handle`);\n      error.cause = new Error(`PTable with handle ${key} not found`);\n      throw error;\n    }\n    return resource;\n  }\n}\n\nfunction hasArtificialColumns<T>(entry: JoinEntry<T>): boolean {\n  switch (entry.type) {\n    case \"column\":\n    case \"slicedColumn\":\n    case \"inlineColumn\":\n      return false;\n    case \"artificialColumn\":\n      return true;\n    case \"full\":\n    case \"inner\":\n      return entry.entries.some(hasArtificialColumns);\n    case \"outer\":\n      return hasArtificialColumns(entry.primary) || entry.secondary.some(hasArtificialColumns);\n    default:\n      assertNever(entry);\n  }\n}\n\nfunction joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntryV4 {\n  const type = entry.type;\n  switch (type) {\n    case \"column\":\n      return {\n        type: \"column\",\n        columnId: entry.column,\n      };\n    case \"slicedColumn\":\n      return {\n        type: \"slicedColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axisFilters: entry.axisFilters,\n      };\n    case \"artificialColumn\":\n      return {\n        type: \"artificialColumn\",\n        columnId: entry.column,\n        newId: entry.newId,\n        axesIndices: entry.axesIndices,\n      };\n    case \"inlineColumn\":\n      return {\n        type: \"inlineColumn\",\n        newId: entry.column.id,\n        spec: entry.column.spec,\n        dataInfo: {\n          type: \"Json\",\n          keyLength: entry.column.spec.axesSpec.length,\n          data: entry.column.data.reduce(\n            (acc, row) => {\n              acc[JSON.stringify(row.key)] = row.val;\n              return acc;\n            },\n            {} as Record<string, PColumnValue>,\n          ),\n        },\n      };\n    case \"inner\":\n    case \"full\":\n      return {\n        type: entry.type,\n        entries: entry.entries.map((col) => joinEntryToInternal(col)),\n      };\n    case \"outer\":\n      return {\n        type: \"outer\",\n        primary: joinEntryToInternal(entry.primary),\n        secondary: entry.secondary.map((col) => joinEntryToInternal(col)),\n      };\n    default:\n      throw new PFrameDriverError(`unsupported PFrame join entry type: ${type satisfies never}`);\n  }\n}\n"],"mappings":"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"}

package/dist/ptable_shared.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_shared.cjs","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  PObjectId,\n  PFrameHandle,\n  PTableDef,\n  PTableHandle,\n  DataQuery,\n  PTableColumnSpec,\n} from \"@platforma-sdk/model\";\nimport { hashJson } from \"@milaboratories/pl-model-middle-layer\";\n\nexport type FullPTableDefV1 = {\n  type: \"v1\";\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n};\n\nexport type FullPTableDefV2 = {\n  type: \"v2\";\n  pFrameHandle: PFrameHandle;\n  def: {\n    tableSpec: PTableColumnSpec[];\n    dataQuery: DataQuery;\n  };\n};\n\nexport type FullPTableDef = FullPTableDefV1 | FullPTableDefV2;\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n"],"mappings":";;;;AA2BA,SAAgB,2BAA2B,MAAmC;AAC5E,4DAAgB,KAAK"}
+{"version":3,"file":"ptable_shared.cjs","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  PObjectId,\n  PFrameHandle,\n  PTableDef,\n  PTableHandle,\n  DataQuery,\n  PTableColumnSpec,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson } from \"@milaboratories/pl-model-middle-layer\";\n\nexport type FullPTableDefV1 = {\n  type: \"v1\";\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n};\n\nexport type FullPTableDefV2 = {\n  type: \"v2\";\n  pFrameHandle: PFrameHandle;\n  def: {\n    tableSpec: PTableColumnSpec[];\n    dataQuery: DataQuery;\n  };\n};\n\nexport type FullPTableDef = FullPTableDefV1 | FullPTableDefV2;\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n"],"mappings":";;;;AA2BA,SAAgB,2BAA2B,MAAmC;AAC5E,4DAAgB,KAAK"}

package/dist/ptable_shared.d.ts

@@ -1 +1 @@
-import { PFrameHandle, PObjectId, PTableColumnSpec, PTableDef, PTableHandle } from "@platforma-sdk/model";
+import { PFrameHandle, PObjectId, PTableColumnSpec, PTableDef, PTableHandle } from "@milaboratories/pl-model-common";

package/dist/ptable_shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"ptable_shared.js","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  PObjectId,\n  PFrameHandle,\n  PTableDef,\n  PTableHandle,\n  DataQuery,\n  PTableColumnSpec,\n} from \"@platforma-sdk/model\";\nimport { hashJson } from \"@milaboratories/pl-model-middle-layer\";\n\nexport type FullPTableDefV1 = {\n  type: \"v1\";\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n};\n\nexport type FullPTableDefV2 = {\n  type: \"v2\";\n  pFrameHandle: PFrameHandle;\n  def: {\n    tableSpec: PTableColumnSpec[];\n    dataQuery: DataQuery;\n  };\n};\n\nexport type FullPTableDef = FullPTableDefV1 | FullPTableDefV2;\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n"],"mappings":";;;AA2BA,SAAgB,2BAA2B,MAAmC;AAC5E,QAAO,SAAS,KAAK"}
+{"version":3,"file":"ptable_shared.js","names":[],"sources":["../src/ptable_shared.ts"],"sourcesContent":["import type {\n  PObjectId,\n  PFrameHandle,\n  PTableDef,\n  PTableHandle,\n  DataQuery,\n  PTableColumnSpec,\n} from \"@milaboratories/pl-model-common\";\nimport { hashJson } from \"@milaboratories/pl-model-middle-layer\";\n\nexport type FullPTableDefV1 = {\n  type: \"v1\";\n  pFrameHandle: PFrameHandle;\n  def: PTableDef<PObjectId>;\n};\n\nexport type FullPTableDefV2 = {\n  type: \"v2\";\n  pFrameHandle: PFrameHandle;\n  def: {\n    tableSpec: PTableColumnSpec[];\n    dataQuery: DataQuery;\n  };\n};\n\nexport type FullPTableDef = FullPTableDefV1 | FullPTableDefV2;\n\nexport function stableKeyFromFullPTableDef(data: FullPTableDef): PTableHandle {\n  return hashJson(data) as string as PTableHandle;\n}\n"],"mappings":";;;AA2BA,SAAgB,2BAA2B,MAAmC;AAC5E,QAAO,SAAS,KAAK"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pf-driver",
-  "version": "1.0.68",
+  "version": "1.1.1",
   "description": "PFrameDriver implementation abstracted from Middle Layer",
   "keywords": [],
   "license": "UNLICENSED",
@@ -24,8 +24,8 @@
     "@milaboratories/pframes-rs-wasm": "1.1.14",
     "es-toolkit": "^1.39.10",
     "lru-cache": "^11.2.2",
-    "@milaboratories/pl-model-middle-layer": "1.13.1",
-    "@platforma-sdk/model": "1.59.3",
+    "@milaboratories/pl-model-common": "1.28.0",
+    "@milaboratories/pl-model-middle-layer": "1.15.0",
     "@milaboratories/ts-helpers": "1.7.3"
   },
   "devDependencies": {
@@ -34,8 +34,8 @@
     "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/ts-builder": "1.3.0"
   },
   "engines": {
     "node": ">=22.19.0"

package/src/data_info_helpers.ts

@@ -4,7 +4,7 @@ import {
   type PColumnValues,
   type JsonDataInfo,
   type PColumnValue,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 
 export function makeJsonDataInfo(spec: PColumnSpec, data: PColumnValues): JsonDataInfo {
   const keyLength = spec.axesSpec.length;

package/src/driver_decl.ts

@@ -14,7 +14,7 @@ import type {
   TableRange,
   UniqueValuesRequest,
   UniqueValuesResponse,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 import type { PoolEntry } from "@milaboratories/ts-helpers";
 
 /**

package/src/driver_double.test.ts

@@ -1,15 +1,12 @@
 import {
   pTableValue,
-  canonicalizeJson,
-  filterSpecToSpecQueryExpr,
   type CalculateTableDataResponse,
   type PFrameDriver,
   type PObjectId,
-  type PTableColumnId,
   type SpecQuery,
   type SpecQueryExpression,
   SpecQueryBooleanExpression,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 import { readJson, PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import { test } from "vitest";
 import { join } from "node:path";
@@ -165,16 +162,6 @@ test("createTableV2 support", async ({ expect }) => {
     valueType: "Int" as const,
   };
 
-  const axisColumnStr = canonicalizeJson<PTableColumnId>({
-    type: "axis",
-    id: { name: "axis1", type: "String" },
-  }) as string;
-
-  const valueColumnStr = canonicalizeJson<PTableColumnId>({
-    type: "column",
-    id: columnId,
-  }) as string;
-
   const inlineData = [
     { key: ["a"], val: 10 },
     { key: ["b"], val: 20 },
@@ -213,11 +200,12 @@ test("createTableV2 support", async ({ expect }) => {
       query: {
         type: "filter",
         input: baseQuery,
-        predicate: filterSpecToSpecQueryExpr({
-          type: "patternEquals",
-          column: axisColumnStr,
+        predicate: {
+          type: "stringEquals",
+          input: { type: "axisRef", value: { name: "axis1", type: "String" } },
           value: "b",
-        }) as SpecQueryBooleanExpression,
+          caseInsensitive: false,
+        } as SpecQueryBooleanExpression,
       },
     });
 
@@ -235,11 +223,12 @@ test("createTableV2 support", async ({ expect }) => {
       query: {
         type: "filter",
         input: baseQuery,
-        predicate: filterSpecToSpecQueryExpr({
-          type: "greaterThan",
-          column: valueColumnStr,
-          x: 15,
-        }) as SpecQueryBooleanExpression,
+        predicate: {
+          type: "numericComparison",
+          operand: "gt",
+          left: { type: "columnRef", value: columnId },
+          right: { type: "constant", value: 15 },
+        } as SpecQueryBooleanExpression,
       },
     });
 
@@ -280,13 +269,26 @@ test("createTableV2 support", async ({ expect }) => {
         input: {
           type: "filter",
           input: baseQuery,
-          predicate: filterSpecToSpecQueryExpr({
+          predicate: {
             type: "and",
-            filters: [
-              { type: "greaterThan", column: valueColumnStr, x: 5 },
-              { type: "patternNotEquals", column: axisColumnStr, value: "c" },
+            input: [
+              {
+                type: "numericComparison",
+                operand: "gt",
+                left: { type: "columnRef", value: columnId },
+                right: { type: "constant", value: 5 },
+              },
+              {
+                type: "not",
+                input: {
+                  type: "stringEquals",
+                  input: { type: "axisRef", value: { name: "axis1", type: "String" } },
+                  value: "c",
+                  caseInsensitive: false,
+                },
+              },
             ],
-          }) as SpecQueryBooleanExpression,
+          } as SpecQueryBooleanExpression,
         },
         sortBy: [
           {

package/src/driver_double.ts

@@ -4,7 +4,7 @@ import {
   type Branded,
   type PColumnSpec,
   type PColumnValues,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 import { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import { RefCountPoolBase, type PoolEntry } from "@milaboratories/ts-helpers";
 import { HttpHelpers } from "@milaboratories/pframes-rs-node";

package/src/driver_impl.ts

@@ -32,7 +32,7 @@ import {
   collectSpecQueryColumns,
   sortSpecQuery,
   sortPTableDef,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import { ConcurrencyLimitingExecutor, type PoolEntry } from "@milaboratories/ts-helpers";
 import { PFrameFactory } from "@milaboratories/pframes-rs-node";

package/src/index.ts

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

package/src/pframe_pool.ts

@@ -8,7 +8,7 @@ import {
   type JsonSerializable,
   type PColumn,
   type PFrameHandle,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 import { hashJson, PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import { RefCountPoolBase, type PoolEntry } from "@milaboratories/ts-helpers";
 import { PFrameFactory } from "@milaboratories/pframes-rs-node";

package/src/ptable_cache_per_frame.ts

@@ -1,4 +1,4 @@
-import type { PFrameHandle, PTableHandle } from "@platforma-sdk/model";
+import type { PFrameHandle, PTableHandle } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import type { PoolEntry } from "@milaboratories/ts-helpers";
 import { LRUCache } from "lru-cache";

package/src/ptable_cache_plain.ts

@@ -1,4 +1,4 @@
-import type { PTableHandle } from "@platforma-sdk/model";
+import type { PTableHandle } from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import type { PoolEntry } from "@milaboratories/ts-helpers";
 import { LRUCache } from "lru-cache";

package/src/ptable_def_pool.ts

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

package/src/ptable_pool.ts

@@ -8,7 +8,7 @@ import {
   type JsonSerializable,
   type PColumnValue,
   type PObjectId,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 import type { PFrameInternal } from "@milaboratories/pl-model-middle-layer";
 import { RefCountPoolBase, type PoolEntry } from "@milaboratories/ts-helpers";
 import { logPFrames } from "./logging";

package/src/ptable_shared.ts

@@ -5,7 +5,7 @@ import type {
   PTableHandle,
   DataQuery,
   PTableColumnSpec,
-} from "@platforma-sdk/model";
+} from "@milaboratories/pl-model-common";
 import { hashJson } from "@milaboratories/pl-model-middle-layer";
 
 export type FullPTableDefV1 = {