feature(putout) getProcessors: sync -> async

Author: coderaiser

packages/putout/lib/cli/formatter.js

@@ -1,72 +1,28 @@
 'use strict';
 
 const tryToCatch = require('try-to-catch');
+const {createAsyncLoader} = require('@putout/engine-loader');
 
 const {
     NO_FORMATTER,
     CANNOT_LOAD_FORMATTER,
 } = require('./exit-codes');
 
-const {simpleImportDefault} = require('./simple-import');
-
-const stub = () => () => {};
-
 const {isArray} = Array;
-const {assign} = Object;
 const maybeArray = (a) => isArray(a) ? a : [a, {}];
 
-module.exports.getFormatter = async (formatter, exit) => {
-    const [name, formatterOptions] = maybeArray(formatter);
-    
-    return [
-        await getReporter(name, exit),
-        formatterOptions,
-    ];
-};
-
-module.exports.getReporter = getReporter;
-async function getReporter(name, exit) {
-    if (name === 'none')
-        return stub();
+module.exports.getFormatter = async (formatterOptional, exit) => {
+    const [formatterName, formatterOptions] = maybeArray(formatterOptional);
+    const loadFormatter = createAsyncLoader('formatter');
 
-    const [error, reporter] = await loadFormatter([
-        `@putout/formatter-${name}`,
-        `putout-formatter-${name}`,
-    ]);
+    const [error, formatter] = await tryToCatch(loadFormatter, formatterName, exit);
 
-    if (reporter)
-        return reporter;
+    if (formatter)
+        return [formatter, formatterOptions];
 
     if (error.code === 'ERR_MODULE_NOT_FOUND')
         return exit(NO_FORMATTER, error);
 
     exit(CANNOT_LOAD_FORMATTER, error);
-}
-
-async function loadFormatter(names) {
-    let e;
-    let reporter;
-    
-    for (const name of names) {
-        [e, reporter] = await tryToCatch(simpleImportDefault, name);
-        
-        if (!e)
-            return [null, reporter];
-        
-        if (e.code === 'ERR_MODULE_NOT_FOUND')
-            continue;
-        
-        assign(e, {
-            message: `${name}: ${e.message}`,
-        });
-        
-        return [e];
-    }
-    
-    assign(e, {
-        message: e.message.replace(/\simported.*/, ''),
-    });
-    
-    return [e];
-}
+};
 

packages/putout/lib/cli/formatter.spec.js

@@ -12,8 +12,6 @@ const {getFormatter} = require('./formatter');
 
 const {reRequire, stopAll} = mockRequire;
 
