npm - @arbor-css/core - Versions diffs - 0.0.107 → 0.0.110 - Mend

@arbor-css/core 0.0.107 → 0.0.110

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (171) hide show

package/dist/stylesheet/generateStylesheet.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generateStylesheet.d.ts","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAIxE,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,cAAc,EACtB,EACC,KAAK,EAAE,gBAA0B,EACjC,UAAU,GACV,GAAE;IACF,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;~~CAChB~~,GACJ,MAAM,CAyBR"}
1	+ {"version":3,"file":"generateStylesheet.d.ts","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAIxE,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,cAAc,EACtB,EACC,KAAK,EAAE,gBAA0B,EACjC,UAAU,EACV,UAAU,GACV,GAAE;IACF,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,aAAa,CAAC;CACtB,GACJ,MAAM,CAyBR"}

package/dist/stylesheet/generateStylesheet.js CHANGED Viewed

@@ -1,14 +1,14 @@
 import { getInternals } from '@arbor-css/preset/config';
 import { flattenTokenSchema } from '@arbor-css/tokens';
 import { modeToCss } from './modeToCss.js';
-export function generateStylesheet(config, { layer: cascadeLayerName = 'arbor', skipBaking, } = {}) {
+export function generateStylesheet(config, { layer: cascadeLayerName = 'arbor', skipBaking, simplifier, } = {}) {
     const { modes } = getInternals(config);
     const allModeProps = flattenTokenSchema(config.$.mode);
     return `/* Auto-generated CSS - do not edit directly */
 	${cascadeLayerName ? `@layer ${cascadeLayerName} {` : ''}
 ${[config.baseMode, ...Object.values(modes)]
         .map((modeValue) => {
-        return modeToCss(modeValue, config, { skipBaking });
+        return modeToCss(modeValue, config, { simplifier, skipBaking });
     })
         .join('\n\n')}
 /* Function definitions */

package/dist/stylesheet/generateStylesheet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generateStylesheet.js","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,EAAkB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,UAAU,kBAAkB,CACjC,MAAsB,EACtB,EACC,KAAK,EAAE,gBAAgB,GAAG,OAAO,EACjC,UAAU,~~MAIP~~,EAAE;IAEN,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEvD,OAAO;GACL,gBAAgB,CAAC,CAAC,CAAC,UAAU,gBAAgB,IAAI,CAAC,CAAC,CAAC,EAAE;EACvD,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1C,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QAClB,OAAO,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;~~IACrD~~,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC;;EAEZ,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;SAC/B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC;;EAEZ,YAAY;SACZ,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;SAC9B,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC;EACZ,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;CAC5B;SACE,IAAI,EAAE;SACN,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACzB,CAAC"}
1	+ {"version":3,"file":"generateStylesheet.js","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,UAAU,kBAAkB,CACjC,MAAsB,EACtB,EACC,KAAK,EAAE,gBAAgB,GAAG,OAAO,EACjC,UAAU,EACV,UAAU,MAKP,EAAE;IAEN,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEvD,OAAO;GACL,gBAAgB,CAAC,CAAC,CAAC,UAAU,gBAAgB,IAAI,CAAC,CAAC,CAAC,EAAE;EACvD,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1C,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QAClB,OAAO,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;IACjE,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC;;EAEZ,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;SAC/B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC;;EAEZ,YAAY;SACZ,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;SAC9B,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,MAAM,CAAC;EACZ,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;CAC5B;SACE,IAAI,EAAE;SACN,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACzB,CAAC"}

package/dist/stylesheet/generateStylesheet.test.js CHANGED Viewed

@@ -13,7 +13,7 @@ it("generates a preset's CSS, including globals, primitives, modes, and function
             roundness: 1,
         },
     });
-    const css = generateStylesheet(preset);
+    const css = generateStylesheet(preset, {});
     expect(css).toContain('--m-global-roundness: 1');
     expect(css).toContain('--m-primitive-color-brand-mid: ');
     expect(css).toContain('--m-color-main: ');

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

	@@ -1 +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,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,yBAAyB,CAAC,CAAC;IACjD,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"}
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,OAAO,EAAE;YACR,SAAS,EAAE,CAAC;SACZ;KACD,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAE3C,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;IACjD,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 CHANGED Viewed

@@ -1,7 +1,6 @@
+import { CssResolutionContext } from '@arbor-css/css-eval';
 import { ModeInstance } from '@arbor-css/modes';
 import { ArborPreset } from '@arbor-css/preset';
 import { SimpleTokenSchema } from '@arbor-css/tokens';
-export declare function modeToCss<TModeShape extends SimpleTokenSchema>(mode: ModeInstance<TModeShape>, preset: ArborPreset<TModeShape>, { skipBaking }?: {
-    skipBaking?: boolean;
-}): string;
+export declare function modeToCss<TModeShape extends SimpleTokenSchema>(mode: ModeInstance<TModeShape>, preset: ArborPreset<TModeShape>, ctx: CssResolutionContext): string;
 //# sourceMappingURL=modeToCss.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"modeToCss.d.ts","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAMtD,wBAAgB,SAAS,CAAC,UAAU,SAAS,iBAAiB,EAC7D,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,EAC9B,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,EAC/B,~~EAAE~~,~~UAAU,~~EAAE,~~GAAE;IAAE~~,~~UAAU~~,~~CAAC,EAAE,OAAO,CAAA;CAAO,GAC3C,~~MAAM,~~CAgCR~~"}
1	+ {"version":3,"file":"modeToCss.d.ts","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAoB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAMtD,wBAAgB,SAAS,CAAC,UAAU,SAAS,iBAAiB,EAC7D,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,EAC9B,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,EAC/B,GAAG,EAAE,oBAAoB,GACvB,MAAM,CA8BR"}

package/dist/stylesheet/modeToCss.js CHANGED Viewed

@@ -1,10 +1,8 @@
 import { getModeInternals } from '@arbor-css/modes';
 import { buildModeTokenGraph, walkModeTokenGraph, } from '../util/buildModeTokenGraph.js';
-export function modeToCss(mode, preset, { skipBaking } = {}) {
+export function modeToCss(mode, preset, ctx) {
     const modeInternals = getModeInternals(mode);
-    const graph = buildModeTokenGraph(mode, preset, {
-        skipBaking,
-    });
+    const graph = buildModeTokenGraph(mode, preset, ctx);
     const valuesCss = walkModeTokenGraph(graph).reduce((acc, node) => `${acc}${node.token.name}: ${node.computed};\n`, '');
     const content = [valuesCss, preset.modeSchema.extraCss]
         .filter(Boolean)

package/dist/stylesheet/modeToCss.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"modeToCss.js","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,EAAE,gBAAgB,EAAgB,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EACN,mBAAmB,EACnB,kBAAkB,GAClB,MAAM,gCAAgC,CAAC;AAExC,MAAM,UAAU,SAAS,CACxB,IAA8B,EAC9B,MAA+B,EAC/B,~~EAAE,UAAU,KAA+B,EAAE~~;~~IAE7C~~,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE~~;QAC/C~~,~~UAAU;KACV~~,CAAC,CAAC;~~IACH~~,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,MAAM,CACjD,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,QAAQ,KAAK,EAC9D,EAAE,CACF,CAAC;IACF,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"}
1	+ {"version":3,"file":"modeToCss.js","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAgB,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EACN,mBAAmB,EACnB,kBAAkB,GAClB,MAAM,gCAAgC,CAAC;AAExC,MAAM,UAAU,SAAS,CACxB,IAA8B,EAC9B,MAA+B,EAC/B,GAAyB;IAEzB,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC,MAAM,CACjD,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,QAAQ,KAAK,EAC9D,EAAE,CACF,CAAC;IACF,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"}

package/dist/stylesheet/modeToCss.test.js CHANGED Viewed

@@ -1,7 +1,8 @@
-import { css } from '@arbor-css/calc';
+import { css } from '@arbor-css/css-eval';
 import { definePreset } from '@arbor-css/preset';
 import { expect, it } from 'vitest';
 import { modeToCss } from './modeToCss.js';
+const ctx = {};
 const preset = definePreset({
     name: 'test-preset',
     modeSchema: {
@@ -40,7 +41,7 @@ const underivedMode = preset.createMode('underived', {
     },
 });
 it('prints a base mode with derived values', () => {
-    const css = modeToCss(preset.baseMode, preset);
+    const css = modeToCss(preset.baseMode, preset, ctx);
     expect(css).toMatchInlineSnapshot(`
 		".\\@mode-base, :root, .\\@mode-base, :root {
 			--_-meta-modeName: base;
@@ -55,7 +56,7 @@ it('prints a base mode with derived values', () => {
 	`);
 });
 it('prints a partial mode with derived dependencies it doesnt declare', () => {
-    const css = modeToCss(partialMode, preset);
+    const css = modeToCss(partialMode, preset, ctx);
     expect(css).toMatchInlineSnapshot(`
 		".\\@mode-partial {
 			--_-meta-modeName: partial;
@@ -68,7 +69,7 @@ it('prints a partial mode with derived dependencies it doesnt declare', () => {
 	`);
 });
 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);
+    const css = modeToCss(underivedMode, preset, ctx);
     expect(css).toMatchInlineSnapshot(`
 		".\\@mode-underived {
 			--_-meta-modeName: underived;
@@ -84,12 +85,12 @@ const rootBase = preset.createMode('rootBase', {
     },
 });
 it('$root at nested level generates CSS var at group path (no -$root suffix)', () => {
-    const css = modeToCss(rootBase, preset);
+    const css = modeToCss(rootBase, preset, ctx);
     expect(css).toContain('--m-ex: oklch(0.5 0.1 240)');
     expect(css).not.toContain('--m-ex-$root');
 });
 it('$root and sibling keys coexist and both emit correctly', () => {
-    const css = modeToCss(rootBase, preset);
+    const css = modeToCss(rootBase, preset, ctx);
     expect(css).toContain('--m-ex: oklch(0.5 0.1 240)');
     expect(css).toContain('--m-ex-mid: oklch(0.6 0.1 240)');
 });
@@ -99,7 +100,7 @@ it('partial mode override of $root maps correctly', () => {
             $root: 'oklch(0.7 0.2 30)',
         },
     });
-    const css = modeToCss(partial, preset);
+    const css = modeToCss(partial, preset, ctx);
     expect(css).toContain('--m-ex: oklch(0.7 0.2 30)');
     expect(css).not.toContain('--m-ex-mid');
 });
@@ -121,7 +122,7 @@ it('throws with full token chain for circular derived dependencies', () => {
             },
         }),
     });
