@bufbuild/protoc-gen-es 0.2.0 → 0.3.0

package/dist/cjs/package.json

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

package/dist/cjs/src/declaration.js

@@ -15,7 +15,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDts = void 0;
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
-const match_wkt_js_1 = require("./match-wkt.js");
 function generateDts(schema) {
     for (const file of schema.files) {
         const f = schema.generateFile(file.name + "_pb.d.ts");
@@ -119,18 +118,20 @@ 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;
     }
-    const { Message, MessageType, } = schema.runtime;
+    const { Message, MessageType, IMessageTypeRegistry } = schema.runtime;
     switch (ref.typeName) {
         case "google.protobuf.Any":
             f.print("  packFrom(message: ", Message, "): void;");
             f.print();
             f.print("  unpackTo(target: ", Message, "): boolean;");
             f.print();
-            f.print("  is(type: ", MessageType, "): boolean;");
+            f.print("  unpack(registry: ", IMessageTypeRegistry, "): Message | undefined;");
+            f.print();
+            f.print("  is(type: ", MessageType, " | string): boolean;");
             f.print();
             f.print("  private typeNameToUrl(name: string): string;");
             f.print();
@@ -160,7 +161,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;
     }
@@ -186,7 +187,7 @@ function generateWktStaticMethods(schema, f, message) {
         case "google.protobuf.BytesValue": {
             const { typing } = (0, ecmascript_1.getFieldTyping)(ref.value, f);
             f.print("  static readonly fieldWrapper: {");
-            f.print("    wrapField(value: ", typing, " | ", message, "): ", message, ",");
+            f.print("    wrapField(value: ", typing, "): ", message, ",");
             f.print("    unwrapField(value: ", message, "): ", typing, ",");
             f.print("  };");
             f.print();

package/dist/cjs/src/javascript.js

@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
 function generateJs(schema) {
     for (const file of schema.files) {
         const f = schema.generateFile(file.name + "_pb.js");
@@ -148,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;
     }
@@ -178,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`);');
@@ -211,8 +213,29 @@ function generateWktMethods(schema, f, message) {
             f.print("  return true;");
             f.print("};");
             f.print();
+            f.print(message, ".prototype.unpack = function unpack(registry) {");
+            f.print("    if (this.", (0, ecmascript_1.localName)(ref.typeUrl), ` === "") {`);
+            f.print("      return undefined;");
+            f.print("    }");
+            f.print("    const messageType = registry.findMessage(this.typeUrlToName(this.", (0, ecmascript_1.localName)(ref.typeUrl), "));");
+            f.print("    if (!messageType) {");
+            f.print("      return undefined;");
+            f.print("    }");
+            f.print("    return messageType.fromBinary(this.", (0, ecmascript_1.localName)(ref.value), ");");
+            f.print("  }");
+            f.print();
             f.print(message, ".prototype.is = function is(type) {");
-            f.print("  return this.", (0, ecmascript_1.localName)(ref.typeUrl), " === this.typeNameToUrl(type.typeName);");
+            f.print("  if (this.typeUrl === '') {");
+            f.print("    return false;");
+            f.print("  }");
+            f.print("  const name = this.typeUrlToName(this.", (0, ecmascript_1.localName)(ref.typeUrl), ");");
+            f.print("  let typeName = '';");
+            f.print("  if (typeof type === 'string') {");
+            f.print("      typeName = type;");
+            f.print("  } else {");
+            f.print("      typeName = type.typeName;");
+            f.print("  }");
+            f.print("  return name === typeName;");
             f.print("};");
             f.print();
             f.print(message, ".prototype.typeNameToUrl = function typeNameToUrl(name) {");
@@ -500,7 +523,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;
     }
@@ -539,7 +562,7 @@ function generateWktStaticMethods(schema, f, message) {
         case "google.protobuf.BytesValue": {
             f.print(message, ".fieldWrapper = {");
             f.print("  wrapField(value) {");
-            f.print("    return value instanceof ", message, " ? value : new ", message, "({value});");
+            f.print("    return new ", message, "({value});");
             f.print("  },");
             f.print("  unwrapField(value) {");
             f.print("    return value.", (0, ecmascript_1.localName)(ref.value), ";");

package/dist/cjs/src/typescript.js

@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
 function generateTs(schema) {
@@ -149,11 +148,11 @@ 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;
     }
-    const { Message, JsonValue, JsonReadOptions, JsonWriteOptions, JsonObject, MessageType, ScalarType: rtScalarType, protoInt64, } = schema.runtime;
+    const { Message, JsonValue, JsonReadOptions, JsonWriteOptions, JsonObject, MessageType, IMessageTypeRegistry, ScalarType: rtScalarType, protoInt64, } = schema.runtime;
     const protoN = schema.runtime[message.file.syntax];
     switch (ref.typeName) {
         case "google.protobuf.Any":
@@ -179,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`);');
@@ -212,8 +214,29 @@ function generateWktMethods(schema, f, message) {
             f.print("    return true;");
             f.print("  }");
             f.print();
-            f.print("  is(type: ", MessageType, "): boolean {");
-            f.print("    return this.", (0, ecmascript_1.localName)(ref.typeUrl), " === this.typeNameToUrl(type.typeName);");
+            f.print("  unpack(registry: ", IMessageTypeRegistry, "): ", Message, " | undefined {");
+            f.print("    if (this.", (0, ecmascript_1.localName)(ref.typeUrl), ` === "") {`);
+            f.print("      return undefined;");
+            f.print("    }");
+            f.print("    const messageType = registry.findMessage(this.typeUrlToName(this.", (0, ecmascript_1.localName)(ref.typeUrl), "));");
+            f.print("    if (!messageType) {");
+            f.print("      return undefined;");
+            f.print("    }");
+            f.print("    return messageType.fromBinary(this.", (0, ecmascript_1.localName)(ref.value), ");");
+            f.print("  }");
+            f.print();
+            f.print("  is(type: ", MessageType, " | string): boolean {");
+            f.print("    if (this.typeUrl === '') {");
+            f.print("      return false;");
+            f.print("    }");
+            f.print("    const name = this.typeUrlToName(this.", (0, ecmascript_1.localName)(ref.typeUrl), ");");
+            f.print("    let typeName = '';");
+            f.print("    if (typeof type === 'string') {");
+            f.print("        typeName = type;");
+            f.print("    } else {");
+            f.print("        typeName = type.typeName;");
+            f.print("    }");
+            f.print("    return name === typeName;");
             f.print("  }");
             f.print();
             f.print("  private typeNameToUrl(name: string): string {");
@@ -501,7 +524,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;
     }
@@ -540,8 +563,8 @@ function generateWktStaticMethods(schema, f, message) {
         case "google.protobuf.BytesValue": {
             const { typing } = (0, ecmascript_1.getFieldTyping)(ref.value, f);
             f.print("  static readonly fieldWrapper = {");
-            f.print("    wrapField(value: ", typing, " | ", message, "): ", message, " {");
-            f.print("      return value instanceof ", message, " ? value : new ", message, "({value});");
+            f.print("    wrapField(value: ", typing, "): ", message, " {");
+            f.print("      return new ", message, "({value});");
             f.print("    },");
             f.print("    unwrapField(value: ", message, "): ", typing, " {");
             f.print("      return value.", (0, ecmascript_1.localName)(ref.value), ";");

package/package.json

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

package/src/declaration.ts

@@ -28,8 +28,8 @@ import {
   literalString,
   localName,
   makeJsDoc,
+  reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
-import { matchWkt } from "./match-wkt.js";
 
 export function generateDts(schema: Schema) {
   for (const file of schema.files) {
@@ -145,13 +145,14 @@ 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;
   }
   const {
     Message,
     MessageType,
+    IMessageTypeRegistry
   } = schema.runtime;
   switch (ref.typeName) {
     case "google.protobuf.Any":
@@ -159,7 +160,9 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print();
       f.print("  unpackTo(target: ", Message, "): boolean;");
       f.print();
-      f.print("  is(type: ", MessageType, "): boolean;");
+      f.print("  unpack(registry: ", IMessageTypeRegistry, "): Message | undefined;");
+      f.print();
+      f.print("  is(type: ", MessageType, " | string): boolean;");
       f.print();
       f.print("  private typeNameToUrl(name: string): string;");
       f.print();
@@ -190,7 +193,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;
   }
@@ -216,7 +219,7 @@ function generateWktStaticMethods(schema: Schema, f: GeneratedFile, message: Des
     case "google.protobuf.BytesValue": {
       const {typing} = getFieldTyping(ref.value, f);
       f.print("  static readonly fieldWrapper: {")
-      f.print("    wrapField(value: ", typing, " | ", message, "): ", message, ",")
+      f.print("    wrapField(value: ", typing, "): ", message, ",")
       f.print("    unwrapField(value: ", message, "): ", typing, ",")
       f.print("  };")
       f.print()

package/src/javascript.ts

@@ -24,8 +24,8 @@ import {
   literalString,
   localName,
   makeJsDoc,
+  reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
-import { matchWkt } from "./match-wkt.js";
 
 export function generateJs(schema: Schema) {
   for (const file of schema.files) {
@@ -157,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;
   }
@@ -190,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`);');
@@ -223,8 +226,29 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print("  return true;");
       f.print("};");
       f.print();
+      f.print(message, ".prototype.unpack = function unpack(registry) {")
+      f.print("    if (this.", localName(ref.typeUrl), ` === "") {`);
+      f.print("      return undefined;");
+      f.print("    }");
+      f.print("    const messageType = registry.findMessage(this.typeUrlToName(this.", localName(ref.typeUrl), "));");
+      f.print("    if (!messageType) {");
+      f.print("      return undefined;");
+      f.print("    }");
+      f.print("    return messageType.fromBinary(this.", localName(ref.value), ");");
+      f.print("  }");
+      f.print();
       f.print(message, ".prototype.is = function is(type) {")
-      f.print("  return this.", localName(ref.typeUrl), " === this.typeNameToUrl(type.typeName);");
+      f.print("  if (this.typeUrl === '') {");
+      f.print("    return false;");
+      f.print("  }");
+      f.print("  const name = this.typeUrlToName(this.", localName(ref.typeUrl), ");");
+      f.print("  let typeName = '';");
+      f.print("  if (typeof type === 'string') {");
+      f.print("      typeName = type;");
+      f.print("  } else {");
+      f.print("      typeName = type.typeName;");
+      f.print("  }");
+      f.print("  return name === typeName;");
       f.print("};");
       f.print();
       f.print(message, ".prototype.typeNameToUrl = function typeNameToUrl(name) {")
@@ -513,7 +537,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;
   }
@@ -554,7 +578,7 @@ function generateWktStaticMethods(schema: Schema, f: GeneratedFile, message: Des
     case "google.protobuf.BytesValue": {
       f.print(message, ".fieldWrapper = {")
       f.print("  wrapField(value) {")
-      f.print("    return value instanceof ", message, " ? value : new ", message, "({value});")
+      f.print("    return new ", message, "({value});")
       f.print("  },")
       f.print("  unwrapField(value) {")
       f.print("    return value.", localName(ref.value), ";")

package/src/typescript.ts

@@ -29,8 +29,8 @@ import {
   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";
 
@@ -175,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;
   }
@@ -186,6 +186,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
     JsonWriteOptions,
     JsonObject,
     MessageType,
+    IMessageTypeRegistry,
     ScalarType: rtScalarType,
     protoInt64,
   } = schema.runtime;
@@ -214,6 +215,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`);');
@@ -247,8 +251,29 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print("    return true;");
       f.print("  }");
       f.print();
-      f.print("  is(type: ", MessageType, "): boolean {");
-      f.print("    return this.", localName(ref.typeUrl), " === this.typeNameToUrl(type.typeName);");
+      f.print("  unpack(registry: ", IMessageTypeRegistry, "): ", Message, " | undefined {");
+      f.print("    if (this.", localName(ref.typeUrl), ` === "") {`);
+      f.print("      return undefined;");
+      f.print("    }");
+      f.print("    const messageType = registry.findMessage(this.typeUrlToName(this.", localName(ref.typeUrl), "));");
+      f.print("    if (!messageType) {");
+      f.print("      return undefined;");
+      f.print("    }");
+      f.print("    return messageType.fromBinary(this.", localName(ref.value), ");");
+      f.print("  }");
+      f.print();
+      f.print("  is(type: ", MessageType, " | string): boolean {");
+      f.print("    if (this.typeUrl === '') {");
+      f.print("      return false;");
+      f.print("    }");
+      f.print("    const name = this.typeUrlToName(this.", localName(ref.typeUrl), ");");
+      f.print("    let typeName = '';");
+      f.print("    if (typeof type === 'string') {");
+      f.print("        typeName = type;");
+      f.print("    } else {");
+      f.print("        typeName = type.typeName;");
+      f.print("    }");
+      f.print("    return name === typeName;");
       f.print("  }");
       f.print();
       f.print("  private typeNameToUrl(name: string): string {");
@@ -537,7 +562,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;
   }
@@ -578,8 +603,8 @@ function generateWktStaticMethods(schema: Schema, f: GeneratedFile, message: Des
     case "google.protobuf.BytesValue": {
       const {typing} = getFieldTyping(ref.value, f);
       f.print("  static readonly fieldWrapper = {")
-      f.print("    wrapField(value: ", typing, " | ", message, "): ", message, " {")
-      f.print("      return value instanceof ", message, " ? value : new ", message, "({value});")
+      f.print("    wrapField(value: ", typing, "): ", message, " {")
+      f.print("      return new ", message, "({value});")
       f.print("    },")
       f.print("    unwrapField(value: ", message, "): ", typing, " {")
       f.print("      return value.", localName(ref.value), ";")

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.fieldKind == "scalar" &&
-                f.scalar === protobuf_1.ScalarType.STRING);
-            const value = message.fields.find((f) => f.number == 2 &&
-                f.fieldKind == "scalar" &&
-                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.fieldKind == "scalar" &&
-                f.scalar === protobuf_1.ScalarType.INT64);
-            const nanos = message.fields.find((f) => f.number == 2 &&
-                f.fieldKind == "scalar" &&
-                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.fieldKind == "scalar" &&
-                f.scalar === protobuf_1.ScalarType.INT64);
-            const nanos = message.fields.find((f) => f.number == 2 &&
-                f.fieldKind == "scalar" &&
-                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.fieldKind) !== "map" ||
-                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.fieldKind) !== "enum" ||
-                nullValue.enum.typeName !== "google.protobuf.NullValue") {
-                return undefined;
-            }
-            const numberValue = message.fields.find((f) => f.number == 2 &&
-                f.fieldKind == "scalar" &&
-                f.scalar === protobuf_1.ScalarType.DOUBLE &&
-                f.oneof === kind);
-            const stringValue = message.fields.find((f) => f.number == 3 &&
-                f.fieldKind == "scalar" &&
-                f.scalar === protobuf_1.ScalarType.STRING &&
-                f.oneof === kind);
-            const boolValue = message.fields.find((f) => f.number == 4 &&
-                f.fieldKind == "scalar" &&
-                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.fieldKind) !== "message" ||
-                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.fieldKind) !== "message" ||
-                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.fieldKind) != "message" ||
-                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.fieldKind == "scalar" &&
-                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.fieldKind !== "scalar") {
-                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 & { fieldKind: "map" };
-    }
-  | {
-      typeName: "google.protobuf.Value";
-      kind: DescOneof;
-      nullValue: DescField & { fieldKind: "enum" };
-      numberValue: DescField;
-      stringValue: DescField;
-      boolValue: DescField;
-      structValue: DescField & { fieldKind: "message" };
-      listValue: DescField & { fieldKind: "message" };
-    }
-  | {
-      typeName: "google.protobuf.ListValue";
-      values: DescField & { fieldKind: "message" };
-    }
-  | {
-      typeName: "google.protobuf.FieldMask";
-      paths: DescField;
-    }
-  | {
-      typeName: "google.protobuf.DoubleValue";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.FloatValue";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.Int64Value";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.UInt64Value";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.Int32Value";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.UInt32Value";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.BoolValue";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.StringValue";
-      value: DescField & { fieldKind: "scalar" };
-    }
-  | {
-      typeName: "google.protobuf.BytesValue";
-      value: DescField & { fieldKind: "scalar" };
-    };
-
-export function matchWkt(message: DescMessage): DescWkt | undefined {
-  switch (message.typeName) {
-    case "google.protobuf.Any": {
-      const typeUrl = message.fields.find(
-        (f) =>
-          f.number == 1 &&
-          f.fieldKind == "scalar" &&
-          f.scalar === ScalarType.STRING
-      );
-      const value = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.fieldKind == "scalar" &&
-          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.fieldKind == "scalar" &&
-          f.scalar === ScalarType.INT64
-      );
-      const nanos = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.fieldKind == "scalar" &&
-          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.fieldKind == "scalar" &&
-          f.scalar === ScalarType.INT64
-      );
-      const nanos = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.fieldKind == "scalar" &&
-          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?.fieldKind !== "map" ||
-        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?.fieldKind !== "enum" ||
-        nullValue.enum.typeName !== "google.protobuf.NullValue"
-      ) {
-        return undefined;
-      }
-      const numberValue = message.fields.find(
-        (f) =>
-          f.number == 2 &&
-          f.fieldKind == "scalar" &&
-          f.scalar === ScalarType.DOUBLE &&
-          f.oneof === kind
-      );
-      const stringValue = message.fields.find(
-        (f) =>
-          f.number == 3 &&
-          f.fieldKind == "scalar" &&
-          f.scalar === ScalarType.STRING &&
-          f.oneof === kind
-      );
-      const boolValue = message.fields.find(
-        (f) =>
-          f.number == 4 &&
-          f.fieldKind == "scalar" &&
-          f.scalar === ScalarType.BOOL &&
-          f.oneof === kind
-      );
-      const structValue = message.fields.find(
-        (f) => f.number == 5 && f.oneof === kind
-      );
-      if (
-        structValue?.fieldKind !== "message" ||
-        structValue.message.typeName !== "google.protobuf.Struct"
-      ) {
-        return undefined;
-      }
-      const listValue = message.fields.find(
-        (f) => f.number == 6 && f.oneof === kind
-      );
-      if (
-        listValue?.fieldKind !== "message" ||
-        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?.fieldKind != "message" ||
-        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.fieldKind == "scalar" &&
-          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.fieldKind !== "scalar") {
-        break;
-      }
-      return { typeName: message.typeName, value };
-    }
-  }
-  return undefined;
-}