-const {assign} = Object;
-
 test('putout: cli: formatter: get formatter', async (t) => {
     const exit = stub();
 
@@ -42,88 +40,10 @@ test('putout: cli: formatter: get formatter: options', async (t) => {
     t.end();
 });
 
-test('putout: cli: formatter: get reporter', async (t) => {
-    const formatter = stub();
-    const simpleImportDefault = stub().returns(formatter);
-    
-    mockRequire('./simple-import', {
-        simpleImportDefault,
-    });
-    
-    const {getReporter} = reRequire('./formatter');
-    
-    const result = await getReporter('xxx', stub());
-    
-    stopAll();
-    reRequire('./formatter');
-    
-    t.equal(result, formatter);
-    t.end();
-});
-
-test('putout: cli: formatter: calls', async (t) => {
-    const simpleImportDefault = stub()
-        .rejects(assign(Error('not found'), {
-            code: 'ERR_MODULE_NOT_FOUND',
-        }));
-    
-    mockRequire('./simple-import', {
-        simpleImportDefault,
-    });
-    
-    const {getReporter} = reRequire('./formatter');
-    
-    const exit = stub();
-    await getReporter('xxx', exit);
-    const expected = [
-        ['@putout/formatter-xxx'],
-        ['putout-formatter-xxx'],
-    ];
-    
-    stopAll();
-    reRequire('./formatter');
-    
-    t.deepEqual(simpleImportDefault.args, expected);
-    t.end();
-});
-
-test('putout: cli: formatter: second import', async (t) => {
-    let called = false;
-    
-    const simpleImportDefault = async () => {
-        if (!called) {
-            called = true;
-            const error = assign(Error('not found from test'), {
-                code: 'ERR_MODULE_NOT_FOUND',
-            });
-            
-            throw error;
-        }
-        
-        return 'found from test';
-    };
-    
-    mockRequire('./simple-import', {
-        simpleImportDefault,
-    });
-    
-    const {getReporter} = reRequire('./formatter');
-    
-    const exit = stub();
-    const result = await getReporter('xxx', exit);
-    const expected = 'found from test';
-    
-    stopAll();
-    reRequire('./formatter');
-    
-    t.deepEqual(result, expected);
-    t.end();
-});
-
 test('putout: cli: formatter: get reporter: exit: NO_FORMATTER', async (t) => {
     const exit = stub();
-    const {getReporter} = reRequire('./formatter');
-    await getReporter('xxx', exit);
+    const {getFormatter} = reRequire('./formatter');
+    await getFormatter('xxx', exit);
 
     const expected = [
         NO_FORMATTER,
@@ -139,14 +59,14 @@ test('putout: cli: formatter: get reporter: exit: NO_FORMATTER', async (t) => {
 
 test('putout: cli: formatter: get reporter: exit: CANNOT_LOAD_FORMATTER', async (t) => {
     const exit = stub();
-    const simpleImportDefault = stub().rejects(Error('Syntax error'));
+    const createAsyncLoader = stub().returns(stub().rejects(Error('@putout/formatter-xxx: Syntax error')));
 
-    mockRequire('./simple-import', {
-        simpleImportDefault,
+    mockRequire('@putout/engine-loader', {
+        createAsyncLoader,
     });
 
-    const {getReporter} = reRequire('./formatter');
-    await getReporter('xxx', exit);
+    const {getFormatter} = reRequire('./formatter');
+    await getFormatter('xxx', exit);
 
     const expected = [
         CANNOT_LOAD_FORMATTER,

packages/putout/lib/cli/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const tryToCatch = require('try-to-catch');
+
 const yargsParser = require('yargs-parser');
 const {isCI} = require('ci-info');
 const memo = require('nano-memoize');
@@ -213,7 +215,7 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
     } = config;
 
     const [currentFormat, formatterOptions] = await getFormatter(format || formatter, exit);
-    const [error, processorRunners] = tryCatch(getProcessorRunners, processors);
+    const [error, processorRunners] = await tryToCatch(getProcessorRunners, processors);
 
     if (error)
         return exit(CANNOT_LOAD_PROCESSOR, error);
@@ -350,3 +352,4 @@ function addOnce(emitter, name, fn) {
     if (!emitter.listenerCount(name))
         emitter.on(name, fn);
 }
+

packages/putout/lib/cli/index.spec.js

@@ -1446,12 +1446,14 @@ test('putout: cli: not fixable', async (t) => {
     const fileCache = stub().returns({
         setInfo,
     });
+    const {getProcessorRunners} = reRequire('@putout/engine-processor');
 
     mockRequire('./get-options', getOptions);
     mockRequire('./file-cache', fileCache);
     mockRequire('@putout/engine-processor', {
         runProcessors,
         getFilePatterns,
+        getProcessorRunners,
     });
 
     const cli = reRequire('.');
@@ -1499,11 +1501,14 @@ test('putout: cli: setInfo: crash', async (t) => {
         setInfo,
     });
 
+    const {getProcessorRunners} = require('@putout/engine-processor');
+    
     mockRequire('./get-options', getOptions);
     mockRequire('./file-cache', fileCache);
     mockRequire('@putout/engine-processor', {
         runProcessors,
         getFilePatterns,
+        getProcessorRunners,
     });
 
     const cli = reRequire('.');
@@ -1827,12 +1832,13 @@ test('putout: cli: cannot load processor: not found', async (t) => {
     const argv = [];
 
     const logError = stub();
-    const loadProcessors = stub().throws(Error(`Processor "putout-processor-hello" could not be found!`));
+    const loadProcessorsAsync = stub().rejects(Error(`Processor "putout-processor-hello" could not be found!`));
 
     mockRequire('@putout/engine-loader', {
-        loadProcessors,
+        loadProcessorsAsync,
     });
 
+    reRequire('@putout/engine-processor');
     const cli = reRequire('.');
 
     await runCli({
@@ -1884,6 +1890,8 @@ test('putout: processor throw', async (t) => {
         ],
     });
 
+    reRequire('@putout/engine-processor');
+    
     mockRequire('./get-options', getOptions);
 
     reRequire('./runner/worker.js');
@@ -1928,6 +1936,8 @@ test('putout: processor throw: raw', async (t) => {
         ],
     });
 
+    reRequire('@putout/engine-processor');
+    
     mockRequire('./get-options', getOptions);
 
     reRequire('./runner/worker.js');
@@ -2014,6 +2024,7 @@ test('putout: processor: invalid config: message', async (t) => {
         };
     });
 
+    reRequire('@putout/engine-processor');
     reRequire('./runner/worker.js');
     reRequire('./runner/runner.js');