Merge pull request #641 from samchon/features/clone

Fix #639 - clone mode for native class (`Date`) types

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestia/core",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Super-fast validation decorators of NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -34,7 +34,7 @@
   },
   "homepage": "https://nestia.io",
   "dependencies": {
-    "@nestia/fetcher": "^2.1.5",
+    "@nestia/fetcher": "^2.1.6",
     "@nestjs/common": ">= 7.0.1",
     "@nestjs/core": ">= 7.0.1",
     "@nestjs/platform-express": ">= 7.0.1",
@@ -47,7 +47,7 @@
     "typia": "^5.1.5"
   },
   "peerDependencies": {
-    "@nestia/fetcher": ">=2.1.5",
+    "@nestia/fetcher": ">=2.1.6",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
     "@nestjs/platform-express": ">=7.0.1",

packages/fetcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestia/fetcher",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Fetcher library of Nestia SDK",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestia/sdk",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Nestia SDK and Swagger generator",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -35,7 +35,7 @@
   },
   "homepage": "https://nestia.io",
   "dependencies": {
-    "@nestia/fetcher": "^2.1.5",
+    "@nestia/fetcher": "^2.1.6",
     "cli": "^1.0.1",
     "glob": "^7.2.0",
     "path-to-regexp": "^6.2.1",
@@ -47,7 +47,7 @@
     "typia": "^5.1.5"
   },
   "peerDependencies": {
-    "@nestia/fetcher": ">=2.1.5",
+    "@nestia/fetcher": ">=2.1.6",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
     "reflect-metadata": ">=0.1.12",

packages/sdk/src/generates/internal/SdkDtoGenerator.ts

@@ -10,6 +10,7 @@ import { MetadataAlias } from "typia/lib/schemas/metadata/MetadataAlias";
 import { MetadataArray } from "typia/lib/schemas/metadata/MetadataArray";
 import { MetadataAtomic } from "typia/lib/schemas/metadata/MetadataAtomic";
 import { MetadataConstant } from "typia/lib/schemas/metadata/MetadataConstant";
+import { MetadataEscaped } from "typia/lib/schemas/metadata/MetadataEscaped";
 import { MetadataObject } from "typia/lib/schemas/metadata/MetadataObject";
 import { MetadataProperty } from "typia/lib/schemas/metadata/MetadataProperty";
 import { MetadataTuple } from "typia/lib/schemas/metadata/MetadataTuple";
@@ -240,13 +241,15 @@ export namespace SdkDtoGenerator {
     export const decode =
         (config: INestiaConfig) =>
         (importer: ImportDictionary) =>
-        (meta: Metadata): string => {
+        (meta: Metadata, parentEscaped: boolean = false): string => {
             const union: string[] = [];
 
             // COALESCES
             if (meta.any) union.push("any");
             if (meta.nullable) union.push("null");
             if (meta.isRequired() === false) union.push("undefined");
+            if (parentEscaped === false && meta.escaped)
+                union.push(decodeEscaped(config)(importer)(meta.escaped));
 
             // ATOMICS
             for (const atomic of meta.atomics)
@@ -278,10 +281,26 @@ export namespace SdkDtoGenerator {
                         importer,
                     )(map.value)}>`,
                 );
-
             return union.join(" | ");
         };
 
+    const decodeEscaped =
+        (config: INestiaConfig) =>
+        (importer: ImportDictionary) =>
+        (escaped: MetadataEscaped) => {
+            if (
+                escaped.original.size() === 1 &&
+                escaped.original.natives.length === 1 &&
+                escaped.original.natives[0] === "Date"
+            )
+                return `(string & ${importer.external({
+                    type: true,
+                    library: `typia/lib/tags/Format`,
+                    instance: "Format",
+                })}<"date-time">)`;
+            return `(${decode(config)(importer)(escaped.returns, true)})`;
+        };
+
     const decodeTypeTag =
         (importer: ImportDictionary) =>
         (tag: IMetadataTypeTag): string => {

test/features/clone-date/nestia.config.ts

@@ -0,0 +1,17 @@
+import { INestiaConfig } from "@nestia/sdk";
+
+export const NESTIA_CONFIG: INestiaConfig = {
+    input: ["src/controllers"],
+    output: "src/api",
+    e2e: "src/test",
+    clone: true,
+    swagger: {
+        output: "swagger.json",
+        security: {
+            bearer: {
+                type: "apiKey",
+            },
+        },
+    },
+};
+export default NESTIA_CONFIG;

test/features/clone-date/src/Backend.ts

@@ -0,0 +1,28 @@
+import { INestApplication } from "@nestjs/common";
+import { NestFactory } from "@nestjs/core";
+
+import core from "@nestia/core";
+
+export class Backend {
+    private application_?: INestApplication;
+
+    public async open(): Promise<void> {
+        this.application_ = await NestFactory.create(
+            await core.EncryptedModule.dynamic(__dirname + "/controllers", {
+                key: "A".repeat(32),
+                iv: "B".repeat(16),
+            }),
+            { logger: false },
+        );
+        await this.application_.listen(37_000);
+    }
+
+    public async close(): Promise<void> {
+        if (this.application_ === undefined) return;
+
+        const app = this.application_;
+        await app.close();
+
+        delete this.application_;
+    }
+}

test/features/clone-date/src/api/HttpError.ts

@@ -0,0 +1 @@
+export { HttpError } from "@nestia/fetcher";

test/features/clone-date/src/api/IConnection.ts

@@ -0,0 +1 @@
+export type { IConnection } from "@nestia/fetcher";

test/features/clone-date/src/api/Primitive.ts

@@ -0,0 +1 @@
+export type { Primitive } from "@nestia/fetcher";

test/features/clone-date/src/api/functional/date/index.ts

@@ -0,0 +1,45 @@
+/**
+ * @packageDocumentation
+ * @module api.functional.date
+ * @nestia Generated by Nestia - https://github.com/samchon/nestia 
+ */
+//================================================================
+import type { IConnection, Primitive } from "@nestia/fetcher";
+import { PlainFetcher } from "@nestia/fetcher/lib/PlainFetcher";
+
+import type { IDateDefined } from "../../structures/IDateDefined";
+
+/**
+ * @controller DateController.get
+ * @path GET /date
+ * @nestia Generated by Nestia - https://github.com/samchon/nestia
+ */
+export async function get(
+    connection: IConnection,
+): Promise<get.Output> {
+    return PlainFetcher.fetch(
+        connection,
+        {
+            ...get.METADATA,
+            path: get.path(),
+        } as const,
+    );
+}
+export namespace get {
+    export type Output = Primitive<IDateDefined>;
+
+    export const METADATA = {
+        method: "GET",
+        path: "/date",
+        request: null,
+        response: {
+            type: "application/json",
+            encrypted: false,
+        },
+        status: null,
+    } as const;
+
+    export const path = (): string => {
+        return `/date`;
+    }
+}

test/features/clone-date/src/api/functional/index.ts

@@ -0,0 +1,7 @@
+/**
+ * @packageDocumentation
+ * @module api.functional
+ * @nestia Generated by Nestia - https://github.com/samchon/nestia 
+ */
+//================================================================
+export * as date from "./date";

test/features/clone-date/src/api/index.ts

@@ -0,0 +1,4 @@
+import * as api from "./module";
+
+export * from "./module";
+export default api;

test/features/clone-date/src/api/module.ts

@@ -0,0 +1,5 @@
+export type * from "./IConnection";
+export type * from "./Primitive";
+export * from "./HttpError";
+
+export * as functional from "./functional";

test/features/clone-date/src/api/structures/ArrayBufferLike.ts

@@ -0,0 +1 @@
+export type ArrayBufferLike = ArrayBuffer | SharedArrayBuffer;

test/features/clone-date/src/api/structures/IDateDefined.ts

@@ -0,0 +1,6 @@
+import type { Format } from "typia/lib/tags/Format";
+
+export type IDateDefined = {
+    string: (string & Format<"date-time">);
+    date: (string & Format<"date-time">);
+}

test/features/clone-date/src/api/structures/__type.ts

@@ -0,0 +1,4 @@
+export type __type = {
+    type: ("Buffer");
+    data: Array<number>;
+}

test/features/clone-date/src/api/structures/buffer.ts

@@ -0,0 +1,31 @@
+import type { ArrayBufferLike } from "./ArrayBufferLike";
+
+export namespace buffer {
+    export namespace global {
+        export type Buffer = {
+            /**
+             * The size in bytes of each element in the array.
+             */
+            BYTES_PER_ELEMENT: number;
+            /**
+             * The ArrayBuffer instance referenced by the array.
+             */
+            buffer: ArrayBufferLike;
+            /**
+             * The length in bytes of the array.
+             */
+            byteLength: number;
+            /**
+             * The offset in bytes of the array.
+             */
+            byteOffset: number;
+            /**
+             * The length of the array.
+             */
+            length: number;
+            "__@toStringTag@398": ("Uint8Array");
+        } & {
+            [key: number]: number;
+        }
+    }
+}

test/features/clone-date/src/controllers/DateController.ts

@@ -0,0 +1,22 @@
+import core from "@nestia/core";
+import { Controller } from "@nestjs/common";
+
+@Controller("date")
+export class DateController {
+    @core.TypedRoute.Get()
+    public get(): IDateDefined {
+        return {
+            string: new Date().toISOString(),
+            date: new Date(),
+        };
+    }
+}
+
+interface IDateDefined {
+    /**
+     * @format date-time
+     */
+    string: string;
+
+    date: Date;
+}

test/features/clone-date/src/test/features/api/automated/test_api_date_get.ts

@@ -0,0 +1,12 @@
+import typia from "typia";
+
+import api from "../../../../api";
+
+export const test_api_date_get = async (
+    connection: api.IConnection
+): Promise<void> => {
+    const output = await api.functional.date.get(
+        connection,
+    );
+    typia.assert(output);
+};

test/features/clone-date/src/test/index.ts

@@ -0,0 +1,40 @@
+import { DynamicExecutor } from "@nestia/e2e";
+
+import { Backend } from "../Backend";
+
+async function main(): Promise<void> {
+    const server: Backend = new Backend();
+    await server.open();
+
+    const report: DynamicExecutor.IReport = await DynamicExecutor.validate({
+        extension: __filename.substring(__filename.length - 2),
+        prefix: "test",
+        parameters: () => [
+            {
+                host: "http://127.0.0.1:37000",
+                encryption: {
+                    key: "A".repeat(32),
+                    iv: "B".repeat(16),
+                },
+            },
+        ],
+    })(`${__dirname}/features`);
+    await server.close();
+
+    const exceptions: Error[] = report.executions
+        .filter((exec) => exec.error !== null)
+        .map((exec) => exec.error!);
+    if (exceptions.length === 0) {
+        console.log("Success");
+        console.log("Elapsed time", report.time.toLocaleString(), `ms`);
+    } else {
+        for (const exp of exceptions) console.log(exp);
+        console.log("Failed");
+        console.log("Elapsed time", report.time.toLocaleString(), `ms`);
+        process.exit(-1);
+    }
+}
+main().catch((exp) => {
+    console.log(exp);
+    process.exit(-1);
+});