@eik/cli 3.1.2 → 3.1.4

package/utils/http/latest-version.js

@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join } from "path";
 
 /**
  * Fetches the latest version from an Eik server of a package by name, optionally restricting the lookup to a specified semver major version
@@ -12,44 +12,44 @@ import { join } from 'path';
  * @throws Error
  */
 export default async (server, type, name, major) => {
-    const url = new URL(`${join(type, name)}?t=${Date.now()}`, server);
-    const res = await fetch(url);
-    if (!res.ok) {
-        if (res.status === 404) {
-            return null;
-        }
-        throw new Error('Server responded with non 200 status code.');
-    }
+	const url = new URL(`${join(type, name)}?t=${Date.now()}`, server);
+	const res = await fetch(url);
+	if (!res.ok) {
+		if (res.status === 404) {
+			return null;
+		}
+		throw new Error("Server responded with non 200 status code.");
+	}
 
-    let body;
-    try {
-        body = await res.json();
-    } catch (err) {
-        throw new Error(
-            'An error occurred while attempting to parse json response from server.',
-        );
-    }
+	let body;
+	try {
+		body = await res.json();
+	} catch (err) {
+		throw new Error(
+			"An error occurred while attempting to parse json response from server.",
+		);
+	}
 
-    let versions;
-    try {
-        versions = new Map(body.versions);
-    } catch (err) {
-        throw new Error(
-            'An error occurred while attempting to create an internal versions map. The JSON returned from the server is most likely invalid.',
-        );
-    }
+	let versions;
+	try {
+		versions = new Map(body.versions);
+	} catch (err) {
+		throw new Error(
+			"An error occurred while attempting to create an internal versions map. The JSON returned from the server is most likely invalid.",
+		);
+	}
 
-    const highestMajor = Math.max(...versions.keys());
-    if (Number.isNaN(highestMajor)) {
-        throw new Error(
-            'An error occurred while attempting to get the highest major version from the internal versions map.',
-        );
-    }
+	const highestMajor = Math.max(...versions.keys());
+	if (Number.isNaN(highestMajor)) {
+		throw new Error(
+			"An error occurred while attempting to get the highest major version from the internal versions map.",
+		);
+	}
 
-    try {
-        const entry = versions.get(Number(major || highestMajor));
-        return entry.version;
-    } catch (err) {
-        return null;
-    }
+	try {
+		const entry = versions.get(Number(major || highestMajor));
+		return entry.version;
+	} catch (err) {
+		return null;
+	}
 };

package/utils/http/request.js

@@ -1,4 +1,4 @@
-import { readFile } from 'node:fs/promises';
+import { readFile } from "node:fs/promises";
 
 /**
  * @typedef {object} RequestOptions
@@ -21,54 +21,54 @@ import { readFile } from 'node:fs/promises';
  * @throws Error
  */
 async function request(options) {
-    const { method = 'POST', host, pathname, data, file, map, token } = options;
-    const body = new FormData();
-    const headers = new Headers();
+	const { method = "POST", host, pathname, data, file, map, token } = options;
+	const body = new FormData();
+	const headers = new Headers();
 
-    if (data) {
-        for (const [key, value] of Object.entries(data)) {
-            body.set(key, value);
-        }
-    }
+	if (data) {
+		for (const [key, value] of Object.entries(data)) {
+			body.set(key, value);
+		}
+	}
 
-    if (file) {
-        const fileData = await readFile(file);
-        body.set('package', new Blob([fileData]));
-    }
+	if (file) {
+		const fileData = await readFile(file);
+		body.set("package", new Blob([fileData]));
+	}
 
-    if (map) {
-        const mapData = await readFile(map);
-        body.set('map', new Blob([mapData]));
-    }
+	if (map) {
+		const mapData = await readFile(map);
+		body.set("map", new Blob([mapData]));
+	}
 
-    if (token) {
-        headers.set('Authorization', `Bearer ${token}`);
-    }
+	if (token) {
+		headers.set("Authorization", `Bearer ${token}`);
+	}
 
-    try {
-        const url = new URL(pathname, host);
-        url.search = `?t=${Date.now()}`;
+	try {
+		const url = new URL(pathname, host);
+		url.search = `?t=${Date.now()}`;
 
-        const res = await fetch(url, { method, body, headers });
+		const res = await fetch(url, { method, body, headers });
 
-        if (!res.ok) {
-            const err = new Error(
-                `Server responded with a non 200 ok status code. Response: ${res.status}`,
-            );
-            // @ts-ignore
-            err.statusCode = res.status;
-            throw err;
-        }
-        if (res?.headers?.get('content-type')?.includes('application/json')) {
-            return { message: await res.json(), status: res.status };
-        }
-        return { message: await res.text(), status: res.status };
-    } catch (err) {
-        if (!err.statusCode) {
-            err.statusCode = 500;
-        }
-        throw err;
-    }
+		if (!res.ok) {
+			const err = new Error(
+				`Server responded with a non 200 ok status code. Response: ${res.status}`,
+			);
+			// @ts-ignore
+			err.statusCode = res.status;
+			throw err;
+		}
+		if (res?.headers?.get("content-type")?.includes("application/json")) {
+			return { message: await res.json(), status: res.status };
+		}
+		return { message: await res.text(), status: res.status };
+	} catch (err) {
+		if (!err.statusCode) {
+			err.statusCode = 500;
+		}
+		throw err;
+	}
 }
 
 export default request;

