@aptre/protobuf-es-lite 0.1.3 → 0.1.5

package/dist/typescript.js

@@ -33,13 +33,53 @@ function generateTs(schema) {
         for (const enumeration of file.enums) {
             generateEnum(f, enumeration);
         }
+        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);
+                    }
+                }
+                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.
+        const sortedMessageTypes = topologicalSort(messageTypes, dependencies);
+        for (const message of sortedMessageTypes) {
             generateMessage(schema, f, message);
         }
         // We do not generate anything for services or extensions
     }
 }
 exports.generateTs = generateTs;
+// topologicalSort sorts the list of messages by dependency order.
+function topologicalSort(messages, dependencies) {
+    const result = [];
+    const visited = new Set();
+    function visit(message) {
+        if (visited.has(message))
+            return;
+        visited.add(message);
+        for (const dep of dependencies.get(message) ?? []) {
+            visit(dep);
+        }
+        result.push(message);
+    }
+    for (const message of messages) {
+        visit(message);
+    }
+    return result;
+}
 // prettier-ignore
 function generateEnum(f, enumeration) {
     f.print(f.jsDoc(enumeration));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptre/protobuf-es-lite",
   "description": "Lightweight Protobuf codegen for TypeScript and JavaScript.",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "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"