typia 4.0.0-dev.20230502 → 4.0.0-dev.20230517

package/src/programmers/internal/application_schema.ts

@@ -1,213 +1,198 @@
-import { Metadata } from "../../metadata/Metadata";
-import { IJsonComponents } from "../../schemas/IJsonComponents";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { ApplicationProgrammer } from "../ApplicationProgrammer";
-import { AtomicPredicator } from "../helpers/AtomicPredicator";
-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_string } from "./application_string";
-import { application_templates } from "./application_templates";
-import { application_tuple } from "./application_tuple";
-
-/**
- * @internal
- */
-export const application_schema =
-    (options: ApplicationProgrammer.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[] = [];
-
-        // toJSON() METHOD
-        if (meta.resolved !== null) {
-            const resolved = application_schema(options)(blockNever)(
-                components,
-            )(meta.resolved)(attribute);
-            if (resolved !== null) union.push(resolved);
-        }
-
-        // ATOMIC TYPES
-        if (meta.templates.length && AtomicPredicator.template(meta))
-            union.push(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
-                union.push(
-                    application_constant(constant)({
-                        nullable: meta.nullable,
-                        attribute,
-                    }),
-                );
-        for (const type of meta.atomics)
-            if (type === "bigint") throw new Error(NO_BIGINT);
-            else if (AtomicPredicator.atomic(meta)(type) === false) continue;
-            else
-                union.push(
-                    type === "string"
-                        ? application_string(meta, attribute)
-                        : type === "boolean"
-                        ? application_boolean({
-                              nullable: meta.nullable,
-                              attribute,
-                          })
-                        : application_number({
-                              nullable: meta.nullable,
-                              attribute,
-                          }),
-                );
-
-        // ARRAY
-        for (const schema of meta.arrays.values())
-            union.push(
-                application_array(options)(components)()(schema)({
-                    nullable: meta.nullable,
-                    attribute,
-                }),
-            );
-
-        // TUPLE
-        for (const items of meta.tuples) {
-            const tuple: IJsonSchema.ITuple = application_tuple(options)(
-                components,
-            )(items)({
-                nullable: meta.nullable,
-                attribute,
-            });
-            if (options.purpose === "swagger" && items.length === 0)
-                throw new Error(
-                    "Error on typia.application(): swagger does not support zero length tuple type.",
-                );
-            else if (
-                options.purpose === "ajv" &&
-                !items[items.length - 1]?.rest
-            )
-                union.push(tuple);
-            else {
-                // SWAGGER DOES NOT SUPPORT TUPLE TYPE YET
-                const merged: Metadata = items.reduce((x, y) =>
-                    Metadata.merge(x, y),
-                );
-                union.push(
-                    application_array(options)(components)(tuple)(merged)({
-                        nullable: merged?.nullable ?? false,
-                        attribute,
-                    }),
-                );
-            }
-        }
-
-        // NATIVES
-        for (const native of meta.natives)
-            if (AtomicPredicator.native(native))
-                union.push(
-                    native === "String"
-                        ? application_string(meta, attribute)
-                        : native === "Boolean"
-                        ? application_boolean({
-                              nullable: meta.nullable,
-                              attribute,
-                          })
-                        : application_number({
-                              nullable: meta.nullable,
-                              attribute,
-                          }),
-                );
-            else
-                union.push(
-                    application_native(options)(components)(native)({
-                        nullable: meta.nullable,
-                        attribute,
-                    }),
-                );
-        if (meta.sets.length)
-            union.push(
-                application_native(options)(components)(`Set`)({
-                    nullable: meta.nullable,
-                    attribute,
-                }),
-            );
-        if (meta.maps.length)
-            union.push(
-                application_native(options)(components)(`Map`)({
-                    nullable: meta.nullable,
-                    attribute,
-                }),
-            );
-
-        // OBJECT
-        for (const obj of meta.objects) {
-            const key: string = obj.name + (meta.nullable ? ".Nullable" : "");
-            application_object(options)(components)(obj)({
-                key,
-                nullable: meta.nullable,
-            });
-            union.push(
-                (options.purpose === "ajv" && obj.recursive
-                    ? recursive
-                    : reference)(`${options.prefix}/${key}`, attribute),
-            );
-        }
-
-        //----
-        // RETURNS
-        //----
-        if (union.length === 0)
-            return blockNever === true
-                ? null!
-                : {
-                      ...attribute,
-                      type: undefined,
-                  };
-        else if (union.length === 1) return union[0]!;
-        return { oneOf: union, ...attribute };
-    };
-
-/**
- * @internal
- */
-const reference = (
-    $ref: string,
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.IReference => ({
-    $ref,
-    ...attribute,
-});
-
-/**
- * @internal
- */
-const recursive = (
-    $recursiveRef: string,
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.IRecursiveReference => ({
-    $recursiveRef,
-    ...attribute,
-});
-
-const NO_BIGINT = "Error on typia.application(): does not allow bigint type.";
+import { Metadata } from "../../metadata/Metadata";
+import { IJsonComponents } from "../../schemas/IJsonComponents";
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+import { ApplicationProgrammer } from "../ApplicationProgrammer";
+import { AtomicPredicator } from "../helpers/AtomicPredicator";
+import { JSON_SCHEMA_PREFIX } from "./JSON_SCHEMA_PREFIX";
+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_string } from "./application_string";
+import { application_templates } from "./application_templates";
+import { application_tuple } from "./application_tuple";
+
+/**
+ * @internal
+ */
+export const application_schema =
+    (options: ApplicationProgrammer.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"
+                ? (significant: IJsonSchema.ISignificant<any>) =>
+                      union.push({
+                          ...significant,
+                          nullable: true,
+                      })
+                : (schema: IJsonSchema) => union.push(schema);
+
+        // toJSON() METHOD
+        if (meta.resolved !== null) {
+            const resolved = application_schema(options)(blockNever)(
+                components,
+            )(meta.resolved)(attribute);
+            if (resolved !== null) union.push(resolved);
+        }
+
+        // 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 type of meta.atomics)
+            if (type === "bigint") throw new Error(NO_BIGINT);
+            else if (AtomicPredicator.atomic(meta)(type) === false) continue;
+            else
+                insert(
+                    type === "string"
+                        ? application_string(meta)(attribute)
+                        : type === "boolean"
+                        ? application_boolean(attribute)
+                        : application_number(attribute),
+                );
+
+        // ARRAY
+        for (const schema of meta.arrays.values())
+            insert(application_array(options)(components)()(schema)(attribute));
+
+        // TUPLE
+        for (const items of meta.tuples) {
+            const tuple: IJsonSchema.ITuple =
+                application_tuple(options)(components)(items)(attribute);
+            if (options.purpose === "swagger" && items.length === 0)
+                throw new Error(
+                    "Error on typia.application(): swagger does not support zero length tuple type.",
+                );
+            else if (
+                options.purpose === "ajv" &&
+                !items[items.length - 1]?.rest
+            )
+                insert(tuple);
+            else {
+                // SWAGGER DOES NOT SUPPORT TUPLE TYPE YET
+                const merged: Metadata = items.reduce((x, y) =>
+                    Metadata.merge(x, y),
+                );
+                insert(
+                    application_array(options)(components)(tuple)(merged)(
+                        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
+                union.push(
+                    application_native(options)(components)(native)({
+                        nullable: meta.nullable,
+                        attribute,
+                    }),
+                );
+        if (meta.sets.length)
+            union.push(
+                application_native(options)(components)(`Set`)({
+                    nullable: meta.nullable,
+                    attribute,
+                }),
+            );
+        if (meta.maps.length)
+            union.push(
+                application_native(options)(components)(`Map`)({
+                    nullable: meta.nullable,
+                    attribute,
+                }),
+            );
+
+        // OBJECT
+        for (const obj of meta.objects) {
+            const key: string = application_object(options)(components)(obj)(
+                meta.nullable,
+            );
+            union.push(
+                (options.purpose === "ajv" && obj.recursive
+                    ? recursive
+                    : reference)(`${JSON_SCHEMA_PREFIX}/${key}`, attribute),
+            );
+        }
+
+        //----
+        // RETURNS
+        //----
+        if (union.length === 0)
+            return blockNever === true
+                ? null!
+                : {
+                      ...attribute,
+                      type: undefined,
+                  };
+        else if (union.length === 1) return union[0]!;
+        return { oneOf: union, ...attribute };
+    };
+
+/**
+ * @internal
+ */
+const reference = (
+    $ref: string,
+    attribute: IJsonSchema.IAttribute,
+): IJsonSchema.IReference => ({
+    $ref,
+    ...attribute,
+});
+
+/**
+ * @internal
+ */
+const recursive = (
+    $recursiveRef: string,
+    attribute: IJsonSchema.IAttribute,
+): IJsonSchema.IRecursiveReference => ({
+    $recursiveRef,
+    ...attribute,
+});
+
+const NO_BIGINT = "Error on typia.application(): does not allow bigint type.";

package/src/programmers/internal/application_string.ts

@@ -1,45 +1,44 @@
-import { IMetadataTag } from "../../metadata/IMetadataTag";
-import { Metadata } from "../../metadata/Metadata";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { application_default_string } from "./application_default_string";
-
-/**
- * @internal
- */
-export const application_string = (
-    meta: Metadata,
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.IString => {
-    const output: IJsonSchema.IString = {
-        type: "string",
-        nullable: meta.nullable,
-        ...attribute,
-    };
-
-    // FORMAT TAG OF METADATA
-    const formatJsdocTag = attribute["x-typia-jsDocTags"]?.find(
-        (tag) => tag.name === "format",
-    );
-    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 emendFormat = (tag: IMetadataTag.IFormat["value"]) =>
-    tag === "datetime" ? "date-time" : tag;
+import { IMetadataTag } from "../../metadata/IMetadataTag";
+import { Metadata } from "../../metadata/Metadata";
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+import { application_default_string } from "./application_default_string";
+
+/**
+ * @internal
+ */
+export const application_string =
+    (meta: Metadata) =>
+    (attribute: IJsonSchema.IAttribute): IJsonSchema.IString => {
+        const output: IJsonSchema.IString = {
+            ...attribute,
+            type: "string",
+        };
+
+        // FORMAT TAG OF METADATA
+        const formatJsdocTag = attribute["x-typia-jsDocTags"]?.find(
+            (tag) => tag.name === "format",
+        );
+        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 emendFormat = (tag: IMetadataTag.IFormat["value"]) =>
+    tag === "datetime" ? "date-time" : tag;

package/src/programmers/internal/application_templates.ts

@@ -1,26 +1,25 @@
-import { Metadata } from "../../metadata/Metadata";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { application_default_string } from "./application_default_string";
-import { metadata_to_pattern } from "./metadata_to_pattern";
-
-/**
- * @internal
- */
-export const application_templates =
-    (meta: Metadata) =>
-    (attribute: IJsonSchema.IAttribute): IJsonSchema.IString => {
-        // CONSTRUCT PATTERN
-        const output: IJsonSchema.IString = {
-            type: "string",
-            nullable: meta.nullable,
-            ...attribute,
-        };
-        output.pattern = metadata_to_pattern(true)(meta);
-
-        // DEFAULT VALUE
-        output.default = application_default_string(meta)(attribute)(output);
-
-        // RETURNS
-        return output;
-    };
+import { Metadata } from "../../metadata/Metadata";
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+import { application_default_string } from "./application_default_string";
+import { metadata_to_pattern } from "./metadata_to_pattern";
+
+/**
+ * @internal
+ */
+export const application_templates =
+    (meta: Metadata) =>
+    (attribute: IJsonSchema.IAttribute): IJsonSchema.IString => {
+        // CONSTRUCT PATTERN
+        const output: IJsonSchema.IString = {
+            type: "string",
+            ...attribute,
+        };
+        output.pattern = metadata_to_pattern(true)(meta);
+
+        // DEFAULT VALUE
+        output.default = application_default_string(meta)(attribute)(output);
+
+        // RETURNS
+        return output;
+    };

package/src/programmers/internal/application_tuple.ts

@@ -1,31 +1,27 @@
-import { Metadata } from "../../metadata/Metadata";
-import { IJsonComponents } from "../../schemas/IJsonComponents";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { ApplicationProgrammer } from "../ApplicationProgrammer";
-import { application_schema } from "./application_schema";
-
-/**
- * @internal
- */
-export const application_tuple =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (items: Array<Metadata>) =>
-    (props: {
-        nullable: boolean;
-        attribute: IJsonSchema.IAttribute;
-    }): IJsonSchema.ITuple => ({
-        type: "array",
-        items: items.map((meta, i) =>
-            application_schema(options)(false)(components)(meta.rest ?? meta)({
-                ...props.attribute,
-                "x-typia-rest":
-                    i === items.length - 1 ? meta.rest !== null : undefined,
-                "x-typia-required": meta.required,
-                "x-typia-optional": meta.optional,
-            }),
-        ),
-        nullable: props.nullable,
-        ...props.attribute,
-    });
+import { Metadata } from "../../metadata/Metadata";
+import { IJsonComponents } from "../../schemas/IJsonComponents";
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+import { ApplicationProgrammer } from "../ApplicationProgrammer";
+import { application_schema } from "./application_schema";
+
+/**
+ * @internal
+ */
+export const application_tuple =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (items: Array<Metadata>) =>
+    (attribute: IJsonSchema.IAttribute): IJsonSchema.ITuple => ({
+        type: "array",
+        items: items.map((meta, i) =>
+            application_schema(options)(false)(components)(meta.rest ?? meta)({
+                ...attribute,
+                "x-typia-rest":
+                    i === items.length - 1 ? meta.rest !== null : undefined,
+                "x-typia-required": meta.required,
+                "x-typia-optional": meta.optional,
+            }),
+        ),
+        ...attribute,
+    });