typia 5.3.0-dev.20231120 → 5.3.0-dev.20231126

package/src/executable/TypiaSetupWizard.ts

@@ -1,140 +1,153 @@
-import fs from "fs";
-
-import { ArgumentParser } from "./setup/ArgumentParser";
-import { CommandExecutor } from "./setup/CommandExecutor";
-import { PackageManager } from "./setup/PackageManager";
-import { PluginConfigurator } from "./setup/PluginConfigurator";
-
-export namespace TypiaSetupWizard {
-  export interface IArguments {
-    manager: "npm" | "pnpm" | "yarn";
-    project: string | null;
-  }
-
-  export async function setup(): Promise<void> {
-    console.log("----------------------------------------");
-    console.log(" Typia Setup Wizard");
-    console.log("----------------------------------------");
-
-    // PREPARE ASSETS
-    const pack: PackageManager = await PackageManager.mount();
-    const args: IArguments = await ArgumentParser.parse(pack)(inquiry);
-
-    // INSTALL TYPESCRIPT COMPILERS
-    pack.install({ dev: true, modulo: "ts-patch", version: "latest" });
-    pack.install({ dev: true, modulo: "ts-node", version: "latest" });
-    pack.install({ dev: true, modulo: "typescript", version: "5.2.2" });
-    args.project ??= (() => {
-      const runner: string = pack.manager === "npm" ? "npx" : pack.manager;
-      CommandExecutor.run(`${runner} tsc --init`);
-      return (args.project = "tsconfig.json");
-    })();
-
-    // SETUP TRANSFORMER
-    await pack.save((data) => {
-      // COMPOSE PREPARE COMMAND
-      data.scripts ??= {};
-      if (
-        typeof data.scripts.prepare === "string" &&
-        data.scripts.prepare.trim().length
-      ) {
-        if (data.scripts.prepare.indexOf("ts-patch install") === -1)
-          data.scripts.prepare = "ts-patch install && " + data.scripts.prepare;
-      } else data.scripts.prepare = "ts-patch install";
-
-      // FOR OLDER VERSIONS
-      if (typeof data.scripts.postinstall === "string") {
-        data.scripts.postinstall = data.scripts.postinstall
-          .split("&&")
-          .map((str) => str.trim())
-          .filter((str) => str.indexOf("ts-patch install") === -1)
-          .join(" && ");
-        if (data.scripts.postinstall.length === 0)
-          delete data.scripts.postinstall;
-      }
-    });
-    CommandExecutor.run(`${pack.manager} run prepare`);
-
-    // CONFIGURE TYPIA
-    await PluginConfigurator.configure(args);
-  }
-
-  const inquiry: ArgumentParser.Inquiry<IArguments> = async (
-    pack,
-    command,
-    prompt,
-    action,
-  ) => {
-    // PREPARE ASSETS
-    command.option("--manager [manager", "package manager");
-    command.option("--project [project]", "tsconfig.json file location");
-
-    // INTERNAL PROCEDURES
-    const questioned = { value: false };
-    const select =
-      (name: string) =>
-      (message: string) =>
-      async <Choice extends string>(
-        choices: Choice[],
-        filter?: (choice: string) => Choice,
-      ): Promise<Choice> => {
-        questioned.value = true;
-        return (
-          await prompt()({
-            type: "list",
-            name: name,
-            message: message,
-            choices: choices,
-            ...(filter
-              ? {
-                  filter,
-                }
-              : {}),
-          })
-        )[name];
-      };
-    const configure = async (): Promise<string | null> => {
-      const fileList: string[] = await (
-        await fs.promises.readdir(process.cwd())
-      )
-        .filter(
-          (str) =>
-            str.substring(0, 8) === "tsconfig" &&
-            str.substring(str.length - 5) === ".json",
-        )
-        .sort((x, y) =>
-          x === "tsconfig.json"
-            ? -1
-            : y === "tsconfig.json"
-            ? 1
-            : x < y
-            ? -1
-            : 1,
-        );
-      if (fileList.length === 0) {
-        if (process.cwd() !== pack.directory)
-          throw new URIError(`Unable to find "tsconfig.json" file.`);
-        return null;
-      } else if (fileList.length === 1) return fileList[0]!;
-      return select("tsconfig")("TS Config File")(fileList);
-    };
-
-    // DO CONSTRUCT
-    return action(async (options) => {
-      pack.manager = options.manager ??= await select("manager")(
-        "Package Manager",
-      )(
-        [
-          "npm" as const,
-          "pnpm" as const,
-          "yarn (berry is not supported)" as "yarn",
-        ],
-        (value) => value.split(" ")[0] as "yarn",
-      );
-      options.project ??= await configure();
-
-      if (questioned.value) console.log("");
-      return options as IArguments;
-    });
-  };
-}
+import fs from "fs";
+
+import { TypiaPatchWizard } from "./TypiaPatchWizard";
+import { ArgumentParser } from "./setup/ArgumentParser";
+import { CommandExecutor } from "./setup/CommandExecutor";
+import { PackageManager } from "./setup/PackageManager";
+import { PluginConfigurator } from "./setup/PluginConfigurator";
+
+export namespace TypiaSetupWizard {
+  export interface IArguments {
+    manager: "npm" | "pnpm" | "yarn";
+    project: string | null;
+  }
+
+  export async function setup(): Promise<void> {
+    console.log("----------------------------------------");
+    console.log(" Typia Setup Wizard");
+    console.log("----------------------------------------");
+
+    // PREPARE ASSETS
+    const pack: PackageManager = await PackageManager.mount();
+    const args: IArguments = await ArgumentParser.parse(pack)(inquiry);
+
+    // INSTALL TYPESCRIPT COMPILERS
+    pack.install({ dev: true, modulo: "ts-patch", version: "latest" });
+    pack.install({ dev: true, modulo: "ts-node", version: "latest" });
+    pack.install({ dev: true, modulo: "typescript", version: "5.2.2" });
+    args.project ??= (() => {
+      const runner: string = pack.manager === "npm" ? "npx" : pack.manager;
+      CommandExecutor.run(`${runner} tsc --init`);
+      return (args.project = "tsconfig.json");
+    })();
+
+    // SETUP TRANSFORMER
+    await pack.save((data) => {
+      // COMPOSE PREPARE COMMAND
+      data.scripts ??= {};
+      if (
+        typeof data.scripts.prepare === "string" &&
+        data.scripts.prepare.trim().length
+      ) {
+        if (
+          data.scripts.prepare.indexOf("ts-patch install") === -1 &&
+          data.scripts.prepare.indexOf("typia patch") === -1
+        )
+          data.scripts.prepare =
+            "ts-patch install && typia patch && " + data.scripts.prepare;
+        else if (data.scripts.prepare.indexOf("ts-patch install") === -1)
+          data.scripts.prepare = "ts-patch install && " + data.scripts.prepare;
+        else if (data.scripts.prepare.indexOf("typia patch") === -1)
+          data.scripts.prepare = data.scripts.prepare.replace(
+            "ts-patch install",
+            "ts-patch install && typia patch",
+          );
+      } else data.scripts.prepare = "ts-patch install && typia patch";
+
+      // FOR OLDER VERSIONS
+      if (typeof data.scripts.postinstall === "string") {
+        data.scripts.postinstall = data.scripts.postinstall
+          .split("&&")
+          .map((str) => str.trim())
+          .filter((str) => str.indexOf("ts-patch install") === -1)
+          .join(" && ");
+        if (data.scripts.postinstall.length === 0)
+          delete data.scripts.postinstall;
+      }
+    });
+    await TypiaPatchWizard.patch();
+    CommandExecutor.run(`${pack.manager} run prepare`);
+
+    // CONFIGURE TYPIA
+    await PluginConfigurator.configure(args);
+  }
+
+  const inquiry: ArgumentParser.Inquiry<IArguments> = async (
+    pack,
+    command,
+    prompt,
+    action,
+  ) => {
+    // PREPARE ASSETS
+    command.option("--manager [manager", "package manager");
+    command.option("--project [project]", "tsconfig.json file location");
+
+    // INTERNAL PROCEDURES
+    const questioned = { value: false };
+    const select =
+      (name: string) =>
+      (message: string) =>
+      async <Choice extends string>(
+        choices: Choice[],
+        filter?: (choice: string) => Choice,
+      ): Promise<Choice> => {
+        questioned.value = true;
+        return (
+          await prompt()({
+            type: "list",
+            name: name,
+            message: message,
+            choices: choices,
+            ...(filter
+              ? {
+                  filter,
+                }
+              : {}),
+          })
+        )[name];
+      };
+    const configure = async (): Promise<string | null> => {
+      const fileList: string[] = await (
+        await fs.promises.readdir(process.cwd())
+      )
+        .filter(
+          (str) =>
+            str.substring(0, 8) === "tsconfig" &&
+            str.substring(str.length - 5) === ".json",
+        )
+        .sort((x, y) =>
+          x === "tsconfig.json"
+            ? -1
+            : y === "tsconfig.json"
+            ? 1
+            : x < y
+            ? -1
+            : 1,
+        );
+      if (fileList.length === 0) {
+        if (process.cwd() !== pack.directory)
+          throw new URIError(`Unable to find "tsconfig.json" file.`);
+        return null;
+      } else if (fileList.length === 1) return fileList[0]!;
+      return select("tsconfig")("TS Config File")(fileList);
+    };
+
+    // DO CONSTRUCT
+    return action(async (options) => {
+      pack.manager = options.manager ??= await select("manager")(
+        "Package Manager",
+      )(
+        [
+          "npm" as const,
+          "pnpm" as const,
+          "yarn (berry is not supported)" as "yarn",
+        ],
+        (value) => value.split(" ")[0] as "yarn",
+      );
+      options.project ??= await configure();
+
+      if (questioned.value) console.log("");
+      return options as IArguments;
+    });
+  };
+}

