nestia 6.0.2 → 6.0.3-dev.20240910
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/NestiaSetupWizard.js +14 -1
- package/bin/NestiaSetupWizard.js.map +1 -1
- package/bin/index.d.ts +1 -1
- package/bin/index.js +0 -2
- package/bin/index.js.map +1 -1
- package/bin/internal/ArgumentParser.d.ts +1 -1
- package/bin/internal/ArgumentParser.js +14 -5
- package/bin/internal/ArgumentParser.js.map +1 -1
- package/bin/internal/PackageManager.d.ts +4 -2
- package/bin/internal/PackageManager.js +16 -4
- package/bin/internal/PackageManager.js.map +1 -1
- package/package.json +4 -3
- package/src/NestiaSetupWizard.ts +17 -1
- package/src/index.ts +0 -2
- package/src/internal/ArgumentParser.ts +21 -9
- package/src/internal/PackageManager.ts +28 -9
package/bin/NestiaSetupWizard.js
CHANGED
|
@@ -8,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.NestiaSetupWizard = void 0;
|
|
16
|
+
const fs_1 = __importDefault(require("fs"));
|
|
13
17
|
const ArgumentParser_1 = require("./internal/ArgumentParser");
|
|
14
18
|
const CommandExecutor_1 = require("./internal/CommandExecutor");
|
|
15
19
|
const PackageManager_1 = require("./internal/PackageManager");
|
|
@@ -40,7 +44,11 @@ var NestiaSetupWizard;
|
|
|
40
44
|
// INSTALL TYPESCRIPT COMPILERS
|
|
41
45
|
pack.install({ dev: true, modulo: "ts-patch", version: "latest" });
|
|
42
46
|
pack.install({ dev: true, modulo: "ts-node", version: "latest" });
|
|
43
|
-
pack.install({
|
|
47
|
+
pack.install({
|
|
48
|
+
dev: true,
|
|
49
|
+
modulo: "typescript",
|
|
50
|
+
version: yield getTypeScriptVersion(),
|
|
51
|
+
});
|
|
44
52
|
(_a = args.project) !== null && _a !== void 0 ? _a : (args.project = (() => {
|
|
45
53
|
const runner = pack.manager === "npm" ? "npx" : pack.manager;
|
|
46
54
|
CommandExecutor_1.CommandExecutor.run(`${runner} tsc --init`);
|
|
@@ -81,5 +89,10 @@ var NestiaSetupWizard;
|
|
|
81
89
|
});
|
|
82
90
|
}
|
|
83
91
|
NestiaSetupWizard.setup = setup;
|
|
92
|
+
const getTypeScriptVersion = () => __awaiter(this, void 0, void 0, function* () {
|
|
93
|
+
const content = yield fs_1.default.promises.readFile(`${__dirname}/../package.json`, "utf-8");
|
|
94
|
+
const json = JSON.parse(content);
|
|
95
|
+
return json.devDependencies.typescript;
|
|
96
|
+
});
|
|
84
97
|
})(NestiaSetupWizard || (exports.NestiaSetupWizard = NestiaSetupWizard = {}));
|
|
85
98
|
//# sourceMappingURL=NestiaSetupWizard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NestiaSetupWizard.js","sourceRoot":"","sources":["../src/NestiaSetupWizard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NestiaSetupWizard.js","sourceRoot":"","sources":["../src/NestiaSetupWizard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAoB;AAEpB,8DAA2D;AAC3D,gEAA6D;AAC7D,8DAA2D;AAC3D,sEAAmE;AAEnE,IAAiB,iBAAiB,CAsFjC;AAtFD,WAAiB,iBAAiB;IAChC,SAAsB,KAAK;;;YACzB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YAExD,iBAAiB;YACjB,MAAM,IAAI,GAAmB,MAAM,+BAAc,CAAC,KAAK,EAAE,CAAC;YAC1D,MAAM,IAAI,GAA8B,MAAM,+BAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEzE,iBAAiB;YACjB,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YACvE,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC3E,IAAI,CAAC,OAAO,CAAC;gBACX,GAAG,EAAE,IAAI,CAAC,OAAO,KAAK,KAAK;gBAC3B,MAAM,EAAE,aAAa;gBACrB,OAAO,EAAE,QAAQ;aAClB,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5E,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAEjE,+BAA+B;YAC/B,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YACnE,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO,CAAC;gBACX,GAAG,EAAE,IAAI;gBACT,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,MAAM,oBAAoB,EAAE;aACtC,CAAC,CAAC;YACH,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,CAAC,GAAG,EAAE;gBACrB,MAAM,MAAM,GAAW,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;gBACrE,iCAAe,CAAC,GAAG,CAAC,GAAG,MAAM,aAAa,CAAC,CAAC;gBAC5C,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,CAAC;YAC1C,CAAC,CAAC,EAAE,EAAC;YAEL,oBAAoB;YACpB,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;;gBACvB,0BAA0B;gBAC1B,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;gBACpB,IACE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,QAAQ;oBACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,EAClC,CAAC;oBACD,IACE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;wBACvD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;wBAElD,IAAI,CAAC,OAAO,CAAC,OAAO;4BAClB,qCAAqC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;yBAC5D,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;wBAC9D,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;yBAClE,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;wBACzD,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CACjD,kBAAkB,EAClB,iCAAiC,CAClC,CAAC;gBACN,CAAC;;oBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,iCAAiC,CAAC;gBAEhE,qBAAqB;gBACrB,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;oBACjD,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW;yBAChD,KAAK,CAAC,IAAI,CAAC;yBACX,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;yBACxB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;yBACvD,IAAI,CAAC,MAAM,CAAC,CAAC;oBAChB,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC;wBACvC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;gBACpC,CAAC;YACH,CAAC,CAAC,CAAC;YACH,iCAAe,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,cAAc,CAAC,CAAC;YAEnD,mBAAmB;YACnB,MAAM,uCAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC;KAAA;IA1EqB,uBAAK,QA0E1B,CAAA;IAED,MAAM,oBAAoB,GAAG,GAA0B,EAAE;QACvD,MAAM,OAAO,GAAW,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAChD,GAAG,SAAS,kBAAkB,EAC9B,OAAO,CACR,CAAC;QACF,MAAM,IAAI,GACR,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;IACzC,CAAC,CAAA,CAAC;AACJ,CAAC,EAtFgB,iBAAiB,iCAAjB,iBAAiB,QAsFjC"}
|
package/bin/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
declare const USAGE = "Wrong command has been detected. Use like below:\n\nnpx nestia [command] [options?]\n\n 1. npx nestia start <directory>\n 2. npx nestia template <directory>\n 3. npx nestia setup\n 4. npx nestia dependencies\n 5. npx nestia init\n 6. npx nestia sdk\n 7. npx nestia swagger\n
|
|
2
|
+
declare const USAGE = "Wrong command has been detected. Use like below:\n\nnpx nestia [command] [options?]\n\n 1. npx nestia start <directory>\n 2. npx nestia template <directory>\n 3. npx nestia setup\n 4. npx nestia dependencies\n 5. npx nestia init\n 6. npx nestia sdk\n 7. npx nestia swagger\n 9. npx nestia e2e\n 10. npx nestia all\n";
|
|
3
3
|
declare function halt(desc: string): never;
|
|
4
4
|
declare function main(): Promise<void>;
|
package/bin/index.js
CHANGED
|
@@ -43,7 +43,6 @@ npx nestia [command] [options?]
|
|
|
43
43
|
5. npx nestia init
|
|
44
44
|
6. npx nestia sdk
|
|
45
45
|
7. npx nestia swagger
|
|
46
|
-
8. npx nestia openai
|
|
47
46
|
9. npx nestia e2e
|
|
48
47
|
10. npx nestia all
|
|
49
48
|
`;
|
|
@@ -75,7 +74,6 @@ function main() {
|
|
|
75
74
|
else if (type === "dependencies" ||
|
|
76
75
|
type === "init" ||
|
|
77
76
|
type === "sdk" ||
|
|
78
|
-
type === "openai" ||
|
|
79
77
|
type === "swagger" ||
|
|
80
78
|
type === "e2e" ||
|
|
81
79
|
type === "all") {
|
package/bin/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,MAAM,KAAK,GAAG
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,MAAM,KAAK,GAAG;;;;;;;;;;;;;CAab,CAAC;AAEF,SAAS,IAAI,CAAC,IAAY;IACxB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAED,SAAe,IAAI;;QACjB,MAAM,IAAI,GAAuB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,IAAI,GAAa,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAE7C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,MAAM,CACJ,wDAAa,iBAAiB,GAAC,CAChC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;aAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,CACJ,wDAAa,kBAAkB,GAAC,CACjC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;aAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,wDAAa,cAAc,GAAC,CAAC;gBAC7B,wDAAa,UAAU,GAAC,CAAC;gBACzB,wDAAa,WAAW,GAAC,CAAC;YAC5B,CAAC;YAAC,WAAM,CAAC;gBACP,IAAI,CAAC,8DAA8D,CAAC,CAAC;YACvE,CAAC;YACD,MAAM,CAAC,wDAAa,qBAAqB,GAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QACxE,CAAC;aAAM,IACL,IAAI,KAAK,cAAc;YACvB,IAAI,KAAK,MAAM;YACf,IAAI,KAAK,KAAK;YACd,IAAI,KAAK,SAAS;YAClB,IAAI,KAAK,KAAK;YACd,IAAI,KAAK,KAAK,EACd,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;YACpD,CAAC;YAAC,WAAM,CAAC;gBACP,IAAI,CACF,oEAAoE,CACrE,CAAC;YACJ,CAAC;YACD,wDAAa,gCAAgC,GAAC,CAAC;QACjD,CAAC;;YAAM,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;CAAA;AACD,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC,CAAC,CAAC"}
|
|
@@ -16,6 +16,7 @@ exports.ArgumentParser = void 0;
|
|
|
16
16
|
const commander_1 = __importDefault(require("commander"));
|
|
17
17
|
const fs_1 = __importDefault(require("fs"));
|
|
18
18
|
const inquirer_1 = __importDefault(require("inquirer"));
|
|
19
|
+
const package_manager_detector_1 = require("package-manager-detector");
|
|
19
20
|
var ArgumentParser;
|
|
20
21
|
(function (ArgumentParser) {
|
|
21
22
|
function parse(pack) {
|
|
@@ -71,16 +72,17 @@ var ArgumentParser;
|
|
|
71
72
|
});
|
|
72
73
|
// DO CONSTRUCT
|
|
73
74
|
return action((options) => __awaiter(this, void 0, void 0, function* () {
|
|
74
|
-
var _a, _b, _c;
|
|
75
|
-
(_a = options.manager) !== null && _a !== void 0 ? _a : (options.manager = yield select("manager")("Package Manager")([
|
|
75
|
+
var _a, _b, _c, _d;
|
|
76
|
+
(_a = options.manager) !== null && _a !== void 0 ? _a : (options.manager = (_b = (yield detectManager())) !== null && _b !== void 0 ? _b : (yield select("manager")("Package Manager")([
|
|
76
77
|
"npm",
|
|
77
78
|
"pnpm",
|
|
78
79
|
"yarn (berry is not supported)",
|
|
79
|
-
|
|
80
|
+
"bun",
|
|
81
|
+
], (value) => value.split(" ")[0])));
|
|
80
82
|
pack.manager = options.manager;
|
|
81
|
-
(
|
|
83
|
+
(_c = options.project) !== null && _c !== void 0 ? _c : (options.project = yield configure());
|
|
82
84
|
options.runtime =
|
|
83
|
-
((
|
|
85
|
+
((_d = options.runtime) !== null && _d !== void 0 ? _d : (yield select("runtime")("Transform Runtime Swagger")([
|
|
84
86
|
"true",
|
|
85
87
|
"false",
|
|
86
88
|
]))) !== "false";
|
|
@@ -91,5 +93,12 @@ var ArgumentParser;
|
|
|
91
93
|
});
|
|
92
94
|
}
|
|
93
95
|
ArgumentParser.parse = parse;
|
|
96
|
+
const detectManager = () => __awaiter(this, void 0, void 0, function* () {
|
|
97
|
+
var _a;
|
|
98
|
+
const result = yield (0, package_manager_detector_1.detect)({ cwd: process.cwd() });
|
|
99
|
+
if ((result === null || result === void 0 ? void 0 : result.name) === "npm")
|
|
100
|
+
return null; // NPM case is still selectable
|
|
101
|
+
return (_a = result === null || result === void 0 ? void 0 : result.name) !== null && _a !== void 0 ? _a : null;
|
|
102
|
+
});
|
|
94
103
|
})(ArgumentParser || (exports.ArgumentParser = ArgumentParser = {}));
|
|
95
104
|
//# sourceMappingURL=ArgumentParser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArgumentParser.js","sourceRoot":"","sources":["../../src/internal/ArgumentParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,4CAAoB;AACpB,wDAAgC;
|
|
1
|
+
{"version":3,"file":"ArgumentParser.js","sourceRoot":"","sources":["../../src/internal/ArgumentParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
export declare class PackageManager {
|
|
2
2
|
readonly directory: string;
|
|
3
3
|
data: Package.Data;
|
|
4
|
-
manager:
|
|
4
|
+
manager: Manager;
|
|
5
5
|
get file(): string;
|
|
6
6
|
static mount(): Promise<PackageManager>;
|
|
7
7
|
save(modifier: (data: Package.Data) => void): Promise<void>;
|
|
8
8
|
install(props: {
|
|
9
9
|
dev: boolean;
|
|
10
10
|
modulo: string;
|
|
11
|
-
version?: `latest` | `next` |
|
|
11
|
+
version?: `latest` | `next` | `^${number}.${number}.${number}` | (string & {});
|
|
12
12
|
force?: boolean;
|
|
13
13
|
}): boolean;
|
|
14
14
|
private constructor();
|
|
@@ -21,3 +21,5 @@ export declare namespace Package {
|
|
|
21
21
|
devDependencies?: Record<string, string>;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
+
type Manager = "npm" | "pnpm" | "yarn" | "bun";
|
|
25
|
+
export {};
|
|
@@ -38,10 +38,10 @@ class PackageManager {
|
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
40
|
install(props) {
|
|
41
|
-
const
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
CommandExecutor_1.CommandExecutor.run(`${this.manager} ${
|
|
41
|
+
const cmd = installCmdTable[this.manager];
|
|
42
|
+
const option = props.dev ? devOptionTable[this.manager] : "";
|
|
43
|
+
const middle = `${cmd} ${option}`;
|
|
44
|
+
CommandExecutor_1.CommandExecutor.run(`${this.manager} ${middle} ${props.modulo}${props.version ? `@${props.version}` : ""}`);
|
|
45
45
|
return true;
|
|
46
46
|
}
|
|
47
47
|
constructor(directory, data) {
|
|
@@ -57,4 +57,16 @@ class PackageManager {
|
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
exports.PackageManager = PackageManager;
|
|
60
|
+
const installCmdTable = {
|
|
61
|
+
npm: "install",
|
|
62
|
+
pnpm: "add",
|
|
63
|
+
yarn: "add",
|
|
64
|
+
bun: "add",
|
|
65
|
+
};
|
|
66
|
+
const devOptionTable = {
|
|
67
|
+
npm: "--save-dev",
|
|
68
|
+
pnpm: "--save-dev",
|
|
69
|
+
yarn: "--dev",
|
|
70
|
+
bun: "--dev",
|
|
71
|
+
};
|
|
60
72
|
//# sourceMappingURL=PackageManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PackageManager.js","sourceRoot":"","sources":["../../src/internal/PackageManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAExB,uDAAoD;AACpD,mDAAgD;AAEhD,MAAa,cAAc;IAEzB,IAAW,IAAI;QACb,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAO,KAAK;;YACvB,MAAM,QAAQ,GAAkB,MAAM,6BAAa,CAAC,SAAS,CAC3D,cAAc,CACf,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACjB,IAAI,QAAQ,KAAK,IAAI;gBACnB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;YAExD,OAAO,IAAI,cAAc,CACvB,QAAQ,EACR,MAAM,IAAI,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CACrD,CAAC;QACJ,CAAC;KAAA;IAEY,IAAI,CAAC,QAAsC;;YACtD,MAAM,OAAO,GAAW,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpB,OAAO,YAAE,CAAC,QAAQ,CAAC,SAAS,CAC1B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAClC,MAAM,CACP,CAAC;QACJ,CAAC;KAAA;IAEM,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"PackageManager.js","sourceRoot":"","sources":["../../src/internal/PackageManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAExB,uDAAoD;AACpD,mDAAgD;AAEhD,MAAa,cAAc;IAEzB,IAAW,IAAI;QACb,OAAO,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAO,KAAK;;YACvB,MAAM,QAAQ,GAAkB,MAAM,6BAAa,CAAC,SAAS,CAC3D,cAAc,CACf,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACjB,IAAI,QAAQ,KAAK,IAAI;gBACnB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;YAExD,OAAO,IAAI,cAAc,CACvB,QAAQ,EACR,MAAM,IAAI,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CACrD,CAAC;QACJ,CAAC;KAAA;IAEY,IAAI,CAAC,QAAsC;;YACtD,MAAM,OAAO,GAAW,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpB,OAAO,YAAE,CAAC,QAAQ,CAAC,SAAS,CAC1B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAClC,MAAM,CACP,CAAC;QACJ,CAAC;KAAA;IAEM,OAAO,CAAC,KASd;QACC,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,MAAM,MAAM,GAAW,GAAG,GAAG,IAAI,MAAM,EAAW,CAAC;QACnD,iCAAe,CAAC,GAAG,CACjB,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,GACvC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EACxC,EAAE,CACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YACkB,SAAiB,EAC1B,IAAkB;QADT,cAAS,GAAT,SAAS,CAAQ;QAC1B,SAAI,GAAJ,IAAI,CAAc;QArDpB,YAAO,GAAY,KAAK,CAAC;IAsD7B,CAAC;IAEI,MAAM,CAAO,IAAI,CAAC,IAAY;;YACpC,MAAM,OAAO,GAAW,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;KAAA;CACF;AA7DD,wCA6DC;AAWD,MAAM,eAAe,GAAG;IACtB,GAAG,EAAE,SAAS;IACd,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,KAAK;IACX,GAAG,EAAE,KAAK;CACgC,CAAC;AAE7C,MAAM,cAAc,GAAG;IACrB,GAAG,EAAE,YAAY;IACjB,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,OAAO;IACb,GAAG,EAAE,OAAO;CAC8B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nestia",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.3-dev.20240910",
|
|
4
4
|
"description": "Nestia CLI tool",
|
|
5
5
|
"main": "bin/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -33,7 +33,8 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"commander": "^10.0.0",
|
|
35
35
|
"comment-json": "^4.2.3",
|
|
36
|
-
"inquirer": "^8.2.5"
|
|
36
|
+
"inquirer": "^8.2.5",
|
|
37
|
+
"package-manager-detector": "^0.2.0"
|
|
37
38
|
},
|
|
38
39
|
"devDependencies": {
|
|
39
40
|
"@nestia/core": "^3.8.0",
|
|
@@ -41,7 +42,7 @@
|
|
|
41
42
|
"@types/inquirer": "^9.0.3",
|
|
42
43
|
"@types/node": "^18.11.16",
|
|
43
44
|
"rimraf": "^3.0.2",
|
|
44
|
-
"typescript": "^5.
|
|
45
|
+
"typescript": "^5.6.2"
|
|
45
46
|
},
|
|
46
47
|
"files": [
|
|
47
48
|
"bin",
|
package/src/NestiaSetupWizard.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import fs from "fs";
|
|
2
|
+
|
|
1
3
|
import { ArgumentParser } from "./internal/ArgumentParser";
|
|
2
4
|
import { CommandExecutor } from "./internal/CommandExecutor";
|
|
3
5
|
import { PackageManager } from "./internal/PackageManager";
|
|
@@ -29,7 +31,11 @@ export namespace NestiaSetupWizard {
|
|
|
29
31
|
// INSTALL TYPESCRIPT COMPILERS
|
|
30
32
|
pack.install({ dev: true, modulo: "ts-patch", version: "latest" });
|
|
31
33
|
pack.install({ dev: true, modulo: "ts-node", version: "latest" });
|
|
32
|
-
pack.install({
|
|
34
|
+
pack.install({
|
|
35
|
+
dev: true,
|
|
36
|
+
modulo: "typescript",
|
|
37
|
+
version: await getTypeScriptVersion(),
|
|
38
|
+
});
|
|
33
39
|
args.project ??= (() => {
|
|
34
40
|
const runner: string = pack.manager === "npm" ? "npx" : pack.manager;
|
|
35
41
|
CommandExecutor.run(`${runner} tsc --init`);
|
|
@@ -75,4 +81,14 @@ export namespace NestiaSetupWizard {
|
|
|
75
81
|
// CONFIGURE PLUGIN
|
|
76
82
|
await PluginConfigurator.configure(args);
|
|
77
83
|
}
|
|
84
|
+
|
|
85
|
+
const getTypeScriptVersion = async (): Promise<string> => {
|
|
86
|
+
const content: string = await fs.promises.readFile(
|
|
87
|
+
`${__dirname}/../package.json`,
|
|
88
|
+
"utf-8",
|
|
89
|
+
);
|
|
90
|
+
const json: { devDependencies: { typescript: string } } =
|
|
91
|
+
JSON.parse(content);
|
|
92
|
+
return json.devDependencies.typescript;
|
|
93
|
+
};
|
|
78
94
|
}
|
package/src/index.ts
CHANGED
|
@@ -10,7 +10,6 @@ npx nestia [command] [options?]
|
|
|
10
10
|
5. npx nestia init
|
|
11
11
|
6. npx nestia sdk
|
|
12
12
|
7. npx nestia swagger
|
|
13
|
-
8. npx nestia openai
|
|
14
13
|
9. npx nestia e2e
|
|
15
14
|
10. npx nestia all
|
|
16
15
|
`;
|
|
@@ -45,7 +44,6 @@ async function main(): Promise<void> {
|
|
|
45
44
|
type === "dependencies" ||
|
|
46
45
|
type === "init" ||
|
|
47
46
|
type === "sdk" ||
|
|
48
|
-
type === "openai" ||
|
|
49
47
|
type === "swagger" ||
|
|
50
48
|
type === "e2e" ||
|
|
51
49
|
type === "all"
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import commander from "commander";
|
|
2
2
|
import fs from "fs";
|
|
3
3
|
import inquirer from "inquirer";
|
|
4
|
+
import { DetectResult, detect } from "package-manager-detector";
|
|
4
5
|
|
|
5
6
|
import { PackageManager } from "./PackageManager";
|
|
6
7
|
|
|
7
8
|
export namespace ArgumentParser {
|
|
8
9
|
export interface IArguments {
|
|
9
|
-
manager: "npm" | "pnpm" | "yarn";
|
|
10
|
+
manager: "npm" | "pnpm" | "yarn" | "bun";
|
|
10
11
|
project: string | null;
|
|
11
12
|
runtime: boolean;
|
|
12
13
|
}
|
|
@@ -85,14 +86,17 @@ export namespace ArgumentParser {
|
|
|
85
86
|
|
|
86
87
|
// DO CONSTRUCT
|
|
87
88
|
return action(async (options) => {
|
|
88
|
-
options.manager ??=
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
89
|
+
options.manager ??=
|
|
90
|
+
(await detectManager()) ??
|
|
91
|
+
(await select("manager")("Package Manager")(
|
|
92
|
+
[
|
|
93
|
+
"npm" as const,
|
|
94
|
+
"pnpm" as const,
|
|
95
|
+
"yarn (berry is not supported)" as "yarn",
|
|
96
|
+
"bun" as const,
|
|
97
|
+
],
|
|
98
|
+
(value) => value.split(" ")[0] as "yarn",
|
|
99
|
+
));
|
|
96
100
|
pack.manager = options.manager;
|
|
97
101
|
options.project ??= await configure();
|
|
98
102
|
options.runtime =
|
|
@@ -106,4 +110,12 @@ export namespace ArgumentParser {
|
|
|
106
110
|
return options as IArguments;
|
|
107
111
|
});
|
|
108
112
|
}
|
|
113
|
+
|
|
114
|
+
const detectManager = async (): Promise<
|
|
115
|
+
"npm" | "pnpm" | "yarn" | "bun" | null
|
|
116
|
+
> => {
|
|
117
|
+
const result: DetectResult | null = await detect({ cwd: process.cwd() });
|
|
118
|
+
if (result?.name === "npm") return null; // NPM case is still selectable
|
|
119
|
+
return result?.name ?? null;
|
|
120
|
+
};
|
|
109
121
|
}
|
|
@@ -5,7 +5,7 @@ import { CommandExecutor } from "./CommandExecutor";
|
|
|
5
5
|
import { FileRetriever } from "./FileRetriever";
|
|
6
6
|
|
|
7
7
|
export class PackageManager {
|
|
8
|
-
public manager:
|
|
8
|
+
public manager: Manager = "npm";
|
|
9
9
|
public get file(): string {
|
|
10
10
|
return path.join(this.directory, "package.json");
|
|
11
11
|
}
|
|
@@ -38,17 +38,20 @@ export class PackageManager {
|
|
|
38
38
|
public install(props: {
|
|
39
39
|
dev: boolean;
|
|
40
40
|
modulo: string;
|
|
41
|
-
version?:
|
|
41
|
+
version?:
|
|
42
|
+
| `latest`
|
|
43
|
+
| `next`
|
|
44
|
+
| `^${number}.${number}.${number}`
|
|
45
|
+
| (string & {});
|
|
42
46
|
force?: boolean;
|
|
43
47
|
}): boolean {
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
: `install ${props.dev ? "--save-dev" : "--save"}`;
|
|
48
|
+
const cmd = installCmdTable[this.manager];
|
|
49
|
+
const option = props.dev ? devOptionTable[this.manager] : "";
|
|
50
|
+
const middle: string = `${cmd} ${option}` as const;
|
|
48
51
|
CommandExecutor.run(
|
|
49
|
-
`${this.manager} ${
|
|
50
|
-
props.
|
|
51
|
-
}
|
|
52
|
+
`${this.manager} ${middle} ${props.modulo}${
|
|
53
|
+
props.version ? `@${props.version}` : ""
|
|
54
|
+
}`,
|
|
52
55
|
);
|
|
53
56
|
return true;
|
|
54
57
|
}
|
|
@@ -70,3 +73,19 @@ export namespace Package {
|
|
|
70
73
|
devDependencies?: Record<string, string>;
|
|
71
74
|
}
|
|
72
75
|
}
|
|
76
|
+
|
|
77
|
+
type Manager = "npm" | "pnpm" | "yarn" | "bun";
|
|
78
|
+
|
|
79
|
+
const installCmdTable = {
|
|
80
|
+
npm: "install",
|
|
81
|
+
pnpm: "add",
|
|
82
|
+
yarn: "add",
|
|
83
|
+
bun: "add",
|
|
84
|
+
} as const satisfies Record<Manager, string>;
|
|
85
|
+
|
|
86
|
+
const devOptionTable = {
|
|
87
|
+
npm: "--save-dev",
|
|
88
|
+
pnpm: "--save-dev",
|
|
89
|
+
yarn: "--dev",
|
|
90
|
+
bun: "--dev",
|
|
91
|
+
} as const satisfies Record<Manager, string>;
|