@nestia/sdk 2.0.0-dev.20230903 → 2.0.0-dev.20230904

package/src/executable/internal/NestiaSdkCommand.ts

@@ -1,157 +1,34 @@
-import cli from "cli";
-import path from "path";
-import { WorkerConnector } from "tgrid/protocols/workers/WorkerConnector";
-import { parseNative } from "tsconfck";
 import ts from "typescript";
 
 import { INestiaConfig } from "../../INestiaConfig";
 import { NestiaSdkApplication } from "../../NestiaSdkApplication";
-import { NestiaSdkConfig } from "./NestiaSdkConfig";
-
-interface ICommand {
-    exclude: string | null;
-    out: string | null;
-    e2e: string | null;
-}
-
-interface IProps {
-    assign: (config: INestiaConfig, output: string) => void;
-    validate: (config: INestiaConfig) => boolean;
-    location: (config: INestiaConfig) => string;
-}
+import { NestiaConfigLoader } from "./NestiaConfigLoader";
 
 export namespace NestiaSdkCommand {
-    export const sdk = (argv: string[]) =>
-        main({
-            assign: (config, output) => (config.output = output),
-            validate: (config) => !!config.output,
-            location: (config) => config.output!,
-        })(argv)((app) => app.sdk());
-
-    export const swagger = (argv: string[]) =>
-        main({
-            assign: (config, output) => {
-                if (!config.swagger) config.swagger = { output };
-                else config.swagger.output = output;
-            },
-            validate: (config) => !!config.swagger && !!config.swagger.output,
-            location: (config) => config.swagger!.output!,
-        })(argv)((app) => app.swagger());
-
-    export const e2e = (argv: string[]) =>
-        main({
-            assign: (config, output) => (config.output = output),
-            validate: (config) => !!config.output,
-            location: (config) => config.output!,
-        })(argv)((app) => app.e2e());
-
-    const main =
-        (props: IProps) =>
-        (argv: string[]) =>
-        async (task: (app: NestiaSdkApplication) => Promise<void>) => {
-            const command: ICommand = cli.parse({
-                exclude: ["e", "Something to exclude", "string", null],
-                out: ["o", "Output path of the SDK files", "string", null],
-                e2e: [
-                    "e",
-                    "Output path of e2e test function files",
-                    "string",
-                    null,
-                ],
-            });
-
-            const inputs: string[] = [];
-            for (const r of argv) {
-                if (r[0] === "-") break;
-                inputs.push(r);
-            }
-            await generate(props)(command)(inputs)(task);
-        };
-
-    const generate =
-        (props: IProps) =>
-        (command: ICommand) =>
-        (include: string[]) =>
-        async (task: (app: NestiaSdkApplication) => Promise<void>) => {
-            // CONFIGURATION
-            const config: INestiaConfig =
-                (await get_nestia_config(props.validate)) ??
-                parse_cli(props)(command)(include);
-
-            const options: ts.CompilerOptions | null =
-                await get_typescript_options();
-            config.compilerOptions = {
-                ...(options ?? {}),
-                ...(config.compilerOptions ?? {}),
-            };
-
-            // CALL THE APP.GENERATE()
-            const app: NestiaSdkApplication = new NestiaSdkApplication(config);
-            await task(app);
-        };
-
-    async function get_typescript_options(): Promise<ts.CompilerOptions | null> {
-        const configFileName = ts.findConfigFile(
-            process.cwd(),
-            ts.sys.fileExists,
-            "tsconfig.json",
+    export const sdk = () => main((app) => app.sdk());
+    export const swagger = () => main((app) => app.swagger());
+    export const e2e = () => main((app) => app.e2e());
+
+    const main = async (task: (app: NestiaSdkApplication) => Promise<void>) => {
+        await generate(task);
+    };
+
+    const generate = async (
+        task: (app: NestiaSdkApplication) => Promise<void>,
+    ) => {
+        // LOAD CONFIG INFO
+        const project: string = await NestiaConfigLoader.project();
+        const compilerOptions: ts.CompilerOptions =
+            await NestiaConfigLoader.compilerOptions(project);
+        const config: INestiaConfig = await NestiaConfigLoader.config(
+            compilerOptions,
         );
-        if (!configFileName) return null;
 
-        const { tsconfig } = await parseNative(configFileName);
-        const configFileText = JSON.stringify(tsconfig);
-        const { config } = ts.parseConfigFileTextToJson(
-            configFileName,
-            configFileText,
-        );
-        const configParseResult = ts.parseJsonConfigFileContent(
+        // GENERATE
+        const app: NestiaSdkApplication = new NestiaSdkApplication(
             config,
-            ts.sys,
-            path.dirname(configFileName),
-        );
-
-        const { moduleResolution, ...result } =
-            configParseResult.raw.compilerOptions;
-        return result;
-    }
-
-    async function get_nestia_config(
-        validate: (config: INestiaConfig) => boolean,
-    ): Promise<INestiaConfig | null> {
-        const connector = new WorkerConnector(null, null, "process");
-        await connector.connect(
-            `${__dirname}/nestia.config.getter.${__filename.substr(-2)}`,
+            compilerOptions,
         );
-
-        const driver = await connector.getDriver<typeof NestiaSdkConfig>();
-        const config: INestiaConfig | null = await driver.get();
-        await connector.close();
-
-        if (config !== null && validate(config) === false)
-            throw new Error(
-                `Error on NestiaCommand.main(): output path is not specified in the "nestia.config.ts".`,
-            );
-
-        return config;
-    }
-
-    const parse_cli =
-        (props: IProps) =>
-        (command: ICommand) =>
-        (include: string[]): INestiaConfig => {
-            if (command.out === null)
-                throw new Error(
-                    `Error on NestiaCommand.main(): output directory is not specified. Add the "--out <output_directory>" option.`,
-                );
-
-            const config: INestiaConfig = {
-                input: {
-                    include,
-                    exclude: command.exclude ? [command.exclude] : undefined,
-                },
-                e2e: command.e2e ?? undefined,
-            };
-            props.assign(config, command.out);
-            return config;
-        };
+        await task(app);
+    };
 }

package/src/executable/internal/{nestia.config.getter.ts → nestia.project.getter.ts}

@@ -1,10 +1,10 @@
 import { WorkerServer } from "tgrid/protocols/workers/WorkerServer";
 
-import { NestiaSdkConfig } from "./NestiaSdkConfig";
+import { NestiaProjectGetter } from "./NestiaProjectGetter";
 
 async function main(): Promise<void> {
     const worker = new WorkerServer();
-    await worker.open(NestiaSdkConfig);
+    await worker.open(NestiaProjectGetter);
 }
 main().catch((exp) => {
     console.log(exp);

package/src/executable/sdk.ts

@@ -59,9 +59,9 @@ async function main() {
 
     if (type === "dependencies") dependencies(argv);
     else if (type === "init") await initialize();
-    else if (type === "sdk") await execute((c) => c.sdk(argv));
-    else if (type === "swagger") await execute((c) => c.swagger(argv));
-    else if (type === "e2e") await execute((c) => c.e2e(argv));
+    else if (type === "sdk") await execute((c) => c.sdk());
+    else if (type === "swagger") await execute((c) => c.swagger());
+    else if (type === "e2e") await execute((c) => c.e2e());
     else halt(USAGE);
 }
 main().catch((exp) => {

package/lib/executable/internal/NestiaConfigCompilerOptions.d.ts

@@ -1,12 +0,0 @@
-export declare namespace NestiaConfigCompilerOptions {
-    const DEFAULT_OPTIONS: {
-        target: string;
-        module: string;
-        strictNullChecks: boolean;
-        types: string[];
-        noEmit: boolean;
-        esModuleInterop: boolean;
-        experimentalDecorators: boolean;
-        emitDecoratorMetadata: boolean;
-    };
-}

package/lib/executable/internal/NestiaConfigCompilerOptions.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NestiaConfigCompilerOptions = void 0;
-var NestiaConfigCompilerOptions;
-(function (NestiaConfigCompilerOptions) {
-    /* -----------------------------------------------------------
-        DEFAULT VALUES
-    ----------------------------------------------------------- */
-    const ESSENTIAL_OPTIONS = {
-        types: ["node", "reflect-metadata"],
-        noEmit: true,
-        esModuleInterop: true,
-        experimentalDecorators: true,
-        emitDecoratorMetadata: true,
-    };
-    NestiaConfigCompilerOptions.DEFAULT_OPTIONS = Object.assign(Object.assign({}, ESSENTIAL_OPTIONS), { target: "es5", module: "commonjs", strictNullChecks: true });
-})(NestiaConfigCompilerOptions || (exports.NestiaConfigCompilerOptions = NestiaConfigCompilerOptions = {}));
-//# sourceMappingURL=NestiaConfigCompilerOptions.js.map

package/lib/executable/internal/NestiaConfigCompilerOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NestiaConfigCompilerOptions.js","sourceRoot":"","sources":["../../../src/executable/internal/NestiaConfigCompilerOptions.ts"],"names":[],"mappings":";;;AAAA,IAAiB,2BAA2B,CAkB3C;AAlBD,WAAiB,2BAA2B;IACxC;;kEAE8D;IAC9D,MAAM,iBAAiB,GAAG;QACtB,KAAK,EAAE,CAAC,MAAM,EAAE,kBAAkB,CAAC;QACnC,MAAM,EAAE,IAAI;QACZ,eAAe,EAAE,IAAI;QACrB,sBAAsB,EAAE,IAAI;QAC5B,qBAAqB,EAAE,IAAI;KAC9B,CAAC;IAEW,2CAAe,mCACrB,iBAAiB,KACpB,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,UAAU,EAClB,gBAAgB,EAAE,IAAI,GACzB,CAAC;AACN,CAAC,EAlBgB,2BAA2B,2CAA3B,2BAA2B,QAkB3C"}

package/lib/executable/internal/NestiaSdkConfig.d.ts

@@ -1,4 +0,0 @@
-import { INestiaConfig } from "../../INestiaConfig";
-export declare namespace NestiaSdkConfig {
-    function get(): Promise<INestiaConfig | null>;
-}