ts-proto 1.97.0 → 1.97.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.97.1](https://github.com/stephenh/ts-proto/compare/v1.97.0...v1.97.1) (2022-01-05)
+
+
+### Bug Fixes
+
+* oneof=union breaks wrapper types [#458](https://github.com/stephenh/ts-proto/issues/458) ([#462](https://github.com/stephenh/ts-proto/issues/462)) ([dd16992](https://github.com/stephenh/ts-proto/commit/dd16992a409f24e88e3a142830cd0745f50dbd10))
+
 # [1.97.0](https://github.com/stephenh/ts-proto/compare/v1.96.1...v1.97.0) (2021-12-30)
 
 

package/build/main.js

@@ -86,8 +86,8 @@ function generateFile(ctx, fileDesc) {
             if (options.outputPartialMethods) {
                 staticMembers.push(generateFromPartial(ctx, fullName, message));
             }
-            staticMembers.push(...generateWrap(fullTypeName));
-            staticMembers.push(...generateUnwrap(fullTypeName));
+            staticMembers.push(...generateWrap(ctx, fullTypeName));
+            staticMembers.push(...generateUnwrap(ctx, fullTypeName));
             chunks.push(ts_poet_1.code `
           export const ${ts_poet_1.def(fullName)} = {
             ${ts_poet_1.joinCode(staticMembers, { on: ',\n\n' })}
@@ -195,6 +195,7 @@ function makeUtils(options) {
         ...makeDeepPartial(options, longs),
         ...makeTimestampMethods(options, longs),
         ...longs,
+        ...makeComparisonUtils(),
     };
 }
 exports.makeUtils = makeUtils;
@@ -396,6 +397,17 @@ function makeTimestampMethods(options, longs) {
       `);
     return { toTimestamp, fromTimestamp, fromJsonTimestamp };
 }
+function makeComparisonUtils() {
+    const isObject = ts_poet_1.conditionalOutput('isObject', ts_poet_1.code `
+    function isObject(value: any): boolean {
+      return typeof value === 'object' && value !== null;
+    }`);
+    const isSet = ts_poet_1.conditionalOutput('isSet', ts_poet_1.code `
+    function isSet(value: any): boolean {
+      return value !== null && value !== undefined;
+    }`);
+    return { isObject, isSet };
+}
 // Create the interface with properties
 function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fullTypeName) {
     var _a;
@@ -811,7 +823,7 @@ function generateFromJson(ctx, fullName, messageDesc) {
     messageDesc.field.forEach((field) => {
         const fieldName = case_1.maybeSnakeToCamel(field.name, options);
         const jsonName = utils_1.determineFieldJsonName(field, options);
-        // get a generic 'reader.doSomething' bit that is specific to the basic type
+        // get code that extracts value from incoming object
         const readSnippet = (from) => {
             if (types_1.isEnum(field)) {
                 const fromJson = types_1.getEnumMethod(ctx, field.typeName, 'FromJSON');
@@ -846,6 +858,9 @@ function generateFromJson(ctx, fullName, messageDesc) {
             else if (types_1.isAnyValueType(field) || types_1.isStructType(field)) {
                 return ts_poet_1.code `${from}`;
             }
+            else if (types_1.isListValueType(field)) {
+                return ts_poet_1.code `[...${from}]`;
+            }
             else if (types_1.isValueType(ctx, field)) {
                 const valueType = types_1.valueTypeName(ctx, field.typeName);
                 if (types_1.isLongValueType(field) && options.forceLong === options_1.LongOption.LONG) {
@@ -854,9 +869,6 @@ function generateFromJson(ctx, fullName, messageDesc) {
                 else if (types_1.isBytesValueType(field)) {
                     return ts_poet_1.code `new ${case_1.capitalize(valueType.toCodeString())}(${from})`;
                 }
-                else if (types_1.isListValueType(field)) {
-                    return ts_poet_1.code `[...${from}]`;
-                }
                 else {
                     return ts_poet_1.code `${case_1.capitalize(valueType.toCodeString())}(${from})`;
                 }
@@ -923,22 +935,23 @@ function generateFromJson(ctx, fullName, messageDesc) {
             acc[${i}] = ${readSnippet('value')};
             return acc;
           }, {});
-        `);
-            }
-            else if (types_1.isAnyValueType(field)) {
-                chunks.push(ts_poet_1.code `
-          message.${fieldName} = Array.isArray(object?.${jsonName}) ? [...object.${jsonName}] : [];
         `);
             }
             else {
-                // Explicit `any` type required to make TS with noImplicitAny happy. `object` is also `any` here.
-                chunks.push(ts_poet_1.code `
-          message.${fieldName} = (object.${jsonName} ?? []).map((e: any) => ${readSnippet('e')});
-        `);
+                const readValueSnippet = readSnippet('e');
+                if (readValueSnippet.toString() === ts_poet_1.code `e`.toString()) {
+                    chunks.push(ts_poet_1.code `message.${fieldName} = Array.isArray(object?.${jsonName}) ? [...object.${jsonName}] : [];`);
+                }
+                else {
+                    // Explicit `any` type required to make TS with noImplicitAny happy. `object` is also `any` here.
+                    chunks.push(ts_poet_1.code `
+            message.${fieldName} = Array.isArray(object?.${jsonName}) ? object.${jsonName}.map((e: any) => ${readValueSnippet}): [];
+          `);
+                }
             }
         }
         else if (types_1.isWithinOneOfThatShouldBeUnion(options, field)) {
-            chunks.push(ts_poet_1.code `if (object.${jsonName} !== undefined && object.${jsonName} !== null) {`);
+            chunks.push(ts_poet_1.code `if (${ctx.utils.isSet}(object.${jsonName})) {`);
             const oneofName = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[field.oneofIndex].name, options);
             chunks.push(ts_poet_1.code `
         message.${oneofName} = { $case: '${fieldName}', ${fieldName}: ${readSnippet(`object.${jsonName}`)} }
@@ -946,22 +959,27 @@ function generateFromJson(ctx, fullName, messageDesc) {
             chunks.push(ts_poet_1.code `}`);
         }
         else if (types_1.isAnyValueType(field)) {
-            chunks.push(ts_poet_1.code `message.${fieldName} = object.${fieldName};`);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${ctx.utils.isSet}(object?.${jsonName})
+        ? ${readSnippet(`object.${jsonName}`)}
+        : undefined;
+      `);
         }
         else if (types_1.isStructType(field)) {
-            chunks.push(ts_poet_1.code `message.${fieldName} = typeof(object.${fieldName}) === 'object' ? object.${fieldName} : undefined;`);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${ctx.utils.isObject}(object.${jsonName})
+          ? ${readSnippet(`object.${jsonName}`)}
+          : undefined;`);
         }
         else if (types_1.isListValueType(field)) {
             chunks.push(ts_poet_1.code `
-        message.${fieldName} = Array.isArray(object?.${fieldName})
-          ? ${readSnippet(`object.${fieldName}`)}
+        message.${fieldName} = Array.isArray(object.${jsonName})
+          ? ${readSnippet(`object.${jsonName}`)}
           : ${'undefined'};
       `);
         }
         else {
             const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
             chunks.push(ts_poet_1.code `
-        message.${fieldName} = (object.${jsonName} !== undefined && object.${jsonName} !== null)
+        message.${fieldName} = ${ctx.utils.isSet}(object.${jsonName})
           ? ${readSnippet(`object.${jsonName}`)}
           : ${fallback};
       `);
@@ -1223,7 +1241,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     chunks.push(ts_poet_1.code `}`);
     return ts_poet_1.joinCode(chunks, { on: '\n' });
 }
-function generateWrap(fullProtoTypeName) {
+function generateWrap(ctx, fullProtoTypeName) {
     const chunks = [];
     if (types_1.isStructTypeName(fullProtoTypeName)) {
         chunks.push(ts_poet_1.code `wrap(object: {[key: string]: any} | undefined): Struct {
@@ -1237,7 +1255,29 @@ function generateWrap(fullProtoTypeName) {
     }`);
     }
     if (types_1.isAnyValueTypeName(fullProtoTypeName)) {
-        chunks.push(ts_poet_1.code `wrap(value: any): Value {
+        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);
+      }
+    }`);
+        }
+        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') {
@@ -1256,15 +1296,16 @@ function generateWrap(fullProtoTypeName) {
         throw new Error('Unsupported any value type: ' + typeof value);
       }
     }`);
+        }
     }
     if (types_1.isListValueTypeName(fullProtoTypeName)) {
-        chunks.push(ts_poet_1.code `wrap(value: Array<any>): ListValue {
-      return {values: value};
+        chunks.push(ts_poet_1.code `wrap(value: Array<any> | undefined): ListValue {
+      return {values: value ?? []};
     }`);
     }
     return chunks;
 }
-function generateUnwrap(fullProtoTypeName) {
+function generateUnwrap(ctx, fullProtoTypeName) {
     const chunks = [];
     if (types_1.isStructTypeName(fullProtoTypeName)) {
         chunks.push(ts_poet_1.code `unwrap(message: Struct): {[key: string]: any} {
@@ -1276,7 +1317,27 @@ function generateUnwrap(fullProtoTypeName) {
     }`);
     }
     if (types_1.isAnyValueTypeName(fullProtoTypeName)) {
-        chunks.push(ts_poet_1.code `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
+        if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
+            chunks.push(ts_poet_1.code `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
+        if (message.kind?.$case === 'nullValue') {
+          return null;
+        } else if (message.kind?.$case === 'numberValue') {
+          return message.kind?.numberValue;
+        } else if (message.kind?.$case === 'stringValue') {
+          return message.kind?.stringValue;
+        } else if (message.kind?.$case === 'boolValue') {
+          return message.kind?.boolValue;
+        } else if (message.kind?.$case === 'structValue') {
+          return message.kind?.structValue;
+        } else if (message.kind?.$case === 'listValue') {
+          return message.kind?.listValue;
+        } else {
+          return undefined;
+        }
+    }`);
+        }
+        else {
+            chunks.push(ts_poet_1.code `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
       if (message?.stringValue !== undefined) {
         return message.stringValue;
       } else if (message?.numberValue !== undefined) {
@@ -1292,6 +1353,7 @@ function generateUnwrap(fullProtoTypeName) {
       }
       return undefined;
     }`);
+        }
     }
     if (types_1.isListValueTypeName(fullProtoTypeName)) {
         chunks.push(ts_poet_1.code `unwrap(message: ListValue): Array<any> {

package/package.json

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