Publish v2.2 with @nestia/migrate

samchon · Oct 10, 2023 · 0208b32 · 0208b32
1 parent 569e6a7
commit 0208b32
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 24 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/core",
-  "version": "2.2.0-dev.20231010",
+  "version": "2.2.0",
   "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.2.0-dev.20231010",
+    "@nestia/fetcher": "^2.2.0",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
     "@nestjs/platform-express": ">=7.0.1",
@@ -47,7 +47,7 @@
     "typia": ">=5.2.0 <6.0.0"
   },
   "peerDependencies": {
-    "@nestia/fetcher": ">=2.2.0-dev.20231010",
+    "@nestia/fetcher": ">=2.2.0",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
     "@nestjs/platform-express": ">=7.0.1",

diff --git a/packages/fetcher/package.json b/packages/fetcher/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/fetcher",
-  "version": "2.2.0-dev.20231010",
+  "version": "2.2.0",
   "description": "Fetcher library of Nestia SDK",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/fetcher/src/internal/IFetchRoute.ts b/packages/fetcher/src/internal/IFetchRoute.ts
@@ -1,3 +1,8 @@
+/**
+ * Properties of remote API route.
+ *
+ * @author Jeongho Nam - https://github.com/samchon
+ */
 export interface IFetchRoute<
     Method extends "HEAD" | "GET" | "POST" | "PUT" | "PATCH" | "DELETE",
 > {
@@ -15,13 +20,13 @@ export interface IFetchRoute<
      * Request body data info.
      */
     request: Method extends "DELETE" | "POST" | "PUT" | "PATCH"
-        ? IRoute.IBody | null
+        ? IFetchRoute.IBody | null
         : null;
 
     /**
      * Response body data info.
      */
-    response: Method extends "HEAD" ? null : IRoute.IBody;
+    response: Method extends "HEAD" ? null : IFetchRoute.IBody;
 
     /**
      * When special status code being used.
@@ -32,15 +37,20 @@ export interface IFetchRoute<
      * Parser of the query string.
      *
      * If content type of response body is `application/x-www-form-urlencoded`,
-     * then this `query` function would be called.
+     * then this `parseQuery` function would be called.
      *
-     * If you've forgotten to configuring this property about the
-     * `application/x-www-form-urlencoded` typed response body data,
-     * then `URLSearchParams` instance would be returned instead.
+     * If you've forgotten to configuring this `parseQuery` property about the
+     * `application/x-www-form-urlencoded` typed response body data, then
+     * only the `URLSearchParams` typed instance would be returned instead.
      */
     parseQuery?(input: URLSearchParams): any;
 }
-export namespace IRoute {
+export namespace IFetchRoute {
+    /**
+     * Metadata of body.
+     *
+     * Describes how content-type being used in body, and whether encrypted or not.
+     */
     export interface IBody {
         type:
             | "application/json"

diff --git a/packages/migrate/package.json b/packages/migrate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/migrate",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Migration program from swagger to NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -30,8 +30,8 @@
   },
   "homepage": "https://github.com/samchon/nestia#readme",
   "devDependencies": {
-    "@nestia/core": "^2.1.5",
-    "@nestia/fetcher": "^2.1.5",
+    "@nestia/core": "^2.2.0-dev.20231010",
+    "@nestia/fetcher": "^2.2.0-dev.20231010",
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
     "@types/node": "^20.3.3",
     "prettier": "^2.8.8",

diff --git a/packages/migrate/src/programmers/RouteProgrammer.ts b/packages/migrate/src/programmers/RouteProgrammer.ts
@@ -25,7 +25,7 @@ export namespace RouteProgrammer {
                 console.log(
                     `Failed to migrate ${props.method.toUpperCase()} ${
                         props.path
-                    }: @nestia/migrate supports only application/json or text/plain format yet.`,
+                    }: @nestia/migrate supports only application/json, application/x-www-form-urlencoded or text/plain format yet.`,
                 );
                 return null;
             } else if (
@@ -296,7 +296,6 @@ export namespace RouteProgrammer {
                       e[0].includes("application/json")
                     : e[0].includes("application/json"),
             );
-
             if (json) {
                 const { schema } = json[1];
                 return {
@@ -308,6 +307,19 @@ export namespace RouteProgrammer {
                 };
             }
 
+            const query = entries.find((e) =>
+                e[0].includes("application/x-www-form-urlencoded"),
+            );
+            if (query) {
+                const { schema } = query[1];
+                return {
+                    type: "application/x-www-form-urlencoded",
+                    schema: isNotObjectLiteral(schema)
+                        ? schema
+                        : emplacer(schema),
+                };
+            }
+
             const text = entries.find((e) => e[0].includes("text/plain"));
             if (text) return { type: "text/plain", schema: { type: "string" } };
             return false;
@@ -356,6 +368,13 @@ export namespace RouteProgrammer {
                               external("@nestjs/common")(str),
                           )}`,
                       ]
+                    : route.success?.type ===
+                      "application/x-www-form-urlencoded"
+                    ? [
+                          `@${external("@nestia/core")(
+                              "TypedQuery",
+                          )}.${methoder((str) => str)}`,
+                      ]
                     : route.method === "head"
                     ? [
                           `@${external("@nestjs/common")("Head")}${methoder(
@@ -429,6 +448,15 @@ export namespace RouteProgrammer {
                                   references,
                               )(importer)(route.body.schema)},`,
                           ]
+                        : route.body.type ===
+                          "application/x-www-form-urlencoded"
+                        ? [
+                              `    @${external("@nestia/core")(
+                                  "TypedQuery",
+                              )}.Body() body: ${SchemaProgrammer.write(
+                                  components,
+                              )(references)(importer)(route.body.schema)},`,
+                          ]
                         : [
                               `    @${external("@nestia/core")(
                                   "PlainBody",

diff --git a/packages/migrate/src/structures/IMigrateRoute.ts b/packages/migrate/src/structures/IMigrateRoute.ts
@@ -22,7 +22,10 @@ export namespace IMigrateRoute {
         description?: string;
     }
     export interface IBody {
-        type: "text/plain" | "application/json";
+        type:
+            | "text/plain"
+            | "application/json"
+            | "application/x-www-form-urlencoded";
         schema: ISwaggerSchema;
         "x-nestia-encrypted"?: boolean;
     }

diff --git a/packages/migrate/src/structures/ISwaggerRoute.ts b/packages/migrate/src/structures/ISwaggerRoute.ts
@@ -42,5 +42,8 @@ export namespace ISwaggerRoute {
         "application/json"?: {
             schema: ISwaggerSchema;
         };
+        "application/x-www-form-urlencoded"?: {
+            schema: ISwaggerSchema;
+        };
     }
 }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/sdk",
-  "version": "2.2.0-dev.20231010",
+  "version": "2.2.0",
   "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.2.0-dev.20231010",
+    "@nestia/fetcher": "^2.2.0",
     "cli": "^1.0.1",
     "glob": "^7.2.0",
     "path-to-regexp": "^6.2.1",
@@ -47,7 +47,7 @@
     "typia": "^5.2.0"
   },
   "peerDependencies": {
-    "@nestia/fetcher": ">=2.2.0-dev.20231010",
+    "@nestia/fetcher": ">=2.2.0",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
     "reflect-metadata": ">=0.1.12",

diff --git a/test/package.json b/test/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@nestia/test",
-  "version": "2.2.0-dev.20231010",
+  "version": "2.2.0",
   "description": "Test program of Nestia",
   "main": "index.js",
   "scripts": {
@@ -37,9 +37,9 @@
     "typia": "^5.2.0",
     "uuid": "^9.0.0",
     "nestia": "^4.5.0",
-    "@nestia/core": "^2.2.0-dev.20231010",
+    "@nestia/core": "^2.2.0",
     "@nestia/e2e": "^0.3.6",
-    "@nestia/fetcher": "^2.2.0-dev.20231010",
-    "@nestia/sdk": "^2.2.0-dev.20231010"
+    "@nestia/fetcher": "^2.2.0",
+    "@nestia/sdk": "^2.2.0"
   }
 }