putout 26.2.0 → 26.3.1

package/ChangeLog

@@ -1,3 +1,27 @@
+2022.05.17, v26.3.1
+
+feature:
+- (putout) add ability to override import of processors for yarn pnp
+
+
+2022.05.17, v26.3.0
+
+feature:
+- (@putout/engine-loader) add ability to pass loader
+- (@putout/engine-processor) add ability to pass load
+- (@putout/engine-loader) add support of load
+- (putout) cli: formatter: add support of load
+- (putout) worker: add ability to pass load to getProcessors
+
+
+2022.05.16, v26.2.1
+
+feature:
+- (putout) parse-options: apply-module-type-rules: simplify
+- (package) @putout/processor-css v5.0.0
+- (@putout/processor-html) convert to ESM
+
+
 2022.05.15, v26.2.0
 
 feature:

package/lib/cli/formatter.js

@@ -2,6 +2,7 @@
 
 const tryToCatch = require('try-to-catch');
 const {createAsyncLoader} = require('@putout/engine-loader');
+const {simpleImport} = require('./simple-import');
 
 const {
     NO_FORMATTER,
@@ -15,7 +16,7 @@ module.exports.getFormatter = async (formatterOptional, exit) => {
     const [formatterName, formatterOptions] = maybeArray(formatterOptional);
     const loadFormatter = createAsyncLoader('formatter');
     
-    const [error, formatter] = await tryToCatch(loadFormatter, formatterName, exit);
+    const [error, formatter] = await tryToCatch(loadFormatter, formatterName, simpleImport);
     
     if (formatter)
         return [formatter, formatterOptions];

package/lib/cli/index.js

@@ -11,10 +11,7 @@ const fullstore = require('fullstore');
 
 const keyPress = require('@putout/cli-keypress');
 const {version} = require('../../package.json');
-const {
-    simpleImport,
-    simpleImportDefault,
-} = require('./simple-import');
+const {simpleImport} = require('./simple-import');
 const {run} = require('./runner/runner.js');
 
 const {
@@ -144,7 +141,7 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
         plugins,
     } = args;
     
-    const {red} = await simpleImportDefault('chalk');
+    const {red} = await simpleImport('chalk');
     const exit = getExit({
         red,
         raw,
@@ -215,7 +212,7 @@ module.exports = async ({argv, halt, log, write, logError, readFile, writeFile})
     } = config;
     
     const [currentFormat, formatterOptions] = await getFormatter(format || formatter, exit);
-    const [error, processorRunners] = await tryToCatch(getProcessorRunners, processors);
+    const [error, processorRunners] = await tryToCatch(getProcessorRunners, processors, simpleImport);
     
     if (error)
         return exit(CANNOT_LOAD_PROCESSOR, error);

package/lib/cli/runner/worker.js

@@ -12,6 +12,7 @@ const {runProcessors} = require('@putout/engine-processor');
 
 const parseError = require('../parse-error.js');
 const getOptions = require('../get-options.js');
+const {simpleImport} = require('../simple-import');
 const {
     INVALID_CONFIG,
     NO_PROCESSORS,
@@ -92,6 +93,7 @@ module.exports = async ({readFile, report, writeFile, exit, raw, write, log, cur
             options,
             rawSource,
             processorRunners,
+            load: simpleImport,
         });
         
         if (error) {

package/lib/cli/simple-import.js

@@ -1,6 +1,7 @@
 'use strict';
 
-// How in other way to mock import using mock require in CommonJS?
-module.exports.simpleImportDefault = async (url) => (await import(url)).default;
-module.exports.simpleImport = async (url) => await import(url);
+module.exports.simpleImport = async (url) => {
+    const result = await import(url);
+    return result.default || result;
+};
 

package/lib/parse-options/apply-module-type-rules.js

@@ -1,25 +1,37 @@
 'use strict';
 
 const {assign} = Object;
-const getRuleByType = (a) => a === 'module' ? 'convert-commonjs-to-esm' : 'convert-esm-to-commonjs';
+const merge = require('../merge');
 
 module.exports = ({type}, options) => {
-    const rule = getRuleByType(type);
-    const js = '*.js';
-    
-    assign(options, {
+    const rules = type === 'module' ? esm() : commonjs();
+    assign(options, merge(options, rules));
+};
+
+function commonjs() {
+    return {
         match: {
-            ...options.match,
-            [js]: {
-                ...options.match?.[js],
-                [rule]: 'on',
+            '*.js': {
+                'convert-esm-to-commonjs': 'on',
             },
             '.eslintrc.json': {
-                ...options.match?.['.eslintrc.json'],
                 'eslint': 'on',
-                'eslint/convert-require-to-import': type === 'module' ? 'on' : 'off',
+                'eslint/convert-require-to-import': 'off',
             },
         },
-    });
-};
+    };
+}
 
+function esm() {
+    return {
+        match: {
+            '*.js': {
+                'convert-commonjs-to-esm': 'on',
+            },
+            '.eslintrc.json': {
+                'eslint': 'on',
+                'eslint/convert-require-to-import': 'on',
+            },
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "26.2.0",
+  "version": "26.3.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊 Pluggable and configurable code transformer with built-in eslint and babel plugins support of js, jsx typescript, flow files, markdown, yaml and json",