Updated alternative parser support

As commented on [Polyconseil#72](Polyconseil#72)
Knogobert · Sep 1, 2020 · 24bc239 · 24bc239
1 parent 6d5e546
commit 24bc239
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 43 deletions.
diff --git a/src/extract-cli.js b/src/extract-cli.js
@@ -7,8 +7,8 @@ const minimist = require('minimist');
 
 const constants = require('./constants.js');
 const extract = require('./extract.js');
+const {PROGRAM_NAME} = require('./extract-utils.js');
 
-const PROGRAM_NAME = 'easygettext';
 const ALLOWED_EXTENSIONS = ['html', 'htm', 'jade', 'js', 'pug', 'vue', 'ts'];
 const ALLOWED_EXTENSIONS_EXCEPTIONS = ['.d.ts'];
 

diff --git a/src/extract-utils.js b/src/extract-utils.js
@@ -1,5 +1,6 @@
 const Pofile = require('pofile');
 const {MARKER_NO_CONTEXT} = require('./constants.js');
+const PROGRAM_NAME = 'easygettext';
 
 function lineNumToString(withLineNumbers = false) {
   return (withLineNumbers && this.line)
@@ -38,5 +39,6 @@ function getTextEntries(filename, textEntries) {
 }
 
 module.exports = {
+  PROGRAM_NAME,
   getTextEntries,
 };
diff --git a/src/extract.js b/src/extract.js
@@ -325,7 +325,7 @@ exports.Extractor = class Extractor {
     }
   }
 
-  parseJavascript(filename, content, parser='auto') {
+  parseJavascript(filename, content, parser = 'auto') {
     const jsContent = flowRemoveTypes(content).toString();
 
     const extractedStringsFromScript = jsExtractor.extractStringsFromJavascript(filename, jsContent, parser);

diff --git a/src/javascript-extract.js b/src/javascript-extract.js
@@ -1,7 +1,7 @@
 const {Parser} = require('acorn');
 const stage3 = require('acorn-stage3');
 const babel = require('@babel/core');
-const {getTextEntries} = require('./extract-utils.js');
+const {getTextEntries, PROGRAM_NAME} = require('./extract-utils.js');
 
 const {DEFAULT_VUE_GETTEXT_FUNCTIONS} = require('./constants.js');
 
@@ -15,43 +15,8 @@ function extractConcatenatedStrings(value, allTokens, index) {
   return value + extractConcatenatedStrings(nextValue, allTokens, index + 2);
 }
 
-
-function getGettextEntriesFromJavaScript(script, parser = 'auto') {
-  const allTokens = [];
-
-  switch (parser) {
-  case 'acorn':
-    const ACORN_OPTIONS = {
-      ecmaVersion: 10,
-      sourceType: 'module',
-      locations: true,
-      onToken: allTokens,
-      plugins: {
-        stage3: true,
-      },
-    };
-
-    Parser.extend(stage3).parse(script, ACORN_OPTIONS);
-    break;
-  case 'babel':
-    const babelResult = babel.parseSync(script, {
-      sourceType: 'module',
-      parserOpts: {
-        tokens: true,
-      },
-    });
-    allTokens.push(...babelResult.tokens);
-    break;
-  case 'auto':
-  default:
-    try {
-      return getGettextEntriesFromJavaScript(script, 'acorn');
-    } catch (e) {
-      return getGettextEntriesFromJavaScript(script, 'babel');
-    }
-  }
-
-
+function getGettextEntriesFromJavaScript(argTokens = []) {
+  let allTokens = argTokens;
   let extractedEntries = [];
 
   // parse all tokens
@@ -80,7 +45,7 @@ function getGettextEntriesFromJavaScript(script, parser = 'auto') {
 
             if (closingToken.type.label !== '`') {
               const line = currentToken.loc.start.line;
-              throw new Error(`easygettext currently does not support translated template strings with variables! [line ${line}]`);
+              throw new Error(`${PROGRAM_NAME} currently does not support translated template strings with variables! [line ${line}]`);
             }
             obj[argName] = nextToken.value.trim();
             return obj;
@@ -108,8 +73,59 @@ function getGettextEntriesFromJavaScript(script, parser = 'auto') {
   return extractedEntries;
 }
 
+function parseJSGettextWithAcorn(script) {
+  let allTokens = [];
+
+  const ACORN_OPTIONS = {
+    ecmaVersion: 10,
+    sourceType: 'module',
+    locations: true,
+    onToken: allTokens,
+    plugins: {
+      stage3: true,
+    },
+  };
+
+  Parser.extend(stage3).parse(script, ACORN_OPTIONS);
+
+  return allTokens;
+}
+
+function parseJSGettextWithBabel(script) {
+  let allTokens = [];
+
+  const babelResult = babel.parseSync(script, {
+    sourceType: 'module',
+    parserOpts: {
+      tokens: true,
+    },
+  });
+  allTokens.push(...babelResult.tokens);
+
+  return allTokens;
+}
+
 function extractStringsFromJavascript(filename, script, parser = 'auto') {
-  return getTextEntries(filename, getGettextEntriesFromJavaScript(script, parser));
+  let extractedEntries;
+
+  switch (parser) {
+  case 'acorn':
+    extractedEntries = getGettextEntriesFromJavaScript(parseJSGettextWithAcorn(script));
+    break;
+  case 'babel':
+    extractedEntries = getGettextEntriesFromJavaScript(parseJSGettextWithBabel(script));
+    break;
+
+  default:
+    try {
+      extractedEntries = getGettextEntriesFromJavaScript(parseJSGettextWithAcorn(script));
+    } catch (e) {
+      console.log(`[${PROGRAM_NAME}] will switch extracting using acorn as parser and use babel instead`); // eslint-disable-line no-console
+      extractedEntries = getGettextEntriesFromJavaScript(parseJSGettextWithBabel(script));
+    }
+  }
+
+  return getTextEntries(filename, extractedEntries);
 }
 
 module.exports = {

diff --git a/src/javascript-extract.spec.js b/src/javascript-extract.spec.js
@@ -145,7 +145,8 @@ describe('Javascript extractor object', () => {
       expect(() => {
         jsExtractor.extractStringsFromJavascript(
           filename,
-          fixtures.SCRIPT_WITH_TEMPLATE_LITERALS_WITH_VARIABLES
+          fixtures.SCRIPT_WITH_TEMPLATE_LITERALS_WITH_VARIABLES,
+          'acorn'
         );
       }).toThrow();
     });