@tim-greller/xgettext-regex 0.4.0 → 0.5.0

package/index.js

@@ -4,9 +4,8 @@ var Readable = require('stream').Readable
 var through = require('through2')
 var readdirp = require('readdirp')
 var once = require('once')
-var split = require('split')
 var xtend = require('xtend')
-var combine = require('stream-combiner')
+const concat = require('concat-stream')
 
 function createDuplexStream (filename, opts) {
   filename = filename || ''
@@ -55,44 +54,47 @@ function createDuplexStream (filename, opts) {
   opts.regex = opts.regex || new RegExp("(?<=" + opts.fn + "\\(\\s*(?:(?:\"(?:[^\"]|\\\\.)*\"|'(?:[^']|\\\\.)*')\\s*,\\s*)*)(([\"'])(?:(?=(\\\\?))\\3.)*?\\2)(?=(?:\\s*,\\s*(?:\"(?:[^\"]|\\\\.)*\"|'(?:[^']|\\\\.)*'|[^\"')]+))*\\s*\\))", 'g')
   opts.regexTextCaptureIndex = opts.regexTextCaptureIndex || 1
 
-  var lineNum = 1
+  var chunks = []
 
-  return combine(
-    split(),
-    through(function (line, enc, cb) {
-      line = line.toString()
+  return through(function (chunk, enc, cb) {
+    chunks.push(chunk)
+    cb()
+  }, function (cb) {
+    var content = Buffer.concat(chunks).toString()
+    var matches
+    var lineNum = 1
+    var scanIndex = 0
+    const relativeFilename = path.relative(process.cwd(), filename)
 
-      var matches
-      var first = true
+    opts.regex.lastIndex = 0
 
-      while ((matches = opts.regex.exec(line)) !== null) {
-        var entry = '\n'
+    while ((matches = opts.regex.exec(content)) !== null) {
+      var matchIndex = matches.index
 
-        if (first) {
-          const relativeFilename = path.relative(process.cwd(), filename)
-          entry += '#: ' + relativeFilename + ':' + lineNum + '\n'
-          first = false
-        }
-
-        var text = matches[opts.regexTextCaptureIndex]
-
-        if (text[0] == "'") {
-          text = text.slice(1, -1)
-          text = text.replace(/\\'/g, "'")
-          text = '"' + text.replace(/"/g, '\\"') + '"'
-        }
+      while (scanIndex < matchIndex) {
+        if (content.charCodeAt(scanIndex) === 10) lineNum++
+        scanIndex++
+      }
 
-        entry += 'msgid ' + text + '\n'
-        entry += 'msgstr ' + text + '\n'
+      var text = matches[opts.regexTextCaptureIndex]
 
-        this.push(entry)
+      if (text[0] == "'") {
+        text = text.slice(1, -1)
+        text = text.replace(/\\'/g, "'")
+        text = '"' + text.replace(/"/g, '\\"') + '"'
       }
 
-      lineNum++
-      opts.regex.lastIndex = 0
-      cb()
-    })
-  )
+      this.push([
+        ``,
+        `#: ${relativeFilename}:${lineNum}`,
+        `msgid ${text}`,
+        `msgstr ${text}`
+      ].join('\n'))
+    }
+
+    opts.regex.lastIndex = 0
+    cb()
+  })
 }
 
 module.exports = createDuplexStream

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@tim-greller/xgettext-regex",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Minimum viable xgettext .po file generator. Uses a configurable regex to get translation keys.",
   "main": "index.js",
   "scripts": {
     "test": "istanbul cover node_modules/.bin/tape test/test.js"
   },
-  "author": "Alan Shaw",
+  "author": "Alan Shaw, Tim Greller",
   "license": "ISC",
   "dependencies": {
     "minimist": "^1.1.0",
@@ -27,7 +27,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/alanshaw/xgettext-regex.git"
+    "url": "git+https://github.com/timlg07/xgettext-regex.git"
   },
   "keywords": [
     "xgettext",
@@ -36,9 +36,9 @@
     "l18n"
   ],
   "bugs": {
-    "url": "https://github.com/alanshaw/xgettext-regex/issues"
+    "url": "https://github.com/timlg07/xgettext-regex/issues"
   },
-  "homepage": "https://github.com/alanshaw/xgettext-regex",
+  "homepage": "https://github.com/timlg07/xgettext-regex",
   "directories": {
     "test": "test"
   }

package/test/test.js

@@ -83,6 +83,63 @@ test('Can change i18n function', function (t) {
     }))
 })
 
+test('Can match i18n call spanning multiple lines', function (t) {
+  t.plan(2)
+
+  var src = new Readable
+  src._read = function () {
+    this.push('i18n.trn(\n')
+    this.push('  "multiline match",\n')
+    this.push('  "multiline matches",\n')
+    this.push('  stuff\n')
+    this.push(');\n')
+    this.push(null)
+  }
+
+  src
+    .pipe(xgettext('src', {fn: 'i18n.trn'}))
+    .pipe(concat({encoding: 'string'}, function (pot) {
+      t.ok(pot.indexOf('msgid "multiline match"') > -1, 'msgid "multiline match" exists')
+      t.ok(pot.indexOf('msgid "multiline matches"') > -1, 'msgid "multiline matches" exists')
+      t.end()
+    }))
+})
+
+test('Emits location line for each same-line match', function (t) {
+  t.plan(2)
+
+  var src = new Readable
+  src._read = function () {
+    this.push('_("first"); _("second")\n')
+    this.push(null)
+  }
+
+  src
+    .pipe(xgettext('src'))
+    .pipe(concat({encoding: 'string'}, function (pot) {
+      t.ok(pot.indexOf('#: src:1\nmsgid "first"') > -1, 'first entry has location line')
+      t.ok(pot.indexOf('#: src:1\nmsgid "second"') > -1, 'second entry has location line')
+      t.end()
+    }))
+})
+
+test('Emits location line for single match on line 4', function (t) {
+  t.plan(1)
+
+  var src = new Readable
+  src._read = function () {
+    this.push('Lorem\nIpsum\nDolor\n_("line four")\n')
+    this.push(null)
+  }
+
+  src
+    .pipe(xgettext('src'))
+    .pipe(concat({encoding: 'string'}, function (pot) {
+      t.ok(/#: src:4\r?\n(?:\r?\n)*msgid "line four"/.test(pot), 'single entry on line 4 has location line')
+      t.end()
+    }))
+})
+
 test('Can create .pot from multiple files/directories', function (t) {
   t.plan(6)