Refactors il8n to use simple-git

Moves language list to package.json
mkmori · Jun 27, 2018 · a497570 · a497570
1 parent 6a9a24c
commit a497570
Show file tree

Hide file tree

Showing 4 changed files with 1,581 additions and 1,932 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -6,6 +6,8 @@
 // use this if you want to match all subfolders:
 // '<%= config.src %>/templates/pages/**/*.hbs'
 
+const pkg = require('./package.json');
+
 module.exports = function(grunt) {
 
   require('time-grunt')(grunt);
@@ -87,11 +89,7 @@ module.exports = function(grunt) {
             'assemble-contrib-i18n'
           ],
           i18n: {
-            languages: [
-              'en',
-              'es',
-              'zh-Hans'
-            ],
+            languages: pkg.languages,
             templates: [
               "<%= config.src %>/templates/pages/**/*.hbs",
             ]
@@ -347,4 +345,4 @@ module.exports = function(grunt) {
     'build'
   ]);
 
-};
+};
diff --git a/i18n.js b/i18n.js
@@ -5,113 +5,97 @@
 // source files (en.yml) should be committed before translating
 // and removing entries in the i18n-tracking.yml file.
 
-var Git = require('nodegit');
-var fs = require('fs');
-var yaml = require('js-yaml');
-var _ = require('lodash');
-
-var lang = ['es', 'zh-Hans'];
+const fs = require('fs');
+const yaml = require('js-yaml');
+const _ = require('lodash');
+const git = require('simple-git/promise');
+
+const pkg = require('./package.json');
+
+const enSrcFile = 'src/data/en.yml';
+
+function parseDiff(diff) {
+  return new Promise((resolve, reject) => {
+    const changes = [];
+    let [, lineNum] = diff.match(/@@ -(\d+),.*@@/);
+    lineNum = parseInt(lineNum, 10) - 1;
+    let lines = diff.split('\n');
+    const startAt = lines.findIndex(line => line.startsWith('@@'));
+    lines = lines.slice(startAt);
+    lines.forEach((line, index) => {
+      if (line.startsWith('+')) {
+        changes.push([lineNum, line.replace(/^\+/, '')]);
+      }
+      lineNum++;
+    });
+    writeTracker(enSrcFile, changes, resolve, reject);
+  });
+}
 
 var task = function(done) {
-  Git.Repository.open(process.cwd())
-    .then(repo => {
-      return Git.Diff.indexToWorkdir(repo);
-    })
-    .then(diff => {
-      return diff.patches();
+  const repo = git();
+  repo
+    .status()
+    .then(data => {
+      if (data.modified.includes(enSrcFile)) {
+        return repo.diff(['-p', enSrcFile]);
+      }
+      return Promise.reject(`${enSrcFile} file was not modified.`);
     })
-    .then(patches => {
-      var enFileChanged = false;
-
-      patches.forEach(function(patch) {
-        // Each patch represent a file
-        if (patch.oldFile().path() === 'src/data/en.yml') {
-          enFileChanged = true;
-          patch
-            .hunks()
-            .then(hunks => {
-              var hunksPromises = [];
-              hunks.forEach(function(hunk) {
-                hunksPromises.push(hunk.lines());
-              });
-
-              return Promise.all(hunksPromises);
-            })
-            .then(hunks => {
-              var changes = [];
-
-              hunks.forEach(function(lines) {
-                lines.forEach(function(line) {
-                  // If a line has changed, add it to i18n-tracking.json
-                  var changedLineNumber = 0;
-                  var changedLine = '';
-
-                  if (String.fromCharCode(line.origin()) === '+') {
-                    changedLineNumber = line.newLineno();
-                    changedLine = line.content().trim();
-                    changes.push([changedLineNumber, changedLine]);
-                  }
-                });
-              });
-
-              writeTracker(patch.oldFile().path(), changes);
-            });
-        }
-      });
-
-      if (!enFileChanged) done();
+    .then(diff => parseDiff(diff))
+    .then(done)
+    .catch(e => {
+      done();
     });
+};
 
-  function writeTracker(path, changes) {
-    var dest = {};
-
-    // Read once, write once
-    fs.readFile('./i18n-tracking.yml', 'utf-8', (err, data) => {
-      if (err) done(err);
-
-      lang.forEach(langCode => {
-        dest[langCode] = {};
-        dest[langCode][path] = {};
-        var newObj = {};
-        newObj[path] = {};
-        var currentObj = yaml.safeLoad(data) ? yaml.safeLoad(data)[langCode] : {};
-
-        changes.forEach(change => {
-          var i = `line ${change[0]}`;
-          newObj[path][i] = change[1].split(':')[0];
-        });
+function writeTracker(path, changes, resolve, reject) {
+  fs.readFile('./i18n-tracking.yml', 'utf-8', (err, data) => {
+    if (err) reject(err);
+
+    const dest = {};
+    const lang = pkg.languages.filter(v => v !== 'en');
+    lang.forEach(langCode => {
+      dest[langCode] = {};
+      dest[langCode][path] = {};
+      var newObj = {};
+      newObj[path] = {};
+      var currentObj = yaml.safeLoad(data) ? yaml.safeLoad(data)[langCode] : {};
+
+      changes.forEach(change => {
+        var i = `line ${change[0]}`;
+        newObj[path][i] = change[1].split(':')[0];
+      });
 
-        var intersect = _.intersection(
-          _.keys(currentObj[path]),
-          _.keys(newObj[path])
-        );
-        var diffAB = _.difference(_.keys(currentObj[path]), _.keys(newObj[path]));
-        var diffBA = _.difference(_.keys(newObj[path]), _.keys(currentObj[path]));
+      var intersect = _.intersection(
+        _.keys(currentObj[path]),
+        _.keys(newObj[path])
+      );
+      var diffAB = _.difference(_.keys(currentObj[path]), _.keys(newObj[path]));
+      var diffBA = _.difference(_.keys(newObj[path]), _.keys(currentObj[path]));
 
-        intersect.forEach(line => {
-          dest[langCode][path][line] = newObj[path][line];
-        });
-        diffAB.forEach(line => {
-          dest[langCode][path][line] = currentObj[path][line];
-        });
-        diffBA.forEach(line => {
-          dest[langCode][path][line] = newObj[path][line];
-        });
+      intersect.forEach(line => {
+        dest[langCode][path][line] = newObj[path][line];
       });
-      var dump = yaml.safeDump(dest, {
-        styles: {
-          '!!null': 'canonical'
-        },
-        sortKeys: false
+      diffAB.forEach(line => {
+        dest[langCode][path][line] = currentObj[path][line];
       });
-
-      fs.writeFile('./i18n-tracking.yml', dump, (err, res) => {
-        if (err) done(err);
-
-        done();
+      diffBA.forEach(line => {
+        dest[langCode][path][line] = newObj[path][line];
       });
     });
-  }
-};
+    var dump = yaml.safeDump(dest, {
+      styles: {
+        '!!null': 'canonical'
+      },
+      sortKeys: false
+    });
+
+    fs.writeFile('./i18n-tracking.yml', dump, (err, res) => {
+      if (err) reject(err);
+      resolve();
+    });
+  });
+}
 
 module.exports = task;