@eik/cli 3.1.3 → 3.1.5

package/commands/version.js

@@ -1,107 +1,99 @@
-import { execSync } from 'child_process';
-import { join } from 'path';
-import ora from 'ora';
-import VersionPackage from '../classes/version.js';
-import { logger, getDefaults } from '../utils/index.js';
-import json from '../utils/json/index.js';
+import { execSync } from "child_process";
+import { join } from "path";
+import VersionPackage from "../classes/version.js";
+import json from "../utils/json/index.js";
+import { EikCliError, errors } from "../utils/error.js";
+import { commandHandler } from "../utils/command-handler.js";
 
-export const command = 'version [level]';
+export const command = "version [level]";
 
-export const describe = `Compares local files with files on server and increments "version" field in eik.json if necessary.`;
+export const describe =
+	'Compare local files with files on server and increment "version" field if different';
 
+/** @type {import('yargs').CommandBuilder} */
 export const builder = (yargs) => {
-    yargs.positional('level', {
-        describe: 'Semver level to increment version by',
-        default: 'patch',
-        type: 'string',
-        choices: ['major', 'minor', 'patch'],
-    });
-
-    yargs.options({
-        dryRun: {
-            alias: 'd',
-            describe:
-                'Terminates the publish early (before upload) and provides information about created bundles for inspection.',
-            default: false,
-            type: 'boolean',
-        },
-    });
-
-    yargs.example(`eik version`);
-    yargs.example(`eik version minor`);
+	return yargs
+		.positional("level", {
+			describe: "Semver level to increment version by",
+			default: "patch",
+			type: "string",
+			choices: ["major", "minor", "patch"],
+		})
+		.options({
+			dryRun: {
+				alias: "d",
+				describe: "Log details about the operation and skip upload",
+				type: "boolean",
+			},
+		})
+		.example("eik version")
+		.example("eik version minor")
+		.example("eik version --dry-run");
 };
 
-export const handler = async (argv) => {
-    const spinner = ora({ stream: process.stdout }).start('working...');
-    const { level, debug, dryRun, cwd, config } = argv;
-    // @ts-expect-error
-    const { name, version, server, map, out, files } = getDefaults(
-        config || cwd,
-    );
-
-    try {
-        const log = logger(spinner, debug);
+export const handler = commandHandler(
+	{ command, options: ["server"] },
+	async (argv, log) => {
+		const { level, dryRun, cwd, name, version, server, map, out, files } = argv;
 
-        const options = {
-            logger: log,
-            name,
-            server,
-            version,
-            cwd,
-            level,
-            map,
-            out,
-            files,
-        };
+		const options = {
+			logger: log,
+			name,
+			server,
+			version,
+			cwd,
+			level,
+			map,
+			out,
+			files,
+		};
 
-        const newVersion = await new VersionPackage(options).run();
+		const newVersion = await new VersionPackage(options).run();
 
-        if (dryRun) {
-            log.info(
-                `Dry Run: new version needed, determined new version to be ${newVersion}`,
-            );
-        } else {
-            log.debug(`Writing new version ${newVersion} to eik.json`);
-            // @ts-expect-error
-            await json.writeEik({ version: newVersion }, { cwd });
+		if (dryRun) {
+			log.info(
+				`Dry Run: new version needed, determined new version to be ${newVersion}`,
+			);
+		} else {
+			log.debug(`Writing new version ${newVersion} to eik.json`);
+			// @ts-expect-error
+			await json.writeEik({ version: newVersion }, { cwd });
 
-            log.debug(`Committing eik.json to local git repository`);
-            try {
-                execSync(`git add ${join(cwd, 'eik.json')}`);
-                log.debug(`  ==> stage: ${join(cwd, 'eik.json')}`);
-            } catch (err) {
-                throw new Error(
-                    'Failed to stage file "eik.json". Is this directory (or any parent directories) a git repository?',
-                );
-            }
+			log.debug(`Committing eik.json to local git repository`);
+			try {
+				execSync(`git add ${join(cwd, "eik.json")}`);
+				log.debug(`  ==> stage: ${join(cwd, "eik.json")}`);
+			} catch (err) {
+				throw new EikCliError(
+					errors.ERR_NOT_GIT,
+					'Failed to stage file "eik.json". Is this directory (or any parent directories) a git repository?',
+					err,
+				);
+			}
 
-            try {
-                execSync(
-                    `git commit -m "build(assets): version eik.json to v${newVersion} [skip ci]"`,
-                    {
-                        env: {
-                            GIT_AUTHOR_NAME: 'Eik Cli',
-                            GIT_AUTHOR_EMAIL: 'eik@eik.dev',
-                            GIT_COMMITTER_NAME: 'Eik Cli',
-                            GIT_COMMITTER_EMAIL: 'eik@eik.dev',
-                        },
-                        stdio: 'ignore',
-                    },
-                );
-                log.debug(`  ==> commit`);
+			try {
+				execSync(
+					`git commit -m "build(assets): version eik.json to v${newVersion} [skip ci]"`,
+					{
+						env: {
+							GIT_AUTHOR_NAME: "Eik Cli",
+							GIT_AUTHOR_EMAIL: "eik@eik.dev",
+							GIT_COMMITTER_NAME: "Eik Cli",
+							GIT_COMMITTER_EMAIL: "eik@eik.dev",
+						},
+						stdio: "ignore",
+					},
+				);
+				log.debug(`  ==> commit`);
 
-                log.info(`New version ${newVersion} written back to eik.json`);
-            } catch (err) {
-                throw new Error('Failed to commit changes to file "eik.json".');
-            }
-        }
-
-        spinner.text = '';
-        spinner.stopAndPersist();
-        process.exit();
-    } catch (err) {
-        spinner.warn(err.message);
-        spinner.text = '';
-        spinner.stopAndPersist();
-    }
-};
+				log.info(`New version ${newVersion} written back to eik.json`);
+			} catch (err) {
+				throw new EikCliError(
+					errors.ERR_GIT_COMMIT,
+					'Failed to commit changes to file "eik.json".',
+					err,
+				);
+			}
+		}
+	},
+);

