typia 5.0.0-dev.2023084 → 5.0.0

package/src/programmers/internal/application_number.ts

@@ -1,81 +1,87 @@
+import { IMetadataTypeTag } from "../../schemas/metadata/IMetadataTypeTag";
+import { MetadataAtomic } from "../../schemas/metadata/MetadataAtomic";
+
 import { IJsonSchema } from "../../module";
 import { application_default } from "./application_default";
 
+type Schema = IJsonSchema.INumber | IJsonSchema.IInteger;
+
 /**
  * @internal
  */
-export const application_number = (
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.INumber | IJsonSchema.IInteger => {
-    const output: IJsonSchema.INumber | IJsonSchema.IInteger = {
-        ...attribute,
-        type: "number" as "number" | "integer",
+export const application_number =
+    (atomic: MetadataAtomic) =>
+    (attribute: IJsonSchema.IAttribute): Array<Schema> => {
+        // BASE CONFIGURATION
+        const base: Schema = {
+            ...attribute,
+            type: "number",
+        };
+        const out = (schema: Schema) => {
+            schema.default = application_default(attribute)((str) => {
+                const value: number = Number(str);
+                const conditions: boolean[] = [!Number.isNaN(value)];
+                if (schema.minimum !== undefined)
+                    if (schema.exclusiveMinimum === true)
+                        conditions.push(value > schema.minimum);
+                    else conditions.push(value >= schema.minimum);
+                if (schema.maximum !== undefined)
+                    if (schema.exclusiveMaximum === true)
+                        conditions.push(value < schema.maximum);
+                    else conditions.push(value <= schema.maximum);
+                if (schema.multipleOf !== undefined)
+                    conditions.push(value % schema.multipleOf === 0);
+                return conditions.every((cond) => cond);
+            })((str) => Number(str));
+            return schema;
+        };
+        if (atomic.tags.length === 0) return [out(base)];
+
+        // CONSIDER TYPE TAGS
+        const union: Schema[] = atomic.tags.map(
+            (row) => application_number_tags({ ...base })(row)!,
+        );
+        const map: Map<string, Schema> = new Map(
+            union.map((u) => [JSON.stringify(u), u]),
+        );
+        return [...map.values()].map((s) => out(s));
     };
-    for (const tag of attribute["x-typia-metaTags"] ?? []) {
-        // CHECK TYPE
-        if (tag.kind === "type") {
-            if (
-                tag.value === "int" ||
-                tag.value === "uint" ||
-                tag.value === "int32" ||
-                tag.value === "uint32" ||
-                tag.value === "int64" ||
-                tag.value === "uint64"
-            )
-                output.type = "integer";
-        }
-        // RANGE TAG
-        else if (tag.kind === "minimum") output.minimum = tag.value;
-        else if (tag.kind === "maximum") output.maximum = tag.value;
-        else if (tag.kind === "exclusiveMinimum") {
-            output.minimum = tag.value;
-            output.exclusiveMinimum = true;
-        } else if (tag.kind === "exclusiveMaximum") {
-            output.maximum = tag.value;
-            output.exclusiveMaximum = true;
-        }
-        // MULTIPLE-OF
-        else if (tag.kind === "multipleOf") output.multipleOf = tag.value;
-    }
 
-    // WHEN UNSIGNED INT
-    if (
-        output.type === "integer" &&
-        (attribute["x-typia-metaTags"] ?? []).find(
-            (tag) =>
+const application_number_tags =
+    (schema: Schema) =>
+    (row: IMetadataTypeTag[]): Schema => {
+        for (const tag of row
+            .slice()
+            .sort((a, b) => a.kind.localeCompare(b.kind))) {
+            if (
                 tag.kind === "type" &&
-                (tag.value === "uint" ||
+                (tag.value === "int32" ||
                     tag.value === "uint32" ||
-                    tag.value === "uint64"),
-        )
-    )
-        if (
-            output.minimum === undefined ||
-            (output.exclusiveMaximum !== true && output.minimum < 0)
-        )
-            output.minimum = 0;
-        else if (output.exclusiveMinimum === true && output.minimum < -1) {
-            output.maximum = 0;
-            delete output.exclusiveMinimum;
+                    tag.value === "int64" ||
+                    tag.value === "uint64")
+            )
+                schema.type = "integer";
+            else if (tag.kind === "minimum" && typeof tag.value === "number")
+                schema.minimum = tag.value;
+            else if (tag.kind === "maximum" && typeof tag.value === "number")
+                schema.maximum = tag.value;
+            else if (
+                tag.kind === "exclusiveMinimum" &&
+                typeof tag.value === "number"
+            ) {
+                schema.minimum = tag.value;
+                schema.exclusiveMinimum = true;
+            } else if (
+                tag.kind === "exclusiveMaximum" &&
+                typeof tag.value === "number"
+            ) {
+                schema.maximum = tag.value;
+                schema.exclusiveMaximum = true;
+            } else if (
+                tag.kind === "multipleOf" &&
+                typeof tag.value === "number"
+            )
+                schema.multipleOf = tag.value;
         }
-
-    // DEFAULT CONFIGURATION
-    output.default = application_default(attribute)((str) => {
-        const value: number = Number(str);
-        const conditions: boolean[] = [!Number.isNaN(value)];
-        if (output.minimum !== undefined)
-            if (output.exclusiveMinimum === true)
-                conditions.push(value > output.minimum);
-            else conditions.push(value >= output.minimum);
-        if (output.maximum !== undefined)
-            if (output.exclusiveMaximum === true)
-                conditions.push(value < output.maximum);
-            else conditions.push(value <= output.maximum);
-        if (output.multipleOf !== undefined)
-            conditions.push(value % output.multipleOf === 0);
-        return conditions.every((cond) => cond);
-    })((str) => Number(str));
-
-    // RETURNS
-    return output;
-};
+        return schema;
+    };

package/src/programmers/internal/application_object.ts

@@ -69,9 +69,6 @@ export const application_object =
                         : undefined;
                 })(),
                 description: property.description ?? undefined,
-                "x-typia-metaTags": property.tags.length
-                    ? property.tags
-                    : undefined,
                 "x-typia-jsDocTags": property.jsDocTags.length
                     ? property.jsDocTags
                     : undefined,

package/src/programmers/internal/application_schema.ts

@@ -1,157 +1,175 @@
-import { IJsonComponents } from "../../schemas/json/IJsonComponents";
-import { IJsonSchema } from "../../schemas/json/IJsonSchema";
-import { Metadata } from "../../schemas/metadata/Metadata";
-
-import { AtomicPredicator } from "../helpers/AtomicPredicator";
-import { JsonApplicationProgrammer } from "../json/JsonApplicationProgrammer";
-import { application_alias } from "./application_alias";
-import { application_array } from "./application_array";
-import { application_boolean } from "./application_boolean";
-import { application_constant } from "./application_constant";
-import { application_native } from "./application_native";
-import { application_number } from "./application_number";
-import { application_object } from "./application_object";
-import { application_resolved } from "./application_resolved";
-import { application_string } from "./application_string";
-import { application_templates } from "./application_templates";
-import { application_tuple } from "./application_tuple";
-
-/**
- * @internal
- */
-export const application_schema =
-    (options: JsonApplicationProgrammer.IOptions) =>
-    <BlockNever extends boolean>(blockNever: BlockNever) =>
-    (components: IJsonComponents) =>
-    (meta: Metadata) =>
-    (
-        attribute: IJsonSchema.IAttribute,
-    ): BlockNever extends true ? IJsonSchema | null : IJsonSchema => {
-        // VULNERABLE CASE
-        if (meta.any === true)
-            return {
-                ...attribute,
-                type: undefined,
-            };
-        else if (meta.nullable && meta.empty())
-            return { type: "null", ...attribute };
-
-        //----
-        // GATHER UNION SCHEMAS
-        //----
-        const union: IJsonSchema[] = [];
-        if (meta.nullable && options.purpose !== "swagger")
-            union.push({
-                ...attribute,
-                type: "null",
-            });
-
-        const insert =
-            meta.nullable && options.purpose === "swagger"
-                ? (s: IJsonSchema) =>
-                      union.push({
-                          ...s,
-                          nullable: (s as IJsonSchema.ISignificant<any>).type
-                              ? true
-                              : undefined,
-                      } as IJsonSchema)
-                : (schema: IJsonSchema) => union.push(schema);
-
-        // toJSON() METHOD
-        if (meta.escaped !== null)
-            union.push(
-                ...application_resolved(options)(blockNever)(components)(
-                    meta.escaped,
-                )(attribute),
-            );
-
-        // ATOMIC TYPES
-        if (meta.templates.length && AtomicPredicator.template(meta))
-            insert(application_templates(meta)(attribute));
-        for (const constant of meta.constants)
-            if (constant.type === "bigint") throw new Error(NO_BIGINT);
-            else if (
-                (constant.type === "string" && meta.templates.length) ||
-                AtomicPredicator.constant(meta)(constant.type) === false
-            )
-                continue;
-            else insert(application_constant(constant)(attribute));
-        for (const a of meta.atomics)
-            if (a.type === "bigint") throw new Error(NO_BIGINT);
-            else if (AtomicPredicator.atomic(meta)(a.type) === false) continue;
-            else
-                insert(
-                    a.type === "string"
-                        ? application_string(meta)(attribute)
-                        : a.type === "boolean"
-                        ? application_boolean(attribute)
-                        : application_number(attribute),
-                );
-
-        // ARRAY
-        for (const array of meta.arrays)
-            insert(application_array(options)(components)(array)(attribute));
-
-        // TUPLE
-        for (const tuple of meta.tuples)
-            insert(application_tuple(options)(components)(tuple)(attribute));
-
-        // NATIVES
-        for (const native of meta.natives)
-            if (AtomicPredicator.native(native))
-                insert(
-                    native === "String"
-                        ? application_string(meta)(attribute)
-                        : native === "Boolean"
-                        ? application_boolean(attribute)
-                        : application_number(attribute),
-                );
-            else
-                insert(
-                    application_native(options)(components)(native)({
-                        nullable: meta.nullable,
-                        attribute,
-                    }),
-                );
-        if (meta.sets.length)
-            insert(
-                application_native(options)(components)(`Set`)({
-                    nullable: meta.nullable,
-                    attribute,
-                }),
-            );
-        if (meta.maps.length)
-            insert(
-                application_native(options)(components)(`Map`)({
-                    nullable: meta.nullable,
-                    attribute,
-                }),
-            );
-
-        // OBJECT
-        for (const obj of meta.objects)
-            insert(application_object(options)(components)(obj)(meta.nullable));
-
-        // ALIASES
-        for (const alias of meta.aliases)
-            insert(
-                application_alias(options)(blockNever)(components)(alias)(
-                    meta.nullable,
-                ),
-            );
-
-        //----
-        // RETURNS
-        //----
-        if (union.length === 0)
-            return blockNever === true
-                ? null!
-                : {
-                      ...attribute,
-                      type: undefined,
-                  };
-        else if (union.length === 1) return union[0]!;
-        return { oneOf: union, ...attribute };
-    };
-
-const NO_BIGINT = "Error on typia.application(): does not allow bigint type.";
+import { IJsonComponents } from "../../schemas/json/IJsonComponents";
+import { IJsonSchema } from "../../schemas/json/IJsonSchema";
+import { Metadata } from "../../schemas/metadata/Metadata";
+import { MetadataAtomic } from "../../schemas/metadata/MetadataAtomic";
+
+import { AtomicPredicator } from "../helpers/AtomicPredicator";
+import { JsonApplicationProgrammer } from "../json/JsonApplicationProgrammer";
+import { application_alias } from "./application_alias";
+import { application_array } from "./application_array";
+import { application_boolean } from "./application_boolean";
+import { application_constant } from "./application_constant";
+import { application_escaped } from "./application_escaped";
+import { application_native } from "./application_native";
+import { application_number } from "./application_number";
+import { application_object } from "./application_object";
+import { application_string } from "./application_string";
+import { application_templates } from "./application_templates";
+import { application_tuple } from "./application_tuple";
+
+/**
+ * @internal
+ */
+export const application_schema =
+    (options: JsonApplicationProgrammer.IOptions) =>
+    <BlockNever extends boolean>(blockNever: BlockNever) =>
+    (components: IJsonComponents) =>
+    (meta: Metadata) =>
+    (
+        attribute: IJsonSchema.IAttribute,
+    ): BlockNever extends true ? IJsonSchema | null : IJsonSchema => {
+        // VULNERABLE CASE
+        if (meta.any === true)
+            return {
+                ...attribute,
+                type: undefined,
+            };
+        else if (meta.nullable && meta.empty())
+            return { type: "null", ...attribute };
+
+        //----
+        // GATHER UNION SCHEMAS
+        //----
+        const union: IJsonSchema[] = [];
+        if (meta.nullable && options.purpose !== "swagger")
+            union.push({
+                ...attribute,
+                type: "null",
+            });
+
+        const insert =
+            meta.nullable && options.purpose === "swagger"
+                ? (s: IJsonSchema) =>
+                      union.push({
+                          ...s,
+                          nullable: (s as IJsonSchema.ISignificant<any>).type
+                              ? true
+                              : undefined,
+                      } as IJsonSchema)
+                : (schema: IJsonSchema) => union.push(schema);
+
+        // toJSON() METHOD
+        if (meta.escaped !== null)
+            union.push(
+                ...application_escaped(options)(blockNever)(components)(
+                    meta.escaped,
+                )(attribute),
+            );
+
+        // ATOMIC TYPES
+        if (meta.templates.length && AtomicPredicator.template(meta))
+            insert(application_templates(meta)(attribute));
+        for (const constant of meta.constants)
+            if (constant.type === "bigint") throw new TypeError(NO_BIGINT);
+            else if (
+                (constant.type === "string" && meta.templates.length) ||
+                AtomicPredicator.constant(meta)(constant.type) === false
+            )
+                continue;
+            else insert(application_constant(constant)(attribute));
+        for (const a of meta.atomics)
+            if (a.type === "bigint") throw new TypeError(NO_BIGINT);
+            else if (a.type === "boolean")
+                insert(application_boolean(attribute));
+            else if (a.type === "number")
+                application_number(a)(attribute).forEach((s) => insert(s));
+            else if (a.type === "string")
+                application_string(meta)(a)(attribute).forEach((s) =>
+                    insert(s),
+                );
+
+        // ARRAY
+        for (const array of meta.arrays)
+            application_array(options)(components)(array)(attribute).forEach(
+                (s) => insert(s),
+            );
+
+        // TUPLE
+        for (const tuple of meta.tuples)
+            insert(application_tuple(options)(components)(tuple)(attribute));
+
+        // NATIVES
+        for (const native of meta.natives)
+            if (AtomicPredicator.native(native)) {
+                const type: string = native.toLowerCase();
+                if (meta.atomics.some((a) => a.type === type)) continue;
+                else if (type === "bigint") throw new TypeError(NO_BIGINT);
+                else if (type === "boolean")
+                    insert(application_boolean(attribute));
+                else if (type === "number")
+                    insert(
+                        application_number(
+                            MetadataAtomic.create({
+                                type: "number",
+                                tags: [],
+                            }),
+                        )(attribute)[0]!,
+                    );
+                else if (type === "string")
+                    insert(
+                        application_string(meta)(
+                            MetadataAtomic.create({
+                                type: "string",
+                                tags: [],
+                            }),
+                        )(attribute)[0]!,
+                    );
+            } else
+                insert(
+                    application_native(options)(components)(native)({
+                        nullable: meta.nullable,
+                        attribute,
+                    }),
+                );
+        if (meta.sets.length)
+            insert(
+                application_native(options)(components)(`Set`)({
+                    nullable: meta.nullable,
+                    attribute,
+                }),
+            );
+        if (meta.maps.length)
+            insert(
+                application_native(options)(components)(`Map`)({
+                    nullable: meta.nullable,
+                    attribute,
+                }),
+            );
+
+        // OBJECT
+        for (const obj of meta.objects)
+            insert(application_object(options)(components)(obj)(meta.nullable));
+
+        // ALIASES
+        for (const alias of meta.aliases)
+            insert(
+                application_alias(options)(blockNever)(components)(alias)(
+                    meta.nullable,
+                ),
+            );
+
+        //----
+        // RETURNS
+        //----
+        if (union.length === 0)
+            return blockNever === true
+                ? null!
+                : {
+                      ...attribute,
+                      type: undefined,
+                  };
+        else if (union.length === 1) return union[0]!;
+        return { oneOf: union, ...attribute };
+    };
+
+const NO_BIGINT = "Error on typia.application(): does not allow bigint type.";

package/src/programmers/internal/application_string.ts

@@ -1,6 +1,7 @@
 import { IJsonSchema } from "../../schemas/json/IJsonSchema";
-import { IMetadataTag } from "../../schemas/metadata/IMetadataTag";
+import { IMetadataTypeTag } from "../../schemas/metadata/IMetadataTypeTag";
 import { Metadata } from "../../schemas/metadata/Metadata";
+import { MetadataAtomic } from "../../schemas/metadata/MetadataAtomic";
 
 import { application_default_string } from "./application_default_string";
 
@@ -9,36 +10,41 @@ import { application_default_string } from "./application_default_string";
  */
 export const application_string =
     (meta: Metadata) =>
-    (attribute: IJsonSchema.IAttribute): IJsonSchema.IString => {
-        const output: IJsonSchema.IString = {
+    (atomic: MetadataAtomic) =>
+    (attribute: IJsonSchema.IAttribute): IJsonSchema.IString[] => {
+        // DEFAULT CONFIGURATION
+        const base: IJsonSchema.IString = {
             ...attribute,
             type: "string",
         };
+        const out = (schema: IJsonSchema.IString) => {
+            schema.default = application_default_string(meta)(attribute)(base);
+            return schema;
+        };
+        if (atomic.tags.length === 0) return [out(base)];
 
-        // FORMAT TAG OF METADATA
-        const formatJsdocTag = attribute["x-typia-jsDocTags"]?.find(
-            (tag) => tag.name === "format",
+        // CONSIDER TYPE TAGS
+        const union: IJsonSchema.IString[] = atomic.tags.map(
+            (row) => application_string_tags({ ...base })(row)!,
         );
-        if (formatJsdocTag?.text?.length)
-            output.format = formatJsdocTag?.text.map((t) => t.text).join(" ");
-
-        // REGULAR TAGS COMPATIBLE WITH JSON-SCHEMA
-        for (const tag of attribute["x-typia-metaTags"] ?? []) {
-            // RANGE
-            if (tag.kind === "minLength") output.minLength = tag.value;
-            else if (tag.kind === "maxLength") output.maxLength = tag.value;
-            // FORMAT AND PATTERN
-            else if (tag.kind === "format")
-                output.format = emendFormat(tag.value);
-            else if (tag.kind === "pattern") output.pattern = tag.value;
-        }
-
-        // DEFAULT CONFIGURATION
-        output.default = application_default_string(meta)(attribute)(output);
-
-        // RETURNS
-        return output;
+        const map: Map<string, IJsonSchema.IString> = new Map(
+            union.map((u) => [JSON.stringify(u), u]),
+        );
+        return [...map.values()].map((s) => out(s));
     };
 
-const emendFormat = (tag: IMetadataTag.IFormat["value"]) =>
-    tag === "datetime" ? "date-time" : tag;
+const application_string_tags =
+    (schema: IJsonSchema.IString) =>
+    (row: IMetadataTypeTag[]): IJsonSchema.IString | null => {
+        for (const tag of row
+            .slice()
+            .sort((a, b) => a.kind.localeCompare(b.kind)))
+            if (tag.kind === "minLength" && typeof tag.value === "number")
+                schema.minLength = tag.value;
+            else if (tag.kind === "maxLength" && typeof tag.value === "number")
+                schema.maxLength = tag.value;
+            else if (tag.kind === "format" && typeof tag.value === "string")
+                schema.format = tag.value;
+            else if (tag.kind === "pattern") schema.pattern = tag.value;
+        return schema;
+    };

package/src/programmers/internal/application_tuple.ts

@@ -18,37 +18,38 @@ export const application_tuple =
     ): IJsonSchema.ITuple | IJsonSchema.IArray => {
         const schema: IJsonSchema.ITuple = {
             type: "array",
-            items: tuple.elements.map((meta, i) =>
+            items: tuple.type.elements.map((meta, i) =>
                 application_schema(options)(false)(components)(
                     meta.rest ?? meta,
                 )({
                     ...attribute,
                     "x-typia-rest":
-                        i === tuple.elements.length - 1 && meta.rest !== null,
+                        i === tuple.type.elements.length - 1 &&
+                        meta.rest !== null,
                     "x-typia-required": meta.required,
                     "x-typia-optional": meta.optional,
                 }),
             ),
             ...attribute,
-            minItems: !!tuple.elements.at(-1)?.rest
-                ? tuple.elements.length - 1
-                : tuple.elements.filter((x) => !x.optional).length,
-            maxItems: !!tuple.elements.at(-1)?.rest
+            minItems: !!tuple.type.elements.at(-1)?.rest
+                ? tuple.type.elements.length - 1
+                : tuple.type.elements.filter((x) => !x.optional).length,
+            maxItems: !!tuple.type.elements.at(-1)?.rest
                 ? undefined
-                : tuple.elements.length,
+                : tuple.type.elements.length,
         };
         if (options.purpose === "ajv")
-            if (tuple.elements.length === 0) return schema;
-            else if (!tuple.elements.at(-1)?.rest) return schema;
+            if (tuple.type.elements.length === 0) return schema;
+            else if (!tuple.type.elements.at(-1)?.rest) return schema;
 
         const wrapper: IJsonSchema.IArray = {
             ...schema,
             items: application_schema(options)(false)(components)(
-                tuple.elements.reduce(
+                tuple.type.elements.reduce(
                     (x, y) => Metadata.merge(x.rest ?? x, y.rest ?? y),
                     Metadata.initialize(),
                 ),
-            )(tuple.recursive ? {} : attribute),
+            )(tuple.type.recursive ? {} : attribute),
             "x-typia-tuple": schema,
             minItems: schema.minItems,
             maxItems: schema.maxItems,