Merge pull request #995 from samchon/feature/input

Fix #994: when `INestiaConfig.input` is not application, but controller path(s).

benchmark/package.json

@@ -42,7 +42,7 @@
     "reflect-metadata": "^0.2.2",
     "tgrid": "^1.0.3",
     "tstl": "^3.0.0",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   },
   "devDependencies": {
     "@types/autocannon": "^7.9.0",

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@nestia/station",
-  "version": "3.11.1",
+  "version": "3.11.2",
   "description": "Nestia station",
   "scripts": {
     "build": "node build/index.js",

packages/benchmark/package.json

@@ -34,7 +34,7 @@
     "ts-patch": "^3.2.1",
     "typescript": "^5.5.4",
     "typescript-transform-paths": "^3.4.7",
-    "typia": "^6.8.0",
+    "typia": "^6.9.0",
     "uuid": "^10.0.0"
   },
   "dependencies": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestia/core",
-  "version": "3.11.1",
+  "version": "3.11.2",
   "description": "Super-fast validation decorators of NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -36,10 +36,10 @@
   },
   "homepage": "https://nestia.io",
   "dependencies": {
-    "@nestia/fetcher": "^3.11.1",
+    "@nestia/fetcher": "^3.11.2",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
-    "@samchon/openapi": "^0.4.5",
+    "@samchon/openapi": "^0.4.6",
     "detect-ts-node": "^1.0.5",
     "get-function-location": "^2.0.0",
     "glob": "^7.2.0",
@@ -49,16 +49,16 @@
     "reflect-metadata": ">=0.1.12",
     "rxjs": ">=6.0.3",
     "tgrid": "^1.0.0",
-    "typia": "^6.8.0",
+    "typia": "^6.9.0",
     "ws": "^7.5.3"
   },
   "peerDependencies": {
-    "@nestia/fetcher": ">=3.11.1",
+    "@nestia/fetcher": ">=3.11.2",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
     "reflect-metadata": ">=0.1.12",
     "rxjs": ">=6.0.3",
-    "typia": ">=6.8.0 <7.0.0"
+    "typia": ">=6.9.0 <7.0.0"
   },
   "devDependencies": {
     "@fastify/multipart": "^8.1.0",

packages/core/src/decorators/internal/load_controller.ts

@@ -3,9 +3,6 @@ import is_ts_node from "detect-ts-node";
 import { Creator } from "../../typings/Creator";
 import { SourceFinder } from "../../utils/SourceFinder";
 
-/**
- * @internal
- */
 export const load_controllers = async (
   path: string | string[] | { include: string[]; exclude?: string[] },
   isTsNode?: boolean,

packages/e2e/package.json

@@ -41,7 +41,7 @@
     "ts-patch": "^3.2.1",
     "typescript": "^5.5.3",
     "typescript-transform-paths": "^3.4.7",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   },
   "files": [
     "lib",

packages/fetcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestia/fetcher",
-  "version": "3.11.1",
+  "version": "3.11.2",
   "description": "Fetcher library of Nestia SDK",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -43,6 +43,6 @@
     "src"
   ],
   "dependencies": {
-    "@samchon/openapi": "^0.4.5"
+    "@samchon/openapi": "^0.4.6"
   }
 }

packages/migrate/package.json