-    expect(() => modeToCss(circular.baseMode, circular)).toThrow(/Circular dependency detected/);
+    expect(() => modeToCss(circular.baseMode, circular, ctx)).toThrow(/Circular dependency detected/);
 });
 it('throws for cycles during property value resolution', () => {
     const resolverCycle = definePreset({
@@ -147,6 +148,6 @@ it('throws for cycles during property value resolution', () => {
             b: css `color-mix(in hsl, ${resolverCycle.$.mode.derived.a}, black)`,
         },
     });
-    expect(() => modeToCss(partial, resolverCycle)).toThrow(/Circular dependency detected/);
+    expect(() => modeToCss(partial, resolverCycle, ctx)).toThrow(/Circular dependency detected/);
 });
 //# sourceMappingURL=modeToCss.test.js.map

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

	@@ -1 +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;YACd,MAAM,EAAE,OAAO;SACf;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;YACnD,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK;SACpB;QACD,EAAE,EAAE;YACH,KAAK,EAAE,MAAM;YACb,GAAG,EAAE,MAAM;SACX;KACD,CAAC;CACF,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;;;;;;;;;;;EAWjC,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;;;;;;;;;EASjC,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;;;;;;EAMjC,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~~,8BAA8B,CAC9B,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC7D,MAAM,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,EAAE,qBAAqB;QAC3B,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,KAAK,UAAU;gBACjD,CAAC,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU;aACrD;SACD,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,eAAe,EAAE;QACzD,OAAO,EAAE;YACR,CAAC,EAAE,GAAG,CAAA,qBAAqB,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU;YACnE,CAAC,EAAE,GAAG,CAAA,qBAAqB,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,UAAU;SACnE;KACD,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,OAAO,~~CACtD~~,8BAA8B,CAC9B,CAAC;AACH,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"modeToCss.test.js","sourceRoot":"","sources":["../../src/stylesheet/modeToCss.test.ts"],"names":[],"mappings":"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"}

