typia 5.0.0-dev.20230730 → 5.0.0-dev.20230808

package/lib/utils/PatternUtil.js

@@ -30,7 +30,9 @@ var PatternUtil;
             .replace(/[|\\/{}()[\]^$+*?.]/g, "\\$&")
             .replace(/-/g, "\\x2d");
     };
-    PatternUtil.NUMBER = "-?\\d+\\.?\\d*";
+    PatternUtil.NUMBER = "[+-]?" +
+        "\\d+(?:\\.\\d+)?" +
+        "(?:[eE][+-]?\\d+)?";
     PatternUtil.BOOLEAN = "true|false";
     PatternUtil.STRING = "(.*)";
 })(PatternUtil || (exports.PatternUtil = PatternUtil = {}));

package/lib/utils/PatternUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"PatternUtil.js","sourceRoot":"","sources":["../../src/utils/PatternUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,IAAiB,WAAW,CAsB3B;AAtBD,WAAiB,WAAW;IACX,eAAG,GAAG,UAAC,GAAW;QAC3B,IAAM,KAAK,GAAW,GAAG,CAAC,OAAO,CAAC,YAAA,MAAM,CAAC,CAAC;QAC1C,IAAM,IAAI,GAAW,GAAG,CAAC,WAAW,CAAC,YAAA,MAAM,CAAC,CAAC;QAC7C,OAAO;YACH,KAAK,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACzD,GAAG;YACH,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,YAAA,MAAM,CAAC,MAAM,CAAC,CAAC;gBACrD,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,EAAE;SACX,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC,CAAC;IAEW,kBAAM,GAAG,UAAC,GAAW;QAC9B,OAAO,GAAG;aACL,OAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC;aACvC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC;IAEW,kBAAM,GAAG,gBAAgB,CAAC;IAC1B,mBAAO,GAAG,YAAY,CAAC;IACvB,kBAAM,GAAG,MAAM,CAAC;AACjC,CAAC,EAtBgB,WAAW,2BAAX,WAAW,QAsB3B;AAED,IAAM,IAAI,GACN,UAAC,WAAmB;IACpB,OAAA,UAAC,GAAW;;;YACR,KAAiB,IAAA,QAAA,SAAA,GAAG,CAAA,wBAAA;gBAAf,IAAM,EAAE,gBAAA;gBAAS,IAAI,EAAE,KAAK,WAAW;oBAAE,OAAO,IAAI,CAAC;aAAA;;;;;;;;;QAC1D,OAAO,KAAK,CAAC;IACjB,CAAC;AAHD,CAGC,CAAC"}
+{"version":3,"file":"PatternUtil.js","sourceRoot":"","sources":["../../src/utils/PatternUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,IAAiB,WAAW,CAyB3B;AAzBD,WAAiB,WAAW;IACX,eAAG,GAAG,UAAC,GAAW;QAC3B,IAAM,KAAK,GAAW,GAAG,CAAC,OAAO,CAAC,YAAA,MAAM,CAAC,CAAC;QAC1C,IAAM,IAAI,GAAW,GAAG,CAAC,WAAW,CAAC,YAAA,MAAM,CAAC,CAAC;QAC7C,OAAO;YACH,KAAK,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACzD,GAAG;YACH,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,YAAA,MAAM,CAAC,MAAM,CAAC,CAAC;gBACrD,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,EAAE;SACX,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC,CAAC;IAEW,kBAAM,GAAG,UAAC,GAAW;QAC9B,OAAO,GAAG;aACL,OAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC;aACvC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC;IAEW,kBAAM,GACf,OAAO;QACP,kBAAkB;QAClB,oBAAoB,CAAC;IACZ,mBAAO,GAAG,YAAY,CAAC;IACvB,kBAAM,GAAG,MAAM,CAAC;AACjC,CAAC,EAzBgB,WAAW,2BAAX,WAAW,QAyB3B;AAED,IAAM,IAAI,GACN,UAAC,WAAmB;IACpB,OAAA,UAAC,GAAW;;;YACR,KAAiB,IAAA,QAAA,SAAA,GAAG,CAAA,wBAAA;gBAAf,IAAM,EAAE,gBAAA;gBAAS,IAAI,EAAE,KAAK,WAAW;oBAAE,OAAO,IAAI,CAAC;aAAA;;;;;;;;;QAC1D,OAAO,KAAK,CAAC;IACjB,CAAC;AAHD,CAGC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typia",
-  "version": "5.0.0-dev.20230730",
+  "version": "5.0.0-dev.20230808",
   "description": "Superfast runtime validators with only one line",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -107,7 +107,7 @@
     "d3": "^5.16.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "express": "^4.18.2",
-    "fast-json-stringify": "^5.4.0",
+    "fast-json-stringify": "^5.8.0",
     "fastify": "^4.9.2",
     "io-ts": "^2.2.19",
     "jsdom": "^21.1.1",
@@ -128,7 +128,7 @@
     "zod": "^3.19.1"
   },
   "stackblitzs": {
-    "startCommand": "npm run prepare && npm run build && npm run build:test && npm run test"
+    "startCommand": "npm run postinstall && npm run build && npm run build:test && npm run test"
   },
   "files": [
     "LICENSE",

package/src/executable/TypiaSetupWizard.ts

@@ -40,23 +40,37 @@ export namespace TypiaSetupWizard {
             })(),
         });
         args.project ??= (() => {
-            CommandExecutor.run("npx tsc --init");
+            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 POSTINSTALL COMMAND
             data.scripts ??= {};
             if (
-                typeof data.scripts.prepare === "string" &&
-                data.scripts.prepare.length
+                typeof data.scripts.postinstall === "string" &&
+                data.scripts.postinstall.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";
+                if (data.scripts.postinstall.indexOf("ts-patch install") === -1)
+                    data.scripts.postinstall =
+                        "ts-patch install && " + data.scripts.postinstall;
+            } else data.scripts.postinstall = "ts-patch install";
+
+            // FOR OLDER VERSIONS
+            if (typeof data.scripts.prepare === "string") {
+                data.scripts.prepare = data.scripts.prepare
+                    .split("&&")
+                    .map((str) => str.trim())
+                    .filter((str) => str.indexOf("ts-patch install") === -1)
+                    .join(" && ");
+                if (data.scripts.prepare.length === 0)
+                    delete data.scripts.prepare;
+            }
         });
