@xylabs/ts-scripts-yarn3 2.14.6 → 2.14.8

package/src/actions/compile.ts

@@ -1,7 +1,10 @@
-import { runSteps, ScriptStep } from '../lib'
+import chalk from 'chalk'
+
+import { runStepsAsync, ScriptStep } from '../lib'
 
 export interface CompileParams {
   incremental?: boolean
+  jobs?: number
   pkg?: string
   target?: 'esm' | 'cjs'
   verbose?: boolean
@@ -13,33 +16,38 @@ export interface CompilePackageParams {
   verbose?: boolean
 }
 
-export const compile = ({ verbose, target, pkg, incremental }: CompileParams) => {
-  return pkg ? compilePackage({ pkg, target, verbose }) : compileAll({ incremental, target, verbose })
+export const compile = async ({ verbose, target, pkg, incremental }: CompileParams) => {
+  return pkg ? await compilePackage({ pkg, target, verbose }) : await compileAll({ incremental, target, verbose })
 }
 
 export const compilePackage = ({ verbose, target, pkg }: CompilePackageParams) => {
   const verboseOptions = verbose ? ['-v'] : []
-  const cjsSteps: ScriptStep[] = target === 'cjs' ? [['yarn', ['workspace', pkg, 'run', 'package-compile-cjs', ...verboseOptions]]] : []
-
-  const esmSteps: ScriptStep[] = target === 'esm' ? [['yarn', ['workspace', pkg, 'run', 'package-compile-esm', ...verboseOptions]]] : []
+  const cjsSteps: ScriptStep[] = target === 'cjs' || !target ? [['yarn', ['workspace', pkg, 'run', 'package-compile-cjs', ...verboseOptions]]] : []
 
-  const bothSteps: ScriptStep[] = !target ? [['yarn', ['workspace', pkg, 'run', 'package-compile', ...verboseOptions]]] : []
+  const esmSteps: ScriptStep[] = target === 'esm' || !target ? [['yarn', ['workspace', pkg, 'run', 'package-compile-esm', ...verboseOptions]]] : []
 
-  return runSteps(`Compile [${pkg}]`, [...esmSteps, ...cjsSteps, ...bothSteps])
+  return runStepsAsync(`Compile [${pkg}]`, [...esmSteps, ...cjsSteps])
 }
 
-export const compileAll = ({ verbose, target, incremental }: CompileParams) => {
+export const compileAll = async ({ jobs, verbose, target, incremental }: CompileParams) => {
+  const start = Date.now()
   const verboseOptions = verbose ? ['-v'] : []
   const incrementalOptions = incremental ? ['--since', '-ptA'] : ['-ptA']
+  const jobsOptions = jobs ? ['-j', `${jobs}`] : []
+  if (jobs) {
+    console.log(chalk.blue(`Jobs set to [${jobs}]`))
+  }
   const cjsSteps: ScriptStep[] =
-    target === 'cjs' ? [['yarn', ['workspaces', 'foreach', ...incrementalOptions, 'run', 'package-compile-cjs', ...verboseOptions]]] : []
+    target === 'cjs' || !target
+      ? [['yarn', ['workspaces', 'foreach', ...incrementalOptions, ...jobsOptions, 'run', 'package-compile-cjs', ...verboseOptions]]]
+      : []
 
   const esmSteps: ScriptStep[] =
-    target === 'esm' ? [['yarn', ['workspaces', 'foreach', ...incrementalOptions, 'run', 'package-compile-esm', ...verboseOptions]]] : []
-
-  const bothSteps: ScriptStep[] = !target
-    ? [['yarn', ['workspaces', 'foreach', ...incrementalOptions, 'run', 'package-compile', ...verboseOptions]]]
-    : []
+    target === 'esm' || !target
+      ? [['yarn', ['workspaces', 'foreach', ...incrementalOptions, ...jobsOptions, 'run', 'package-compile-esm', ...verboseOptions]]]
+      : []
 
-  return runSteps(`Compile [All${incremental ? '-Incremental' : ''}]`, [...esmSteps, ...cjsSteps, ...bothSteps])
+  const result = await runStepsAsync(`Compile [All${incremental ? '-Incremental' : ''}]`, [...esmSteps, ...cjsSteps])
+  console.log(`${chalk.gray('Compiled in')} [${chalk.magenta(((Date.now() - start) / 1000).toFixed(2))}] ${chalk.gray('seconds')}`)
+  return result
 }

package/src/actions/deps.ts

@@ -1,7 +1,10 @@
+import chalk from 'chalk'
+
 import { runSteps, ScriptStep } from '../lib'
 
 export interface DepsParams {
   incremental?: boolean
+  jobs?: number
   pkg?: string
 }
 
@@ -19,9 +22,16 @@ export const depsPackage = ({ pkg }: DepsPackageParams) => {
   return runSteps(`Deps [${pkg}]`, [...steps])
 }
 
-export const depsAll = ({ incremental }: DepsParams) => {
+export const depsAll = ({ incremental, jobs }: DepsParams) => {
+  const start = Date.now()
+  const jobsOptions = jobs ? ['-j', `${jobs}`] : []
+  if (jobs) {
+    console.log(chalk.blue(`Jobs set to [${jobs}]`))
+  }
   const incrementalOptions = incremental ? ['--since', '-pA'] : ['-pA']
-  const steps: ScriptStep[] = [['yarn', ['workspaces', 'foreach', ...incrementalOptions, 'run', 'package-deps']]]
+  const steps: ScriptStep[] = [['yarn', ['workspaces', 'foreach', ...jobsOptions, ...incrementalOptions, 'run', 'package-deps']]]
 
-  return runSteps(`Deps [All${incremental ? '-Incremental' : ''}]`, [...steps])
+  const result = runSteps(`Deps [All${incremental ? '-Incremental' : ''}]`, [...steps])
+  console.log(`${chalk.gray('Dep checked in')} [${chalk.magenta(((Date.now() - start) / 1000).toFixed(2))}] ${chalk.gray('seconds')}`)
+  return result
 }

package/src/actions/package/compile-cjs.ts

@@ -1,11 +1,15 @@
-import { runSteps } from '../../lib'
+import { runStepsAsync } from '../../lib'
+import { packageCopyAssets } from './copy-assets'
+import { packageTsconfigGenCjs } from './tsconfig-gen-cjs'
 
-export const packageCompileCjs = () => {
+export const packageCompileCjs = async () => {
   const pkg = process.env.INIT_CWD
 
-  return runSteps('Package Compile [CJS]', [
-    ['yarn', ['package-tsconfig-gen-cjs']],
-    ['tsc', ['--build', `${pkg}/.tsconfig.build.cjs.json`]],
-    ['yarn', ['package-copy-assets-cjs']],
-  ])
+  packageTsconfigGenCjs()
+  return (
+    await Promise.all([
+      packageCopyAssets({ target: 'cjs' }),
+      runStepsAsync('Package Compile [CJS]', [['tsc', ['--build', `${pkg}/.tsconfig.build.cjs.json`]]]),
+    ])
+  ).reduce((prev, value) => prev + value)
 }

package/src/actions/package/compile-esm.ts

@@ -1,11 +1,15 @@
-import { runSteps } from '../../lib'
+import { runStepsAsync } from '../../lib'
+import { packageCopyAssets } from './copy-assets'
+import { packageTsconfigGenEsm } from './tsconfig-gen-esm'
 
-export const packageCompileEsm = () => {
+export const packageCompileEsm = async () => {
   const pkg = process.env.INIT_CWD
 
-  return runSteps('Package Compile [ESM]', [
-    ['yarn', ['package-tsconfig-gen-esm']],
-    ['tsc', ['--build', `${pkg}/.tsconfig.build.esm.json`]],
-    ['yarn', ['package-copy-assets-esm']],
-  ])
+  packageTsconfigGenEsm()
+  return (
+    await Promise.all([
+      packageCopyAssets({ target: 'esm' }),
+      runStepsAsync('Package Compile [ESM]', [['tsc', ['--build', `${pkg}/.tsconfig.build.esm.json`]]]),
+    ])
+  ).reduce((prev, value) => prev + value)
 }

package/src/actions/package/compile.ts

@@ -1,15 +1,6 @@
-import { runSteps, runStepsAsync } from '../../lib'
+import { packageCompileCjs } from './compile-cjs'
+import { packageCompileEsm } from './compile-esm'
 
-export const packageCompile = () => {
-  return runSteps('Package Compile', [
-    ['yarn', ['package-compile-cjs']],
-    ['yarn', ['package-compile-esm']],
-  ])
-}
-
-export const packageCompileAsync = () => {
-  return runStepsAsync('Package Compile', [
-    ['yarn', ['package-compile-cjs']],
-    ['yarn', ['package-compile-esm']],
-  ])
+export const packageCompile = async () => {
+  return (await Promise.all([packageCompileEsm(), packageCompileCjs()])).reduce((prev, value) => prev + value)
 }

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

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk'
 import { packageCompileCjs } from '../../actions'
 
-packageCompileCjs()
+packageCompileCjs().then((value) => process.exitCode = value).catch((reason) => {
+  console.error(chalk.red(reason))
+  process.exitCode = 1
+})

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

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk'
 import { packageCompileEsm } from '../../actions'
 
-packageCompileEsm()
+packageCompileEsm().then((value) => process.exitCode = value).catch((reason) => {
+  console.error(chalk.red(reason))
+  process.exitCode = 1
+})

package/src/bin/package/compile.ts

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk'
 import { packageCompile } from '../../actions'
 
-packageCompile()
+packageCompile().then((value) => process.exitCode = value).catch((reason) => {
+  console.error(chalk.red(reason))
+  process.exitCode = 1
+})

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

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk'
 import { packageCopyAssets } from '../../actions'
 
-packageCopyAssets({target: 'cjs'})
+packageCopyAssets({target: 'cjs'}).then((value) => process.exitCode = value).catch((reason) => {
+  console.error(chalk.red(reason))
+  process.exitCode = 1
+})

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

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk'
 import { packageCopyAssets } from '../../actions'
 
-packageCopyAssets({target: 'esm'})
+packageCopyAssets({target: 'esm'}).then((value) => process.exitCode = value).catch((reason) => {
+  console.error(chalk.red(reason))
+  process.exitCode = 1
+})

package/src/bin/package/deps.ts

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+import chalk from 'chalk'
 import { packageDeps } from '../../actions'
 
-packageDeps()
+packageDeps().then((value) => process.exitCode = value).catch((reason) => {
+  console.error(chalk.red(reason))
+  process.exitCode = 1
+})

package/src/lib/xy/xyBuildCommands.ts

@@ -17,7 +17,12 @@ export const xyBuildCommands = (args: yargs.Argv) => {
           console.log(`Building: ${argv.package ?? 'all'}`)
         }
 
-        process.exitCode = build({ pkg: argv.package as string, target: argv.target as 'esm' | 'cjs', verbose: !!argv.verbose })
+        process.exitCode = build({
+          jobs: argv.jobs as number,
+          pkg: argv.package as string,
+          target: argv.target as 'esm' | 'cjs',
+          verbose: !!argv.verbose,
+        })
       },
     )
     .command(
@@ -28,12 +33,13 @@ export const xyBuildCommands = (args: yargs.Argv) => {
           describe: 'Specific package to compile',
         })
       },
-      (argv) => {
+      async (argv) => {
         if (argv.verbose) {
           console.log(`Compiling: ${argv.package ?? 'all'}`)
         }
-        process.exitCode = compile({
+        process.exitCode = await compile({
           incremental: !!argv.incremental,
+          jobs: argv.jobs as number,
           pkg: argv.package as string,
           target: argv.target as 'esm' | 'cjs',
           verbose: !!argv.verbose,

package/src/lib/xy/xyCommonCommands.ts

@@ -54,7 +54,7 @@ export const xyCommonCommands = (args: yargs.Argv) => {
       },
       (argv) => {
         if (argv.verbose) console.log(`Checking Dependencies: ${argv.package ?? 'all'}`)
-        process.exitCode = deps({ incremental: !!argv.incremental, pkg: argv.package as string })
+        process.exitCode = deps({ incremental: !!argv.incremental, jobs: argv.jobs as number, pkg: argv.package as string })
       },
     )
     .command(

package/src/lib/xy/xyParseOptions.ts

@@ -4,6 +4,12 @@ import { hideBin } from 'yargs/helpers'
 
 export const xyParseOptions = (): yargs.Argv => {
   return yargs(hideBin(process.argv))
+    .option('jobs', {
+      alias: 'j',
+      default: undefined,
+      description: 'Max parallel jobs',
+      type: 'number',
+    })
     .option('verbose', {
       alias: 'v',
       default: false,