nestia 2.0.13-dev.20220421 → 2.0.15

package/lib/analyses/ControllerAnalyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ControllerAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ControllerAnalyzer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAK9C,yBAAiB,kBAAkB,CACnC;IACI,SAAgB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,EAAE,CAc/G;CA+HJ"}
+{"version":3,"file":"ControllerAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ControllerAnalyzer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAK9C,yBAAiB,kBAAkB,CACnC;IACI,SAAgB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,EAAE,CAc/G;CAyIJ"}

package/lib/analyses/ControllerAnalyzer.js

@@ -156,13 +156,18 @@ var ControllerAnalyzer;
         var output = ImportAnalyzer_1.ImportAnalyzer.analyze(checker, genericDict, importDict, checker.getReturnTypeOfSignature(signature));
         var imports = importDict.toJSON().map(function (pair) { return [pair.first, pair.second.toJSON()]; });
         // CONFIGURE PATH
-        var path = NodePath.join(controller.path, func.path).split("\\").join("/");
+        var path = _Normalize_path(NodePath.join(controller.path, func.path)
+            .split("\\")
+            .join("/"));
+        // RETURNS
+        return __assign(__assign({}, func), { path: path, parameters: parameters, output: output, imports: imports, symbol: "".concat(controller.name, ".").concat(func.name, "()"), comments: signature.getDocumentationComment(undefined), tags: signature.getJsDocTags() });
+    }
+    function _Normalize_path(path) {
         if (path[0] !== "/")
             path = "/" + path;
         if (path[path.length - 1] === "/" && path !== "/")
             path = path.substr(0, path.length - 1);
-        // RETURNS
-        return __assign(__assign({}, func), { path: path, parameters: parameters, output: output, imports: imports, symbol: "".concat(controller.name, ".").concat(func.name, "()"), comments: signature.getDocumentationComment(undefined), tags: signature.getJsDocTags() });
+        return path;
     }
     /* ---------------------------------------------------------
         PARAMETER

package/lib/analyses/ImportAnalyzer.d.ts

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

package/lib/analyses/ImportAnalyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImportAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ImportAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,yBAAiB,cAAc,CAC/B;IACI,UAAiB,OAAO;QAEpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAC/B,KAAK,EAAE,MAAM,CAAC;KACjB;IAED,KAAY,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,SAAgB,OAAO,CAEf,OAAO,EAAE,GAAG,CAAC,WAAW,EACxB,WAAW,EAAE,eAAe,CAAC,UAAU,EACvC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,GAAG,CAAC,IAAI,GACf,MAAM,CAGZ;CAmEJ"}
+{"version":3,"file":"ImportAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ImportAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,yBAAiB,cAAc,CAC/B;IACI,UAAiB,OAAO;QAEpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAC/B,KAAK,EAAE,MAAM,CAAC;KACjB;IAED,KAAY,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,SAAgB,OAAO,CAEf,OAAO,EAAE,GAAG,CAAC,WAAW,EACxB,WAAW,EAAE,eAAe,CAAC,UAAU,EACvC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,GAAG,CAAC,IAAI,GACf,MAAM,CAGZ;CAsEJ"}

package/lib/analyses/ImportAnalyzer.js

@@ -1,30 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportAnalyzer = void 0;
-var tsc = __importStar(require("typescript"));
+var typescript_1 = __importDefault(require("typescript"));
 var HashSet_1 = require("tstl/container/HashSet");
 var ImportAnalyzer;
 (function (ImportAnalyzer) {
@@ -54,29 +34,25 @@ var ImportAnalyzer;
         var name = get_name(symbol);
         var sourceFile = symbol.declarations[0].getSourceFile();
         if (sourceFile.fileName.indexOf("typescript/lib") === -1) {
-            var it = importDict.find(sourceFile.fileName);
-            if (it.equals(importDict.end()) === true)
-                it = importDict.emplace(sourceFile.fileName, new HashSet_1.HashSet()).first;
-            it.second.insert(name.split(".")[0]);
+            var set = importDict.take(sourceFile.fileName, function () { return new HashSet_1.HashSet(); });
+            set.insert(name.split(".")[0]);
         }
         // CHECK GENERIC
         var generic = checker.getTypeArguments(type);
-        if (generic.length) {
+        if (generic.length)
             return name === "Promise"
                 ? explore(checker, genericDict, importDict, generic[0])
                 : "".concat(name, "<").concat(generic.map(function (child) { return explore(checker, genericDict, importDict, child); }).join(", "), ">");
-        }
         else
             return name;
     }
     function get_name(symbol) {
-        var name = symbol.escapedName.toString();
-        var decl = symbol.getDeclarations()[0].parent;
-        while (tsc.isModuleBlock(decl)) {
-            name = "".concat(decl.parent.name.getText(), ".").concat(name);
-            decl = decl.parent.parent;
-        }
-        return name;
+        return explore_name(symbol.escapedName.toString(), symbol.getDeclarations()[0].parent);
+    }
+    function explore_name(name, decl) {
+        return typescript_1.default.isModuleBlock(decl)
+            ? explore_name("".concat(decl.parent.name.getText(), ".").concat(name), decl.parent.parent)
+            : name;
     }
 })(ImportAnalyzer = exports.ImportAnalyzer || (exports.ImportAnalyzer = {}));
 //# sourceMappingURL=ImportAnalyzer.js.map

package/lib/executable/internal/CompilerOptions.js

@@ -83,13 +83,13 @@ var CompilerOptions;
         // INITALIZE PLUGINS
         if (!options.plugins || !(options.plugins instanceof Array))
             options.plugins = [];
-        var transformed = false;
+        var transformed = [];
         var plugins = options.plugins;
         var emplace = function (input) {
             var found = plugins.find(function (p) { return nestia_fetcher_1.Primitive.equal_to(p, input); });
             if (found === undefined)
                 plugins.push(input);
-            transformed || (transformed = true);
+            transformed.push(true);
         };
         if (assert === true)
             emplace({
@@ -97,7 +97,7 @@ var CompilerOptions;
             });
         if (options.paths && Object.entries(options.paths).length !== 0)
             emplace({ transform: "typescript-transform-paths" });
-        return [transformed, !!options.baseUrl];
+        return [!!transformed.length, !!options.baseUrl];
     }
     CompilerOptions.emend = emend;
     function merge_array(origin, must) {

package/lib/executable/internal/NestiaSdkCli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NestiaSdkCli.d.ts","sourceRoot":"","sources":["../../../src/executable/internal/NestiaSdkCli.ts"],"names":[],"mappings":"AAiBA,yBAAiB,YAAY,CAC7B;IACI,SAAsB,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBlF;CAwDJ"}
+{"version":3,"file":"NestiaSdkCli.d.ts","sourceRoot":"","sources":["../../../src/executable/internal/NestiaSdkCli.ts"],"names":[],"mappings":"AAiBA,yBAAiB,YAAY,CAC7B;IACI,SAAsB,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBlF;CA2DJ"}

package/lib/executable/internal/NestiaSdkCli.js

@@ -162,44 +162,32 @@ var NestiaSdkCli;
     }
     NestiaSdkCli.main = main;
     function generate(include, command) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var config, parentPath, parentStats, content, options, app;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, get_nestia_config()];
                     case 1:
-                        config = _a.sent();
-                        if (config === null) {
-                            if (command.out === null)
-                                throw new Error("Output directory is not specified. Add the \"--out <output_directory>\" option.");
-                            config = {
-                                input: {
-                                    include: include,
-                                    exclude: command.exclude
-                                        ? [command.exclude]
-                                        : undefined
-                                },
-                                output: command.out
-                            };
-                        }
+                        config = (_a = _b.sent()) !== null && _a !== void 0 ? _a : parse_cli(include, command);
                         parentPath = path.resolve(config.output + "/..");
                         return [4 /*yield*/, fs.promises.stat(parentPath)];
                     case 2:
