@aptre/protobuf-es-lite 0.1.2 → 0.1.4

package/dist/typescript.js

@@ -23,22 +23,59 @@ const libPkg = "@aptre/protobuf-es-lite";
 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);
 function generateTs(schema) {
     for (const file of schema.files) {
         const f = schema.generateFile(file.name + "_pb.ts");
         f.preamble(file);
         f.print(`export const protobufPackage = "${file.proto.package}";`);
         f.print();
+        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);
+                }
+            }
+            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);
+        }
+        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;
+function topologicalSort(messages, dependencies) {
+    const result = [];
+    const visited = new Set();
+    const 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));
@@ -83,7 +120,7 @@ function generateMessage(schema, f, message) {
     for (const field of message.fields) {
         generateFieldInfo(f, field);
     }
-    f.print("    ],");
+    f.print("    ] as readonly ", PartialFieldInfo, "[],");
     f.print("    packedByDefault: ", message.file.proto.syntax === "proto3", ",");
     f.print("  },");
     f.print(");");

package/example/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.json",
+  "files": ["example_pb.ts"],
+  "compilerOptions": {
+    "paths": {"@aptre/protobuf-es-lite": ["../", "../dist"]}
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptre/protobuf-es-lite",
   "description": "Lightweight Protobuf codegen for TypeScript and JavaScript.",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"
@@ -34,6 +34,10 @@
   "scripts": {
     "clean": "rimraf ./dist",
     "build": "npm run clean && tsc --project tsconfig.json --outDir ./dist",
+    "release:version": "npm version patch -m \"release: v%s\" --no-git-tag-version",
+    "release:commit": "git reset && git add package.json && git commit -s -m \"release: v$npm_package_version\" && git tag v$npm_package_version",
+    "release:publish": "git push --follow-tags && npm run build && npm publish",
+    "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)'"