Cleanup

smorimoto · smorimoto · commit a78727ccf923 · 2024-10-29T20:33:54.000+09:00
Signed-off-by: Sora Morimoto &lt;sora@morimoto.io&gt;
diff --git a/index.ts b/index.ts
@@ -1,12 +1,12 @@
 import * as path from "node:path";
+import * as url from "node:url";
 import { defineCommand, runMain } from "citty";
 import { consola } from "consola";
 import packageJson from "./package.json" with { type: "json" };
 import { TemplatesGenConfig } from "./src/commands/generate-templates/configuration.js";
 import { CodeGenConfig } from "./src/configuration.js";
 import { HTTP_CLIENT } from "./src/constants.js";
 import { generateApi, generateTemplates } from "./src/index.js";
-import { pathToFileURL } from "url";
 
 const templateGenBaseConfig = new TemplatesGenConfig({});
 
@@ -282,23 +282,23 @@ const generateCommand = defineCommand({
     },
   },
   run: async ({ args }) => {
-    let customConfig = null;
-    let customConfigPath: string | undefined;
+    let customConfig;
 
     if (args["custom-config"]) {
       try {
-        customConfigPath = path.resolve(process.cwd(), args["custom-config"]);
-        customConfig = await import(pathToFileURL(customConfigPath).toString());
+        const customConfigPath = url
+          .pathToFileURL(path.resolve(process.cwd(), args["custom-config"]))
+          .toString();
+        customConfig = await import(customConfigPath);
         customConfig = customConfig.default || customConfig;
+        if (customConfig) {
+          consola.info(`Found custom config at: ${customConfigPath}`);
+        }
       } catch (error) {
         consola.error("Error loading custom config:", error);
       }
     }
 
-    if (customConfig) {
-      consola.info(`Found custom config at: ${customConfigPath}`);
-    }
-
     await generateApi({
       addReadonly: args["add-readonly"],
       anotherArrayType: args["another-array-type"],
