@nestia/sdk 1.3.8 → 1.3.10

package/src/generates/E2eGenerator.ts

@@ -1,67 +1,67 @@
-import fs from "fs";
-import path from "path";
-
-import { INestiaConfig } from "../INestiaConfig";
-import { IRoute } from "../structures/IRoute";
-import { NestiaConfigUtil } from "../utils/NestiaConfigUtil";
-import { E2eFileProgrammer } from "./internal/E2eFileProgrammer";
-
-export namespace E2eGenerator {
-    export const generate =
-        (config: INestiaConfig) =>
-        async (routeList: IRoute[]): Promise<void> => {
-            console.log("Generating E2E Test Functions");
-
-            // PREPARE DIRECTORIES
-            const output: string = path.resolve(config.e2e!);
-            await mkdir(output);
-            await mkdir(path.join(output, "features"));
-            await mkdir(path.join(output, "features", "api"));
-            await mkdir(path.join(output, "features", "api", "automated"));
-
-            // GENERATE TEST INDEX FILE
-            await index(config)(path.join(config.e2e!, "index.ts"));
-
-            // GENERATE EACH TEST FILES
-            for (const route of routeList)
-                await E2eFileProgrammer.generate(config)({
-                    api: path.resolve(config.output!),
-                    current: path.join(output, "features", "api", "automated"),
-                })(route);
-        };
-
-    const index =
-        (config: INestiaConfig) =>
-        async (output: string): Promise<void> => {
-            if (fs.existsSync(output)) return;
-
-            const location: string = path.join(
-                __dirname,
-                "..",
-                "..",
-                "assets",
-                "bundle",
-                "e2e",
-                "index.ts",
-            );
-            const content: string = await fs.promises.readFile(
-                location,
-                "utf8",
-            );
-
-            await fs.promises.writeFile(
-                output,
-                content.replace(
-                    "${input}",
-                    JSON.stringify(NestiaConfigUtil.input(config.input)),
-                ),
-                "utf8",
-            );
-        };
-}
-
-const mkdir = async (location: string): Promise<void> => {
-    try {
-        await fs.promises.mkdir(location);
-    } catch {}
-};
+import fs from "fs";
+import path from "path";
+
+import { INestiaConfig } from "../INestiaConfig";
+import { IRoute } from "../structures/IRoute";
+import { NestiaConfigUtil } from "../utils/NestiaConfigUtil";
+import { E2eFileProgrammer } from "./internal/E2eFileProgrammer";
+
+export namespace E2eGenerator {
+    export const generate =
+        (config: INestiaConfig) =>
+        async (routeList: IRoute[]): Promise<void> => {
+            console.log("Generating E2E Test Functions");
+
+            // PREPARE DIRECTORIES
+            const output: string = path.resolve(config.e2e!);
+            await mkdir(output);
+            await mkdir(path.join(output, "features"));
+            await mkdir(path.join(output, "features", "api"));
+            await mkdir(path.join(output, "features", "api", "automated"));
+
+            // GENERATE TEST INDEX FILE
+            await index(config)(path.join(config.e2e!, "index.ts"));
+
+            // GENERATE EACH TEST FILES
+            for (const route of routeList)
+                await E2eFileProgrammer.generate(config)({
+                    api: path.resolve(config.output!),
+                    current: path.join(output, "features", "api", "automated"),
+                })(route);
+        };
+
+    const index =
+        (config: INestiaConfig) =>
+        async (output: string): Promise<void> => {
+            if (fs.existsSync(output)) return;
+
+            const location: string = path.join(
+                __dirname,
+                "..",
+                "..",
+                "assets",
+                "bundle",
+                "e2e",
+                "index.ts",
+            );
+            const content: string = await fs.promises.readFile(
+                location,
+                "utf8",
+            );
+
+            await fs.promises.writeFile(
+                output,
+                content.replace(
+                    "${input}",
+                    JSON.stringify(NestiaConfigUtil.input(config.input)),
+                ),
+                "utf8",
+            );
+        };
+}
+
+const mkdir = async (location: string): Promise<void> => {
+    try {
+        await fs.promises.mkdir(location);
+    } catch {}
+};

package/src/generates/SdkGenerator.ts

