typia 4.1.2-dev.20230630 → 4.1.3-dev.20230704

package/src/executable/setup/PluginConfigurator.ts

@@ -1,70 +1,70 @@
-import comments from "comment-json";
-import fs from "fs";
-
-import { TypiaSetupWizard } from "../TypiaSetupWizard";
-
-export namespace PluginConfigurator {
-    export async function configure(
-        args: TypiaSetupWizard.IArguments,
-    ): Promise<void> {
-        // GET COMPILER-OPTIONS
-        const config: comments.CommentObject = comments.parse(
-            await fs.promises.readFile(args.project!, "utf8"),
-        ) as comments.CommentObject;
-        const compilerOptions = config.compilerOptions as
-            | comments.CommentObject
-            | undefined;
-        if (compilerOptions === undefined)
-            throw new Error(
-                `${args.project} file does not have "compilerOptions" property.`,
-            );
-
-        // PREPARE PLUGINS
-        const plugins: comments.CommentArray<comments.CommentObject> = (() => {
-            const plugins = compilerOptions.plugins as
-                | comments.CommentArray<comments.CommentObject>
-                | undefined;
-            if (plugins === undefined)
-                return (compilerOptions.plugins = [] as any);
-            else if (!Array.isArray(plugins))
-                throw new Error(
-                    `"plugins" property of ${args.project} must be array type.`,
-                );
-            return plugins;
-        })();
-
-        const strict: boolean | undefined = compilerOptions.strict as
-            | boolean
-            | undefined;
-        const strictNullChecks: boolean | undefined =
-            compilerOptions.strictNullChecks as boolean | undefined;
-        const oldbie: comments.CommentObject | undefined = plugins.find(
-            (p) =>
-                typeof p === "object" &&
-                p !== null &&
-                p.transform === "typia/lib/transform",
-        );
-        if (
-            strictNullChecks !== false &&
-            (strict === true || strictNullChecks === true) &&
-            oldbie !== undefined
-        )
-            return;
-
-        // DO CONFIGURE
-        compilerOptions.strictNullChecks = true;
-        if (strict === undefined && strictNullChecks === undefined)
-            compilerOptions.strict = true;
-        if (oldbie === undefined)
-            plugins.push(
-                comments.parse(`
-                        {
-                            "transform": "typia/lib/transform"
-                        }`) as comments.CommentObject,
-            );
-        await fs.promises.writeFile(
-            args.project!,
-            comments.stringify(config, null, 2),
-        );
-    }
-}
+import comments from "comment-json";
+import fs from "fs";
+
+import { TypiaSetupWizard } from "../TypiaSetupWizard";
+
+export namespace PluginConfigurator {
+    export async function configure(
+        args: TypiaSetupWizard.IArguments,
+    ): Promise<void> {
+        // GET COMPILER-OPTIONS
+        const config: comments.CommentObject = comments.parse(
+            await fs.promises.readFile(args.project!, "utf8"),
+        ) as comments.CommentObject;
+        const compilerOptions = config.compilerOptions as
+            | comments.CommentObject
+            | undefined;
+        if (compilerOptions === undefined)
+            throw new Error(
+                `${args.project} file does not have "compilerOptions" property.`,
+            );
+
+        // PREPARE PLUGINS
+        const plugins: comments.CommentArray<comments.CommentObject> = (() => {
+            const plugins = compilerOptions.plugins as
+                | comments.CommentArray<comments.CommentObject>
+                | undefined;
+            if (plugins === undefined)
+                return (compilerOptions.plugins = [] as any);
+            else if (!Array.isArray(plugins))
+                throw new Error(
+                    `"plugins" property of ${args.project} must be array type.`,
+                );
+            return plugins;
+        })();
+
+        const strict: boolean | undefined = compilerOptions.strict as
+            | boolean
+            | undefined;
+        const strictNullChecks: boolean | undefined =
+            compilerOptions.strictNullChecks as boolean | undefined;
+        const oldbie: comments.CommentObject | undefined = plugins.find(
+            (p) =>
+                typeof p === "object" &&
+                p !== null &&
+                p.transform === "typia/lib/transform",
+        );
+        if (
+            strictNullChecks !== false &&
+            (strict === true || strictNullChecks === true) &&
+            oldbie !== undefined
+        )
+            return;
+
+        // DO CONFIGURE
+        compilerOptions.strictNullChecks = true;
+        if (strict === undefined && strictNullChecks === undefined)
+            compilerOptions.strict = true;
+        if (oldbie === undefined)
+            plugins.push(
+                comments.parse(`
+                        {
+                            "transform": "typia/lib/transform"
+                        }`) as comments.CommentObject,
+            );
+        await fs.promises.writeFile(
+            args.project!,
+            comments.stringify(config, null, 2),
+        );
+    }
+}

