@yahoo/uds-create-config 2.15.0 → 2.17.0

package/dist/index.d.ts

@@ -33,7 +33,7 @@ import { ELEMENT_MARKER_KIND, ElementMarker, OpaqueLeafPredicate, hasElementMark
 import { collectFontFaceCss, deriveFontFaceCss, familiesInRawCss } from "./font-face.js";
 import { interpolate } from "./interpolate.js";
 import { resolveRegistryDir } from "./registry-dir.js";
-import { ModeBackedModifierDefinition, ModeBackedModifierInput, ModeBackedModifierLookup, OverrideModeRef, OverrideRow, buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRowValue } from "./token-override-rows.js";
+import { ModeBackedModifierDefinition, ModeBackedModifierInput, ModeBackedModifierLookup, ModifierTree, OverrideModeRef, OverrideRow, buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRow, resolveOverrideRowValue } from "./token-override-rows.js";
 import { rem } from "./units.js";
 import { EntityKind } from "@yahoo/uds-create-types/entity";
-export { ASSET_CLASS_CAPABILITIES, type AnyRef, type AnyStylePropDefinition, type ArbitrarySpec, AssetGroup, type AssetGroupBuilder, type AssetGroupConfig, type AssetGroupDefinition, type AssetGroupName, type AssetGroupRef, type AssetKind, type AssetName, type AssetRef, type BaseStyles, type BooleanMarker, type BoundComponent, type BuildOptions, CSS_GLOBAL_KEYWORDS, CSS_PROPERTY_KEYWORDS, type CanvasRole, type CanvasRoleEntry, type CanvasRoleEntryInput, type CanvasRolesDefinition, type CanvasRolesDefinitionInput, type CanvasRolesInputConstraint, type ColorCssProperty, type ColorExpression, type ColorFn, type ColorKeyword, type ColorSpace, type ColorValue, Component, type ComponentBuilder, type ComponentBuilderMethods, type ComponentDefinition, ComponentGroup, type ComponentGroupDefinition, type ComponentKind, type ComponentMetadata, type ComponentName, type ComponentRef, type ComponentRenderFn, type CompositeInfo, type CompositeName, type CompositeRef, type CompositeRefBuilder, CompositeStyle, type CompositeStyleDefinition, type CompositeStyleObject, type CompoundPropsEntry, Config, type ConfigCallbackHelpers, type ConfigDiagnostic, type ConfigDiagnosticDefinition, ConfigValidationError, type Css, type CssAngle, type CssClassName, type CssColor, type CssDeclaration, type CssGlobalKeyword, type CssLength, CssMotionDef, type CssMotionDefinition, type CssMotionFields, type CssPercentage, type CssPropertyName, type CssPropertyValues, type CssPropertyWithKeywords, type CssRatio, type CssSelector, type CssSlotMotion, type CssTime, type CssValue, type CssValueTypeName, type CssVar, type CssVarRef, type DataAttrs, type DefineComponentFn, type DefinedComponent, type DefinedMotion, type DefinedProvider, type DefinedStyleProp, type DefinedTokenGroup, type DependenciesQuery, type DependencyKind, type DependencyRef, type DependentsQuery, ELEMENT_MARKER_KIND, type ElementMarker, type EntityKind, type FontAssetGroupConfig, type FontAssetGroupDefinition, type FontAssetMember, type FunctionInfo, type GlobalStylesDef, type GradientStop, type GradientValue, type HexColor, type HslColor, type IconAssetGroupConfig, type IconAssetGroupDefinition, type IconAssetMember, type IconAssetMetadata, JsMotionDef, type JsMotionDefinition, type JsMotionFields, type JsSlotMotion, Layer, type LayerInput, type LayerMarker, type LayerPropsMap, type LengthOrPercent, type LineDirection, type LinearGradientExpr, type LinkedComponentsInput, type LinkedSystemEntry, type LiteralFor, MOTION_CSS_DEFINITION_KEYS, MOTION_CSS_DIRECTIONS, MOTION_CSS_FILL_MODES, MOTION_CSS_PLAY_STATES, MOTION_CSS_PROPERTY_PREFIXES, MOTION_JS_DEFINITION_KEYS, MOTION_JS_DRAG_AXES, MOTION_JS_FIELD_KEYS, MOTION_JS_LAYOUT_MODES, MOTION_JS_REPEAT_TYPES, MOTION_JS_SPRING_FIELDS, MOTION_JS_TRANSITION_TYPES, MOTION_JS_TWEEN_FIELDS, type MixExpr, Mode, type ModeBackedModifierDefinition, type ModeBackedModifierInput, type ModeBackedModifierLookup, type ModeDefinition, type ModeName, ModeOption, type ModeOptionDefinition, type ModeRef, Modifier, type ModifierDefinition, type MotionDef, type MotionDefinitionInput, type MotionDragBox, type MotionKeyframes, type MotionMarker, type MotionMetadata, type MotionName, type MotionState, type MotionStateKeyframe, type MotionTransition, type MotionVariants, type MotionViewportOptions, type NumberMarker, type OpacityPairSpec, type OpaqueLeafPredicate, type OverrideModeRef, type OverrideRow, PREVIEW_SEED_KEY, type PlaygroundOptions, type PlaygroundPage, type PlaygroundSpec, type PreviewAxisMarker, type PreviewCallbackHelpers, type PreviewDefinition, type PreviewPropsRule, type PrimitivePropKind, type PropBase, type PropBinding, type PropInfo, type PropKind, Provider, type RadialGradientExpr, type RadialSize, type RawToken, type RegisteredAssetGroups, type RegisteredComponents, type RegisteredCompositeStyles, type RegisteredModes, type RegisteredModifiers, type RegisteredMotion, type RegisteredStyleProps, type RegisteredTokenGroups, type RequiredBrand, type ResolvedCompoundOverrides, type ResolvedTokenLiteral, type RgbColor, SOURCE_PATH_KEY, type SerializedAssetGroup, type SerializedComponentGroup, type SerializedConfig, type SerializedFontAssetGroup, type SerializedIconAssetGroup, type SerializedPlaygroundOptions, type SerializedTokenGroup, type SlotInfo, type SlotMarker, type SlotMotion, type SlotRef, type SlotValueKind, type SlotValueType, type StringMarker, StyleProp, type StylePropDefinition, type StylePropInfo, type StylePropKeyword, type StylePropMetadata, type StylePropName, type StylePropProperty, type StylePropRef, type StylePropTokenUsage, type SystemLink, type TagName, type TagRef, Token, type TokenDefinition, type TokenDefinitionFor, TokenGroup, type TokenGroupDefinition, type TokenGroupDefinitionFor, type TokenGroupMetadata, type TokenGroupName, type TokenGroupRef, type TokenModifierKey, type TokenModifierValue, type TokenName, type TokenQualifiedName, type TokenRawNameRegistry, type TokenRawValue, type TokenRef, type TokenRefToCss, type TokenType, type TokenValue, type TypedSlotRef, type ValuesEntry, type VariantInfo, type VariantMarker, type VariantMarkerArray, type VariantMarkerObject, alpha, asChild, asset, assetGroup, attachSourcePath, boolean, buildModeBackedModifierLookup, buildNestedModifierUpdate, captureCallerPath, collectFontFaceCss, component, composite, createModeBackedModifierLookup, cssClassName, cssDeclaration, cssSelector, cssVar, defineAssetGroup, defineAssetIcon, defineComponent, defineComponentGroup, defineCompositeStyle, defineMode, defineModifier, defineMotion, defineProvider, defineStyleProp, defineTokenGroup, deriveFontFaceCss, familiesInRawCss, findComponentReferrers, hasElementMarkerDeep, interpolate, isAssetGroupRef, isAssetRef, isBoolMarker, isColorExpression, isComponentRef, isCompositeRef, isElementLikeValue, isElementMarker, isLayerMarker, isLinearGradientExpr, isMixExpr, isModeRef, isMotionMarker, isNumberMarker, isPlaceable, isPreviewAxisMarker, isRadialGradientExpr, isSafeClassNameValue, isSlotMarker, isStringMarker, isStylePropRef, isTagRef, isTokenGroupRef, isTokenRef, isVariantArrayMarker, isVariantMarker, linearGradient, makeTokenRefToCss, matchesPreviewWhen, mergeModifierUpdates, mix, mode, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, motion, number, overrideRowsToModifierTree, parseRegistryKey, radialGradient, readSourcePath, rem, resolveAssetRefCss, resolveColorExpression, resolveFontStack, resolveOverrideRowValue, resolvePreviewRules, resolveRegistryDir, reviveElementMarkersDeep, serializeElementsDeep, slot, string, styleProp, tag, token, tokenGroup, variant };
+export { ASSET_CLASS_CAPABILITIES, type AnyRef, type AnyStylePropDefinition, type ArbitrarySpec, AssetGroup, type AssetGroupBuilder, type AssetGroupConfig, type AssetGroupDefinition, type AssetGroupName, type AssetGroupRef, type AssetKind, type AssetName, type AssetRef, type BaseStyles, type BooleanMarker, type BoundComponent, type BuildOptions, CSS_GLOBAL_KEYWORDS, CSS_PROPERTY_KEYWORDS, type CanvasRole, type CanvasRoleEntry, type CanvasRoleEntryInput, type CanvasRolesDefinition, type CanvasRolesDefinitionInput, type CanvasRolesInputConstraint, type ColorCssProperty, type ColorExpression, type ColorFn, type ColorKeyword, type ColorSpace, type ColorValue, Component, type ComponentBuilder, type ComponentBuilderMethods, type ComponentDefinition, ComponentGroup, type ComponentGroupDefinition, type ComponentKind, type ComponentMetadata, type ComponentName, type ComponentRef, type ComponentRenderFn, type CompositeInfo, type CompositeName, type CompositeRef, type CompositeRefBuilder, CompositeStyle, type CompositeStyleDefinition, type CompositeStyleObject, type CompoundPropsEntry, Config, type ConfigCallbackHelpers, type ConfigDiagnostic, type ConfigDiagnosticDefinition, ConfigValidationError, type Css, type CssAngle, type CssClassName, type CssColor, type CssDeclaration, type CssGlobalKeyword, type CssLength, CssMotionDef, type CssMotionDefinition, type CssMotionFields, type CssPercentage, type CssPropertyName, type CssPropertyValues, type CssPropertyWithKeywords, type CssRatio, type CssSelector, type CssSlotMotion, type CssTime, type CssValue, type CssValueTypeName, type CssVar, type CssVarRef, type DataAttrs, type DefineComponentFn, type DefinedComponent, type DefinedMotion, type DefinedProvider, type DefinedStyleProp, type DefinedTokenGroup, type DependenciesQuery, type DependencyKind, type DependencyRef, type DependentsQuery, ELEMENT_MARKER_KIND, type ElementMarker, type EntityKind, type FontAssetGroupConfig, type FontAssetGroupDefinition, type FontAssetMember, type FunctionInfo, type GlobalStylesDef, type GradientStop, type GradientValue, type HexColor, type HslColor, type IconAssetGroupConfig, type IconAssetGroupDefinition, type IconAssetMember, type IconAssetMetadata, JsMotionDef, type JsMotionDefinition, type JsMotionFields, type JsSlotMotion, Layer, type LayerInput, type LayerMarker, type LayerPropsMap, type LengthOrPercent, type LineDirection, type LinearGradientExpr, type LinkedComponentsInput, type LinkedSystemEntry, type LiteralFor, MOTION_CSS_DEFINITION_KEYS, MOTION_CSS_DIRECTIONS, MOTION_CSS_FILL_MODES, MOTION_CSS_PLAY_STATES, MOTION_CSS_PROPERTY_PREFIXES, MOTION_JS_DEFINITION_KEYS, MOTION_JS_DRAG_AXES, MOTION_JS_FIELD_KEYS, MOTION_JS_LAYOUT_MODES, MOTION_JS_REPEAT_TYPES, MOTION_JS_SPRING_FIELDS, MOTION_JS_TRANSITION_TYPES, MOTION_JS_TWEEN_FIELDS, type MixExpr, Mode, type ModeBackedModifierDefinition, type ModeBackedModifierInput, type ModeBackedModifierLookup, type ModeDefinition, type ModeName, ModeOption, type ModeOptionDefinition, type ModeRef, Modifier, type ModifierDefinition, type ModifierTree, type MotionDef, type MotionDefinitionInput, type MotionDragBox, type MotionKeyframes, type MotionMarker, type MotionMetadata, type MotionName, type MotionState, type MotionStateKeyframe, type MotionTransition, type MotionVariants, type MotionViewportOptions, type NumberMarker, type OpacityPairSpec, type OpaqueLeafPredicate, type OverrideModeRef, type OverrideRow, PREVIEW_SEED_KEY, type PlaygroundOptions, type PlaygroundPage, type PlaygroundSpec, type PreviewAxisMarker, type PreviewCallbackHelpers, type PreviewDefinition, type PreviewPropsRule, type PrimitivePropKind, type PropBase, type PropBinding, type PropInfo, type PropKind, Provider, type RadialGradientExpr, type RadialSize, type RawToken, type RegisteredAssetGroups, type RegisteredComponents, type RegisteredCompositeStyles, type RegisteredModes, type RegisteredModifiers, type RegisteredMotion, type RegisteredStyleProps, type RegisteredTokenGroups, type RequiredBrand, type ResolvedCompoundOverrides, type ResolvedTokenLiteral, type RgbColor, SOURCE_PATH_KEY, type SerializedAssetGroup, type SerializedComponentGroup, type SerializedConfig, type SerializedFontAssetGroup, type SerializedIconAssetGroup, type SerializedPlaygroundOptions, type SerializedTokenGroup, type SlotInfo, type SlotMarker, type SlotMotion, type SlotRef, type SlotValueKind, type SlotValueType, type StringMarker, StyleProp, type StylePropDefinition, type StylePropInfo, type StylePropKeyword, type StylePropMetadata, type StylePropName, type StylePropProperty, type StylePropRef, type StylePropTokenUsage, type SystemLink, type TagName, type TagRef, Token, type TokenDefinition, type TokenDefinitionFor, TokenGroup, type TokenGroupDefinition, type TokenGroupDefinitionFor, type TokenGroupMetadata, type TokenGroupName, type TokenGroupRef, type TokenModifierKey, type TokenModifierValue, type TokenName, type TokenQualifiedName, type TokenRawNameRegistry, type TokenRawValue, type TokenRef, type TokenRefToCss, type TokenType, type TokenValue, type TypedSlotRef, type ValuesEntry, type VariantInfo, type VariantMarker, type VariantMarkerArray, type VariantMarkerObject, alpha, asChild, asset, assetGroup, attachSourcePath, boolean, buildModeBackedModifierLookup, buildNestedModifierUpdate, captureCallerPath, collectFontFaceCss, component, composite, createModeBackedModifierLookup, cssClassName, cssDeclaration, cssSelector, cssVar, defineAssetGroup, defineAssetIcon, defineComponent, defineComponentGroup, defineCompositeStyle, defineMode, defineModifier, defineMotion, defineProvider, defineStyleProp, defineTokenGroup, deriveFontFaceCss, familiesInRawCss, findComponentReferrers, hasElementMarkerDeep, interpolate, isAssetGroupRef, isAssetRef, isBoolMarker, isColorExpression, isComponentRef, isCompositeRef, isElementLikeValue, isElementMarker, isLayerMarker, isLinearGradientExpr, isMixExpr, isModeRef, isMotionMarker, isNumberMarker, isPlaceable, isPreviewAxisMarker, isRadialGradientExpr, isSafeClassNameValue, isSlotMarker, isStringMarker, isStylePropRef, isTagRef, isTokenGroupRef, isTokenRef, isVariantArrayMarker, isVariantMarker, linearGradient, makeTokenRefToCss, matchesPreviewWhen, mergeModifierUpdates, mix, mode, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, motion, number, overrideRowsToModifierTree, parseRegistryKey, radialGradient, readSourcePath, rem, resolveAssetRefCss, resolveColorExpression, resolveFontStack, resolveOverrideRow, resolveOverrideRowValue, resolvePreviewRules, resolveRegistryDir, reviveElementMarkersDeep, serializeElementsDeep, slot, string, styleProp, tag, token, tokenGroup, variant };

package/dist/index.js

@@ -28,7 +28,7 @@ import { collectFontFaceCss, deriveFontFaceCss, familiesInRawCss } from "./font-
 import { interpolate } from "./interpolate.js";
 import { MOTION_CSS_DIRECTIONS, MOTION_CSS_FILL_MODES, MOTION_CSS_PLAY_STATES, MOTION_CSS_PROPERTY_PREFIXES, MOTION_JS_DRAG_AXES, MOTION_JS_LAYOUT_MODES, MOTION_JS_REPEAT_TYPES, MOTION_JS_SPRING_FIELDS, MOTION_JS_TRANSITION_TYPES, MOTION_JS_TWEEN_FIELDS } from "./motion-constants.js";
 import { resolveRegistryDir } from "./registry-dir.js";
-import { buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRowValue } from "./token-override-rows.js";
+import { buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRow, resolveOverrideRowValue } from "./token-override-rows.js";
 import { CSS_GLOBAL_KEYWORDS, CSS_PROPERTY_KEYWORDS } from "./types/css-property-keywords.js";
 import { rem } from "./units.js";
-export { ASSET_CLASS_CAPABILITIES, AssetGroup, CSS_GLOBAL_KEYWORDS, CSS_PROPERTY_KEYWORDS, Component, ComponentGroup, CompositeStyle, Config, ConfigValidationError, CssMotionDef, ELEMENT_MARKER_KIND, JsMotionDef, Layer, MOTION_CSS_DEFINITION_KEYS, MOTION_CSS_DIRECTIONS, MOTION_CSS_FILL_MODES, MOTION_CSS_PLAY_STATES, MOTION_CSS_PROPERTY_PREFIXES, MOTION_JS_DEFINITION_KEYS, MOTION_JS_DRAG_AXES, MOTION_JS_FIELD_KEYS, MOTION_JS_LAYOUT_MODES, MOTION_JS_REPEAT_TYPES, MOTION_JS_SPRING_FIELDS, MOTION_JS_TRANSITION_TYPES, MOTION_JS_TWEEN_FIELDS, Mode, ModeOption, Modifier, PREVIEW_SEED_KEY, Provider, SOURCE_PATH_KEY, StyleProp, Token, TokenGroup, alpha, asChild, asset, assetGroup, attachSourcePath, boolean, buildModeBackedModifierLookup, buildNestedModifierUpdate, captureCallerPath, collectFontFaceCss, component, composite, createModeBackedModifierLookup, cssClassName, cssDeclaration, cssSelector, cssVar, defineAssetGroup, defineAssetIcon, defineComponent, defineComponentGroup, defineCompositeStyle, defineMode, defineModifier, defineMotion, defineProvider, defineStyleProp, defineTokenGroup, deriveFontFaceCss, familiesInRawCss, findComponentReferrers, hasElementMarkerDeep, interpolate, isAssetGroupRef, isAssetRef, isBoolMarker, isColorExpression, isComponentRef, isCompositeRef, isElementLikeValue, isElementMarker, isLayerMarker, isLinearGradientExpr, isMixExpr, isModeRef, isMotionMarker, isNumberMarker, isPlaceable, isPreviewAxisMarker, isRadialGradientExpr, isSafeClassNameValue, isSlotMarker, isStringMarker, isStylePropRef, isTagRef, isTokenGroupRef, isTokenRef, isVariantArrayMarker, isVariantMarker, linearGradient, makeTokenRefToCss, matchesPreviewWhen, mergeModifierUpdates, mix, mode, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, motion, number, overrideRowsToModifierTree, parseRegistryKey, radialGradient, readSourcePath, rem, resolveAssetRefCss, resolveColorExpression, resolveFontStack, resolveOverrideRowValue, resolvePreviewRules, resolveRegistryDir, reviveElementMarkersDeep, serializeElementsDeep, slot, string, styleProp, tag, token, tokenGroup, variant };
+export { ASSET_CLASS_CAPABILITIES, AssetGroup, CSS_GLOBAL_KEYWORDS, CSS_PROPERTY_KEYWORDS, Component, ComponentGroup, CompositeStyle, Config, ConfigValidationError, CssMotionDef, ELEMENT_MARKER_KIND, JsMotionDef, Layer, MOTION_CSS_DEFINITION_KEYS, MOTION_CSS_DIRECTIONS, MOTION_CSS_FILL_MODES, MOTION_CSS_PLAY_STATES, MOTION_CSS_PROPERTY_PREFIXES, MOTION_JS_DEFINITION_KEYS, MOTION_JS_DRAG_AXES, MOTION_JS_FIELD_KEYS, MOTION_JS_LAYOUT_MODES, MOTION_JS_REPEAT_TYPES, MOTION_JS_SPRING_FIELDS, MOTION_JS_TRANSITION_TYPES, MOTION_JS_TWEEN_FIELDS, Mode, ModeOption, Modifier, PREVIEW_SEED_KEY, Provider, SOURCE_PATH_KEY, StyleProp, Token, TokenGroup, alpha, asChild, asset, assetGroup, attachSourcePath, boolean, buildModeBackedModifierLookup, buildNestedModifierUpdate, captureCallerPath, collectFontFaceCss, component, composite, createModeBackedModifierLookup, cssClassName, cssDeclaration, cssSelector, cssVar, defineAssetGroup, defineAssetIcon, defineComponent, defineComponentGroup, defineCompositeStyle, defineMode, defineModifier, defineMotion, defineProvider, defineStyleProp, defineTokenGroup, deriveFontFaceCss, familiesInRawCss, findComponentReferrers, hasElementMarkerDeep, interpolate, isAssetGroupRef, isAssetRef, isBoolMarker, isColorExpression, isComponentRef, isCompositeRef, isElementLikeValue, isElementMarker, isLayerMarker, isLinearGradientExpr, isMixExpr, isModeRef, isMotionMarker, isNumberMarker, isPlaceable, isPreviewAxisMarker, isRadialGradientExpr, isSafeClassNameValue, isSlotMarker, isStringMarker, isStylePropRef, isTagRef, isTokenGroupRef, isTokenRef, isVariantArrayMarker, isVariantMarker, linearGradient, makeTokenRefToCss, matchesPreviewWhen, mergeModifierUpdates, mix, mode, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, motion, number, overrideRowsToModifierTree, parseRegistryKey, radialGradient, readSourcePath, rem, resolveAssetRefCss, resolveColorExpression, resolveFontStack, resolveOverrideRow, resolveOverrideRowValue, resolvePreviewRules, resolveRegistryDir, reviveElementMarkersDeep, serializeElementsDeep, slot, string, styleProp, tag, token, tokenGroup, variant };

package/dist/native/NativeConfig.d.ts

@@ -1,6 +1,5 @@
-import { ModeDefinition } from "../types.js";
 import { ConfigValidationError } from "../config-diagnostics.js";
-import { NativeAssetGroupDefinition, NativeFontAssetGroupDefinition, NativeTokenGroupDefinition, SerializedNativeConfig } from "./types.js";
+import { NativeAssetGroupDefinition, NativeDefaultModes, NativeFontAssetGroupDefinition, NativeModeDefinition, NativeTokenGroupDefinition, SerializedNativeConfig } from "./types.js";
 import { NativeConfigDiagnostic } from "./validation.js";
 
 //#region src/native/NativeConfig.d.ts
@@ -9,16 +8,18 @@ declare class NativeConfigValidationError extends ConfigValidationError<NativeCo
 }
 declare class NativeConfig {
   #private;
-  static readonly SCHEMA_VERSION = 1;
+  static readonly SCHEMA_VERSION = 2;
   readonly platform: "native";
   namespace?: string;
-  readonly modes: Map<string, ModeDefinition>;
+  defaultModes?: NativeDefaultModes;
+  readonly modes: Map<string, NativeModeDefinition>;
   readonly tokenGroups: Map<string, NativeTokenGroupDefinition>;
   readonly assetGroups: Map<string, NativeFontAssetGroupDefinition>;
   configure(options: {
     namespace?: string;
+    defaultModes?: NativeDefaultModes;
   }): this;
-  registerModes(modes: Record<string, ModeDefinition>): this;
+  registerModes(modes: Record<string, NativeModeDefinition>): this;
   registerTokenGroups(groups: Record<string, NativeTokenGroupDefinition>): this;
   registerAssetGroups(groups: Record<string, NativeAssetGroupDefinition>): this;
   validate(): NativeConfigDiagnostic[];

package/dist/native/NativeConfig.js

@@ -8,9 +8,10 @@ var NativeConfigValidationError = class extends ConfigValidationError {
 	}
 };
 var NativeConfig = class NativeConfig {
-	static SCHEMA_VERSION = 1;
+	static SCHEMA_VERSION = 2;
 	platform = "native";
 	namespace;
+	defaultModes;
 	modes = /* @__PURE__ */ new Map();
 	tokenGroups = /* @__PURE__ */ new Map();
 	assetGroups = /* @__PURE__ */ new Map();
@@ -24,6 +25,7 @@ var NativeConfig = class NativeConfig {
 			if (diagnostics.length > 0) throw new NativeConfigValidationError(diagnostics);
 			this.namespace = options.namespace;
 		}
+		if (options.defaultModes !== void 0) this.defaultModes = { ...options.defaultModes };
 		return this;
 	}
 	registerModes(modes) {
@@ -53,6 +55,7 @@ var NativeConfig = class NativeConfig {
 		const json = input;
 		const config = new NativeConfig();
 		config.namespace = json.namespace;
+		config.defaultModes = json.defaultModes ? { ...json.defaultModes } : void 0;
 		for (const [name, mode] of Object.entries(json.modes ?? {})) config.modes.set(name, mode);
 		for (const [name, group] of Object.entries(json.tokenGroups ?? {})) config.tokenGroups.set(name, group);
 		for (const [name, group] of Object.entries(json.assetGroups ?? {})) config.assetGroups.set(name, group);
@@ -65,6 +68,7 @@ var NativeConfig = class NativeConfig {
 		};
 		if (meta?.builtAt !== void 0) out.builtAt = meta.builtAt;
 		if (this.namespace !== void 0) out.namespace = this.namespace;
+		if (this.defaultModes !== void 0) out.defaultModes = { ...this.defaultModes };
 		if (this.modes.size > 0) out.modes = Object.fromEntries(this.modes);
 		if (this.tokenGroups.size > 0) out.tokenGroups = Object.fromEntries(this.tokenGroups);
 		if (this.assetGroups.size > 0) out.assetGroups = Object.fromEntries(this.assetGroups);

package/dist/native/index.d.ts

@@ -1,9 +1,10 @@
 import { AssetRef, TokenRef, asset, token } from "../refs.js";
 import { ColorSpace, MixExpr, alpha, mix } from "../colorExpressions.js";
-import { ModeDefinition, SystemLink, TokenType } from "../types.js";
-import { DefinedTokenGroupValue, defineMode } from "../factories.js";
-import { NativeAssetGroupDefinition, NativeColorExpression, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig } from "./types.js";
+import { SystemLink, TokenType } from "../types.js";
+import { DefinedTokenGroupValue } from "../factories.js";
+import { ModeDefinition, NativeAppearanceModeOption, NativeAssetGroupDefinition, NativeColorExpression, NativeDefaultModes, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeModeDefinition, NativeModeOptionDefinition, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, NativeViewportModeOption, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig } from "./types.js";
 import { NativeAssetGroupBuilder, NativeFontAssetGroupConfig, defineAssetGroup } from "./assets.js";
+import { defineMode } from "./modes.js";
 import { NativeConfigDiagnostic, NativeConfigDiagnosticCode, validateSerializedNativeConfig } from "./validation.js";
 import { NativeConfig, NativeConfigValidationError } from "./NativeConfig.js";
 import { isOperatingSystemValue, operatingSystem } from "./values.js";

package/dist/native/index.js

@@ -2,6 +2,7 @@ import "../refs.js";
 import "../colorExpressions.js";
 import { defineTokenGroupValue } from "../factories.js";
 import "./assets.js";
+import "./modes.js";
 import "./values.js";
 import "./validation.js";
 import "./NativeConfig.js";

package/dist/native/modes.d.ts

@@ -0,0 +1,10 @@
+import { NativeModeDefinition } from "./types.js";
+
+//#region src/native/modes.d.ts
+/**
+ * Native mode authoring uses the shared option/modifier model while requiring
+ * each option to describe the application condition that activates it.
+ */
+declare function defineMode<const T extends NativeModeDefinition>(modes: T): T;
+//#endregion
+export { defineMode };

package/dist/native/modes.js

@@ -0,0 +1,11 @@
+import { attachSourcePath, captureCallerPath } from "../captureCallerPath.js";
+//#region src/native/modes.ts
+/**
+* Native mode authoring uses the shared option/modifier model while requiring
+* each option to describe the application condition that activates it.
+*/
+function defineMode(modes) {
+	return attachSourcePath(modes, captureCallerPath());
+}
+//#endregion
+export { defineMode };

package/dist/native/types.d.ts

@@ -1,6 +1,6 @@
 import { AssetRef, TokenRef } from "../refs.js";
 import { MixExpr } from "../colorExpressions.js";
-import { ModeDefinition, TokenDefinitionFor, TokenGroupDefinitionFor } from "../types.js";
+import { TokenDefinitionFor, TokenGroupDefinitionFor, TokenModifierKey } from "../types.js";
 
 //#region src/native/types.d.ts
 type NativeLiteral = string | number | boolean;
@@ -27,6 +27,28 @@ interface OperatingSystemValue {
 type NativeTokenValue = NativeSelectableValue | OperatingSystemValue;
 type NativeTokenDefinition = TokenDefinitionFor<NativeTokenValue>;
 type NativeTokenGroupDefinition = TokenGroupDefinitionFor<NativeTokenDefinition>;
+interface NativeModeOptionBase {
+  /** Modifier contributed by this option. Defaults to `_${optionName}`. */
+  modifier?: TokenModifierKey;
+  label?: string;
+  description?: string;
+}
+/** An option driven by the React Native color-scheme condition. */
+type NativeAppearanceModeOption = NativeModeOptionBase & {
+  appearance: 'light' | 'dark';
+  minWidth?: never;
+};
+/** An option driven by the current React Native window width. */
+type NativeViewportModeOption = NativeModeOptionBase & {
+  minWidth: number;
+  appearance?: never;
+};
+type NativeModeOptionDefinition = NativeAppearanceModeOption | NativeViewportModeOption;
+type NativeModeDefinition = Record<string, NativeModeOptionDefinition>;
+/** Native-entry compatibility name for the platform-specific mode shape. */
+type ModeDefinition = NativeModeDefinition;
+/** Registered mode selections used when resolveTheme() receives no override. */
+type NativeDefaultModes = Record<string, string>;
 interface NativeFontAssetMember {
   /** Font-family value React Native consumes after the font is installed. */
   postscriptName: string;
@@ -43,9 +65,10 @@ interface SerializedNativeConfig {
   platform: 'native';
   builtAt?: string;
   namespace?: string;
-  modes?: Record<string, ModeDefinition>;
+  defaultModes?: NativeDefaultModes;
+  modes?: Record<string, NativeModeDefinition>;
   tokenGroups?: Record<string, NativeTokenGroupDefinition>;
   assetGroups?: Record<string, NativeAssetGroupDefinition>;
 }
 //#endregion
-export { NativeAssetGroupDefinition, NativeColorExpression, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig };
+export { ModeDefinition, NativeAppearanceModeOption, NativeAssetGroupDefinition, NativeColorExpression, NativeDefaultModes, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeModeDefinition, NativeModeOptionDefinition, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, NativeViewportModeOption, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig };

package/dist/native/validation.d.ts

@@ -1,7 +1,7 @@
 import { ConfigDiagnostic } from "../config-diagnostics.js";
 
 //#region src/native/validation.d.ts
-type NativeConfigDiagnosticCode = 'INVALID_SCHEMA' | 'UNSUPPORTED_SCHEMA_VERSION' | 'PLATFORM_MISMATCH' | 'INVALID_NAMESPACE' | 'INVALID_NATIVE_VALUE' | 'UNSUPPORTED_NATIVE_FIELD' | 'INCOMPLETE_OS_VALUE' | 'NESTED_OS_VALUE' | 'INVALID_REFERENCE' | 'UNRESOLVED_TOKEN_REFERENCE' | 'TOKEN_REFERENCE_CYCLE' | 'UNRESOLVED_ASSET_REFERENCE' | 'UNOWNED_MODIFIER' | 'UNSUPPORTED_COLOR_EXPRESSION';
+type NativeConfigDiagnosticCode = 'INVALID_SCHEMA' | 'UNSUPPORTED_SCHEMA_VERSION' | 'PLATFORM_MISMATCH' | 'INVALID_NAMESPACE' | 'INVALID_NATIVE_VALUE' | 'UNSUPPORTED_NATIVE_FIELD' | 'INCOMPLETE_OS_VALUE' | 'NESTED_OS_VALUE' | 'INVALID_REFERENCE' | 'UNRESOLVED_TOKEN_REFERENCE' | 'TOKEN_REFERENCE_CYCLE' | 'UNRESOLVED_ASSET_REFERENCE' | 'UNOWNED_MODIFIER' | 'DUPLICATE_MODIFIER' | 'INVALID_DEFAULT_MODE' | 'INVALID_MODE_CONDITION' | 'INVALID_MODE_COMBINATION' | 'UNSUPPORTED_COLOR_EXPRESSION';
 type NativeConfigDiagnostic = ConfigDiagnostic<NativeConfigDiagnosticCode>;
 declare function validateSerializedNativeConfig(input: unknown, expectedSchemaVersion?: number): NativeConfigDiagnostic[];
 //#endregion

package/dist/native/validation.js

@@ -1,5 +1,6 @@
 import { isAssetRef, isTokenRef } from "../refs.js";
 import { isMixExpr } from "../colorExpressions.js";
+import { createModeBackedModifierLookup, modifierTreeToOverrideRows, resolveOverrideRow } from "../token-override-rows.js";
 import { isOperatingSystemValue } from "./values.js";
 //#region src/native/validation.ts
 const TOP_LEVEL_KEYS = new Set([
@@ -7,6 +8,7 @@ const TOP_LEVEL_KEYS = new Set([
 	"platform",
 	"builtAt",
 	"namespace",
+	"defaultModes",
 	"modes",
 	"tokenGroups",
 	"assetGroups"
@@ -27,9 +29,12 @@ const MODE_OPTION_KEYS = new Set([
 	"modifier",
 	"label",
 	"description",
+	"appearance",
+	"minWidth",
 	"css",
 	"media"
 ]);
+const APPEARANCES = new Set(["light", "dark"]);
 const OS_KEYS = new Set([
 	"__kind",
 	"default",
@@ -54,7 +59,7 @@ const COLOR_SPACES = new Set([
 	"hsl",
 	"hwb"
 ]);
-function validateSerializedNativeConfig(input, expectedSchemaVersion = 1) {
+function validateSerializedNativeConfig(input, expectedSchemaVersion = 2) {
 	const diagnostics = [];
 	const configDefinition = { kind: "config" };
 	if (!isRecord(input)) {
@@ -67,6 +72,7 @@ function validateSerializedNativeConfig(input, expectedSchemaVersion = 1) {
 	if (input.builtAt !== void 0 && typeof input.builtAt !== "string") push(diagnostics, "INVALID_SCHEMA", ["builtAt"], configDefinition, "builtAt must be a string when present.");
 	validateNamespace(input.namespace, diagnostics);
 	validateModes(input.modes, diagnostics);
+	validateDefaultModes(input.defaultModes, input.modes, diagnostics);
 	validateAssetGroups(input.assetGroups, diagnostics);
 	validateTokenGroups(input.tokenGroups, diagnostics);
 	validateReferences(input, diagnostics);
@@ -83,6 +89,8 @@ function validateModes(value, diagnostics) {
 		push(diagnostics, "INVALID_SCHEMA", ["modes"], { kind: "config" }, "modes must be a record.");
 		return;
 	}
+	const kindOwners = /* @__PURE__ */ new Map();
+	const modifierOwners = /* @__PURE__ */ new Map();
 	for (const [modeName, options] of Object.entries(value)) {
 		const definition = {
 			kind: "mode",
@@ -93,6 +101,9 @@ function validateModes(value, diagnostics) {
 			push(diagnostics, "INVALID_SCHEMA", modePath, definition, `Mode "${modeName}" must be an option record.`);
 			continue;
 		}
+		if (Object.keys(options).length === 0) push(diagnostics, "INVALID_MODE_CONDITION", modePath, definition, `Native mode "${modeName}" must define at least one appearance or viewport option.`);
+		let modeKind;
+		const conditionValues = /* @__PURE__ */ new Map();
 		for (const [optionName, option] of Object.entries(options)) {
 			const optionPath = [...modePath, optionName];
 			if (!isRecord(option)) {
@@ -105,10 +116,61 @@ function validateModes(value, diagnostics) {
 				"label",
 				"description"
 			]) if (option[key] !== void 0 && typeof option[key] !== "string") push(diagnostics, "INVALID_SCHEMA", [...optionPath, key], definition, `${key} must be a string when present.`);
+			if (typeof option.modifier === "string" && !option.modifier.startsWith("_")) push(diagnostics, "INVALID_SCHEMA", [...optionPath, "modifier"], definition, "Native mode modifiers must start with \"_\".");
 			for (const key of ["css", "media"]) if (option[key] !== void 0) push(diagnostics, "UNSUPPORTED_NATIVE_FIELD", [...optionPath, key], definition, `Mode option field "${key}" is web-only and is not supported by NativeConfig.`);
+			const hasAppearance = option.appearance !== void 0;
+			if (hasAppearance === (option.minWidth !== void 0)) {
+				push(diagnostics, "INVALID_MODE_CONDITION", optionPath, definition, `Native mode option "${modeName}/${optionName}" must define exactly one condition: appearance or minWidth.`);
+				continue;
+			}
+			const optionKind = hasAppearance ? "appearance" : "viewport";
+			if (modeKind !== void 0 && modeKind !== optionKind) push(diagnostics, "INVALID_MODE_CONDITION", optionPath, definition, `Native mode "${modeName}" cannot mix appearance and viewport options.`);
+			else modeKind = optionKind;
+			let conditionValue;
+			if (hasAppearance) if (typeof option.appearance !== "string" || !APPEARANCES.has(option.appearance)) push(diagnostics, "INVALID_MODE_CONDITION", [...optionPath, "appearance"], definition, "Native appearance must be \"light\" or \"dark\".");
+			else conditionValue = option.appearance;
+			else if (typeof option.minWidth !== "number" || !Number.isFinite(option.minWidth) || option.minWidth < 0) push(diagnostics, "INVALID_MODE_CONDITION", [...optionPath, "minWidth"], definition, "Native minWidth must be a finite, non-negative number.");
+			else conditionValue = option.minWidth;
+			if (conditionValue !== void 0) {
+				const previous = conditionValues.get(conditionValue);
+				if (previous !== void 0) push(diagnostics, "INVALID_MODE_CONDITION", optionPath, definition, `Native mode options "${modeName}/${previous}" and "${modeName}/${optionName}" describe the same condition.`);
+				else conditionValues.set(conditionValue, optionName);
+			}
+			const modifier = typeof option.modifier === "string" ? option.modifier : `_${optionName}`;
+			const previousModifierOwner = modifierOwners.get(modifier);
+			if (previousModifierOwner !== void 0) push(diagnostics, "DUPLICATE_MODIFIER", [...optionPath, "modifier"], definition, `Modifier "${modifier}" is already owned by mode option "${previousModifierOwner}".`);
+			else modifierOwners.set(modifier, `${modeName}/${optionName}`);
+		}
+		if (modeKind !== void 0) {
+			const previousKindOwner = kindOwners.get(modeKind);
+			if (previousKindOwner !== void 0) push(diagnostics, "INVALID_MODE_CONDITION", modePath, definition, `Native ${modeKind} conditions are already registered by mode "${previousKindOwner}".`);
+			else kindOwners.set(modeKind, modeName);
 		}
 	}
 }
+function validateDefaultModes(value, modes, diagnostics) {
+	if (value === void 0) return;
+	if (!isRecord(value)) {
+		push(diagnostics, "INVALID_DEFAULT_MODE", ["defaultModes"], { kind: "config" }, "defaultModes must be a record of registered mode selections.");
+		return;
+	}
+	const registeredModes = isRecord(modes) ? modes : {};
+	for (const [modeName, optionName] of Object.entries(value)) {
+		const path = ["defaultModes", modeName];
+		const options = registeredModes[modeName];
+		if (!isRecord(options)) {
+			push(diagnostics, "INVALID_DEFAULT_MODE", path, {
+				kind: "mode",
+				name: modeName
+			}, `Default mode "${modeName}" is not registered.`);
+			continue;
+		}
+		if (typeof optionName !== "string" || !isRecord(options[optionName])) push(diagnostics, "INVALID_DEFAULT_MODE", path, {
+			kind: "mode",
+			name: modeName
+		}, `Default mode "${modeName}" must select a registered option.`);
+	}
+}
 function validateAssetGroups(value, diagnostics) {
 	if (value === void 0) return;
 	if (!isRecord(value)) {
@@ -180,10 +242,10 @@ function validateTokenGroups(value, diagnostics) {
 		], {
 			kind: "token",
 			name: `${groupName}/${tokenName}`
-		}, diagnostics, true);
+		}, diagnostics);
 	}
 }
-function validateTokenDefinition(value, path, definition, diagnostics, allowModifiers) {
+function validateTokenDefinition(value, path, definition, diagnostics) {
 	if (!isRecord(value)) {
 		push(diagnostics, "INVALID_SCHEMA", path, definition, `Native token "${definition.name ?? ""}" must be an object.`);
 		return;
@@ -198,8 +260,7 @@ function validateTokenDefinition(value, path, definition, diagnostics, allowModi
 			push(diagnostics, "INVALID_SCHEMA", [...path, key], definition, `Unknown token definition field "${key}"; modifier fields must start with "_".`);
 			continue;
 		}
-		if (!allowModifiers) push(diagnostics, "UNSUPPORTED_NATIVE_FIELD", [...path, key], definition, "Compound native token modifiers are completed by the production modes work; this config cannot emit them yet.");
-		if (looksLikeTokenDefinition(modifier)) validateTokenDefinition(modifier, [...path, key], definition, diagnostics, false);
+		if (looksLikeTokenDefinition(modifier)) validateTokenDefinition(modifier, [...path, key], definition, diagnostics);
 		else validateNativeValue(modifier, [...path, key], definition, diagnostics, true);
 	}
 }
@@ -305,15 +366,14 @@ function validateReferences(config, diagnostics) {
 		}
 	}
 	const assets = isRecord(config.assetGroups) ? config.assetGroups : {};
-	const modifiers = /* @__PURE__ */ new Set();
-	for (const { definition } of tokens.values()) for (const key of Object.keys(definition)) if (key.startsWith("_")) modifiers.add(key);
-	const contexts = [void 0, ...modifiers];
+	const modifierLookup = createNativeModifierLookup(config.modes);
+	const contexts = buildModifierContexts(config.modes);
 	for (const [tokenRef, token] of tokens) {
 		collectAllReferences(token.definition, token.path, {
 			kind: "token",
 			name: tokenRef
 		}, tokens, assets, diagnostics);
-		for (const modifier of contexts) resolveTokenContext(tokenRef, modifier, tokens, diagnostics, [], token.path);
+		for (const modifiers of contexts) resolveTokenContext(tokenRef, modifiers, modifierLookup, tokens, diagnostics, [], token.path);
 	}
 }
 function collectAllReferences(value, path, definition, tokens, assets, diagnostics) {
@@ -330,7 +390,7 @@ function collectAllReferences(value, path, definition, tokens, assets, diagnosti
 		if (!groupName || !memberName || !group || group.assetKind !== "font" || !isRecord(group.members) || !group.members[memberName]) push(diagnostics, "UNRESOLVED_ASSET_REFERENCE", entryPath, definition, `Asset reference "${entry.ref}" does not resolve to a registered native font asset.`);
 	});
 }
-function resolveTokenContext(ref, modifier, tokens, diagnostics, stack, sourcePath) {
+function resolveTokenContext(ref, activeModes, modifierLookup, tokens, diagnostics, stack, sourcePath) {
 	if (stack.includes(ref)) {
 		const cycle = [...stack.slice(stack.indexOf(ref)), ref].join(" -> ");
 		push(diagnostics, "TOKEN_REFERENCE_CYCLE", sourcePath, {
@@ -341,38 +401,62 @@ function resolveTokenContext(ref, modifier, tokens, diagnostics, stack, sourcePa
 	}
 	const token = tokens.get(ref);
 	if (!token) return;
-	const selected = selectTokenValue(token.definition, token.path, modifier);
+	const selected = selectTokenValue(token.definition, token.path, activeModes, modifierLookup);
 	const nextStack = [...stack, ref];
 	walkValues(selected.value, selected.path, (entry, entryPath) => {
-		if (isTokenRef(entry) && typeof entry.ref === "string") resolveTokenContext(entry.ref, modifier, tokens, diagnostics, nextStack, entryPath);
+		if (isTokenRef(entry) && typeof entry.ref === "string") resolveTokenContext(entry.ref, activeModes, modifierLookup, tokens, diagnostics, nextStack, entryPath);
 	});
 }
-function selectTokenValue(definition, path, modifier) {
-	const override = modifier ? definition[modifier] : void 0;
-	if (override === void 0) return {
+function selectTokenValue(definition, path, activeModes, modifierLookup) {
+	const selected = resolveOverrideRow(modifierTreeToOverrideRows(definition, modifierLookup), activeModes);
+	if (!selected) return {
 		value: definition.value,
 		path: [...path, "value"]
 	};
-	if (looksLikeTokenDefinition(override)) return {
-		value: override.value,
+	let source = definition;
+	for (const modifier of selected.sourceModifierPath) source = source[modifier];
+	return {
+		value: selected.value,
 		path: [
 			...path,
-			modifier,
-			"value"
+			...selected.sourceModifierPath,
+			...looksLikeTokenDefinition(source) ? ["value"] : []
 		]
 	};
-	return {
-		value: override,
-		path: [...path, modifier]
-	};
+}
+function buildModifierContexts(modes) {
+	let contexts = [/* @__PURE__ */ new Set()];
+	for (const [modeName, options] of Object.entries(modes ?? {})) {
+		if (!isRecord(options)) continue;
+		const modeRefs = Object.entries(options).filter((entry) => isRecord(entry[1])).map(([optionName]) => `${modeName}.${optionName}`);
+		contexts = contexts.flatMap((context) => [context, ...modeRefs.map((modeRef) => new Set([...context, modeRef]))]);
+	}
+	return contexts;
+}
+function createNativeModifierLookup(modes) {
+	return createModeBackedModifierLookup(Object.entries(modes ?? {}).flatMap(([modeName, options], modeOrder) => {
+		if (!isRecord(options)) return [];
+		return Object.entries(options).flatMap(([optionName, option], optionOrder) => {
+			if (!isRecord(option)) return [];
+			return [{
+				modifier: typeof option.modifier === "string" ? option.modifier : `_${optionName}`,
+				mode: modeName,
+				option: optionName,
+				label: typeof option.label === "string" ? option.label : void 0,
+				modeOrder,
+				optionOrder
+			}];
+		});
+	}));
 }
 function validateModifierOwnership(config, diagnostics) {
-	const owned = /* @__PURE__ */ new Set();
-	if (isRecord(config.modes)) for (const options of Object.values(config.modes)) {
+	const owners = /* @__PURE__ */ new Map();
+	if (isRecord(config.modes)) for (const [modeName, options] of Object.entries(config.modes)) {
 		if (!isRecord(options)) continue;
 		for (const [optionName, option] of Object.entries(options)) {
 			if (!isRecord(option)) continue;
-			owned.add(typeof option.modifier === "string" ? option.modifier : `_${optionName}`);
+			const modifier = typeof option.modifier === "string" ? option.modifier : `_${optionName}`;
+			if (!owners.has(modifier)) owners.set(modifier, modeName);
 		}
 	}
 	if (!isRecord(config.tokenGroups)) return;
@@ -380,20 +464,29 @@ function validateModifierOwnership(config, diagnostics) {
 		if (!isRecord(group) || !isRecord(group.tokens)) continue;
 		for (const [tokenName, definition] of Object.entries(group.tokens)) {
 			if (!isRecord(definition)) continue;
-			for (const key of Object.keys(definition)) {
-				if (!key.startsWith("_") || owned.has(key)) continue;
-				push(diagnostics, "UNOWNED_MODIFIER", [
-					"tokenGroups",
-					groupName,
-					"tokens",
-					tokenName,
-					key
-				], {
-					kind: "token",
-					name: `${groupName}/${tokenName}`
-				}, `Modifier "${key}" is not owned by a registered mode option.`);
-			}
+			validateDefinitionModifiers(definition, [
+				"tokenGroups",
+				groupName,
+				"tokens",
+				tokenName
+			], {
+				kind: "token",
+				name: `${groupName}/${tokenName}`
+			}, owners, /* @__PURE__ */ new Set(), diagnostics);
+		}
+	}
+}
+function validateDefinitionModifiers(definition, path, tokenDefinition, owners, activeModeGroups, diagnostics) {
+	for (const [modifier, value] of Object.entries(definition)) {
+		if (!modifier.startsWith("_")) continue;
+		const modifierPath = [...path, modifier];
+		const owner = owners.get(modifier);
+		if (owner === void 0) {
+			push(diagnostics, "UNOWNED_MODIFIER", modifierPath, tokenDefinition, `Modifier "${modifier}" is not owned by a registered mode option.`);
+			continue;
 		}
+		if (activeModeGroups.has(owner)) push(diagnostics, "INVALID_MODE_COMBINATION", modifierPath, tokenDefinition, `Compound native token overrides cannot select more than one option from mode "${owner}".`);
+		if (looksLikeTokenDefinition(value)) validateDefinitionModifiers(value, modifierPath, tokenDefinition, owners, new Set([...activeModeGroups, owner]), diagnostics);
 	}
 }
 function walkValues(value, path, visit) {

package/dist/native.d.ts

@@ -1,11 +1,11 @@
 import { AssetRef, TokenRef, asset, token } from "./refs.js";
 import { ColorSpace, MixExpr, alpha, mix } from "./colorExpressions.js";
-import { ModeDefinition, SystemLink, TokenType } from "./types.js";
-import { defineMode } from "./factories.js";
-import { NativeAssetGroupDefinition, NativeColorExpression, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig } from "./native/types.js";
+import { SystemLink, TokenType } from "./types.js";
+import { ModeDefinition, NativeAppearanceModeOption, NativeAssetGroupDefinition, NativeColorExpression, NativeDefaultModes, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeModeDefinition, NativeModeOptionDefinition, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, NativeViewportModeOption, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig } from "./native/types.js";
 import { NativeAssetGroupBuilder, NativeFontAssetGroupConfig, defineAssetGroup } from "./native/assets.js";
+import { defineMode } from "./native/modes.js";
 import { NativeConfigDiagnostic, NativeConfigDiagnosticCode, validateSerializedNativeConfig } from "./native/validation.js";
 import { NativeConfig, NativeConfigValidationError } from "./native/NativeConfig.js";
 import { isOperatingSystemValue, operatingSystem } from "./native/values.js";
 import { DefinedNativeTokenGroup, defineTokenGroup } from "./native/index.js";
-export { AssetRef, ColorSpace, DefinedNativeTokenGroup, MixExpr, ModeDefinition, NativeAssetGroupBuilder, NativeAssetGroupDefinition, NativeColorExpression, NativeConfig, NativeConfigDiagnostic, NativeConfigDiagnosticCode, NativeConfigValidationError, NativeFontAssetGroupConfig, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig, SystemLink, TokenRef, TokenType, alpha, asset, defineAssetGroup, defineMode, defineTokenGroup, isOperatingSystemValue, mix, operatingSystem, token, validateSerializedNativeConfig };
+export { AssetRef, ColorSpace, DefinedNativeTokenGroup, MixExpr, ModeDefinition, NativeAppearanceModeOption, NativeAssetGroupBuilder, NativeAssetGroupDefinition, NativeColorExpression, NativeConfig, NativeConfigDiagnostic, NativeConfigDiagnosticCode, NativeConfigValidationError, NativeDefaultModes, NativeFontAssetGroupConfig, NativeFontAssetGroupDefinition, NativeFontAssetMember, NativeLiteral, NativeModeDefinition, NativeModeOptionDefinition, NativeSelectableValue, NativeTokenDefinition, NativeTokenGroupDefinition, NativeTokenValue, NativeViewportModeOption, OperatingSystemInput, OperatingSystemValue, SerializedNativeConfig, SystemLink, TokenRef, TokenType, alpha, asset, defineAssetGroup, defineMode, defineTokenGroup, isOperatingSystemValue, mix, operatingSystem, token, validateSerializedNativeConfig };

package/dist/native.js

@@ -1,7 +1,7 @@
 import { asset, token } from "./refs.js";
 import { alpha, mix } from "./colorExpressions.js";
-import { defineMode } from "./factories.js";
 import { defineAssetGroup } from "./native/assets.js";
+import { defineMode } from "./native/modes.js";
 import { isOperatingSystemValue, operatingSystem } from "./native/values.js";
 import { validateSerializedNativeConfig } from "./native/validation.js";
 import { NativeConfig, NativeConfigValidationError } from "./native/NativeConfig.js";

package/dist/token-override-rows.d.ts

@@ -51,6 +51,8 @@ declare function buildModeBackedModifierLookup(modes: readonly ModeBackedModeMet
 declare function modifierTreeToOverrideRows<TValue>(modifiers: ModifierTree<TValue> | undefined, lookup: ModeBackedModifierLookup): OverrideRow<TValue>[];
 declare function overrideRowsToModifierTree<TValue>(rows: readonly OverrideRow<TValue>[], lookup: ModeBackedModifierLookup): ModifierTree<TValue>;
 declare function resolveOverrideRowValue<TValue>(baseValue: TValue, rows: readonly Pick<OverrideRow<TValue>, 'modes' | 'value'>[], activeModes: Iterable<OverrideModeRef>): TValue;
+/** Return the winning authored row using shared specificity/order semantics. */
+declare function resolveOverrideRow<TRow extends Pick<OverrideRow<unknown>, 'modes' | 'value'>>(rows: readonly TRow[], activeModes: Iterable<OverrideModeRef>): TRow | undefined;
 declare function modifierPathToId(path: readonly TokenModifierKey[]): string;
 declare function modifierIdToPath(id: string): TokenModifierKey[];
 declare function buildNestedModifierUpdate<TValue>(modifierPath: readonly TokenModifierKey[], value: ModifierUpdateValue<TValue>): Record<TokenModifierKey, ModifierUpdateValue<TValue>>;
@@ -63,4 +65,4 @@ declare function buildNestedModifierUpdate<TValue>(modifierPath: readonly TokenM
  */
 declare function mergeModifierUpdates<TValue>(...updates: readonly ModifierUpdate<TValue>[]): Record<string, ModifierUpdateValue<TValue>>;
 //#endregion
-export { ModeBackedModifierDefinition, ModeBackedModifierInput, ModeBackedModifierLookup, OverrideModeRef, OverrideRow, buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRowValue };
+export { ModeBackedModifierDefinition, ModeBackedModifierInput, ModeBackedModifierLookup, ModifierTree, OverrideModeRef, OverrideRow, buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRow, resolveOverrideRowValue };

package/dist/token-override-rows.js

@@ -45,7 +45,7 @@ function modifierTreeToOverrideRows(modifiers, lookup) {
 	const rows = [];
 	let sourceOrder = 0;
 	const visit = (value, modifierPath) => {
-		const node = asModifierNode(value);
+		const node = asModeModifierNode(value);
 		const modes = canonicalizeModifierPath(modifierPath, lookup);
 		if (!node) {
 			rows.push({
@@ -89,8 +89,13 @@ function overrideRowsToModifierTree(rows, lookup) {
 	return tree;
 }
 function resolveOverrideRowValue(baseValue, rows, activeModes) {
+	const resolved = resolveOverrideRow(rows, activeModes);
+	return resolved === void 0 ? baseValue : resolved.value;
+}
+/** Return the winning authored row using shared specificity/order semantics. */
+function resolveOverrideRow(rows, activeModes) {
 	const active = new Set(activeModes);
-	let resolved = baseValue;
+	let resolved;
 	let bestSpecificity = -1;
 	let bestOrder = -1;
 	rows.forEach((row, order) => {
@@ -98,7 +103,7 @@ function resolveOverrideRowValue(baseValue, rows, activeModes) {
 		const specificity = row.modes.length;
 		if (specificity < bestSpecificity) return;
 		if (specificity === bestSpecificity && order < bestOrder) return;
-		resolved = row.value;
+		resolved = row;
 		bestSpecificity = specificity;
 		bestOrder = order;
 	});
@@ -191,6 +196,11 @@ function mergeLeafValue(current, value) {
 		value
 	};
 }
+function asModeModifierNode(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
+	if (Object.hasOwn(value, "__kind")) return null;
+	return asModifierNode(value);
+}
 function asWritableModifierNode(current) {
 	const node = asModifierNode(current);
 	if (node) return { ...node };
@@ -220,4 +230,4 @@ function compareModeBackedModifiersByRef(a, b, lookup) {
 	return a.localeCompare(b);
 }
 //#endregion
-export { buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRowValue };
+export { buildModeBackedModifierLookup, buildNestedModifierUpdate, createModeBackedModifierLookup, mergeModifierUpdates, modifierIdToPath, modifierPathToId, modifierTreeToOverrideRows, overrideRowsToModifierTree, resolveOverrideRow, resolveOverrideRowValue };