nestia 2.0.2 → 2.0.4-dev.20220415

package/.github/workflows/build.yml

@@ -3,7 +3,10 @@ on: [push, pull_request]
 
 jobs:
   Ubuntu:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "2.0.2",
+  "version": "2.0.4-dev.20220415",
   "description": "Automatic SDK and Document generator for the NestJS",
   "main": "src/index.ts",
   "bin": {
@@ -8,8 +8,7 @@
   },
   "scripts": {
     "dev": "tsc --watch",
-    "test": "cd test && bash script.sh",
-    "test:default": "cd test/default && rimraf -rf src/api/functional && ts-node ../../src/bin/nestia sdk src/controllers --out src/api"
+    "test": "ts-node test/index"
   },
   "repository": {
     "type": "git",
@@ -36,7 +35,7 @@
     "cli": "^1.0.1",
     "del": "^6.0.0",
     "glob": "^7.2.0",
-    "ts-node": "^10.4.0",
+    "ts-node": "^9.1.1",
     "tstl": "^2.5.3",
     "ttypescript": "^1.5.13",
     "typescript": "^4.6.3",

package/src/IConfiguration.ts

@@ -1,4 +1,4 @@
-import type tsc from "typescript";
+import * as tsc from "typescript";
 
 export interface IConfiguration
 {

package/src/NestiaApplication.ts

@@ -1,6 +1,6 @@
-import fs from "fs";
-import path from "path";
-import tsc from "typescript";
+import * as fs from "fs";
+import * as path from "path";
+import * as tsc from "typescript";
 import { Pair } from "tstl/utility/Pair";
 import { Singleton } from "tstl/thread/Singleton";
 

package/src/analyses/ControllerAnalyzer.ts

@@ -1,5 +1,5 @@
-import NodePath from "path";
-import tsc from "typescript";
+import * as NodePath from "path";
+import * as tsc from "typescript";
 import { HashMap } from "tstl/container/HashMap";
 
 import { IController } from "../structures/IController";

package/src/analyses/GenericAnalyzer.ts

@@ -1,4 +1,4 @@
-import tsc from "typescript";
+import * as tsc from "typescript";
 
 export namespace GenericAnalyzer
 {

package/src/analyses/ImportAnalyzer.ts

@@ -1,4 +1,4 @@
-import tsc from "typescript";
+import * as tsc from "typescript";
 
 import { HashMap } from "tstl/container/HashMap";
 import { HashSet } from "tstl/container/HashSet";

package/src/analyses/ReflectAnalyzer.ts

@@ -1,11 +1,11 @@
-import Pather from "path";
+import * as NodePath from "path";
+import { equal } from "tstl/ranges/module";
 
 import { ArrayUtil } from "../utils/ArrayUtil";
 import { StringUtil } from "../utils/StringUtil";
 
 import { IController } from "../structures/IController";
 import { ParamCategory } from "../structures/ParamCategory";
-import { equal } from "tstl/ranges/module";
 
 type IModule =
 {
@@ -128,7 +128,7 @@ export namespace ReflectAnalyzer
         }
 
         // VALIDATE PATH ARGUMENTS
-        const funcPathArguments: string[] = StringUtil.betweens(Pather.join(controller.path, meta.path).split("\\").join("/"), ":", "/").sort();
+        const funcPathArguments: string[] = StringUtil.betweens(NodePath.join(controller.path, meta.path).split("\\").join("/"), ":", "/").sort();
         const paramPathArguments: string[] = meta.parameters.filter(param => param.category === "param").map(param => param.field!).sort();
 
         if (equal(funcPathArguments, paramPathArguments) === false)

package/src/analyses/SourceFinder.ts

@@ -1,6 +1,6 @@
-import fs from  "fs";
+import * as fs from  "fs";
 import glob from "glob";
-import path from "path";
+import * as path from "path";
 
 import { IConfiguration } from "../IConfiguration";
 

package/src/bin/nestia.ts

@@ -2,6 +2,8 @@
 
 import * as cp from "child_process";
 import * as fs from "fs";
+import * as path from "path";
+import * as process from "process";
 
 import { CompilerOptions } from "../internal/CompilerOptions";
 import { stripJsonComments } from "../utils/stripJsonComments";
@@ -21,12 +23,12 @@ function install(): void
     }
 }
 
-function sdk(): void
+function sdk(file: string): void
 {
     // PREPARE COMMAND
     const parameters: string[] = [
-        "npx ts-node -C ttypescript",
-        __dirname + "/../executable/sdk",
+        `npx ts-node -C ttypescript --project "${file}"`,
+        `"${path.relative(process.cwd(), `${__dirname}/../executable/sdk`)}"`,
         ...process.argv.slice(3)
     ];
     const command: string = parameters.join(" ");
@@ -37,7 +39,10 @@ function sdk(): void
         command, 
         { 
             stdio: "inherit",
-            env: { "NODE_NO_WARNINGS": "1" } 
+            env: { 
+                ...process.env, 
+                "NODE_NO_WARNINGS": "1" 
+            } 
         }
     );
 }
@@ -53,69 +58,51 @@ function configure(config: IConfig): boolean
         return CompilerOptions.emend(config.compilerOptions);
 }
 
