feature(putout) add support of yarn PnP by formatters loader (#93)

coderaiser · Dec 15, 2021 · b878e04 · b878e04
1 parent 02e522a
commit b878e04
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/packages/putout/lib/cli/formatter.js b/packages/putout/lib/cli/formatter.js
@@ -1,14 +1,14 @@
 'use strict';
 
-const {createSimport} = require('simport');
 const tryToCatch = require('try-to-catch');
 
 const {
     NO_FORMATTER,
     CANNOT_LOAD_FORMATTER,
 } = require('./exit-codes');
 
-const simport = createSimport(__filename);
+const simpleImport = require('./simple-import');
+
 const stub = () => () => {};
 
 const {isArray} = Array;
@@ -48,7 +48,7 @@ async function loadFormatter(names) {
     let reporter;
 
     for (const name of names) {
-        [e, reporter] = await tryToCatch(simport, name);
+        [e, reporter] = await tryToCatch(simpleImport, name);
 
         if (!e)
             return [null, reporter];
@@ -69,3 +69,4 @@ async function loadFormatter(names) {
 
     return [e];
 }
+
diff --git a/packages/putout/lib/cli/formatter.spec.js b/packages/putout/lib/cli/formatter.spec.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const {createSimport} = require('simport');
-
 const test = require('supertape');
 const stub = require('@cloudcmd/stub');
 const mockRequire = require('mock-require');
@@ -14,14 +12,12 @@ const {getFormatter} = require('./formatter');
 
 const {reRequire, stopAll} = mockRequire;
 
-const simport = createSimport(__filename);
-
 const {assign} = Object;
 
 test('putout: cli: formatter: get formatter', async (t) => {
     const exit = stub();
 
-    const progress = await simport('@putout/formatter-progress');
+    const {default: progress} = await import('@putout/formatter-progress');
 
     const result = await getFormatter('progress', exit);
     const expected = [progress, {}];
@@ -37,7 +33,7 @@ test('putout: cli: formatter: get formatter: options', async (t) => {
         minCount: 10,
     };
 
-    const progress = await simport('@putout/formatter-progress');
+    const {default: progress} = await import('@putout/formatter-progress');
 
     const result = await getFormatter(['progress', formatterOptions], exit);
     const expected = [progress, formatterOptions];
@@ -50,9 +46,7 @@ test('putout: cli: formatter: get reporter', async (t) => {
     const formatter = stub();
     const simport = stub().returns(formatter);
 
-    mockRequire('simport', {
-        createSimport: stub().returns(simport),
-    });
+    mockRequire('./simple-import', simport);
 
     const {getReporter} = reRequire('./formatter');
 
@@ -71,9 +65,7 @@ test('putout: cli: formatter: calls', async (t) => {
             code: 'ERR_MODULE_NOT_FOUND',
         }));
 
-    mockRequire('simport', {
-        createSimport: stub().returns(simport),
-    });
+    mockRequire('./simple-import', simport);
 
     const {getReporter} = reRequire('./formatter');
 
@@ -107,9 +99,7 @@ test('putout: cli: formatter: second import', async (t) => {
         return 'found from test';
     };
 
-    mockRequire('simport', {
-        createSimport: stub().returns(simport),
-    });
+    mockRequire('./simple-import', simport);
 
     const {getReporter} = reRequire('./formatter');
 
@@ -145,9 +135,7 @@ test('putout: cli: formatter: get reporter: exit: CANNOT_LOAD_FORMATTER', async
     const exit = stub();
     const simport = stub().rejects(Error('Syntax error'));
 
-    mockRequire('simport', {
-        createSimport: stub().returns(simport),
-    });
+    mockRequire('./simple-import', simport);
 
     const {getReporter} = reRequire('./formatter');
     await getReporter('xxx', exit);

diff --git a/packages/putout/lib/cli/simple-import.js b/packages/putout/lib/cli/simple-import.js
@@ -0,0 +1,7 @@
+'use strict';
+
+// yarn doesn't understand how simport works
+// https://github.com/coderaiser/putout/issues/93
+
+module.exports = async (url) => (await import(url)).default;
+