@aptre/protobuf-es-lite 0.2.5 → 0.2.7

package/README.md

@@ -48,6 +48,8 @@ const myMessageBin = new MyMessage(myMessage).toBinary()
 declaration object containing the marshal and unmarshal functions. This allows
 using interfaces and plain messages everywhere and does not need classes.
 
+[ts-proto]: https://github.com/stephenh/ts-proto
+
 This fork generates the ts-proto style with the protoc-gen-es tools:
 
 ```typescript

package/dist/binary.js

@@ -55,7 +55,7 @@ reader, field, wireType, options) {
             }
             break;
         case "message":
-            const messageType = field.T;
+            const messageType = typeof field.T === "function" ? field.T() : field.T;
             if (repeated) {
                 var tgtArr = target[localName];
                 if (!Array.isArray(tgtArr)) {
@@ -105,7 +105,8 @@ function readMapEntry(field, reader, options) {
                         val = reader.int32();
                         break;
                     case "message":
-                        val = readMessageField(reader, field.V.T.create(), field.V.T.fields, options, undefined);
+                        const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                        val = readMessageField(reader, messageType.create(), messageType.fields, options, undefined);
                         break;
                 }
                 break;
@@ -126,7 +127,8 @@ function readMapEntry(field, reader, options) {
                 val = field.V.T.values[0].no;
                 break;
             case "message":
-                val = field.V.T.create();
+                const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                val = messageType.create();
                 break;
         }
     }
@@ -301,17 +303,18 @@ function writeUnknownFields(message, writer) {
 }
 // Value must not be undefined
 function writeMessageField(writer, options, field, value) {
-    const message = (0, field_wrapper_js_1.wrapField)(field.T.fieldWrapper, value);
+    const messageType = typeof field.T === "function" ? field.T() : field.T;
+    const message = (0, field_wrapper_js_1.wrapField)(messageType.fieldWrapper, value);
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     if (field.delimited)
         writer
             .tag(field.no, protobuf_1.WireType.StartGroup)
-            .raw(field.T.toBinary(message, options))
+            .raw(messageType.toBinary(message, options))
             .tag(field.no, protobuf_1.WireType.EndGroup);
     else
         writer
             .tag(field.no, protobuf_1.WireType.LengthDelimited)
-            .bytes(field.T.toBinary(message, options));
+            .bytes(messageType.toBinary(message, options));
 }
 function writeScalar(writer, type, fieldNo, value) {
     (0, assert_js_1.assert)(value !== undefined);
@@ -394,9 +397,10 @@ function writeMapEntry(writer, options, field, key, value) {
             break;
         case "message":
             (0, assert_js_1.assert)(value !== undefined);
+            const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
             writer
                 .tag(2, protobuf_1.WireType.LengthDelimited)
-                .bytes(field.V.T.toBinary(value, options));
+                .bytes(messageType.toBinary(value, options));
             break;
     }
     writer.join();

package/dist/field.d.ts

@@ -220,7 +220,7 @@ interface fiMessage extends fiShared {
     /**
      * Message handler for the field.
      */
-    readonly T: MessageType;
+    readonly T: MessageType | (() => MessageType);
     /**
      * Is the field repeated?
      */
@@ -302,7 +302,7 @@ interface fiMap extends fiShared {
         readonly T: EnumType;
     } | {
         readonly kind: "message";
-        readonly T: MessageType;
+        readonly T: MessageType | (() => MessageType);
     };
     /**
      * Is the field repeated? Never true for maps.

package/dist/is-message.js

@@ -38,7 +38,8 @@ function isCompleteField(value, field) {
         case "scalar":
             return true;
         case "message":
-            return isCompleteMessage(value, field.T.fields.list());
+            const messageType = typeof field.T === "function" ? field.T() : field.T;
+            return isCompleteMessage(value, messageType.fields.list());
         case "enum":
             return typeof value === "number";
         case "map":
@@ -50,7 +51,8 @@ function isCompleteField(value, field) {
                     case "enum":
                         return typeof val === "number";
                     case "message":
-                        return isCompleteMessage(val, field.V.T.fields.list());
+                        const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                        return isCompleteMessage(val, messageType.fields.list());
                     default:
                         return valueKind;
                 }

package/dist/json.js

@@ -175,7 +175,8 @@ function readField(target, jsonValue, field, options) {
             }
             switch (field.kind) {
                 case "message":
-                    targetArray.push(field.T.fromJson(jsonItem, options));
+                    const messageType = typeof field.T === "function" ? field.T() : field.T;
+                    targetArray.push(messageType.fromJson(jsonItem, options));
                     break;
                 case "enum":
                     const enumValue = readEnum(field.T, jsonItem, options.ignoreUnknownFields, true);
@@ -226,7 +227,8 @@ function readField(target, jsonValue, field, options) {
             }
             switch (field.V.kind) {
                 case "message":
-                    targetMap[key] = field.V.T.fromJson(jsonMapValue, options);
+                    const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                    targetMap[key] = messageType.fromJson(jsonMapValue, options);
                     break;
                 case "enum":
                     const enumValue = readEnum(field.V.T, jsonMapValue, options.ignoreUnknownFields, true);
@@ -256,7 +258,7 @@ function readField(target, jsonValue, field, options) {
         }
         switch (field.kind) {
             case "message":
-                const messageType = field.T;
+                const messageType = typeof field.T === "function" ? field.T() : field.T;
                 if (jsonValue === null &&
                     messageType.typeName != "google.protobuf.Value") {
                     return;
@@ -521,7 +523,8 @@ function writeField(field, value, options) {
             case "message":
                 for (const [entryKey, entryValue] of entries) {
                     // JSON standard allows only (double quoted) string as property key
-                    jsonObj[entryKey.toString()] = field.V.T.toJson(entryValue, options);
+                    const messageType = typeof field.V.T === "function" ? field.V.T() : field.V.T;
+                    jsonObj[entryKey.toString()] = messageType.toJson(entryValue, options);
                 }
                 break;
             case "enum":
@@ -566,7 +569,7 @@ function writeField(field, value, options) {
         case "enum":
             return writeEnum(field.T, value, options.enumAsInteger);
         case "message":
-            return (0, field_wrapper_js_1.wrapField)(field.T.fieldWrapper, value).toJson(options);
+            return (0, field_wrapper_js_1.wrapField)((typeof field.T === "function" ? field.T() : field.T).fieldWrapper, value).toJson(options);
     }
 }
 function writeScalar(type, value) {

package/dist/message.js

@@ -41,7 +41,8 @@ function compareMessages(fields, a, b) {
             // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- repeated fields are never "map"
             switch (m.kind) {
                 case "message":
-                    return va.every((a, i) => m.T.equals(a, vb[i]));
+                    const messageType = typeof m.T === "function" ? m.T() : m.T;
+                    return va.every((a, i) => messageType.equals(a, vb[i]));
                 case "scalar":
                     return va.every((a, i) => (0, scalar_js_1.scalarEquals)(m.T, a, vb[i]));
                 case "enum":
@@ -51,7 +52,7 @@ function compareMessages(fields, a, b) {
         }
         switch (m.kind) {
             case "message":
-                return m.T.equals(va, vb);
+                return (typeof m.T === "function" ? m.T() : m.T).equals(va, vb);
             case "enum":
                 return (0, scalar_js_1.scalarEquals)(protobuf_1.ScalarType.INT32, va, vb);
             case "scalar":
@@ -67,7 +68,8 @@ function compareMessages(fields, a, b) {
                 // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- oneof fields are never "map"
                 switch (s.kind) {
                     case "message":
-                        return s.T.equals(va.value, vb.value);
+                        const messageType = typeof s.T === "function" ? s.T() : s.T;
+                        return messageType.equals(va.value, vb.value);
                     case "enum":
                         return (0, scalar_js_1.scalarEquals)(protobuf_1.ScalarType.INT32, va.value, vb.value);
                     case "scalar":
@@ -78,7 +80,7 @@ function compareMessages(fields, a, b) {
                 const keys = Object.keys(va).concat(Object.keys(vb));
                 switch (m.V.kind) {
                     case "message":
-                        const messageType = m.V.T;
+                        const messageType = typeof m.V.T === "function" ? m.V.T() : m.V.T;
                         return keys.every((k) => messageType.equals(va[k], vb[k]));
                     case "enum":
                         return keys.every((k) => (0, scalar_js_1.scalarEquals)(protobuf_1.ScalarType.INT32, va[k], vb[k]));
@@ -96,7 +98,8 @@ function cloneSingularField(value, fieldInfo) {
         return value;
     }
     if (fieldInfo.kind === "message") {
-        return cloneMessage(value, fieldInfo.T.fields);
+        const messageType = typeof fieldInfo.T === "function" ? fieldInfo.T() : fieldInfo.T;
+        return cloneMessage(value, messageType.fields);
     }
     if (fieldInfo.kind === "oneof") {
         if (value.case === undefined) {
@@ -237,7 +240,8 @@ function createMessage(fields) {
                     message[field.localName] = undefined;
                     continue;
                 }
-                message[field.localName] = createMessage(field.T.fields);
+                const messageType = typeof field.T === "function" ? field.T() : field.T;
+                message[field.localName] = createMessage(messageType.fields);
                 break;
             case "map":
                 message[field.localName] = {};

package/dist/partial.js

@@ -22,10 +22,13 @@ function applyPartialMessage(source, target, fields) {
                 }
                 const sourceField = member.findField(sk);
                 let val = s[localName].value;
-                if (sourceField &&
-                    sourceField.kind == "message" &&
-                    !(0, is_message_js_1.isCompleteMessage)(val, sourceField.T.fields.list())) {
-                    val = sourceField.T.create(val);
+                if (sourceField?.kind == "message") {
+                    const messageType = typeof sourceField.T === "function"
+                        ? sourceField.T()
+                        : sourceField.T;
+                    if (!(0, is_message_js_1.isCompleteMessage)(val, messageType.fields.list())) {
+                        val = messageType.create(val);
+                    }
                 }
                 else if (sourceField &&
                     sourceField.kind === "scalar" &&
@@ -58,7 +61,7 @@ function applyPartialMessage(source, target, fields) {
                         }
                         break;
                     case "message":
-                        const messageType = member.V.T;
+                        const messageType = typeof member.V.T === "function" ? member.V.T() : member.V.T;
                         for (const k of Object.keys(s[localName])) {
                             let val = s[localName][k];
                             if (!messageType.fieldWrapper) {
@@ -72,7 +75,7 @@ function applyPartialMessage(source, target, fields) {
                 }
                 break;
             case "message":
-                const mt = member.T;
+                const mt = typeof member.T === "function" ? member.T() : member.T;
                 if (member.repeated) {
                     t[localName] = s[localName].map((val) => (0, is_message_js_1.isCompleteMessage)(val, mt.fields.list()) ? val : mt.create(val));
                 }
@@ -89,9 +92,10 @@ function applyPartialMessage(source, target, fields) {
                         }
                     }
                     else {
-                        t[localName] = (0, is_message_js_1.isCompleteMessage)(val, mt.fields.list())
+                        const messageType = mt;
+                        t[localName] = (0, is_message_js_1.isCompleteMessage)(val, messageType.fields.list())
                             ? val
-                            : mt.create(val);
+                            : messageType.create(val);
                     }
                 }
                 break;

package/dist/typescript.d.ts

@@ -1,5 +1,7 @@
-import type { DescExtension, DescField } from "@bufbuild/protobuf";
-import type { GeneratedFile, Printable, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type { DescEnum, DescExtension, DescField, DescFile, DescMessage } from "@bufbuild/protobuf";
+import type { GeneratedFile, ImportSymbol, Printable, Schema } from "@bufbuild/protoplugin/ecmascript";
 export declare function generateTs(schema: Schema): void;
+export declare function makeImportPath(file: DescFile): string;
 export declare function generateFieldInfo(f: GeneratedFile, field: DescField | DescExtension): void;
+export declare const createTypeImport: (desc: DescMessage | DescEnum | DescExtension) => ImportSymbol;
 export declare function getFieldInfoLiteral(field: DescField | DescExtension): Printable;

package/dist/typescript.js

@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFieldInfoLiteral = exports.generateFieldInfo = exports.generateTs = void 0;
+exports.getFieldInfoLiteral = exports.createTypeImport = exports.generateFieldInfo = exports.makeImportPath = exports.generateTs = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
 const editions_js_1 = require("./editions.js");
@@ -40,6 +40,9 @@ function generateTs(schema) {
             if (message.file !== file) {
                 return;
             }
+            for (const nestedEnum of message.nestedEnums) {
+                generateEnum(f, nestedEnum);
+            }
             messageTypes.push(message);
             const deps = new Set();
             for (const field of message.fields) {
@@ -133,12 +136,6 @@ function generateMessage(schema, f, message) {
     f.print("  },");
     f.print(");");
     f.print();
-    for (const nestedEnum of message.nestedEnums) {
-        generateEnum(f, nestedEnum);
-    }
-    for (const nestedMessage of message.nestedMessages) {
-        generateMessage(schema, f, nestedMessage);
-    }
 }
 function generateField(f, field) {
     if (field.oneof) {
@@ -168,10 +165,23 @@ function generateOneof(f, oneof) {
         .flat();
     f.print("  ", oneof.name, "?: {\n    value?: undefined,\n    case: undefined\n  }", oneOfCases, ";");
 }
+function makeImportPath(file) {
+    return "./" + file.name + "_pb.js";
+}
+exports.makeImportPath = makeImportPath;
 function generateFieldInfo(f, field) {
     f.print("        ", getFieldInfoLiteral(field), ",");
 }
 exports.generateFieldInfo = generateFieldInfo;
+const createTypeImport = (desc) => {
+    var name = (0, ecmascript_1.localName)(desc);
+    if (desc.kind === "enum") {
+        name += "_Enum";
+    }
+    const from = makeImportPath(desc.file);
+    return (0, ecmascript_1.createImportSymbol)(name, from);
+};
+exports.createTypeImport = createTypeImport;
 function getFieldInfoLiteral(field) {
     const e = [];
     e.push("{ no: ", field.number, `, `);
@@ -195,7 +205,7 @@ function getFieldInfoLiteral(field) {
                     e.push(`V: {kind: "scalar", T: `, field.mapValue.scalar, ` /* ScalarType.`, protobuf_1.ScalarType[field.mapValue.scalar], ` */}, `);
                     break;
                 case "message":
-                    e.push(`V: {kind: "message", T: `, field.mapValue.message, `}, `);
+                    e.push(`V: {kind: "message", T: () => `, field.mapValue.message, `}, `);
                     break;
                 case "enum":
                     e.push(`V: {kind: "enum", T: `, field.mapValue.enum, `}, `);
@@ -203,13 +213,13 @@ function getFieldInfoLiteral(field) {
             }
             break;
         case "message":
-            e.push(`kind: "message", T: `, field.message, `, `);
+            e.push(`kind: "message", T: () => `, field.message, `, `);
             if (field.proto.type === protobuf_1.FieldDescriptorProto_Type.GROUP) {
                 e.push(`delimited: true, `);
             }
             break;
         case "enum":
-            e.push(`kind: "enum", T: `, field.enum, `_Enum, `);
+            e.push(`kind: "enum", T: `, (0, exports.createTypeImport)(field.enum), `, `);
             break;
     }
     if (field.repeated) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptre/protobuf-es-lite",
   "description": "Lightweight Protobuf codegen for TypeScript and JavaScript.",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"