package/src/executable/typia.ts

@@ -1,52 +1,52 @@
-#!/usr/bin/env node
-const USAGE = `Wrong command has been detected. Use like below:
-
-  npx typia setup \\
-    --manager (npm|pnpm|yarn) \\
-    --project {tsconfig.json file path}
-
-    - npx typia setup
-    - npx typia setup --manager pnpm
-    - npx typia setup --project tsconfig.test.json
-
-  npx typia generate 
-    --input {directory} \\
-    --output {directory}
-
-    --npx typia generate --input src/templates --output src/functinoal
-`;
-
-const halt = (desc: string): never => {
-    console.error(desc);
-    process.exit(-1);
-};
-
-const main = async (): Promise<void> => {
-    try {
-        await import("comment-json");
-        await import("inquirer");
-        await import("commander");
-    } catch {
-        halt(`typia has not been installed. Run "npm i typia" before.`);
-    }
-
-    const type: string | undefined = process.argv[2];
-    if (type === "setup") {
-        const { TypiaSetupWizard } = await import("./TypiaSetupWizard");
-        await TypiaSetupWizard.setup();
-    } else if (type === "generate") {
-        try {
-            await import("typescript");
-        } catch {
-            halt(
-                `typescript has not been installed. Run "npm i -D typescript" before.`,
-            );
-        }
-        const { TypiaGenerateWizard } = await import("./TypiaGenerateWizard");
-        await TypiaGenerateWizard.generate();
-    } else halt(USAGE);
-};
-main().catch((exp) => {
-    console.error(exp);
-    process.exit(-1);
-});
+#!/usr/bin/env node
+const USAGE = `Wrong command has been detected. Use like below:
+
+  npx typia setup \\
+    --manager (npm|pnpm|yarn) \\
+    --project {tsconfig.json file path}
+
+    - npx typia setup
+    - npx typia setup --manager pnpm
+    - npx typia setup --project tsconfig.test.json
+
+  npx typia generate 
+    --input {directory} \\
+    --output {directory}
+
+    --npx typia generate --input src/templates --output src/functinoal
+`;
+
+const halt = (desc: string): never => {
+    console.error(desc);
+    process.exit(-1);
+};
+
+const main = async (): Promise<void> => {
+    try {
+        await import("comment-json");
+        await import("inquirer");
+        await import("commander");
+    } catch {
+        halt(`typia has not been installed. Run "npm i typia" before.`);
+    }
+
+    const type: string | undefined = process.argv[2];
+    if (type === "setup") {
+        const { TypiaSetupWizard } = await import("./TypiaSetupWizard");
+        await TypiaSetupWizard.setup();
+    } else if (type === "generate") {
+        try {
+            await import("typescript");
+        } catch {
+            halt(
+                `typescript has not been installed. Run "npm i -D typescript" before.`,
+            );
+        }
+        const { TypiaGenerateWizard } = await import("./TypiaGenerateWizard");
+        await TypiaGenerateWizard.generate();
+    } else halt(USAGE);
+};
+main().catch((exp) => {
+    console.error(exp);
+    process.exit(-1);
+});

package/src/factories/CommentFactory.ts

