ts-proto 1.109.0 → 1.110.1

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.110.1](https://github.com/stephenh/ts-proto/compare/v1.110.0...v1.110.1) (2022-03-25)
+
+
+### Bug Fixes
+
+* Use a module star import for protobuf types. ([#540](https://github.com/stephenh/ts-proto/issues/540)) ([f5b7700](https://github.com/stephenh/ts-proto/commit/f5b770083dffe72338beb4a09432a2a917760eae))
+
+# [1.110.0](https://github.com/stephenh/ts-proto/compare/v1.109.1...v1.110.0) (2022-03-15)
+
+
+### Features
+
+* Add generic metadata parameter to the generic service definition interface. ([#530](https://github.com/stephenh/ts-proto/issues/530)) ([0f5525a](https://github.com/stephenh/ts-proto/commit/0f5525ade80e7b69889dfd091a458e21bb14a265))
+
+## [1.109.1](https://github.com/stephenh/ts-proto/compare/v1.109.0...v1.109.1) (2022-03-13)
+
+
+### Bug Fixes
+
+* Type Error when map contains string enums [#382](https://github.com/stephenh/ts-proto/issues/382) ([#529](https://github.com/stephenh/ts-proto/issues/529)) ([c2107b9](https://github.com/stephenh/ts-proto/commit/c2107b96b494a500a4773ac04900a1acd13c507a))
+
 # [1.109.0](https://github.com/stephenh/ts-proto/compare/v1.108.0...v1.109.0) (2022-03-13)
 
 

package/README.markdown

@@ -362,6 +362,8 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=outputServices=generic-definitions`, ts-proto will output generic (framework-agnostic) service definitions. These definitions contain descriptors for each method with links to request and response types, which allows to generate server and client stubs at runtime, and also generate strong types for them at compile time. An example of a library that uses this approach is [nice-grpc](https://github.com/deeplay-io/nice-grpc).
 
+- With `--ts_proto_opt=metadataType=Foo@./some-file`, ts-proto add a generic (framework-agnostic) metadata field to the generic service definition.
+
 - With `--ts_proto_opt=outputServices=generic-definitions,outputServices=default`, ts-proto will output both generic definitions and interfaces.  This is useful if you want to rely on the interfaces, but also have some reflection capabilities at runtime.
 
 - With `--ts_proto_opt=outputServices=false`, or `=none`, ts-proto will output NO service definitions.

package/build/generate-services.js

@@ -52,6 +52,10 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
             const q = options.addNestjsRestParameter ? '' : '?';
             params.push(ts_poet_1.code `metadata${q}: ${Metadata}`);
         }
+        else if (options.metadataType) {
+            const Metadata = ts_poet_1.imp(options.metadataType);
+            params.push(ts_poet_1.code `metadata?: ${Metadata}`);
+        }
         if (options.addNestjsRestParameter) {
             params.push(ts_poet_1.code `...rest: any`);
         }

package/build/main.js

@@ -974,10 +974,10 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
             }
             else if (types_1.isMessage(field)) {
                 if (types_1.isRepeated(field) && types_1.isMapType(ctx, messageDesc, field)) {
-                    const valueType = typeMap.get(field.typeName)[2].field[1];
-                    if (types_1.isPrimitive(valueType)) {
+                    const { valueField, valueType } = types_1.detectMapType(ctx, messageDesc, field);
+                    if (types_1.isPrimitive(valueField)) {
                         // TODO Can we not copy/paste this from ^?
-                        if (types_1.isBytes(valueType)) {
+                        if (types_1.isBytes(valueField)) {
                             if (options.env === options_1.EnvOption.NODE) {
                                 return ts_poet_1.code `Buffer.from(${utils.bytesFromBase64}(${from} as string))`;
                             }
@@ -985,37 +985,35 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                                 return ts_poet_1.code `${utils.bytesFromBase64}(${from} as string)`;
                             }
                         }
-                        else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
+                        else if (types_1.isLong(valueField) && options.forceLong === options_1.LongOption.LONG) {
                             return ts_poet_1.code `Long.fromValue(${from} as Long | string)`;
                         }
-                        else if (types_1.isEnum(valueType)) {
-                            return ts_poet_1.code `${from} as number`;
+                        else if (types_1.isEnum(valueField)) {
+                            return ts_poet_1.code `${from} as ${valueType}`;
                         }
                         else {
-                            const cstr = case_1.capitalize(types_1.basicTypeName(ctx, valueType).toCodeString());
+                            const cstr = case_1.capitalize(valueType.toCodeString());
                             return ts_poet_1.code `${cstr}(${from})`;
                         }
                     }
-                    else if (types_1.isObjectId(valueType) && options.useMongoObjectId) {
+                    else if (types_1.isObjectId(valueField) && options.useMongoObjectId) {
                         return ts_poet_1.code `${utils.fromJsonObjectId}(${from})`;
                     }
-                    else if (types_1.isTimestamp(valueType) && options.useDate === options_1.DateOption.STRING) {
+                    else if (types_1.isTimestamp(valueField) && options.useDate === options_1.DateOption.STRING) {
                         return ts_poet_1.code `String(${from})`;
                     }
-                    else if (types_1.isTimestamp(valueType) &&
+                    else if (types_1.isTimestamp(valueField) &&
                         (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.TIMESTAMP)) {
                         return ts_poet_1.code `${utils.fromJsonTimestamp}(${from})`;
                     }
-                    else if (types_1.isValueType(ctx, valueType)) {
-                        const type = types_1.basicTypeName(ctx, valueType);
-                        return ts_poet_1.code `${from} as ${type}`;
+                    else if (types_1.isValueType(ctx, valueField)) {
+                        return ts_poet_1.code `${from} as ${valueType}`;
                     }
-                    else if (types_1.isAnyValueType(valueType)) {
+                    else if (types_1.isAnyValueType(valueField)) {
                         return ts_poet_1.code `${from}`;
                     }
                     else {
-                        const type = types_1.basicTypeName(ctx, valueType);
-                        return ts_poet_1.code `${type}.fromJSON(${from})`;
+                        return ts_poet_1.code `${valueType}.fromJSON(${from})`;
                     }
                 }
                 else {
@@ -1293,37 +1291,37 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             }
             else if (types_1.isMessage(field)) {
                 if (types_1.isRepeated(field) && types_1.isMapType(ctx, messageDesc, field)) {
-                    const valueType = typeMap.get(field.typeName)[2].field[1];
-                    if (types_1.isPrimitive(valueType)) {
-                        if (types_1.isBytes(valueType)) {
+                    const { valueField, valueType } = types_1.detectMapType(ctx, messageDesc, field);
+                    if (types_1.isPrimitive(valueField)) {
+                        if (types_1.isBytes(valueField)) {
                             return ts_poet_1.code `${from}`;
                         }
-                        else if (types_1.isEnum(valueType)) {
-                            return ts_poet_1.code `${from} as number`;
+                        else if (types_1.isEnum(valueField)) {
+                            return ts_poet_1.code `${from} as ${valueType}`;
                         }
-                        else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
+                        else if (types_1.isLong(valueField) && options.forceLong === options_1.LongOption.LONG) {
                             return ts_poet_1.code `Long.fromValue(${from})`;
                         }
                         else {
-                            const cstr = case_1.capitalize(types_1.basicTypeName(ctx, valueType).toCodeString());
+                            const cstr = case_1.capitalize(valueType.toCodeString());
                             return ts_poet_1.code `${cstr}(${from})`;
                         }
                     }
-                    else if (types_1.isAnyValueType(valueType)) {
+                    else if (types_1.isAnyValueType(valueField)) {
                         return ts_poet_1.code `${from}`;
                     }
-                    else if (types_1.isObjectId(valueType) && options.useMongoObjectId) {
+                    else if (types_1.isObjectId(valueField) && options.useMongoObjectId) {
                         return ts_poet_1.code `${from} as mongodb.ObjectId`;
                     }
-                    else if (types_1.isTimestamp(valueType) &&
+                    else if (types_1.isTimestamp(valueField) &&
                         (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.STRING)) {
                         return ts_poet_1.code `${from}`;
                     }
-                    else if (types_1.isValueType(ctx, valueType)) {
+                    else if (types_1.isValueType(ctx, valueField)) {
                         return ts_poet_1.code `${from}`;
                     }
                     else {
-                        const type = types_1.basicTypeName(ctx, valueType);
+                        const type = types_1.basicTypeName(ctx, valueField);
                         return ts_poet_1.code `${type}.fromPartial(${from})`;
                     }
                 }

package/build/options.js

@@ -54,6 +54,7 @@ function defaultOptions() {
         outputServices: [],
         returnObservable: false,
         addGrpcMetadata: false,
+        metadataType: undefined,
         addNestjsRestParameter: false,
         nestJs: false,
         env: EnvOption.BOTH,
@@ -140,11 +141,6 @@ function parseParameter(parameter) {
     return options;
 }
 function getTsPoetOpts(options) {
-    if (options.esModuleInterop) {
-        return { forceDefaultImport: ['protobufjs/minimal'] };
-    }
-    else {
-        return {};
-    }
+    return { forceModuleImport: ['protobufjs/minimal'] };
 }
 exports.getTsPoetOpts = getTsPoetOpts;

package/build/types.js

@@ -588,10 +588,11 @@ function detectMapType(ctx, messageDesc, fieldDesc) {
         const mapType = typeMap.get(fieldDesc.typeName)[2];
         if (!((_a = mapType.options) === null || _a === void 0 ? void 0 : _a.mapEntry))
             return undefined;
-        const keyType = toTypeName(ctx, messageDesc, mapType.field[0]);
+        const [keyField, valueField] = mapType.field;
+        const keyType = toTypeName(ctx, messageDesc, keyField);
         // use basicTypeName because we don't need the '| undefined'
-        const valueType = basicTypeName(ctx, mapType.field[1]);
-        return { messageDesc: mapType, keyType, valueType };
+        const valueType = basicTypeName(ctx, valueField);
+        return { messageDesc: mapType, keyField, keyType, valueField, valueType };
     }
     return undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.109.0",
+  "version": "1.110.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -64,7 +64,7 @@
     "dataloader": "^1.4.0",
     "object-hash": "^1.3.1",
     "protobufjs": "^6.8.8",
-    "ts-poet": "^4.10.0",
+    "ts-poet": "^4.11.0",
     "ts-proto-descriptors": "1.6.0"
   }
 }