@xylabs/ts-scripts-yarn3 2.10.0-rc.8 → 2.10.0

package/src/actions/reinstall.ts

@@ -6,7 +6,7 @@ export const reinstall = () => {
   console.log('Reinstall [Clear Lock File]')
   closeSync(openSync('./yarn.lock', 'w'))
   return runSteps('Reinstall', [
-    ['yarn', 'rimraf ./node_modules'],
+    ['yarn', 'xy rimraf ./node_modules'],
     ['yarn', 'install --network-timeout 10000'],
   ])
 }

package/src/actions/rimraf.ts

@@ -3,57 +3,66 @@
 import path from 'path'
 import rimraf from 'rimraf'
 
-const isRoot = (arg: string) => /^(\/|[a-zA-Z]:\\)$/.test(path.resolve(arg))
-const filterOutRoot = (arg: string) => {
-  const ok = preserveRoot === false || !isRoot(arg)
-  if (!ok) {
-    console.error(`refusing to remove ${arg}`)
-    console.error('Set --no-preserve-root to allow this')
-  }
-  return ok
-}
+export const runRimraf = () => {
+  try {
+    const isRoot = (arg: string) => /^(\/|[a-zA-Z]:\\)$/.test(path.resolve(arg))
+    const filterOutRoot = (arg: string) => {
+      const ok = preserveRoot === false || !isRoot(arg)
+      if (!ok) {
+        console.error(`refusing to remove ${arg}`)
+        console.error('Set --no-preserve-root to allow this')
+      }
+      return ok
+    }
 
-let help = false
-let dashdash = false
-let noglob = false
-let preserveRoot = true
-const args = process.argv
-  .slice(2)
-  .filter((arg) => {
-    if (dashdash) return !!arg
-    else if (arg === '--') dashdash = true
-    else if (arg === '--no-glob' || arg === '-G') noglob = true
-    else if (arg === '--glob' || arg === '-g') noglob = false
-    else if (arg.match(/^(-+|\/)(h(elp)?|\?)$/)) help = true
-    else if (arg === '--preserve-root') preserveRoot = true
-    else if (arg === '--no-preserve-root') preserveRoot = false
-    else return !!arg
-  })
-  .filter((arg) => !preserveRoot || filterOutRoot(arg))
+    let help = false
+    let dashdash = false
+    let noglob = false
+    let preserveRoot = true
+    const args = process.argv
+      .slice(2)
+      .filter((arg) => {
+        if (dashdash) return !!arg
+        else if (arg === '--') dashdash = true
+        else if (arg === '--no-glob' || arg === '-G') noglob = true
+        else if (arg === '--glob' || arg === '-g') noglob = false
+        else if (arg.match(/^(-+|\/)(h(elp)?|\?)$/)) help = true
+        else if (arg === '--preserve-root') preserveRoot = true
+        else if (arg === '--no-preserve-root') preserveRoot = false
+        else return !!arg
+      })
+      .filter((arg) => !preserveRoot || filterOutRoot(arg))
 
-const go = (n: number) => {
-  if (n >= args.length) return
-  const options: rimraf.Options = noglob ? { glob: false } : {}
-  rimraf(args[n], options, (er) => {
-    if (er) throw er
-    go(n + 1)
-  })
-}
+    const go = (n: number) => {
+      if (n >= args.length) return
+      const options: rimraf.Options = noglob ? { glob: false } : {}
+      rimraf(args[n], options, (er) => {
+        if (er) throw er
+        go(n + 1)
+      })
+    }
 
-if (help || args.length === 0) {
-  // If they didn't ask for help, then this is not a "success"
-  const log = help ? console.log : console.error
-  log('Usage: rimraf <path> [<path> ...]')
-  log('')
-  log('  Deletes all files and folders at "path" recursively.')
-  log('')
-  log('Options:')
-  log('')
-  log('  -h, --help          Display this usage info')
-  log('  -G, --no-glob       Do not expand glob patterns in arguments')
-  log('  -g, --glob          Expand glob patterns in arguments (default)')
-  log("  --preserve-root     Do not remove '/' (default)")
-  log("  --no-preserve-root  Do not treat '/' specially")
-  log('  --                  Stop parsing flags')
-  process.exit(help ? 0 : 1)
-} else go(0)
+    if (help || args.length === 0) {
+      // If they didn't ask for help, then this is not a "success"
+      const log = help ? console.log : console.error
+      log('Usage: rimraf <path> [<path> ...]')
+      log('')
+      log('  Deletes all files and folders at "path" recursively.')
+      log('')
+      log('Options:')
+      log('')
+      log('  -h, --help          Display this usage info')
+      log('  -G, --no-glob       Do not expand glob patterns in arguments')
+      log('  -g, --glob          Expand glob patterns in arguments (default)')
+      log("  --preserve-root     Do not remove '/' (default)")
+      log("  --no-preserve-root  Do not treat '/' specially")
+      log('  --                  Stop parsing flags')
+      return help ? 0 : 1
+    } else go(0)
+    return 0
+  } catch (ex) {
+    const error = ex as Error
+    console.error(error.message)
+    return 1
+  }
+}

package/src/lib/xy.ts

@@ -25,6 +25,7 @@ import {
   rebuild,
   reinstall,
   relint,
+  runRimraf,
   sonar,
   test,
   tsconfigGen,
@@ -34,7 +35,6 @@ import {
   updo,
   yarn3Only,
 } from '../actions'
-import { runSteps } from './runSteps'
 
 export const parseOptions = () => {
   return yargs(hideBin(process.argv))
@@ -400,7 +400,7 @@ export const xy = () => {
       },
       (argv) => {
         if (argv.verbose) console.info('Rimraf')
-        process.exitCode = runSteps('Rimraf', [['yarn', ['rimraf', ...process.argv]]])
+        process.exitCode = runRimraf()
       },
     )
     .command(

package/src/bin/rimraf.ts

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import { runXy } from "../lib"
-
-runXy('rimraf')