typia 4.0.9 → 4.0.10-dev.20230616

package/src/programmers/helpers/StringifyPredicator.ts

@@ -6,7 +6,7 @@ export namespace StringifyPredicator {
 
     export const undefindable = (meta: Metadata): boolean =>
         meta.required === false ||
-        (meta.resolved !== null && meta.resolved.required === false);
+        (meta.resolved !== null && meta.resolved.returns.required === false);
 
     const ESCAPED = ['"', "\\", "\b", "\f", "\n", "\n", "\r", "\t"];
 }

package/src/programmers/internal/application_resolved.ts

@@ -0,0 +1,55 @@
+import { Metadata } from "../../metadata/Metadata";
+import { MetadataResolved } from "../../metadata/MetadataResolved";
+
+import { IJsonComponents, IJsonSchema } from "../../module";
+import { ApplicationProgrammer } from "../ApplicationProgrammer";
+import { application_schema } from "./application_schema";
+
+export const application_resolved =
+    (options: ApplicationProgrammer.IOptions) =>
+    <BlockNever extends boolean>(blockNever: BlockNever) =>
+    (components: IJsonComponents) =>
+    (resolved: MetadataResolved) =>
+    (attribute: IJsonSchema.IAttribute): IJsonSchema[] => {
+        const output = application_schema(options)(blockNever)(components)(
+            resolved.returns,
+        )(attribute);
+        if (output === null) return [];
+
+        if (is_date(new Set())(resolved.original)) {
+            const string: IJsonSchema.IString | undefined = is_string(output)
+                ? output
+                : is_one_of(output)
+                ? output.oneOf.find(is_string)
+                : undefined;
+            if (
+                string !== undefined &&
+                string.format !== "date" &&
+                string.format !== "date-time"
+            )
+                string.format = "date-time";
+        }
+        return is_one_of(output) ? output.oneOf : [output];
+    };
+
+const is_string = (elem: IJsonSchema): elem is IJsonSchema.IString =>
+    (elem as IJsonSchema.IString).type === "string";
+
+const is_one_of = (elem: IJsonSchema): elem is IJsonSchema.IOneOf =>
+    Array.isArray((elem as IJsonSchema.IOneOf).oneOf);
+
+const is_date =
+    (visited: Set<Metadata>) =>
+    (meta: Metadata): boolean => {
+        if (visited.has(meta)) return false;
+        visited.add(meta);
+
+        return (
+            meta.natives.some((name) => name === "Date") ||
+            meta.arrays.some((array) => is_date(visited)(array.value)) ||
+            meta.tuples.some((tuple) =>
+                tuple.elements.some(is_date(visited)),
+            ) ||
+            meta.aliases.some((alias) => is_date(visited)(alias.value))
+        );
+    };

package/src/programmers/internal/application_schema.ts

@@ -11,6 +11,7 @@ import { application_constant } from "./application_constant";
 import { application_native } from "./application_native";
 import { application_number } from "./application_number";
 import { application_object } from "./application_object";
+import { application_resolved } from "./application_resolved";
 import { application_string } from "./application_string";
 import { application_templates } from "./application_templates";
 import { application_tuple } from "./application_tuple";
@@ -57,12 +58,12 @@ export const application_schema =
                 : (schema: IJsonSchema) => union.push(schema);
 
         // toJSON() METHOD
-        if (meta.resolved !== null) {
-            const resolved = application_schema(options)(blockNever)(
-                components,
-            )(meta.resolved)(attribute);
-            if (resolved !== null) union.push(resolved);
-        }
+        if (meta.resolved !== null)
+            union.push(
+                ...application_resolved(options)(blockNever)(components)(
+                    meta.resolved,
+                )(attribute),
+            );
 
         // ATOMIC TYPES
         if (meta.templates.length && AtomicPredicator.template(meta))

package/src/transformers/features/miscellaneous/MetadataTransformer.ts

@@ -33,7 +33,7 @@ export namespace MetadataTransformer {
             const collection: MetadataCollection = new MetadataCollection();
             const metadatas: Array<Metadata> = types.map((type) =>
                 MetadataFactory.analyze(checker)({
-                    resolve: false,
+                    resolve: true,
                     constant: true,
                     absorb: true,
                 })(collection)(type),