ts-proto 1.115.2 → 1.115.5

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.115.5](https://github.com/stephenh/ts-proto/compare/v1.115.4...v1.115.5) (2022-06-22)
+
+
+### Bug Fixes
+
+* remove Long import statement when Long was unused ([#599](https://github.com/stephenh/ts-proto/issues/599)) ([58dc10c](https://github.com/stephenh/ts-proto/commit/58dc10c61ec5a76d4b54ba9eddf34021979dd4aa))
+
+## [1.115.4](https://github.com/stephenh/ts-proto/compare/v1.115.3...v1.115.4) (2022-06-05)
+
+
+### Bug Fixes
+
+* Struct wrap/unwrap snake case [#579](https://github.com/stephenh/ts-proto/issues/579) ([#588](https://github.com/stephenh/ts-proto/issues/588)) ([33f89bf](https://github.com/stephenh/ts-proto/commit/33f89bfcf0d5d9e64a6fd360eaefc140055e9291))
+
+## [1.115.3](https://github.com/stephenh/ts-proto/compare/v1.115.2...v1.115.3) (2022-06-03)
+
+
+### Bug Fixes
+
+* Fix ts-poet typo in package.json. ([#589](https://github.com/stephenh/ts-proto/issues/589)) ([5211347](https://github.com/stephenh/ts-proto/commit/5211347cb21ac7d117349a32a87c0d017999c44a))
+
 ## [1.115.2](https://github.com/stephenh/ts-proto/compare/v1.115.1...v1.115.2) (2022-06-03)
 
 

package/build/main.js

@@ -87,8 +87,16 @@ function generateFile(ctx, fileDesc) {
             if (options.outputPartialMethods) {
                 staticMembers.push(generateFromPartial(ctx, fullName, message));
             }
-            staticMembers.push(...generateWrap(ctx, fullTypeName));
-            staticMembers.push(...generateUnwrap(ctx, fullTypeName));
+            const structFieldNames = {
+                nullValue: case_1.maybeSnakeToCamel('null_value', ctx.options),
+                numberValue: case_1.maybeSnakeToCamel('number_value', ctx.options),
+                stringValue: case_1.maybeSnakeToCamel('string_value', ctx.options),
+                boolValue: case_1.maybeSnakeToCamel('bool_value', ctx.options),
+                structValue: case_1.maybeSnakeToCamel('struct_value', ctx.options),
+                listValue: case_1.maybeSnakeToCamel('list_value', ctx.options),
+            };
+            staticMembers.push(...generateWrap(ctx, fullTypeName, structFieldNames));
+            staticMembers.push(...generateUnwrap(ctx, fullTypeName, structFieldNames));
             chunks.push(ts_poet_1.code `
           export const ${ts_poet_1.def(fullName)} = {
             ${ts_poet_1.joinCode(staticMembers, { on: ',\n\n' })}
@@ -180,9 +188,6 @@ function generateFile(ctx, fileDesc) {
         if (v instanceof ConditionalOutput_1.ConditionalOutput) {
             return ts_poet_1.code `${v.ifUsed}`;
         }
-        else if (v instanceof ts_poet_1.Code) {
-            return v;
-        }
         else {
             return ts_poet_1.code ``;
         }
@@ -229,23 +234,22 @@ function makeLongUtils(options, bytes) {
     //
     // I.e there is not an import for long that "just works" in both esModuleInterop and
     // not esModuleInterop.
-    const Long = options.esModuleInterop ? ts_poet_1.imp('Long=long') : ts_poet_1.imp('Long*long');
+    const LongImp = options.esModuleInterop ? ts_poet_1.imp('Long=long') : ts_poet_1.imp('Long*long');
     const disclaimer = options.esModuleInterop
         ? ''
         : `
     // If you get a compile-error about 'Constructor<Long> and ... have no overlap',
     // add '--ts_proto_opt=esModuleInterop=true' as a flag when calling 'protoc'.`;
-    // Kinda hacky, but we always init long unless in onlyTypes mode. I'd rather do
-    // this more implicitly, like if `Long@long` is imported or something like that.
-    const longInit = options.onlyTypes
-        ? ts_poet_1.code ``
-        : ts_poet_1.code `
+    // Instead of exposing `LongImp` directly, let callers think that they are getting the
+    // `imp(Long)` but really it is that + our long initialization snippet. This means the
+    // initialization code will only be emitted in files that actually use the Long import.
+    const Long = ts_poet_1.conditionalOutput('Long', ts_poet_1.code `
       ${disclaimer}
-      if (${util}.Long !== ${Long}) {
-        ${util}.Long = ${Long} as any;
+      if (${util}.Long !== ${LongImp}) {
+        ${util}.Long = ${LongImp} as any;
         ${configure}();
       }
-    `;
+    `);
     // TODO This is unused?
     const numberToLong = ts_poet_1.conditionalOutput('numberToLong', ts_poet_1.code `
       function numberToLong(number: number) {
@@ -265,7 +269,7 @@ function makeLongUtils(options, bytes) {
         return long.toNumber();
       }
     `);
-    return { numberToLong, longToNumber, longToString, longInit, Long };
+    return { numberToLong, longToNumber, longToString, Long };
 }
 function makeByteUtils() {
     const globalThis = ts_poet_1.conditionalOutput('globalThis', ts_poet_1.code `
@@ -1405,7 +1409,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     chunks.push(ts_poet_1.code `}`);
     return ts_poet_1.joinCode(chunks, { on: '\n' });
 }
-function generateWrap(ctx, fullProtoTypeName) {
+function generateWrap(ctx, fullProtoTypeName, fieldNames) {
     const chunks = [];
     if (types_1.isStructTypeName(fullProtoTypeName)) {
         chunks.push(ts_poet_1.code `wrap(object: {[key: string]: any} | undefined): Struct {
@@ -1424,17 +1428,17 @@ function generateWrap(ctx, fullProtoTypeName) {
         const result = createBaseValue();
 
         if (value === null) {
-          result.kind = {$case: 'nullValue', nullValue: NullValue.NULL_VALUE};
+          result.kind = {$case: '${fieldNames.nullValue}', ${fieldNames.nullValue}: NullValue.NULL_VALUE};
         } else if (typeof value === 'boolean') {
-          result.kind = {$case: 'boolValue', boolValue: value};
+          result.kind = {$case: '${fieldNames.boolValue}', ${fieldNames.boolValue}: value};
         } else if (typeof value === 'number') {
-          result.kind = {$case: 'numberValue', numberValue: value};
+          result.kind = {$case: '${fieldNames.numberValue}', ${fieldNames.numberValue}: value};
         } else if (typeof value === 'string') {
-          result.kind = {$case: 'stringValue', stringValue: value};
+          result.kind = {$case: '${fieldNames.stringValue}', ${fieldNames.stringValue}: value};
         } else if (Array.isArray(value)) {
-          result.kind = {$case: 'listValue', listValue: value};
+          result.kind = {$case: '${fieldNames.listValue}', ${fieldNames.listValue}: value};
         } else if (typeof value === 'object') {
-          result.kind = {$case: 'structValue', structValue: value};
+          result.kind = {$case: '${fieldNames.structValue}', ${fieldNames.structValue}: value};
         } else if (typeof value !== 'undefined') {
           throw new Error('Unsupported any value type: ' + typeof value);
         }
@@ -1447,17 +1451,17 @@ function generateWrap(ctx, fullProtoTypeName) {
         const result = createBaseValue();
 
         if (value === null) {
-          result.nullValue = NullValue.NULL_VALUE;
+          result.${fieldNames.nullValue} = NullValue.NULL_VALUE;
         } else if (typeof value === 'boolean') {
-          result.boolValue = value;
+          result.${fieldNames.boolValue} = value;
         } else if (typeof value === 'number') {
-          result.numberValue = value;
+          result.${fieldNames.numberValue} = value;
         } else if (typeof value === 'string') {
-          result.stringValue = value;
+          result.${fieldNames.stringValue} = value;
         } else if (Array.isArray(value)) {
-          result.listValue = value;
+          result.${fieldNames.listValue} = value;
         } else if (typeof value === 'object') {
-          result.structValue = value;
+          result.${fieldNames.structValue} = value;
         } else if (typeof value !== 'undefined') {
           throw new Error('Unsupported any value type: ' + typeof value);
         }
@@ -1482,7 +1486,7 @@ function generateWrap(ctx, fullProtoTypeName) {
     }
     return chunks;
 }
-function generateUnwrap(ctx, fullProtoTypeName) {
+function generateUnwrap(ctx, fullProtoTypeName, fieldNames) {
     const chunks = [];
     if (types_1.isStructTypeName(fullProtoTypeName)) {
         chunks.push(ts_poet_1.code `unwrap(message: Struct): {[key: string]: any} {
@@ -1496,18 +1500,18 @@ function generateUnwrap(ctx, fullProtoTypeName) {
     if (types_1.isAnyValueTypeName(fullProtoTypeName)) {
         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') {
+        if (message.kind?.$case === '${fieldNames.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 if (message.kind?.$case === '${fieldNames.numberValue}') {
+          return message.kind?.${fieldNames.numberValue};
+        } else if (message.kind?.$case === '${fieldNames.stringValue}') {
+          return message.kind?.${fieldNames.stringValue};
+        } else if (message.kind?.$case === '${fieldNames.boolValue}') {
+          return message.kind?.${fieldNames.boolValue};
+        } else if (message.kind?.$case === '${fieldNames.structValue}') {
+          return message.kind?.${fieldNames.structValue};
+        } else if (message.kind?.$case === '${fieldNames.listValue}') {
+          return message.kind?.${fieldNames.listValue};
         } else {
           return undefined;
         }
@@ -1515,17 +1519,17 @@ function generateUnwrap(ctx, fullProtoTypeName) {
         }
         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) {
-        return message.numberValue;
-      } else if (message?.boolValue !== undefined) {
-        return message.boolValue;
-      } else if (message?.structValue !== undefined) {
-        return message.structValue;
-      } else if (message?.listValue !== undefined) {
-          return message.listValue;
-      } else if (message?.nullValue !== undefined) {
+      if (message?.${fieldNames.stringValue} !== undefined) {
+        return message.${fieldNames.stringValue};
+      } else if (message?.${fieldNames.numberValue} !== undefined) {
+        return message.${fieldNames.numberValue};
+      } else if (message?.${fieldNames.boolValue} !== undefined) {
+        return message.${fieldNames.boolValue};
+      } else if (message?.${fieldNames.structValue} !== undefined) {
+        return message.${fieldNames.structValue};
+      } else if (message?.${fieldNames.listValue} !== undefined) {
+          return message.${fieldNames.listValue};
+      } else if (message?.${fieldNames.nullValue} !== undefined) {
         return null;
       }
       return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.115.2",
+  "version": "1.115.5",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -66,7 +66,7 @@
     "dataloader": "^1.4.0",
     "object-hash": "^1.3.1",
     "protobufjs": "^6.11.3",
-    "ts-poet": "^t 4.11.0",
+    "ts-poet": "^4.11.0",
     "ts-proto-descriptors": "1.6.0"
   }
 }