typia 3.5.0-dev.20221222 → 3.5.0-dev.20230124

package/src/programmers/MessageProgrammer.ts

@@ -11,6 +11,7 @@ import { Escaper } from "../utils/Escaper";
 import { MapUtil } from "../utils/MapUtil";
 import { NameEncoder } from "../utils/NameEncoder";
 
+import { IProtocolMap } from "../messages/IProtocolMap";
 import { IProtocolMessage } from "../messages/IProtocolMessage";
 
 export namespace MessageProgrammer {
@@ -53,7 +54,7 @@ export namespace MessageProgrammer {
                             TAB,
                             property.required ? "" : "optional ",
                             property.repeated ? "repeated " : "",
-                            NameEncoder.encode(property.oneOf[0]!.type) + " ",
+                            getTypeName(property.oneOf[0]!.type) + " ",
                             Escaper.variable(property.key)
                                 ? property.key
                                 : `v${index + 1}`,
@@ -65,7 +66,7 @@ export namespace MessageProgrammer {
                         property.oneOf
                             .map(
                                 (o, i) =>
-                                    `${TAB}${TAB}${NameEncoder.encode(
+                                    `${TAB}${TAB}${getTypeName(
                                         o.type,
                                     )} o${i} = ${index++};`,
                             )
@@ -105,6 +106,12 @@ export namespace MessageProgrammer {
                 if (i === accessors.length - 1) hierarchy.message = message;
             });
         };
+
+    function getTypeName(type: string | IProtocolMap): string {
+        return typeof type === "string"
+            ? NameEncoder.encode(type)
+            : `map<${type.key}, ${getTypeName(type.value)}>`;
+    }
 }
 
 interface Hierarchy {

package/src/programmers/ValidateProgrammer.ts

@@ -88,7 +88,7 @@ const combine =
     (equals: boolean) =>
     (importer: FunctionImporter): CheckerProgrammer.IConfig.Combiner =>
     (explore: CheckerProgrammer.IExplore) => {
-        if (explore.tracable === false && explore.from !== "top")
+        if (explore.tracable === false)
             return IsProgrammer.CONFIG({
                 object: validate_object(equals)(importer),
                 numeric: true,

package/src/programmers/helpers/AtomicPredicator.ts

@@ -1,15 +1,15 @@
-import { Metadata } from "../../metadata/Metadata";
-
-import { Atomic } from "../../typings/Atomic";
-
-import { ArrayUtil } from "../../utils/ArrayUtil";
-
-export namespace AtomicPredicator {
-    export const constant =
-        (meta: Metadata) =>
-        (name: Atomic.Literal): boolean =>
-            !ArrayUtil.has(meta.atomics, (atomic) => atomic === name);
-
-    export const template = (meta: Metadata): boolean =>
-        !ArrayUtil.has(meta.atomics, (type) => type === "string");
-}
+import { Metadata } from "../../metadata/Metadata";
+
+import { Atomic } from "../../typings/Atomic";
+
+import { ArrayUtil } from "../../utils/ArrayUtil";
+
+export namespace AtomicPredicator {
+    export const constant =
+        (meta: Metadata) =>
+        (name: Atomic.Literal): boolean =>
+            !ArrayUtil.has(meta.atomics, (atomic) => atomic === name);
+
+    export const template = (meta: Metadata): boolean =>
+        !ArrayUtil.has(meta.atomics, (type) => type === "string");
+}

package/src/programmers/helpers/FunctionImporeter.ts

@@ -1,31 +1,31 @@
-import ts from "typescript";
-
-import { IdentifierFactory } from "../../factories/IdentifierFactory";
-import { StatementFactory } from "../../factories/StatementFactory";
-
-export class FunctionImporter {
-    private readonly used_: Set<string> = new Set();
-    private sequence_: number = 0;
-
-    public empty(): boolean {
-        return this.used_.size === 0;
-    }
-
-    public use(name: string): ts.Identifier {
-        this.used_.add(name);
-        return ts.factory.createIdentifier("$" + name);
-    }
-
-    public declare(modulo: ts.LeftHandSideExpression): ts.Statement[] {
-        return [...this.used_].map((name) =>
-            StatementFactory.constant(
-                "$" + name,
-                IdentifierFactory.join(modulo, name),
-            ),
-        );
-    }
-
-    public increment(): number {
-        return ++this.sequence_;
-    }
-}
+import ts from "typescript";
+
+import { IdentifierFactory } from "../../factories/IdentifierFactory";
+import { StatementFactory } from "../../factories/StatementFactory";
+
+export class FunctionImporter {
+    private readonly used_: Set<string> = new Set();
+    private sequence_: number = 0;
+
+    public empty(): boolean {
+        return this.used_.size === 0;
+    }
+
+    public use(name: string): ts.Identifier {
+        this.used_.add(name);
+        return ts.factory.createIdentifier("$" + name);
+    }
+
+    public declare(modulo: ts.LeftHandSideExpression): ts.Statement[] {
+        return [...this.used_].map((name) =>
+            StatementFactory.constant(
+                "$" + name,
+                IdentifierFactory.join(modulo, name),
+            ),
+        );
+    }
+
+    public increment(): number {
+        return ++this.sequence_;
+    }
+}

package/src/programmers/helpers/IExpressionEntry.ts

@@ -1,10 +1,10 @@
-import ts from "typescript";
-
-import { Metadata } from "../../metadata/Metadata";
-
-export interface IExpressionEntry {
-    input: ts.Expression;
-    key: Metadata;
-    meta: Metadata;
-    expression: ts.Expression;
-}
+import ts from "typescript";
+
+import { Metadata } from "../../metadata/Metadata";
+
+export interface IExpressionEntry {
+    input: ts.Expression;
+    key: Metadata;
+    meta: Metadata;
+    expression: ts.Expression;
+}

package/src/programmers/helpers/StringifyJoinder.ts

@@ -1,111 +1,111 @@
-import ts from "typescript";
-
-import { IdentifierFactory } from "../../factories/IdentifierFactory";
-import { TemplateFactory } from "../../factories/TemplateFactory";
-
-import { stringify_dynamic_properties } from "../internal/stringify_dynamic_properties";
-import { stringify_regular_properties } from "../internal/stringify_regular_properties";
-import { FunctionImporter } from "./FunctionImporeter";
-import { IExpressionEntry } from "./IExpressionEntry";
-
-export namespace StringifyJoiner {
-    export const object =
-        (importer: FunctionImporter) =>
-        (entries: IExpressionEntry[]): ts.Expression => {
-            // CHECK AND SORT ENTRIES
-            const regular: IExpressionEntry[] = entries.filter((entry) =>
-                entry.key.isSoleLiteral(),
-            );
-            const dynamic: IExpressionEntry[] = entries.filter(
-                (entry) => !entry.key.isSoleLiteral(),
-            );
-            if (regular.length === 0 && dynamic.length === 0)
-                return ts.factory.createStringLiteral("{}");
-
-            // PROPERTIES
-            const expressions: ts.Expression[] = [
-                ...stringify_regular_properties(regular, dynamic),
-                ...(dynamic.length
-                    ? [
-                          stringify_dynamic_properties(
-                              dynamic,
-                              regular.map((r) => r.key.getSoleLiteral()!),
-                          ),
-                      ]
-                    : []),
-            ];
-
-            // POP LAST COMMA, IF REQUIRED
-            const filtered: ts.Expression[] =
-                (regular.length &&
-                    regular[regular.length - 1]!.meta.required &&
-                    dynamic.length === 0) ||
-                (regular.length === 0 && dynamic.length)
-                    ? expressions
-                    : [
-                          ts.factory.createCallExpression(
-                              importer.use("tail"),
-                              undefined,
-                              [TemplateFactory.generate(expressions)],
-                          ),
-                      ];
-
-            // RETURNS WITH OBJECT BRACKET
-            return TemplateFactory.generate([
-                ts.factory.createStringLiteral(`{`),
-                ...filtered,
-                ts.factory.createStringLiteral(`}`),
-            ]);
-        };
-
-    export function array(
-        input: ts.Expression,
-        arrow: ts.ArrowFunction,
-    ): ts.Expression {
-        return TemplateFactory.generate([
-            ts.factory.createStringLiteral(`[`),
-            ts.factory.createCallExpression(
-                ts.factory.createPropertyAccessExpression(
-                    ts.factory.createCallExpression(
-                        IdentifierFactory.join(input, "map"),
-                        undefined,
-                        [arrow],
-                    ),
-                    ts.factory.createIdentifier("join"),
-                ),
-                undefined,
-                [ts.factory.createStringLiteral(`,`)],
-            ),
-            ts.factory.createStringLiteral(`]`),
-        ]);
-    }
-
-    export function tuple(
-        children: ts.Expression[],
-        rest: ts.Expression | null,
-    ): ts.Expression {
-        if (children.length === 0) return ts.factory.createStringLiteral("[]");
-        if (
-            rest === null &&
-            children.every((child) => ts.isStringLiteral(child))
-        )
-            return ts.factory.createStringLiteral(
-                "[" +
-                    children
-                        .map((child) => (child as ts.StringLiteral).text)
-                        .join(",") +
-                    "]",
-            );
-
-        const elements: ts.Expression[] = [ts.factory.createStringLiteral(`[`)];
-        children.forEach((child, i) => {
-            elements.push(child);
-            if (i !== children.length - 1)
-                elements.push(ts.factory.createStringLiteral(`,`));
-        });
-        if (rest !== null) elements.push(rest);
-
-        elements.push(ts.factory.createStringLiteral(`]`));
-        return TemplateFactory.generate(elements);
-    }
-}
+import ts from "typescript";
+
+import { IdentifierFactory } from "../../factories/IdentifierFactory";
+import { TemplateFactory } from "../../factories/TemplateFactory";
+
+import { stringify_dynamic_properties } from "../internal/stringify_dynamic_properties";
+import { stringify_regular_properties } from "../internal/stringify_regular_properties";
+import { FunctionImporter } from "./FunctionImporeter";
+import { IExpressionEntry } from "./IExpressionEntry";
+
+export namespace StringifyJoiner {
+    export const object =
+        (importer: FunctionImporter) =>
+        (entries: IExpressionEntry[]): ts.Expression => {
+            // CHECK AND SORT ENTRIES
+            const regular: IExpressionEntry[] = entries.filter((entry) =>
+                entry.key.isSoleLiteral(),
+            );
+            const dynamic: IExpressionEntry[] = entries.filter(
+                (entry) => !entry.key.isSoleLiteral(),
+            );
+            if (regular.length === 0 && dynamic.length === 0)
+                return ts.factory.createStringLiteral("{}");
+
+            // PROPERTIES
+            const expressions: ts.Expression[] = [
+                ...stringify_regular_properties(regular, dynamic),
+                ...(dynamic.length
+                    ? [
+                          stringify_dynamic_properties(
+                              dynamic,
+                              regular.map((r) => r.key.getSoleLiteral()!),
+                          ),
+                      ]
+                    : []),
+            ];
+
+            // POP LAST COMMA, IF REQUIRED
+            const filtered: ts.Expression[] =
+                (regular.length &&
+                    regular[regular.length - 1]!.meta.required &&
+                    dynamic.length === 0) ||
+                (regular.length === 0 && dynamic.length)
+                    ? expressions
+                    : [
+                          ts.factory.createCallExpression(
+                              importer.use("tail"),
+                              undefined,
+                              [TemplateFactory.generate(expressions)],
+                          ),
+                      ];
+
+            // RETURNS WITH OBJECT BRACKET
+            return TemplateFactory.generate([
+                ts.factory.createStringLiteral(`{`),
+                ...filtered,
+                ts.factory.createStringLiteral(`}`),
+            ]);
+        };
+
+    export function array(
+        input: ts.Expression,
+        arrow: ts.ArrowFunction,
+    ): ts.Expression {
+        return TemplateFactory.generate([
+            ts.factory.createStringLiteral(`[`),
+            ts.factory.createCallExpression(
+                ts.factory.createPropertyAccessExpression(
+                    ts.factory.createCallExpression(
+                        IdentifierFactory.join(input, "map"),
+                        undefined,
+                        [arrow],
+                    ),
+                    ts.factory.createIdentifier("join"),
+                ),
+                undefined,
+                [ts.factory.createStringLiteral(`,`)],
+            ),
+            ts.factory.createStringLiteral(`]`),
+        ]);
+    }
+
+    export function tuple(
+        children: ts.Expression[],
+        rest: ts.Expression | null,
+    ): ts.Expression {
+        if (children.length === 0) return ts.factory.createStringLiteral("[]");
+        if (
+            rest === null &&
+            children.every((child) => ts.isStringLiteral(child))
+        )
+            return ts.factory.createStringLiteral(
+                "[" +
+                    children
+                        .map((child) => (child as ts.StringLiteral).text)
+                        .join(",") +
+                    "]",
+            );
+
+        const elements: ts.Expression[] = [ts.factory.createStringLiteral(`[`)];
+        children.forEach((child, i) => {
+            elements.push(child);
+            if (i !== children.length - 1)
+                elements.push(ts.factory.createStringLiteral(`,`));
+        });
+        if (rest !== null) elements.push(rest);
+
+        elements.push(ts.factory.createStringLiteral(`]`));
+        return TemplateFactory.generate(elements);
+    }
+}

package/src/programmers/helpers/StringifyPredicator.ts

@@ -1,18 +1,18 @@
-import { Metadata } from "../../metadata/Metadata";
-
-export namespace StringifyPredicator {
-    export function require_escape(value: string): boolean {
-        return value
-            .split("")
-            .some((ch) => ESCAPED.some((escaped) => escaped === ch));
-    }
-
-    export function undefindable(meta: Metadata): boolean {
-        return (
-            meta.required === false ||
-            (meta.resolved !== null && meta.resolved.required === false)
-        );
-    }
-
-    const ESCAPED = ['"', "\\", "\b", "\f", "\n", "\n", "\r", "\t"];
-}
+import { Metadata } from "../../metadata/Metadata";
+
+export namespace StringifyPredicator {
+    export function require_escape(value: string): boolean {
+        return value
+            .split("")
+            .some((ch) => ESCAPED.some((escaped) => escaped === ch));
+    }
+
+    export function undefindable(meta: Metadata): boolean {
+        return (
+            meta.required === false ||
+            (meta.resolved !== null && meta.resolved.required === false)
+        );
+    }
+
+    const ESCAPED = ['"', "\\", "\b", "\f", "\n", "\n", "\r", "\t"];
+}