@oclif/core 3.10.0 → 3.10.2

package/lib/config/ts-node.js

@@ -15,28 +15,21 @@ const util_2 = require("./util");
 const debug = (0, util_2.Debug)('ts-node');
 exports.TS_CONFIGS = {};
 const REGISTERED = new Set();
+function isErrno(error) {
+    return 'code' in error && error.code === 'ENOENT';
+}
 async function loadTSConfig(root) {
     try {
         if (exports.TS_CONFIGS[root])
             return exports.TS_CONFIGS[root];
-        const tsconfigPath = (0, node_path_1.join)(root, 'tsconfig.json');
-        const tsconfig = await (0, fs_1.readJson)(tsconfigPath);
-        if (!tsconfig || Object.keys(tsconfig.compilerOptions).length === 0)
-            return;
-        exports.TS_CONFIGS[root] = tsconfig;
-        if (tsconfig.extends) {
-            const { parse } = await import('tsconfck');
-            const result = await parse(tsconfigPath);
-            const tsNodeOpts = Object.fromEntries((result.extended ?? []).flatMap((e) => Object.entries(e.tsconfig['ts-node'] ?? {})).reverse());
-            exports.TS_CONFIGS[root] = { ...result.tsconfig, 'ts-node': tsNodeOpts };
-        }
+        exports.TS_CONFIGS[root] = await (0, fs_1.readTSConfig)((0, node_path_1.join)(root, 'tsconfig.json'));
         return exports.TS_CONFIGS[root];
     }
     catch (error) {
-        if (error instanceof SyntaxError) {
-            debug(`Could not parse tsconfig.json. Skipping ts-node registration for ${root}.`);
-            (0, errors_1.memoizedWarn)(`Could not parse tsconfig.json for ${root}. Falling back to compiled source.`);
-        }
+        if (isErrno(error))
+            return;
+        debug(`Could not parse tsconfig.json. Skipping ts-node registration for ${root}.`);
+        (0, errors_1.memoizedWarn)(`Could not parse tsconfig.json for ${root}. Falling back to compiled source.`);
     }
 }
 async function registerTSNode(root) {
@@ -186,12 +179,10 @@ async function tsPath(root, orig, plugin) {
         debug(`Skipping ts-node registration for ${root} because it's an ESM module (NODE_ENV: ${process.env.NODE_ENV}, root plugin module type: ${rootPlugin?.moduleType})))`);
         if (plugin?.type === 'link')
             (0, errors_1.memoizedWarn)(`${plugin?.name} is a linked ESM module and cannot be auto-transpiled. Existing compiled source will be used instead.`);
-        if (plugin?.options.url)
-            (0, errors_1.memoizedWarn)(`${plugin?.name} is an ESM module installed from github and cannot be auto-transpiled. Existing compiled source will be used instead.`);
         return orig;
     }
-    // Do not skip ts-node registration if the plugin is linked or installed from github
-    if (settings_1.settings.tsnodeEnabled === undefined && isProduction && plugin?.type !== 'link' && !plugin?.options.url) {
+    // Do not skip ts-node registration if the plugin is linked
+    if (settings_1.settings.tsnodeEnabled === undefined && isProduction && plugin?.type !== 'link') {
         debug(`Skipping ts-node registration for ${root} because NODE_ENV is NOT "test" or "development"`);
         return orig;
     }

package/lib/util/fs.d.ts

@@ -18,3 +18,4 @@ export declare function readJsonSync(path: string, parse: false): string;
 export declare function readJsonSync<T = unknown>(path: string, parse?: true): T;
 export declare function safeReadJson<T>(path: string): Promise<T | undefined>;
 export declare function existsSync(path: string): boolean;
+export declare function readTSConfig(path: string): Promise<any>;

package/lib/util/fs.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.existsSync = exports.safeReadJson = exports.readJsonSync = exports.readJson = exports.fileExists = exports.dirExists = exports.requireJson = void 0;
+exports.readTSConfig = exports.existsSync = exports.safeReadJson = exports.readJsonSync = exports.readJson = exports.fileExists = exports.dirExists = exports.requireJson = void 0;
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
+const util_1 = require("./util");
 function requireJson(...pathParts) {
     return JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(...pathParts), 'utf8'));
 }
@@ -69,3 +70,10 @@ function existsSync(path) {
     return (0, node_fs_1.existsSync)(path);
 }
 exports.existsSync = existsSync;
+async function readTSConfig(path) {
+    const { parse } = await import('tsconfck');
+    const result = await parse(path);
+    const tsNodeOpts = (0, util_1.mergeNestedObjects)(result.extended ?? [result], 'tsconfig.ts-node');
+    return { ...result.tsconfig, 'ts-node': tsNodeOpts };
+}
+exports.readTSConfig = readTSConfig;

package/lib/util/util.d.ts

@@ -19,4 +19,5 @@ export declare function mapValues<T extends Record<string, any>, TResult>(obj: {
 }, fn: (i: T[keyof T], k: keyof T) => TResult): {
     [P in keyof T]: TResult;
 };
+export declare function mergeNestedObjects(objs: Record<string, any>[], path: string): Record<string, any>;
 export {};

package/lib/util/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapValues = exports.uniq = exports.isNotFalsy = exports.isTruthy = exports.capitalize = exports.sumBy = exports.maxBy = exports.isProd = exports.castArray = exports.sortBy = exports.last = exports.uniqBy = exports.compact = exports.pickBy = void 0;
+exports.mergeNestedObjects = exports.mapValues = exports.uniq = exports.isNotFalsy = exports.isTruthy = exports.capitalize = exports.sumBy = exports.maxBy = exports.isProd = exports.castArray = exports.sortBy = exports.last = exports.uniqBy = exports.compact = exports.pickBy = void 0;
 function pickBy(obj, fn) {
     return Object.entries(obj).reduce((o, [k, v]) => {
         if (fn(v))
@@ -96,3 +96,10 @@ function mapValues(obj, fn) {
     }, {});
 }
 exports.mapValues = mapValues;
+function get(obj, path) {
+    return path.split('.').reduce((o, p) => o?.[p], obj);
+}
+function mergeNestedObjects(objs, path) {
+    return Object.fromEntries(objs.flatMap((o) => Object.entries(get(o, path) ?? {})).reverse());
+}
+exports.mergeNestedObjects = mergeNestedObjects;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.10.0",
+  "version": "3.10.2",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {