From b9394176b1d572ec9c53f25d2d614a27874fddfb Mon Sep 17 00:00:00 2001
From: Ruben Vermeersch <ruben@rocketeer.be>
Date: Thu, 20 Aug 2015 15:12:56 +0200
Subject: [PATCH] Handle extracted comments in headers

---
 dist/pofile.js           | 21 ++++++++++++++-------
 dist/pofile.min.js       |  2 +-
 lib/po.js                | 13 ++++++++++---
 test/fixtures/comment.po |  1 +
 test/parse.js            |  3 +++
 test/write.js            |  1 +
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/dist/pofile.js b/dist/pofile.js
index 1b2d925..5b57cf1 100644
--- a/dist/pofile.js
+++ b/dist/pofile.js
@@ -1,4 +1,6 @@
-require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({"W8CkM0":[function(require,module,exports){
+require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({"pofile":[function(require,module,exports){
+module.exports=require('W8CkM0');
+},{}],"W8CkM0":[function(require,module,exports){
 var fs = require('fs');
 var isArray = require('lodash.isarray');
 
@@ -8,6 +10,7 @@ function trim(string) {
 
 var PO = function () {
     this.comments = [];
+    this.extractedComments = [];
     this.headers = {};
     this.items = [];
 };
@@ -24,6 +27,11 @@ PO.prototype.toString = function () {
             lines.push('# ' + comment);
         });
     }
+    if (this.extractedComments) {
+        this.extractedComments.forEach(function (comment) {
+            lines.push('#. ' + comment);
+        });
+    }
 
     lines.push('msgid ""');
     lines.push('msgstr ""');
@@ -87,10 +95,11 @@ PO.parse = function (data) {
         acc.push(line);
         return acc;
     }, []).forEach(function (header) {
-        if (header.match(/^#/)) {
+        if (header.match(/^#\./)) {
+            po.extractedComments.push(header.replace(/^#\.\s*/, ''));
+        } else if (header.match(/^#/)) {
             po.comments.push(header.replace(/^#\s*/, ''));
-        }
-        if (header.match(/^"/)) {
+        } else if (header.match(/^"/)) {
             header = header.trim().replace(/^"/, '').replace(/\\n"$/, '');
             var p = header.split(/:/);
             var name = p.shift().trim();
@@ -322,9 +331,7 @@ PO.Item.prototype.toString = function () {
 
 module.exports = PO;
 
-},{"fs":3,"lodash.isarray":4}],"pofile":[function(require,module,exports){
-module.exports=require('W8CkM0');
-},{}],3:[function(require,module,exports){
+},{"fs":3,"lodash.isarray":4}],3:[function(require,module,exports){
 
 },{}],4:[function(require,module,exports){
 /**
diff --git a/dist/pofile.min.js b/dist/pofile.min.js
index 99352ea..9a5d9b7 100644
--- a/dist/pofile.min.js
+++ b/dist/pofile.min.js
@@ -1 +1 @@
-require=function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({W8CkM0:[function(a,b,c){function d(a){return a.replace(/^\s+|\s+$/g,"")}var e=a("fs"),f=a("lodash.isarray"),g=function(){this.comments=[],this.headers={},this.items=[]};g.prototype.save=function(a,b){e.writeFile(a,this.toString(),b)},g.prototype.toString=function(){var a=[];this.comments&&this.comments.forEach(function(b){a.push("# "+b)}),a.push('msgid ""'),a.push('msgstr ""');var b=Object.keys(this.headers),c=this;return b.forEach(function(b){a.push('"'+b+": "+c.headers[b]+'\\n"')}),a.push(""),this.items.forEach(function(b){a.push(b.toString()),a.push("")}),a.join("\n")},g.load=function(a,b){e.readFile(a,"utf-8",function(a,c){if(a)return b(a);var d=g.parse(c);b(null,d)})},g.parse=function(a){function b(){j.msgid.length>0&&(m>=n&&(j.obsolete=!0),m=0,n=0,e.items.push(j),j=new g.Item)}function c(a){return a=d(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\([abtnvfr'"\\?]|([0-7]{3})|x([0-9a-fA-F]{2}))/g,function(a,b,c,d){if(c)return String.fromCharCode(parseInt(c,8));if(d)return String.fromCharCode(parseInt(d,16));switch(b){case"a":return"";case"b":return"\b";case"t":return"	";case"n":return"\n";case"v":return"";case"f":return"\f";case"r":return"\r";default:return b}})}a=a.replace(/\r\n/g,"\n");var e=new g,f=a.split(/\n\n/),h=f.shift(),i=f.join("\n").split(/\n/);e.headers={"Project-Id-Version":"","Report-Msgid-Bugs-To":"","POT-Creation-Date":"","PO-Revision-Date":"","Last-Translator":"",Language:"","Language-Team":"","Content-Type":"","Content-Transfer-Encoding":"","Plural-Forms":""},h.split(/\n/).reduce(function(a,b){return a.merge&&(b=a.pop().slice(0,-1)+b.slice(1),delete a.merge),/^".*"$/.test(b)&&!/^".*\\n"$/.test(b)&&(a.merge=!0),a.push(b),a},[]).forEach(function(a){if(a.match(/^#/)&&e.comments.push(a.replace(/^#\s*/,"")),a.match(/^"/)){a=a.trim().replace(/^"/,"").replace(/\\n"$/,"");var b=a.split(/:/),c=b.shift().trim(),d=b.join(":").trim();e.headers[c]=d}});for(var j=new g.Item,k=null,l=0,m=0,n=0;i.length>0;){var o=d(i.shift()),p=!1;if(o.match(/^#\~/)&&(o=d(o.substring(2)),p=!0),o.match(/^#:/))b(),j.references.push(d(o.replace(/^#:/,"")));else if(o.match(/^#,/)){b();for(var q=d(o.replace(/^#,/,"")).split(","),r=0;r<q.length;r++)j.flags[q[r]]=!0}else if(o.match(/^#($|\s+)/))b(),j.comments.push(d(o.replace(/^#($|\s+)/,"")));else if(o.match(/^#\./))b(),j.extractedComments.push(d(o.replace(/^#\./,"")));else if(o.match(/^msgid_plural/))j.msgid_plural=c(o),k="msgid_plural",n++;else if(o.match(/^msgid/))b(),j.msgid=c(o),k="msgid",n++;else if(o.match(/^msgstr/)){var s=o.match(/^msgstr\[(\d+)\]/);l=s&&s[1]?parseInt(s[1]):0,j.msgstr[l]=c(o),k="msgstr",n++}else o.match(/^msgctxt/)?(b(),j.msgctxt=c(o),n++):o.length>0&&(n++,"msgstr"===k?j.msgstr[l]+=c(o):"msgid"===k?j.msgid+=c(o):"msgid_plural"===k&&(j.msgid_plural+=c(o)));p&&m++}return b(),e},g.Item=function(){this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={},this.obsolete=!1},g.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/[\x07\b\t\v\f\r"\\]/g,function(a){switch(a){case"":return"\\a";case"\b":return"\\b";case"	":return"\\t";case"":return"\\v";case"\f":return"\\f";case"\r":return"\\r";default:return"\\"+a}})},d=function(a,b,d){var e=[],f=b.split(/\n/),g="undefined"!=typeof d?"["+d+"]":"";return f.length>1?(e.push(a+g+' ""'),f.forEach(function(a){e.push('"'+c(a)+'"')})):e.push(a+g+' "'+c(b)+'"'),e};this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments.forEach(function(b){a.push("#. "+b)}),this.references.forEach(function(b){a.push("#: "+b)});var e=Object.keys(this.flags).filter(function(a){return!!this.flags[a]},this);e.length>0&&a.push("#, "+e.join(","));var g=this.obsolete?"#~ ":"";return["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var e=b[c];if(null!=e)if(f(e)&&e.length>1)e.forEach(function(b,e){a=a.concat(g+d(c,b,e))});else{e=f(e)?e.join():e;for(var h=d(c,e),i=1;i<h.length-1;i++)h[i]=h[i].slice(0,-1)+'\\n"';a=a.concat(g+h.join("\n"+g))}}),a.join("\n")},b.exports=g},{fs:3,"lodash.isarray":4}],pofile:[function(a,b,c){b.exports=a("W8CkM0")},{}],3:[function(a,b,c){},{}],4:[function(a,b,c){var d=a("lodash._isnative"),e="[object Array]",f=Object.prototype,g=f.toString,h=d(h=Array.isArray)&&h,i=h||function(a){return a&&"object"==typeof a&&"number"==typeof a.length&&g.call(a)==e||!1};b.exports=i},{"lodash._isnative":5}],5:[function(a,b,c){function d(a){return"function"==typeof a&&g.test(a)}var e=Object.prototype,f=e.toString,g=RegExp("^"+String(f).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$");b.exports=d},{}]},{},["W8CkM0"]);
\ No newline at end of file
+require=function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({pofile:[function(a,b,c){b.exports=a("W8CkM0")},{}],W8CkM0:[function(a,b,c){function d(a){return a.replace(/^\s+|\s+$/g,"")}var e=a("fs"),f=a("lodash.isarray"),g=function(){this.comments=[],this.extractedComments=[],this.headers={},this.items=[]};g.prototype.save=function(a,b){e.writeFile(a,this.toString(),b)},g.prototype.toString=function(){var a=[];this.comments&&this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments&&this.extractedComments.forEach(function(b){a.push("#. "+b)}),a.push('msgid ""'),a.push('msgstr ""');var b=Object.keys(this.headers),c=this;return b.forEach(function(b){a.push('"'+b+": "+c.headers[b]+'\\n"')}),a.push(""),this.items.forEach(function(b){a.push(b.toString()),a.push("")}),a.join("\n")},g.load=function(a,b){e.readFile(a,"utf-8",function(a,c){if(a)return b(a);var d=g.parse(c);b(null,d)})},g.parse=function(a){function b(){j.msgid.length>0&&(m>=n&&(j.obsolete=!0),m=0,n=0,e.items.push(j),j=new g.Item)}function c(a){return a=d(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\([abtnvfr'"\\?]|([0-7]{3})|x([0-9a-fA-F]{2}))/g,function(a,b,c,d){if(c)return String.fromCharCode(parseInt(c,8));if(d)return String.fromCharCode(parseInt(d,16));switch(b){case"a":return"";case"b":return"\b";case"t":return"	";case"n":return"\n";case"v":return"";case"f":return"\f";case"r":return"\r";default:return b}})}a=a.replace(/\r\n/g,"\n");var e=new g,f=a.split(/\n\n/),h=f.shift(),i=f.join("\n").split(/\n/);e.headers={"Project-Id-Version":"","Report-Msgid-Bugs-To":"","POT-Creation-Date":"","PO-Revision-Date":"","Last-Translator":"",Language:"","Language-Team":"","Content-Type":"","Content-Transfer-Encoding":"","Plural-Forms":""},h.split(/\n/).reduce(function(a,b){return a.merge&&(b=a.pop().slice(0,-1)+b.slice(1),delete a.merge),/^".*"$/.test(b)&&!/^".*\\n"$/.test(b)&&(a.merge=!0),a.push(b),a},[]).forEach(function(a){if(a.match(/^#\./))e.extractedComments.push(a.replace(/^#\.\s*/,""));else if(a.match(/^#/))e.comments.push(a.replace(/^#\s*/,""));else if(a.match(/^"/)){a=a.trim().replace(/^"/,"").replace(/\\n"$/,"");var b=a.split(/:/),c=b.shift().trim(),d=b.join(":").trim();e.headers[c]=d}});for(var j=new g.Item,k=null,l=0,m=0,n=0;i.length>0;){var o=d(i.shift()),p=!1;if(o.match(/^#\~/)&&(o=d(o.substring(2)),p=!0),o.match(/^#:/))b(),j.references.push(d(o.replace(/^#:/,"")));else if(o.match(/^#,/)){b();for(var q=d(o.replace(/^#,/,"")).split(","),r=0;r<q.length;r++)j.flags[q[r]]=!0}else if(o.match(/^#($|\s+)/))b(),j.comments.push(d(o.replace(/^#($|\s+)/,"")));else if(o.match(/^#\./))b(),j.extractedComments.push(d(o.replace(/^#\./,"")));else if(o.match(/^msgid_plural/))j.msgid_plural=c(o),k="msgid_plural",n++;else if(o.match(/^msgid/))b(),j.msgid=c(o),k="msgid",n++;else if(o.match(/^msgstr/)){var s=o.match(/^msgstr\[(\d+)\]/);l=s&&s[1]?parseInt(s[1]):0,j.msgstr[l]=c(o),k="msgstr",n++}else o.match(/^msgctxt/)?(b(),j.msgctxt=c(o),n++):o.length>0&&(n++,"msgstr"===k?j.msgstr[l]+=c(o):"msgid"===k?j.msgid+=c(o):"msgid_plural"===k&&(j.msgid_plural+=c(o)));p&&m++}return b(),e},g.Item=function(){this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={},this.obsolete=!1},g.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/[\x07\b\t\v\f\r"\\]/g,function(a){switch(a){case"":return"\\a";case"\b":return"\\b";case"	":return"\\t";case"":return"\\v";case"\f":return"\\f";case"\r":return"\\r";default:return"\\"+a}})},d=function(a,b,d){var e=[],f=b.split(/\n/),g="undefined"!=typeof d?"["+d+"]":"";return f.length>1?(e.push(a+g+' ""'),f.forEach(function(a){e.push('"'+c(a)+'"')})):e.push(a+g+' "'+c(b)+'"'),e};this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments.forEach(function(b){a.push("#. "+b)}),this.references.forEach(function(b){a.push("#: "+b)});var e=Object.keys(this.flags).filter(function(a){return!!this.flags[a]},this);e.length>0&&a.push("#, "+e.join(","));var g=this.obsolete?"#~ ":"";return["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var e=b[c];if(null!=e)if(f(e)&&e.length>1)e.forEach(function(b,e){a=a.concat(g+d(c,b,e))});else{e=f(e)?e.join():e;for(var h=d(c,e),i=1;i<h.length-1;i++)h[i]=h[i].slice(0,-1)+'\\n"';a=a.concat(g+h.join("\n"+g))}}),a.join("\n")},b.exports=g},{fs:3,"lodash.isarray":4}],3:[function(a,b,c){},{}],4:[function(a,b,c){var d=a("lodash._isnative"),e="[object Array]",f=Object.prototype,g=f.toString,h=d(h=Array.isArray)&&h,i=h||function(a){return a&&"object"==typeof a&&"number"==typeof a.length&&g.call(a)==e||!1};b.exports=i},{"lodash._isnative":5}],5:[function(a,b,c){function d(a){return"function"==typeof a&&g.test(a)}var e=Object.prototype,f=e.toString,g=RegExp("^"+String(f).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$");b.exports=d},{}]},{},["W8CkM0"]);
\ No newline at end of file
diff --git a/lib/po.js b/lib/po.js
index 2ab79ba..b79de83 100644
--- a/lib/po.js
+++ b/lib/po.js
@@ -7,6 +7,7 @@ function trim(string) {
 
 var PO = function () {
     this.comments = [];
+    this.extractedComments = [];
     this.headers = {};
     this.items = [];
 };
@@ -23,6 +24,11 @@ PO.prototype.toString = function () {
             lines.push('# ' + comment);
         });
     }
+    if (this.extractedComments) {
+        this.extractedComments.forEach(function (comment) {
+            lines.push('#. ' + comment);
+        });
+    }
 
     lines.push('msgid ""');
     lines.push('msgstr ""');
@@ -86,10 +92,11 @@ PO.parse = function (data) {
         acc.push(line);
         return acc;
     }, []).forEach(function (header) {
-        if (header.match(/^#/)) {
+        if (header.match(/^#\./)) {
+            po.extractedComments.push(header.replace(/^#\.\s*/, ''));
+        } else if (header.match(/^#/)) {
             po.comments.push(header.replace(/^#\s*/, ''));
-        }
-        if (header.match(/^"/)) {
+        } else if (header.match(/^"/)) {
             header = header.trim().replace(/^"/, '').replace(/\\n"$/, '');
             var p = header.split(/:/);
             var name = p.shift().trim();
diff --git a/test/fixtures/comment.po b/test/fixtures/comment.po
index bd35b92..70a2724 100644
--- a/test/fixtures/comment.po
+++ b/test/fixtures/comment.po
@@ -1,6 +1,7 @@
 # French translation of Link (6.x-2.9)
 # Copyright (c) 2011 by the French translation team
 #
+#. extracted from test
 msgid ""
 msgstr ""
 "Project-Id-Version: Link (6.x-2.9)\n"
diff --git a/test/parse.js b/test/parse.js
index 87dc571..3a2fe63 100644
--- a/test/parse.js
+++ b/test/parse.js
@@ -61,6 +61,9 @@ describe('Parse', function () {
         assert.notEqual(po, null);
         assert.equal(po.items.length, 2);
 
+        assert.equal(po.extractedComments.length, 1);
+        assert.equal(po.extractedComments[0], 'extracted from test');
+
         var item = po.items[0];
         assert.equal(item.msgid, 'Title, as plain text');
         assert.equal(item.msgstr, 'Attribut title, en tant que texte brut');
diff --git a/test/write.js b/test/write.js
index fee578c..6a114c5 100644
--- a/test/write.js
+++ b/test/write.js
@@ -74,6 +74,7 @@ describe('Write', function () {
         var input = fs.readFileSync(__dirname + '/fixtures/comment.po', 'utf8');
         var po = PO.parse(input);
         var str = po.toString();
+        assertHasLine(str, '#. extracted from test');
         assertHasLine(str, '#. Extracted comment');
     });