@aptre/protobuf-es-lite 0.2.7 → 0.2.8

package/dist/index.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeEnumValue = exports.createEnumType = exports.isScalarZeroValue = exports.scalarZeroValue = exports.scalarEquals = exports.localOneofName = exports.localFieldName = exports.fieldJsonName = exports.FieldList = exports.newFieldList = exports.isCompleteField = exports.isCompleteMessage = exports.createMessageType = exports.compareMessages = exports.LongType = exports.WireType = exports.ScalarType = exports.EnumValue = void 0;
-var protobuf_1 = require("@bufbuild/protobuf");
-Object.defineProperty(exports, "EnumValue", { enumerable: true, get: function () { return protobuf_1.EnumValue; } });
-Object.defineProperty(exports, "ScalarType", { enumerable: true, get: function () { return protobuf_1.ScalarType; } });
-Object.defineProperty(exports, "WireType", { enumerable: true, get: function () { return protobuf_1.WireType; } });
-Object.defineProperty(exports, "LongType", { enumerable: true, get: function () { return protobuf_1.LongType; } });
+exports.Struct = exports.ListValue = exports.NullValue = exports.Value = exports.BytesValue = exports.StringValue = exports.BoolValue = exports.UInt32Value = exports.Int32Value = exports.UInt64Value = exports.Int64Value = exports.FloatValue = exports.DoubleValue = exports.Empty = exports.Any = exports.Duration = exports.Timestamp = exports.protoDouble = exports.protoBase64 = exports.protoInt64 = exports.uInt64ToString = exports.int64ToString = exports.int64FromString = exports.safeIdentifier = exports.safeObjectProperty = exports.protoCamelCase = exports.camelToSnakeCase = exports.findEnumSharedPrefix = exports.localOneofName = exports.localFieldName = exports.localName = exports.normalizeEnumValue = exports.createEnumType = exports.isScalarZeroValue = exports.scalarZeroValue = exports.scalarEquals = exports.fieldJsonName = exports.FieldList = exports.newFieldList = exports.isCompleteField = exports.isCompleteMessage = exports.createMessageType = exports.compareMessages = void 0;
 var message_js_1 = require("./message.js");
 Object.defineProperty(exports, "compareMessages", { enumerable: true, get: function () { return message_js_1.compareMessages; } });
 Object.defineProperty(exports, "createMessageType", { enumerable: true, get: function () { return message_js_1.createMessageType; } });
@@ -16,8 +11,6 @@ var field_js_1 = require("./field.js");
 Object.defineProperty(exports, "newFieldList", { enumerable: true, get: function () { return field_js_1.newFieldList; } });
 Object.defineProperty(exports, "FieldList", { enumerable: true, get: function () { return field_js_1.FieldList; } });
 Object.defineProperty(exports, "fieldJsonName", { enumerable: true, get: function () { return field_js_1.fieldJsonName; } });
-Object.defineProperty(exports, "localFieldName", { enumerable: true, get: function () { return field_js_1.localFieldName; } });
-Object.defineProperty(exports, "localOneofName", { enumerable: true, get: function () { return field_js_1.localOneofName; } });
 var scalar_js_1 = require("./scalar.js");
 Object.defineProperty(exports, "scalarEquals", { enumerable: true, get: function () { return scalar_js_1.scalarEquals; } });
 Object.defineProperty(exports, "scalarZeroValue", { enumerable: true, get: function () { return scalar_js_1.scalarZeroValue; } });
