typia 4.0.0-dev.20230527 → 4.0.0-dev.20230604

package/src/programmers/helpers/UnionPredicator.ts

@@ -1,81 +1,81 @@
-import { Metadata } from "../../metadata/Metadata";
-import { MetadataObject } from "../../metadata/MetadataObject";
-import { MetadataProperty } from "../../metadata/MetadataProperty";
-
-import { ArrayUtil } from "../../utils/ArrayUtil";
-import { MapUtil } from "../../utils/MapUtil";
-
-export namespace UnionPredicator {
-    export interface ISpecialized {
-        index: number;
-        object: MetadataObject;
-        property: MetadataProperty;
-        neighbour: boolean;
-    }
-
-    export const object = (targets: MetadataObject[]): Array<ISpecialized> => {
-        // PROPERTY MATRIX
-        const matrix: Map<string, Array<MetadataProperty | null>> = new Map();
-        for (const obj of targets)
-            for (const prop of obj.properties) {
-                const key: string | null = prop.key.getSoleLiteral();
-                if (key !== null)
-                    MapUtil.take(matrix)(key, () =>
-                        ArrayUtil.repeat(targets.length, () => null),
-                    );
-            }
-        targets.forEach((obj, i) => {
-            for (const prop of obj.properties) {
-                const key: string | null = prop.key.getSoleLiteral();
-                if (key !== null) matrix.get(key)![i] = prop;
-            }
-        });
-
-        // EXPLORE SPECIALIZERS
-        const output: ISpecialized[] = [];
-        targets.forEach((obj, i) => {
-            const children: ISpecializedProperty[] = [];
-            obj.properties.forEach((prop) => {
-                // MUST BE REQUIRED
-                if (prop.value.required === false) return;
-                const key: string | null = prop.key.getSoleLiteral();
-                if (key === null) return;
-
-                // FIND NEIGHBORHOOD PROPERTIES
-                const neighbors: MetadataProperty[] = matrix
-                    .get(key)!
-                    .filter(
-                        (oppo, k) => i !== k && oppo !== null,
-                    ) as MetadataProperty[];
-
-                // NO NEIGHBORHOOD
-                const unique: boolean =
-                    neighbors.length === 0 ||
-                    neighbors.every(
-                        (n) => !Metadata.intersects(prop.value, n.value, false),
-                    );
-                if (unique === true)
-                    children.push({
-                        property: prop,
-                        neighbour: neighbors.length !== 0,
-                    });
-            });
-            if (children.length === 0) return;
-
-            const top: ISpecializedProperty =
-                children.find((child) => child.property.value.isConstant()) ||
-                children[0]!;
-            output.push({
-                index: i,
-                object: obj,
-                ...top,
-            });
-        });
-        return output;
-    };
-}
-
-interface ISpecializedProperty {
-    property: MetadataProperty;
-    neighbour: boolean;
-}
+import { Metadata } from "../../metadata/Metadata";
+import { MetadataObject } from "../../metadata/MetadataObject";
+import { MetadataProperty } from "../../metadata/MetadataProperty";
+
+import { ArrayUtil } from "../../utils/ArrayUtil";
+import { MapUtil } from "../../utils/MapUtil";
+
+export namespace UnionPredicator {
+    export interface ISpecialized {
+        index: number;
+        object: MetadataObject;
+        property: MetadataProperty;
+        neighbour: boolean;
+    }
+
+    export const object = (targets: MetadataObject[]): Array<ISpecialized> => {
+        // PROPERTY MATRIX
+        const matrix: Map<string, Array<MetadataProperty | null>> = new Map();
+        for (const obj of targets)
+            for (const prop of obj.properties) {
+                const key: string | null = prop.key.getSoleLiteral();
+                if (key !== null)
+                    MapUtil.take(matrix)(key, () =>
+                        ArrayUtil.repeat(targets.length, () => null),
+                    );
+            }
+        targets.forEach((obj, i) => {
+            for (const prop of obj.properties) {
+                const key: string | null = prop.key.getSoleLiteral();
+                if (key !== null) matrix.get(key)![i] = prop;
+            }
+        });
+
+        // EXPLORE SPECIALIZERS
+        const output: ISpecialized[] = [];
+        targets.forEach((obj, i) => {
+            const children: ISpecializedProperty[] = [];
+            obj.properties.forEach((prop) => {
+                // MUST BE REQUIRED
+                if (prop.value.required === false) return;
+                const key: string | null = prop.key.getSoleLiteral();
+                if (key === null) return;
+
+                // FIND NEIGHBORHOOD PROPERTIES
+                const neighbors: MetadataProperty[] = matrix
+                    .get(key)!
+                    .filter(
+                        (oppo, k) => i !== k && oppo !== null,
+                    ) as MetadataProperty[];
+
+                // NO NEIGHBORHOOD
+                const unique: boolean =
+                    neighbors.length === 0 ||
+                    neighbors.every(
+                        (n) => !Metadata.intersects(prop.value, n.value),
+                    );
+                if (unique === true)
+                    children.push({
+                        property: prop,
+                        neighbour: neighbors.length !== 0,
+                    });
+            });
+            if (children.length === 0) return;
+
+            const top: ISpecializedProperty =
+                children.find((child) => child.property.value.isConstant()) ||
+                children[0]!;
+            output.push({
+                index: i,
+                object: obj,
+                ...top,
+            });
+        });
+        return output;
+    };
+}
+
+interface ISpecializedProperty {
+    property: MetadataProperty;
+    neighbour: boolean;
+}

