@putout/engine-parser 10.3.0 → 10.5.0

package/lib/custom-parser.js

@@ -9,6 +9,10 @@ const hermes = require('./parsers/hermes');
 const secondChance = require('./second-chance');
 const isObject = (a) => typeof a === 'object';
 
+const MESSAGES = [
+    'has already been declared',
+];
+
 module.exports = (source, parser, {isTS, isFlow, isJSX}) => {
     const options = {
         parser,
@@ -17,18 +21,30 @@ module.exports = (source, parser, {isTS, isFlow, isJSX}) => {
         isJSX,
     };
     
-    return secondChance(customParse, source, options, {
+    const optionsB = {
         ...options,
         isJSX: false,
-    });
+    };
+    
+    const optionsC = {
+        ...options,
+        isRecovery: true,
+    };
+    
+    return secondChance(customParse, source, MESSAGES, [
+        options,
+        optionsB,
+        optionsC,
+    ]);
 };
 
-function customParse(source, {parser, isTS, isFlow, isJSX}) {
+function customParse(source, {parser, isTS, isFlow, isJSX, isRecovery}) {
     if (parser === 'babel')
         return babel.parse(source, {
             isTS,
             isFlow,
             isJSX,
+            isRecovery,
         });
     
     if (isObject(parser))

package/lib/parsers/babel/index.js

@@ -1,9 +1,13 @@
 'use strict';
 
-const process = require('process');
+const process = require('node:process');
 const once = require('once');
 
-// stricter validation to prevent even more invalid ASTs: not only// from a tree shape point of view but also ensuring that nodes in// the correct position carry valid information. For example, starting// from Babel 8 t.identifier("123") will be disallowed, because 123 is// not a valid identifier.
+// stricter validation to prevent even more invalid ASTs: not only
+// from a tree shape point of view but also ensuring that nodes in
+// the correct position carry valid information. For example, starting
+// from Babel 8 t.identifier("123") will be disallowed, because 123 is
+// not a valid identifier.
 process.env.BABEL_TYPES_8_BREAKING = true;
 
 const plugins = require('./plugins');
@@ -13,14 +17,16 @@ const clean = (a) => a.filter(Boolean);
 const initBabel = once(() => require('@putout/babel'));
 const {assign} = Object;
 
-// There is a difference in options naming for babel and recast// recast -> sourceFileName// babel, putout: sourceFilename
-module.exports.parse = function babelParse(source, {sourceFilename, isTS, isJSX = true, isFlow = getFlow(source)}) {
+// There is a difference in options naming for babel and recast
+// recast -> sourceFileName
+// babel, putout: sourceFilename
+module.exports.parse = function babelParse(source, {sourceFilename, isTS, isJSX = true, isFlow = getFlow(source), isRecovery}) {
     const {parse} = initBabel();
-    
     const parserOptions = {
         sourceType: 'module',
         tokens: true,
         ...options,
+        errorRecovery: isRecovery,
         plugins: clean([
             ...plugins,
             ...getBabelLangExts({

package/lib/second-chance.js

@@ -2,16 +2,31 @@
 
 const tryCatch = require('try-catch');
 
-module.exports = (fn, source, a, b) => {
+module.exports = (fn, source, messages, args) => {
+    const [a, ...others] = args;
     const [errorA, resultA] = tryCatch(fn, source, a);
     
     if (!errorA)
         return resultA;
     
-    const [errorB, resultB] = tryCatch(fn, source, b);
+    if (checkError(errorA, messages))
+        throw errorA;
     
-    if (!errorB)
-        return resultB;
+    for (const b of others) {
+        const [errorB, resultB] = tryCatch(fn, source, b);
+        
+        if (!errorB)
+            return resultB;
+    }
     
     throw errorA;
 };
+
+function checkError(error, messages) {
+    for (const message of messages) {
+        if (error.message.includes(message))
+            return true;
+    }
+    
+    return false;
+}

package/lib/template.js

@@ -14,8 +14,20 @@ const defaults = {
     ],
 };
 
-const {isExpressionStatement} = types;
-const extractExpression = (a) => isExpressionStatement(a) ? a.expression : a;
+const {
+    isExpressionStatement,
+    isTSExternalModuleReference,
+} = types;
+
+const extractExpression = (a) => {
+    if (isExpressionStatement(a))
+        return a.expression;
+    
+    if (isTSExternalModuleReference(a))
+        return a.expression;
+    
+    return a;
+};
 
 module.exports = nanomemoize((value, options) => {
     const fn = template(value, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/engine-parser",
-  "version": "10.3.0",
+  "version": "10.5.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout parser",
@@ -50,8 +50,8 @@
     "acorn-jsx": "^5.0.2",
     "acorn-stage3": "^4.0.0",
     "c8": "^9.0.0",
-    "eslint": "^9.0.0-alpha.0",
-    "eslint-plugin-n": "^17.0.0-0",
+    "eslint": "^9.0.0",
+    "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-putout": "^22.0.0",
     "espree": "^10.0.0",
     "esprima": "^4.0.1",