@sapphire/cli 1.2.0-next.4c47d1a.0 → 1.2.1-next.00d2a50.0

package/CHANGELOG.md

@@ -0,0 +1,81 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [1.2.0](https://github.com/sapphiredev/cli/compare/v1.1.0...v1.2.0) (2022-02-26)
+
+### Features
+
+-   add yarn v3 support ([#84](https://github.com/sapphiredev/cli/issues/84)) ([4c47d1a](https://github.com/sapphiredev/cli/commit/4c47d1aef07b600c0727106bd8d008213f3c2d04))
+
+## [1.1.0](https://github.com/sapphiredev/cli/compare/v1.0.2...v1.1.0) (2022-01-31)
+
+### Features
+
+-   add tsup and swc template options ([#71](https://github.com/sapphiredev/cli/issues/71)) ([625dd8e](https://github.com/sapphiredev/cli/commit/625dd8ea9d43f7005c72212fb5a65bf0b8aa7492))
+
+### Bug Fixes
+
+-   **deps:** update dependency commander to v9 ([#76](https://github.com/sapphiredev/cli/issues/76)) ([d75ea1b](https://github.com/sapphiredev/cli/commit/d75ea1b1542490fd67a14630ee67e3223dc3b6e7))
+-   Generated command comportnent code has error ([#67](https://github.com/sapphiredev/cli/issues/67)) ([9901517](https://github.com/sapphiredev/cli/commit/990151771e3d1da09dee34c9995d70abc241a769))
+
+### [1.0.2](https://github.com/sapphiredev/cli/compare/v1.0.1...v1.0.2) (2021-11-08)
+
+### Bug Fixes
+
+-   update URL for guide ([0b7e402](https://github.com/sapphiredev/cli/commit/0b7e402e3db26af818824f423059c643374ed920))
+
+### [1.0.1](https://github.com/sapphiredev/cli/compare/v1.0.0...v1.0.1) (2021-11-06)
+
+### Bug Fixes
+
+-   allow more node & npm versions in engines field ([ce6c97f](https://github.com/sapphiredev/cli/commit/ce6c97f8c2934796e9d6ab159195f2c0fa05188a))
+-   **deps:** update all non-major dependencies ([#36](https://github.com/sapphiredev/cli/issues/36)) ([1a9e791](https://github.com/sapphiredev/cli/commit/1a9e791768ebbe5edd11875ac07c31b9d3cec50e))
+-   typo `msg` -> `message` ([#39](https://github.com/sapphiredev/cli/issues/39)) ([0f8933b](https://github.com/sapphiredev/cli/commit/0f8933b1af3927c96a79a1f4d9b1bcc46727dd24))
+
+## [1.0.0](https://github.com/sapphiredev/cli/compare/v0.0.3...v1.0.0) (2021-10-16)
+
+### [0.0.3](https://github.com/sapphiredev/cli/compare/v0.0.2...v0.0.3) (2021-10-16)
+
+### Bug Fixes
+
+-   **templates:** Overridden run method to messageRun ([#30](https://github.com/sapphiredev/cli/issues/30)) ([07fc1d5](https://github.com/sapphiredev/cli/commit/07fc1d5516f057cd346340de853ded314741335f))
+
+### [0.0.2](https://github.com/sapphiredev/cli/compare/v0.0.1...v0.0.2) (2021-10-16)
+
+### Features
+
+-   add `init` command ([588e956](https://github.com/sapphiredev/cli/commit/588e956eeb9867be1e16db9bcd962fd72864d8fc))
+-   add JSON scheme for CLI config ([1ca569b](https://github.com/sapphiredev/cli/commit/1ca569b8ed89a869af3d5e39c6f1f4cc988edf08))
+-   add prompt for `init` command ([67d5a10](https://github.com/sapphiredev/cli/commit/67d5a106c66df3235260810ac6770234a7e7f2fc))
+-   category support ([0498b31](https://github.com/sapphiredev/cli/commit/0498b3125767b1b37614e50795402dbb8d72627e))
+-   switch to commander ([#15](https://github.com/sapphiredev/cli/issues/15)) ([8f34fa8](https://github.com/sapphiredev/cli/commit/8f34fa8323a6dfdb79abf2ebaf7fdd4d17f3df4b))
+-   YAML support ([#17](https://github.com/sapphiredev/cli/issues/17)) ([f69ae95](https://github.com/sapphiredev/cli/commit/f69ae959b664a3aa4342cf67c27802e197505c08))
+
+### Bug Fixes
+
+-   add timeout when finding the config file ([46e3e21](https://github.com/sapphiredev/cli/commit/46e3e21e2b3e0d431e1eeea612a5da9b636ed34a))
+-   create the config file on project root instead of the current folder ([aa3b352](https://github.com/sapphiredev/cli/commit/aa3b352aa22b7cecb2117ced37f8e33202fa492b))
+-   include `templates` directory in the npm package ([c85406f](https://github.com/sapphiredev/cli/commit/c85406f9e9ba764a8063f5b7af458eb8b8f23924))
+-   path and executable issues on Windows ([f317d7f](https://github.com/sapphiredev/cli/commit/f317d7f35d39d388798e6250d79915e7cfdfa23a))
+-   **templates:** typescript types ([3812b34](https://github.com/sapphiredev/cli/commit/3812b34f7467e30624c7993a64366d2cb0821ac9))
+
+### 0.0.1 (2021-09-23)
+
+### Features
+
+-   add a function to check if a command exists ([107ccee](https://github.com/sapphiredev/cli/commit/107ccee0b55b3ddf6261d177d6b0b5730512811c))
+-   add command: `generate` ([b14a965](https://github.com/sapphiredev/cli/commit/b14a965548f5548ce7ac5e0e53d23c85ca827da2))
+-   add command: `new` ([4afa8cd](https://github.com/sapphiredev/cli/commit/4afa8cdaf122bac4bc7b16a8f18a9bda40663d4c))
+-   add command: `new` ([ffe5a69](https://github.com/sapphiredev/cli/commit/ffe5a695c0126523a4c9e79ea4817542023de193))
+-   add function to create files using templates ([e95db50](https://github.com/sapphiredev/cli/commit/e95db50555a9f02e241bea9753506e12a14b0395))
+-   add path aliases ([1b65110](https://github.com/sapphiredev/cli/commit/1b65110d0135f4ee9a064d8ac6f130f06ec8ab4c))
+-   add PWSH script for Windows ([c69c55f](https://github.com/sapphiredev/cli/commit/c69c55f44f39b6d1984adaded486e29759118375))
+-   add templates for `generate` command ([be6f535](https://github.com/sapphiredev/cli/commit/be6f53583ecba3d959a76a12310ff3d80cbd52dd))
+-   update batch file for Windows Command Prompt ([746ab83](https://github.com/sapphiredev/cli/commit/746ab838bc668c863a8fc6b2d9632e4c5790acdc))
+-   update config template ([65c47a0](https://github.com/sapphiredev/cli/commit/65c47a0728f4652b725b37ebcf758fb60155de7c))
+-   use new template format ([1adcbeb](https://github.com/sapphiredev/cli/commit/1adcbeb39678fbbfe6ea119dd9586d3a022cbc11))
+
+### Bug Fixes
+
+-   language value was not getting replaced when creating the `.sapphirerc.json` file from template ([946a40a](https://github.com/sapphiredev/cli/commit/946a40a4365411c2f20a1ed8806e0057c0afbc56))

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,62 @@
 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 '@favware/colorette-spinner';
+import { Result } 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 });
+        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);
+    }
+    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)))
     });
-    spinner.succeed();
-    return console.log(blueBright('Done!'));
 };
 //# 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,120 +1,86 @@
-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 { PromptNew } from '#prompts/PromptNew';
+import { Spinner } from '@favware/colorette-spinner';
+import { Result } 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 Result.fromAsync(() => writeFile(pjLocation, JSON.stringify(output, null, 2)));
+    return result.isOk();
 }
-function installDeps(location, pm, verbose) {
-    const pmp = spawn(process.platform === 'win32' ? `${pm.toLowerCase()}.cmd` : pm.toLowerCase(), ['install'], {
+async function installDeps(location, pm, verbose) {
+    const value = await 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 (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 configureYarnRc(location) {
-    return (name, value) => {
-        return new Promise((resolve, reject) => {
-            return exec(`yarn config set ${name} ${value}`, { cwd: `./${location}/` }, (e) => {
-                if (e)
-                    return reject(e);
-                return resolve(true);
-            });
-        });
-    };
+async function configureYarnRc(location, name, value) {
+    await execa('yarn', ['config', 'set', name, value], { cwd: `./${location}/` });
+    return true;
 }
-function installYarnV3(location, verbose) {
-    const yarnProcess = spawn('yarn', ['set', 'version', 'berry'], {
+async function installYarnV3(location, verbose) {
+    const value = await execa('yarn', ['set', 'version', 'berry'], {
         stdio: verbose ? 'inherit' : undefined,
         cwd: `./${location}/`
     });
-    return new Promise((resolve, reject) => {
-        yarnProcess.on('error', reject);
-        yarnProcess.on('exit', async (code) => {
-            if (code === 0) {
-                const configure = configureYarnRc(location);
-                await Promise.all([configure('enableGlobalCache', 'true'), configure('nodeLinker', 'node-modules')]).catch(reject);
-                resolve(true);
-            }
-            else {
-                reject(new Error('An unknown error occured while installing Yarn v3. Try running Sapphire CLI with "--verbose" flag.'));
-            }
-        });
-    });
+    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;
 }
-function installYarnTypescriptPlugin(location) {
-    return new Promise((resolve, reject) => {
-        return exec('yarn plugin import typescript', { cwd: `./${location}/` }, (e) => {
-            if (!e)
-                return resolve(true);
-            return reject(e);
-        });
-    });
+async function installYarnTypescriptPlugin(location) {
+    await execa('yarn', ['plugin', 'import', 'typescript'], { cwd: `./${location}/` });
+    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 initializeGitRepo(location) {
+    await execa('git', ['init'], { 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 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;
+        }
     });
 }
-function cloneRepo(location, verbose) {
-    const git = spawn('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.'));
-        });
-    });
+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;
 }
 export default async (name, flags) => {
     const response = await prompts(PromptNew(name, await CommandExists('yarn')));
@@ -153,5 +119,6 @@ export default async (name, flags) => {
         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 { Result } 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 Result.fromAsync(() => access(command, constants.X_OK));
+    return result.isErr();
 }
-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}`;
     }
-    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)));
-            }
-        });
+    const result = await Result.fromAsync(() => execa('which', [command]));
+    return result.match({
+        err: () => false,
+        ok: (value) => Boolean(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 Result.fromAsync(async () => execa('where', [cleanWindowsCommand(command)]));
+    return result.match({
+        err: () => fileExists(command),
+        ok: () => 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 { 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();
+}
+//# sourceMappingURL=FileExists.js.map

package/package.json

@@ -1,118 +1,121 @@
 {
-	"name": "@sapphire/cli",
-	"version": "1.2.0-next.4c47d1a.0",
-	"description": "CLI for Sapphire Framework",
-	"author": "@sapphire",
-	"license": "MIT",
-	"type": "module",
-	"main": "dist/cli.js",
-	"bin": {
-		"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"
-	},
-	"sideEffects": "false",
-	"files": [
-		"dist",
-		"!dist/*.tsbuildinfo",
-		"!dist/**/*.js.map",
-		"!dist/**/*.d.ts",
-		"!dist/**/*.d.ts.map",
-		"templates"
-	],
-	"scripts": {
-		"lint": "eslint src --ext ts --fix",
-		"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",
-		"prepublishOnly": "yarn build",
-		"prepare": "husky install .github/husky"
-	},
-	"dependencies": {
-		"chalk": "^4.1.2",
-		"commander": "^9.0.0",
-		"find-up": "^5.0.0",
-		"ora": "^6.0.1",
-		"prompts": "^2.4.2",
-		"tslib": "^2.3.1",
-		"yaml": "^1.10.2"
-	},
-	"devDependencies": {
-		"@commitlint/cli": "^16.2.1",
-		"@commitlint/config-conventional": "^16.2.1",
-		"@favware/npm-deprecate": "^1.0.4",
-		"@sapphire/eslint-config": "^4.2.1",
-		"@sapphire/prettier-config": "^1.3.0",
-		"@sapphire/ts-config": "^3.3.1",
-		"@types/node": "^17.0.8",
-		"@types/prompts": "^2.0.14",
-		"@typescript-eslint/eslint-plugin": "^5.12.0",
-		"@typescript-eslint/parser": "^5.12.0",
-		"cz-conventional-changelog": "^3.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.4",
-		"prettier": "^2.5.1",
-		"pretty-quick": "^3.1.3",
-		"standard-version": "^9.3.2",
-		"ts-node": "^10.5.0",
-		"typescript": "^4.5.5"
-	},
-	"engines": {
-		"node": ">=v16.6.0",
-		"npm": ">=7.0.0"
-	},
-	"keywords": [
-		"@sapphire/cli",
-		"bot",
-		"typescript",
-		"ts",
-		"yarn",
-		"discord",
-		"sapphire",
-		"discordjs"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/sapphiredev/cli.git"
-	},
-	"bugs": {
-		"url": "https://github.com/sapphiredev/cli/issues"
-	},
-	"homepage": "https://www.sapphirejs.dev",
-	"commitlint": {
-		"extends": [
-			"@commitlint/config-conventional"
-		]
-	},
-	"lint-staged": {
-		"*.{mjs,js,ts}": "eslint --fix --ext mjs,js,ts"
-	},
-	"config": {
-		"commitizen": {
-			"path": "./node_modules/cz-conventional-changelog"
-		}
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"resolutions": {
-		"ansi-regex": "^5.0.1"
-	},
-	"prettier": "@sapphire/prettier-config",
-	"packageManager": "yarn@3.2.0"
-}
+  "name": "@sapphire/cli",
+  "version": "1.2.1-next.00d2a50.0",
+  "description": "CLI for Sapphire Framework",
+  "author": "@sapphire",
+  "license": "MIT",
+  "type": "module",
+  "main": "dist/cli.js",
+  "bin": {
+    "sapphire": "./dist/cli.js"
+  },
+  "imports": {
+    "#prompts/*": "./dist/prompts/*.js",
+    "#functions/*": "./dist/functions/*.js",
+    "#commands/*": "./dist/commands/*.js",
+    "#constants": "./dist/constants.js"
+  },
+  "sideEffects": "false",
+  "files": [
+    "dist",
+    "!dist/*.tsbuildinfo",
+    "!dist/**/*.js.map",
+    "!dist/**/*.d.ts",
+    "!dist/**/*.d.ts.map",
+    "templates"
+  ],
+  "scripts": {
+    "lint": "eslint src --ext ts --fix",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "update": "yarn upgrade-interactive",
+    "build": "tsc -b src",
+    "clean": "tsc -b src --clean",
+    "watch": "tsc -b src -w",
+    "bump": "cliff-jumper",
+    "check-update": "cliff-jumper --dry-run",
+    "_postinstall": "husky install .github/husky",
+    "prepack": "yarn build && pinst --disable",
+    "postpack": "pinst --enable"
+  },
+  "dependencies": {
+    "@favware/colorette-spinner": "^1.0.0",
+    "@sapphire/result": "^2.0.1",
+    "colorette": "^2.0.19",
+    "commander": "^9.4.0",
+    "execa": "^6.1.0",
+    "find-up": "^5.0.0",
+    "js-yaml": "^4.1.0",
+    "prompts": "^2.4.2",
+    "tslib": "^2.4.0"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^17.0.3",
+    "@commitlint/config-conventional": "^17.0.3",
+    "@favware/cliff-jumper": "^1.8.5",
+    "@favware/npm-deprecate": "^1.0.4",
+    "@sapphire/eslint-config": "^4.3.7",
+    "@sapphire/prettier-config": "^1.4.3",
+    "@sapphire/ts-config": "^3.3.4",
+    "@types/js-yaml": "^4.0.5",
+    "@types/node": "^18.0.1",
+    "@types/prompts": "^2.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.30.6",
+    "@typescript-eslint/parser": "^5.30.6",
+    "cz-conventional-changelog": "^3.3.0",
+    "eslint": "^8.20.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "globby": "^13.1.2",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "pinst": "^3.0.0",
+    "prettier": "^2.7.1",
+    "pretty-quick": "^3.1.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4"
+  },
+  "resolutions": {
+    "ansi-regex": "^5.0.1",
+    "minimist": "^1.2.6"
+  },
+  "engines": {
+    "node": ">=v16.6.0",
+    "npm": ">=7.0.0"
+  },
+  "keywords": [
+    "@sapphire/cli",
+    "bot",
+    "typescript",
+    "ts",
+    "yarn",
+    "discord",
+    "sapphire",
+    "discordjs"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sapphiredev/cli.git"
+  },
+  "bugs": {
+    "url": "https://github.com/sapphiredev/cli/issues"
+  },
+  "homepage": "https://www.sapphirejs.dev",
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "lint-staged": {
+    "*.{mjs,js,ts}": "eslint --fix --ext mjs,js,ts"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "prettier": "@sapphire/prettier-config",
+  "packageManager": "yarn@3.2.1"
+}

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