@@ -25,3 +18,40 @@ Object.defineProperty(exports, "isScalarZeroValue", { enumerable: true, get: fun
 var enum_js_1 = require("./enum.js");
 Object.defineProperty(exports, "createEnumType", { enumerable: true, get: function () { return enum_js_1.createEnumType; } });
 Object.defineProperty(exports, "normalizeEnumValue", { enumerable: true, get: function () { return enum_js_1.normalizeEnumValue; } });
+var names_js_1 = require("./names.js");
+Object.defineProperty(exports, "localName", { enumerable: true, get: function () { return names_js_1.localName; } });
+Object.defineProperty(exports, "localFieldName", { enumerable: true, get: function () { return names_js_1.localFieldName; } });
+Object.defineProperty(exports, "localOneofName", { enumerable: true, get: function () { return names_js_1.localOneofName; } });
+Object.defineProperty(exports, "findEnumSharedPrefix", { enumerable: true, get: function () { return names_js_1.findEnumSharedPrefix; } });
+Object.defineProperty(exports, "camelToSnakeCase", { enumerable: true, get: function () { return names_js_1.camelToSnakeCase; } });
+Object.defineProperty(exports, "protoCamelCase", { enumerable: true, get: function () { return names_js_1.protoCamelCase; } });
+Object.defineProperty(exports, "safeObjectProperty", { enumerable: true, get: function () { return names_js_1.safeObjectProperty; } });
+Object.defineProperty(exports, "safeIdentifier", { enumerable: true, get: function () { return names_js_1.safeIdentifier; } });
+var varint_js_1 = require("./varint.js");
+Object.defineProperty(exports, "int64FromString", { enumerable: true, get: function () { return varint_js_1.int64FromString; } });
+Object.defineProperty(exports, "int64ToString", { enumerable: true, get: function () { return varint_js_1.int64ToString; } });
+Object.defineProperty(exports, "uInt64ToString", { enumerable: true, get: function () { return varint_js_1.uInt64ToString; } });
+var proto_int64_js_1 = require("./proto-int64.js");
+Object.defineProperty(exports, "protoInt64", { enumerable: true, get: function () { return proto_int64_js_1.protoInt64; } });
+var proto_base64_js_1 = require("./proto-base64.js");
+Object.defineProperty(exports, "protoBase64", { enumerable: true, get: function () { return proto_base64_js_1.protoBase64; } });
+var proto_double_js_1 = require("./proto-double.js");
+Object.defineProperty(exports, "protoDouble", { enumerable: true, get: function () { return proto_double_js_1.protoDouble; } });
+var index_js_1 = require("./google/index.js");
+Object.defineProperty(exports, "Timestamp", { enumerable: true, get: function () { return index_js_1.Timestamp; } });
+Object.defineProperty(exports, "Duration", { enumerable: true, get: function () { return index_js_1.Duration; } });
+Object.defineProperty(exports, "Any", { enumerable: true, get: function () { return index_js_1.Any; } });
+Object.defineProperty(exports, "Empty", { enumerable: true, get: function () { return index_js_1.Empty; } });
+Object.defineProperty(exports, "DoubleValue", { enumerable: true, get: function () { return index_js_1.DoubleValue; } });
+Object.defineProperty(exports, "FloatValue", { enumerable: true, get: function () { return index_js_1.FloatValue; } });
+Object.defineProperty(exports, "Int64Value", { enumerable: true, get: function () { return index_js_1.Int64Value; } });
+Object.defineProperty(exports, "UInt64Value", { enumerable: true, get: function () { return index_js_1.UInt64Value; } });
+Object.defineProperty(exports, "Int32Value", { enumerable: true, get: function () { return index_js_1.Int32Value; } });
+Object.defineProperty(exports, "UInt32Value", { enumerable: true, get: function () { return index_js_1.UInt32Value; } });
+Object.defineProperty(exports, "BoolValue", { enumerable: true, get: function () { return index_js_1.BoolValue; } });
+Object.defineProperty(exports, "StringValue", { enumerable: true, get: function () { return index_js_1.StringValue; } });
+Object.defineProperty(exports, "BytesValue", { enumerable: true, get: function () { return index_js_1.BytesValue; } });
+Object.defineProperty(exports, "Value", { enumerable: true, get: function () { return index_js_1.Value; } });
+Object.defineProperty(exports, "NullValue", { enumerable: true, get: function () { return index_js_1.NullValue; } });
+Object.defineProperty(exports, "ListValue", { enumerable: true, get: function () { return index_js_1.ListValue; } });
+Object.defineProperty(exports, "Struct", { enumerable: true, get: function () { return index_js_1.Struct; } });

package/dist/is-message.d.ts

@@ -1,5 +1,13 @@
 import { FieldInfo } from "./field.js";
-import { AnyMessage, CompleteMessage, Message, Field, CompleteField } from "./message.js";
+import { AnyMessage, Message, CompleteMessage, Field } from "./message.js";
+/**
+ * Check whether the given partial is a valid message.
+ */
+export declare function isMessage<T extends Message<T> = AnyMessage>(arg: any, fields: readonly FieldInfo[]): arg is T;
+/**
+ * Check whether the given partial field is a valid field value.
+ */
+export declare function isField<F>(value: any, field: FieldInfo): value is Field<F>;
 /**
  * Check whether the given partial has all fields present recursively.
  */
@@ -7,4 +15,4 @@ export declare function isCompleteMessage<T extends Message<T> = AnyMessage>(arg
 /**
  * Check whether the given partial field has a full value present recursively.
  */
-export declare function isCompleteField<F>(value: Field<F>, field: FieldInfo): value is CompleteField<F>;
+export declare function isCompleteField<F>(value: Field<F>, field: FieldInfo): boolean;

package/dist/is-message.js

@@ -1,10 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCompleteField = exports.isCompleteMessage = void 0;
+exports.isCompleteField = exports.isCompleteMessage = exports.isField = exports.isMessage = void 0;
+const field_js_1 = require("./field.js");
+/**
+ * Check whether the given partial is a valid message.
+ */
+function isMessage(arg, fields) {
+    if (arg == null || typeof arg !== "object") {
+        return false;
+    }
+    return fields.every((fi) => {
+        // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
+        const value = arg[fi.localName];
+        // if the value is null or undefined this is OK in isMessage.
+        if (value == null) {
+            return true;
+        }
+        if (fi.repeated) {
+            return Array.isArray(value) && value.every((item) => isField(item, fi));
+        }
+        else {
+            return isField(value, fi);
+        }
+    });
+}
+exports.isMessage = isMessage;
+/**
+ * Check whether the given partial field is a valid field value.
+ */
+function isField(value, field) {
+    if (value == null) {
+        return false;
+    }
+    if (field.oneof) {
+        // For oneof fields, only one field should be set
+        const oneofFields = field.oneof.fields;
+        const setField = oneofFields.find((f) => value[f.localName] !== undefined);
+        return setField === field;
+    }
+    if (value === undefined) {
+        return false;
+    }
+    const fieldKind = field.kind;
+    switch (fieldKind) {
+        case "scalar":
+            return true;
+        case "message":
+            const messageType = (0, field_js_1.resolveMessageType)(field.T);
+            return isMessage(value, messageType.fields.list());
+        case "enum":
+            return typeof value === "number";
+        case "map":
+            return Object.values(value).every((val) => {
+                const valueKind = field.V.kind;
+                switch (valueKind) {
+                    case "scalar":
+                        return true;
+                    case "enum":
+                        return typeof val === "number";
+                    case "message":
+                        const messageType = (0, field_js_1.resolveMessageType)(field.V.T);
+                        return isMessage(val, messageType.fields.list());
+                    default:
+                        return valueKind;
+                }
+            });
+        default:
+            return fieldKind;
+    }
+}
+exports.isField = isField;
 /**
  * Check whether the given partial has all fields present recursively.
  */
 function isCompleteMessage(arg, fields) {
+    // arg is CompleteMessage<T> {
     if (arg == null || typeof arg !== "object") {
         return false;
     }
@@ -24,6 +94,7 @@ exports.isCompleteMessage = isCompleteMessage;
  * Check whether the given partial field has a full value present recursively.
  */
 function isCompleteField(value, field) {
+    // value is CompleteField<F> {
     if (field.oneof) {
         // For oneof fields, only one field should be set
         const oneofFields = field.oneof.fields;
@@ -38,7 +109,7 @@ function isCompleteField(value, field) {
         case "scalar":
             return true;
         case "message":
-            const messageType = typeof field.T === "function" ? field.T() : field.T;
+            const messageType = (0, field_js_1.resolveMessageType)(field.T);
             return isCompleteMessage(value, messageType.fields.list());
         case "enum":
             return typeof value === "number";
@@ -51,7 +122,7 @@ function isCompleteField(value, field) {
                     case "enum":
                         return typeof val === "number";
                     case "message":
-                        const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                        const messageType = (0, field_js_1.resolveMessageType)(field.V.T);
                         return isCompleteMessage(val, messageType.fields.list());
                     default:
                         return valueKind;

package/dist/json.d.ts

@@ -1,5 +1,72 @@
-import { JsonReadOptions, JsonValue, JsonWriteOptions, JsonWriteStringOptions } from "@bufbuild/protobuf";
 import { FieldInfo, FieldList } from "./field.js";
+import { IMessageTypeRegistry } from "./type-registry.js";
+/**
+ * Options for parsing JSON data.
+ */
+export interface JsonReadOptions {
+    /**
+     * Ignore unknown fields: Proto3 JSON parser should reject unknown fields
+     * by default. This option ignores unknown fields in parsing, as well as
+     * unrecognized enum string representations.
+     */
+    ignoreUnknownFields: boolean;
+    /**
+     * This option is required to read `google.protobuf.Any`
+     */
+    typeRegistry?: IMessageTypeRegistry;
+}
+/**
+ * Options for serializing to JSON.
+ */
+export interface JsonWriteOptions {
+    /**
+     * Emit fields with default values: Fields with default values are omitted
+     * by default in proto3 JSON output. This option overrides this behavior
+     * and outputs fields with their default values.
+     */
+    emitDefaultValues: boolean;
+    /**
+     * Emit enum values as integers instead of strings: The name of an enum
+     * value is used by default in JSON output. An option may be provided to
+     * use the numeric value of the enum value instead.
+     */
+    enumAsInteger: boolean;
+    /**
+     * Use proto field name instead of lowerCamelCase name: By default proto3
+     * JSON printer should convert the field name to lowerCamelCase and use
+     * that as the JSON name. An implementation may provide an option to use
+     * proto field name as the JSON name instead. Proto3 JSON parsers are
+     * required to accept both the converted lowerCamelCase name and the proto
+     * field name.
+     */
+    useProtoFieldName: boolean;
+    /**
+     * This option is required to write `google.protobuf.Any`
+     */
+    typeRegistry?: IMessageTypeRegistry;
+}
+/**
+ * Options for serializing to JSON.
+ */
+export interface JsonWriteStringOptions extends JsonWriteOptions {
+    prettySpaces: number;
+}
+/**
+ * Represents any possible JSON value:
+ * - number
+ * - string
+ * - boolean
+ * - null
+ * - object (with any JSON value as property)
+ * - array (with any JSON value as element)
+ */
+export type JsonValue = number | string | boolean | null | JsonObject | JsonValue[];
+/**
+ * Represents a JSON object.
+ */
+export type JsonObject = {
+    [k: string]: JsonValue;
+};
 export declare function makeReadOptions(options?: Partial<JsonReadOptions>): Readonly<JsonReadOptions>;
 export declare function makeWriteOptions(options?: Partial<JsonWriteStringOptions>): Readonly<JsonWriteStringOptions>;
 export declare function readMessage<T>(fields: FieldList, typeName: string, json: JsonValue, options: JsonReadOptions, message: T): T;

package/dist/json.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearField = exports.writeMessage = exports.readMessage = exports.makeWriteOptions = exports.makeReadOptions = void 0;
-const protobuf_1 = require("@bufbuild/protobuf");
 const field_js_1 = require("./field.js");
 const assert_js_1 = require("./assert.js");
 const scalar_js_1 = require("./scalar.js");
 const field_wrapper_js_1 = require("./field-wrapper.js");
+const proto_int64_js_1 = require("./proto-int64.js");
+const proto_base64_js_1 = require("./proto-base64.js");
 // Default options for parsing JSON.
 const jsonReadDefaults = {
     ignoreUnknownFields: false,
@@ -43,7 +44,6 @@ function readMessage(fields, typeName, json, options, message) {
         throw new Error(`cannot decode message ${typeName} from JSON: ${debugJsonValue(json)}`);
     }
     const oneofSeen = new Map();
-    const registry = options.typeRegistry;
     for (const [jsonKey, jsonValue] of Object.entries(json)) {
         const field = fields.findJsonName(jsonKey);
         if (field) {
@@ -62,30 +62,6 @@ function readMessage(fields, typeName, json, options, message) {
         }
         else {
             let found = false;
-            if (registry?.findExtension &&
-                jsonKey.startsWith("[") &&
-                jsonKey.endsWith("]")) {
-                // TODO: handle extension
-                /*
-                    const ext = registry.findExtension(
-                      jsonKey.substring(1, jsonKey.length - 1),
-                    );
-                    if (ext && ext.extendee.typeName == typeName) {
-                      found = true;
-                      const [container, get] = createExtensionContainer(ext);
-                      readField(container, jsonValue, ext.field, options, ext);
-                      // We pass on the options as BinaryReadOptions/BinaryWriteOptions,
-                      // so that users can bring their own binary reader and writer factories
-                      // if necessary.
-                      setExtension(
-                        message,
-                        ext as Extension<T>,
-                        get(),
-                        options as Partial<BinaryReadOptions & BinaryWriteOptions>,
-                      );
-                    }
-                    */
-            }
             if (!found && !options.ignoreUnknownFields) {
                 throw new Error(`cannot decode message ${typeName} from JSON: key "${jsonKey}" is unknown`);
             }
@@ -111,8 +87,8 @@ function writeMessage(message, fields, options) {
                     continue;
                 }
             }
-            const value = field.oneof
-                ? message[field.oneof.localName].value
+            const value = field.oneof ?
+                message[field.oneof.localName].value
                 : message[field.localName];
             const jsonValue = writeField(field, value, options);
             if (jsonValue !== undefined) {
@@ -144,8 +120,8 @@ function writeMessage(message, fields, options) {
             */
     }
     catch (e) {
-        const m = field
-            ? `cannot encode field ${field.name} to JSON`
+        const m = field ?
+            `cannot encode field ${field.name} to JSON`
             : `cannot encode message to JSON`;
         const r = e instanceof Error ? e.message : String(e);
         throw new Error(m + (r.length > 0 ? `: ${r}` : ""));
@@ -175,7 +151,7 @@ function readField(target, jsonValue, field, options) {
             }
             switch (field.kind) {
                 case "message":
-                    const messageType = typeof field.T === "function" ? field.T() : field.T;
+                    const messageType = (0, field_js_1.resolveMessageType)(field.T);
                     targetArray.push(messageType.fromJson(jsonItem, options));
                     break;
                 case "enum":
@@ -227,7 +203,7 @@ function readField(target, jsonValue, field, options) {
             }
             switch (field.V.kind) {
                 case "message":
-                    const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                    const messageType = (0, field_js_1.resolveMessageType)(field.V.T);
                     targetMap[key] = messageType.fromJson(jsonMapValue, options);
                     break;
                 case "enum":
@@ -238,7 +214,7 @@ function readField(target, jsonValue, field, options) {
                     break;
                 case "scalar":
                     try {
-                        targetMap[key] = readScalar(field.V.T, jsonMapValue, protobuf_1.LongType.BIGINT, true);
+                        targetMap[key] = readScalar(field.V.T, jsonMapValue, scalar_js_1.LongType.BIGINT, true);
                     }
                     catch (e) {
                         let m = `cannot decode map value for field ${field.name} from JSON: ${debugJsonValue(jsonValue)}`;
@@ -258,7 +234,7 @@ function readField(target, jsonValue, field, options) {
         }
         switch (field.kind) {
             case "message":
-                const messageType = typeof field.T === "function" ? field.T() : field.T;
+                const messageType = (0, field_js_1.resolveMessageType)(field.T);
                 if (jsonValue === null &&
                     messageType.typeName != "google.protobuf.Value") {
                     return;
@@ -345,8 +321,8 @@ function readScalar(type, json, longType, nullAsZeroValue) {
     switch (type) {
         // float, double: JSON value will be a number or one of the special string values "NaN", "Infinity", and "-Infinity".
         // Either numbers or strings are accepted. Exponent notation is also accepted.
-        case protobuf_1.ScalarType.DOUBLE:
-        case protobuf_1.ScalarType.FLOAT:
+        case scalar_js_1.ScalarType.DOUBLE:
+        case scalar_js_1.ScalarType.FLOAT:
             if (json === "NaN")
                 return Number.NaN;
             if (json === "Infinity")
@@ -373,15 +349,15 @@ function readScalar(type, json, longType, nullAsZeroValue) {
                 // infinity and -infinity are handled by string representation above, so this is an error
                 break;
             }
-            if (type == protobuf_1.ScalarType.FLOAT)
+            if (type == scalar_js_1.ScalarType.FLOAT)
                 (0, assert_js_1.assertFloat32)(float);
             return float;
         // int32, fixed32, uint32: JSON value will be a decimal number. Either numbers or strings are accepted.
-        case protobuf_1.ScalarType.INT32:
-        case protobuf_1.ScalarType.FIXED32:
-        case protobuf_1.ScalarType.SFIXED32:
-        case protobuf_1.ScalarType.SINT32:
-        case protobuf_1.ScalarType.UINT32:
+        case scalar_js_1.ScalarType.INT32:
+        case scalar_js_1.ScalarType.FIXED32:
+        case scalar_js_1.ScalarType.SFIXED32:
+        case scalar_js_1.ScalarType.SINT32:
+        case scalar_js_1.ScalarType.UINT32:
             let int32;
             if (typeof json == "number")
                 int32 = json;
@@ -391,34 +367,34 @@ function readScalar(type, json, longType, nullAsZeroValue) {
             }
             if (int32 === undefined)
                 break;
-            if (type == protobuf_1.ScalarType.UINT32 || type == protobuf_1.ScalarType.FIXED32)
+            if (type == scalar_js_1.ScalarType.UINT32 || type == scalar_js_1.ScalarType.FIXED32)
                 (0, assert_js_1.assertUInt32)(int32);
             else
                 (0, assert_js_1.assertInt32)(int32);
             return int32;
         // int64, fixed64, uint64: JSON value will be a decimal string. Either numbers or strings are accepted.
-        case protobuf_1.ScalarType.INT64:
-        case protobuf_1.ScalarType.SFIXED64:
-        case protobuf_1.ScalarType.SINT64:
+        case scalar_js_1.ScalarType.INT64:
+        case scalar_js_1.ScalarType.SFIXED64:
+        case scalar_js_1.ScalarType.SINT64:
             if (typeof json != "number" && typeof json != "string")
                 break;
-            const long = protobuf_1.protoInt64.parse(json);
+            const long = proto_int64_js_1.protoInt64.parse(json);
             // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
             return longType ? long.toString() : long;
-        case protobuf_1.ScalarType.FIXED64:
-        case protobuf_1.ScalarType.UINT64:
+        case scalar_js_1.ScalarType.FIXED64:
+        case scalar_js_1.ScalarType.UINT64:
             if (typeof json != "number" && typeof json != "string")
                 break;
-            const uLong = protobuf_1.protoInt64.uParse(json);
+            const uLong = proto_int64_js_1.protoInt64.uParse(json);
             // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
             return longType ? uLong.toString() : uLong;
         // bool:
-        case protobuf_1.ScalarType.BOOL:
+        case scalar_js_1.ScalarType.BOOL:
             if (typeof json !== "boolean")
                 break;
             return json;
         // string:
-        case protobuf_1.ScalarType.STRING:
+        case scalar_js_1.ScalarType.STRING:
             if (typeof json !== "string") {
                 break;
             }
@@ -433,17 +409,17 @@ function readScalar(type, json, longType, nullAsZeroValue) {
             return json;
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
-        case protobuf_1.ScalarType.BYTES:
+        case scalar_js_1.ScalarType.BYTES:
             if (json === "")
                 return new Uint8Array(0);
             if (typeof json !== "string")
                 break;
-            return protobuf_1.protoBase64.dec(json);
+            return proto_base64_js_1.protoBase64.dec(json);
     }
     throw new Error();
 }
 function readMapKey(type, json) {
-    if (type === protobuf_1.ScalarType.BOOL) {
+    if (type === scalar_js_1.ScalarType.BOOL) {
         // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (json) {
             case "true":
@@ -454,7 +430,7 @@ function readMapKey(type, json) {
                 break;
         }
     }
-    return readScalar(type, json, protobuf_1.LongType.BIGINT, true).toString();
+    return readScalar(type, json, scalar_js_1.LongType.BIGINT, true).toString();
 }
 /**
  * Resets the field, so that isFieldSet() will return false.
@@ -477,9 +453,8 @@ function clearField(field, target) {
                 target[localName] = implicitPresence ? field.T.values[0].no : undefined;
                 break;
             case "scalar":
-                target[localName] = implicitPresence
-                    ? (0, scalar_js_1.scalarZeroValue)(field.T, field.L)
-                    : undefined;
+                target[localName] =
+                    implicitPresence ? (0, scalar_js_1.scalarZeroValue)(field.T, field.L) : undefined;
                 break;
             case "message":
                 target[localName] = undefined;
@@ -523,7 +498,7 @@ function writeField(field, value, options) {
             case "message":
                 for (const [entryKey, entryValue] of entries) {
                     // JSON standard allows only (double quoted) string as property key
-                    const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                    const messageType = (0, field_js_1.resolveMessageType)(field.V.T);
                     jsonObj[entryKey.toString()] = messageType.toJson(entryValue, options);
                 }
                 break;
@@ -535,8 +510,8 @@ function writeField(field, value, options) {
                 }
                 break;
         }
-        return options.emitDefaultValues || entries.length > 0
-            ? jsonObj
+        return options.emitDefaultValues || entries.length > 0 ?
+            jsonObj
             : undefined;
     }
     if (field.repeated) {
@@ -559,8 +534,8 @@ function writeField(field, value, options) {
                 }
                 break;
         }
-        return options.emitDefaultValues || jsonArr.length > 0
-            ? jsonArr
+        return options.emitDefaultValues || jsonArr.length > 0 ?
+            jsonArr
             : undefined;
     }
     switch (field.kind) {
@@ -569,24 +544,25 @@ function writeField(field, value, options) {
         case "enum":
             return writeEnum(field.T, value, options.enumAsInteger);
         case "message":
-            return (0, field_wrapper_js_1.wrapField)((typeof field.T === "function" ? field.T() : field.T).fieldWrapper, value).toJson(options);
+            const messageType = (0, field_js_1.resolveMessageType)(field.T);
+            return messageType.toJson((0, field_wrapper_js_1.wrapField)(messageType.fieldWrapper, value));
     }
 }
 function writeScalar(type, value) {
     switch (type) {
         // int32, fixed32, uint32: JSON value will be a decimal number. Either numbers or strings are accepted.
-        case protobuf_1.ScalarType.INT32:
-        case protobuf_1.ScalarType.SFIXED32:
-        case protobuf_1.ScalarType.SINT32:
-        case protobuf_1.ScalarType.FIXED32:
-        case protobuf_1.ScalarType.UINT32:
+        case scalar_js_1.ScalarType.INT32:
+        case scalar_js_1.ScalarType.SFIXED32:
+        case scalar_js_1.ScalarType.SINT32:
+        case scalar_js_1.ScalarType.FIXED32:
+        case scalar_js_1.ScalarType.UINT32:
             (0, assert_js_1.assert)(typeof value == "number");
             return value;
         // float, double: JSON value will be a number or one of the special string values "NaN", "Infinity", and "-Infinity".
         // Either numbers or strings are accepted. Exponent notation is also accepted.
-        case protobuf_1.ScalarType.FLOAT:
+        case scalar_js_1.ScalarType.FLOAT:
         // assertFloat32(value);
-        case protobuf_1.ScalarType.DOUBLE: // eslint-disable-line no-fallthrough
+        case scalar_js_1.ScalarType.DOUBLE: // eslint-disable-line no-fallthrough
             (0, assert_js_1.assert)(typeof value == "number");
             if (Number.isNaN(value))
                 return "NaN";
@@ -596,28 +572,28 @@ function writeScalar(type, value) {
                 return "-Infinity";
             return value;
         // string:
-        case protobuf_1.ScalarType.STRING:
+        case scalar_js_1.ScalarType.STRING:
             (0, assert_js_1.assert)(typeof value == "string");
             return value;
         // bool:
-        case protobuf_1.ScalarType.BOOL:
+        case scalar_js_1.ScalarType.BOOL:
             (0, assert_js_1.assert)(typeof value == "boolean");
             return value;
         // JSON value will be a decimal string. Either numbers or strings are accepted.
-        case protobuf_1.ScalarType.UINT64:
-        case protobuf_1.ScalarType.FIXED64:
-        case protobuf_1.ScalarType.INT64:
-        case protobuf_1.ScalarType.SFIXED64:
-        case protobuf_1.ScalarType.SINT64:
+        case scalar_js_1.ScalarType.UINT64:
+        case scalar_js_1.ScalarType.FIXED64:
+        case scalar_js_1.ScalarType.INT64:
+        case scalar_js_1.ScalarType.SFIXED64:
+        case scalar_js_1.ScalarType.SINT64:
             (0, assert_js_1.assert)(typeof value == "bigint" ||
                 typeof value == "string" ||
                 typeof value == "number");
             return value.toString();
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
-        case protobuf_1.ScalarType.BYTES:
+        case scalar_js_1.ScalarType.BYTES:
             (0, assert_js_1.assert)(value instanceof Uint8Array);
-            return protobuf_1.protoBase64.enc(value);
+            return proto_base64_js_1.protoBase64.enc(value);
     }
 }
 function writeEnum(type, value, enumAsInteger) {