@@ -1,64 +1,64 @@
-import ts from "typescript";
-
-export namespace CommentFactory {
-    export const description = (symbol: ts.Symbol): string | undefined => {
-        const node = symbol.declarations?.[0];
-        if (!node) return undefined;
-
-        const range = ts.getCommentRange(node);
-        const text: string = node
-            .getSourceFile()
-            .text.substring(range.pos, range.end);
-        const output: string = transform(text).join("\n");
-        return output.length ? output : undefined;
-    };
-
-    export const merge = (comments: ts.SymbolDisplayPart[]): string =>
-        comments
-            .map((part) => part.text)
-            .map((str) => str.split("\r\n").join("\n"))
-            .join("");
-}
-
-const transform = (text: string): string[] => {
-    const elements: string[] = text.split("\r\n").join("\n").split("\n");
-    const first: number = lastIndexOf(elements)((elem) =>
-        elem.trim().startsWith("/**"),
-    );
-    const last: number = lastIndexOf(elements)((elem) =>
-        elem.trim().endsWith("*/"),
-    );
-
-    const cut: string[] = elements.slice(first, last + 1);
-    return cut
-        .map((elem, i) => {
-            if (i === 0) elem = elem.substring(elem.lastIndexOf("/**") + 3);
-            if (i === cut.length - 1)
-                elem = elem.substring(0, elem.lastIndexOf("*/"));
-            return trim(elem);
-        })
-        .filter(
-            (str, i, array) =>
-                (i !== 0 && i !== array.length - 1) || !!str.length,
-        );
-};
-
-const lastIndexOf =
-    <T>(array: T[]) =>
-    (pred: (elem: T) => boolean) => {
-        for (let i = array.length - 1; i >= 0; i--)
-            if (pred(array[i]!)) return i;
-        return -1;
-    };
-
-const trim = (str: string): string => {
-    const vulnerable = (ch: string) =>
-        ch === " " || ch === "\n" || ch === "\t" || ch === "*";
-    let start: number;
-    let end: number;
-    for (start = 0; start < str.length; ++start)
-        if (!vulnerable(str.charAt(start))) break;
-    for (end = str.length - 1; end >= 0; --end)
-        if (!vulnerable(str.charAt(end))) break;
-    return start > end ? "" : str.substring(start, end + 1).trim();
-};
+import ts from "typescript";
+
+export namespace CommentFactory {
+    export const description = (symbol: ts.Symbol): string | undefined => {
+        const node = symbol.declarations?.[0];
+        if (!node) return undefined;
+
+        const range = ts.getCommentRange(node);
+        const text: string = node
+            .getSourceFile()
+            .text.substring(range.pos, range.end);
+        const output: string = transform(text).join("\n");
+        return output.length ? output : undefined;
+    };
+
+    export const merge = (comments: ts.SymbolDisplayPart[]): string =>
+        comments
+            .map((part) => part.text)
+            .map((str) => str.split("\r\n").join("\n"))
+            .join("");
+}
+
+const transform = (text: string): string[] => {
+    const elements: string[] = text.split("\r\n").join("\n").split("\n");
+    const first: number = lastIndexOf(elements)((elem) =>
+        elem.trim().startsWith("/**"),
+    );
+    const last: number = lastIndexOf(elements)((elem) =>
+        elem.trim().endsWith("*/"),
+    );
+
+    const cut: string[] = elements.slice(first, last + 1);
+    return cut
+        .map((elem, i) => {
+            if (i === 0) elem = elem.substring(elem.lastIndexOf("/**") + 3);
+            if (i === cut.length - 1)
+                elem = elem.substring(0, elem.lastIndexOf("*/"));
+            return trim(elem);
+        })
+        .filter(
+            (str, i, array) =>
+                (i !== 0 && i !== array.length - 1) || !!str.length,
+        );
+};
+
+const lastIndexOf =
+    <T>(array: T[]) =>
+    (pred: (elem: T) => boolean) => {
+        for (let i = array.length - 1; i >= 0; i--)
+            if (pred(array[i]!)) return i;
+        return -1;
+    };
+
+const trim = (str: string): string => {
+    const vulnerable = (ch: string) =>
+        ch === " " || ch === "\n" || ch === "\t" || ch === "*";
+    let start: number;
+    let end: number;
+    for (start = 0; start < str.length; ++start)
+        if (!vulnerable(str.charAt(start))) break;
+    for (end = str.length - 1; end >= 0; --end)
+        if (!vulnerable(str.charAt(end))) break;
+    return start > end ? "" : str.substring(start, end + 1).trim();
+};

