ts-proto 2.17.0 → 2.18.1

package/README.markdown

@@ -372,6 +372,8 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=exportCommonSymbols=false`, utility types like `DeepPartial` and `protobufPackage` won't be `export`d.
 
+  Each generated file also exports `protobufFileName`, the path of the `.proto` file it was generated from (for example `export const protobufFileName = "company/foo.proto";`), next to `protobufPackage`; neither is exported with `exportCommonSymbols=false`.
+
   This should make it possible to use create barrel imports of the generated output, i.e. `import * from ./foo` and `import * from ./bar`.
 
   Note that if you have the same message name used in multiple `*.proto` files, you will still get import conflicts.

package/build/src/main.js

@@ -49,6 +49,8 @@ function generateFile(ctx, fileDesc) {
     // Indicate this file's source protobuf package for reflective use with google.protobuf.Any
     if (options.exportCommonSymbols) {
         chunks.push((0, ts_poet_1.code) `export const protobufPackage = '${fileDesc.package}';`);
+        // The source .proto path, e.g. for NestJS's `protoPath` or @grpc/proto-loader
+        chunks.push((0, ts_poet_1.code) `export const protobufFileName = '${fileDesc.name}';`);
     }
     // Syntax, unlike most fields, is not repeated and thus does not use an index
     const sourceInfo = sourceInfo_1.default.fromDescriptor(fileDesc);
@@ -521,10 +523,10 @@ function makeDeepPartial(options, longs) {
     const maybeExcludeType = (0, options_1.addTypeToMessages)(options) ? `| '$type'` : "";
     const Exact = (0, ts_poet_1.conditionalOutput)("Exact", (0, ts_poet_1.code) `
       type KeysOfUnion<T> = T extends T ? keyof T : never;
-      ${maybeExport} type Exact<P, I extends P> = ${maybeUnknownP}P extends ${Builtin}
+      ${maybeExport} type Exact<P, I> = ${maybeUnknownP}P extends ${Builtin}
         ? P
         : P &
-        { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>]: never };
+        { [K in keyof P as Extract<K, keyof I>]: Exact<P[K], I[K & keyof I]> } & { [K in Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>]: never };
     `);
     // Based on the type from ts-essentials
     const keys = (0, options_1.addTypeToMessages)(options) ? (0, ts_poet_1.code) `Exclude<keyof T, '$type'>` : (0, ts_poet_1.code) `keyof T`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "2.17.0",
+  "version": "2.18.1",
   "description": "",
   "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",