-async function tsconfig(task: () => void): Promise<void>
+async function tsconfig(task: (file: string) => void): Promise<void>
 {
     //----
     // PREPARE ASSETS
     //----
-    let prepare: null | (() => Promise<void>) = null;
-    let restore: null | (() => Promise<void>) = null;
+    let prepare: null | (() => Promise<[string, () => Promise<void>]>) = null;
 
+    // NO TSCONFIG.JSON?
     if (fs.existsSync("tsconfig.json") === false)
     {
-        // NO TSCONFIG.JSON
-        const config: IConfig = {
-            compilerOptions: CompilerOptions.DEFAULT
-        };
-        prepare = () => fs.promises.writeFile
-        (
-            "tsconfig.json",
-            JSON.stringify(config, null, 2),
-            "utf8"
-        );
-        restore = () => fs.promises.unlink("tsconfig.json")
+        const config = { compilerOptions: CompilerOptions.DEFAULT };
+        prepare = CompilerOptions.temporary(config);
     }
     else
     {
         // HAS TSCONFIG.JSON
         const content: string = await fs.promises.readFile("tsconfig.json", "utf8");
-        const config: IConfig = JSON.parse(stripJsonComments(content));
+        const config = JSON.parse(stripJsonComments(content));
+        
+        // NEED TO ADD TRANSFORM PLUGINS
         const changed: boolean = configure(config);
-
         if (changed === true)
-        {
-            // NEED TO ADD TRANSFORM PLUGINS
-            prepare = () => fs.promises.writeFile
-            (
-                "tsconfig.json", 
-                JSON.stringify(config, null, 2),
-                "utf8"
-            );
-            restore = () => fs.promises.writeFile("tsconfig.json", content, "utf8");
-        }
+            prepare = CompilerOptions.temporary(config);
     }
 
     //----
     // EXECUTION
     //----
-    // PREPARE SOMETHING
-    if (prepare !== null)
-        await prepare();
+    // CREATE TEMPORARY TSCONFIG
+    const [file, erasure] = prepare ? await prepare() : ["tsconfig.json", null];
 
     // EXECUTE THE TASK
     let error: Error | null = null;
     try
     {
-        task();
+        task(file);
     }
     catch (exp)
     {
         error = exp as Error;
     }
 
-    // RESTORE THE TSCONFIG.JSON
-    if (restore !== null)
-        await restore();
+    // REMOVE THE TEMPORARY TSCONFIG
+    if (erasure)
+        await erasure();
 
     // THROW ERROR IF EXISTS
     if (error)

package/src/executable/sdk.ts

@@ -1,7 +1,7 @@
-import cli from "cli";
-import fs from "fs";
-import path from "path";
-import tsc from "typescript";
+import * as cli from "cli";
+import * as fs from "fs";
+import * as path from "path";
+import * as tsc from "typescript";
 import { Primitive } from "nestia-fetcher";
 
 import { IConfiguration } from "../IConfiguration";

package/src/generates/FileGenerator.ts

@@ -1,4 +1,4 @@
-import fs from "fs";
+import * as fs from "fs";
 import { HashMap } from "tstl/container/HashMap";
 import { IConfiguration } from "../IConfiguration";
 

package/src/generates/FunctionGenerator.ts

@@ -1,4 +1,4 @@
-import type tsc from "typescript";
+import * as tsc from "typescript";
 import { Pair } from "tstl/utility/Pair";
 import { Vector } from "tstl/container/Vector";
 

package/src/generates/SdkGenerator.ts

@@ -1,4 +1,4 @@
-import fs from "fs";
+import * as fs from "fs";
 import { DirectoryUtil } from "../utils/DirectoryUtil";
 
 import { IRoute } from "../structures/IRoute";
@@ -36,4 +36,4 @@ export namespace SdkGenerator
     }
 }
 
-const BUNDLE = __dirname + "/../bundle"
+const BUNDLE = __dirname + "/../bundle";

package/src/internal/CompilerOptions.ts

@@ -1,3 +1,5 @@
+import * as fs from "fs";
+
 export interface CompilerOptions
 {
     target: string;
@@ -14,7 +16,10 @@ export interface CompilerOptions
     emitDecoratorMetadata?: boolean;
 }
 export namespace CompilerOptions
-{   
+{
+    /* -----------------------------------------------------------
+        DEFAULT VALUES
+    ----------------------------------------------------------- */
     export const DEPENDENCIES: string[] = [
         "nestia-fetcher", 
         "typescript-is"
@@ -110,4 +115,28 @@ export namespace CompilerOptions
         const checks: boolean[] = checkers.map(func => func());
         return checks.some(flag => flag);
     }
+
+    /* -----------------------------------------------------------
+        PROCEDURES
+    ----------------------------------------------------------- */
+    export function temporary(config: IConfig): () => Promise<[string, () => Promise<void>]>
+    {
+        return async () =>
+        {
+            const file: string = `nestia.temporary.tsconfig.${Math.random().toString().substr(2)}.json`;
+            
+            await fs.promises.writeFile
+            (
+                file,
+                JSON.stringify(config, null, 2),
+                "utf8" 
+            );
+            return [file, () => fs.promises.unlink(file)];
+        };
+    }
+}
+
+interface IConfig
+{
+    compilerOptions?: CompilerOptions;
 }

package/src/structures/IRoute.ts

@@ -1,4 +1,4 @@
-import type tsc from "typescript";
+import * as tsc from "typescript";
 import { ParamCategory } from "./ParamCategory";
 
 export interface IRoute

package/src/utils/DirectoryUtil.ts

@@ -1,5 +1,5 @@
 import del from "del";
-import fs from "fs";
+import * as fs from "fs";
 
 export namespace DirectoryUtil
 {

package/src/utils/ImportDictionary.ts

@@ -1,4 +1,4 @@
-import path from "path";
+import * as path from "path";
 
 import { HashMap } from "tstl/container/HashMap";
 import { HashSet } from "tstl/container/HashSet";