package/src/programmers/helpers/disable_function_importer_declare.ts

@@ -1,21 +1,26 @@
-import type ts from "typescript/lib/tsclibrary";
-
-import { FunctionImporter } from "./FunctionImporeter";
-
-export const disable_function_importer_declare = (
-    importer: FunctionImporter,
-): FunctionImporter => disable(importer) as FunctionImporter;
-
-const disable = (importer: FunctionImporter): MethodOnly<FunctionImporter> => ({
-    empty: (): boolean => importer.empty(),
-    use: (name: string): ts.Identifier => importer.use(name),
-    useLocal: (name: string): string => importer.useLocal(name),
-    hasLocal: (name: string): boolean => importer.hasLocal(name),
-    declare: (_modulo: ts.LeftHandSideExpression): ts.Statement[] => [],
-    increment: (): number => importer.increment(),
-    trace: (): void => importer.trace(),
-});
-
-type MethodOnly<T> = {
-    [P in keyof T]: T[P] extends Function ? T[P] : never;
-};
+import ts from "typescript";
+
+import { FunctionImporter } from "./FunctionImporeter";
+
+export const disable_function_importer_declare = (
+    importer: FunctionImporter,
+): FunctionImporter => disable(importer) as FunctionImporter;
+
+const disable = (importer: FunctionImporter): MethodOnly<FunctionImporter> => ({
+    empty: (): boolean => importer.empty(),
+    use: (name: string): ts.Identifier => importer.use(name),
+    useLocal: (name: string): string => importer.useLocal(name),
+    hasLocal: (name: string): boolean => importer.hasLocal(name),
+    declare: (_modulo: ts.LeftHandSideExpression): ts.Statement[] => [],
+    increment: (): number => importer.increment(),
+    emplaceUnion: (
+        prefix: string,
+        name: string,
+        factory: () => ts.ArrowFunction,
+    ): string => importer.emplaceUnion(prefix, name, factory),
+    trace: (): void => importer.trace(),
+});
+
+type MethodOnly<T> = {
+    [P in keyof T]: T[P] extends Function ? T[P] : never;
+};

package/src/programmers/internal/JSON_SCHEMA_PREFIX.ts

@@ -1 +1 @@
-export const JSON_SCHEMA_PREFIX = "#/components/schemas";
+export const JSON_COMPONENTS_PREFIX = "#/components";

package/src/programmers/internal/application_array.ts

