nestia 1.1.0 → 1.2.0

package/README.md

@@ -152,7 +152,7 @@ export = {
 >     /* input: {
 >         include: ["src/controllers/*.controller.ts"],
 >         exclude: ["src/controllers/fake_*.controller.ts"]
->     }
+>     },*/
 >     output: "src/api"   
 > }
 > ```
@@ -247,18 +247,15 @@ export function store
         connection: IConnection,
         section: string,
         saleId: number,
-        input: store.Input
+        input: Primitive<store.Input>
     ): Promise<store.Output>
 {
     return Fetcher.fetch
     (
         connection,
-        {
-            input_encrypted: false,
-            output_encrypted: false
-        },
-        "POST",
-        `/consumers/${section}/sales/${saleId}/questions/`,
+        store.ENCRYPTED,
+        store.METHOD,
+        store.path(section, saleId),
         input
     );
 }
@@ -266,6 +263,18 @@ export namespace store
 {
     export type Input = Primitive<ISaleInquiry.IStore>;
     export type Output = Primitive<ISaleInquiry<ISaleArticle.IContent>>;
+
+    export const METHOD = "POST" as const;
+    export const PATH: string = "/consumers/:section/sales/:saleId/questions";
+    export const ENCRYPTED: Fetcher.IEncrypted = {
+        request: true,
+        response: true,
+    };
+
+    export function path(section: string, saleId: number): string
+    {
+        return `/consumers/${section}/sales/${saleId}/questions`;
+    }
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Automatic SDK and Document generator for the NestJS",
   "main": "src/index.ts",
   "bin": {
@@ -37,11 +37,12 @@
     "del": "^6.0.0",
     "glob": "^7.2.0",
     "ts-node": "^9.1.1",
-    "tstl": "^2.5.0",
-    "typescript": "^4.3.2"
+    "tsconfig-paths": "^3.14.1",
+    "tstl": "^2.5.3",
+    "typescript": "^4.6.3"
   },
   "devDependencies": {
-    "nestia-helper": "^1.0.0",
+    "nestia-helper": "^1.2.0-dev.20220411",
     "rimraf": "^3.0.2"
   }
 }

package/src/bin/nestia.ts

@@ -1,72 +1,82 @@
-#!/usr/bin/env ts-node-script
+#!/usr/bin/env ts-node
 
-import cli from "cli";
+import cp from "child_process";
 import fs from "fs";
-import path from "path";
 import tsc from "typescript";
 
-import { NestiaApplication } from "../NestiaApplication";
-
-import { Terminal } from "../utils/Terminal";
 import { stripJsonComments } from "../utils/stripJsonComments";
-import { IConfiguration } from "../IConfiguration";
 
-interface ICommand
+function install(): void
 {
-    exclude: string | null;
-    out: string | null;
+    const command: string = "npm install --save nestia-fetcher";
+    cp.execSync(command, { stdio: "inherit" });
 }
 
-async function sdk(include: string[], command: ICommand): Promise<void>
+function sdk(alias: boolean): void
 {
-    // CONFIGURATION
-    let config: IConfiguration;
-    if (fs.existsSync("nestia.config.ts") === true)
-        config = {
-            ...await import(path.resolve("nestia.config.ts"))
-        };
-    else
+    const parameters: string[] = [
+        alias ? "npx ts-node -r tsconfig-paths/register" : "npx ts-node",
+        __dirname + "/../executable/sdk",
+        ...process.argv.slice(3)
+    ];
+    const command: string = parameters.join(" ");
+    cp.execSync(command, { stdio: "inherit" });
+}
+
+async function tsconfig(task: (alias: boolean) => void): Promise<void>
+{
+    // NO TSCONFIG.JSON?
+    if (fs.existsSync("tsconfig.json") === false)
     {
-        if (command.out === null)
-            throw new Error(`Output directory is not specified. Add the "--out <output_directory>" option.`);
-        config = {
-            input: {
-                include,
-                exclude: command.exclude
-                    ? [command.exclude]
-                    : undefined
-            },
-            output: command.out
-        };
+        task(false);
+        return;
     }
-    
-    // VALIDATE OUTPUT DIRECTORY
-    const parentPath: string = path.resolve(config.output + "/..");
-    const parentStats: fs.Stats = await fs.promises.stat(parentPath);
 
-    if (parentStats.isDirectory() === false)
-        throw new Error(`Unable to find parent directory of the output path: "${parentPath}".`);
+    const content: string = await fs.promises.readFile("tsconfig.json", "utf8");
+    const json: any = JSON.parse(stripJsonComments(content));
+    const options: tsc.CompilerOptions = json.compilerOptions;
 
-    // GENERATION
-    if (fs.existsSync("tsconfig.json") === true)
+    // NO ALIAS PATHS
+    if (!options.paths || !Object.entries(options.paths).length)
     {
-        const content: string = await fs.promises.readFile("tsconfig.json", "utf8");
-        const options: tsc.CompilerOptions = JSON.parse(stripJsonComments(content)).compilerOptions;
+        task(false);
+        return;
+    }
 
-        config.compilerOptions = {
-            ...options,
-            ...(config.compilerOptions || {})
-        };
+    let closer: null | (() => Promise<void>) = null;
+    let error: Error | null = null;
+
+    if (!options.baseUrl)
+    {
+        options.baseUrl = "./";
+        await fs.promises.writeFile
+        (
+            "tsconfig.json", 
+            JSON.stringify(json, null, 2),
+            "utf8"
+        );
+
+        closer = () => fs.promises.writeFile
+        (
+            "tsconfig.json", 
+            content, 
+            "utf8"
+        );
     }
 
-    // CALL THE APP.GENERATE()
-    const app: NestiaApplication = new NestiaApplication(config);
-    await app.generate();
-}
+    try
+    {
+        task(true);
+    }
+    catch (exp)
+    {
+        error = exp as Error;
+    }
 
-async function install(): Promise<void>
-{
-    await Terminal.execute("npm install --save nestia-fetcher");
+    if (closer)
+        await closer();
+    if (error)
+        throw error;
 }
 
 async function main(): Promise<void>
@@ -74,33 +84,12 @@ async function main(): Promise<void>
     if (process.argv[2] === "install")
         await install();
     else if (process.argv[2] === "sdk")
-    {
-        const command: ICommand = cli.parse({
-            exclude: ["e", "Something to exclude", "string", null],
-            out: ["o", "Output path of the SDK files", "string", null],
-        });
-
-        try
-        {
-            const inputs: string[] = [];
-            for (const arg of process.argv.slice(3))
-            {
-                if (arg[0] === "-")
-                    break;
-                inputs.push(arg);
-            }
-            await sdk(inputs, command);
-        }
-        catch (exp)
-        {
-            console.log(exp);
-            process.exit(-1);
-        }
-    }
+        await tsconfig(sdk);
     else
-    {
-        console.log(`nestia supports only two commands; install and sdk, however you typed ${process.argv[2]}`);
-        process.exit(-1);
-    }
+        throw new Error(`nestia supports only two commands; install and sdk, however you typed ${process.argv[2]}`);
 }
-main();
+main().catch(exp =>
+{
+    console.log(exp.message);
+    process.exit(-1);
+});

package/src/executable/sdk.ts

@@ -0,0 +1,89 @@
+import cli from "cli";
+import fs from "fs";
+import path from "path";
+import tsc from "typescript";
+import { Primitive } from "nestia-fetcher";
+
+import { IConfiguration } from "../IConfiguration";
+import { NestiaApplication } from "../NestiaApplication";
+import { stripJsonComments } from "../utils/stripJsonComments";
+
+interface ICommand
+{
+    exclude: string | null;
+    out: string | null;
+}
+
+async function sdk(include: string[], command: ICommand): Promise<void>
+{
+    // CONFIGURATION
+    let config: IConfiguration;
+    if (fs.existsSync("nestia.config.ts") === true)
+        config = Primitive.clone
+        (
+            await import(path.resolve("nestia.config.ts"))
+        );
+    else
+    {
+        if (command.out === null)
+            throw new Error(`Output directory is not specified. Add the "--out <output_directory>" option.`);
+        config = {
+            input: {
+                include,
+                exclude: command.exclude
+                    ? [command.exclude]
+                    : undefined
+            },
+            output: command.out
+        };
+    }
+    
+    // VALIDATE OUTPUT DIRECTORY
+    const parentPath: string = path.resolve(config.output + "/..");
+    const parentStats: fs.Stats = await fs.promises.stat(parentPath);
+
+    if (parentStats.isDirectory() === false)
+        throw new Error(`Unable to find parent directory of the output path: "${parentPath}".`);
+
+    // GENERATION
+    if (fs.existsSync("tsconfig.json") === true)
+    {
+        const content: string = await fs.promises.readFile("tsconfig.json", "utf8");
+        const options: tsc.CompilerOptions = JSON.parse(stripJsonComments(content)).compilerOptions;
+
+        config.compilerOptions = {
+            ...options,
+            ...(config.compilerOptions || {})
+        };
+    }
+
+    // CALL THE APP.GENERATE()
+    const app: NestiaApplication = new NestiaApplication(config);
+    await app.generate();
+}
+
+async function main(): Promise<void>
+{
+    const command: ICommand = cli.parse({
+        exclude: ["e", "Something to exclude", "string", null],
+        out: ["o", "Output path of the SDK files", "string", null],
+    });
+
+    try
+    {
+        const inputs: string[] = [];
+        for (const arg of process.argv.slice(2))
+        {
+            if (arg[0] === "-")
+                break;
+            inputs.push(arg);
+        }
+        await sdk(inputs, command);
+    }
+    catch (exp)
+    {
+        console.log(exp);
+        process.exit(-1);
+    }
+}
+main();

package/src/utils/Terminal.ts

@@ -1,19 +0,0 @@
-import * as cp from "child_process";
-import { Pair } from "tstl/utility/Pair";
-
-export namespace Terminal
-{
-    export function execute(...commands: string[]): Promise<Pair<string, string>>
-    {
-        return new Promise((resolve, reject) =>
-        {
-            cp.exec(commands.join(" && "), (error: Error | null, stdout: string, stderr: string) =>
-            {
-                if (error)
-                    reject(error);
-                else
-                    resolve(new Pair(stdout, stderr));
-            });
-        });
-    }
-}