@milaboratories/pl-client 2.8.2 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-client",
-  "version": "2.8.2",
+  "version": "2.9.1",
   "engines": {
     "node": ">=20.3.0"
   },
@@ -32,8 +32,8 @@
     "undici": "~7.5.0",
     "utility-types": "^3.11.0",
     "yaml": "^2.7.0",
-    "@milaboratories/ts-helpers": "^1.1.7",
-    "@milaboratories/pl-http": "^1.1.2"
+    "@milaboratories/pl-http": "^1.1.2",
+    "@milaboratories/ts-helpers": "^1.3.0"
   },
   "devDependencies": {
     "typescript": "~5.5.4",

package/src/core/transaction.ts

@@ -17,6 +17,7 @@ import {
   MaxTxId,
   isLocalResourceId,
   extractBasicResourceData,
+  isNullResourceId,
 } from './types';
 import type {
   ClientMessageRequest,
@@ -28,7 +29,7 @@ import { TxAPI_Open_Request_WritableTx } from '../proto/github.com/milaboratory/
 import type { NonUndefined } from 'utility-types';
 import { toBytes } from '../util/util';
 import { fieldTypeToProto, protoToField, protoToResource } from './type_conversion';
-import { notEmpty } from '@milaboratories/ts-helpers';
+import { deepFreeze, notEmpty } from '@milaboratories/ts-helpers';
 import { isNotFoundError } from './errors';
 import type { FinalResourceDataPredicate } from './final';
 import type { LRUCache } from 'lru-cache';
@@ -85,6 +86,10 @@ export function isResource(ref: AnyRef): ref is AnyResourceRef {
   );
 }
 
+export function isResourceId(ref: AnyRef): ref is ResourceId {
+  return typeof ref === 'bigint' && !isLocalResourceId(ref) && !isNullResourceId(ref);
+}
+
 export function isFieldRef(ref: AnyFieldRef): ref is FieldRef {
   return isResourceRef(ref.resourceId);
 }
@@ -535,6 +540,7 @@ export class PlTransaction {
     // we will cache only final resource data states
     // caching result even if we were ignore the cache
     if (!isResourceRef(rId) && !isLocalResourceId(rId) && this.finalPredicate(result)) {
+      deepFreeze(result);
       const fromCache = this.sharedResourceDataCache.get(rId);
       if (fromCache) {
         if (loadFields && !fromCache.data) {
@@ -543,15 +549,17 @@ export class PlTransaction {
           fromCache.cacheTxOpenTimestamp = this.txOpenTimestamp;
         }
       } else {
+        const basicData = extractBasicResourceData(result);
+        deepFreeze(basicData);
         if (loadFields)
           this.sharedResourceDataCache.set(rId, {
-            basicData: extractBasicResourceData(result),
+            basicData,
             data: result,
             cacheTxOpenTimestamp: this.txOpenTimestamp,
           });
         else
           this.sharedResourceDataCache.set(rId, {
-            basicData: extractBasicResourceData(result),
+            basicData,
             data: undefined,
             cacheTxOpenTimestamp: this.txOpenTimestamp,
           });

package/src/core/types.ts

@@ -1,4 +1,4 @@
-import { notEmpty } from '@milaboratories/ts-helpers';
+import { cachedDeserialize, notEmpty } from '@milaboratories/ts-helpers';
 
 // more details here: https://egghead.io/blog/using-branded-types-in-typescript
 declare const __resource_id_type__: unique symbol;
@@ -118,7 +118,7 @@ export function extractBasicResourceData(rd: ResourceData): BasicResourceData {
 
 export const jsonToData = (data: unknown) => Buffer.from(JSON.stringify(data));
 
-export const resDataToJson = (res: ResourceData) => JSON.parse(notEmpty(res.data).toString());
+export const resDataToJson = (res: ResourceData) => cachedDeserialize(notEmpty(res.data));
 
 export type ResourceData = BasicResourceData & {
   readonly fields: FieldData[];

package/src/helpers/tx_helpers.ts

@@ -1,7 +1,7 @@
 import type { PlTransaction } from '../core/transaction';
 import type { FieldData, OptionalResourceId } from '../core/types';
 import { isNotNullResourceId } from '../core/types';
-import { notEmpty } from '@milaboratories/ts-helpers';
+import { cachedDeserialize, notEmpty } from '@milaboratories/ts-helpers';
 
 export interface ValErr {
   valueId: OptionalResourceId;
@@ -18,7 +18,12 @@ export async function valErr(tx: PlTransaction, f: FieldData): Promise<ValErr> {
 
   if (isNotNullResourceId(f.error)) {
     const e = await tx.getResourceData(f.error, true);
-    result.error = JSON.parse(notEmpty(e.data).toString());
+    const deserializationResult = cachedDeserialize(notEmpty(e.data));
+    if (typeof deserializationResult !== 'string') {
+      const dataStr = notEmpty(e.data).toString();
+      throw new Error(`Unexpected error structure: ${dataStr.substring(0, Math.min(dataStr.length, 100))}...`);
+    }
+    result.error = deserializationResult;
   }
 
   return result;