@arbor-css/core 0.0.89 → 0.0.91

package/dist/stylesheet/generateStylesheet.js.map

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

package/dist/stylesheet/generateStylesheet.test.js

@@ -9,15 +9,13 @@ it("generates a preset's CSS, including globals, primitives, modes, and function
             },
             mainColor: 'brand',
         },
-        config: {
-            globals: {
-                roundness: 1,
-            },
+        globals: {
+            roundness: 1,
         },
     });
     const css = generateStylesheet(preset);
     expect(css).toContain('--_-system-round: 1');
-    expect(css).toContain('--p-color-brand-mid: ');
+    expect(css).toContain('--m-primitive-color-brand-mid: ');
     expect(css).toContain('--m-color-main: ');
     expect(css).toContain('@function --fn-lighten-color');
 });

package/dist/stylesheet/generateStylesheet.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateStylesheet.test.js","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;IACxF,MAAM,MAAM,GAAG,WAAW,CAAC;QAC1B,KAAK,EAAE;YACN,MAAM,EAAE;gBACP,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;aAClB;YACD,SAAS,EAAE,OAAO;SAClB;QACD,MAAM,EAAE;YACP,OAAO,EAAE;gBACR,SAAS,EAAE,CAAC;aACZ;SACD;KACD,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEvC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;IAC7C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IAC/C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"generateStylesheet.test.js","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;IACxF,MAAM,MAAM,GAAG,WAAW,CAAC;QAC1B,KAAK,EAAE;YACN,MAAM,EAAE;gBACP,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;aAClB;YACD,SAAS,EAAE,OAAO;SAClB;QACD,OAAO,EAAE;YACR,SAAS,EAAE,CAAC;SACZ;KACD,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEvC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;IAC7C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,iCAAiC,CAAC,CAAC;IACzD,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC"}

