@xylabs/ts-scripts-yarn3 3.13.0 → 3.13.1

package/src/actions/compile.ts

@@ -22,12 +22,10 @@ export const compile = ({ verbose, target, pkg, incremental, publint }: CompileP
   return pkg ? compilePackage({ pkg, publint, target, verbose }) : compileAll({ incremental, publint, target, verbose })
 }
 
-export const compilePackage = ({ target, pkg, publint = true }: CompilePackageParams) => {
+export const compilePackage = ({ target, pkg }: CompilePackageParams) => {
   const targetOptions = target ? ['-t', target] : []
 
-  return publint ?
-      runSteps(`Compile [${pkg}]`, [['yarn', ['workspace', pkg, 'run', 'package-compile', ...targetOptions]]])
-    : runSteps(`Compile [${pkg}]`, [['yarn', ['workspace', pkg, 'run', 'package-compile', ...targetOptions]]])
+  return runSteps(`Compile [${pkg}]`, [['yarn', ['workspace', pkg, 'run', 'package-compile', ...targetOptions]]])
 }
 
 export const compileAll = ({ jobs, verbose, target, incremental }: CompileParams) => {

package/src/actions/lint.ts

@@ -45,9 +45,7 @@ export const lintPackage = async ({ pkg }: LintParams) => {
 
   dumpMessages(lintResults)
 
-  const errorCount = lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0)
-
-  return errorCount
+  return lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0)
 }
 
 export const lintAll = async () => {
@@ -57,9 +55,7 @@ export const lintAll = async () => {
 
   dumpMessages(lintResults)
 
-  const errorCount = lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0)
-
-  return errorCount
+  return lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0)
 }
 
 export const lint = async ({ pkg }: LintParams = {}) => {

package/src/bin/package/clean-outputs.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { packageCleanOutputs } from '../../actions'
-
 import { forget } from '@xylabs/forget'
 
+import { packageCleanOutputs } from '../../actions'
+
 forget(packageCleanOutputs())

package/src/bin/package/clean-typescript.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { packageCleanTypescript } from '../../actions'
-
 import { forget } from '@xylabs/forget'
 
+import { packageCleanTypescript } from '../../actions'
+
 forget(packageCleanTypescript())

package/src/bin/package/clean.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { packageClean } from '../../actions'
-
 import { forget } from '@xylabs/forget'
 
+import { packageClean } from '../../actions'
+
 forget(packageClean())

package/src/bin/package/compile-only.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packageCompile } from '../../actions'
 
 packageCompile({ verbose: true, publint: false })

package/src/bin/package/compile-tsup.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packageCompileTsup } from '../../actions'
 
 packageCompileTsup({ verbose: true })

package/src/bin/package/compile.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packageCompile } from '../../actions'
 
 packageCompile({ verbose: false })

package/src/bin/package/copy-assets-cjs.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packageCopyAssets } from '../../actions'
 
 packageCopyAssets({ target: 'cjs' })

package/src/bin/package/copy-assets-esm.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packageCopyAssets } from '../../actions'
 
 packageCopyAssets({ target: 'esm' })

package/src/bin/package/deps.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packageDeps } from '../../actions'
 
 packageDeps()

package/src/bin/package/gen-docs.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { packageGenDocs } from '../../actions'
-
 import { forget } from '@xylabs/forget'
 
+import { packageGenDocs } from '../../actions'
+
 forget(packageGenDocs())

package/src/bin/package/publint.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packagePublint } from '../../actions'
 
 packagePublint()

package/src/bin/package/recompile.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
+
 import { packageRecompile } from '../../actions'
 
 packageRecompile()

package/src/lib/dependencies/DuplicateDetector.ts

@@ -1,7 +1,6 @@
 import { EOL } from 'node:os'
 
 import chalk from 'chalk'
-
 import uniq from 'lodash/uniq'
 
 import { multiLineToJSONArray } from '../jsonFormatters'
@@ -65,7 +64,8 @@ export class DuplicateDetector {
     const result = this.dependencyEntries.reduce(this.detectReducer, this.resultsFactory(this.dependency))
     if (result.duplicateVersions.length > 0) {
       console.log(chalk.yellow(`${EOL}Duplicates found for: ${this.dependency}`))
-      console.log(chalk.grey(`  ${result.duplicateVersions.toString().replaceAll(',', `${EOL}  `)}`, EOL))
+      const duplicateVersions = result.duplicateVersions.toString().replaceAll(',', `${EOL}  `)
+      console.log(chalk.grey(`  ${duplicateVersions}`, EOL))
       return 1
     } else {
       console.log(`${this.dependency} - OK`)

package/src/lib/dependencies/detectDuplicateDependencies.ts

@@ -26,7 +26,6 @@ export const detectDuplicateDependencies = (depsFromPackageJSON?: string[], Defa
         if (output) {
           exitCode = new DuplicateDetector(output, dependency).detect()
           exitCode
-          continue
         } else {
           console.log(`${dependency} - N/A`)
           if (depsFromPackageJSON) {
@@ -34,7 +33,6 @@ export const detectDuplicateDependencies = (depsFromPackageJSON?: string[], Defa
             console.log(`🚨 Library ${dependency} was requested in package.json but not found`)
           }
           exitCode
-          continue
         }
       }
       return exitCode

package/src/lib/loadConfig.ts

@@ -1,6 +1,5 @@
 import chalk from 'chalk'
 import { cosmiconfig } from 'cosmiconfig'
-
 import merge from 'lodash/merge'
 
 let config: Record<string, unknown>

package/src/lib/runXyWithWarning.ts

@@ -1,7 +1,9 @@
 import chalk from 'chalk'
 
 export const runXyWithWarning = (command: string) => {
-  console.warn(chalk.yellow(`WARNING: [${chalk.white(`yarn ${command}`)}] is deprecated for XY Labs Scripts.`))
-  console.warn(chalk.gray(`Did you mean [${chalk.magenta(`yarn xy ${command}`)}]?`))
+  const commandString = `yarn ${command}`
+  const commandXyString = `yarn xy ${command}`
+  console.warn(chalk.yellow(`WARNING: [${chalk.white(commandString)}] is deprecated for XY Labs Scripts.`))
+  console.warn(chalk.gray(`Did you mean [${chalk.magenta(commandXyString)}]?`))
   return 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/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 => {