@@ -1,32 +1,64 @@
-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_array =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (tuple?: IJsonSchema.ITuple) =>
-    (metadata: Metadata) =>
-    (attribute: IJsonSchema.IAttribute): IJsonSchema.IArray => {
-        // SCHEMA
-        const output: IJsonSchema.IArray = {
-            ...attribute,
-            type: "array",
-            items: application_schema(options)(false)(components)(metadata)(
-                attribute,
-            ),
-            "x-typia-tuple": tuple,
-        };
-
-        // RANGE
-        for (const tag of attribute["x-typia-metaTags"] ?? [])
-            if (tag.kind === "minItems") output.minItems = tag.value;
-            else if (tag.kind === "maxItems") output.maxItems = tag.value;
-        return output;
-    };
+import { MetadataArray } from "../../metadata/MetadataArray";
+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_array =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (array: MetadataArray) =>
+    (attribute: IJsonSchema.IAttribute) =>
+    (
+        nullable: boolean,
+    ):
+        | IJsonSchema.IArray
+        | IJsonSchema.IReference
+        | IJsonSchema.IRecursiveReference => {
+        // SCHEMA
+        const generator = () => {
+            const schema: IJsonSchema.IArray = {
+                ...attribute,
+                type: "array",
+                items: application_schema(options)(false)(components)(
+                    array.value,
+                )(array.recursive ? {} : attribute),
+            };
+            if (array.recursive === false) {
+                for (const tag of attribute["x-typia-metaTags"] ?? [])
+                    if (tag.kind === "minItems") schema.minItems = tag.value;
+                    else if (tag.kind === "maxItems")
+                        schema.maxItems = tag.value;
+            }
+            return schema;
+        };
+        if (array.recursive === false) return generator();
+
+        // KEY
+        const key: string =
+            options.purpose === "ajv"
+                ? array.name
+                : `${array.name}${nullable ? ".Nullable" : ""}`;
+        const $id: string = `${JSON_COMPONENTS_PREFIX}/arrays/${key}`;
+
+        // REFERENCE
+        if (components.arrays?.[key] === undefined) {
+            components.arrays ??= {};
+            components.arrays[key] = {} as any;
+
+            const repeated: IJsonComponents.IArray = {
+                ...generator(),
+                $id: options.purpose === "ajv" ? $id : undefined,
+                $recursiveAnchor: options.purpose === "ajv" || undefined,
+            };
+            components.arrays[key] = repeated;
+        }
+        return options.purpose === "ajv" && array.recursive
+            ? { ...attribute, $recursiveRef: $id }
+            : { ...attribute, $ref: $id };
+    };

package/src/programmers/internal/application_boolean.ts

