Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor copy API in async/await #1021

Merged
merged 15 commits into from Oct 24, 2023
Merged

Refactor copy API in async/await #1021

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
56428e3
Refactor `copy` API in async/await
SukkaW Oct 19, 2023
f04093f
Update test to import `copy` from main exports
SukkaW Oct 19, 2023
47db735
Use promisified fs API from `lib/fs`
SukkaW Oct 20, 2023
e125aa2
Update test to import `ncp` from re-exports
SukkaW Oct 20, 2023
d9f8ef9
Use promisfied fs API from `lib/fs`
SukkaW Oct 20, 2023
bc8ee0b
Apply code review suggestions from @RyanZim
SukkaW Oct 21, 2023
cf3aed7
Refactor copy recursive logic
SukkaW Oct 21, 2023
a3e2c21
Universalify stat utility
SukkaW Oct 21, 2023
dbfdb31
Universalify the `gracefulFsStub` inside the unit test
SukkaW Oct 21, 2023
b27cdfa
Inline preserve timestamp function
SukkaW Oct 21, 2023
20ac969
Make `standard` happy
SukkaW Oct 21, 2023
eebb61d
Inline `setDestMode`
SukkaW Oct 21, 2023
ce7cf64
Remove duplicated `opts` handling
SukkaW Oct 21, 2023
1ce5d34
Apply code review suggestions from @RyanZim
SukkaW Oct 24, 2023
c2d1871
Make `standard` happy
SukkaW Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions lib/util/__tests__/utimes.test.js
View file
Open in desktop
Expand Up @@ -6,6 +6,8 @@ const fse = require('../..')
const path = require('path')
const assert = require('assert')
const proxyquire = require('proxyquire')
const u = require('universalify').fromCallback

let gracefulFsStub
let utimes

Expand Down Expand Up @@ -68,25 +70,25 @@ describe('utimes', () => {
it('should close open file desciptors after encountering an error', done => {
const fakeFd = Math.random()

gracefulFsStub.open = (pathIgnored, flagsIgnored, modeIgnored, callback) => {
gracefulFsStub.open = u((pathIgnored, flagsIgnored, modeIgnored, callback) => {
Copy link
Contributor Author

@SukkaW SukkaW Oct 21, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The gracefulFsStub needs to be universalify as the utimesMillis is now Promise-based and then universalized.

if (typeof modeIgnored === 'function') callback = modeIgnored
process.nextTick(() => callback(null, fakeFd))
}
})

let closeCalled = false
gracefulFsStub.close = (fd, callback) => {
gracefulFsStub.close = u((fd, callback) => {
assert.strictEqual(fd, fakeFd)
closeCalled = true
if (callback) process.nextTick(callback)
}
})

let testError
gracefulFsStub.futimes = (fd, atimeIgnored, mtimeIgnored, callback) => {
gracefulFsStub.futimes = u((fd, atimeIgnored, mtimeIgnored, callback) => {
process.nextTick(() => {
testError = new Error('A test error')
callback(testError)
})
}
})

utimes.utimesMillis('ignored', 'ignored', 'ignored', err => {
assert.strictEqual(err, testError)
Expand Down
2 changes: 1 addition & 1 deletion lib/util/utimes.js
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
const fs = require('../fs')
const u = require('universalify').fromPromise

async function utimesMillis (path, atime, mtime) {
async function utimesMillis (path, atime, mtime, cb) {
SukkaW marked this conversation as resolved.
Show resolved Hide resolved
// if (!HAS_MILLIS_RES) return fs.utimes(path, atime, mtime, callback)
const fd = await fs.open(path, 'r+')

Expand Down