diff --git a/package.json b/package.json index 6442c31f..10ef58e8 100644 --- a/package.json +++ b/package.json @@ -72,5 +72,10 @@ "tsx": "4.19.2", "typescript": "5.6.3", "typescript-eslint": "8.15.0" + }, + "pnpm": { + "patchedDependencies": { + "ts-proto@2.3.0": "patches/ts-proto@2.3.0.patch" + } } } diff --git a/patches/ts-proto@2.3.0.patch b/patches/ts-proto@2.3.0.patch new file mode 100644 index 00000000..398c5b31 --- /dev/null +++ b/patches/ts-proto@2.3.0.patch @@ -0,0 +1,22 @@ +diff --git a/build/src/main.js b/build/src/main.js +index 3e03249d11bae4b1ccc9000e0f4e41f1e4393f26..a6e519f26db63304ab4f29781261d2736d986382 100644 +--- a/build/src/main.js ++++ b/build/src/main.js +@@ -851,7 +851,7 @@ function generateOneofProperty(ctx, messageDesc, oneofIndex, sourceInfo) { + let fieldComments = []; + (0, utils_1.maybeAddComment)(options, fieldInfo, fieldComments); + const combinedComments = fieldComments.join("\n"); +- return (0, ts_poet_1.code) `| // \n ${combinedComments} { ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`; ++ return (0, ts_poet_1.code) `|${combinedComments ? " // " : ""}\n ${combinedComments} { ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`; + })); + const name = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, options); + return (0, ts_poet_1.joinCode)([...outerComments, (0, ts_poet_1.code) `${mbReadonly}${name}?:`, unionType, (0, ts_poet_1.code) `| ${(0, utils_1.nullOrUndefined)(options)},`], { +@@ -1155,7 +1155,7 @@ function generateDecode(ctx, fullName, messageDesc) { + } + chunks.push((0, ts_poet_1.code) ` + const buf = reader.skip(tag & 7); +- ++ + ${unknownFieldsInitializerSnippet} + const list = message._unknownFields${maybeNonNullAssertion}[tag]; + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46967bc7..47696045 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +patchedDependencies: + ts-proto@2.3.0: + hash: 2qpjfd4y3g7erppns3t4ngrbg4 + path: patches/ts-proto@2.3.0.patch + importers: .: @@ -61,7 +66,7 @@ importers: version: 0.18.1(prettier@3.3.3) ts-proto: specifier: 2.3.0 - version: 2.3.0 + version: 2.3.0(patch_hash=2qpjfd4y3g7erppns3t4ngrbg4) tsx: specifier: 4.19.2 version: 4.19.2 @@ -5161,7 +5166,7 @@ snapshots: dependencies: '@bufbuild/protobuf': 2.2.2 - ts-proto@2.3.0: + ts-proto@2.3.0(patch_hash=2qpjfd4y3g7erppns3t4ngrbg4): dependencies: '@bufbuild/protobuf': 2.2.2 case-anything: 2.1.13