@bufbuild/protoc-gen-es 0.1.1 → 0.2.1

package/README.md

@@ -124,3 +124,11 @@ By default, we generate JavaScript and TypeScript declaration files, which
 produces the smallest code size. If you prefer to generate TypeScript, use
 `target=ts`.
 
+### `keep_empty_files=true`
+
+By default, [protoc-gen-es](https://www.npmjs.com/package/@bufbuild/protoc-gen-es) 
+(and all other plugins based on [@bufbuild/protoplugin](https://www.npmjs.com/package/@bufbuild/protoplugin)) 
+omit empty files from the plugin output. This option disables pruning of 
+empty files, to allow for smooth interoperation with Bazel and similar 
+tooling that requires all output files to be declared ahead of time.
+Unless you use Bazel, it is very unlikely that you need this option.

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bufbuild/protoc-gen-es",
-    "version": "0.1.1",
+    "version": "0.2.1",
     "description": "Protocol Buffers code generator for ECMAScript",
     "license": "Apache-2.0",
     "repository": {
@@ -20,10 +20,10 @@
     },
     "preferUnplugged": true,
     "dependencies": {
-        "@bufbuild/protoplugin": "0.1.1"
+        "@bufbuild/protoplugin": "0.2.1"
     },
     "peerDependencies": {
-        "@bufbuild/protobuf": "0.1.1"
+        "@bufbuild/protobuf": "0.2.1"
     },
     "peerDependenciesMeta": {
         "@bufbuild/protobuf": {

package/dist/cjs/src/declaration.js

@@ -13,15 +13,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.declaration = void 0;
+exports.generateDts = void 0;
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
-const match_wkt_js_1 = require("./match-wkt.js");
-exports.declaration = {
-    target: "dts",
-    extension: "_pb.d.ts",
-    generateEnum,
-    generateMessage,
-};
+function generateDts(schema) {
+    for (const file of schema.files) {
+        const f = schema.generateFile(file.name + "_pb.d.ts");
+        f.preamble(file);
+        for (const enumeration of file.enums) {
+            generateEnum(schema, f, enumeration);
+        }
+        for (const message of file.messages) {
+            generateMessage(schema, f, message);
+        }
+        // We do not generate anything for services, and we do not support extensions at this time
+    }
+}
+exports.generateDts = generateDts;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     f.print((0, ecmascript_1.makeJsDoc)(enumeration));
@@ -111,7 +118,7 @@ function generateField(schema, f, field) {
 }
 // prettier-ignore
 function generateWktMethods(schema, f, message) {
-    const ref = (0, match_wkt_js_1.matchWkt)(message);
+    const ref = (0, ecmascript_1.reifyWkt)(message);
     if (ref === undefined) {
         return;
     }
@@ -152,7 +159,7 @@ function generateWktMethods(schema, f, message) {
 }
 // prettier-ignore
 function generateWktStaticMethods(schema, f, message) {
-    const ref = (0, match_wkt_js_1.matchWkt)(message);
+    const ref = (0, ecmascript_1.reifyWkt)(message);
     if (ref === undefined) {
         return;
     }

package/dist/cjs/src/javascript.js

@@ -13,16 +13,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFieldInfo = exports.javascript = void 0;
+exports.generateFieldInfo = exports.generateJs = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
-const match_wkt_js_1 = require("./match-wkt.js");
-exports.javascript = {
-    target: "js",
-    extension: "_pb.js",
-    generateEnum,
-    generateMessage,
-};
+function generateJs(schema) {
+    for (const file of schema.files) {
+        const f = schema.generateFile(file.name + "_pb.js");
+        f.preamble(file);
+        for (const enumeration of file.enums) {
+            generateEnum(schema, f, enumeration);
+        }
+        for (const message of file.messages) {
+            generateMessage(schema, f, message);
+        }
+        // We do not generate anything for services, and we do not support extensions at this time
+    }
+}
+exports.generateJs = generateJs;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     const protoN = schema.runtime[enumeration.file.syntax];
@@ -88,11 +95,11 @@ function generateFieldInfo(schema, f, field) {
     if (field.jsonName !== undefined) {
         e.push(`jsonName: "`, field.jsonName, `", `);
     }
-    switch (field.kind) {
-        case "scalar_field":
+    switch (field.fieldKind) {
+        case "scalar":
             e.push(`kind: "scalar", T: `, field.scalar, ` /* ScalarType.`, protobuf_1.ScalarType[field.scalar], ` */, `);
             break;
-        case "map_field":
+        case "map":
             e.push(`kind: "map", K: `, field.mapKey, ` /* ScalarType.`, protobuf_1.ScalarType[field.mapKey], ` */, `);
             switch (field.mapValue.kind) {
                 case "scalar":
@@ -106,10 +113,10 @@ function generateFieldInfo(schema, f, field) {
                     break;
             }
             break;
-        case "message_field":
+        case "message":
             e.push(`kind: "message", T: `, field.message, `, `);
             break;
-        case "enum_field":
+        case "enum":
             e.push(`kind: "enum", T: `, protoN, `.getEnumType(`, field.enum, `), `);
             break;
     }
@@ -140,7 +147,7 @@ exports.generateFieldInfo = generateFieldInfo;
 // prettier-ignore
 function generateWktMethods(schema, f, message) {
     var _a;
-    const ref = (0, match_wkt_js_1.matchWkt)(message);
+    const ref = (0, ecmascript_1.reifyWkt)(message);
     if (ref === undefined) {
         return;
     }
@@ -170,6 +177,9 @@ function generateWktMethods(schema, f, message) {
             f.print(`  if (json === null || Array.isArray(json) || typeof json != "object") {`);
             f.print("    throw new Error(`cannot decode message ", message.typeName, ' from JSON: expected object but got ${json === null ? "null" : Array.isArray(json) ? "array" : typeof json}`);');
             f.print("  }");
+            f.print(`  if (Object.keys(json).length == 0) {`);
+            f.print(`    return this;`);
+            f.print(`  }`);
             f.print(`  const typeUrl = json["@type"];`);
             f.print(`  if (typeof typeUrl != "string" || typeUrl == "") {`);
             f.print("    throw new Error(`cannot decode message ", message.typeName, ' from JSON: "@type" is empty`);');
@@ -492,7 +502,7 @@ function generateWktMethods(schema, f, message) {
 }
 // prettier-ignore
 function generateWktStaticMethods(schema, f, message) {
-    const ref = (0, match_wkt_js_1.matchWkt)(message);
+    const ref = (0, ecmascript_1.reifyWkt)(message);
     if (ref === undefined) {
         return;
     }

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

@@ -17,24 +17,12 @@ exports.protocGenEs = void 0;
 const protoplugin_1 = require("@bufbuild/protoplugin");
 const typescript_js_1 = require("./typescript.js");
 const javascript_js_1 = require("./javascript.js");
-const declaration_1 = require("./declaration");
+const declaration_js_1 = require("./declaration.js");
 const package_json_1 = require("../package.json");
 exports.protocGenEs = (0, protoplugin_1.createEcmaScriptPlugin)({
     name: "protoc-gen-es",
     version: `v${String(package_json_1.version)}`,
-}, (schema) => {
-    const targets = [typescript_js_1.typescript, javascript_js_1.javascript, declaration_1.declaration].filter((gen) => schema.targets.includes(gen.target));
-    for (const target of targets) {
-        for (const file of schema.files) {
-            const f = schema.generateFile(file.name + target.extension);
-            f.preamble(file);
-            for (const enumeration of file.enums) {
-                target.generateEnum(schema, f, enumeration);
-            }
-            for (const message of file.messages) {
-                target.generateMessage(schema, f, message);
-            }
-            // We do not generate anything for services, and we do not support extensions at this time
-        }
-    }
+    generateTs: typescript_js_1.generateTs,
+    generateJs: javascript_js_1.generateJs,
+    generateDts: declaration_js_1.generateDts,
 });

package/dist/cjs/src/typescript.js

@@ -13,18 +13,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typescript = void 0;
+exports.generateTs = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
-const match_wkt_js_1 = require("./match-wkt.js");
 const javascript_js_1 = require("./javascript.js");
 const ecmascript_2 = require("@bufbuild/protoplugin/ecmascript");
-exports.typescript = {
-    target: "ts",
-    extension: "_pb.ts",
-    generateEnum,
-    generateMessage,
-};
+function generateTs(schema) {
+    for (const file of schema.files) {
+        const f = schema.generateFile(file.name + "_pb.ts");
+        f.preamble(file);
+        for (const enumeration of file.enums) {
+            generateEnum(schema, f, enumeration);
+        }
+        for (const message of file.messages) {
+            generateMessage(schema, f, message);
+        }
+        // We do not generate anything for services, and we do not support extensions at this time
+    }
+}
+exports.generateTs = generateTs;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     const protoN = schema.runtime[enumeration.file.syntax];
@@ -141,7 +148,7 @@ function generateField(schema, f, field) {
 // prettier-ignore
 function generateWktMethods(schema, f, message) {
     var _a;
-    const ref = (0, match_wkt_js_1.matchWkt)(message);
+    const ref = (0, ecmascript_1.reifyWkt)(message);
     if (ref === undefined) {
         return;
     }
@@ -171,6 +178,9 @@ function generateWktMethods(schema, f, message) {
             f.print(`    if (json === null || Array.isArray(json) || typeof json != "object") {`);
             f.print("      throw new Error(`cannot decode message ", message.typeName, ' from JSON: expected object but got ${json === null ? "null" : Array.isArray(json) ? "array" : typeof json}`);');
             f.print("    }");
+            f.print(`    if (Object.keys(json).length == 0) {`);
+            f.print(`      return this;`);
+            f.print(`    }`);
             f.print(`    const typeUrl = json["@type"];`);
             f.print(`    if (typeof typeUrl != "string" || typeUrl == "") {`);
             f.print("      throw new Error(`cannot decode message ", message.typeName, ' from JSON: "@type" is empty`);');
@@ -493,7 +503,7 @@ function generateWktMethods(schema, f, message) {
 }
 // prettier-ignore
 function generateWktStaticMethods(schema, f, message) {
-    const ref = (0, match_wkt_js_1.matchWkt)(message);
+    const ref = (0, ecmascript_1.reifyWkt)(message);
     if (ref === undefined) {
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoc-gen-es",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Protocol Buffers code generator for ECMAScript",
   "license": "Apache-2.0",
   "repository": {
@@ -20,10 +20,10 @@
   },
   "preferUnplugged": true,
   "dependencies": {
-    "@bufbuild/protoplugin": "0.1.1"
+    "@bufbuild/protoplugin": "0.2.1"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "0.1.1"
+    "@bufbuild/protobuf": "0.2.1"
   },
   "peerDependenciesMeta": {
     "@bufbuild/protobuf": {

package/src/declaration.ts

@@ -18,21 +18,32 @@ import type {
   DescMessage,
   DescOneof,
 } from "@bufbuild/protobuf";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type {
+  GeneratedFile,
+  Printable,
+  Schema,
+} from "@bufbuild/protoplugin/ecmascript";
 import {
   getFieldTyping,
   literalString,
   localName,
   makeJsDoc,
+  reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
-import { matchWkt } from "./match-wkt.js";
 
-export const declaration = {
-  target: "dts",
-  extension: "_pb.d.ts",
-  generateEnum,
-  generateMessage,
-} as const;
+export function generateDts(schema: Schema) {
+  for (const file of schema.files) {
+    const f = schema.generateFile(file.name + "_pb.d.ts");
+    f.preamble(file);
+    for (const enumeration of file.enums) {
+      generateEnum(schema, f, enumeration);
+    }
+    for (const message of file.messages) {
+      generateMessage(schema, f, message);
+    }
+    // We do not generate anything for services, and we do not support extensions at this time
+  }
+}
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
@@ -120,7 +131,7 @@ function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
 
 function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
   f.print(makeJsDoc(field, "  "));
-  const e: Parameters<typeof f.print> = [];
+  const e: Printable = [];
   e.push("  ", localName(field));
   const { typing, optional } = getFieldTyping(field, f);
   if (optional) {
@@ -134,7 +145,7 @@ function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
 
 // prettier-ignore
 function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
-  const ref = matchWkt(message);
+  const ref = reifyWkt(message);
   if (ref === undefined) {
     return;
   }
@@ -179,7 +190,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
 
 // prettier-ignore
 function generateWktStaticMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
-  const ref = matchWkt(message);
+  const ref = reifyWkt(message);
   if (ref === undefined) {
     return;
   }

package/src/javascript.ts

@@ -14,21 +14,32 @@
 
 import type { DescEnum, DescField, DescMessage } from "@bufbuild/protobuf";
 import { proto2, proto3, ScalarType } from "@bufbuild/protobuf";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type {
+  GeneratedFile,
+  Printable,
+  Schema,
+} from "@bufbuild/protoplugin/ecmascript";
 import {
   getFieldExplicitDefaultValue,
   literalString,
   localName,
   makeJsDoc,
+  reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
-import { matchWkt } from "./match-wkt.js";
 
-export const javascript = {
-  target: "js",
-  extension: "_pb.js",
-  generateEnum,
-  generateMessage,
-} as const;
+export function generateJs(schema: Schema) {
+  for (const file of schema.files) {
+    const f = schema.generateFile(file.name + "_pb.js");
+    f.preamble(file);
+    for (const enumeration of file.enums) {
+      generateEnum(schema, f, enumeration);
+    }
+    for (const message of file.messages) {
+      generateMessage(schema, f, message);
+    }
+    // We do not generate anything for services, and we do not support extensions at this time
+  }
+}
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
@@ -90,16 +101,16 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
 // prettier-ignore
 export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescField) {
   const protoN = schema.runtime[field.parent.file.syntax];
-  const e: Parameters<typeof f.print> = [];
+  const e: Printable = [];
   e.push("    { no: ", field.number, `, name: "`, field.name, `", `);
   if (field.jsonName !== undefined) {
     e.push(`jsonName: "`, field.jsonName, `", `);
   }
-  switch (field.kind) {
-    case "scalar_field":
+  switch (field.fieldKind) {
+    case "scalar":
       e.push(`kind: "scalar", T: `, field.scalar, ` /* ScalarType.`, ScalarType[field.scalar], ` */, `);
       break;
-    case "map_field":
+    case "map":
       e.push(`kind: "map", K: `, field.mapKey, ` /* ScalarType.`, ScalarType[field.mapKey], ` */, `);
       switch (field.mapValue.kind) {
         case "scalar":
@@ -113,10 +124,10 @@ export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescF
           break;
       }
       break;
-    case "message_field":
+    case "message":
       e.push(`kind: "message", T: `, field.message, `, `);
       break;
-    case "enum_field":
+    case "enum":
       e.push(`kind: "enum", T: `, protoN, `.getEnumType(`, field.enum, `), `);
       break;
   }
@@ -146,7 +157,7 @@ export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescF
 
 // prettier-ignore
 function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
-  const ref = matchWkt(message);
+  const ref = reifyWkt(message);
   if (ref === undefined) {
     return;
   }
@@ -179,6 +190,9 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print(`  if (json === null || Array.isArray(json) || typeof json != "object") {`);
       f.print("    throw new Error(`cannot decode message ", message.typeName, ' from JSON: expected object but got ${json === null ? "null" : Array.isArray(json) ? "array" : typeof json}`);');
       f.print("  }");
+      f.print(`  if (Object.keys(json).length == 0) {`);
+      f.print(`    return this;`);
+      f.print(`  }`);
       f.print(`  const typeUrl = json["@type"];`);
       f.print(`  if (typeof typeUrl != "string" || typeUrl == "") {`);
       f.print("    throw new Error(`cannot decode message ", message.typeName, ' from JSON: "@type" is empty`);');
@@ -502,7 +516,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
 
 // prettier-ignore
 function generateWktStaticMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
-  const ref = matchWkt(message);
+  const ref = reifyWkt(message);
   if (ref === undefined) {
     return;
   }

package/src/protoc-gen-es-plugin.ts

@@ -13,32 +13,15 @@
 // limitations under the License.
 
 import { createEcmaScriptPlugin } from "@bufbuild/protoplugin";
-import { typescript } from "./typescript.js";
-import { javascript } from "./javascript.js";
-import { declaration } from "./declaration";
+import { generateTs } from "./typescript.js";
+import { generateJs } from "./javascript.js";
+import { generateDts } from "./declaration.js";
 import { version } from "../package.json";
 
-export const protocGenEs = createEcmaScriptPlugin(
-  {
-    name: "protoc-gen-es",
-    version: `v${String(version)}`,
-  },
-  (schema) => {
-    const targets = [typescript, javascript, declaration].filter((gen) =>
-      schema.targets.includes(gen.target)
-    );
-    for (const target of targets) {
-      for (const file of schema.files) {
-        const f = schema.generateFile(file.name + target.extension);
-        f.preamble(file);
-        for (const enumeration of file.enums) {
-          target.generateEnum(schema, f, enumeration);
-        }
-        for (const message of file.messages) {
-          target.generateMessage(schema, f, message);
-        }
-        // We do not generate anything for services, and we do not support extensions at this time
-      }
-    }
-  }
-);
+export const protocGenEs = createEcmaScriptPlugin({
+  name: "protoc-gen-es",
+  version: `v${String(version)}`,
+  generateTs,
+  generateJs,
+  generateDts,
+});

package/src/typescript.ts

@@ -19,23 +19,34 @@ import type {
   DescOneof,
 } from "@bufbuild/protobuf";
 import { ScalarType } from "@bufbuild/protobuf";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type {
+  GeneratedFile,
+  Printable,
+  Schema,
+} from "@bufbuild/protoplugin/ecmascript";
 import {
   localName,
   getFieldIntrinsicDefaultValue,
   getFieldTyping,
   makeJsDoc,
+  reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
-import { matchWkt } from "./match-wkt.js";
 import { generateFieldInfo } from "./javascript.js";
 import { literalString } from "@bufbuild/protoplugin/ecmascript";
 
-export const typescript = {
-  target: "ts",
-  extension: "_pb.ts",
-  generateEnum,
-  generateMessage,
-} as const;
+export function generateTs(schema: Schema) {
+  for (const file of schema.files) {
+    const f = schema.generateFile(file.name + "_pb.ts");
+    f.preamble(file);
+    for (const enumeration of file.enums) {
+      generateEnum(schema, f, enumeration);
+    }
+    for (const message of file.messages) {
+      generateMessage(schema, f, message);
+    }
+    // We do not generate anything for services, and we do not support extensions at this time
+  }
+}
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
@@ -145,7 +156,7 @@ function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
 
 function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
   f.print(makeJsDoc(field, "  "));
-  const e: Parameters<typeof f.print> = [];
+  const e: Printable = [];
   e.push("  ", localName(field));
   const { defaultValue, typingInferrable } =
     getFieldIntrinsicDefaultValue(field);
@@ -164,7 +175,7 @@ function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
 
 // prettier-ignore
 function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
-  const ref = matchWkt(message);
+  const ref = reifyWkt(message);
   if (ref === undefined) {
     return;
   }
@@ -203,6 +214,9 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print(`    if (json === null || Array.isArray(json) || typeof json != "object") {`);
       f.print("      throw new Error(`cannot decode message ", message.typeName, ' from JSON: expected object but got ${json === null ? "null" : Array.isArray(json) ? "array" : typeof json}`);');
       f.print("    }");
+      f.print(`    if (Object.keys(json).length == 0) {`);
+      f.print(`      return this;`);
+      f.print(`    }`);
       f.print(`    const typeUrl = json["@type"];`);
       f.print(`    if (typeof typeUrl != "string" || typeUrl == "") {`);
       f.print("      throw new Error(`cannot decode message ", message.typeName, ' from JSON: "@type" is empty`);');
@@ -526,7 +540,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
 
 // prettier-ignore
 function generateWktStaticMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
-  const ref = matchWkt(message);
+  const ref = reifyWkt(message);
   if (ref === undefined) {
     return;
   }

package/dist/cjs/src/match-wkt.js

@@ -1,159 +0,0 @@
-"use strict";
-// Copyright 2021-2022 Buf Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchWkt = void 0;
-const protobuf_1 = require("@bufbuild/protobuf");
-function matchWkt(message) {
-    switch (message.typeName) {
-        case "google.protobuf.Any": {
-            const typeUrl = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.STRING);
-            const value = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.BYTES);
-            if (typeUrl && value) {
-                return {
-                    typeName: message.typeName,
-                    typeUrl,
-                    value,
-                };
-            }
-            break;
-        }
-        case "google.protobuf.Timestamp": {
-            const seconds = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.INT64);
-            const nanos = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.INT32);
-            if (seconds && nanos) {
-                return {
-                    typeName: message.typeName,
-                    seconds,
-                    nanos,
-                };
-            }
-            break;
-        }
-        case "google.protobuf.Duration": {
-            const seconds = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.INT64);
-            const nanos = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.INT32);
-            if (seconds && nanos) {
-                return {
-                    typeName: message.typeName,
-                    seconds,
-                    nanos,
-                };
-            }
-            break;
-        }
-        case "google.protobuf.Struct": {
-            const fields = message.fields.find((f) => f.number == 1 && !f.repeated);
-            if ((fields === null || fields === void 0 ? void 0 : fields.kind) !== "map_field" ||
-                fields.mapValue.kind !== "message" ||
-                fields.mapValue.message.typeName !== "google.protobuf.Value") {
-                break;
-            }
-            return { typeName: message.typeName, fields };
-        }
-        case "google.protobuf.Value": {
-            const kind = message.oneofs.find((o) => o.name === "kind");
-            const nullValue = message.fields.find((f) => f.number == 1 && f.oneof === kind);
-            if ((nullValue === null || nullValue === void 0 ? void 0 : nullValue.kind) !== "enum_field" ||
-                nullValue.enum.typeName !== "google.protobuf.NullValue") {
-                return undefined;
-            }
-            const numberValue = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.DOUBLE &&
-                f.oneof === kind);
-            const stringValue = message.fields.find((f) => f.number == 3 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.STRING &&
-                f.oneof === kind);
-            const boolValue = message.fields.find((f) => f.number == 4 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.BOOL &&
-                f.oneof === kind);
-            const structValue = message.fields.find((f) => f.number == 5 && f.oneof === kind);
-            if ((structValue === null || structValue === void 0 ? void 0 : structValue.kind) !== "message_field" ||
-                structValue.message.typeName !== "google.protobuf.Struct") {
-                return undefined;
-            }
-            const listValue = message.fields.find((f) => f.number == 6 && f.oneof === kind);
-            if ((listValue === null || listValue === void 0 ? void 0 : listValue.kind) !== "message_field" ||
-                listValue.message.typeName !== "google.protobuf.ListValue") {
-                return undefined;
-            }
-            if (kind && numberValue && stringValue && boolValue) {
-                return {
-                    typeName: message.typeName,
-                    kind,
-                    nullValue,
-                    numberValue,
-                    stringValue,
-                    boolValue,
-                    structValue,
-                    listValue,
-                };
-            }
-            break;
-        }
-        case "google.protobuf.ListValue": {
-            const values = message.fields.find((f) => f.number == 1 && f.repeated);
-            if ((values === null || values === void 0 ? void 0 : values.kind) != "message_field" ||
-                values.message.typeName !== "google.protobuf.Value") {
-                break;
-            }
-            return { typeName: message.typeName, values };
-        }
-        case "google.protobuf.FieldMask": {
-            const paths = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
-                f.scalar === protobuf_1.ScalarType.STRING &&
-                f.repeated);
-            if (paths) {
-                return { typeName: message.typeName, paths };
-            }
-            break;
-        }
-        case "google.protobuf.DoubleValue":
-        case "google.protobuf.FloatValue":
-        case "google.protobuf.Int64Value":
-        case "google.protobuf.UInt64Value":
-        case "google.protobuf.Int32Value":
-        case "google.protobuf.UInt32Value":
-        case "google.protobuf.BoolValue":
-        case "google.protobuf.StringValue":
-        case "google.protobuf.BytesValue": {
-            const value = message.fields.find((f) => f.number == 1 && f.name == "value");
-            if (!value) {
-                break;
-            }
-            if (value.kind !== "scalar_field") {
-                break;
-            }
-            return { typeName: message.typeName, value };
-        }
-    }
-    return undefined;
-}
-exports.matchWkt = matchWkt;

package/src/match-wkt.ts

@@ -1,285 +0,0 @@
-// Copyright 2021-2022 Buf Technologies, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import {
-  DescField,
-  DescMessage,
-  DescOneof,
-  ScalarType,
-} from "@bufbuild/protobuf";
-
-type DescWkt =
-  | {
-      typeName: "google.protobuf.Any";
-      typeUrl: DescField;
-      value: DescField;
-    }
-  | {
-      typeName: "google.protobuf.Timestamp";
-      seconds: DescField;
-      nanos: DescField;
-    }
-  | {
-      typeName: "google.protobuf.Duration";
-      seconds: DescField;
-      nanos: DescField;
-    }
-  | {
-      typeName: "google.protobuf.Struct";
-      fields: DescField & { kind: "map_field" };
-    }
-  | {
-      typeName: "google.protobuf.Value";
-      kind: DescOneof;
-      nullValue: DescField & { kind: "enum_field" };
-      numberValue: DescField;
-      stringValue: DescField;
-      boolValue: DescField;
-      structValue: DescField & { kind: "message_field" };
-      listValue: DescField & { kind: "message_field" };
-    }
-  | {
-      typeName: "google.protobuf.ListValue";
-      values: DescField & { kind: "message_field" };
-    }
-  | {
-      typeName: "google.protobuf.FieldMask";
-      paths: DescField;
-    }
-  | {
-      typeName: "google.protobuf.DoubleValue";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.FloatValue";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.Int64Value";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.UInt64Value";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.Int32Value";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.UInt32Value";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.BoolValue";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.StringValue";
-      value: DescField & { kind: "scalar_field" };
-    }
-  | {
-      typeName: "google.protobuf.BytesValue";
-      value: DescField & { kind: "scalar_field" };
-    };
-
-export function matchWkt(message: DescMessage): DescWkt | undefined {
-  switch (message.typeName) {
-    case "google.protobuf.Any": {
-      const typeUrl = message.fields.find(
-        (f) =>
-          f.number == 1 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.STRING
-      );
-      const value = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.BYTES
-      );
-      if (typeUrl && value) {
-        return {
-          typeName: message.typeName,
-          typeUrl,
-          value,
-        };
-      }
-      break;
-    }
-    case "google.protobuf.Timestamp": {
-      const seconds = message.fields.find(
-        (f) =>
-          f.number == 1 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.INT64
-      );
-      const nanos = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.INT32
-      );
-      if (seconds && nanos) {
-        return {
-          typeName: message.typeName,
-          seconds,
-          nanos,
-        };
-      }
-      break;
-    }
-    case "google.protobuf.Duration": {
-      const seconds = message.fields.find(
-        (f) =>
-          f.number == 1 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.INT64
-      );
-      const nanos = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.INT32
-      );
-      if (seconds && nanos) {
-        return {
-          typeName: message.typeName,
-          seconds,
-          nanos,
-        };
-      }
-      break;
-    }
-    case "google.protobuf.Struct": {
-      const fields = message.fields.find((f) => f.number == 1 && !f.repeated);
-      if (
-        fields?.kind !== "map_field" ||
-        fields.mapValue.kind !== "message" ||
-        fields.mapValue.message.typeName !== "google.protobuf.Value"
-      ) {
-        break;
-      }
-      return { typeName: message.typeName, fields };
-    }
-    case "google.protobuf.Value": {
-      const kind = message.oneofs.find((o) => o.name === "kind");
-      const nullValue = message.fields.find(
-        (f) => f.number == 1 && f.oneof === kind
-      );
-      if (
-        nullValue?.kind !== "enum_field" ||
-        nullValue.enum.typeName !== "google.protobuf.NullValue"
-      ) {
-        return undefined;
-      }
-      const numberValue = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.DOUBLE &&
-          f.oneof === kind
-      );
-      const stringValue = message.fields.find(
-        (f) =>
-          f.number == 3 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.STRING &&
-          f.oneof === kind
-      );
-      const boolValue = message.fields.find(
-        (f) =>
-          f.number == 4 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.BOOL &&
-          f.oneof === kind
-      );
-      const structValue = message.fields.find(
-        (f) => f.number == 5 && f.oneof === kind
-      );
-      if (
-        structValue?.kind !== "message_field" ||
-        structValue.message.typeName !== "google.protobuf.Struct"
-      ) {
-        return undefined;
-      }
-      const listValue = message.fields.find(
-        (f) => f.number == 6 && f.oneof === kind
-      );
-      if (
-        listValue?.kind !== "message_field" ||
-        listValue.message.typeName !== "google.protobuf.ListValue"
-      ) {
-        return undefined;
-      }
-      if (kind && numberValue && stringValue && boolValue) {
-        return {
-          typeName: message.typeName,
-          kind,
-          nullValue,
-          numberValue,
-          stringValue,
-          boolValue,
-          structValue,
-          listValue,
-        };
-      }
-      break;
-    }
-    case "google.protobuf.ListValue": {
-      const values = message.fields.find((f) => f.number == 1 && f.repeated);
-      if (
-        values?.kind != "message_field" ||
-        values.message.typeName !== "google.protobuf.Value"
-      ) {
-        break;
-      }
-      return { typeName: message.typeName, values };
-    }
-    case "google.protobuf.FieldMask": {
-      const paths = message.fields.find(
-        (f) =>
-          f.number == 1 &&
-          f.kind == "scalar_field" &&
-          f.scalar === ScalarType.STRING &&
-          f.repeated
-      );
-      if (paths) {
-        return { typeName: message.typeName, paths };
-      }
-      break;
-    }
-    case "google.protobuf.DoubleValue":
-    case "google.protobuf.FloatValue":
-    case "google.protobuf.Int64Value":
-    case "google.protobuf.UInt64Value":
-    case "google.protobuf.Int32Value":
-    case "google.protobuf.UInt32Value":
-    case "google.protobuf.BoolValue":
-    case "google.protobuf.StringValue":
-    case "google.protobuf.BytesValue": {
-      const value = message.fields.find(
-        (f) => f.number == 1 && f.name == "value"
-      );
-      if (!value) {
-        break;
-      }
-      if (value.kind !== "scalar_field") {
-        break;
-      }
-      return { typeName: message.typeName, value };
-    }
-  }
-  return undefined;
-}