@xylabs/ts-scripts-yarn3 2.7.0-rc.7 → 2.7.0

package/src/actions/rebuild.ts

@@ -1,8 +1,14 @@
 import { runSteps } from '../lib'
 
-export const rebuild = () => {
-  runSteps('Rebuild', [
+export interface RebuildParams {
+  target?: 'esm' | 'cjs'
+  pkg?: string
+}
+
+export const rebuild = ({ target }: RebuildParams) => {
+  return runSteps('Rebuild', [
     ['yarn', 'clean'],
-    ['yarn', 'build'],
+    ['yarn', target ? `xy compile -t ${target}` : 'xy compile'],
+    ['yarn', 'lint'],
   ])
 }

package/src/actions/reinstall.ts

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

package/src/actions/relint.ts

@@ -1,5 +1,5 @@
 import { runSteps } from '../lib'
 
 export const relint = () => {
-  runSteps('Relint [Caching]', [['node', ['./node_modules/eslint/bin/eslint.js', '.']]])
+  return runSteps('Relint [Caching]', [['node', ['./node_modules/eslint/bin/eslint.js', '.']]])
 }

package/src/actions/sonar.ts

@@ -1,5 +1,5 @@
 import { runSteps } from '../lib'
 
 export const sonar = () => {
-  runSteps('Sonar', [['node', ['./node_modules/eslint/bin/eslint.js', '-c', 'sonar.eslintrc', '.']]])
+  return runSteps('Sonar', [['node', ['./node_modules/eslint/bin/eslint.js', '-c', 'sonar.eslintrc', '.']]])
 }

package/src/actions/test.ts

@@ -1,5 +1,5 @@
 import { runSteps } from '../lib'
 
 export const test = () => {
-  runSteps('Test', [['node', ['./node_modules/jest/bin/jest.js', '.']]])
+  return runSteps('Test', [['node', ['./node_modules/jest/bin/jest.js', '.']]])
 }

package/src/actions/tsconfig-gen-cjs.ts

@@ -26,4 +26,5 @@ export const tsconfigGenCjs = () => {
   workspaces.forEach(({ location }) => {
     writeFileSync(`${location}/.tsconfig.build.cjs.json`, config)
   })
+  return 0
 }

package/src/actions/tsconfig-gen-clean.ts

@@ -1,5 +1,5 @@
 import { runSteps } from '../lib'
 
 export const tsconfigGenClean = () => {
-  runSteps('Clean Configs', [['node', ['./node_modules/rimraf/bin.js', '-q', '**/.tsconfig*']]])
+  return runSteps('Clean Configs', [['node', ['./node_modules/rimraf/bin.js', '-q', '**/.tsconfig*']]])
 }

package/src/actions/tsconfig-gen-esm.ts

@@ -26,4 +26,5 @@ export const tsconfigGenEsm = () => {
   workspaces.forEach(({ location }) => {
     writeFileSync(`${location}/.tsconfig.build.esm.json`, config)
   })
+  return 0
 }

package/src/actions/tsconfig-gen-test.ts

@@ -20,4 +20,5 @@ export const tsconfigGenTest = () => {
   workspaces.forEach(({ location }) => {
     writeFileSync(`${location}/.tsconfig.build.test.json`, config)
   })
+  return 0
 }

package/src/actions/tsconfig-gen.ts

@@ -1,9 +1,19 @@
-import { runSteps } from '../lib'
+import { tsconfigGenCjs } from './tsconfig-gen-cjs'
+import { tsconfigGenEsm } from './tsconfig-gen-esm'
+import { tsconfigGenTest } from './tsconfig-gen-test'
 
-export const tsconfigGen = () => {
-  runSteps('Generate Configs', [
-    ['yarn', 'tsconfig-gen:esm'],
-    ['yarn', 'tsconfig-gen:cjs'],
-    ['yarn', 'tsconfig-gen:test'],
-  ])
+export interface TsconfigGenParams {
+  target?: 'esm' | 'cjs'
+  pkg?: string
+}
+
+export const tsconfigGen = ({ target }: TsconfigGenParams) => {
+  switch (target) {
+    case 'esm':
+      return tsconfigGenEsm() || tsconfigGenTest()
+    case 'cjs':
+      return tsconfigGenCjs() || tsconfigGenTest()
+    default:
+      return tsconfigGenEsm() || tsconfigGenCjs() || tsconfigGenTest()
+  }
 }

package/src/actions/up.ts

@@ -1,5 +1,5 @@
 import { runSteps } from '../lib'
 
 export const up = () => {
-  runSteps('Up', [['yarn', 'outdated']])
+  return runSteps('Up', [['yarn', 'outdated']])
 }

package/src/actions/updo.ts

@@ -1,7 +1,7 @@
 import { runSteps } from '../lib'
 
 export const updo = () => {
-  runSteps('Updo', [
+  return runSteps('Updo', [
     ['yarn', 'install'],
     ['yarn', 'upgrade-interactive'],
     ['yarn', 'dedupe'],

package/src/actions/yarn3only.ts

@@ -5,4 +5,5 @@ export const yarn3Only = () => {
   if (!valid) {
     processEx(`Invalid Yarn version [${version}]`)
   }
+  return 0
 }

package/src/bin/build.ts

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

package/src/bin/clean.ts

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

package/src/bin/compile.ts

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

package/src/bin/cycle.ts

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

package/src/bin/dead.ts

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

package/src/bin/deploy-major.ts

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

package/src/bin/deploy-minor.ts

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

package/src/bin/deploy-next.ts

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

package/src/bin/deploy.ts

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

package/src/bin/deps.ts

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

package/src/bin/fix.ts

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

package/src/bin/gen-docs.ts

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

package/src/bin/gitlint-fix.ts

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

package/src/bin/gitlint.ts

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

package/src/bin/license.ts

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

package/src/bin/lint-clean.ts

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

package/src/bin/lint-fast.ts

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

package/src/bin/lint-profile.ts

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

package/src/bin/lint.ts

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

package/src/bin/rebuild.ts

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

package/src/bin/reinstall.ts

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

package/src/bin/relint.ts

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

package/src/bin/sonar.ts

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

package/src/bin/test.ts

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

package/src/bin/tsconfig-gen-clean.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
-import { tsconfigGenClean } from '../actions'
+import { runXy } from "../lib"
 
-tsconfigGenClean()
+runXy('tsconfig-gen-clean')

package/src/bin/tsconfig-gen.ts

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

package/src/bin/up.ts

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

package/src/bin/updo.ts

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

package/src/bin/xy.ts

@@ -1,81 +1,5 @@
-import yargs from 'yargs'
-// eslint-disable-next-line import/no-internal-modules
-import { hideBin } from 'yargs/helpers'
+#!/usr/bin/env node
 
-import { build, compile, clean, copyAssets } from '../actions'
+import { xy } from '../lib'
 
-const parseOptions = async (y: typeof yargs) => {
-  return await y.option('verbose', {
-    alias: 'v',
-    description: 'Run with verbose logging',
-    type: 'boolean',
-  })
-  .option('target', {
-    alias: 't',
-    description: 'Limit output to specific target',
-    type: 'string',
-    choices: ['esm', 'cjs']
-  })
-  .parse()
-}
-
-const run = async () => {
-  const y = yargs(hideBin(process.argv))
-  const options = await parseOptions(y)
-
-  y.command(
-      'build [package]',
-      'Build - Compile & Lint',
-      (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to build'
-        })
-      },
-      (argv) => {
-        if (argv.verbose) console.info(`Building: ${(argv.package ?? 'all')}`)
-        build({target: options.target as ('esm' | 'cjs')})
-      },
-    )
-    .command(
-      'compile [package]',
-      'Compile with Typescript & Copy Images',
-      (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to compile'
-        })
-      },
-      (argv) => {
-        if (argv.verbose) console.info(`Compiling: ${(argv.package ?? 'all')}`)
-        compile({target: options.target as ('esm' | 'cjs')})
-      },
-    )
-    .command(
-      'clean [package]',
-      'Clean - Remove intermediate files',
-      (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to clean'
-        })
-      },
-      (argv) => {
-        if (argv.verbose) console.info(`Cleaning: ${(argv.package ?? 'all')}`)
-        clean()
-      },
-    )
-    .command(
-      'copy-assets [package]',
-      'Copy Assets - Copy the assets from src to dist',
-      (yargs) => {
-        return yargs.positional('package', {
-          describe: 'Specific package to copy assets'
-        })
-      },
-      (argv) => {
-        if (argv.verbose) console.info(`Copying Assets: ${(argv.package ?? 'all')}`)
-        copyAssets({target: options.target as ('esm' | 'cjs')})
-      },
-    )
-    .parse()
-  }
-
-run()
+xy()

package/src/bin/yarn3only.ts

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

package/src/lib/index.ts

@@ -1,8 +1,11 @@
 export * from './isYarnVersionOrGreater'
 export * from './processEx'
 export * from './runSteps'
+export * from './runStepsAsync'
+export * from './runXy'
 export * from './safeExit'
 export * from './withErrnoException'
 export * from './withError'
+export * from './xy'
 export * from './yarnInitCwd'
 export * from './yarnWorkspaces'

package/src/lib/runSteps.ts

@@ -31,5 +31,6 @@ export const runSteps = (name: string, steps: ScriptStep[], exitOnFail = true, m
         return status
       }
     }
+    return 0
   })
 }

