@aptre/protobuf-es-lite 0.1.4 → 0.1.6

package/dist/typescript.js

@@ -30,27 +30,30 @@ function generateTs(schema) {
         f.preamble(file);
         f.print(`export const protobufPackage = "${file.proto.package}";`);
         f.print();
+        for (const enumeration of file.enums) {
+            generateEnum(f, enumeration);
+        }
         const messageTypes = [];
         const dependencies = new Map();
         function collectMessages(message) {
-            messageTypes.push(message);
-            const deps = new Set();
-            for (const field of message.fields) {
-                if (field.fieldKind === "message") {
-                    deps.add(field.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);
+                    }
+                }
+                dependencies.set(message, deps);
+                for (const nestedMessage of message.nestedMessages) {
+                    collectMessages(nestedMessage);
                 }
             }
-            dependencies.set(message, deps);
-            for (const nestedMessage of message.nestedMessages) {
-                collectMessages(nestedMessage);
-            }
-        }
-        for (const enumeration of file.enums) {
-            generateEnum(f, enumeration);
         }
         for (const message of file.messages) {
             collectMessages(message);
         }
+        // Topological sort toensure consts are declared in the right order.
         const sortedMessageTypes = topologicalSort(messageTypes, dependencies);
         for (const message of sortedMessageTypes) {
             generateMessage(schema, f, message);
@@ -59,10 +62,11 @@ function generateTs(schema) {
     }
 }
 exports.generateTs = generateTs;
+// topologicalSort sorts the list of messages by dependency order.
 function topologicalSort(messages, dependencies) {
     const result = [];
     const visited = new Set();
-    const visit = (message) => {
+    function visit(message) {
         if (visited.has(message))
             return;
         visited.add(message);
@@ -70,7 +74,7 @@ function topologicalSort(messages, dependencies) {
             visit(dep);
         }
         result.push(message);
-    };
+    }
     for (const message of messages) {
         visit(message);
     }
@@ -103,14 +107,15 @@ function generateMessage(schema, f, message) {
     (0, editions_js_1.getNonEditionRuntime)(schema, message.file);
     f.print(f.jsDoc(message));
     f.print(f.exportDecl("interface", message), " extends ", MessageImport, "<", message, "> {");
-    for (const member of message.members) {
-        switch (member.kind) {
-            case "field":
-                generateField(f, member);
-                break;
+    for (const field of message.fields) {
+        if (!field.oneof) {
+            generateField(f, field);
         }
-        f.print();
     }
+    for (const oneof of message.oneofs) {
+        generateOneof(f, oneof);
+    }
+    f.print();
     f.print("}");
     f.print();
     f.print(f.exportDecl("const", message), ": ", MessageTypeImport, "<", message, "> = ", CreateMessageTypeImport, "(");
@@ -139,6 +144,17 @@ function generateField(f, field) {
     f.print("  ", (0, ecmascript_1.localName)(field), ": ", typing, ";");
 }
 // prettier-ignore
+function generateOneof(f, oneof) {
+    f.print();
+    f.print(f.jsDoc(oneof, "  "));
+    var oneOfCases = oneof.fields.map((field) => {
+        const { typing } = (0, util_js_1.getFieldTypeInfo)(field);
+        const doc = f.jsDoc(field, "    ");
+        return [` | {\n`, doc, `\n    value: `, typing, `;\n    case: "`, (0, ecmascript_1.localName)(field), `";\n  }`];
+    }).flat();
+    f.print("  ", oneof.name, ": {\n    value?: undefined,\n    case: undefined\n  }", oneOfCases, ";");
+}
+// prettier-ignore
 function generateFieldInfo(f, field) {
     f.print("        ", getFieldInfoLiteral(field), ",");
 }

package/example/example.proto

@@ -26,5 +26,8 @@ enum ExampleEnum {
 message EchoMsg {
   string body = 1;
   google.protobuf.Timestamp ts = 2;
-  ExampleEnum example_enum = 3;
+  oneof demo {
+    ExampleEnum example_enum = 3;
+    string example_string = 4;
+  }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptre/protobuf-es-lite",
   "description": "Lightweight Protobuf codegen for TypeScript and JavaScript.",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"
@@ -40,9 +40,13 @@
     "release": "npm run release:version && npm run release:commit",
     "typecheck": "tsc --noEmit --project tsconfig.json --outDir ./dist",
     "example": "npm run build && protoc --plugin=./bin/protoc-gen-es-lite --es-lite_out=. --es-lite_opt target=ts --es-lite_opt ts_nocheck=false ./example/example.proto",
-    "format": "prettier --write './src/**/(*.ts|*.tsx|*.html|*.css|*.scss)'"
+    "format": "prettier --write './src/**/(*.ts|*.tsx|*.html|*.css|*.scss)'",
+    "precommit": "npm run format"
   },
   "preferUnplugged": true,
+  "pre-commit": [
+    "precommit"
+  ],
   "dependencies": {
     "@bufbuild/protobuf": "^1.9.0",
     "@bufbuild/protoplugin": "1.9.0"
@@ -56,6 +60,7 @@
     }
   },
   "devDependencies": {
+    "pre-commit": "^1.2.2",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
     "typescript": "^5.4.5"