@milaboratories/pl-middle-layer 1.37.7 → 1.37.9

package/dist/index.mjs

@@ -5025,16 +5025,19 @@ class nr {
         de().logPFrameRequests && t.info(
           `PTable creation (pTableHandle = ${this.calculateParamsKey(i)}): ${JSON.stringify(i, Te)}`
         );
-        const a = n.run(async () => await this.pFrames.getByKey(c).pFrame.createTable({
-          src: je(i.def.src),
-          filters: Ot(i.def.filters)
-        }, i.signal)).then(async (l) => {
-          if (i.def.sorting.length === 0) return l;
-          try {
-            return n.run(async () => await l.sort(i.def.sorting, i.signal));
-          } finally {
-            l.dispose();
-          }
+        const a = n.run(async () => {
+          const l = await this.pFrames.getByKey(c).pFrame.createTable({
+            src: je(i.def.src),
+            filters: Ot(i.def.filters)
+          }, i.signal);
+          let u = l;
+          if (i.def.sorting.length > 0)
+            try {
+              u = await l.sort(i.def.sorting, i.signal);
+            } finally {
+              l.dispose();
+            }
+          return u;
         });
         return new ru(a);
       }
@@ -5099,25 +5102,26 @@ class nr {
   async calculateTableData(e, t, r) {
     return de().logPFrameRequests && this.logger.info(
       `Call calculateTableData, handle = ${e}, request = ${JSON.stringify(t, Te)}`
-    ), await this.concurrencyLimiter.run(async () => await this.pFrames.getByKey(e).pFrame.createTable({
-      src: je(t.src),
-      filters: Ot(t.filters)
-    }, r)).then(async (o) => {
-      if (t.sorting.length === 0) return o;
-      try {
-        return await this.concurrencyLimiter.run(async () => await o.sort(t.sorting, r));
-      } finally {
-        o.dispose();
-      }
-    }).then(async (o) => {
+    ), await this.concurrencyLimiter.run(async () => {
+      const o = await this.pFrames.getByKey(e).pFrame.createTable({
+        src: je(t.src),
+        filters: Ot(t.filters)
+      }, r);
+      let n = o;
+      if (t.sorting.length > 0)
+        try {
+          n = await o.sort(t.sorting, r);
+        } finally {
+          o.dispose();
+        }
       try {
-        const n = o.getSpec(), i = await this.concurrencyLimiter.run(async () => await o.getData([...n.keys()], void 0, r));
-        return n.map((c, a) => ({
-          spec: c,
-          data: i[a]
+        const i = n.getSpec(), c = await n.getData([...i.keys()], void 0, r);
+        return i.map((a, l) => ({
+          spec: a,
+          data: c[l]
         }));
       } finally {
-        o.dispose();
+        n.dispose();
       }
     });
   }