@@ -1,15 +1,15 @@
-import { IJsonSchema } from "../../module";
-import { application_default } from "./application_default";
-
-/**
- * @internal
- */
-export const application_boolean = (
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.IBoolean => ({
-    ...attribute,
-    default: application_default(attribute)(
-        (def) => def === "true" || def === "false",
-    )((str) => Boolean(str)),
-    type: "boolean",
-});
+import { IJsonSchema } from "../../module";
+import { application_default } from "./application_default";
+
+/**
+ * @internal
+ */
+export const application_boolean = (
+    attribute: IJsonSchema.IAttribute,
+): IJsonSchema.IBoolean => ({
+    ...attribute,
+    default: application_default(attribute)(
+        (alias) => alias === "true" || alias === "false",
+    )((str) => Boolean(str)),
+    type: "boolean",
+});

package/src/programmers/internal/application_constant.ts

@@ -1,26 +1,26 @@
-import { MetadataConstant } from "../../metadata/MetadataConstant";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { application_default } from "./application_default";
-
-/**
- * @internal
- */
-export const application_constant =
-    (constant: MetadataConstant) =>
-    (attribute: IJsonSchema.IAttribute): IJsonSchema.IEnumeration<any> => ({
-        ...attribute,
-        type: constant.type,
-        enum: constant.values as any,
-        default: application_default(attribute)((def) =>
-            constant.values.some((v) => v.toString() === def),
-        )(
-            constant.type === "string"
-                ? (str) => str
-                : constant.type === "number"
-                ? (str) => Number(str)
-                : constant.type === "boolean"
-                ? (str) => Boolean(str)
-                : (str) => BigInt(str) as any,
-        ),
-    });
+import { MetadataConstant } from "../../metadata/MetadataConstant";
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+import { application_default } from "./application_default";
+
+/**
+ * @internal
+ */
+export const application_constant =
+    (constant: MetadataConstant) =>
+    (attribute: IJsonSchema.IAttribute): IJsonSchema.IEnumeration<any> => ({
+        ...attribute,
+        type: constant.type,
+        enum: constant.values as any,
+        default: application_default(attribute)((alias) =>
+            constant.values.some((v) => v.toString() === alias),
+        )(
+            constant.type === "string"
+                ? (str) => str
+                : constant.type === "number"
+                ? (str) => Number(str)
+                : constant.type === "boolean"
+                ? (str) => Boolean(str)
+                : (str) => BigInt(str) as any,
+        ),
+    });

package/src/programmers/internal/application_default.ts

@@ -1,17 +1,17 @@
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-/**
- * @internal
- */
-export const application_default =
-    (attribute: IJsonSchema.IAttribute) =>
-    (pred: (value: string) => boolean) =>
-    <T>(caster: (str: string) => T): T | undefined => {
-        const defaults = (attribute["x-typia-jsDocTags"] ?? []).filter(
-            (tag) => tag.name === "default",
-        );
-        for (const def of defaults)
-            if (def.text?.length && pred(def.text[0]!.text))
-                return caster(def.text[0]!.text);
-        return undefined;
-    };
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+/**
+ * @internal
+ */
+export const application_default =
+    (attribute: IJsonSchema.IAttribute) =>
+    (pred: (value: string) => boolean) =>
+    <T>(caster: (str: string) => T): T | undefined => {
+        const defaults = (attribute["x-typia-jsDocTags"] ?? []).filter(
+            (tag) => tag.name === "default",
+        );
+        for (const alias of defaults)
+            if (alias.text?.length && pred(alias.text[0]!.text))
+                return caster(alias.text[0]!.text);
+        return undefined;
+    };

package/src/programmers/internal/application_default_string.ts

@@ -1,33 +1,33 @@
-import { Metadata } from "../../metadata/Metadata";
-
-import { IJsonSchema } from "../../module";
-import { application_default } from "./application_default";
-
-/**
- * @internal
- */
-export const application_default_string =
-    (meta: Metadata) =>
-    (attribute: IJsonSchema.IAttribute) =>
-    (schema: IJsonSchema.IString) =>
-        application_default(attribute)((str) => {
-            const conditions: boolean[] = [];
-
-            // OTHER ATOMIC TYPES
-            if (meta.atomics.find((t) => t === "number" || t === "bigint"))
-                conditions.push(Number.isNaN(Number(str)));
-            if (meta.atomics.find((t) => t === "boolean"))
-                conditions.push(str !== "true" && str !== "false");
-            for (const constant of meta.constants)
-                for (const value of constant.values)
-                    conditions.push(str !== value.toString());
-
-            // CONSIDER TAGS
-            if (schema.minLength !== undefined)
-                conditions.push(str.length >= schema.minLength);
-            if (schema.maxLength !== undefined)
-                conditions.push(str.length <= schema.maxLength);
-            if (schema.pattern !== undefined)
-                conditions.push(new RegExp(schema.pattern).test(str));
-            return conditions.every((c) => c);
-        })((str) => str);
+import { Metadata } from "../../metadata/Metadata";
+
+import { IJsonSchema } from "../../module";
+import { application_default } from "./application_default";
+
+/**
+ * @internal
+ */
+export const application_default_string =
+    (meta: Metadata) =>
+    (attribute: IJsonSchema.IAttribute) =>
+    (schema: IJsonSchema.IString) =>
+        application_default(attribute)((str) => {
+            const conditions: boolean[] = [];
+
+            // OTHER ATOMIC TYPES
+            if (meta.atomics.find((t) => t === "number" || t === "bigint"))
+                conditions.push(Number.isNaN(Number(str)));
+            if (meta.atomics.find((t) => t === "boolean"))
+                conditions.push(str !== "true" && str !== "false");
+            for (const constant of meta.constants)
+                for (const value of constant.values)
+                    conditions.push(str !== value.toString());
+
+            // CONSIDER TAGS
+            if (schema.minLength !== undefined)
+                conditions.push(str.length >= schema.minLength);
+            if (schema.maxLength !== undefined)
+                conditions.push(str.length <= schema.maxLength);
+            if (schema.pattern !== undefined)
+                conditions.push(new RegExp(schema.pattern).test(str));
+            return conditions.every((c) => c);
+        })((str) => str);

package/src/programmers/internal/application_definition.ts

@@ -0,0 +1,45 @@
+import { MetadataAlias } from "../../metadata/MetadataAlias";
+import { IJsonComponents } from "../../schemas/IJsonComponents";
+
+import { IJsonSchema } from "../../module";
+import { ApplicationProgrammer } from "../ApplicationProgrammer";
+import { JSON_COMPONENTS_PREFIX } from "./JSON_SCHEMA_PREFIX";
+import { application_schema } from "./application_schema";
+
+export const application_definition =
+    (options: ApplicationProgrammer.IOptions) =>
+    <BlockNever extends boolean>(blockNever: BlockNever) =>
+    (components: IJsonComponents) =>
+    (alias: MetadataAlias) =>
+    (
+        nullable: boolean,
+    ): IJsonSchema.IReference | IJsonSchema.IRecursiveReference => {
+        const key: string =
+            options.purpose === "ajv"
+                ? alias.name
+                : `${alias.name}${nullable ? ".Nullable" : ""}`;
+        const $id: string = `${JSON_COMPONENTS_PREFIX}/aliases/${key}`;
+
+        // TEMPORARY ASSIGNMENT
+        if (components.aliases?.[key] === undefined) {
+            components.aliases ??= {};
+            components.aliases[key] = {
+                $id: key,
+            } as any;
+
+            // GENERATE SCHEM
+            const schema: IJsonSchema = application_schema(options)(blockNever)(
+                components,
+            )(alias.value)({})!;
+            components.aliases ??= {};
+            components.aliases[key] = {
+                $id: options.purpose === "ajv" ? $id : undefined,
+                $recursiveAnchor:
+                    (options.purpose === "ajv" && alias.recursive) || undefined,
+                ...schema,
+            };
+        }
+        return options.purpose === "ajv" && alias.recursive
+            ? { $recursiveRef: $id }
+            : { $ref: $id };
+    };

package/src/programmers/internal/application_native.ts

@@ -1,36 +1,39 @@
-import { IJsonComponents } from "../../schemas/IJsonComponents";
-
-import { IJsonSchema } from "../../module";
-import { ApplicationProgrammer } from "../ApplicationProgrammer";
-import { JSON_SCHEMA_PREFIX } from "./JSON_SCHEMA_PREFIX";
-
-/**
- * @internal
- */
-export const application_native =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (name: string) =>
-    (props: {
-        nullable: boolean;
-        attribute: IJsonSchema.IAttribute;
-    }): IJsonSchema.IReference => {
-        const key: string =
-            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,
-        };
-        return {
-            ...props.attribute,
-            $ref: `${JSON_SCHEMA_PREFIX}/${key}`,
-        };
-    };
+import { IJsonComponents } from "../../schemas/IJsonComponents";
+
+import { IJsonSchema } from "../../module";
+import { ApplicationProgrammer } from "../ApplicationProgrammer";
+import { JSON_COMPONENTS_PREFIX } from "./JSON_SCHEMA_PREFIX";
+
+/**
+ * @internal
+ */
+export const application_native =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (name: string) =>
+    (props: {
+        nullable: boolean;
+        attribute: IJsonSchema.IAttribute;
+    }): IJsonSchema.IReference => {
+        const key: string =
+            options.purpose === "ajv"
+                ? name
+                : `${name}${props.nullable ? ".Nullable" : ""}`;
+        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_COMPONENTS_PREFIX}/objects/${key}`,
+        };
+    };