typia 3.4.21 → 3.4.23

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 function 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 function 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;
+}

package/src/programmers/internal/application_array.ts

@@ -1,47 +1,47 @@
-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,
-        nullable: boolean,
-        attribute: IJsonSchema.IAttribute,
-    ): IJsonSchema.IArray => {
-        // SCHEMA
-        const output: IJsonSchema.IArray = {
-            type: "array",
-            items: application_schema(options)(components)(false)(
-                metadata,
-                attribute,
-            ),
-            nullable,
-            "x-typia-tuple": tuple,
-            ...attribute,
-        };
-
-        // 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;
-            else if (tag.kind === "items") {
-                if (tag.minimum !== undefined)
-                    output.minItems =
-                        tag.minimum.value +
-                        (tag.minimum.include === true ? 0 : 1);
-                if (tag.maximum !== undefined)
-                    output.maxItems =
-                        tag.maximum.value -
-                        (tag.maximum.include === true ? 0 : 1);
-            }
-        return output;
-    };
+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,
+        nullable: boolean,
+        attribute: IJsonSchema.IAttribute,
+    ): IJsonSchema.IArray => {
+        // SCHEMA
+        const output: IJsonSchema.IArray = {
+            type: "array",
+            items: application_schema(options)(components)(false)(
+                metadata,
+                attribute,
+            ),
+            nullable,
+            "x-typia-tuple": tuple,
+            ...attribute,
+        };
+
+        // 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;
+            else if (tag.kind === "items") {
+                if (tag.minimum !== undefined)
+                    output.minItems =
+                        tag.minimum.value +
+                        (tag.minimum.include === true ? 0 : 1);
+                if (tag.maximum !== undefined)
+                    output.maxItems =
+                        tag.maximum.value -
+                        (tag.maximum.include === true ? 0 : 1);
+            }
+        return output;
+    };

package/src/programmers/internal/application_boolean.ts

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

package/src/programmers/internal/application_constant.ts

