wrangler 0.0.0-e87ad068 → 0.0.0-e89ee2a5

package/src/parse.ts

@@ -1,308 +0,0 @@
-import * as fs from "node:fs";
-import { resolve } from "node:path";
-import TOML from "@iarna/toml";
-import { formatMessagesSync } from "esbuild";
-import {
-	parse as jsoncParse,
-	printParseErrorCode,
-	type ParseError as JsoncParseError,
-} from "jsonc-parser";
-import { logger } from "./logger";
-export type Message = {
-	text: string;
-	location?: Location;
-	notes?: Message[];
-	kind?: "warning" | "error";
-};
-
-export type Location = File & {
-	line: number;
-	column: number;
-	length?: number;
-	lineText?: string;
-	suggestion?: string;
-};
-
-export type File = {
-	file?: string;
-	fileText?: string;
-};
-
-/**
- * Formats a `Message` using esbuild's pretty-printing algorithm.
- */
-export function formatMessage(
-	{ text, notes, location, kind = "error" }: Message,
-	color = true
-): string {
-	const input = { text, notes, location };
-	delete input.location?.fileText;
-	for (const note of notes ?? []) {
-		delete note.location?.fileText;
-	}
-	const lines = formatMessagesSync([input], {
-		color,
-		kind: kind,
-		terminalWidth: logger.columns,
-	});
-	return lines.join("\n");
-}
-
-/**
- * An error that's thrown when something fails to parse.
- */
-export class ParseError extends Error implements Message {
-	readonly text: string;
-	readonly notes: Message[];
-	readonly location?: Location;
-	readonly kind: "warning" | "error";
-
-	constructor({ text, notes, location, kind }: Message) {
-		super(text);
-		this.name = this.constructor.name;
-		this.text = text;
-		this.notes = notes ?? [];
-		this.location = location;
-		this.kind = kind ?? "error";
-	}
-}
-
-const TOML_ERROR_NAME = "TomlError";
-const TOML_ERROR_SUFFIX = " at row ";
-
-type TomlError = Error & {
-	line: number;
-	col: number;
-};
-
-/**
- * A wrapper around `TOML.parse` that throws a `ParseError`.
- */
-export function parseTOML(input: string, file?: string): TOML.JsonMap | never {
-	try {
-		// Normalize CRLF to LF to avoid hitting https://github.com/iarna/iarna-toml/issues/33.
-		const normalizedInput = input.replace(/\r\n/g, "\n");
-		return TOML.parse(normalizedInput);
-	} catch (err) {
-		const { name, message, line, col } = err as TomlError;
-		if (name !== TOML_ERROR_NAME) {
-			throw err;
-		}
-		const text = message.substring(0, message.lastIndexOf(TOML_ERROR_SUFFIX));
-		const lineText = input.split("\n")[line];
-		const location = {
-			lineText,
-			line: line + 1,
-			column: col - 1,
-			file,
-			fileText: input,
-		};
-		throw new ParseError({ text, location });
-	}
-}
-
-const JSON_ERROR_SUFFIX = " in JSON at position ";
-
-/**
- * A minimal type describing a package.json file.
- */
-export type PackageJSON = {
-	devDependencies?: Record<string, unknown>;
-	dependencies?: Record<string, unknown>;
-	scripts?: Record<string, unknown>;
-};
-
-/**
- * A typed version of `parseJSON()`.
- */
-export function parsePackageJSON<T extends PackageJSON = PackageJSON>(
-	input: string,
-	file?: string
-): T {
-	return parseJSON<T>(input, file);
-}
-
-/**
- * A wrapper around `JSON.parse` that throws a `ParseError`.
- */
-export function parseJSON<T>(input: string, file?: string): T {
-	try {
-		return JSON.parse(input);
-	} catch (err) {
-		const { message } = err as Error;
-		const index = message.lastIndexOf(JSON_ERROR_SUFFIX);
-		if (index < 0) {
-			throw err;
-		}
-		const text = message.substring(0, index);
-		const position = parseInt(
-			message.substring(index + JSON_ERROR_SUFFIX.length)
-		);
-		const location = indexLocation({ file, fileText: input }, position);
-		throw new ParseError({ text, location });
-	}
-}
-
-/**
- * A wrapper around `JSONC.parse` that throws a `ParseError`.
- */
-export function parseJSONC<T>(input: string, file?: string): T {
-	const errors: JsoncParseError[] = [];
-	const data = jsoncParse(input, errors);
-	if (errors.length) {
-		throw new ParseError({
-			text: printParseErrorCode(errors[0].error),
-			location: {
-				...indexLocation({ file, fileText: input }, errors[0].offset + 1),
-				length: errors[0].length,
-			},
-		});
-	}
-	return data;
-}
-
-/**
- * Reads a file into a node Buffer.
- */
-export function readFileSyncToBuffer(file: string): Buffer {
-	try {
-		return fs.readFileSync(file);
-	} catch (err) {
-		const { message } = err as Error;
-		throw new ParseError({
-			text: `Could not read file: ${file}`,
-			notes: [
-				{
-					text: message.replace(file, resolve(file)),
-				},
-			],
-		});
-	}
-}
-
-/**
- * Reads a file and parses it based on its type.
- */
-export function readFileSync(file: string): string {
-	try {
-		return fs.readFileSync(file, { encoding: "utf-8" });
-	} catch (err) {
-		const { message } = err as Error;
-		throw new ParseError({
-			text: `Could not read file: ${file}`,
-			notes: [
-				{
-					text: message.replace(file, resolve(file)),
-				},
-			],
-		});
-	}
-}
-
-/**
- * Calculates the line and column location from an index.
- */
-export function indexLocation(file: File, index: number): Location {
-	let lineText,
-		line = 0,
-		column = 0,
-		cursor = 0;
-	const { fileText = "" } = file;
-	for (const row of fileText.split("\n")) {
-		line++;
-		cursor += row.length + 1;
-		if (cursor >= index) {
-			lineText = row;
-			column = row.length - (cursor - index);
-			break;
-		}
-	}
-	return { lineText, line, column, ...file };
-}
-
-/**
- * Guesses the line and column location of a search query.
- */
-export function searchLocation(file: File, query: unknown): Location {
-	let lineText,
-		length,
-		line = 0,
-		column = 0;
-	const queryText = String(query);
-	const { fileText = "" } = file;
-	for (const content of fileText.split("\n")) {
-		line++;
-		const index = content.indexOf(queryText);
-		if (index >= 0) {
-			lineText = content;
-			column = index;
-			length = queryText.length;
-			break;
-		}
-	}
-	return { lineText, line, column, length, ...file };
-}
-
-const units = {
-	nanoseconds: 0.000000001,
-	nanosecond: 0.000000001,
-	microseconds: 0.000001,
-	microsecond: 0.000001,
-	milliseconds: 0.001,
-	millisecond: 0.001,
-	seconds: 1,
-	second: 1,
-	minutes: 60,
-	minute: 60,
-	hours: 3600,
-	hour: 3600,
-	days: 86400,
-	day: 86400,
-	weeks: 604800,
-	week: 604800,
-	month: 18144000,
-	year: 220752000,
-
-	nsecs: 0.000000001,
-	nsec: 0.000000001,
-	usecs: 0.000001,
-	usec: 0.000001,
-	msecs: 0.001,
-	msec: 0.001,
-	secs: 1,
-	sec: 1,
-	mins: 60,
-	min: 60,
-
-	ns: 0.000000001,
-	us: 0.000001,
-	ms: 0.001,
-	mo: 18144000,
-	yr: 220752000,
-
-	s: 1,
-	m: 60,
-	h: 3600,
-	d: 86400,
-	w: 604800,
-	y: 220752000,
-};
-
-/**
- * Parse a human-readable time duration in seconds (including fractional)
- *
- * Invalid values will return NaN
- */
-export function parseHumanDuration(s: string): number {
-	const unitsMap = new Map(Object.entries(units));
-	s = s.trim().toLowerCase();
-	let base = 1;
-	for (const [name, _] of unitsMap) {
-		if (s.endsWith(name)) {
-			s = s.substring(0, s.length - name.length);
-			base = unitsMap.get(name) || 1;
-			break;
-		}
-	}
-	return Number(s) * base;
-}

