@aptre/protobuf-es-lite 0.2.5 → 0.2.6

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, `, `);
@@ -209,7 +219,7 @@ function getFieldInfoLiteral(field) {
             }
             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.6",
   "license": "Apache-2.0",
   "repository": {
     "url": "git+ssh://git@github.com/aperturerobotics/protobuf-es-lite.git"