@sapphire/cli 1.2.1-next.b7ba03c.0 → 1.2.1-next.d253e1c.0

package/dist/commands/generate.js

@@ -2,7 +2,7 @@ import { componentsFolder } from '#constants';
 import { CreateFileFromTemplate } from '#functions/CreateFileFromTemplate';
 import { fileExists } from '#functions/FileExists';
 import { Spinner } from '@favware/colorette-spinner';
-import { fromAsync, isErr } from '@sapphire/result';
+import { Result } from '@sapphire/result';
 import { blueBright, red } from 'colorette';
 import findUp from 'find-up';
 import { load } from 'js-yaml';
@@ -38,8 +38,7 @@ export default async (component, name) => {
     const spinner = new Spinner(`Creating a ${component.toLowerCase()}`).start();
     const fail = (error, additionalExecution) => {
         spinner.error({ text: error });
-        if (additionalExecution)
-            additionalExecution();
+        additionalExecution?.();
         process.exit(1);
     };
     const configLoc = await fetchConfig();
@@ -50,12 +49,14 @@ export default async (component, name) => {
     if (!config) {
         return fail("Can't parse the Sapphire CLI config.");
     }
-    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);
+    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

package/dist/commands/new.js

@@ -4,7 +4,7 @@ import { CreateFileFromTemplate } from '#functions/CreateFileFromTemplate';
 import { fileExists } from '#functions/FileExists';
 import { PromptNew } from '#prompts/PromptNew';
 import { Spinner } from '@favware/colorette-spinner';
-import { fromAsync, isErr, isOk } from '@sapphire/result';
+import { Result } from '@sapphire/result';
 import { blueBright, red } from 'colorette';
 import { execa } from 'execa';
 import { cp, readFile, rm, writeFile } from 'node:fs/promises';
@@ -16,18 +16,15 @@ async function editPackageJson(location, name) {
     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);
+    const result = await Result.fromAsync(() => writeFile(pjLocation, JSON.stringify(output, null, 2)));
+    return result.isOk();
 }
 async function installDeps(location, pm, verbose) {
-    const result = await fromAsync(() => execa(pm.toLowerCase(), ['install'], {
+    const value = await execa(pm.toLowerCase(), ['install'], {
         stdio: verbose ? 'inherit' : undefined,
         cwd: `./${location}/`
-    }));
-    if (isErr(result)) {
-        throw result.error;
-    }
-    if (result.value.exitCode !== 0) {
+    });
+    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'}`;
@@ -41,14 +38,11 @@ async function configureYarnRc(location, name, value) {
     return true;
 }
 async function installYarnV3(location, verbose) {
-    const result = await fromAsync(() => execa('yarn', ['set', 'version', 'berry'], {
+    const value = await execa('yarn', ['set', 'version', 'berry'], {
         stdio: verbose ? 'inherit' : undefined,
         cwd: `./${location}/`
-    }));
-    if (isErr(result)) {
-        throw result.error;
-    }
-    if (result.value.exitCode !== 0) {
+    });
+    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([
@@ -68,23 +62,22 @@ async function initializeGitRepo(location) {
 }
 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;
+    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 result = await fromAsync(async () => execa('git', ['clone', repoUrl, `${location}/ghr`], {
-        stdio: verbose ? 'inherit' : undefined
-    }));
-    if (isErr(result)) {
-        throw result.error;
-    }
-    if (result.value.exitCode !== 0) {
+    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;

package/dist/functions/CommandExists.js

@@ -22,14 +22,14 @@
     SOFTWARE.
 */
 import { fileExists } from '#functions/FileExists';
-import { fromAsync, isErr } from '@sapphire/result';
+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';
 async function isExecutable(command) {
-    const result = await fromAsync(() => access(command, constants.X_OK));
-    return isErr(result);
+    const result = await Result.fromAsync(() => access(command, constants.X_OK));
+    return result.isErr();
 }
 function cleanWindowsCommand(input) {
     if (/[^A-Za-z0-9_\/:=-]/.test(input)) {
@@ -44,22 +44,22 @@ async function commandExistsUnix(command) {
             return true;
         }
     }
-    const result = await fromAsync(() => execa('which', [command]));
-    if (isErr(result)) {
-        return false;
-    }
-    return Boolean(result.value.stdout);
+    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 fromAsync(async () => execa('where', [cleanWindowsCommand(command)]));
-    if (isErr(result)) {
-        return fileExists(command);
-    }
-    return true;
+    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);

package/dist/functions/FileExists.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapphire/cli",
-  "version": "1.2.1-next.b7ba03c.0",
+  "version": "1.2.1-next.d253e1c.0",
   "description": "CLI for Sapphire Framework",
   "author": "@sapphire",
   "license": "MIT",
@@ -39,9 +39,9 @@
   },
   "dependencies": {
     "@favware/colorette-spinner": "^1.0.0",
-    "@sapphire/result": "^1.1.1",
+    "@sapphire/result": "^2.0.1",
     "colorette": "^2.0.19",
-    "commander": "^9.3.0",
+    "commander": "^9.4.0",
     "execa": "^6.1.0",
     "find-up": "^5.0.0",
     "js-yaml": "^4.1.0",
@@ -57,12 +57,12 @@
     "@sapphire/prettier-config": "^1.4.3",
     "@sapphire/ts-config": "^3.3.4",
     "@types/js-yaml": "^4.0.5",
-    "@types/node": "^17.0.33",
-    "@types/prompts": "^2.0.14",
-    "@typescript-eslint/eslint-plugin": "^5.30.3",
-    "@typescript-eslint/parser": "^5.30.3",
+    "@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.19.0",
+    "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "globby": "^13.1.2",
@@ -71,7 +71,7 @@
     "pinst": "^3.0.0",
     "prettier": "^2.7.1",
     "pretty-quick": "^3.1.3",
-    "ts-node": "^10.8.2",
+    "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
   "resolutions": {