@xylabs/ts-scripts-yarn3 3.15.2 → 3.15.3

package/package.json

@@ -65,8 +65,8 @@
     "@types/yargs": "^17.0.32",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
-    "@xylabs/tsconfig": "^3.15.2",
-    "@xylabs/tsconfig-dom": "^3.15.2",
+    "@xylabs/tsconfig": "^3.15.3",
+    "@xylabs/tsconfig-dom": "^3.15.3",
     "async-mutex": "^0.5.0",
     "chalk": "^4.1.2",
     "cosmiconfig": "^9.0.0",
@@ -114,8 +114,8 @@
     "@types/license-checker": "^25.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/parse-git-config": "^3.0.4",
-    "@xylabs/eslint-config": "^3.15.2",
-    "@xylabs/tsconfig": "^3.15.2",
+    "@xylabs/eslint-config": "^3.15.3",
+    "@xylabs/tsconfig": "^3.15.3",
     "publint": "^0.2.9",
     "typescript": "^5.5.4"
   },
@@ -162,6 +162,6 @@
     "package-clean": "echo Not cleaning..."
   },
   "sideEffects": false,
-  "version": "3.15.2",
+  "version": "3.15.3",
   "type": "module"
 }

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

@@ -1,26 +1,27 @@
 import { createRequire } from 'node:module'
 
 import { merge } from 'lodash-es'
+import { TsConfig } from 'tsc-prog'
 import { CompilerOptions, findConfigFile, readConfigFile, sys } from 'typescript'
 
-export const getCompilerOptionsJSONFollowExtends = (filename: string): CompilerOptions => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let opts: any = {}
-  const config = readConfigFile(filename, sys.readFile).config
+const getNested = (config: TsConfig): CompilerOptions => {
   if (config.extends) {
     const require = createRequire(import.meta.url)
-    opts = require(config.extends)
-  }
-  if (config?.error) {
-    throw new Error(`getCompilerOptionsJSONFollowExtends failed ${JSON.stringify(config?.error?.messageText, null, 2)}`)
+    const opts = require(config.extends)
+    return { ...getNested(opts), ...config.compilerOptions } as CompilerOptions
   }
 
-  return { ...opts.compilerOptions, ...config.compilerOptions }
+  return config.compilerOptions as CompilerOptions
+}
+
+export const getCompilerOptionsJSONFollowExtends = (filename: string): CompilerOptions => {
+  const config = readConfigFile(filename, sys.readFile).config
+  return getNested(config)
 }
 
-export const getCompilerOptions = async (options?: CompilerOptions, tsconfig: string = 'tsconfig.json'): Promise<CompilerOptions> => {
+export const getCompilerOptions = (options?: CompilerOptions, tsconfig: string = 'tsconfig.json'): CompilerOptions => {
   const configFileName = findConfigFile('./', sys.fileExists, tsconfig)
-  const configFileCompilerOptions = configFileName ? await getCompilerOptionsJSONFollowExtends(configFileName) : undefined
+  const configFileCompilerOptions = configFileName ? getCompilerOptionsJSONFollowExtends(configFileName) : undefined
 
   return merge({}, configFileCompilerOptions, options)
 }