putout 33.6.2 → 33.8.0

package/ChangeLog

@@ -1,3 +1,28 @@
+2023.11.18, v33.8.0
+
+fix:
+- d79f6a49e putout: loader: use putoutAsync
+
+feature:
+- be92475be putout: enable nodejs filesystem rules
+- a8e501db1 @putout/plugin-nodejs: mjs-file: add
+- f85820fca @putout/plugin-nodejs: cjs-file: add
+- 4e80a6f73 @putout/operator-match-files: add additional check of provided files
+- be49cc530 @putout/operator-match-files: autodetect json/js
+
+2023.11.17, v33.7.0
+
+fix:
+- 0650c3c03 @putout/plugin-nextjs: update-tsconfig: disabled by default
+
+feature:
+- cd981e88c @putout/plugin-putout: declare: matchFiles: add
+- 3b577c59d @putout/operator-match-files: add
+- 2dff879d0 putout: exports: transform, findPlaces
+- c8be4d2d0 @putout/plugin-nextjs: update-tsconfig-file: reuse update-tsconfig-file
+- 80cd0b2a7 @putout/plugin-nextjs: update-tsconfig: add
+- f48b53485 @putout/plugin-nextjs: update-tsconfig-file: add
+
 2023.11.16, v33.6.2
 
 fix:

package/lib/default-options.js

@@ -0,0 +1,27 @@
+'use strict';
+
+const loader = require('@putout/engine-loader');
+const runner = require('@putout/engine-runner');
+
+module.exports.defaultOptions = (opts = {}) => {
+    const {
+        parser = 'babel',
+        printer = opts.printer || 'putout',
+        fix = true,
+        fixCount = 2,
+        loadPlugins = loader.loadPlugins,
+        loadPluginsAsync = loader.loadPluginsAsync,
+        runPlugins = runner.runPlugins,
+    } = opts;
+    
+    return {
+        ...opts,
+        parser,
+        printer,
+        fix,
+        fixCount,
+        loadPlugins,
+        loadPluginsAsync,
+        runPlugins,
+    };
+};

package/lib/find-places.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const {transform, transformAsync} = require('./transform');
+
+module.exports.findPlaces = (ast, source, opts) => {
+    return transform(ast, source, {
+        ...opts,
+        fix: false,
+    });
+};
+
+module.exports.findPlacesAsync = async (ast, source, opts) => {
+    return await transformAsync(ast, source, {
+        ...opts,
+        fix: false,
+    });
+};

package/lib/loader.mjs

@@ -1,5 +1,5 @@
 import process from 'node:process';
-import putout from './putout.js';
+import {putoutAsync} from './putout.js';
 import ignores from './ignores.js';
 import parseOptions from './parse-options/index.js';
 
@@ -23,9 +23,8 @@ const toLoad = (transformSource) => async (url, context, defaultLoad) => {
     };
 };
 
