@xylabs/ts-scripts-yarn3 2.14.7 → 2.14.9

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((ex: Error) => {
+  console.error(`Deps Failed: ${chalk.red(ex)}`)
+  process.exitCode = 0
+})

package/src/lib/runStepsAsync.ts

@@ -5,7 +5,7 @@ import { existsSync } from 'fs'
 import { ScriptStep } from './runSteps'
 
 export const runStepAsync = (step: ScriptStep, exitOnFail = true, message?: string) => {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     const [command, args, config] = step
     if (message) {
       console.log(chalk.gray(message))
@@ -22,9 +22,15 @@ export const runStepAsync = (step: ScriptStep, exitOnFail = true, message?: stri
     }).on('close', (code) => {
       if (code) {
         if (exitOnFail) {
-          process.exit(code)
+          console.error(
+            chalk.blue(
+              `Command Exited With Non-Zero Result [${chalk.gray(code)}] | ${chalk.yellow(command)} ${chalk.white(
+                Array.isArray(args) ? args.join(' ') : args,
+              )}`,
+            ),
+          )
         }
-        reject(code)
+        resolve(code)
       } else {
         resolve(0)
       }
@@ -41,7 +47,7 @@ export const runStepsAsync = async (name: string, steps: ScriptStep[], exitOnFai
     }
     return 0
   } catch (ex) {
-    console.log(ex)
+    console.error(chalk.red(ex))
     process.exit(-1)
   }
 }

package/src/lib/xy/xyBuildCommands.ts

@@ -12,12 +12,12 @@ export const xyBuildCommands = (args: yargs.Argv) => {
           describe: 'Specific package to build',
         })
       },
-      (argv) => {
+      async (argv) => {
         if (argv.verbose) {
           console.log(`Building: ${argv.package ?? 'all'}`)
         }
 
-        process.exitCode = build({
+        process.exitCode = await build({
           jobs: argv.jobs as number,
           pkg: argv.package as string,
           target: argv.target as 'esm' | 'cjs',
@@ -33,11 +33,11 @@ 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,

package/tsconfig.build.cjs.json

@@ -1,10 +1,6 @@
 {
   "compilerOptions": {
-    "rootDirs": [
-      "package.json"
-    ],
     "composite": true,
-    "rootDir": "src",
     "module": "CommonJS",
     "outDir": "./dist/cjs",
     "target": "ES6"

package/tsconfig.build.esm.json

@@ -1,10 +1,6 @@
 {
   "compilerOptions": {
-    "rootDirs": [
-      "package.json"
-    ],
     "composite": true,
-    "rootDir": "src",
     "module": "ESNext",
     "outDir": "./dist/esm",
     "target": "ESNext"