package/dist/stylesheet/modeToCss.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modeToCss.d.ts","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,YAAY,EAAa,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAGN,iBAAiB,EAEjB,MAAM,mBAAmB,CAAC;AAG3B,wBAAgB,SAAS,CAAC,UAAU,SAAS,iBAAiB,EAC7D,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,EAC9B,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,GAC7B,MAAM,CAoER"}
+{"version":3,"file":"modeToCss.d.ts","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"AACA,OAAO,EAGN,YAAY,EAEZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAGN,iBAAiB,EAEjB,MAAM,mBAAmB,CAAC;AAG3B,wBAAgB,SAAS,CAAC,UAAU,SAAS,iBAAiB,EAC7D,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,EAC9B,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,GAC7B,MAAM,CAsER"}

package/dist/stylesheet/modeToCss.js

@@ -1,5 +1,5 @@
 import { isCalcEquation, printEquation } from '@arbor-css/calc';
-import { isModeValue } from '@arbor-css/modes';
+import { getModeInternals, isModeValue, } from '@arbor-css/modes';
 import { isToken, } from '@arbor-css/tokens';
 import { toFlatKeys } from '@arbor-css/util';
 export function modeToCss(mode, preset) {
@@ -9,6 +9,7 @@ export function modeToCss(mode, preset) {
     const flatTokens = toFlatKeys(preset.$.mode, isToken, {
         separator: '-',
     });
+    const modeInternals = getModeInternals(mode);
     const cssVars = {};
     const lowPriorityVars = {};
     for (const key in flatValues) {
@@ -22,8 +23,7 @@ export function modeToCss(mode, preset) {
             cssVars[tokenVar.name] = value.var;
         }
         else if (isCalcEquation(value)) {
-            // TODO: add globals to parameters of this function and computeEquation
-            // instead?
+            // TODO: computeEquation instead?
             cssVars[tokenVar.name] = printEquation(value);
         }
         else if (typeof value === 'string' || typeof value === 'number') {
@@ -43,18 +43,21 @@ export function modeToCss(mode, preset) {
     const content = [valuesCss, preset.modeSchema.extraCss]
         .filter(Boolean)
         .join('\n');
-    const simpleSelector = `.\\@mode-${mode.$name}`;
-    const schemeSelectors = preset.schemes.map((schemeName) => `:where(&.\\@mode-${mode.$name} .\\@scheme-${schemeName})`);
-    const selectors = [simpleSelector, ...schemeSelectors];
+    const simpleSelector = `.\\@mode-${modeInternals.name}`;
+    const selectors = [simpleSelector, ...(modeInternals.extraSelectors ?? [])];
     if (mode === preset.baseMode) {
         // base mode values are applied to :root and all scheme selectors since they can be referenced by any mode and we want them to update when the base mode changes
         selectors.push(...selectors.map((s) => s.replace(`.\\@mode-${mode.$name}`, ':root')));
     }
     return `${selectors.join(', ')} {
-	${preset.$.system.meta.modeName.assign(mode.$name)}
+	${preset.$.system.meta.modeName.assign(modeInternals.name)}
 	${content}
+	${modeInternals.extraCss ?? ''}
 }
-`;
+`
+        .replace(/\s+/g, ' ')
+        .replaceAll('; ', ';\n\t')
+        .replaceAll('{ ', '{\n\t');
 }
 /**
  * For a given Token, returns which values in the base mode depend on it.
@@ -91,6 +94,17 @@ function getBaseModeDependents(baseMode, token, modeTokens, visiting = []) {
                 Object.assign(dependents, getBaseModeDependents(baseMode, tokenForKey, modeTokens, nextVisiting));
             }
         }
+        else if (isToken(value)) {
+            if (value.name === token.name) {
+                const tokenForKey = flatTokens[key];
+                if (!tokenForKey) {
+                    continue;
+                }
+                dependents[tokenForKey.name] = value.var;
+                // recurse to find any values that depend on this dependent as well
+                Object.assign(dependents, getBaseModeDependents(baseMode, tokenForKey, modeTokens, nextVisiting));
+            }
+        }
     }
     return dependents;
 }

package/dist/stylesheet/modeToCss.js.map

@@ -1 +1 @@
-{"version":3,"file":"modeToCss.js","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAExE,OAAO,EACN,OAAO,GAIP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,UAAU,SAAS,CACxB,IAA8B,EAC9B,MAA+B;IAE/B,MAAM,UAAU,GAAG,UAAU,CAAY,IAAI,EAAE,WAAW,EAAE;QAC3D,SAAS,EAAE,GAAG;KACd,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,UAAU,CAAQ,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE;QAC5D,SAAS,EAAE,GAAG;KACd,CAAC,CAAC;IAEH,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,eAAe,GAA2B,EAAE,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,8CAA8C;YAC9C,SAAS;QACV,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC;QACpC,CAAC;aAAM,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,uEAAuE;YACvE,WAAW;YACX,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACnE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACd,2BAA2B,QAAQ,CAAC,IAAI,KAAK,KAAK,uCAAuC,CACzF,CAAC;QACH,CAAC;QAED,iMAAiM;QACjM,MAAM,QAAQ,GAAG,qBAAqB,CACrC,MAAM,CAAC,QAAQ,EACf,QAAQ,EACR,MAAM,CAAC,CAAC,CAAC,IAAI,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,GAAG,eAAe;QAClB,GAAG,OAAO;KACV,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,GAAG,KAAK,KAAK,KAAK,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;SACrD,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,MAAM,cAAc,GAAG,YAAY,IAAI,CAAC,KAAK,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CACzC,CAAC,UAAU,EAAE,EAAE,CAAC,oBAAoB,IAAI,CAAC,KAAK,eAAe,UAAU,GAAG,CAC1E,CAAC;IACF,MAAM,SAAS,GAAG,CAAC,cAAc,EAAE,GAAG,eAAe,CAAC,CAAC;IAEvD,IAAI,IAAI,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC9B,gKAAgK;QAChK,SAAS,CAAC,IAAI,CACb,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC,CACrE,CAAC;IACH,CAAC;IAED,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;GAC5B,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;GAChD,OAAO;;CAET,CAAC;AACF,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,qBAAqB,CAC7B,QAA2B,EAC3B,KAAY,EACZ,UAA+C,EAC/C,WAAqB,EAAE;IAEvB,MAAM,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;IACrE,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QACvB,uDAAuD;QACvD,oCAAoC;QACpC,MAAM,UAAU,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5E,MAAM,IAAI,KAAK,CACd,wCAAwC,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE,CACvE,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,UAAU,CAAQ,UAAU,EAAE,OAAO,EAAE;QACzD,SAAS,EAAE,GAAG;KACd,CAAC,CAAC;IACH,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzD,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,WAAW,EAAE,CAAC;oBAClB,SAAS;gBACV,CAAC;gBACD,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;gBACpD,mEAAmE;gBACnE,MAAM,CAAC,MAAM,CACZ,UAAU,EACV,qBAAqB,CACpB,QAAQ,EACR,WAAW,EACX,UAAU,EACV,YAAY,CACZ,CACD,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC"}
+{"version":3,"file":"modeToCss.js","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EACN,gBAAgB,EAChB,WAAW,GAGX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,OAAO,GAIP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,UAAU,SAAS,CACxB,IAA8B,EAC9B,MAA+B;IAE/B,MAAM,UAAU,GAAG,UAAU,CAAY,IAAI,EAAE,WAAW,EAAE;QAC3D,SAAS,EAAE,GAAG;KACd,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,UAAU,CAAQ,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE;QAC5D,SAAS,EAAE,GAAG;KACd,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,eAAe,GAA2B,EAAE,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,8CAA8C;YAC9C,SAAS;QACV,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC;QACpC,CAAC;aAAM,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,iCAAiC;YACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACnE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC3C,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CACd,2BAA2B,QAAQ,CAAC,IAAI,KAAK,KAAK,uCAAuC,CACzF,CAAC;QACH,CAAC;QAED,iMAAiM;QACjM,MAAM,QAAQ,GAAG,qBAAqB,CACrC,MAAM,CAAC,QAAQ,EACf,QAAQ,EACR,MAAM,CAAC,CAAC,CAAC,IAAI,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,GAAG,eAAe;QAClB,GAAG,OAAO;KACV,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,GAAG,KAAK,KAAK,KAAK,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;SACrD,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,MAAM,cAAc,GAAG,YAAY,aAAa,CAAC,IAAI,EAAE,CAAC;IACxD,MAAM,SAAS,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,aAAa,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC;IAE5E,IAAI,IAAI,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC9B,gKAAgK;QAChK,SAAS,CAAC,IAAI,CACb,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC,CACrE,CAAC;IACH,CAAC;IAED,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;GAC5B,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;GACxD,OAAO;GACP,aAAa,CAAC,QAAQ,IAAI,EAAE;;CAE9B;SACE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;SACzB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,qBAAqB,CAC7B,QAA2B,EAC3B,KAAY,EACZ,UAA+C,EAC/C,WAAqB,EAAE;IAEvB,MAAM,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;IACrE,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QACvB,uDAAuD;QACvD,oCAAoC;QACpC,MAAM,UAAU,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5E,MAAM,IAAI,KAAK,CACd,wCAAwC,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE,CACvE,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,UAAU,CAAQ,UAAU,EAAE,OAAO,EAAE;QACzD,SAAS,EAAE,GAAG;KACd,CAAC,CAAC;IACH,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzD,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,WAAW,EAAE,CAAC;oBAClB,SAAS;gBACV,CAAC;gBACD,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;gBACpD,mEAAmE;gBACnE,MAAM,CAAC,MAAM,CACZ,UAAU,EACV,qBAAqB,CACpB,QAAQ,EACR,WAAW,EACX,UAAU,EACV,YAAY,CACZ,CACD,CAAC;YACH,CAAC;QACF,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC/B,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,WAAW,EAAE,CAAC;oBAClB,SAAS;gBACV,CAAC;gBACD,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC;gBACzC,mEAAmE;gBACnE,MAAM,CAAC,MAAM,CACZ,UAAU,EACV,qBAAqB,CACpB,QAAQ,EACR,WAAW,EACX,UAAU,EACV,YAAY,CACZ,CACD,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC"}

package/dist/stylesheet/modeToCss.test.js

@@ -10,6 +10,7 @@ const preset = definePreset({
             once: 'color',
             twice: 'color',
             again: 'color',
+            direct: 'color',
         },
         ex: {
             $root: 'color',
@@ -22,13 +23,13 @@ const preset = definePreset({
             once: css `color-mix(in hsl, ${$.mode.value}, black)`,
             twice: css `color-mix(in hsl, ${$.mode.derived.once}, transparent)`,
             again: css `color-mix(in hsl, ${$.mode.value}, red)`,
+            direct: $.mode.value,
         },
         ex: {
             $root: 'blue',
             mid: 'teal',
         },
     }),
-    primitives: () => ({}),
 });
 const partialMode = preset.createMode('partial', {
     value: 'blue',
@@ -41,43 +42,39 @@ const underivedMode = preset.createMode('underived', {
 it('prints a base mode with derived values', () => {
     const css = modeToCss(preset.baseMode, preset);
     expect(css).toMatchInlineSnapshot(`
-		".\\@mode-base, :where(&.\\@mode-base .\\@scheme-light), :where(&.\\@mode-base .\\@scheme-dark), :root, :where(&:root .\\@scheme-light), :where(&:root .\\@scheme-dark) {
+		".\\@mode-base, :root, .\\@mode-base, :root {
 			--_-system-modeName: base;
 			--m-derived-once: color-mix(in hsl, var(--m-value), black);
-		--m-derived-twice: color-mix(in hsl, var(--m-derived-once), transparent);
-		--m-derived-again: color-mix(in hsl, var(--m-value), red);
-		--m-value: red;
-		--m-ex: blue;
-		--m-ex-mid: teal;
-
-		}
-		"
+			--m-derived-twice: color-mix(in hsl, var(--m-derived-once), transparent);
+			--m-derived-again: color-mix(in hsl, var(--m-value), red);
+			--m-derived-direct: var(--m-value);
+			--m-value: red;
+			--m-ex: blue;
+			--m-ex-mid: teal;
+			} "
 	`);
 });
 it('prints a partial mode with derived dependencies it doesnt declare', () => {
     const css = modeToCss(partialMode, preset);
     expect(css).toMatchInlineSnapshot(`
-		".\\@mode-partial, :where(&.\\@mode-partial .\\@scheme-light), :where(&.\\@mode-partial .\\@scheme-dark) {
+		".\\@mode-partial {
 			--_-system-modeName: partial;
 			--m-derived-once: color-mix(in hsl, var(--m-value), black);
-		--m-derived-twice: color-mix(in hsl, var(--m-derived-once), transparent);
-		--m-derived-again: color-mix(in hsl, var(--m-value), red);
-		--m-value: blue;
-
-		}
-		"
+			--m-derived-twice: color-mix(in hsl, var(--m-derived-once), transparent);
+			--m-derived-again: color-mix(in hsl, var(--m-value), red);
+			--m-derived-direct: var(--m-value);
+			--m-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, preset);
     expect(css).toMatchInlineSnapshot(`
-		".\\@mode-underived, :where(&.\\@mode-underived .\\@scheme-light), :where(&.\\@mode-underived .\\@scheme-dark) {
+		".\\@mode-underived {
 			--_-system-modeName: underived;
 			--m-derived-twice: color-mix(in hsl, var(--m-derived-once), transparent);
-		--m-derived-once: green;
-
-		}
-		"
+			--m-derived-once: green;
+			} "
 	`);
 });
 const rootBase = preset.createMode('rootBase', {

package/dist/stylesheet/modeToCss.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"modeToCss.test.js","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,MAAM,GAAG,YAAY,CAAC;IAC3B,IAAI,EAAE,aAAa;IACnB,UAAU,EAAE;QACX,KAAK,EAAE,OAAO;QACd,OAAO,EAAE;YACR,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,OAAO;SACd;QACD,EAAE,EAAE;YACH,KAAK,EAAE,OAAO;YACd,GAAG,EAAE,OAAO;SACZ;KACD;IACD,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjB,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE;YACR,IAAI,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,KAAK,UAAU;YACpD,KAAK,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,gBAAgB;YAClE,KAAK,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,KAAK,QAAQ;SACnD;QACD,EAAE,EAAE;YACH,KAAK,EAAE,MAAM;YACb,GAAG,EAAE,MAAM;SACX;KACD,CAAC;IACF,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;CACtB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE;IAChD,KAAK,EAAE,MAAM;CACb,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE;IACpD,OAAO,EAAE;QACR,IAAI,EAAE,OAAO;KACb;CACD,CAAC,CAAC;AAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;IACjD,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;EAYjC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;IAC5E,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC3C,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;EAUjC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,uJAAuJ,EAAE,GAAG,EAAE;IAChK,MAAM,GAAG,GAAG,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC7C,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;EAQjC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE;IAC9C,EAAE,EAAE;QACH,KAAK,EAAE,oBAAoB;QAC3B,GAAG,EAAE,oBAAoB;KACzB;CACD,CAAC,CAAC;AAEH,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;IACnF,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACxC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;IACpD,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;IACjE,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACxC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;IACpD,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;AACzD,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;IACxD,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE;QAC5C,EAAE,EAAE;YACH,KAAK,EAAE,mBAAmB;SAC1B;KACD,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACvC,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;IACnD,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;IACzE,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC7B,IAAI,EAAE,gBAAgB;QACtB,UAAU,EAAE;YACX,KAAK,EAAE,OAAO;YACd,OAAO,EAAE;gBACR,CAAC,EAAE,OAAO;gBACV,CAAC,EAAE,OAAO;aACV;SACD;QACD,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACjB,KAAK,EAAE,KAAK;YACZ,OAAO,EAAE;gBACR,CAAC,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU;gBACrD,CAAC,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU;aACrD;SACD,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAC3D,oFAAoF,CACpF,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"modeToCss.test.js","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.test.ts"],"names":[],"mappings":"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"}

package/dist/util/resolveComputedTokenValue.js

@@ -30,26 +30,19 @@ export function resolveComputedTokenValue(preset, tokenName, propertyValues = {}
 function getResolvedTokenValues(preset) {
     const internals = getInternals(preset);
     const colorScheme = internals.defaultScheme;
-    const schemeValues = internals.primitiveValues.color[colorScheme];
     const values = {
         ...preset.context.getGlobalPropertyAssignments(),
     };
-    applyKnownTokenValues(preset.$.primitives.color, schemeValues?.colors, values);
-    applyKnownTokenValues(preset.$.primitives.typography, internals.primitiveValues.typography.levels, values);
-    applyKnownTokenValues(preset.$.primitives.spacing, internals.primitiveValues.spacing.levels, values);
-    applyKnownTokenValues(preset.$.primitives.shadow, internals.primitiveValues.shadow.levels, values);
-    applyKnownTokenValues(preset.$.primitives.easing, internals.primitiveValues.easing, values);
-    applyKnownTokenValues(preset.$.primitives.duration, internals.primitiveValues.duration, values);
     applyKnownTokenValues(preset.$.mode, preset.baseMode, values);
     applyKnownTokenValues(preset.$.system.meta, {
         modeName: 'base',
         schemeName: colorScheme,
         scheme: {
-            invertMultiplier: schemeValues?.isDark ? -1 : 1,
-            whenDark: schemeValues?.isDark ? 1 : 0,
-            whenLight: schemeValues?.isDark ? 0 : 1,
-            trueLight: schemeValues?.isDark ? 'black' : 'white',
-            trueHeavy: schemeValues?.isDark ? 'white' : 'black',
+            invertMultiplier: colorScheme === 'dark' ? -1 : 1,
+            whenDark: colorScheme === 'dark' ? 1 : 0,
+            whenLight: colorScheme === 'dark' ? 0 : 1,
+            trueLight: colorScheme === 'dark' ? 'black' : 'white',
+            trueHeavy: colorScheme === 'dark' ? 'white' : 'black',
         },
     }, values);
     return values;

package/dist/util/resolveComputedTokenValue.js.map

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

package/dist/util/resolveComputedTokenValue.test.js

@@ -1,5 +1,5 @@
-import { expect, it } from 'vitest';
 import { css } from '@arbor-css/calc';
+import { expect, it } from 'vitest';
 import { presetArbor } from '../presets/arborPreset/preset.js';
 import { resolveComputedTokenValue } from './resolveComputedTokenValue.js';
 const preset = presetArbor({
@@ -13,7 +13,7 @@ const preset = presetArbor({
     },
 });
 it('resolves primitive token values', () => {
-    const value = resolveComputedTokenValue(preset, preset.$.primitives.spacing.$root.name);
+    const value = resolveComputedTokenValue(preset, preset.$.mode.primitive.spacing.$root.name);
     expect(value).toBe('0.5rem');
 });
 it('resolves base mode values with baking', () => {
@@ -22,13 +22,13 @@ it('resolves base mode values with baking', () => {
 });
 it('applies user property values to evaluation context', () => {
     const value = resolveComputedTokenValue(preset, preset.$.mode.spacing.sm.name, {
-        [preset.$.mode.density.name]: '2',
+        [preset.$.mode.scalar.density.name]: '2',
     });
     expect(value).toBe('calc(calc(0.3333333333333333rem / 2))');
 });
 it('resolves equation property values from user overrides', () => {
     const value = resolveComputedTokenValue(preset, preset.$.mode.spacing.sm.name, {
-        [preset.$.mode.density.name]: css `calc(1 + 1)`,
+        [preset.$.mode.scalar.density.name]: css `calc(1 + 1)`,
     });
     expect(value).toBe('calc(calc(0.3333333333333333rem / calc(2)))');
 });

package/dist/util/resolveComputedTokenValue.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveComputedTokenValue.test.js","sourceRoot":"","sources":["../../src/util/resolveComputedTokenValue.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,MAAM,GAAG,WAAW,CAAC;IAC1B,KAAK,EAAE;QACN,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACP,GAAG,EAAE;gBACJ,GAAG,EAAE,CAAC;aACN;SACD;KACD;CACD,CAAC,CAAC;AAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC1C,MAAM,KAAK,GAAG,yBAAyB,CACtC,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CACtC,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;IAChD,MAAM,KAAK,GAAG,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAE/E,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC7D,MAAM,KAAK,GAAG,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE;QAC9E,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG;KACjC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAChE,MAAM,KAAK,GAAG,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE;QAC9E,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA,aAAa;KAC9C,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;IAClD,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;AAC5E,CAAC,CAAC,CAAC"}
+{"version":3,"file":"resolveComputedTokenValue.test.js","sourceRoot":"","sources":["../../src/util/resolveComputedTokenValue.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,MAAM,MAAM,GAAG,WAAW,CAAC;IAC1B,KAAK,EAAE;QACN,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACP,GAAG,EAAE;gBACJ,GAAG,EAAE,CAAC;aACN;SACD;KACD;CACD,CAAC,CAAC;AAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC1C,MAAM,KAAK,GAAG,yBAAyB,CACtC,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAC1C,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;IAChD,MAAM,KAAK,GAAG,yBAAyB,CACtC,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAC7B,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC7D,MAAM,KAAK,GAAG,yBAAyB,CACtC,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAC7B;QACC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG;KACxC,CACD,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;IAChE,MAAM,KAAK,GAAG,yBAAyB,CACtC,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAC7B;QACC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA,aAAa;KACrD,CACD,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;IAClD,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;AAC5E,CAAC,CAAC,CAAC"}

package/dist/util/resolveTokenReferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTokenReferences.d.ts","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAgB,MAAM,0BAA0B,CAAC;AAIrE,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,MAAgB,GAC3B,MAAM,GAAG,SAAS,CAuDpB"}
+{"version":3,"file":"resolveTokenReferences.d.ts","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,MAAgB,GAC3B,MAAM,GAAG,SAAS,CAuCpB"}

package/dist/util/resolveTokenReferences.js

@@ -1,22 +1,8 @@
 import { isCalcEquation, printEquation } from '@arbor-css/calc';
-import { getInternals } from '@arbor-css/preset/config';
 import { isToken } from '@arbor-css/tokens';
 import { flattenAndApplyTokenValues } from './flattenAndApplyTokenValues.js';
 export function resolveTokenReferences(preset, tokenName, colorScheme = 'light') {
-    const internals = getInternals(preset);
-    const flat = flattenAndApplyTokenValues({
-        colors: preset.$.primitives.color,
-        shadows: preset.$.primitives.shadow,
-        spacing: preset.$.primitives.spacing,
-        typography: preset.$.primitives.typography,
-        mode: preset.$.mode,
-    }, {
-        colors: internals.primitiveValues.color[colorScheme].colors,
-        shadows: internals.primitiveValues.shadow.levels,
-        spacing: internals.primitiveValues.spacing.levels,
-        typography: internals.primitiveValues.typography.levels,
-        mode: preset.baseMode,
-    });
+    const flat = flattenAndApplyTokenValues(preset.$.mode, preset.baseMode);
     let current = tokenName;
     const visited = new Set();
     while (current) {

package/dist/util/resolveTokenReferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTokenReferences.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAe,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,UAAU,sBAAsB,CACrC,MAA6B,EAC7B,SAAiB,EACjB,cAAsB,OAAO;IAE7B,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,0BAA0B,CACtC;QACC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK;QACjC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM;QACnC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO;QACpC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU;QAC1C,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI;KACnB,EACD;QACC,MAAM,EAAE,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,MAAM;QAC3D,OAAO,EAAE,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM;QAChD,OAAO,EAAE,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM;QACjD,UAAU,EAAE,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM;QACvD,IAAI,EAAE,MAAM,CAAC,QAAQ;KACrB,CACD,CAAC;IAEF,IAAI,OAAO,GAAG,SAAS,CAAC;IACxB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,OAAO,OAAO,EAAE,CAAC;QAChB,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,qBAAqB;YACrB,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAErB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,mDAAmD;YACnD,kCAAkC;YAClC,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO,SAAS,CAAC;YAClB,CAAC;YACD,OAAO,GAAG,QAAQ,CAAC;QACpB,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtC,oDAAoD;YACpD,MAAM,QAAQ,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,GAAG,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACP,yBAAyB;YACzB,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa;IAC5C,MAAM,KAAK,GAAG,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChC,CAAC"}
+{"version":3,"file":"resolveTokenReferences.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,MAAM,UAAU,sBAAsB,CACrC,MAA6B,EAC7B,SAAiB,EACjB,cAAsB,OAAO;IAE7B,MAAM,IAAI,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAExE,IAAI,OAAO,GAAG,SAAS,CAAC;IACxB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,OAAO,OAAO,EAAE,CAAC;QAChB,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,qBAAqB;YACrB,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAErB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,mDAAmD;YACnD,kCAAkC;YAClC,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO,SAAS,CAAC;YAClB,CAAC;YACD,OAAO,GAAG,QAAQ,CAAC;QACpB,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACtC,oDAAoD;YACpD,MAAM,QAAQ,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,GAAG,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACP,yBAAyB;YACzB,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa;IAC5C,MAAM,KAAK,GAAG,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAChC,CAAC"}

package/dist/util/resolveTokenReferences.test.js

@@ -12,12 +12,12 @@ const preset = presetArbor({
     },
 });
 it('resolves a indirect token values', () => {
-    expect(resolveTokenReferences(preset, preset.$.primitives.color.red.$root.name)).toBe('oklch(90% 0.15000000000000002 0)');
+    expect(resolveTokenReferences(preset, preset.$.mode.primitive.color.red.$root.name)).toBe('light-dark(oklch(90% 0.15000000000000002 0), oklch(60% 0.16000000000000003 0))');
 });
 it('resolves direct token values', () => {
-    expect(resolveTokenReferences(preset, preset.$.primitives.spacing.$root.name)).toBe('0.5rem');
+    expect(resolveTokenReferences(preset, preset.$.mode.primitive.spacing.$root.name)).toBe('0.5rem');
 });
 it('resolves mode token values', () => {
-    expect(resolveTokenReferences(preset, preset.$.mode.color.main.$root.name)).toBe('oklch(90% 0.15000000000000002 0)');
+    expect(resolveTokenReferences(preset, preset.$.mode.color.main.$root.name)).toBe('light-dark(oklch(90% 0.15000000000000002 0), oklch(60% 0.16000000000000003 0))');
 });
 //# sourceMappingURL=resolveTokenReferences.test.js.map

package/dist/util/resolveTokenReferences.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTokenReferences.test.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,MAAM,GAAG,WAAW,CAAC;IAC1B,KAAK,EAAE;QACN,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACP,GAAG,EAAE;gBACJ,GAAG,EAAE,CAAC;aACN;SACD;KACD;CACD,CAAC,CAAC;AAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC3C,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CACxE,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACvC,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CACtE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACrC,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CACnE,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"resolveTokenReferences.test.js","sourceRoot":"","sources":["../../src/util/resolveTokenReferences.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,MAAM,GAAG,WAAW,CAAC;IAC1B,KAAK,EAAE;QACN,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACP,GAAG,EAAE;gBACJ,GAAG,EAAE,CAAC;aACN;SACD;KACD;CACD,CAAC,CAAC;AAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAC3C,MAAM,CACL,sBAAsB,CACrB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAC5C,CACD,CAAC,IAAI,CACL,gFAAgF,CAChF,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACvC,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAC1E,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACrC,MAAM,CACL,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CACnE,CAAC,IAAI,CACL,gFAAgF,CAChF,CAAC;AACH,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arbor-css/core",
-  "version": "0.0.89",
+  "version": "0.0.91",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -53,17 +53,17 @@
     "jiti": "^2.6.1",
     "lil-gui": "^0.21.0",
     "yargs": "^18.0.0",
-    "@arbor-css/preset": "0.0.89",
-    "@arbor-css/colors": "0.0.89",
-    "@arbor-css/tokens": "0.0.89",
-    "@arbor-css/modes": "0.0.89",
-    "@arbor-css/typography": "0.0.89",
-    "@arbor-css/spacing": "0.0.89",
-    "@arbor-css/globals": "0.0.89",
-    "@arbor-css/shadows": "0.0.89",
-    "@arbor-css/util": "0.0.89",
-    "@arbor-css/functions": "0.0.89",
-    "@arbor-css/calc": "0.0.89"
+    "@arbor-css/preset": "0.0.91",
+    "@arbor-css/tokens": "0.0.91",
+    "@arbor-css/globals": "0.0.91",
+    "@arbor-css/colors": "0.0.91",
+    "@arbor-css/modes": "0.0.91",
+    "@arbor-css/spacing": "0.0.91",
+    "@arbor-css/shadows": "0.0.91",
+    "@arbor-css/util": "0.0.91",
+    "@arbor-css/functions": "0.0.91",
+    "@arbor-css/typography": "0.0.91",
+    "@arbor-css/calc": "0.0.91"
   },
   "scripts": {
     "build": "tsc",

package/dist/presets/arborPreset/baseModeValues.d.ts

@@ -1,16 +0,0 @@
-import { CompiledColors } from '@arbor-css/colors';
-import { PresetMixins } from '@arbor-css/functions';
-import { ModeValues } from '@arbor-css/modes';
-import { PresetTokens } from '@arbor-css/preset';
-import { CompiledShadows } from '@arbor-css/shadows';
-import { CompiledSpacing } from '@arbor-css/spacing';
-import { CompiledTypography } from '@arbor-css/typography';
-import { ArborModeSchema } from './modeSchema.js';
-type Tokens = PresetTokens<ArborModeSchema, CompiledColors, CompiledTypography, CompiledSpacing, Record<string, string>, Record<string, string>, CompiledShadows, PresetMixins, [
-]>;
-export declare function createArborModeValues<TCompiledColors extends CompiledColors>(config: {
-    mainColor: keyof TCompiledColors[keyof TCompiledColors]['colors'];
-    tokens: Tokens;
-}): ModeValues<ArborModeSchema>;
-export {};
-//# sourceMappingURL=baseModeValues.d.ts.map

package/dist/presets/arborPreset/baseModeValues.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"baseModeValues.d.ts","sourceRoot":"","sources":["../../../src/presets/arborPreset/baseModeValues.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,KAAK,MAAM,GAAG,YAAY,CACzB,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACtB,eAAe,EACf,YAAY,EACZ;CAAE,CACF,CAAC;AA2BF,wBAAgB,qBAAqB,CACpC,eAAe,SAAS,cAAc,EACrC,MAAM,EAAE;IACT,SAAS,EAAE,MAAM,eAAe,CAAC,MAAM,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC;IAClE,MAAM,EAAE,MAAM,CAAC;CACf,GAAG,UAAU,CAAC,eAAe,CAAC,CA6M9B"}