@milaboratories/pl-middle-layer 1.23.4 → 1.23.6

package/dist/pool/driver.d.ts.map

@@ -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,EAAwB,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AACjG,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,EAET,SAAS,EAKT,aAAa,EAEd,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAe,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAsHnE,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IA4D5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,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;IAgCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAiBnB,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"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAwB,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AACjG,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,EAET,SAAS,EAKT,aAAa,EAEd,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAe,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAsHnE,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IA4D5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,GAAG,EAAE,aAAa,GACjB,YAAY;IAmBF,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;IAgCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAiBnB,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.23.4",
+  "version": "1.23.6",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -29,20 +29,20 @@
     "yaml": "^2.6.1",
     "zod": "~3.23.8",
     "@milaboratories/pl-http": "^1.0.2",
-    "@milaboratories/computable": "^2.3.4",
     "@milaboratories/resolve-helper": "^1.0.2",
-    "@platforma-sdk/block-tools": "^2.5.1",
+    "@milaboratories/computable": "^2.3.4",
     "@milaboratories/pl-client": "^2.7.1",
-    "@milaboratories/pl-model-common": "^1.10.2",
+    "@platforma-sdk/block-tools": "^2.5.1",
     "@milaboratories/pl-drivers": "^1.5.6",
     "@milaboratories/pl-model-middle-layer": "^1.6.9",
-    "@milaboratories/pl-tree": "^1.4.20",
     "@milaboratories/pl-model-backend": "^1.0.1",
+    "@milaboratories/pl-model-common": "^1.10.2",
+    "@milaboratories/pl-tree": "^1.4.20",
+    "@milaboratories/ts-helpers": "^1.1.3",
     "@platforma-sdk/workflow-tengo": "2.8.8",
+    "@platforma-sdk/model": "^1.21.0",
     "@milaboratories/pl-config": "^1.3.3",
