@nanoforge-dev/cli 1.5.4-beta.f618d37 → 1.6.1-alpha.upgrade-schematics.0

package/dist/command.loader.js

@@ -12,7 +12,7 @@ import { Expose, Type, plainToInstance } from "class-transformer";
 import { IsBoolean, IsEnum, IsNotEmpty, IsObject, IsOptional, IsPort, IsString, Matches, ValidateNested, validate } from "class-validator";
 import { existsSync, readFileSync } from "node:fs";
 import open from "open";
-import { read, readUser, write, writeUser } from "rc9";
+import { read, readUserConfig, write, writeUserConfig } from "rc9";
 import dotenv from "dotenv";
 //#region src/lib/ui/emojis.ts
 const Emojis = {
@@ -855,7 +855,7 @@ const runSafe = async (fn, fallback) => {
 	}
 };
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -964,12 +964,21 @@ __decorate([
 	Type(() => DirsConfig),
 	ValidateNested()
 ], ServerConfig.prototype, "dirs", void 0);
+var SslConfig = class {
+	enable;
+	cert;
+	key;
+};
+__decorate([Expose(), IsBoolean()], SslConfig.prototype, "enable", void 0);
+__decorate([Expose(), IsString()], SslConfig.prototype, "cert", void 0);
+__decorate([Expose(), IsString()], SslConfig.prototype, "key", void 0);
 var Config = class {
 	name;
 	language;
 	initFunctions;
 	client;
 	server;
+	ssl;
 };
 __decorate([
 	Expose(),
@@ -988,6 +997,11 @@ __decorate([
 	Type(() => ServerConfig),
 	ValidateNested()
 ], Config.prototype, "server", void 0);
+__decorate([
+	Expose(),
+	Type(() => SslConfig),
+	ValidateNested()
+], Config.prototype, "ssl", void 0);
 //#endregion
 //#region src/lib/constants.ts
 const CONFIG_FILE_NAME = "nanoforge.config.json";
@@ -1014,6 +1028,11 @@ const CONFIG_DEFAULTS = {
 	name: "nanoforge-app",
 	language: "ts",
 	initFunctions: true,
+	ssl: {
+		enable: false,
+		cert: "",
+		key: ""
+	},
 	client: {
 		enable: true,
 		port: "3000",
@@ -1200,10 +1219,14 @@ var AbstractCollection = class {
 			onFail
 		});
 	}
-	buildCommandLine(name, options, flags = []) {
+	buildCommandLine(name, options, flags = [
+		"--no-dry-run",
+		"--allow-private",
+		"--no-debug"
+	]) {
 		return [
-			`${this.collection}:${name}`,
 			...flags,
+			`'${getModulePath(this.collection + "/collection.json")}:${name}'`,
 			...this.serializeOptions(options)
 		];
 	}
@@ -1407,9 +1430,11 @@ var EditorAction = class extends AbstractAction {
 	async handle(args, options) {
 		const directory = getDirectoryInput(options);
 		const path = getPathInput(args);
-		const open = getEditorOpenInput(options, !!path);
+		const shouldOpen = getEditorOpenInput(options, !!path);
+		const url = `http://localhost:3000/load-project${path ? `?projectPath=${encodeURIComponent(path)}` : ""}`;
+		console.log(`\n🔗 Editor running! Open it in your browser: \x1b[36m${url}\x1b[0m\n`);
 		this.startEditor(directory);
-		if (open) await this.openEditor(path);
+		if (shouldOpen) await this.openBrowser(url);
 		return { keepAlive: true };
 	}
 	async startEditor(directory) {
@@ -1418,8 +1443,8 @@ var EditorAction = class extends AbstractAction {
 			await PackageManagerFactory.create("local_bun").run("Editor", directory, editorPath, [], {}, [], true);
 		});
 	}
-	async openEditor(path) {
-		await open(`http://localhost:3000/load-project${path ? `?projectPath=${encodeURIComponent(path)}` : ""}`);
+	async openBrowser(url) {
+		await open(url);
 	}
 };
 //#endregion
@@ -1479,9 +1504,11 @@ const GLOBAL_CONFIG_DEFAULTS = {};
 //#region src/lib/global-config/global-config-handler.ts
 var GlobalConfigHandler = class {
 	static read(dir) {
-		const localConfig = this._readConfig(read, false, dir);
-		if (localConfig) return localConfig;
-		return this._readConfig(readUser, true);
+		const dirConfig = this._readConfig(read, false, dir);
+		if (dirConfig) return dirConfig;
+		const cwdConfig = this._readConfig(read, false, process.cwd());
+		if (cwdConfig) return cwdConfig;
+		return this._readConfig(readUserConfig, true);
 	}
 	static write(config, local = false, dir) {
 		const options = {
@@ -1489,7 +1516,7 @@ var GlobalConfigHandler = class {
 			dir
 		};
 		if (local) write(config, options);
-		else writeUser(config, options);
+		else writeUserConfig(config, options);
 	}
 	static _readConfig(func, force, dir) {
 		const res = func({
@@ -2068,7 +2095,7 @@ var StartAction = class extends AbstractAction {
 		const serverDir = getStringInputWithDefault(options, "serverDir", config.server.outDir);
 		const watch = getWatchInput(options);
 		const port = getStringInputWithDefault(options, "port", config.client.port);
-		const ssl = this.resolveSSL(options);
+		const ssl = this.resolveSSL(options, config);
 		const tasks = this.buildStartTasks(config, directory, {
 			clientDir,
 			serverDir,
@@ -2079,12 +2106,14 @@ var StartAction = class extends AbstractAction {
 		await Promise.all(tasks);
 		return { keepAlive: true };
 	}
-	resolveSSL(options) {
-		const cert = getStringInput(options, "cert");
-		const key = getStringInput(options, "key");
-		if (!cert && !key) return void 0;
-		if (!cert) throw new CLIError("No cert entered for SSL. Please enter a cert with --cert.");
-		if (!key) throw new CLIError("No key entered for SSL. Please enter a key with --key.");
+	resolveSSL(options, config) {
+		const cliCert = getStringInput(options, "cert");
+		const cliKey = getStringInput(options, "key");
+		if (!Boolean(cliCert || cliKey || config.ssl?.enable)) return void 0;
+		const cert = cliCert ? cliCert : config.ssl?.cert;
+		const key = cliKey ? cliKey : config.ssl?.key;
+		if (!cert) throw new CLIError("No certificate found for SSL.", "Please provide a certificate path with --cert or configure 'ssl.cert' in your nanoforge.config.json.");
+		if (!key) throw new CLIError("No key found for SSL.", "Please provide a key path with --key or configure 'ssl.key' in your nanoforge.config.json.");
 		return {
 			cert,
 			key