perf(typecheck): resolve typescript alongside preparing nuxt types

Author: danielroe

packages/nuxi/src/commands/typecheck.ts

@@ -26,67 +26,60 @@ export default defineCommand({
 
     const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
 
-    const { loadNuxt, buildNuxt, writeTypes } = await loadKit(cwd)
-    const nuxt = await loadNuxt({
-      cwd,
-      dotenv: { cwd, fileName: ctx.args.dotenv },
-      overrides: {
-        _prepare: true,
-        logLevel: ctx.args.logLevel as 'silent' | 'info' | 'verbose',
-      },
-    })
-
-    // Generate types and build Nuxt instance
-    await writeTypes(nuxt)
-    await buildNuxt(nuxt)
-    await nuxt.close()
-
-    const supportsProjects = await readTSConfig(cwd).then(r => !!(r.references?.length))
-    const typeCheckArgs = supportsProjects ? ['-b', '--noEmit'] : ['--noEmit']
-
-    // Prefer local install if possible
-    const [resolvedTypeScript, resolvedVueTsc] = await Promise.all([
+    const [supportsProjects, resolvedTypeScript, resolvedVueTsc] = await Promise.all([
+      readTSConfig(cwd).then(r => !!(r.references?.length)),
+      // Prefer local install if possible
       resolveModulePath('typescript', { try: true }),
       resolveModulePath('vue-tsc/bin/vue-tsc.js', { try: true }),
+      writeTypes(cwd, ctx.args.dotenv, ctx.args.logLevel as 'silent' | 'info' | 'verbose'),
     ])
+
+    const typeCheckArgs = supportsProjects ? ['-b', '--noEmit'] : ['--noEmit']
     if (resolvedTypeScript && resolvedVueTsc) {
-      await x(resolvedVueTsc, typeCheckArgs, {
+      return await x(resolvedVueTsc, typeCheckArgs, {
         throwOnError: true,
         nodeOptions: {
           stdio: 'inherit',
           cwd,
         },
       })
     }
-    else {
-      if (isBun) {
-        await x(
-          'bun',
-          'install typescript vue-tsc --global --silent'.split(' '),
-          {
-            throwOnError: true,
-            nodeOptions: { stdio: 'inherit', cwd },
-          },
-        )
 
-        await x('bunx', ['vue-tsc', ...typeCheckArgs], {
-          throwOnError: true,
-          nodeOptions: {
-            stdio: 'inherit',
-            cwd,
-          },
-        })
-      }
-      else {
-        await x(
-          'npx',
-          ['-p', 'vue-tsc', '-p', 'typescript', 'vue-tsc', ...typeCheckArgs],
-          {
-            throwOnError: true,
-            nodeOptions: { stdio: 'inherit', cwd },
-          },
-        )
-      }
+    if (isBun) {
+      await x('bun', ['install', 'typescript', 'vue-tsc', '--global', '--silent'], {
+        throwOnError: true,
+        nodeOptions: { stdio: 'inherit', cwd },
+      })
+
+      return await x('bunx', ['vue-tsc', ...typeCheckArgs], {
+        throwOnError: true,
+        nodeOptions: {
+          stdio: 'inherit',
+          cwd,
+        },
+      })
     }
+
+    await x('npx', ['-p', 'vue-tsc', '-p', 'typescript', 'vue-tsc', ...typeCheckArgs], {
+      throwOnError: true,
+      nodeOptions: { stdio: 'inherit', cwd },
+    })
   },
 })
+
+async function writeTypes(cwd: string, dotenv?: string, logLevel?: 'silent' | 'info' | 'verbose') {
+  const { loadNuxt, buildNuxt, writeTypes } = await loadKit(cwd)
+  const nuxt = await loadNuxt({
+    cwd,
+    dotenv: { cwd, fileName: dotenv },
+    overrides: {
+      _prepare: true,
+      logLevel,
+    },
+  })
+
+  // Generate types and build Nuxt instance
+  await writeTypes(nuxt)
+  await buildNuxt(nuxt)
+  await nuxt.close()
+}