@sapphire/cli 1.5.0-next.2945f09.0 → 1.5.0

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+# [1.5.0](https://github.com/sapphiredev/cli/compare/v1.4.0...v1.5.0) - (2023-04-10)
+
+## 🐛 Bug Fixes
+
+- **deps:** Update dependency execa to v7 (#203) ([dd78817](https://github.com/sapphiredev/cli/commit/dd78817e287246ae17c5e0ca947a04adf49fb86c))
+
+## 🚀 Features
+
+- **templates:** Add route component (#215) ([2945f09](https://github.com/sapphiredev/cli/commit/2945f09a663421362ea3f34f28900fd193acf5d7))
+
 # [1.4.0](https://github.com/sapphiredev/cli/compare/v1.3.1...v1.4.0) - (2023-01-29)
 
 ## 🏠 Refactor

package/dist/cli.js

@@ -11,26 +11,26 @@ const sapphire = new Command();
 const packageFile = new URL('../package.json', import.meta.url);
 const packageJson = JSON.parse(await readFile(packageFile, 'utf-8'));
 sapphire //
-    .name('sapphire')
-    .version(packageJson.version);
+	.name('sapphire')
+	.version(packageJson.version);
 sapphire
-    .command('new')
-    .description('creates a new Sapphire project')
-    .alias('n')
-    .argument('[name]', 'project name')
-    .option('-v, --verbose')
-    .action(newCmd);
+	.command('new')
+	.description('creates a new Sapphire project')
+	.alias('n')
+	.argument('[name]', 'project name')
+	.option('-v, --verbose')
+	.action(newCmd);
 sapphire
-    .command('generate')
-    .description('generates a component/piece')
-    .alias('g')
-    .argument('<component>', 'component/piece name')
-    .argument('<name>', 'file name')
-    .action(generateCmd);
+	.command('generate')
+	.description('generates a component/piece')
+	.alias('g')
+	.argument('<component>', 'component/piece name')
+	.argument('<name>', 'file name')
+	.action(generateCmd);
 sapphire //
-    .command('init')
-    .description('creates a config file on an existing Sapphire project')
-    .alias('i')
-    .action(initCmd);
+	.command('init')
+	.description('creates a config file on an existing Sapphire project')
+	.alias('i')
+	.action(initCmd);
 sapphire.parse(process.argv);
-//# sourceMappingURL=cli.js.map
+//# sourceMappingURL=cli.js.map

package/dist/commands/generate.js

@@ -10,53 +10,52 @@ import { readFile } from 'node:fs/promises';
 import { basename, join } from 'node:path';
 import { setTimeout as sleep } from 'node:timers/promises';
 async function createComponent(component, name, config, configLoc) {
-    const { projectLanguage } = config;
-    if (!projectLanguage) {
-        throw new Error("There is no 'projectLanguage' field in .sapphirerc.json");
-    }
-    const template = `${component.toLowerCase()}.${projectLanguage}.sapphire`;
-    const corePath = `${componentsFolder}${template}`;
-    const userPath = config.customFileTemplates.enabled ? join(configLoc, config.customFileTemplates.location, template) : null;
-    const target = join(configLoc, config.locations.base, '%L%', `${name}.${projectLanguage}`);
-    const params = { name: basename(name) };
-    if (userPath && (await fileExists(userPath))) {
-        return CreateFileFromTemplate(userPath, target, config, params, true, true);
-    }
-    else if (await fileExists(corePath)) {
-        return CreateFileFromTemplate(`components/${template}`, target, config, params, false, true);
-    }
-    throw new Error("Can't find the template.");
+	const { projectLanguage } = config;
+	if (!projectLanguage) {
+		throw new Error("There is no 'projectLanguage' field in .sapphirerc.json");
+	}
+	const template = `${component.toLowerCase()}.${projectLanguage}.sapphire`;
+	const corePath = `${componentsFolder}${template}`;
+	const userPath = config.customFileTemplates.enabled ? join(configLoc, config.customFileTemplates.location, template) : null;
+	const target = join(configLoc, config.locations.base, '%L%', `${name}.${projectLanguage}`);
+	const params = { name: basename(name) };
+	if (userPath && (await fileExists(userPath))) {
+		return CreateFileFromTemplate(userPath, target, config, params, true, true);
+	} else if (await fileExists(corePath)) {
+		return CreateFileFromTemplate(`components/${template}`, target, config, params, false, true);
+	}
+	throw new Error("Can't find the template.");
 }
 async function fetchConfig() {
-    const a = await Promise.race([findUp('.sapphirerc.json', { cwd: '.' }), sleep(5000)]);
-    if (a) {
-        return a;
-    }
-    return Promise.race([findUp('.sapphirerc.yml', { cwd: '.' }), sleep(5000)]);
+	const a = await Promise.race([findUp('.sapphirerc.json', { cwd: '.' }), sleep(5000)]);
+	if (a) {
+		return a;
+	}
+	return Promise.race([findUp('.sapphirerc.yml', { cwd: '.' }), sleep(5000)]);
 }
 export default async (component, name) => {
-    const spinner = new Spinner(`Creating a ${component.toLowerCase()}`).start();
-    const fail = (error, additionalExecution) => {
-        spinner.error({ text: error });
-        additionalExecution?.();
-        process.exit(1);
-    };
-    const configLoc = await fetchConfig();
-    if (!configLoc) {
-        return fail("Can't find the Sapphire CLI config.");
-    }
-    const config = configLoc.endsWith('json') ? JSON.parse(await readFile(configLoc, 'utf8')) : load(await readFile(configLoc, 'utf8'));
-    if (!config) {
-        return fail("Can't parse the Sapphire CLI config.");
-    }
-    const result = await Result.fromAsync(() => createComponent(component, name, config, configLoc.replace(/.sapphirerc.(json|yml)/g, '')));
-    return result.match({
-        ok: () => {
-            spinner.success();
-            console.log(blueBright('Done!'));
-            process.exit(0);
-        },
-        err: (error) => fail(error.message, () => console.log(red(error.message)))
-    });
+	const spinner = new Spinner(`Creating a ${component.toLowerCase()}`).start();
+	const fail = (error, additionalExecution) => {
+		spinner.error({ text: error });
+		additionalExecution?.();
+		process.exit(1);
+	};
+	const configLoc = await fetchConfig();
+	if (!configLoc) {
+		return fail("Can't find the Sapphire CLI config.");
+	}
+	const config = configLoc.endsWith('json') ? JSON.parse(await readFile(configLoc, 'utf8')) : load(await readFile(configLoc, 'utf8'));
+	if (!config) {
+		return fail("Can't parse the Sapphire CLI config.");
+	}
+	const result = await Result.fromAsync(() => createComponent(component, name, config, configLoc.replace(/.sapphirerc.(json|yml)/g, '')));
+	return result.match({
+		ok: () => {
+			spinner.success();
+			console.log(blueBright('Done!'));
+			process.exit(0);
+		},
+		err: (error) => fail(error.message, () => console.log(red(error.message)))
+	});
 };
-//# sourceMappingURL=generate.js.map
+//# sourceMappingURL=generate.js.map

package/dist/commands/init.js

@@ -5,30 +5,29 @@ import { dump } from 'js-yaml';
 import { writeFile } from 'node:fs/promises';
 import prompts from 'prompts';
 export default async () => {
-    const packageJson = await findUp('package.json');
-    if (!packageJson) {
-        console.log(red("Can't find package.json"));
-        process.exit(1);
-    }
-    const response = await prompts(PromptInit);
-    if (!response.preconditions)
-        process.exit(1);
-    const config = {
-        projectLanguage: response.projectLanguage,
-        locations: {
-            base: response.base,
-            arguments: response.arguments,
-            commands: response.commands,
-            listeners: response.listeners,
-            preconditions: response.preconditions
-        },
-        customFileTemplates: {
-            enabled: response.cftEnabled,
-            location: response.cftLocation ?? ''
-        }
-    };
-    const file = response.configFormat === 'json' ? JSON.stringify(config, null, 2) : dump(config);
-    await writeFile(packageJson.replace('package.json', `.sapphirerc.${response.configFormat}`), file);
-    process.exit(0);
+	const packageJson = await findUp('package.json');
+	if (!packageJson) {
+		console.log(red("Can't find package.json"));
+		process.exit(1);
+	}
+	const response = await prompts(PromptInit);
+	if (!response.preconditions) process.exit(1);
+	const config = {
+		projectLanguage: response.projectLanguage,
+		locations: {
+			base: response.base,
+			arguments: response.arguments,
+			commands: response.commands,
+			listeners: response.listeners,
+			preconditions: response.preconditions
+		},
+		customFileTemplates: {
+			enabled: response.cftEnabled,
+			location: response.cftLocation ?? ''
+		}
+	};
+	const file = response.configFormat === 'json' ? JSON.stringify(config, null, 2) : dump(config);
+	await writeFile(packageJson.replace('package.json', `.sapphirerc.${response.configFormat}`), file);
+	process.exit(0);
 };
-//# sourceMappingURL=init.js.map
+//# sourceMappingURL=init.js.map

package/dist/commands/new.js

@@ -11,124 +11,127 @@ import { cp, readFile, rm, writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import prompts from 'prompts';
 async function editPackageJson(location, name) {
-    const pjLocation = `./${location}/package.json`;
-    const output = JSON.parse(await readFile(pjLocation, 'utf8'));
-    if (!output)
-        throw new Error("Can't read file.");
-    output.name = name;
-    const result = await Result.fromAsync(() => writeFile(pjLocation, JSON.stringify(output, null, 2)));
-    return result.isOk();
+	const pjLocation = `./${location}/package.json`;
+	const output = JSON.parse(await readFile(pjLocation, 'utf8'));
+	if (!output) throw new Error("Can't read file.");
+	output.name = name;
+	const result = await Result.fromAsync(() => writeFile(pjLocation, JSON.stringify(output, null, 2)));
+	return result.isOk();
 }
 async function installDeps(location, pm, verbose) {
-    const value = await execa(pm.toLowerCase(), ['install'], {
-        stdio: verbose ? 'inherit' : undefined,
-        cwd: `./${location}/`
-    });
-    if (value.exitCode !== 0) {
-        throw new Error('An unknown error occurred while installing the dependencies. Try running Sapphire CLI with "--verbose" flag.');
-    }
-    const oppositeLockfiles = {
-        npm: ['yarn.lock', 'pnpm-lock.yaml'],
-        yarn: ['package-lock.json', 'pnpm-lock.yaml'],
-        pnpm: ['package-lock.json', 'yarn.lock']
-    };
-    const lockfiles = pm === 'npm' ? oppositeLockfiles.npm : pm === 'Yarn' ? oppositeLockfiles.yarn : oppositeLockfiles.pnpm;
-    for (const lockfile of lockfiles) {
-        if (await fileExists(lockfile)) {
-            await rm(lockfile);
-        }
-    }
-    return true;
+	const value = await execa(pm.toLowerCase(), ['install'], {
+		stdio: verbose ? 'inherit' : undefined,
+		cwd: `./${location}/`
+	});
+	if (value.exitCode !== 0) {
+		throw new Error('An unknown error occurred while installing the dependencies. Try running Sapphire CLI with "--verbose" flag.');
+	}
+	const oppositeLockfiles = {
+		npm: ['yarn.lock', 'pnpm-lock.yaml'],
+		yarn: ['package-lock.json', 'pnpm-lock.yaml'],
+		pnpm: ['package-lock.json', 'yarn.lock']
+	};
+	const lockfiles = pm === 'npm' ? oppositeLockfiles.npm : pm === 'Yarn' ? oppositeLockfiles.yarn : oppositeLockfiles.pnpm;
+	for (const lockfile of lockfiles) {
+		if (await fileExists(lockfile)) {
+			await rm(lockfile);
+		}
+	}
+	return true;
 }
 async function configureYarnRc(location, name, value) {
-    await execa('yarn', ['config', 'set', name, value], { cwd: `./${location}/` });
-    return true;
+	await execa('yarn', ['config', 'set', name, value], { cwd: `./${location}/` });
+	return true;
 }
 async function installYarnV3(location, verbose) {
-    const value = await execa('yarn', ['set', 'version', 'berry'], {
-        stdio: verbose ? 'inherit' : undefined,
-        cwd: `./${location}/`
-    });
-    if (value.exitCode !== 0) {
-        throw new Error('An unknown error occurred while installing Yarn v3. Try running Sapphire CLI with "--verbose" flag.');
-    }
-    await Promise.all([
-        //
-        configureYarnRc(location, 'enableGlobalCache', 'true'),
-        configureYarnRc(location, 'nodeLinker', 'node-modules')
-    ]);
-    return true;
+	const value = await execa('yarn', ['set', 'version', 'berry'], {
+		stdio: verbose ? 'inherit' : undefined,
+		cwd: `./${location}/`
+	});
+	if (value.exitCode !== 0) {
+		throw new Error('An unknown error occurred while installing Yarn v3. Try running Sapphire CLI with "--verbose" flag.');
+	}
+	await Promise.all([
+		//
+		configureYarnRc(location, 'enableGlobalCache', 'true'),
+		configureYarnRc(location, 'nodeLinker', 'node-modules')
+	]);
+	return true;
 }
 async function installYarnTypescriptPlugin(location) {
-    await execa('yarn', ['plugin', 'import', 'typescript'], { cwd: `./${location}/` });
-    return true;
+	await execa('yarn', ['plugin', 'import', 'typescript'], { cwd: `./${location}/` });
+	return true;
 }
 async function initializeGitRepo(location) {
-    await execa('git', ['init'], { cwd: `./${location}/` });
-    return true;
+	await execa('git', ['init'], { cwd: `./${location}/` });
+	return true;
 }
 async function runJob(job, name) {
-    const spinner = new Spinner(name).start();
-    const result = await Result.fromAsync(() => job());
-    return result.match({
-        ok: () => {
-            spinner.success();
-            return true;
-        },
-        err: (error) => {
-            spinner.error({ text: red(error.message) });
-            console.error(red(error.message));
-            throw error;
-        }
-    });
+	const spinner = new Spinner(name).start();
+	const result = await Result.fromAsync(() => job());
+	return result.match({
+		ok: () => {
+			spinner.success();
+			return true;
+		},
+		err: (error) => {
+			spinner.error({ text: red(error.message) });
+			console.error(red(error.message));
+			throw error;
+		}
+	});
 }
 async function cloneRepo(location, verbose) {
-    const value = await execa('git', ['clone', repoUrl, `${location}/ghr`], { stdio: verbose ? 'inherit' : undefined });
-    if (value.exitCode !== 0) {
-        throw new Error('An unknown error occurred while cloning the repository. Try running Sapphire CLI with "--verbose" flag.');
-    }
-    return true;
+	const value = await execa('git', ['clone', repoUrl, `${location}/ghr`], { stdio: verbose ? 'inherit' : undefined });
+	if (value.exitCode !== 0) {
+		throw new Error('An unknown error occurred while cloning the repository. Try running Sapphire CLI with "--verbose" flag.');
+	}
+	return true;
 }
 export default async (name, flags) => {
-    const response = await prompts(PromptNew(name, await CommandExists('yarn'), await CommandExists('pnpm')));
-    if (!response.projectName || !response.projectLang || !response.projectTemplate || !response.packageManager) {
-        process.exit(1);
-    }
-    const projectName = response.projectName === '.' ? '' : response.projectName;
-    const stpJob = async () => {
-        await cp(`./${response.projectName}/ghr/examples/${response.projectTemplate}/.`, `./${response.projectName}/`, { recursive: true });
-        for (const p of ['.gitignore', '.prettierignore']) {
-            await cp(`./${response.projectName}/ghr/${p}`, `./${response.projectName}/${p}`, { recursive: true });
-        }
-        await rm(`./${response.projectName}/ghr`, { recursive: true, force: true });
-        await CreateFileFromTemplate(`.sapphirerc.${response.configFormat}.sapphire`, resolve(`./${response.projectName}/.sapphirerc.${response.configFormat}`), null, {
-            language: response.projectLang
-        });
-        await editPackageJson(response.projectName, projectName);
-        if (response.packageManager === 'pnpm') {
-            await writeFile(`./${response.projectName}/.npmrc`, '# pnpm only\nshamefully-hoist=true\npublic-hoist-pattern[]=@sapphire/*');
-        }
-    };
-    const jobs = [
-        [() => cloneRepo(response.projectName, flags.verbose), 'Cloning the repository'],
-        [stpJob, 'Setting up the project']
-    ];
-    if (response.git) {
-        jobs.push([() => initializeGitRepo(response.projectName), 'Initializing git repo']);
-    }
-    if (response.yarnV3) {
-        jobs.push([() => installYarnV3(response.projectName, flags.verbose), 'Installing Yarn v3']);
-        if (response.projectLang === 'ts')
-            jobs.push([() => installYarnTypescriptPlugin(response.projectName), 'Installing Yarn Typescript Plugin']);
-    }
-    jobs.push([
-        () => installDeps(response.projectName, response.packageManager, flags.verbose),
-        `Installing dependencies using ${response.packageManager}`
-    ]);
-    for (const [job, name] of jobs) {
-        await runJob(job, name).catch(() => process.exit(1));
-    }
-    console.log(blueBright('Done!'));
-    process.exit(0);
+	const response = await prompts(PromptNew(name, await CommandExists('yarn'), await CommandExists('pnpm')));
+	if (!response.projectName || !response.projectLang || !response.projectTemplate || !response.packageManager) {
+		process.exit(1);
+	}
+	const projectName = response.projectName === '.' ? '' : response.projectName;
+	const stpJob = async () => {
+		await cp(`./${response.projectName}/ghr/examples/${response.projectTemplate}/.`, `./${response.projectName}/`, { recursive: true });
+		for (const p of ['.gitignore', '.prettierignore']) {
+			await cp(`./${response.projectName}/ghr/${p}`, `./${response.projectName}/${p}`, { recursive: true });
+		}
+		await rm(`./${response.projectName}/ghr`, { recursive: true, force: true });
+		await CreateFileFromTemplate(
+			`.sapphirerc.${response.configFormat}.sapphire`,
+			resolve(`./${response.projectName}/.sapphirerc.${response.configFormat}`),
+			null,
+			{
+				language: response.projectLang
+			}
+		);
+		await editPackageJson(response.projectName, projectName);
+		if (response.packageManager === 'pnpm') {
+			await writeFile(`./${response.projectName}/.npmrc`, '# pnpm only\nshamefully-hoist=true\npublic-hoist-pattern[]=@sapphire/*');
+		}
+	};
+	const jobs = [
+		[() => cloneRepo(response.projectName, flags.verbose), 'Cloning the repository'],
+		[stpJob, 'Setting up the project']
+	];
+	if (response.git) {
+		jobs.push([() => initializeGitRepo(response.projectName), 'Initializing git repo']);
+	}
+	if (response.yarnV3) {
+		jobs.push([() => installYarnV3(response.projectName, flags.verbose), 'Installing Yarn v3']);
+		if (response.projectLang === 'ts') jobs.push([() => installYarnTypescriptPlugin(response.projectName), 'Installing Yarn Typescript Plugin']);
+	}
+	jobs.push([
+		() => installDeps(response.projectName, response.packageManager, flags.verbose),
+		`Installing dependencies using ${response.packageManager}`
+	]);
+	for (const [job, name] of jobs) {
+		await runJob(job, name).catch(() => process.exit(1));
+	}
+	console.log(blueBright('Done!'));
+	process.exit(0);
 };
-//# sourceMappingURL=new.js.map
+//# sourceMappingURL=new.js.map

package/dist/constants.js

@@ -6,4 +6,4 @@ export const rootFolder = fileURLToPath(rootURL);
 export const templatesFolder = fileURLToPath(templatesURL);
 export const componentsFolder = fileURLToPath(componentsURL);
 export const repoUrl = 'https://github.com/sapphiredev/examples.git';
-//# sourceMappingURL=constants.js.map
+//# sourceMappingURL=constants.js.map

package/dist/functions/CommandExists.js

@@ -28,40 +28,40 @@ import { constants } from 'node:fs';
 import { access } from 'node:fs/promises';
 const windows = process.platform === 'win32';
 async function isExecutable(command) {
-    const result = await Result.fromAsync(() => access(command, constants.X_OK));
-    return result.isErr();
+	const result = await Result.fromAsync(() => access(command, constants.X_OK));
+	return result.isErr();
 }
 function cleanWindowsCommand(input) {
-    if (/[^A-Za-z0-9_\/:=-]/.test(input)) {
-        input = `'${input.replace(/'/g, "'\\''")}'`;
-        input = input.replace(/^(?:'')+/g, '').replace(/\\'''/g, "\\'");
-    }
-    return input;
+	if (/[^A-Za-z0-9_\/:=-]/.test(input)) {
+		input = `'${input.replace(/'/g, "'\\''")}'`;
+		input = input.replace(/^(?:'')+/g, '').replace(/\\'''/g, "\\'");
+	}
+	return input;
 }
 async function commandExistsUnix(command) {
-    if (await fileExists(command)) {
-        if (await isExecutable(command)) {
-            return true;
-        }
-    }
-    const result = await Result.fromAsync(() => execa('which', [command]));
-    return result.match({
-        err: () => false,
-        ok: (value) => Boolean(value.stdout)
-    });
+	if (await fileExists(command)) {
+		if (await isExecutable(command)) {
+			return true;
+		}
+	}
+	const result = await Result.fromAsync(() => execa('which', [command]));
+	return result.match({
+		err: () => false,
+		ok: (value) => Boolean(value.stdout)
+	});
 }
 const invalidWindowsCommandNameRegex = /[\x00-\x1f<>:"|?*]/;
 async function commandExistsWindows(command) {
-    if (invalidWindowsCommandNameRegex.test(command)) {
-        return false;
-    }
-    const result = await Result.fromAsync(async () => execa('where', [cleanWindowsCommand(command)]));
-    return result.match({
-        err: () => fileExists(command),
-        ok: () => true
-    });
+	if (invalidWindowsCommandNameRegex.test(command)) {
+		return false;
+	}
+	const result = await Result.fromAsync(async () => execa('where', [cleanWindowsCommand(command)]));
+	return result.match({
+		err: () => fileExists(command),
+		ok: () => true
+	});
 }
 export async function CommandExists(command) {
-    return windows ? commandExistsWindows(command) : commandExistsUnix(command);
+	return windows ? commandExistsWindows(command) : commandExistsUnix(command);
 }
-//# sourceMappingURL=CommandExists.js.map
+//# sourceMappingURL=CommandExists.js.map

package/dist/functions/CreateFileFromTemplate.js

@@ -3,42 +3,42 @@ import { fileExists } from '#functions/FileExists';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { dirname, resolve } from 'node:path';
 export async function CreateFileFromTemplate(template, target, config, params, custom = false, component = false) {
-    const location = custom ? template : `${templatesFolder}${template}`;
-    const output = {};
-    if (component) {
-        const [c, f] = await getComponentTemplateWithConfig(location);
-        output.c = c;
-        output.f = f;
-    }
-    output.f ??= await readFile(location, 'utf8');
-    if (!output.f) {
-        throw new Error("Can't read file.");
-    }
-    if (params) {
-        for (const param of Object.entries(params)) {
-            output.f = output.f.replaceAll(`{{${param[0]}}}`, param[1]);
-        }
-    }
-    if (!output || (component && (!output.c || !output.c.category))) {
-        throw new Error('Invalid template.');
-    }
-    const dir = component ? config.locations[output.c.category] : null;
-    const ta = component ? target.replace('%L%', dir) : target;
-    if (await fileExists(ta)) {
-        throw new Error('Component already exists');
-    }
-    await writeFileRecursive(ta, output.f);
-    return true;
+	const location = custom ? template : `${templatesFolder}${template}`;
+	const output = {};
+	if (component) {
+		const [c, f] = await getComponentTemplateWithConfig(location);
+		output.c = c;
+		output.f = f;
+	}
+	output.f ??= await readFile(location, 'utf8');
+	if (!output.f) {
+		throw new Error("Can't read file.");
+	}
+	if (params) {
+		for (const param of Object.entries(params)) {
+			output.f = output.f.replaceAll(`{{${param[0]}}}`, param[1]);
+		}
+	}
+	if (!output || (component && (!output.c || !output.c.category))) {
+		throw new Error('Invalid template.');
+	}
+	const dir = component ? config.locations[output.c.category] : null;
+	const ta = component ? target.replace('%L%', dir) : target;
+	if (await fileExists(ta)) {
+		throw new Error('Component already exists');
+	}
+	await writeFileRecursive(ta, output.f);
+	return true;
 }
 async function getComponentTemplateWithConfig(path) {
-    const file = await readFile(path, 'utf8');
-    const fa = file.split(/---(\r\n|\r|\n|)/gm);
-    return [JSON.parse(fa[0]), fa[2]];
+	const file = await readFile(path, 'utf8');
+	const fa = file.split(/---(\r\n|\r|\n|)/gm);
+	return [JSON.parse(fa[0]), fa[2]];
 }
 async function writeFileRecursive(target, data) {
-    const resolvedTarget = resolve(target);
-    const dir = dirname(resolvedTarget);
-    await mkdir(dir, { recursive: true });
-    return writeFile(resolvedTarget, data);
+	const resolvedTarget = resolve(target);
+	const dir = dirname(resolvedTarget);
+	await mkdir(dir, { recursive: true });
+	return writeFile(resolvedTarget, data);
 }
-//# sourceMappingURL=CreateFileFromTemplate.js.map
+//# sourceMappingURL=CreateFileFromTemplate.js.map

package/dist/functions/FileExists.js

@@ -1,7 +1,7 @@
 import { Result } from '@sapphire/result';
 import { access } from 'node:fs/promises';
 export async function fileExists(filePath) {
-    const result = await Result.fromAsync(() => access(filePath));
-    return result.isOk();
+	const result = await Result.fromAsync(() => access(filePath));
+	return result.isOk();
 }
-//# sourceMappingURL=FileExists.js.map
+//# sourceMappingURL=FileExists.js.map

package/dist/prompts/PromptInit.js

@@ -1,62 +1,62 @@
 export const PromptInit = [
-    {
-        type: 'select',
-        name: 'configFormat',
-        message: 'What format do you want your config file to be in?',
-        choices: [
-            { title: 'JSON', value: 'json' },
-            { title: 'YAML', value: 'yml' }
-        ]
-    },
-    {
-        type: 'select',
-        name: 'projectLanguage',
-        message: 'Choose the language used in your project',
-        choices: [
-            { title: 'TypeScript', value: 'ts' },
-            { title: 'JavaScript', value: 'js' }
-        ]
-    },
-    {
-        type: 'text',
-        name: 'base',
-        message: 'Your base directory',
-        initial: 'src'
-    },
-    {
-        type: 'text',
-        name: 'commands',
-        message: 'Where do you store your commands? (do not include the base)',
-        initial: 'commands'
-    },
-    {
-        type: 'text',
-        name: 'listeners',
-        message: 'Where do you store your listeners? (do not include the base)',
-        initial: 'listeners'
-    },
-    {
-        type: 'text',
-        name: 'arguments',
-        message: 'Where do you store your arguments? (do not include the base)',
-        initial: 'arguments'
-    },
-    {
-        type: 'text',
-        name: 'preconditions',
-        message: 'Where do you store your preconditions? (do not include the base)',
-        initial: 'preconditions'
-    },
-    {
-        type: 'confirm',
-        name: 'cftEnabled',
-        message: 'Do you want to enable custom file templates?'
-    },
-    {
-        type: (prev) => (prev ? 'text' : null),
-        name: 'cftLocation',
-        message: 'Where do you store your custom file templates?',
-        initial: 'templates'
-    }
+	{
+		type: 'select',
+		name: 'configFormat',
+		message: 'What format do you want your config file to be in?',
+		choices: [
+			{ title: 'JSON', value: 'json' },
+			{ title: 'YAML', value: 'yml' }
+		]
+	},
+	{
+		type: 'select',
+		name: 'projectLanguage',
+		message: 'Choose the language used in your project',
+		choices: [
+			{ title: 'TypeScript', value: 'ts' },
+			{ title: 'JavaScript', value: 'js' }
+		]
+	},
+	{
+		type: 'text',
+		name: 'base',
+		message: 'Your base directory',
+		initial: 'src'
+	},
+	{
+		type: 'text',
+		name: 'commands',
+		message: 'Where do you store your commands? (do not include the base)',
+		initial: 'commands'
+	},
+	{
+		type: 'text',
+		name: 'listeners',
+		message: 'Where do you store your listeners? (do not include the base)',
+		initial: 'listeners'
+	},
+	{
+		type: 'text',
+		name: 'arguments',
+		message: 'Where do you store your arguments? (do not include the base)',
+		initial: 'arguments'
+	},
+	{
+		type: 'text',
+		name: 'preconditions',
+		message: 'Where do you store your preconditions? (do not include the base)',
+		initial: 'preconditions'
+	},
+	{
+		type: 'confirm',
+		name: 'cftEnabled',
+		message: 'Do you want to enable custom file templates?'
+	},
+	{
+		type: (prev) => (prev ? 'text' : null),
+		name: 'cftLocation',
+		message: 'Where do you store your custom file templates?',
+		initial: 'templates'
+	}
 ];
-//# sourceMappingURL=PromptInit.js.map
+//# sourceMappingURL=PromptInit.js.map

package/dist/prompts/PromptNew.js

@@ -1,75 +1,75 @@
 const tsTemplates = [
-    { title: 'Starter template (Recommended)', value: 'with-typescript-starter' },
-    { title: 'Complete template', value: 'with-typescript-complete' },
-    { title: 'with Docker', value: 'with-docker' },
-    { title: 'with tsup', value: 'with-tsup' },
-    { title: 'with SWC', value: 'with-swc' }
+	{ title: 'Starter template (Recommended)', value: 'with-typescript-starter' },
+	{ title: 'Complete template', value: 'with-typescript-complete' },
+	{ title: 'with Docker', value: 'with-docker' },
+	{ title: 'with tsup', value: 'with-tsup' },
+	{ title: 'with SWC', value: 'with-swc' }
 ];
 const jsTemplates = [
-    { title: 'with ESM (Recommended)', value: 'with-esm' },
-    { title: 'with CommonJS', value: 'with-javascript' }
+	{ title: 'with ESM (Recommended)', value: 'with-esm' },
+	{ title: 'with CommonJS', value: 'with-javascript' }
 ];
 export const PromptNew = (projectName, yarn, pnpm) => {
-    const pmChoices = [
-        {
-            title: `Yarn (Recommended) ${yarn ? '' : '(Not installed)'}`,
-            value: 'Yarn',
-            disabled: !yarn
-        },
-        {
-            title: `pnpm ${pnpm ? '' : '(Not Installed)'}`,
-            value: 'pnpm',
-            disabled: !pnpm
-        },
-        { title: 'npm', value: 'npm' }
-    ];
-    return [
-        {
-            type: 'text',
-            name: 'projectName',
-            message: "What's the name of your project?",
-            initial: projectName ?? 'my-sapphire-bot'
-        },
-        {
-            type: 'select',
-            name: 'projectLang',
-            message: 'Choose a language for your project',
-            choices: [
-                { title: 'TypeScript (Recommended)', value: 'ts' },
-                { title: 'JavaScript', value: 'js' }
-            ]
-        },
-        {
-            type: 'select',
-            name: 'projectTemplate',
-            message: 'Choose a template for your project',
-            choices: (prev) => (prev === 'ts' ? tsTemplates : jsTemplates)
-        },
-        {
-            type: 'select',
-            name: 'configFormat',
-            message: 'What format do you want your config file to be in?',
-            choices: [
-                { title: 'JSON', value: 'json' },
-                { title: 'YAML', value: 'yml' }
-            ]
-        },
-        {
-            type: 'select',
-            name: 'packageManager',
-            message: 'What package manager do you want to use?',
-            choices: yarn ? pmChoices : pmChoices.slice().reverse()
-        },
-        {
-            type: (prev) => (prev === 'Yarn' ? 'confirm' : false),
-            name: 'yarnV3',
-            message: 'Do you want to use Yarn v3?'
-        },
-        {
-            type: 'confirm',
-            name: 'git',
-            message: 'Do you want to create a git repository for this project?'
-        }
-    ];
+	const pmChoices = [
+		{
+			title: `Yarn (Recommended) ${yarn ? '' : '(Not installed)'}`,
+			value: 'Yarn',
+			disabled: !yarn
+		},
+		{
+			title: `pnpm ${pnpm ? '' : '(Not Installed)'}`,
+			value: 'pnpm',
+			disabled: !pnpm
+		},
+		{ title: 'npm', value: 'npm' }
+	];
+	return [
+		{
+			type: 'text',
+			name: 'projectName',
+			message: "What's the name of your project?",
+			initial: projectName ?? 'my-sapphire-bot'
+		},
+		{
+			type: 'select',
+			name: 'projectLang',
+			message: 'Choose a language for your project',
+			choices: [
+				{ title: 'TypeScript (Recommended)', value: 'ts' },
+				{ title: 'JavaScript', value: 'js' }
+			]
+		},
+		{
+			type: 'select',
+			name: 'projectTemplate',
+			message: 'Choose a template for your project',
+			choices: (prev) => (prev === 'ts' ? tsTemplates : jsTemplates)
+		},
+		{
+			type: 'select',
+			name: 'configFormat',
+			message: 'What format do you want your config file to be in?',
+			choices: [
+				{ title: 'JSON', value: 'json' },
+				{ title: 'YAML', value: 'yml' }
+			]
+		},
+		{
+			type: 'select',
+			name: 'packageManager',
+			message: 'What package manager do you want to use?',
+			choices: yarn ? pmChoices : pmChoices.slice().reverse()
+		},
+		{
+			type: (prev) => (prev === 'Yarn' ? 'confirm' : false),
+			name: 'yarnV3',
+			message: 'Do you want to use Yarn v3?'
+		},
+		{
+			type: 'confirm',
+			name: 'git',
+			message: 'Do you want to create a git repository for this project?'
+		}
+	];
 };
-//# sourceMappingURL=PromptNew.js.map
+//# sourceMappingURL=PromptNew.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapphire/cli",
-  "version": "1.5.0-next.2945f09.0",
+  "version": "1.5.0",
   "description": "CLI for Sapphire Framework",
   "author": "@sapphire",
   "license": "MIT",
@@ -17,17 +17,12 @@
   },
   "sideEffects": "false",
   "files": [
-    "dist",
-    "!dist/*.tsbuildinfo",
-    "!dist/**/*.js.map",
-    "!dist/**/*.d.ts",
-    "!dist/**/*.d.ts.map",
+    "dist/**/*.js",
     "templates"
   ],
   "scripts": {
     "lint": "eslint src --ext ts --fix",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "update": "yarn upgrade-interactive",
+    "format": "prettier --write .",
     "build": "tsc -b src",
     "clean": "tsc -b src --clean",
     "watch": "tsc -b src -w",
@@ -39,7 +34,7 @@
   },
   "dependencies": {
     "@favware/colorette-spinner": "^1.0.1",
-    "@sapphire/result": "^2.6.0",
+    "@sapphire/result": "^2.6.1",
     "colorette": "^2.0.19",
     "commander": "^10.0.0",
     "execa": "^7.1.1",
@@ -53,14 +48,14 @@
     "@commitlint/config-conventional": "^17.4.4",
     "@favware/cliff-jumper": "^2.0.0",
     "@favware/npm-deprecate": "^1.0.7",
-    "@sapphire/eslint-config": "^4.3.8",
+    "@sapphire/eslint-config": "^4.4.0",
     "@sapphire/prettier-config": "^1.4.5",
-    "@sapphire/ts-config": "^3.3.4",
+    "@sapphire/ts-config": "^4.0.0",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^18.15.11",
     "@types/prompts": "^2.4.4",
-    "@typescript-eslint/eslint-plugin": "^5.57.1",
-    "@typescript-eslint/parser": "^5.57.1",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
@@ -72,7 +67,7 @@
     "prettier": "^2.8.7",
     "pretty-quick": "^3.1.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.4"
   },
   "resolutions": {
     "ansi-regex": "^5.0.1",
@@ -80,7 +75,7 @@
   },
   "engines": {
     "node": ">=v16.6.0",
-    "npm": ">=7.0.0"
+    "npm": ">=7"
   },
   "keywords": [
     "@sapphire/cli",