Skip to content

Commit 778c9a7

Browse files
XhmikosRXhmikosR
committed
Update all the stuff
* switch to ESM, require Node.js 12 * switch to GitHub Actions * add coverage with c8 * update all packages to the latest version
1 parent 84a8c10 commit 778c9a7

File tree

7 files changed

+172
-143
lines changed

7 files changed

+172
-143
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
pull_request:
6+
workflow_dispatch:
7+
8+
env:
9+
FORCE_COLOR: 2
10+
11+
jobs:
12+
test:
13+
name: Node ${{ matrix.node }} on ${{ matrix.os }}
14+
runs-on: ${{ matrix.os }}
15+
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
node: [12, 14, 16]
20+
os: [ubuntu-latest, windows-latest]
21+
22+
steps:
23+
- name: Clone repository
24+
uses: actions/checkout@v3
25+
26+
- name: Set up Node.js
27+
uses: actions/setup-node@v3
28+
with:
29+
node-version: ${{ matrix.node }}
30+
31+
- name: Install npm dependencies
32+
run: npm install
33+
34+
- name: Run tests
35+
run: npm run test-ci

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
22
yarn.lock
3+
/coverage

‎.travis.yml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎index.js‎

Lines changed: 70 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,68 @@
1-
'use strict';
2-
const path = require('path');
3-
const fs = require('graceful-fs');
4-
const decompressTar = require('decompress-tar');
5-
const decompressTarbz2 = require('decompress-tarbz2');
6-
const decompressTargz = require('decompress-targz');
7-
const decompressUnzip = require('decompress-unzip');
8-
const makeDir = require('make-dir');
9-
const pify = require('pify');
10-
const stripDirs = require('strip-dirs');
1+
import {Buffer} from 'node:buffer';
2+
import path from 'node:path';
3+
import process from 'node:process';
4+
import decompressTar from 'decompress-tar';
5+
import decompressTarbz2 from 'decompress-tarbz2';
6+
import decompressTargz from 'decompress-targz';
7+
import decompressUnzip from 'decompress-unzip';
8+
import fs from 'graceful-fs';
9+
import makeDir from 'make-dir';
10+
import pify from 'pify';
11+
import stripDirs from 'strip-dirs';
1112

1213
const fsP = pify(fs);
1314

