typia 5.0.0-dev.20230822 → 5.0.0-dev.20230823-2

package/src/schemas/metadata/IMetadata.ts

@@ -2,7 +2,7 @@ import { Atomic } from "../../typings/Atomic";
 
 import { IMetadataConstant } from "./IMetadataConstant";
 import { IMetadataEntry } from "./IMetadataEntry";
-import { IMetadataResolved } from "./IMetadataResolved";
+import { IMetadataEscaped } from "./IMetadataEscaped";
 
 export interface IMetadata {
     any: boolean;
@@ -14,7 +14,7 @@ export interface IMetadata {
     atomics: Atomic.Literal[];
     constants: IMetadataConstant[];
     templates: IMetadata[][];
-    resolved: IMetadataResolved | null;
+    escaped: IMetadataEscaped | null;
 
     rest: IMetadata | null;
     arrays: string[];

package/src/schemas/metadata/{IMetadataResolved.ts → IMetadataEscaped.ts}

@@ -1,6 +1,6 @@
 import { IMetadata } from "./IMetadata";
 
-export interface IMetadataResolved {
+export interface IMetadataEscaped {
     original: IMetadata;
     returns: IMetadata;
 }

package/src/schemas/metadata/Metadata.ts

@@ -10,9 +10,9 @@ import { IMetadataDictionary } from "./IMetadataDictionary";
 import { MetadataAlias } from "./MetadataAlias";
 import { MetadataArray } from "./MetadataArray";
 import { MetadataConstant } from "./MetadataConstant";
+import { MetadataEscaped } from "./MetadataEscaped";
 import { MetadataObject } from "./MetadataObject";
 import { MetadataProperty } from "./MetadataProperty";
-import { MetadataResolved } from "./MetadataResolved";
 import { MetadataTuple } from "./MetadataTuple";
 
 export class Metadata {
@@ -22,7 +22,7 @@ export class Metadata {
     public nullable: boolean;
     public functional: boolean;
 
-    public resolved: MetadataResolved | null;
+    public escaped: MetadataEscaped | null;
     public atomics: Atomic.Literal[];
     public constants: MetadataConstant[];
     public templates: Metadata[][];
@@ -55,7 +55,7 @@ export class Metadata {
         this.nullable = props.nullable;
         this.functional = props.functional;
 
-        this.resolved = props.resolved;
+        this.escaped = props.escaped;
         this.atomics = props.atomics;
         this.constants = props.constants;
         this.templates = props.templates;
@@ -89,7 +89,7 @@ export class Metadata {
             optional: false,
             functional: false,
 
-            resolved: null,
+            escaped: null,
             constants: [],
             atomics: [],
             templates: [],
@@ -120,7 +120,7 @@ export class Metadata {
             templates: this.templates.map((tpl) =>
                 tpl.map((meta) => meta.toJSON()),
             ),
-            resolved: this.resolved ? this.resolved.toJSON() : null,
+            escaped: this.escaped ? this.escaped.toJSON() : null,
 
             rest: this.rest ? this.rest.toJSON() : null,
             arrays: this.arrays.map((array) => array.name),
@@ -209,8 +209,8 @@ export class Metadata {
             templates: meta.templates.map((tpl) =>
                 tpl.map((meta) => this._From(meta, dict)),
             ),
-            resolved: meta.resolved
-                ? MetadataResolved._From(meta.resolved, dict)
+            escaped: meta.escaped
+                ? MetadataEscaped._From(meta.escaped, dict)
                 : null,
 
             rest: meta.rest ? this._From(meta.rest, dict) : null,
@@ -271,7 +271,7 @@ export class Metadata {
     public size(): number {
         return (
             (this.any ? 1 : 0) +
-            (this.resolved ? 1 : 0) +
+            (this.escaped ? 1 : 0) +
             (this.functional ? 1 : 0) +
             (this.rest ? this.rest.size() : 0) +
             this.templates.length +
@@ -310,7 +310,7 @@ export class Metadata {
     public bucket(): number {
         return (
             (this.any ? 1 : 0) +
-            (this.resolved ? 1 : 0) +
+            (this.escaped ? 1 : 0) +
             (this.functional ? 1 : 0) +
             (this.templates.length ? 1 : 0) +
             (this.atomics.length ? 1 : 0) +
@@ -521,20 +521,17 @@ export namespace Metadata {
             optional: x.optional || y.optional,
             functional: x.functional || y.functional,
 
-            resolved:
-                x.resolved !== null && y.resolved !== null
+            escaped:
+                x.escaped !== null && y.escaped !== null
                     ? //? merge(x.resolved, y.resolved)
-                      MetadataResolved.create({
+                      MetadataEscaped.create({
                           original: merge(
-                              x.resolved.original,
-                              y.resolved.original,
-                          ),
-                          returns: merge(
-                              x.resolved.returns,
-                              y.resolved.returns,
+                              x.escaped.original,
+                              y.escaped.original,
                           ),
+                          returns: merge(x.escaped.returns, y.escaped.returns),
                       })
-                    : x.resolved ?? y.resolved,
+                    : x.escaped ?? y.escaped,
             atomics: [...new Set([...x.atomics, ...y.atomics])],
             constants: [...x.constants],
             templates: x.templates.slice(),
@@ -620,7 +617,7 @@ const getName = (metadata: Metadata): string => {
     for (const array of metadata.arrays) elements.push(array.name);
     for (const object of metadata.objects) elements.push(object.name);
     for (const alias of metadata.aliases) elements.push(alias.name);
-    if (metadata.resolved !== null) elements.push(metadata.resolved.getName());
+    if (metadata.escaped !== null) elements.push(metadata.escaped.getName());
 
     // RETURNS
     if (elements.length === 0) return "unknown";

package/src/schemas/metadata/{MetadataResolved.ts → MetadataEscaped.ts}

@@ -1,17 +1,17 @@
 import { ClassProperties } from "../../typings/ClassProperties";
 
 import { IMetadataDictionary } from "./IMetadataDictionary";
-import { IMetadataResolved } from "./IMetadataResolved";
+import { IMetadataEscaped } from "./IMetadataEscaped";
 import { Metadata } from "./Metadata";
 
-export class MetadataResolved {
+export class MetadataEscaped {
     public readonly original: Metadata;
     public readonly returns: Metadata;
 
     /**
      * @hidden
      */
-    private constructor(props: ClassProperties<MetadataResolved>) {
+    private constructor(props: ClassProperties<MetadataEscaped>) {
         this.original = props.original;
         this.returns = props.returns;
     }
@@ -20,9 +20,9 @@ export class MetadataResolved {
      * @internal
      */
     public static _From(
-        props: IMetadataResolved,
+        props: IMetadataEscaped,
         dict: IMetadataDictionary,
-    ): MetadataResolved {
+    ): MetadataEscaped {
         return this.create({
             original: Metadata._From(props.original, dict),
             returns: Metadata._From(props.returns, dict),
@@ -33,16 +33,16 @@ export class MetadataResolved {
      * @internal
      */
     public static create(
-        props: ClassProperties<MetadataResolved>,
-    ): MetadataResolved {
-        return new MetadataResolved(props);
+        props: ClassProperties<MetadataEscaped>,
+    ): MetadataEscaped {
+        return new MetadataEscaped(props);
     }
 
     public getName(): string {
         return this.returns.getName();
     }
 
-    public toJSON(): IMetadataResolved {
+    public toJSON(): IMetadataEscaped {
         return {
             original: this.original.toJSON(),
             returns: this.returns.toJSON(),

package/src/transformers/features/json/JsonApplicationTransformer.ts

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

package/src/transformers/features/misc/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: true,
+                    escape: true,
                     constant: true,
                     absorb: true,
                 })(collection)(type),

package/src/utils/RandomGenerator.ts

@@ -74,8 +74,10 @@ export namespace RandomGenerator {
     };
 
     export const datetime = (min?: number, max?: number) => {
-        min ??= 0;
-        max ??= Date.now() * 2;
+        min ??= Date.now() - 30 * DAY;
+        max ??= Date.now() + 7 * DAY;
         return new Date(number(min, max)).toISOString();
     };
 }
+
+const DAY = 1000 * 60 * 60 * 24;

package/lib/schemas/metadata/IMetadataResolved.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IMetadataResolved.js","sourceRoot":"","sources":["../../../src/schemas/metadata/IMetadataResolved.ts"],"names":[],"mappings":""}

package/lib/schemas/metadata/MetadataResolved.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MetadataResolved.js","sourceRoot":"","sources":["../../../src/schemas/metadata/MetadataResolved.ts"],"names":[],"mappings":";;;AAIA,uCAAsC;AAEtC;IAOI,0BAAoB,KAAwC;QACxD,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IACjC,CAAC;IAKa,sBAAK,GAAnB,UACI,KAAwB,EACxB,IAAyB;QAEzB,OAAO,IAAI,CAAC,MAAM,CAAC;YACf,QAAQ,EAAE,mBAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC;YAC9C,OAAO,EAAE,mBAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC;SAC/C,CAAC,CAAC;IACP,CAAC;IAKa,uBAAM,GAApB,UACI,KAAwC;QAExC,OAAO,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAEM,kCAAO,GAAd;QACI,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;IAEM,iCAAM,GAAb;QACI,OAAO;YACH,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;SACjC,CAAC;IACN,CAAC;IACL,uBAAC;AAAD,CAAC,AA5CD,IA4CC;AA5CY,4CAAgB"}