feat(custom generators): added '-custom-generator' parameter fixes OpenAPITools#237

Author: mcaden

apps/generator-cli/src/app/services/pass-trough.service.spec.ts

@@ -175,6 +175,24 @@ describe('PassTroughService', () => {
             )
           })
 
+          it('can delegate with custom jar', () => {
+            delete process.env['JAVA_OPTS']
+            const newCmdMock = {...cmdMock};
+            const args = [...newCmdMock.args];
+            newCmdMock.args = [...newCmdMock.args, '-custom-generator=../some/custom.jar'];
+            commandMock.commands[cmd].action(newCmdMock)
+            const cpDelimiter = process.platform === "win32" ? ';' : ':';
+            expect(childProcess.spawn).toHaveBeenNthCalledWith(
+              1,
+              `java -cp "${['../some/custom.jar', '/some/path/to/4.2.1.jar'].join(cpDelimiter)}" org.openapitools.codegen.OpenAPIGenerator`,
+              [cmd, ...args],
+              {
+                stdio: 'inherit',
+                shell: true
+              }
+            )
+          })
+
           if (cmd === 'help') {
             it('prints the help info and does not delegate, if args length = 0', () => {
               childProcess.spawn.mockReset()

apps/generator-cli/src/app/services/pass-trough.service.ts

@@ -49,11 +49,16 @@ export class PassTroughService {
 
   }
 
-  public passTrough = (args: string[] = []) => spawn(this.cmd(), args, {
+  public passTrough = (args: string[] = []) => spawn(this.cmd(this.processCustomJarParam(args)), args, {
     stdio: 'inherit',
     shell: true
   }).on('exit', process.exit);
 
+  private processCustomJarParam = (args: string[]): string => {
+    const jarOptionIndex = args.findIndex(e => e.startsWith('-custom-generator'));
+    return jarOptionIndex < 0 ? '' : args.splice(jarOptionIndex, 1)[0].split('=')[1];
+  }
+
   private getCommands = async (): Promise<[string, string | undefined][]> => {
 
     const [help, completion] = (await Promise.all([
@@ -85,8 +90,13 @@ export class PassTroughService {
     });
   });
 
-  private cmd() {
-    return ['java', process.env['JAVA_OPTS'], `-jar "${this.versionManager.filePath()}"`].filter(isString).join(' ');
+  private cmd(customJarPath: string = '') {
+    const cliPath = this.versionManager.filePath();
+    const cpDelimiter = process.platform === "win32" ? ';' : ':';
+    const subCmd = customJarPath
+      ? `-cp "${[customJarPath, cliPath].join(cpDelimiter)}" org.openapitools.codegen.OpenAPIGenerator`
+      : `-jar "${cliPath}"`;
+    return ['java', process.env['JAVA_OPTS'], subCmd].filter(isString).join(' ');
   }
 
 }