feature(trammel) drop support of node < 14

Author: coderaiser

.eslintrc.json

@@ -3,8 +3,8 @@
         "node/no-unsupported-features/node-builtins": "off"
     },
     "extends": [
-        "plugin:putout/recommended",
-        "plugin:node/recommended"
+        "plugin:node/recommended",
+        "plugin:putout/recommended"
     ],
     "plugins": [
         "putout",

.gitignore

@@ -1,5 +1,7 @@
+*.swp
 .*.swp
 .nyc_output
 node_modules
 yarn-error.log
 
+.putoutcache

.madrun.js .madrun.mjs.madrun.js renamed to .madrun.mjs

@@ -1,9 +1,9 @@
-'use strict';
+import {run} from 'madrun';
 
-const {run} = require('madrun');
-
-module.exports = {
-    'lint': () => 'putout lib test .madrun.js',
+export default {
+    'lint': () => 'putout .',
+    'fresh:lint': () => run('lint', '--fresh'),
+    'lint:fresh': () => run('lint', '--fresh'),
     'fix:lint': () => run('lint', '--fix'),
     'report': () => 'nyc report --reporter=text-lcov | coveralls',
     'coverage': () => 'nyc npm test',

.travis.yml

@@ -1,17 +1,13 @@
 language: node_js
 node_js:
-    - 14
-    - 12
-    - 10
-
+  - 15
+  - 14
 script:
   - npm run lint
   - npm run coverage && npm run report
-
 notifications:
-    email:
-        on_success: never
-        on_failure: change
-
+  email:
+    on_success: never
+    on_failure: change
 sudo: false
-
+cache: false

README.md

@@ -1,13 +1,13 @@
 # Trammel [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL]
 
-[NPMIMGURL]:                https://img.shields.io/npm/v/trammel.svg?style=flat
-[BuildStatusIMGURL]:        https://img.shields.io/travis/coderaiser/trammel/master.svg?style=flat
-[DependencyStatusIMGURL]:   https://img.shields.io/david/coderaiser/trammel.svg?style=flat
-[LicenseIMGURL]:            https://img.shields.io/badge/license-MIT-317BF9.svg?style=flat
-[NPMURL]:                   https://npmjs.org/package/trammel "npm"
-[BuildStatusURL]:           https://travis-ci.org/coderaiser/trammel  "Build Status"
-[DependencyStatusURL]:      https://david-dm.org/coderaiser/trammel "Dependency Status"
-[LicenseURL]:               https://tldrlegal.com/license/mit-license "MIT License"
+[NPMIMGURL]: https://img.shields.io/npm/v/trammel.svg?style=flat
+[BuildStatusIMGURL]: https://img.shields.io/travis/coderaiser/trammel/master.svg?style=flat
+[DependencyStatusIMGURL]: https://img.shields.io/david/coderaiser/trammel.svg?style=flat
+[LicenseIMGURL]: https://img.shields.io/badge/license-MIT-317BF9.svg?style=flat
+[NPMURL]: https://npmjs.org/package/trammel "npm"
+[BuildStatusURL]: https://travis-ci.org/coderaiser/trammel "Build Status"
+[DependencyStatusURL]: https://david-dm.org/coderaiser/trammel "Dependency Status"
+[LicenseURL]: https://tldrlegal.com/license/mit-license "MIT License"
 
 Get directory size.
 
@@ -20,18 +20,17 @@ import trammel from 'trammel';
 
 await trammel('.');
 // returns
-'58.47kb'
+'58.47kb';
 
 await trammel('.', {type: 'raw'});
 // returns
-59974
+59_974;
 
 await trammel('do not exist', {stopOnError: true});
 // throws
-Error
+Error;
 ```
 
 ## License
 
 MIT
-

lib/trammel.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {promisify} = require('util');
-const {lstat, readdir} = require('fs').promises;
+const {lstat, readdir} = require('fs/promises');
 const path = require('path');
 const {EventEmitter} = require('events');
 
@@ -14,7 +14,7 @@ const tryToCatch = require('try-to-catch');
     information about the file the link references.
 */
 
-module.exports = promisify((dir, options, callback) => {
+module.exports = promisify(async (dir, options, callback) => {
     const emitter = new EventEmitter();
 
     let total = 0;
@@ -40,10 +40,10 @@ module.exports = promisify((dir, options, callback) => {
         callback(null, format.size(total));
     });
 
-    processDir(dir, options, emitter);
+    await processDir(dir, options, emitter);
 });
 
-function processDir(dir, options, emitter) {
+async function processDir(dir, options, emitter) {
     const {stopOnError} = options;
     let wasError = false;
     let asyncRunning = 0;
@@ -59,7 +59,7 @@ function processDir(dir, options, emitter) {
         emitter.emit('end');
     };
 
-    getDirInfo(dir);
+    await getDirInfo(dir);
 
     async function getDirInfo(dir) {
         const [error, stat] = await tryToCatch(lstat, dir);
@@ -92,7 +92,7 @@ function processDir(dir, options, emitter) {
         asyncRunning--;
 
         if (!readError)
-            return onReaddir(dir, files);
+            return await onReaddir(dir, files);
 
         if (readError && stopOnError) {
             wasError = true;
@@ -102,7 +102,7 @@ function processDir(dir, options, emitter) {
         execCallBack();
     }
 
-    function onReaddir(dir, files) {
+    async function onReaddir(dir, files) {
         const n = files.length;
 
         fileCounter += n;
@@ -112,7 +112,7 @@ function processDir(dir, options, emitter) {
 
         for (const file of files) {
             const dirPath = path.join(dir, file);
-            getDirInfo(dirPath);
+            await getDirInfo(dirPath);
         }
     }
 }

package.json

@@ -21,7 +21,6 @@
     "watcher": "madrun watcher"
   },
   "dependencies": {
-    "events.once": "^2.0.2",
     "format-io": "^2.0.0",
     "try-to-catch": "^3.0.0"
   },
@@ -35,11 +34,11 @@
     "nodemon": "^2.0.7",
     "nyc": "^15.0.1",
     "putout": "^13.7.1",
-    "supertape": "^1.2.3"
+    "supertape": "^4.7.0"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=10"
+    "node": ">=14"
   },
   "main": "lib/trammel.js",
   "publishConfig": {

test/trammel.js

@@ -15,15 +15,15 @@ test('trammel: size of a file', async (t) => {
     const expected = '12b';
     const [, size] = await tryToCatch(trammel, `${fixturePath}/file.txt`);
 
-    t.equal(expected, size, 'should equal');
+    t.equal(size, expected, 'should equal');
     t.end();
 });
 
 test('trammel: size of a directory', async (t) => {
     const expected = '12b';
     const [, size] = await tryToCatch(trammel, `${fixturePath}/dir`);
 
-    t.equal(expected, size, 'should equal');
+    t.equal(size, expected, 'should equal');
     t.end();
 });
 
@@ -33,7 +33,7 @@ test('trammel: size of a directory: empty dir: raw', async (t) => {
         type: 'raw',
     });
 
-    t.equal(expected, size, 'should equal');
+    t.equal(size, expected, 'should equal');
     t.end();
 });