package/formatters/alias.js

@@ -1,82 +1,79 @@
-import { join } from 'path';
-import chalk from 'chalk';
-import File from './file.js';
+import { join } from "path";
+import chalk from "chalk";
+import File from "./file.js";
 
 function colorType(type) {
-    if (type === 'npm') {
-        return chalk.white.bgRed.bold(' NPM ');
-    }
+	if (type === "npm") {
+		return chalk.white.bgRed.bold(" NPM ");
+	}
 
-    if (type === 'pkg') {
-        return chalk.white.bgYellow.bold(' PACKAGE ');
-    }
+	if (type === "pkg") {
+		return chalk.white.bgYellow.bold(" PACKAGE ");
+	}
 
-    if (type === 'img') {
-        return chalk.white.bgYellow.bold(' IMAGE ');
-    }
+	if (type === "img") {
+		return chalk.white.bgYellow.bold(" IMAGE ");
+	}
 
-    return chalk.white.bgBlue.bold(' IMPORT MAP ');
+	return chalk.white.bgBlue.bold(" IMPORT MAP ");
 }
 
 class Alias {
-    constructor({
-        type = '',
-        name = '',
-        alias = '',
-        version = '',
-        update = false,
-        files = [],
-        org = '',
-        integrity = '',
-    } = {}) {
-        this.type = type;
-        this.name = name;
-        this.org = org;
-        this.alias = alias;
-        this.version = version;
-        this.files = files;
-        this.update = update;
-        this.integrity = integrity;
-    }
+	constructor({
+		type = "",
+		name = "",
+		alias = "",
+		version = "",
+		update = false,
+		files = [],
+		org = "",
+		integrity = "",
+	} = {}) {
+		this.type = type;
+		this.name = name;
+		this.org = org;
+		this.alias = alias;
+		this.version = version;
+		this.files = files;
+		this.update = update;
+		this.integrity = integrity;
+	}
 
-    format(baseURL = '') {
-        const write = process.stdout.write.bind(process.stdout);
-        const url = new URL(
-            join(this.type, this.name, `v${this.alias}`),
-            baseURL,
-        );
+	format(baseURL = "") {
+		const write = process.stdout.write.bind(process.stdout);
+		const url = new URL(join(this.type, this.name, `v${this.alias}`), baseURL);
 
-        write(`:: `);
+		write(`:: `);
 
-        write(`${colorType(this.type)} > ${chalk.green(this.name)} | `);
-        write(`${chalk.bold('org:')} ${this.org} | `);
-        write(`${chalk.bold('version:')} ${this.version} | `);
-        write(`${chalk.bold('alias:')} v${this.alias} `);
+		write(`${colorType(this.type)} > ${chalk.green(this.name)} | `);
+		write(`${chalk.bold("org:")} ${this.org} | `);
+		write(`${chalk.bold("version:")} ${this.version} | `);
+		write(`${chalk.bold("alias:")} v${this.alias} `);
 
-        if (this.update) {
-            write(`${chalk.bgMagenta.white(' UPDATED \n\n')}`);
-        } else {
-            write(`${chalk.bgGreen.white(' NEW ')}\n\n`);
-        }
+		if (this.update) {
+			write(`${chalk.bgMagenta.white(" UPDATED \n\n")}`);
+		} else {
+			write(`${chalk.bgGreen.white(" NEW ")}\n\n`);
+		}
 
-        if (url.href) {
-            write(`   ${chalk.bold('url:      ')} ${chalk.cyan(url.href)}\n`);
-        }
+		if (url.href) {
+			write(`   ${chalk.bold("url:      ")} ${chalk.cyan(url.href)}\n`);
+		}
 
-        if (this.integrity) {
-            write(`   ${chalk.bold('integrity:')} ${this.integrity}\n`);
-        }
+		if (this.integrity) {
+			write(`   ${chalk.bold("integrity:")} ${this.integrity}\n`);
+		}
 
-        if (this.files.length) {
-            write(`\n   ${chalk.bold('files:')}\n`);
-        }
+		if (this.files.length) {
+			write(`\n   ${chalk.bold("files:")}\n`);
+		}
 
-        for (const file of this.files) {
-            new File(file).format(url.href);
-            write(`\n`);
-        }
-        write(`\n`);
-    }
+		for (const file of this.files) {
+			new File(file).format(url.href);
+			write(`\n`);
+		}
+		write(`\n`);
+	}
 }
 
 export default Alias;

