@dxos/codec-protobuf 2.33.8 → 2.33.9-dev.0628f3ab

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@dxos/codec-protobuf",
-  "version": "2.33.8",
+  "version": "2.33.9-dev.0628f3ab",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
+  "browser": {
+    "./dist/src/index.js": "./dist/browser.js",
+    "node:assert": "assert"
+  },
   "files": [
     "dist",
     "src"
@@ -23,19 +27,20 @@
   "dependencies": {
     "assert": "^2.0.0",
     "debug": "^4.3.3",
-    "lodash.merge": "^4.6.2",
-    "protobufjs": "^6.9.0"
+    "lodash.merge": "^4.6.2"
   },
   "devDependencies": {
     "@dxos/eslint-plugin": "~1.0.34",
-    "@types/assert": "^1.5.4",
     "@types/debug": "^4.1.7",
-    "@types/jest": "^26.0.7",
+    "@types/jest": "^28.1.6",
     "@types/lodash.merge": "^4.6.6",
     "@types/node": "^16.11.27",
+    "esbuild": "^0.14.49",
+    "esbuild-node-externals": "^1.4.1",
     "eslint": "^7.12.1",
-    "jest": "^26.6.3",
-    "ts-jest": "^26.5.6",
+    "jest": "^28.1.3",
+    "protobufjs": "^6.9.0",
+    "ts-jest": "^28.0.7",
     "ts-node": "^10.8.2",
     "typescript": "^4.7.2"
   },
@@ -43,7 +48,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && ts-node build.ts",
     "build:test": "pnpm run build && pnpm run lint && pnpm run test",
     "lint": "eslint '{src,test}/**/*.ts'",
     "test": "jest 2>&1"

package/src/encoding.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2021 DXOS.org
+//
+
+import * as protobuf from 'protobufjs';
+
+export const encodeProtobuf = (root: protobuf.Root): string => JSON.stringify(root.toJSON());
+
+export const decodeProtobuf = (json: string): protobuf.Root => protobuf.Root.fromJSON(JSON.parse(json));

package/src/index.ts

@@ -5,7 +5,9 @@
 export * from './buffer-patch';
 export * from './codec';
 export * from './common';
+export * from './encoding';
 export * from './interface';
+export * from './mapping';
 export * from './sanitizer';
 export * from './schema';
 export * from './service';

package/src/mapping.ts

@@ -2,6 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
+import assert from 'node:assert';
+import protobufjs from 'protobufjs';
+
 import { Substitutions } from './common';
 
 export type MapingDescriptors = Partial<Record<string, (value: any, ...extraArgs: any) => any>>
@@ -23,3 +26,60 @@ export const createMappingDescriptors = (substitutions: Substitutions): Bidirect
     decode
   };
 };
+
+export type FieldMapper = (value: any, typeName: string) => Promise<any>;
+
+export const mapMessage = async (type: protobufjs.Type, mapper: FieldMapper, obj: any) => {
+  const res: any = {};
+  for (const field of type.fieldsArray) {
+    if (!(field.name in obj)) {
+      continue;
+    }
+    res[field.name] = await mapField(field, mapper, obj[field.name]);
+  }
+
+  return res;
+};
+
+const mapField = async (field: protobufjs.Field, mapper: FieldMapper, value: any) => {
+  if (!field.required && (value === null || value === undefined)) {
+    return value;
+  } else if (field.repeated) {
+    return await Promise.all(value.map((value: any) => mapScalarField(field, mapper, value)));
+  } else if (field.map) {
+    assert(field instanceof protobufjs.MapField);
+    return await asyncObjectMap((value) => mapScalarField(field, mapper, value), value);
+  } else {
+    return mapScalarField(field, mapper, value);
+  }
+};
+
+const mapScalarField = async (field: protobufjs.Field, mapper: FieldMapper, value: any) => {
+  if (!field.resolved) {
+    field.resolve();
+  }
+
+  const typeName = field.resolvedType?.fullName.slice(1); // Name of the protobuf message type if the field type is not primitive.
+  if (typeName) {
+    return await mapper(value, typeName);
+  }
+
+  if (field.resolvedType && field.resolvedType instanceof protobufjs.Type) {
+    return await mapMessage(field.resolvedType, mapper, value);
+  }
+
+  return value;
+};
+
+const asyncObjectMap = async <K extends keyof any, T, U>(
+  map: (value: T, key: K) => Promise<U>,
+  record: Record<K, T>
+): Promise<Record<K, U>> => {
+  const res: Record<K, U> = {} as any;
+
+  await Promise.all(Object.entries(record).map(async ([key, value]) => {
+    res[key as keyof typeof res] = await map(value as T, key as K);
+  }));
+
+  return res;
+};

package/src/precompiled-mapping/create-message-mapper.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 import * as pb from 'protobufjs';
 
 import { MapingDescriptors } from '../mapping';

package/src/service.ts

@@ -2,7 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 import pb from 'protobufjs';
 
 import type { Schema } from './schema';

package/src/stream.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 const log = debug('dxos:codec-protobuf:stream');