checkpoint

Author: jonathantneal

src/loader/merge.ts

@@ -73,10 +73,18 @@ export const mergeFormats = (formats: Format[], root?: RawObject, inheritedType?
 						// Do NOT pass it into $value content — type is DTCG metadata on the token
 						// node itself, not something that should bleed into value sub-objects.
 						const sub = mergeFormats(subFormats as Format[], effectiveRoot, key === "$value" ? undefined : getNodeType()) as unknown as RawObject;
-						// Leaf token: unwrap to the resolved value so callers get the value
-						// directly (e.g. tokens["box-shadow"].panel → shadow array, not { $type, $value }).
-						// Group nodes have no $value and pass through as-is.
-						value = "$value" in sub ? sub.$value : sub;
+						if ("$value" in sub) {
+							// Leaf token: unwrap to the resolved value so callers get the value
+							// directly (e.g. tokens["focus-ring"].dark → border object, not { $type, $value }).
+							value = sub.$value;
+						} else if (key === "$value") {
+							// $value is a plain object (e.g. a border or color composite) — resolve
+							// any alias strings or $ref objects inside it, same as the array branch.
+							value = resolveDeep(sub, effectiveRoot);
+						} else {
+							// Group node: pass through as a navigable merged object.
+							value = sub;
+						}
 					} else if (hasLeaf) {
 						// Deeply resolve aliases and $ref objects inside $value.
 						value = key === "$value" ? resolveDeep(leafValue, effectiveRoot) : leafValue;

src/scratch.ts

@@ -4,11 +4,8 @@ const resolverURL = new URL("../src/test/example/design-tokens.resolver.json", i
 
 const { tokens } = load(resolverURL);
 
-// Leaf token: should be the resolved value directly, no $type/$value wrapper
-console.log("panel shadow:", JSON.stringify((tokens as any)["box-shadow"].panel, null, 2));
+// focus-ring dark: alias "{color.blue.600.dark}" inside plain-object $value should resolve
+console.log("focus-ring dark:", JSON.stringify((tokens as any)["focus-ring"].dark, null, 2));
 
-// Group node: should still be a navigable object
-console.log("box-shadow group $type:", (tokens as any)["box-shadow"].$type);
-
-// Alias resolution inside the value
-console.log("panel[0].offsetX:", (tokens as any)["box-shadow"].panel[0].offsetX);
+// focus-ring light: same for light
+console.log("focus-ring light color:", (tokens as any)["focus-ring"].light?.color);