@xylabs/ts-scripts-yarn3 3.0.12 → 3.0.13

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

@@ -1,6 +1,5 @@
 import { copyFile, readdir } from 'fs/promises'
 
-
 const getDistTypeFiles = async () => {
   return (await readdir('dist', { recursive: true })).filter((file) => file.endsWith('d.ts')).map((file) => `dist/${file}`)
 }
@@ -10,18 +9,18 @@ const getDistTypeMapFiles = async () => {
 }
 
 export const copyTypeFiles = async () => {
-    //hybrid packages want two copies of the types
-    const distTypeFiles = await getDistTypeFiles()
-    await Promise.all(
-      distTypeFiles.map(async (file) => {
-        await copyFile(file, file.replace('d.ts', 'd.mts'))
-      }),
-    )
-  
-    const distTypeMapFiles = await getDistTypeMapFiles()
-    await Promise.all(
-      distTypeMapFiles.map(async (file) => {
-        await copyFile(file, file.replace('d.ts.map', 'd.mts.map'))
-      }),
-    )
-}
+  //hybrid packages want two copies of the types
+  const distTypeFiles = await getDistTypeFiles()
+  await Promise.all(
+    distTypeFiles.map(async (file) => {
+      await copyFile(file, file.replace('d.ts', 'd.mts'))
+    }),
+  )
+
+  const distTypeMapFiles = await getDistTypeMapFiles()
+  await Promise.all(
+    distTypeMapFiles.map(async (file) => {
+      await copyFile(file, file.replace('d.ts.map', 'd.mts.map'))
+    }),
+  )
+}

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

@@ -1,4 +1,4 @@
 export * from './compile'
+export * from './rollup'
 export * from './tsc'
 export * from './tsup'
-export * from './rollup'

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

@@ -30,4 +30,4 @@ export const getInputDirs = async (depth: number = 0) => {
 export const getAllInputs = async (depth: number = 100) => {
   const dirs = await getInputDirs(depth)
   return (await Promise.all(dirs.map(async (dir) => await getInputs(dir)))).flat()
-}
+}

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

@@ -5,17 +5,16 @@ import chalk from 'chalk'
 import { OutputOptions, rollup, RollupLog, RollupOptions } from 'rollup'
 import externalDeps from 'rollup-plugin-exclude-dependencies-from-bundle'
 import nodeExternals from 'rollup-plugin-node-externals'
-import { getInputDirs, getInputs } from './inputs'
-import { packagePublint } from '../publint'
+
+import { loadConfig } from '../../../lib'
 import { loadPackageConfig } from '../../../loadPackageConfig'
+import { packagePublint } from '../publint'
 import { CompileParams } from './CompileParams'
-import { loadConfig } from '../../../lib'
+import { getInputDirs, getInputs } from './inputs'
 
