@xylabs/ts-scripts-yarn3 6.0.4 → 6.0.6

package/src/actions/lint.ts

@@ -14,17 +14,13 @@ export interface LintPackageParams {
   verbose?: boolean
 }
 
-export const lintPackage = ({
-  pkg, fix, verbose,
-}: LintParams & Required<Pick<LintParams, 'pkg'>>) => {
+export const lintPackage = ({ pkg, fix }: LintParams & Required<Pick<LintParams, 'pkg'>>) => {
   console.log(chalk.gray(`${fix ? 'Fix' : 'Lint'} [All-Packages]`))
   const start = Date.now()
-  const verboseOptions = verbose ? ['--verbose'] : ['--no-verbose']
 
   const result = runSteps(`${fix ? 'Fix' : 'Lint'}  [All-Packages]`, [
     ['yarn', ['workspace',
       pkg,
-      ...verboseOptions,
       'run',
       fix ? 'package-fix' : 'package-lint',
     ]],

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

@@ -2,8 +2,6 @@ import type { Options } from 'tsup'
 
 export type EntryMode = 'all' | 'single' | 'auto' | 'platform'
 
-export type CompileMode = 'tsup' | 'tsc'
-
 /**
  * Configuration for specifying which paths are targeted.
  */
@@ -36,12 +34,10 @@ export interface CompileConfig {
   entryMode?: EntryMode
   /** @param files Manually specify the files to be compiled */
   files?: string[]
-  mode?: CompileMode
 }
 
 export type PackageCompileTsupConfig = CompileConfig & {
   browser?: Record<string, Options | boolean>
-  mode?: 'tsup'
   neutral?: Record<string, Options | boolean>
   node?: Record<string, Options | boolean>
   tsup?: { options?: Options }

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

@@ -2,29 +2,27 @@ import chalk from 'chalk'
 
 import { loadConfig } from '../../../lib/index.ts'
 import { packagePublint } from '../publint.ts'
-import { packageCompileTsc } from './packageCompileTsc.ts'
+import { packageCompileTypes } from './compileTypes.ts'
 import { packageCompileTsup } from './packageCompileTsup.ts'
-import type {
-  XyConfig, XyTscConfig, XyTsupConfig,
-} from './XyConfig.ts'
+import type { XyConfig } from './XyConfig.ts'
 
-export const packageCompile = async (inConfig: XyConfig = {}, types?: 'tsc' | 'tsup'): Promise<number> => {
+export const packageCompile = async (inConfig: XyConfig = {}): Promise<number> => {
   const pkg = process.env.INIT_CWD
   console.log(chalk.green(`Compiling ${pkg}`))
   const config = await loadConfig(inConfig)
   const publint = config.publint
 
-  const mode = config.compile?.mode ?? 'tsup'
-  let result: number = 0
-  switch (mode) {
-    case 'tsc': {
-      result += await packageCompileTsc(undefined, config as XyTscConfig)
-      break
-    }
-    case 'tsup': {
-      result += await packageCompileTsup(config as XyTsupConfig, types)
-      break
-    }
+  const tscResults = await packageCompileTypes(config)
+
+  if (tscResults > 0) {
+    return tscResults
   }
-  return result + (publint ? await packagePublint(config) : 0)
+
+  const tsupResults = await packageCompileTsup(config)
+
+  if (tsupResults > 0) {
+    return tsupResults
+  }
+
+  return (publint ? await packagePublint(config) : 0)
 }

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

@@ -1,10 +1,11 @@
 import { cwd } from 'node:process'
 
-import chalk from 'chalk'
 import type { TsConfigCompilerOptions } from 'tsc-prog'
 import { createProgramFromConfig } from 'tsc-prog'
 import type { CompilerOptions } from 'typescript'
-import { DiagnosticCategory } from 'typescript'
+import {
+  DiagnosticCategory, formatDiagnosticsWithColorAndContext, getPreEmitDiagnostics, sys,
+} from 'typescript'
 
 import { buildEntries } from './buildEntries.ts'
 import { getCompilerOptions } from './getCompilerOptions.ts'
@@ -19,12 +20,11 @@ export const packageCompileTscTypes = (
   const verbose = config?.verbose ?? false
 
   if (verbose) {
-    console.log(`Compiling types with TSC [${pkg}]`)
+    console.log(`Compiling types [${pkg}]`)
   }
 
   const compilerOptions = {
     ...(getCompilerOptions({
-      declaration: true,
       emitDeclarationOnly: true,
       outDir: 'dist/types',
       removeComments: false,
@@ -40,35 +40,27 @@ export const packageCompileTscTypes = (
   // calling all here since the types do not get rolled up
   const files = buildEntries(folder, 'all', verbose)
 
-  const result = createProgramFromConfig({
+  const program = createProgramFromConfig({
     basePath: pkg ?? cwd(),
     compilerOptions,
     exclude: ['dist', 'docs', '**/*.spec.*', '**/*.stories.*', 'src/**/spec/**/*'],
     files,
-  }).emit()
+  })
 
-  const diagResults = result.diagnostics.length
-  for (const diag of result.diagnostics) {
-    switch (diag.category) {
-      case DiagnosticCategory.Error: {
-        console.error(chalk.red(diag.messageText))
-        console.error(chalk.grey(pkg))
-        console.error(chalk.blue(diag.file?.fileName))
-        break
-      }
-      case DiagnosticCategory.Warning: {
-        console.error(chalk.yellow(diag.messageText))
-        console.error(chalk.grey(pkg))
-        console.error(chalk.blue(diag.file?.fileName))
-        break
-      }
-      case DiagnosticCategory.Suggestion: {
-        console.error(chalk.white(diag.messageText))
-        console.error(chalk.grey(pkg))
-        console.error(chalk.blue(diag.file?.fileName))
-        break
-      }
-    }
+  const diagnostics = getPreEmitDiagnostics(program)
+
+  if (diagnostics.length > 0) {
+    const formattedDiagnostics = formatDiagnosticsWithColorAndContext(
+      diagnostics,
+      {
+        getCanonicalFileName: fileName => fileName,
+        getCurrentDirectory: () => folder,
+        getNewLine: () => sys.newLine,
+      },
+    )
+    console.error(formattedDiagnostics)
   }
-  return diagResults
+
+  program.emit()
+  return diagnostics.reduce((acc, diag) => acc + (diag.category === DiagnosticCategory.Error ? 1 : 0), 0)
 }

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

@@ -1,18 +1,16 @@
-/* eslint-disable complexity */
 import type { Loader } from 'esbuild'
 import type { Options } from 'tsup'
 import { build, defineConfig } from 'tsup'
 
 import { buildEntries } from './buildEntries.ts'
+import { packageCompileTypes } from './compileTypes.ts'
 import { deepMergeObjects } from './deepMerge.ts'
-import { packageCompileTscTypes } from './packageCompileTscTypes.ts'
 import type { EntryMode, XyTsupConfig } from './XyConfig.ts'
 
 const compileFolder = async (
   folder: string,
   entryMode: EntryMode = 'single',
   options?: Options,
-  types: 'tsc' | 'tsup' = 'tsc',
   verbose?: boolean,
 ): Promise<number> => {
   const outDir = options?.outDir ?? 'dist'
@@ -26,7 +24,7 @@ const compileFolder = async (
     bundle: true,
     cjsInterop: true,
     clean: true,
-    dts: types === 'tsup',
+    dts: false,
     entry,
     format: ['esm'],
     outDir,
@@ -46,13 +44,13 @@ const compileFolder = async (
   ).flat()
 
   if (verbose) {
-    console.log(`TSUP:build:start [${folder}] ${types}`)
+    console.log(`TSUP:build:start [${folder}]`)
   }
 
   await Promise.all(optionsList.map(options => build(options)))
 
   if (verbose) {
-    console.log(`TSUP:build:stop [${folder}] ${types}`)
+    console.log(`TSUP:build:stop [${folder}]`)
   }
 
   return 0
@@ -76,8 +74,8 @@ export const tsupOptions = (options: Options[] = []): Options => {
   return deepMergeObjects([standardOptions, ...options])
 }
 
-export const packageCompileTsup = async (config?: XyTsupConfig, types: 'tsc' | 'tsup' = 'tsc') => {
-  console.warn('packageCompileTsup-types', types)
+export const packageCompileTsup = async (config?: XyTsupConfig) => {
+  console.log('packageCompileTsup-types')
   const compile = config?.compile
   const verbose = config?.verbose ?? false
   if (verbose) {
@@ -88,14 +86,12 @@ export const packageCompileTsup = async (config?: XyTsupConfig, types: 'tsc' | '
   const compileForBrowser = compile?.browser ?? { src: {} }
   const compileForNeutral = compile?.neutral ?? { src: {} }
 
-  if (types === 'tsc') {
-    if (verbose) {
-      console.log(`Calling packageCompileTscTypes [${types}`)
-    }
-    const errors = packageCompileTscTypes('src', { verbose })
-    if (errors) {
-      return errors
-    }
+  if (verbose) {
+    console.log('Calling packageCompileTscTypes')
+  }
+  const errors = await packageCompileTypes(config)
+  if (errors > 0) {
+    return errors
   }
 
   return (
@@ -111,7 +107,6 @@ export const packageCompileTsup = async (config?: XyTsupConfig, types: 'tsc' | '
                 compile?.tsup?.options ?? {},
                 (typeof options === 'object' ? options : {}),
                 { platform: 'node', outDir: 'dist/node' }]),
-              types,
               verbose,
             )
             : 0
@@ -130,7 +125,6 @@ export const packageCompileTsup = async (config?: XyTsupConfig, types: 'tsc' | '
                 compile?.tsup?.options ?? {},
                 (typeof options === 'object' ? options : {}),
                 { platform: 'browser', outDir: 'dist/browser' }]),
-              types,
               verbose,
             )
             : 0
@@ -149,7 +143,6 @@ export const packageCompileTsup = async (config?: XyTsupConfig, types: 'tsc' | '
                 compile?.tsup?.options ?? {},
                 (typeof options === 'object' ? options : {}),
                 { platform: 'neutral', outDir: 'dist/neutral' }]),
-              types,
               verbose,
             )
             : 0

package/src/actions/recompile.ts

@@ -28,15 +28,12 @@ export const recompile = async ({
     })
 }
 
-export const recompilePackage = ({
-  verbose, target, pkg,
-}: RecompilePackageParams) => {
+export const recompilePackage = ({ target, pkg }: RecompilePackageParams) => {
   const targetOptions = target ? ['-t', target] : []
-  const verboseOptions = verbose ? ['--verbose'] : ['--no-verbose']
 
   return runStepsAsync(
     `Recompile [${pkg}]`,
-    [['yarn', ['workspace', pkg, ...verboseOptions, 'run', 'package-recompile', ...targetOptions]]],
+    [['yarn', ['workspace', pkg, 'run', 'package-recompile', ...targetOptions]]],
   )
 }
 

package/src/actions/relint.ts

@@ -33,15 +33,13 @@ const dumpMessages = (lintResults: ESLint.LintResult[]) => {
   }
 }
 
-export const relintPackage = ({ pkg, verbose }: RelintParams & Required<Pick<RelintParams, 'pkg'>>) => {
+export const relintPackage = ({ pkg }: RelintParams & Required<Pick<RelintParams, 'pkg'>>) => {
   console.log(chalk.gray(`${'Relint'} [All-Packages]`))
   const start = Date.now()
-  const verboseOptions = verbose ? ['--verbose'] : ['--no-verbose']
 
   const result = runSteps('Relint [All-Packages]', [
     ['yarn', ['workspace',
       pkg,
-      ...verboseOptions,
       'run',
       'package-relint',
     ]],

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

@@ -4,7 +4,7 @@ import chalk from 'chalk'
 
 import { packageCompile } from '../../actions/index.ts'
 
-packageCompile({ verbose: true, publint: false }, 'tsc')
+packageCompile({ verbose: true, publint: false })
   .then((value) => {
     if (value) {
       process.exit(value)

package/src/bin/package/build.ts

@@ -4,7 +4,7 @@ import chalk from 'chalk'
 
 import { packageCompile } from '../../actions/index.ts'
 
-packageCompile({ verbose: false, publint: true }, 'tsc')
+packageCompile({ verbose: false, publint: true })
   .then((value) => {
     if (value) {
       process.exit(value)

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

@@ -2,11 +2,4 @@
 
 import { packageCleanOutputs } from '../../actions/index.ts'
 
-packageCleanOutputs()
-  .then(() => {
-    process.exit(0)
-  })
-  .catch((error) => {
-    console.error(error)
-    process.exit(1)
-  })
+process.exitCode = packageCleanOutputs()

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

@@ -2,11 +2,4 @@
 
 import { packageCleanTypescript } from '../../actions/index.ts'
 
-packageCleanTypescript()
-  .then(() => {
-    process.exit(0)
-  })
-  .catch((error) => {
-    console.error(error)
-    process.exit(1)
-  })
+process.exitCode = packageCleanTypescript()

package/src/xy/xyBuildCommands.ts

@@ -41,7 +41,6 @@ export const xyBuildCommands = (args: Argv) => {
           jobs: argv.jobs as number,
           pkg: argv.package as string,
           target: argv.target as 'esm' | 'cjs',
-          types: argv.types as 'tsc' | 'tsup',
           verbose: !!argv.verbose,
         })
       },