@bufbuild/protoc-gen-es 2.2.1 → 2.2.3

package/README.md

@@ -9,17 +9,13 @@ The code generator plugin for Protocol Buffers for ECMAScript. Learn more about
 schema. The generated code requires the runtime library [@bufbuild/protobuf](https://www.npmjs.com/package/@bufbuild/protobuf).
 It's compatible with Protocol Buffer compilers like [buf](https://github.com/bufbuild/buf) and [protoc](https://github.com/protocolbuffers/protobuf/releases).
 
-To install the plugin and the runtime library, run:
+To install the runtime library and the plugin, run:
 
 ```shell
-npm install --save-dev @bufbuild/protoc-gen-es
 npm install @bufbuild/protobuf
+npm install --save-dev @bufbuild/protoc-gen-es
 ```
 
-We use peer dependencies to ensure that the code generator and runtime library are
-compatible with each other. Note that npm installs them automatically, but Yarn
-and pnpm do not.
-
 ## Generating code
 
 ### With buf

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bufbuild/protoc-gen-es",
-    "version": "2.2.1",
+    "version": "2.2.3",
     "license": "Apache-2.0",
     "description": "Protocol Buffers code generator for ECMAScript",
     "keywords": [
@@ -30,11 +30,11 @@
     },
     "preferUnplugged": true,
     "dependencies": {
-        "@bufbuild/protobuf": "^2.2.1",
-        "@bufbuild/protoplugin": "2.2.1"
+        "@bufbuild/protobuf": "^2.2.3",
+        "@bufbuild/protoplugin": "2.2.3"
     },
     "peerDependencies": {
-        "@bufbuild/protobuf": "2.2.1"
+        "@bufbuild/protobuf": "2.2.3"
     },
     "peerDependenciesMeta": {
         "@bufbuild/protobuf": {

package/dist/cjs/src/protoc-gen-es-plugin.js

@@ -447,19 +447,16 @@ function generateMessageJsonShape(f, message, target) {
             else {
                 f.print(exp, " = {");
                 for (const field of message.fields) {
-                    switch (field.kind) {
-                        default:
-                            f.print(f.jsDoc(field, "  "));
-                            // eslint-disable-next-line no-case-declarations
-                            let jsonName = field.jsonName;
-                            if (jsonName === ""
-                                || /^[0-9]/.test(jsonName)
-                                || jsonName.indexOf("@") > -1) {
-                                jsonName = f.string(jsonName);
-                            }
-                            f.print("  ", jsonName, "?: ", (0, util_1.fieldJsonType)(field), ";");
-                            break;
+                    f.print(f.jsDoc(field, "  "));
+                    let jsonName = field.jsonName;
+                    const startWithNumber = /^[0-9]/;
+                    const containsSpecialChar = /[^a-zA-Z0-9_$]/;
+                    if (jsonName === ""
+                        || startWithNumber.test(jsonName)
+                        || containsSpecialChar.test(jsonName)) {
+                        jsonName = f.string(jsonName);
                     }
+                    f.print("  ", jsonName, "?: ", (0, util_1.fieldJsonType)(field), ";");
                     if (message.fields.indexOf(field) < message.fields.length - 1) {
                         f.print();
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoc-gen-es",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "license": "Apache-2.0",
   "description": "Protocol Buffers code generator for ECMAScript",
   "keywords": [
@@ -30,11 +30,11 @@
   },
   "preferUnplugged": true,
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.1",
-    "@bufbuild/protoplugin": "2.2.1"
+    "@bufbuild/protobuf": "^2.2.3",
+    "@bufbuild/protoplugin": "2.2.3"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "2.2.1"
+    "@bufbuild/protobuf": "2.2.3"
   },
   "peerDependenciesMeta": {
     "@bufbuild/protobuf": {