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

package/src/programmers/internal/application_number.ts

@@ -1,71 +1,71 @@
-import { IJsonSchema } from "../../module";
-import { application_default } from "./application_default";
-
-/**
- * @internal
- */
-export const application_number = (
-    attribute: IJsonSchema.IAttribute,
-): IJsonSchema.INumber | IJsonSchema.IInteger => {
-    const output: IJsonSchema.INumber | IJsonSchema.IInteger = {
-        ...attribute,
-        type: "number" as "number" | "integer",
-    };
-    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 === "exclusiveMinimum") {
-            output.minimum = tag.value;
-            output.exclusiveMinimum = true;
-        } else if (tag.kind === "exclusiveMaximum") {
-            output.maximum = tag.value;
-            output.exclusiveMaximum = true;
-        }
-        // 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.exclusiveMaximum !== true && output.minimum < 0)
-        )
-            output.minimum = 0;
-        else if (output.exclusiveMinimum === true && output.minimum < -1) {
-            output.maximum = 0;
-            delete output.exclusiveMinimum;
-        }
-
-    // DEFAULT CONFIGURATION
-    output.default = application_default(attribute)((str) => {
-        const value: number = Number(str);
-        const conditions: boolean[] = [!Number.isNaN(value)];
-        if (output.minimum !== undefined)
-            if (output.exclusiveMinimum === true)
-                conditions.push(value > output.minimum);
-            else conditions.push(value >= output.minimum);
-        if (output.maximum !== undefined)
-            if (output.exclusiveMaximum === true)
-                conditions.push(value < output.maximum);
-            else conditions.push(value <= output.maximum);
-        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 = (
+    attribute: IJsonSchema.IAttribute,
+): IJsonSchema.INumber | IJsonSchema.IInteger => {
+    const output: IJsonSchema.INumber | IJsonSchema.IInteger = {
+        ...attribute,
+        type: "number" as "number" | "integer",
+    };
+    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 === "exclusiveMinimum") {
+            output.minimum = tag.value;
+            output.exclusiveMinimum = true;
+        } else if (tag.kind === "exclusiveMaximum") {
+            output.maximum = tag.value;
+            output.exclusiveMaximum = true;
+        }
+        // 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.exclusiveMaximum !== true && output.minimum < 0)
+        )
+            output.minimum = 0;
+        else if (output.exclusiveMinimum === true && output.minimum < -1) {
+            output.maximum = 0;
+            delete output.exclusiveMinimum;
+        }
+
+    // DEFAULT CONFIGURATION
+    output.default = application_default(attribute)((str) => {
+        const value: number = Number(str);
+        const conditions: boolean[] = [!Number.isNaN(value)];
+        if (output.minimum !== undefined)
+            if (output.exclusiveMinimum === true)
+                conditions.push(value > output.minimum);
+            else conditions.push(value >= output.minimum);
+        if (output.maximum !== undefined)
+            if (output.exclusiveMaximum === true)
+                conditions.push(value < output.maximum);
+            else conditions.push(value <= output.maximum);
+        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_object.ts

@@ -1,162 +1,167 @@
-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 { JSON_SCHEMA_PREFIX } from "./JSON_SCHEMA_PREFIX";
-import { application_schema } from "./application_schema";
-import { metadata_to_pattern } from "./metadata_to_pattern";
-
-/**
- * @internal
- */
-export const application_object =
-    (options: ApplicationProgrammer.IOptions) =>
-    (components: IJsonComponents) =>
-    (obj: MetadataObject) =>
-    (nullable: boolean): string => {
-        const key =
-            options.purpose === "ajv"
-                ? obj.name
-                : `${obj.name}${nullable ? ".Nullable" : ""}`;
-
-        // TEMPORARY ASSIGNMENT
-        if (components.schemas[key] !== undefined) return key;
-        components.schemas[key] = {} 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)(
-                true,
-            )(components)(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.string(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,
-                "x-typia-optional": property.value.optional,
-            });
-
-            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"
-                    ? `${JSON_SCHEMA_PREFIX}/${key}`
-                    : undefined,
-            $recursiveAnchor:
-                (options.purpose === "ajv" && obj.recursive) || undefined,
-            type: "object",
-            properties,
-            nullable: options.purpose === "swagger" ? nullable : undefined,
-            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[key] = schema;
-        return key;
-    };
-
-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)(true)(components)(meta)({
-                "x-typia-required": false,
-            }) ?? undefined
-        );
-    };
-
-interface ISuperfluous {
-    additionalProperties?: [Metadata, IJsonSchema];
-    patternProperties: Record<string, [Metadata, IJsonSchema]>;
-}
+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 { JSON_COMPONENTS_PREFIX } from "./JSON_SCHEMA_PREFIX";
+import { application_schema } from "./application_schema";
+import { metadata_to_pattern } from "./metadata_to_pattern";
+
+/**
+ * @internal
+ */
+export const application_object =
+    (options: ApplicationProgrammer.IOptions) =>
+    (components: IJsonComponents) =>
+    (obj: MetadataObject) =>
+    (
+        nullable: boolean,
+    ): IJsonSchema.IReference | IJsonSchema.IRecursiveReference => {
+        const key: string =
+            options.purpose === "ajv"
+                ? obj.name
+                : `${obj.name}${nullable ? ".Nullable" : ""}`;
+        const $id: string = `${JSON_COMPONENTS_PREFIX}/objects/${key}`;
+        const out = () =>
+            options.purpose === "ajv" && obj.recursive
+                ? { $recursiveRef: $id }
+                : { $ref: $id };
+
+        // TEMPORARY ASSIGNMENT
+        if (components.objects?.[key] !== undefined) return out();
+        components.objects ??= {};
+        components.objects[key] = {} 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)(
+                true,
+            )(components)(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.merge(info.text)
+                        : undefined;
+                })(),
+                description: property.description ?? undefined,
+                "x-typia-metaTags": property.tags.length
+                    ? property.tags
+                    : undefined,
+                "x-typia-jsDocTags": property.jsDocTags.length
+                    ? property.jsDocTags
+                    : undefined,
+                "x-typia-required": property.value.required,
+                "x-typia-optional": property.value.optional,
+            });
+
+            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" ? $id : undefined,
+            $recursiveAnchor:
+                (options.purpose === "ajv" && obj.recursive) || undefined,
+            type: "object",
+            properties,
+            nullable: options.purpose === "swagger" ? nullable : undefined,
+            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.objects[key] = schema;
+        return out();
+    };
+
+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)(true)(components)(meta)({
+                "x-typia-required": false,
+            }) ?? undefined
+        );
+    };
+
+interface ISuperfluous {
+    additionalProperties?: [Metadata, IJsonSchema];
+    patternProperties: Record<string, [Metadata, IJsonSchema]>;
+}