package/formatters/artifact.js

@@ -1,89 +1,89 @@
-import { join } from 'path';
-import chalk from 'chalk';
-import Version from './version.js';
+import { join } from "path";
+import chalk from "chalk";
+import Version from "./version.js";
 
-const _name = Symbol('name');
-const _type = Symbol('type');
-const _org = Symbol('org');
-const _versions = Symbol('versions');
+const _name = Symbol("name");
+const _type = Symbol("type");
+const _org = Symbol("org");
+const _versions = Symbol("versions");
 
 function colorType(type) {
-    if (type === 'npm') {
-        return chalk.white.bgRed.bold(' NPM ');
-    }
+	if (type === "npm") {
+		return chalk.white.bgRed.bold(" NPM ");
+	}
 
-    if (type === 'pkg') {
-        return chalk.white.bgYellow.bold(' PACKAGE ');
-    }
+	if (type === "pkg") {
+		return chalk.white.bgYellow.bold(" PACKAGE ");
+	}
 
-    if (type === 'img') {
-        return chalk.white.bgYellow.bold(' IMAGE ');
-    }
+	if (type === "img") {
+		return chalk.white.bgYellow.bold(" IMAGE ");
+	}
 
-    return chalk.white.bgBlue.bold(' IMPORT MAP ');
+	return chalk.white.bgBlue.bold(" IMPORT MAP ");
 }
 
 class Artifact {
-    constructor({ type = '', name = '', org = '', versions = [] } = {}) {
-        this.type = type;
-        this.name = name;
-        this.org = org;
-        this.versions = versions;
-    }
-
-    get type() {
-        return this[_type];
-    }
-
-    set type(type) {
-        this[_type] = type;
-    }
-
-    get name() {
-        return this[_name];
-    }
-
-    set name(name) {
-        this[_name] = name;
-    }
-
-    get org() {
-        return this[_org];
-    }
-
-    set org(org) {
-        this[_org] = org;
-    }
-
-    get versions() {
-        return this[_versions];
-    }
-
-    set versions(versions) {
-        const v = [];
-        for (const version of versions) {
-            v.push(new Version(version, this.baseURL));
-        }
-        this[_versions] = v;
-    }
-
-    format(baseURL = '') {
-        const write = process.stdout.write.bind(process.stdout);
-        const url = new URL(join(this.type, this.name), baseURL);
-
-        write(`:: ${colorType(this.type)} > ${chalk.green(this.name)} | `);
-        write(`${chalk.bold('org:')} ${this.org} | `);
-        write(`${chalk.bold('url:')} ${chalk.cyan(url.href)}\n`);
-
-        if (this.versions.length) {
-            write(`\n   ${chalk.bold('versions:')}\n`);
-        }
-
-        for (const version of this.versions) {
-            version.format(url.href);
-            write(`\n`);
-        }
-    }
+	constructor({ type = "", name = "", org = "", versions = [] } = {}) {
+		this.type = type;
+		this.name = name;
+		this.org = org;
+		this.versions = versions;
+	}
+
+	get type() {
+		return this[_type];
+	}
+
+	set type(type) {
+		this[_type] = type;
+	}
+
+	get name() {
+		return this[_name];
+	}
+
+	set name(name) {
+		this[_name] = name;
+	}
+
+	get org() {
+		return this[_org];
+	}
+
+	set org(org) {
+		this[_org] = org;
+	}
+
+	get versions() {
+		return this[_versions];
+	}
+
+	set versions(versions) {
+		const v = [];
+		for (const version of versions) {
+			v.push(new Version(version, this.baseURL));
+		}
+		this[_versions] = v;
+	}
+
+	format(baseURL = "") {
+		const write = process.stdout.write.bind(process.stdout);
+		const url = new URL(join(this.type, this.name), baseURL);
+
+		write(`:: ${colorType(this.type)} > ${chalk.green(this.name)} | `);
+		write(`${chalk.bold("org:")} ${this.org} | `);
+		write(`${chalk.bold("url:")} ${chalk.cyan(url.href)}\n`);
+
+		if (this.versions.length) {
+			write(`\n   ${chalk.bold("versions:")}\n`);
+		}
+
+		for (const version of this.versions) {
+			version.format(url.href);
+			write(`\n`);
+		}
+	}
 }
 
 export default Artifact;

