fix: move up prod check in tsPath (#858)

* fix: move up prod check in tsPath * test: fix parser perf test * fix: clarify performance debug logs * chore: update log message * fix: add bullet point for time spent loading root plugin
oclif · Nov 8, 2023 · 204de58 · 204de58
1 parent 672abf0
commit 204de58
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/config/ts-node.ts b/src/config/ts-node.ts
@@ -203,6 +203,12 @@ export async function tsPath(root: string, orig: string | undefined, plugin?: Pl
 
   const isProduction = isProd()
 
+  // Do not skip ts-node registration if the plugin is linked
+  if (settings.tsnodeEnabled === undefined && isProduction && plugin?.type !== 'link') {
+    debug(`Skipping ts-node registration for ${root} because NODE_ENV is NOT "test" or "development"`)
+    return orig
+  }
+
   if (cannotTranspileEsm(rootPlugin, plugin, isProduction)) {
     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})`,
@@ -214,12 +220,6 @@ export async function tsPath(root: string, orig: string | undefined, plugin?: Pl
     return orig
   }
 
-  // Do not skip ts-node registration if the plugin is linked
-  if (settings.tsnodeEnabled === undefined && isProduction && plugin?.type !== 'link') {
-    debug(`Skipping ts-node registration for ${root} because NODE_ENV is NOT "test" or "development"`)
-    return orig
-  }
-
   if (cannotUseTsNode(root, plugin, isProduction)) {
     debug(`Skipping ts-node registration for ${root} because ts-node is run in node version ${process.version}"`)
     memoizedWarn(

diff --git a/src/performance.ts b/src/performance.ts
@@ -194,9 +194,15 @@ export class Performance {
     if (!Performance.enabled) return
 
     const oclifDebug = require('debug')('oclif-perf')
-    oclifDebug('Total Time: %sms', Performance.oclifPerf['oclif.runMs'].toFixed(4))
+    const processUpTime = (process.uptime() * 1000).toFixed(4)
+    oclifDebug('Process Uptime: %sms', processUpTime)
+    oclifDebug('Oclif Time: %sms', Performance.oclifPerf['oclif.runMs'].toFixed(4))
     oclifDebug('Init Time: %sms', Performance.oclifPerf['oclif.initMs'].toFixed(4))
     oclifDebug('Config Load Time: %sms', Performance.oclifPerf['oclif.configLoadMs'].toFixed(4))
+    oclifDebug(
+      '  • Root Plugin Load Time: %sms',
+      Performance.getResult(OCLIF_MARKER_OWNER, 'plugin.load#root')?.duration.toFixed(4) ?? 0,
+    )
     oclifDebug(
       '  • Plugins Load Time: %sms',
       Performance.getResult(OCLIF_MARKER_OWNER, 'config.loadAllPlugins')?.duration.toFixed(4) ?? 0,
@@ -227,6 +233,11 @@ export class Performance {
 
     oclifDebug('Command Load Time: %sms', Performance.oclifPerf['oclif.commandLoadMs'].toFixed(4))
     oclifDebug('Command Run Time: %sms', Performance.oclifPerf['oclif.commandRunMs'].toFixed(4))
+    if (Performance.oclifPerf['oclif.configLoadMs'] > Performance.oclifPerf['oclif.runMs']) {
+      oclifDebug(
+        '! Config load time is greater than total oclif time. This might mean that Config was instantiated before oclif was run.',
+      )
+    }
 
     const nonCoreDebug = require('debug')('non-oclif-perf')
 

diff --git a/test/perf/parser.perf.ts b/test/perf/parser.perf.ts
@@ -28,7 +28,7 @@ suite
   .add('multiple async flags that take time', {
     defer: true,
     fn(deferred: {resolve: () => any}) {
-      parse(['--flagA', 'foo', '--flagA', 'bar'], {
+      parse(['--flagA', 'foo', '--flagB', 'bar'], {
         flags: {
           flagA: Flags.string({
             async parse(input) {