Skip to content

Commit 8f79dcd

Browse files
authored
Refactor folder structure (#922)
* Rename lib/output/ to lib/output-file/ * Refactor lib/ensure/index.js * Collapse copy-sync/ and move-sync/ into the async folders
1 parent e6a9505 commit 8f79dcd

25 files changed

+23
-33
lines changed

lib/copy-sync/index.js

Lines changed: 0 additions & 5 deletions
This file was deleted.
File renamed without changes.

lib/copy/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
const u = require('universalify').fromCallback
44
module.exports = {
5-
copy: u(require('./copy'))
5+
copy: u(require('./copy')),
6+
copySync: require('./copy-sync')
67
}

lib/ensure/index.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
'use strict'
22

3-
const file = require('./file')
4-
const link = require('./link')
5-
const symlink = require('./symlink')
3+
const { createFile, createFileSync } = require('./file')
4+
const { createLink, createLinkSync } = require('./link')
5+
const { createSymlink, createSymlinkSync } = require('./symlink')
66

77
module.exports = {
88
// file
9-
createFile: file.createFile,
10-
createFileSync: file.createFileSync,
11-
ensureFile: file.createFile,
12-
ensureFileSync: file.createFileSync,
9+
createFile,
10+
createFileSync,
11+
ensureFile: createFile,
12+
ensureFileSync: createFileSync,
1313
// link
14-
createLink: link.createLink,
15-
createLinkSync: link.createLinkSync,
16-
ensureLink: link.createLink,
17-
ensureLinkSync: link.createLinkSync,
14+
createLink,
15+
createLinkSync,
16+
ensureLink: createLink,
17+
ensureLinkSync: createLinkSync,
1818
// symlink
19-
createSymlink: symlink.createSymlink,
20-
createSymlinkSync: symlink.createSymlinkSync,
21-
ensureSymlink: symlink.createSymlink,
22-
ensureSymlinkSync: symlink.createSymlinkSync
19+
createSymlink,
20+
createSymlinkSync,
21+
ensureSymlink: createSymlink,
22+
ensureSymlinkSync: createSymlinkSync
2323
}

lib/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ module.exports = {
44
// Export promiseified graceful-fs:
55
...require('./fs'),
66
// Export extra methods:
7-
...require('./copy-sync'),
87
...require('./copy'),
98
...require('./empty'),
109
...require('./ensure'),
1110
...require('./json'),
1211
...require('./mkdirs'),
13-
...require('./move-sync'),
1412
...require('./move'),
15-
...require('./output'),
13+
...require('./output-file'),
1614
...require('./path-exists'),
1715
...require('./remove')
1816
}

lib/json/output-json-sync.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const { stringify } = require('jsonfile/utils')
4-
const { outputFileSync } = require('../output')
4+
const { outputFileSync } = require('../output-file')
55

66
function outputJsonSync (file, data, options) {
77
const str = stringify(data, options)

lib/json/output-json.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
22

33
const { stringify } = require('jsonfile/utils')
4-
const { outputFile } = require('../output')
4+
const { outputFile } = require('../output-file')
55

66
async function outputJson (file, data, options = {}) {
77
const str = stringify(data, options)

lib/move-sync/index.js

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

lib/move/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
const u = require('universalify').fromCallback
44
module.exports = {
5-
move: u(require('./move'))
5+
move: u(require('./move')),
6+
moveSync: require('./move-sync')
67
}

lib/move-sync/move-sync.js renamed to lib/move/move-sync.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const fs = require('graceful-fs')
44
const path = require('path')
5-
const copySync = require('../copy-sync').copySync
5+
const copySync = require('../copy').copySync
66
const removeSync = require('../remove').removeSync
77
const mkdirpSync = require('../mkdirs').mkdirpSync
88
const stat = require('../util/stat')
File renamed without changes.

0 commit comments

Comments
 (0)