ts-proto 1.91.0 → 1.92.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.92.0](https://github.com/stephenh/ts-proto/compare/v1.91.0...v1.92.0) (2021-11-28)
+
+
+### Features
+
+* Use exact types for fromPartial ([#412](https://github.com/stephenh/ts-proto/issues/412)) ([808f8a7](https://github.com/stephenh/ts-proto/commit/808f8a7a77d56f65dd4a4643dd66158f106ab755)), closes [#156](https://github.com/stephenh/ts-proto/issues/156)
+
 # [1.91.0](https://github.com/stephenh/ts-proto/compare/v1.90.1...v1.91.0) (2021-11-27)
 
 

package/build/generate-type-registry.js

@@ -13,7 +13,7 @@ function generateTypeRegistry(ctx) {
     chunks.push(ts_poet_1.code `
     export const messageTypeRegistry = new Map<string, MessageType>();
   `);
-    chunks.push(ts_poet_1.code `${ctx.utils.DeepPartial.ifUsed}`);
+    chunks.push(ts_poet_1.code ` ${ctx.utils.Builtin.ifUsed} ${ctx.utils.DeepPartial.ifUsed}`);
     return ts_poet_1.joinCode(chunks, { on: '\n\n' });
 }
 exports.generateTypeRegistry = generateTypeRegistry;

package/build/main.js

@@ -289,11 +289,20 @@ function makeDeepPartial(options, longs) {
     const maybeExport = options.exportCommonSymbols ? 'export' : '';
     // Allow passing longs as numbers or strings, nad we'll convert them
     const maybeLong = options.forceLong === options_1.LongOption.LONG ? ts_poet_1.code ` : T extends ${longs.Long} ? string | number | Long ` : '';
-    const keys = options.outputTypeRegistry ? ts_poet_1.code `Exclude<keyof T, '$type'>` : ts_poet_1.code `keyof T`;
+    const Builtin = ts_poet_1.conditionalOutput('Builtin', ts_poet_1.code `type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;`);
+    // Based on https://github.com/sindresorhus/type-fest/pull/259
+    const maybeExcludeType = options.outputTypeRegistry ? `| '$type'` : '';
+    const Exact = ts_poet_1.conditionalOutput('Exact', ts_poet_1.code `
+      type KeysOfUnion<T> = T extends T ? keyof T : never;
+      ${maybeExport} type Exact<P, I extends P> = P extends ${Builtin}
+        ? P
+        : P &
+        { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>, never>;
+    `);
     // Based on the type from ts-essentials
+    const keys = options.outputTypeRegistry ? ts_poet_1.code `Exclude<keyof T, '$type'>` : ts_poet_1.code `keyof T`;
     const DeepPartial = ts_poet_1.conditionalOutput('DeepPartial', ts_poet_1.code `
-      type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-      ${maybeExport} type DeepPartial<T> =  T extends Builtin
+      ${maybeExport} type DeepPartial<T> =  T extends ${Builtin}
         ? T
         ${maybeLong}
         : T extends Array<infer U>
@@ -304,7 +313,7 @@ function makeDeepPartial(options, longs) {
         ? { [K in ${keys}]?: DeepPartial<T[K]> }
         : Partial<T>;
     `);
-    return { DeepPartial };
+    return { Builtin, DeepPartial, Exact };
 }
 function makeTimestampMethods(options, longs) {
     const Timestamp = ts_poet_1.imp('Timestamp@./google/protobuf/timestamp');
@@ -1045,8 +1054,9 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     const chunks = [];
     const Timestamp = ts_poet_1.imp('Timestamp@./google/protobuf/timestamp');
     // create the basic function declaration
+    const paramName = messageDesc.field.length > 0 ? 'object' : '_';
     chunks.push(ts_poet_1.code `
-    fromPartial(${messageDesc.field.length > 0 ? 'object' : '_'}: ${utils.DeepPartial}<${fullName}>): ${fullName} {
+    fromPartial<I extends ${utils.Exact}<${utils.DeepPartial}<${fullName}>, I>>(${paramName}: I): ${fullName} {
       const message = { ...base${fullName} } as ${fullName};
   `);
     // add a check for each incoming field
@@ -1122,7 +1132,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             }
             else {
                 chunks.push(ts_poet_1.code `
-          message.${fieldName} = (object.${fieldName} ?? []).map((e) => ${readSnippet('e')});
+          message.${fieldName} = object.${fieldName}?.map((e) => ${readSnippet('e')}) || [];
         `);
             }
         }

package/package.json

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