ts-proto 2.8.2 → 2.9.0

package/build/src/context.d.ts

@@ -1,7 +1,7 @@
 import { TypeMap } from "./types";
 import { Utils } from "./main";
 import { Options } from "./options";
-import { FileDescriptorProto } from "ts-proto-descriptors";
+import { Edition, FileDescriptorProto } from "ts-proto-descriptors";
 /** Provides a parameter object for passing around the various context/config data. */
 export interface BaseContext {
     options: Options;
@@ -13,7 +13,7 @@ export interface Context extends BaseContext {
 }
 export interface FileContext {
     isProto3Syntax: boolean;
+    isEdition: boolean;
+    edition: Edition | undefined;
 }
-export declare function createFileContext(file: FileDescriptorProto): {
-    isProto3Syntax: boolean;
-};
+export declare function createFileContext(file: FileDescriptorProto): FileContext;

package/build/src/context.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFileContext = createFileContext;
+const ts_proto_descriptors_1 = require("ts-proto-descriptors");
 function createFileContext(file) {
-    return { isProto3Syntax: file.syntax === "proto3" };
+    const edition = file.edition !== ts_proto_descriptors_1.Edition.EDITION_UNKNOWN ? file.edition : undefined;
+    const isEdition = edition !== undefined;
+    const isProto3Syntax = file.syntax === "proto3" || (file.syntax !== "proto2" && isProto3Edition(edition));
+    return {
+        isProto3Syntax,
+        isEdition,
+        edition,
+    };
+}
+function isProto3Edition(edition) {
+    if (edition === undefined) {
+        return false;
+    }
+    return edition === ts_proto_descriptors_1.Edition.EDITION_PROTO3 || edition === ts_proto_descriptors_1.Edition.EDITION_2023 || edition === ts_proto_descriptors_1.Edition.EDITION_2024;
 }

package/build/src/generate-struct-wrappers.js

@@ -201,7 +201,7 @@ function generateWrapShallow(ctx, fullProtoTypeName, fieldNames) {
             chunks.push((0, ts_poet_1.code) `wrap(value: any): ${(0, utils_1.wrapTypeName)(ctx.options, "Value")} {
         const result = createBase${(0, utils_1.wrapTypeName)(ctx.options, "Value")}()${maybeAsAny(ctx.options)};
         if (value === null) {
-          result.kind = {$case: '${fieldNames.nullValue}', value };
+          result.kind = {$case: '${fieldNames.nullValue}', value: ${(0, utils_1.wrapTypeName)(ctx.options, "NullValue")}.NULL_VALUE};
         } else if (typeof value === 'boolean') {
           result.kind = {$case: '${fieldNames.boolValue}', value };
         } else if (typeof value === 'number') {
@@ -310,7 +310,7 @@ function generateUnwrapShallow(ctx, fullProtoTypeName, fieldNames) {
         }
         else if (ctx.options.oneof === options_1.OneofOption.UNIONS_VALUE) {
             chunks.push((0, ts_poet_1.code) `unwrap(message: ${(0, utils_1.wrapTypeName)(ctx.options, "Value")}): string | number | boolean | Object | null | Array<any> | undefined {
-        return message.kind?.value;
+        return (message.kind?.$case === '${fieldNames.nullValue}') ? null : message.kind?.value;
       }`);
         }
         else {

package/build/src/plugin.js

@@ -62,7 +62,9 @@ async function main() {
     }
     const response = ts_proto_descriptors_1.CodeGeneratorResponse.fromPartial({
         file: files,
-        supportedFeatures: ts_proto_descriptors_1.CodeGeneratorResponse_Feature.FEATURE_PROTO3_OPTIONAL,
+        supportedFeatures: ts_proto_descriptors_1.CodeGeneratorResponse_Feature.FEATURE_PROTO3_OPTIONAL | ts_proto_descriptors_1.CodeGeneratorResponse_Feature.FEATURE_SUPPORTS_EDITIONS,
+        minimumEdition: ts_proto_descriptors_1.Edition.EDITION_PROTO2,
+        maximumEdition: ts_proto_descriptors_1.Edition.EDITION_2024,
     });
     const buffer = ts_proto_descriptors_1.CodeGeneratorResponse.encode(response).finish();
     const write = (0, util_1.promisify)(process.stdout.write).bind(process.stdout);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "description": "",
   "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -36,12 +36,12 @@
     "@nestjs/core": "^9.4.3",
     "@nestjs/microservices": "^9.4.3",
     "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^13.0.0",
-    "@semantic-release/exec": "^6.0.3",
+    "@semantic-release/commit-analyzer": "^13.0.1",
+    "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^10.1.6",
-    "@semantic-release/npm": "^12.0.1",
-    "@semantic-release/release-notes-generator": "^14.0.1",
+    "@semantic-release/github": "^12.0.2",
+    "@semantic-release/npm": "^13.1.3",
+    "@semantic-release/release-notes-generator": "^14.1.0",
     "@tsconfig/strictest": "^2.0.1",
     "@types/jest": "^29.5.3",
     "@types/node": "^16.18.38",
@@ -56,11 +56,12 @@
     "nice-grpc": "^2.1.4",
     "object-hash": "^3.0.0",
     "prettier": "^3.5.3",
+    "prettier-legacy": "npm:prettier@2.8.8",
     "protobufjs": "^7.2.4",
     "protobufjs-cli": "^1.1.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
-    "semantic-release": "^24.0.0",
+    "semantic-release": "^25.0.2",
     "temporal-polyfill": "^0.3.0",
     "temporal-spec": "^0.3.0",
     "ts-jest": "^29.3.4",
@@ -72,7 +73,7 @@
     "@bufbuild/protobuf": "^2.0.0",
     "case-anything": "^2.1.13",
     "ts-poet": "^6.12.0",
-    "ts-proto-descriptors": "2.0.0"
+    "ts-proto-descriptors": "2.1.0"
   },
   "packageManager": "yarn@4.4.0"
 }