typia 3.8.9 → 3.9.0-dev.20230604

package/src/programmers/internal/application_native.ts

@@ -2,7 +2,7 @@ import { IJsonComponents } from "../../schemas/IJsonComponents";
 
 import { IJsonSchema } from "../../module";
 import { ApplicationProgrammer } from "../ApplicationProgrammer";
-import { JSON_SCHEMA_PREFIX } from "./JSON_SCHEMA_PREFIX";
+import { JSON_COMPONENTS_PREFIX } from "./JSON_SCHEMA_PREFIX";
 
 /**
  * @internal
@@ -19,18 +19,21 @@ export const application_native =
             options.purpose === "ajv"
                 ? name
                 : `${name}${props.nullable ? ".Nullable" : ""}`;
-        components.schemas[key] ??= {
-            type: "object",
-            $id:
-                options.purpose === "ajv"
-                    ? `${JSON_SCHEMA_PREFIX}/${key}`
-                    : undefined,
-            properties: {},
-            nullable:
-                options.purpose === "swagger" ? props.nullable : undefined,
-        };
+        if (components.objects?.[key] === undefined) {
+            components.objects ??= {};
+            components.objects[key] ??= {
+                type: "object",
+                $id:
+                    options.purpose === "ajv"
+                        ? `${JSON_COMPONENTS_PREFIX}/objects/${key}`
+                        : undefined,
+                properties: {},
+                nullable:
+                    options.purpose === "swagger" ? props.nullable : undefined,
+            };
+        }
         return {
             ...props.attribute,
-            $ref: `${JSON_SCHEMA_PREFIX}/${key}`,
+            $ref: `${JSON_COMPONENTS_PREFIX}/objects/${key}`,
         };
     };

package/src/programmers/internal/application_object.ts

@@ -9,7 +9,7 @@ import { PatternUtil } from "../../utils/PatternUtil";
 
 import { IJsonSchema } from "../../module";
 import { ApplicationProgrammer } from "../ApplicationProgrammer";
-import { JSON_SCHEMA_PREFIX } from "./JSON_SCHEMA_PREFIX";
+import { JSON_COMPONENTS_PREFIX } from "./JSON_SCHEMA_PREFIX";
 import { application_schema } from "./application_schema";
 import { metadata_to_pattern } from "./metadata_to_pattern";
 
@@ -20,15 +20,23 @@ export const application_object =
     (options: ApplicationProgrammer.IOptions) =>
     (components: IJsonComponents) =>
     (obj: MetadataObject) =>
-    (nullable: boolean): string => {
-        const key =
+    (
+        nullable: boolean,
+    ): IJsonSchema.IReference | IJsonSchema.IRecursiveReference => {
+        const key: string =
             options.purpose === "ajv"
                 ? obj.name
                 : `${obj.name}${nullable ? ".Nullable" : ""}`;
+        const $id: string = `${JSON_COMPONENTS_PREFIX}/objects/${key}`;
+        const out = () =>
+            options.purpose === "ajv" && obj.recursive
+                ? { $recursiveRef: $id }
+                : { $ref: $id };
 
         // TEMPORARY ASSIGNMENT
-        if (components.schemas[key] !== undefined) return key;
-        components.schemas[key] = {} as any;
+        if (components.objects?.[key] !== undefined) return out();
+        components.objects ??= {};
+        components.objects[key] = {} as any;
 
         // ITERATE PROPERTIES
         const properties: Record<string, any> = {};
@@ -62,7 +70,7 @@ export const application_object =
                         ? CommentFactory.merge(info.text)
                         : undefined;
                 })(),
-                description: property.description,
+                description: property.description ?? undefined,
                 "x-typia-metaTags": property.tags.length
                     ? property.tags
                     : undefined,
@@ -103,10 +111,7 @@ export const application_object =
             })(),
         };
         const schema: IJsonComponents.IObject = {
-            $id:
-                options.purpose === "ajv"
-                    ? `${JSON_SCHEMA_PREFIX}/${key}`
-                    : undefined,
+            $id: options.purpose === "ajv" ? $id : undefined,
             $recursiveAnchor:
                 (options.purpose === "ajv" && obj.recursive) || undefined,
             type: "object",
@@ -126,8 +131,8 @@ export const application_object =
                           join(options)(components)(extraMeta),
                   }),
         };
-        components.schemas[key] = schema;
-        return key;
+        components.objects[key] = schema;
+        return out();
     };
 
 const join =

package/src/programmers/internal/application_schema.ts

@@ -4,10 +4,10 @@ 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_definition } from "./application_definition";
 import { application_native } from "./application_native";
 import { application_number } from "./application_number";
 import { application_object } from "./application_object";
@@ -47,11 +47,13 @@ export const application_schema =
 
         const insert =
             meta.nullable && options.purpose === "swagger"
-                ? (significant: IJsonSchema.ISignificant<any>) =>
+                ? (s: IJsonSchema) =>
                       union.push({
-                          ...significant,
-                          nullable: true,
-                      })
+                          ...s,
+                          nullable: (s as IJsonSchema.ISignificant<any>).type
+                              ? true
+                              : undefined,
+                      } as IJsonSchema)
                 : (schema: IJsonSchema) => union.push(schema);
 
         // toJSON() METHOD
@@ -86,34 +88,20 @@ export const application_schema =
                 );
 
         // ARRAY
-        for (const schema of meta.arrays.values())
-            insert(application_array(options)(components)()(schema)(attribute));
+        for (const array of meta.arrays)
+            insert(
+                application_array(options)(components)(array)(attribute)(
+                    meta.nullable,
+                ),
+            );
 
         // 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,
-                    ),
-                );
-            }
-        }
+        for (const tuple of meta.tuples)
+            insert(
+                application_tuple(options)(components)(tuple)(attribute)(
+                    meta.nullable,
+                ),
+            );
 
         // NATIVES
         for (const native of meta.natives)
@@ -126,21 +114,21 @@ export const application_schema =
                         : application_number(attribute),
                 );
             else
-                union.push(
+                insert(
                     application_native(options)(components)(native)({
                         nullable: meta.nullable,
                         attribute,
                     }),
                 );
         if (meta.sets.length)
-            union.push(
+            insert(
                 application_native(options)(components)(`Set`)({
                     nullable: meta.nullable,
                     attribute,
                 }),
             );
         if (meta.maps.length)
-            union.push(
+            insert(
                 application_native(options)(components)(`Map`)({
                     nullable: meta.nullable,
                     attribute,
@@ -148,16 +136,16 @@ export const application_schema =
             );
 
         // 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),
+        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
@@ -173,26 +161,4 @@ export const application_schema =
         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_tuple.ts

@@ -1,8 +1,10 @@
 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";
 
 /**
@@ -11,17 +13,65 @@ import { application_schema } from "./application_schema";
 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)({
+    (tuple: MetadataTuple) =>
+    (attribute: IJsonSchema.IAttribute) =>
+    (
+        nullable: boolean,
+    ):
+        | IJsonSchema.ITuple
+        | IJsonSchema.IArray
+        | IJsonSchema.IReference
+        | IJsonSchema.IRecursiveReference => {
+        const generator = () => {
+            const schema: IJsonSchema.ITuple = {
                 ...attribute,
-                "x-typia-rest":
-                    i === items.length - 1 ? meta.rest !== null : undefined,
-                "x-typia-required": meta.required,
-                "x-typia-optional": meta.optional,
-            }),
-        ),
-        ...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 };
+    };