typia 3.8.0-dev.20230417 → 3.8.0-dev.20230420

package/src/programmers/internal/application_boolean.ts

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

package/src/programmers/internal/application_constant.ts

@@ -6,24 +6,25 @@ 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,
-    ),
-});
+export const application_constant =
+    (constant: MetadataConstant) =>
+    (props: {
+        nullable: boolean;
+        attribute: IJsonSchema.IAttribute;
+    }): IJsonSchema.IEnumeration<any> => ({
+        type: constant.type,
+        enum: constant.values as any,
+        nullable: props.nullable,
+        ...props.attribute,
+        default: application_default(props.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

@@ -7,7 +7,8 @@ import { application_default } from "./application_default";
  * @internal
  */
 export const application_default_string =
-    (meta: Metadata, attribute: IJsonSchema.IAttribute) =>
+    (meta: Metadata) =>
+    (attribute: IJsonSchema.IAttribute) =>
     (schema: IJsonSchema.IString) =>
         application_default(attribute)((str) => {
             const conditions: boolean[] = [];

package/src/programmers/internal/application_native.ts

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

package/src/programmers/internal/application_number.ts

@@ -4,16 +4,16 @@ import { application_default } from "./application_default";
 /**
  * @internal
  */
-export const application_number = (
-    nullable: boolean,
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.INumber | IJsonSchema.IInteger => {
+export const application_number = (props: {
+    nullable: boolean;
+    attribute: IJsonSchema.IAttribute;
+}): IJsonSchema.INumber | IJsonSchema.IInteger => {
     const output: IJsonSchema.INumber | IJsonSchema.IInteger = {
         type: "number" as "number" | "integer",
-        nullable,
-        ...attribute,
+        nullable: props.nullable,
+        ...props.attribute,
     };
-    for (const tag of attribute["x-typia-metaTags"] || []) {
+    for (const tag of props.attribute["x-typia-metaTags"] || []) {
         // CHECK TYPE
         if (
             tag.kind === "type" &&
@@ -37,7 +37,7 @@ export const application_number = (
     // WHEN UNSIGNED INT
     if (
         output.type === "integer" &&
-        (attribute["x-typia-metaTags"] || []).find(
+        (props.attribute["x-typia-metaTags"] || []).find(
             (tag) => tag.kind === "type" && tag.value === "uint",
         )
     )
@@ -52,7 +52,7 @@ export const application_number = (
         }
 
     // DEFAULT CONFIGURATION
-    output.default = application_default(attribute)((str) => {
+    output.default = application_default(props.attribute)((str) => {
         const value: number = Number(str);
         const conditions: boolean[] = [!Number.isNaN(value)];
         if (output.minimum !== undefined)

package/src/programmers/internal/application_object.ts

@@ -18,10 +18,11 @@ import { metadata_to_pattern } from "./metadata_to_pattern";
 export const application_object =
     (options: ApplicationProgrammer.IOptions) =>
     (components: IJsonComponents) =>
-    (key: string, obj: MetadataObject, nullable: boolean): void => {
+    (obj: MetadataObject) =>
+    (props: { key: string; nullable: boolean }): void => {
         // TEMPORARY ASSIGNMENT
-        if (components.schemas[key] !== undefined) return;
-        components.schemas[key] = {} as any;
+        if (components.schemas[props.key] !== undefined) return;
+        components.schemas[props.key] = {} as any;
 
         // ITERATE PROPERTIES
         const properties: Record<string, any> = {};
@@ -42,8 +43,8 @@ export const application_object =
 
             const key: string | null = property.key.getSoleLiteral();
             const schema: IJsonSchema | null = application_schema(options)(
-                components,
-            )(true)(property.value, {
+                true,
+            )(components)(property.value)({
                 deprecated:
                     !!property.jsDocTags.find(
                         (tag) => tag.name === "deprecated",
@@ -52,7 +53,7 @@ export const application_object =
                     const info: IJsDocTagInfo | undefined =
                         property.jsDocTags.find((tag) => tag.name === "title");
                     return info?.text?.length
-                        ? CommentFactory.generate(info.text)
+                        ? CommentFactory.string(info.text)
                         : undefined;
                 })(),
                 description: property.description,
@@ -97,13 +98,13 @@ export const application_object =
         const schema: IJsonComponents.IObject = {
             $id:
                 options.purpose === "ajv"
-                    ? options.prefix + "/" + key
+                    ? options.prefix + "/" + props.key
                     : undefined,
             $recursiveAnchor:
                 (options.purpose === "ajv" && obj.recursive) || undefined,
             type: "object",
             properties,
-            nullable,
+            nullable: props.nullable,
             required: required.length ? required : undefined,
             description: obj.description,
             "x-typia-jsDocTags": obj.jsDocTags,
@@ -118,7 +119,7 @@ export const application_object =
                           join(options)(components)(extraMeta),
                   }),
         };
-        components.schemas[key] = schema;
+        components.schemas[props.key] = schema;
     };
 
 const join =
@@ -141,7 +142,7 @@ const join =
             .map((tuple) => tuple[0])
             .reduce((x, y) => Metadata.merge(x, y));
         return (
-            application_schema(options)(components)(true)(meta, {
+            application_schema(options)(true)(components)(meta)({
                 "x-typia-required": false,
             }) ?? undefined
         );

package/src/programmers/internal/application_schema.ts

@@ -19,10 +19,10 @@ import { application_tuple } from "./application_tuple";
  */
 export const application_schema =
     (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
     <BlockNever extends boolean>(blockNever: BlockNever) =>
+    (components: IJsonComponents) =>
+    (meta: Metadata) =>
     (
-        meta: Metadata,
         attribute: IJsonSchema.IAttribute,
     ): BlockNever extends true ? IJsonSchema | null : IJsonSchema => {
         // VULNERABLE CASE
@@ -37,15 +37,15 @@ export const application_schema =
 
         // toJSON() METHOD
         if (meta.resolved !== null) {
-            const resolved = application_schema(options)(components)(
-                blockNever,
-            )(meta.resolved, attribute);
+            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));
+            union.push(application_templates(meta)(attribute));
         for (const constant of meta.constants)
             if (constant.type === "bigint") throw new Error(NO_BIGINT);
             else if (
@@ -55,7 +55,10 @@ export const application_schema =
                 continue;
             else
                 union.push(
-                    application_constant(constant, meta.nullable, attribute),
+                    application_constant(constant)({
+                        nullable: meta.nullable,
+                        attribute,
+                    }),
                 );
         for (const type of meta.atomics)
             if (type === "bigint") throw new Error(NO_BIGINT);
@@ -65,25 +68,33 @@ export const application_schema =
                     type === "string"
                         ? application_string(meta, attribute)
                         : type === "boolean"
-                        ? application_boolean(meta.nullable, attribute)
-                        : application_number(meta.nullable, attribute),
+                        ? 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,
-                    meta.nullable,
+                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, meta.nullable, attribute);
+            )(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.",
@@ -99,11 +110,10 @@ export const application_schema =
                     Metadata.merge(x, y),
                 );
                 union.push(
-                    application_array(options)(components)(tuple)(
-                        merged,
-                        merged?.nullable || false,
+                    application_array(options)(components)(tuple)(merged)({
+                        nullable: merged?.nullable ?? false,
                         attribute,
-                    ),
+                    }),
                 );
             }
         }
@@ -115,35 +125,44 @@ export const application_schema =
                     native === "String"
                         ? application_string(meta, attribute)
                         : native === "Boolean"
-                        ? application_boolean(meta.nullable, attribute)
-                        : application_number(meta.nullable, attribute),
+                        ? application_boolean({
+                              nullable: meta.nullable,
+                              attribute,
+                          })
+                        : application_number({
+                              nullable: meta.nullable,
+                              attribute,
+                          }),
                 );
             else
                 union.push(
-                    application_native(options)(components)(native)(
-                        meta.nullable,
+                    application_native(options)(components)(native)({
+                        nullable: meta.nullable,
                         attribute,
-                    ),
+                    }),
                 );
         if (meta.sets.length)
             union.push(
-                application_native(options)(components)(`Set`)(
-                    meta.nullable,
+                application_native(options)(components)(`Set`)({
+                    nullable: meta.nullable,
                     attribute,
-                ),
+                }),
             );
         if (meta.maps.length)
             union.push(
-                application_native(options)(components)(`Map`)(
-                    meta.nullable,
+                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)(key, obj, meta.nullable);
+            application_object(options)(components)(obj)({
+                key,
+                nullable: meta.nullable,
+            });
             union.push(
                 (options.purpose === "ajv" && obj.recursive
                     ? recursive

package/src/programmers/internal/application_string.ts

@@ -35,7 +35,7 @@ export const application_string = (
     }
 
     // DEFAULT CONFIGURATION
-    output.default = application_default_string(meta, attribute)(output);
+    output.default = application_default_string(meta)(attribute)(output);
 
     // RETURNS
     return output;

package/src/programmers/internal/application_templates.ts

@@ -7,21 +7,20 @@ 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);
+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);
+        // DEFAULT VALUE
+        output.default = application_default_string(meta)(attribute)(output);
 
-    // RETURNS
-    return output;
-};
+        // RETURNS
+        return output;
+    };

package/src/programmers/internal/application_tuple.ts

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

package/src/programmers/internal/check_array.ts

@@ -1,30 +1,30 @@
-import ts from "typescript";
-
-import { ExpressionFactory } from "../../factories/ExpressionFactory";
-import { IdentifierFactory } from "../../factories/IdentifierFactory";
-
-import { IJsDocTagInfo } from "../../metadata/IJsDocTagInfo";
-import { IMetadataTag } from "../../metadata/IMetadataTag";
-
-import { FunctionImporter } from "../helpers/FunctionImporeter";
-import { ICheckEntry } from "../helpers/ICheckEntry";
-import { check_array_length } from "./check_array_length";
-import { check_custom } from "./check_custom";
-
-/**
- * @internal
- */
-export const check_array =
-    (importer: FunctionImporter) =>
-    (metaTags: IMetadataTag[]) =>
-    (jsDocTags: IJsDocTagInfo[]) =>
-    (input: ts.Expression): ICheckEntry => ({
-        expression: ExpressionFactory.isArray(input),
-        tags: [
-            ...check_array_length(metaTags)(
-                IdentifierFactory.join(input, "length"),
-            ),
-            ...check_custom("array", "Array")(importer)(jsDocTags)(input),
-            // check custom array for legacy (3.7.0)
-        ],
-    });
+import ts from "typescript";
+
+import { ExpressionFactory } from "../../factories/ExpressionFactory";
+import { IdentifierFactory } from "../../factories/IdentifierFactory";
+
+import { IJsDocTagInfo } from "../../metadata/IJsDocTagInfo";
+import { IMetadataTag } from "../../metadata/IMetadataTag";
+
+import { FunctionImporter } from "../helpers/FunctionImporeter";
+import { ICheckEntry } from "../helpers/ICheckEntry";
+import { check_array_length } from "./check_array_length";
+import { check_custom } from "./check_custom";
+
+/**
+ * @internal
+ */
+export const check_array =
+    (importer: FunctionImporter) =>
+    (metaTags: IMetadataTag[]) =>
+    (jsDocTags: IJsDocTagInfo[]) =>
+    (input: ts.Expression): ICheckEntry => ({
+        expression: ExpressionFactory.isArray(input),
+        tags: [
+            ...check_array_length(metaTags)(
+                IdentifierFactory.join(input)("length"),
+            ),
+            ...check_custom("array", "Array")(importer)(jsDocTags)(input),
+            // check custom array for legacy (3.7.0)
+        ],
+    });

package/src/programmers/internal/check_array_length.ts

@@ -1,35 +1,35 @@
-import ts from "typescript";
-
-import { IMetadataTag } from "../../metadata/IMetadataTag";
-
-/**
- * @internal
- */
-export const check_array_length =
-    (metaTags: IMetadataTag[]) => (input: ts.Expression) =>
-        metaTags
-            .map((tag) => ({
-                tag,
-                expression:
-                    tag.kind === "items"
-                        ? ts.factory.createStrictEquality(
-                              ts.factory.createNumericLiteral(tag.value),
-                              input,
-                          )
-                        : tag.kind === "minItems"
-                        ? ts.factory.createLessThanEquals(
-                              ts.factory.createNumericLiteral(tag.value),
-                              input,
-                          )
-                        : tag.kind === "maxItems"
-                        ? ts.factory.createGreaterThanEquals(
-                              ts.factory.createNumericLiteral(tag.value),
-                              input,
-                          )
-                        : null!,
-            }))
-            .filter((tuple) => tuple.expression !== null)
-            .map(({ tag, expression }) => ({
-                expected: `Array.length (@${tag.kind} ${tag.value})`,
-                expression,
-            }));
+import ts from "typescript";
+
+import { IMetadataTag } from "../../metadata/IMetadataTag";
+
+/**
+ * @internal
+ */
+export const check_array_length =
+    (metaTags: IMetadataTag[]) => (input: ts.Expression) =>
+        metaTags
+            .map((tag) => ({
+                tag,
+                expression:
+                    tag.kind === "items"
+                        ? ts.factory.createStrictEquality(
+                              ts.factory.createNumericLiteral(tag.value),
+                              input,
+                          )
+                        : tag.kind === "minItems"
+                        ? ts.factory.createLessThanEquals(
+                              ts.factory.createNumericLiteral(tag.value),
+                              input,
+                          )
+                        : tag.kind === "maxItems"
+                        ? ts.factory.createGreaterThanEquals(
+                              ts.factory.createNumericLiteral(tag.value),
+                              input,
+                          )
+                        : null!,
+            }))
+            .filter((tuple) => tuple.expression !== null)
+            .map(({ tag, expression }) => ({
+                expected: `Array.length (@${tag.kind} ${tag.value})`,
+                expression,
+            }));