ts-proto 1.96.0 → 1.96.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.96.1](https://github.com/stephenh/ts-proto/compare/v1.96.0...v1.96.1) (2021-12-28)
+
+
+### Performance Improvements
+
+* optimize object creation in `decode`, `fromJSON` and `fromPartial` ([#457](https://github.com/stephenh/ts-proto/issues/457)) ([70832d3](https://github.com/stephenh/ts-proto/commit/70832d33bae82ecb3c5f87845d14e992a13437e4))
+
 # [1.96.0](https://github.com/stephenh/ts-proto/compare/v1.95.1...v1.96.0) (2021-12-24)
 
 

package/build/main.js

@@ -70,7 +70,7 @@ function generateFile(ctx, fileDesc) {
         // then add the encoder/decoder/base instance
         visit_1.visit(fileDesc, sourceInfo, (fullName, message, sInfo, fullProtoTypeName) => {
             const fullTypeName = utils_1.maybePrefixPackage(fileDesc, fullProtoTypeName);
-            chunks.push(generateBaseInstance(ctx, fullName, message, fullTypeName));
+            chunks.push(generateBaseInstanceFactory(ctx, fullName, message, fullTypeName));
             const staticMembers = [];
             if (options.outputTypeRegistry) {
                 staticMembers.push(ts_poet_1.code `$type: '${fullTypeName}' as const`);
@@ -460,20 +460,39 @@ function generateOneofProperty(ctx, messageDesc, oneofIndex, sourceInfo) {
     return prop;
     */
 }
-// Create a 'base' instance with default values for decode to use as a prototype
-function generateBaseInstance(ctx, fullName, messageDesc, fullTypeName) {
-    const fields = messageDesc.field
-        .filter((field) => !types_1.isWithinOneOf(field))
-        .map((field) => [field, types_1.defaultValue(ctx, field)])
-        .filter(([field, val]) => val !== 'undefined' && !types_1.isBytes(field))
-        .map(([field, val]) => {
+// Create a function that constructs 'base' instance with default values for decode to use as a prototype
+function generateBaseInstanceFactory(ctx, fullName, messageDesc, fullTypeName) {
+    const fields = [];
+    // When oneof=unions, we generate a single property with an ADT per `oneof` clause.
+    const processedOneofs = new Set();
+    for (const field of messageDesc.field) {
+        if (types_1.isWithinOneOfThatShouldBeUnion(ctx.options, field)) {
+            const { oneofIndex } = field;
+            if (!processedOneofs.has(oneofIndex)) {
+                processedOneofs.add(oneofIndex);
+                const name = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[oneofIndex].name, ctx.options);
+                fields.push(ts_poet_1.code `${name}: undefined`);
+            }
+            continue;
+        }
         const name = case_1.maybeSnakeToCamel(field.name, ctx.options);
-        return ts_poet_1.code `${name}: ${val}`;
-    });
+        const val = types_1.isWithinOneOf(field)
+            ? 'undefined'
+            : types_1.isMapType(ctx, messageDesc, field)
+                ? '{}'
+                : types_1.isRepeated(field)
+                    ? '[]'
+                    : types_1.defaultValue(ctx, field);
+        fields.push(ts_poet_1.code `${name}: ${val}`);
+    }
     if (ctx.options.outputTypeRegistry) {
         fields.unshift(ts_poet_1.code `$type: '${fullTypeName}'`);
     }
-    return ts_poet_1.code `const base${fullName}: object = { ${ts_poet_1.joinCode(fields, { on: ',' })} };`;
+    return ts_poet_1.code `
+    function createBase${fullName}(): ${fullName} {
+      return { ${ts_poet_1.joinCode(fields, { on: ',' })} };
+    }
+  `;
 }
 /** Creates a function to decode a message by loop overing the tags. */
 function generateDecode(ctx, fullName, messageDesc) {
@@ -487,22 +506,8 @@ function generateDecode(ctx, fullName, messageDesc) {
     ): ${fullName} {
       const reader = input instanceof ${Reader} ? input : new ${Reader}(input);
       let end = length === undefined ? reader.len : reader.pos + length;
-      const message = { ...base${fullName} } as ${fullName};
+      const message = createBase${fullName}();
   `);
-    // initialize all lists
-    messageDesc.field.filter(types_1.isRepeated).forEach((field) => {
-        const name = case_1.maybeSnakeToCamel(field.name, options);
-        const value = types_1.isMapType(ctx, messageDesc, field) ? '{}' : '[]';
-        chunks.push(ts_poet_1.code `message.${name} = ${value};`);
-    });
-    // initialize all buffers
-    messageDesc.field
-        .filter((field) => !types_1.isRepeated(field) && !types_1.isWithinOneOf(field) && types_1.isBytes(field))
-        .forEach((field) => {
-        const value = options.env === options_1.EnvOption.NODE ? 'Buffer.alloc(0)' : 'new Uint8Array()';
-        const name = case_1.maybeSnakeToCamel(field.name, options);
-        chunks.push(ts_poet_1.code `message.${name} = ${value};`);
-    });
     // start the tag loop
     chunks.push(ts_poet_1.code `
     while (reader.pos < end) {
@@ -567,28 +572,29 @@ function generateDecode(ctx, fullName, messageDesc) {
         }
         // and then use the snippet to handle repeated fields if necessary
         if (types_1.isRepeated(field)) {
+            const maybeNonNullAssertion = ctx.options.useOptionals === 'all' ? '!' : '';
             if (types_1.isMapType(ctx, messageDesc, field)) {
                 // We need a unique const within the `cast` statement
                 const varName = `entry${field.number}`;
                 chunks.push(ts_poet_1.code `
           const ${varName} = ${readSnippet};
           if (${varName}.value !== undefined) {
-            message.${fieldName}[${varName}.key] = ${varName}.value;
+            message.${fieldName}${maybeNonNullAssertion}[${varName}.key] = ${varName}.value;
           }
         `);
             }
             else if (types_1.packedType(field.type) === undefined) {
-                chunks.push(ts_poet_1.code `message.${fieldName}.push(${readSnippet});`);
+                chunks.push(ts_poet_1.code `message.${fieldName}${maybeNonNullAssertion}.push(${readSnippet});`);
             }
             else {
                 chunks.push(ts_poet_1.code `
           if ((tag & 7) === 2) {
             const end2 = reader.uint32() + reader.pos;
             while (reader.pos < end2) {
-              message.${fieldName}.push(${readSnippet});
+              message.${fieldName}${maybeNonNullAssertion}.push(${readSnippet});
             }
           } else {
-            message.${fieldName}.push(${readSnippet});
+            message.${fieldName}${maybeNonNullAssertion}.push(${readSnippet});
           }
         `);
             }
@@ -799,7 +805,7 @@ function generateFromJson(ctx, fullName, messageDesc) {
     // create the basic function declaration
     chunks.push(ts_poet_1.code `
     fromJSON(${messageDesc.field.length > 0 ? 'object' : '_'}: any): ${fullName} {
-      const message = { ...base${fullName} } as ${fullName};
+      const message = createBase${fullName}();
   `);
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {
@@ -1100,7 +1106,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     const paramName = messageDesc.field.length > 0 ? 'object' : '_';
     chunks.push(ts_poet_1.code `
     fromPartial<I extends ${utils.Exact}<${utils.DeepPartial}<${fullName}>, I>>(${paramName}: I): ${fullName} {
-      const message = { ...base${fullName} } as ${fullName};
+      const message = createBase${fullName}();
   `);
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {

package/package.json

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