@@ -65,13 +65,13 @@
     "typescript-transform-paths": "^3.4.6"
   },
   "dependencies": {
-    "@samchon/openapi": "^0.4.5",
+    "@samchon/openapi": "^0.4.6",
     "commander": "10.0.0",
     "inquirer": "8.2.5",
     "prettier": "^3.2.5",
     "tstl": "^3.0.0",
     "typescript": "^5.5.4",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   },
   "files": [
     "lib",

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestia/sdk",
-  "version": "3.11.1",
+  "version": "3.11.2",
   "description": "Nestia SDK and Swagger generator",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -32,9 +32,9 @@
   },
   "homepage": "https://nestia.io",
   "dependencies": {
-    "@nestia/core": "^3.11.1",
-    "@nestia/fetcher": "^3.11.1",
-    "@samchon/openapi": "^0.4.5",
+    "@nestia/core": "^3.11.2",
+    "@nestia/fetcher": "^3.11.2",
+    "@samchon/openapi": "^0.4.6",
     "@wrtnio/openai-function-schema": "^0.2.3",
     "cli": "^1.0.1",
     "get-function-location": "^2.0.0",
@@ -45,16 +45,16 @@
     "tsconfck": "^2.1.2",
     "tsconfig-paths": "^4.1.1",
     "tstl": "^3.0.0",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   },
   "peerDependencies": {
-    "@nestia/core": ">=3.11.1",
-    "@nestia/fetcher": ">=3.11.1",
+    "@nestia/core": ">=3.11.2",
+    "@nestia/fetcher": ">=3.11.2",
     "@nestjs/common": ">=7.0.1",
     "@nestjs/core": ">=7.0.1",
     "reflect-metadata": ">=0.1.12",
     "ts-node": ">=10.6.0",
-    "typia": ">=6.8.0 <7.0.0"
+    "typia": ">=6.9.0 <7.0.0"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",

packages/sdk/src/analyses/ConfigAnalyzer.ts

@@ -1,31 +1,56 @@
 /// <reference path="../typings/get-function-location.d.ts" />
-import { DynamicModule } from "@nestia/core";
 import { INestApplication, VersioningType } from "@nestjs/common";
 import { MODULE_PATH } from "@nestjs/common/constants";
-import { NestContainer, NestFactory } from "@nestjs/core";
+import { NestContainer } from "@nestjs/core";
 import { Module } from "@nestjs/core/injector/module";
+import fs from "fs";
 import getFunctionLocation from "get-function-location";
-import { HashMap } from "tstl";
+import path from "path";
+import { HashMap, Pair, Singleton } from "tstl";
 
 import { INestiaConfig } from "../INestiaConfig";
+import { SdkGenerator } from "../generates/SdkGenerator";
 import { INestiaSdkInput } from "../structures/INestiaSdkInput";
+import { ArrayUtil } from "../utils/ArrayUtil";
 import { MapUtil } from "../utils/MapUtil";
+import { SourceFinder } from "../utils/SourceFinder";
 
 export namespace ConfigAnalyzer {
   export const input = async (
     config: INestiaConfig,
   ): Promise<INestiaSdkInput> => {
     return MapUtil.take(memory, config, async () => {
-      const app: INestApplication =
-        typeof config.input === "function"
-          ? await config.input()
-          : await NestFactory.create(
-              await DynamicModule.mount(config.input, {}, true as any),
-              {
-                logger: false,
-              },
-            );
-      return analyze_application(app);
+      if (typeof config.input === "function")
+        return analyze_application(await config.input());
+
+      const sources: string[] = await SourceFinder.find({
+        include: Array.isArray(config.input)
+          ? config.input
+          : typeof config.input === "object"
+            ? config.input.include
+            : [config.input],
+        exclude:
+          typeof config.input === "object" && !Array.isArray(config.input)
+            ? config.input.exclude ?? []
+            : [],
+        filter: filter(config),
+      });
+      const controllers: INestiaSdkInput.IController[] = [];
+      for (const file of sources) {
+        const external: any[] = await import(file);
+        for (const key in external) {
+          const instance: Function = external[key];
+          if (Reflect.getMetadata("path", instance) !== undefined)
+            controllers.push({
+              class: instance,
+              location: file,
+              prefixes: [],
+            });
+        }
+      }
+      return {
+        controllers,
+      };
     });
   };
 
@@ -66,7 +91,6 @@ export namespace ConfigAnalyzer {
 
     const versioning = (app as any).config?.versioningOptions;
     return {
-      application: app,
       controllers,
       globalPrefix:
         typeof (app as any).config?.globalPrefix === "string"
@@ -99,3 +123,33 @@ const normalize_file = (str: string) =>
         ? 7
         : 0,
   );
+
+const filter =
+  (config: INestiaConfig) =>
+  async (location: string): Promise<boolean> =>
+    location.endsWith(".ts") &&
+    !location.endsWith(".d.ts") &&
+    (config.output === undefined ||
+      (location.indexOf(path.join(config.output, "functional")) === -1 &&
+        (await (
+          await bundler.get(config.output)
+        )(location))) === false);
+
+const bundler = new Singleton(async (output: string) => {
+  const assets: string[] = await fs.promises.readdir(SdkGenerator.BUNDLE_PATH);
+  const tuples: Pair<string, boolean>[] = await ArrayUtil.asyncMap(
+    assets,
+    async (file) => {
+      const relative: string = path.join(output, file);
+      const location: string = path.join(SdkGenerator.BUNDLE_PATH, file);
+      const stats: fs.Stats = await fs.promises.stat(location);
+      return new Pair(relative, stats.isDirectory());
+    },
+  );
+  return async (file: string): Promise<boolean> => {
+    for (const it of tuples)
+      if (it.second === false && file === it.first) return true;
+      else if (it.second === true && file.indexOf(it.first) === 0) return true;
+    return false;
+  };
+});

packages/sdk/src/structures/INestiaSdkInput.ts

@@ -1,11 +1,6 @@
-import {
-  INestApplication,
-  RouteInfo,
-  VersionValue,
-} from "@nestjs/common/interfaces";
+import { RouteInfo, VersionValue } from "@nestjs/common/interfaces";
 
 export interface INestiaSdkInput {
-  application: INestApplication;
   controllers: INestiaSdkInput.IController[];
   globalPrefix?: {
     prefix: string;

test/features/all/src/api/functional/health/index.ts

@@ -13,20 +13,11 @@ import { PlainFetcher } from "@nestia/fetcher/lib/PlainFetcher";
  * @nestia Generated by Nestia - https://github.com/samchon/nestia
  */
 export async function get(connection: IConnection): Promise<void> {
-  return PlainFetcher.fetch(
-    {
-      ...connection,
-      headers: {
-        ...connection.headers,
-        "Content-Type": "application/json",
-      },
-    },
-    {
-      ...get.METADATA,
-      template: get.METADATA.path,
-      path: get.path(),
-    },
-  );
+  return PlainFetcher.fetch(connection, {
+    ...get.METADATA,
+    template: get.METADATA.path,
+    path: get.path(),
+  });
 }
 export namespace get {
   export const METADATA = {

test/features/all/src/api/functional/performance/index.ts

@@ -15,20 +15,11 @@ import type { IPerformance } from "../../structures/IPerformance";
  * @nestia Generated by Nestia - https://github.com/samchon/nestia
  */
 export async function get(connection: IConnection): Promise<get.Output> {
-  return PlainFetcher.fetch(
-    {
-      ...connection,
-      headers: {
-        ...connection.headers,
-        "Content-Type": "application/json",
-      },
-    },
-    {
-      ...get.METADATA,
-      template: get.METADATA.path,
-      path: get.path(),
-    },
-  );
+  return PlainFetcher.fetch(connection, {
+    ...get.METADATA,
+    template: get.METADATA.path,
+    path: get.path(),
+  });
 }
 export namespace get {
   export type Output = Primitive<IPerformance>;

test/features/all/swagger.json

@@ -7,7 +7,7 @@
     }
   ],
   "info": {
-    "version": "3.11.0",
+    "version": "3.11.2",
     "title": "@samchon/nestia-test",
     "description": "Test program of Nestia",
     "license": {

test/features/distribute-assert-json/packages/api/package.json

@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "@nestia/fetcher": "^3.11.0",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   }
 }

test/features/distribute-assert/packages/api/package.json

@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "@nestia/fetcher": "^3.11.0",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   }
 }

test/features/distribute-json/packages/api/package.json

@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "@nestia/fetcher": "^3.11.0",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   }
 }

test/features/distribute/packages/api/package.json

@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "@nestia/fetcher": "^3.11.0",
-    "typia": "^6.8.0"
+    "typia": "^6.9.0"
   }
 }