Merge pull request #283 from samchon/features/long

Fix #282 - too long type name
samchon · Mar 16, 2023 · e6310b9 · e6310b9
2 parents 6d5433d + 91f8556
commit e6310b9
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "description": "Nestia CLI",
   "main": "bin/index.js",
   "bin": {
@@ -29,15 +29,15 @@
   },
   "homepage": "https://github.com/samchon/nestia",
   "devDependencies": {
-    "@nestia/core": "^1.0.6",
-    "@nestia/sdk": "^1.0.1",
+    "@nestia/core": "^1.0.17",
+    "@nestia/sdk": "^1.0.16",
     "@types/inquirer": "^9.0.3",
     "@types/node": "^18.11.16",
     "commander": "^10.0.0",
     "comment-json": "^4.2.3",
     "inquirer": "^8.2.5",
     "rimraf": "^3.0.2",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.5"
   },
   "files": [
     "bin",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/core",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Super-fast validation decorators of NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -63,10 +63,10 @@
     "raw-body": "*",
     "reflect-metadata": "*",
     "rxjs": "*",
-    "typia": "^3.6.5"
+    "typia": "^3.6.8"
   },
   "peerDependencies": {
-    "typescript": ">= 4.5.2"
+    "typescript": ">= 4.5.2 && < 5.0.0"
   },
   "files": [
     "README.md",

diff --git a/packages/core/src/executable/core.ts b/packages/core/src/executable/core.ts
@@ -33,7 +33,7 @@ async function setup(): Promise<void> {
     const args: ArgumentParser.IArguments = await ArgumentParser.parse(pack);
 
     // INSTALL TYPESCRIPT
-    pack.install({ dev: true, modulo: "typescript" });
+    pack.install({ dev: true, modulo: "typescript", version: "4.9.5" });
     args.project ??= (() => {
         CommandExecutor.run("npx tsc --init", false);
         return (args.project = "tsconfig.json");

diff --git a/packages/core/src/executable/internal/ArgumentParser.ts b/packages/core/src/executable/internal/ArgumentParser.ts
@@ -2,8 +2,8 @@ import type CommanderModule from "commander";
 import fs from "fs";
 import type * as InquirerModule from "inquirer";
 import path from "path";
-import { FileRetriever } from "./FileRetriever";
 
+import { FileRetriever } from "./FileRetriever";
 import { PackageManager } from "./PackageManager";
 
 export namespace ArgumentParser {
@@ -97,11 +97,21 @@ export namespace ArgumentParser {
         const configure = async () => {
             const fileList: string[] = await (
                 await fs.promises.readdir(process.cwd())
-            ).filter(
-                (str) =>
-                    str.substring(0, 8) === "tsconfig" &&
-                    str.substring(str.length - 5) === ".json",
-            );
+            )
+                .filter(
+                    (str) =>
+                        str.substring(0, 8) === "tsconfig" &&
+                        str.substring(str.length - 5) === ".json",
+                )
+                .sort((x, y) =>
+                    x === "tsconfig.json"
+                        ? -1
+                        : y === "tsconfig.json"
+                        ? 1
+                        : x < y
+                        ? -1
+                        : 1,
+                );
             if (fileList.length === 0) {
                 if (process.cwd() !== pack.directory)
                     throw new Error(`Unable to find "tsconfig.json" file.`);

diff --git a/packages/core/src/transformers/MethodTransformer.ts b/packages/core/src/transformers/MethodTransformer.ts
@@ -88,7 +88,7 @@ function get_name(symbol: ts.Symbol): string {
 function explore_name(name: string, decl: ts.Node): string {
     return ts.isModuleBlock(decl)
         ? explore_name(
-              `${decl.parent.name.getText()}.${name}`,
+              `${decl.parent.name.getFullText().trim()}.${name}`,
               decl.parent.parent,
           )
         : name;

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/sdk",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Nestia SDK and Swagger generator",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/samchon/nestia",
   "devDependencies": {
-    "@nestia/core": "^1.0.15",
+    "@nestia/core": "^1.0.17",
     "@nestia/fetcher": "^1.0.1",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "@types/cli": "^0.11.21",
@@ -49,7 +49,7 @@
     "rimraf": "^3.0.2",
     "ts-node": "^10.9.1",
     "ttypescript": "^1.5.15",
-    "typescript": "^4.9.4",
+    "typescript": "^4.9.5",
     "typescript-transform-paths": "^3.4.4",
     "uuid": "^9.0.0"
   },
@@ -61,7 +61,7 @@
     "tsconfck": "^2.0.1",
     "tsconfig-paths": "^4.1.1",
     "tstl": "^2.5.13",
-    "typia": "^3.6.7"
+    "typia": "^3.6.8"
   },
   "files": [
     "assets",

diff --git a/packages/sdk/src/analyses/ImportAnalyzer.ts b/packages/sdk/src/analyses/ImportAnalyzer.ts
@@ -135,7 +135,7 @@ export namespace ImportAnalyzer {
     function explore_name(name: string, decl: ts.Node): string {
         return ts.isModuleBlock(decl)
             ? explore_name(
-                  `${decl.parent.name.getText()}.${name}`,
+                  `${decl.parent.name.getFullText().trim()}.${name}`,
                   decl.parent.parent,
               )
             : name;

diff --git a/src/NestiaSetupWizard.ts b/src/NestiaSetupWizard.ts
@@ -18,7 +18,7 @@ export namespace NestiaSetupWizard {
         );
 
         // INSTALL TYPESCRIPT
-        pack.install({ dev: true, modulo: "typescript" });
+        pack.install({ dev: true, modulo: "typescript", version: "4.9.5" });
         args.project ??= (() => {
             CommandExecutor.run("npx tsc --init", false);
             return (args.project = "tsconfig.json");

diff --git a/src/internal/ArgumentParser.ts b/src/internal/ArgumentParser.ts
@@ -97,11 +97,21 @@ export namespace ArgumentParser {
         const configure = async () => {
             const fileList: string[] = await (
                 await fs.promises.readdir(process.cwd())
-            ).filter(
-                (str) =>
-                    str.substring(0, 8) === "tsconfig" &&
-                    str.substring(str.length - 5) === ".json",
-            );
+            )
+                .filter(
+                    (str) =>
+                        str.substring(0, 8) === "tsconfig" &&
+                        str.substring(str.length - 5) === ".json",
+                )
+                .sort((x, y) =>
+                    x === "tsconfig.json"
+                        ? -1
+                        : y === "tsconfig.json"
+                        ? 1
+                        : x < y
+                        ? -1
+                        : 1,
+                );
             if (fileList.length === 0) {
                 if (process.cwd() !== pack.directory)
                     throw new Error(`Unable to find "tsconfig.json" file.`);