@milaboratories/pl-middle-layer 1.16.9 → 1.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/index.js +2 -2
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.mjs +483 -472
  4. package/dist/index.mjs.map +1 -1
  5. package/dist/pool/driver.d.ts.map +1 -1
  6. package/package.json +11 -11
  7. package/src/pool/driver.ts +18 -3
package/dist/pool/driver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACpF,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EAEP,SAAS,EACT,SAAS,EACT,SAAS,EAGV,MAAM,sBAAsB,CAAC;AAgG9B,qBAAa,YAAa,YAAW,eAAe;IAOtC,OAAO,CAAC,QAAQ,CAAC,UAAU;IANvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsE;IAC9F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAEpC,UAAU,EAAE,cAAc;IAmDhD,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,YAAY;IAQlF,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAC3C,GAAG,EAAE,aAAa,GACjB,YAAY;IAYF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAiBlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAM9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAM9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IA6BzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAUnB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B;AA+CD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAI/E"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACpF,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EAEP,SAAS,EACT,SAAS,EACT,SAAS,EAMV,MAAM,sBAAsB,CAAC;AAyG9B,qBAAa,YAAa,YAAW,eAAe;IAOtC,OAAO,CAAC,QAAQ,CAAC,UAAU;IANvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsE;IAC9F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAEpC,UAAU,EAAE,cAAc;IAmDhD,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,kBAAkB,CAAC,EAAE,GAAG,EAAE,aAAa,GAAG,YAAY;IAQlF,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAC3C,GAAG,EAAE,aAAa,GACjB,YAAY;IAYF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAiBlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAM9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAM9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IA6BzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAanB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B;AA+CD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAI/E"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@milaboratories/pl-middle-layer",
3
- "version": "1.16.9",
3
+ "version": "1.17.1",
4
4
  "description": "Pl Middle Layer",
5
5
  "types": "./dist/index.d.ts",
6
6
  "main": "./dist/index.js",
@@ -26,24 +26,24 @@
26
26
  "quickjs-emscripten": "^0.31.0",
27
27
  "undici": "^6.21.0",
28
28
  "utility-types": "^3.11.0",
29
- "yaml": "^2.6.0",
29
+ "yaml": "^2.6.1",
30
30
  "zod": "^3.23.8",
31
31
  "@milaboratories/computable": "^2.3.2",
32
32
  "@milaboratories/resolve-helper": "^1.0.2",
33
- "@platforma-sdk/block-tools": "^2.3.28",
33
+ "@platforma-sdk/block-tools": "^2.3.29",
34
+ "@milaboratories/pl-model-common": "^1.7.0",
35
+ "@milaboratories/pl-drivers": "^1.3.24",
36
+ "@milaboratories/pl-model-middle-layer": "^1.5.12",
34
37
  "@milaboratories/pl-client": "^2.6.1",
35
- "@milaboratories/pl-drivers": "^1.3.23",
36
- "@milaboratories/pl-model-common": "^1.6.4",
37
38
  "@milaboratories/pl-tree": "^1.4.16",
38
- "@milaboratories/pl-model-middle-layer": "^1.5.11",
39
+ "@platforma-sdk/model": "^1.13.15",
39
40
  "@milaboratories/ts-helpers": "^1.1.1",
40
- "@platforma-sdk/workflow-tengo": "2.4.0",
41
- "@milaboratories/pl-config": "^1.3.1",
42
- "@platforma-sdk/model": "^1.13.5",
43
- "@milaboratories/pl-local": "^1.8.0"
41
+ "@platforma-sdk/workflow-tengo": "2.4.1",
42
+ "@milaboratories/pl-local": "^1.8.0",
43
+ "@milaboratories/pl-config": "^1.3.1"
44
44
  },
45
45
  "devDependencies": {
46
- "typescript": "~5.5.4",
46
+ "typescript": "~5.6.3",
47
47
  "vite": "^5.4.11",
48
48
  "@types/jest": "^29.5.14",
49
49
  "@types/node": "~20.16.15",
package/src/pool/driver.ts CHANGED
@@ -27,6 +27,9 @@ import {
27
27
  PTableDef,
28
28
  mapPTableDef,
29
29
  ValueType,
30
+ PTableRecordSingleValueFilter,
31
+ PTableRecordSingleValueFilterV2,
32
+ PTableRecordFilter,
30
33
  } from '@platforma-sdk/model';
31
34
  import { RefCountResourcePool } from './ref_count_pool';
32
35
  import { allBlobs, mapBlobs, parseDataInfoResource } from './data';
@@ -46,6 +49,15 @@ type InternalPFrameData = PFrameDef<PFrameInternal.DataInfo<ResourceInfo>>;
46
49
 
47
50
  const valueTypes: ValueType[] = ['Int', 'Long', 'Float', 'Double', 'String', 'Bytes'] as const;
48
51
 
52
+ function migrateFilters(filters: PTableRecordFilter[]): PTableRecordSingleValueFilter[] {
53
+ const unsupportedFilters = filters.filter((f) => f.type !== 'bySingleColumn');
54
+ if (unsupportedFilters.length > 0) {
55
+ const unsupportedFiltersJson = JSON.stringify(unsupportedFilters);
56
+ throw new Error(`unsupported filters: ${unsupportedFiltersJson}`);
57
+ }
58
+ return filters as PTableRecordSingleValueFilter[];
59
+ }
60
+
49
61
  class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
50
62
  public readonly pFrame = new PFrame();
51
63
  private readonly blobIdToResource = new Map<string, ResourceInfo>();
@@ -166,7 +178,7 @@ export class PFrameDriver implements SdkPFrameDriver {
166
178
  async () =>
167
179
  await pFrame.pFrame.createTable({
168
180
  src: joinEntryToInternal(params.def.src),
169
- filters: params.def.filters
181
+ filters: migrateFilters(params.def.filters),
170
182
  })
171
183
  );
172
184
  return params.def.sorting.length !== 0 ? rawPTable.sort(params.def.sorting) : rawPTable;
@@ -244,7 +256,7 @@ export class PFrameDriver implements SdkPFrameDriver {
244
256
  async () =>
245
257
  await this.pFrames.getByKey(handle).pFrame.createTable({
246
258
  src: joinEntryToInternal(request.src),
247
- filters: request.filters
259
+ filters: migrateFilters(request.filters),
248
260
  })
249
261
  );
250
262
 
@@ -273,7 +285,10 @@ export class PFrameDriver implements SdkPFrameDriver {
273
285
  request: UniqueValuesRequest
274
286
  ): Promise<UniqueValuesResponse> {
275
287
  return await this.concurrencyLimiter.run(
276
- async () => await this.pFrames.getByKey(handle).pFrame.getUniqueValues(request)
288
+ async () => await this.pFrames.getByKey(handle).pFrame.getUniqueValues({
289
+ ...request,
290
+ filters: migrateFilters(request.filters),
291
+ })
277
292
  );
278
293
  }
279
294