@vlandoss/run-run 0.0.12 → 0.0.13-git-62457e3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/run-run",
-  "version": "0.0.12",
+  "version": "0.0.13-git-62457e3.0",
   "description": "The CLI toolbox to fullstack common scripts in Variable Land",
   "homepage": "https://github.com/variableland/dx/tree/main/packages/run-run#readme",
   "bugs": {

package/src/program/commands/typecheck.ts

@@ -10,21 +10,18 @@ export function createTypecheckCommand(ctx: Context) {
     .action(async function typecheckAction() {
       const { appPkg, shell } = ctx;
 
-      async function singleTypecheck(dir?: string, options?: { logger?: typeof logger }): Promise<boolean | undefined> {
-        const log = options?.logger ?? logger;
+      const isTsProject = (dir: string) => appPkg.hasFile("tsconfig.json", dir);
 
-        if (!appPkg.hasFile("tsconfig.json", dir)) {
-          log.info("No tsconfig.json found, skipping typecheck");
-          return;
-        }
+      const getPreScript = (scripts: Record<string, string> | undefined) => {
+        return scripts?.pretsc ?? scripts?.pretypecheck;
+      };
 
-        if (dir) {
-          await shell.at(dir).$`tsc --noEmit`;
-        } else {
-          await shell.$`tsc --noEmit`;
+      async function typecheckTask(dir: string, preScript?: string) {
+        if (preScript) {
+          await shell.at(dir).$`${preScript}`;
         }
 
-        return true;
+        await shell.at(dir).$`tsc --noEmit`;
       }
 
       async function typecheckAtProject(project: Project) {
@@ -35,14 +32,9 @@ export function createTypecheckCommand(ctx: Context) {
 
         try {
           childLogger.start("Type checking started");
-
-          const success = await singleTypecheck(project.rootDir, {
-            logger: childLogger,
-          });
-
-          if (success) {
-            childLogger.success("Typecheck completed");
-          }
+          const preScript = getPreScript(project.manifest.scripts);
+          await typecheckTask(project.rootDir, preScript);
+          childLogger.success("Typecheck completed");
         } catch (error) {
           childLogger.error("Typecheck failed");
           throw error;
@@ -51,18 +43,32 @@ export function createTypecheckCommand(ctx: Context) {
 
       if (!appPkg.isMonorepo()) {
         try {
-          await singleTypecheck();
+          if (!isTsProject(appPkg.dirPath)) {
+            logger.info("No tsconfig.json found, skipping typecheck");
+            return;
+          }
+
+          const preScript = getPreScript(appPkg.packageJson.scripts);
+
+          logger.start("Type checking started");
+          await typecheckTask(appPkg.dirPath, preScript);
+          logger.success("Typecheck completed");
         } catch (error) {
           logger.error("Typecheck failed");
           throw error;
         }
+        return;
       }
 
       const projects = await appPkg.getWorkspaceProjects();
+      const tsProjects = projects.filter((project) => isTsProject(project.rootDir));
 
-      for (const project of projects) {
-        await typecheckAtProject(project);
+      if (!tsProjects.length) {
+        logger.warn("No TypeScript projects found in the monorepo, skipping typecheck");
+        return;
       }
+
+      await Promise.all(tsProjects.map(typecheckAtProject));
     })
     .addHelpText("afterAll", "\nUnder the hood, this command uses the TypeScript CLI to check the code.");
 }