@arbor-css/modes 0.0.49 → 0.0.52

package/LICENSE.md

@@ -0,0 +1,7 @@
+Copyright 2026 Grant Forrest
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/createModeSchema.d.ts

@@ -1,5 +1,5 @@
-import { Token, TokenPurpose } from '@arbor-css/tokens';
-import { TrackedValue } from './tracking.js';
+import { Equation } from '@arbor-css/calc';
+import { CreateToken, Token, TokenPurpose } from '@arbor-css/tokens';
 export type ModePropertyType = TokenPurpose;
 export type ModeSchemaProperty = ModePropertyType | {
     type: ModePropertyType;
@@ -9,7 +9,7 @@ export type ModeSchemaLevel = {
     /**
      * Special key: creates a token at the current group path without appending
      * a `-$root` segment. For example, `{ colors: { main: { $root: 'color', mid: 'color' } } }`
-     * generates `--Ⓜ️-colors-main` (for `$root`) and `--Ⓜ️-colors-main-mid` (for `mid`).
+     * generates `--$-colors-main` (for `$root`) and `--$-colors-main-mid` (for `mid`).
      * Optional at any level.
      */
     $root?: ModeSchemaProperty;
@@ -18,20 +18,21 @@ export type ModeSchemaLevel = {
 export type ModeSchema<TSchema extends ModeSchemaLevel = ModeSchemaLevel> = {
     definition: TSchema;
     tag: string;
-    $tokens: AsPropertyDefinitions<TSchema>;
+    $tokens: ModeTokens<TSchema>;
     createBase: (def: ModeValues<TSchema>) => ModeInstance<TSchema>;
     createPartial: (name: string, def: DeepPartial<ModeValues<TSchema>>) => PartialModeInstance<TSchema>;
     extend: <TExtensionSchema extends ModeSchemaLevel>(extension: TExtensionSchema) => ModeSchema<TSchema & TExtensionSchema>;
     extraCss?: string;
 };
-export declare function createModeSchema<T extends ModeSchemaLevel>(input: T, { tag, extraCss }?: {
+export declare function createModeSchema<T extends ModeSchemaLevel>(input: T, { tag, extraCss, createToken: createTokenValue, }: {
     tag?: string;
     extraCss?: string;
+    createToken: CreateToken;
 }): ModeSchema<T>;
 export type DeepPartial<T> = {
     [P in keyof T]?: DeepPartial<T[P]> | undefined;
 };
-export type ModeValue = string | number | Token | TrackedValue;
+export type ModeValue = string | number | Token | Equation;
 export declare function isModeValue(value: any): value is ModeValue;
 export type ModeValues<T extends ModeSchemaLevel> = {
     [P in keyof T]: NonNullable<T[P]> extends ModeSchemaProperty ? ModeValue : NonNullable<T[P]> extends ModeSchemaLevel ? ModeValues<NonNullable<T[P]>> : never;
@@ -47,9 +48,8 @@ export type ModeInstance<T extends ModeSchemaLevel> = {
 export type PartialModeInstance<T extends ModeSchemaLevel> = Omit<ModeInstance<T>, 'values'> & {
     values: DeepPartial<ModeValues<T>>;
 };
-type AsPropertyDefinitions<T> = T extends object ? {
-    [P in keyof T]: NonNullable<T[P]> extends string ? Token : NonNullable<T[P]> extends object ? AsPropertyDefinitions<NonNullable<T[P]>> : never;
+export type ModeTokens<T> = T extends object ? {
+    [P in keyof T]: NonNullable<T[P]> extends string ? Token : NonNullable<T[P]> extends object ? ModeTokens<NonNullable<T[P]>> : never;
 } : never;
 export declare function flattenToPropsList(obj: any): Token[];
-export {};
 //# sourceMappingURL=createModeSchema.d.ts.map

package/dist/createModeSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createModeSchema.d.ts","sourceRoot":"","sources":["../src/createModeSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createModeSchema.d.ts","sourceRoot":"","sources":["../src/createModeSchema.ts"],"names":[],"mappings":"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"}

package/dist/createModeSchema.js

@@ -1,5 +1,5 @@
-import { createToken, isToken } from '@arbor-css/tokens';
-import { isTrackedValue } from './tracking.js';
+import { isCalcEquation } from '@arbor-css/calc';
+import { isToken } from '@arbor-css/tokens';
 function isModeSchemaProperty(value) {
     return (typeof value === 'string' ||
         (typeof value === 'object' &&
@@ -7,20 +7,20 @@ function isModeSchemaProperty(value) {
             'type' in value &&
             value.type !== undefined));
 }
-function getModeSchemaPropertyAsPropertyDefinition(name, prop, group) {
+function getModeSchemaPropertyAsPropertyDefinition(name, prop, createTokenValue, group) {
     if (typeof prop === 'string') {
-        return createToken(name, { purpose: prop, group });
+        return createTokenValue(name, { purpose: prop, group });
     }
     else {
-        return createToken(name, {
+        return createTokenValue(name, {
             purpose: prop.type,
             fallback: prop.fallback,
             group,
         });
     }
 }
-export function createModeSchema(input, { tag = 'Ⓜ️', extraCss } = {}) {
-    const PROPS = createModeTokens(input, tag);
+export function createModeSchema(input, { tag = '', extraCss, createToken: createTokenValue, }) {
+    const PROPS = createModeTokens(input, tag, createTokenValue);
     const schema = {
         definition: input,
         tag,
@@ -51,18 +51,19 @@ export function createModeSchema(input, { tag = 'Ⓜ️', extraCss } = {}) {
             };
             return createModeSchema(extendedDefinition, {
                 tag: schema.tag,
+                createToken: createTokenValue,
             });
         },
     };
     return schema;
 }
 export function isModeValue(value) {
-    return (isTrackedValue(value) ||
+    return (isCalcEquation(value) ||
         isToken(value) ||
         typeof value === 'string' ||
         typeof value === 'number');
 }
-function createModeTokens(root, tag) {
+function createModeTokens(root, tag, createTokenValue) {
     function generatePropsForSchemaLevel(schemaLevel, propPrefix) {
         const propsLevel = {};
         for (const key in schemaLevel) {
@@ -70,13 +71,15 @@ function createModeTokens(root, tag) {
             if (key === '$root') {
                 // $root generates a token at the current group path (no segment appended)
                 if (isModeSchemaProperty(value)) {
-                    propsLevel.$root = getModeSchemaPropertyAsPropertyDefinition(propPrefix, value, propPrefix);
+                    propsLevel.$root = getModeSchemaPropertyAsPropertyDefinition(propPrefix, value, createTokenValue, propPrefix);
                 }
                 continue;
             }
-            const currentPrefix = `${propPrefix}-${key.toLowerCase()}`;
+            const currentPrefix = [propPrefix, key.toLowerCase()]
+                .filter(Boolean)
+                .join('-');
             if (isModeSchemaProperty(value)) {
-                const propertyDefinition = getModeSchemaPropertyAsPropertyDefinition(currentPrefix, value, propPrefix);
+                const propertyDefinition = getModeSchemaPropertyAsPropertyDefinition(currentPrefix, value, createTokenValue, propPrefix);
                 propsLevel[key] = propertyDefinition;
             }
             else if (typeof value === 'object' && value !== null) {

package/dist/createModeSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"createModeSchema.js","sourceRoot":"","sources":["../src/createModeSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createModeSchema.js","sourceRoot":"","sources":["../src/createModeSchema.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export * from './createModeSchema.js';
 export * from './modeToCss.js';
-export * from './tracking.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC"}

package/dist/index.js

@@ -1,4 +1,3 @@
 export * from './createModeSchema.js';
 export * from './modeToCss.js';
-export * from './tracking.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC"}

package/dist/modeToCss.d.ts

@@ -1,3 +1,6 @@
+import { SystemTokens } from '@arbor-css/globals';
 import { ModeInstance, ModeSchemaLevel, PartialModeInstance } from './createModeSchema.js';
-export declare function modeToCss<TModeShape extends ModeSchemaLevel>(mode: PartialModeInstance<TModeShape>, baseMode: ModeInstance<TModeShape>): string;
+export declare function modeToCss<TModeShape extends ModeSchemaLevel>(mode: PartialModeInstance<TModeShape>, baseMode: ModeInstance<TModeShape>, { systemProps, }: {
+    systemProps: SystemTokens;
+}): string;
 //# sourceMappingURL=modeToCss.d.ts.map

package/dist/modeToCss.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modeToCss.d.ts","sourceRoot":"","sources":["../src/modeToCss.ts"],"names":[],"mappings":"AAGA,OAAO,EAEN,YAAY,EACZ,eAAe,EAEf,mBAAmB,EACnB,MAAM,uBAAuB,CAAC;AA8C/B,wBAAgB,SAAS,CAAC,UAAU,SAAS,eAAe,EAC3D,IAAI,EAAE,mBAAmB,CAAC,UAAU,CAAC,EACrC,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,GAChC,MAAM,CAkDR"}
+{"version":3,"file":"modeToCss.d.ts","sourceRoot":"","sources":["../src/modeToCss.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAEN,YAAY,EACZ,eAAe,EAEf,mBAAmB,EACnB,MAAM,uBAAuB,CAAC;AAgD/B,wBAAgB,SAAS,CAAC,UAAU,SAAS,eAAe,EAC3D,IAAI,EAAE,mBAAmB,CAAC,UAAU,CAAC,EACrC,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,EAClC,EACC,WAAW,GACX,EAAE;IACF,WAAW,EAAE,YAAY,CAAC;CAC1B,GACC,MAAM,CAoDR"}

package/dist/modeToCss.js

@@ -1,8 +1,7 @@
-import { $systemProps } from '@arbor-css/globals';
+import { isCalcEquation, printEquation } from '@arbor-css/calc';
 import { isToken } from '@arbor-css/tokens';
 import { toFlatKeys } from '@arbor-css/util';
 import { isModeValue, } from './createModeSchema.js';
-import { isTrackedValue } from './tracking.js';
 /**
  * For a given Token, returns which values in the base mode depend on it.
  * When any mode defines a value, we check the corresponding token with
@@ -11,11 +10,13 @@ import { isTrackedValue } from './tracking.js';
  * evaluated at declaration and won't update due to downstream changes to
  * properties they derive from.
  */
-function getBaseModeDependents(baseMode, token, seen = new Set()) {
-    if (seen.has(token)) {
-        throw new Error(`Circular dependency detected for token ${token.name} in mode ${baseMode.config.name}`);
+function getBaseModeDependents(baseMode, token, visiting = []) {
+    const cycleStart = visiting.findIndex((name) => name === token.name);
+    if (cycleStart !== -1) {
+        const cycleChain = [...visiting.slice(cycleStart), token.name].join(' -> ');
+        throw new Error(`Circular dependency detected in mode ${baseMode.config.name}: ${cycleChain}`);
     }
-    seen.add(token);
+    const nextVisiting = [...visiting, token.name];
     const dependents = {};
     const flatBase = toFlatKeys(baseMode.values, isModeValue, { separator: '-' });
     const flatTokens = toFlatKeys(baseMode.schema.$tokens, isToken, {
@@ -23,20 +24,21 @@ function getBaseModeDependents(baseMode, token, seen = new Set()) {
     });
     for (const key in flatBase) {
         const value = flatBase[key];
-        if (isTrackedValue(value)) {
-            if (value.dependencies.some((dep) => dep.name === token.name)) {
+        if (isCalcEquation(value)) {
+            if (value.tokens.some((dep) => dep.name === token.name)) {
                 const tokenForKey = flatTokens[key];
-                dependents[tokenForKey.name] = value.value;
-                // recurse to find any values that depend on this dependent as well
-                if (tokenForKey) {
-                    Object.assign(dependents, getBaseModeDependents(baseMode, tokenForKey, seen));
+                if (!tokenForKey) {
+                    continue;
                 }
+                dependents[tokenForKey.name] = printEquation(value);
+                // recurse to find any values that depend on this dependent as well
+                Object.assign(dependents, getBaseModeDependents(baseMode, tokenForKey, nextVisiting));
             }
         }
     }
     return dependents;
 }
-export function modeToCss(mode, baseMode) {
+export function modeToCss(mode, baseMode, { systemProps, }) {
     const flatValues = toFlatKeys(mode.values, isModeValue, {
         separator: '-',
     });
@@ -55,8 +57,10 @@ export function modeToCss(mode, baseMode) {
         if (isToken(value)) {
             cssVars[tokenVar.name] = value.var;
         }
-        else if (isTrackedValue(value)) {
-            cssVars[tokenVar.name] = value.value;
+        else if (isCalcEquation(value)) {
+            // TODO: add globals to parameters of this function and computeEquation
+            // instead?
+            cssVars[tokenVar.name] = printEquation(value);
         }
         else if (typeof value === 'string' || typeof value === 'number') {
             cssVars[tokenVar.name] = value.toString();
@@ -73,13 +77,13 @@ export function modeToCss(mode, baseMode) {
         ...cssVars,
     }).reduce((acc, [key, value]) => `${acc}${key}: ${value};\n`, '');
     const content = [valuesCss, mode.schema.extraCss].filter(Boolean).join('\n');
-    return `.\\@mode-${mode.config.name},
-[data-mode-${mode.config.name}=""],
-:where(.\\@mode-${mode.config.name} [class^="\\@scheme-"]),
-:where([data-mode-${mode.config.name}=""] [class^="\\@scheme-"]) {
-	${$systemProps.labels.mode.assign(mode.config.name)}
-	${content}
-}
+    return `.\\@mode-${mode.config.name},
+[data-mode-${mode.config.name}=""],
+:where(.\\@mode-${mode.config.name} [class^="\\@scheme-"]),
+:where([data-mode-${mode.config.name}=""] [class^="\\@scheme-"]) {
+	${systemProps.labels.mode.assign(mode.config.name)}
+	${content}
+}
 `;
 }
 //# sourceMappingURL=modeToCss.js.map

package/dist/modeToCss.js.map

@@ -1 +1 @@
-{"version":3,"file":"modeToCss.js","sourceRoot":"","sources":["../src/modeToCss.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modeToCss.js","sourceRoot":"","sources":["../src/modeToCss.ts"],"names":[],"mappings":"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"}

package/dist/modeToCss.test.js

@@ -1,7 +1,10 @@
+import { css } from '@arbor-css/calc';
+import { createGlobalContext } from '@arbor-css/globals';
 import { expect, it } from 'vitest';
 import { createModeSchema } from './createModeSchema.js';
 import { modeToCss } from './modeToCss.js';
-import { derive } from './tracking.js';
+const ctx = createGlobalContext();
+const systemProps = ctx.$systemTokens;
 const testSchema = createModeSchema({
     value: 'color',
     derived: {
@@ -9,13 +12,15 @@ const testSchema = createModeSchema({
         twice: 'color',
         again: 'color',
     },
+}, {
+    createToken: ctx.createToken,
 });
 const baseMode = testSchema.createBase({
     value: 'red',
     derived: {
-        once: derive `color-mix(in hsl, ${testSchema.$tokens.value}, black)`,
-        twice: derive `color-mix(in hsl, ${testSchema.$tokens.derived.once}, transparent)`,
-        again: derive `color-mix(in hsl, ${testSchema.$tokens.value}, red)`,
+        once: css `color-mix(in hsl, ${testSchema.$tokens.value}, black)`,
+        twice: css `color-mix(in hsl, ${testSchema.$tokens.derived.once}, transparent)`,
+        again: css `color-mix(in hsl, ${testSchema.$tokens.value}, red)`,
     },
 });
 const partialMode = testSchema.createPartial('partial', {
@@ -27,52 +32,52 @@ const underivedMode = testSchema.createPartial('underived', {
     },
 });
 it('prints a base mode with derived values', () => {
-    const css = modeToCss(baseMode, baseMode);
-    expect(css).toMatchInlineSnapshot(`
-		".\\@mode-base,
-		[data-mode-base=""],
-		:where(.\\@mode-base [class^="\\@scheme-"]),
-		:where([data-mode-base=""] [class^="\\@scheme-"]) {
-			--ℹ️-mode: base;
-			--Ⓜ️-derived-once: color-mix(in hsl, var(--Ⓜ️-value), black);
-		--Ⓜ️-derived-twice: color-mix(in hsl, var(--Ⓜ️-derived-once), transparent);
-		--Ⓜ️-derived-again: color-mix(in hsl, var(--Ⓜ️-value), red);
-		--Ⓜ️-value: red;
-
-		}
-		"
+    const css = modeToCss(baseMode, baseMode, { systemProps });
+    expect(css).toMatchInlineSnapshot(`
+		".\\@mode-base,
+		[data-mode-base=""],
+		:where(.\\@mode-base [class^="\\@scheme-"]),
+		:where([data-mode-base=""] [class^="\\@scheme-"]) {
+			--x-system-mode: base;
+			--x-derived-once: color-mix(in hsl, var(--x-value), black);
+		--x-derived-twice: color-mix(in hsl, var(--x-derived-once), transparent);
+		--x-derived-again: color-mix(in hsl, var(--x-value), red);
+		--x-value: red;
+
+		}
+		"
 	`);
 });
 it('prints a partial mode with derived dependencies it doesnt declare', () => {
-    const css = modeToCss(partialMode, baseMode);
-    expect(css).toMatchInlineSnapshot(`
-		".\\@mode-partial,
-		[data-mode-partial=""],
-		:where(.\\@mode-partial [class^="\\@scheme-"]),
-		:where([data-mode-partial=""] [class^="\\@scheme-"]) {
-			--ℹ️-mode: partial;
-			--Ⓜ️-derived-once: color-mix(in hsl, var(--Ⓜ️-value), black);
-		--Ⓜ️-derived-twice: color-mix(in hsl, var(--Ⓜ️-derived-once), transparent);
-		--Ⓜ️-derived-again: color-mix(in hsl, var(--Ⓜ️-value), red);
-		--Ⓜ️-value: blue;
-
-		}
-		"
+    const css = modeToCss(partialMode, baseMode, { systemProps });
+    expect(css).toMatchInlineSnapshot(`
+		".\\@mode-partial,
+		[data-mode-partial=""],
+		:where(.\\@mode-partial [class^="\\@scheme-"]),
+		:where([data-mode-partial=""] [class^="\\@scheme-"]) {
+			--x-system-mode: partial;
+			--x-derived-once: color-mix(in hsl, var(--x-value), black);
+		--x-derived-twice: color-mix(in hsl, var(--x-derived-once), transparent);
+		--x-derived-again: color-mix(in hsl, var(--x-value), red);
+		--x-value: blue;
+
+		}
+		"
 	`);
 });
 it('prints a partial mode which overrides derived dependencies from base and doesnt go upstream from there, but does go downstream to further derivations', () => {
-    const css = modeToCss(underivedMode, baseMode);
-    expect(css).toMatchInlineSnapshot(`
-		".\\@mode-underived,
-		[data-mode-underived=""],
-		:where(.\\@mode-underived [class^="\\@scheme-"]),
-		:where([data-mode-underived=""] [class^="\\@scheme-"]) {
-			--ℹ️-mode: underived;
-			--Ⓜ️-derived-twice: color-mix(in hsl, var(--Ⓜ️-derived-once), transparent);
-		--Ⓜ️-derived-once: green;
-
-		}
-		"
+    const css = modeToCss(underivedMode, baseMode, { systemProps });
+    expect(css).toMatchInlineSnapshot(`
+		".\\@mode-underived,
+		[data-mode-underived=""],
+		:where(.\\@mode-underived [class^="\\@scheme-"]),
+		:where([data-mode-underived=""] [class^="\\@scheme-"]) {
+			--x-system-mode: underived;
+			--x-derived-twice: color-mix(in hsl, var(--x-derived-once), transparent);
+		--x-derived-once: green;
+
+		}
+		"
 	`);
 });
 // $root tests
@@ -83,6 +88,8 @@ const rootSchema = createModeSchema({
             mid: 'color',
         },
     },
+}, {
+    createToken: ctx.createToken,
 });
 const rootBase = rootSchema.createBase({
     colors: {
@@ -93,14 +100,14 @@ const rootBase = rootSchema.createBase({
     },
 });
 it('$root at nested level generates CSS var at group path (no -$root suffix)', () => {
-    const css = modeToCss(rootBase, rootBase);
-    expect(css).toContain('--Ⓜ️-colors-main: oklch(0.5 0.1 240)');
-    expect(css).not.toContain('--Ⓜ️-colors-main-$root');
+    const css = modeToCss(rootBase, rootBase, { systemProps });
+    expect(css).toContain('--x-colors-main: oklch(0.5 0.1 240)');
+    expect(css).not.toContain('--x-colors-main-$root');
 });
 it('$root and sibling keys coexist and both emit correctly', () => {
-    const css = modeToCss(rootBase, rootBase);
-    expect(css).toContain('--Ⓜ️-colors-main: oklch(0.5 0.1 240)');
-    expect(css).toContain('--Ⓜ️-colors-main-mid: oklch(0.6 0.1 240)');
+    const css = modeToCss(rootBase, rootBase, { systemProps });
+    expect(css).toContain('--x-colors-main: oklch(0.5 0.1 240)');
+    expect(css).toContain('--x-colors-main-mid: oklch(0.6 0.1 240)');
 });
 it('partial mode override of $root maps correctly', () => {
     const partial = rootSchema.createPartial('alt', {
@@ -110,8 +117,27 @@ it('partial mode override of $root maps correctly', () => {
             },
         },
     });
-    const css = modeToCss(partial, rootBase);
-    expect(css).toContain('--Ⓜ️-colors-main: oklch(0.7 0.2 30)');
-    expect(css).not.toContain('--Ⓜ️-colors-main-mid');
+    const css = modeToCss(partial, rootBase, { systemProps });
+    expect(css).toContain('--x-colors-main: oklch(0.7 0.2 30)');
+    expect(css).not.toContain('--x-colors-main-mid');
+});
+it('throws with full token chain for circular derived dependencies', () => {
+    const circularSchema = createModeSchema({
+        value: 'color',
+        derived: {
+            a: 'color',
+            b: 'color',
+        },
+    }, {
+        createToken: ctx.createToken,
+    });
+    const circularBase = circularSchema.createBase({
+        value: 'red',
+        derived: {
+            a: css `color-mix(in hsl, ${circularSchema.$tokens.derived.b}, white)`,
+            b: css `color-mix(in hsl, ${circularSchema.$tokens.derived.a}, black)`,
+        },
+    });
+    expect(() => modeToCss(circularBase, circularBase, { systemProps })).toThrow(/Circular dependency detected in mode base: .*--x-derived-a.*->.*--x-derived-b.*->.*--x-derived-a/);
 });
 //# sourceMappingURL=modeToCss.test.js.map

package/dist/modeToCss.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"modeToCss.test.js","sourceRoot":"","sources":["../src/modeToCss.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modeToCss.test.js","sourceRoot":"","sources":["../src/modeToCss.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arbor-css/modes",
-  "version": "0.0.49",
+  "version": "0.0.52",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -25,13 +25,15 @@
     "vitest": "^4.1.5"
   },
   "dependencies": {
-    "@arbor-css/tokens": "0.0.49",
-    "@arbor-css/util": "0.0.49",
-    "@arbor-css/globals": "0.0.49"
+    "@arbor-css/tokens": "0.0.52",
+    "@arbor-css/util": "0.0.52",
+    "@arbor-css/calc": "0.0.52",
+    "@arbor-css/globals": "0.0.52"
   },
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w --preserveWatchOutput",
-    "test": "vitest"
+    "test": "vitest",
+    "test:ci": "vitest --run"
   }
 }

package/dist/tracking.d.ts

@@ -1,17 +0,0 @@
-import { Token } from '@arbor-css/tokens';
-export type TrackedValue = {
-    '@@TRACKED': true;
-    dependencies: Token[];
-    value: string;
-};
-export declare function isTrackedValue(value: any): value is TrackedValue;
-export type DeriveEntry = Token | {
-    value: Token;
-    fallback: DeriveEntry;
-};
-/**
- * A tagged template literal which interpolates Tokens and
- * tracks them as dependencies.
- */
-export declare const derive: (strings: TemplateStringsArray, ...values: DeriveEntry[]) => TrackedValue;
-//# sourceMappingURL=tracking.d.ts.map

package/dist/tracking.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tracking.d.ts","sourceRoot":"","sources":["../src/tracking.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,YAAY,GAAG;IAC1B,WAAW,EAAE,IAAI,CAAC;IAClB,YAAY,EAAE,KAAK,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,YAAY,CAEhE;AAED,MAAM,MAAM,WAAW,GACpB,KAAK,GACL;IACA,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,WAAW,CAAC;CACrB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,MAAM,GAClB,SAAS,oBAAoB,EAC7B,GAAG,QAAQ,WAAW,EAAE,KACtB,YAkBF,CAAC"}

package/dist/tracking.js

@@ -1,48 +0,0 @@
-import { isToken } from '@arbor-css/tokens';
-export function isTrackedValue(value) {
-    return value && typeof value === 'object' && '@@TRACKED' in value;
-}
-/**
- * A tagged template literal which interpolates Tokens and
- * tracks them as dependencies.
- */
-export const derive = (strings, ...values) => {
-    const dependencies = [];
-    const result = strings.reduce((acc, str, i) => {
-        const value = values[i - 1];
-        if (value) {
-            if (isToken(value)) {
-                dependencies.push(value);
-                acc += value.var;
-            }
-            else {
-                const flattened = flattenDeriveEntry(value);
-                dependencies.push(...flattened);
-                acc += writeVarFallbacks(flattened);
-            }
-        }
-        acc += str;
-        return acc;
-    }, '');
-    return { value: result, dependencies, '@@TRACKED': true };
-};
-function flattenDeriveEntry(entry) {
-    if (isToken(entry)) {
-        return [entry];
-    }
-    else {
-        return [entry.value, ...flattenDeriveEntry(entry.fallback)];
-    }
-}
-function writeVarFallbacks(tokens) {
-    const copy = [...tokens];
-    let latest = copy.pop()?.var;
-    if (!latest)
-        return '';
-    while (copy.length > 0) {
-        const next = copy.pop();
-        latest = next.varFallback(latest);
-    }
-    return latest;
-}
-//# sourceMappingURL=tracking.js.map

package/dist/tracking.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tracking.js","sourceRoot":"","sources":["../src/tracking.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,mBAAmB,CAAC;AAQnD,MAAM,UAAU,cAAc,CAAC,KAAU;IACxC,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,WAAW,IAAI,KAAK,CAAC;AACnE,CAAC;AASD;;;GAGG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CACrB,OAA6B,EAC7B,GAAG,MAAqB,EACT,EAAE;IACjB,MAAM,YAAY,GAAY,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,IAAI,KAAK,EAAE,CAAC;YACX,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzB,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACP,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAC5C,YAAY,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;gBAChC,GAAG,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;QACD,GAAG,IAAI,GAAG,CAAC;QACX,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAC3D,CAAC,CAAC;AAEF,SAAS,kBAAkB,CAAC,KAAkB;IAC7C,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,CAAC;AACF,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAe;IACzC,MAAM,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IACzB,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC;IAC7B,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAG,CAAC;QACzB,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC"}

package/dist/tracking.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=tracking.test.d.ts.map

package/dist/tracking.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tracking.test.d.ts","sourceRoot":"","sources":["../src/tracking.test.ts"],"names":[],"mappings":""}

package/dist/tracking.test.js

@@ -1,35 +0,0 @@
-import { createToken } from '@arbor-css/tokens';
-import { expect, it } from 'vitest';
-import { derive } from './tracking.js';
-const a = createToken('a', {});
-const b = createToken('b', {});
-const c = createToken('c', {});
-it('tracks simple token values', () => {
-    expect(derive `${a}`).toEqual({
-        value: a.var,
-        dependencies: [a],
-        '@@TRACKED': true,
-    });
-});
-it('interpolates tokens into other things', () => {
-    expect(derive `calc(${a} + 1px)`).toEqual({
-        value: `calc(${a.var} + 1px)`,
-        dependencies: [a],
-        '@@TRACKED': true,
-    });
-});
-it('handles fallbacks', () => {
-    expect(derive `${{ value: a, fallback: b }}`).toEqual({
-        value: a.varFallback(b.var),
-        dependencies: [a, b],
-        '@@TRACKED': true,
-    });
-});
-it('handles nested fallbacks', () => {
-    expect(derive `${{ value: a, fallback: { value: b, fallback: c } }}`).toEqual({
-        value: a.varFallback(b.varFallback(c.var)),
-        dependencies: [a, b, c],
-        '@@TRACKED': true,
-    });
-});
-//# sourceMappingURL=tracking.test.js.map

package/dist/tracking.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tracking.test.js","sourceRoot":"","sources":["../src/tracking.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC/B,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC/B,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAE/B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACrC,MAAM,CAAC,MAAM,CAAA,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;QAC5B,KAAK,EAAE,CAAC,CAAC,GAAG;QACZ,YAAY,EAAE,CAAC,CAAC,CAAC;QACjB,WAAW,EAAE,IAAI;KACjB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;IAChD,MAAM,CAAC,MAAM,CAAA,QAAQ,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QACxC,KAAK,EAAE,QAAQ,CAAC,CAAC,GAAG,SAAS;QAC7B,YAAY,EAAE,CAAC,CAAC,CAAC;QACjB,WAAW,EAAE,IAAI;KACjB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC5B,MAAM,CAAC,MAAM,CAAA,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC;QACpD,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3B,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACpB,WAAW,EAAE,IAAI;KACjB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACnC,MAAM,CAAC,MAAM,CAAA,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC;QAC5E,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC1C,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACvB,WAAW,EAAE,IAAI;KACjB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}