typia 4.0.0 → 4.0.1-dev.20230604

package/src/programmers/internal/application_schema.ts

@@ -1,164 +1,156 @@
-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_definition } from "./application_definition";
-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"
-                ? (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.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 array of meta.arrays)
-            insert(
-                application_array(options)(components)(array)(attribute)(
-                    meta.nullable,
-                ),
-            );
-
-        // TUPLE
-        for (const tuple of meta.tuples)
-            insert(
-                application_tuple(options)(components)(tuple)(attribute)(
-                    meta.nullable,
-                ),
-            );
-
-        // 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_definition(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 { 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_alias } from "./application_definition";
+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"
+                ? (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.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 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.";

package/src/programmers/internal/application_tuple.ts

@@ -1,77 +1,47 @@
-import { Metadata } from "../../metadata/Metadata";
-import { MetadataTuple } from "../../metadata/MetadataTuple";
-import { IJsonComponents } from "../../schemas/IJsonComponents";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { ApplicationProgrammer } from "../ApplicationProgrammer";
-import { JSON_COMPONENTS_PREFIX } from "./JSON_SCHEMA_PREFIX";
-import { application_schema } from "./application_schema";
-
-/**
- * @internal
- */
-export const application_tuple =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (tuple: MetadataTuple) =>
-    (attribute: IJsonSchema.IAttribute) =>
-    (
-        nullable: boolean,
-    ):
-        | IJsonSchema.ITuple
-        | IJsonSchema.IArray
-        | IJsonSchema.IReference
-        | IJsonSchema.IRecursiveReference => {
-        const generator = () => {
-            const schema: IJsonSchema.ITuple = {
-                ...attribute,
-                type: "array",
-                items: tuple.elements.map((elem) =>
-                    application_schema(options)(false)(components)(
-                        elem.rest ?? elem,
-                    )(tuple.recursive ? {} : attribute),
-                ),
-                "x-typia-rest": !!tuple.elements.at(-1)?.rest,
-            };
-            const wrapper: IJsonSchema.ITuple | IJsonSchema.IArray =
-                options.purpose === "ajv" && !tuple.elements.at(-1)?.rest
-                    ? schema
-                    : {
-                          ...schema,
-                          items: application_schema(options)(false)(components)(
-                              tuple.elements.reduce(
-                                  (x, y) =>
-                                      Metadata.merge(x.rest ?? x, y.rest ?? y),
-                                  Metadata.initialize(),
-                              ),
-                          )(tuple.recursive ? {} : attribute),
-                          "x-typia-tuple": schema,
-                      };
-            return wrapper;
-        };
-        if (tuple.recursive === false) return generator();
-
-        // KEY
-        const key: string =
-            options.purpose === "ajv"
-                ? tuple.name
-                : `${tuple.name}${nullable ? ".Nullable" : ""}`;
-        const $id: string = `${JSON_COMPONENTS_PREFIX}/tuples/${key}`;
-
-        // REFERENCE
-        if (components.tuples?.[key] === undefined) {
-            components.tuples ??= {};
-            components.tuples[key] = {} as any;
-
-            const repeated: IJsonComponents.IArray | IJsonComponents.ITuple = {
-                ...generator(),
-                $id: options.purpose === "ajv" ? $id : undefined,
-                $recursiveAnchor: options.purpose === "ajv" || undefined,
-            };
-            components.tuples ??= {};
-            components.tuples[key] = repeated;
-        }
-        return options.purpose === "ajv" && tuple.recursive
-            ? { ...attribute, $recursiveRef: $id }
-            : { ...attribute, $ref: $id };
-    };
+import { Metadata } from "../../metadata/Metadata";
+import { MetadataTuple } from "../../metadata/MetadataTuple";
+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) =>
+    (tuple: MetadataTuple) =>
+    (
+        attribute: IJsonSchema.IAttribute,
+    ): IJsonSchema.ITuple | IJsonSchema.IArray => {
+        const schema: IJsonSchema.ITuple = {
+            type: "array",
+            items: tuple.elements.map((meta, i) =>
+                application_schema(options)(false)(components)(
+                    meta.rest ?? meta,
+                )({
+                    ...attribute,
+                    "x-typia-rest":
+                        i === tuple.elements.length - 1 && meta.rest !== null,
+                    "x-typia-required": meta.required,
+                    "x-typia-optional": meta.optional,
+                }),
+            ),
+            ...attribute,
+        };
+        if (options.purpose === "ajv") return schema;
+
+        const wrapper: IJsonSchema.IArray = {
+            ...schema,
+            items: application_schema(options)(false)(components)(
+                tuple.elements.reduce(
+                    (x, y) => Metadata.merge(x.rest ?? x, y.rest ?? y),
+                    Metadata.initialize(),
+                ),
+            )(tuple.recursive ? {} : attribute),
+            "x-typia-tuple": schema,
+        };
+        return wrapper;
+    };