package/utils/http/versions.js

@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join } from "path";
 
 /**
  * Fetches package versions by name from a given Eik asset server.
@@ -11,27 +11,27 @@ import { join } from 'path';
  * @throws Error
  */
 export default async (server, type, name) => {
-    const pkg = join(type, name);
-    const url = new URL(pkg, server);
-    url.search = `?t=${Date.now()}`;
+	const pkg = join(type, name);
+	const url = new URL(pkg, server);
+	url.search = `?t=${Date.now()}`;
 
-    const res = await fetch(url);
+	const res = await fetch(url);
 
-    if (!res.ok) {
-        if (res.status === 404) {
-            return null;
-        }
-        throw new Error('Server responded with non 200 status code.');
-    }
+	if (!res.ok) {
+		if (res.status === 404) {
+			return null;
+		}
+		throw new Error("Server responded with non 200 status code.");
+	}
 
-    let body;
-    try {
-        body = await res.json();
-    } catch (err) {
-        throw new Error(
-            'An error occurred while attempting to parse json response from server.',
-        );
-    }
+	let body;
+	try {
+		body = await res.json();
+	} catch (err) {
+		throw new Error(
+			"An error occurred while attempting to parse json response from server.",
+		);
+	}
 
-    return body.versions;
+	return body.versions;
 };

package/utils/index.js

@@ -1,6 +1,6 @@
-import { helpers } from '@eik/common';
-import logger from './logger.js';
-import typeTitle from './type-title.js';
+import { helpers } from "@eik/common";
+import logger from "./logger.js";
+import typeTitle from "./type-title.js";
 
 const { getDefaults, typeSlug } = helpers;
 

package/utils/json/index.js

@@ -1,5 +1,5 @@
-import read from './read.js';
-import write from './write.js';
-import writeEik from './write-eik.js';
+import read from "./read.js";
+import write from "./write.js";
+import writeEik from "./write-eik.js";
 
 export default { read, write, writeEik };

package/utils/json/read.js

@@ -1,6 +1,6 @@
-import assert from 'assert';
-import fs from 'node:fs/promises';
-import { join, isAbsolute } from 'path';
+import assert from "assert";
+import fs from "node:fs/promises";
+import { join, isAbsolute } from "path";
 
 /**
  * Reads a file at a given location, assumes the contents to be JSON and then deserializes into a JavaScript object
@@ -17,27 +17,27 @@ import { join, isAbsolute } from 'path';
  * @example json.read({ filename: './relative/path/to/file.json', cwd: '/path/to/cwd });
  */
 export default async (location) => {
-    if (typeof location !== 'string') {
-        assert(
-            location.filename,
-            'When "location" is not of type "string" then it must be an "object" with property "filename"',
-        );
-    }
-    let cwd = process.cwd();
-    let filename = '';
-    if (typeof location === 'string') {
-        filename = location;
-    } else {
-        filename = location.filename;
-        if (location.cwd) {
-            cwd = location.cwd;
-        }
-    }
-    const path = isAbsolute(filename) ? filename : join(cwd, filename);
-    try {
-        const meta = await fs.readFile(path, 'utf8');
-        return JSON.parse(meta);
-    } catch (err) {
-        return {};
-    }
+	if (typeof location !== "string") {
+		assert(
+			location.filename,
+			'When "location" is not of type "string" then it must be an "object" with property "filename"',
+		);
+	}
+	let cwd = process.cwd();
+	let filename = "";
+	if (typeof location === "string") {
+		filename = location;
+	} else {
+		filename = location.filename;
+		if (location.cwd) {
+			cwd = location.cwd;
+		}
+	}
+	const path = isAbsolute(filename) ? filename : join(cwd, filename);
+	try {
+		const meta = await fs.readFile(path, "utf8");
+		return JSON.parse(meta);
+	} catch (err) {
+		return {};
+	}
 };

package/utils/json/write-eik.js

@@ -1,5 +1,5 @@
-import fs from 'node:fs/promises';
-import { join } from 'path';
+import fs from "node:fs/promises";
+import { join } from "path";
 
 /**
  * Reads, updates and then writes data to given eik.json file (defaults to file in current directory)
@@ -14,20 +14,20 @@ import { join } from 'path';
  * @example json.writeEik({ key: 'value' }, { cwd: '/path/to/cwd', filename: 'eik.json' });
  */
 export default async (data = {}, options) => {
-    const { cwd = process.cwd(), filename = 'eik.json' } = options;
-    const eikpath = join(cwd, filename);
-    const eik = await fs.readFile(eikpath, 'utf-8');
-    const eikjson = JSON.parse(eik);
+	const { cwd = process.cwd(), filename = "eik.json" } = options;
+	const eikpath = join(cwd, filename);
+	const eik = await fs.readFile(eikpath, "utf-8");
+	const eikjson = JSON.parse(eik);
 
-    await fs.writeFile(
-        eikpath,
-        JSON.stringify(
-            {
-                ...eikjson,
-                ...data,
-            },
-            null,
-            2,
-        ),
-    );
+	await fs.writeFile(
+		eikpath,
+		JSON.stringify(
+			{
+				...eikjson,
+				...data,
+			},
+			null,
+			2,
+		),
+	);
 };