package/dist/util/buildModeTokenGraph.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { CssEnvValues, CssSimplifier } from '@arbor-css/css-eval';
 import { ModeInstance, ModeValue } from '@arbor-css/modes';
 import { ArborPreset } from '@arbor-css/preset';
 import { SimpleTokenSchema, Token } from '@arbor-css/tokens';
@@ -18,8 +19,10 @@ export type ModeTokenGraph = {
  * Constructs a dependency graph for a mode by combining the base mode values
  * with any explicit overrides for the current mode.
  */
-export declare function buildModeTokenGraph<TModeShape extends SimpleTokenSchema>(mode: ModeInstance<TModeShape>, preset: ArborPreset<TModeShape>, options?: {
+export declare function buildModeTokenGraph<TModeShape extends SimpleTokenSchema>(mode: ModeInstance<TModeShape>, preset: ArborPreset<TModeShape>, options: {
     skipBaking?: boolean;
+    simplifier?: CssSimplifier;
+    envValues?: CssEnvValues;
 }): ModeTokenGraph;
 /**
  * Returns the graph nodes in the order they should be emitted to CSS.

package/dist/util/buildModeTokenGraph.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildModeTokenGraph.d.ts","sourceRoot":"","sources":["../../src/util/buildModeTokenGraph.ts"],"names":[],"mappings":"~~AAMA~~,OAAO,EAAoB,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAW,iBAAiB,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAMtE,MAAM,MAAM,kBAAkB,GAAG;IAChC,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,SAAS,iBAAiB,EACvE,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,EAC9B,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,EAC/B,OAAO,~~GAAE~~;IACR,UAAU,CAAC,EAAE,OAAO,CAAC;~~CAChB~~,~~GACJ~~,cAAc,~~CAiEhB~~;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CACjC,KAAK,EAAE,cAAc,GACnB,kBAAkB,EAAE,CAqDtB"}
1	+ {"version":3,"file":"buildModeTokenGraph.d.ts","sourceRoot":"","sources":["../../src/util/buildModeTokenGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EAEZ,aAAa,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAoB,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAW,iBAAiB,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAMtE,MAAM,MAAM,kBAAkB,GAAG;IAChC,KAAK,EAAE,KAAK,CAAC;IACb,GAAG,EAAE,SAAS,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC1C,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,SAAS,iBAAiB,EACvE,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,EAC9B,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,EAC/B,OAAO,EAAE;IACR,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,SAAS,CAAC,EAAE,YAAY,CAAC;CACzB,GACC,cAAc,CAqEhB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CACjC,KAAK,EAAE,cAAc,GACnB,kBAAkB,EAAE,CAqDtB"}

package/dist/util/buildModeTokenGraph.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { computeEquation, isCalcEquation, printComputationResult, } from '@arbor-css/calc';
+import { isCss, resolveCss, } from '@arbor-css/css-eval';
 import { getModeInternals } from '@arbor-css/modes';
 import { isToken } from '@arbor-css/tokens';
 import { toFlatKeys } from '@arbor-css/util';
@@ -7,7 +7,7 @@ import { flattenAndApplyTokenValues } from './flattenAndApplyTokenValues.js';
  * Constructs a dependency graph for a mode by combining the base mode values
  * with any explicit overrides for the current mode.
  */
-export function buildModeTokenGraph(mode, preset, options = {}) {
+export function buildModeTokenGraph(mode, preset, options) {
     const modeInternals = getModeInternals(mode);
     const flatTokens = toFlatKeys(preset.$.mode, isToken, {
         separator: '-',
@@ -25,6 +25,8 @@ export function buildModeTokenGraph(mode, preset, options = {}) {
     const resolvedValues = createResolvingPropertyValuesProxy(rawValues, {
         allowMissing: true,
         skipBaking: options.skipBaking,
+        simplifier: options.simplifier,
+        envValues: options.envValues,
     });
     const explicitNames = new Set(Object.keys(explicitValues));
     const nodes = {};
@@ -41,6 +43,8 @@ export function buildModeTokenGraph(mode, preset, options = {}) {
             computed: resolveGraphValue(raw, {
                 skipBaking: options.skipBaking ?? !explicit,
                 propertyValues: resolvedValues,
+                simplifier: options.simplifier,
+                envValues: options.envValues,
             }),
             explicit,
             dependencies: getGraphDependencies(raw),
@@ -117,16 +121,16 @@ function resolveGraphValue(rawValue, context) {
     if (isToken(rawValue)) {
         return rawValue.var;
     }
-    if (isCalcEquation(rawValue)) {
-        return printComputationResult(computeEquation(rawValue, context));
+    if (isCss(rawValue)) {
+        return resolveCss(rawValue, context);
     }
-    throw new Error(`Invalid mode token graph value: ${rawValue}. Must be a string, number, token reference, or calc equation.`);
+    throw new Error(`Invalid mode token graph value: ${JSON.stringify(rawValue)}. Must be a string, number, token reference, or calc equation.`);
 }
 function getGraphDependencies(rawValue) {
     if (isToken(rawValue)) {
         return [rawValue.name];
     }
-    if (isCalcEquation(rawValue)) {
+    if (isCss(rawValue)) {
         return rawValue.tokens.map((token) => token.name);
     }
     return [];
@@ -135,7 +139,7 @@ function getGraphDependencies(rawValue) {
  * Constructs a proxy which computes the resolved value of any assigned
  * property on demand and caches the result.
  */
-function createResolvingPropertyValuesProxy(propertyValues, { allowMissing = false, skipBaking, } = {}) {
+function createResolvingPropertyValuesProxy(propertyValues, { allowMissing = false, skipBaking, simplifier, envValues, }) {
     const cache = {};
     const resolvingStack = [];
     const resolvingSet = new Set();
@@ -170,11 +174,13 @@ function createResolvingPropertyValuesProxy(propertyValues, { allowMissing = fal
                     }
                     return cache[prop];
                 }
-                else if (isCalcEquation(value)) {
-                    cache[prop] = printComputationResult(computeEquation(value, {
+                else if (isCss(value)) {
+                    cache[prop] = resolveCss(value, {
                         propertyValues: propertyValuesProxy,
                         skipBaking,
-                    }));
+                        simplifier,
+                        envValues,
+                    });
                     return cache[prop];
                 }
                 else if (value === undefined) {

package/dist/util/buildModeTokenGraph.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildModeTokenGraph.js","sourceRoot":"","sources":["../../src/util/buildModeTokenGraph.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAEN~~,~~eAAe~~,~~EACf~~,~~cAAc~~,~~EACd~~,~~sBAAsB,GACtB,~~MAAM,~~iBAAiB~~,CAAC;~~AACzB~~,OAAO,EAAE,gBAAgB,EAA2B,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAE,OAAO,EAA4B,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAmB7E;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAClC,IAA8B,EAC9B,MAA+B,EAC/B,~~UAEI,EAAE~~;~~IAEN~~,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,UAAU,CAAQ,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE;QAC5D,SAAS,EAAE,GAAG;KACd,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE;QACtE,YAAY,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,0BAA0B,CAC5C,MAAM,CAAC,CAAC,CAAC,IAAI,EACb,MAAM,CAAC,QAAQ,EACf;QACC,YAAY,EAAE,KAAK;KACnB,CACD,CAAC;IACF,MAAM,SAAS,GAAqB;QACnC,GAAG,UAAU;QACb,GAAG,cAAc;KACjB,CAAC;IACF,MAAM,cAAc,GAAG,kCAAkC,CAAC,SAAS,EAAE;QACpE,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,OAAO,CAAC,UAAU;~~KAC9B~~,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IAE3D,MAAM,KAAK,GAAuC,EAAE,CAAC;IACrD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACd,2BAA2B,KAAK,CAAC,IAAI,sCAAsC,aAAa,CAAC,IAAI,GAAG,CAChG,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/C,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;YACnB,KAAK;YACL,GAAG;YACH,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE;gBAChC,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC,QAAQ;gBAC3C,cAAc,EAAE,cAAc;~~aAC9B~~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~~OAA8B~~;~~IAE9B~~,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClE,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,GAAG,CAAC;IACrB,CAAC;IAED,IAAI,~~cAAc~~,CAAC,QAAQ,CAAC,EAAE,CAAC;~~QAC9B~~,OAAO,~~sBAAsB~~,CAAC,~~eAAe,CAAC,~~QAAQ,EAAE,OAAO,CAAC,CAAC~~,CAAC~~;~~IACnE~~,CAAC;IAED,MAAM,IAAI,KAAK,CACd,mCAAmC,QAAQ,gEAAgE,~~CAC3G~~,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAmB;IAChD,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,~~cAAc~~,CAAC,QAAQ,CAAC,EAAE,CAAC;~~QAC9B~~,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC;AAED;;;GAGG;AACH,SAAS,kCAAkC,CAC1C,cAAgC,EAChC,EACC,YAAY,GAAG,KAAK,EACpB,UAAU,~~MAIP~~,~~EAAE~~;~~IAEN~~,MAAM,KAAK,GAA2B,EAAE,CAAC;IACzC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvC,MAAM,mBAAmB,GAAG,IAAI,KAAK,CAAC,EAA4B,EAAE;QACnE,GAAG,CAAC,CAAC,EAAE,IAAqB;YAC3B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,SAAS,CAAC;YAClB,CAAC;YAED,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;gBACnB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;YAED,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5B,MAAM,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;gBACrE,MAAM,UAAU,GAAG,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAClE,MAAM,CACN,CAAC;gBACF,MAAM,IAAI,KAAK,CACd,4DAA4D,UAAU,EAAE,CACxE,CAAC;YACH,CAAC;YAED,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEvB,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC;gBACJ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC5D,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;qBAAM,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,KAAK,CAAC,IAAI,IAAI,cAAc,EAAE,CAAC;wBAClC,MAAM,eAAe,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACxD,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC;oBAC/B,CAAC;yBAAM,CAAC;wBACP,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC;oBACzB,CAAC;oBACD,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;qBAAM,IAAI,~~cAAc~~,CAAC,KAAK,CAAC,EAAE,CAAC;~~oBAClC~~,KAAK,CAAC,IAAI,CAAC,GAAG,~~sBAAsB~~,~~CACnC,eAAe,~~CAAC,KAAK,EAAE;~~wBACtB~~,cAAc,EAAE,mBAAmB;wBACnC,UAAU;~~qBACV~~,~~CAAC~~,~~CACF~~,CAAC;~~oBACF~~,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;qBAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBAChC,IAAI,CAAC,YAAY,EAAE,CAAC;wBACnB,MAAM,IAAI,KAAK,CACd,8BAA8B,IAAI,qBAAqB,CACvD,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACP,OAAO,SAAS,CAAC;oBAClB,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,MAAM,IAAI,KAAK,CACd,8BAA8B,IAAI,KAAK,KAAK,gEAAgE,CAC5G,CAAC;gBACH,CAAC;YACF,CAAC;oBAAS,CAAC;gBACV,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC1B,cAAc,CAAC,GAAG,EAAE,CAAC;YACtB,CAAC;QACF,CAAC;KACD,CAAC,CAAC;IAEH,OAAO,mBAAmB,CAAC;AAC5B,CAAC"}
1	+ {"version":3,"file":"buildModeTokenGraph.js","sourceRoot":"","sources":["../../src/util/buildModeTokenGraph.ts"],"names":[],"mappings":"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"}

package/dist/util/buildModeTokenGraph.test.js CHANGED Viewed

@@ -1,4 +1,5 @@
-import { css } from '@arbor-css/calc';
+import { css } from '@arbor-css/css-eval';
+import { simplifier } from '@arbor-css/css-eval/node';
 import { definePreset } from '@arbor-css/preset';
 import { expect, it } from 'vitest';
 import { presetArbor } from '../presets/arborPreset/preset.js';
@@ -29,7 +30,9 @@ it('resolves token dependencies and sub-dependencies', () => {
     const setUnrelatedMode = preset.createMode('set-unrelated', {
         unrelated: 'yellow',
     });
-    const graphFromSetRoot = buildModeTokenGraph(setRootMode, preset);
+    const graphFromSetRoot = buildModeTokenGraph(setRootMode, preset, {
+        simplifier,
+    });
     expect(graphFromSetRoot.roots).toEqual(['--m-root']);
     expect(graphFromSetRoot.nodes['--m-root'].dependents).toEqual([
         '--m-derived-once',
@@ -39,6 +42,7 @@ it('resolves token dependencies and sub-dependencies', () => {
     ]);
     expect(graphFromSetRoot.nodes['--m-unrelated']).toBeDefined();
     const graphFromSetUnrelated = buildModeTokenGraph(setUnrelatedMode, preset, {
+        simplifier,
         skipBaking: false,
     });
     expect(graphFromSetUnrelated.roots).toEqual(['--m-unrelated']);
@@ -60,7 +64,8 @@ it('resolves and computes complicated dependency chains', () => {
     });
     const graphWithDensity = buildModeTokenGraph(mode, preset, {
         skipBaking: false,
+        simplifier,
     });
-    expect(graphWithDensity.nodes['--m-primitive-spacing-md'].computed).toMatchInlineSnapshot(`"0.5rem"`);
+    expect(graphWithDensity.nodes['--m-primitive-spacing-md'].computed).toMatchInlineSnapshot(`".5rem"`);
 });
 //# sourceMappingURL=buildModeTokenGraph.test.js.map

package/dist/util/buildModeTokenGraph.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildModeTokenGraph.test.js","sourceRoot":"","sources":["../../src/util/buildModeTokenGraph.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,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC3D,MAAM,MAAM,GAAG,YAAY,CAAC;QAC3B,IAAI,EAAE,MAAM;QACZ,UAAU,EAAE;YACX,IAAI,EAAE,OAAO;YACb,OAAO,EAAE;gBACR,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,OAAO;aACd;YACD,SAAS,EAAE,OAAO;SAClB;QACD,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACjB,IAAI,EAAE,KAAK;YACX,OAAO,EAAE;gBACR,IAAI,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,UAAU;gBACnD,KAAK,EAAE,GAAG,CAAA,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,gBAAgB;aAClE;YACD,SAAS,EAAE,MAAM;SACjB,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE;QACjD,IAAI,EAAE,OAAO;KACb,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE;QAC3D,SAAS,EAAE,QAAQ;KACnB,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;~~IAElE~~,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IACrD,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;QAC7D,kBAAkB;KAClB,CAAC,CAAC;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;QACrE,mBAAmB;KACnB,CAAC,CAAC;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAE9D,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE;QAC3E,UAAU,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/D,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5E,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,+CAA+C;AAC/C,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;IAC9D,MAAM,MAAM,GAAG,WAAW,CAAC;QAC1B,KAAK,EAAE;YACN,SAAS,EAAE,OAAO;YAClB,MAAM,EAAE;gBACP,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE;aACjB;SACD;KACD,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;QACtC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;KACtB,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE;QAC1D,UAAU,EAAE,KAAK;~~KACjB~~,CAAC,CAAC;IAEH,MAAM,CACL,gBAAgB,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAC3D,CAAC,qBAAqB,CAAC,~~UAAU~~,CAAC,CAAC;~~AACrC~~,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"buildModeTokenGraph.test.js","sourceRoot":"","sources":["../../src/util/buildModeTokenGraph.test.ts"],"names":[],"mappings":"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"}

package/dist/util/resolveComputedTokenValue.d.ts CHANGED Viewed

@@ -1,6 +1,4 @@
-import { type Equation } from '@arbor-css/calc';
+import { CssResolutionContext } from '@arbor-css/css-eval';
 import { ArborPreset } from '@arbor-css/preset/config';
-type PropertyValueMap = Record<string, string | Equation | undefined>;
-export declare function resolveComputedTokenValue(preset: ArborPreset<any, any>, tokenName: string, propertyValues?: PropertyValueMap): string | undefined;
-export {};
+export declare function resolveComputedTokenValue(preset: ArborPreset<any, any>, tokenName: string, { simplifier, propertyValues }: CssResolutionContext): string | undefined;
 //# sourceMappingURL=resolveComputedTokenValue.d.ts.map

package/dist/util/resolveComputedTokenValue.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"resolveComputedTokenValue.d.ts","sourceRoot":"","sources":["../../src/util/resolveComputedTokenValue.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAKN~~,~~KAAK~~,~~QAAQ~~,~~EACb,~~MAAM,~~iBAAiB~~,CAAC;~~AACzB~~,OAAO,EAAE,WAAW,EAAgB,MAAM,0BAA0B,CAAC;~~AAGrE~~,~~KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC,CAAC;AAEtE,~~wBAAgB,yBAAyB,CACxC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,cAAc,~~GAAE~~,~~gBAAqB~~,~~GACnC~~,MAAM,GAAG,SAAS,CA8BpB"}
1	+ {"version":3,"file":"resolveComputedTokenValue.d.ts","sourceRoot":"","sources":["../../src/util/resolveComputedTokenValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,oBAAoB,EAIpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAgB,MAAM,0BAA0B,CAAC;AAKrE,wBAAgB,yBAAyB,CACxC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7B,SAAS,EAAE,MAAM,EACjB,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,oBAAoB,GAClD,MAAM,GAAG,SAAS,CA8BpB"}

package/dist/util/resolveComputedTokenValue.js CHANGED Viewed

@@ -1,7 +1,7 @@
-import { $, computeEquation, isCalcEquation, printComputationResult, } from '@arbor-css/calc';
+import { css, isCss, resolveCss, } from '@arbor-css/css-eval';
 import { getInternals } from '@arbor-css/preset/config';
 import { isToken, tokenSchemaToList } from '@arbor-css/tokens';
-export function resolveComputedTokenValue(preset, tokenName, propertyValues = {}) {
+export function resolveComputedTokenValue(preset, tokenName, { simplifier, propertyValues }) {
     const resolvedValues = getResolvedTokenValues(preset);
     const tokens = tokenSchemaToList(preset.$);
     const token = tokens.find((candidate) => candidate.name === tokenName);
@@ -16,16 +16,14 @@ export function resolveComputedTokenValue(preset, tokenName, propertyValues = {}
         ...resolvedValues,
         ...propertyValues,
     };
-    const computed = typeof tokenValue === 'string' ?
-        computeEquation($.val(tokenValue), {
-            propertyValues: contextValues,
-            skipBaking: false,
-        })
-        : computeEquation(tokenValue, {
-            propertyValues: contextValues,
-            skipBaking: false,
-        });
-    return printComputationResult(computed);
+    const computed = resolveCss(css `
+			${tokenValue}
+		`, {
+        propertyValues: contextValues,
+        skipBaking: false,
+        simplifier,
+    });
+    return computed;
 }
 function getResolvedTokenValues(preset) {
     const internals = getInternals(preset);
@@ -67,7 +65,7 @@ function normalizeResolvedValue(value) {
     if (isToken(value)) {
         return value.var;
     }
-    if (isCalcEquation(value)) {
+    if (isCss(value)) {
         return value;
     }
     return undefined;

package/dist/util/resolveComputedTokenValue.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"resolveComputedTokenValue.js","sourceRoot":"","sources":["../../src/util/resolveComputedTokenValue.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,~~CAAC~~,~~EACD~~,~~eAAe~~,~~EACf~~,~~cAAc~~,~~EACd~~,~~sBAAsB,GAEtB,~~MAAM,~~iBAAiB~~,CAAC;~~AACzB~~,OAAO,EAAe,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAI/D,MAAM,UAAU,yBAAyB,CACxC,MAA6B,EAC7B,SAAiB,EACjB,~~iBAAmC~~,EAAE;~~IAErC~~,MAAM,cAAc,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IACvE,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,aAAa,GAAqB;QACvC,GAAG,cAAc;QACjB,GAAG,cAAc;KACjB,CAAC;IAEF,MAAM,QAAQ,~~GACb~~,~~OAAO,~~UAAU,~~KAAK~~,~~QAAQ~~,~~CAAC,CAAC~~;~~QAC/B~~,~~eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,~~UAAU,~~CAAC,EAAE~~;~~YAClC~~,cAAc,EAAE,aAAa;~~YAC7B~~,UAAU,EAAE,KAAK;~~SACjB~~,~~CAAC;QACH,CAAC,CAAC,eAAe,CAAC,~~UAAU~~,EAAE~~;~~YAC5B~~,~~cAAc~~,~~EAAE,aAAa;YAC7B,UAAU,EAAE,KAAK;SACjB,~~CAAC~~,CAAC~~;~~IAEL~~,OAAO,~~sBAAsB,CAAC,~~QAAQ,CAAC~~,CAAC~~;~~AACzC~~,CAAC;AAED,SAAS,sBAAsB,CAC9B,MAA6B;IAE7B,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC;IAE5C,MAAM,MAAM,~~GAAsC~~,EAAE,CAAC;~~IACrD~~,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE9D,qBAAqB,CACpB,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EACpB;QACC,QAAQ,EAAE,MAAM;QAChB,UAAU,EAAE,WAAW;KACvB,EACD,MAAM,CACN,CAAC;IAEF,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,qBAAqB,CAC7B,SAAc,EACd,SAAc,EACd,~~MAAyC~~;~~IAEzC~~,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC/D,OAAO;IACR,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAErC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YACjC,SAAS;QACV,CAAC;QAED,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;YACzD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;YACtC,CAAC;YACD,SAAS;QACV,CAAC;QAED,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YAC3D,qBAAqB,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAC1D,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAc;IAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,~~cAAc~~,CAAC,KAAK,CAAC,EAAE,CAAC;~~QAC3B~~,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC"}
1	+ {"version":3,"file":"resolveComputedTokenValue.js","sourceRoot":"","sources":["../../src/util/resolveComputedTokenValue.ts"],"names":[],"mappings":"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"}

package/dist/util/resolveComputedTokenValue.test.js CHANGED Viewed

@@ -1,4 +1,5 @@
-import { css } from '@arbor-css/calc';
+import { css } from '@arbor-css/css-eval';
+import { simplifier } from '@arbor-css/css-eval/node';
 import { expect, it } from 'vitest';
 import { presetArbor } from '../presets/arborPreset/preset.js';
 import { resolveComputedTokenValue } from './resolveComputedTokenValue.js';
@@ -12,27 +13,36 @@ const preset = presetArbor({
         },
     },
 });
+const ctx = {
+    simplifier,
+};
 it('resolves primitive token values', () => {
-    const value = resolveComputedTokenValue(preset, preset.$.mode.primitive.spacing.$root.name);
-    expect(value).toMatchInlineSnapshot(`"0.5rem"`);
+    const value = resolveComputedTokenValue(preset, preset.$.mode.primitive.spacing.$root.name, ctx);
+    expect(value).toMatchInlineSnapshot(`".5rem"`);
 });
 it('resolves base mode values with baking', () => {
-    const value = resolveComputedTokenValue(preset, preset.$.mode.spacing.sm.name);
-    expect(value).toMatchInlineSnapshot(`"0.21022410381342863rem"`);
+    const value = resolveComputedTokenValue(preset, preset.$.mode.spacing.sm.name, ctx);
+    expect(value).toMatchInlineSnapshot(`".25rem"`);
 });
 it('applies user property values to evaluation context', () => {
     const value = resolveComputedTokenValue(preset, preset.$.mode.spacing.sm.name, {
-        [preset.$.mode.global.density.name]: '2',
+        ...ctx,
+        propertyValues: {
+            [preset.$.mode.global.density.name]: '2',
+        },
     });
-    expect(value).toMatchInlineSnapshot(`"0.10511205190671431rem"`);
+    expect(value).toMatchInlineSnapshot(`".125rem"`);
 });
 it('resolves equation property values from user overrides', () => {
     const value = resolveComputedTokenValue(preset, preset.$.mode.spacing.sm.name, {
-        [preset.$.mode.global.density.name]: css `calc(1 + 1)`,
+        ...ctx,
+        propertyValues: {
+            [preset.$.mode.global.density.name]: css `calc(1 + 1)`,
+        },
     });
-    expect(value).toMatchInlineSnapshot(`"0.10511205190671431rem"`);
+    expect(value).toMatchInlineSnapshot(`".125rem"`);
 });
 it('returns undefined when token is unknown', () => {
-    expect(resolveComputedTokenValue(preset, '--not-a-token')).toBeUndefined();
+    expect(resolveComputedTokenValue(preset, '--not-a-token', ctx)).toBeUndefined();
 });
 //# sourceMappingURL=resolveComputedTokenValue.test.js.map

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

	@@ -1 +1 @@
1	- {"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,qBAAqB,CAAC,~~UAAU~~,CAAC,CAAC;~~AACjD~~,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,qBAAqB,CAAC,~~0BAA0B~~,CAAC,CAAC;~~AACjE~~,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,qBAAqB,CAAC,~~0BAA0B~~,CAAC,CAAC;~~AACjE~~,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,qBAAqB,CAAC,~~0BAA0B~~,CAAC,CAAC;~~AACjE~~,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"}
1	+ {"version":3,"file":"resolveComputedTokenValue.test.js","sourceRoot":"","sources":["../../src/util/resolveComputedTokenValue.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAwB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,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,MAAM,GAAG,GAAyB;IACjC,UAAU;CACV,CAAC;AAEF,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,EAC1C,GAAG,CACH,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;AAChD,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,EAC7B,GAAG,CACH,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;AACjD,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,GAAG,GAAG;QACN,cAAc,EAAE;YACf,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG;SACxC;KACD,CACD,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;AAClD,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,GAAG,GAAG;QACN,cAAc,EAAE;YACf,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA,aAAa;SACrD;KACD,CACD,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;IAClD,MAAM,CACL,yBAAyB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,CAAC,CACvD,CAAC,aAAa,EAAE,CAAC;AACnB,CAAC,CAAC,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@arbor-css/core",
-  "version": "0.0.107",
+  "version": "0.0.110",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -54,13 +54,13 @@
     "lil-gui": "^0.21.0",
     "lit-element": "^4.2.2",
     "yargs": "^18.0.0",
-    "@arbor-css/preset": "0.0.107",
-    "@arbor-css/globals": "0.0.107",
-    "@arbor-css/util": "0.0.107",
-    "@arbor-css/functions": "0.0.107",
-    "@arbor-css/modes": "0.0.107",
-    "@arbor-css/tokens": "0.0.107",
-    "@arbor-css/calc": "0.0.107"
+    "@arbor-css/tokens": "0.0.110",
+    "@arbor-css/preset": "0.0.110",
+    "@arbor-css/util": "0.0.110",
+    "@arbor-css/globals": "0.0.110",
+    "@arbor-css/modes": "0.0.110",
+    "@arbor-css/functions": "0.0.110",
+    "@arbor-css/css-eval": "0.0.110"
   },
   "scripts": {
     "build": "tsc",

package/dist/runtime/componentsOld/BaseElement.d.ts DELETED Viewed

@@ -1,8 +0,0 @@
-import { ArborPreset } from '@arbor-css/preset';
-export declare class ArborElement extends HTMLElement {
-    shadowRoot: ShadowRoot;
-    config: ArborPreset;
-    constructor();
-    render(): void;
-}
-//# sourceMappingURL=BaseElement.d.ts.map

package/dist/runtime/componentsOld/BaseElement.d.ts.map DELETED Viewed

	@@ -1 +0,0 @@
1	- {"version":3,"file":"BaseElement.d.ts","sourceRoot":"","sources":["../../../src/runtime/componentsOld/BaseElement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,qBAAa,YAAa,SAAQ,WAAW;IAC5C,UAAU,EAAG,UAAU,CAAC;IACxB,MAAM,EAAG,WAAW,CAAC;;IAWrB,MAAM;CACN"}

package/dist/runtime/componentsOld/BaseElement.js DELETED Viewed

@@ -1,14 +0,0 @@
-import { getPreset, getStyleSheet, ready } from '../registration.js';
-export class ArborElement extends HTMLElement {
-    constructor() {
-        super();
-        ready.then(() => {
-            this.config = getPreset();
-            this.attachShadow({ mode: 'open' });
-            this.shadowRoot.adoptedStyleSheets.push(getStyleSheet());
-            this.render();
-        });
-    }
-    render() { }
-}
-//# sourceMappingURL=BaseElement.js.map

package/dist/runtime/componentsOld/BaseElement.js.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"BaseElement.js","sourceRoot":"","sources":["../../../src/runtime/componentsOld/BaseElement.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAErE,MAAM,OAAO,YAAa,SAAQ,WAAW;IAG5C;QACC,KAAK,EAAE,CAAC;QACR,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,IAAI,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;YACzD,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,KAAI,CAAC;CACX"}

package/dist/runtime/componentsOld/ModeSelector.d.ts DELETED Viewed

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

package/dist/runtime/componentsOld/ModeSelector.d.ts.map DELETED Viewed

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