-export const transformSource = (source, context) => {
+export const transformSource = async (source, context) => {
     const {url} = context;
-    
     const name = url.replace('file://', '');
     
     const options = parseOptions({
@@ -37,7 +36,7 @@ export const transformSource = (source, context) => {
             source,
         };
     
-    const {code} = putout(source, {
+    const {code} = await putoutAsync(source, {
         printer: 'putout',
         ...options,
     });

package/lib/putout.js

@@ -1,10 +1,6 @@
 'use strict';
 
 const {traverse, types} = require('@putout/babel');
-
-const loader = require('@putout/engine-loader');
-const runner = require('@putout/engine-runner');
-
 const {
     parse,
     print,
@@ -13,35 +9,19 @@ const {
 } = require('@putout/engine-parser');
 
 const {cutShebang, mergeShebang} = require('./shebang');
+const {defaultOptions} = require('./default-options');
+const {transform, transformAsync} = require('./transform');
 
-const isString = (a) => typeof a === 'string';
+const {
+    findPlaces,
+    findPlacesAsync,
+} = require('./find-places');
 
-const defaultOpts = (opts = {}) => {
-    const {
-        parser = 'babel',
-        printer = opts.printer || 'putout',
-        fix = true,
-        fixCount = 2,
-        loadPlugins = loader.loadPlugins,
-        loadPluginsAsync = loader.loadPluginsAsync,
-        runPlugins = runner.runPlugins,
-    } = opts;
-    
-    return {
-        ...opts,
-        parser,
-        printer,
-        fix,
-        fixCount,
-        loadPlugins,
-        loadPluginsAsync,
-        runPlugins,
-    };
-};
+const isString = (a) => typeof a === 'string';
 
 module.exports = (source, opts) => {
     check(source);
-    opts = defaultOpts(opts);
+    opts = defaultOptions(opts);
     
     const {
         parser,
@@ -87,7 +67,7 @@ module.exports = (source, opts) => {
 
 module.exports.putoutAsync = async (source, opts) => {
     check(source);
-    opts = defaultOpts(opts);
+    opts = defaultOptions(opts);
     
     const {
         parser,
@@ -131,93 +111,11 @@ module.exports.putoutAsync = async (source, opts) => {
     };
 };
 
+module.exports.transform = transform;
 module.exports.transformAsync = transformAsync;
-module.exports.findPlaces = (ast, source, opts) => {
-    return transform(ast, source, {
-        ...opts,
-        fix: false,
-    });
-};
-module.exports.findPlacesAsync = async (ast, source, opts) => {
-    return await transformAsync(ast, source, {
-        ...opts,
-        fix: false,
-    });
-};
-
-async function transformAsync(ast, source, opts) {
-    opts = defaultOpts(opts);
-    
-    const {
-        plugins: pluginNames,
-        cache,
-        rules,
-        fix,
-        fixCount,
-        loadPluginsAsync,
-        runPlugins,
-    } = opts;
-    
-    const [, shebang] = cutShebang(source);
-    
-    const plugins = await loadPluginsAsync({
-        pluginNames,
-        cache,
-        rules,
-    });
-    
-    const places = runPlugins({
-        ast,
-        shebang,
-        fix,
-        fixCount,
-        plugins,
-    });
-    
-    return places;
-}
 
-// why we pass 'source' to 'transform()'?
-// because we need to calculate position in a right way
-// and determine is shebang is exists
-//
-// 25     return {¬
-// 26         line: shebang ? line + 1 : line,¬
-// 27         column,¬
-// 28     };¬
-//
-module.exports.transform = transform;
-function transform(ast, source, opts) {
-    opts = defaultOpts(opts);
-    
-    const {
-        plugins: pluginNames,
-        cache,
-        rules,
-        fix,
-        fixCount,
-        loadPlugins,
-        runPlugins,
-    } = opts;
-    
-    const [, shebang] = cutShebang(source);
-    
-    const plugins = loadPlugins({
-        pluginNames,
-        cache,
-        rules,
-    });
-    
-    const places = runPlugins({
-        ast,
-        shebang,
-        fix,
-        fixCount,
-        plugins,
-    });
-    
-    return places;
-}
+module.exports.findPlaces = findPlaces;
+module.exports.findPlacesAsync = findPlacesAsync;
 
 module.exports.parse = parse;
 module.exports.print = print;
@@ -236,6 +134,7 @@ module.exports.operator = {
     ...require('@putout/operator-regexp'),
     ...require('@putout/operator-add-args'),
     ...require('@putout/operator-filesystem'),
+    ...require('@putout/operator-match-files'),
 };
 
 module.exports.ignores = require('./ignores');

package/lib/transform.js

@@ -0,0 +1,77 @@
+'use strict';
+
+const {defaultOptions} = require('./default-options');
+const {cutShebang} = require('./shebang');
+
+// why we pass 'source' to 'transform()'?
+// because we need to calculate position in a right way
+// and determine is shebang is exists
+//
+// 25     return {¬
+// 26         line: shebang ? line + 1 : line,¬
+// 27         column,¬
+// 28     };¬
+//
+module.exports.transform = (ast, source, opts) => {
+    opts = defaultOptions(opts);
+    
+    const {
+        plugins: pluginNames,
+        cache,
+        rules,
+        fix,
+        fixCount,
+        loadPlugins,
+        runPlugins,
+    } = opts;
+    
+    const [, shebang] = cutShebang(source);
+    
+    const plugins = loadPlugins({
+        pluginNames,
+        cache,
+        rules,
+    });
+    
+    const places = runPlugins({
+        ast,
+        shebang,
+        fix,
+        fixCount,
+        plugins,
+    });
+    
+    return places;
+};
+
+module.exports.transformAsync = async (ast, source, opts) => {
+    opts = defaultOptions(opts);
+    
+    const {
+        plugins: pluginNames,
+        cache,
+        rules,
+        fix,
+        fixCount,
+        loadPluginsAsync,
+        runPlugins,
+    } = opts;
+    
+    const [, shebang] = cutShebang(source);
+    
+    const plugins = await loadPluginsAsync({
+        pluginNames,
+        cache,
+        rules,
+    });
+    
+    const places = runPlugins({
+        ast,
+        shebang,
+        fix,
+        fixCount,
+        plugins,
+    });
+    
+    return places;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "putout",
-  "version": "33.6.2",
+  "version": "33.8.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊 Pluggable and configurable code transformer with built-in ESLint, Babel and support of js, jsx, typescript, flow, markdown, yaml and json",
@@ -19,7 +19,9 @@
     "./cli/run": "./lib/cli/runner/work",
     "./loader": "./lib/loader.mjs",
     "./package.json": "./package.json",
-    "./lint/json": "./lib/lint/json.mjs"
+    "./lint/json": "./lib/lint/json.mjs",
+    "./transform": "./lib/transform.js",
+    "./find-places": "./lib/find-places.js"
   },
   "bin": {
     "putout": "bin/putout.mjs"
@@ -73,6 +75,7 @@
     "@putout/operator-declare": "^8.0.0",
     "@putout/operator-filesystem": "^2.0.0",
     "@putout/operator-json": "^1.0.1",
+    "@putout/operator-match-files": "^1.0.0",
     "@putout/operator-regexp": "^1.0.0",
     "@putout/plugin-apply-at": "^2.0.0",
     "@putout/plugin-apply-destructuring": "^7.0.0",

package/putout.json

@@ -30,6 +30,10 @@
         "setupTests.*": {
             "remove-empty/import": "off"
         },
+        ".filesystem.json": {
+            "nodejs/cjs-file": "on",
+            "nodejs/mjs-file": "on"
+        },
         "*.md": {
             "conditions/apply-consistent-blocks": "off",
             "conditions/convert-comparison-to-boolean": "off",