Handle package manager and log level choice

Author: codenem

packages/cli-v3/e2e/compile.test.ts

@@ -1,4 +1,5 @@
 import { execaNode } from "execa";
+import { renameSync } from "node:fs";
 import { join, resolve } from "node:path";
 
 type TestCase = {
@@ -24,6 +25,9 @@ for (let testCase of testCases) {
 
   const fixtureDir = resolve(join(process.cwd(), "e2e/fixtures", name));
   const commandPath = resolve(join(process.cwd(), "dist/e2e.js"));
+  const logLevel = process.env.LOG || "log";
+
+  togglePackageManager(true, fixtureDir, process.env.PM);
 
   test(
     `project fixture "${testCase.name}" compiles`,
@@ -32,7 +36,7 @@ for (let testCase of testCases) {
         (async () => {
           const { stdout } = await execaNode(
             commandPath,
-            ["deploy-compile", fixtureDir, ...options],
+            ["deploy-compile", fixtureDir, "--log-level", logLevel, ...options],
             { cwd: fixtureDir }
           );
           console.log(stdout);
@@ -41,4 +45,69 @@ for (let testCase of testCases) {
     },
     { timeout: 60_000 }
   );
+
+  togglePackageManager(false, fixtureDir, process.env.PM);
+}
+
+// For now to avoid changes in codebase.
+function togglePackageManager(toggle: boolean, dir: string, packageManager?: string) {
+  switch (packageManager) {
+    case "bun":
+      renameSync(
+        join(dir, `pnpm-lock${toggle ? "" : ".muted"}.yaml`),
+        join(dir, `pnpm-lock${toggle ? ".muted" : ""}.yaml`)
+      );
+      renameSync(
+        join(dir, `yarn${toggle ? "" : ".muted"}.lock`),
+        join(dir, `yarn${toggle ? ".muted" : ""}.lock`)
+      );
+      renameSync(
+        join(dir, `package-lock${toggle ? "" : ".muted"}.json`),
+        join(dir, `package-lock${toggle ? ".muted" : ""}.json`)
+      );
+      break;
+    case "pnpm":
+      renameSync(
+        join(dir, `bun${toggle ? "" : ".muted"}.lockb`),
+        join(dir, `bun${toggle ? ".muted" : ""}.lockb`)
+      );
+      renameSync(
+        join(dir, `yarn${toggle ? "" : ".muted"}.lock`),
+        join(dir, `yarn${toggle ? ".muted" : ""}.lock`)
+      );
+      renameSync(
+        join(dir, `package-lock${toggle ? "" : ".muted"}.json`),
+        join(dir, `package-lock${toggle ? ".muted" : ""}.json`)
+      );
+      break;
+    case "yarn":
+      renameSync(
+        join(dir, `bun${toggle ? "" : ".muted"}.lockb`),
+        join(dir, `bun${toggle ? ".muted" : ""}.lockb`)
+      );
+      renameSync(
+        join(dir, `pnpm-lock${toggle ? "" : ".muted"}.yaml`),
+        join(dir, `pnpm-lock${toggle ? ".muted" : ""}.yaml`)
+      );
+      renameSync(
+        join(dir, `package-lock${toggle ? "" : ".muted"}.json`),
+        join(dir, `package-lock${toggle ? ".muted" : ""}.json`)
+      );
+      break;
+    case "npm":
+    default:
+      renameSync(
+        join(dir, `pnpm-lock${toggle ? "" : ".muted"}.yaml`),
+        join(dir, `pnpm-lock${toggle ? ".muted" : ""}.yaml`)
+      );
+      renameSync(
+        join(dir, `bun${toggle ? "" : ".muted"}.lockb`),
+        join(dir, `bun${toggle ? ".muted" : ""}.lockb`)
+      );
+      renameSync(
+        join(dir, `yarn${toggle ? "" : ".muted"}.lock`),
+        join(dir, `yarn${toggle ? ".muted" : ""}.lock`)
+      );
+      break;
+  }
 }

packages/cli-v3/e2e/compile.ts

@@ -5,8 +5,11 @@ import { z } from "zod";
 
 import { compileProject, DeployCommandOptions } from "../src/commands/deploy.js";
 import { readConfig } from "../src/utilities/configFiles.js";
+import { logger } from "../src/utilities/logger.js";
+import { fromZodError } from "zod-validation-error";
 
 const CompileCommandOptionsSchema = z.object({
+  logLevel: z.enum(["debug", "info", "log", "warn", "error", "none"]).default("log"),
   skipTypecheck: z.boolean().default(false),
   config: z.string().optional(),
   projectRef: z.string().optional(),
@@ -22,6 +25,11 @@ export function configureCompileCommand(program: Command) {
       "[dir]",
       "The project root directory. Usually where the top level package.json is located."
     )
+    .option(
+      "-l, --log-level <level>",
+      "The CLI log level to use (debug, info, log, warn, error, none). This does not effect the log level of your trigger.dev tasks.",
+      "log"
+    )
     .option("--skip-typecheck", "Whether to skip the pre-build typecheck")
     .option("-c, --config <config file>", "The name of the config file, found at [path]")
     .option(
@@ -38,6 +46,12 @@ export function configureCompileCommand(program: Command) {
 }
 
 async function compile(dir: string, options: CompileCommandOptions) {
+  const parsedOptions = CompileCommandOptionsSchema.safeParse(options);
+  if (!parsedOptions.success) {
+    throw new Error(fromZodError(parsedOptions.error).toString());
+  }
+  logger.loggerLevel = parsedOptions.data.logLevel;
+
   const resolvedConfig = await readConfig(dir, {
     configFile: options.config,
     projectRef: options.projectRef,