@@ -1,65 +1,94 @@
-import fs from "fs";
-import NodePath from "path";
-
-import { INestiaConfig } from "../INestiaConfig";
-import { IRoute } from "../structures/IRoute";
-import { DistributionComposer } from "./internal/DistributionComposer";
-import { SdkFileProgrammer } from "./internal/SdkFileProgrammer";
-
-export namespace SdkGenerator {
-    export const generate =
-        (config: INestiaConfig) =>
-        async (routes: IRoute[]): Promise<void> => {
-            console.log("Generating SDK Library");
-
-            // PREPARE NEW DIRECTORIES
-            try {
-                await fs.promises.mkdir(config.output!);
-            } catch {}
-
-            // BUNDLING
-            const bundle: string[] = await fs.promises.readdir(BUNDLE_PATH);
-            for (const file of bundle) {
-                const current: string = `${BUNDLE_PATH}/${file}`;
-                const stats: fs.Stats = await fs.promises.stat(current);
-
-                if (stats.isFile() === true) {
-                    const content: string = await fs.promises.readFile(
-                        current,
-                        "utf8",
-                    );
-                    if (fs.existsSync(`${config.output}/${file}`) === false)
-                        await fs.promises.writeFile(
-                            `${config.output}/${file}`,
-                            content,
-                            "utf8",
-                        );
-                }
-            }
-            if (config.random && routes.some((r) => !!r.parameters.length)) {
-                try {
-                    await fs.promises.mkdir(`${config.output}/utils`);
-                } catch {}
-                await fs.promises.copyFile(
-                    `${BUNDLE_PATH}/utils/NestiaSimulator.ts`,
-                    `${config.output}/utils/NestiaSimulator.ts`,
-                );
-            }
-
-            // FUNCTIONAL
-            await SdkFileProgrammer.generate(config)(routes);
-
-            // DISTRIBUTION
-            if (config.distribute !== undefined)
-                await DistributionComposer.compose(config);
-        };
-
-    export const BUNDLE_PATH = NodePath.join(
-        __dirname,
-        "..",
-        "..",
-        "assets",
-        "bundle",
-        "api",
-    );
-}
+import fs from "fs";
+import NodePath from "path";
+
+import { INestiaConfig } from "../INestiaConfig";
+import { IRoute } from "../structures/IRoute";
+import { DistributionComposer } from "./internal/DistributionComposer";
+import { SdkFileProgrammer } from "./internal/SdkFileProgrammer";
+
+export namespace SdkGenerator {
+    export const generate =
+        (config: INestiaConfig) =>
+        async (routes: IRoute[]): Promise<void> => {
+            console.log("Generating SDK Library");
+
+            // FIND IMPLICIT TYPES
+            const implicit: IRoute[] = routes.filter(is_implicit_return_typed);
+            if (implicit.length > 0)
+                throw new Error(
+                    "NestiaApplication.sdk(): implicit return type is not allowed.\n" +
+                        "\n" +
+                        "List of implicit return typed routes:\n" +
+                        implicit
+                            .map((it) => `  - ${it.symbol} at "${it.location}"`)
+                            .join("\n"),
+                );
+
+            // PREPARE NEW DIRECTORIES
+            try {
+                await fs.promises.mkdir(config.output!);
+            } catch {}
+
+            // BUNDLING
+            const bundle: string[] = await fs.promises.readdir(BUNDLE_PATH);
+            for (const file of bundle) {
+                const current: string = `${BUNDLE_PATH}/${file}`;
+                const stats: fs.Stats = await fs.promises.stat(current);
+
+                if (stats.isFile() === true) {
+                    const content: string = await fs.promises.readFile(
+                        current,
+                        "utf8",
+                    );
+                    if (fs.existsSync(`${config.output}/${file}`) === false)
+                        await fs.promises.writeFile(
+                            `${config.output}/${file}`,
+                            content,
+                            "utf8",
+                        );
+                }
+            }
+            if (config.random && routes.some((r) => !!r.parameters.length)) {
+                try {
+                    await fs.promises.mkdir(`${config.output}/utils`);
+                } catch {}
+                await fs.promises.copyFile(
+                    `${BUNDLE_PATH}/utils/NestiaSimulator.ts`,
+                    `${config.output}/utils/NestiaSimulator.ts`,
+                );
+            }
+
+            // FUNCTIONAL
+            await SdkFileProgrammer.generate(config)(routes);
+
+            // DISTRIBUTION
+            if (config.distribute !== undefined)
+                await DistributionComposer.compose(config);
+        };
+
+    export const BUNDLE_PATH = NodePath.join(
+        __dirname,
+        "..",
+        "..",
+        "assets",
+        "bundle",
+        "api",
+    );
+}
+
+const is_implicit_return_typed = (route: IRoute): boolean => {
+    const name: string = route.output.name;
+    if (name === "void") return false;
+    else if (name.indexOf("readonly [") !== -1) return true;
+
+    const pos: number = name.indexOf("__object");
+    if (pos === -1) return false;
+
+    const before: number = pos - 1;
+    const after: number = pos + "__object".length;
+    for (const i of [before, after])
+        if (name[i] === undefined) continue;
+        else if (VARIABLE.test(name[i])) return false;
+    return true;
+};
+const VARIABLE = /[a-zA-Z_$0-9]/;