@oclif/core 2.5.0 → 2.5.2

package/lib/config/plugin.d.ts

@@ -24,6 +24,7 @@ export declare class Plugin implements IPlugin {
     parent: Plugin | undefined;
     children: Plugin[];
     hasManifest: boolean;
+    private _commandsDir;
     protected _debug: (..._: any) => void;
     protected warned: boolean;
     constructor(options: PluginOptions);

package/lib/config/plugin.js

@@ -141,7 +141,10 @@ class Plugin {
         return topicsToArray(this.pjson.oclif.topics || {});
     }
     get commandsDir() {
-        return (0, ts_node_1.tsPath)(this.root, this.pjson.oclif.commands);
+        if (this._commandsDir)
+            return this._commandsDir;
+        this._commandsDir = (0, ts_node_1.tsPath)(this.root, this.pjson.oclif.commands, this.type);
+        return this._commandsDir;
     }
     get commandIDs() {
         if (!this.commandsDir)
@@ -179,7 +182,7 @@ class Plugin {
             };
             let m;
             try {
-                const p = path.join(this.pjson.oclif.commands, ...id.split(':'));
+                const p = path.join(this.commandsDir ?? this.pjson.oclif.commands, ...id.split(':'));
                 const { isESM, module, filePath } = await module_loader_1.default.loadWithData(this, p);
                 this._debug(isESM ? '(import)' : '(require)', filePath);
                 m = module;

package/lib/config/ts-node.d.ts

@@ -1,7 +1,7 @@
 /**
- * convert a path from the compiled ./lib files to the ./src typescript source
+ * Convert a path from the compiled ./lib files to the ./src typescript source
  * this is for developing typescript plugins/CLIs
- * if there is a tsconfig and the original sources exist, it attempts to require ts-
+ * if there is a tsconfig and the original sources exist, it attempts to require ts-node
  */
-export declare function tsPath(root: string, orig: string): string;
-export declare function tsPath(root: string, orig: string | undefined): string | undefined;
+export declare function tsPath(root: string, orig: string, type?: string): string;
+export declare function tsPath(root: string, orig: string | undefined, type?: string): string | undefined;

package/lib/config/ts-node.js

@@ -8,6 +8,8 @@ const util_1 = require("../util");
 const util_2 = require("./util");
 // eslint-disable-next-line new-cap
 const debug = (0, util_2.Debug)('ts-node');
+const TYPE_ROOTS = [`${__dirname}/../node_modules/@types`];
+const ROOT_DIRS = [];
 function loadTSConfig(root) {
     const tsconfigPath = path.join(root, 'tsconfig.json');
     let typescript;
@@ -29,19 +31,58 @@ function loadTSConfig(root) {
         return tsconfig;
     }
 }
-function tsPath(root, orig) {
+function registerTSNode(root) {
+    const tsconfig = loadTSConfig(root);
+    if (!tsconfig)
+        return;
+    debug('registering ts-node at', root);
+    const tsNodePath = require.resolve('ts-node', { paths: [root, __dirname] });
+    const tsNode = require(tsNodePath);
+    TYPE_ROOTS.push(`${root}/node_modules/@types`);
+    if (tsconfig.compilerOptions.rootDirs) {
+        ROOT_DIRS.push(...tsconfig.compilerOptions.rootDirs.map(r => path.join(root, r)));
+    }
+    else {
+        ROOT_DIRS.push(`${root}/src`);
+    }
+    const cwd = process.cwd();
+    try {
+        process.chdir(root);
+        tsNode.register({
+            skipProject: true,
+            transpileOnly: true,
+            compilerOptions: {
+                esModuleInterop: tsconfig.compilerOptions.esModuleInterop,
+                target: tsconfig.compilerOptions.target || 'es2017',
+                experimentalDecorators: tsconfig.compilerOptions.experimentalDecorators || false,
+                emitDecoratorMetadata: tsconfig.compilerOptions.emitDecoratorMetadata || false,
+                module: 'commonjs',
+                sourceMap: true,
+                rootDirs: ROOT_DIRS,
+                typeRoots: TYPE_ROOTS,
+                jsx: 'react',
+            },
+        });
+        return tsconfig;
+    }
+    finally {
+        process.chdir(cwd);
+    }
+}
+function tsPath(root, orig, type) {
     if (!orig)
         return orig;
-    orig = path.join(root, orig);
+    orig = orig.startsWith(root) ? orig : path.join(root, orig);
     const skipTSNode = 
     // the CLI specifically turned it off
     (settings_1.settings.tsnodeEnabled === false) ||
         // the CLI didn't specify ts-node and it is production
         (settings_1.settings.tsnodeEnabled === undefined && (0, util_1.isProd)());
-    if (skipTSNode)
+    // We always want to load the tsconfig for linked plugins.
+    if (skipTSNode && type !== 'link')
         return orig;
     try {
-        const tsconfig = loadTSConfig(root);
+        const tsconfig = type === 'link' ? registerTSNode(root) : loadTSConfig(root);
         if (!tsconfig)
             return orig;
         const { rootDir, rootDirs, outDir } = tsconfig.compilerOptions;

package/lib/performance.d.ts

@@ -24,6 +24,7 @@ declare class Marker {
     module: string;
     method: string;
     scope: string;
+    stopped: boolean;
     private startMarker;
     private stopMarker;
     constructor(name: string, details?: Details);

package/lib/performance.js

@@ -7,6 +7,7 @@ class Marker {
     constructor(name, details = {}) {
         this.name = name;
         this.details = details;
+        this.stopped = false;
         this.startMarker = `${this.name}-start`;
         this.stopMarker = `${this.name}-stop`;
         const [caller, scope] = name.split('#');
@@ -20,6 +21,7 @@ class Marker {
         this.details = { ...this.details, ...details };
     }
     stop() {
+        this.stopped = true;
         perf_hooks_1.performance.mark(this.stopMarker);
     }
     measure() {
@@ -65,6 +67,11 @@ class Performance {
     static async collect() {
         if (!Performance.enabled)
             return;
+        if (Performance._results.length > 0)
+            return;
+        for (const marker of Object.values(Performance.markers).filter(m => !m.stopped)) {
+            marker.stop();
+        }
         return new Promise(resolve => {
             const perfObserver = new perf_hooks_1.PerformanceObserver(items => {
                 for (const entry of items.getEntries()) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -29,6 +29,7 @@
     "strip-ansi": "^6.0.1",
     "supports-color": "^8.1.1",
     "supports-hyperlinks": "^2.2.0",
+    "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
     "widest-line": "^3.1.0",
     "wordwrap": "^1.0.0",
@@ -36,7 +37,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^12.1.4",
-    "@oclif/plugin-help": "^5.2.5",
+    "@oclif/plugin-help": "^5.2.7",
     "@oclif/plugin-plugins": "^2.3.2",
     "@oclif/test": "^2.3.7",
     "@types/ansi-styles": "^3.2.1",
@@ -73,7 +74,6 @@
     "shelljs": "^0.8.5",
     "shx": "^0.3.4",
     "sinon": "^11.1.2",
-    "ts-node": "^10.9.1",
     "tsd": "^0.25.0",
     "typescript": "^4.9.5"
   },