google-spreadsheet-translation-sync 1.2.7 → 1.3.6

package/Gruntfile.js

@@ -75,7 +75,7 @@ module.exports = function(grunt) {
     shell: {
       publish_npm: {
         command: [
-            'npmrc public', // well, this is at the moment hardcoded to my personal public registry name
+            // 'npmrc public', // well, this is at the moment hardcoded to my personal public registry name
             'npm publish'
         ].join('&&')
       },

package/README.md

@@ -2,10 +2,6 @@
 
 [![Build Status](https://travis-ci.org/Andreas-Schoenefeldt/node-google-spreadsheet-translation-sync.svg?branch=master)](https://travis-ci.org/Andreas-Schoenefeldt/node-google-spreadsheet-translation-sync)
 
-> WARNING: This relies at the moment on a php script to parse the translation files. It was just more easy, to start off with my existing utilities. Please open a issue on github, if you want to give it a try, then I migrate.
->
-> So long I'll just happy use it as it is for myself :) 
-
 A plugin to read and write i18n translations from and to google spreadsheets
 
 ## Installation
@@ -91,7 +87,8 @@ Type: `Enum`
 Possible Values: 
 * `locale_json` (translations are stored in simple key/value json files)
 * `gettext` (utilizes [node gettext-parser](https://github.com/smhg/gettext-parser) for the work with po and mo files)
-* `properties` (utilizes [propertie-reader](https://github.com/steveukx/properties) for java property files)      
+* `properties` (utilizes [propertie-reader](https://github.com/steveukx/properties) for java property files)
+* `yml` (utilizes [js-yaml](https://github.com/nodeca/js-yaml) for symfony yaml translation files)
 Default value: `locale_json`
 
 Please feel free to create a PR or open an issue, if you need an additional translation format.

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "google-spreadsheet-translation-sync",
-  "version": "1.2.7",
+  "version": "1.3.6",
   "description": "A plugin to read and write i18n translationsfrom and to google spreadsheets ",
   "main": "index.js",
   "scripts": {
-    "test": "mocha --reporter spec"
+    "test": "mocha --reporter spec",
+    "build": "grunt build"
   },
   "repository": {
     "type": "git",
@@ -43,9 +44,10 @@
   },
   "dependencies": {
     "async": "^2.6.3",
-    "fast-csv": "^2.5.0",
+    "fast-csv": "^4.3",
     "gettext-parser": "^4.0.2",
     "google-spreadsheet": "^3.0.11",
+    "js-yaml": "^4.1.0",
     "mkdirp": "^0.5.5",
     "properties-reader": "github:Andreas-Schoenefeldt/properties#master",
     "shelljs": "^0.7.8",

package/src/connector.js

@@ -28,7 +28,7 @@ module.exports = function (sheetId, worksheetId, credentials, callback) {
                         throw new Error('The sheet with the gid ' + sheetId + ' does not exist.');
                     }
 
-                    console.log('Loaded doc: ' + doc.title + ' with ' + sheet.rowCount + ' rows');
+                    // console.log('Loaded doc: ' + doc.title + ' with ' + sheet.rowCount + ' rows');
 
                     callback(null, sheet);
                 },

package/src/export-to-spreadsheet.js

@@ -62,7 +62,7 @@ module.exports = function (translationFiles, options, callback) {
         localeKey = matches[3];
       }
     } else {
-      localeKey = fileName.substr(options.fileBaseName.length);
+      localeKey = fileName.substr(options.fileBaseName.length + (options.namespaceSeparator ? options.namespaceSeparator.length : 0));
     }
 
     if (dataHeaderIndexMap[namespace] === undefined) {
@@ -199,7 +199,7 @@ module.exports = function (translationFiles, options, callback) {
                           }
                         }
 
-                        console.log(`Uploading rows ${rowIndexStart} - ${Math.min(rowIndexRunMax, data.length)}`);
+                        // console.log(`Uploading rows ${rowIndexStart} - ${Math.min(rowIndexRunMax, data.length)}`);
 
                         sheet.saveUpdatedCells().then(function () {
 

package/src/handler.js

@@ -1,10 +1,9 @@
 'use strict'
 
-
 /**
  *
  * @param translationFormat
- * @return {TranslationHandler}
+ * @return {{loadTranslationFile: function, getTranslationKeys: function, updateTranslations: function}}
  */
 module.exports.getHandler = function (translationFormat) {
 
@@ -13,12 +12,16 @@ module.exports.getHandler = function (translationFormat) {
   switch (translationFormat) {
     default:
       throw new Error('No handler available for the translation format ' + translationFormat);
-      break;
+    case TRANSLATION_FORMATS.JSON_STRUCTURE:
+      return require('./handlers/json_structure');
     case TRANSLATION_FORMATS.LOCALE_JSON:
       return require('./handlers/locale_json');
     case TRANSLATION_FORMATS.GETTEXT:
       return require('./handlers/gettext');
     case TRANSLATION_FORMATS.PROPERTIES:
       return require('./handlers/properties');
+    case 'yaml':
+    case TRANSLATION_FORMATS.YAML:
+      return require('./handlers/yaml');
   }
 }

package/src/handlers/gettext.js

@@ -26,6 +26,11 @@ module.exports.loadTranslationFile = function (filePath, callback) {
   });
 }
 
+/**
+ * A wrapper to return a flat key: value object structure, used for uploading
+ * @param filePath
+ * @param callback
+ */
 module.exports.getTranslationKeys = function (filePath, callback) {
 
   const translations = {};

package/src/handlers/json_structure.js

@@ -0,0 +1,116 @@
+'use strict'
+
+const fs = require('fs');
+const withoutError = require('../helpers').withoutError
+const constraints = require('../util/constraints');
+
+module.exports.loadTranslationFile = function (filePath, callback) {
+
+    fs.access(filePath, function (err) {
+
+        if (err) {
+            callback({}); // we return the empty json
+        } else {
+
+            fs.readFile(filePath, function (err, data) {
+                callback(err ? {} : JSON.parse(data));
+            })
+        }
+    });
+}
+
+/**
+ * A wrapper to return a flat key: value object structure, used for uploading
+ * @param {string} filePath
+ * @param {function} callback
+ */
+module.exports.getTranslationKeys = function (filePath, callback) {
+    const result = {};
+
+    const keyFlattener = function(structure, prefix) {
+        prefix = prefix || '';
+
+        Object.keys(structure).forEach((key) => {
+
+            const subStructure = structure[key];
+
+            if (typeof subStructure === 'object' && subStructure !== null && subStructure !== undefined) {
+                keyFlattener(subStructure, prefix + key + '.');
+            } else {
+                result[prefix + key] = subStructure;
+            }
+        })
+
+    }
+
+    this.loadTranslationFile(filePath, (parsedObject) => {
+        keyFlattener(parsedObject);
+        callback(result);
+    });
+}
+
+module.exports.updateTranslations = function (translationData, translationRootFolder, options, callback) {
+    const path = require('path');
+    const async = require('async');
+    const mod = this;
+    const fileUtils = require('../util/file-utils');
+
+    if (! fs.existsSync(translationRootFolder)) {
+        throw new Error('The folder ' + translationRootFolder + ' does not exist');
+    }
+
+    async.each(Object.keys(translationData), function(locale, done) {
+
+        // is it a comment or a real translation?
+        if (locale.substr(0, constraints.commentCollumnName.length) !== constraints.commentCollumnName) {
+
+            async.each(Object.keys(translationData[locale]), function (namespace, done2) {
+
+                const localeFileName = fileUtils.buildTranslationFileName(constraints.TRANSLATION_FORMATS.JSON_STRUCTURE, namespace, locale, options);
+                const file = path.resolve(translationRootFolder + '/' + localeFileName);
+
+                mod.loadTranslationFile(file, function (translations) {
+                    const potentiallyUpdatedTranslations = translationData[locale][namespace];
+
+                    Object.keys(potentiallyUpdatedTranslations).forEach((key) => {
+                        const parts = key.split('.');
+                        let tree = translations;
+
+                        while (parts.length > 0) {
+                            const part = parts.shift();
+
+                            if (parts.length === 0) {
+                                tree[part] = potentiallyUpdatedTranslations[key];
+                            } else {
+                                if (!tree[part]) {
+                                    tree[part] = {}
+                                }
+
+                                tree = tree[part];
+                            }
+                        }
+                    });
+
+                    // now we write
+                    fs.writeFile(file, JSON.stringify(translations, null, 4), function (err) {
+                        if (withoutError(err)) {
+                            // console.info('Updated translations of %o', localeFileName);
+                        }
+                        done2();
+                    })
+                })
+            }, function () {
+                done();
+            })
+
+        } else {
+            done();
+        }
+    }, function (err) {
+        if (withoutError(err, callback)) {
+            callback(null);
+        }
+    });
+
+
+}

package/src/handlers/locale_json.js

@@ -17,11 +17,10 @@ module.exports.loadTranslationFile = function (filePath, callback) {
       })
     }
   });
-
 }
 
 /**
- * A wrapper to return a key: value object structure
+ * A wrapper to return a flat key: value object structure, used for uploading
  * @param {string} filePath
  * @param {function} callback
  */

package/src/handlers/properties.js

@@ -10,7 +10,7 @@ module.exports.loadTranslationFile = function (filePath, callback) {
 }
 
 /**
- * A wrapper to return a key: value object structure
+ * A wrapper to return a flat key: value object structure, used for uploading
  * @param {string} filePath
  * @param {function} callback
  */

package/src/handlers/yaml.js

@@ -0,0 +1,109 @@
+const fs = require("fs");
+const yaml = require('js-yaml');
+const constraints = require("../util/constraints");
+const {withoutError} = require("../helpers");
+
+module.exports.loadTranslationFile = function (filePath, callback) {
+    if (fs.existsSync(filePath)) {
+        callback(yaml.load(fs.readFileSync(filePath)));
+    } else {
+        callback({}); // empty object, if teh file does not exist
+    }
+}
+
+/**
+ * A wrapper to return a flat key: value object structure, used for uploading
+ * @param {string} filePath
+ * @param {function} callback
+ */
+module.exports.getTranslationKeys = function (filePath, callback) {
+    const result = {};
+
+    const keyFlattener = function(structure, prefix) {
+        prefix = prefix || '';
+
+        Object.keys(structure).forEach((key) => {
+
+            const subStructure = structure[key];
+
+            if (typeof subStructure === 'object' && subStructure !== null && subStructure !== undefined) {
+                keyFlattener(subStructure, prefix + key + '.');
+            } else {
+                result[prefix + key] = subStructure;
+            }
+        })
+
+    }
+
+    this.loadTranslationFile(filePath, (parsedObject) => {
+        keyFlattener(parsedObject);
+        callback(result);
+    });
+}
+
+
+module.exports.updateTranslations = function (translationData, translationRootFolder, options, callback) {
+    const path = require('path');
+    const async = require('async');
+    const mod = this;
+    const fileUtils = require('../util/file-utils');
+
+    if (! fs.existsSync(translationRootFolder)) {
+        throw new Error('The folder ' + translationRootFolder + ' does not exist');
+    }
+
+    async.each(Object.keys(translationData), function(locale, done) {
+
+        // is it a comment or a real translation?
+        if (locale.substr(0, constraints.commentCollumnName.length) !== constraints.commentCollumnName) {
+
+            async.each(Object.keys(translationData[locale]), function (namespace, done2) {
+
+                const localeFileName = fileUtils.buildTranslationFileName(constraints.TRANSLATION_FORMATS.YAML, namespace, locale, options);
+                const file = path.resolve(translationRootFolder + '/' + localeFileName);
+
+                mod.loadTranslationFile(file, function (translations) {
+                    const potentiallyUpdatedTranslations = translationData[locale][namespace];
+
+                    Object.keys(potentiallyUpdatedTranslations).forEach((key) => {
+                        const parts = key.split('.');
+                        let tree = translations;
+
+                        while (parts.length > 0) {
+                            const part = parts.shift();
+
+                            if (parts.length === 0) {
+                                tree[part] = potentiallyUpdatedTranslations[key];
+                            } else {
+                                if (!tree[part]) {
+                                    tree[part] = {}
+                                }
+
+                                tree = tree[part];
+                            }
+                        }
+                    });
+
+                    // now we write
+                    fs.writeFile(file, yaml.dump(translations, {indent: 4}), function (err) {
+                        if (withoutError(err)) {
+                            // console.info('Updated translations of %o', localeFileName);
+                        }
+                        done2();
+                    })
+                })
+            }, function () {
+                done();
+            })
+
+        } else {
+            done();
+        }
+    }, function (err) {
+        if (withoutError(err, callback)) {
+            callback(null);
+        }
+    });
+
+
+}

package/src/util/constraints.js

@@ -1,7 +1,9 @@
 const formats = {
-  LOCALE_JSON: 'locale_json',
+  LOCALE_JSON: 'locale_json', // just a plain array - lorem.ipsum keys will be {'lorem.ipsum': 'whatever'}
+  JSON_STRUCTURE: 'json_structure', // lorem.ipsum keys will be converted into a json structure: {lorem: {ipsum: 'whatever'}}
   GETTEXT: 'gettext',
-  PROPERTIES: 'properties'
+  PROPERTIES: 'properties',
+  YAML: 'yml'
 };
 
 module.exports.TRANSLATION_FORMATS = formats;

package/src/util/file-utils.js

@@ -10,8 +10,8 @@ const constraints = require('./constraints');
  * @returns {string}
  */
 module.exports.buildTranslationFileName = function (format, namespace, locale, options) {
-  const namespaceSeparator = options.namespaceSeparator ? options.namespaceSeparator : '-';
-  const base = options.namespaces ? namespace : (options.fileBaseName ? options.fileBaseName : '');
+  const namespaceSeparator = options.namespaceSeparator || '-';
+  const base = options.namespaces ? namespace : (options.fileBaseName || '');
   let extension;
 
   switch (format) {
@@ -19,11 +19,15 @@ module.exports.buildTranslationFileName = function (format, namespace, locale, o
       throw new Error('Unknown extension for translation format ' + format);
       break;
     case constraints.TRANSLATION_FORMATS.LOCALE_JSON:
+    case constraints.TRANSLATION_FORMATS.JSON_STRUCTURE:
       extension = 'json';
       break;
     case constraints.TRANSLATION_FORMATS.GETTEXT:
       extension = 'po';
       break;
+    case constraints.TRANSLATION_FORMATS.YAML:
+      extension = 'yml';
+      break;
     case constraints.TRANSLATION_FORMATS.PROPERTIES:
 
       if (options.defaultLocaleName === locale) {

package/test/test.js

@@ -13,6 +13,7 @@ const testSheetId = '1ZJK1G_3wrEo9lnu1FenjOzSy3uoAi-RLWbph1cI6DWI';
 const testWorksheetId = '1209225803';
 const testSheetId_gettext = '1CRvX4TCxUGCcs_MtKC5BdEViHYzYzLXdqtbuVaAXfKc';
 const testSheetId_properties = '1Z0Mpbf6lgdGiuiHlpb9DENVfKxkxSRwcfQEDYrgokEE';
+const testSheetId_yaml = '1Ml3jLK6RgbPQ4e7XZpILvB-XWMeziHpwdxS8r4AYNtE';
 const timeout = 20000;
 
 // preparations
@@ -20,12 +21,15 @@ const timeout = 20000;
 var tmpFile = tmp.fileSync({postfix: '.csv'});
 
 const csv = require('fast-csv');
+const fileUtils = require("../src/util/file-utils");
+const yamlHandler = require("../src/handlers/yaml");
+const rimraf = require("rimraf");
+const yaml = require("js-yaml");
 const testFile = tmpFile.name;
-const targetPath = path.basename(testFile);
 const csvData = [
   ['key', 'default', 'de', 'it', 'fr', 'pl', 'hu'],
   ['additional.news.' + Math.round(Math.random() * 10000), 'Additional News', null, null, null, 'czecz ' + Math.round(Math.random() * 10000), 'Elfogadom'],
-  ['some.key', 'a Key ' + Math.round(Math.random() * 10000), 'ein Schlüssel ' + Math.round(Math.random() * 10000)]
+  ['some.key', 'a Key ' + Math.round(Math.random() * 10000), 'ein Schlüssel ' + Math.round(Math.random() * 10000)],
 ];
 
 // this provokes the "Cannot read property 'toLocaleLowerCase' of undefined" ERROR
@@ -36,6 +40,7 @@ frOnlyLine2[4] = 'bon!';
 
 csvData.push(frOnlyLine);
 csvData.push(frOnlyLine2);
+csvData.push(['some.other', 'with : colon', 'mit : Doppelpunkt']);
 
 
 csv.writeToPath(
@@ -44,19 +49,22 @@ csv.writeToPath(
 
 function ensureFolder (folder) {
   if (!fs.existsSync(folder)){
-    fs.mkdirSync(folder);
+    fs.mkdirSync(folder, {
+      recursive: true
+    });
   }
   return folder;
 }
 
 
-// const testFor = 'all' // 'connect', 'upload', 'import'
+// const testFor = 'all' // 'connect', 'upload', 'import', 'properties', 'locale_json', 'gettext', 'yml', 'json_structure'
+// const testFor = 'json_structure';
 const testFor = 'all';
 
 const tests = [
   {
      name: 'should connect to the test google doc',
-     run: 'connect',
+     run: ['connect'],
      fnc: function (done) {
       this.timeout(timeout);
 
@@ -76,7 +84,7 @@ const tests = [
 
   {
     name: 'should not connect with wrong credentials',
-    run: 'connect',
+    run: ['connect'],
     fnc: function (done) {
       this.timeout(timeout);
 
@@ -89,7 +97,7 @@ const tests = [
 
   {
     name: 'should connect to a specific sheet',
-    run: 'connect',
+    run: ['connect'],
     fnc: function (done) {
       this.timeout(timeout);
 
@@ -115,7 +123,7 @@ const tests = [
 
   {
     name: 'should upload changes in the namespace properties test project',
-    run: 'upload',
+    run: ['upload', 'properties'],
     fnc: function (done) {
 
       const PropertiesReader = require('properties-reader');
@@ -226,7 +234,7 @@ const tests = [
 
   {
     name: 'should upload changes in the json test project',
-    run: 'upload',
+    run: ['upload', 'locale_json'],
     fnc: function (done) {
       this.timeout(timeout);
 
@@ -294,7 +302,7 @@ const tests = [
 
   {
     name: 'should import updated properties keys in the test project',
-    run: 'import',
+    run: ['import', 'properties'],
     fnc: function (done) {
       this.timeout(timeout);
 
@@ -332,7 +340,7 @@ const tests = [
 
   {
     name: 'should import updated locale_json keys in the test project',
-    run: 'import',
+    run: ['import', 'locale_json'],
     fnc: function (done) {
       this.timeout(timeout);
 
@@ -362,7 +370,7 @@ const tests = [
 
   {
     name: 'should import updated gettext keys in the test project',
-    run: 'import',
+    run: ['import', 'gettext'],
     fnc: function (done) {
       this.timeout(timeout);
 
@@ -395,17 +403,243 @@ const tests = [
         done();
       });
     }
-  }
+  },
+
+  {
+    name: 'should upload changes in the yaml test project',
+    run: ['upload', 'yml'],
+    fnc: function (done) {
+      this.timeout(timeout);
+
+      const baseName = 'messages';
+
+      const fs = require('fs');
+      const options = {
+        translationFormat: 'yml',
+        fileBaseName: baseName,
+        keyId: csvData[0][0],
+        gid: 0,
+        namespaceSeparator: '.',
+        spreadsheetId: testSheetId,
+        credentials: accessData
+      }
+
+      const files = [];
+
+      const tempFolder = tmp.dirSync({prefix: 'trans-dyn-to-update'});
+      const yamlHandler = require('../src/handlers/yaml');
+      const fileUtils = require('../src/util/file-utils');
+
+      const data = {};
+
+      csvData[0].forEach( function (key, index) {
+
+        if (index > 0) {
+          data[key] = {default: {}}
+          csvData.forEach(function (lines, i) {
+            if (i > 0 && lines[index]) {
+              data[key].default[lines[0]] = lines[index];
+            }
+          });
+          files.push(tempFolder.name + '/' + fileUtils.buildTranslationFileName(options.translationFormat, null, key, options));
+        }
+      });
+
+      yamlHandler.updateTranslations(data, tempFolder.name, options, () => {
+
+        app.exportToSpreadsheet(files, options, function (err) {
+          const rimraf = require("rimraf");
+          expect(err).to.be.null;
+
+          if (!err) {
+            connector(options.spreadsheetId, options.gid, accessData, function (err, sheet) {
+              expect(err).to.be.null;
+              expect(sheet).to.be.an('object');
+
+              sheet.getRows({
+                offset: 0,
+                limit: csvData.length - 1
+              }).then(function (rows) {
+                expect(rows).to.have.lengthOf(csvData.length - 1);
+                expect(rows[0][options.keyId]).to.equal(csvData[1][0]);
+                expect(rows[0].pl).to.equal(csvData[1][5]);
+                expect(rows[0].default).to.equal(csvData[1][1]);
+                expect(rows[0].hu).to.equal('Elfogadom'); // this was not part of the upload and should not be overwrittem
+                expect(rows[1].default).to.equal(csvData[2][1]);
+                expect(rows[1].de).to.equal(csvData[2][2]);
+                expect(rows[1].key).to.equal(csvData[2][0]);
+                rimraf.sync(tempFolder.name);
+                done()
+              })
+            })
+          } else {
+            rimraf.sync(tempFolder.name);
+            done()
+          }
+        })
+      });
+    }
+  },
+
+  {
+    name: 'should import updated yml keys in the test project',
+    run: ['import', 'yml'],
+    fnc: function (done) {
+      this.timeout(timeout);
+
+      const baseName = 'messages';
+
+      const options = {
+        translationFormat: 'yml',
+        fileBaseName: baseName,
+        namespaceSeparator: '.',
+        spreadsheetId: testSheetId_yaml,
+        credentials: accessData
+      };
+
+      const translationRoot = ensureFolder(path.resolve('./test/translations/' + options.translationFormat + '/'));
+      const testFile = path.resolve(translationRoot + '/' + baseName + '.en.yml');
+
+      app.importFromSpreadsheet(translationRoot, options, function (err) {
+        expect(err).to.be.null
+
+        if (!err) {
+          const yaml = require('js-yaml');
+          const fs = require('fs');
+
+          expect(fs.existsSync(testFile)).to.equal(true);
+
+          const translations = yaml.load(fs.readFileSync(testFile, 'utf8'));
+
+          expect(translations.add_address).to.equal("Add new address");
+          expect(translations.additional.news).to.equal("Additional News");
+        }
+        done();
+      });
+    }
+  },
+
+  {
+    name: 'should upload changes in the json_structure test project',
+    run: ['upload', 'json_structure'],
+    fnc: function (done) {
+      this.timeout(timeout);
+
+      const baseName = 'messages';
+
+      const options = {
+        translationFormat: 'json_structure',
+        fileBaseName: baseName,
+        keyId: csvData[0][0],
+        gid: 0,
+        namespaceSeparator: '.',
+        spreadsheetId: testSheetId,
+        credentials: accessData
+      }
+
+      const files = [];
+
+      const tempFolder = tmp.dirSync({prefix: 'trans-dyn-to-update'});
+      const handler = require('../src/handlers/json_structure');
+      const fileUtils = require('../src/util/file-utils');
+
+      const data = {};
+
+      csvData[0].forEach( function (key, index) {
+
+        if (index > 0) {
+          data[key] = {default: {}}
+          csvData.forEach(function (lines, i) {
+            if (i > 0 && lines[index]) {
+              data[key].default[lines[0]] = lines[index];
+            }
+          });
+          files.push(tempFolder.name + '/' + fileUtils.buildTranslationFileName(options.translationFormat, null, key, options));
+        }
+      });
+
+      handler.updateTranslations(data, tempFolder.name, options, () => {
+
+        app.exportToSpreadsheet(files, options, function (err) {
+          const rimraf = require("rimraf");
+          expect(err).to.be.null;
+
+          if (!err) {
+            connector(options.spreadsheetId, options.gid, accessData, function (err, sheet) {
+              expect(err).to.be.null;
+              expect(sheet).to.be.an('object');
+
+              sheet.getRows({
+                offset: 0,
+                limit: csvData.length - 1
+              }).then(function (rows) {
+                expect(rows).to.have.lengthOf(csvData.length - 1);
+                expect(rows[0][options.keyId]).to.equal(csvData[1][0]);
+                expect(rows[0].pl).to.equal(csvData[1][5]);
+                expect(rows[0].default).to.equal(csvData[1][1]);
+                expect(rows[0].hu).to.equal('Elfogadom'); // this was not part of the upload and should not be overwrittem
+                expect(rows[1].default).to.equal(csvData[2][1]);
+                expect(rows[1].de).to.equal(csvData[2][2]);
+                expect(rows[1].key).to.equal(csvData[2][0]);
+                rimraf.sync(tempFolder.name);
+                done()
+              })
+            })
+          } else {
+            rimraf.sync(tempFolder.name);
+            done()
+          }
+        })
+      });
+    }
+  },
+
+  {
+    name: 'should import updated json_structure keys from the test project',
+    run: ['import', 'json_structure'],
+    fnc: function (done) {
+      this.timeout(timeout);
+
+      const baseName = 'messages';
+
+      const options = {
+        translationFormat: 'json_structure',
+        fileBaseName: baseName,
+        namespaceSeparator: '.',
+        spreadsheetId: testSheetId_yaml,
+        credentials: accessData
+      };
+
+      const translationRoot = ensureFolder(path.resolve('./test/translations/' + options.translationFormat + '/'));
+      const testFile = path.resolve(translationRoot + '/' + baseName + '.en.json');
+
+      app.importFromSpreadsheet(translationRoot, options, function (err) {
+        expect(err).to.be.null
+
+        if (!err) {
+          const fs = require('fs');
+
+          expect(fs.existsSync(testFile)).to.equal(true);
+
+          const translations = require(testFile);
+
+          expect(translations.add_address).to.equal("Add new address");
+          expect(translations.additional.news).to.equal("Additional News");
+        }
+        done();
+      });
+    }
+  },
 ];
 
 
 // run the test
-describe('#Export', function () {
+describe('Running ' + testFor + ' tests', function () {
 
   for (let i = 0; i < tests.length; i++) {
     const theTest = tests[i];
 
-    if (testFor === 'all' || theTest.run === testFor) {
+    if (testFor === 'all' || theTest.run.indexOf(testFor) > -1) {
       it(theTest.name, theTest.fnc);
     }
   }