package/src/factories/ExpressionFactory.ts

@@ -1,70 +1,70 @@
-import ts from "typescript";
-
-export namespace ExpressionFactory {
-    export const isRequired = (input: ts.Expression): ts.Expression =>
-        ts.factory.createStrictInequality(
-            ts.factory.createIdentifier("undefined"),
-            input,
-        );
-
-    export const isArray = (input: ts.Expression): ts.Expression =>
-        ts.factory.createCallExpression(
-            ts.factory.createIdentifier("Array.isArray"),
-            undefined,
-            [input],
-        );
-
-    export const isObject =
-        (options: { checkNull: boolean; checkArray: boolean }) =>
-        (input: ts.Expression): ts.Expression => {
-            const conditions: ts.Expression[] = [
-                ts.factory.createStrictEquality(
-                    ts.factory.createStringLiteral("object"),
-                    ts.factory.createTypeOfExpression(input),
-                ),
-            ];
-            if (options.checkNull === true)
-                conditions.push(
-                    ts.factory.createStrictInequality(
-                        ts.factory.createNull(),
-                        input,
-                    ),
-                );
-            if (options.checkArray === true)
-                conditions.push(
-                    ts.factory.createStrictEquality(
-                        ts.factory.createFalse(),
-                        ts.factory.createCallExpression(
-                            ts.factory.createIdentifier("Array.isArray"),
-                            undefined,
-                            [input],
-                        ),
-                    ),
-                );
-
-            return conditions.length === 1
-                ? conditions[0]!
-                : conditions.reduce((x, y) =>
-                      ts.factory.createLogicalAnd(x, y),
-                  );
-        };
-
-    export const isInstanceOf =
-        (type: string) =>
-        (input: ts.Expression): ts.Expression => {
-            return ts.factory.createBinaryExpression(
-                input,
-                ts.factory.createToken(ts.SyntaxKind.InstanceOfKeyword),
-                ts.factory.createIdentifier(type),
-            );
-        };
-
-    export const coalesce =
-        (x: ts.Expression) =>
-        (y: ts.Expression): ts.Expression =>
-            ts.factory.createBinaryExpression(
-                x,
-                ts.factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
-                y,
-            );
-}
+import ts from "typescript";
+
+export namespace ExpressionFactory {
+    export const isRequired = (input: ts.Expression): ts.Expression =>
+        ts.factory.createStrictInequality(
+            ts.factory.createIdentifier("undefined"),
+            input,
+        );
+
+    export const isArray = (input: ts.Expression): ts.Expression =>
+        ts.factory.createCallExpression(
+            ts.factory.createIdentifier("Array.isArray"),
+            undefined,
+            [input],
+        );
+
+    export const isObject =
+        (options: { checkNull: boolean; checkArray: boolean }) =>
+        (input: ts.Expression): ts.Expression => {
+            const conditions: ts.Expression[] = [
+                ts.factory.createStrictEquality(
+                    ts.factory.createStringLiteral("object"),
+                    ts.factory.createTypeOfExpression(input),
+                ),
+            ];
+            if (options.checkNull === true)
+                conditions.push(
+                    ts.factory.createStrictInequality(
+                        ts.factory.createNull(),
+                        input,
+                    ),
+                );
+            if (options.checkArray === true)
+                conditions.push(
+                    ts.factory.createStrictEquality(
+                        ts.factory.createFalse(),
+                        ts.factory.createCallExpression(
+                            ts.factory.createIdentifier("Array.isArray"),
+                            undefined,
+                            [input],
+                        ),
+                    ),
+                );
+
+            return conditions.length === 1
+                ? conditions[0]!
+                : conditions.reduce((x, y) =>
+                      ts.factory.createLogicalAnd(x, y),
+                  );
+        };
+
+    export const isInstanceOf =
+        (type: string) =>
+        (input: ts.Expression): ts.Expression => {
+            return ts.factory.createBinaryExpression(
+                input,
+                ts.factory.createToken(ts.SyntaxKind.InstanceOfKeyword),
+                ts.factory.createIdentifier(type),
+            );
+        };
+
+    export const coalesce =
+        (x: ts.Expression) =>
+        (y: ts.Expression): ts.Expression =>
+            ts.factory.createBinaryExpression(
+                x,
+                ts.factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+                y,
+            );
+}

