nestia 2.0.7-dev.20220414-5 → 2.0.8

package/.github/workflows/build.yml

@@ -6,11 +6,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [windows-latest, macos-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
           node-version: 12.x
       - run: npm install
+      - run: npm run build
       - run: npm run test

package/bin/executable/internal/NestiaSdkCli.d.ts

@@ -0,0 +1,4 @@
+export declare namespace NestiaSdkCli {
+    function main(elements: string[], pure?: boolean): Promise<void>;
+}
+//# sourceMappingURL=NestiaSdkCli.d.ts.map

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

@@ -0,0 +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"}

package/bin/executable/internal/NestiaSdkCli.js

@@ -0,0 +1,233 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+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));
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NestiaSdkCli = void 0;
+var cli = __importStar(require("cli"));
+var fs = __importStar(require("fs"));
+var path = __importStar(require("path"));
+var jsonc_simple_parser_1 = __importDefault(require("jsonc-simple-parser"));
+var WorkerConnector_1 = require("tgrid/protocols/workers/WorkerConnector");
+var NestiaApplication_1 = require("../../NestiaApplication");
+var NestiaSdkCli;
+(function (NestiaSdkCli) {
+    function main(elements, pure) {
+        if (pure === void 0) { pure = true; }
+        return __awaiter(this, void 0, void 0, function () {
+            var command, inputs, elements_1, elements_1_1, arg;
+            var e_1, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (pure === false)
+                            cli.setArgv(__spreadArray([
+                                process.argv[0],
+                                process.argv[1],
+                                "nestia"
+                            ], __read(elements), false));
+                        command = cli.parse({
+                            exclude: ["e", "Something to exclude", "string", null],
+                            out: ["o", "Output path of the SDK files", "string", null],
+                        });
+                        inputs = [];
+                        try {
+                            for (elements_1 = __values(elements), elements_1_1 = elements_1.next(); !elements_1_1.done; elements_1_1 = elements_1.next()) {
+                                arg = elements_1_1.value;
+                                if (arg[0] === "-")
+                                    break;
+                                inputs.push(arg);
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (elements_1_1 && !elements_1_1.done && (_a = elements_1.return)) _a.call(elements_1);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        return [4 /*yield*/, generate(inputs, command)];
+                    case 1:
+                        _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    }
+    NestiaSdkCli.main = main;
+    function generate(include, command) {
+        return __awaiter(this, void 0, void 0, function () {
+            var config, parentPath, parentStats, content, options, app;
+            return __generator(this, function (_a) {
+                switch (_a.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
+                            };
+                        }
+                        parentPath = path.resolve(config.output + "/..");
+                        return [4 /*yield*/, fs.promises.stat(parentPath)];
+                    case 2:
+                        parentStats = _a.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();
+                        options = jsonc_simple_parser_1.default.parse(content).compilerOptions;
+                        config.compilerOptions = __assign(__assign({}, options), (config.compilerOptions || {}));
+                        _a.label = 4;
+                    case 4:
+                        app = new NestiaApplication_1.NestiaApplication(config);
+                        return [4 /*yield*/, app.generate()];
+                    case 5:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    }
+    function get_nestia_config() {
+        return __awaiter(this, void 0, void 0, function () {
+            var connector, driver, config;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        connector = new WorkerConnector_1.WorkerConnector(null, null, "process");
+                        return [4 /*yield*/, connector.connect("".concat(__dirname, "/nestia.config.getter.js"))];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, connector.getDriver()];
+                    case 2:
+                        driver = _a.sent();
+                        return [4 /*yield*/, driver.get()];
+                    case 3:
+                        config = _a.sent();
+                        return [4 /*yield*/, connector.close()];
+                    case 4:
+                        _a.sent();
+                        return [2 /*return*/, config];
+                }
+            });
+        });
+    }
+})(NestiaSdkCli = exports.NestiaSdkCli || (exports.NestiaSdkCli = {}));
+//# sourceMappingURL=NestiaSdkCli.js.map

package/bin/executable/nestia.js

@@ -73,6 +73,7 @@ var __values = (this && this.__values) || function(o) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var cp = __importStar(require("child_process"));
 var process = __importStar(require("process"));
+var NestiaSdkCli_1 = require("./internal/NestiaSdkCli");
 function install() {
     var e_1, _a;
     try {
@@ -95,11 +96,8 @@ function sdk() {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: 
-                // EXECUTE THE COMMAND, BUT IGNORE WARNINGS
-                return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("".concat(__dirname, "/sdk.js"))); })];
+                case 0: return [4 /*yield*/, NestiaSdkCli_1.NestiaSdkCli.main(process.argv.slice(3))];
                 case 1:
-                    // EXECUTE THE COMMAND, BUT IGNORE WARNINGS
                     _a.sent();
                     return [2 /*return*/];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestia",
-  "version": "2.0.7-dev.20220414-5",
+  "version": "2.0.8",
   "description": "Automatic SDK and Document generator for the NestJS",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -10,7 +10,7 @@
   "scripts": {
     "build": "rimraf bin && ttsc",
     "dev": "npm run build -- --watch",
-    "test": "ts-node test/index"
+    "test": "node bin/test"
   },
   "repository": {
     "type": "git",

package/bin/executable/sdk.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=sdk.d.ts.map

package/bin/executable/sdk.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/executable/sdk.ts"],"names":[],"mappings":""}

package/bin/executable/sdk.js

@@ -1,206 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var cli = __importStar(require("cli"));
-var fs = __importStar(require("fs"));
-var path = __importStar(require("path"));
-var jsonc_simple_parser_1 = __importDefault(require("jsonc-simple-parser"));
-var WorkerConnector_1 = require("tgrid/protocols/workers/WorkerConnector");
-var NestiaApplication_1 = require("../NestiaApplication");
-function get_nestia_config() {
-    return __awaiter(this, void 0, void 0, function () {
-        var connector, driver, config;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    connector = new WorkerConnector_1.WorkerConnector(null, null, "process");
-                    return [4 /*yield*/, connector.connect(__dirname + "/internal/nestia.config.getter.js")];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, connector.getDriver()];
-                case 2:
-                    driver = _a.sent();
-                    return [4 /*yield*/, driver.get()];
-                case 3:
-                    config = _a.sent();
-                    return [4 /*yield*/, connector.close()];
-                case 4:
-                    _a.sent();
-                    return [2 /*return*/, config];
-            }
-        });
-    });
-}
-function generate(include, command) {
-    return __awaiter(this, void 0, void 0, function () {
-        var config, parentPath, parentStats, content, options, app;
-        return __generator(this, function (_a) {
-            switch (_a.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
-                        };
-                    }
-                    parentPath = path.resolve(config.output + "/..");
-                    return [4 /*yield*/, fs.promises.stat(parentPath)];
-                case 2:
-                    parentStats = _a.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();
-                    options = jsonc_simple_parser_1.default.parse(content).compilerOptions;
-                    config.compilerOptions = __assign(__assign({}, options), (config.compilerOptions || {}));
-                    _a.label = 4;
-                case 4:
-                    app = new NestiaApplication_1.NestiaApplication(config);
-                    return [4 /*yield*/, app.generate()];
-                case 5:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-function main() {
-    return __awaiter(this, void 0, void 0, function () {
-        var command, inputs, _a, _b, arg, exp_1;
-        var e_1, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    command = cli.parse({
-                        exclude: ["e", "Something to exclude", "string", null],
-                        out: ["o", "Output path of the SDK files", "string", null],
-                    });
-                    _d.label = 1;
-                case 1:
-                    _d.trys.push([1, 3, , 4]);
-                    inputs = [];
-                    try {
-                        for (_a = __values(process.argv.slice(2)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                            arg = _b.value;
-                            if (arg[0] === "-")
-                                break;
-                            inputs.push(arg);
-                        }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                    }
-                    return [4 /*yield*/, generate(inputs, command)];
-                case 2:
-                    _d.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    exp_1 = _d.sent();
-                    console.log(exp_1);
-                    process.exit(-1);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
-}
-main();
-//# sourceMappingURL=sdk.js.map