-                        parentStats = _a.sent();
+                        parentStats = _b.sent();
                         if (parentStats.isDirectory() === false)
                             throw new Error("Unable to find parent directory of the output path: \"".concat(parentPath, "\"."));
                         if (!(fs.existsSync("tsconfig.json") === true)) return [3 /*break*/, 4];
                         return [4 /*yield*/, fs.promises.readFile("tsconfig.json", "utf8")];
                     case 3:
-                        content = _a.sent();
+                        content = _b.sent();
                         options = jsonc_simple_parser_1.default.parse(content).compilerOptions;
                         config.compilerOptions = __assign(__assign({}, options), (config.compilerOptions || {}));
-                        _a.label = 4;
+                        _b.label = 4;
                     case 4:
                         app = new NestiaApplication_1.NestiaApplication(config);
                         return [4 /*yield*/, app.generate()];
                     case 5:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -229,5 +217,18 @@ var NestiaSdkCli;
             });
         });
     }
+    function parse_cli(include, command) {
+        if (command.out === null)
+            throw new Error("Output directory is not specified. Add the \"--out <output_directory>\" option.");
+        return {
+            input: {
+                include: include,
+                exclude: command.exclude
+                    ? [command.exclude]
+                    : undefined
+            },
+            output: command.out
+        };
+    }
 })(NestiaSdkCli = exports.NestiaSdkCli || (exports.NestiaSdkCli = {}));
 //# sourceMappingURL=NestiaSdkCli.js.map