package/src/factories/IdentifierFactory.ts

@@ -1,59 +1,59 @@
-import ts from "typescript";
-
-import { Escaper } from "../utils/Escaper";
-
-import { TypeFactory } from "./TypeFactory";
-
-export namespace IdentifierFactory {
-    export const identifier = (name: string) =>
-        Escaper.variable(name)
-            ? ts.factory.createIdentifier(name)
-            : ts.factory.createStringLiteral(name);
-
-    export const access = (target: ts.Expression) => (property: string) => {
-        const postfix = identifier(property);
-        return ts.isStringLiteral(postfix)
-            ? ts.factory.createElementAccessExpression(target, postfix)
-            : ts.factory.createPropertyAccessExpression(target, postfix);
-    };
-
-    export const postfix = (str: string): string =>
-        Escaper.variable(str)
-            ? `".${str}"`
-            : `"[${JSON.stringify(str).split('"').join('\\"')}]"`;
-
-    export const parameter = (
-        name: string | ts.BindingName,
-        type?: ts.TypeNode,
-        init?: ts.Expression | ts.PunctuationToken<ts.SyntaxKind.QuestionToken>,
-    ) => {
-        // instead of ts.version >= "4.8"
-        if (ts.getDecorators !== undefined)
-            return ts.factory.createParameterDeclaration(
-                undefined,
-                undefined,
-                name,
-                init?.kind === ts.SyntaxKind.QuestionToken
-                    ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
-                    : undefined,
-                type ?? TypeFactory.keyword("any"),
-                init && init.kind !== ts.SyntaxKind.QuestionToken
-                    ? init
-                    : undefined,
-            );
-        // eslint-disable-next-line
-        return (ts.factory.createParameterDeclaration as any)(
-            undefined,
-            undefined,
-            undefined,
-            name,
-            init?.kind === ts.SyntaxKind.QuestionToken
-                ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
-                : undefined,
-            type,
-            init && init.kind !== ts.SyntaxKind.QuestionToken
-                ? init
-                : undefined,
-        );
-    };
-}
+import ts from "typescript";
+
+import { Escaper } from "../utils/Escaper";
+
+import { TypeFactory } from "./TypeFactory";
+
+export namespace IdentifierFactory {
+    export const identifier = (name: string) =>
+        Escaper.variable(name)
+            ? ts.factory.createIdentifier(name)
+            : ts.factory.createStringLiteral(name);
+
+    export const access = (target: ts.Expression) => (property: string) => {
+        const postfix = identifier(property);
+        return ts.isStringLiteral(postfix)
+            ? ts.factory.createElementAccessExpression(target, postfix)
+            : ts.factory.createPropertyAccessExpression(target, postfix);
+    };
+
+    export const postfix = (str: string): string =>
+        Escaper.variable(str)
+            ? `".${str}"`
+            : `"[${JSON.stringify(str).split('"').join('\\"')}]"`;
+
+    export const parameter = (
+        name: string | ts.BindingName,
+        type?: ts.TypeNode,
+        init?: ts.Expression | ts.PunctuationToken<ts.SyntaxKind.QuestionToken>,
+    ) => {
+        // instead of ts.version >= "4.8"
+        if (ts.getDecorators !== undefined)
+            return ts.factory.createParameterDeclaration(
+                undefined,
+                undefined,
+                name,
+                init?.kind === ts.SyntaxKind.QuestionToken
+                    ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
+                    : undefined,
+                type ?? TypeFactory.keyword("any"),
+                init && init.kind !== ts.SyntaxKind.QuestionToken
+                    ? init
+                    : undefined,
+            );
+        // eslint-disable-next-line
+        return (ts.factory.createParameterDeclaration as any)(
+            undefined,
+            undefined,
+            undefined,
+            name,
+            init?.kind === ts.SyntaxKind.QuestionToken
+                ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
+                : undefined,
+            type,
+            init && init.kind !== ts.SyntaxKind.QuestionToken
+                ? init
+                : undefined,
+        );
+    };
+}