@pantoken/utils 1.1.0 → 1.2.1

package/dist/index.d.mts

@@ -78,7 +78,8 @@ interface ResolveOptions {
 /**
  * Build a resolver that expands `var(--x)` references to concrete leaf values against `base` (plus
  * any `overrides`). With `mode` it collapses `light-dark()` to that branch; without, it leaves
- * `light-dark()` in place.
+ * `light-dark()` in place. A token carrying a {@link Token.flatValue} resolves through that rather
+ * than its CSS-expression `value`, so callers always land on a real colour.
  *
  * @param base - The token set to resolve references against.
  * @param options - {@link ResolveOptions}.

package/dist/index.mjs

@@ -132,10 +132,33 @@ const VAR_RE = regex(VAR_SOURCE, "g");
 /** A `light-dark(<light>, <dark>)` value; capture groups 1 and 2 are the two branches. */
 const LIGHT_DARK_RE = regex(LIGHT_DARK_SOURCE);
 const MAX_DEPTH = 12;
+function lightDarkBranches(value) {
+	const trimmed = value.trim();
+	if (!trimmed.startsWith("light-dark(") || !trimmed.endsWith(")")) return void 0;
+	const content = trimmed.slice(11, -1);
+	let depth = 0;
+	let separator = -1;
+	for (let index = 0; index < content.length; index += 1) {
+		const char = content[index];
+		if (char === "(") depth += 1;
+		else if (char === ")") {
+			depth -= 1;
+			if (depth < 0) return void 0;
+		} else if (char === "," && depth === 0) {
+			if (separator !== -1) return void 0;
+			separator = index;
+		}
+	}
+	if (depth !== 0 || separator === -1) return void 0;
+	const light = content.slice(0, separator).trim();
+	const dark = content.slice(separator + 1).trim();
+	return light && dark ? [light, dark] : void 0;
+}
 /**
 * Build a resolver that expands `var(--x)` references to concrete leaf values against `base` (plus
 * any `overrides`). With `mode` it collapses `light-dark()` to that branch; without, it leaves
-* `light-dark()` in place.
+* `light-dark()` in place. A token carrying a {@link Token.flatValue} resolves through that rather
+* than its CSS-expression `value`, so callers always land on a real colour.
 *
 * @param base - The token set to resolve references against.
 * @param options - {@link ResolveOptions}.
@@ -186,12 +209,12 @@ const MAX_DEPTH = 12;
 * ```
 */
 function makeResolver(base, options = {}) {
-	const map = new Map(base.map((t) => [t.name, t.value]));
-	for (const t of options.overrides ?? []) map.set(t.name, t.value);
+	const map = new Map(base.map((t) => [t.name, t.flatValue ?? t.value]));
+	for (const t of options.overrides ?? []) map.set(t.name, t.flatValue ?? t.value);
 	const pickMode = (value) => {
 		if (!options.mode) return value;
-		const m = LIGHT_DARK_RE.exec(value.trim());
-		return m ? options.mode === "light" ? m[1] : m[2] : value;
+		const branches = lightDarkBranches(value);
+		return branches ? branches[options.mode === "light" ? 0 : 1] : value;
 	};
 	const expand = (value, depth) => {
 		const picked = pickMode(value);
@@ -224,7 +247,7 @@ function makeResolver(base, options = {}) {
 */
 function resolveTokens(base, options = {}) {
 	const resolve = makeResolver(base, options);
-	return new Map(base.map((t) => [t.name, resolve(t.value)]));
+	return new Map(base.map((t) => [t.name, resolve(t.flatValue ?? t.value)]));
 }
 //#endregion
 //#region src/drift.ts
@@ -259,6 +282,11 @@ function extractInstuiRefs(text) {
 function tokenNames(ir) {
 	return new Set(ir.map((t) => t.name));
 }
+function declaredInstuiProperties(text) {
+	const declared = new Set([...text.matchAll(/@property\s+(--instui-[\w-]+)/g)].map((m) => m[1]));
+	for (const match of text.matchAll(/(--instui-[\w]+(?:-[\w]+)*)\s*:/g)) declared.add(match[1]);
+	return declared;
+}
 /**
 * Drift check: `--instui-*` names in `text` that the IR doesn't define (sorted; empty means no
 * drift). Use for outputs that *reference* tokens defined elsewhere — e.g. the docusaurus/vitepress
@@ -284,7 +312,8 @@ function tokenNames(ir) {
 */
 function unknownReferences(text, ir) {
 	const names = tokenNames(ir);
-	return [...extractInstuiRefs(text)].filter((name) => !names.has(name)).sort();
+	const declared = declaredInstuiProperties(text);
+	return [...extractInstuiRefs(text)].filter((name) => !names.has(name) && !declared.has(name)).sort();
 }
 /**
 * Self-containment check: `--instui-*` names referenced via `var()` in a stylesheet that it never
@@ -309,9 +338,7 @@ function unknownReferences(text, ir) {
 */
 function danglingReferences(css) {
 	const referenced = new Set([...css.matchAll(/var\(\s*?(--instui-[\w-]+)/g)].map((m) => m[1]));
-	const defined = /* @__PURE__ */ new Set();
-	for (const m of css.matchAll(/@property\s+(--instui-[\w-]+)/g)) defined.add(m[1]);
-	for (const m of css.matchAll(/(--instui-[\w]+(?:-[\w]+)*)\s*:/g)) defined.add(m[1]);
+	const defined = declaredInstuiProperties(css);
 	return [...referenced].filter((name) => !defined.has(name)).sort();
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pantoken/utils",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Shared pantoken helpers: token reference resolver, typed regexes (arkregex), name-case, and hex-colour parsing.",
   "homepage": "https://pantoken.app",
   "bugs": "https://github.com/thedannywahl/pantoken/issues",
@@ -26,13 +26,13 @@
     "provenance": true
   },
   "dependencies": {
-    "@pantoken/model": "0.4.0",
+    "@pantoken/model": "0.5.0",
     "arkregex": "^0.0.8",
     "css-tree": "^3.2.1"
   },
   "devDependencies": {
     "@types/css-tree": "^3.2.0",
-    "@types/node": "^26.6.2",
+    "@types/node": "^26.6.3",
     "typescript": "^7.0.2",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.0.0-rc.0",
     "vite-plus": "1.0.0-rc.0"