package/formatters/file.js

@@ -1,35 +1,35 @@
-import { join } from 'path';
-import chalk from 'chalk';
+import { join } from "path";
+import chalk from "chalk";
 
 function readableBytes(bytes) {
-    const i = Math.floor(Math.log(bytes) / Math.log(1024)),
-        sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-    return (bytes / 1024 ** i).toFixed(2) * 1 + ' ' + sizes[i];
+	const i = Math.floor(Math.log(bytes) / Math.log(1024)),
+		sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+	return (bytes / 1024 ** i).toFixed(2) * 1 + " " + sizes[i];
 }
 
 class File {
-    constructor({
-        pathname = '',
-        mimeType = '',
-        size = null,
-        integrity = '',
-    } = {}) {
-        this.pathname = pathname;
-        this.mimeType = mimeType;
-        this.size = size;
-        this.integrity = integrity;
-    }
+	constructor({
+		pathname = "",
+		mimeType = "",
+		size = null,
+		integrity = "",
+	} = {}) {
+		this.pathname = pathname;
+		this.mimeType = mimeType;
+		this.size = size;
+		this.integrity = integrity;
+	}
 
-    format(baseURL = '') {
-        const write = process.stdout.write.bind(process.stdout);
-        const url = new URL(baseURL);
+	format(baseURL = "") {
+		const write = process.stdout.write.bind(process.stdout);
+		const url = new URL(baseURL);
 
-        const fileUrl = new URL(join(url.pathname, this.pathname), url.origin);
-        write(`     - ${chalk.cyan(fileUrl.href)} `);
-        write(`${chalk.yellow(this.mimeType)} `);
-        write(`${chalk.magenta(readableBytes(this.size))}\n`);
-        write(`       ${chalk.bold('integrity:')} ${this.integrity}\n`);
-    }
+		const fileUrl = new URL(join(url.pathname, this.pathname), url.origin);
+		write(`     - ${chalk.cyan(fileUrl.href)} `);
+		write(`${chalk.yellow(this.mimeType)} `);
+		write(`${chalk.magenta(readableBytes(this.size))}\n`);
+		write(`       ${chalk.bold("integrity:")} ${this.integrity}\n`);
+	}
 }
 
 export default File;

package/formatters/index.js

@@ -1,6 +1,6 @@
-import Artifact from './artifact.js';
-import Alias from './alias.js';
-import File from './file.js';
-import Version from './version.js';
+import Artifact from "./artifact.js";
+import Alias from "./alias.js";
+import File from "./file.js";
+import Version from "./version.js";
 
 export { Artifact, Alias, Version, File };