typia 7.0.0-dev.20241011 → 7.0.0-dev.20241012

package/src/schemas/metadata/MetadataArray.ts

@@ -42,7 +42,7 @@ export class MetadataArray {
 
   public toJSON(): IMetadataArray {
     return {
-      type: this.type.toJSON(),
+      name: this.type.name,
       tags: this.tags.map((row) => row.slice()),
     };
   }

package/src/schemas/metadata/MetadataComponents.ts

@@ -1,98 +1,98 @@
-import { ClassProperties } from "../../typings/ClassProperties";
-import { Writable } from "../../typings/Writable";
-
-import { IMetadataComponents } from "./IMetadataComponents";
-import { IMetadataDictionary } from "./IMetadataDictionary";
-import { Metadata } from "./Metadata";
-import { MetadataAlias } from "./MetadataAlias";
-import { MetadataArrayType } from "./MetadataArrayType";
-import { MetadataObject } from "./MetadataObject";
-import { MetadataProperty } from "./MetadataProperty";
-import { MetadataTupleType } from "./MetadataTupleType";
-
-export class MetadataComponents {
-  public readonly aliases: MetadataAlias[];
-  public readonly objects: MetadataObject[];
-  public readonly arrays: MetadataArrayType[];
-  public readonly tuples: MetadataTupleType[];
-  public readonly dictionary: IMetadataDictionary;
-
-  private constructor(props: ClassProperties<MetadataComponents>) {
-    this.aliases = props.aliases;
-    this.objects = props.objects;
-    this.arrays = props.arrays;
-    this.tuples = props.tuples;
-    this.dictionary = props.dictionary;
-  }
-
-  public static from(json: IMetadataComponents): MetadataComponents {
-    // INITIALIZE COMPONENTS
-    const dictionary: IMetadataDictionary = {
-      objects: new Map(
-        json.objects.map((obj) => [
-          obj.name,
-          MetadataObject._From_without_properties(obj),
-        ]),
-      ),
-      aliases: new Map(
-        json.aliases.map((alias) => [
-          alias.name,
-          MetadataAlias._From_without_value(alias),
-        ]),
-      ),
-      arrays: new Map(
-        json.arrays.map((arr) => [
-          arr.name,
-          MetadataArrayType._From_without_value(arr),
-        ]),
-      ),
-      tuples: new Map(
-        json.tuples.map((tpl) => [
-          tpl.name,
-          MetadataTupleType._From_without_elements(tpl),
-        ]),
-      ),
-    };
-
-    // CONSTRUCT METADATA OF THEM
-    for (const obj of json.objects)
-      dictionary.objects
-        .get(obj.name)!
-        .properties.push(
-          ...obj.properties.map((prop) =>
-            MetadataProperty.from(prop, dictionary),
-          ),
-        );
-    for (const alias of json.aliases)
-      Writable(dictionary.aliases.get(alias.name)!).value = Metadata.from(
-        alias.value,
-        dictionary,
-      );
-    for (const array of json.arrays)
-      Writable(dictionary.arrays.get(array.name)!).value = Metadata.from(
-        array.value,
-        dictionary,
-      );
-    for (const tuple of json.tuples)
-      Writable(dictionary.tuples.get(tuple.name)!).elements =
-        tuple.elements.map((elem) => Metadata.from(elem, dictionary));
-
-    // FINALIZE
-    return new MetadataComponents({
-      aliases: [...dictionary.aliases.values()],
-      objects: [...dictionary.objects.values()],
-      arrays: [...dictionary.arrays.values()],
-      tuples: [...dictionary.tuples.values()],
-      dictionary,
-    });
-  }
-
-  public toJSON(): IMetadataComponents {
-    return {
-      aliases: this.aliases.map((alias) => alias.toJSON()),
-      objects: this.objects.map((object) => object.toJSON()),
-      arrays: this.arrays.map((array) => array.toJSON()),
-      tuples: this.tuples.map((tuple) => tuple.toJSON()),
-    };
-  }
-}
+import { ClassProperties } from "../../typings/ClassProperties";
+import { Writable } from "../../typings/Writable";
+
+import { IMetadataComponents } from "./IMetadataComponents";
+import { IMetadataDictionary } from "./IMetadataDictionary";
+import { Metadata } from "./Metadata";
+import { MetadataAlias } from "./MetadataAlias";
+import { MetadataArrayType } from "./MetadataArrayType";
+import { MetadataObjectType } from "./MetadataObjectType";
+import { MetadataProperty } from "./MetadataProperty";
+import { MetadataTupleType } from "./MetadataTupleType";
+
+export class MetadataComponents {
+  public readonly aliases: MetadataAlias[];
+  public readonly objects: MetadataObjectType[];
+  public readonly arrays: MetadataArrayType[];
+  public readonly tuples: MetadataTupleType[];
+  public readonly dictionary: IMetadataDictionary;
+
+  private constructor(props: ClassProperties<MetadataComponents>) {
+    this.aliases = props.aliases;
+    this.objects = props.objects;
+    this.arrays = props.arrays;
+    this.tuples = props.tuples;
+    this.dictionary = props.dictionary;
+  }
+
+  public static from(json: IMetadataComponents): MetadataComponents {
+    // INITIALIZE COMPONENTS
+    const dictionary: IMetadataDictionary = {
+      objects: new Map(
+        json.objects.map((obj) => [
+          obj.name,
+          MetadataObjectType._From_without_properties(obj),
+        ]),
+      ),
+      aliases: new Map(
+        json.aliases.map((alias) => [
+          alias.name,
+          MetadataAlias._From_without_value(alias),
+        ]),
+      ),
+      arrays: new Map(
+        json.arrays.map((arr) => [
+          arr.name,
+          MetadataArrayType._From_without_value(arr),
+        ]),
+      ),
+      tuples: new Map(
+        json.tuples.map((tpl) => [
+          tpl.name,
+          MetadataTupleType._From_without_elements(tpl),
+        ]),
+      ),
+    };
+
+    // CONSTRUCT METADATA OF THEM
+    for (const obj of json.objects)
+      dictionary.objects
+        .get(obj.name)!
+        .properties.push(
+          ...obj.properties.map((prop) =>
+            MetadataProperty.from(prop, dictionary),
+          ),
+        );
+    for (const alias of json.aliases)
+      Writable(dictionary.aliases.get(alias.name)!).value = Metadata.from(
+        alias.value,
+        dictionary,
+      );
+    for (const array of json.arrays)
+      Writable(dictionary.arrays.get(array.name)!).value = Metadata.from(
+        array.value,
+        dictionary,
+      );
+    for (const tuple of json.tuples)
+      Writable(dictionary.tuples.get(tuple.name)!).elements =
+        tuple.elements.map((elem) => Metadata.from(elem, dictionary));
+
+    // FINALIZE
+    return new MetadataComponents({
+      aliases: [...dictionary.aliases.values()],
+      objects: [...dictionary.objects.values()],
+      arrays: [...dictionary.arrays.values()],
+      tuples: [...dictionary.tuples.values()],
+      dictionary,
+    });
+  }
+
+  public toJSON(): IMetadataComponents {
+    return {
+      aliases: this.aliases.map((alias) => alias.toJSON()),
+      objects: this.objects.map((object) => object.toJSON()),
+      arrays: this.arrays.map((array) => array.toJSON()),
+      tuples: this.tuples.map((tuple) => tuple.toJSON()),
+    };
+  }
+}

package/src/schemas/metadata/MetadataObject.ts

@@ -1,139 +1,48 @@
-import { ClassProperties } from "../../typings/ClassProperties";
-
-import { IJsDocTagInfo } from "./IJsDocTagInfo";
-import { IMetadataObject } from "./IMetadataObject";
-import { MetadataProperty } from "./MetadataProperty";
-
-export class MetadataObject {
-  public readonly name: string;
-  public readonly properties: Array<MetadataProperty>;
-  public readonly description: string | undefined;
-  public readonly jsDocTags: IJsDocTagInfo[];
-
-  public readonly index: number;
-  public validated: boolean;
-  public recursive: boolean;
-  public nullables: boolean[] = [];
-
-  /**
-   * @internal
-   */
-  public tagged_: boolean = false;
-
-  /**
-   * @internal
-   */
-  private literal_?: boolean;
-
-  /* -----------------------------------------------------------
-        CONSTRUCTORS
-    ----------------------------------------------------------- */
-  /**
-   * @hidden
-   */
-  private constructor(props: Omit<ClassProperties<MetadataObject>, "tagged_">) {
-    this.name = props.name;
-    this.properties = props.properties;
-    this.description = props.description;
-    this.jsDocTags = props.jsDocTags;
-
-    this.index = props.index;
-    this.validated = props.validated;
-    this.recursive = props.recursive;
-    this.nullables = props.nullables.slice();
-
-    this.tagged_ = false;
-  }
-
-  /**
-   * @internal
-   */
-  public static create(
-    props: Omit<ClassProperties<MetadataObject>, "tagged_">,
-  ) {
-    return new MetadataObject(props);
-  }
-
-  /**
-   * @internal
-   */
-  public static _From_without_properties(obj: IMetadataObject): MetadataObject {
-    return MetadataObject.create({
-      name: obj.name,
-      properties: [],
-      description: obj.description,
-      jsDocTags: obj.jsDocTags,
-
-      index: obj.index,
-      validated: false,
-      recursive: obj.recursive,
-      nullables: obj.nullables.slice(),
-    });
-  }
-
-  public isPlain(level: number = 0): boolean {
-    return (
-      this.recursive === false &&
-      this.properties.length < 10 &&
-      this.properties.every(
-        (property) =>
-          property.key.isSoleLiteral() &&
-          property.value.size() === 1 &&
-          property.value.isRequired() === true &&
-          property.value.nullable === false &&
-          (property.value.atomics.length === 1 ||
-            (level < 1 &&
-              property.value.objects.length === 1 &&
-              property.value.objects[0]!.isPlain(level + 1))),
-      )
-    );
-  }
-
-  public isLiteral(): boolean {
-    return (this.literal_ ??= (() => {
-      if (this.recursive === true) return false;
-      return (
-        this.name === "__type" ||
-        this.name === "__object" ||
-        this.name.startsWith("__type.") ||
-        this.name.startsWith("__object.") ||
-        this.name.includes("readonly [")
-      );
-    })());
-  }
-
-  public toJSON(): IMetadataObject {
-    return {
-      name: this.name,
-      properties: this.properties.map((property) => property.toJSON()),
-      description: this.description,
-      jsDocTags: this.jsDocTags,
-
-      index: this.index,
-      recursive: this.recursive,
-      nullables: this.nullables.slice(),
-    };
-  }
-}
-
-/**
- * @internal
- */
-export namespace MetadataObject {
-  export const intersects = (x: MetadataObject, y: MetadataObject): boolean =>
-    x.properties.some(
-      (prop) =>
-        y.properties.find(
-          (oppo) => prop.key.getName() === oppo.key.getName(),
-        ) !== undefined,
-    );
-
-  export const covers = (x: MetadataObject, y: MetadataObject): boolean =>
-    x.properties.length >= y.properties.length &&
-    x.properties.every(
-      (prop) =>
-        y.properties.find(
-          (oppo) => prop.key.getName() === oppo.key.getName(),
-        ) !== undefined,
-    );
-}
+import { ClassProperties } from "../../typings/ClassProperties";
+
+import { IMetadataObject } from "./IMetadataObject";
+import { IMetadataTypeTag } from "./IMetadataTypeTag";
+import { MetadataObjectType } from "./MetadataObjectType";
+
+export class MetadataObject {
+  public readonly type: MetadataObjectType;
+  public readonly tags: IMetadataTypeTag[][];
+  private name_?: string;
+
+  /**
+   * @hidden
+   */
+  private constructor(props: ClassProperties<MetadataObject>) {
+    this.type = props.type;
+    this.tags = props.tags;
+  }
+
+  public static create(props: ClassProperties<MetadataObject>): MetadataObject {
+    return new MetadataObject(props);
+  }
+
+  public getName(): string {
+    return (this.name_ ??= (() => {
+      if (this.tags.length === 0) return this.type.name;
+      else if (this.tags.length === 1) {
+        const str: string = [
+          this.type.name,
+          ...this.tags[0]!.map((t) => t.name),
+        ].join(" & ");
+        return `(${str})`;
+      }
+      const rows: string[] = this.tags.map((row) => {
+        const str: string = row.map((t) => t.name).join(" & ");
+        return row.length === 1 ? str : `(${str})`;
+      });
+      return `(${this.type.name} & (${rows.join(" | ")}))`;
+    })());
+  }
+
+  public toJSON(): IMetadataObject {
+    return {
+      name: this.type.name,
+      tags: this.tags.map((row) => row.slice()),
+    };
+  }
+}

package/src/schemas/metadata/MetadataObjectType.ts

@@ -0,0 +1,149 @@
+import { ClassProperties } from "../../typings/ClassProperties";
+
+import { IJsDocTagInfo } from "./IJsDocTagInfo";
+import { IMetadataObjectType } from "./IMetadataObjectType";
+import { MetadataProperty } from "./MetadataProperty";
+
+export class MetadataObjectType {
+  public readonly name: string;
+  public readonly properties: Array<MetadataProperty>;
+  public readonly description: string | undefined;
+  public readonly jsDocTags: IJsDocTagInfo[];
+
+  public readonly index: number;
+  public validated: boolean;
+  public recursive: boolean;
+  public nullables: boolean[] = [];
+
+  /**
+   * @internal
+   */
+  public tagged_: boolean = false;
+
+  /**
+   * @internal
+   */
+  private literal_?: boolean;
+
+  /* -----------------------------------------------------------
+        CONSTRUCTORS
+    ----------------------------------------------------------- */
+  /**
+   * @hidden
+   */
+  private constructor(
+    props: Omit<ClassProperties<MetadataObjectType>, "tagged_">,
+  ) {
+    this.name = props.name;
+    this.properties = props.properties;
+    this.description = props.description;
+    this.jsDocTags = props.jsDocTags;
+
+    this.index = props.index;
+    this.validated = props.validated;
+    this.recursive = props.recursive;
+    this.nullables = props.nullables.slice();
+
+    this.tagged_ = false;
+  }
+
+  /**
+   * @internal
+   */
+  public static create(
+    props: Omit<ClassProperties<MetadataObjectType>, "tagged_">,
+  ) {
+    return new MetadataObjectType(props);
+  }
+
+  /**
+   * @internal
+   */
+  public static _From_without_properties(
+    obj: IMetadataObjectType,
+  ): MetadataObjectType {
+    return MetadataObjectType.create({
+      name: obj.name,
+      properties: [],
+      description: obj.description,
+      jsDocTags: obj.jsDocTags,
+
+      index: obj.index,
+      validated: false,
+      recursive: obj.recursive,
+      nullables: obj.nullables.slice(),
+    });
+  }
+
+  public isPlain(level: number = 0): boolean {
+    return (
+      this.recursive === false &&
+      this.properties.length < 10 &&
+      this.properties.every(
+        (property) =>
+          property.key.isSoleLiteral() &&
+          property.value.size() === 1 &&
+          property.value.isRequired() === true &&
+          property.value.nullable === false &&
+          (property.value.atomics.length === 1 ||
+            (level < 1 &&
+              property.value.objects.length === 1 &&
+              property.value.objects[0]!.type.isPlain(level + 1))),
+      )
+    );
+  }
+
+  public isLiteral(): boolean {
+    return (this.literal_ ??= (() => {
+      if (this.recursive === true) return false;
+      return (
+        this.name === "__type" ||
+        this.name === "__object" ||
+        this.name.startsWith("__type.") ||
+        this.name.startsWith("__object.") ||
+        this.name.includes("readonly [")
+      );
+    })());
+  }
+
+  public toJSON(): IMetadataObjectType {
+    return {
+      name: this.name,
+      properties: this.properties.map((property) => property.toJSON()),
+      description: this.description,
+      jsDocTags: this.jsDocTags,
+
+      index: this.index,
+      recursive: this.recursive,
+      nullables: this.nullables.slice(),
+    };
+  }
+}
+
+/**
+ * @internal
+ */
+export namespace MetadataObjectType {
+  export const intersects = (
+    x: MetadataObjectType,
+    y: MetadataObjectType,
+  ): boolean =>
+    x.properties.some(
+      (prop) =>
+        y.properties.find(
+          (oppo) => prop.key.getName() === oppo.key.getName(),
+        ) !== undefined,
+    );
+
+  export const covers = (
+    x: MetadataObjectType,
+    y: MetadataObjectType,
+  ): boolean =>
+    x.properties.length >= y.properties.length &&
+    x.properties.every(
+      (prop) =>
+        y.properties.find(
+          (oppo) => prop.key.getName() === oppo.key.getName(),
+        ) !== undefined,
+    );
+}

package/src/schemas/metadata/MetadataTuple.ts

@@ -25,7 +25,7 @@ export class MetadataTuple {
 
   public toJSON(): IMetadataTuple {
     return {
-      type: this.type.toJSON(),
+      name: this.type.name,
       tags: this.tags.map((row) => row.slice()),
     };
   }

package/src/transformers/TransformerError.ts

@@ -1,6 +1,6 @@
 import { MetadataFactory } from "../factories/MetadataFactory";
 
-import { MetadataObject } from "../schemas/metadata/MetadataObject";
+import { MetadataObjectType } from "../schemas/metadata/MetadataObjectType";
 
 import { Escaper } from "../utils/Escaper";
 
@@ -50,10 +50,11 @@ export namespace TransformerError {
     });
   };
 
