typia 3.5.0-dev.20221222 → 3.5.0-dev.20230124

package/src/programmers/internal/application_object.ts

@@ -1,103 +1,153 @@
-import { CommentFactory } from "../../factories/CommentFactory";
-
-import { IJsDocTagInfo } from "../../metadata/IJsDocTagInfo";
-import { MetadataObject } from "../../metadata/MetadataObject";
-import { IJsonComponents } from "../../schemas/IJsonComponents";
-
-import { PatternUtil } from "../../utils/PatternUtil";
-
-import { IJsonSchema } from "../../module";
-import { ApplicationProgrammer } from "../ApplicationProgrammer";
-import { application_schema } from "./application_schema";
-import { metadata_to_pattern } from "./metadata_to_pattern";
-
-/**
- * @internal
- */
-export const application_object =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (id: string, obj: MetadataObject, nullable: boolean): void => {
-        // TEMPORARY ASSIGNMENT
-        if (components.schemas[id] !== undefined) return;
-        components.schemas[id] = {} as any;
-
-        // ITERATE PROPERTIES
-        const properties: Record<string, any> = {};
-        const patternProperties: Record<string, any> = {};
-        const additionalProperties: IJsonSchema[] = [];
-        const required: string[] = [];
-
-        for (const property of obj.properties) {
-            if (
-                property.value.functional === true &&
-                property.value.nullable === false &&
-                property.value.required === true &&
-                property.value.size() === 0
-            )
-                continue;
-
-            const key: string | null = property.key.getSoleLiteral();
-            const value: IJsonSchema | null = application_schema(options)(
-                components,
-            )(true)(property.value, {
-                deprecated:
-                    !!property.jsDocTags.find(
-                        (tag) => tag.name === "deprecated",
-                    ) || undefined,
-                title: (() => {
-                    const info: IJsDocTagInfo | undefined =
-                        property.jsDocTags.find((tag) => tag.name === "title");
-                    return info?.text?.length
-                        ? CommentFactory.generate(info.text)
-                        : undefined;
-                })(),
-                description: property.description,
-                "x-typia-metaTags": property.tags.length
-                    ? property.tags
-                    : undefined,
-                "x-typia-jsDocTags": property.jsDocTags.length
-                    ? property.jsDocTags
-                    : undefined,
-                "x-typia-required": property.value.required,
-            });
-
-            if (value === null) continue;
-            else if (key !== null) {
-                properties[key] = value;
-                if (property.value.required === true) required.push(key);
-            } else {
-                const pattern: string = metadata_to_pattern(true)(property.key);
-                if (
-                    options.purpose === "swagger" ||
-                    pattern === PatternUtil.STRING
-                )
-                    additionalProperties.push(value);
-                else patternProperties[pattern] = value;
-            }
-        }
-
-        const schema: IJsonComponents.IObject = {
-            $id:
-                options.purpose === "ajv"
-                    ? options.prefix + "/" + id
-                    : undefined,
-            $recursiveAnchor:
-                (options.purpose === "ajv" && obj.recursive) || undefined,
-            type: "object",
-            properties,
-            patternProperties: Object.keys(patternProperties).length
-                ? patternProperties
-                : undefined,
-            additionalProperties: additionalProperties.length
-                ? additionalProperties.length === 1
-                    ? additionalProperties[0]
-                    : { oneOf: additionalProperties }
-                : undefined,
-            nullable,
-            required: required.length ? required : undefined,
-            description: obj.description,
-            "x-typia_jsDocTags": obj.jsDocTags,
-        };
-        components.schemas[id] = schema;
-    };
+import { CommentFactory } from "../../factories/CommentFactory";
+
+import { IJsDocTagInfo } from "../../metadata/IJsDocTagInfo";
+import { Metadata } from "../../metadata/Metadata";
+import { MetadataObject } from "../../metadata/MetadataObject";
+import { IJsonComponents } from "../../schemas/IJsonComponents";
+
+import { PatternUtil } from "../../utils/PatternUtil";
+
+import { IJsonSchema } from "../../module";
+import { ApplicationProgrammer } from "../ApplicationProgrammer";
+import { application_schema } from "./application_schema";
+import { metadata_to_pattern } from "./metadata_to_pattern";
+
+/**
+ * @internal
+ */
+export const application_object =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (id: string, obj: MetadataObject, nullable: boolean): void => {
+        // TEMPORARY ASSIGNMENT
+        if (components.schemas[id] !== undefined) return;
+        components.schemas[id] = {} as any;
+
+        // ITERATE PROPERTIES
+        const properties: Record<string, any> = {};
+        const extraMeta: ISuperfluous = {
+            patternProperties: {},
+            additionalProperties: undefined,
+        };
+        const required: string[] = [];
+
+        for (const property of obj.properties) {
+            if (
+                property.value.functional === true &&
+                property.value.nullable === false &&
+                property.value.required === true &&
+                property.value.size() === 0
+            )
+                continue;
+
+            const key: string | null = property.key.getSoleLiteral();
+            const schema: IJsonSchema | null = application_schema(options)(
+                components,
+            )(true)(property.value, {
+                deprecated:
+                    !!property.jsDocTags.find(
+                        (tag) => tag.name === "deprecated",
+                    ) || undefined,
+                title: (() => {
+                    const info: IJsDocTagInfo | undefined =
+                        property.jsDocTags.find((tag) => tag.name === "title");
+                    return info?.text?.length
+                        ? CommentFactory.generate(info.text)
+                        : undefined;
+                })(),
+                description: property.description,
+                "x-typia-metaTags": property.tags.length
+                    ? property.tags
+                    : undefined,
+                "x-typia-jsDocTags": property.jsDocTags.length
+                    ? property.jsDocTags
+                    : undefined,
+                "x-typia-required": property.value.required,
+            });
+
+            if (schema === null) continue;
+            else if (key !== null) {
+                properties[key] = schema;
+                if (property.value.required === true) required.push(key);
+            } else {
+                const pattern: string = metadata_to_pattern(true)(property.key);
+                if (pattern === PatternUtil.STRING)
+                    extraMeta.additionalProperties = [property.value, schema];
+                else
+                    extraMeta.patternProperties[pattern] = [
+                        property.value,
+                        schema,
+                    ];
+            }
+        }
+
+        const extraProps = {
+            additionalProperties: extraMeta.additionalProperties?.[1],
+            patternProperties: (() => {
+                if (Object.keys(extraMeta.patternProperties).length === 0)
+                    return undefined;
+                const output: Record<string, IJsonSchema> = {};
+                for (const [key, value] of Object.entries(
+                    extraMeta.patternProperties,
+                ))
+                    output[key] = value[1];
+                return output;
+            })(),
+        };
+        const schema: IJsonComponents.IObject = {
+            $id:
+                options.purpose === "ajv"
+                    ? options.prefix + "/" + id
+                    : undefined,
+            $recursiveAnchor:
+                (options.purpose === "ajv" && obj.recursive) || undefined,
+            type: "object",
+            properties,
+            nullable,
+            required: required.length ? required : undefined,
+            description: obj.description,
+            "x-typia-jsDocTags": obj.jsDocTags,
+            ...(options.purpose === "ajv"
+                ? extraProps
+                : {
+                      // swagger can't express patternProperties
+                      "x-typia-additionalProperties":
+                          extraProps.additionalProperties,
+                      "x-typia-patternProperties": extraProps.patternProperties,
+                      additionalProperties:
+                          join(options)(components)(extraMeta),
+                  }),
+        };
+        components.schemas[id] = schema;
+    };
+
+const join =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (extra: ISuperfluous): IJsonSchema | undefined => {
+        // LIST UP METADATA
+        const elements: [Metadata, IJsonSchema][] = Object.values(
+            extra.patternProperties || {},
+        );
+        if (extra.additionalProperties)
+            elements.push(extra.additionalProperties);
+
+        // SHORT RETURN
+        if (elements.length === 0) return undefined;
+        else if (elements.length === 1) return elements[0]![1]!;
+
+        // MERGE METADATA AND GENERATE VULNERABLE SCHEMA
+        const meta: Metadata = elements
+            .map((tuple) => tuple[0])
+            .reduce((x, y) => Metadata.merge(x, y));
+        return (
+            application_schema(options)(components)(true)(meta, {
+                "x-typia-required": false,
+            }) ?? undefined
+        );
+    };
+
+interface ISuperfluous {
+    additionalProperties?: [Metadata, IJsonSchema];
+    patternProperties: Record<string, [Metadata, IJsonSchema]>;
+}