package/src/executable/setup/ArgumentParser.ts

@@ -1,43 +1,43 @@
-import commander from "commander";
-import inquirer from "inquirer";
-
-import { PackageManager } from "./PackageManager";
-
-export namespace ArgumentParser {
-  export type Inquiry<T> = (
-    pack: PackageManager,
-    command: commander.Command,
-    prompt: (opt?: inquirer.StreamOptions) => inquirer.PromptModule,
-    action: (closure: (options: Partial<T>) => Promise<T>) => Promise<T>,
-  ) => Promise<T>;
-
-  export const parse =
-    (pack: PackageManager) =>
-    async <T>(
-      inquiry: (
-        pack: PackageManager,
-        command: commander.Command,
-        prompt: (opt?: inquirer.StreamOptions) => inquirer.PromptModule,
-        action: (closure: (options: Partial<T>) => Promise<T>) => Promise<T>,
-      ) => Promise<T>,
-    ): Promise<T> => {
-      // TAKE OPTIONS
-      const action = (closure: (options: Partial<T>) => Promise<T>) =>
-        new Promise<T>((resolve, reject) => {
-          commander.program.action(async (options) => {
-            try {
-              resolve(await closure(options));
-            } catch (exp) {
-              reject(exp);
-            }
-          });
-          commander.program.parseAsync().catch(reject);
-        });
-      return inquiry(
-        pack,
-        commander.program,
-        inquirer.createPromptModule,
-        action,
-      );
-    };
-}
+import commander from "commander";
+import inquirer from "inquirer";
+
+import { PackageManager } from "./PackageManager";
+
+export namespace ArgumentParser {
+  export type Inquiry<T> = (
+    pack: PackageManager,
+    command: commander.Command,
+    prompt: (opt?: inquirer.StreamOptions) => inquirer.PromptModule,
+    action: (closure: (options: Partial<T>) => Promise<T>) => Promise<T>,
+  ) => Promise<T>;
+
+  export const parse =
+    (pack: PackageManager) =>
+    async <T>(
+      inquiry: (
+        pack: PackageManager,
+        command: commander.Command,
+        prompt: (opt?: inquirer.StreamOptions) => inquirer.PromptModule,
+        action: (closure: (options: Partial<T>) => Promise<T>) => Promise<T>,
+      ) => Promise<T>,
+    ): Promise<T> => {
+      // TAKE OPTIONS
+      const action = (closure: (options: Partial<T>) => Promise<T>) =>
+        new Promise<T>((resolve, reject) => {
+          commander.program.action(async (options) => {
+            try {
+              resolve(await closure(options));
+            } catch (exp) {
+              reject(exp);
+            }
+          });
+          commander.program.parseAsync().catch(reject);
+        });
+      return inquiry(
+        pack,
+        commander.program,
+        inquirer.createPromptModule,
+        action,
+      );
+    };
+}

