A local-first personal finance app
[AI] Replace google-protobuf with @bufbuild/protobuf (#7535)
Matiss Janis Aboltins2c7f3c7a3d99
diff --git a/packages/crdt/bin/generate-proto b/packages/crdt/bin/generate-protoindex 690075ef81..c6efcc7da1 100755--- a/packages/crdt/bin/generate-proto+++ b/packages/crdt/bin/generate-proto@@ -1,4 +1,5 @@#!/bin/bash+set -euo pipefailcd "$(dirname "$(dirname "$0")")"@@ -7,20 +8,10 @@ if ! [ -x "$(command -v protoc)" ]; thenexit 1fi-export PATH="$PWD/bin:$PATH"--protoc --plugin="protoc-gen-ts=../../node_modules/.bin/protoc-gen-ts" \- --ts_opt=esModuleInterop=true \- --ts_out="src/proto" \- --js_out=import_style=commonjs,binary:src/proto \+protoc --plugin="protoc-gen-es=../../node_modules/.bin/protoc-gen-es" \+ --es_opt=target=ts \+ --es_out="src/proto" \--proto_path=src/proto \sync.proto-../../node_modules/.bin/oxfmt src/proto/*.d.ts--for file in src/proto/*.d.ts; do- { echo "/* oxlint-disable typescript/no-namespace */"; sed 's/export class/export declare class/g' "$file"; } > "${file%.d.ts}.ts"- rm "$file"-done--echo 'One more step! Find the `var global = ...` declaration in src/proto/sync_pb.js and change it to `var global = globalThis;`'+../../node_modules/.bin/oxfmt src/proto/*.tsdiff --git a/packages/crdt/package.json b/packages/crdt/package.jsonindex d9217d9673..cf17cb6429 100644--- a/packages/crdt/package.json+++ b/packages/crdt/package.json@@ -10,6 +10,7 @@"!dist/**/*.spec.d.ts","!dist/**/*.spec.d.ts.map"],+ "type": "module","main": "src/index.ts","types": "src/index.ts","exports": {@@ -33,16 +34,14 @@"typecheck": "tsgo -b"},"dependencies": {- "google-protobuf": "^3.21.4",+ "@bufbuild/protobuf": "^2.11.0","murmurhash": "^2.0.1","uuid": "^14.0.0"},"devDependencies": {- "@types/google-protobuf": "3.15.12",+ "@bufbuild/protoc-gen-es": "^2.11.0","@typescript/native-preview": "beta",- "protoc-gen-js": "3.21.4-4","rollup-plugin-visualizer": "^7.0.1",- "ts-protoc-gen": "0.15.0","vite": "^8.0.5","vitest": "^4.1.2"}diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.tsindex f029d06d30..9d5bca409b 100644--- a/packages/crdt/src/index.ts+++ b/packages/crdt/src/index.ts@@ -1,6 +1,3 @@-import './proto/sync_pb.js'; // Import for side effects-import type * as SyncPb from './proto/sync_pb';-export {merkle,getClock,@@ -13,16 +10,17 @@ export {Timestamp,} from './crdt';-declare global {- var proto: typeof SyncPb;-}--const { proto } = globalThis;--export const SyncRequest = proto.SyncRequest;-export const SyncResponse = proto.SyncResponse;-export const Message = proto.Message;-export const MessageEnvelope = proto.MessageEnvelope;-export const EncryptedData = proto.EncryptedData;+export {+ type EncryptedData,+ type Message,+ type MessageEnvelope,+ type SyncRequest,+ type SyncResponse,+ EncryptedDataSchema,+ MessageSchema,+ MessageEnvelopeSchema,+ SyncRequestSchema,+ SyncResponseSchema,+} from './proto/sync_pb';-export const SyncProtoBuf = proto;+export { create, fromBinary, toBinary } from '@bufbuild/protobuf';diff --git a/packages/crdt/src/proto/sync.proto b/packages/crdt/src/proto/sync.protoindex 675171bc95..dba6fb1aa8 100644--- a/packages/crdt/src/proto/sync.proto+++ b/packages/crdt/src/proto/sync.proto@@ -21,6 +21,7 @@ message MessageEnvelope {}message SyncRequest {+ reserved 4;repeated MessageEnvelope messages = 1;string fileId = 2;string groupId = 3;diff --git a/packages/crdt/src/proto/sync_pb.js b/packages/crdt/src/proto/sync_pb.jsdeleted file mode 100644index ddfff02296..0000000000--- a/packages/crdt/src/proto/sync_pb.js+++ /dev/null@@ -1,1206 +0,0 @@-// source: sync.proto-/**- * @fileoverview- * @enhanceable- * @suppress {missingRequire} reports error on implicit type usages.- * @suppress {messageConventions} JS Compiler reports an error if a variable or- * field starts with 'MSG_' and isn't a translatable message.- * @public- */-// GENERATED CODE -- DO NOT EDIT!-/* eslint-disable */-// @ts-nocheck--var jspb = require('google-protobuf');-var goog = jspb;-var global = globalThis;--goog.exportSymbol('proto.EncryptedData', null, global);-goog.exportSymbol('proto.Message', null, global);-goog.exportSymbol('proto.MessageEnvelope', null, global);-goog.exportSymbol('proto.SyncRequest', null, global);-goog.exportSymbol('proto.SyncResponse', null, global);-/**- * Generated by JsPbCodeGenerator.- * @param {Array=} opt_data Optional initial data array, typically from a- * server response, or constructed directly in Javascript. The array is used- * in place and becomes part of the constructed object. It is not cloned.- * If no data is provided, the constructed object will be empty, but still- * valid.- * @extends {jspb.Message}- * @constructor- */-proto.EncryptedData = function (opt_data) {- jspb.Message.initialize(this, opt_data, 0, -1, null, null);-};-goog.inherits(proto.EncryptedData, jspb.Message);-if (goog.DEBUG && !COMPILED) {- /**- * @public- * @override- */- proto.EncryptedData.displayName = 'proto.EncryptedData';-}-/**- * Generated by JsPbCodeGenerator.- * @param {Array=} opt_data Optional initial data array, typically from a- * server response, or constructed directly in Javascript. The array is used- * in place and becomes part of the constructed object. It is not cloned.- * If no data is provided, the constructed object will be empty, but still- * valid.- * @extends {jspb.Message}- * @constructor- */-proto.Message = function (opt_data) {- jspb.Message.initialize(this, opt_data, 0, -1, null, null);-};-goog.inherits(proto.Message, jspb.Message);-if (goog.DEBUG && !COMPILED) {- /**- * @public- * @override- */- proto.Message.displayName = 'proto.Message';-}-/**- * Generated by JsPbCodeGenerator.- * @param {Array=} opt_data Optional initial data array, typically from a- * server response, or constructed directly in Javascript. The array is used- * in place and becomes part of the constructed object. It is not cloned.- * If no data is provided, the constructed object will be empty, but still- * valid.- * @extends {jspb.Message}- * @constructor- */-proto.MessageEnvelope = function (opt_data) {- jspb.Message.initialize(this, opt_data, 0, -1, null, null);-};-goog.inherits(proto.MessageEnvelope, jspb.Message);-if (goog.DEBUG && !COMPILED) {- /**- * @public- * @override- */- proto.MessageEnvelope.displayName = 'proto.MessageEnvelope';-}-/**- * Generated by JsPbCodeGenerator.- * @param {Array=} opt_data Optional initial data array, typically from a- * server response, or constructed directly in Javascript. The array is used- * in place and becomes part of the constructed object. It is not cloned.- * If no data is provided, the constructed object will be empty, but still- * valid.- * @extends {jspb.Message}- * @constructor- */-proto.SyncRequest = function (opt_data) {- jspb.Message.initialize(- this,- opt_data,- 0,- -1,- proto.SyncRequest.repeatedFields_,- null,- );-};-goog.inherits(proto.SyncRequest, jspb.Message);-if (goog.DEBUG && !COMPILED) {- /**- * @public- * @override- */- proto.SyncRequest.displayName = 'proto.SyncRequest';-}-/**- * Generated by JsPbCodeGenerator.- * @param {Array=} opt_data Optional initial data array, typically from a- * server response, or constructed directly in Javascript. The array is used- * in place and becomes part of the constructed object. It is not cloned.- * If no data is provided, the constructed object will be empty, but still- * valid.- * @extends {jspb.Message}- * @constructor- */-proto.SyncResponse = function (opt_data) {- jspb.Message.initialize(- this,- opt_data,- 0,- -1,- proto.SyncResponse.repeatedFields_,- null,- );-};-goog.inherits(proto.SyncResponse, jspb.Message);-if (goog.DEBUG && !COMPILED) {- /**- * @public- * @override- */- proto.SyncResponse.displayName = 'proto.SyncResponse';-}--if (jspb.Message.GENERATE_TO_OBJECT) {- /**- * Creates an object representation of this proto.- * Field names that are reserved in JavaScript and will be renamed to pb_name.- * Optional fields that are not set will be set to undefined.- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.- * For the list of reserved names please see:- * net/proto2/compiler/js/internal/generator.cc#kKeyword.- * @param {boolean=} opt_includeInstance Deprecated. whether to include the- * JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @return {!Object}- */- proto.EncryptedData.prototype.toObject = function (opt_includeInstance) {- return proto.EncryptedData.toObject(opt_includeInstance, this);- };-- /**- * Static version of the {@see toObject} method.- * @param {boolean|undefined} includeInstance Deprecated. Whether to include- * the JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @param {!proto.EncryptedData} msg The msg instance to transform.- * @return {!Object}- * @suppress {unusedLocalVariables} f is only used for nested messages- */- proto.EncryptedData.toObject = function (includeInstance, msg) {- var f,- obj = {- iv: msg.getIv_asB64(),- authtag: msg.getAuthtag_asB64(),- data: msg.getData_asB64(),- };-- if (includeInstance) {- obj.$jspbMessageInstance = msg;- }- return obj;- };-}--/**- * Deserializes binary data (in protobuf wire format).- * @param {jspb.ByteSource} bytes The bytes to deserialize.- * @return {!proto.EncryptedData}- */-proto.EncryptedData.deserializeBinary = function (bytes) {- var reader = new jspb.BinaryReader(bytes);- var msg = new proto.EncryptedData();- return proto.EncryptedData.deserializeBinaryFromReader(msg, reader);-};--/**- * Deserializes binary data (in protobuf wire format) from the- * given reader into the given message object.- * @param {!proto.EncryptedData} msg The message object to deserialize into.- * @param {!jspb.BinaryReader} reader The BinaryReader to use.- * @return {!proto.EncryptedData}- */-proto.EncryptedData.deserializeBinaryFromReader = function (msg, reader) {- while (reader.nextField()) {- if (reader.isEndGroup()) {- break;- }- var field = reader.getFieldNumber();- switch (field) {- case 1:- var value = /** @type {!Uint8Array} */ (reader.readBytes());- msg.setIv(value);- break;- case 2:- var value = /** @type {!Uint8Array} */ (reader.readBytes());- msg.setAuthtag(value);- break;- case 3:- var value = /** @type {!Uint8Array} */ (reader.readBytes());- msg.setData(value);- break;- default:- reader.skipField();- break;- }- }- return msg;-};--/**- * Serializes the message to binary data (in protobuf wire format).- * @return {!Uint8Array}- */-proto.EncryptedData.prototype.serializeBinary = function () {- var writer = new jspb.BinaryWriter();- proto.EncryptedData.serializeBinaryToWriter(this, writer);- return writer.getResultBuffer();-};--/**- * Serializes the given message to binary data (in protobuf wire- * format), writing to the given BinaryWriter.- * @param {!proto.EncryptedData} message- * @param {!jspb.BinaryWriter} writer- * @suppress {unusedLocalVariables} f is only used for nested messages- */-proto.EncryptedData.serializeBinaryToWriter = function (message, writer) {- var f = undefined;- f = message.getIv_asU8();- if (f.length > 0) {- writer.writeBytes(1, f);- }- f = message.getAuthtag_asU8();- if (f.length > 0) {- writer.writeBytes(2, f);- }- f = message.getData_asU8();- if (f.length > 0) {- writer.writeBytes(3, f);- }-};--/**- * optional bytes iv = 1;- * @return {!(string|Uint8Array)}- */-proto.EncryptedData.prototype.getIv = function () {- return /** @type {!(string|Uint8Array)} */ (- jspb.Message.getFieldWithDefault(this, 1, '')- );-};--/**- * optional bytes iv = 1;- * This is a type-conversion wrapper around `getIv()`- * @return {string}- */-proto.EncryptedData.prototype.getIv_asB64 = function () {- return /** @type {string} */ (jspb.Message.bytesAsB64(this.getIv()));-};--/**- * optional bytes iv = 1;- * Note that Uint8Array is not supported on all browsers.- * @see http://caniuse.com/Uint8Array- * This is a type-conversion wrapper around `getIv()`- * @return {!Uint8Array}- */-proto.EncryptedData.prototype.getIv_asU8 = function () {- return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(this.getIv()));-};--/**- * @param {!(string|Uint8Array)} value- * @return {!proto.EncryptedData} returns this- */-proto.EncryptedData.prototype.setIv = function (value) {- return jspb.Message.setProto3BytesField(this, 1, value);-};--/**- * optional bytes authTag = 2;- * @return {!(string|Uint8Array)}- */-proto.EncryptedData.prototype.getAuthtag = function () {- return /** @type {!(string|Uint8Array)} */ (- jspb.Message.getFieldWithDefault(this, 2, '')- );-};--/**- * optional bytes authTag = 2;- * This is a type-conversion wrapper around `getAuthtag()`- * @return {string}- */-proto.EncryptedData.prototype.getAuthtag_asB64 = function () {- return /** @type {string} */ (jspb.Message.bytesAsB64(this.getAuthtag()));-};--/**- * optional bytes authTag = 2;- * Note that Uint8Array is not supported on all browsers.- * @see http://caniuse.com/Uint8Array- * This is a type-conversion wrapper around `getAuthtag()`- * @return {!Uint8Array}- */-proto.EncryptedData.prototype.getAuthtag_asU8 = function () {- return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(this.getAuthtag()));-};--/**- * @param {!(string|Uint8Array)} value- * @return {!proto.EncryptedData} returns this- */-proto.EncryptedData.prototype.setAuthtag = function (value) {- return jspb.Message.setProto3BytesField(this, 2, value);-};--/**- * optional bytes data = 3;- * @return {!(string|Uint8Array)}- */-proto.EncryptedData.prototype.getData = function () {- return /** @type {!(string|Uint8Array)} */ (- jspb.Message.getFieldWithDefault(this, 3, '')- );-};--/**- * optional bytes data = 3;- * This is a type-conversion wrapper around `getData()`- * @return {string}- */-proto.EncryptedData.prototype.getData_asB64 = function () {- return /** @type {string} */ (jspb.Message.bytesAsB64(this.getData()));-};--/**- * optional bytes data = 3;- * Note that Uint8Array is not supported on all browsers.- * @see http://caniuse.com/Uint8Array- * This is a type-conversion wrapper around `getData()`- * @return {!Uint8Array}- */-proto.EncryptedData.prototype.getData_asU8 = function () {- return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(this.getData()));-};--/**- * @param {!(string|Uint8Array)} value- * @return {!proto.EncryptedData} returns this- */-proto.EncryptedData.prototype.setData = function (value) {- return jspb.Message.setProto3BytesField(this, 3, value);-};--if (jspb.Message.GENERATE_TO_OBJECT) {- /**- * Creates an object representation of this proto.- * Field names that are reserved in JavaScript and will be renamed to pb_name.- * Optional fields that are not set will be set to undefined.- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.- * For the list of reserved names please see:- * net/proto2/compiler/js/internal/generator.cc#kKeyword.- * @param {boolean=} opt_includeInstance Deprecated. whether to include the- * JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @return {!Object}- */- proto.Message.prototype.toObject = function (opt_includeInstance) {- return proto.Message.toObject(opt_includeInstance, this);- };-- /**- * Static version of the {@see toObject} method.- * @param {boolean|undefined} includeInstance Deprecated. Whether to include- * the JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @param {!proto.Message} msg The msg instance to transform.- * @return {!Object}- * @suppress {unusedLocalVariables} f is only used for nested messages- */- proto.Message.toObject = function (includeInstance, msg) {- var f,- obj = {- dataset: jspb.Message.getFieldWithDefault(msg, 1, ''),- row: jspb.Message.getFieldWithDefault(msg, 2, ''),- column: jspb.Message.getFieldWithDefault(msg, 3, ''),- value: jspb.Message.getFieldWithDefault(msg, 4, ''),- };-- if (includeInstance) {- obj.$jspbMessageInstance = msg;- }- return obj;- };-}--/**- * Deserializes binary data (in protobuf wire format).- * @param {jspb.ByteSource} bytes The bytes to deserialize.- * @return {!proto.Message}- */-proto.Message.deserializeBinary = function (bytes) {- var reader = new jspb.BinaryReader(bytes);- var msg = new proto.Message();- return proto.Message.deserializeBinaryFromReader(msg, reader);-};--/**- * Deserializes binary data (in protobuf wire format) from the- * given reader into the given message object.- * @param {!proto.Message} msg The message object to deserialize into.- * @param {!jspb.BinaryReader} reader The BinaryReader to use.- * @return {!proto.Message}- */-proto.Message.deserializeBinaryFromReader = function (msg, reader) {- while (reader.nextField()) {- if (reader.isEndGroup()) {- break;- }- var field = reader.getFieldNumber();- switch (field) {- case 1:- var value = /** @type {string} */ (reader.readString());- msg.setDataset(value);- break;- case 2:- var value = /** @type {string} */ (reader.readString());- msg.setRow(value);- break;- case 3:- var value = /** @type {string} */ (reader.readString());- msg.setColumn(value);- break;- case 4:- var value = /** @type {string} */ (reader.readString());- msg.setValue(value);- break;- default:- reader.skipField();- break;- }- }- return msg;-};--/**- * Serializes the message to binary data (in protobuf wire format).- * @return {!Uint8Array}- */-proto.Message.prototype.serializeBinary = function () {- var writer = new jspb.BinaryWriter();- proto.Message.serializeBinaryToWriter(this, writer);- return writer.getResultBuffer();-};--/**- * Serializes the given message to binary data (in protobuf wire- * format), writing to the given BinaryWriter.- * @param {!proto.Message} message- * @param {!jspb.BinaryWriter} writer- * @suppress {unusedLocalVariables} f is only used for nested messages- */-proto.Message.serializeBinaryToWriter = function (message, writer) {- var f = undefined;- f = message.getDataset();- if (f.length > 0) {- writer.writeString(1, f);- }- f = message.getRow();- if (f.length > 0) {- writer.writeString(2, f);- }- f = message.getColumn();- if (f.length > 0) {- writer.writeString(3, f);- }- f = message.getValue();- if (f.length > 0) {- writer.writeString(4, f);- }-};--/**- * optional string dataset = 1;- * @return {string}- */-proto.Message.prototype.getDataset = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ''));-};--/**- * @param {string} value- * @return {!proto.Message} returns this- */-proto.Message.prototype.setDataset = function (value) {- return jspb.Message.setProto3StringField(this, 1, value);-};--/**- * optional string row = 2;- * @return {string}- */-proto.Message.prototype.getRow = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ''));-};--/**- * @param {string} value- * @return {!proto.Message} returns this- */-proto.Message.prototype.setRow = function (value) {- return jspb.Message.setProto3StringField(this, 2, value);-};--/**- * optional string column = 3;- * @return {string}- */-proto.Message.prototype.getColumn = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ''));-};--/**- * @param {string} value- * @return {!proto.Message} returns this- */-proto.Message.prototype.setColumn = function (value) {- return jspb.Message.setProto3StringField(this, 3, value);-};--/**- * optional string value = 4;- * @return {string}- */-proto.Message.prototype.getValue = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ''));-};--/**- * @param {string} value- * @return {!proto.Message} returns this- */-proto.Message.prototype.setValue = function (value) {- return jspb.Message.setProto3StringField(this, 4, value);-};--if (jspb.Message.GENERATE_TO_OBJECT) {- /**- * Creates an object representation of this proto.- * Field names that are reserved in JavaScript and will be renamed to pb_name.- * Optional fields that are not set will be set to undefined.- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.- * For the list of reserved names please see:- * net/proto2/compiler/js/internal/generator.cc#kKeyword.- * @param {boolean=} opt_includeInstance Deprecated. whether to include the- * JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @return {!Object}- */- proto.MessageEnvelope.prototype.toObject = function (opt_includeInstance) {- return proto.MessageEnvelope.toObject(opt_includeInstance, this);- };-- /**- * Static version of the {@see toObject} method.- * @param {boolean|undefined} includeInstance Deprecated. Whether to include- * the JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @param {!proto.MessageEnvelope} msg The msg instance to transform.- * @return {!Object}- * @suppress {unusedLocalVariables} f is only used for nested messages- */- proto.MessageEnvelope.toObject = function (includeInstance, msg) {- var f,- obj = {- timestamp: jspb.Message.getFieldWithDefault(msg, 1, ''),- isencrypted: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),- content: msg.getContent_asB64(),- };-- if (includeInstance) {- obj.$jspbMessageInstance = msg;- }- return obj;- };-}--/**- * Deserializes binary data (in protobuf wire format).- * @param {jspb.ByteSource} bytes The bytes to deserialize.- * @return {!proto.MessageEnvelope}- */-proto.MessageEnvelope.deserializeBinary = function (bytes) {- var reader = new jspb.BinaryReader(bytes);- var msg = new proto.MessageEnvelope();- return proto.MessageEnvelope.deserializeBinaryFromReader(msg, reader);-};--/**- * Deserializes binary data (in protobuf wire format) from the- * given reader into the given message object.- * @param {!proto.MessageEnvelope} msg The message object to deserialize into.- * @param {!jspb.BinaryReader} reader The BinaryReader to use.- * @return {!proto.MessageEnvelope}- */-proto.MessageEnvelope.deserializeBinaryFromReader = function (msg, reader) {- while (reader.nextField()) {- if (reader.isEndGroup()) {- break;- }- var field = reader.getFieldNumber();- switch (field) {- case 1:- var value = /** @type {string} */ (reader.readString());- msg.setTimestamp(value);- break;- case 2:- var value = /** @type {boolean} */ (reader.readBool());- msg.setIsencrypted(value);- break;- case 3:- var value = /** @type {!Uint8Array} */ (reader.readBytes());- msg.setContent(value);- break;- default:- reader.skipField();- break;- }- }- return msg;-};--/**- * Serializes the message to binary data (in protobuf wire format).- * @return {!Uint8Array}- */-proto.MessageEnvelope.prototype.serializeBinary = function () {- var writer = new jspb.BinaryWriter();- proto.MessageEnvelope.serializeBinaryToWriter(this, writer);- return writer.getResultBuffer();-};--/**- * Serializes the given message to binary data (in protobuf wire- * format), writing to the given BinaryWriter.- * @param {!proto.MessageEnvelope} message- * @param {!jspb.BinaryWriter} writer- * @suppress {unusedLocalVariables} f is only used for nested messages- */-proto.MessageEnvelope.serializeBinaryToWriter = function (message, writer) {- var f = undefined;- f = message.getTimestamp();- if (f.length > 0) {- writer.writeString(1, f);- }- f = message.getIsencrypted();- if (f) {- writer.writeBool(2, f);- }- f = message.getContent_asU8();- if (f.length > 0) {- writer.writeBytes(3, f);- }-};--/**- * optional string timestamp = 1;- * @return {string}- */-proto.MessageEnvelope.prototype.getTimestamp = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ''));-};--/**- * @param {string} value- * @return {!proto.MessageEnvelope} returns this- */-proto.MessageEnvelope.prototype.setTimestamp = function (value) {- return jspb.Message.setProto3StringField(this, 1, value);-};--/**- * optional bool isEncrypted = 2;- * @return {boolean}- */-proto.MessageEnvelope.prototype.getIsencrypted = function () {- return /** @type {boolean} */ (- jspb.Message.getBooleanFieldWithDefault(this, 2, false)- );-};--/**- * @param {boolean} value- * @return {!proto.MessageEnvelope} returns this- */-proto.MessageEnvelope.prototype.setIsencrypted = function (value) {- return jspb.Message.setProto3BooleanField(this, 2, value);-};--/**- * optional bytes content = 3;- * @return {!(string|Uint8Array)}- */-proto.MessageEnvelope.prototype.getContent = function () {- return /** @type {!(string|Uint8Array)} */ (- jspb.Message.getFieldWithDefault(this, 3, '')- );-};--/**- * optional bytes content = 3;- * This is a type-conversion wrapper around `getContent()`- * @return {string}- */-proto.MessageEnvelope.prototype.getContent_asB64 = function () {- return /** @type {string} */ (jspb.Message.bytesAsB64(this.getContent()));-};--/**- * optional bytes content = 3;- * Note that Uint8Array is not supported on all browsers.- * @see http://caniuse.com/Uint8Array- * This is a type-conversion wrapper around `getContent()`- * @return {!Uint8Array}- */-proto.MessageEnvelope.prototype.getContent_asU8 = function () {- return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(this.getContent()));-};--/**- * @param {!(string|Uint8Array)} value- * @return {!proto.MessageEnvelope} returns this- */-proto.MessageEnvelope.prototype.setContent = function (value) {- return jspb.Message.setProto3BytesField(this, 3, value);-};--/**- * List of repeated fields within this message type.- * @private {!Array<number>}- * @const- */-proto.SyncRequest.repeatedFields_ = [1];--if (jspb.Message.GENERATE_TO_OBJECT) {- /**- * Creates an object representation of this proto.- * Field names that are reserved in JavaScript and will be renamed to pb_name.- * Optional fields that are not set will be set to undefined.- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.- * For the list of reserved names please see:- * net/proto2/compiler/js/internal/generator.cc#kKeyword.- * @param {boolean=} opt_includeInstance Deprecated. whether to include the- * JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @return {!Object}- */- proto.SyncRequest.prototype.toObject = function (opt_includeInstance) {- return proto.SyncRequest.toObject(opt_includeInstance, this);- };-- /**- * Static version of the {@see toObject} method.- * @param {boolean|undefined} includeInstance Deprecated. Whether to include- * the JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @param {!proto.SyncRequest} msg The msg instance to transform.- * @return {!Object}- * @suppress {unusedLocalVariables} f is only used for nested messages- */- proto.SyncRequest.toObject = function (includeInstance, msg) {- var f,- obj = {- messagesList: jspb.Message.toObjectList(- msg.getMessagesList(),- proto.MessageEnvelope.toObject,- includeInstance,- ),- fileid: jspb.Message.getFieldWithDefault(msg, 2, ''),- groupid: jspb.Message.getFieldWithDefault(msg, 3, ''),- keyid: jspb.Message.getFieldWithDefault(msg, 5, ''),- since: jspb.Message.getFieldWithDefault(msg, 6, ''),- };-- if (includeInstance) {- obj.$jspbMessageInstance = msg;- }- return obj;- };-}--/**- * Deserializes binary data (in protobuf wire format).- * @param {jspb.ByteSource} bytes The bytes to deserialize.- * @return {!proto.SyncRequest}- */-proto.SyncRequest.deserializeBinary = function (bytes) {- var reader = new jspb.BinaryReader(bytes);- var msg = new proto.SyncRequest();- return proto.SyncRequest.deserializeBinaryFromReader(msg, reader);-};--/**- * Deserializes binary data (in protobuf wire format) from the- * given reader into the given message object.- * @param {!proto.SyncRequest} msg The message object to deserialize into.- * @param {!jspb.BinaryReader} reader The BinaryReader to use.- * @return {!proto.SyncRequest}- */-proto.SyncRequest.deserializeBinaryFromReader = function (msg, reader) {- while (reader.nextField()) {- if (reader.isEndGroup()) {- break;- }- var field = reader.getFieldNumber();- switch (field) {- case 1:- var value = new proto.MessageEnvelope();- reader.readMessage(- value,- proto.MessageEnvelope.deserializeBinaryFromReader,- );- msg.addMessages(value);- break;- case 2:- var value = /** @type {string} */ (reader.readString());- msg.setFileid(value);- break;- case 3:- var value = /** @type {string} */ (reader.readString());- msg.setGroupid(value);- break;- case 5:- var value = /** @type {string} */ (reader.readString());- msg.setKeyid(value);- break;- case 6:- var value = /** @type {string} */ (reader.readString());- msg.setSince(value);- break;- default:- reader.skipField();- break;- }- }- return msg;-};--/**- * Serializes the message to binary data (in protobuf wire format).- * @return {!Uint8Array}- */-proto.SyncRequest.prototype.serializeBinary = function () {- var writer = new jspb.BinaryWriter();- proto.SyncRequest.serializeBinaryToWriter(this, writer);- return writer.getResultBuffer();-};--/**- * Serializes the given message to binary data (in protobuf wire- * format), writing to the given BinaryWriter.- * @param {!proto.SyncRequest} message- * @param {!jspb.BinaryWriter} writer- * @suppress {unusedLocalVariables} f is only used for nested messages- */-proto.SyncRequest.serializeBinaryToWriter = function (message, writer) {- var f = undefined;- f = message.getMessagesList();- if (f.length > 0) {- writer.writeRepeatedMessage(- 1,- f,- proto.MessageEnvelope.serializeBinaryToWriter,- );- }- f = message.getFileid();- if (f.length > 0) {- writer.writeString(2, f);- }- f = message.getGroupid();- if (f.length > 0) {- writer.writeString(3, f);- }- f = message.getKeyid();- if (f.length > 0) {- writer.writeString(5, f);- }- f = message.getSince();- if (f.length > 0) {- writer.writeString(6, f);- }-};--/**- * repeated MessageEnvelope messages = 1;- * @return {!Array<!proto.MessageEnvelope>}- */-proto.SyncRequest.prototype.getMessagesList = function () {- return /** @type{!Array<!proto.MessageEnvelope>} */ (- jspb.Message.getRepeatedWrapperField(this, proto.MessageEnvelope, 1)- );-};--/**- * @param {!Array<!proto.MessageEnvelope>} value- * @return {!proto.SyncRequest} returns this- */-proto.SyncRequest.prototype.setMessagesList = function (value) {- return jspb.Message.setRepeatedWrapperField(this, 1, value);-};--/**- * @param {!proto.MessageEnvelope=} opt_value- * @param {number=} opt_index- * @return {!proto.MessageEnvelope}- */-proto.SyncRequest.prototype.addMessages = function (opt_value, opt_index) {- return jspb.Message.addToRepeatedWrapperField(- this,- 1,- opt_value,- proto.MessageEnvelope,- opt_index,- );-};--/**- * Clears the list making it empty but non-null.- * @return {!proto.SyncRequest} returns this- */-proto.SyncRequest.prototype.clearMessagesList = function () {- return this.setMessagesList([]);-};--/**- * optional string fileId = 2;- * @return {string}- */-proto.SyncRequest.prototype.getFileid = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ''));-};--/**- * @param {string} value- * @return {!proto.SyncRequest} returns this- */-proto.SyncRequest.prototype.setFileid = function (value) {- return jspb.Message.setProto3StringField(this, 2, value);-};--/**- * optional string groupId = 3;- * @return {string}- */-proto.SyncRequest.prototype.getGroupid = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ''));-};--/**- * @param {string} value- * @return {!proto.SyncRequest} returns this- */-proto.SyncRequest.prototype.setGroupid = function (value) {- return jspb.Message.setProto3StringField(this, 3, value);-};--/**- * optional string keyId = 5;- * @return {string}- */-proto.SyncRequest.prototype.getKeyid = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ''));-};--/**- * @param {string} value- * @return {!proto.SyncRequest} returns this- */-proto.SyncRequest.prototype.setKeyid = function (value) {- return jspb.Message.setProto3StringField(this, 5, value);-};--/**- * optional string since = 6;- * @return {string}- */-proto.SyncRequest.prototype.getSince = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ''));-};--/**- * @param {string} value- * @return {!proto.SyncRequest} returns this- */-proto.SyncRequest.prototype.setSince = function (value) {- return jspb.Message.setProto3StringField(this, 6, value);-};--/**- * List of repeated fields within this message type.- * @private {!Array<number>}- * @const- */-proto.SyncResponse.repeatedFields_ = [1];--if (jspb.Message.GENERATE_TO_OBJECT) {- /**- * Creates an object representation of this proto.- * Field names that are reserved in JavaScript and will be renamed to pb_name.- * Optional fields that are not set will be set to undefined.- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.- * For the list of reserved names please see:- * net/proto2/compiler/js/internal/generator.cc#kKeyword.- * @param {boolean=} opt_includeInstance Deprecated. whether to include the- * JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @return {!Object}- */- proto.SyncResponse.prototype.toObject = function (opt_includeInstance) {- return proto.SyncResponse.toObject(opt_includeInstance, this);- };-- /**- * Static version of the {@see toObject} method.- * @param {boolean|undefined} includeInstance Deprecated. Whether to include- * the JSPB instance for transitional soy proto support:- * http://goto/soy-param-migration- * @param {!proto.SyncResponse} msg The msg instance to transform.- * @return {!Object}- * @suppress {unusedLocalVariables} f is only used for nested messages- */- proto.SyncResponse.toObject = function (includeInstance, msg) {- var f,- obj = {- messagesList: jspb.Message.toObjectList(- msg.getMessagesList(),- proto.MessageEnvelope.toObject,- includeInstance,- ),- merkle: jspb.Message.getFieldWithDefault(msg, 2, ''),- };-- if (includeInstance) {- obj.$jspbMessageInstance = msg;- }- return obj;- };-}--/**- * Deserializes binary data (in protobuf wire format).- * @param {jspb.ByteSource} bytes The bytes to deserialize.- * @return {!proto.SyncResponse}- */-proto.SyncResponse.deserializeBinary = function (bytes) {- var reader = new jspb.BinaryReader(bytes);- var msg = new proto.SyncResponse();- return proto.SyncResponse.deserializeBinaryFromReader(msg, reader);-};--/**- * Deserializes binary data (in protobuf wire format) from the- * given reader into the given message object.- * @param {!proto.SyncResponse} msg The message object to deserialize into.- * @param {!jspb.BinaryReader} reader The BinaryReader to use.- * @return {!proto.SyncResponse}- */-proto.SyncResponse.deserializeBinaryFromReader = function (msg, reader) {- while (reader.nextField()) {- if (reader.isEndGroup()) {- break;- }- var field = reader.getFieldNumber();- switch (field) {- case 1:- var value = new proto.MessageEnvelope();- reader.readMessage(- value,- proto.MessageEnvelope.deserializeBinaryFromReader,- );- msg.addMessages(value);- break;- case 2:- var value = /** @type {string} */ (reader.readString());- msg.setMerkle(value);- break;- default:- reader.skipField();- break;- }- }- return msg;-};--/**- * Serializes the message to binary data (in protobuf wire format).- * @return {!Uint8Array}- */-proto.SyncResponse.prototype.serializeBinary = function () {- var writer = new jspb.BinaryWriter();- proto.SyncResponse.serializeBinaryToWriter(this, writer);- return writer.getResultBuffer();-};--/**- * Serializes the given message to binary data (in protobuf wire- * format), writing to the given BinaryWriter.- * @param {!proto.SyncResponse} message- * @param {!jspb.BinaryWriter} writer- * @suppress {unusedLocalVariables} f is only used for nested messages- */-proto.SyncResponse.serializeBinaryToWriter = function (message, writer) {- var f = undefined;- f = message.getMessagesList();- if (f.length > 0) {- writer.writeRepeatedMessage(- 1,- f,- proto.MessageEnvelope.serializeBinaryToWriter,- );- }- f = message.getMerkle();- if (f.length > 0) {- writer.writeString(2, f);- }-};--/**- * repeated MessageEnvelope messages = 1;- * @return {!Array<!proto.MessageEnvelope>}- */-proto.SyncResponse.prototype.getMessagesList = function () {- return /** @type{!Array<!proto.MessageEnvelope>} */ (- jspb.Message.getRepeatedWrapperField(this, proto.MessageEnvelope, 1)- );-};--/**- * @param {!Array<!proto.MessageEnvelope>} value- * @return {!proto.SyncResponse} returns this- */-proto.SyncResponse.prototype.setMessagesList = function (value) {- return jspb.Message.setRepeatedWrapperField(this, 1, value);-};--/**- * @param {!proto.MessageEnvelope=} opt_value- * @param {number=} opt_index- * @return {!proto.MessageEnvelope}- */-proto.SyncResponse.prototype.addMessages = function (opt_value, opt_index) {- return jspb.Message.addToRepeatedWrapperField(- this,- 1,- opt_value,- proto.MessageEnvelope,- opt_index,- );-};--/**- * Clears the list making it empty but non-null.- * @return {!proto.SyncResponse} returns this- */-proto.SyncResponse.prototype.clearMessagesList = function () {- return this.setMessagesList([]);-};--/**- * optional string merkle = 2;- * @return {string}- */-proto.SyncResponse.prototype.getMerkle = function () {- return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ''));-};--/**- * @param {string} value- * @return {!proto.SyncResponse} returns this- */-proto.SyncResponse.prototype.setMerkle = function (value) {- return jspb.Message.setProto3StringField(this, 2, value);-};--goog.object.extend(exports, proto);diff --git a/packages/crdt/src/proto/sync_pb.ts b/packages/crdt/src/proto/sync_pb.tsindex be8e0b2923..f03466f75f 100644--- a/packages/crdt/src/proto/sync_pb.ts+++ b/packages/crdt/src/proto/sync_pb.ts@@ -1,217 +1,161 @@-/* oxlint-disable typescript/no-namespace */-// package:-// file: sync.proto--import * as jspb from 'google-protobuf';--export declare class EncryptedData extends jspb.Message {- getIv(): Uint8Array | string;- getIv_asU8(): Uint8Array;- getIv_asB64(): string;- setIv(value: Uint8Array | string): void;-- getAuthtag(): Uint8Array | string;- getAuthtag_asU8(): Uint8Array;- getAuthtag_asB64(): string;- setAuthtag(value: Uint8Array | string): void;-- getData(): Uint8Array | string;- getData_asU8(): Uint8Array;- getData_asB64(): string;- setData(value: Uint8Array | string): void;-- serializeBinary(): Uint8Array;- toObject(includeInstance?: boolean): EncryptedData.AsObject;- static toObject(- includeInstance: boolean,- msg: EncryptedData,- ): EncryptedData.AsObject;- static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> };- static extensionsBinary: {- [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>;- };- static serializeBinaryToWriter(- message: EncryptedData,- writer: jspb.BinaryWriter,- ): void;- static deserializeBinary(bytes: Uint8Array): EncryptedData;- static deserializeBinaryFromReader(- message: EncryptedData,- reader: jspb.BinaryReader,- ): EncryptedData;-}--export namespace EncryptedData {- export type AsObject = {- iv: Uint8Array | string;- authtag: Uint8Array | string;- data: Uint8Array | string;- };-}--export declare class Message extends jspb.Message {- getDataset(): string;- setDataset(value: string): void;-- getRow(): string;- setRow(value: string): void;-- getColumn(): string;- setColumn(value: string): void;-- getValue(): string;- setValue(value: string): void;-- serializeBinary(): Uint8Array;- toObject(includeInstance?: boolean): Message.AsObject;- static toObject(includeInstance: boolean, msg: Message): Message.AsObject;- static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> };- static extensionsBinary: {- [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>;- };- static serializeBinaryToWriter(- message: Message,- writer: jspb.BinaryWriter,- ): void;- static deserializeBinary(bytes: Uint8Array): Message;- static deserializeBinaryFromReader(- message: Message,- reader: jspb.BinaryReader,- ): Message;-}--export namespace Message {- export type AsObject = {- dataset: string;- row: string;- column: string;- value: string;- };-}--export declare class MessageEnvelope extends jspb.Message {- getTimestamp(): string;- setTimestamp(value: string): void;-- getIsencrypted(): boolean;- setIsencrypted(value: boolean): void;-- getContent(): Uint8Array | string;- getContent_asU8(): Uint8Array;- getContent_asB64(): string;- setContent(value: Uint8Array | string): void;-- serializeBinary(): Uint8Array;- toObject(includeInstance?: boolean): MessageEnvelope.AsObject;- static toObject(- includeInstance: boolean,- msg: MessageEnvelope,- ): MessageEnvelope.AsObject;- static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> };- static extensionsBinary: {- [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>;- };- static serializeBinaryToWriter(- message: MessageEnvelope,- writer: jspb.BinaryWriter,- ): void;- static deserializeBinary(bytes: Uint8Array): MessageEnvelope;- static deserializeBinaryFromReader(- message: MessageEnvelope,- reader: jspb.BinaryReader,- ): MessageEnvelope;-}--export namespace MessageEnvelope {- export type AsObject = {- timestamp: string;- isencrypted: boolean;- content: Uint8Array | string;- };-}--export declare class SyncRequest extends jspb.Message {- clearMessagesList(): void;- getMessagesList(): Array<MessageEnvelope>;- setMessagesList(value: Array<MessageEnvelope>): void;- addMessages(value?: MessageEnvelope, index?: number): MessageEnvelope;-- getFileid(): string;- setFileid(value: string): void;-- getGroupid(): string;- setGroupid(value: string): void;-- getKeyid(): string;- setKeyid(value: string): void;-- getSince(): string;- setSince(value: string): void;-- serializeBinary(): Uint8Array;- toObject(includeInstance?: boolean): SyncRequest.AsObject;- static toObject(- includeInstance: boolean,- msg: SyncRequest,- ): SyncRequest.AsObject;- static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> };- static extensionsBinary: {- [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>;- };- static serializeBinaryToWriter(- message: SyncRequest,- writer: jspb.BinaryWriter,- ): void;- static deserializeBinary(bytes: Uint8Array): SyncRequest;- static deserializeBinaryFromReader(- message: SyncRequest,- reader: jspb.BinaryReader,- ): SyncRequest;-}--export namespace SyncRequest {- export type AsObject = {- messagesList: Array<MessageEnvelope.AsObject>;- fileid: string;- groupid: string;- keyid: string;- since: string;- };-}--export declare class SyncResponse extends jspb.Message {- clearMessagesList(): void;- getMessagesList(): Array<MessageEnvelope>;- setMessagesList(value: Array<MessageEnvelope>): void;- addMessages(value?: MessageEnvelope, index?: number): MessageEnvelope;-- getMerkle(): string;- setMerkle(value: string): void;-- serializeBinary(): Uint8Array;- toObject(includeInstance?: boolean): SyncResponse.AsObject;- static toObject(- includeInstance: boolean,- msg: SyncResponse,- ): SyncResponse.AsObject;- static extensions: { [key: number]: jspb.ExtensionFieldInfo<jspb.Message> };- static extensionsBinary: {- [key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>;- };- static serializeBinaryToWriter(- message: SyncResponse,- writer: jspb.BinaryWriter,- ): void;- static deserializeBinary(bytes: Uint8Array): SyncResponse;- static deserializeBinaryFromReader(- message: SyncResponse,- reader: jspb.BinaryReader,- ): SyncResponse;-}--export namespace SyncResponse {- export type AsObject = {- messagesList: Array<MessageEnvelope.AsObject>;- merkle: string;- };-}+// @generated by protoc-gen-es v2.11.0 with parameter "target=ts"+// @generated from file sync.proto (syntax proto3)+/* eslint-disable */++import type { Message as Message$1 } from '@bufbuild/protobuf';+import type { GenFile, GenMessage } from '@bufbuild/protobuf/codegenv2';+import { fileDesc, messageDesc } from '@bufbuild/protobuf/codegenv2';++/**+ * Describes the file sync.proto.+ */+export const file_sync: GenFile /*@__PURE__*/ = fileDesc(+ 'CgpzeW5jLnByb3RvIjoKDUVuY3J5cHRlZERhdGESCgoCaXYYASABKAwSDwoHYXV0aFRhZxgCIAEoDBIMCgRkYXRhGAMgASgMIkYKB01lc3NhZ2USDwoHZGF0YXNldBgBIAEoCRILCgNyb3cYAiABKAkSDgoGY29sdW1uGAMgASgJEg0KBXZhbHVlGAQgASgJIkoKD01lc3NhZ2VFbnZlbG9wZRIRCgl0aW1lc3RhbXAYASABKAkSEwoLaXNFbmNyeXB0ZWQYAiABKAgSDwoHY29udGVudBgDIAEoDCJ2CgtTeW5jUmVxdWVzdBIiCghtZXNzYWdlcxgBIAMoCzIQLk1lc3NhZ2VFbnZlbG9wZRIOCgZmaWxlSWQYAiABKAkSDwoHZ3JvdXBJZBgDIAEoCRINCgVrZXlJZBgFIAEoCRINCgVzaW5jZRgGIAEoCUoECAQQBSJCCgxTeW5jUmVzcG9uc2USIgoIbWVzc2FnZXMYASADKAsyEC5NZXNzYWdlRW52ZWxvcGUSDgoGbWVya2xlGAIgASgJYgZwcm90bzM',+);++/**+ * @generated from message EncryptedData+ */+export type EncryptedData = Message$1<'EncryptedData'> & {+ /**+ * @generated from field: bytes iv = 1;+ */+ iv: Uint8Array;++ /**+ * @generated from field: bytes authTag = 2;+ */+ authTag: Uint8Array;++ /**+ * @generated from field: bytes data = 3;+ */+ data: Uint8Array;+};++/**+ * Describes the message EncryptedData.+ * Use `create(EncryptedDataSchema)` to create a new message.+ */+export const EncryptedDataSchema: GenMessage<EncryptedData> /*@__PURE__*/ =+ messageDesc(file_sync, 0);++/**+ * @generated from message Message+ */+export type Message = Message$1<'Message'> & {+ /**+ * @generated from field: string dataset = 1;+ */+ dataset: string;++ /**+ * @generated from field: string row = 2;+ */+ row: string;++ /**+ * @generated from field: string column = 3;+ */+ column: string;++ /**+ * @generated from field: string value = 4;+ */+ value: string;+};++/**+ * Describes the message Message.+ * Use `create(MessageSchema)` to create a new message.+ */+export const MessageSchema: GenMessage<Message> /*@__PURE__*/ = messageDesc(+ file_sync,+ 1,+);++/**+ * @generated from message MessageEnvelope+ */+export type MessageEnvelope = Message$1<'MessageEnvelope'> & {+ /**+ * @generated from field: string timestamp = 1;+ */+ timestamp: string;++ /**+ * @generated from field: bool isEncrypted = 2;+ */+ isEncrypted: boolean;++ /**+ * @generated from field: bytes content = 3;+ */+ content: Uint8Array;+};++/**+ * Describes the message MessageEnvelope.+ * Use `create(MessageEnvelopeSchema)` to create a new message.+ */+export const MessageEnvelopeSchema: GenMessage<MessageEnvelope> /*@__PURE__*/ =+ messageDesc(file_sync, 2);++/**+ * @generated from message SyncRequest+ */+export type SyncRequest = Message$1<'SyncRequest'> & {+ /**+ * @generated from field: repeated MessageEnvelope messages = 1;+ */+ messages: MessageEnvelope[];++ /**+ * @generated from field: string fileId = 2;+ */+ fileId: string;++ /**+ * @generated from field: string groupId = 3;+ */+ groupId: string;++ /**+ * @generated from field: string keyId = 5;+ */+ keyId: string;++ /**+ * @generated from field: string since = 6;+ */+ since: string;+};++/**+ * Describes the message SyncRequest.+ * Use `create(SyncRequestSchema)` to create a new message.+ */+export const SyncRequestSchema: GenMessage<SyncRequest> /*@__PURE__*/ =+ messageDesc(file_sync, 3);++/**+ * @generated from message SyncResponse+ */+export type SyncResponse = Message$1<'SyncResponse'> & {+ /**+ * @generated from field: repeated MessageEnvelope messages = 1;+ */+ messages: MessageEnvelope[];++ /**+ * @generated from field: string merkle = 2;+ */+ merkle: string;+};++/**+ * Describes the message SyncResponse.+ * Use `create(SyncResponseSchema)` to create a new message.+ */+export const SyncResponseSchema: GenMessage<SyncResponse> /*@__PURE__*/ =+ messageDesc(file_sync, 4);diff --git a/packages/crdt/vite.config.mts b/packages/crdt/vite.config.mtsindex e71868c484..1ab3df2da5 100644--- a/packages/crdt/vite.config.mts+++ b/packages/crdt/vite.config.mts@@ -6,7 +6,7 @@ import { defineConfig } from 'vite';export default defineConfig({ssr: {noExternal: true,- external: ['google-protobuf', 'murmurhash'],+ external: ['@bufbuild/protobuf', 'murmurhash'],},build: {ssr: true,@@ -16,7 +16,7 @@ export default defineConfig({sourcemap: true,lib: {entry: path.resolve(__dirname, 'src/index.ts'),- formats: ['cjs'],+ formats: ['es'],fileName: () => 'index.js',},},diff --git a/packages/loot-core/package.json b/packages/loot-core/package.jsonindex 20c9ffaece..36d5532698 100644--- a/packages/loot-core/package.json+++ b/packages/loot-core/package.json@@ -181,7 +181,6 @@"csv-parse": "^6.2.1","csv-stringify": "^6.7.0","date-fns": "^4.1.0",- "google-protobuf": "^3.21.4","handlebars": "^4.7.9","hyperformula": "^3.2.0","lodash": "^4.18.1",diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.tsindex 89bd09fbc8..f4fcd494d1 100644--- a/packages/loot-core/src/server/main.ts+++ b/packages/loot-core/src/server/main.ts@@ -1,5 +1,4 @@// @ts-strict-ignore-import './polyfills';import * as asyncStorage from '#platform/server/asyncStorage';import * as connection from '#platform/server/connection';import * as fs from '#platform/server/fs';diff --git a/packages/loot-core/src/server/polyfills.ts b/packages/loot-core/src/server/polyfills.tsdeleted file mode 100644index 4d4df03e87..0000000000--- a/packages/loot-core/src/server/polyfills.ts+++ /dev/null@@ -1,26 +0,0 @@-// Polyfills for browser/web worker environment-import * as jspb from 'google-protobuf';--if (typeof globalThis !== 'undefined') {- // Add a basic require polyfill for CommonJS modules- if (typeof globalThis.require === 'undefined') {- // @ts-expect-error - we're creating a minimal require implementation- globalThis.require = (moduleId: string) => {- switch (moduleId) {- case 'google-protobuf':- return jspb;- default:- throw new Error(- `Module not found: ${moduleId}. Add to polyfills if needed.`,- );- }- };- }-}--// Also set on global for compatibility-if (typeof global !== 'undefined') {- if (typeof global.require === 'undefined') {- global.require = globalThis.require;- }-}diff --git a/packages/loot-core/src/server/sync/encoder.ts b/packages/loot-core/src/server/sync/encoder.tsindex cffc386b0e..a2dd83b1e4 100644--- a/packages/loot-core/src/server/sync/encoder.ts+++ b/packages/loot-core/src/server/sync/encoder.ts@@ -1,5 +1,15 @@// @ts-strict-ignore-import { SyncProtoBuf, Timestamp } from '@actual-app/crdt';+import {+ create,+ EncryptedDataSchema,+ fromBinary,+ MessageEnvelopeSchema,+ MessageSchema,+ SyncRequestSchema,+ SyncResponseSchema,+ Timestamp,+ toBinary,+} from '@actual-app/crdt';import { logger } from '#platform/server/log';import * as encryption from '#server/encryption';@@ -26,23 +36,27 @@ export async function encode(messages: Message[],): Promise<Uint8Array> {const { encryptKeyId } = prefs.getPrefs();- const requestPb = new SyncProtoBuf.SyncRequest();-- for (let i = 0; i < messages.length; i++) {- const msg = messages[i];- const envelopePb = new SyncProtoBuf.MessageEnvelope();- envelopePb.setTimestamp(msg.timestamp.toString());-- const messagePb = new SyncProtoBuf.Message();- messagePb.setDataset(msg.dataset);- messagePb.setRow(msg.row);- messagePb.setColumn(msg.column);- messagePb.setValue(msg.value as string);- const binaryMsg = messagePb.serializeBinary();-+ const requestPb = create(SyncRequestSchema, {+ groupId,+ fileId,+ keyId: encryptKeyId ?? '',+ since: since.toString(),+ });++ for (const msg of messages) {+ const binaryMsg = toBinary(+ MessageSchema,+ create(MessageSchema, {+ dataset: msg.dataset,+ row: msg.row,+ column: msg.column,+ value: msg.value as string,+ }),+ );++ let content: Uint8Array;+ let isEncrypted: boolean;if (encryptKeyId) {- const encrypted = new SyncProtoBuf.EncryptedData();-let result;try {result = await encryption.encrypt(binaryMsg, encryptKeyId);@@ -52,25 +66,30 @@ export async function encode(});}- encrypted.setData(result.value);- encrypted.setIv(Buffer.from(result.meta.iv, 'base64'));- encrypted.setAuthtag(Buffer.from(result.meta.authTag, 'base64'));-- envelopePb.setContent(encrypted.serializeBinary());- envelopePb.setIsencrypted(true);+ content = toBinary(+ EncryptedDataSchema,+ create(EncryptedDataSchema, {+ data: result.value,+ iv: Buffer.from(result.meta.iv, 'base64'),+ authTag: Buffer.from(result.meta.authTag, 'base64'),+ }),+ );+ isEncrypted = true;} else {- envelopePb.setContent(binaryMsg);+ content = binaryMsg;+ isEncrypted = false;}- requestPb.addMessages(envelopePb);+ requestPb.messages.push(+ create(MessageEnvelopeSchema, {+ timestamp: msg.timestamp.toString(),+ content,+ isEncrypted,+ }),+ );}- requestPb.setGroupid(groupId);- requestPb.setFileid(fileId);- requestPb.setKeyid(encryptKeyId);- requestPb.setSince(since.toString());-- return requestPb.serializeBinary();+ return toBinary(SyncRequestSchema, requestPb);}export async function decode(@@ -78,29 +97,23 @@ export async function decode(): Promise<{ messages: Message[]; merkle: { hash: number } }> {const { encryptKeyId } = prefs.getPrefs();- const responsePb = SyncProtoBuf.SyncResponse.deserializeBinary(data);- const merkle = JSON.parse(responsePb.getMerkle());- const list = responsePb.getMessagesList();+ const responsePb = fromBinary(SyncResponseSchema, data);+ const merkle = JSON.parse(responsePb.merkle);const messages = [];- for (let i = 0; i < list.length; i++) {- const envelopePb = list[i];- const timestamp = Timestamp.parse(envelopePb.getTimestamp());- const encrypted = envelopePb.getIsencrypted();+ for (const envelopePb of responsePb.messages) {let msg;- if (encrypted) {- const binary = SyncProtoBuf.EncryptedData.deserializeBinary(- envelopePb.getContent() as Uint8Array,- );+ if (envelopePb.isEncrypted) {+ const binary = fromBinary(EncryptedDataSchema, envelopePb.content);let decrypted;try {- decrypted = await encryption.decrypt(coerceBuffer(binary.getData()), {+ decrypted = await encryption.decrypt(coerceBuffer(binary.data), {keyId: encryptKeyId,algorithm: 'aes-256-gcm',- iv: coerceBuffer(binary.getIv()),- authTag: coerceBuffer(binary.getAuthtag()),+ iv: coerceBuffer(binary.iv),+ authTag: coerceBuffer(binary.authTag),});} catch (e) {logger.log(e);@@ -109,19 +122,17 @@ export async function decode(});}- msg = SyncProtoBuf.Message.deserializeBinary(decrypted);+ msg = fromBinary(MessageSchema, decrypted);} else {- msg = SyncProtoBuf.Message.deserializeBinary(- envelopePb.getContent() as Uint8Array,- );+ msg = fromBinary(MessageSchema, envelopePb.content);}messages.push({- timestamp,- dataset: msg.getDataset(),- row: msg.getRow(),- column: msg.getColumn(),- value: msg.getValue(),+ timestamp: Timestamp.parse(envelopePb.timestamp),+ dataset: msg.dataset,+ row: msg.row,+ column: msg.column,+ value: msg.value,});}diff --git a/packages/loot-core/src/server/sync/make-test-message.ts b/packages/loot-core/src/server/sync/make-test-message.tsindex e16d9b5b83..7a94f4e0f9 100644--- a/packages/loot-core/src/server/sync/make-test-message.ts+++ b/packages/loot-core/src/server/sync/make-test-message.ts@@ -1,5 +1,5 @@// @ts-strict-ignore-import { SyncProtoBuf } from '@actual-app/crdt';+import { create, MessageSchema, toBinary } from '@actual-app/crdt';import * as encryption from '#server/encryption';@@ -8,12 +8,15 @@ function randomString() {}export async function makeTestMessage(keyId) {- const messagePb = new SyncProtoBuf.Message();- messagePb.setDataset(randomString());- messagePb.setRow(randomString());- messagePb.setColumn(randomString());- messagePb.setValue(randomString());- const binaryMsg = messagePb.serializeBinary();+ const binaryMsg = toBinary(+ MessageSchema,+ create(MessageSchema, {+ dataset: randomString(),+ row: randomString(),+ column: randomString(),+ value: randomString(),+ }),+ );return await encryption.encrypt(binaryMsg, keyId);}diff --git a/packages/loot-core/src/server/tests/mockSyncServer.ts b/packages/loot-core/src/server/tests/mockSyncServer.tsindex 0796f58e1d..6bbad6c652 100644--- a/packages/loot-core/src/server/tests/mockSyncServer.ts+++ b/packages/loot-core/src/server/tests/mockSyncServer.ts@@ -1,5 +1,16 @@// @ts-strict-ignore-import { makeClock, merkle, SyncProtoBuf, Timestamp } from '@actual-app/crdt';+import {+ create,+ fromBinary,+ makeClock,+ merkle,+ MessageEnvelopeSchema,+ MessageSchema,+ SyncRequestSchema,+ SyncResponseSchema,+ Timestamp,+ toBinary,+} from '@actual-app/crdt';import type { Clock } from '@actual-app/crdt';import type { Message } from '#server/sync';@@ -36,41 +47,41 @@ handlers['/'] = () => {};handlers['/sync/sync'] = async (data: Uint8Array): Promise<Uint8Array> => {- const requestPb = SyncProtoBuf.SyncRequest.deserializeBinary(data);- const since = requestPb.getSince();- const messages = requestPb.getMessagesList();+ const requestPb = fromBinary(SyncRequestSchema, data);- const newMessages = currentMessages.filter(msg => msg.timestamp > since);+ const newMessages = currentMessages.filter(+ msg => msg.timestamp > requestPb.since,+ );- messages.forEach(msg => {- if (!currentMessages.find(m => m.timestamp === msg.getTimestamp())) {+ requestPb.messages.forEach(msg => {+ if (!currentMessages.find(m => m.timestamp === msg.timestamp)) {currentMessages.push({- timestamp: msg.getTimestamp(),- is_encrypted: msg.getIsencrypted(),- content: msg.getContent_asU8(),+ timestamp: msg.timestamp,+ is_encrypted: msg.isEncrypted,+ content: msg.content,});currentClock.merkle = merkle.insert(currentClock.merkle,- Timestamp.parse(msg.getTimestamp()),+ Timestamp.parse(msg.timestamp),);}});currentClock.merkle = merkle.prune(currentClock.merkle);- const responsePb = new SyncProtoBuf.SyncResponse();- responsePb.setMerkle(JSON.stringify(currentClock.merkle));-- newMessages.forEach(msg => {- const envelopePb = new SyncProtoBuf.MessageEnvelope();- envelopePb.setTimestamp(msg.timestamp);- envelopePb.setIsencrypted(msg.is_encrypted);- envelopePb.setContent(msg.content);- responsePb.addMessages(envelopePb);+ const responsePb = create(SyncResponseSchema, {+ merkle: JSON.stringify(currentClock.merkle),+ messages: newMessages.map(msg =>+ create(MessageEnvelopeSchema, {+ timestamp: msg.timestamp,+ isEncrypted: msg.is_encrypted,+ content: msg.content,+ }),+ ),});- return responsePb.serializeBinary();+ return toBinary(SyncResponseSchema, responsePb);};handlers['/gocardless/accounts'] = () => {@@ -96,14 +107,14 @@ export const getClock = (): Clock => {export const getMessages = (): Message[] => {return currentMessages.map(msg => {const { timestamp, content } = msg;- const fields = SyncProtoBuf.Message.deserializeBinary(content);+ const fields = fromBinary(MessageSchema, content);return {timestamp: Timestamp.parse(timestamp),- dataset: fields.getDataset(),- row: fields.getRow(),- column: fields.getColumn(),- value: deserializeValue(fields.getValue()),+ dataset: fields.dataset,+ row: fields.row,+ column: fields.column,+ value: deserializeValue(fields.value),};});};diff --git a/packages/sync-server/src/app-sync.test.ts b/packages/sync-server/src/app-sync.test.tsindex 6bccc70ffb..97854c4b84 100644--- a/packages/sync-server/src/app-sync.test.ts+++ b/packages/sync-server/src/app-sync.test.ts@@ -2,7 +2,7 @@import crypto from 'node:crypto';import fs from 'node:fs';-import { SyncProtoBuf } from '@actual-app/crdt';+import { create, SyncRequestSchema, toBinary } from '@actual-app/crdt';import request from 'supertest';import { getAccountDb } from './account-db';@@ -1340,7 +1340,9 @@ describe('/sync', () => {'group-id','key-id',);- syncRequest.setSince(undefined);+ // proto3 default-value semantics: '' is omitted on the wire and+ // decoded back to '', which the handler falsy-checks as missing.+ syncRequest.since = '';const res = await sendSyncRequest(syncRequest);@@ -1485,17 +1487,16 @@ function addMockFile(}function createMinimalSyncRequest(fileId, groupId, keyId) {- const syncRequest = new SyncProtoBuf.SyncRequest();- syncRequest.setFileid(fileId);- syncRequest.setGroupid(groupId);- syncRequest.setKeyid(keyId);- syncRequest.setSince('2024-01-01T00:00:00.000Z');- syncRequest.setMessagesList([]);- return syncRequest;+ return create(SyncRequestSchema, {+ fileId,+ groupId,+ keyId,+ since: '2024-01-01T00:00:00.000Z',+ });}async function sendSyncRequest(syncRequest, token = 'valid-token') {- const serializedRequest = syncRequest.serializeBinary();+ const serializedRequest = toBinary(SyncRequestSchema, syncRequest);// Convert Uint8Array to Bufferconst bufferRequest = Buffer.from(serializedRequest);diff --git a/packages/sync-server/src/app-sync.ts b/packages/sync-server/src/app-sync.tsindex 1695e125ac..d956f343c6 100644--- a/packages/sync-server/src/app-sync.ts+++ b/packages/sync-server/src/app-sync.ts@@ -3,7 +3,13 @@ import { Buffer } from 'node:buffer';import fs from 'node:fs/promises';import { resolve } from 'node:path';-import { SyncProtoBuf } from '@actual-app/crdt';+import {+ create,+ fromBinary,+ SyncRequestSchema,+ SyncResponseSchema,+ toBinary,+} from '@actual-app/crdt';import type { Request, Response } from 'express';import express from 'express';import { v4 as uuidv4 } from 'uuid';@@ -125,7 +131,7 @@ function requireFileAccess(file: File, userId: string) {app.post('/sync', async (req, res): Promise<void> => {let requestPb;try {- requestPb = SyncProtoBuf.SyncRequest.deserializeBinary(req.body);+ requestPb = fromBinary(SyncRequestSchema, req.body);} catch (e) {console.log('Error parsing sync request', e);res.status(500);@@ -133,11 +139,11 @@ app.post('/sync', async (req, res): Promise<void> => {return;}- const fileId = requestPb.getFileid() || null;- const groupId = requestPb.getGroupid() || null;- const keyId = requestPb.getKeyid() || null;- const since = requestPb.getSince() || null;- const messages = requestPb.getMessagesList();+ const fileId = requestPb.fileId || null;+ const groupId = requestPb.groupId || null;+ const keyId = requestPb.keyId || null;+ const since = requestPb.since || null;+ const messages = requestPb.messages;if (!since) {res.status(422).send({@@ -177,14 +183,14 @@ app.post('/sync', async (req, res): Promise<void> => {const { trie, newMessages } = simpleSync.sync(messages, since, groupId);- // encode it back...- const responsePb = new SyncProtoBuf.SyncResponse();- responsePb.setMerkle(JSON.stringify(trie));- newMessages.forEach(msg => responsePb.addMessages(msg));+ const responsePb = create(SyncResponseSchema, {+ merkle: JSON.stringify(trie),+ messages: newMessages,+ });res.set('Content-Type', 'application/actual-sync');res.set('X-ACTUAL-SYNC-METHOD', 'simple');- res.send(Buffer.from(responsePb.serializeBinary()));+ res.send(Buffer.from(toBinary(SyncResponseSchema, responsePb)));});app.post('/user-get-key', (req, res) => {diff --git a/packages/sync-server/src/sync-simple.js b/packages/sync-server/src/sync-simple.jsindex aa19edd7db..c907ed94f6 100644--- a/packages/sync-server/src/sync-simple.js+++ b/packages/sync-server/src/sync-simple.js@@ -1,6 +1,11 @@import { existsSync } from 'node:fs';-import { merkle, SyncProtoBuf, Timestamp } from '@actual-app/crdt';+import {+ create,+ merkle,+ MessageEnvelopeSchema,+ Timestamp,+} from '@actual-app/crdt';import { openDatabase } from './db';import messagesSql from './sql/messages.sql?raw';@@ -29,15 +34,11 @@ function addMessages(db, messages) {const info = db.mutate(`INSERT OR IGNORE INTO messages_binary (timestamp, is_encrypted, content)VALUES (?, ?, ?)`,- [- msg.getTimestamp(),- msg.getIsencrypted() ? 1 : 0,- Buffer.from(msg.getContent()),- ],+ [msg.timestamp, msg.isEncrypted ? 1 : 0, Buffer.from(msg.content)],);if (info.changes > 0) {- trie = merkle.insert(trie, Timestamp.parse(msg.getTimestamp()));+ trie = merkle.insert(trie, Timestamp.parse(msg.timestamp));}}}@@ -82,12 +83,12 @@ export function sync(messages, since, groupId) {return {trie,- newMessages: newMessages.map(msg => {- const envelopePb = new SyncProtoBuf.MessageEnvelope();- envelopePb.setTimestamp(msg.timestamp);- envelopePb.setIsencrypted(msg.is_encrypted);- envelopePb.setContent(msg.content);- return envelopePb;- }),+ newMessages: newMessages.map(msg =>+ create(MessageEnvelopeSchema, {+ timestamp: msg.timestamp,+ isEncrypted: msg.is_encrypted === 1,+ content: msg.content,+ }),+ ),};}diff --git a/upcoming-release-notes/7535.md b/upcoming-release-notes/7535.mdnew file mode 100644index 0000000000..aaa9e966f4--- /dev/null+++ b/upcoming-release-notes/7535.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++crdt: move from 'google-protobuf' to '@bufbuild/protobuf'diff --git a/yarn.lock b/yarn.lockindex e9fb684585..ff8daecd1a 100644--- a/yarn.lock+++ b/yarn.lock@@ -125,7 +125,6 @@ __metadata:date-fns: "npm:^4.1.0"fake-indexeddb: "npm:^6.2.5"fast-check: "npm:^4.6.0"- google-protobuf: "npm:^3.21.4"handlebars: "npm:^4.7.9"hyperformula: "npm:^3.2.0"i18next: "npm:^25.10.10"@@ -161,13 +160,11 @@ __metadata:version: 0.0.0-use.localresolution: "@actual-app/crdt@workspace:packages/crdt"dependencies:- "@types/google-protobuf": "npm:3.15.12"+ "@bufbuild/protobuf": "npm:^2.11.0"+ "@bufbuild/protoc-gen-es": "npm:^2.11.0""@typescript/native-preview": "npm:beta"- google-protobuf: "npm:^3.21.4"murmurhash: "npm:^2.0.1"- protoc-gen-js: "npm:3.21.4-4"rollup-plugin-visualizer: "npm:^7.0.1"- ts-protoc-gen: "npm:0.15.0"uuid: "npm:^14.0.0"vite: "npm:^8.0.5"vitest: "npm:^4.1.2"@@ -1959,6 +1956,41 @@ __metadata:languageName: nodelinkType: hard+"@bufbuild/protobuf@npm:2.12.0, @bufbuild/protobuf@npm:^2.11.0":+ version: 2.12.0+ resolution: "@bufbuild/protobuf@npm:2.12.0"+ checksum: 10/a21ee54b053672827f52e3525477972f7ea75ce82150d6599ee3544f00b442a49093608b7557581bc8846d066193220bece20cf4712bb44d8aba5067a8eeb035+ languageName: node+ linkType: hard++"@bufbuild/protoc-gen-es@npm:^2.11.0":+ version: 2.12.0+ resolution: "@bufbuild/protoc-gen-es@npm:2.12.0"+ dependencies:+ "@bufbuild/protobuf": "npm:2.12.0"+ "@bufbuild/protoplugin": "npm:2.12.0"+ peerDependencies:+ "@bufbuild/protobuf": 2.12.0+ peerDependenciesMeta:+ "@bufbuild/protobuf":+ optional: true+ bin:+ protoc-gen-es: bin/protoc-gen-es+ checksum: 10/870f106aaa4a5f8b1e4e7894cbd417872b9af49a8b0cca2a519304600dda94393c42dec0339d2191f86a5631cea2d5ada2dffbfd8b9116e80cfa707b82e57361+ languageName: node+ linkType: hard++"@bufbuild/protoplugin@npm:2.12.0":+ version: 2.12.0+ resolution: "@bufbuild/protoplugin@npm:2.12.0"+ dependencies:+ "@bufbuild/protobuf": "npm:2.12.0"+ "@typescript/vfs": "npm:^1.6.2"+ typescript: "npm:5.4.5"+ checksum: 10/ad59fe9f4d805bab3d3c260315020259d9fc8a27bbbfbd74d16502e2e60cf15eaa8527435eb45da1ecc0d0b223d5f5a0f9ebd72dd3f0fec605f39d9a92dda752+ languageName: node+ linkType: hard+"@chevrotain/types@npm:~11.1.1":version: 11.1.2resolution: "@chevrotain/types@npm:11.1.2"@@ -9702,13 +9734,6 @@ __metadata:languageName: nodelinkType: hard-"@types/google-protobuf@npm:3.15.12":- version: 3.15.12- resolution: "@types/google-protobuf@npm:3.15.12"- checksum: 10/a5c5f09a3fc4bc6a9339df29f4a32daf77c37f2bce6e8aa7b949fae19829a87c351786b7401eb45ea643dfa98d5155ffd9dd637c3ec61f69a30979bd67f6954e- languageName: node- linkType: hard-"@types/gtag.js@npm:^0.0.20":version: 0.0.20resolution: "@types/gtag.js@npm:0.0.20"@@ -10428,6 +10453,17 @@ __metadata:languageName: nodelinkType: hard+"@typescript/vfs@npm:^1.6.2":+ version: 1.6.4+ resolution: "@typescript/vfs@npm:1.6.4"+ dependencies:+ debug: "npm:^4.4.3"+ peerDependencies:+ typescript: "*"+ checksum: 10/3a301cdc950f7b3bc3b21164d355d9d23ec00b6888ca77c83193afd950b9f5d30ec2de61c7473c99518fc47b51e1c69592eab253072a35781b48e5096b11692a+ languageName: node+ linkType: hard+"@uiw/codemirror-extensions-basic-setup@npm:4.25.9":version: 4.25.9resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.25.9"@@ -17099,13 +17135,6 @@ __metadata:languageName: nodelinkType: hard-"google-protobuf@npm:^3.15.5, google-protobuf@npm:^3.21.4":- version: 3.21.4- resolution: "google-protobuf@npm:3.21.4"- checksum: 10/0d87fe8ef221d105cbaa808f4024bd577638524d8e461469e3733f2e4933391ad4da86b7fcbd11e8781bee04eacf2e8ba19aaacd5f9deb336a220485841d980f- languageName: node- linkType: hard-"gopd@npm:^1.0.1, gopd@npm:^1.2.0":version: 1.2.0resolution: "gopd@npm:1.2.0"@@ -23752,17 +23781,6 @@ __metadata:languageName: nodelinkType: hard-"protoc-gen-js@npm:3.21.4-4":- version: 3.21.4-4- resolution: "protoc-gen-js@npm:3.21.4-4"- dependencies:- adm-zip: "npm:0.5.10"- bin:- protoc-gen-js: cli.js- checksum: 10/43d5469195fb28ecbb6e2f387601c22d7a032aaffd5eadee10e02ca4a6b6361bfb54e83fe220b6eef36a27011421f3a0ef86e163116273d71ab9158d31980c3b- languageName: node- linkType: hard-"proxy-addr@npm:^2.0.7, proxy-addr@npm:~2.0.7":version: 2.0.7resolution: "proxy-addr@npm:2.0.7"@@ -27520,17 +27538,6 @@ __metadata:languageName: nodelinkType: hard-"ts-protoc-gen@npm:0.15.0":- version: 0.15.0- resolution: "ts-protoc-gen@npm:0.15.0"- dependencies:- google-protobuf: "npm:^3.15.5"- bin:- protoc-gen-ts: bin/protoc-gen-ts- checksum: 10/de1d526b47886e1994995836b1e1e5765193f476ee0aded067a2e4154d60df0bd8fb33a1f56654a1ea779576c158c184b7beca36e59f620c9382217040f91d64- languageName: node- linkType: hard-"tsconfig-paths@npm:^4.2.0":version: 4.2.0resolution: "tsconfig-paths@npm:4.2.0"@@ -27722,6 +27729,16 @@ __metadata:languageName: nodelinkType: hard+"typescript@npm:5.4.5":+ version: 5.4.5+ resolution: "typescript@npm:5.4.5"+ bin:+ tsc: bin/tsc+ tsserver: bin/tsserver+ checksum: 10/d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5+ languageName: node+ linkType: hard+"typescript@npm:^5.0.4":version: 5.9.3resolution: "typescript@npm:5.9.3"@@ -27742,6 +27759,16 @@ __metadata:languageName: nodelinkType: hard+"typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>":+ version: 5.4.5+ resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"+ bin:+ tsc: bin/tsc+ tsserver: bin/tsserver+ checksum: 10/760f7d92fb383dbf7dee2443bf902f4365db2117f96f875cf809167f6103d55064de973db9f78fe8f31ec08fff52b2c969aee0d310939c0a3798ec75d0bca2e1+ languageName: node+ linkType: hard+"typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":version: 5.9.3resolution: "typescript@patch:typescript@npm%3A5.9.3#optional!builtin<compat/typescript>::version=5.9.3&hash=5786d5"