@aptre/protobuf-es-lite 0.2.3 → 0.2.5

package/dist/enum.d.ts

@@ -0,0 +1,6 @@
+import { EnumType, EnumValueInfo } from "@bufbuild/protobuf";
+export declare function normalizeEnumValue(value: EnumValueInfo | Omit<EnumValueInfo, "localName">): EnumValueInfo;
+/**
+ * Create a new EnumType with the given values.
+ */
+export declare function createEnumType(typeName: string, values: (EnumValueInfo | Omit<EnumValueInfo, "localName">)[], _opt?: {}): EnumType;

package/dist/enum.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEnumType = exports.normalizeEnumValue = void 0;
+function normalizeEnumValue(value) {
+    if ("localName" in value) {
+        return value;
+    }
+    return { ...value, localName: value.name };
+}
+exports.normalizeEnumValue = normalizeEnumValue;
+/**
+ * Create a new EnumType with the given values.
+ */
+function createEnumType(typeName, values, 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+_opt) {
+    const names = Object.create(null);
+    const numbers = Object.create(null);
+    const normalValues = [];
+    for (const value of values) {
+        // We do not surface options at this time
+        // const value: EnumValueInfo = {...v, options: v.options ?? emptyReadonlyObject};
+        const n = normalizeEnumValue(value);
+        normalValues.push(n);
+        names[value.name] = n;
+        numbers[value.no] = n;
+    }
+    return {
+        typeName,
+        values: normalValues,
+        // We do not surface options at this time
+        // options: opt?.options ?? Object.create(null),
+        findName(name) {
+            return names[name];
+        },
+        findNumber(no) {
+            return numbers[no];
+        },
+    };
+}
+exports.createEnumType = createEnumType;

package/dist/index.d.ts

@@ -1,4 +1,6 @@
+export { EnumType, EnumValue, EnumValueInfo, ScalarType, WireType, LongType, } from "@bufbuild/protobuf";
 export { Message, CompleteMessage, AnyMessage, MessageType, Field, CompleteField, compareMessages, createMessageType, } from "./message.js";
 export { isCompleteMessage, isCompleteField } from "./is-message.js";
 export { newFieldList, FieldList, PartialFieldInfo, FieldInfo, OneofInfo, fieldJsonName, localFieldName, localOneofName, } from "./field.js";
 export { scalarEquals, scalarZeroValue, isScalarZeroValue } from "./scalar.js";
+export { createEnumType, normalizeEnumValue } from "./enum.js";

package/dist/index.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isScalarZeroValue = exports.scalarZeroValue = exports.scalarEquals = exports.localOneofName = exports.localFieldName = exports.fieldJsonName = exports.FieldList = exports.newFieldList = exports.isCompleteField = exports.isCompleteMessage = exports.createMessageType = exports.compareMessages = void 0;
+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; } });
 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; } });
@@ -17,3 +22,6 @@ 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; } });
 Object.defineProperty(exports, "isScalarZeroValue", { enumerable: true, get: function () { return scalar_js_1.isScalarZeroValue; } });
+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; } });

package/dist/typescript.js

@@ -24,6 +24,7 @@ const MessageImport = (0, ecmascript_1.createImportSymbol)("Message", libPkg);
 const MessageTypeImport = (0, ecmascript_1.createImportSymbol)("MessageType", libPkg);
 const CreateMessageTypeImport = (0, ecmascript_1.createImportSymbol)("createMessageType", libPkg);
 const PartialFieldInfo = (0, ecmascript_1.createImportSymbol)("PartialFieldInfo", libPkg);
+const CreateEnumTypeImport = (0, ecmascript_1.createImportSymbol)("createEnumType", libPkg);
 function generateTs(schema) {
     for (const file of schema.files) {
         const f = schema.generateFile(file.name + "_pb.ts");
@@ -36,24 +37,30 @@ function generateTs(schema) {
         const messageTypes = [];
         const dependencies = new Map();
         function collectMessages(message) {
-            if (message.file === file) {
-                messageTypes.push(message);
-                const deps = new Set();
-                for (const field of message.fields) {
-                    if (field.fieldKind === "message" && field.message.file === file) {
-                        deps.add(field.message);
-                    }
+            if (message.file !== file) {
+                return;
+            }
+            messageTypes.push(message);
+            const deps = new Set();
+            for (const field of message.fields) {
+                if (field.fieldKind === "message" && field.message.file === file) {
+                    deps.add(field.message);
                 }
-                dependencies.set(message, deps);
-                for (const nestedMessage of message.nestedMessages) {
-                    collectMessages(nestedMessage);
+                else if (field.fieldKind === "map" &&
+                    field.mapValue.kind === "message" &&
+                    field.mapValue.message.file === file) {
+                    deps.add(field.mapValue.message);
                 }
             }
+            dependencies.set(message, deps);
+            for (const nestedMessage of message.nestedMessages) {
+                collectMessages(nestedMessage);
+            }
         }
         for (const message of file.messages) {
             collectMessages(message);
         }
-        // Topological sort toensure consts are declared in the right order.
+        // Topological sort to ensure consts are declared in the right order.
         const sortedMessageTypes = topologicalSort(messageTypes, dependencies);
         for (const message of sortedMessageTypes) {
             generateMessage(schema, f, message);
@@ -92,12 +99,12 @@ function generateEnum(f, enumeration) {
     }
     f.print("}");
     f.print();
-    f.print("// ", enumeration, "_Name maps the enum names to the values.");
-    f.print(f.exportDecl("const", enumeration.name + "_Name"), " = {");
+    f.print("// ", enumeration, "_Enum is the enum type for ", enumeration, ".");
+    f.print(f.exportDecl("const", enumeration.name + "_Enum"), " = ", CreateEnumTypeImport, "(", f.string(enumeration.typeName), ", [");
     for (const value of enumeration.values) {
-        f.print("  ", (0, ecmascript_1.localName)(value), ": ", enumeration, ".", (0, ecmascript_1.localName)(value), ",");
+        f.print("  { no: ", value.number, ', name: "', value.name, '" },');
     }
-    f.print("};");
+    f.print("]);");
     f.print();
 }
 function generateMessage(schema, f, message) {
@@ -202,7 +209,7 @@ function getFieldInfoLiteral(field) {
             }
             break;
         case "enum":
-            e.push(`kind: "enum", T: `, field.enum, `, `);
+            e.push(`kind: "enum", T: `, field.enum, `_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.3",
+  "version": "0.2.5",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"