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

package/src/functional/$report.ts

@@ -1,15 +1,15 @@
-import { IValidation } from "../IValidation";
-
-export const $report = (array: IValidation.IError[]) => {
-    const reportable = (path: string): boolean => {
-        if (array.length === 0) return true;
-        const last: string = array[array.length - 1]!.path;
-        return (
-            path.length > last.length || last.substring(0, path.length) !== path
-        );
-    };
-    return (exceptable: boolean, error: IValidation.IError): false => {
-        if (exceptable && reportable(error.path)) array.push(error);
-        return false;
-    };
-};
+import { IValidation } from "../IValidation";
+
+export const $report = (array: IValidation.IError[]) => {
+    const reportable = (path: string): boolean => {
+        if (array.length === 0) return true;
+        const last: string = array[array.length - 1]!.path;
+        return (
+            path.length > last.length || last.substring(0, path.length) !== path
+        );
+    };
+    return (exceptable: boolean, error: IValidation.IError): false => {
+        if (exceptable && reportable(error.path)) array.push(error);
+        return false;
+    };
+};

package/src/functional/$rest.ts

@@ -1,3 +1,3 @@
-export function $rest(str: string): string {
-    return str.length === 2 ? "" : "," + str.substring(1, str.length - 1);
-}
+export function $rest(str: string): string {
+    return str.length === 2 ? "" : "," + str.substring(1, str.length - 1);
+}

package/src/functional/$string.ts

@@ -1,37 +1,37 @@
-/**
- * @internal
- */
-export function $string(str: string): string {
-    if (str.length > 41) return JSON.stringify(str);
-
-    const length = str.length;
-    let result = "";
-    let last = 0;
-    let found = false;
-    let surrogateFound = false;
-    let point = 255;
-
-    // eslint-disable-next-line
-    for (let i = 0; i < length && point >= 32; i++) {
-        point = str.charCodeAt(i);
-        if (0xd800 <= point && point <= 0xdfff) {
-            // The current character is a surrogate.
-            surrogateFound = true;
-            break;
-        }
-        if (point === 34 || point === 92) {
-            result += str.slice(last, i) + "\\";
-            last = i;
-            found = true;
-        }
-    }
-
-    if (!found) {
-        result = str;
-    } else {
-        result += str.slice(last);
-    }
-    return point < 32 || surrogateFound === true
-        ? JSON.stringify(str)
-        : `"${result}"`;
-}
+/**
+ * @internal
+ */
+export function $string(str: string): string {
+    if (str.length > 41) return JSON.stringify(str);
+
+    const length = str.length;
+    let result = "";
+    let last = 0;
+    let found = false;
+    let surrogateFound = false;
+    let point = 255;
+
+    // eslint-disable-next-line
+    for (let i = 0; i < length && point >= 32; i++) {
+        point = str.charCodeAt(i);
+        if (0xd800 <= point && point <= 0xdfff) {
+            // The current character is a surrogate.
+            surrogateFound = true;
+            break;
+        }
+        if (point === 34 || point === 92) {
+            result += str.slice(last, i) + "\\";
+            last = i;
+            found = true;
+        }
+    }
+
+    if (!found) {
+        result = str;
+    } else {
+        result += str.slice(last);
+    }
+    return point < 32 || surrogateFound === true
+        ? JSON.stringify(str)
+        : `"${result}"`;
+}

package/src/functional/$tail.ts

@@ -1,6 +1,6 @@
-/**
- * @internal
- */
-export function $tail(str: string): string {
-    return str[str.length - 1] === "," ? str.substring(0, str.length - 1) : str;
-}
+/**
+ * @internal
+ */
+export function $tail(str: string): string {
+    return str[str.length - 1] === "," ? str.substring(0, str.length - 1) : str;
+}

package/src/index.ts

@@ -1,4 +1,4 @@
-import * as typia from "./module";
-
-export default typia;
-export * from "./module";
+import * as typia from "./module";
+
+export default typia;
+export * from "./module";

