ts-proto 1.148.1 → 1.149.0

package/README.markdown

@@ -340,7 +340,7 @@ Generated code will be placed in the Gradle build directory.
 
   (See [this issue](https://github.com/stephenh/ts-proto/issues/120#issuecomment-678375833) and [this issue](https://github.com/stephenh/ts-proto/issues/397#issuecomment-977259118) for discussions on `useOptional`.)
 
-- With `--ts_proto_opt=exportCommonSymbols=false`, utility types like `DeepPartial` won't be `export`d.
+- With `--ts_proto_opt=exportCommonSymbols=false`, utility types like `DeepPartial` and `protobufPackage` won't be `export`d.
 
   This should make it possible to use create barrel imports of the generated output, i.e. `import * from ./foo` and `import * from ./bar`.
 

package/build/encode.js

@@ -44,7 +44,7 @@ function generateEncoder(ctx, typeName) {
         case "BoolValue":
             return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? false}).finish()`;
         case "BytesValue":
-            return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? new Uint8Array()}).finish()`;
+            return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? new Uint8Array(0)}).finish()`;
     }
     throw new Error(`unknown wrapper type: ${name}`);
 }

package/build/generate-services.js

@@ -6,8 +6,6 @@ const types_1 = require("./types");
 const utils_1 = require("./utils");
 const sourceInfo_1 = require("./sourceInfo");
 const main_1 = require("./main");
-const hash = (0, ts_poet_1.imp)("hash*object-hash");
-const dataloader = (0, ts_poet_1.imp)("DataLoader*dataloader");
 /**
  * Generates an interface for `serviceDesc`.
  *
@@ -188,9 +186,12 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
 }
 exports.generateServiceClientImpl = generateServiceClientImpl;
 /** We've found a BatchXxx method, create a synthetic GetXxx method that calls it. */
-function generateBatchingRpcMethod(_ctx, batchMethod) {
+function generateBatchingRpcMethod(ctx, batchMethod) {
     const { methodDesc, singleMethodName, inputFieldName, inputType, outputFieldName, outputType, mapType, uniqueIdentifier, } = batchMethod;
     (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
+    const { options } = ctx;
+    const hash = options.esModuleInterop ? (0, ts_poet_1.imp)("hash=object-hash") : (0, ts_poet_1.imp)("hash*object-hash");
+    const dataloader = options.esModuleInterop ? (0, ts_poet_1.imp)("DataLoader=dataloader") : (0, ts_poet_1.imp)("DataLoader*dataloader");
     // Create the `(keys) => ...` lambda we'll pass to the DataLoader constructor
     const lambda = [];
     lambda.push((0, ts_poet_1.code) `
