ts-proto 1.104.0 → 1.104.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.104.1](https://github.com/stephenh/ts-proto/compare/v1.104.0...v1.104.1) (2022-02-12)
+
+
+### Bug Fixes
+
+* make struct types play well with type registry ([#503](https://github.com/stephenh/ts-proto/issues/503)) ([d62f854](https://github.com/stephenh/ts-proto/commit/d62f85478011c7eb3dbca196f79b452895406ece))
+
 # [1.104.0](https://github.com/stephenh/ts-proto/compare/v1.103.0...v1.104.0) (2022-01-21)
 
 

package/README.markdown

@@ -376,6 +376,10 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=unknownFields=true`, all unknown fields will be parsed and output as arrays of buffers.
 
+- With `--ts_proto_opt=onlyTypes=true`, only types will be emitted, and imports for `long` and `protobufjs/minimal` will be excluded.
+
+  Note: _This is a combination_ of `outputJsonMethods=false,outputEncodeMethods=false,outputClientImpl=false,nestJs=false`
+
 - With `--ts_proto_opt=usePrototypeForDefaults=true`, the generated code will wrap new objects with `Object.create`.
 
   This allows code to do hazzer checks to detect when default values have been applied, which due to proto3's behavior of not putting default values on the wire, is typically only useful for interacting with proto2 messages.
@@ -385,10 +389,9 @@ Generated code will be placed in the Gradle build directory.
   Note that, as indicated, this means Object.keys will not include set-by-default fields, so if you have code that iterates over messages keys in a generic fashion, it will have to also iterate over keys inherited from the prototype.
 
 ### Only Types
-
 If you're looking for `ts-proto` to generate only types for your Protobuf types then passing all three of `outputEncodeMethods`, `outputJsonMethods`, and `outputClientImpl` as `false` is probably what you want, i.e.:
 
-`--ts_proto_opt=outputEncodeMethods=false,outputJsonMethods=false,outputClientImpl=false`.
+`--ts_proto_opt=onlyTypes=true`.
 
 ### NestJS Support
 

package/build/main.js

@@ -1349,7 +1349,7 @@ function generateWrap(ctx, fullProtoTypeName) {
     const chunks = [];
     if (types_1.isStructTypeName(fullProtoTypeName)) {
         chunks.push(ts_poet_1.code `wrap(object: {[key: string]: any} | undefined): Struct {
-      const struct = Struct.fromPartial({});
+      const struct = createBaseStruct();
       if (object !== undefined) {
         Object.keys(object).forEach(key => {
           struct.fields[key] = object[key];
@@ -1361,50 +1361,58 @@ function generateWrap(ctx, fullProtoTypeName) {
     if (types_1.isAnyValueTypeName(fullProtoTypeName)) {
         if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
             chunks.push(ts_poet_1.code `wrap(value: any): Value {
-      if (value === null) {
-        return {kind: {$case: 'nullValue', nullValue: NullValue.NULL_VALUE}};
-      } else if (typeof value === 'boolean') {
-        return {kind: {$case: 'boolValue', boolValue: value}};
-      } else if (typeof value === 'number') {
-        return {kind: {$case: 'numberValue', numberValue: value}};
-      } else if (typeof value === 'string') {
-        return {kind: {$case: 'stringValue', stringValue: value}};
-      } else if (Array.isArray(value)) {
-        return {kind: {$case: 'listValue', listValue: value}};
-      } else if (typeof value === 'object') {
-        return {kind: {$case: 'structValue', structValue: value}};
-      } else if (typeof value === 'undefined') {
-        return {} as Value;
-      } else {
-        throw new Error('Unsupported any value type: ' + typeof value);
-      }
+        const result = createBaseValue();
+        
+        if (value === null) {
+          result.kind = {$case: 'nullValue', nullValue: NullValue.NULL_VALUE};
+        } else if (typeof value === 'boolean') {
+          result.kind = {$case: 'boolValue', boolValue: value};
+        } else if (typeof value === 'number') {
+          result.kind = {$case: 'numberValue', numberValue: value};
+        } else if (typeof value === 'string') {
+          result.kind = {$case: 'stringValue', stringValue: value};
+        } else if (Array.isArray(value)) {
+          result.kind = {$case: 'listValue', listValue: value};
+        } else if (typeof value === 'object') {
+          result.kind = {$case: 'structValue', structValue: value};
+        } else if (typeof value !== 'undefined') {
+          throw new Error('Unsupported any value type: ' + typeof value);
+        }
+
+        return result;
     }`);
         }
         else {
             chunks.push(ts_poet_1.code `wrap(value: any): Value {
-      if (value === null) {
-        return {nullValue: NullValue.NULL_VALUE} as Value;
-      } else if (typeof value === 'boolean') {
-        return {boolValue: value} as Value;
-      } else if (typeof value === 'number') {
-        return {numberValue: value} as Value;
-      } else if (typeof value === 'string') {
-        return {stringValue: value} as Value;
-      } else if (Array.isArray(value)) {
-        return {listValue: value} as Value;
-      } else if (typeof value === 'object') {
-        return {structValue: value} as Value;
-      } else if (typeof value === 'undefined') {
-        return {} as Value;
-      } else {
-        throw new Error('Unsupported any value type: ' + typeof value);
-      }
+        const result = createBaseValue();
+
+        if (value === null) {
+          result.nullValue = NullValue.NULL_VALUE;
+        } else if (typeof value === 'boolean') {
+          result.boolValue = value;
+        } else if (typeof value === 'number') {
+          result.numberValue = value;
+        } else if (typeof value === 'string') {
+          result.stringValue = value;
+        } else if (Array.isArray(value)) {
+          result.listValue = value;
+        } else if (typeof value === 'object') {
+          result.structValue = value;
+        } else if (typeof value !== 'undefined') {
+          throw new Error('Unsupported any value type: ' + typeof value);
+        }
+
+        return result;
     }`);
         }
     }
     if (types_1.isListValueTypeName(fullProtoTypeName)) {
         chunks.push(ts_poet_1.code `wrap(value: Array<any> | undefined): ListValue {
-      return {values: value ?? []};
+      const result = createBaseListValue();
+
+      result.values = value ?? [];
+
+      return result;
     }`);
     }
     return chunks;

package/package.json

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