package/src/messages/IProtocolMap.ts

@@ -0,0 +1,5 @@
+export interface IProtocolMap {
+    type: "map";
+    key: string;
+    value: string | IProtocolMap;
+}

package/src/messages/IProtocolProperty.ts

@@ -1,3 +1,5 @@
+import { IProtocolMap } from "./IProtocolMap";
+
 export interface IProtocolProperty {
     key: string;
     oneOf: IProtocolProperty.IOneOf[];
@@ -6,6 +8,6 @@ export interface IProtocolProperty {
 }
 export namespace IProtocolProperty {
     export interface IOneOf {
-        type: string;
+        type: string | IProtocolMap;
     }
 }

package/src/metadata/IJsDocTagInfo.ts

@@ -1,10 +1,10 @@
-export interface IJsDocTagInfo {
-    name: string;
-    text?: IJsDocTagInfo.IText[];
-}
-export namespace IJsDocTagInfo {
-    export interface IText {
-        text: string;
-        kind: string;
-    }
-}
+export interface IJsDocTagInfo {
+    name: string;
+    text?: IJsDocTagInfo.IText[];
+}
+export namespace IJsDocTagInfo {
+    export interface IText {
+        text: string;
+        kind: string;
+    }
+}

package/src/metadata/IMetadata.ts

@@ -1,25 +1,25 @@
-import { Atomic } from "../typings/Atomic";
-
-import { IMetadataConstant } from "./IMetadataConstant";
-import { IMetadataEntry } from "./IMetadataEntry";
-
-export interface IMetadata {
-    any: boolean;
-    required: boolean;
-    nullable: boolean;
-    functional: boolean;
-
-    atomics: Atomic.Literal[];
-    constants: IMetadataConstant[];
-    templates: IMetadata[][];
-    resolved: IMetadata | null;
-
-    rest: IMetadata | null;
-    arrays: IMetadata[];
-    tuples: IMetadata[][];
-    objects: string[];
-
-    natives: string[];
-    sets: IMetadata[];
-    maps: IMetadataEntry[];
-}
+import { Atomic } from "../typings/Atomic";
+
+import { IMetadataConstant } from "./IMetadataConstant";
+import { IMetadataEntry } from "./IMetadataEntry";
+
+export interface IMetadata {
+    any: boolean;
+    required: boolean;
+    nullable: boolean;
+    functional: boolean;
+
+    atomics: Atomic.Literal[];
+    constants: IMetadataConstant[];
+    templates: IMetadata[][];
+    resolved: IMetadata | null;
+
+    rest: IMetadata | null;
+    arrays: IMetadata[];
+    tuples: IMetadata[][];
+    objects: string[];
+
+    natives: string[];
+    sets: IMetadata[];
+    maps: IMetadataEntry[];
+}

package/src/metadata/IMetadataApplication.ts

@@ -1,7 +1,7 @@
-import { IMetadata } from "./IMetadata";
-import { IMetadataObject } from "./IMetadataObject";
-
-export interface IMetadataApplication {
-    metadatas: IMetadata[];
-    collection: IMetadataObject[];
-}
+import { IMetadata } from "./IMetadata";
+import { IMetadataObject } from "./IMetadataObject";
+
+export interface IMetadataApplication {
+    metadatas: IMetadata[];
+    collection: IMetadataObject[];
+}

package/src/metadata/IMetadataConstant.ts

@@ -1,16 +1,16 @@
-import { Atomic } from "../typings/Atomic";
-
-export type IMetadataConstant =
-    | IMetadataConstant.IBase<"boolean", boolean>
-    | IMetadataConstant.IBase<"number", number>
-    | IMetadataConstant.IBase<"string", string>
-    | IMetadataConstant.IBase<"bigint", bigint>;
-export namespace IMetadataConstant {
-    export interface IBase<
-        Type extends Atomic.Literal,
-        Value extends Atomic.Type,
-    > {
-        type: Type;
-        values: Value[];
-    }
-}
+import { Atomic } from "../typings/Atomic";
+
+export type IMetadataConstant =
+    | IMetadataConstant.IBase<"boolean", boolean>
+    | IMetadataConstant.IBase<"number", number>
+    | IMetadataConstant.IBase<"string", string>
+    | IMetadataConstant.IBase<"bigint", bigint>;
+export namespace IMetadataConstant {
+    export interface IBase<
+        Type extends Atomic.Literal,
+        Value extends Atomic.Type,
+    > {
+        type: Type;
+        values: Value[];
+    }
+}

package/src/metadata/IMetadataEntry.ts

@@ -1,6 +1,6 @@
-import { IMetadata } from "./IMetadata";
-
-export interface IMetadataEntry {
-    key: IMetadata;
-    value: IMetadata;
-}
+import { IMetadata } from "./IMetadata";
+
+export interface IMetadataEntry {
+    key: IMetadata;
+    value: IMetadata;
+}

package/src/metadata/IMetadataObject.ts

@@ -1,29 +1,29 @@
-import { IJsDocTagInfo } from "./IJsDocTagInfo";
-import { IMetadataProperty } from "./IMetadataProperty";
-
-export interface IMetadataObject {
-    name: string;
-    properties: IMetadataProperty[];
-    description?: string;
-    jsDocTags: IJsDocTagInfo[];
-
-    /**
-     * @internal
-     */
-    index: number;
-
-    /**
-     * @internal
-     */
-    validated: boolean;
-
-    /**
-     * @internal
-     */
-    recursive: boolean;
-
-    /**
-     * @internal
-     */
-    nullables: boolean[];
-}
+import { IJsDocTagInfo } from "./IJsDocTagInfo";
+import { IMetadataProperty } from "./IMetadataProperty";
+
+export interface IMetadataObject {
+    name: string;
+    properties: IMetadataProperty[];
+    description?: string;
+    jsDocTags: IJsDocTagInfo[];
+
+    /**
+     * @internal
+     */
+    index: number;
+
+    /**
+     * @internal
+     */
+    validated: boolean;
+
+    /**
+     * @internal
+     */
+    recursive: boolean;
+
+    /**
+     * @internal
+     */
+    nullables: boolean[];
+}

package/src/metadata/IMetadataProperty.ts

@@ -1,11 +1,11 @@
-import { IJsDocTagInfo } from "./IJsDocTagInfo";
-import { IMetadata } from "./IMetadata";
-import { IMetadataTag } from "./IMetadataTag";
-
-export interface IMetadataProperty {
-    key: IMetadata;
-    value: IMetadata;
-    description?: string;
-    tags: IMetadataTag[];
-    jsDocTags: IJsDocTagInfo[];
-}
+import { IJsDocTagInfo } from "./IJsDocTagInfo";
+import { IMetadata } from "./IMetadata";
+import { IMetadataTag } from "./IMetadataTag";
+
+export interface IMetadataProperty {
+    key: IMetadata;
+    value: IMetadata;
+    description?: string;
+    tags: IMetadataTag[];
+    jsDocTags: IJsDocTagInfo[];
+}

package/src/metadata/Metadata.ts

@@ -1,6 +1,8 @@
 import { Atomic } from "../typings/Atomic";
 import { ClassProperties } from "../typings/ClassProperties";
 
+import { ArrayUtil } from "../utils/ArrayUtil";
+
 import { IMetadata } from "./IMetadata";
 import { IMetadataObject } from "./IMetadataObject";
 import { MetadataConstant } from "./MetadataConstant";
@@ -315,7 +317,9 @@ export namespace Metadata {
         // TUPLES
         for (const xt of x.tuples)
             for (const yt of y.tuples)
-                if (
+                if (xt.length === 0 || yt.length === 0)
+                    return xt.length === 0 && yt.length === 0;
+                else if (
                     xt
                         .slice(0, Math.min(xt.length, yt.length))
                         .some((xv, i) => intersects(xv, yt[i]!, deep))
@@ -371,6 +375,7 @@ export namespace Metadata {
         // TUPLES
         for (const yt of y.tuples)
             if (
+                yt.length !== 0 &&
                 x.tuples.some(
                     (xt) =>
                         xt.length >= yt.length &&
@@ -414,6 +419,58 @@ export namespace Metadata {
         // SUCCESS
         return true;
     }
+
+    export function merge(x: Metadata, y: Metadata): Metadata {
+        const output: Metadata = Metadata.create({
+            any: x.any || y.any,
+            nullable: x.nullable || y.nullable,
+            required: x.required && y.required,
+            functional: x.functional || y.functional,
+
+            resolved:
+                x.resolved !== null && y.resolved !== null
+                    ? merge(x.resolved, y.resolved)
+                    : x.resolved || y.resolved,
+            atomics: [...new Set([...x.atomics, ...y.atomics])],
+            constants: [...x.constants],
+            templates: x.templates.slice(),
+
+            rest:
+                x.rest !== null && y.rest !== null
+                    ? merge(x.rest, y.rest)
+                    : x.rest ?? y.rest,
+            arrays: x.arrays.slice(),
+            tuples: x.tuples.slice(),
+            objects: x.objects.slice(),
+
+            natives: [...new Set([...x.natives, ...y.natives])],
+            sets: x.sets.slice(),
+            maps: x.maps.slice(),
+        });
+        for (const constant of y.constants) {
+            const target: MetadataConstant = ArrayUtil.take(
+                output.constants,
+                (elem) => elem.type === constant.type,
+                () => ({
+                    type: constant.type,
+                    values: [],
+                }),
+            );
+            for (const value of constant.values)
+                ArrayUtil.add(target.values, value);
+        }
+        for (const array of y.arrays)
+            ArrayUtil.set(output.arrays, array, (elem) => elem.getName());
+        for (const obj of y.objects)
+            ArrayUtil.set(output.objects, obj, (elem) => elem.name);
+
+        if (x.rest !== null)
+            ArrayUtil.set(output.arrays, x.rest, (elem) => elem.getName());
+        if (y.rest !== null)
+            ArrayUtil.set(output.arrays, y.rest, (elem) => elem.getName());
+
+        return output;
+    }
 }
 
 function getName(metadata: Metadata): string {
@@ -447,6 +504,12 @@ function getName(metadata: Metadata): string {
                 "`",
         );
 
+    // NATIVES
+    for (const native of metadata.natives) elements.push(native);
+    for (const set of metadata.sets) elements.push(`Set<${set.getName()}>`);
+    for (const map of metadata.maps)
+        elements.push(`Map<${map.key.getName()}, ${map.value.getName()}>`);
+
     // ARRAY
     if (metadata.rest !== null) elements.push(`...${metadata.rest.getName()}`);
     for (const tuple of metadata.tuples)
@@ -458,12 +521,6 @@ function getName(metadata: Metadata): string {
     for (const object of metadata.objects) elements.push(object.name);
     if (metadata.resolved !== null) elements.push(metadata.resolved.getName());
 
-    // NATIVES
-    for (const native of metadata.natives) elements.push(native);
-    for (const set of metadata.sets) elements.push(`Set<${set.getName()}>`);
-    for (const map of metadata.maps)
-        elements.push(`Map<${map.key.getName()}, ${map.value.getName()}>`);
-
     // RETURNS
     if (elements.length === 0) return "unknown";
     else if (elements.length === 1) return elements[0]!;

package/src/metadata/MetadataConstant.ts

@@ -1,3 +1,3 @@
-import { IMetadataConstant } from "./IMetadataConstant";
-
-export import MetadataConstant = IMetadataConstant;
+import { IMetadataConstant } from "./IMetadataConstant";
+
+export import MetadataConstant = IMetadataConstant;