@terrazzo/parser 0.10.3 → 0.10.4

package/dist/index.js

@@ -36,10 +36,7 @@ function getMarkerLines(loc, source, opts = {}) {
 			const sourceLength = source[lineNumber - 1].length;
 			markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
 		} else if (i === lineDiff) markerLines[lineNumber] = [0, endColumn];
-		else {
-			const sourceLength = source[lineNumber - i].length;
-			markerLines[lineNumber] = [0, sourceLength];
-		}
+		else markerLines[lineNumber] = [0, source[lineNumber - i].length];
 	}
 	else if (startColumn === endColumn) if (startColumn) markerLines[startLine] = [startColumn, 0];
 	else markerLines[startLine] = true;
@@ -61,8 +58,7 @@ function codeFrameColumns(rawLines, loc, opts = {}) {
 	const numberMaxWidth = String(end).length;
 	let frame = rawLines.split(NEWLINE, end).slice(start, end).map((line, index) => {
 		const number = start + 1 + index;
-		const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
-		const gutter = ` ${paddedNumber} |`;
+		const gutter = ` ${` ${number}`.slice(-numberMaxWidth)} |`;
 		const hasMarker = markerLines[number];
 		const lastMarkerLine = !markerLines[number + 1];
 		if (hasMarker) {
@@ -457,7 +453,7 @@ const rule$7 = {
 			if (shouldIgnore?.(t.id)) continue;
 			if (t.aliasOf) continue;
 			switch (t.$type) {
-				case "color": {
+				case "color":
 					if (t.$value.colorSpace !== options.colorSpace) report({
 						messageId: ERROR_COLOR$1,
 						data: {
@@ -467,8 +463,7 @@ const rule$7 = {
 						node: t.source.node
 					});
 					break;
-				}
-				case "border": {
+				case "border":
 					if (!t.partialAliasOf?.color && t.$value.color.colorSpace !== options.colorSpace) report({
 						messageId: ERROR_BORDER$1,
 						data: {
@@ -478,8 +473,7 @@ const rule$7 = {
 						node: t.source.node
 					});
 					break;
-				}
-				case "gradient": {
+				case "gradient":
 					for (let stopI = 0; stopI < t.$value.length; stopI++) if (!t.partialAliasOf?.[stopI]?.color && t.$value[stopI].color.colorSpace !== options.colorSpace) report({
 						messageId: ERROR_GRADIENT$1,
 						data: {
@@ -489,8 +483,7 @@ const rule$7 = {
 						node: t.source.node
 					});
 					break;
-				}
-				case "shadow": {
+				case "shadow":
 					for (let shadowI = 0; shadowI < t.$value.length; shadowI++) if (!t.partialAliasOf?.[shadowI]?.color && t.$value[shadowI].color.colorSpace !== options.colorSpace) report({
 						messageId: ERROR_SHADOW$1,
 						data: {
@@ -500,7 +493,6 @@ const rule$7 = {
 						node: t.source.node
 					});
 					break;
-				}
 			}
 		}
 	}
@@ -517,7 +509,7 @@ const STR_SPLITTERS = [
 	"."
 ];
 function isUppercase(char = "") {
-	if (NUMBER_CHAR_RE.test(char)) return void 0;
+	if (NUMBER_CHAR_RE.test(char)) return;
 	return char !== char.toLowerCase();
 }
 function splitByCase(str, separators) {
@@ -599,8 +591,7 @@ const rule$6 = {
 			SCREAMING_SNAKE_CASE: (name) => snakeCase(name).toLocaleUpperCase()
 		}[String(options.format)];
 		for (const t of Object.values(tokens)) if (basicFormatter) {
-			const parts = t.id.split(".");
-			if (!parts.every((part) => basicFormatter(part) === part)) report({
+			if (!t.id.split(".").every((part) => basicFormatter(part) === part)) report({
 				messageId: ERROR_WRONG_FORMAT,
 				data: {
 					id: t.id,
@@ -609,8 +600,7 @@ const rule$6 = {
 				node: t.source.node
 			});
 		} else if (typeof options.format === "function") {
-			const result = options.format(t.id);
-			if (result) report({
+			if (options.format(t.id)) report({
 				messageId: ERROR_WRONG_FORMAT,
 				data: {
 					id: t.id,
@@ -744,7 +734,7 @@ const rule$3 = {
 			if (shouldIgnore?.(t.id)) continue;
 			if (t.aliasOf) continue;
 			switch (t.$type) {
-				case "color": {
+				case "color":
 					if (!isWithinGamut(t.$value, options.gamut)) report({
 						messageId: ERROR_COLOR,
 						data: {
@@ -754,8 +744,7 @@ const rule$3 = {
 						node: t.source.node
 					});
 					break;
-				}
-				case "border": {
+				case "border":
 					if (!t.partialAliasOf?.color && !isWithinGamut(t.$value.color, options.gamut)) report({
 						messageId: ERROR_BORDER,
 						data: {
@@ -765,8 +754,7 @@ const rule$3 = {
 						node: t.source.node
 					});
 					break;
-				}
-				case "gradient": {
+				case "gradient":
 					for (let stopI = 0; stopI < t.$value.length; stopI++) if (!t.partialAliasOf?.[stopI]?.color && !isWithinGamut(t.$value[stopI].color, options.gamut)) report({
 						messageId: ERROR_GRADIENT,
 						data: {
@@ -776,8 +764,7 @@ const rule$3 = {
 						node: t.source.node
 					});
 					break;
-				}
-				case "shadow": {
+				case "shadow":
 					for (let shadowI = 0; shadowI < t.$value.length; shadowI++) if (!t.partialAliasOf?.[shadowI]?.color && !isWithinGamut(t.$value[shadowI].color, options.gamut)) report({
 						messageId: ERROR_SHADOW,
 						data: {
@@ -787,7 +774,6 @@ const rule$3 = {
 						node: t.source.node
 					});
 					break;
-				}
 			}
 		}
 	}
@@ -1214,8 +1200,7 @@ async function lintRunner({ tokens, filename, config = {}, src, logger }) {
 							"boolean"
 						].includes(typeof v) ? String(v) : JSON.stringify(v);
 						message = message.replace(/{{[^}]+}}/g, (inner) => {
-							const key = inner.substring(2, inner.length - 2).trim();
-							return key === k ? formatted : inner;
+							return inner.substring(2, inner.length - 2).trim() === k ? formatted : inner;
 						});
 					}
 					(severity === "error" ? errors : warnings).push({
@@ -1265,7 +1250,7 @@ async function lintRunner({ tokens, filename, config = {}, src, logger }) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@humanwhocodes+momoa@3.3.8/node_modules/@humanwhocodes/momoa/dist/momoa.js
+//#region ../../node_modules/.pnpm/@humanwhocodes+momoa@3.3.9/node_modules/@humanwhocodes/momoa/dist/momoa.js
 /**
 * @fileoverview Character codes.
 * @author Nicholas C. Zakas
@@ -2341,6 +2326,31 @@ function normalizeIdentifier(identifier) {
 	});
 }
 /**
+* Calculates the location at the end of the given text.
+* @param {string} text The text to calculate the end location for.
+* @returns {Location} The location at the end of the text.
+*/
+function getEndLocation(text) {
+	let line = 1;
+	let column = 1;
+	for (let i = 0; i < text.length; i++) {
+		const char = text[i];
+		if (char === "\n") {
+			line++;
+			column = 1;
+		} else if (char === "\r") {
+			if (text[i + 1] === "\n") i++;
+			line++;
+			column = 1;
+		} else column++;
+	}
+	return {
+		line,
+		column,
+		offset: text.length
+	};
+}
+/**
 * Converts a JSON-encoded string into a JavaScript string, interpreting each
 * escape sequence.
 * @param {string} value The text for the token.
@@ -2495,12 +2505,11 @@ function parse$1(text, options) {
 		const token = tokenizer.token;
 		const range = createRange(token.loc.start, token.loc.end);
 		const value = getLiteralValue(text.slice(token.loc.start.offset, token.loc.end.offset), token, json5);
-		const loc = {
-			start: { ...token.loc.start },
-			end: { ...token.loc.end }
-		};
 		const parts = {
-			loc,
+			loc: {
+				start: { ...token.loc.start },
+				end: { ...token.loc.end }
+			},
 			...range
 		};
 		switch (tokenType) {
@@ -2519,12 +2528,11 @@ function parse$1(text, options) {
 	function createJSON5IdentifierNode(token) {
 		const range = createRange(token.loc.start, token.loc.end);
 		const identifier = text.slice(token.loc.start.offset, token.loc.end.offset);
-		const loc = {
-			start: { ...token.loc.start },
-			end: { ...token.loc.end }
-		};
 		const parts = {
-			loc,
+			loc: {
+				start: { ...token.loc.start },
+				end: { ...token.loc.end }
+			},
 			...range
 		};
 		if (token.type !== "Identifier") {
@@ -2674,15 +2682,14 @@ function parse$1(text, options) {
 		}
 	}
 	const docBody = parseValue();
-	const unexpectedToken = next();
-	if (unexpectedToken) throw new UnexpectedToken(tokenizer.token);
+	if (next()) throw new UnexpectedToken(tokenizer.token);
 	const docParts = { loc: {
 		start: {
 			line: 1,
 			column: 1,
 			offset: 0
 		},
-		end: { ...docBody.loc.end }
+		end: { ...getEndLocation(text) }
 	} };
 	if (options.tokens) docParts.tokens = tokens;
 	if (options.ranges) docParts.range = [docParts.loc.start.offset, docParts.loc.end.offset];
@@ -3068,48 +3075,42 @@ function applyAliases(token, options) {
 		}
 		const node = getObjMembers(options.node).$value || options.node;
 		switch (token.$type) {
-			case "border": {
+			case "border":
 				applyBorderPartialAlias(token, mode, {
 					...options,
 					node
 				});
 				break;
-			}
-			case "gradient": {
+			case "gradient":
 				applyGradientPartialAlias(token, mode, {
 					...options,
 					node
 				});
 				break;
-			}
-			case "shadow": {
+			case "shadow":
 				applyShadowPartialAlias(token, mode, {
 					...options,
 					node
 				});
 				break;
-			}
-			case "strokeStyle": {
+			case "strokeStyle":
 				applyStrokeStylePartialAlias(token, mode, {
 					...options,
 					node
 				});
 				break;
-			}
-			case "transition": {
+			case "transition":
 				applyTransitionPartialAlias(token, mode, {
 					...options,
 					node
 				});
 				break;
-			}
-			case "typography": {
+			case "typography":
 				applyTypographyPartialAlias(token, mode, {
 					...options,
 					node
 				});
 				break;
-			}
 		}
 	}
 }
@@ -3361,7 +3362,7 @@ function normalizeValue(token) {
 	if (typeof token.$value === "string" && isAlias(token.$value)) return token.$value;
 	switch (token.$type) {
 		case "boolean": return !!token.$value;
-		case "border": {
+		case "border":
 			if (typeof token.$value === "string") return token.$value;
 			return {
 				color: normalizeValue({
@@ -3377,7 +3378,6 @@ function normalizeValue(token) {
 					$value: token.$value.width
 				})
 			};
-		}
 		case "color": {
 			if (typeof token.$value === "string") return parseColor(token.$value);
 			const newValue = {
@@ -3388,14 +3388,13 @@ function normalizeValue(token) {
 			if ("hex" in token.$value) newValue.hex = token.$value.hex;
 			return newValue;
 		}
-		case "cubicBezier": {
+		case "cubicBezier":
 			if (typeof token.$value === "string") return token.$value;
 			return token.$value.map((value) => typeof value === "number" ? normalizeValue({
 				$type: "number",
 				$value: value
 			}) : value);
-		}
-		case "dimension": {
+		case "dimension":
 			if (token.$value === 0) return {
 				value: 0,
 				unit: "px"
@@ -3408,8 +3407,7 @@ function normalizeValue(token) {
 				};
 			}
 			return token.$value;
-		}
-		case "duration": {
+		case "duration":
 			if (token.$value === 0) return {
 				value: 0,
 				unit: "ms"
@@ -3422,12 +3420,10 @@ function normalizeValue(token) {
 				};
 			}
 			return token.$value;
-		}
 		case "fontFamily": return Array.isArray(token.$value) ? token.$value : [token.$value];
-		case "fontWeight": {
+		case "fontWeight":
 			if (typeof token.$value === "string" && FONT_WEIGHT_MAP[token.$value]) return FONT_WEIGHT_MAP[token.$value];
 			return Math.min(999, Math.max(1, typeof token.$value === "string" ? Number.parseInt(token.$value) : token.$value));
-		}
 		case "gradient": {
 			if (typeof token.$value === "string") return token.$value;
 			const output = [];
@@ -3443,7 +3439,7 @@ function normalizeValue(token) {
 			return output;
 		}
 		case "number": return typeof token.$value === "number" ? token.$value : Number.parseFloat(token.$value);
-		case "shadow": {
+		case "shadow":
 			if (typeof token.$value === "string") return token.$value;
 			return (Array.isArray(token.$value) ? token.$value : [token.$value]).map((layer) => ({
 				color: normalizeValue({
@@ -3480,10 +3476,9 @@ function normalizeValue(token) {
 				}),
 				inset: layer.inset === true
 			}));
-		}
 		case "strokeStyle": return token.$value;
 		case "string": return String(token.$value);
-		case "transition": {
+		case "transition":
 			if (typeof token.$value === "string") return token.$value;
 			return {
 				duration: normalizeValue({
@@ -3499,37 +3494,32 @@ function normalizeValue(token) {
 					$value: token.$value.timingFunction
 				})
 			};
-		}
 		case "typography": {
 			if (typeof token.$value === "string") return token.$value;
 			const output = {};
 			for (const [k, $value] of Object.entries(token.$value)) switch (k) {
-				case "fontFamily": {
+				case "fontFamily":
 					output[k] = normalizeValue({
 						$type: "fontFamily",
 						$value
 					});
 					break;
-				}
 				case "fontSize":
-				case "letterSpacing": {
+				case "letterSpacing":
 					output[k] = normalizeValue({
 						$type: "dimension",
 						$value
 					});
 					break;
-				}
-				case "lineHeight": {
+				case "lineHeight":
 					output[k] = normalizeValue({
 						$type: typeof token.$value === "number" ? "number" : "dimension",
 						$value
 					});
 					break;
-				}
-				default: {
+				default:
 					output[k] = $value;
 					break;
-				}
 			}
 			return output;
 		}
@@ -4132,56 +4122,49 @@ function validateTokenMemberNode(node, { filename, src, logger }) {
 		message: "Token missing $type"
 	});
 	switch ($type.value) {
-		case "color": {
+		case "color":
 			validateColor($value, node, {
 				logger,
 				src
 			});
 			break;
-		}
-		case "cubicBezier": {
+		case "cubicBezier":
 			validateCubicBezier($value, node, {
 				logger,
 				src
 			});
 			break;
-		}
-		case "dimension": {
+		case "dimension":
 			validateDimension($value, node, {
 				logger,
 				src
 			});
 			break;
-		}
-		case "duration": {
+		case "duration":
 			validateDuration($value, node, {
 				logger,
 				src
 			});
 			break;
-		}
-		case "fontFamily": {
+		case "fontFamily":
 			validateFontFamily($value, node, {
 				logger,
 				src
 			});
 			break;
-		}
-		case "fontWeight": {
+		case "fontWeight":
 			validateFontWeight($value, node, {
 				logger,
 				src
 			});
 			break;
-		}
-		case "number": {
+		case "number":
 			validateNumber($value, node, {
 				logger,
 				src
 			});
 			break;
-		}
-		case "shadow": {
+		case "shadow":
 			if ($value.type === "Object") validateShadowLayer($value, node, {
 				logger,
 				src
@@ -4196,16 +4179,14 @@ function validateTokenMemberNode(node, { filename, src, logger }) {
 				node: $value
 			});
 			break;
-		}
-		case "boolean": {
+		case "boolean":
 			if ($value.type !== "Boolean") logger.error({
 				...baseMessage,
 				message: `Expected boolean, received ${$value.type}`,
 				node: $value
 			});
 			break;
-		}
-		case "link": {
+		case "link":
 			if ($value.type !== "String") logger.error({
 				...baseMessage,
 				message: `Expected string, received ${$value.type}`,
@@ -4217,48 +4198,42 @@ function validateTokenMemberNode(node, { filename, src, logger }) {
 				node: $value
 			});
 			break;
-		}
-		case "string": {
+		case "string":
 			if ($value.type !== "String") logger.error({
 				...baseMessage,
 				message: `Expected string, received ${$value.type}`,
 				node: $value
 			});
 			break;
-		}
-		case "border": {
+		case "border":
 			validateBorder($value, node, {
 				filename,
 				src,
 				logger
 			});
 			break;
-		}
-		case "gradient": {
+		case "gradient":
 			validateGradient($value, node, {
 				filename,
 				src,
 				logger
 			});
 			break;
-		}
-		case "strokeStyle": {
+		case "strokeStyle":
 			validateStrokeStyle($value, node, {
 				filename,
 				src,
 				logger
 			});
 			break;
-		}
-		case "transition": {
+		case "transition":
 			validateTransition($value, node, {
 				filename,
 				src,
 				logger
 			});
 			break;
-		}
-		case "typography": {
+		case "typography":
 			if ($value.type !== "Object") {
 				logger.error({
 					...baseMessage,
@@ -4281,7 +4256,6 @@ function validateTokenMemberNode(node, { filename, src, logger }) {
 				logger
 			});
 			break;
-		}
 		default: break;
 	}
 }
@@ -4289,8 +4263,7 @@ function validateTokenMemberNode(node, { filename, src, logger }) {
 * Groups can have properties that their child nodes will inherit. */
 function isGroupNode(node) {
 	if (node.type !== "Object") return false;
-	const has$value = node.members.some((m) => m.name.type === "String" && m.name.value === "$value");
-	return !has$value;
+	return !node.members.some((m) => m.name.type === "String" && m.name.value === "$value");
 }
 /** Check if a token node has the specified property name, and if it does, stores
 * the value in the `inherited` object as a side effect for future use. If not,
@@ -4537,8 +4510,13 @@ async function parseSingle(input, { filename, logger, config, skipLint, continue
 			});
 			if (node.value.type === "Object") {
 				const $value = node.value.members.find((m) => m.name.type === "String" && m.name.value === "$value");
-				if ($value && inheritedTypeNode?.value.type === "String" && transform?.[inheritedTypeNode.value.value]) {
-					const result = transform[inheritedTypeNode.value.value]?.(evaluate(node.value), subpath.join("."), node);
+				let typeNode = inheritedTypeNode;
+				if (!typeNode) {
+					const local$type = node.value.members.find((m) => m.name.type === "String" && m.name.value === "$type");
+					if (local$type) typeNode = local$type;
+				}
+				if ($value && typeNode?.value.type === "String" && transform?.[typeNode.value.value]) {
+					const result = transform[typeNode.value.value]?.(evaluate(node.value), subpath.join("."), node);
 					if (result) node.value = parseJSON(result).body;
 				}
 				const token = validateTokenNode(node, {