-export interface PackageCompileRollupParams extends CompileParams {
+export interface PackageCompileRollupParams extends CompileParams {}
 
-}
-
-export const compileSubDir = async (format: 'cjs' | 'esm', ext: string, subDir?: string, verbose = false) => {
+export const compileSubDir = async (format: 'cjs' | 'esm', ext: string, subDir?: string, _verbose = false) => {
   const dir = subDir === '.' ? undefined : subDir
   const input = await getInputs(dir)
   const tsPlugIn = typescript({
@@ -99,10 +98,12 @@ export const packageCompileRollup = async (params?: PackageCompileRollupParams)
   const esmExt = pkgType === 'module' ? 'js' : 'mjs'
   const cjsExt = pkgType === 'commonjs' ? 'js' : 'cjs'
 
-  const result = (await Promise.all(
-    inputDirs.map(async (inputDir) => {
-      return await compileSubDir('cjs', cjsExt, inputDir, verbose) + await compileSubDir('esm', esmExt, inputDir, verbose)
-    }),
-  )).reduce(((prev, result) => prev + result), 0)
+  const result = (
+    await Promise.all(
+      inputDirs.map(async (inputDir) => {
+        return (await compileSubDir('cjs', cjsExt, inputDir, verbose)) + (await compileSubDir('esm', esmExt, inputDir, verbose))
+      }),
+    )
+  ).reduce((prev, result) => prev + result, 0)
   return result + (publint ? await packagePublint() : 0)
-}
+}

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

@@ -1,74 +1,79 @@
-import ts, { CompilerOptions, readConfigFile, sys, getPreEmitDiagnostics, parseJsonConfigFileContent, getLineAndCharacterOfPosition, flattenDiagnosticMessageText, createProgram, convertCompilerOptionsFromJson, Diagnostic, findConfigFile } from "typescript"
-import { CompileParams } from "./CompileParams"
-import { loadConfig } from "../../../lib"
-import { getAllInputs } from "./inputs"
+import chalk from 'chalk'
+// eslint-disable-next-line import/no-internal-modules
 import merge from 'lodash/merge'
-import chalk from "chalk"
+import {
+  CompilerOptions,
+  createProgram,
+  Diagnostic,
+  findConfigFile,
+  flattenDiagnosticMessageText,
+  getLineAndCharacterOfPosition,
+  getPreEmitDiagnostics,
+  readConfigFile,
+  sys,
+} from 'typescript'
 
-export type PackageCompileTscParams = Partial<CompileParams & {
-  compile?: {
-    tsc?: {
-      tsconfig?: string
-      compilerOptions?: CompilerOptions
+import { loadConfig } from '../../../lib'
+import { CompileParams } from './CompileParams'
+import { getAllInputs } from './inputs'
+
+export type PackageCompileTscParams = Partial<
+  CompileParams & {
+    compile?: {
+      tsc?: {
+        compilerOptions?: CompilerOptions
+        tsconfig?: string
+      }
     }
   }
-}>
+>
 
-const getCompilerOptionsJSONFollowExtends = (filename: string): Record<string, any> => {
-  let opts = {};
-  const config = readConfigFile(filename, ts.sys.readFile).config;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const getCompilerOptionsJSONFollowExtends = (filename: string): CompilerOptions => {
+  let opts = {}
+  const config = readConfigFile(filename, sys.readFile).config
   if (config.extends) {
-    const requirePath = require.resolve(config.extends);
-    opts = getCompilerOptionsJSONFollowExtends(requirePath);
+    const requirePath = require.resolve(config.extends)
+    opts = getCompilerOptionsJSONFollowExtends(requirePath)
   }
   if (config?.error) {
     throw Error(`getCompilerOptionsJSONFollowExtends failed ${JSON.stringify(config?.error?.messageText, null, 2)}`)
   }
-  
-  return config.compilerOptions
+
+  return { ...opts, ...config.compilerOptions }
 }
 
-const getCompilerOptions = (options?: CompilerOptions, tsconfig: string = "tsconfig.json"): CompilerOptions => {
-  const configFileName = findConfigFile(
-    "./",
-    ts.sys.fileExists,
-    tsconfig
-  )
+const getCompilerOptions = (options?: CompilerOptions, tsconfig: string = 'tsconfig.json'): CompilerOptions => {
+  const configFileName = findConfigFile('./', sys.fileExists, tsconfig)
   const configFileCompilerOptions = configFileName ? getCompilerOptionsJSONFollowExtends(configFileName) : undefined
 
   return merge({}, configFileCompilerOptions, options)
 }
 
-const getConfigFile = (options?: CompilerOptions, tsconfig: string = "tsconfig.json") => {
-  const configFileName = findConfigFile(
-    "./",
-    ts.sys.fileExists,
-    tsconfig
-  )
-  return {...(configFileName ? readConfigFile(configFileName, sys.readFile).config : {}), compilerOptions: getCompilerOptions(options)}
+const getConfigFile = (options?: CompilerOptions, tsconfig: string = 'tsconfig.json') => {
+  const configFileName = findConfigFile('./', sys.fileExists, tsconfig)
+  return { ...(configFileName ? readConfigFile(configFileName, sys.readFile).config : {}), compilerOptions: getCompilerOptions(options) }
 }
 
-const compile = (fileNames: string[], optionsParam: CompilerOptions) => {
-  console.log(chalk.blue(`compile`))
-  const {moduleResolution, ...options} = optionsParam
+const compile = (fileNames: string[], options: CompilerOptions) => {
+  console.log(chalk.blue('compile'))
   console.log(chalk.magenta(`options: ${JSON.stringify(options, null, 2)}`))
   const program = createProgram(fileNames, options)
-  console.log(chalk.blue(`createProgram`))
+  console.log(chalk.blue('createProgram'))
   const emitResult = program.emit()
-  console.log(chalk.blue(`emit`))
+  console.log(chalk.blue('emit'))
 
-  const allDiagnostics: Diagnostic[] = getPreEmitDiagnostics(program)
-    .concat(emitResult.diagnostics)
+  const allDiagnostics: Diagnostic[] = getPreEmitDiagnostics(program).concat(emitResult.diagnostics)
 
   const errorDiagnostics = allDiagnostics.filter((diagnostic) => diagnostic.category === 1)
 
-  allDiagnostics.forEach(diagnostic => {
+  allDiagnostics.forEach((diagnostic) => {
     if (diagnostic.file) {
-      let { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start!)
-      let message = flattenDiagnosticMessageText(diagnostic.messageText, "\n")
+      const { line, character } = getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start!)
+      const message = flattenDiagnosticMessageText(diagnostic.messageText, '\n')
       console.log(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`)
     } else {
-      console.log(flattenDiagnosticMessageText(diagnostic.messageText, "\n"))
+      console.log(flattenDiagnosticMessageText(diagnostic.messageText, '\n'))
     }
   })
 
@@ -82,19 +87,19 @@ const compile = (fileNames: string[], optionsParam: CompilerOptions) => {
 
 export const packageCompileTsc = async (params?: PackageCompileTscParams): Promise<number> => {
   const defaultCompilerOptions: CompilerOptions = {
-    sourceMap: true,
     declaration: true,
     declarationMap: true,
-    rootDir: 'src',
     outDir: 'dist',
+    rootDir: 'src',
+    sourceMap: true,
   }
   const compilerOptions = merge({}, defaultCompilerOptions, params?.compile?.tsc?.compilerOptions)
   const config = await loadConfig(params)
   if (config.verbose) {
-    console.log(`Compiling with TSC`)
+    console.log('Compiling with TSC')
   }
 
   const fileNames = (await getAllInputs(config.compile?.depth)).map((fileName) => `src/${fileName}`)
   const configFile = getConfigFile(compilerOptions)
   return compile(fileNames, configFile.compilerOptions)
-}
+}

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

@@ -1,24 +1,23 @@
-import { build, BuildOptions } from 'tsc-prog'
-import { CompileParams } from "./CompileParams"
-import { loadConfig } from "../../../lib"
-import { getAllInputs } from "./inputs"
 import { cwd } from 'process'
+import { build, BuildOptions } from 'tsc-prog'
 
+import { loadConfig } from '../../../lib'
+import { CompileParams } from './CompileParams'
 
 export const packageCompileTscTypes = async (params?: CompileParams): Promise<number> => {
   const pkg = process.env.INIT_CWD
   const buildOptions: BuildOptions = {
     basePath: pkg ?? cwd(),
     compilerOptions: {
-      sourceMap: true,
       declaration: true,
       declarationMap: true,
       emitDeclarationOnly: true,
       esModuleInterop: true,
-      outDir: 'dist'
+      outDir: 'dist',
+      sourceMap: true,
     },
+    exclude: ['dist', 'docs'],
     include: ['src'],
-    exclude: ['dist', 'docs']
   }
 
   const config = await loadConfig(params)
@@ -26,7 +25,6 @@ export const packageCompileTscTypes = async (params?: CompileParams): Promise<nu
     console.log(`Compiling types with TSC [${pkg}]`)
   }
 
-  const fileNames = (await getAllInputs(config.compile?.depth)).map((fileName) => `src/${fileName}`)
   build(buildOptions)
   return 0
-}
+}

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

@@ -1,17 +1,20 @@
 import { build, defineConfig, Options } from 'tsup'
-import {getInputDirs, getInputs} from './inputs'
+
+import { loadConfig } from '../../../lib'
 import { packagePublint } from '../publint'
 import { CompileParams } from './CompileParams'
-import { loadConfig } from '../../../lib'
+import { getInputDirs, getInputs } from './inputs'
 import { packageCompileTscTypes } from './tscTypes'
 
-export type PackageCompileTsupParams = Partial<CompileParams & {
-  compile?: {
-    tsup?: {
-      options?: Options
+export type PackageCompileTsupParams = Partial<
+  CompileParams & {
+    compile?: {
+      tsup?: {
+        options?: Options
+      }
     }
   }
-}>
+>
 
 const compileSubDir = async (subDir?: string, options?: Options, verbose?: boolean) => {
   const dir = subDir === '.' ? undefined : subDir
@@ -22,8 +25,8 @@ const compileSubDir = async (subDir?: string, options?: Options, verbose?: boole
     clean: true,
     dts: {
       entry: ['src/index.ts'],
+      only: false,
       resolve: false,
-      only: false
     },
     entry: subDir ? input.map((file) => `./src/${file}`) : ['./src/index.ts'],
     format: ['cjs', 'esm'],
@@ -31,7 +34,7 @@ const compileSubDir = async (subDir?: string, options?: Options, verbose?: boole
     sourcemap: true,
     splitting: false,
     tsconfig: 'tsconfig.json',
-    ...options
+    ...options,
   })
   const optionsList = (
     await Promise.all(
@@ -45,20 +48,22 @@ const compileSubDir = async (subDir?: string, options?: Options, verbose?: boole
   ).flat()
   await Promise.all(optionsList.map((options) => build(options)))
 
-  return await packageCompileTscTypes({verbose})
+  return await packageCompileTscTypes({ verbose })
 }
 
 export const packageCompileTsup = async (params?: PackageCompileTsupParams) => {
   const config = await loadConfig(params)
   if (config.verbose) {
-    console.log(`Compiling with TSUP`)
+    console.log('Compiling with TSUP')
   }
   const inputDirs = await getInputDirs(config.compile?.depth)
 
-  const result = (await Promise.all(
-    inputDirs.map(async (inputDir) => {
-      return await compileSubDir(inputDir, config.compile?.tsup?.options, config.verbose )
-    }),
-  )).reduce(((prev, result) => prev + result), 0)
+  const result = (
+    await Promise.all(
+      inputDirs.map(async (inputDir) => {
+        return await compileSubDir(inputDir, config.compile?.tsup?.options, config.verbose)
+      }),
+    )
+  ).reduce((prev, result) => prev + result, 0)
   return result + (config.compile?.publint ? await packagePublint() : 0)
-}
+}

package/src/actions/package/publint.ts

@@ -6,7 +6,7 @@ export interface PackagePublintParams {
   verbose?: boolean
 }
 
-export const packagePublint = async (params?: PackagePublintParams) => {
+export const packagePublint = async (_params?: PackagePublintParams) => {
   const pkgDir = process.env.INIT_CWD
 
   const pkg = JSON.parse(await fs.readFile(`${pkgDir}/package.json`, 'utf8'))

package/src/lib/index.ts

@@ -5,6 +5,7 @@ export * from './dependencies'
 export * from './file'
 export * from './generateIgnoreFiles'
 export * from './jsonFormatters'
+export * from './loadConfig'
 export * from './parsedPackageJSON'
 export * from './processEx'
 export * from './runSteps'
@@ -16,4 +17,3 @@ export * from './string'
 export * from './withErrnoException'
 export * from './withError'
 export * from './yarn'
-export * from './loadConfig'

package/src/lib/loadConfig.ts

@@ -1,7 +1,9 @@
 import chalk from 'chalk'
-import merge from 'lodash/merge'
 import { cosmiconfig } from 'cosmiconfig'
+// eslint-disable-next-line import/no-internal-modules
+import merge from 'lodash/merge'
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 let config: Record<string, any>
 
 export const loadConfig = async <T extends object>(params?: T): Promise<T> => {
@@ -16,4 +18,4 @@ export const loadConfig = async <T extends object>(params?: T): Promise<T> => {
     console.log(chalk.gray(`Loading config from ${configFilePath}`))
   }
   return merge({}, config, params)
-}
+}

package/tsconfig.build.json

@@ -1,5 +1,5 @@
 {
-  "include": ["src"],
   "exclude": ["src/**/*.spec.*", "dist", "docs"],
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "include": ["src"]
 }