package/src/programmers/internal/application_schema.ts

@@ -1,9 +1,7 @@
 import { Metadata } from "../../metadata/Metadata";
-import { MetadataConstant } from "../../metadata/MetadataConstant";
 import { IJsonComponents } from "../../schemas/IJsonComponents";
 import { IJsonSchema } from "../../schemas/IJsonSchema";
 
-import { ArrayUtil } from "../../utils/ArrayUtil";
 import { NameEncoder } from "../../utils/NameEncoder";
 
 import { ApplicationProgrammer } from "../ApplicationProgrammer";
@@ -75,7 +73,7 @@ export const application_schema =
         // ARRAY
         for (const schema of meta.arrays.values())
             union.push(
-                application_array(options)(components)(
+                application_array(options)(components)()(
                     schema,
                     meta.nullable,
                     attribute,
@@ -83,31 +81,33 @@ export const application_schema =
             );
 
         // TUPLE
-        for (const items of meta.tuples)
-            if (
+        for (const items of meta.tuples) {
+            const tuple: IJsonSchema.ITuple = application_tuple(options)(
+                components,
+            )(items, 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.",
+                );
+            else if (
                 options.purpose === "ajv" &&
-                items.every((i) => i.rest === null)
+                !items[items.length - 1]?.rest
             )
-                union.push(
-                    application_tuple(options)(components)(
-                        items,
-                        meta.nullable,
-                        attribute,
-                    ),
-                );
+                union.push(tuple);
             else {
                 // SWAGGER DOES NOT SUPPORT TUPLE TYPE YET
                 const merged: Metadata = items.reduce((x, y) =>
-                    merge_metadata(x, y),
+                    Metadata.merge(x, y),
                 );
                 union.push(
-                    application_array(options)(components)(
+                    application_array(options)(components)(tuple)(
                         merged,
                         merged?.nullable || false,
                         attribute,
                     ),
                 );
             }
+        }
 
         // NATIVES
         for (const native of meta.natives)
@@ -175,57 +175,4 @@ const recursive = (
     ...attribute,
 });
 
-/**
- * @internal
- * @todo: not perfect
- */
-function merge_metadata(x: Metadata, y: Metadata): Metadata {
-    const output: Metadata = Metadata.create({
-        any: x.any || y.any,
-        nullable: x.nullable || y.nullable,
-        required: x.required && y.required,
-        functional: x.functional || y.functional,
-
-        resolved:
-            x.resolved !== null && y.resolved !== null
-                ? merge_metadata(x.resolved, y.resolved)
-                : x.resolved || y.resolved,
-        atomics: [...new Set([...x.atomics, ...y.atomics])],
-        constants: [...x.constants],
-        templates: x.templates.slice(),
-
-        rest: null,
-        arrays: x.arrays.slice(),
-        tuples: x.tuples.slice(),
-        objects: x.objects.slice(),
-
-        natives: [...new Set([...x.natives, ...y.natives])],
-        sets: x.sets.slice(),
-        maps: x.maps.slice(),
-    });
-    for (const constant of y.constants) {
-        const target: MetadataConstant = ArrayUtil.take(
-            output.constants,
-            (elem) => elem.type === constant.type,
-            () => ({
-                type: constant.type,
-                values: [],
-            }),
-        );
-        for (const value of constant.values)
-            ArrayUtil.add(target.values, value);
-    }
-    for (const array of y.arrays)
-        ArrayUtil.set(output.arrays, array, (elem) => elem.getName());
-    for (const obj of y.objects)
-        ArrayUtil.set(output.objects, obj, (elem) => elem.name);
-
-    if (x.rest !== null)
-        ArrayUtil.set(output.arrays, x.rest, (elem) => elem.getName());
-    if (y.rest !== null)
-        ArrayUtil.set(output.arrays, y.rest, (elem) => elem.getName());
-
-    return output;
-}
-
 const NO_BIGINT = "Error on typia.application(): does not allow bigint type.";

package/src/programmers/internal/application_string.ts

@@ -1,49 +1,49 @@
-import { Metadata } from "../../metadata/Metadata";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { application_default_string } from "./application_default_string";
-
-/**
- * @internal
- */
-export const application_string = (
-    meta: Metadata,
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.IString => {
-    const output: IJsonSchema.IString = {
-        type: "string",
-        nullable: meta.nullable,
-        ...attribute,
-    };
-
-    // FORMAT TAG OF METADATA
-    const formatJsdocTag = attribute["x-typia-jsDocTags"]?.find(
-        (tag) => tag.name === "format",
-    );
-    if (formatJsdocTag?.text?.length)
-        output.format = formatJsdocTag?.text.map((t) => t.text).join(" ");
-
-    // REGULAR TAGS COMPATIBLE WITH JSON-SCHEMA
-    for (const tag of attribute["x-typia-metaTags"] || []) {
-        // RANGE
-        if (tag.kind === "minLength") output.minLength = tag.value;
-        else if (tag.kind === "maxLength") output.maxLength = tag.value;
-        else if (tag.kind === "length") {
-            if (tag.minimum !== undefined)
-                output.minLength =
-                    tag.minimum.value + (tag.minimum.include ? 0 : 1);
-            if (tag.maximum !== undefined)
-                output.maxLength =
-                    tag.maximum.value - (tag.maximum.include ? 0 : 1);
-        }
-        // FORMAT AND PATTERN
-        else if (tag.kind === "format") output.format = tag.value;
-        else if (tag.kind === "pattern") output.pattern = tag.value;
-    }
-
-    // DEFAULT CONFIGURATION
-    output.default = application_default_string(meta, attribute)(output);
-
-    // RETURNS
-    return output;
-};
+import { Metadata } from "../../metadata/Metadata";
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+import { application_default_string } from "./application_default_string";
+
+/**
+ * @internal
+ */
+export const application_string = (
+    meta: Metadata,
+    attribute: IJsonSchema.IAttribute,
+): IJsonSchema.IString => {
+    const output: IJsonSchema.IString = {
+        type: "string",
+        nullable: meta.nullable,
+        ...attribute,
+    };
+
+    // FORMAT TAG OF METADATA
+    const formatJsdocTag = attribute["x-typia-jsDocTags"]?.find(
+        (tag) => tag.name === "format",
+    );
+    if (formatJsdocTag?.text?.length)
+        output.format = formatJsdocTag?.text.map((t) => t.text).join(" ");
+
+    // REGULAR TAGS COMPATIBLE WITH JSON-SCHEMA
+    for (const tag of attribute["x-typia-metaTags"] || []) {
+        // RANGE
+        if (tag.kind === "minLength") output.minLength = tag.value;
+        else if (tag.kind === "maxLength") output.maxLength = tag.value;
+        else if (tag.kind === "length") {
+            if (tag.minimum !== undefined)
+                output.minLength =
+                    tag.minimum.value + (tag.minimum.include ? 0 : 1);
+            if (tag.maximum !== undefined)
+                output.maxLength =
+                    tag.maximum.value - (tag.maximum.include ? 0 : 1);
+        }
+        // FORMAT AND PATTERN
+        else if (tag.kind === "format") output.format = tag.value;
+        else if (tag.kind === "pattern") output.pattern = tag.value;
+    }
+
+    // DEFAULT CONFIGURATION
+    output.default = application_default_string(meta, attribute)(output);
+
+    // RETURNS
+    return output;
+};

package/src/programmers/internal/application_templates.ts

@@ -1,27 +1,27 @@
-import { Metadata } from "../../metadata/Metadata";
-import { IJsonSchema } from "../../schemas/IJsonSchema";
-
-import { application_default_string } from "./application_default_string";
-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);
-
-    // DEFAULT VALUE
-    output.default = application_default_string(meta, attribute)(output);
-
-    // RETURNS
-    return output;
-};
+import { Metadata } from "../../metadata/Metadata";
+import { IJsonSchema } from "../../schemas/IJsonSchema";
+
+import { application_default_string } from "./application_default_string";
+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);
+
+    // DEFAULT VALUE
+    output.default = application_default_string(meta, attribute)(output);
+
+    // RETURNS
+    return output;
+};

