@sapphire/cli 1.1.1-next.bbb2fe9.0 → 1.2.0

package/dist/cli.js

@@ -1,14 +1,18 @@
 #!/usr/bin/env node
-import { Command } from 'commander';
-import { readFile } from 'fs/promises';
-import { URL } from 'url';
-import newCmd from '#commands/new';
 import generateCmd from '#commands/generate';
 import initCmd from '#commands/init';
+import newCmd from '#commands/new';
+import { createColors } from 'colorette';
+import { Command } from 'commander';
+import { readFile } from 'node:fs/promises';
+import { URL } from 'node:url';
+createColors({ useColor: true });
 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);
+sapphire //
+    .name('sapphire')
+    .version(packageJson.version);
 sapphire
     .command('new')
     .description('creates a new Sapphire project')
@@ -23,6 +27,10 @@ sapphire
     .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);
+sapphire //
+    .command('init')
+    .description('creates a config file on an existing Sapphire project')
+    .alias('i')
+    .action(initCmd);
 sapphire.parse(process.argv);
 //# sourceMappingURL=cli.js.map

package/dist/commands/generate.js

@@ -1,69 +1,61 @@
 import { componentsFolder } from '#constants';
-import { CreateFileFromTemplate } from '#functions';
-import chalk from 'chalk';
+import { CreateFileFromTemplate } from '#functions/CreateFileFromTemplate';
+import { fileExists } from '#functions/FileExists';
+import { Spinner } from '#functions/Spinner';
+import { fromAsync, isErr } from '@sapphire/result';
+import { blueBright, red } from 'colorette';
 import findUp from 'find-up';
-import { existsSync } from 'fs';
-import { readFile } from 'fs/promises';
-import ora from 'ora';
-import { basename, join } from 'path';
-import { setTimeout } from 'timers/promises';
-import YAML from 'yaml';
-const { blueBright, red } = chalk;
-function createComponent(component, name, config, configLoc) {
-    return new Promise((resolve, reject) => {
-        const { projectLanguage } = config;
-        if (!projectLanguage)
-            return reject(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 && existsSync(userPath)) {
-            return CreateFileFromTemplate(userPath, target, config, params, true, true).then(resolve).catch(reject);
-        }
-        else if (existsSync(corePath)) {
-            return CreateFileFromTemplate(`components/${template}`, target, config, params, false, true).then(resolve).catch(reject);
-        }
-        return reject(new Error("Can't find the template."));
-    });
+import { load } from 'js-yaml';
+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.");
 }
