Add log level

package.json

@@ -7,6 +7,7 @@
     "type": "git",
     "url": "https://github.com/hiroki0525/dandori.git"
   },
+  "type": "module",
   "scripts": {
     "build": "turbo build",
     "prepare": "husky install",

packages/cli/src/core/__tests__/index.test.ts

@@ -16,6 +16,13 @@ import generateDandoriTasks, {
   OptionalTaskPropsOption,
 } from "@dandori/core";
 
+const { actualLoadFile } = await vi.hoisted(async () => {
+  const actualModule = await import("@dandori/libs");
+  return {
+    actualLoadFile: actualModule.loadFile,
+  };
+});
+
 const tasks: DandoriTask[] = [
   {
     id: "1",
@@ -32,14 +39,13 @@ vi.mock("@dandori/core", () => ({
 
 const mockLogError = vi.fn();
 
-vi.mock("@dandori/libs", async () => {
-  const actualModule =
-    await vi.importActual<typeof import("@dandori/libs")>("@dandori/libs");
+vi.mock("@dandori/libs", () => {
   return {
-    ...actualModule,
+    logLevel: "info",
     getLogger: vi.fn(() => ({
       error: mockLogError,
     })),
+    loadFile: actualLoadFile,
   };
 });
 

packages/core/src/__tests__/index.test.ts

@@ -33,11 +33,9 @@ vi.mock("openai", () => {
 
 const mockLogDebug = vi.fn();
 
-vi.mock("@dandori/libs", async () => {
-  const actualModule =
-    await vi.importActual<typeof import("@dandori/libs")>("@dandori/libs");
+vi.mock("@dandori/libs", () => {
   return {
-    ...actualModule,
+    logLevel: "info",
     getLogger: vi.fn(() => ({
       error: vi.fn(),
       debug: mockLogDebug,

packages/libs/global.d.ts

@@ -0,0 +1,9 @@
+declare module "process" {
+  global {
+    namespace NodeJS {
+      interface ProcessEnv {
+        LOG_LEVEL: "debug" | "info" | "warn" | "error";
+      }
+    }
+  }
+}

packages/libs/src/__tests__/loadEnvFile.test.ts

@@ -1,44 +1,95 @@
-import { describe, expect, vi, it, beforeEach } from "vitest";
-import { getLogger, setLogger } from "../logger";
-import pino from "pino";
-
-const defaultLogger = pino({
-  name: "dandori",
-  level: "debug",
-  transport: {
-    target: "pino-pretty",
-    options: {
-      colorize: true,
-    },
-  },
-});
+import { loadEnvFile } from "../index";
+import {
+  describe,
+  it,
+  expect,
+  beforeAll,
+  afterAll,
+  beforeEach,
+  vi,
+  afterEach,
+} from "vitest";
+import { mkdir, rm, rmdir, writeFile } from "fs/promises";
+
+const mockErrorLog = vi.fn();
 
-vi.mock("pino", () => ({
-  default: vi.fn(),
+vi.mock("../logger", () => ({
+  getLogger: vi.fn(() => ({
+    error: mockErrorLog,
+  })),
 }));
 
-describe("logger", () => {
-  describe("use default logger", () => {
-    it("get default logger", () => {
-      expect(getLogger()).toEqual(defaultLogger);
+describe("loadEnvFile", () => {
+  describe("with valid .env file", () => {
+    const openApiKeyPropName = "OPENAI_API_KEY";
+
+    afterEach(() => {
+      delete process.env[openApiKeyPropName];
+    });
+
+    describe("no filePath argument", () => {
+      const apiKey = "123";
+      const envFileName = ".env";
+
+      beforeAll(async () => {
+        await writeFile(envFileName, `${openApiKeyPropName}=${apiKey}`);
+      });
+
+      afterAll(async () => {
+        await rm(envFileName);
+      });
+
+      beforeEach(() => {
+        loadEnvFile();
+      });
+
+      it(`loaded ${openApiKeyPropName}`, () => {
+        expect(process.env[openApiKeyPropName]).toBe(apiKey);
+      });
+    });
+
+    describe("filePath argument", () => {
+      const apiKey = "456";
+      const envFileDir = "./dir";
+      const envFilePath = `./${envFileDir}/.env`;
+
+      beforeAll(async () => {
+        await mkdir(envFileDir);
+        await writeFile(envFilePath, `${openApiKeyPropName}=${apiKey}`);
+      });
+
+      afterAll(async () => {
+        await rm(envFilePath);
+        await rmdir(envFileDir);
+      });
+
+      beforeEach(() => {
+        loadEnvFile(envFilePath);
+      });
+
+      it(`loaded ${openApiKeyPropName}`, () => {
+        expect(process.env[openApiKeyPropName]).toBe(apiKey);
+      });
     });
   });
 
-  describe("use custom logger", () => {
-    const customLogger = {
-      debug: vi.fn(),
-      info: vi.fn(),
-      warn: vi.fn(),
-      error: vi.fn(),
-      customProp: vi.fn(),
-    };
-
-    beforeEach(() => {
-      setLogger(customLogger);
+  describe("without valid .env file", () => {
+    const runErrorLoadEnvFile = () => loadEnvFile("./nodir/.env");
+
+    afterEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it("throw Error", async () => {
+      expect(runErrorLoadEnvFile).toThrowError();
     });
 
-    it("get custom logger", () => {
-      expect(getLogger()).toEqual(customLogger);
+    it("called error log", async () => {
+      try {
+        runErrorLoadEnvFile();
+      } catch (e) {
+        expect(mockErrorLog).toBeCalled();
+      }
     });
   });
 });

packages/libs/src/__tests__/logger.test.ts

@@ -1,95 +1,44 @@
-import { loadEnvFile } from "../index";
-import {
-  describe,
-  it,
-  expect,
-  beforeAll,
-  afterAll,
-  beforeEach,
-  vi,
-  afterEach,
-} from "vitest";
-import { mkdir, rm, rmdir, writeFile } from "fs/promises";
-
-const mockErrorLog = vi.fn();
+import { describe, expect, vi, it, beforeEach } from "vitest";
+import { getLogger, setLogger } from "../logger";
+import pino from "pino";
+
+const defaultLogger = pino({
+  name: "dandori",
+  level: "debug",
+  transport: {
+    target: "pino-pretty",
+    options: {
+      colorize: true,
+    },
+  },
+});
 
-vi.mock("../logger", () => ({
-  getLogger: vi.fn(() => ({
-    error: mockErrorLog,
-  })),
+vi.mock("pino", () => ({
+  default: vi.fn(),
 }));
 
-describe("loadEnvFile", () => {
-  describe("with valid .env file", () => {
-    const openApiKeyPropName = "OPENAI_API_KEY";
-
-    afterEach(() => {
-      delete process.env[openApiKeyPropName];
-    });
-
-    describe("no filePath argument", () => {
-      const apiKey = "123";
-      const envFileName = ".env";
-
-      beforeAll(async () => {
-        await writeFile(envFileName, `${openApiKeyPropName}=${apiKey}`);
-      });
-
-      afterAll(async () => {
-        await rm(envFileName);
-      });
-
-      beforeEach(() => {
-        loadEnvFile();
-      });
-
-      it(`loaded ${openApiKeyPropName}`, () => {
-        expect(process.env[openApiKeyPropName]).toBe(apiKey);
-      });
-    });
-
-    describe("filePath argument", () => {
-      const apiKey = "456";
-      const envFileDir = "./dir";
-      const envFilePath = `./${envFileDir}/.env`;
-
-      beforeAll(async () => {
-        await mkdir(envFileDir);
-        await writeFile(envFilePath, `${openApiKeyPropName}=${apiKey}`);
-      });
-
-      afterAll(async () => {
-        await rm(envFilePath);
-        await rmdir(envFileDir);
-      });
-
-      beforeEach(() => {
-        loadEnvFile(envFilePath);
-      });
-
-      it(`loaded ${openApiKeyPropName}`, () => {
-        expect(process.env[openApiKeyPropName]).toBe(apiKey);
-      });
+describe("logger", () => {
+  describe("use default logger", () => {
+    it("get default logger", () => {
+      expect(getLogger()).toEqual(defaultLogger);
     });
   });
 
-  describe("without valid .env file", () => {
-    const runErrorLoadEnvFile = () => loadEnvFile("./nodir/.env");
-
-    afterEach(() => {
-      vi.clearAllMocks();
-    });
-
-    it("throw Error", async () => {
-      expect(runErrorLoadEnvFile).toThrowError();
+  describe("use custom logger", () => {
+    const customLogger = {
+      debug: vi.fn(),
+      info: vi.fn(),
+      warn: vi.fn(),
+      error: vi.fn(),
+      customProp: vi.fn(),
+    };
+
+    beforeEach(() => {
+      setLogger(customLogger);
     });
 
-    it("called error log", async () => {
-      try {
-        runErrorLoadEnvFile();
-      } catch (e) {
-        expect(mockErrorLog).toBeCalled();
-      }
+    it("get custom logger", () => {
+      expect(getLogger()).toEqual(customLogger);
     });
   });
 });

packages/libs/src/logger.ts

@@ -14,12 +14,14 @@ export const setLogger = (newLogger: Logger): void => {
   logger = newLogger;
 };
 
+export const logLevel = process.env.LOG_LEVEL ?? "info";
+
 export const getLogger = (): Logger => {
   if (!logger) {
     setLogger(
       pino({
         name: "dandori",
-        level: "debug",
+        level: logLevel,
         transport: {
           target: "pino-pretty",
           options: {

packages/libs/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.json",
+  "include": ["./src/**/*", "global.d.ts"]
 }

packages/ui/src/__tests__/miro.test.ts

@@ -20,15 +20,18 @@ vi.mock("@mirohq/miro-api", () => {
 
 const mockLogInfo = vi.fn();
 
-vi.mock("@dandori/libs", () => ({
-  getLogger: vi.fn(() => ({
-    debug: vi.fn(),
-    info: mockLogInfo,
-  })),
-  runPromisesSequentially: vi.fn((runPromises, _runningLogPrefix) =>
-    Promise.all(runPromises.map((runPromise: () => any) => runPromise())),
-  ),
-}));
+vi.mock("@dandori/libs", () => {
+  return {
+    logLevel: "info",
+    getLogger: vi.fn(() => ({
+      debug: vi.fn(),
+      info: mockLogInfo,
+    })),
+    runPromisesSequentially: vi.fn((runPromises, _runningLogPrefix) =>
+      Promise.all(runPromises.map((runPromise: () => any) => runPromise())),
+    ),
+  };
+});
 
 const mockRunPromisesSequentially = runPromisesSequentially as Mock;