package/src/programmers/internal/application_tuple.ts

@@ -1,25 +1,29 @@
-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_tuple =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (
-        items: Array<Metadata>,
-        nullable: boolean,
-        attribute: IJsonSchema.IAttribute,
-    ): IJsonSchema.ITuple => ({
-        type: "array",
-        items: items.map((meta) =>
-            application_schema(options)(components)(false)(meta, attribute),
-        ),
-        nullable,
-        ...attribute,
-    });
+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_tuple =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (
+        items: Array<Metadata>,
+        nullable: boolean,
+        attribute: IJsonSchema.IAttribute,
+    ): IJsonSchema.ITuple => ({
+        type: "array",
+        items: items.map((meta, i) =>
+            application_schema(options)(components)(false)(meta.rest ?? meta, {
+                ...attribute,
+                "x-typia-rest":
+                    i === items.length - 1 ? meta.rest !== null : undefined,
+            }),
+        ),
+        nullable,
+        ...attribute,
+    });

package/src/programmers/internal/check_array.ts

@@ -1,44 +1,22 @@
-import ts from "typescript";
-
-import { ExpressionFactory } from "../../factories/ExpressionFactory";
-import { IdentifierFactory } from "../../factories/IdentifierFactory";
-
-import { IMetadataTag } from "../../metadata/IMetadataTag";
-
-import { check_length } from "./check_length";
-
-/**
- * @internal
- */
-export function check_array(
-    input: ts.Expression,
-    tagList: IMetadataTag[],
-): ts.Expression {
-    const conditions: ts.Expression[] = [ExpressionFactory.isArray(input)];
-
-    // CHECK TAGS
-    for (const tag of tagList)
-        if (tag.kind === "minItems")
-            conditions.push(
-                ts.factory.createLessThanEquals(
-                    ts.factory.createNumericLiteral(tag.value),
-                    IdentifierFactory.join(input, "length"),
-                ),
-            );
-        else if (tag.kind === "maxItems")
-            conditions.push(
-                ts.factory.createGreaterThanEquals(
-                    ts.factory.createNumericLiteral(tag.value),
-                    IdentifierFactory.join(input, "length"),
-                ),
-            );
-        else if (tag.kind === "items")
-            check_length(
-                conditions,
-                IdentifierFactory.join(input, "length"),
-                tag,
-            );
-
-    // COMBINATION
-    return conditions.reduce((x, y) => ts.factory.createLogicalAnd(x, y));
-}
+import ts from "typescript";
+
+import { ExpressionFactory } from "../../factories/ExpressionFactory";
+
+import { IMetadataTag } from "../../metadata/IMetadataTag";
+
+import { check_array_length } from "./check_array_length";
+
+/**
+ * @internal
+ */
+export function check_array(
+    input: ts.Expression,
+    tagList: IMetadataTag[],
+): ts.Expression {
+    const conditions: ts.Expression[] = [ExpressionFactory.isArray(input)];
+
+    const length: ts.Expression | null = check_array_length(input, tagList);
+    if (length !== null) conditions.push(length);
+
+    return conditions.reduce((x, y) => ts.factory.createLogicalAnd(x, y));
+}