Merge pull request #254 from samchon/features/yarn

Fix #251 - support yarn monorepo in setup wizard
samchon · Feb 20, 2023 · b93be57 · b93be57
2 parents 8f41010 + d11f193
commit b93be57
Show file tree

Hide file tree

Showing 12 changed files with 118 additions and 58 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "Nestia CLI",
   "main": "bin/index.js",
   "bin": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/core",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Super-fast validation decorators of NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,7 @@
     "raw-body": "*",
     "reflect-metadata": "*",
     "rxjs": "*",
-    "typia": "^3.5.3"
+    "typia": "^3.5.5"
   },
   "peerDependencies": {
     "ttypescript": ">= 1.5.15",

diff --git a/packages/core/src/executable/internal/ArgumentParser.ts b/packages/core/src/executable/internal/ArgumentParser.ts
@@ -2,6 +2,7 @@ import type CommanderModule from "commander";
 import fs from "fs";
 import type * as InquirerModule from "inquirer";
 import path from "path";
+import { FileRetriever } from "./FileRetriever";
 
 import { PackageManager } from "./PackageManager";
 
@@ -49,12 +50,13 @@ export namespace ArgumentParser {
 
     async function _Parse(pack: PackageManager): Promise<IArguments> {
         // PREPARE ASSETS
-        const { createPromptModule }: typeof InquirerModule = await import(
-            path.join(pack.directory, "node_modules", "inquirer")
-        );
-        const { program }: typeof CommanderModule = await import(
-            path.join(pack.directory, "node_modules", "commander")
-        );
+        const { createPromptModule }: typeof InquirerModule =
+            await FileRetriever.require(path.join("node_modules", "inquirer"))(
+                pack.directory,
+            );
+        const { program }: typeof CommanderModule = await FileRetriever.require(
+            path.join("node_modules", "commander"),
+        )(pack.directory);
 
         program.option("--compiler [compiler]", "compiler type");
         program.option("--manager [manager", "package manager");

diff --git a/packages/core/src/executable/internal/FileRetriever.ts b/packages/core/src/executable/internal/FileRetriever.ts
@@ -0,0 +1,33 @@
+import fs from "fs";
+import path from "path";
+
+export namespace FileRetriever {
+    export const directory =
+        (name: string) =>
+        (directory: string, depth: number = 0): string | null => {
+            const location: string = path.join(directory, name);
+            if (fs.existsSync(location)) return directory;
+            else if (depth > 2) return null;
+            return file(name)(path.join(directory, ".."), depth + 1);
+        };
+
+    export const file =
+        (name: string) =>
+        (directory: string, depth: number = 0): string | null => {
+            const location: string = path.join(directory, name);
+            if (fs.existsSync(location)) return location;
+            else if (depth > 2) return null;
+            return file(name)(path.join(directory, ".."), depth + 1);
+        };
+
+    export const require =
+        (name: string) =>
+        async (directory: string, depth: number = 0) => {
+            const location: string | null = file(name)(directory, depth);
+            if (location === null)
+                throw new Error(
+                    `Unable to find installed module. Please report to the nestia - https://github.com/samchon/nestia/issues`,
+                );
+            return import(location);
+        };
+}
diff --git a/packages/core/src/executable/internal/PackageManager.ts b/packages/core/src/executable/internal/PackageManager.ts
@@ -2,6 +2,7 @@ import fs from "fs";
 import path from "path";
 
 import { CommandExecutor } from "./CommandExecutor";
+import { FileRetriever } from "./FileRetriever";
 
 export class PackageManager {
     public manager: string = "npm";
@@ -10,7 +11,9 @@ export class PackageManager {
     }
 
     public static async mount(): Promise<PackageManager> {
-        const location: string | null = await find(process.cwd());
+        const location: string | null = await FileRetriever.directory(
+            "package.json",
+        )(process.cwd());
         if (location === null)
             throw new Error(`Unable to find "package.json" file`);
 
@@ -43,9 +46,9 @@ export class PackageManager {
             : this.data.dependencies;
         if (
             !!container?.[props.modulo] &&
-            fs.existsSync(
-                path.join(this.directory, "node_modules", props.modulo),
-            )
+            FileRetriever.file(path.join("node_modules", props.modulo))(
+                this.directory,
+            ) !== null
         )
             return false;
 
@@ -87,13 +90,3 @@ export namespace Package {
         devDependencies?: Record<string, string>;
     }
 }
-
-async function find(
-    directory: string = process.cwd(),
-    depth: number = 0,
-): Promise<string | null> {
-    const location: string = path.join(directory, "package.json");
-    if (fs.existsSync(location)) return directory;
-    else if (depth > 1) return null;
-    return find(path.join(directory, ".."), depth + 1);
-}
diff --git a/packages/core/src/executable/internal/PluginConfigurator.ts b/packages/core/src/executable/internal/PluginConfigurator.ts
@@ -3,6 +3,7 @@ import fs from "fs";
 import path from "path";
 
 import { ArgumentParser } from "./ArgumentParser";
+import { FileRetriever } from "./FileRetriever";
 import { PackageManager } from "./PackageManager";
 
 export namespace PluginConfigurator {
@@ -42,9 +43,10 @@ export namespace PluginConfigurator {
         args: ArgumentParser.IArguments,
     ): Promise<void> {
         // GET COMPILER-OPTIONS
-        const Comment: typeof import("comment-json") = await import(
-            path.join(pack.directory, "node_modules", "comment-json")
-        );
+        const Comment: typeof import("comment-json") =
+            await FileRetriever.require(
+                path.join("node_modules", "comment-json"),
+            )(pack.directory);
 
         const config: Comment.CommentObject = Comment.parse(
             await fs.promises.readFile(args.project!, "utf8"),

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nestia/sdk",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Nestia SDK and Swagger generator",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -61,7 +61,7 @@
     "tsconfck": "^2.0.1",
     "tsconfig-paths": "^4.1.1",
     "tstl": "^2.5.13",
-    "typia": "^3.4.22"
+    "typia": "^3.5.5"
   },
   "files": [
     "assets",

diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+import path from "path";
+import { FileRetriever } from "./internal/FileRetriever";
 import { NestiaSetupWizard } from "./NestiaSetupWizard";
 import { NestiaStarter } from "./NestiaStarter";
 
@@ -49,16 +51,14 @@ async function main(): Promise<void> {
         type === "sdk" ||
         type === "swagger"
     ) {
-        try {
-            await import(process.cwd() + "/node_modules/@nestia/sdk");
-        } catch {
+        const location: string | null = FileRetriever.file(
+            path.join("node_modules", "@nestia", "sdk"),
+        )(process.cwd());
+        if (location === null)
             halt(
                 `@nestia/sdk has not been installed. Run "npx nestia setup" before.`,
             );
-        }
-        await import(
-            process.cwd() + "/node_modules/@nestia/sdk/lib/executable/sdk"
-        );
+        await import(path.join(location, "lib", "executable", "sdk"));
     } else halt(USAGE);
 }
 main().catch((exp) => {

diff --git a/src/internal/ArgumentParser.ts b/src/internal/ArgumentParser.ts
@@ -2,6 +2,7 @@ import type CommanderModule from "commander";
 import fs from "fs";
 import type * as InquirerModule from "inquirer";
 import path from "path";
+import { FileRetriever } from "./FileRetriever";
 
 import { PackageManager } from "./PackageManager";
 
@@ -49,12 +50,13 @@ export namespace ArgumentParser {
 
     async function _Parse(pack: PackageManager): Promise<IArguments> {
         // PREPARE ASSETS
-        const { createPromptModule }: typeof InquirerModule = await import(
-            path.join(pack.directory, "node_modules", "inquirer")
-        );
-        const { program }: typeof CommanderModule = await import(
-            path.join(pack.directory, "node_modules", "commander")
-        );
+        const { createPromptModule }: typeof InquirerModule =
+            await FileRetriever.require(path.join("node_modules", "inquirer"))(
+                pack.directory,
+            );
+        const { program }: typeof CommanderModule = await FileRetriever.require(
+            path.join("node_modules", "commander"),
+        )(pack.directory);
 
         program.option("--compiler [compiler]", "compiler type");
         program.option("--manager [manager", "package manager");

diff --git a/src/internal/FileRetriever.ts b/src/internal/FileRetriever.ts
@@ -0,0 +1,33 @@
+import fs from "fs";
+import path from "path";
+
+export namespace FileRetriever {
+    export const directory =
+        (name: string) =>
+        (directory: string, depth: number = 0): string | null => {
+            const location: string = path.join(directory, name);
+            if (fs.existsSync(location)) return directory;
+            else if (depth > 2) return null;
+            return file(name)(path.join(directory, ".."), depth + 1);
+        };
+
+    export const file =
+        (name: string) =>
+        (directory: string, depth: number = 0): string | null => {
+            const location: string = path.join(directory, name);
+            if (fs.existsSync(location)) return location;
+            else if (depth > 2) return null;
+            return file(name)(path.join(directory, ".."), depth + 1);
+        };
+
+    export const require =
+        (name: string) =>
+        async (directory: string, depth: number = 0) => {
+            const location: string | null = file(name)(directory, depth);
+            if (location === null)
+                throw new Error(
+                    `Unable to find installed module. Please report to the nestia - https://github.com/samchon/nestia/issues`,
+                );
+            return import(location);
+        };
+}
diff --git a/src/internal/PackageManager.ts b/src/internal/PackageManager.ts
@@ -2,6 +2,7 @@ import fs from "fs";
 import path from "path";
 
 import { CommandExecutor } from "./CommandExecutor";
+import { FileRetriever } from "./FileRetriever";
 
 export class PackageManager {
     public manager: string = "npm";
@@ -10,7 +11,9 @@ export class PackageManager {
     }
 
     public static async mount(): Promise<PackageManager> {
-        const location: string | null = await find(process.cwd());
+        const location: string | null = await FileRetriever.directory(
+            "package.json",
+        )(process.cwd());
         if (location === null)
             throw new Error(`Unable to find "package.json" file`);
 
@@ -43,9 +46,9 @@ export class PackageManager {
             : this.data.dependencies;
         if (
             !!container?.[props.modulo] &&
-            fs.existsSync(
-                path.join(this.directory, "node_modules", props.modulo),
-            )
+            FileRetriever.file(path.join("node_modules", props.modulo))(
+                this.directory,
+            ) !== null
         )
             return false;
 
@@ -87,13 +90,3 @@ export namespace Package {
         devDependencies?: Record<string, string>;
     }
 }
-
-async function find(
-    directory: string = process.cwd(),
-    depth: number = 0,
-): Promise<string | null> {
-    const location: string = path.join(directory, "package.json");
-    if (fs.existsSync(location)) return directory;
-    else if (depth > 1) return null;
-    return find(path.join(directory, ".."), depth + 1);
-}
diff --git a/src/internal/PluginConfigurator.ts b/src/internal/PluginConfigurator.ts
@@ -3,6 +3,7 @@ import fs from "fs";
 import path from "path";
 
 import { ArgumentParser } from "./ArgumentParser";
+import { FileRetriever } from "./FileRetriever";
 import { PackageManager } from "./PackageManager";
 
 export namespace PluginConfigurator {
@@ -42,9 +43,10 @@ export namespace PluginConfigurator {
         args: ArgumentParser.IArguments,
     ): Promise<void> {
         // GET COMPILER-OPTIONS
-        const Comment: typeof import("comment-json") = await import(
-            path.join(pack.directory, "node_modules", "comment-json")
-        );
+        const Comment: typeof import("comment-json") =
+            await FileRetriever.require(
+                path.join("node_modules", "comment-json"),
+            )(pack.directory);
 
         const config: Comment.CommentObject = Comment.parse(
             await fs.promises.readFile(args.project!, "utf8"),