14-
const runPlugins = (input, opts) => {
15-
if (opts.plugins.length === 0) {
15+
const runPlugins = (input, options) => {
16+
if (options.plugins.length === 0) {
1617
return Promise.resolve([]);
1718
}
1819

19-
return Promise.all(opts.plugins.map(x => x(input, opts))).then(files => files.reduce((a, b) => a.concat(b)));
20+
return Promise.all(options.plugins.map(x => x(input, options)))
21+
.then(files => files.reduce((a, b) => a.concat(b))); // eslint-disable-line unicorn/no-array-reduce, unicorn/prefer-spread
2022
};
2123

22-
const safeMakeDir = (dir, realOutputPath) => {
23-
return fsP.realpath(dir)
24-
.catch(_ => {
25-
const parent = path.dirname(dir);
26-
return safeMakeDir(parent, realOutputPath);
27-
})
28-
.then(realParentPath => {
29-
if (realParentPath.indexOf(realOutputPath) !== 0) {
30-
throw (new Error('Refusing to create a directory outside the output path.'));
31-
}
32-
33-
return makeDir(dir).then(fsP.realpath);
34-
});
35-
};
24+
const safeMakeDir = (dir, realOutputPath) => fsP.realpath(dir)
25+
.catch(_ => {
26+
const parent = path.dirname(dir);
27+
return safeMakeDir(parent, realOutputPath);
28+
})
29+
.then(realParentPath => {
30+
if (realParentPath.indexOf(realOutputPath) !== 0) {
31+
throw new Error('Refusing to create a directory outside the output path.');
32+
}
3633

37-
const preventWritingThroughSymlink = (destination, realOutputPath) => {
38-
return fsP.readlink(destination)
39-
.catch(_ => {
40-
// Either no file exists, or it's not a symlink. In either case, this is
41-
// not an escape we need to worry about in this phase.
42-
return null;
43-
})
44-
.then(symlinkPointsTo => {
45-
if (symlinkPointsTo) {
46-
throw new Error('Refusing to write into a symlink');
47-
}
48-
49-
// No symlink exists at `destination`, so we can continue
50-
return realOutputPath;
51-
});
52-
};
34+
return makeDir(dir).then(fsP.realpath);
35+
});
36+
37+
const preventWritingThroughSymlink = (destination, realOutputPath) => fsP.readlink(destination)
38+
// Either no file exists, or it's not a symlink. In either case, this is
39+
// not an escape we need to worry about in this phase.
40+
.catch(_ => null)
41+
.then(symlinkPointsTo => {
42+
if (symlinkPointsTo) {
43+
throw new Error('Refusing to write into a symlink');
44+
}
45+
46+
// No symlink exists at `destination`, so we can continue
47+
return realOutputPath;
48+
});
5349

54-
const extractFile = (input, output, opts) => runPlugins(input, opts).then(files => {
55-
if (opts.strip > 0) {
50+
const extractFile = (input, output, options) => runPlugins(input, options).then(files => {
51+
if (options.strip > 0) {
5652
files = files
5753
.map(x => {
58-
x.path = stripDirs(x.path, opts.strip);
54+
x.path = stripDirs(x.path, options.strip);
5955
return x;
6056
})
6157
.filter(x => x.path !== '.');
6258
}
6359

64-
if (typeof opts.filter === 'function') {
65-
files = files.filter(opts.filter);
60+
if (typeof options.filter === 'function') {
61+
files = files.filter(options.filter); // eslint-disable-line unicorn/no-array-callback-reference
6662
}
6763

68-
if (typeof opts.map === 'function') {
69-
files = files.map(opts.map);
64+
if (typeof options.map === 'function') {
65+
files = files.map(options.map); // eslint-disable-line unicorn/no-array-callback-reference
7066
}
7167

7268
if (!output) {
@@ -75,7 +71,7 @@ const extractFile = (input, output, opts) => runPlugins(input, opts).then(files
7571

7672
return Promise.all(files.map(x => {
7773
const dest = path.join(output, x.path);
78-
const mode = x.mode & ~process.umask();
74+
const mode = x.mode & ~process.umask(); // eslint-disable-line no-bitwise
7975
const now = new Date();
8076

8177
if (x.type === 'directory') {
@@ -88,26 +84,23 @@ const extractFile = (input, output, opts) => runPlugins(input, opts).then(files
8884

8985
return makeDir(output)
9086
.then(outputPath => fsP.realpath(outputPath))
91-
.then(realOutputPath => {
87+
.then(realOutputPath =>
9288
// Attempt to ensure parent directory exists (failing if it's outside the output dir)
93-
return safeMakeDir(path.dirname(dest), realOutputPath)
94-
.then(() => realOutputPath);
95-
})
89+
safeMakeDir(path.dirname(dest), realOutputPath).then(() => realOutputPath),
90+
)
9691
.then(realOutputPath => {
9792
if (x.type === 'file') {
9893
return preventWritingThroughSymlink(dest, realOutputPath);
9994
}
10095

10196
return realOutputPath;
10297
})
103-
.then(realOutputPath => {
104-
return fsP.realpath(path.dirname(dest))
105-
.then(realDestinationDir => {
106-
if (realDestinationDir.indexOf(realOutputPath) !== 0) {
107-
throw (new Error('Refusing to write outside output directory: ' + realDestinationDir));
108-
}
109-
});
110-
})
98+
.then(realOutputPath => fsP.realpath(path.dirname(dest))
99+
.then(realDestinationDir => {
100+
if (realDestinationDir.indexOf(realOutputPath) !== 0) {
101+
throw new Error(`Refusing to write outside output directory: ${realDestinationDir}`);
102+
}
103+
}))
111104
.then(() => {
112105
if (x.type === 'link') {
113106
return fsP.link(x.linkname, dest);
@@ -128,24 +121,29 @@ const extractFile = (input, output, opts) => runPlugins(input, opts).then(files
128121
}));
129122
});
130123

131-
module.exports = (input, output, opts) => {
124+
const decompress = (input, output, options) => {
132125
if (typeof input !== 'string' && !Buffer.isBuffer(input)) {
133126
return Promise.reject(new TypeError('Input file required'));
134127
}
135128

136129
if (typeof output === 'object') {
137-
opts = output;
130+
options = output;
138131
output = null;
139132
}
140133

141-
opts = Object.assign({plugins: [
142-
decompressTar(),
143-
decompressTarbz2(),
144-
decompressTargz(),
145-
decompressUnzip()
146-
]}, opts);
134+
options = {
135+
plugins: [
136+
decompressTar(),
137+
decompressTarbz2(),
138+
decompressTargz(),
139+
decompressUnzip(),
140+
],
141+
...options,
142+
};
147143

148144
const read = typeof input === 'string' ? fsP.readFile(input) : Promise.resolve(input);
149145

150-
return read.then(buf => extractFile(buf, output, opts));
146+
return read.then(buf => extractFile(buf, output, options));
151147
};
148+
149+
export default decompress;

‎package.json‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,18 @@
1010
"url": "github.com/kevva"
1111
},
1212
"engines": {
13-
"node": ">=4"
13+
"node": "^12.20.0 || ^14.14.0 || >=16.0.0"
1414
},
1515
"scripts": {
16-
"test": "xo && ava"
16+
"ava": "ava",
17+
"xo": "xo",
18+
"test": "npm run xo && npm run ava",
19+
"test-ci": "npm run xo && c8 ava"
20+
},
21+
"main": "index.js",
22+
"type": "module",
23+
"exports": {
24+
".": "./index.js"
1725
},
1826
"files": [
1927
"index.js"
@@ -30,32 +38,21 @@
3038
"unzip"
3139
],
3240
"dependencies": {
33-
"decompress-tar": "^4.0.0",
34-
"decompress-tarbz2": "^4.0.0",
35-
"decompress-targz": "^4.0.0",
41+
"decompress-tar": "^4.1.1",
42+
"decompress-tarbz2": "^4.1.1",
43+
"decompress-targz": "^4.1.1",
3644
"decompress-unzip": "^4.0.1",
37-
"graceful-fs": "^4.1.10",
38-
"make-dir": "^1.0.0",
39-
"pify": "^2.3.0",
40-
"strip-dirs": "^2.0.0"
45+
"graceful-fs": "^4.2.9",
46+
"make-dir": "^3.1.0",
47+
"pify": "^5.0.0",
48+
"strip-dirs": "^3.0.0"
4149
},
4250
"devDependencies": {
43-
"ava": "*",
44-
"esm": "^3.2.25",
45-
"is-jpg": "^1.0.0",
46-
"path-exists": "^3.0.0",
47-
"pify": "^2.3.0",
51+
"ava": "^4.0.1",
52+
"c8": "^7.11.0",
53+
"is-jpg": "^3.0.0",
54+
"path-exists": "^5.0.0",
4855
"rimraf": "^3.0.2",
49-
"xo": "*"
50-
},
51-
"ava": {
52-
"require": [
53-
"esm"
54-
]
55-
},
56-
"xo": {
57-
"rules": {
58-
"promise/prefer-await-to-then": "off"
59-
}
56+
"xo": "^0.48.0"
6057
}
6158
}

‎readme.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# decompress [![Build Status](https://travis-ci.org/kevva/decompress.svg?branch=master)](https://travis-ci.org/kevva/decompress)
1+
# decompress [![CI](https://github.com/kevva/decompress/actions/workflows/ci.yml/badge.svg)](https://github.com/kevva/decompress/actions/workflows/ci.yml)
22

33
> Extracting archives made easy
44
55
*See [decompress-cli](https://github.com/kevva/decompress-cli) for the command-line version.*
66

77
## Install
88

9-
```
10-
$ npm install decompress
9+
```sh
10+
npm install decompress
1111
```
1212

1313

1414
## Usage
1515

1616
```js
17-
const decompress = require('decompress');
17+
import decompress from 'decompress';
1818

1919
decompress('unicorn.zip', 'dist').then(files => {
2020
console.log('done!');
@@ -87,15 +87,15 @@ decompress('unicorn.zip', 'dist', {
8787

8888
##### plugins
8989

90-
Type: `Array`<br>
91-
Default: `[decompressTar(), decompressTarbz2(), decompressTargz(), decompressUnzip()]`
90+
* Type: `Array`
91+
* Default: `[decompressTar(), decompressTarbz2(), decompressTargz(), decompressUnzip()]`
9292

9393
Array of [plugins](https://www.npmjs.com/browse/keyword/decompressplugin) to use.
9494

9595
##### strip
9696

97-
Type: `number`<br>
98-
Default: `0`
97+
* Type: `number`
98+
* Default: `0`
9999

100100
Remove leading directory components from extracted files.
101101

0 commit comments

Comments
 (0)