-        CommandExecutor.run("npm run prepare");
+        CommandExecutor.run(`${pack.manager} run postinstall`);
 
         // CONFIGURE TYPIA
         await PluginConfigurator.configure(args);
@@ -79,6 +93,7 @@ export namespace TypiaSetupWizard {
             (message: string) =>
             async <Choice extends string>(
                 choices: Choice[],
+                filter?: (choice: string) => Choice,
             ): Promise<Choice> => {
                 questioned.value = true;
                 return (
@@ -87,6 +102,7 @@ export namespace TypiaSetupWizard {
                         name: name,
                         message: message,
                         choices: choices,
+                        filter,
                     })
                 )[name];
             };
@@ -118,12 +134,16 @@ export namespace TypiaSetupWizard {
 
         // DO CONSTRUCT
         return action(async (options) => {
-            options.manager ??= await select("manager")("Package Manager")([
-                "npm" as const,
-                "pnpm" as const,
-                "yarn" as const,
-            ]);
-            pack.manager = options.manager;
+            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("");

package/src/factories/CommentFactory.ts

@@ -1,76 +1,84 @@
-import ts from "typescript";
-
-export namespace CommentFactory {
-    export const description = (symbol: ts.Symbol): string | undefined => {
-        const node = symbol.declarations?.[0];
-        if (!node) return undefined;
-
-        // FOR LEGACY TS < 5.2
-        const [major, minor] = ts.versionMajorMinor.split(".").map(Number) as [
-            number,
-            number,
-        ];
-        if (major < 5 || (major === 5 && minor < 1)) {
-            const content: string[] = [];
-            const main: string = ts.displayPartsToString(
-                symbol.getDocumentationComment(undefined),
-            );
-            if (main.length) {
-                content.push(main);
-                if (symbol.getJsDocTags().length) content.push("");
-            }
-            for (const tag of symbol.getJsDocTags()) {
-                content.push(
-                    tag.text
-                        ? `@${tag.name} ${ts.displayPartsToString(tag.text)}`
-                        : `@${tag.name}`,
-                );
-            }
-            return content.length
-                ? content
-                      .map((line) => line.split("\r\n").join("\n"))
-                      .join("\n")
-                : undefined;
-        }
-
-        // NEW FEATURE OF TS 5.2
-        const elements: readonly (ts.JSDoc | ts.JSDocTag)[] =
-            ts.getJSDocCommentsAndTags(node);
-        if (elements.length === 0) return undefined;
-
-        const content: string[] = [];
-        for (const comment of elements) {
-            if (ts.isJSDoc(comment)) {
-                const parsed: string | undefined = ts.getTextOfJSDocComment(
-                    comment.comment,
-                );
-                if (parsed?.length) {
-                    content.push(parsed);
-                    if (comment.tags?.length) content.push("");
-                }
-                for (const tag of comment.tags ?? [])
-                    content.push(parseJSDocTag(tag));
-            } else content.push(parseJSDocTag(comment));
-        }
-        const output: string = content
-            .map((line) => line.split("\r\n").join("\n"))
-            .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 parseJSDocTag = (tag: ts.JSDocTag): string => {
-    const name: string | undefined = (
-        tag as ts.JSDocParameterTag
-    ).name?.getText();
-    const parsed: string | undefined = ts.getTextOfJSDocComment(tag.comment);
-    return [`@${tag.tagName.text}`, name, parsed]
-        .filter((str) => !!str?.length)
-        .join(" ");
-};
+import ts from "typescript";
+
+export namespace CommentFactory {
+    export const description = (
+        symbol: ts.Symbol,
+        includeTags: boolean = false,
+    ): string | undefined => {
+        const node = symbol.declarations?.[0];
+        if (!node) return undefined;
+
+        // FOR LEGACY TS < 5.2
+        const [major, minor] = ts.versionMajorMinor.split(".").map(Number) as [
+            number,
+            number,
+        ];
+        if (major < 5 || (major === 5 && minor < 1)) {
+            const content: string[] = [];
+            const main: string = ts.displayPartsToString(
+                symbol.getDocumentationComment(undefined),
+            );
+            if (main.length) {
+                content.push(main);
+                if (includeTags && symbol.getJsDocTags().length)
+                    content.push("");
+            }
+            if (includeTags)
+                for (const tag of symbol.getJsDocTags()) {
+                    content.push(
+                        tag.text
+                            ? `@${tag.name} ${ts.displayPartsToString(
+                                  tag.text,
+                              )}`
+                            : `@${tag.name}`,
+                    );
+                }
+            return content.length
+                ? content
+                      .map((line) => line.split("\r\n").join("\n"))
+                      .join("\n")
+                : undefined;
+        }
+
+        // NEW FEATURE OF TS 5.2
+        const elements: readonly (ts.JSDoc | ts.JSDocTag)[] =
+            ts.getJSDocCommentsAndTags(node);
+        if (elements.length === 0) return undefined;
+
+        const content: string[] = [];
+        for (const comment of elements) {
+            if (ts.isJSDoc(comment)) {
+                const parsed: string | undefined = ts.getTextOfJSDocComment(
+                    comment.comment,
+                );
+                if (parsed?.length) {
+                    content.push(parsed);
+                    if (includeTags && comment.tags?.length) content.push("");
+                }
+                if (includeTags)
+                    for (const tag of comment.tags ?? [])
+                        content.push(parseJSDocTag(tag));
+            } else if (includeTags) content.push(parseJSDocTag(comment));
+        }
+        const output: string = content
+            .map((line) => line.split("\r\n").join("\n"))
+            .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 parseJSDocTag = (tag: ts.JSDocTag): string => {
+    const name: string | undefined = (
+        tag as ts.JSDocParameterTag
+    ).name?.getText();
+    const parsed: string | undefined = ts.getTextOfJSDocComment(tag.comment);
+    return [`@${tag.tagName.text}`, name, parsed]
+        .filter((str) => !!str?.length)
+        .join(" ");
+};