random: update to latest spec

packages/css-calc/CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Unreleased (minor)
 
 - Add support for `calc-mix()`
+- Update `random()` to match the latest spec
 
 ### 3.2.1
 

packages/css-calc/src/functions/calc.ts

@@ -725,12 +725,15 @@ function random(randomNode: FunctionNode, globals: Globals, options: conversionO
 
 function parseRandomValueSharing(fnNode: FunctionNode, nodes: Array<ComponentValue>, globals: Globals, options: conversionOptions): [RandomValueSharing, Array<ComponentValue>] | -1 {
 	const x: RandomValueSharing = {
-		isAuto: false,
 		dashedIdent: "",
 		fixed: -1,
-		elementShared: false,
+		elementScoped: false,
+		propertyScoped: false,
+		propertyIndexScoped: false,
 	};
 
+	let hasAutoKeyword = false;
+
 	const firstNode = nodes[0];
 	if (!isTokenNode(firstNode) || !isTokenIdent(firstNode.value)) {
 		return [x, nodes];
@@ -753,18 +756,36 @@ function parseRandomValueSharing(fnNode: FunctionNode, nodes: Array<ComponentVal
 		const token = node.value;
 		const tokenStr = token[4].value.toLowerCase();
 
-		if (tokenStr === 'element-shared') {
-			if (x.fixed !== -1) {
+		if (tokenStr === 'element-scoped') {
+			if (x.fixed !== -1 || hasAutoKeyword || x.elementScoped) {
+				return -1;
+			}
+
+			x.elementScoped = true;
+			continue;
+		}
+
+		if (tokenStr === 'property-scoped') {
+			if (x.fixed !== -1 || hasAutoKeyword || x.propertyScoped || x.propertyIndexScoped) {
 				return -1;
 			}
 
-			x.elementShared = true;
+			x.propertyScoped = true;
+			continue;
+		}
+
+		if (tokenStr === 'property-index-scoped') {
+			if (x.fixed !== -1 || hasAutoKeyword || x.propertyScoped || x.propertyIndexScoped) {
+				return -1;
+			}
+
+			x.propertyIndexScoped = true;
 			continue;
 		}
 
 		// fixed <number [0,1]>
 		if (tokenStr === 'fixed') {
-			if (x.elementShared || x.dashedIdent || x.isAuto) {
+			if (x.fixed !== -1 || hasAutoKeyword || x.dashedIdent || x.elementScoped || x.propertyScoped || x.propertyIndexScoped) {
 				return -1;
 			}
 
@@ -793,22 +814,26 @@ function parseRandomValueSharing(fnNode: FunctionNode, nodes: Array<ComponentVal
 		}
 
 		if (tokenStr === 'auto') {
-			if (x.fixed !== -1 || x.dashedIdent) {
+			if (x.fixed !== -1 || hasAutoKeyword || x.dashedIdent || x.elementScoped || x.propertyScoped || x.propertyIndexScoped) {
 				return -1;
 			}
 
-			x.isAuto = true;
+			x.elementScoped = true;
+			x.propertyIndexScoped = true;
+			hasAutoKeyword = true;
 			continue;
 		}
 
 		if (tokenStr.startsWith('--')) {
-			if (x.fixed !== -1 || x.isAuto) {
+			if (x.fixed !== -1 || hasAutoKeyword || x.dashedIdent) {
 				return -1;
 			}
 
 			x.dashedIdent = tokenStr;
 			continue;
 		}
+
+		return -1;
 	}
 
 	return -1;

packages/css-calc/src/functions/random.ts

@@ -10,9 +10,10 @@ import type { conversionOptions } from '../options';
 const NULL_CHAR = String.fromCodePoint(0x000);
 
 export type RandomValueSharing = {
-	isAuto: boolean,
 	dashedIdent: string,
-	elementShared: boolean,
+	elementScoped: boolean,
+	propertyScoped: boolean,
+	propertyIndexScoped: boolean,
 	fixed: number,
 };
 
@@ -71,8 +72,10 @@ export function solveRandom(randomNode: FunctionNode, randomValueSharing: Random
 	const rnd = randomValueSharing.fixed === -1 ? sfc32(
 		crc32(
 			[
-				randomValueSharing.dashedIdent ? randomValueSharing.dashedIdent : (`${options.randomCaching?.propertyName} ${options.randomCaching.propertyN++}`),
-				randomValueSharing.elementShared ? "" : options.randomCaching.elementID,
+				randomValueSharing.dashedIdent ? randomValueSharing.dashedIdent : "",
+				randomValueSharing.elementScoped ? options.randomCaching.elementID : "",
+				(randomValueSharing.propertyScoped || randomValueSharing.propertyIndexScoped) ? options.randomCaching.propertyName : "",
+				randomValueSharing.propertyIndexScoped ? options.randomCaching.propertyN : "",
 				options.randomCaching.documentID,
 			].join(NULL_CHAR),
 		),