-    "@milaboratories/pl-local": "^1.10.0",
-    "@platforma-sdk/model": "^1.20.27",
-    "@milaboratories/ts-helpers": "^1.1.3"
+    "@milaboratories/pl-local": "^1.10.0"
   },
   "devDependencies": {
     "semver": "^7.6.3",
@@ -54,8 +54,8 @@
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "@milaboratories/platforma-build-configs": "1.0.2",
-    "@milaboratories/eslint-config": "^1.0.1"
+    "@milaboratories/eslint-config": "^1.0.1",
+    "@milaboratories/platforma-build-configs": "1.0.2"
   },
   "scripts": {
     "type-check": "tsc --noEmit --composite false",

package/src/pool/driver.ts

@@ -180,7 +180,7 @@ export class PFrameDriver implements SdkPFrameDriver {
       protected createNewResource(params: InternalPFrameData): PFrameHolder {
         if (getDebugFlags().logPFrameRequests)
           logger.info(
-            `Create PFrame (${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`
+            `PFrame creation (pFrameHandle = ${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`
           );
         return new PFrameHolder(this.blobDriver, blobContentCache, params);
       }
@@ -203,7 +203,7 @@ export class PFrameDriver implements SdkPFrameDriver {
         const rawPTable = await concurrencyLimiter.run(async () => {
           if (getDebugFlags().logPFrameRequests)
             logger.info(
-              `Create PTable (${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`
+              `PTable creation (pTableHandle = ${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`
             );
           return await pFrame.pFrame.createTable({
             src: joinEntryToInternal(params.def.src),
@@ -245,6 +245,13 @@ export class PFrameDriver implements SdkPFrameDriver {
     const pFrameHandle = this.createPFrame(extractAllColumns(def.src), ctx);
     const defIds = mapPTableDef(def, (c) => c.id);
     const res = this.pTables.acquire({ def: defIds, pFrameHandle });
+    if (getDebugFlags().logPFrameRequests)
+      this.logger.info(
+        `Create PTable call (pFrameHandle = ${pFrameHandle}; pTableHandle = ${res}): ${JSON.stringify(
+          mapPTableDef(def, (c) => c.spec),
+          bigintReplacer
+        )}`
+      );
     ctx.addOnDestroy(res.unref); // in addition to pframe unref added in createPFrame above
     return res.key as PTableHandle;
   }
@@ -292,7 +299,7 @@ export class PFrameDriver implements SdkPFrameDriver {
     let table = await this.concurrencyLimiter.run(async () => {
       if (getDebugFlags().logPFrameRequests)
         this.logger.info(
-          `calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`
+          `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`
         );
       return await this.pFrames.getByKey(handle).pFrame.createTable({
         src: joinEntryToInternal(request.src),
@@ -327,7 +334,7 @@ export class PFrameDriver implements SdkPFrameDriver {
     return await this.concurrencyLimiter.run(async () => {
       if (getDebugFlags().logPFrameRequests)
         this.logger.info(
-          `getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`
+          `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`
         );
       return await this.pFrames.getByKey(handle).pFrame.getUniqueValues({
         ...request,
@@ -389,58 +396,60 @@ function joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEn
 
 function stableKeyFromFullPTableDef(data: FullPTableDef): string {
   const hash = createHash('sha256');
-  hash.update(canonicalize(data.def)!);
+  hash.update(canonicalize(data)!);
   return hash.digest().toString('hex');
 }
 
 function stableKeyFromPFrameData(data: PColumn<PFrameInternal.DataInfo<ResourceInfo>>[]): string {
-  const orderedData = [...data].map((column) => mapPObjectData(column, (r) => {
-    let result: {
-      type: string,
-      keyLength: number,
-      payload: {
-        key: string;
-        value: null | number | string | [string, string]
-      }[];
-    };
-    const type = r.type;
-    switch (type) {
-      case 'Json':
-        result = {
-          type: r.type,
-          keyLength: r.keyLength,
-          payload: Object.entries(r.data).map(([part, value]) => ({
-            key: part,
-            value,
-          }))
-        };
-        break;
-      case 'JsonPartitioned':
-        result = {
-          type: r.type,
-          keyLength: r.partitionKeyLength,
-          payload: Object.entries(r.parts).map(([part, info]) => ({
-            key: part,
-            value: info.id.toString(),
-          }))
-        };
-        break;
-      case 'BinaryPartitioned':
-        result = {
-          type: r.type,
-          keyLength: r.partitionKeyLength,
-          payload: Object.entries(r.parts).map(([part, info]) => ({
-            key: part,
-            value: [info.index.id.toString(), info.values.id.toString()] as const,
-          }))
-        };
-        break;
-      default:
-        throw Error(`unsupported resource type: ${ type satisfies never }`);
-    }
-    result.payload.sort((lhs, rhs) => lhs.key.localeCompare(rhs.key));
-    return result;
-  }));
+  const orderedData = [...data].map((column) =>
+    mapPObjectData(column, (r) => {
+      let result: {
+        type: string;
+        keyLength: number;
+        payload: {
+          key: string;
+          value: null | number | string | [string, string];
+        }[];
+      };
+      const type = r.type;
+      switch (type) {
+        case 'Json':
+          result = {
+            type: r.type,
+            keyLength: r.keyLength,
+            payload: Object.entries(r.data).map(([part, value]) => ({
+              key: part,
+              value
+            }))
+          };
+          break;
+        case 'JsonPartitioned':
+          result = {
+            type: r.type,
+            keyLength: r.partitionKeyLength,
+            payload: Object.entries(r.parts).map(([part, info]) => ({
+              key: part,
+              value: info.id.toString()
+            }))
+          };
+          break;
+        case 'BinaryPartitioned':
+          result = {
+            type: r.type,
+            keyLength: r.partitionKeyLength,
+            payload: Object.entries(r.parts).map(([part, info]) => ({
+              key: part,
+              value: [info.index.id.toString(), info.values.id.toString()] as const
+            }))
+          };
+          break;
+        default:
+          throw Error(`unsupported resource type: ${type satisfies never}`);
+      }
+      result.payload.sort((lhs, rhs) => lhs.key.localeCompare(rhs.key));
+      return result;
+    })
+  );
   orderedData.sort((lhs, rhs) => lhs.id.localeCompare(rhs.id));
 
   const hash = createHash('sha256');