remove more cruft, format codes

map.js

@@ -1,12 +1,9 @@
 import { basename } from 'path'
 
 const map = test =>
-  test === 'map.js'
-    ? test
-    : test === 'unpack.js'
-      ? ['src/unpack.ts', 'src/mkdir.ts']
-      : test === 'load-all.js'
-        ? []
-        : `src/${test.replace(/js$/, 'ts')}`
+  test === 'map.js' ? test
+  : test === 'unpack.js' ? ['src/unpack.ts', 'src/mkdir.ts']
+  : test === 'load-all.js' ? []
+  : `src/${test.replace(/js$/, 'ts')}`
 
 export default test => map(basename(test))

package.json

@@ -17,7 +17,7 @@
     "preversion": "npm test",
     "postversion": "npm publish",
     "prepublishOnly": "git push origin --follow-tags",
-    "format": "prettier --write . --loglevel warn",
+    "format": "prettier --write . --log-level warn",
     "typedoc": "typedoc --tsconfig .tshy/esm.json ./src/*.ts"
   },
   "dependencies": {
@@ -52,6 +52,7 @@
     "timeout": 0
   },
   "prettier": {
+    "experimentalTernaries": true,
     "semi": false,
     "printWidth": 70,
     "tabWidth": 2,

scripts/generate-parse-fixtures.js

@@ -1,7 +1,7 @@
 import { Parser } from '../dist/esm/parse.js'
 import fs from 'fs'
-import path, {dirname, resolve} from 'path'
-import {fileURLToPath} from 'url'
+import path, { dirname, resolve } from 'path'
+import { fileURLToPath } from 'url'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 
@@ -17,7 +17,8 @@ const makeTest = (tarfile, tardata, maxMeta, filter, strict) => {
     (filter ? '-filter' : '') +
     (strict ? '-strict' : '')
   const tail = (o ? '-' + o : '') + '.json'
-  const eventsfile = parsedir + '/' + path.basename(tarfile, '.tar') + tail
+  const eventsfile =
+    parsedir + '/' + path.basename(tarfile, '.tar') + tail
 
   const p = new Parser({
     maxMetaEntrySize: maxMeta,
@@ -27,57 +28,67 @@ const makeTest = (tarfile, tardata, maxMeta, filter, strict) => {
   const events = []
 
   const pushEntry = type => entry => {
-    events.push([type, {
-      extended: entry.extended,
-      globalExtended: entry.globalExtended,
-      type: entry.type,
-      meta: entry.meta,
-      ignore: entry.ignore,
-      path: entry.path,
-      mode: entry.mode,
-      uid: entry.uid,
-      gid: entry.gid,
-      uname: entry.uname,
-      gname: entry.gname,
-      size: entry.size,
-      mtime: entry.mtime,
-      atime: entry.atime,
-      ctime: entry.ctime,
-      linkpath: entry.linkpath,
-      header: {
-        cksumValid: entry.header.cksumValid,
-        needPax: entry.header.needPax,
-        path: entry.header.path,
-        mode: entry.header.mode,
-        uid: entry.header.uid,
-        gid: entry.header.gid,
-        size: entry.header.size,
-        mtime: entry.header.mtime,
-        cksum: entry.header.cksum,
-        linkpath: entry.header.linkpath,
-        ustar: entry.header.ustar,
-        ustarver: entry.header.ustarver,
-        uname: entry.header.uname,
-        gname: entry.header.gname,
-        devmaj: entry.header.devmaj,
-        devmin: entry.header.devmin,
-        ustarPrefix: entry.header.ustarPrefix,
-        xstarPrefix: entry.header.xstarPrefix,
-        prefixTerminator: entry.header.prefixTerminator,
-        atime: entry.header.atime,
-        ctime: entry.header.atime,
+    events.push([
+      type,
+      {
+        extended: entry.extended,
+        globalExtended: entry.globalExtended,
+        type: entry.type,
+        meta: entry.meta,
+        ignore: entry.ignore,
+        path: entry.path,
+        mode: entry.mode,
+        uid: entry.uid,
+        gid: entry.gid,
+        uname: entry.uname,
+        gname: entry.gname,
+        size: entry.size,
+        mtime: entry.mtime,
+        atime: entry.atime,
+        ctime: entry.ctime,
+        linkpath: entry.linkpath,
+        header: {
+          cksumValid: entry.header.cksumValid,
+          needPax: entry.header.needPax,
+          path: entry.header.path,
+          mode: entry.header.mode,
+          uid: entry.header.uid,
+          gid: entry.header.gid,
+          size: entry.header.size,
+          mtime: entry.header.mtime,
+          cksum: entry.header.cksum,
+          linkpath: entry.header.linkpath,
+          ustar: entry.header.ustar,
+          ustarver: entry.header.ustarver,
+          uname: entry.header.uname,
+          gname: entry.header.gname,
+          devmaj: entry.header.devmaj,
+          devmin: entry.header.devmin,
+          ustarPrefix: entry.header.ustarPrefix,
+          xstarPrefix: entry.header.xstarPrefix,
+          prefixTerminator: entry.header.prefixTerminator,
+          atime: entry.header.atime,
+          ctime: entry.header.atime,
+        },
       },
-    }])
+    ])
     entry.resume()
   }
 
   p.on('entry', pushEntry('entry'))
   p.on('ignoredEntry', pushEntry('ignoredEntry'))
-  p.on('warn', (code, message, _data) => events.push(['warn', code, message]))
-  p.on('error', er => events.push(['error', {
-    message: er.message,
-    code: er.code,
-  }]))
+  p.on('warn', (code, message, _data) =>
+    events.push(['warn', code, message]),
+  )
+  p.on('error', er =>
+    events.push([
+      'error',
+      {
+        message: er.message,
+        code: er.code,
+      },
+    ]),
+  )
   p.on('end', _ => events.push(['end']))
   p.on('nullBlock', _ => events.push(['nullBlock']))
   p.on('eof', _ => events.push(['eof']))
@@ -88,12 +99,14 @@ const makeTest = (tarfile, tardata, maxMeta, filter, strict) => {
   fs.writeFileSync(eventsfile, JSON.stringify(events, null, 2) + '\n')
 }
 
-fs.readdirSync(tardir)
-  .forEach(tar => {
-    const tarfile = tardir + '/' + tar
-    const tardata = fs.readFileSync(tarfile)
-    maxMetaOpt.forEach(maxMeta =>
-      filterOpt.forEach(filter =>
-        strictOpt.forEach(strict =>
-          makeTest(tarfile, tardata, maxMeta, filter, strict))))
-  })
+fs.readdirSync(tardir).forEach(tar => {
+  const tarfile = tardir + '/' + tar
+  const tardata = fs.readFileSync(tarfile)
+  maxMetaOpt.forEach(maxMeta =>
+    filterOpt.forEach(filter =>
+      strictOpt.forEach(strict =>
+        makeTest(tarfile, tardata, maxMeta, filter, strict),
+      ),
+    ),
+  )
+})

src/create.ts

@@ -71,13 +71,12 @@ export function create(
     throw new TypeError('callback only supported with file option')
   }
 
-  return isSyncFile(opt)
-    ? createFileSync(opt, files)
-    : isFile(opt)
-      ? createFile(opt, files, cb)
-      : isSync(opt)
-        ? createSync(opt, files)
-        : create_(opt, files)
+  return (
+    isSyncFile(opt) ? createFileSync(opt, files)
+    : isFile(opt) ? createFile(opt, files, cb)
+    : isSync(opt) ? createSync(opt, files)
+    : create_(opt, files)
+  )
 }
 
 const createFileSync = (opt: TarOptionsSyncFile, files: string[]) => {

src/extract.ts

@@ -77,13 +77,12 @@ export function extract(
     filesFilter(opt, files)
   }
 
-  return isSyncFile(opt)
-    ? extractFileSync(opt)
-    : isFile(opt)
-      ? extractFile(opt, cb)
-      : isSync(opt)
-        ? extractSync(opt)
-        : extract_(opt)
+  return (
+    isSyncFile(opt) ? extractFileSync(opt)
+    : isFile(opt) ? extractFile(opt, cb)
+    : isSync(opt) ? extractSync(opt)
+    : extract_(opt)
+  )
 }
 
 // construct a filter that limits the file entries listed
@@ -109,8 +108,9 @@ const filesFilter = (opt: TarOptions, files: string[]) => {
     return ret
   }
 
-  opt.filter = filter
-    ? (file, entry) =>
+  opt.filter =
+    filter ?
+      (file, entry) =>
         filter(file, entry) && mapHas(stripTrailingSlashes(file))
     : file => mapHas(stripTrailingSlashes(file))
 }
@@ -130,10 +130,7 @@ const extractFileSync = (opt: TarOptionsSyncFile) => {
   stream.pipe(u)
 }
 
-const extractFile = (
-  opt: TarOptionsFile,
-  cb?: () => void,
-) => {
+const extractFile = (opt: TarOptionsFile, cb?: () => void) => {
   const u = new Unpack(opt)
   const readSize = opt.maxReadSize || 16 * 1024 * 1024
 

src/get-write-flag.ts

@@ -22,6 +22,7 @@ const UV_FS_O_FILEMAP =
 const fMapEnabled = isWindows && !!UV_FS_O_FILEMAP
 const fMapLimit = 512 * 1024
 const fMapFlag = UV_FS_O_FILEMAP | O_TRUNC | O_CREAT | O_WRONLY
-export const getWriteFlag = !fMapEnabled
-  ? () => 'w'
+export const getWriteFlag =
+  !fMapEnabled ?
+    () => 'w'
   : (size: number) => (size < fMapLimit ? fMapFlag : 'w')