@xylabs/ts-scripts-yarn3 3.15.4 → 3.15.5

package/src/actions/lint.ts

@@ -33,7 +33,7 @@ const dumpMessages = (lintResults: ESLint.LintResult[]) => {
 }
 
 export const lintPackage = async ({ pkg }: LintParams) => {
-  const workspace = yarnWorkspaces().find((workspace) => workspace.name === pkg)
+  const workspace = yarnWorkspaces().find(workspace => workspace.name === pkg)
   if (!workspace) {
     console.error(chalk.red(`Unable to locate package [${chalk.magenta(pkg)}]`))
     process.exit(1)

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

@@ -9,7 +9,7 @@ export const packageCleanOutputs = async () => {
   const folders: string[] = [path.join(pkg, 'dist'), path.join(pkg, 'build'), path.join(pkg, 'docs')]
   console.log(chalk.green(`Cleaning Outputs [${pkgName}]`))
 
-  await Promise.all(folders.map((folder) => rimraf(folder)))
+  await Promise.all(folders.map(folder => rimraf(folder)))
 
   return 0
 }

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

@@ -9,7 +9,7 @@ export const packageCleanTypescript = async () => {
   console.log(chalk.green(`Cleaning Typescript [${pkgName}]`))
   const files: string[] = [path.join(pkg, '*.tsbuildinfo'), path.join(pkg, '.tsconfig.*'), path.join(pkg, '.eslintcache')]
 
-  await Promise.all(files.map((file) => rimraf(file)))
+  await Promise.all(files.map(file => rimraf(file)))
 
   return 0
 }

package/src/actions/package/compile/XyConfig.ts

@@ -21,11 +21,13 @@ export interface PathConfig {
 /**
  * Configuration for Dynamic Share.
  */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface DynamicShareConfig extends PathConfig {}
 
 /**
  * Configuration for Live Share.
  */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface LiveShareConfig extends PathConfig {}
 
 export interface CompileConfig {

package/src/actions/package/compile/buildEntries.ts

@@ -9,7 +9,7 @@ export const buildEntries = (folder: string, entryMode?: EntryMode, verbose = fa
     }
     case 'all': {
       if (verbose) console.log('buildEntries [all]')
-      return getAllInputs2(folder).filter((entry) => !entry.includes('.spec.') && !entry.includes('.story.'))
+      return getAllInputs2(folder).filter(entry => !entry.includes('.spec.') && !entry.includes('.story.'))
     }
     default: {
       if (verbose) console.log('buildEntries [single]')

package/src/actions/package/compile/copyTypeFiles.ts

@@ -7,18 +7,18 @@ const copyFileMutex = new Mutex()
 
 const getDistTypeFiles = async (compilerOptions: TsConfigCompilerOptions) => {
   const outDir = compilerOptions.outDir ?? 'dist'
-  return (await readdir(outDir, { recursive: true })).filter((file) => file.endsWith('d.ts')).map((file) => `${outDir}/${file}`)
+  return (await readdir(outDir, { recursive: true })).filter(file => file.endsWith('d.ts')).map(file => `${outDir}/${file}`)
 }
 
 const getDistTypeMapFiles = async (compilerOptions: TsConfigCompilerOptions) => {
   const outDir = compilerOptions.outDir ?? 'dist'
-  return (await readdir(outDir, { recursive: true })).filter((file) => file.endsWith('d.ts.map')).map((file) => `${outDir}/${file}`)
+  return (await readdir(outDir, { recursive: true })).filter(file => file.endsWith('d.ts.map')).map(file => `${outDir}/${file}`)
 }
 
 export const copyTypeFiles = async (compilerOptions: TsConfigCompilerOptions) => {
-  //using a mutex since sometimes two compiles are running at once and cause a lock on windows
+  // using a mutex since sometimes two compiles are running at once and cause a lock on windows
   await copyFileMutex.runExclusive(async () => {
-    //hybrid packages want two copies of the types
+    // hybrid packages want two copies of the types
     const distTypeFiles = await getDistTypeFiles(compilerOptions)
     await Promise.all(
       distTypeFiles.map(async (file) => {

package/src/actions/package/compile/inputs.ts

@@ -5,9 +5,9 @@ import { glob } from 'glob'
 export const getInputs = async (subDir?: string) => {
   return (await readdir(subDir ? `src/${subDir}` : 'src', { recursive: false }))
     .filter(
-      (file) => (file.endsWith('.ts') || file.endsWith('.tsx')) && !file.endsWith('d.ts') && !file.includes('.spec.') && !file.includes('.stories.'),
+      file => (file.endsWith('.ts') || file.endsWith('.tsx')) && !file.endsWith('d.ts') && !file.includes('.spec.') && !file.includes('.stories.'),
     )
-    .map((file) => (subDir ? `${subDir}/${file}` : file))
+    .map(file => (subDir ? `${subDir}/${file}` : file))
 }
 
 export const getInputDirs = async (depth: number = 0) => {
@@ -17,7 +17,7 @@ export const getInputDirs = async (depth: number = 0) => {
   return [
     '.',
     ...(await readdir('src', { recursive: true, withFileTypes: true }))
-      .filter((file) => file.isDirectory())
+      .filter(file => file.isDirectory())
       .map((file) => {
         const pathParts = file.path?.split('/') ?? []
         pathParts.shift()
@@ -33,7 +33,7 @@ export const getInputDirs = async (depth: number = 0) => {
 
 export const getAllInputs = async (depth = 100) => {
   const dirs = await getInputDirs(depth)
-  return (await Promise.all(dirs.map(async (dir) => await getInputs(dir)))).flat()
+  return (await Promise.all(dirs.map(async dir => await getInputs(dir)))).flat()
 }
 
 export const getAllInputs2 = (folder: string) => {

package/src/actions/package/compile/packageCompileTsc.ts

@@ -23,7 +23,7 @@ export const packageCompileTsc = async (noEmit?: boolean, config?: XyTscConfig,
   const verbose = config?.verbose ?? false
 
   const formatHost: FormatDiagnosticsHost = {
-    getCanonicalFileName: (fileName) => fileName,
+    getCanonicalFileName: fileName => fileName,
     getCurrentDirectory: () => pkg,
     getNewLine: () => '\n',
   }

package/src/actions/package/compile/packageCompileTscTypes.ts

@@ -34,7 +34,7 @@ export const packageCompileTscTypes = async (
     ...compilerOptionsParam,
   } as TsConfigCompilerOptions
 
-  //calling all here since the types do not get rolled up
+  // calling all here since the types do not get rolled up
   const files = buildEntries(folder, 'all')
 
   const result = createProgramFromConfig({

package/src/actions/package/compile/packageCompileTsup.ts

@@ -35,7 +35,7 @@ const compileFolder = async (folder: string, entryMode: EntryMode = 'single', op
     )
   ).flat()
 
-  await Promise.all(optionsList.map((options) => build(options)))
+  await Promise.all(optionsList.map(options => build(options)))
   await packageCompileTscTypes(folder, { verbose }, { outDir })
 
   return 0
@@ -55,46 +55,46 @@ export const packageCompileTsup = async (config?: XyTsupConfig) => {
   const compileForNeutral = compile?.neutral ?? { src: {} }
 
   return (
-    (await packageCompileTsc(true, { publint: false, verbose })) ||
-    (
+    (await packageCompileTsc(true, { publint: false, verbose }))
+    || (
       await Promise.all(
         Object.entries(compileForNode).map(async ([folder, options]) => {
           const inEsBuildOptions = typeof compile?.node?.esbuildOptions === 'object' ? compile?.node?.esbuildOptions : {}
-          return folder ?
-              await compileFolder(
-                folder,
-                compile?.entryMode,
-                {
-                  bundle: true,
-                  format: ['cjs', 'esm'],
-                  loader: merge(
-                    {},
-                    { '.gif': 'copy', '.html': 'copy', '.jpg': 'copy', '.json': 'json', '.png': 'copy', '.svg': 'copy', '.webp': 'copy' },
-                    inEsBuildOptions?.loader,
-                  ),
-                  // minify: true,
-                  outDir: 'dist/node',
-                  outExtension: ({ format }) => (format === 'esm' ? { js: '.mjs' } : { js: '.cjs' }),
-                  platform: 'node',
-                  skipNodeModulesBundle: true,
-                  sourcemap: true,
-                  target: 'node16',
-                  // terserOptions: { format: { comments: false } },
-                  ...compile?.tsup?.options,
-                  ...(typeof options === 'object' ? options : {}),
-                },
-                verbose,
-              )
+          return folder
+            ? await compileFolder(
+              folder,
+              compile?.entryMode,
+              {
+                bundle: true,
+                format: ['cjs', 'esm'],
+                loader: merge(
+                  {},
+                  { '.gif': 'copy', '.html': 'copy', '.jpg': 'copy', '.json': 'json', '.png': 'copy', '.svg': 'copy', '.webp': 'copy' },
+                  inEsBuildOptions?.loader,
+                ),
+                // minify: true,
+                outDir: 'dist/node',
+                outExtension: ({ format }) => (format === 'esm' ? { js: '.mjs' } : { js: '.cjs' }),
+                platform: 'node',
+                skipNodeModulesBundle: true,
+                sourcemap: true,
+                target: 'node16',
+                // terserOptions: { format: { comments: false } },
+                ...compile?.tsup?.options,
+                ...(typeof options === 'object' ? options : {}),
+              },
+              verbose,
+            )
             : 0
         }),
       )
-    ).reduce((prev, value) => prev + value, 0) ||
-    (
+    ).reduce((prev, value) => prev + value, 0)
+    || (
       await Promise.all(
         Object.entries(compileForBrowser).map(async ([folder, options]) => {
           const inEsBuildOptions = typeof compile?.browser?.esbuildOptions === 'object' ? compile?.browser?.esbuildOptions : {}
-          return folder ?
-              (
+          return folder
+            ? (
                 await Promise.all([
                   compileFolder(
                     folder,
@@ -149,13 +149,13 @@ export const packageCompileTsup = async (config?: XyTsupConfig) => {
             : 0
         }),
       )
-    ).reduce((prev, value) => prev + value, 0) ||
-    (
+    ).reduce((prev, value) => prev + value, 0)
+    || (
       await Promise.all(
         Object.entries(compileForNeutral).map(async ([folder, options]) => {
           const inEsBuildOptions = typeof compile?.neutral?.esbuildOptions === 'object' ? compile?.neutral?.esbuildOptions : {}
-          return folder ?
-              (
+          return folder
+            ? (
                 await Promise.all([
                   compileFolder(
                     folder,
@@ -210,7 +210,7 @@ export const packageCompileTsup = async (config?: XyTsupConfig) => {
             : 0
         }),
       )
-    ).reduce((prev, value) => prev + value, 0) ||
-    (publint ? await packagePublint() : 0)
+    ).reduce((prev, value) => prev + value, 0)
+    || (publint ? await packagePublint() : 0)
   )
 }

package/src/actions/package/copy-assets.ts

@@ -14,7 +14,7 @@ const copyTargetAssets = async (target: 'esm' | 'cjs', name: string, location: s
       `../dist/${target}`,
       {
         cwd: path.join(location, 'src'),
-        parents: true,
+        flat: false,
       },
     )
     if (values.length > 0) {

package/src/actions/package/deps.ts

@@ -69,8 +69,8 @@ export const packageDeps = async () => {
 
   const packageContent = existsSync(`${pkg}/package.json`) ? JSON.parse(readFileSync(`${pkg}/package.json`, { encoding: 'utf8' })) : undefined
 
-  const rawIgnore =
-    existsSync(`${pkg}/.depcheckrc`) ? readFileSync(`${pkg}/.depcheckrc`, { encoding: 'utf8' }).replace('ignores:', '"ignores":') : undefined
+  const rawIgnore
+    = existsSync(`${pkg}/.depcheckrc`) ? readFileSync(`${pkg}/.depcheckrc`, { encoding: 'utf8' }).replace('ignores:', '"ignores":') : undefined
   let ignoreMatches: string[] = []
   try {
     ignoreMatches = rawIgnore ? (JSON.parse(`{${rawIgnore}}`).ignores as string[]) : []
@@ -86,10 +86,10 @@ export const packageDeps = async () => {
   const declaredDevDeps = Object.keys(packageContent.devDependencies ?? {})
 
   const missingDeps = Object.keys(usedDeps).filter(
-    (key) => !declaredDeps.includes(key) && !declaredPeerDeps.includes(key) && !key.startsWith('@types/'),
+    key => !declaredDeps.includes(key) && !declaredPeerDeps.includes(key) && !key.startsWith('@types/'),
   )
 
-  const missingDevDeps = Object.keys(usedDevDeps).filter((key) => !declaredDevDeps.includes(key) && !declaredDeps.includes(key))
+  const missingDevDeps = Object.keys(usedDevDeps).filter(key => !declaredDevDeps.includes(key) && !declaredDeps.includes(key))
 
   const missingDepsObject: Record<string, string[]> = {}
   for (const key of missingDeps) {
@@ -136,6 +136,6 @@ export const packageDeps = async () => {
 
   checkResult(`Deps [${pkgName}]`, errorCount, 'warn', false)
 
-  //returning 0 here since we never want deps to be fatal
+  // returning 0 here since we never want deps to be fatal
   return 0
 }

package/src/actions/package/publint.ts

@@ -27,7 +27,7 @@ export const packagePublint = async (params?: PackagePublintParams) => {
 
   const validMessage = (_message: Message): boolean => {
     return true
-    /*try {
+    /* try {
       const value = getValueFromPath(pkg, message.path)
       switch (message.code) {
         case 'FILE_INVALID_FORMAT':
@@ -42,10 +42,10 @@ export const packagePublint = async (params?: PackagePublintParams) => {
       console.error(chalk.red(`validMessage Excepted: ${error.message}`))
       console.error(chalk.gray(JSON.stringify(error.stack)))
       return true
-    }*/
+    } */
   }
 
-  //we filter out invalid file formats for the esm folder since it is intentionally done
+  // we filter out invalid file formats for the esm folder since it is intentionally done
   const validMessages = messages.filter(validMessage)
   for (const message of validMessages) {
     switch (message.type) {
@@ -68,5 +68,5 @@ export const packagePublint = async (params?: PackagePublintParams) => {
     console.log(chalk.gray(`Publint [Finish]: ${pkgDir} [${validMessages.length}]`))
   }
 
-  return validMessages.filter((message) => message.type === 'error').length
+  return validMessages.filter(message => message.type === 'error').length
 }

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

@@ -5,7 +5,7 @@ import chalk from 'chalk'
 import { packageCompile } from '../../actions/index.ts'
 
 packageCompile({ verbose: true, publint: false })
-  .then((value) => (process.exitCode = value))
+  .then(value => (process.exitCode = value))
   .catch((reason) => {
     console.error(chalk.red(reason))
     process.exitCode = 1

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

@@ -5,7 +5,7 @@ import chalk from 'chalk'
 import { packageCompileTsup } from '../../actions/index.ts'
 
 packageCompileTsup({ verbose: true })
-  .then((value) => (process.exitCode = value))
+  .then(value => (process.exitCode = value))
   .catch((reason) => {
     console.error(chalk.red(reason))
     process.exitCode = 1

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

@@ -5,7 +5,7 @@ import chalk from 'chalk'
 import { packageCopyAssets } from '../../actions/index.ts'
 
 packageCopyAssets({ target: 'cjs' })
-  .then((value) => (process.exitCode = value))
+  .then(value => (process.exitCode = value))
   .catch((reason) => {
     console.error(chalk.red(reason))
     process.exitCode = 1

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

@@ -5,7 +5,7 @@ import chalk from 'chalk'
 import { packageCopyAssets } from '../../actions/index.ts'
 
 packageCopyAssets({ target: 'esm' })
-  .then((value) => (process.exitCode = value))
+  .then(value => (process.exitCode = value))
   .catch((reason) => {
     console.error(chalk.red(reason))
     process.exitCode = 1

package/src/bin/package/deps.ts

@@ -5,7 +5,7 @@ import chalk from 'chalk'
 import { packageDeps } from '../../actions/index.ts'
 
 packageDeps()
-  .then((value) => (process.exitCode = value))
+  .then(value => (process.exitCode = value))
   .catch((ex: Error) => {
     console.error(`Deps Failed: ${chalk.red(ex)}`)
     process.exitCode = 0

package/src/bin/package/publint.ts

@@ -5,7 +5,7 @@ import chalk from 'chalk'
 import { packagePublint } from '../../actions/index.ts'
 
 packagePublint()
-  .then((value) => (process.exitCode = value))
+  .then(value => (process.exitCode = value))
   .catch((ex: Error) => {
     console.error(`Publint Failed: ${chalk.red(ex)}`)
     console.error(chalk.gray(ex.stack))

package/src/bin/package/recompile.ts

@@ -5,7 +5,7 @@ import chalk from 'chalk'
 import { packageRecompile } from '../../actions/index.ts'
 
 packageRecompile()
-  .then((value) => (process.exitCode = value))
+  .then(value => (process.exitCode = value))
   .catch((reason) => {
     console.error(chalk.red(reason))
     process.exitCode = 1

package/src/lib/dependencies/detectDuplicateDependencies.ts

@@ -19,20 +19,17 @@ export const detectDuplicateDependencies = (depsFromPackageJSON?: string[], Defa
         } catch (e) {
           console.error(`Error running yarn why: ${e}`)
           exitCode = 1
-          exitCode
           continue
         }
 
         if (output) {
           exitCode = new DuplicateDetector(output, dependency).detect()
-          exitCode
         } else {
           console.log(`${dependency} - N/A`)
           if (depsFromPackageJSON) {
             exitCode = 1
             console.log(`🚨 Library ${dependency} was requested in package.json but not found`)
           }
-          exitCode
         }
       }
       return exitCode

package/src/lib/generateIgnoreFiles.ts

@@ -22,6 +22,6 @@ export const generateIgnoreFiles = (filename: string, pkg?: string) => {
       return 1
     }
   })
-  const succeeded = results.every((result) => result === 0)
+  const succeeded = results.every(result => result === 0)
   return succeeded ? 0 : 1
 }

package/src/lib/processEx.ts

@@ -5,23 +5,23 @@ import { withError } from './withError.ts'
 
 export const processEx = (ex: unknown) => {
   const error = typeof ex === 'string' ? new Error(ex) : ex
-  const exitCode =
-    withErrnoException(error, (error) => {
+  const exitCode
+    = withErrnoException(error, (error) => {
       if (error.code === 'ENOENT') {
         console.error(chalk.red(`'${error.path}' not found.`))
       } else {
         console.error(chalk.red(`Errno: ${error.code}`))
       }
       return error.errno ?? -1
-    }) ??
-    withError(error, (error) => {
+    })
+    ?? withError(error, (error) => {
       console.error(chalk.red(`${error.name}: ${error.message}`))
       return -1
-    }) ??
-    (() => {
+    })
+    ?? (() => {
       console.error(chalk.red(`Unexpected Error: ${JSON.stringify(ex, null, 2)}`))
       return -1
     })()
-  //This allows us to use a previously set exit code
+  // This allows us to use a previously set exit code
   process.exit(process.exitCode ?? exitCode)
 }

package/src/lib/runSteps.ts

@@ -7,8 +7,8 @@ import { checkResult } from './checkResult.ts'
 import { safeExit } from './safeExit.ts'
 
 export type ScriptStep =
-  | [/*command*/ 'yarn' | 'node' | 'ts-node-script' | 'tsc' | 'jest', /*arg*/ string | string[]]
-  | [/*command*/ string, /*arg*/ string | string[], /*config*/ SpawnSyncOptionsWithBufferEncoding]
+  | [/* command */ 'yarn' | 'node' | 'ts-node-script' | 'tsc' | 'jest', /* arg */ string | string[]]
+  | [/* command */ string, /* arg */ string | string[], /* config */ SpawnSyncOptionsWithBufferEncoding]
 
 export const runSteps = (name: string, steps: ScriptStep[], exitOnFail = true, messages?: string[]): number => {
   return safeExit(() => {
@@ -23,8 +23,8 @@ export const runSteps = (name: string, steps: ScriptStep[], exitOnFail = true, m
       if (command === 'node' && !existsSync(argList[0])) {
         throw new Error(`File not found [${argList[0]}]`)
       }
-      const status =
-        spawnSync(command, Array.isArray(args) ? args : args.split(' '), {
+      const status
+        = spawnSync(command, Array.isArray(args) ? args : args.split(' '), {
           ...config,
           encoding: 'utf8',
           env: { FORCE_COLOR: '3', ...process.env },

package/src/lib/yarn/isYarnVersionOrGreater.ts

@@ -3,7 +3,7 @@ import { spawnSync } from 'node:child_process'
 export const isYarnVersionOrGreater = (major: number, minor?: number, patch?: number): [boolean, string] => {
   const result = spawnSync('yarn', ['-v'], { encoding: 'utf8', shell: true })
   const version = result.stdout.toString().replaceAll('\n', '')
-  const versionNumbers = version.split('.').map((ver) => Number.parseInt(ver))
+  const versionNumbers = version.split('.').map(ver => Number.parseInt(ver))
   const majorDelta = versionNumbers[0] - major
   const minorDelta = versionNumbers[1] - (minor ?? versionNumbers[1])
   const patchDelta = versionNumbers[2] - (patch ?? versionNumbers[2])

package/src/xy/xy.ts

@@ -13,7 +13,7 @@ export const xy = async () => {
     .demandCommand(1)
     .command('*', '', () => {
       console.error(chalk.yellow(`Command not found [${chalk.magenta(process.argv[2])}]`))
-      console.log(chalk.gray("Try 'yarn xy --help' for list of commands"))
+      console.log(chalk.gray('Try \'yarn xy --help\' for list of commands'))
     })
     .version()
     .help().argv

package/src/xy/xyCommonCommands.ts

@@ -68,7 +68,7 @@ export const xyCommonCommands = (args: Argv) => {
     .command(
       'clean-docs',
       'CleanDocs - Clean TypeDocs',
-      (yargs) => yargs,
+      yargs => yargs,
       (argv) => {
         if (argv.verbose) console.log('Cleaning TypeDocs: all')
         process.exitCode = cleanDocs()

package/src/xy/xyLintCommands.ts

@@ -28,10 +28,12 @@ export const xyLintCommands = (args: Argv) => {
       async (argv) => {
         if (argv.verbose) console.log('Lint')
         const start = Date.now()
-        process.exitCode =
-          argv.fix ? fix()
-          : argv.profile ? lintProfile()
-          : await lint({ pkg: argv.package as string })
+        process.exitCode
+          = argv.fix
+            ? fix()
+            : argv.profile
+              ? lintProfile()
+              : await lint({ pkg: argv.package as string })
         console.log(chalk.blue(`Finished in ${Date.now() - start}ms`))
       },
     )