package/src/executable/setup/CommandExecutor.ts

@@ -1,8 +1,8 @@
-import cp from "child_process";
-
-export namespace CommandExecutor {
-  export const run = (str: string): void => {
-    console.log(`\n$ ${str}`);
-    cp.execSync(str, { stdio: "inherit" });
-  };
-}
+import cp from "child_process";
+
+export namespace CommandExecutor {
+  export const run = (str: string): void => {
+    console.log(`\n$ ${str}`);
+    cp.execSync(str, { stdio: "inherit" });
+  };
+}

package/src/executable/setup/FileRetriever.ts

@@ -1,22 +1,22 @@
-import fs from "fs";
-import path from "path";
-
-export namespace FileRetriever {
-  export const directory =
-    (name: string) =>
-    (dir: string, depth: number = 0): string | null => {
-      const location: string = path.join(dir, name);
-      if (fs.existsSync(location)) return dir;
-      else if (depth > 2) return null;
-      return directory(name)(path.join(dir, ".."), depth + 1);
-    };
-
-  export const file =
-    (name: string) =>
-    (directory: string, depth: number = 0): string | null => {
-      const location: string = path.join(directory, name);
-      if (fs.existsSync(location)) return location;
-      else if (depth > 2) return null;
-      return file(name)(path.join(directory, ".."), depth + 1);
-    };
-}
+import fs from "fs";
+import path from "path";
+
+export namespace FileRetriever {
+  export const directory =
+    (name: string) =>
+    (dir: string, depth: number = 0): string | null => {
+      const location: string = path.join(dir, name);
+      if (fs.existsSync(location)) return dir;
+      else if (depth > 2) return null;
+      return directory(name)(path.join(dir, ".."), depth + 1);
+    };
+
+  export const file =
+    (name: string) =>
+    (directory: string, depth: number = 0): string | null => {
+      const location: string = path.join(directory, name);
+      if (fs.existsSync(location)) return location;
+      else if (depth > 2) return null;
+      return file(name)(path.join(directory, ".."), depth + 1);
+    };
+}

