@aptre/protobuf-es-lite 0.2.15 → 0.3.0

package/dist/message.js

@@ -14,8 +14,81 @@
 import { newFieldList, resolveMessageType, } from "./field.js";
 import { applyPartialMessage } from "./partial.js";
 import { ScalarType, scalarEquals } from "./scalar.js";
-import { makeReadOptions as makeBinaryReadOptions, readMessage as readBinaryMessage, makeWriteOptions as makeBinaryWriteOptions, writeMessage as writeBinaryMessage, } from "./binary.js";
-import { makeReadOptions as makeJsonReadOptions, readMessage as readJsonMessage, makeWriteOptions as makeJsonWriteOptions, writeMessage as writeJsonMessage, } from "./json.js";
+import { binaryReadMessage, binaryWriteMessage, binaryMakeReadOptions, binaryMakeWriteOptions, } from "./binary.js";
+import { jsonReadMessage, jsonWriteMessage, jsonMakeReadOptions, jsonMakeWriteOptions, } from "./json.js";
+/**
+ * createMessageType creates a new message type.
+ *
+ * The argument `packedByDefault` specifies whether fields that do not specify
+ * `packed` should be packed (proto3) or unpacked (proto2).
+ */
+export function createMessageType(params, exts) {
+    const { fields: fieldsSource, typeName, packedByDefault, delimitedMessageEncoding, fieldWrapper, } = params;
+    const fields = newFieldList(fieldsSource, packedByDefault);
+    const mt = {
+        typeName,
+        fields,
+        fieldWrapper,
+        create(partial) {
+            const message = createMessage(fields);
+            applyPartialMessage(partial, message, fields);
+            return message;
+        },
+        equals(a, b) {
+            return compareMessages(fields, a, b);
+        },
+        clone(a) {
+            if (a == null) {
+                return a;
+            }
+            return cloneMessage(a, fields);
+        },
+        fromBinary(bytes, options) {
+            const message = {};
+            if (bytes && bytes.length) {
+                const opt = binaryMakeReadOptions(options);
+                binaryReadMessage(message, fields, opt.readerFactory(bytes), bytes.byteLength, opt, delimitedMessageEncoding);
+            }
+            return message;
+        },
+        fromJson(jsonValue, options) {
+            const message = {};
+            if (jsonValue != null) {
+                const opts = jsonMakeReadOptions(options);
+                jsonReadMessage(fields, typeName, jsonValue, opts, message);
+            }
+            return message;
+        },
+        fromJsonString(jsonString, options) {
+            let json = null;
+            if (jsonString) {
+                try {
+                    json = JSON.parse(jsonString);
+                }
+                catch (e) {
+                    throw new Error(`cannot decode ${typeName} from JSON: ${e instanceof Error ? e.message : String(e)}`);
+                }
+            }
+            return mt.fromJson(json, options);
+        },
+        toBinary(a, options) {
+            const opt = binaryMakeWriteOptions(options);
+            const writer = opt.writerFactory();
+            binaryWriteMessage(a, fields, writer, opt);
+            return writer.finish();
+        },
+        toJson(a, options) {
+            const opt = jsonMakeWriteOptions(options);
+            return jsonWriteMessage(a, fields, opt);
+        },
+        toJsonString(a, options) {
+            const value = mt.toJson(a, options);
+            return JSON.stringify(value, null, options?.prettySpaces ?? 0);
+        },
+        ...(exts ?? {}),
+    };
+    return mt;
+}
 // compareMessages compares two messages for equality.
 export function compareMessages(fields, a, b) {
     if (a == null && b == null) {
@@ -144,81 +217,6 @@ export function cloneMessage(message, fields) {
     }
     return clone;
 }
-/**
- * createMessageType creates a new message type.
- *
- * The argument `packedByDefault` specifies whether fields that do not specify
- * `packed` should be packed (proto3) or unpacked (proto2).
- */
-export function createMessageType(params) {
-    const { fields: fieldsSource, typeName, packedByDefault, delimitedMessageEncoding, fieldWrapper, } = params;
-    const fields = newFieldList(fieldsSource, packedByDefault);
-    const mt = {
-        typeName,
-        fields,
-        fieldWrapper,
-        create(partial) {
-            const message = createMessage(fields);
-            applyPartialMessage(partial, message, fields);
-            return message;
-        },
-        equals(a, b) {
-            return compareMessages(fields, a, b);
-        },
-        clone(a) {
-            if (a == null) {
-                return a;
-            }
-            return cloneMessage(a, fields);
-        },
-        fromBinary(bytes, options) {
-            const message = {};
-            if (bytes && bytes.length) {
-                const opt = makeBinaryReadOptions(options);
-                readBinaryMessage(message, fields, opt.readerFactory(bytes), bytes.byteLength, opt, delimitedMessageEncoding);
-            }
-            return message;
-        },
-        fromJson(jsonValue, options) {
-            const message = {};
-            if (jsonValue != null) {
-                const opts = makeJsonReadOptions(options);
-                readJsonMessage(fields, typeName, jsonValue, opts, message);
-            }
-            return message;
-        },
-        fromJsonString(jsonString, options) {
-            let json = null;
-            if (jsonString) {
-                try {
-                    json = JSON.parse(jsonString);
-                }
-                catch (e) {
-                    throw new Error(`cannot decode ${typeName} from JSON: ${e instanceof Error ? e.message : String(e)}`);
-                }
-            }
-            return this.fromJson(json, options);
-        },
-        toBinary(a, options) {
-            const opt = makeBinaryWriteOptions(options);
-            const writer = opt.writerFactory();
-            writeBinaryMessage(a, fields, writer, opt);
-            return writer.finish();
-        },
-        toJson(a, options) {
-            const opt = makeJsonWriteOptions(options);
-            return writeJsonMessage(a, fields, opt);
-        },
-        toJsonString(a, options) {
-            const value = this.toJson(a, options);
-            return JSON.stringify(value, null, options?.prettySpaces ?? 0);
-        },
-    };
-    if (params.toJson) {
-        mt.toJson = params.toJson;
-    }
-    return mt;
-}
 /**
  * createMessage recursively builds a message filled with zero values based on the given FieldList.
  */

package/dist/protoc-gen-es-lite/typescript.d.ts

@@ -3,6 +3,6 @@ import { DescEnum, DescExtension, DescField, DescFile, DescMessage } from "../de
 export declare function generateTs(schema: Schema): void;
 export declare function checkSupportedSyntax(file: DescFile): void;
 export declare function makeImportPath(file: DescFile): string;
-export declare function generateFieldInfo(f: GeneratedFile, field: DescField | DescExtension): void;
+export declare function generateFieldInfo(f: GeneratedFile, schema: Schema, field: DescField | DescExtension): void;
 export declare const createTypeImport: (desc: DescMessage | DescEnum | DescExtension) => ImportSymbol;
-export declare function getFieldInfoLiteral(field: DescField | DescExtension): Printable;
+export declare function getFieldInfoLiteral(schema: Schema, field: DescField | DescExtension): Printable;

package/dist/protoc-gen-es-lite/typescript.js

@@ -12,7 +12,7 @@
 // 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 { createImportSymbol } from "../protoplugin/ecmascript/index.js";
+import { createImportSymbol, reifyWkt, } from "../protoplugin/ecmascript/index.js";
 import { getFieldDefaultValueExpression, getFieldTypeInfo } from "../util.js";
 import { localName } from "../names.js";
 import { LongType, ScalarType } from "../scalar.js";
@@ -107,20 +107,9 @@ export function checkSupportedSyntax(file) {
     }
 }
 function generateMessage(schema, f, message) {
-    // check if we support this runtime
     checkSupportedSyntax(message.file);
+    const { MessageType: rtMessageType, createMessageType, PartialFieldInfo, } = schema.runtime;
     f.print(f.jsDoc(message));
-    /*
-    f.print(
-      f.exportDecl("interface", message),
-      " extends ",
-      schema.runtime.Message,
-      "<",
-      message,
-      ">",
-      " {",
-    );
-    */
     f.print(f.exportDecl("type", message), " = ", schema.runtime.Message, "<{");
     for (const field of message.fields) {
         generateField(f, field);
@@ -131,17 +120,34 @@ function generateMessage(schema, f, message) {
     f.print();
     f.print("}>;");
     f.print();
-    f.print(f.exportDecl("const", message), ": ", schema.runtime.MessageType, "<", message, "> = ", schema.runtime.createMessageType, "(");
-    f.print("  {");
+    // If we need to extend the message type, do that here.
+    const reWkt = reifyWkt(message);
+    if (reWkt != null) {
+        f.print("// ", message, "_Wkt contains the well-known-type overrides for ", message, ".");
+        f.print("const ", message, "_Wkt = {");
+        generateWktMethods(schema, f, message, reWkt);
+        f.print("};");
+        f.print();
+        f.print("// ", message, " contains the message type declaration for ", message, ".");
+        f.print(f.exportDecl("const", message), `: `, rtMessageType, `<`, message, `> & typeof `, message, `_Wkt = `, createMessageType, "<", message, ", typeof ", message, "_Wkt>({");
+    }
+    else {
+        f.print("// ", message, " contains the message type declaration for ", message, ".");
+        f.print(f.exportDecl("const", message), `: `, rtMessageType, `<`, message, `> = `, createMessageType, "({");
+    }
     f.print("    typeName: ", f.string(message.typeName), ",");
     f.print("    fields: [");
     for (const field of message.fields) {
-        generateFieldInfo(f, field);
+        generateFieldInfo(f, schema, field);
     }
-    f.print("    ] as readonly ", schema.runtime.PartialFieldInfo, "[],");
+    f.print("    ] as readonly ", PartialFieldInfo, "[],");
     f.print("    packedByDefault: ", message.file.proto.syntax === "proto3", ",");
-    f.print("  },");
-    f.print(");");
+    if (reWkt == null) {
+        f.print("});");
+    }
+    else {
+        f.print("}, ", message, "_Wkt);");
+    }
     f.print();
 }
 function generateField(f, field) {
@@ -175,8 +181,8 @@ function generateOneof(f, oneof) {
 export function makeImportPath(file) {
     return "./" + file.name + ".pb.js";
 }
-export function generateFieldInfo(f, field) {
-    f.print("        ", getFieldInfoLiteral(field), ",");
+export function generateFieldInfo(f, schema, field) {
+    f.print("        ", getFieldInfoLiteral(schema, field), ",");
 }
 export const createTypeImport = (desc) => {
     var name = localName(desc);
@@ -186,7 +192,8 @@ export const createTypeImport = (desc) => {
     const from = makeImportPath(desc.file);
     return createImportSymbol(name, from);
 };
-export function getFieldInfoLiteral(field) {
+export function getFieldInfoLiteral(schema, field) {
+    const { ScalarType: rtScalarType, LongType: rtLongType } = schema.runtime;
     const e = [];
     e.push("{ no: ", field.number, `, `);
     if (field.kind == "field") {
@@ -197,16 +204,16 @@ export function getFieldInfoLiteral(field) {
     }
     switch (field.fieldKind) {
         case "scalar":
-            e.push(`kind: "scalar", T: `, field.scalar, ` /* ScalarType.`, ScalarType[field.scalar], ` */, `);
+            e.push(`kind: "scalar", T: `, rtScalarType, `.`, ScalarType[field.scalar], `, `);
             if (field.longType != LongType.BIGINT) {
-                e.push(`L: `, field.longType, ` /* LongType.`, LongType[field.longType], ` */, `);
+                e.push(`L: `, rtLongType, `.`, LongType[field.longType], `, `);
             }
             break;
         case "map":
-            e.push(`kind: "map", K: `, field.mapKey, ` /* ScalarType.`, ScalarType[field.mapKey], ` */, `);
+            e.push(`kind: "map", K: `, rtScalarType, `.`, ScalarType[field.mapKey], `, `);
             switch (field.mapValue.kind) {
                 case "scalar":
-                    e.push(`V: {kind: "scalar", T: `, field.mapValue.scalar, ` /* ScalarType.`, ScalarType[field.mapValue.scalar], ` */}, `);
+                    e.push(`V: {kind: "scalar", T: `, rtScalarType, `.`, ScalarType[field.mapValue.scalar], `}, `);
                     break;
                 case "message":
                     e.push(`V: {kind: "message", T: () => `, field.mapValue.message, `}, `);
@@ -252,3 +259,293 @@ export function getFieldInfoLiteral(field) {
     e.push(" }");
     return e;
 }
+function generateWktMethods(schema, f, message, ref) {
+    const { JsonValue, JsonReadOptions, JsonWriteOptions, JsonObject, jsonReadScalar, jsonWriteScalar, jsonDebugValue, Message, MessageType, IMessageTypeRegistry, ScalarType: rtScalarType, LongType: rtLongType, 
+    // ScalarValue: rtScalarValue,
+    protoInt64, applyPartialMessage, } = schema.runtime;
+    switch (ref.typeName) {
+        case "google.protobuf.Any":
+            f.print("  toJson(msg: ", message, ", options?: Partial<", JsonWriteOptions, ">): ", JsonValue, " {");
+            f.print("    const typeName = msg?.", localName(ref.typeUrl), ";");
+            f.print(`    if (!typeName) {`);
+            f.print("      return {};");
+            f.print("    }");
+            f.print("    const messageType = options?.typeRegistry?.findMessage(typeName);");
+            f.print("    if (!messageType) {");
+            f.print("      throw new Error(`cannot encode message ", message.typeName, ' to JSON: "${typeName}" is not in the type registry`);');
+            f.print("    }");
+            f.print("    const message = messageType.fromBinary(msg.", localName(ref.value), ");");
+            f.print("    let json = messageType.toJson(message, options);");
+            f.print(`    if (typeName.startsWith("google.protobuf.") || (json === null || Array.isArray(json) || typeof json !== "object")) {`);
+            f.print("      json = {value: json};");
+            f.print("    }");
+            f.print(`    json["@type"] = typeName;`);
+            f.print("    return json;");
+            f.print("  },");
+            f.print();
+            f.print("  fromJson(json: ", JsonValue, ", options?: Partial<", JsonReadOptions, ">) {");
+            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 {} as `, message, `;`);
+            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`);');
+            f.print("    }");
+            f.print("    const typeName = typeUrl, messageType = options?.typeRegistry?.findMessage(typeName);");
+            f.print("    if (!messageType) {");
+            f.print("      throw new Error(`cannot decode message ", message.typeName, " from JSON: ${typeUrl} is not in the type registry`);");
+            f.print("    }");
+            f.print("    let message;");
+            f.print(`    if (typeName.startsWith("google.protobuf.") &&  Object.prototype.hasOwnProperty.call(json, "value")) {`);
+            f.print(`      message = messageType.fromJson(json["value"], options);`);
+            f.print("    } else {");
+            f.print("      const copy = Object.assign({}, json);");
+            f.print(`      delete copy["@type"];`);
+            f.print("      message = messageType.fromJson(copy, options);");
+            f.print("    }");
+            f.print("    const out = {} as ", message, ";");
+            f.print("    ", message, ".packFrom(out, message, messageType);");
+            f.print("    return out;");
+            f.print("  },");
+            f.print();
+            f.print("  packFrom<T extends ", Message, "<T>>(out: ", message, ", message: ", Message, "<T>, messageType: ", MessageType, "<T>): void {");
+            f.print("    out.", localName(ref.value), " = messageType.toBinary(message);");
+            f.print("    out.", localName(ref.typeUrl), " = messageType.typeName;");
+            f.print("  },");
+            f.print();
+            f.print("  unpackTo<T extends ", Message, "<T>>(msg: ", message, ", target: ", Message, "<T>, targetMessageType: ", MessageType, "<T>): boolean {");
+            f.print("    if (!", message, ".is(msg, targetMessageType)) {");
+            f.print("      return false;");
+            f.print("    }");
+            f.print("    const partial = targetMessageType.fromBinary(msg.", localName(ref.value), ");");
+            f.print("    ", applyPartialMessage, "(partial, target, targetMessageType.fields);");
+            f.print("    return true;");
+            f.print("  },");
+            f.print();
+            f.print("  unpack<T extends Message<T>>(msg: ", message, ", registry: ", IMessageTypeRegistry, "): {message: ", Message, "<T>, messageType: ", MessageType, "<T>} | undefined {");
+            f.print("    const typeUrl = msg.", localName(ref.typeUrl)), ";";
+            f.print("    const messageType = !!typeUrl && registry.findMessage<T>(typeUrl);");
+            f.print("    return messageType ? {message: messageType.fromBinary(msg.", localName(ref.value), "), messageType} : undefined;");
+            f.print("  },");
+            f.print();
+            f.print("  is(msg: ", message, ", msgType: ", MessageType, " | string): boolean {");
+            f.print("    const name = msg.", localName(ref.typeUrl)), ";";
+            f.print("    return !!name && (typeof msgType === 'string' ? name === msgType : name === msgType.typeName);");
+            f.print("  },");
+            break;
+        case "google.protobuf.Timestamp":
+            f.print("  fromJson(json: ", JsonValue, "): ", message, " {");
+            f.print(`    if (typeof json !== "string") {`);
+            f.print("      throw new Error(`cannot decode ", message.typeName, "(json)}`);");
+            f.print("    }");
+            f.print(`    const matches = json.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:Z|\\.([0-9]{3,9})Z|([+-][0-9][0-9]:[0-9][0-9]))$/);`);
+            f.print("    if (!matches) {");
+            f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON: invalid RFC 3339 string`);");
+            f.print("    }");
+            f.print(`    const ms = Date.parse(matches[1] + "-" + matches[2] + "-" + matches[3] + "T" + matches[4] + ":" + matches[5] + ":" + matches[6] + (matches[8] ? matches[8] : "Z"));`);
+            f.print("    if (Number.isNaN(ms)) {");
+            f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON: invalid RFC 3339 string`);");
+            f.print("    }");
+            f.print(`    if (ms < Date.parse("0001-01-01T00:00:00Z") || ms > Date.parse("9999-12-31T23:59:59Z")) {`);
+            f.print("      throw new Error(`cannot decode message ", message.typeName, " from JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);");
+            f.print("    }");
+            f.print("    return {");
+            if (ref.seconds.longType === LongType.STRING) {
+                f.print("      ", localName(ref.seconds), ": ", protoInt64, ".parse(ms / 1000).toString(),");
+            }
+            else {
+                f.print("      ", localName(ref.seconds), ": ", protoInt64, ".parse(ms / 1000),");
+            }
+            f.print("      ", localName(ref.nanos), ": !matches[7] ? 0 : ", `(parseInt("1" + matches[7] + "0".repeat(9 - matches[7].length)) - 1000000000),`);
+            f.print("    }");
+            f.print("  },");
+            f.print("  toJson(msg: ", message, "): JsonValue {");
+            f.print("    const ms = Number(msg.", localName(ref.seconds), ") * 1000;");
+            f.print(`    if (ms < Date.parse("0001-01-01T00:00:00Z") || ms > Date.parse("9999-12-31T23:59:59Z")) {`);
+            f.print("      throw new Error(`cannot encode ", message.typeName, " to JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);");
+            f.print("    }");
+            f.print("    if (msg.", localName(ref.nanos), " != null && msg.", localName(ref.nanos), " < 0) {");
+            f.print("      throw new Error(`cannot encode ", message.typeName, " to JSON: nanos must not be negative`);");
+            f.print("    }");
+            f.print(`    let z = "Z";`);
+            f.print("    if (msg.", localName(ref.nanos), " != null && msg.", localName(ref.nanos), " > 0) {");
+            f.print("      const nanosStr = (msg.", localName(ref.nanos), " + 1000000000).toString().substring(1);");
+            f.print(`      if (nanosStr.substring(3) === "000000") {`);
+            f.print(`        z = "." + nanosStr.substring(0, 3) + "Z";`);
+            f.print(`      } else if (nanosStr.substring(6) === "000") {`);
+            f.print(`        z = "." + nanosStr.substring(0, 6) + "Z";`);
+            f.print("      } else {");
+            f.print(`        z = "." + nanosStr + "Z";`);
+            f.print("      }");
+            f.print("    }");
+            f.print(`    return new Date(ms).toISOString().replace(".000Z", z);`);
+            f.print("  },");
+            f.print("  toDate(msg: ", message, "): Date {");
+            f.print("    return new Date(Number(msg.", localName(ref.seconds), " ?? 0) * 1000 + Math.ceil((msg.", localName(ref.nanos), " ?? 0) / 1000000));");
+            f.print("  },");
+            break;
+        case "google.protobuf.Duration":
+            f.print("  fromJson(json: ", JsonValue, " | null | undefined, _options?: Partial<", JsonReadOptions, ">): ", message, " {");
+            f.print(`    if (typeof json !== "string") {`);
+            f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON: ${", jsonDebugValue, "(json)}`);");
+            f.print("    }");
+            f.print(`    const match = json.match(/^(-?[0-9]+)(?:\\.([0-9]+))?s/);`);
+            f.print("    if (match === null) {");
+            f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON: ${", jsonDebugValue, "(json)}`);");
+            f.print("    }");
+            f.print("    const longSeconds = Number(match[1]);");
+            f.print("    if (longSeconds > 315576000000 || longSeconds < -315576000000) {");
+            f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON: ${", jsonDebugValue, "(json)}`);");
+            f.print("    }");
+            f.print("    const msg = {} as ", message, ";");
+            if (ref.seconds.longType === LongType.STRING) {
+                f.print("    msg.", localName(ref.seconds), " = ", protoInt64, ".parse(longSeconds).toString();");
+            }
+            else {
+                f.print("    msg.", localName(ref.seconds), " = ", protoInt64, ".parse(longSeconds);");
+            }
+            f.print(`    if (typeof match[2] == "string") {`);
+            f.print(`      const nanosStr = match[2] + "0".repeat(9 - match[2].length);`);
+            f.print("      msg.", localName(ref.nanos), " = parseInt(nanosStr);");
+            f.print("      if (longSeconds < 0 || Object.is(longSeconds, -0)) {");
+            f.print("        msg.", localName(ref.nanos), " = -msg.", localName(ref.nanos), ";");
+            f.print("      }");
+            f.print("    }");
+            f.print("    return msg;");
+            f.print("  },");
+            f.print("  toJson(msg: ", message, "): JsonValue {");
+            f.print("    const secs = Number(msg.", localName(ref.seconds), " ?? 0);");
+            f.print("    const nanos = Number(msg.", localName(ref.nanos), " ?? 0);");
+            f.print("    if (secs > 315576000000 || secs < -315576000000) {");
+            f.print("      throw new Error(`cannot encode ", message.typeName, " to JSON: value out of range`);");
+            f.print("    }");
+            f.print("    let text = secs.toString();");
+            f.print("    if (nanos !== 0) {");
+            f.print("      let nanosStr = Math.abs(nanos).toString();");
+            f.print(`      nanosStr = "0".repeat(9 - nanosStr.length) + nanosStr;`);
+            f.print(`      if (nanosStr.substring(3) === "000000") {`);
+            f.print("        nanosStr = nanosStr.substring(0, 3);");
+            f.print(`      } else if (nanosStr.substring(6) === "000") {`);
+            f.print("        nanosStr = nanosStr.substring(0, 6);");
+            f.print(`      }`);
+            f.print(`      text += "." + nanosStr;`);
+            f.print("      if (nanos < 0 && secs === 0) {");
+            f.print(`          text = "-" + text;`);
+            f.print(`      }`);
+            f.print("    }");
+            f.print(`    return text + "s";`);
+            f.print("  },");
+            break;
+        case "google.protobuf.Struct":
+            f.print("  toJson(msg: ", message, ", options?: Partial<", JsonWriteOptions, ">): ", JsonValue, " {");
+            f.print("    const json: ", JsonObject, " = {}");
+            f.print("    if (!msg.", localName(ref.fields), ") { return json; }");
+            f.print("    for (const [k, v] of Object.entries(msg.", localName(ref.fields), ")) {");
+            f.print("      json[k] = v != null ? ", ref.fields.mapValue.message, ".toJson(v, options) : null;");
+            f.print("    }");
+            f.print("    return json;");
+            f.print("  },");
+            f.print("  fromJson(json: ", JsonValue, " | null | undefined, _options?: Partial<", JsonReadOptions, ">): ", message, " {");
+            f.print(`    if (typeof json != "object" || json == null || Array.isArray(json)) {`);
+            f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON ${", jsonDebugValue, "(json)}`);");
+            f.print("    }");
+            f.print("    const fields = {} as { [key: string]: Value };");
+            f.print("    for (const [k, v] of Object.entries(json)) {");
+            f.print("      fields[k] = ", ref.fields.mapValue.message ?? "", ".fromJson(v);");
+            f.print("    }");
+            f.print("    return {", localName(ref.fields), ": fields} as ", message, ";");
+            f.print("  },");
+            break;
+        case "google.protobuf.Value":
+            f.print("  toJson(msg: ", message, ", options?: Partial<", JsonWriteOptions, ">): ", JsonValue, " {");
+            f.print("    switch (msg.", localName(ref.kind), "?.case) {");
+            f.print(`      case "`, localName(ref.nullValue), `":`);
+            f.print("        return null;");
+            f.print(`      case "`, localName(ref.numberValue), `":`);
+            f.print(`        if (!Number.isFinite(msg.`, localName(ref.kind), `.value)) {`);
+            f.print(`          throw new Error("google.protobuf.Value cannot be NaN or Infinity");`);
+            f.print(`        }`);
+            f.print(`        return msg.`, localName(ref.kind), `.value;`);
+            f.print(`      case "`, localName(ref.boolValue), `":`);
+            f.print(`        return msg.`, localName(ref.kind), `.value;`);
+            f.print(`      case "`, localName(ref.stringValue), `":`);
+            f.print("        return msg.", localName(ref.kind), ".value;");
+            f.print(`      case "`, localName(ref.structValue), `":`);
+            f.print(`        return `, ref.structValue.message, `.toJson(msg.`, localName(ref.kind), `.value, {...options, emitDefaultValues: true});`);
+            f.print(`      case "`, localName(ref.listValue), `":`);
+            f.print(`        return `, ref.listValue.message, `.toJson(msg.`, localName(ref.kind), `.value, {...options, emitDefaultValues: true});`);
+            f.print(`      case null:`);
+            f.print(`      case undefined:`);
+            f.print(`      default:`);
+            f.print(`        return null;`);
+            f.print("    }");
+            f.print("  },");
+            f.print("  fromJson(json: ", JsonValue, " | null | undefined, _options?: Partial<", JsonReadOptions, ">): ", message, " {");
+            f.print("    const msg = {} as ", message, ";");
+            f.print("    switch (typeof json) {");
+            f.print(`      case "number":`);
+            f.print(`        msg.kind = { case: "`, localName(ref.numberValue), `", value: json };`);
+            f.print("        break;");
+            f.print(`      case "string":`);
+            f.print(`        msg.kind = { case: "`, localName(ref.stringValue), `", value: json };`);
+            f.print("        break;");
+            f.print(`      case "boolean":`);
+            f.print(`        msg.kind = { case: "`, localName(ref.boolValue), `", value: json };`);
+            f.print("        break;");
+            f.print(`      case "object":`);
+            f.print("        if (json == null) {");
+            f.print(`          msg.kind = { case: "`, localName(ref.nullValue), `", value: `, ref.nullValue.enum, `.`, localName(ref.nullValue.enum.values[0]), ` };`);
+            f.print("        } else if (Array.isArray(json)) {");
+            f.print(`          msg.kind = { case: "`, localName(ref.listValue), `", value: `, ref.listValue.message, `.fromJson(json) };`);
+            f.print("        } else {");
+            f.print(`          msg.kind = { case: "`, localName(ref.structValue), `", value: `, ref.structValue.message, `.fromJson(json) };`);
+            f.print("        }");
+            f.print("        break;");
+            f.print("      default:");
+            f.print("        throw new Error(`cannot decode ", message.typeName, " from JSON ${", jsonDebugValue, "(json)}`);");
+            f.print("    }");
+            f.print("    return msg;");
+            f.print("  },");
+            break;
+        case "google.protobuf.ListValue":
+            f.print(`  toJson(msg: `, message, `, options?: Partial<`, JsonWriteOptions, `>): `, JsonValue, ` {`);
+            f.print(`    return msg.`, localName(ref.values), `?.map(v => `, ref.values.message, `.toJson(v, options)) ?? [];`);
+            f.print(`  },`);
+            f.print(`  fromJson(json: `, JsonValue, ` | null | undefined, options?: Partial<`, JsonReadOptions, `>): `, message, ` {`);
+            f.print(`    if (json == null) { return {}; }`);
+            f.print(`    if (!Array.isArray(json)) {`);
+            f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON ${", jsonDebugValue, "(json)}`);");
+            f.print(`    }`);
+            f.print(`    const values: `, ref.values.message, `[] = json.map(v => `, ref.values.message, `.fromJson(v, options));`);
+            f.print(`    return {`, localName(ref.values), `: values} as `, message, `;`);
+            f.print(`  },`);
+            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":
+            f.print("  toJson(msg: ", message, ", _options?: Partial<", JsonWriteOptions, ">): ", JsonValue, " {");
+            f.print("    return ", jsonWriteScalar, "(", rtScalarType, ".", ScalarType[ref.value.scalar], ", msg.value)!;");
+            f.print("  },");
+            f.print("  fromJson(json: ", JsonValue, " | null | undefined, _options?: Partial<", JsonReadOptions, ">): ", message, " {");
+            f.print("    try {");
+            f.print("      return {", localName(ref.value), ": ", jsonReadScalar, "(", rtScalarType, ".", ScalarType[ref.value.scalar], ", json, ", rtLongType, ".", LongType[ref.value.longType], ")} as ", message, ";");
+            f.print("    } catch (e) {");
+            f.print("      let m = `cannot decode message ", message.typeName, ' from JSON"`;');
+            f.print("      if (e instanceof Error && e.message.length > 0) {");
+            f.print("        m += `: ${e.message}`");
+            f.print("      }");
+            f.print("      throw new Error(m);");
+            f.print("    }");
+            f.print("  },");
+            break;
+    }
+}

package/dist/protoplugin/ecmascript/reify-wkt.d.ts

@@ -1,5 +1,5 @@
 import { DescField, DescMessage, DescOneof } from "../../descriptor-set.js";
-type DescWkt = {
+export type DescWkt = {
     typeName: "google.protobuf.Any";
     typeUrl: DescField;
     value: DescField;
@@ -36,9 +36,6 @@ type DescWkt = {
     values: DescField & {
         fieldKind: "message";
     };
-} | {
-    typeName: "google.protobuf.FieldMask";
-    paths: DescField;
 } | {
     typeName: "google.protobuf.DoubleValue";
     value: DescField & {
@@ -97,4 +94,3 @@ type DescWkt = {
  * DescMessage.
  */
 export declare function reifyWkt(message: DescMessage): DescWkt | undefined;
-export {};

package/dist/protoplugin/ecmascript/reify-wkt.js

@@ -133,16 +133,6 @@ export function reifyWkt(message) {
             }
             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":