package/utils/json/write.js

@@ -1,6 +1,6 @@
-import assert from 'assert';
-import fs from 'node:fs/promises';
-import { join, isAbsolute, dirname } from 'path';
+import assert from "assert";
+import fs from "node:fs/promises";
+import { join, isAbsolute, dirname } from "path";
 
 /**
  * Utility function that can be used to write a JavaScript object to a file at a given location.
@@ -20,29 +20,27 @@ import { join, isAbsolute, dirname } from 'path';
  * @throws Error
  */
 export default async (meta = {}, location) => {
-    if (typeof location !== 'string') {
-        assert(
-            location.filename,
-            'When "location" is not of type "string" then it must be an "object" with property "filename"',
-        );
-    }
-    let cwd = process.cwd();
-    let filename = '';
-    if (typeof location === 'string') {
-        filename = location;
-    } else {
-        filename = location.filename;
-        if (location.cwd) {
-            cwd = location.cwd;
-        }
-    }
-    const path = isAbsolute(filename) ? filename : join(cwd, filename);
-    try {
-        await fs.mkdir(dirname(path), { recursive: true });
-        await fs.writeFile(path, JSON.stringify(meta, null, 2));
-    } catch (err) {
-        throw new Error(
-            `Error writing to JSON file ["${path}"]: ${err.message}`,
-        );
-    }
+	if (typeof location !== "string") {
+		assert(
+			location.filename,
+			'When "location" is not of type "string" then it must be an "object" with property "filename"',
+		);
+	}
+	let cwd = process.cwd();
+	let filename = "";
+	if (typeof location === "string") {
+		filename = location;
+	} else {
+		filename = location.filename;
+		if (location.cwd) {
+			cwd = location.cwd;
+		}
+	}
+	const path = isAbsolute(filename) ? filename : join(cwd, filename);
+	try {
+		await fs.mkdir(dirname(path), { recursive: true });
+		await fs.writeFile(path, JSON.stringify(meta, null, 2));
+	} catch (err) {
+		throw new Error(`Error writing to JSON file ["${path}"]: ${err.message}`);
+	}
 };

package/utils/logger.js

@@ -5,50 +5,50 @@
  * @param {boolean} debug
  */
 const logger = (spinner, debug = false) => ({
-    /**
-     * @param {string} message
-     */
-    fatal(message) {
-        spinner.fail(message).start();
-    },
-    /**
-     * @param {string} message
-     */
-    error(message) {
-        spinner.fail(message).start();
-    },
-    /**
-     * @param {string} message
-     */
-    warn(message) {
-        spinner.warn(message).start();
-    },
-    /**
-     * @param {string} message
-     */
-    info(message) {
-        if (typeof message !== 'string') {
-            spinner.text = '';
-            spinner.stopAndPersist();
+	/**
+	 * @param {string} message
+	 */
+	fatal(message) {
+		spinner.fail(message).start();
+	},
+	/**
+	 * @param {string} message
+	 */
+	error(message) {
+		spinner.fail(message).start();
+	},
+	/**
+	 * @param {string} message
+	 */
+	warn(message) {
+		spinner.warn(message).start();
+	},
+	/**
+	 * @param {string} message
+	 */
+	info(message) {
+		if (typeof message !== "string") {
+			spinner.text = "";
+			spinner.stopAndPersist();
 
-            console.log(message);
-            spinner.start();
-        } else {
-            spinner.succeed(message).start();
-        }
-    },
-    /**
-     * @param {string} message
-     */
-    debug(message) {
-        if (debug) spinner.info(message).start();
-    },
-    /**
-     * @param {string} message
-     */
-    trace(message) {
-        if (debug) spinner.info(message).start();
-    },
+			console.log(message);
+			spinner.start();
+		} else {
+			spinner.succeed(message).start();
+		}
+	},
+	/**
+	 * @param {string} message
+	 */
+	debug(message) {
+		if (debug) spinner.info(message).start();
+	},
+	/**
+	 * @param {string} message
+	 */
+	trace(message) {
+		if (debug) spinner.info(message).start();
+	},
 });
 
 export default logger;

package/utils/type-title.js

@@ -1,5 +1,5 @@
 export default (type) => {
-    if (type === 'package') return 'PACKAGE';
-    if (type === 'npm') return 'NPM';
-    return 'MAP';
+	if (type === "package") return "PACKAGE";
+	if (type === "npm") return "NPM";
+	return "MAP";
 };

package/utils/url.js

@@ -0,0 +1,10 @@
+import { join } from "node:path";
+
+/**
+ * A version of path.join that replaces \ (win32) with /
+ * @param  {...string} parts
+ * @returns {string}
+ */
+export function joinUrlPathname(...parts) {
+	return join(...parts).replace(/\\/g, "/");
+}