package/lib/executable/nestia.js

@@ -78,7 +78,7 @@ function install() {
     var e_1, _a;
     try {
         // INSTALL DEPENDENCIES
-        for (var _b = __values(["nestia-fetcher", "typescript-is"]), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(["nestia-fetcher", "typescript-is", "typescript-json"]), _c = _b.next(); !_c.done; _c = _b.next()) {
             var lib = _c.value;
             var command = "npm install ".concat(lib);
             cp.execSync(command, { stdio: "inherit" });

package/lib/generates/FileGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/FileGenerator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,yBAAiB,aAAa,CAC9B;IAII,SAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAYzF;CA+GJ"}
+{"version":3,"file":"FileGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/FileGenerator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,yBAAiB,aAAa,CAC9B;IAII,SAAsB,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAYzF;CAwHJ"}

package/lib/generates/FileGenerator.js

@@ -69,6 +69,31 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileGenerator = void 0;
 var fs = __importStar(require("fs"));
@@ -121,15 +146,14 @@ var FileGenerator;
             .split("/")
             .filter(function (str) { return str[0] !== ":" && str.length !== 0; })
             .map(function (str) { return str.split("-").join("_").split(".").join("_"); });
+        var _loop_1 = function (key) {
+            directory = directory.directories.take(key, function () { return new Directory(directory, key); });
+        };
         try {
+            // OPEN DIRECTORIES
             for (var identifiers_1 = __values(identifiers), identifiers_1_1 = identifiers_1.next(); !identifiers_1_1.done; identifiers_1_1 = identifiers_1.next()) {
                 var key = identifiers_1_1.value;
-                // EMPLACE IF REQUIRED
-                var it = directory.directories.find(key);
-                if (it.equals(directory.directories.end()) === true)
-                    it = directory.directories.emplace(key, new Directory(directory, key)).first;
-                // FOR THE NEXT STEP
-                directory = it.second;
+                _loop_1(key);
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -139,6 +163,7 @@ var FileGenerator;
             }
             finally { if (e_2) throw e_2.error; }
         }
+        // ADD ROUTE
         directory.routes.push(route);
     }
     function relocate(directory) {
@@ -170,89 +195,83 @@ var FileGenerator;
     --------------------------------------------------------- */
     function iterate(config, outDir, directory) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, content, _b, _c, it, e_4_1, importDict, _d, _e, route, _f, _g, tuple, _h, _j, instance, primitived, asserted, json, fetcher;
-            var e_4, _k, e_5, _l, e_6, _m, e_7, _o;
-            return __generator(this, function (_p) {
-                switch (_p.label) {
+            var _a, content, _b, _c, it, e_4_1, importDict, primitived, asserted, json, fetcher, head, script;
+            var e_4, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _p.trys.push([0, 2, , 3]);
+                        _e.trys.push([0, 2, , 3]);
                         return [4 /*yield*/, fs.promises.mkdir(outDir)];
                     case 1:
-                        _p.sent();
+                        _e.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        _a = _p.sent();
+                        _a = _e.sent();
                         return [3 /*break*/, 3];
                     case 3:
-                        content = "";
-                        _p.label = 4;
+                        content = [];
+                        _e.label = 4;
                     case 4:
-                        _p.trys.push([4, 9, 10, 11]);
+                        _e.trys.push([4, 9, 10, 11]);
                         _b = __values(directory.directories), _c = _b.next();
-                        _p.label = 5;
+                        _e.label = 5;
                     case 5:
                         if (!!_c.done) return [3 /*break*/, 8];
                         it = _c.value;
                         return [4 /*yield*/, iterate(config, "".concat(outDir, "/").concat(it.first), it.second)];
                     case 6:
-                        _p.sent();
-                        content += "export * as ".concat(it.first, " from \"./").concat(it.first, "\";\n");
-                        _p.label = 7;
+                        _e.sent();
+                        content.push("export * as ".concat(it.first, " from \"./").concat(it.first, "\";"));
+                        _e.label = 7;
                     case 7:
                         _c = _b.next();
                         return [3 /*break*/, 5];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_4_1 = _p.sent();
+                        e_4_1 = _e.sent();
                         e_4 = { error: e_4_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
-                            if (_c && !_c.done && (_k = _b.return)) _k.call(_b);
+                            if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                         }
                         finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 11:
-                        content += "\n";
+                        if (content.length && directory.routes.length)
+                            content.push("");
                         importDict = new ImportDictionary_1.ImportDictionary();
-                        try {
-                            for (_d = __values(directory.routes), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                route = _e.value;
-                                try {
-                                    for (_f = (e_6 = void 0, __values(route.imports)), _g = _f.next(); !_g.done; _g = _f.next()) {
-                                        tuple = _g.value;
-                                        try {
-                                            for (_h = (e_7 = void 0, __values(tuple[1])), _j = _h.next(); !_j.done; _j = _h.next()) {
-                                                instance = _j.value;
-                                                importDict.emplace(tuple[0], false, instance);
-                                            }
-                                        }
-                                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
-                                        finally {
-                                            try {
-                                                if (_j && !_j.done && (_o = _h.return)) _o.call(_h);
-                                            }
-                                            finally { if (e_7) throw e_7.error; }
+                        directory.routes.forEach(function (route, i) {
+                            var e_5, _a, e_6, _b;
+                            try {
+                                for (var _c = __values(route.imports), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                    var tuple = _d.value;
+                                    try {
+                                        for (var _e = (e_6 = void 0, __values(tuple[1])), _f = _e.next(); !_f.done; _f = _e.next()) {
+                                            var instance = _f.value;
+                                            importDict.emplace(tuple[0], false, instance);
                                         }
                                     }
-                                }
-                                catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                                finally {
-                                    try {
-                                        if (_g && !_g.done && (_m = _f.return)) _m.call(_f);
+                                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                                    finally {
+                                        try {
+                                            if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+                                        }
+                                        finally { if (e_6) throw e_6.error; }
                                     }
-                                    finally { if (e_6) throw e_6.error; }
                                 }
-                                content += FunctionGenerator_1.FunctionGenerator.generate(config, route) + "\n\n";
                             }
-                        }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                        finally {
-                            try {
-                                if (_e && !_e.done && (_l = _d.return)) _l.call(_d);
+                            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                            finally {
+                                try {
+                                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                                }
+                                finally { if (e_5) throw e_5.error; }
                             }
-                            finally { if (e_5) throw e_5.error; }
-                        }
+                            content.push(FunctionGenerator_1.FunctionGenerator.generate(config, route));
+                            if (i !== directory.routes.length - 1)
+                                content.push("");
+                        });
                         // FINALIZE THE CONTENT
                         if (directory.routes.length !== 0) {
                             primitived = directory.routes.some(function (route) { return route.output !== "void"
@@ -264,26 +283,27 @@ var FileGenerator;
                             fetcher = ["Fetcher"];
                             if (primitived)
                                 fetcher.push("Primitive");
-                            content = ""
-                                + "import { ".concat(fetcher.join(", "), " } from \"nestia-fetcher\";\n")
-                                + "import type { IConnection } from \"nestia-fetcher\";\n"
-                                + (asserted ? "import { assertType } from \"typescript-is\";\n" : "")
-                                + (json ? "import { createStringifier } from \"typescript-json\";\n" : "")
-                                +
-                                    (importDict.empty()
-                                        ? ""
-                                        : "\n" + importDict.toScript(outDir) + "\n")
-                                + content;
+                            head = [
+                                "import { ".concat(fetcher.join(", "), " } from \"nestia-fetcher\";"),
+                                "import type { IConnection } from \"nestia-fetcher\";",
+                            ];
+                            if (asserted)
+                                head.push("import { assertType } from \"typescript-is\";");
+                            if (json)
+                                head.push("import { createStringifier } from \"typescript-json\";");
+                            if (!importDict.empty())
+                                head.push("", importDict.toScript(outDir));
+                            content.push.apply(content, __spreadArray(__spreadArray(__spreadArray([], __read(head), false), [""], false), __read(content.splice(0, content.length)), false));
                         }
-                        content = "/**\n"
+                        script = "/**\n"
                             + " * @packageDocumentation\n"
                             + " * @module ".concat(directory.module, "\n")
                             + " */\n"
                             + "//================================================================\n"
-                            + content;
-                        return [4 /*yield*/, fs.promises.writeFile("".concat(outDir, "/index.ts"), content, "utf8")];
+                            + content.join("\n");
+                        return [4 /*yield*/, fs.promises.writeFile("".concat(outDir, "/index.ts"), script, "utf8")];
                     case 12:
-                        _p.sent();
+                        _e.sent();
                         return [2 /*return*/];
                 }
             });

package/lib/generates/FunctionGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/FunctionGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,yBAAiB,iBAAiB,CAClC;IACI,SAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAStE;CAkMJ"}
+{"version":3,"file":"FunctionGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/FunctionGenerator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,yBAAiB,iBAAiB,CAClC;IACI,SAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAStE;CAqNJ"}

package/lib/generates/FunctionGenerator.js

@@ -95,9 +95,14 @@ var FunctionGenerator;
         // CONSTRUCT COMMENT
         //----
         // MAIN DESCRIPTION
-        var comment = route.comments.map(function (comment) { return "".concat(comment.kind === "linkText" ? " " : "").concat(comment.text); }).join("");
-        if (comment !== "")
-            comment += "\n\n";
+        var comment = route.comments
+            .map(function (part) { return "".concat(part.kind === "linkText" ? " " : "").concat(part.text); })
+            .map(function (str) { return str.split("\r\n").join("\n"); })
+            .join("")
+            .split("\n")
+            .filter(function (str, i, array) { return str !== "" || i !== array.length - 1; });
+        if (comment.length)
+            comment.push("");
         // FILTER TAGS (VULNERABLE PARAMETERS WOULD BE REMOVED)
         var tagList = route.tags.filter(function (tag) { return tag.text !== undefined; });
         if (tagList.length !== 0) {
@@ -122,14 +127,10 @@ var FunctionGenerator;
                     ]
                 });
             }
-            comment += tagList
-                .map(function (tag) { return "@".concat(tag.name, " ").concat(tag.text.map(function (elem) { return elem.text; }).join("")); })
-                .join("\n") + "\n\n";
+            comment.push.apply(comment, __spreadArray(__spreadArray([], __read(tagList.map(function (tag) { return "@".concat(tag.name, " ").concat(tag.text.map(function (elem) { return elem.text; }).join("")); })), false), [""], false));
         }
         // COMPLETE THE COMMENT
-        comment += "@nestia Generated by Nestia - https://github.com/samchon/nestia\n";
-        comment += "@controller ".concat(route.symbol, "\n");
-        comment += "@path ".concat(route.method, " ").concat(route.path);
+        comment.push("@nestia Generated by Nestia - https://github.com/samchon/nestia", "@controller ".concat(route.symbol), "@path ".concat(route.method, " ").concat(route.path));
         //----
         // FINALIZATION
         //----
@@ -149,7 +150,7 @@ var FunctionGenerator;
         // RETURNS WITH CONSTRUCTION
         return ""
             + "/**\n"
-            + comment.split("\r\n").join("\n").split("\n").map(function (str) { return " * ".concat(str); }).join("\n") + "\n"
+            + comment.map(function (str) { return " * ".concat(str); }).join("\n") + "\n"
             + " */\n"
             + "export function ".concat(route.name, "\n")
             + "    (\n"
@@ -157,7 +158,6 @@ var FunctionGenerator;
             + "    ): Promise<".concat(output, ">");
     }
     function tail(route, query, input, config) {
-        var e_1, _a;
         // LIST UP TYPES
         var types = [];
         if (query !== undefined)
@@ -168,24 +168,7 @@ var FunctionGenerator;
             types.push(new Pair_1.Pair("Output", route.output));
         // PATH WITH PARAMETERS
         var parameters = filter_parameters(route, query);
-        var path = route.path;
-        try {
-            for (var parameters_1 = __values(parameters), parameters_1_1 = parameters_1.next(); !parameters_1_1.done; parameters_1_1 = parameters_1.next()) {
-                var param = parameters_1_1.value;
-                if (param.category === "param")
-                    path = path.replace(":".concat(param.field), "${".concat(param.name, "}"));
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (parameters_1_1 && !parameters_1_1.done && (_a = parameters_1.return)) _a.call(parameters_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        path = (query !== undefined)
-            ? "`".concat(path, "?${new URLSearchParams(").concat(query.name, " as any).toString()}`")
-            : "`".concat(path, "`");
+        var path = compute_path(query, parameters, route.path);
         return "export namespace ".concat(route.name, "\n")
             + "{\n"
             +
@@ -210,5 +193,25 @@ var FunctionGenerator;
                     : "")
             + "}";
     }
+    function compute_path(query, parameters, path) {
+        var e_1, _a;
+        try {
+            for (var parameters_1 = __values(parameters), parameters_1_1 = parameters_1.next(); !parameters_1_1.done; parameters_1_1 = parameters_1.next()) {
+                var param = parameters_1_1.value;
+                if (param.category === "param")
+                    path = path.replace(":".concat(param.field), "${".concat(param.name, "}"));
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (parameters_1_1 && !parameters_1_1.done && (_a = parameters_1.return)) _a.call(parameters_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return (query !== undefined)
+            ? "`".concat(path, "?${new URLSearchParams(").concat(query.name, " as any).toString()}`")
+            : "`".concat(path, "`");
+    }
 })(FunctionGenerator = exports.FunctionGenerator || (exports.FunctionGenerator = {}));
 //# sourceMappingURL=FunctionGenerator.js.map

package/lib/utils/ImportDictionary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImportDictionary.d.ts","sourceRoot":"","sources":["../../src/utils/ImportDictionary.ts"],"names":[],"mappings":"AAMA,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkE;IAEjF,KAAK,IAAI,OAAO;IAKhB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAejE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAa1C"}
+{"version":3,"file":"ImportDictionary.d.ts","sourceRoot":"","sources":["../../src/utils/ImportDictionary.ts"],"names":[],"mappings":"AAMA,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkE;IAEjF,KAAK,IAAI,OAAO;IAKhB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAiBjE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAa1C"}

package/lib/utils/ImportDictionary.js

@@ -53,10 +53,8 @@ var ImportDictionary = /** @class */ (function () {
             file = file.substr(0, file.length - 3);
         else
             throw new Error("Error on ImportDictionary.emplace(): extension of the target file \"".concat(file, "\" is not \"ts\"."));
-        var it = this.dict_.find(file);
-        if (it.equals(this.dict_.end()) === true)
-            it = this.dict_.emplace(file, new Pair_1.Pair(realistic, new HashSet_1.HashSet())).first;
-        it.second.second.insert(instance);
+        var pair = this.dict_.take(file, function () { return new Pair_1.Pair(realistic, new HashSet_1.HashSet()); });
+        pair.second.insert(instance);
     };
     ImportDictionary.prototype.toScript = function (outDir) {
         var e_1, _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "2.0.13-dev.20220421",
+  "version": "2.0.15",
   "description": "Automatic SDK and Document generator for the NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -36,13 +36,13 @@
     "jsonc-simple-parser": "^2.2.1",
     "nestia-fetcher": "^2.0.1",
     "tgrid": "^0.8.6",
-    "ts-node": "^10.4.0",
+    "ts-node": "^10.7.0",
     "tsconfig-paths": "^3.14.1",
-    "tstl": "^2.5.3",
+    "tstl": "^2.5.5",
     "ttypescript": "^1.5.13",
     "typescript": "^4.6.3",
     "typescript-is": "^0.19.0",
-    "typescript-json": "^2.0.2",
+    "typescript-json": "^2.0.4",
     "typescript-transform-paths": "^3.3.1"
   },
   "devDependencies": {

package/lib/utils/stripJsonComments.d.ts

@@ -1,4 +0,0 @@
-export declare function stripJsonComments(jsonString: string, { whitespace }?: {
-    whitespace?: boolean | undefined;
-}): string;
-//# sourceMappingURL=stripJsonComments.d.ts.map

package/lib/utils/stripJsonComments.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"stripJsonComments.d.ts","sourceRoot":"","sources":["../../src/utils/stripJsonComments.ts"],"names":[],"mappings":"AAoBA,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAC,UAAiB,EAAC;;CAAK,UA0D7E"}

package/lib/utils/stripJsonComments.js

@@ -1,76 +0,0 @@
-"use strict";
-// https://github.com/sindresorhus/strip-json-comments
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripJsonComments = void 0;
-var singleComment = Symbol('singleComment');
-var multiComment = Symbol('multiComment');
-var stripWithoutWhitespace = function () { return ''; };
-var stripWithWhitespace = function (string, start, end) { return string.slice(start, end).replace(/\S/g, ' '); };
-var isEscaped = function (jsonString, quotePosition) {
-    var index = quotePosition - 1;
-    var backslashCount = 0;
-    while (jsonString[index] === '\\') {
-        index -= 1;
-        backslashCount += 1;
-    }
-    return Boolean(backslashCount % 2);
-};
-function stripJsonComments(jsonString, _a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.whitespace, whitespace = _c === void 0 ? true : _c;
-    if (typeof jsonString !== 'string') {
-        throw new TypeError("Expected argument `jsonString` to be a `string`, got `".concat(typeof jsonString, "`"));
-    }
-    var strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
-    var isInsideString = false;
-    var isInsideComment = false;
-    var offset = 0;
-    var result = '';
-    for (var index = 0; index < jsonString.length; index++) {
-        var currentCharacter = jsonString[index];
-        var nextCharacter = jsonString[index + 1];
-        if (!isInsideComment && currentCharacter === '"') {
-            var escaped = isEscaped(jsonString, index);
-            if (!escaped) {
-                isInsideString = !isInsideString;
-            }
-        }
-        if (isInsideString) {
-            continue;
-        }
-        if (!isInsideComment && currentCharacter + nextCharacter === '//') {
-            result += jsonString.slice(offset, index);
-            offset = index;
-            isInsideComment = singleComment;
-            index++;
-        }
-        else if (isInsideComment === singleComment && currentCharacter + nextCharacter === '\r\n') {
-            index++;
-            isInsideComment = false;
-            result += strip(jsonString, offset, index);
-            offset = index;
-            continue;
-        }
-        else if (isInsideComment === singleComment && currentCharacter === '\n') {
-            isInsideComment = false;
-            result += strip(jsonString, offset, index);
-            offset = index;
-        }
-        else if (!isInsideComment && currentCharacter + nextCharacter === '/*') {
-            result += jsonString.slice(offset, index);
-            offset = index;
-            isInsideComment = multiComment;
-            index++;
-            continue;
-        }
-        else if (isInsideComment === multiComment && currentCharacter + nextCharacter === '*/') {
-            index++;
-            isInsideComment = false;
-            result += strip(jsonString, offset, index + 1);
-            offset = index + 1;
-            continue;
-        }
-    }
-    return result + (isInsideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
-}
-exports.stripJsonComments = stripJsonComments;
-//# sourceMappingURL=stripJsonComments.js.map