@terrazzo/parser 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/index.js

@@ -1,5 +1,4 @@
-import { BORDER_REQUIRED_PROPERTIES, COLOR_SPACE, FONT_WEIGHTS, GRADIENT_REQUIRED_STOP_PROPERTIES, SHADOW_REQUIRED_PROPERTIES, STROKE_STYLE_LINE_CAP_VALUES, STROKE_STYLE_OBJECT_REQUIRED_PROPERTIES, STROKE_STYLE_STRING_VALUES, TRANSITION_REQUIRED_PROPERTIES, getTokenMatcher, isAlias, parseAlias, parseColor, pluralize, tokenToColor } from "@terrazzo/token-tools";
-import wcmatch from "wildcard-match";
+import { BORDER_REQUIRED_PROPERTIES, COLOR_SPACE, CachedWildcardMatcher, FONT_WEIGHTS, GRADIENT_REQUIRED_STOP_PROPERTIES, SHADOW_REQUIRED_PROPERTIES, STROKE_STYLE_LINE_CAP_VALUES, STROKE_STYLE_OBJECT_REQUIRED_PROPERTIES, STROKE_STYLE_STRING_VALUES, TRANSITION_REQUIRED_PROPERTIES, isAlias, parseAlias, parseColor, pluralize, tokenToColor } from "@terrazzo/token-tools";
 import * as momoa from "@humanwhocodes/momoa";
 import pc from "picocolors";
 import { merge } from "merge-anything";
@@ -140,6 +139,7 @@ function formatMessage(entry, severity) {
 	}
 	return message;
 }
+const debugMatch = new CachedWildcardMatcher();
 var Logger = class {
 	level = "info";
 	debugScope = "*";
@@ -191,7 +191,7 @@ var Logger = class {
 			this.debugCount++;
 			let message = formatMessage(entry, "debug");
 			const debugPrefix = entry.label ? `${entry.group}:${entry.label}` : entry.group;
-			if (this.debugScope !== "*" && !wcmatch(this.debugScope)(debugPrefix)) return;
+			if (this.debugScope !== "*" && !debugMatch.match(this.debugScope)(debugPrefix)) return;
 			message.replace(/\[config[^\]]+\]/, (match) => pc.green(match)).replace(/\[parser[^\]]+\]/, (match) => pc.magenta(match)).replace(/\[lint[^\]]+\]/, (match) => pc.yellow(match)).replace(/\[plugin[^\]]+\]/, (match) => pc.cyan(match));
 			message = `${pc.dim(timeFormatter.format(performance.now()))} ${message}`;
 			if (typeof entry.timing === "number") message = `${message} ${formatTiming(entry.timing)}`;
@@ -243,6 +243,7 @@ function validateTransformParams({ params, logger, pluginName }) {
 	});
 }
 const FALLBACK_PERMUTATION_ID = JSON.stringify({ tzMode: "*" });
+const cachedMatcher$1 = new CachedWildcardMatcher();
 /** Run build stage */
 async function build(tokens, { resolver, sources, logger = new Logger(), config }) {
 	const formats = {};
@@ -257,84 +258,98 @@ async function build(tokens, { resolver, sources, logger = new Logger(), config
 				});
 				return [];
 			}
-			const tokenMatcher = params.id && params.id !== "*" ? getTokenMatcher(params.id) : null;
-			const modeMatcher = params.mode ? wcmatch(params.mode) : null;
-			const permutationID = params.input ? resolver.getPermutationID(params.input) : JSON.stringify({ tzMode: "*" });
+			const isLegacyModes = params.input && Object.keys(params.input).length === 1 && "tzMode" in params.input;
+			const permutationID = params.input && !isLegacyModes ? resolver.getPermutationID(params.input) : FALLBACK_PERMUTATION_ID;
+			const mode = params.mode || isLegacyModes && params.input.tzMode || void 0;
+			const singleTokenID = typeof params.id === "string" && tokens[params.id]?.id || Array.isArray(params.id) && params.id.length === 1 && tokens[params.id[0]]?.id || void 0;
+			const $type = typeof params.$type === "string" && [params.$type] || Array.isArray(params.$type) && params.$type || void 0;
+			const idMatcher = params.id && !singleTokenID && !isFullWildcard(params.id) ? cachedMatcher$1.tokenIDMatch(params.id) : null;
+			const modeMatcher = mode && mode !== "." && !isFullWildcard(mode) ? cachedMatcher$1.match(mode) : null;
 			return (formats[params.format]?.[permutationID] ?? []).filter((token) => {
-				if (params.$type) {
-					if (typeof params.$type === "string" && token.token.$type !== params.$type) return false;
-					else if (Array.isArray(params.$type) && !params.$type.some(($type) => token.token.$type === $type)) return false;
-				}
-				if (tokenMatcher && !tokenMatcher(token.token.id)) return false;
-				if (params.input && token.permutationID !== resolver.getPermutationID(params.input)) return false;
-				if (modeMatcher && !modeMatcher(token.mode)) return false;
+				if (singleTokenID && token.id !== singleTokenID || idMatcher && !idMatcher(token.id)) return false;
+				if (params.$type && !$type?.some((value) => token.token.$type === value)) return false;
+				if (mode === "." && token.mode !== "." || modeMatcher && !modeMatcher(token.mode)) return false;
 				return true;
 			});
 		};
 	}
 	let transformsLocked = false;
 	const startTransform = performance.now();
