@arbor-css/core 0.0.90 → 0.0.91

package/dist/presets/arborPreset/preset.js

@@ -1,51 +1,91 @@
 import { compileColors, } from '@arbor-css/colors';
+import { defaultGlobals, } from '@arbor-css/globals';
 import { definePreset } from '@arbor-css/preset';
 import { compileShadows } from '@arbor-css/shadows';
 import { compileSpacing } from '@arbor-css/spacing';
 import { compileTypography } from '@arbor-css/typography';
 import { presetBasic } from '../basicPreset/preset.js';
-import { createArborModeValues } from './baseModeValues.js';
-import { arborModeSchema } from './modeSchema.js';
+import { createArborModeSchema, } from './modeSchema/modeSchema.js';
+import { createActionIntentValues, createControlIntentValues, createSurfaceIntentValues, createTextIntentValues, } from './modeValues/intents.js';
+import { createColorSemanticValues, createDurationSemanticValues, createEasingSemanticValues, createLineWidthSemanticValues, createRadiusSemanticValues, createShadowSemanticValues, createSpacingSemanticValues, } from './modeValues/semantics.js';
 /**
  * Adds opinionated primitive tokens and a full-featured mode
  * schema on top of the basic preset's utility mixins and functions.
  */
 export const presetArbor = (config) => {
+    const defaultedGlobals = {
+        ...defaultGlobals,
+        ...config.globals,
+    };
     const preset = definePreset({
         name: 'arbor',
-        modeSchema: arborModeSchema,
-        baseMode: ($) => createArborModeValues({
-            tokens: $,
-            mainColor: config.color.mainColor,
+        modeSchema: createArborModeSchema({
+            colorNames: Object.keys(config.color.ranges),
         }),
-        primitives: (ctx) => ({
-            color: compileColors({ ...config.color, context: ctx }),
-            typography: compileTypography({
-                ...config.typography,
-                context: ctx,
-            }),
-            spacing: compileSpacing({
-                ...config.spacing,
-                context: ctx,
-            }),
-            shadow: compileShadows({
-                ...config.shadow,
-                context: ctx,
-            }),
-            easing: config.easing || {
-                tight: `cubic-bezier(0.4, 0, 0.2, 1)`,
-                medium: `cubic-bezier(0.4, 0, 0.2, 1)`,
-                loose: `cubic-bezier(0.4, 0, 0.2, 1)`,
-            },
-            duration: config.duration || {
-                fast: `100ms`,
-                medium: `250ms`,
-                slow: `500ms`,
-            },
-        }),
-        config: config.config,
+        baseMode: ($, ctx) => {
+            // NOTE: had to bypass typings for color tokens... the user-controlled
+            // color names seem to really mess with this.
+            return {
+                scalar: {
+                    density: 1,
+                },
+                /** PRIMITIVES */
+                primitive: {
+                    color: compileColors({
+                        ranges: config.color.ranges,
+                        schemes: config.color.schemes,
+                    }, ctx),
+                    spacing: compileSpacing(config.spacing || {}, ctx),
+                    typography: compileTypography(config.typography || {}, ctx),
+                    shadow: compileShadows(config.shadow || {}, ctx),
+                    easing: config.easing ||
+                        {
+                            $root: $.mode.easing.medium,
+                            tight: `cubic-bezier(0.4, 0, 0.2, 1)`,
+                            medium: `cubic-bezier(0.4, 0, 0.2, 1)`,
+                            loose: `cubic-bezier(0.4, 0, 0.2, 1)`,
+                        },
+                    duration: config.duration ||
+                        {
+                            $root: $.mode.duration.medium,
+                            short: `100ms`,
+                            medium: `250ms`,
+                            long: `500ms`,
+                        },
+                },
+                /** SEMANTICS */
+                color: createColorSemanticValues($, config.color.mainColor),
+                spacing: createSpacingSemanticValues($),
+                shadow: createShadowSemanticValues($),
+                radius: createRadiusSemanticValues($),
+                lineWidth: createLineWidthSemanticValues($),
+                easing: createEasingSemanticValues($),
+                duration: createDurationSemanticValues($),
+                /** INTENTS */
+                action: createActionIntentValues($),
+                control: createControlIntentValues($),
+                surface: createSurfaceIntentValues($),
+                text: createTextIntentValues($),
+            };
+        },
+        config: {
+            ...config.prefixes,
+            globals: defaultedGlobals,
+        },
         extends: [presetBasic],
     });
+    if (!config.disableAutoInvertedMode) {
+        // special built-in mode: @mode-inverted - easier to create here than in userland
+        preset.bundleMode('inverted', {
+            primitive: {
+                color: compileColors({
+                    ranges: config.color.ranges,
+                    schemes: config.color.schemes,
+                    invertLightDark: true,
+                }, preset.context),
+            },
+        });
+    }
     return preset;
 };
 //# sourceMappingURL=preset.js.map

package/dist/presets/arborPreset/preset.js.map

@@ -1 +1 @@
-{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../src/presets/arborPreset/preset.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,aAAa,GAGb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAgB,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAiB,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAoB,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAoBlD;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAI1B,MAA4C,EAC3C,EAAE;IACH,MAAM,MAAM,GAAG,YAAY,CAAC;QAC3B,IAAI,EAAE,OAAO;QACb,UAAU,EAAE,eAAe;QAC3B,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CACf,qBAAqB,CAAC;YACrB,MAAM,EAAE,CAAC;YACT,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAgB;SACxC,CAAC;QACH,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACrB,KAAK,EAAE,aAAa,CAAC,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;YACvD,UAAU,EAAE,iBAAiB,CAAC;gBAC7B,GAAG,MAAM,CAAC,UAAU;gBACpB,OAAO,EAAE,GAAG;aACZ,CAAC;YACF,OAAO,EAAE,cAAc,CAAC;gBACvB,GAAG,MAAM,CAAC,OAAO;gBACjB,OAAO,EAAE,GAAG;aACZ,CAAC;YACF,MAAM,EAAE,cAAc,CAAC;gBACtB,GAAG,MAAM,CAAC,MAAM;gBAChB,OAAO,EAAE,GAAG;aACZ,CAAC;YACF,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI;gBACxB,KAAK,EAAE,8BAA8B;gBACrC,MAAM,EAAE,8BAA8B;gBACtC,KAAK,EAAE,8BAA8B;aACrC;YACD,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI;gBAC5B,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,OAAO;aACb;SACD,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,CAAC,WAAW,CAAC;KACtB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../src/presets/arborPreset/preset.ts"],"names":[],"mappings":"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"}

package/dist/presets/arborPreset/preset.test.js

@@ -1,4 +1,4 @@
-import { definePreset, getInternals } from '@arbor-css/preset';
+import { definePreset } from '@arbor-css/preset';
 import { expect, it } from 'vitest';
 import { presetArbor } from './preset.js';
 it('is extensible', () => {
@@ -23,10 +23,8 @@ it('is extensible', () => {
             },
         }),
     });
-    expect(preset.$.primitives.color.mainColor).toBe(base.$.primitives.color.mainColor);
+    expect(preset.$.mode.primitive.color.red.mid.name).toEqual(base.$.mode.primitive.color.red.mid.name);
     expect(preset.baseMode.test).toBe('red');
     expect(preset.baseMode.action?.roundness).toBe(0.5);
-    const internals = getInternals(preset);
-    expect(internals.primitiveValues.color).toBeDefined();
 });
 //# sourceMappingURL=preset.test.js.map

