@xylabs/ts-scripts-yarn3 3.12.4 → 3.13.1

package/src/lib/yarn/workspace/yarnWorkspaces.ts

@@ -7,14 +7,15 @@ export const yarnWorkspaces = (): Workspace[] => {
   if (result.error) {
     throw result.error
   }
-  const list = result.stdout
-    .toString()
-    // NOTE: This probably doesn't work on Windows
-    // TODO: Replace /r/n with /n first
-    .split('\n')
-    .slice(0, -1)
-    .map((item) => {
-      return JSON.parse(item)
-    })
-  return list
+  return (
+    result.stdout
+      .toString()
+      // NOTE: This probably doesn't work on Windows
+      // TODO: Replace /r/n with /n first
+      .split('\n')
+      .slice(0, -1)
+      .map((item) => {
+        return JSON.parse(item)
+      })
+  )
 }

package/src/xy/param.ts

@@ -0,0 +1,7 @@
+import { Argv } from 'yargs'
+
+export const packagePositionalParam = (yargs: Argv<unknown>) => {
+  return yargs.positional('package', {
+    describe: 'Specific package to target',
+  })
+}

package/src/xy/xy.ts

@@ -7,9 +7,9 @@ import { xyInstallCommands } from './xyInstallCommands'
 import { xyLintCommands } from './xyLintCommands'
 import { xyParseOptions } from './xyParseOptions'
 
-export const xy = () => {
+export const xy = async () => {
   const options = xyParseOptions()
-  return xyBuildCommands(xyCommonCommands(xyInstallCommands(xyDeployCommands(xyLintCommands(options)))))
+  return await xyBuildCommands(xyCommonCommands(xyInstallCommands(xyDeployCommands(xyLintCommands(options)))))
     .demandCommand(1)
     .command('*', '', () => {
       console.error(chalk.yellow(`Command not found [${chalk.magenta(process.argv[2])}]`))

package/src/xy/xyCommonCommands.ts

@@ -16,6 +16,7 @@ import {
   updateYarnVersion,
   yarn3Only,
 } from '../actions'
+import { packagePositionalParam } from './param'
 
 export const xyCommonCommands = (args: Argv) => {
   return args
@@ -24,9 +25,7 @@ export const xyCommonCommands = (args: Argv) => {
       'license [package]',
       'License - Check licenses of dependencies',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to check',
-        })
+        return packagePositionalParam(yargs)
       },
       async (argv) => {
         if (argv.verbose) console.log(`License: ${argv.package ?? 'all'}`)
@@ -37,9 +36,7 @@ export const xyCommonCommands = (args: Argv) => {
       'dead [package]',
       'Dead - Check for dead code',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to check',
-        })
+        return packagePositionalParam(yargs)
       },
       (argv) => {
         if (argv.verbose) console.log('Dead')
@@ -50,9 +47,7 @@ export const xyCommonCommands = (args: Argv) => {
       'deps [package]',
       'Deps - Check for unused or missing dependencies',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to check',
-        })
+        return packagePositionalParam(yargs)
       },
       (argv) => {
         if (argv.verbose) console.log(`Checking Dependencies: ${argv.package ?? 'all'}`)
@@ -63,9 +58,7 @@ export const xyCommonCommands = (args: Argv) => {
       'gen-docs [package]',
       'GenDocs - Generate TypeDocs',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to generate docs for',
-        })
+        return packagePositionalParam(yargs)
       },
       (argv) => {
         if (argv.verbose) console.log(`Generating TypeDocs: ${argv.package ?? 'all'}`)

package/src/xy/xyLintCommands.ts

@@ -2,6 +2,7 @@ import chalk from 'chalk'
 import { Argv } from 'yargs'
 
 import { cycle, fix, lint, lintProfile, publint, relint, sonar } from '../actions'
+import { packagePositionalParam } from './param'
 
 export const xyLintCommands = (args: Argv) => {
   return args
@@ -9,9 +10,7 @@ export const xyLintCommands = (args: Argv) => {
       'cycle [package]',
       'Cycle - Check for dependency cycles',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to check',
-        })
+        return packagePositionalParam(yargs)
       },
       (argv) => {
         const start = Date.now()
@@ -24,9 +23,7 @@ export const xyLintCommands = (args: Argv) => {
       'lint [package]',
       'Lint - Run Eslint',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to check',
-        })
+        return packagePositionalParam(yargs)
       },
       async (argv) => {
         if (argv.verbose) console.log('Lint')
@@ -42,9 +39,7 @@ export const xyLintCommands = (args: Argv) => {
       'fix [package]',
       'Fix - Run Eslint w/fix',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to check',
-        })
+        return packagePositionalParam(yargs)
       },
       (argv) => {
         const start = Date.now()
@@ -57,9 +52,7 @@ export const xyLintCommands = (args: Argv) => {
       'relint [package]',
       'Relint - Clean & Lint',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to relint',
-        })
+        return packagePositionalParam(yargs)
       },
       (argv) => {
         if (argv.verbose) console.log('Relinting')
@@ -72,9 +65,7 @@ export const xyLintCommands = (args: Argv) => {
       'publint [package]',
       'Publint - Run Publint',
       (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to publint',
-        })
+        return packagePositionalParam(yargs)
       },
       async (argv) => {
         if (argv.verbose) console.log('Publint')
@@ -87,7 +78,7 @@ export const xyLintCommands = (args: Argv) => {
       'sonar',
       'Sonar - Run Sonar Check',
       (yargs) => {
-        return yargs
+        return packagePositionalParam(yargs)
       },
       (argv) => {
         const start = Date.now()

package/src/xy/xyParseOptions.ts

@@ -1,5 +1,4 @@
 import yargs, { Argv } from 'yargs'
-
 import { hideBin } from 'yargs/helpers'
 
 export const xyParseOptions = (): Argv => {