package/src/executable/setup/PackageManager.ts

@@ -1,71 +1,71 @@
-import fs from "fs";
-import path from "path";
-
-import { CommandExecutor } from "./CommandExecutor";
-import { FileRetriever } from "./FileRetriever";
-
-export class PackageManager {
-  public manager: string = "npm";
-  public get file(): string {
-    return path.join(this.directory, "package.json");
-  }
-
-  public static async mount(): Promise<PackageManager> {
-    const location: string | null = await FileRetriever.directory(
-      "package.json",
-    )(process.cwd());
-    if (location === null)
-      throw new URIError(`Unable to find "package.json" file`);
-
-    return new PackageManager(
-      location,
-      await this.load(path.join(location, "package.json")),
-    );
-  }
-
-  public async save(modifier: (data: Package.Data) => void): Promise<void> {
-    const content: string = await fs.promises.readFile(this.file, "utf8");
-    this.data = JSON.parse(content);
-    modifier(this.data);
-
-    return fs.promises.writeFile(
-      this.file,
-      JSON.stringify(this.data, null, 2),
-      "utf8",
-    );
-  }
-
-  public install(props: {
-    dev: boolean;
-    modulo: string;
-    version: string;
-  }): boolean {
-    const middle: string =
-      this.manager === "yarn"
-        ? `add${props.dev ? " -D" : ""}`
-        : `install ${props.dev ? "--save-dev" : "--save"}`;
-    CommandExecutor.run(
-      `${this.manager} ${middle} ${props.modulo}${
-        props.version ? `@${props.version}` : ""
-      }`,
-    );
-    return true;
-  }
-
-  private constructor(
-    public readonly directory: string,
-    public data: Package.Data,
-  ) {}
-
-  private static async load(file: string): Promise<Package.Data> {
-    const content: string = await fs.promises.readFile(file, "utf8");
-    return JSON.parse(content);
-  }
-}
-export namespace Package {
-  export interface Data {
-    scripts?: Record<string, string>;
-    dependencies?: Record<string, string>;
-    devDependencies?: Record<string, string>;
-  }
-}
+import fs from "fs";
+import path from "path";
+
+import { CommandExecutor } from "./CommandExecutor";
+import { FileRetriever } from "./FileRetriever";
+
+export class PackageManager {
+  public manager: string = "npm";
+  public get file(): string {
+    return path.join(this.directory, "package.json");
+  }
+
+  public static async mount(): Promise<PackageManager> {
+    const location: string | null = await FileRetriever.directory(
+      "package.json",
+    )(process.cwd());
+    if (location === null)
+      throw new URIError(`Unable to find "package.json" file`);
+
+    return new PackageManager(
+      location,
+      await this.load(path.join(location, "package.json")),
+    );
+  }
+
+  public async save(modifier: (data: Package.Data) => void): Promise<void> {
+    const content: string = await fs.promises.readFile(this.file, "utf8");
+    this.data = JSON.parse(content);
+    modifier(this.data);
+
+    return fs.promises.writeFile(
+      this.file,
+      JSON.stringify(this.data, null, 2),
+      "utf8",
+    );
+  }
+
+  public install(props: {
+    dev: boolean;
+    modulo: string;
+    version: string;
+  }): boolean {
+    const middle: string =
+      this.manager === "yarn"
+        ? `add${props.dev ? " -D" : ""}`
+        : `install ${props.dev ? "--save-dev" : "--save"}`;
+    CommandExecutor.run(
+      `${this.manager} ${middle} ${props.modulo}${
+        props.version ? `@${props.version}` : ""
+      }`,
+    );
+    return true;
+  }
+
+  private constructor(
+    public readonly directory: string,
+    public data: Package.Data,
+  ) {}
+
+  private static async load(file: string): Promise<Package.Data> {
+    const content: string = await fs.promises.readFile(file, "utf8");
+    return JSON.parse(content);
+  }
+}
+export namespace Package {
+  export interface Data {
+    scripts?: Record<string, string>;
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+  }
+}