-	for (const plugin of config.plugins) if (typeof plugin.transform === "function") await plugin.transform({
-		context: { logger },
-		tokens,
-		sources,
-		getTransforms: getTransforms(plugin.name),
-		setTransform(id, params) {
-			if (transformsLocked) {
-				logger.warn({
-					message: "Attempted to call setTransform() after transform step has completed.",
+	for (const plugin of config.plugins) if (typeof plugin.transform === "function") {
+		const pt = performance.now();
+		await plugin.transform({
+			context: { logger },
+			tokens,
+			sources,
+			getTransforms: getTransforms(plugin.name),
+			setTransform(id, params) {
+				if (transformsLocked) {
+					logger.warn({
+						message: "Attempted to call setTransform() after transform step has completed.",
+						group: "plugin",
+						label: plugin.name
+					});
+					return;
+				}
+				const token = tokens[id];
+				if (!token) logger.error({
 					group: "plugin",
-					label: plugin.name
+					label: plugin.name,
+					message: `No token "${id}"`
 				});
-				return;
-			}
-			const token = tokens[id];
-			const permutationID = params.input ? resolver.getPermutationID(params.input) : FALLBACK_PERMUTATION_ID;
-			const cleanValue = typeof params.value === "string" ? params.value : { ...params.value };
-			validateTransformParams({
-				logger,
-				params: {
-					...params,
-					value: cleanValue
-				},
-				pluginName: plugin.name
-			});
-			if (!formats[params.format]) formats[params.format] = {};
-			if (!formats[params.format][permutationID]) formats[params.format][permutationID] = [];
-			let foundTokenI = -1;
-			if (params.mode) foundTokenI = formats[params.format][permutationID].findIndex((t) => id === t.id && (!params.localID || params.localID === t.localID) && params.mode === t.mode);
-			else if (params.input) {
+				const isLegacyModes = params.input && Object.keys(params.input).length === 1 && "tzMode" in params.input;
+				const permutationID = params.input && !isLegacyModes ? resolver.getPermutationID(params.input) : FALLBACK_PERMUTATION_ID;
+				const mode = params.mode || isLegacyModes && params.input.tzMode || void 0;
+				const cleanValue = typeof params.value === "string" ? params.value : { ...params.value };
+				validateTransformParams({
+					logger,
+					params: {
+						...params,
+						value: cleanValue
+					},
+					pluginName: plugin.name
+				});
+				if (!formats[params.format]) formats[params.format] = { [FALLBACK_PERMUTATION_ID]: [] };
 				if (!formats[params.format][permutationID]) formats[params.format][permutationID] = [];
-				foundTokenI = formats[params.format][permutationID].findIndex((t) => id === t.id && (!params.localID || params.localID === t.localID) && permutationID === t.permutationID);
-			} else foundTokenI = formats[params.format][permutationID].findIndex((t) => id === t.id && (!params.localID || params.localID === t.localID));
-			if (foundTokenI === -1) formats[params.format][permutationID].push({
-				...params,
-				id,
-				value: cleanValue,
-				type: typeof cleanValue === "string" ? SINGLE_VALUE : MULTI_VALUE,
-				mode: params.mode || ".",
-				token: structuredClone(token),
-				permutationID,
-				input: JSON.parse(permutationID)
-			});
-			else {
-				formats[params.format][permutationID][foundTokenI].value = cleanValue;
-				formats[params.format][permutationID][foundTokenI].type = typeof cleanValue === "string" ? SINGLE_VALUE : MULTI_VALUE;
-			}
-		},
-		resolver
-	});
+				const foundTokenI = formats[params.format][permutationID].findIndex((t) => id === t.id && (!params.localID || params.localID === t.localID) && (!mode || t.mode === mode));
+				if (foundTokenI === -1) {
+					const transformedToken = {
+						...params,
+						id,
+						value: cleanValue,
+						type: typeof cleanValue === "string" ? SINGLE_VALUE : MULTI_VALUE,
+						mode: mode || ".",
+						token: makeReadOnlyToken(token),
+						permutationID,
+						input: JSON.parse(permutationID)
+					};
+					formats[params.format][permutationID].push(transformedToken);
+					if (params.input && !Object.keys(params.input).length && permutationID !== FALLBACK_PERMUTATION_ID) formats[params.format][FALLBACK_PERMUTATION_ID].push(transformedToken);
+				} else {
+					formats[params.format][permutationID][foundTokenI].value = cleanValue;
+					formats[params.format][permutationID][foundTokenI].type = typeof cleanValue === "string" ? SINGLE_VALUE : MULTI_VALUE;
+				}
+			},
+			resolver
+		});
+		logger.debug({
+			group: "plugin",
+			label: plugin.name,
+			message: "transform()",
+			timing: performance.now() - pt
+		});
+	}
 	transformsLocked = true;
 	logger.debug({
 		group: "parser",
 		label: "transform",
-		message: "transform() step",
+		message: "All plugins finished transform()",
 		timing: performance.now() - startTransform
 	});
 	const startBuild = performance.now();
 	await Promise.all(config.plugins.map(async (plugin) => {
 		if (typeof plugin.build === "function") {
-			const pluginBuildStart = performance.now();
+			const pb = performance.now();
 			await plugin.build({
 				context: { logger },
 				tokens,
@@ -352,18 +367,25 @@ async function build(tokens, { resolver, sources, logger = new Logger(), config
 						filename,
 						contents,
 						plugin: plugin.name,
-						time: performance.now() - pluginBuildStart
+						time: performance.now() - pb
 					});
 				}
 			});
+			logger.debug({
+				group: "plugin",
+				label: plugin.name,
+				message: "build()",
+				timing: performance.now() - pb
+			});
 		}
 	}));
 	logger.debug({
 		group: "parser",
 		label: "build",
-		message: "build() step",
+		message: "All plugins finished build()",
 		timing: performance.now() - startBuild
 	});
+	cachedMatcher$1.reset();
 	const startBuildEnd = performance.now();
 	await Promise.all(config.plugins.map(async (plugin) => plugin.buildEnd?.({
 		context: { logger },
@@ -380,6 +402,65 @@ async function build(tokens, { resolver, sources, logger = new Logger(), config
 	});
 	return result;
 }
+function isFullWildcard(value) {
+	return typeof value === "string" && (value === "*" || value === "**") || Array.isArray(value) && value.some((v) => v === "*" || v === "**");
+}
+/** Generate getters for transformed tokens. Reduces memory usage while improving accuracy. Provides some safety for read-only values. */
+function makeReadOnlyToken(token) {
+	return {
+		get id() {
+			return token.id;
+		},
+		get $value() {
+			return token.$value;
+		},
+		get $type() {
+			return token.$type;
+		},
+		get $description() {
+			return token.$description;
+		},
+		get $deprecated() {
+			return token.$deprecated;
+		},
+		get $extends() {
+			return token.$extends;
+		},
+		get $extensions() {
+			return token.$extensions;
+		},
+		get mode() {
+			return token.mode;
+		},
+		get originalValue() {
+			return token.originalValue;
+		},
+		get aliasChain() {
+			return token.aliasChain;
+		},
+		get aliasOf() {
+			return token.aliasOf;
+		},
+		get partialAliasOf() {
+			return token.partialAliasOf;
+		},
+		get aliasedBy() {
+			return token.aliasedBy;
+		},
+		get group() {
+			return token.group;
+		},
+		get source() {
+			return token.source;
+		},
+		get jsonID() {
+			return token.jsonID;
+		},
+		get dependencies() {
+			return token.dependencies;
+		}
+	};
+}
 
 //#endregion
 //#region src/lint/plugin-core/lib/docs.ts
@@ -435,6 +516,22 @@ const rule$26 = {
 	}
 };
 
+//#endregion
+//#region src/lint/plugin-core/lib/matchers.ts
+/**
+* Share one cached matcher factory for all lint plugins.
+*
+* Creating matchers is CPU-intensive, however, if we made one matcher for very
+* getTransform plugin query, we could end up with tens of thousands of
+* matchers, all taking up space in memory, but without providing any caching
+* benefits if a matcher is used only once. So a reasonable balance is we
+* maintain one cache per task category, and we garbage-collect everything after
+* it’s done. Lint tasks are likely to have frequently-occurring patterns. So
+* we’d expect for most use cases a shared lint cache has benefits, but only
+* so long as this doesn’t spread to other plugins and other task categories.
+*/
+const cachedLintMatcher = new CachedWildcardMatcher();
+
 //#endregion
 //#region src/lint/plugin-core/rules/a11y-min-font-size.ts
 const A11Y_MIN_FONT_SIZE = "a11y/min-font-size";
@@ -450,7 +547,7 @@ const rule$25 = {
 	defaultOptions: {},
 	create({ tokens, options, report }) {
 		if (!options.minSizePx && !options.minSizeRem) throw new Error("Must specify at least one of minSizePx or minSizeRem");
-		const shouldIgnore = options.ignore ? getTokenMatcher(options.ignore) : null;
+		const shouldIgnore = options.ignore ? cachedLintMatcher.tokenIDMatch(options.ignore) : null;
 		for (const t of Object.values(tokens)) {
 			if (shouldIgnore?.(t.id)) continue;
 			if (t.aliasOf) continue;
@@ -491,7 +588,7 @@ const rule$24 = {
 	defaultOptions: { colorSpace: "srgb" },
 	create({ tokens, options, report }) {
 		if (!options.colorSpace) return;
-		const shouldIgnore = options.ignore ? getTokenMatcher(options.ignore) : null;
+		const shouldIgnore = options.ignore ? cachedLintMatcher.tokenIDMatch(options.ignore) : null;
 		for (const t of Object.values(tokens)) {
 			if (shouldIgnore?.(t.id)) continue;
 			if (t.aliasOf) continue;
@@ -602,7 +699,7 @@ const rule$22 = {
 	},
 	defaultOptions: {},
 	create({ tokens, options, report }) {
-		const shouldIgnore = options.ignore ? getTokenMatcher(options.ignore) : null;
+		const shouldIgnore = options.ignore ? cachedLintMatcher.tokenIDMatch(options.ignore) : null;
 		for (const t of Object.values(tokens)) {
 			if (shouldIgnore?.(t.id)) continue;
 			if (!t.$description) report({
@@ -629,7 +726,7 @@ const rule$21 = {
 	defaultOptions: {},
 	create({ report, tokens, options }) {
 		const values = {};
-		const shouldIgnore = options.ignore ? getTokenMatcher(options.ignore) : null;
+		const shouldIgnore = options.ignore ? cachedLintMatcher.tokenIDMatch(options.ignore) : null;
 		for (const t of Object.values(tokens)) {
 			if (shouldIgnore?.(t.id)) continue;
 			if (!values[t.$type]) values[t.$type] = /* @__PURE__ */ new Set();
@@ -682,7 +779,7 @@ const rule$20 = {
 	create({ tokens, options, report }) {
 		if (!options?.gamut) return;
 		if (options.gamut !== "srgb" && options.gamut !== "p3" && options.gamut !== "rec2020") throw new Error(`Unknown gamut "${options.gamut}". Options are "srgb", "p3", or "rec2020"`);
-		const shouldIgnore = options.ignore ? getTokenMatcher(options.ignore) : null;
+		const shouldIgnore = options.ignore ? cachedLintMatcher.tokenIDMatch(options.ignore) : null;
 		for (const t of Object.values(tokens)) {
 			if (shouldIgnore?.(t.id)) continue;
 			if (t.aliasOf) continue;
@@ -761,7 +858,7 @@ const rule$19 = {
 			const { match, requiredTokens, requiredGroups } = options.matches[matchI];
 			if (!match.length) throw new Error(`Match ${matchI}: must declare \`match: […]\``);
 			if (!requiredTokens?.length && !requiredGroups?.length) throw new Error(`Match ${matchI}: must declare either \`requiredTokens: […]\` or \`requiredGroups: […]\``);
-			const matcher = getTokenMatcher(match);
+			const matcher = cachedLintMatcher.tokenIDMatch(match);
 			const matchGroups = [];
 			const matchTokens = [];
 			let tokensMatched = false;
@@ -816,7 +913,7 @@ const rule$18 = {
 			const { match, modes } = options.matches[matchI];
 			if (!match.length) throw new Error(`Match ${matchI}: must declare \`match: […]\``);
 			if (!modes?.length) throw new Error(`Match ${matchI}: must declare \`modes: […]\``);
-			const matcher = getTokenMatcher(match);
+			const matcher = cachedLintMatcher.tokenIDMatch(match);
 			let tokensMatched = false;
 			for (const t of Object.values(tokens)) {
 				if (!matcher(t.id)) continue;
@@ -877,7 +974,7 @@ const rule$16 = {
 	create({ tokens, options, report }) {
 		if (!options) return;
 		if (!options.properties.length) throw new Error(`"properties" can’t be empty`);
-		const shouldIgnore = options.ignore ? getTokenMatcher(options.ignore) : null;
+		const shouldIgnore = options.ignore ? cachedLintMatcher.tokenIDMatch(options.ignore) : null;
 		for (const t of Object.values(tokens)) {
 			if (shouldIgnore?.(t.id)) continue;
 			if (t.$type !== "typography") continue;
@@ -1388,7 +1485,7 @@ const rule$6 = {
 		"lineHeight"
 	] },
 	create({ tokens, options, report }) {
-		const isIgnored = options.ignore ? getTokenMatcher(options.ignore) : () => false;
+		const isIgnored = options.ignore ? cachedLintMatcher.tokenIDMatch(options.ignore) : () => false;
 		for (const t of Object.values(tokens)) {
 			if (t.aliasOf || !t.originalValue || t.$type !== "typography" || isIgnored(t.id)) continue;
 			validateTypography(t.originalValue.$value, {
@@ -2298,14 +2395,14 @@ async function lintRunner({ tokens, filename, config = {}, sources, logger }) {
 					let message = "";
 					if (!descriptor.message && !descriptor.messageId) logger.error({
 						group: "lint",
-						label: `${plugin.name} › lint › ${id}`,
+						label: `${plugin.name}:${id}`,
 						message: "Unable to report error: missing message or messageId"
 					});
 					if (descriptor.message) message = descriptor.message;
 					else {
 						if (!(descriptor.messageId in (rule.meta?.messages ?? {}))) logger.error({
 							group: "lint",
-							label: `${plugin.name} › lint › ${id}`,
+							label: `${plugin.name}:${id}`,
 							message: `messageId "${descriptor.messageId}" does not exist`
 						});
 						message = rule.meta?.messages?.[descriptor.messageId] ?? "";
@@ -2341,6 +2438,7 @@ async function lintRunner({ tokens, filename, config = {}, sources, logger }) {
 			message: "Finished",
 			timing: performance.now() - s
 		});
+		cachedLintMatcher.reset();
 	}
 	const errCount = errors.length ? `${errors.length} ${pluralize(errors.length, "error", "errors")}` : "";
 	const warnCount = warnings.length ? `${warnings.length} ${pluralize(warnings.length, "warning", "warnings")}` : "";
@@ -2372,6 +2470,13 @@ function toMomoa(srcRaw) {
 	});
 }
 
+//#endregion
+//#region src/lib/array.ts
+/** JS compiler-optimizable comparator */
+function alphaComparator(a, b) {
+	return a.localeCompare(b, "en-us", { numeric: true });
+}
+
 //#endregion
 //#region src/lib/resolver-utils.ts
 /**
@@ -2393,8 +2498,32 @@ function filterResolverPaths(path) {
 }
 /** Make a deterministic string from an object */
 function getPermutationID(input) {
-	const keys = Object.keys(input).sort((a, b) => a.localeCompare(b, "en-us", { numeric: true }));
-	return JSON.stringify(Object.fromEntries(keys.map((k) => [k, input[k]])));
+	const keys = Object.keys(input).sort(alphaComparator);
+	const sortedInput = {};
+	for (const k of keys) sortedInput[k] = input[k];
+	return JSON.stringify(sortedInput);
+}
+/**
+* Destructively merge B into A, with B overwriting A
+*
+* This is needed for resolvers because we need a really performant way to merge
+* token sets. merge-anything is a package we use for merging more complex
+* configurations like terrazzo.config.ts files, but that’s too slow for tokens.
+*/
+function destructiveMerge(a, b) {
+	if (!a || !b || typeof b !== "object") return;
+	for (const k in b) {
+		if (!Object.hasOwn(b, k)) continue;
+		const b2 = b[k];
+		if (b2 != null && typeof b2 === "object") if (Array.isArray(b2)) {
+			a[k] = [];
+			destructiveMerge(a[k], [...b2]);
+		} else {
+			if (!(k in a)) a[k] = {};
+			destructiveMerge(a[k], { ...b2 });
+		}
+		else a[k] = b2;
+	}
 }
 
 //#endregion
@@ -2455,15 +2584,12 @@ function normalize(token, { logger, src }) {
 	switch (token.$type) {
 		case "color":
 			for (const mode of Object.keys(token.mode)) token.mode[mode].$value = normalizeColor(token.mode[mode].$value, token.mode[mode].source.node);
-			token.$value = token.mode["."].$value;
 			break;
 		case "fontFamily":
 			for (const mode of Object.keys(token.mode)) token.mode[mode].$value = normalizeFontFamily(token.mode[mode].$value);
-			token.$value = token.mode["."].$value;
 			break;
 		case "fontWeight":
 			for (const mode of Object.keys(token.mode)) token.mode[mode].$value = normalizeFontWeight(token.mode[mode].$value);
-			token.$value = token.mode["."].$value;
 			break;
 		case "border":
 			for (const mode of Object.keys(token.mode)) {
@@ -2471,7 +2597,6 @@ function normalize(token, { logger, src }) {
 				if (!border || typeof border !== "object") continue;
 				if (border.color) border.color = normalizeColor(border.color, getObjMember(token.mode[mode].source.node, "color"));
 			}
-			token.$value = token.mode["."].$value;
 			break;
 		case "shadow":
 			for (const mode of Object.keys(token.mode)) {
@@ -2485,7 +2610,6 @@ function normalize(token, { logger, src }) {
 					if (!("inset" in shadow)) shadow.inset = false;
 				}
 			}
-			token.$value = token.mode["."].$value;
 			break;
 		case "gradient":
 			for (const mode of Object.keys(token.mode)) {
@@ -2498,7 +2622,6 @@ function normalize(token, { logger, src }) {
 					if (stop.color) stop.color = normalizeColor(stop.color, getObjMember(stopNode, "color"));
 				}
 			}
-			token.$value = token.mode["."].$value;
 			break;
 		case "typography":
 			for (const mode of Object.keys(token.mode)) {
@@ -2513,7 +2636,6 @@ function normalize(token, { logger, src }) {
 						break;
 				}
 			}
-			token.$value = token.mode["."].$value;
 			break;
 	}
 }
@@ -2532,6 +2654,7 @@ function aliasToTokenRef(alias, mode) {
 	if (id === alias) return;
 	return { $ref: `#/${id.replace(/~/g, "~0").replace(/\//g, "~1").replace(/\./g, "/")}${mode && mode !== "." ? `/$extensions/mode/${mode}` : ""}/$value` };
 }
+const cachedMatcher = new CachedWildcardMatcher();
 /** Generate a TokenNormalized from a Momoa node */
 function tokenFromNode(node, { groups, path, source, ignore }) {
 	if (!(node.type === "Object" && !!getObjMember(node, "$value") && !path.includes("$extensions"))) return;
@@ -2549,33 +2672,45 @@ function tokenFromNode(node, { groups, path, source, ignore }) {
 		$type: originalToken.$type || group.$type,
 		$description: originalToken.$description || void 0,
 		$deprecated: originalToken.$deprecated ?? group.$deprecated ?? void 0,
-		$value: originalToken.$value,
+		get $value() {
+			return this.mode["."].$value;
+		},
 		$extensions: originalToken.$extensions || void 0,
 		$extends: originalToken.$extends || void 0,
-		aliasChain: void 0,
-		aliasedBy: void 0,
-		aliasOf: void 0,
-		partialAliasOf: void 0,
-		dependencies: void 0,
+		get aliasChain() {
+			return this.mode["."].aliasChain;
+		},
+		get aliasedBy() {
+			return this.mode["."].aliasedBy;
+		},
+		get aliasOf() {
+			return this.mode["."].aliasOf;
+		},
+		get partialAliasOf() {
+			return this.mode["."].partialAliasOf;
+		},
+		get dependencies() {
+			return this.mode["."].dependencies;
+		},
 		group,
 		originalValue: void 0,
 		source: nodeSource,
 		jsonID,
 		mode: { ".": {
 			$value: originalToken.$value,
-			aliasOf: void 0,
 			aliasChain: void 0,
-			partialAliasOf: void 0,
 			aliasedBy: void 0,
-			originalValue: void 0,
+			aliasOf: void 0,
+			partialAliasOf: void 0,
 			dependencies: void 0,
+			originalValue: void 0,
 			source: {
 				...nodeSource,
 				node: getObjMember(nodeSource.node, "$value") ?? nodeSource.node
 			}
 		} }
 	};
-	if (ignore?.deprecated && token.$deprecated || ignore?.tokens && getTokenMatcher(ignore.tokens)(token.id)) return;
+	if (ignore?.deprecated && token.$deprecated || ignore?.tokens && cachedMatcher.tokenIDMatch(ignore.tokens)(token.id)) return;
 	const $extensions = getObjMember(node, "$extensions");
 	if ($extensions) {
 		const modeNode = getObjMember($extensions, "mode");
@@ -2684,7 +2819,7 @@ function graphAliases(refMap, { tokens, logger, sources }) {
 		if (!modeValue) continue;
 		if (!modeValue.dependencies) modeValue.dependencies = [];
 		modeValue.dependencies.push(...refChain.filter((r) => !modeValue.dependencies.includes(r)));
-		modeValue.dependencies.sort((a, b) => a.localeCompare(b, "en-us", { numeric: true }));
+		modeValue.dependencies.sort(alphaComparator);
 		if (jsonID.endsWith("/$value") || tokens[jsonID]) {
 			modeValue.aliasOf = refToTokenID(refChain.at(-1));
 			modeValue.aliasChain = [...refChain.map(refToTokenID)];
@@ -2728,26 +2863,16 @@ function graphAliases(refMap, { tokens, logger, sources }) {
 		const aliasedByRefs = [jsonID, ...refChain].reverse();
 		for (let i = 0; i < aliasedByRefs.length; i++) {
 			const baseRef = getTokenRef(aliasedByRefs[i]);
-			const baseToken = tokens[baseRef]?.mode[mode] || tokens[baseRef];
+			const baseToken = tokens[baseRef]?.mode[mode] || tokens[baseRef]?.mode["."];
 			if (!baseToken) continue;
 			const upstream = aliasedByRefs.slice(i + 1);
 			if (!upstream.length) break;
 			if (!baseToken.aliasedBy) baseToken.aliasedBy = [];
 			for (let j = 0; j < upstream.length; j++) {
 				const downstream = refToTokenID(upstream[j]);
-				if (!baseToken.aliasedBy.includes(downstream)) {
-					baseToken.aliasedBy.push(downstream);
-					if (mode === ".") tokens[baseRef].aliasedBy = baseToken.aliasedBy;
-				}
+				if (!baseToken.aliasedBy.includes(downstream)) baseToken.aliasedBy.push(downstream);
 			}
-			baseToken.aliasedBy.sort((a, b) => a.localeCompare(b, "en-us", { numeric: true }));
-		}
-		if (mode === ".") {
-			tokens[rootRef].aliasChain = modeValue.aliasChain;
-			tokens[rootRef].aliasedBy = modeValue.aliasedBy;
-			tokens[rootRef].aliasOf = modeValue.aliasOf;
-			tokens[rootRef].dependencies = modeValue.dependencies;
-			tokens[rootRef].partialAliasOf = modeValue.partialAliasOf;
+			baseToken.aliasedBy.sort(alphaComparator);
 		}
 	}
 }
@@ -2884,7 +3009,6 @@ function resolveAliases(tokens, { logger, refMap, sources }) {
 			});
 			if (!token.$type) token.$type = $type;
 			if ($value) token.mode[mode].$value = $value;
-			if (mode === ".") token.$value = token.mode[mode].$value;
 		}
 	}
 }
@@ -3015,7 +3139,7 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
 	const tokenIDs = [];
 	const groups = {};
 	traverse(rootSource.document, { enter(node, _parent, rawPath) {
-		if (node.type !== "Object") return;
+		if (node.type !== "Object" || rawPath.includes("$value") || rawPath.includes("$extensions")) return;
 		groupFromNode(node, {
 			path: isResolver ? filterResolverPaths(rawPath) : rawPath,
 			groups
@@ -3045,6 +3169,7 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
 		});
 		if (tokenRawValues && tokens[tokenRawValues?.jsonID]) {
 			tokens[tokenRawValues.jsonID].originalValue = tokenRawValues.originalValue;
+			tokens[tokenRawValues.jsonID].mode["."].originalValue = tokenRawValues.originalValue;
 			tokens[tokenRawValues.jsonID].source = tokenRawValues.source;
 			for (const mode of Object.keys(tokenRawValues.mode)) {
 				tokens[tokenRawValues.jsonID].mode[mode].originalValue = tokenRawValues.mode[mode].originalValue;
@@ -3089,12 +3214,12 @@ function processTokens(rootSource, { config, logger, sourceByFilename, isResolve
 	if (config.alphabetize === false) return tokens;
 	const sortStart = performance.now();
 	const tokensSorted = {};
-	tokenIDs.sort((a, b) => a.localeCompare(b, "en-us", { numeric: true }));
+	tokenIDs.sort(alphaComparator);
 	for (const path of tokenIDs) {
 		const id = refToTokenID(path);
 		tokensSorted[id] = tokens[path];
 	}
-	for (const group of Object.values(groups)) group.tokens.sort((a, b) => a.localeCompare(b, "en-us", { numeric: true }));
+	for (const group of Object.values(groups)) group.tokens.sort(alphaComparator);
 	logger.debug({
 		...entry,
 		message: "Sorted tokens",
@@ -3678,7 +3803,7 @@ function createResolver(resolverSource, { config, logger, sources }) {
 	}
 	return {
 		apply(inputRaw) {
-			let tokensRaw = {};
+			const tokensRaw = {};
 			const input = {
 				...inputDefaults,
 				...inputRaw
@@ -3687,7 +3812,7 @@ function createResolver(resolverSource, { config, logger, sources }) {
 			if (resolverCache[permutationID]) return resolverCache[permutationID];
 			for (const item of resolverSource.resolutionOrder) switch (item.type) {
 				case "set":
-					for (const s of item.sources) tokensRaw = merge(tokensRaw, s);
+					for (const s of item.sources) destructiveMerge(tokensRaw, s);
 					break;
 				case "modifier": {
 					const context = input[item.name];
@@ -3696,7 +3821,7 @@ function createResolver(resolverSource, { config, logger, sources }) {
 						group: "resolver",
 						message: `Modifier ${item.name} has no context ${JSON.stringify(context)}.`
 					});
-					for (const s of sources ?? []) tokensRaw = merge(tokensRaw, s);
+					for (const s of sources ?? []) destructiveMerge(tokensRaw, s);
 					break;
 				}
 			}
@@ -3734,6 +3859,7 @@ function createResolver(resolverSource, { config, logger, sources }) {
 				return false;
 			}
 			for (const [name, contexts] of Object.entries(validContexts)) if (name in input) {
+				if (name === "tzMode") continue;
 				if (!contexts.includes(input[name])) {
 					if (throwError) logger.error({
 						group: "resolver",
@@ -3783,7 +3909,6 @@ function calculatePermutations(options) {
 async function createSyntheticResolver(tokens, { config, logger, req, sources }) {
 	const contexts = {};
 	for (const token of Object.values(tokens)) for (const [mode, value] of Object.entries(token.mode)) {
-		if (mode === ".") continue;
 		if (!(mode in contexts)) contexts[mode] = [{}];
 		addToken(contexts[mode][0], {
 			...token,
@@ -3797,7 +3922,8 @@ async function createSyntheticResolver(tokens, { config, logger, req, sources })
 		sets: { allTokens: { sources: [simpleFlatten(tokens, { logger })] } },
 		modifiers: { tzMode: {
 			description: "Automatically built from $extensions.mode",
-			contexts
+			contexts,
+			default: "."
 		} }
 	}, void 0, 2);
 	return createResolver(await normalizeResolver(momoa.parse(src), {
@@ -3954,6 +4080,16 @@ async function parse(_input, { logger = new Logger(), req = defaultReq, skipLint
 	let tokens = {};
 	let resolver;
 	let sources = [];
+	if (inputs.length === 0) logger.error({
+		group: "parser",
+		label: "init",
+		message: "Nothing to parse."
+	});
+	for (let i = 0; i < inputs.length; i++) if (!inputs[i] || typeof inputs[i] !== "object" || !inputs[i]?.src || inputs[i]?.filename && !(inputs[i].filename instanceof URL)) logger.error({
+		group: "parser",
+		label: "init",
+		message: `Input ${i}: expected { src: any; filename: URL }`
+	});
 	const totalStart = performance.now();
 	const initStart = performance.now();
 	const resolverResult = await loadResolver(inputs, {