@@ -230,6 +231,9 @@ function generateBatchingRpcMethod(_ctx, batchMethod) {
 /** We're not going to batch, but use DataLoader for per-request caching. */
 function generateCachingRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
+    const { options } = ctx;
+    const hash = options.esModuleInterop ? (0, ts_poet_1.imp)("hash=object-hash") : (0, ts_poet_1.imp)("hash*object-hash");
+    const dataloader = options.esModuleInterop ? (0, ts_poet_1.imp)("DataLoader=dataloader") : (0, ts_poet_1.imp)("DataLoader*dataloader");
     const inputType = (0, types_1.requestType)(ctx, methodDesc);
     const outputType = (0, types_1.responseType)(ctx, methodDesc);
     const uniqueIdentifier = `${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}.${methodDesc.name}`;

package/build/options.js

@@ -7,24 +7,24 @@ var LongOption;
     LongOption["LONG"] = "long";
     LongOption["STRING"] = "string";
     LongOption["BIGINT"] = "bigint";
-})(LongOption = exports.LongOption || (exports.LongOption = {}));
+})(LongOption || (exports.LongOption = LongOption = {}));
 var DateOption;
 (function (DateOption) {
     DateOption["DATE"] = "date";
     DateOption["STRING"] = "string";
     DateOption["TIMESTAMP"] = "timestamp";
-})(DateOption = exports.DateOption || (exports.DateOption = {}));
+})(DateOption || (exports.DateOption = DateOption = {}));
 var EnvOption;
 (function (EnvOption) {
     EnvOption["NODE"] = "node";
     EnvOption["BROWSER"] = "browser";
     EnvOption["BOTH"] = "both";
-})(EnvOption = exports.EnvOption || (exports.EnvOption = {}));
+})(EnvOption || (exports.EnvOption = EnvOption = {}));
 var OneofOption;
 (function (OneofOption) {
     OneofOption["PROPERTIES"] = "properties";
     OneofOption["UNIONS"] = "unions";
-})(OneofOption = exports.OneofOption || (exports.OneofOption = {}));
+})(OneofOption || (exports.OneofOption = OneofOption = {}));
 var ServiceOption;
 (function (ServiceOption) {
     ServiceOption["GRPC"] = "grpc-js";
@@ -32,7 +32,7 @@ var ServiceOption;
     ServiceOption["GENERIC"] = "generic-definitions";
     ServiceOption["DEFAULT"] = "default";
     ServiceOption["NONE"] = "none";
-})(ServiceOption = exports.ServiceOption || (exports.ServiceOption = {}));
+})(ServiceOption || (exports.ServiceOption = ServiceOption = {}));
 function defaultOptions() {
     return {
         context: false,

package/build/types.js

@@ -226,7 +226,7 @@ function defaultValue(ctx, field) {
                 return "Buffer.alloc(0)";
             }
             else {
-                return "new Uint8Array()";
+                return "new Uint8Array(0)";
             }
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_MESSAGE:
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_GROUP:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.148.1",
+  "version": "1.149.0",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -28,44 +28,44 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@grpc/grpc-js": "^1.3.0",
-    "@grpc/proto-loader": "^0.6.0",
+    "@grpc/grpc-js": "^1.8.14",
+    "@grpc/proto-loader": "^0.6.13",
     "@improbable-eng/grpc-web": "^0.14.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.14.0",
-    "@nestjs/common": "^8.2.2",
-    "@nestjs/core": "^9.0.5",
-    "@nestjs/microservices": "^8.2.2",
-    "@semantic-release/changelog": "^5.0.1",
-    "@semantic-release/commit-analyzer": "^8.0.1",
+    "@nestjs/common": "^9.4.2",
+    "@nestjs/core": "^9.4.2",
+    "@nestjs/microservices": "^9.4.2",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/commit-analyzer": "^10.0.0",
     "@semantic-release/exec": "^6.0.3",
-    "@semantic-release/git": "^9.0.0",
-    "@semantic-release/github": "^7.2.0",
-    "@semantic-release/npm": "^7.1.0",
-    "@semantic-release/release-notes-generator": "^9.0.2",
-    "@types/jest": "^26.0.22",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^9.0.2",
+    "@semantic-release/npm": "^10.0.3",
+    "@semantic-release/release-notes-generator": "^11.0.2",
+    "@types/jest": "^29.5.2",
     "@types/node": "^14.14.37",
-    "chokidar": "^3.5.2",
-    "jest": "^28.1.2",
+    "chokidar": "^3.5.3",
+    "jest": "^29.5.0",
     "jest-ts-webcompat-resolver": "^1.0.0",
     "mongodb": "^4.3.0",
-    "nice-grpc": "^1.1.1",
-    "prettier": "^2.7.1",
+    "nice-grpc": "^2.1.4",
+    "prettier": "^2.8.8",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.4.0",
-    "semantic-release": "^19.0.3",
-    "ts-jest": "^28.0.5",
-    "tsx": "^3.8.2",
-    "typescript": "^4.9.4",
-    "uglify-js": "^3.16.1"
+    "semantic-release": "^21.0.3",
+    "ts-jest": "^29.1.0",
+    "tsx": "^3.12.7",
+    "typescript": "^5.1.3",
+    "uglify-js": "^3.17.4"
   },
   "dependencies": {
-    "@types/object-hash": "^1.3.0",
+    "@types/object-hash": "^3.0.2",
     "case-anything": "^2.1.10",
     "dataloader": "^1.4.0",
-    "object-hash": "^1.3.1",
+    "object-hash": "^3.0.0",
     "protobufjs": "^6.11.3",
     "ts-poet": "^6.4.1",
     "ts-proto-descriptors": "1.9.0"
   },
-  "packageManager": "yarn@3.3.0"
+  "packageManager": "yarn@3.6.0"
 }