package/src/lib/runStepsAsync.ts

@@ -0,0 +1,46 @@
+import chalk from 'chalk'
+import { spawn } from 'child_process'
+import { existsSync } from 'fs'
+
+import { ScriptStep } from './runSteps'
+
+export const runStepAsync = (step: ScriptStep, exitOnFail = true, message?: string) => {
+  return new Promise((resolve, reject) => {
+    const [command, args, config] = step
+    if (message) {
+      console.log(chalk.gray(message))
+    }
+    const argList = Array.isArray(args) ? args : args.split(' ')
+    if (command === 'node' && !existsSync(argList[0])) {
+      throw Error(`File not found [${argList[0]}]`)
+    }
+    spawn(command, Array.isArray(args) ? args : args.split(' '), {
+      ...config,
+      shell: true,
+      stdio: 'inherit',
+    }).on('close', (code) => {
+      if (code) {
+        if (exitOnFail) {
+          process.exit(code)
+        }
+        reject(code)
+      } else {
+        resolve(0)
+      }
+    })
+  })
+}
+
+export const runStepsAsync = async (name: string, steps: ScriptStep[], exitOnFail = true, messages?: string[]) => {
+  try {
+    const pkgName = process.env.npm_package_name
+    console.log(chalk.green(`${name} [${pkgName}]`))
+    for (let i = 0; i < steps.length; i++) {
+      await runStepAsync(steps[i], exitOnFail, messages?.[i])
+    }
+    return 0
+  } catch (ex) {
+    console.log(ex)
+    process.exit(-1)
+  }
+}

package/src/lib/runXy.ts

@@ -0,0 +1,5 @@
+import { runSteps } from './runSteps'
+
+export const runXy = (command: string) => {
+  return runSteps(`XY [${command}]`, [['yarn', ['xy', command, ...process.argv.filter((value, index) => (index > 1 ? value : undefined))]]])
+}

package/src/lib/safeExit.ts

@@ -2,9 +2,13 @@
 
 import { processEx } from './processEx'
 
-const safeExit = (func: () => number | null | undefined | void) => {
+const safeExit = (func: () => number | undefined) => {
   try {
-    return func()
+    const result = func()
+    if (result) {
+      process.exit(result)
+    }
+    return result
   } catch (ex) {
     processEx(ex)
   }