@@ -1,29 +1,29 @@
-import { MetadataConstant } from "../../metadata/MetadataConstant";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { application_default } from "./application_default";
-
-/**
- * @internal
- */
-export const application_constant = (
-    constant: MetadataConstant,
-    nullable: boolean,
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.IEnumeration<any> => ({
-    type: constant.type,
-    enum: constant.values as any,
-    nullable,
-    ...attribute,
-    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,
+    nullable: boolean,
+    attribute: IJsonSchema.IAttribute,
+): IJsonSchema.IEnumeration<any> => ({
+    type: constant.type,
+    enum: constant.values as any,
+    nullable,
+    ...attribute,
+    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,
+    ),
+});

package/src/programmers/internal/application_default_string.ts

@@ -1,32 +1,32 @@
-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_native.ts

@@ -1,29 +1,29 @@
-import { IJsonComponents } from "../../schemas/IJsonComponents";
-
-import { IJsonSchema } from "../../module";
-import { ApplicationProgrammer } from "../ApplicationProgrammer";
-
-export const application_native =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (name: string) =>
-    (
-        nullable: boolean,
-        attribute: IJsonSchema.IAttribute,
-    ): IJsonSchema.IReference => {
-        const key: string = name + (nullable ? ".Nullable" : "");
-        if (components.schemas[key] === undefined)
-            components.schemas[key] = {
-                type: "object",
-                $id:
-                    options.purpose === "ajv"
-                        ? options.prefix + "/" + key
-                        : undefined,
-                properties: {},
-                nullable,
-            };
-        return {
-            $ref: `#/components/schemas/${name}`,
-            ...attribute,
-        };
-    };
+import { IJsonComponents } from "../../schemas/IJsonComponents";
+
+import { IJsonSchema } from "../../module";
+import { ApplicationProgrammer } from "../ApplicationProgrammer";
+
+export const application_native =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (name: string) =>
+    (
+        nullable: boolean,
+        attribute: IJsonSchema.IAttribute,
+    ): IJsonSchema.IReference => {
+        const key: string = name + (nullable ? ".Nullable" : "");
+        if (components.schemas[key] === undefined)
+            components.schemas[key] = {
+                type: "object",
+                $id:
+                    options.purpose === "ajv"
+                        ? options.prefix + "/" + key
+                        : undefined,
+                properties: {},
+                nullable,
+            };
+        return {
+            $ref: `#/components/schemas/${name}`,
+            ...attribute,
+        };
+    };

package/src/programmers/internal/application_number.ts

@@ -1,76 +1,76 @@
-import { IJsonSchema } from "../../module";
-import { application_default } from "./application_default";
-
-/**
- * @internal
- */
-export const application_number = (
-    nullable: boolean,
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.INumber => {
-    const output: IJsonSchema.INumber = {
-        type: "number",
-        nullable,
-        ...attribute,
-    };
-    for (const tag of attribute["x-typia-metaTags"] || []) {
-        // CHECK TYPE
-        if (
-            tag.kind === "type" &&
-            (tag.value === "int" || tag.value === "uint")
-        )
-            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 === "range") {
-            if (tag.minimum !== undefined)
-                if (tag.minimum.include === true)
-                    output.minimum = tag.minimum.value;
-                else output.exclusiveMinimum = tag.minimum.value;
-            if (tag.maximum !== undefined)
-                if (tag.maximum.include === true)
-                    output.maximum = tag.maximum.value;
-                else output.exclusiveMaximum = tag.maximum.value;
-        }
-        // MULTIPLE-OF
-        else if (tag.kind === "multipleOf") output.multipleOf = tag.value;
-    }
-
-    // WHEN UNSIGNED INT
-    if (
-        output.type === "integer" &&
-        (attribute["x-typia-metaTags"] || []).find(
-            (tag) => tag.kind === "type" && tag.value === "uint",
-        )
-    )
-        if (output.minimum === undefined || output.minimum < 0)
-            output.minimum = 0;
-        else if (
-            output.exclusiveMinimum === undefined ||
-            output.exclusiveMinimum < 0
-        ) {
-            delete output.exclusiveMinimum;
-            output.maximum = 0;
-        }
-
-    // DEFAULT CONFIGURATION
-    output.default = application_default(attribute)((str) => {
-        const value: number = Number(str);
-        const conditions: boolean[] = [!Number.isNaN(value)];
-        if (output.minimum !== undefined)
-            conditions.push(value >= output.minimum);
-        if (output.maximum !== undefined)
-            conditions.push(value <= output.maximum);
-        if (output.exclusiveMinimum !== undefined)
-            conditions.push(value > output.exclusiveMinimum);
-        if (output.exclusiveMaximum !== undefined)
-            conditions.push(value < output.exclusiveMaximum);
-        if (output.multipleOf !== undefined)
-            conditions.push(value % output.multipleOf === 0);
-        return conditions.every((cond) => cond);
-    })((str) => Number(str));
-
-    // RETURNS
-    return output;
-};
+import { IJsonSchema } from "../../module";
+import { application_default } from "./application_default";
+
+/**
+ * @internal
+ */
+export const application_number = (
+    nullable: boolean,
+    attribute: IJsonSchema.IAttribute,
+): IJsonSchema.INumber => {
+    const output: IJsonSchema.INumber = {
+        type: "number",
+        nullable,
+        ...attribute,
+    };
+    for (const tag of attribute["x-typia-metaTags"] || []) {
+        // CHECK TYPE
+        if (
+            tag.kind === "type" &&
+            (tag.value === "int" || tag.value === "uint")
+        )
+            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 === "range") {
+            if (tag.minimum !== undefined)
+                if (tag.minimum.include === true)
+                    output.minimum = tag.minimum.value;
+                else output.exclusiveMinimum = tag.minimum.value;
+            if (tag.maximum !== undefined)
+                if (tag.maximum.include === true)
+                    output.maximum = tag.maximum.value;
+                else output.exclusiveMaximum = tag.maximum.value;
+        }
+        // MULTIPLE-OF
+        else if (tag.kind === "multipleOf") output.multipleOf = tag.value;
+    }
+
+    // WHEN UNSIGNED INT
+    if (
+        output.type === "integer" &&
+        (attribute["x-typia-metaTags"] || []).find(
+            (tag) => tag.kind === "type" && tag.value === "uint",
+        )
+    )
+        if (output.minimum === undefined || output.minimum < 0)
+            output.minimum = 0;
+        else if (
+            output.exclusiveMinimum === undefined ||
+            output.exclusiveMinimum < 0
+        ) {
+            delete output.exclusiveMinimum;
+            output.maximum = 0;
+        }
+
+    // DEFAULT CONFIGURATION
+    output.default = application_default(attribute)((str) => {
+        const value: number = Number(str);
+        const conditions: boolean[] = [!Number.isNaN(value)];
+        if (output.minimum !== undefined)
+            conditions.push(value >= output.minimum);
+        if (output.maximum !== undefined)
+            conditions.push(value <= output.maximum);
+        if (output.exclusiveMinimum !== undefined)
+            conditions.push(value > output.exclusiveMinimum);
+        if (output.exclusiveMaximum !== undefined)
+            conditions.push(value < output.exclusiveMaximum);
+        if (output.multipleOf !== undefined)
+            conditions.push(value % output.multipleOf === 0);
+        return conditions.every((cond) => cond);
+    })((str) => Number(str));
+
+    // RETURNS
+    return output;
+};

package/src/programmers/internal/application_schema.ts

@@ -83,13 +83,16 @@ export const application_schema =
             const tuple: IJsonSchema.ITuple = application_tuple(options)(
                 components,
             )(items, meta.nullable, attribute);
-            if (options.purpose === "ajv") union.push(tuple);
+            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 {
-                if (items.length === 0)
-                    throw new Error(
-                        "Error on typia.application(): swagger does not support zero length tuple type.",
-                    );
-
                 // SWAGGER DOES NOT SUPPORT TUPLE TYPE YET
                 const merged: Metadata = items.reduce((x, y) =>
                     Metadata.merge(x, y),