From bf9c618a8379f876d899ca1154bda9a91d19f886 Mon Sep 17 00:00:00 2001 From: Convly Date: Wed, 3 Aug 2022 09:50:27 +0200 Subject: [PATCH 1/2] Fix invalid return for ts get-config-path --- .../utils/typescript/lib/utils/get-config-path.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/utils/typescript/lib/utils/get-config-path.js b/packages/utils/typescript/lib/utils/get-config-path.js index 45e65a09d1..c49f0b195a 100644 --- a/packages/utils/typescript/lib/utils/get-config-path.js +++ b/packages/utils/typescript/lib/utils/get-config-path.js @@ -5,6 +5,16 @@ const ts = require('typescript'); const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json'; +/** + * Get the path of the typescript config file for a given directory + * + * @param {string} dir + * @param {object} [options] + * @param {string} [options.filename] + * @param {boolean} [options.ancestorsLookup] + * + * @return {string} + */ module.exports = (dir, { filename = DEFAULT_TS_CONFIG_FILENAME, ancestorsLookup = false } = {}) => { const dirAbsolutePath = path.resolve(dir); const configFilePath = ts.findConfigFile(dirAbsolutePath, ts.sys.fileExists, filename); @@ -13,5 +23,5 @@ module.exports = (dir, { filename = DEFAULT_TS_CONFIG_FILENAME, ancestorsLookup return configFilePath; } - return configFilePath.startsWith(dirAbsolutePath); + return configFilePath.startsWith(dirAbsolutePath) ? configFilePath : undefined; }; From a7eb9c81e665a29f1d1accca678a04517bb26e3f Mon Sep 17 00:00:00 2001 From: Convly Date: Wed, 3 Aug 2022 09:51:45 +0200 Subject: [PATCH 2/2] Fix return type def --- packages/utils/typescript/lib/utils/get-config-path.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/typescript/lib/utils/get-config-path.js b/packages/utils/typescript/lib/utils/get-config-path.js index c49f0b195a..d0d1105d9a 100644 --- a/packages/utils/typescript/lib/utils/get-config-path.js +++ b/packages/utils/typescript/lib/utils/get-config-path.js @@ -13,7 +13,7 @@ const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json'; * @param {string} [options.filename] * @param {boolean} [options.ancestorsLookup] * - * @return {string} + * @return {string | undefined} */ module.exports = (dir, { filename = DEFAULT_TS_CONFIG_FILENAME, ancestorsLookup = false } = {}) => { const dirAbsolutePath = path.resolve(dir);