-function timeout(ms) {
-    return new Promise((resolve, reject) => {
-        // false positive
-        // eslint-disable-next-line @typescript-eslint/no-implied-eval
-        return setTimeout(ms)
-            .then(() => {
-            return resolve(null);
-        })
-            .catch(reject);
-    });
-}
-function fetchConfig() {
-    return Promise.race([findUp('.sapphirerc.json', { cwd: '.' }), timeout(5000)]).then((a) => {
-        if (a)
-            return a;
-        return Promise.race([findUp('.sapphirerc.yml', { cwd: '.' }), timeout(5000)]);
-    });
+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)]);
 }
 export default async (component, name) => {
-    const spinner = ora(`Creating a ${component.toLowerCase()}`).start();
-    const fail = (error) => {
-        spinner.fail(error);
+    const spinner = new Spinner(`Creating a ${component.toLowerCase()}`).start();
+    const fail = (error, additionalExecution) => {
+        spinner.error({ text: error });
+        if (additionalExecution)
+            additionalExecution();
         process.exit(1);
     };
     const configLoc = await fetchConfig();
-    if (!configLoc)
+    if (!configLoc) {
         return fail("Can't find the Sapphire CLI config.");
-    const config = configLoc.endsWith('json') ? JSON.parse(await readFile(configLoc, 'utf8')) : YAML.parse(await readFile(configLoc, 'utf8'));
-    if (!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.");
-    await createComponent(component, name, config, configLoc.replace(/.sapphirerc.(json|yml)/g, '')).catch((err) => {
-        spinner.fail();
-        console.log(red(err.message));
-        process.exit(1);
-    });
-    spinner.succeed();
-    return console.log(blueBright('Done!'));
+    }
+    const result = await fromAsync(async () => createComponent(component, name, config, configLoc.replace(/.sapphirerc.(json|yml)/g, '')));
+    if (isErr(result)) {
+        return fail(result.error.message, () => console.log(red(result.error.message)));
+    }
+    spinner.success();
+    console.log(blueBright('Done!'));
+    process.exit(0);
 };
 //# sourceMappingURL=generate.js.map

package/dist/commands/init.js

@@ -1,10 +1,9 @@
-import { PromptInit } from '#prompts';
-import chalk from 'chalk';
+import { PromptInit } from '#prompts/PromptInit';
+import { red } from 'colorette';
 import findUp from 'find-up';
-import { writeFile } from 'fs/promises';
+import { dump } from 'js-yaml';
+import { writeFile } from 'node:fs/promises';
 import prompts from 'prompts';
-import YAML from 'yaml';
-const { red } = chalk;
 export default async () => {
     const packageJson = await findUp('package.json');
     if (!packageJson) {
@@ -13,7 +12,7 @@ export default async () => {
     }
     const response = await prompts(PromptInit);
     if (!response.preconditions)
-        return process.exit(1);
+        process.exit(1);
     const config = {
         projectLanguage: response.projectLanguage,
         locations: {
@@ -28,7 +27,8 @@ export default async () => {
             location: response.cftLocation ?? ''
         }
     };
-    const file = response.configFormat === 'json' ? JSON.stringify(config, null, 2) : YAML.stringify(config);
-    return writeFile(packageJson.replace('package.json', `.sapphirerc.${response.configFormat}`), file);
+    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

package/dist/commands/new.js

@@ -1,81 +1,93 @@
-import { CommandExists, CreateFileFromTemplate } from '#functions';
-import { PromptNew } from '#prompts';
-import chalk from 'chalk';
-import { exec, spawn } from 'child_process';
-import { existsSync } from 'fs';
-import { cp, readFile, rm, writeFile } from 'fs/promises';
-import ora from 'ora';
-import { resolve } from 'path';
-import prompts from 'prompts';
 import { repoUrl } from '#constants';
-const { blueBright, red } = chalk;
-function editPackageJson(location, name) {
-    return new Promise(async (resolve, reject) => {
-        const pjLocation = `./${location}/package.json`;
-        const output = JSON.parse(await readFile(pjLocation, 'utf8'));
-        if (!output)
-            return reject(new Error("Can't read file."));
-        output.name = name;
-        await writeFile(pjLocation, JSON.stringify(output, null, 2)).catch(reject);
-        return resolve(true);
-    });
+import { CommandExists } from '#functions/CommandExists';
+import { CreateFileFromTemplate } from '#functions/CreateFileFromTemplate';
+import { fileExists } from '#functions/FileExists';
+import { Spinner } from '#functions/Spinner';
+import { PromptNew } from '#prompts/PromptNew';
+import { fromAsync, isErr, isOk } from '@sapphire/result';
+import { blueBright, red } from 'colorette';
+import { execa } from 'execa';
+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 fromAsync(() => writeFile(pjLocation, JSON.stringify(output, null, 2)));
+    return isOk(result);
 }
-function installDeps(location, pm, verbose) {
-    const pmp = spawn(process.platform === 'win32' ? `${pm.toLowerCase()}.cmd` : pm.toLowerCase(), ['install'], {
+async function installDeps(location, pm, verbose) {
+    const result = await fromAsync(() => execa(pm.toLowerCase(), ['install'], {
         stdio: verbose ? 'inherit' : undefined,
         cwd: `./${location}/`
-    });
-    return new Promise((resolve, reject) => {
-        pmp.on('error', reject);
-        pmp.on('exit', async (code) => {
-            if (code === 0) {
-                const lockfile = `./${location}/${pm === 'npm' ? 'yarn.lock' : 'package-lock.json'}`;
-                if (existsSync(lockfile))
-                    await rm(lockfile);
-                resolve(true);
-            }
-            else {
-                reject(new Error('An unknown error occured while installing the dependencies. Try running Sapphire CLI with "--verbose" flag.'));
-            }
-        });
-    });
+    }));
+    if (isErr(result)) {
+        throw result.error;
+    }
+    if (result.value.exitCode !== 0) {
+        throw new Error('An unknown error occurred while installing the dependencies. Try running Sapphire CLI with "--verbose" flag.');
+    }
+    const oppositeLockfile = `./${location}/${pm === 'npm' ? 'yarn.lock' : 'package-lock.json'}`;
+    if (await fileExists(oppositeLockfile)) {
+        await rm(oppositeLockfile);
+    }
+    return true;
 }
-function initializeGitRepo(location) {
-    return new Promise((resolve, reject) => {
-        return exec('git init', { cwd: `./${location}/` }, (e) => {
-            if (!e)
-                return resolve(true);
-            return reject(e);
-        });
-    });
+async function configureYarnRc(location, name, value) {
+    await execa('yarn', ['config', 'set', name, value], { cwd: `./${location}/` });
+    return true;
 }
-function runJob(job, name) {
-    return new Promise((resolve, reject) => {
-        const spinner = ora(name).start();
-        return job()
-            .then(() => {
-            spinner.succeed();
-            resolve(true);
-        })
-            .catch((e) => {
-            spinner.fail(red(e.message));
-            console.log(red(e));
-            reject(e);
-        });
-    });
+async function installYarnV3(location, verbose) {
+    const result = await fromAsync(() => execa('yarn', ['set', 'version', 'berry'], {
+        stdio: verbose ? 'inherit' : undefined,
+        cwd: `./${location}/`
+    }));
+    if (isErr(result)) {
+        throw result.error;
+    }
+    if (result.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;
+}
+async function initializeGitRepo(location) {
+    await execa('git', ['init'], { cwd: `./${location}/` });
+    return true;
+}
+async function runJob(job, name) {
+    const spinner = new Spinner(name).start();
+    const result = await fromAsync(async () => job());
+    if (isErr(result)) {
+        spinner.error({ text: red(result.error.message) });
+        console.error(red(result.error.message));
+        throw result.error;
+    }
+    spinner.success();
+    return true;
 }
-function cloneRepo(location, verbose) {
-    const git = spawn('git', ['clone', repoUrl, `${location}/ghr`], {
+async function cloneRepo(location, verbose) {
+    const result = await fromAsync(async () => execa('git', ['clone', repoUrl, `${location}/ghr`], {
         stdio: verbose ? 'inherit' : undefined
-    });
-    return new Promise((resolve, reject) => {
-        git.on('error', reject);
-        git.on('exit', (code) => {
-            code === 0
-                ? resolve(true)
-                : reject(new Error('An unknown error occured while cloning the repository. Try running Sapphire CLI with "--verbose" flag.'));
-        });
-    });
+    }));
+    if (isErr(result)) {
+        throw result.error;
+    }
+    if (result.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')));
@@ -96,15 +108,24 @@ export default async (name, flags) => {
     };
     const jobs = [
         [() => cloneRepo(response.projectName, flags.verbose), 'Cloning the repository'],
-        [stpJob, 'Setting up the project'],
-        [() => installDeps(response.projectName, response.packageManager, flags.verbose), `Installing dependencies using ${response.packageManager}`]
+        [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

package/dist/functions/CommandExists.js

@@ -1,59 +1,67 @@
 /*
-    from https://github.com/raftario/command-exists
-    edited for this project
+    The MIT License (MIT)
+
+    Copyright (c) 2019 Raphaël Thériault
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
 */
-import { exec } from 'child_process';
-import fs from 'fs';
-import path from 'path';
+import { fileExists } from '#functions/FileExists';
+import { fromAsync, isErr } from '@sapphire/result';
+import { execa } from 'execa';
+import { constants } from 'node:fs';
+import { access } from 'node:fs/promises';
 const windows = process.platform === 'win32';
-function fileExists(command) {
-    return new Promise((res) => fs.access(command, (err) => res(!err)));
+async function isExecutable(command) {
+    const result = await fromAsync(() => access(command, constants.X_OK));
+    return isErr(result);
 }
-function executable(command) {
-    return new Promise((res) => fs.access(command, fs.constants.X_OK, (err) => res(!err)));
+function cleanWindowsCommand(input) {
+    if (/[^A-Za-z0-9_\/:=-]/.test(input)) {
+        input = `'${input.replace(/'/g, "'\\''")}'`;
+        input = input.replace(/^(?:'')+/g, '').replace(/\\'''/g, "\\'");
+    }
+    return input;
 }
-function clean(input) {
-    if (windows) {
-        if (/[^A-Za-z0-9_\/:=-]/.test(input)) {
-            input = `'${input.replace(/'/g, "'\\''")}'`;
-            input = input.replace(/^(?:'')+/g, '').replace(/\\'''/g, "\\'");
+async function commandExistsUnix(command) {
+    if (await fileExists(command)) {
+        if (await isExecutable(command)) {
+            return true;
         }
-        return input;
     }
-    if (/[\\]/.test(input)) {
-        const dirname = `"${path.dirname(input)}"`;
-        const basename = `"${path.basename(input)}"`;
-        return `${dirname}:${basename}`;
+    const result = await fromAsync(() => execa('which', [command]));
+    if (isErr(result)) {
+        return false;
     }
-    return `"${input}"`;
-}
-function commandExistsUnix(command, cleanCommand) {
-    return new Promise((res) => {
-        return fileExists(command).then((exists) => {
-            if (exists) {
-                void executable(command).then((exists) => res(exists));
-            }
-            else {
-                exec(`command -v ${cleanCommand} 2>/dev/null && { echo >&1 ${cleanCommand}; exit 0; }`, (_err, stdout) => res(Boolean(stdout)));
-            }
-        });
-    });
+    return Boolean(result.value.stdout);
 }
-function commandExistsWindows(command, cleanCommand) {
-    return new Promise((res) => {
-        if (/[\x00-\x1f<>:"|?*]/.test(command))
-            res(false);
-        exec(`where ${cleanCommand}`, (err) => {
-            if (err) {
-                void fileExists(command).then((exists) => res(exists));
-            }
-            else
-                res(true);
-        });
-    });
+const invalidWindowsCommandNameRegex = /[\x00-\x1f<>:"|?*]/;
+async function commandExistsWindows(command) {
+    if (invalidWindowsCommandNameRegex.test(command)) {
+        return false;
+    }
+    const result = await fromAsync(async () => execa('where', [cleanWindowsCommand(command)]));
+    if (isErr(result)) {
+        return fileExists(command);
+    }
+    return true;
 }
-export function CommandExists(command) {
-    const cleanCommand = clean(command);
-    return windows ? commandExistsWindows(command, cleanCommand) : commandExistsUnix(command, cleanCommand);
+export async function CommandExists(command) {
+    return windows ? commandExistsWindows(command) : commandExistsUnix(command);
 }
 //# sourceMappingURL=CommandExists.js.map

package/dist/functions/CreateFileFromTemplate.js

@@ -1,45 +1,44 @@
-import { existsSync } from 'fs';
-import { readFile, writeFile, mkdir } from 'fs/promises';
-import path from 'path';
 import { templatesFolder } from '#constants';
-export function CreateFileFromTemplate(template, target, config, params, custom = false, component = false) {
-    return new Promise(async (resolve, reject) => {
-        const location = custom ? template : `${templatesFolder}${template}`;
-        const output = {};
-        if (component) {
-            const [c, f] = await getComponentTemplateWithConfig(location);
-            output.c = c;
-            output.f = f;
+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]);
         }
-        output.f ??= await readFile(location, 'utf8');
-        if (!output.f)
-            return reject(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)))
-            return reject(new Error('Invalid template.'));
-        const dir = component ? config.locations[output.c.category] : null;
-        const ta = component ? target.replace('%L%', dir) : target;
-        if (existsSync(ta))
-            reject(new Error('Component already exists'));
-        await writeFileRecursive(ta, output.f).catch(reject);
-        return resolve(true);
-    });
+    }
+    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;
 }
-function getComponentTemplateWithConfig(path) {
-    return readFile(path, 'utf8').then((file) => {
-        const fa = file.split(/---(\r\n|\r|\n|)/gm);
-        return [JSON.parse(fa[0]), fa[2]];
-    });
+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]];
 }
-function writeFileRecursive(target, data) {
-    return new Promise(async (resolve, reject) => {
-        const dir = path.dirname(path.resolve(target));
-        await mkdir(dir, { recursive: true }).catch(reject);
-        return writeFile(path.resolve(target), data).then(resolve).catch(reject);
-    });
+async function writeFileRecursive(target, data) {
+    const resolvedTarget = resolve(target);
+    const dir = dirname(resolvedTarget);
+    await mkdir(dir, { recursive: true });
+    return writeFile(resolvedTarget, data);
 }
 //# sourceMappingURL=CreateFileFromTemplate.js.map

package/dist/functions/FileExists.js

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

package/dist/functions/Spinner.js

@@ -0,0 +1,122 @@
+import * as colorette from 'colorette';
+import tty from 'node:tty';
+/**
+ * A very minimal terminal spinner
+ *
+ * @license ISC
+ * @copyright 2021 Usman Yunusov <usman.iunusov@gmail.com>
+ * @see https://github.com/usmanyunusov/nanospinner/blob/master/index.js
+ */
+export class Spinner {
+    #isCI = process.env.CI ||
+        process.env.WT_SESSION ||
+        process.env.ConEmuTask === '{cmd::Cmder}' ||
+        process.env.TERM_PROGRAM === 'vscode' ||
+        process.env.TERM === 'xterm-256color' ||
+        process.env.TERM === 'alacritty';
+    #isTTY = tty.isatty(1) && process.env.TERM !== 'dumb' && !('CI' in process.env);
+    #supportUnicode = process.platform === 'win32' ? this.#isCI : process.env.TERM !== 'linux';
+    #symbols = {
+        frames: this.#isTTY ? (this.#supportUnicode ? ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'] : ['-', '\\', '|', '/']) : ['-'],
+        tick: this.#supportUnicode ? '✔' : '√',
+        cross: this.#supportUnicode ? '✖' : '×'
+    };
+    #text = '';
+    #current = 0;
+    #interval = 50;
+    #stream = process.stderr;
+    #frames = this.#symbols.frames;
+    #color = 'greenBright';
+    #lines = 0;
+    #timer;
+    constructor(text, options) {
+        this.#text = text ?? this.#text;
+        this.#interval = options?.interval ?? this.#interval;
+        this.#stream = options?.stream ?? this.#stream;
+        if (options?.frames && options?.frames.length) {
+            this.#frames = options.frames;
+        }
+        this.#color = options?.color ?? this.#color;
+    }
+    clear() {
+        this.write('\x1b[1G');
+        for (let i = 0; i < this.#lines; i++) {
+            i > 0 && this.write('\x1b[1A');
+            this.write('\x1b[2K\x1b[1G');
+        }
+        this.#lines = 0;
+        return this;
+    }
+    error(options) {
+        const mark = colorette.red(this.#symbols.cross);
+        return this.stop({ mark, ...options });
+    }
+    reset() {
+        this.#current = 0;
+        this.#lines = 0;
+        if (this.#timer) {
+            clearTimeout(this.#timer);
+        }
+        return this;
+    }
+    spin() {
+        this.render();
+        this.#current = ++this.#current % this.#frames.length;
+        return this;
+    }
+    start(opts = {}) {
+        this.#timer && this.reset();
+        return this.update({ text: opts.text, color: opts.color }).loop();
+    }
+    stop(opts = {}) {
+        if (this.#timer) {
+            clearTimeout(this.#timer);
+        }
+        const mark = colorette[opts.color || this.#color](this.#frames[this.#current]);
+        const optsMark = opts.mark && opts.color ? colorette[opts.color](opts.mark) : opts.mark;
+        this.write(`${optsMark || mark} ${opts.text || this.#text}\n`, true);
+        return this.#isTTY ? this.write(`\x1b[?25h`) : this;
+    }
+    success(opts = {}) {
+        const mark = colorette.green(this.#symbols.tick);
+        return this.stop({ mark, ...opts });
+    }
+    update(opts = {}) {
+        this.#text = opts.text || this.#text;
+        this.#interval = opts?.interval ?? this.#interval;
+        this.#stream = opts?.stream ?? this.#stream;
+        if (opts?.frames && opts?.frames.length) {
+            this.#frames = opts.frames;
+        }
+        this.#color = opts?.color ?? this.#color;
+        if (this.#frames.length - 1 < this.#current) {
+            this.#current = 0;
+        }
+        return this;
+    }
+    loop() {
+        this.#isTTY && (this.#timer = setTimeout(() => this.loop(), this.#interval));
+        return this.spin();
+    }
+    write(str, clear = false) {
+        if (clear && this.#isTTY) {
+            this.clear();
+        }
+        this.#stream.write(str);
+        return this;
+    }
+    render() {
+        const mark = colorette[this.#color](this.#frames[this.#current]);
+        let str = `${mark} ${this.#text}`;
+        this.#isTTY ? this.write(`\x1b[?25l`) : (str += '\n');
+        this.write(str, true);
+        this.#isTTY && (this.#lines = this.getLines(str, this.#stream.columns));
+    }
+    getLines(str = '', width = 80) {
+        return str
+            .replace(/\u001b[^m]*?m/g, '')
+            .split('\n')
+            .reduce((col, line) => (col += Math.max(1, Math.ceil(line.length / width))), 0);
+    }
+}
+//# sourceMappingURL=Spinner.js.map

package/dist/prompts/PromptNew.js

@@ -54,6 +54,11 @@ export const PromptNew = (projectName, yarn) => {
             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',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapphire/cli",
-	"version": "1.1.1-next.bbb2fe9.0",
+	"version": "1.2.0",
 	"description": "CLI for Sapphire Framework",
 	"author": "@sapphire",
 	"license": "MIT",
@@ -10,9 +10,7 @@
 		"sapphire": "./dist/cli.js"
 	},
 	"imports": {
-		"#prompts": "./dist/prompts/index.js",
 		"#prompts/*": "./dist/prompts/*.js",
-		"#functions": "./dist/functions/index.js",
 		"#functions/*": "./dist/functions/*.js",
 		"#commands/*": "./dist/commands/*.js",
 		"#constants": "./dist/constants.js"
@@ -28,44 +26,44 @@
 	],
 	"scripts": {
 		"lint": "eslint src --ext ts --fix",
-		"format": "prettier --write src/**/*.ts",
+		"format": "prettier --write \"src/**/*.ts\"",
 		"update": "yarn up \"*\" -i",
 		"build": "tsc -b src",
 		"clean": "tsc -b src --clean",
 		"watch": "tsc -b src -w",
-		"sversion": "standard-version -a",
-		"commit": "git-cz",
-		"cz": "git-cz",
+		"sversion": "standard-version",
 		"prepublishOnly": "yarn build",
 		"prepare": "husky install .github/husky"
 	},
 	"dependencies": {
-		"chalk": "^4.1.2",
+		"@sapphire/result": "^1.0.0",
+		"colorette": "^2.0.16",
 		"commander": "^9.0.0",
+		"execa": "^6.1.0",
 		"find-up": "^5.0.0",
-		"ora": "^6.0.1",
+		"js-yaml": "^4.1.0",
 		"prompts": "^2.4.2",
-		"tslib": "^2.3.1",
-		"yaml": "^1.10.2"
+		"tslib": "^2.3.1"
 	},
 	"devDependencies": {
-		"@commitlint/cli": "^16.1.0",
-		"@commitlint/config-conventional": "^16.0.0",
+		"@commitlint/cli": "^16.2.1",
+		"@commitlint/config-conventional": "^16.2.1",
 		"@favware/npm-deprecate": "^1.0.4",
-		"@sapphire/eslint-config": "^4.2.0",
+		"@sapphire/eslint-config": "^4.2.1",
 		"@sapphire/prettier-config": "^1.3.0",
 		"@sapphire/ts-config": "^3.3.1",
-		"@types/node": "^17.0.8",
+		"@types/js-yaml": "^4.0.5",
+		"@types/node": "^17.0.21",
 		"@types/prompts": "^2.0.14",
-		"@typescript-eslint/eslint-plugin": "^5.11.0",
-		"@typescript-eslint/parser": "^5.11.0",
+		"@typescript-eslint/eslint-plugin": "^5.12.1",
+		"@typescript-eslint/parser": "^5.12.1",
 		"cz-conventional-changelog": "^3.3.0",
-		"eslint": "~8.9.0",
-		"eslint-config-prettier": "^8.3.0",
+		"eslint": "^8.9.0",
+		"eslint-config-prettier": "^8.4.0",
 		"eslint-plugin-prettier": "^4.0.0",
 		"globby": "^13.1.1",
 		"husky": "^7.0.4",
-		"lint-staged": "^12.3.3",
+		"lint-staged": "^12.3.4",
 		"prettier": "^2.5.1",
 		"pretty-quick": "^3.1.3",
 		"standard-version": "^9.3.2",
@@ -114,5 +112,5 @@
 		"ansi-regex": "^5.0.1"
 	},
 	"prettier": "@sapphire/prettier-config",
-	"packageManager": "yarn@3.1.1"
+	"packageManager": "yarn@3.2.0"
 }

package/dist/functions/index.js

@@ -1,3 +0,0 @@
-export * from '#functions/CommandExists';
-export * from '#functions/CreateFileFromTemplate';
-//# sourceMappingURL=index.js.map

package/dist/prompts/index.js

@@ -1,3 +0,0 @@
-export * from '#prompts/PromptNew';
-export * from '#prompts/PromptInit';
-//# sourceMappingURL=index.js.map