feat(reference): expose prefix

Also fix the regex part in parser test as it wasn't testing the regex properly. Closes #17
conventional-changelog-archived-repos · Sep 12, 2015 · 9962dda · 9962dda
1 parent 0272461
commit 9962dda
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 124 deletions.
diff --git a/lib/parser.js b/lib/parser.js
@@ -90,8 +90,9 @@ function parser(raw, options, regex) {
         action: action,
         owner: owner,
         repository: repository,
-        issue: referenceMatch[2],
-        raw: referenceMatch[0]
+        issue: referenceMatch[3],
+        raw: referenceMatch[0],
+        prefix: referenceMatch[2]
       };
       references.push(reference);
     }
@@ -160,8 +161,9 @@ function parser(raw, options, regex) {
           action: action,
           owner: owner,
           repository: repository,
-          issue: referenceMatch[2],
-          raw: referenceMatch[0]
+          issue: referenceMatch[3],
+          raw: referenceMatch[0],
+          prefix: referenceMatch[2]
         };
         references.push(reference);
       }

diff --git a/lib/regex.js b/lib/regex.js
@@ -26,7 +26,7 @@ function getReferencePartsRegex(issuePrefixes) {
     return reNomatch;
   }
 
-  return new RegExp('(?:.*?)??\\s*(\\S*?)??(?:' + join(issuePrefixes, '|') + ')(\\d+)', 'gi');
+  return new RegExp('(?:.*?)??\\s*(\\S*?)??(' + join(issuePrefixes, '|') + ')(\\d+)', 'gi');
 }
 
 function getReferencesRegex(referenceActions) {

diff --git a/test/cli.spec.js b/test/cli.spec.js
@@ -80,7 +80,7 @@ describe('cli', function() {
     cp.stdout
       .pipe(concat(function(chunk) {
         expect(chunk.toString()).to.include('"scope":"category","type":"fix:subcategory","subject":"My subject"');
-        expect(chunk.toString()).to.include('"references":[{"action":"Close","owner":null,"repository":null,"issue":"10036","raw":"#10036"},{"action":"fix","owner":null,"repository":null,"issue":"9338","raw":"#9338"}]');
+        expect(chunk.toString()).to.include('"references":[{"action":"Close","owner":null,"repository":null,"issue":"10036","raw":"#10036","prefix":"#"},{"action":"fix","owner":null,"repository":null,"issue":"9338","raw":"#9338","prefix":"#"}]');
         expect(chunk.toString()).to.include('"notes":[{"title":"BREAKING NEWS","text":"A lot of changes!"}]');
 
         done();

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -168,13 +168,15 @@ describe('conventionalCommitsParser', function() {
             owner: null,
             repository: null,
             issue: '123',
-            raw: '#123'
+            raw: '#123',
+            prefix: '#'
           }, {
             action: 'fix',
             owner: null,
             repository: null,
             issue: '33',
-            raw: '#33'
+            raw: '#33',
+            prefix: '#'
           }]);
         } else if (i === 1) {
           expect(chunk.type).to.equal('fix');
@@ -226,13 +228,15 @@ describe('conventionalCommitsParser', function() {
             owner: null,
             repository: null,
             issue: '123',
-            raw: '#123'
+            raw: '#123',
+            prefix: '#'
           }, {
             action: 'fix',
             owner: null,
             repository: null,
             issue: '33',
-            raw: '#33'
+            raw: '#33',
+            prefix: '#'
           }]);
         } else if (i === 1) {
           expect(chunk.type).to.equal('ng-list');