ts-proto 1.149.0 → 1.150.1

package/build/generate-services.js

@@ -146,8 +146,13 @@ function generateRegularRpcMethod(ctx, methodDesc) {
 function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
     const { options } = ctx;
     const chunks = [];
-    // Define the FooServiceImpl class
+    // Determine information about the service.
     const { name } = serviceDesc;
+    const serviceName = (0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name);
+    // Define the service name constant.
+    const serviceNameConst = `${name}ServiceName`;
+    chunks.push((0, ts_poet_1.code) `export const ${serviceNameConst} = "${serviceName}";`);
+    // Define the FooServiceImpl class
     const i = options.context ? `${name}<Context>` : name;
     const t = options.context ? `<${main_1.contextTypeVar}>` : "";
     chunks.push((0, ts_poet_1.code) `export class ${name}ClientImpl${t} implements ${(0, ts_poet_1.def)(i)} {`);
@@ -156,8 +161,7 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
     chunks.push((0, ts_poet_1.code) `private readonly rpc: ${rpcType};`);
     chunks.push((0, ts_poet_1.code) `private readonly service: string;`);
     chunks.push((0, ts_poet_1.code) `constructor(rpc: ${rpcType}, opts?: {service?: string}) {`);
-    const serviceID = (0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name);
-    chunks.push((0, ts_poet_1.code) `this.service = opts?.service || "${serviceID}";`);
+    chunks.push((0, ts_poet_1.code) `this.service = opts?.service || ${serviceNameConst};`);
     chunks.push((0, ts_poet_1.code) `this.rpc = rpc;`);
     // Bind each FooService method to the FooServiceImpl class
     for (const methodDesc of serviceDesc.method) {

package/build/plugin.js

@@ -17,10 +17,27 @@ async function main() {
     const typeMap = (0, types_1.createTypeMap)(request, options);
     const utils = (0, main_1.makeUtils)(options);
     const ctx = { typeMap, options, utils };
-    const filesToGenerate = options.emitImportedFiles ? request.protoFile : (0, utils_1.protoFilesToGenerate)(request);
-    const files = await Promise.all(filesToGenerate
-        .filter((file) => !options.M[file.name])
-        .map(async (file) => {
+    let filesToGenerate;
+    if (options.emitImportedFiles) {
+        const fileSet = new Set();
+        const addFilesUnlessAliased = (filenames) => {
+            filenames
+                .filter((name) => !options.M[name])
+                .forEach((name) => {
+                fileSet.add(name);
+                const file = request.protoFile.find((file) => file.name === name);
+                if (file && file.dependency.length > 0) {
+                    addFilesUnlessAliased(file.dependency);
+                }
+            });
+        };
+        addFilesUnlessAliased(request.fileToGenerate);
+        filesToGenerate = request.protoFile.filter((file) => fileSet.has(file.name));
+    }
+    else {
+        filesToGenerate = (0, utils_1.protoFilesToGenerate)(request).filter((file) => !options.M[file.name]);
+    }
+    const files = await Promise.all(filesToGenerate.map(async (file) => {
         const [path, code] = (0, main_1.generateFile)(ctx, file);
         const content = code.toString({ ...(0, options_1.getTsPoetOpts)(options), path });
         return { name: path, content };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.149.0",
+  "version": "1.150.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",