-  const join = (object: MetadataObject) => (key: string | object | null) => {
-    if (key === null) return object.name;
-    else if (typeof key === "object") return `${object.name}[key]`;
-    else if (Escaper.variable(key)) return `${object.name}.${key}`;
-    return `${object.name}[${JSON.stringify(key)}]`;
-  };
+  const join =
+    (object: MetadataObjectType) => (key: string | object | null) => {
+      if (key === null) return object.name;
+      else if (typeof key === "object") return `${object.name}[key]`;
+      else if (Escaper.variable(key)) return `${object.name}.${key}`;
+      return `${object.name}[${JSON.stringify(key)}]`;
+    };
 }

package/src/transformers/features/json/JsonSchemasTransformer.ts

@@ -4,7 +4,7 @@ import { LiteralFactory } from "../../../factories/LiteralFactory";
 import { MetadataCollection } from "../../../factories/MetadataCollection";
 import { MetadataFactory } from "../../../factories/MetadataFactory";
 
-import { IJsonSchemaCollection } from "../../../schemas/json/IJsonSchemaList";
+import { IJsonSchemaCollection } from "../../../schemas/json/IJsonSchemaCollection";
 import { Metadata } from "../../../schemas/metadata/Metadata";
 
 import { JsonSchemasProgrammer } from "../../../programmers/json/JsonSchemasProgrammer";

package/src/utils/MapUtil.ts

@@ -1,14 +1,14 @@
-export namespace MapUtil {
-  export const take = <Key, T>(
-    dict: Map<Key, T>,
-    key: Key,
-    generator: () => T,
-  ): T => {
-    const oldbie: T | undefined = dict.get(key);
-    if (oldbie) return oldbie;
-
-    const value: T = generator();
-    dict.set(key, value);
-    return value;
-  };
-}
+export namespace MapUtil {
+  export const take = <Key, T>(
+    dict: Map<Key, T>,
+    key: Key,
+    generator: () => T,
+  ): T => {
+    const oldbie: T | undefined = dict.get(key);
+    if (oldbie) return oldbie;
+
+    const value: T = generator();
+    dict.set(key, value);
+    return value;
+  };
+}