from-issue: improve parseIssue

.blueprint/from-issue/command.mts

@@ -29,12 +29,14 @@ const command: JHipsterCommandDefinition = {
       },
       configure(gen: any) {
         // Gets the owner, repo and issue_number from a string such as, "jhipster/generator-jhipster#12345"
-        const parsedIssue = parseIssue(gen.issue);
-        if (parsedIssue) {
-          gen.owner = parsedIssue.owner;
-          gen.repository = parsedIssue.repository;
-          gen.issueNumber = parsedIssue.issue;
+        const { owner, repository, issue } = parseIssue(gen.issue);
+        if (owner) {
+          gen.owner = owner;
         }
+        if (repository) {
+          gen.repository = repository;
+        }
+        gen.issueNumber = issue;
       },
       scope: 'generator',
     },

lib/testing/github.spec.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'esmocha';
+import { parseIssue } from './github.js';
+
+describe('github', () => {
+  it('should parse full issue spec', () => {
+    expect(parseIssue('jhipster/generator-jhipster#12345')).toEqual({
+      owner: 'jhipster',
+      repository: 'generator-jhipster',
+      issue: '12345',
+    });
+  });
+  it('should parse repo with issue', () => {
+    expect(parseIssue('generator-jhipster-entity-audit#12345')).toEqual({
+      repository: 'generator-jhipster-entity-audit',
+      issue: '12345',
+    });
+  });
+  it('should parse issue', () => {
+    expect(parseIssue('12345')).toEqual({ issue: '12345' });
+  });
+  it('should not parse with missing repo', () => {
+    expect(() => parseIssue('jhipster/12345')).toThrowError('Invalid issue format: jhipster/12345');
+  });
+  it('should not parse with invalid issue number', () => {
+    expect(() => parseIssue('a')).toThrowError('Invalid issue format: a');
+  });
+});

lib/testing/github.ts

@@ -4,13 +4,15 @@ import { EOL } from 'node:os';
 import process from 'node:process';
 import axios from 'axios';
 
-export const parseIssue = (issue: string): undefined | { owner: string; repository: string; issue: string } => {
-  if (issue.includes('#')) {
-    const split = issue.split('/');
-    const split2 = split[1].split('#');
-    return { owner: split[0], repository: split2[0], issue: split2[1] };
+type GithubIssue = { owner: string; repository: string; issue: string };
+
+export const parseIssue = (issue: string): GithubIssue => {
+  const result = /^(((?<owner>[^/]*)\/)?(?<repository>[^#]+)#)?(?<issue>\d+)$/.exec(issue);
+  const groups = result?.groups;
+  if (groups) {
+    return { ...groups } as GithubIssue;
   }
-  return undefined;
+  throw new Error(`Invalid issue format: ${issue}`);
 };
 
 export const getGithubOutputFile = (): string | undefined => {