package/src/paths.ts

@@ -1,71 +0,0 @@
-import { assert } from "node:console";
-import { relative, basename, resolve } from "node:path";
-
-type DiscriminatedPath<Discriminator extends string> = string & {
-	_discriminator: Discriminator;
-};
-
-/**
- * A branded string that expects to be URL compatible.
- *
- * Require this type when you want callers to ensure that they have converted file-path strings into URL-safe paths.
- */
-export type UrlPath = DiscriminatedPath<"UrlPath">;
-
-/**
- * Convert a file-path string to a URL-path string.
- *
- * Use this helper to convert a `string` to a `UrlPath` when it is not clear whether the string needs normalizing.
- * Replaces all back-slashes with forward-slashes, and throws an error if the path contains a drive letter (e.g. `C:`).
- */
-export function toUrlPath(filePath: string): UrlPath {
-	assert(
-		!/^[a-z]:/i.test(filePath),
-		"Tried to convert a Windows file path with a drive to a URL path."
-	);
-	return filePath.replace(/\\/g, "/") as UrlPath;
-}
-
-/**
- * Get a human-readable path, relative to process.cwd(), prefixed with ./ if
- * in a nested subdirectory, to aid with readability.
- * Only used for logging e.g. `Loading DB at ${readableRelative(dbPath)}`:
- *
- * E.g. (assuming process.cwd() is /pwd)
- *
- *	readableRelative('/pwd/wrangler.toml') => 'wrangler.toml'
- *	readableRelative('/wrangler.toml') => '../wrangler.toml'
- *	readableRelative('/pwd/subdir/wrangler.toml') => './subdir/wrangler.toml'
- *
- * */
-export function readableRelative(to: string) {
-	const relativePath = relative(process.cwd(), to);
-	if (
-		// No directory nesting, return as-is
-		basename(relativePath) === relativePath ||
-		// Outside current directory
-		relativePath.startsWith(".")
-	) {
-		return relativePath;
-	} else {
-		return "./" + relativePath;
-	}
-}
-
-/**
- * The __RELATIVE_PACKAGE_PATH__ is defined either in the esbuild config (for production)
- * or the jest.setup.ts (for unit testing).
- */
-declare const __RELATIVE_PACKAGE_PATH__: string;
-
-/**
- * Use this function (rather than Node.js constants like `__dirname`) to specify
- * paths that are relative to the base path of the Wrangler package.
- *
- * It is important to use this function because it reliably maps to the root of the package
- * no matter whether the code has been bundled or not.
- */
-export function getBasePath(): string {
-	// eslint-disable-next-line no-restricted-globals
-	return resolve(__dirname, __RELATIVE_PACKAGE_PATH__);
-}