package/dist/presets/arborPreset/preset.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"preset.test.js","sourceRoot":"","sources":["../../../src/presets/arborPreset/preset.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;IACxB,MAAM,IAAI,GAAG,WAAW,CAAC;QACxB,KAAK,EAAE;YACN,MAAM,EAAE;gBACP,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE;aACf;YACD,SAAS,EAAE,KAAK;SAChB;KACD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,YAAY,CAAC;QAC3B,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC,IAAI,CAAC;QACf,UAAU,EAAE;YACX,IAAI,EAAE,OAAO;SACb;QACD,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YAChB,IAAI,EAAE,KAAK;YACX,MAAM,EAAE;gBACP,SAAS,EAAE,GAAG;aACd;SACD,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAC/C,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CACjC,CAAC;IACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEpD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AACvD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"preset.test.js","sourceRoot":"","sources":["../../../src/presets/arborPreset/preset.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;IACxB,MAAM,IAAI,GAAG,WAAW,CAAC;QACxB,KAAK,EAAE;YACN,MAAM,EAAE;gBACP,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE;aACf;YACD,SAAS,EAAE,KAAK;SAChB;KACD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,YAAY,CAAC;QAC3B,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC,IAAI,CAAC;QACf,UAAU,EAAE;YACX,IAAI,EAAE,OAAO;SACb;QACD,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YAChB,IAAI,EAAE,KAAK;YACX,MAAM,EAAE;gBACP,SAAS,EAAE,GAAG;aACd;SACD,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CACzD,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CACxC,CAAC;IACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC"}

package/dist/presets/basicPreset/preset.d.ts

@@ -2,7 +2,7 @@
  * This basic preset includes utility mixins and functions,
  * but no primitive tokens or mode schema.
  */
-export declare const presetBasic: import("@arbor-css/preset").ArborPreset<{}, import("@arbor-css/colors").CompiledColors<any, any>, import("@arbor-css/typography").CompiledTypography<any>, import("@arbor-css/spacing").CompiledSpacing<any>, import("@arbor-css/shadows").CompiledShadows<any>, Record<string, string>, Record<string, string>, {
+export declare const presetBasic: import("@arbor-css/preset").ArborPreset<{}, {
     readonly lightenColor: import("@arbor-css/functions").ArborFunction<any>;
     readonly darkenColor: import("@arbor-css/functions").ArborFunction<any>;
     readonly desaturateColor: import("@arbor-css/functions").ArborFunction<any>;

package/dist/runtime/components/BaseElement.d.ts

@@ -1,6 +1,6 @@
 export declare class ArborElement extends HTMLElement {
     shadowRoot: ShadowRoot;
-    config: import("@arbor-css/preset").ArborPreset<any, any, import("@arbor-css/typography").CompiledTypography<"xs" | "sm" | "md" | "lg" | "xl" | "2xl" | "3xl" | "4xl" | "5xl" | "6xl">, import("@arbor-css/spacing").CompiledSpacing<"xs" | "sm" | "md" | "lg" | "xl" | "2xl" | "3xl" | "2xs">, import("@arbor-css/shadows").CompiledShadows<"xs" | "sm" | "md" | "lg" | "xl">, Record<string, string>, Record<string, string>, import("@arbor-css/functions").PresetFunctions, import("@arbor-css/functions").PresetMixins>;
+    config: import("@arbor-css/preset").ArborPreset<any, any, import("@arbor-css/functions").PresetMixins>;
     constructor();
 }
 //# sourceMappingURL=BaseElement.d.ts.map

package/dist/runtime/components/BaseElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseElement.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/BaseElement.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAa,SAAQ,WAAW;IAC5C,UAAU,EAAG,UAAU,CAAC;IACxB,MAAM,ufAAe;;CAMrB"}
+{"version":3,"file":"BaseElement.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/BaseElement.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAa,SAAQ,WAAW;IAC5C,UAAU,EAAG,UAAU,CAAC;IACxB,MAAM,iGAAe;;CAMrB"}

package/dist/runtime/components/GlobalsEditor.js

@@ -1,7 +1,4 @@
-import { getInternals } from '@arbor-css/preset';
-import { isToken } from '@arbor-css/tokens';
 import GUI from 'lil-gui';
-import { readProperties } from '../readProperties.js';
 import { getConfig } from '../registration.js';
 import { ArborElement } from './BaseElement.js';
 class GlobalsEditor extends ArborElement {
@@ -9,7 +6,6 @@ class GlobalsEditor extends ArborElement {
         const gui = new GUI();
         gui.close();
         const config = getConfig();
-        const internals = getInternals(config);
         const globalsFolder = gui.addFolder('Globals');
         for (const [globalKey, token] of Object.entries(config.$.system.global)) {
             let entry = token.type === 'color' ?
@@ -22,42 +18,6 @@ class GlobalsEditor extends ArborElement {
                 entry = entry.min(0).max(2).step(0.1);
             }
         }
-        const primitivesFolder = gui.addFolder('Primitives');
-        function addToken(parent, key, token, folder) {
-            let entry = token.type === 'color' ?
-                folder.addColor(parent, key)
-                : folder.add(parent, key);
-            entry.name(key).onChange((v) => {
-                document.documentElement.style.setProperty(token.name, v.toString());
-                // and all scheme permutations...
-                for (const scheme of Object.keys(internals.primitiveValues.color)) {
-                    const prefix = scheme;
-                    document.documentElement.style.setProperty(token.prefixed(prefix).name, v.toString());
-                }
-            });
-        }
-        const values = readProperties(config.$.primitives);
-        for (const [firstLayerKey, firstTokenLayer] of Object.entries(config.$.primitives)) {
-            if (isToken(firstTokenLayer)) {
-                addToken(values, firstLayerKey, firstTokenLayer, primitivesFolder);
-            }
-            else {
-                const primitiveFolder = primitivesFolder.addFolder(firstLayerKey);
-                for (const [secondLayerKey, secondTokenLayer] of Object.entries(firstTokenLayer)) {
-                    if (isToken(secondTokenLayer)) {
-                        addToken(values[firstLayerKey], secondLayerKey, secondTokenLayer, primitiveFolder);
-                    }
-                    else {
-                        const secondLayerFolder = primitiveFolder.addFolder(secondLayerKey);
-                        for (const [thirdLayerKey, thirdTokenLayer] of Object.entries(secondTokenLayer)) {
-                            if (isToken(thirdTokenLayer)) {
-                                addToken(values[firstLayerKey][secondLayerKey], thirdLayerKey, thirdTokenLayer, secondLayerFolder);
-                            }
-                        }
-                    }
-                }
-            }
-        }
     }
 }
 customElements.define('arbor-globals-editor', GlobalsEditor);

package/dist/runtime/components/GlobalsEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalsEditor.js","sourceRoot":"","sources":["../../../src/runtime/components/GlobalsEditor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GlobalsEditor.js","sourceRoot":"","sources":["../../../src/runtime/components/GlobalsEditor.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,SAAS,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,aAAc,SAAQ,YAAY;IACvC,iBAAiB;QAChB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAE3B,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACzE,IAAI,KAAK,GACR,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;gBACvB,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,SAAgB,CAAC;gBACjE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,SAAgB,CAAC,CAAC;YAE/D,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAM,EAAE,EAAE;gBACzC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtE,CAAC,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC7B,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvC,CAAC;QACF,CAAC;IACF,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC"}

package/dist/runtime/components/SchemeSelector.js

@@ -1,11 +1,9 @@
-import { getInternals } from '../../index.js';
 import { ArborElement } from './BaseElement.js';
 class SchemeSelector extends ArborElement {
     constructor() {
         super();
         this.render = () => {
-            const internals = getInternals(this.config);
-            const schemeNames = Object.keys(internals.primitiveValues.color);
+            const schemeNames = ['light', 'dark'];
             const selected = this.getAttribute('selected') || 'base';
             this.shadowRoot.innerHTML = `<div data-scheme-${selected}>
 			<select data-scheme-select name="scheme" aria-label="Select scheme" style="position: sticky; top: 0;">

package/dist/runtime/components/SchemeSelector.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemeSelector.js","sourceRoot":"","sources":["../../../src/runtime/components/SchemeSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,cAAe,SAAQ,YAAY;IACxC;QACC,KAAK,EAAE,CAAC;QAIT,WAAM,GAAG,GAAG,EAAE;YACb,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC;YACzD,IAAI,CAAC,UAAW,CAAC,SAAS,GAAG,oBAAoB,QAAQ;;MAErD,WAAW;iBACX,GAAG,CACH,CAAC,UAAU,EAAE,EAAE,CACd,kBAAkB,UAAU,KAAK,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,UAAU,WAAW,CACpG;iBACA,IAAI,CAAC,IAAI,CAAC;;;SAGP,CAAC;YACR,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,aAAa,CAChD,sBAAsB,CACM,CAAC;YAC9B,UAAU,EAAE,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC3C,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC;gBACtC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAzBD,IAAI,CAAC,MAAM,EAAE,CAAC;IACf,CAAC;IAyBD,MAAM,KAAK,kBAAkB;QAC5B,OAAO,CAAC,UAAU,CAAC,CAAC;IACrB,CAAC;IACD,wBAAwB,CACvB,IAAY,EACZ,QAAuB,EACvB,QAAuB;QAEvB,IAAI,IAAI,KAAK,UAAU,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC;IACF,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,uBAAuB,EAAE,cAAc,CAAC,CAAC"}
+{"version":3,"file":"SchemeSelector.js","sourceRoot":"","sources":["../../../src/runtime/components/SchemeSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,cAAe,SAAQ,YAAY;IACxC;QACC,KAAK,EAAE,CAAC;QAIT,WAAM,GAAG,GAAG,EAAE;YACb,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC;YACzD,IAAI,CAAC,UAAW,CAAC,SAAS,GAAG,oBAAoB,QAAQ;;MAErD,WAAW;iBACX,GAAG,CACH,CAAC,UAAU,EAAE,EAAE,CACd,kBAAkB,UAAU,KAAK,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,UAAU,WAAW,CACpG;iBACA,IAAI,CAAC,IAAI,CAAC;;;SAGP,CAAC;YACR,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,aAAa,CAChD,sBAAsB,CACM,CAAC;YAC9B,UAAU,EAAE,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;gBAC3C,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC;gBACtC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAxBD,IAAI,CAAC,MAAM,EAAE,CAAC;IACf,CAAC;IAwBD,MAAM,KAAK,kBAAkB;QAC5B,OAAO,CAAC,UAAU,CAAC,CAAC;IACrB,CAAC;IACD,wBAAwB,CACvB,IAAY,EACZ,QAAuB,EACvB,QAAuB;QAEvB,IAAI,IAAI,KAAK,UAAU,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAClD,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC;IACF,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,uBAAuB,EAAE,cAAc,CAAC,CAAC"}

package/dist/runtime/components/SystemDemo.js

@@ -9,7 +9,7 @@ class SystemDemo extends ArborElement {
 			<div data-mode-base>
 				<details>
 					<summary>Primitive Tokens</summary>
-					<pre>${JSON.stringify(convertStructure(this.config.$.primitives, isToken, (token) => token.name), null, 2)}</pre>
+					<pre>${JSON.stringify(convertStructure(this.config.$.mode.primitive, isToken, (token) => token.name), null, 2)}</pre>
 				</details>
 				<details>
 					<summary>Mode Tokens</summary>
@@ -22,7 +22,7 @@ class SystemDemo extends ArborElement {
 				<arbor-scheme-selector>
 					<details open>
 						<summary><h2 id="primitives" style="display: inline; margin: 0;">Primitive Tokens</h2></summary>
-						<arbor-token-values schema-path="$.primitives"></arbor-token-values>
+						<arbor-token-values schema-path="$.mode.primitive"></arbor-token-values>
 					</details>
 					<details open>
 						<summary><h2 id="modes" style="display: inline; margin: 0;">Mode Tokens</h2></summary>

package/dist/runtime/components/SystemDemo.js.map

@@ -1 +1 @@
-{"version":3,"file":"SystemDemo.js","sourceRoot":"","sources":["../../../src/runtime/components/SystemDemo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,UAAW,SAAQ,YAAY;IACpC;QACC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG;;;;YAIlB,IAAI,CAAC,SAAS,CACpB,gBAAgB,CACf,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,EACxB,OAAO,EACP,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CACrB,EACD,IAAI,EACJ,CAAC,CACD;;;;YAIM,IAAI,CAAC,SAAS,CACpB,gBAAgB,CACf,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAClB,OAAO,EACP,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CACrB,EACD,IAAI,EACJ,CAAC,CACD;;;;YAIM,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;GAqBxC,CAAC;IACH,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC"}
+{"version":3,"file":"SystemDemo.js","sourceRoot":"","sources":["../../../src/runtime/components/SystemDemo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,UAAW,SAAQ,YAAY;IACpC;QACC,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG;;;;YAIlB,IAAI,CAAC,SAAS,CACpB,gBAAgB,CACf,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAC5B,OAAO,EACP,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CACrB,EACD,IAAI,EACJ,CAAC,CACD;;;;YAIM,IAAI,CAAC,SAAS,CACpB,gBAAgB,CACf,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAClB,OAAO,EACP,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CACrB,EACD,IAAI,EACJ,CAAC,CACD;;;;YAIM,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;GAqBxC,CAAC;IACH,CAAC;CACD;AAED,cAAc,CAAC,MAAM,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"generateStylesheet.d.ts","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAexE,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,cAAc,EACtB,EACC,KAAK,EAAE,gBAA0B,GACjC,GAAE;IACF,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAClB,GACJ,MAAM,CAqIR"}
+{"version":3,"file":"generateStylesheet.d.ts","sourceRoot":"","sources":["../../src/stylesheet/generateStylesheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAKxE,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,cAAc,EACtB,EACC,KAAK,EAAE,gBAA0B,GACjC,GAAE;IACF,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAClB,GACJ,MAAM,CA6ER"}

package/dist/stylesheet/generateStylesheet.js

@@ -1,60 +1,12 @@
 import { getInternals } from '@arbor-css/preset/config';
-import { flattenTokenSchema, isToken, selfReferencedProps, tokenSchemaToList, } from '@arbor-css/tokens';
-import { convertStructure } from '@arbor-css/util';
-import { flattenAndApplyTokenValues } from '../util/flattenAndApplyTokenValues.js';
-import { formatObjectToCss } from '../util/formatObjectToCss.js';
+import { flattenTokenSchema } from '@arbor-css/tokens';
 import { printTokens } from '../util/printTokens.js';
 import { modeToCss } from './modeToCss.js';
-const noPreference = `, (prefers-color-scheme: no-preference)`;
 export function generateStylesheet(config, { layer: cascadeLayerName = 'arbor', } = {}) {
-    const { defaultScheme, modes, primitiveValues } = getInternals(config);
+    const { modes } = getInternals(config);
     const systemProps = config.$.system;
     const globalProps = systemProps.global;
-    /**
-     * Each scheme generates a full set of CSS color properties
-     * which are prefixed with its tag. The application of a scheme
-     * then sets the "official" version of each property to the
-     * tagged one when it is applied.
-     */
-    function getSchemeRootPropertiesCss(schemeName) {
-        const values = flattenAndApplyTokenValues(config.$.primitives.color, primitiveValues.color[schemeName].colors, { prefix: schemeName });
-        return formatObjectToCss(values);
-    }
-    function getSchemeApplicationCss(schemeName) {
-        const scheme = primitiveValues.color[schemeName];
-        const values = selfReferencedProps(config.$.primitives.color, {
-            valuePrefix: schemeName,
-        });
-        return `${systemProps.meta.schemeName.assign(schemeName)}
-	${systemProps.meta.scheme.invertMultiplier.assign(scheme.isDark ? -1 : 1)}
-	${systemProps.meta.scheme.whenDark.assign(scheme.isDark ? 1 : 0)}
-	${systemProps.meta.scheme.whenLight.assign(scheme.isDark ? 0 : 1)}
-	${systemProps.meta.scheme.trueLight.assign(scheme.isDark ? 'black' : 'white')}
-	${systemProps.meta.scheme.trueHeavy.assign(scheme.isDark ? 'white' : 'black')}
-	${formatObjectToCss(values)}
-	`;
-    }
     const allModeProps = flattenTokenSchema(config.$.mode);
-    // replace scheme names with their tags if they are provided
-    const schemeColorsWithTags = Object.keys(primitiveValues.color).reduce((acc, key) => {
-        acc[key] = primitiveValues.color[key].colors;
-        return acc;
-    }, {});
-    // convert all tagged scheme colors to Tokens
-    const createToken = config.context.createPrimitiveToken;
-    const allColorTokens = tokenSchemaToList(convertStructure(schemeColorsWithTags, isToken, (_, path) => createToken(path.join('-'), { type: 'color' })));
-    const rawSchemeColorValuesCss = `/* Raw scheme colors */
-${Object.keys(primitiveValues.color)
-        .map((schemeName) => getSchemeRootPropertiesCss(schemeName))
-        .join('\n')}`;
-    const lightDarkSchemeApplicationCss = `/* Dark/Light schemes are assigned to built-in device preferences */
-	@media (prefers-color-scheme: light)${defaultScheme === 'light' ? noPreference : ''} {
-		${getSchemeApplicationCss('light')}
-	}
-
-	@media (prefers-color-scheme: dark)${defaultScheme === 'dark' ? noPreference : ''} {
-		${getSchemeApplicationCss('dark')}
-	}`;
     return `/* Auto-generated CSS - do not edit directly */
 ${cascadeLayerName ? `@layer ${cascadeLayerName} {` : ''}
 :root {
@@ -62,32 +14,53 @@ ${cascadeLayerName ? `@layer ${cascadeLayerName} {` : ''}
 	${printTokens(globalProps, config.context.globals)}
 	/* By default we set the font size */
 	font-size: ${globalProps.baseFontSize.var};
-
-	${rawSchemeColorValuesCss}
-	${lightDarkSchemeApplicationCss}
-
-	/* Other primitives */
-	${printTokens(config.$.primitives.typography, primitiveValues.typography.levels)}
-	${printTokens(config.$.primitives.spacing, primitiveValues.spacing.levels)}
-	${printTokens(config.$.primitives.shadow, primitiveValues.shadow.levels)}
-	${printTokens(config.$.primitives.easing, primitiveValues.easing)}
-	${printTokens(config.$.primitives.duration, primitiveValues.duration)}
 }
 
 ${[['base', config.baseMode], ...Object.entries(modes)]
         .map(([modeName, modeValue]) => {
         return `/* Mode: ${modeName} */
-${modeName === 'base' ? ':root, :root [class^="\\@scheme-"], :root [class*=" \\@scheme-"] ' : ''}${modeToCss(modeValue, config)}
+${modeToCss(modeValue, config)}
 `;
     })
         .join('\n\n')}
 
-	/* Scheme classes */
-${Object.keys(primitiveValues.color)
-        .map((schemeName) => `.\\@scheme-${schemeName} {
-	${getSchemeApplicationCss(schemeName)}
-}`)
-        .join('\n\n')}
+/* System scheme tokens */
+@media (prefers-color-scheme: light) {
+	:root {
+		${systemProps.meta.scheme.trueHeavy.assign('#000')}
+		${systemProps.meta.scheme.trueLight.assign('#fff')}
+		${systemProps.meta.scheme.invertMultiplier.assign('1')}
+		${systemProps.meta.scheme.whenDark.assign('0')}
+		${systemProps.meta.scheme.whenLight.assign('1')}
+	}
+}
+@media (prefers-color-scheme: dark) {
+	:root {
+		${systemProps.meta.scheme.trueHeavy.assign('#fff')}
+		${systemProps.meta.scheme.trueLight.assign('#000')}
+		${systemProps.meta.scheme.invertMultiplier.assign('-1')}
+		${systemProps.meta.scheme.whenDark.assign('1')}
+		${systemProps.meta.scheme.whenLight.assign('0')}
+	}
+}
+
+/* Scheme control classes */
+.\\@scheme-light {
+	color-scheme: light;
+	${systemProps.meta.scheme.trueHeavy.assign('#000')}
+	${systemProps.meta.scheme.trueLight.assign('#fff')}
+	${systemProps.meta.scheme.invertMultiplier.assign('1')}
+	${systemProps.meta.scheme.whenDark.assign('0')}
+	${systemProps.meta.scheme.whenLight.assign('1')}
+}
+.\\@scheme-dark {
+	color-scheme: dark;
+	${systemProps.meta.scheme.trueHeavy.assign('#fff')}
+	${systemProps.meta.scheme.trueLight.assign('#000')}
+	${systemProps.meta.scheme.invertMultiplier.assign('-1')}
+	${systemProps.meta.scheme.whenDark.assign('1')}
+	${systemProps.meta.scheme.whenLight.assign('0')}
+}
 
 /* Function definitions */
 ${Object.values(config.functions)
@@ -95,16 +68,6 @@ ${Object.values(config.functions)
         .filter(Boolean)
         .join('\n\n')}
 
-/* Power user classes */
-.\\@user-colors {
-	${rawSchemeColorValuesCss}
-	${lightDarkSchemeApplicationCss}
-}
-
-${allColorTokens
-        .map((token) => token.definition)
-        .filter(Boolean)
-        .join('\n')}
 ${allModeProps
         .map((PROP) => PROP.definition)
         .filter(Boolean)

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