@astryxdesign/core 0.6.2 → 0.6.3-canary.039a67e

package/dist/theme/generateThemeRules.js

@@ -6,14 +6,22 @@
  * Shared logic for generating CSS rules from a resolved theme definition,
  * including one component-leaf lowering path for root, adaptation, and
  * media-surface values plus condition-correct Heading weight precedence guards.
+ * Built adaptation metadata resolves against the same root component defaults
+ * as defineTheme, so scale-only rules do not reset authored component styles.
  * Used by both the runtime path (Theme injects <style>) and the build
  * path (`astryx theme build` pre-compiles to CSS files).
  *
+ * Every consumer-supplied declaration is checked by declarationBoundary.ts
+ * before it is emitted, so a value can never end its declaration or rule
+ * early. A refused declaration is dropped and reported in the supplied
+ * warnings array (build receipts), or through `console.warn` (runtime).
+ *
  * Extracted from defineTheme.ts to reduce cyclomatic complexity and provide
  * a clear single-responsibility module for CSS generation.
  *
- * @input DefinedTheme (resolved theme object from defineTheme)
- * @output CSS rule strings, split by layer (component vs prose)
+ * @input DefinedTheme (resolved theme object from defineTheme), optional warnings array
+ * @output CSS rule strings, split by layer (component vs prose), and warning text
+ *   for each dropped declaration
  * @position packages/core/src/theme/generateThemeRules.ts
  */
 
@@ -22,6 +30,7 @@ import { parseStyleKey } from "../utils/parseStyleKey.js";
 import { getDerivedVars } from "./derivedVarRegistry.js";
 import { dataTokenDefaults } from "./domainTokens/dataTokens.js";
 import { cssVar, classPrefix, dataAttrNamespace } from "../naming.js";
+import { checkDeclarationName, checkDeclarationValue } from "./declarationBoundary.js";
 
 /**
  * Theme @scope selectors.
@@ -284,6 +293,77 @@ function expandContainerPadding(component, parsed, resetInheritedSpecificity = f
   return tokens;
 }
 
+// =============================================================================
+// Declaration assembly: a declaration always stays one declaration
+// =============================================================================
+
+const warnToConsole = message => {
+  console.warn(`[astryx theme] ${message}`);
+};
+
+/** Build receipts collect warning text; runtime callers warn by default. */
+function diagnosticSink(warnings) {
+  return warnings ? message => warnings.push(message) : warnToConsole;
+}
+
+/** Shorten an authored value for a one-line message. */
+function previewValue(value) {
+  const oneLine = JSON.stringify(value);
+  return oneLine.length > 80 ? `${oneLine.slice(0, 77)}..."` : oneLine;
+}
+function reportDrop(sink, property, value, location, reason) {
+  sink(`dropped "${property}" in ${location}: ${reason} (value: ${previewValue(value)})`);
+}
+
+/**
+ * True when `name: value;` stays exactly one declaration; otherwise reports
+ * the drop and returns false. Both checks follow CSS syntax, so valid CSS a
+ * browser keeps inside one declaration (a `data:` URI, `Gill\ Sans`, a closed
+ * comment, a vendor-prefixed property) is never refused; see
+ * declarationBoundary.ts for the rules.
+ */
+function acceptDeclaration(property, value, location, sink) {
+  const reason = checkDeclarationName(property) ?? checkDeclarationValue(value);
+  if (reason === null) {
+    return true;
+  }
+  reportDrop(sink, property, value, location, reason);
+  return false;
+}
+
+/**
+ * Assemble `prop: value;` lines, dropping (and reporting) any entry whose
+ * property or value could not stay a single declaration. Theme definitions
+ * are code, but apps do assemble them from stored input (brand colors,
+ * white-labeling), so the generated stylesheet must never extend beyond the
+ * declarations it means to emit.
+ */
+function joinDeclarations(entries, location, sink, mapProp = p => p) {
+  const lines = [];
+  for (const [rawProp, rawValue] of entries) {
+    // Legacy unenrolled tokens retain non-string values. Scan the same text
+    // interpolation has always emitted, without changing the normalized theme.
+    const value = `${rawValue}`;
+    const prop = mapProp(rawProp);
+    if (acceptDeclaration(prop, value, location, sink)) {
+      lines.push(`    ${prop}: ${value};`);
+    }
+  }
+  return lines.join('\n');
+}
+
+/** The `:scope` token block for portable and theme-local token values. */
+function tokenBlock(source, location, sink) {
+  const declarations = [joinDeclarations(Object.entries(source.tokens), `${location}tokens`, sink), joinDeclarations(Object.entries(source.localTokens ?? {}), `${location}localTokens`, sink)].filter(block => block.length > 0).join('\n');
+  const hasEntries = Object.keys(source.tokens).length > 0 || Object.keys(source.localTokens ?? {}).length > 0;
+  return hasEntries ? `  :scope {\n${declarations}\n  }` : null;
+}
+
+/** `components.button["variant:secondary"]`-style location for a rule. */
+function componentLocation(prefix, component, key) {
+  return `${prefix}components.${component}[${JSON.stringify(key)}]`;
+}
+
 // =============================================================================
 // Public API
 // =============================================================================
@@ -303,9 +383,9 @@ function expandContainerPadding(component, parsed, resetInheritedSpecificity = f
  * lost for every conditional rule, with no type error to catch it.
  */
 
-export function generateThemeRules(theme) {
+export function generateThemeRules(theme, warnings) {
   const parts = [];
-  const tokens = theme.tokens;
+  const sink = diagnosticSink(warnings);
 
   // Bare prose rules reference semantic variables instead of baking the root
   // value. That lets adaptation token writes take effect through CSS alone
@@ -313,16 +393,27 @@ export function generateThemeRules(theme) {
   const val = key => `var(${key})`;
 
   // 1. Token block — CSS custom properties on :scope
-  const tokenEntries = [...Object.entries(tokens), ...Object.entries(theme.localTokens ?? {})];
-  if (tokenEntries.length > 0) {
-    const declarations = tokenEntries.map(([prop, value]) => `    ${prop}: ${value};`).join('\n');
-    parts.push(`  :scope {\n${declarations}\n  }`);
+  const tokenRules = tokenBlock(theme, '', sink);
+  if (tokenRules !== null) {
+    parts.push(tokenRules);
+  }
+
+  // 1b. Base font — apply the theme's declared body font to the scope root.
+  // Components styled with `font-family: inherit` (SideNav items, Buttons)
+  // otherwise resolve against the browser default serif, since nothing else
+  // sets a page font. `font-family` inherits, so one rule on :scope covers
+  // the tree. Only emitted when the theme declares a body font, so a bare
+  // theme still contributes no scope rules of its own.
+  if (theme.tokens['--font-family-body']) {
+    parts.push(`  :scope {\n    font-family: var(--font-family-body);\n  }`);
   }
 
   // 2. Component overrides: stable .astryx-* target classes combined with
   // reflected data-* selectors for visual props and runtime states.
   if (theme.components) {
-    generateComponentRules(theme.components, parts);
+    generateComponentRules(theme.components, parts, {
+      sink
+    });
   }
 
   // 3. Prose HTML element rules (h1-h6, p, small, code, hr)
@@ -386,13 +477,21 @@ function generateHeadingWeightOverrides(components, parts, {
     parts.push(`  ${selector} { font-weight: ${effectiveWeight}; }`);
   }
 }
+
+/**
+ * The `fontWeight` a heading rule authors for `styleKey`, or undefined when
+ * it has none. A value that cannot stay one declaration is treated as not
+ * authored, so the override falls back to the inherited or token weight
+ * instead of interpolating it; the drop itself is reported where that same
+ * rule's declarations are emitted, so it is not reported twice here.
+ */
 function getAuthoredHeadingWeight(headingRuleMap, styleKey) {
   const rule = headingRuleMap[styleKey];
   if (rule == null || typeof rule !== 'object' || Array.isArray(rule)) {
     return undefined;
   }
   const fontWeight = rule.fontWeight;
-  return typeof fontWeight === 'string' ? fontWeight : undefined;
+  return typeof fontWeight === 'string' && checkDeclarationValue(fontWeight) === null ? fontWeight : undefined;
 }
 
 /** Options shared by root, adaptation, and media-surface component lowering. */
@@ -404,7 +503,9 @@ function getAuthoredHeadingWeight(headingRuleMap, styleKey) {
  */
 function generateComponentRules(components, parts, {
   resetInheritedPaddingSpecificity = false,
-  surface
+  surface,
+  sink = warnToConsole,
+  location: locationPrefix = ''
 } = {}) {
   for (const [component, rules] of Object.entries(components)) {
     for (const [key, styles] of Object.entries(rules)) {
@@ -414,6 +515,7 @@ function generateComponentRules(components, parts, {
       }
       const suffix = parseStyleKey(key);
       const baseSelector = componentSelector(component, suffix, surface);
+      const location = componentLocation(locationPrefix, component, key);
 
       // Separate regular properties from pseudo-class overrides
       const props = [];
@@ -421,7 +523,7 @@ function generateComponentRules(components, parts, {
       for (const [prop, value] of entries) {
         if (prop.startsWith(':') && typeof value === 'object') {
           pseudos.push([prop, value]);
-        } else {
+        } else if (acceptDeclaration(toKebabCase(prop), `${value}`, location, sink)) {
           props.push([prop, value]);
         }
       }
@@ -483,7 +585,7 @@ function generateComponentRules(components, parts, {
 
       // Emit base rule
       if (finalProps.length > 0) {
-        const declarations = finalProps.map(([prop, value]) => `    ${toKebabCase(prop)}: ${value};`).join('\n');
+        const declarations = joinDeclarations(finalProps, location, sink, toKebabCase);
         parts.push(`  ${baseSelector} {\n${declarations}\n  }`);
       }
 
@@ -491,7 +593,7 @@ function generateComponentRules(components, parts, {
       for (const [pseudo, pseudoStyles] of pseudos) {
         const pseudoEntries = Object.entries(pseudoStyles);
         if (pseudoEntries.length > 0) {
-          const declarations = pseudoEntries.map(([prop, value]) => `    ${toKebabCase(prop)}: ${value};`).join('\n');
+          const declarations = joinDeclarations(pseudoEntries, `${location}[${JSON.stringify(pseudo)}]`, sink, toKebabCase);
           parts.push(`  ${appendPseudoToSelectorList(baseSelector, pseudo)} {\n${declarations}\n  }`);
         }
       }
@@ -629,8 +731,8 @@ function generateSizeOverrides(components, parts, surface) {
  * Component rules (tokens, stable .astryx-* targets plus data-* selectors) are
  * that need to beat StyleX — they stay in astryx-theme (above StyleX layers).
  */
-export function generateThemeRulesSplit(theme) {
-  const allRules = generateThemeRules(theme);
+export function generateThemeRulesSplit(theme, warnings) {
+  const allRules = generateThemeRules(theme, warnings);
   const prose = [];
   const component = [];
   for (const rule of allRules) {
@@ -654,19 +756,21 @@ export function generateThemeRulesSplit(theme) {
  * to media contexts — only tokens change. Themes can further customize
  * via onDark.components / onLight.components.
  */
-export function generateOnMediaCSS(theme) {
+export function generateOnMediaCSS(theme, warnings) {
   const parts = [];
   const scopeSelector = themeScopeStart(theme.name);
+  const sink = diagnosticSink(warnings);
   for (const surface of ['dark', 'light']) {
     const onMedia = surface === 'dark' ? theme.__onDark : theme.__onLight;
     if (!onMedia) {
       continue;
     }
+    const location = surface === 'dark' ? 'onDark.' : 'onLight.';
 
     // Token overrides
     const tokenEntries = Object.entries(onMedia.tokens);
     if (tokenEntries.length > 0) {
-      const declarations = tokenEntries.map(([prop, value]) => `    ${prop}: ${value};`).join('\n');
+      const declarations = joinDeclarations(tokenEntries, `${location}tokens`, sink);
       parts.push(`  ${mediaSelector(surface)} {\n${declarations}\n  }`);
     }
 
@@ -675,7 +779,9 @@ export function generateOnMediaCSS(theme) {
     if (onMedia.components) {
       generateComponentRules(onMedia.components, parts, {
         resetInheritedPaddingSpecificity: true,
-        surface
+        surface,
+        sink,
+        location
       });
       generateColorOverrides(onMedia.components, parts, surface);
       generateSizeOverrides(onMedia.components, parts, surface);
@@ -697,16 +803,17 @@ export function generateOnMediaCSS(theme) {
 }
 
 /** Generate only the declarations one adaptation rule writes. */
-function generateAdaptationRuleRules(rule) {
+function generateAdaptationRuleRules(rule, location, sink) {
   const parts = [];
-  const tokenEntries = [...Object.entries(rule.tokens), ...Object.entries(rule.localTokens ?? {})];
-  if (tokenEntries.length > 0) {
-    const declarations = tokenEntries.map(([prop, value]) => `    ${prop}: ${value};`).join('\n');
-    parts.push(`  :scope {\n${declarations}\n  }`);
+  const tokens = tokenBlock(rule, location, sink);
+  if (tokens !== null) {
+    parts.push(tokens);
   }
   if (rule.components) {
     generateComponentRules(rule.components, parts, {
-      resetInheritedPaddingSpecificity: true
+      resetInheritedPaddingSpecificity: true,
+      sink,
+      location
     });
     generateColorOverrides(rule.components, parts);
     generateSizeOverrides(rule.components, parts);
@@ -730,12 +837,13 @@ function generateAdaptationMediaBlock(query, parts, scopeSelector) {
  * rule. Bare prose follows semantic variables, so token writes need no duplicate
  * prose selectors here.
  */
-export function generateAdaptationCSS(theme) {
+export function generateAdaptationCSS(theme, warnings) {
+  const sink = diagnosticSink(warnings);
   // Built themes can reach this compiler without passing through defineTheme.
   // Validate retained metadata even when it has no rules (and therefore emits
   // no CSS): width points remain observable through AppShell and inheritance.
   const normalizedAdaptations = theme.__adaptations === undefined ? undefined : normalizeThemeAdaptations(theme.name, theme.__adaptations, undefined);
-  const rules = theme.__adaptationRules ?? (normalizedAdaptations ? resolveThemeAdaptationRules(theme.name, normalizedAdaptations, theme.__axes ?? {}, theme.tokens, theme.localTokens) : undefined);
+  const rules = theme.__adaptationRules ?? (normalizedAdaptations ? resolveThemeAdaptationRules(theme.name, normalizedAdaptations, theme.__axes ?? {}, theme.tokens, theme.localTokens, theme.components) : undefined);
   if (!rules || rules.length === 0) {
     return {
       prose: '',
@@ -751,8 +859,8 @@ export function generateAdaptationCSS(theme) {
   // active whenever the later condition matches, even if the earlier condition
   // does not. Pairwise merging cannot repair that: multiple mutually exclusive
   // earlier rules can each overlap one broad later rule.
-  for (const rule of rules) {
-    const parts = generateAdaptationRuleRules(rule);
+  for (const [index, rule] of rules.entries()) {
+    const parts = generateAdaptationRuleRules(rule, `adaptations[${index}].`, sink);
     if (parts.length === 0) {
       continue;
     }
@@ -787,9 +895,9 @@ export function generateAdaptationCSS(theme) {
   };
 }
 
-/** Indent a generated rule one level further, for nesting inside `@media`. */
+/** Indent the rule start without rewriting newlines inside authored values. */
 function indentRule(rule) {
-  return rule.split('\n').map(line => line.length > 0 ? `  ${line}` : line).join('\n');
+  return `  ${rule}`;
 }
 
 /**
@@ -828,11 +936,11 @@ export function generateDataTokenDefaultsCSS() {
  * The theme-independent `--color-data-*` defaults are not part of this output:
  * see `generateDataTokenDefaultsCSS`.
  */
-export function generateThemeCSS(theme) {
+export function generateThemeCSS(theme, warnings) {
   const {
     component,
     prose
-  } = generateThemeRulesSplit(theme);
+  } = generateThemeRulesSplit(theme, warnings);
   const scopeSelector = themeScopeStart(theme.name);
   const scopeTo = THEME_SCOPE_TO;
   let proseCss = '';
@@ -851,11 +959,11 @@ export function generateThemeCSS(theme) {
 
   // Adaptations follow the root theme in authored order. Media-surface rules
   // follow adaptations so onDark/onLight keep their specified precedence.
-  const adaptationCss = generateAdaptationCSS(theme);
+  const adaptationCss = generateAdaptationCSS(theme, warnings);
   if (adaptationCss.component) {
     componentCss = componentCss ? `${componentCss}\n\n${adaptationCss.component}` : adaptationCss.component;
   }
-  const onMediaCss = generateOnMediaCSS(theme);
+  const onMediaCss = generateOnMediaCSS(theme, warnings);
   if (onMediaCss) {
     componentCss = componentCss ? `${componentCss}\n\n${onMediaCss}` : onMediaCss;
   }

package/dist/theme/themeAdaptations.d.ts

@@ -7,8 +7,10 @@
  * Adaptations are deliberately closed and ordered. Width points are fixed names,
  * sparse rules and reserved token routing are rejected during normalization,
  * condition fields are ANDed, and rule order is the precedence model: every
- * matching rule writes after the root theme and later matching writes win. Token
- * cycles are judged only after each reachable ordered cascade is complete.
+ * matching rule writes after the root theme and later matching writes win.
+ * Invariant type-scale component defaults already declared at root are omitted;
+ * authored rule leaves and generated token writes retain their cascade order.
+ * Token cycles are judged after each reachable ordered cascade is complete.
  *
  * SYNC: When modified, update:
  * - /packages/core/src/theme/defineTheme.ts (`DefineThemeInput.adaptations`)
@@ -123,5 +125,5 @@ export declare function normalizeThemeAdaptations(themeName: string, inherited:
  */
 export declare function resolveThemeGenerativeAxes(inherited: ThemeGenerativeAxes | undefined, own: ThemeGenerativeAxes): ThemeGenerativeAxes;
 /** Lower ordered normalized rules to concrete CSS writes. */
-export declare function resolveThemeAdaptationRules(themeName: string, adaptations: NormalizedThemeAdaptations, axes: ThemeGenerativeAxes, rootTokens: Record<string, string>, rootLocalTokens: Record<string, string> | undefined): ResolvedThemeAdaptationRule[] | undefined;
+export declare function resolveThemeAdaptationRules(themeName: string, adaptations: NormalizedThemeAdaptations, axes: ThemeGenerativeAxes, rootTokens: Record<string, string>, rootLocalTokens: Record<string, string> | undefined, rootComponents?: ComponentStyleMap): ResolvedThemeAdaptationRule[] | undefined;
 //# sourceMappingURL=themeAdaptations.d.ts.map

package/dist/theme/themeAdaptations.d.ts.map

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

package/dist/theme/themeAdaptations.js

@@ -9,8 +9,10 @@
  * Adaptations are deliberately closed and ordered. Width points are fixed names,
  * sparse rules and reserved token routing are rejected during normalization,
  * condition fields are ANDed, and rule order is the precedence model: every
- * matching rule writes after the root theme and later matching writes win. Token
- * cycles are judged only after each reachable ordered cascade is complete.
+ * matching rule writes after the root theme and later matching writes win.
+ * Invariant type-scale component defaults already declared at root are omitted;
+ * authored rule leaves and generated token writes retain their cascade order.
+ * Token cycles are judged after each reachable ordered cascade is complete.
  *
  * SYNC: When modified, update:
  * - /packages/core/src/theme/defineTheme.ts (`DefineThemeInput.adaptations`)
@@ -572,13 +574,39 @@ export function resolveThemeGenerativeAxes(inherited, own) {
   };
 }
 
+/**
+ * Type-scale component generation is invariant var() wiring, not scale values.
+ * Keep root declarations (including authored pins) in the root cascade instead
+ * of resetting them in a rule that only changes tokens. Fill missing root paths
+ * for rule-only scales, and retain every authored rule leaf, even when it equals
+ * the root: that write may intentionally undo an earlier matching rule.
+ *
+ * SYNC: expandTypeScale.ts (generateTypeScaleComponents)
+ */
+function omitRootTypeScaleDefaults(resolved, root, authored) {
+  if (!resolved || !root) {
+    return resolved;
+  }
+  const components = {};
+  for (const [component, rules] of Object.entries(resolved)) {
+    for (const [key, styles] of Object.entries(rules)) {
+      const writes = Object.fromEntries(Object.entries(styles).filter(([property]) => root[component]?.[key]?.[property] === undefined || Object.hasOwn(authored?.[component]?.[key] ?? {}, property)));
+      if (Object.keys(writes).length > 0) {
+        (components[component] ??= {})[key] = writes;
+      }
+    }
+  }
+  return Object.keys(components).length > 0 ? components : undefined;
+}
+
 /** Lower ordered normalized rules to concrete CSS writes. */
-export function resolveThemeAdaptationRules(themeName, adaptations, axes, rootTokens, rootLocalTokens) {
+export function resolveThemeAdaptationRules(themeName, adaptations, axes, rootTokens, rootLocalTokens, rootComponents) {
   if (adaptations.rules.length === 0) {
     return undefined;
   }
   const resolvedRules = adaptations.rules.map((rule, index) => {
-    const resolved = resolveThemeValues(valueToThemeInput(themeName, index, rule.value, axes), undefined,
+    const input = valueToThemeInput(themeName, index, rule.value, axes);
+    const resolved = resolveThemeValues(input, undefined,
     // Authored adaptation values are a new surface with no legacy
     // acceptance to preserve, so a malformed token is rejected here rather
     // than emitted. The root path stays lenient for compatibility.
@@ -603,7 +631,7 @@ export function resolveThemeAdaptationRules(themeName, adaptations, axes, rootTo
       query: mediaQueryForCondition(themeName, index, rule.when, adaptations.widthBreakpoints),
       tokens: resolved.tokens,
       localTokens,
-      components: resolved.components
+      components: input.typography?.scale ? omitRootTypeScaleDefaults(resolved.components, rootComponents, rule.value.components) : resolved.components
     };
   });
   assertNoReachableTokenCycles(themeName, adaptations.widthBreakpoints, rootTokens, rootLocalTokens, resolvedRules);

package/dist/utils/inputPresentation.d.ts

@@ -0,0 +1,55 @@
+/**
+ * @file inputPresentation.ts
+ * @input A presentation policy, the deprecated nativePicker value, and pointer type
+ * @output The resolved picker surface for DateInput, DateTimeInput, and TimeInput
+ * @position Shared presentation vocabulary owned by spec:AST-043
+ *
+ * SYNC: When modified, update these files to stay in sync:
+ * - /docs/specs/AST-043-input-presentation/spec.md (FR1–FR3 tables)
+ * - /packages/core/src/DateInput/DateInput.tsx
+ * - /packages/core/src/DateTimeInput/DateTimeInput.tsx
+ * - /packages/core/src/TimeInput/TimeInput.tsx
+ */
+/** Picker-surface policy for date/time inputs (`spec:AST-043` FR1). */
+export type InputPresentation = 'text-input' | 'popover' | 'bottom-sheet' | 'native' | 'adaptive-bottom-sheet' | 'adaptive-native';
+/** `presentation` for components without a text-only surface: all except `TimeInput` exclude `text-input` (AST-043). */
+export type PickerPresentation = Exclude<InputPresentation, 'text-input'>;
+/** The surface a resolved `InputPresentation` actually renders. */
+export type InputPresentationSurface = 'text-input' | 'desktop' | 'sheet' | 'native';
+/** The surface a resolved `PickerPresentation` renders: one where a picker opens. */
+export type PickerPresentationSurface = Exclude<InputPresentationSurface, 'text-input'>;
+/** Deprecated picker policy (`spec:AST-043` FR3). */
+export type LegacyNativePicker = 'touch' | 'always' | 'never';
+/**
+ * Typed as the narrower policy because the default opens a picker for every
+ * component; it is still a valid `InputPresentation`.
+ */
+export declare const DEFAULT_INPUT_PRESENTATION: PickerPresentation;
+/**
+ * Map a deprecated `nativePicker` value to its `presentation` equivalent for
+ * a component whose every surface opens a picker (`DateInput`,
+ * `DateTimeInput`). Their released `never` was Astryx's own pickers on every
+ * pointer, so no value maps to `text-input` — which is what lets the return
+ * type exclude it.
+ */
+export declare function pickerPresentationFromNativePicker(nativePicker: LegacyNativePicker): PickerPresentation;
+/**
+ * Map a deprecated `nativePicker` value to its `presentation` equivalent.
+ * `TimeInput` differs: its released `never` is the typed field on every
+ * pointer, so it maps to `text-input`, not a sheet policy.
+ */
+export declare function presentationFromNativePicker(nativePicker: LegacyNativePicker, component: 'date' | 'time'): InputPresentation;
+/**
+ * The effective picker-only policy: explicit `presentation` wins over the
+ * deprecated prop. The narrow twin of {@link effectiveInputPresentation} for
+ * `DateInput` and `DateTimeInput`, whose `presentation` cannot be
+ * `text-input`.
+ */
+export declare function effectivePickerPresentation(presentation: PickerPresentation | undefined, nativePicker: LegacyNativePicker | undefined): PickerPresentation;
+/** The effective policy: explicit `presentation` wins over the deprecated prop. */
+export declare function effectiveInputPresentation(presentation: InputPresentation | undefined, nativePicker: LegacyNativePicker | undefined, component: 'date' | 'time'): InputPresentation;
+/** Resolve a picker-only policy to the surface rendered for the current pointer. */
+export declare function resolvePickerPresentation(presentation: PickerPresentation, isCoarsePointer: boolean): PickerPresentationSurface;
+/** Resolve a policy to the surface rendered for the current pointer. */
+export declare function resolveInputPresentation(presentation: InputPresentation, isCoarsePointer: boolean): InputPresentationSurface;
+//# sourceMappingURL=inputPresentation.d.ts.map

package/dist/utils/inputPresentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inputPresentation.d.ts","sourceRoot":"","sources":["../../src/utils/inputPresentation.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AAEH,uEAAuE;AACvE,MAAM,MAAM,iBAAiB,GACzB,YAAY,GACZ,SAAS,GACT,cAAc,GACd,QAAQ,GACR,uBAAuB,GACvB,iBAAiB,CAAC;AAEtB,wHAAwH;AACxH,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;AAE1E,mEAAmE;AACnE,MAAM,MAAM,wBAAwB,GAClC,YAAY,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEhD,qFAAqF;AACrF,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAC7C,wBAAwB,EACxB,YAAY,CACb,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE9D;;;GAGG;AACH,eAAO,MAAM,0BAA0B,EAAE,kBAAsC,CAAC;AAEhF;;;;;;GAMG;AACH,wBAAgB,kCAAkC,CAChD,YAAY,EAAE,kBAAkB,GAC/B,kBAAkB,CASpB;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,YAAY,EAAE,kBAAkB,EAChC,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,iBAAiB,CAKnB;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,YAAY,EAAE,kBAAkB,GAAG,SAAS,GAC3C,kBAAkB,CAQpB;AAED,mFAAmF;AACnF,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,iBAAiB,GAAG,SAAS,EAC3C,YAAY,EAAE,kBAAkB,GAAG,SAAS,EAC5C,SAAS,EAAE,MAAM,GAAG,MAAM,GACzB,iBAAiB,CAQnB;AAED,oFAAoF;AACpF,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,kBAAkB,EAChC,eAAe,EAAE,OAAO,GACvB,yBAAyB,CAa3B;AAED,wEAAwE;AACxE,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,iBAAiB,EAC/B,eAAe,EAAE,OAAO,GACvB,wBAAwB,CAI1B"}

package/dist/utils/inputPresentation.js

@@ -0,0 +1,108 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file inputPresentation.ts
+ * @input A presentation policy, the deprecated nativePicker value, and pointer type
+ * @output The resolved picker surface for DateInput, DateTimeInput, and TimeInput
+ * @position Shared presentation vocabulary owned by spec:AST-043
+ *
+ * SYNC: When modified, update these files to stay in sync:
+ * - /docs/specs/AST-043-input-presentation/spec.md (FR1–FR3 tables)
+ * - /packages/core/src/DateInput/DateInput.tsx
+ * - /packages/core/src/DateTimeInput/DateTimeInput.tsx
+ * - /packages/core/src/TimeInput/TimeInput.tsx
+ */
+
+/** Picker-surface policy for date/time inputs (`spec:AST-043` FR1). */
+
+/** `presentation` for components without a text-only surface: all except `TimeInput` exclude `text-input` (AST-043). */
+
+/** The surface a resolved `InputPresentation` actually renders. */
+
+/** The surface a resolved `PickerPresentation` renders: one where a picker opens. */
+
+/** Deprecated picker policy (`spec:AST-043` FR3). */
+
+/**
+ * Typed as the narrower policy because the default opens a picker for every
+ * component; it is still a valid `InputPresentation`.
+ */
+export const DEFAULT_INPUT_PRESENTATION = 'adaptive-native';
+
+/**
+ * Map a deprecated `nativePicker` value to its `presentation` equivalent for
+ * a component whose every surface opens a picker (`DateInput`,
+ * `DateTimeInput`). Their released `never` was Astryx's own pickers on every
+ * pointer, so no value maps to `text-input` — which is what lets the return
+ * type exclude it.
+ */
+export function pickerPresentationFromNativePicker(nativePicker) {
+  switch (nativePicker) {
+    case 'touch':
+      return 'adaptive-native';
+    case 'always':
+      return 'native';
+    case 'never':
+      return 'adaptive-bottom-sheet';
+  }
+}
+
+/**
+ * Map a deprecated `nativePicker` value to its `presentation` equivalent.
+ * `TimeInput` differs: its released `never` is the typed field on every
+ * pointer, so it maps to `text-input`, not a sheet policy.
+ */
+export function presentationFromNativePicker(nativePicker, component) {
+  if (component === 'time' && nativePicker === 'never') {
+    return 'text-input';
+  }
+  return pickerPresentationFromNativePicker(nativePicker);
+}
+
+/**
+ * The effective picker-only policy: explicit `presentation` wins over the
+ * deprecated prop. The narrow twin of {@link effectiveInputPresentation} for
+ * `DateInput` and `DateTimeInput`, whose `presentation` cannot be
+ * `text-input`.
+ */
+export function effectivePickerPresentation(presentation, nativePicker) {
+  if (presentation !== undefined) {
+    return presentation;
+  }
+  if (nativePicker !== undefined) {
+    return pickerPresentationFromNativePicker(nativePicker);
+  }
+  return DEFAULT_INPUT_PRESENTATION;
+}
+
+/** The effective policy: explicit `presentation` wins over the deprecated prop. */
+export function effectiveInputPresentation(presentation, nativePicker, component) {
+  if (presentation !== undefined) {
+    return presentation;
+  }
+  if (nativePicker !== undefined) {
+    return presentationFromNativePicker(nativePicker, component);
+  }
+  return DEFAULT_INPUT_PRESENTATION;
+}
+
+/** Resolve a picker-only policy to the surface rendered for the current pointer. */
+export function resolvePickerPresentation(presentation, isCoarsePointer) {
+  switch (presentation) {
+    case 'popover':
+      return 'desktop';
+    case 'bottom-sheet':
+      return 'sheet';
+    case 'native':
+      return 'native';
+    case 'adaptive-bottom-sheet':
+      return isCoarsePointer ? 'sheet' : 'desktop';
+    case 'adaptive-native':
+      return isCoarsePointer ? 'native' : 'desktop';
+  }
+}
+
+/** Resolve a policy to the surface rendered for the current pointer. */
+export function resolveInputPresentation(presentation, isCoarsePointer) {
+  return presentation === 'text-input' ? 'text-input' : resolvePickerPresentation(presentation, isCoarsePointer);
+}

package/dist/utils/interactionOverlay.stylex.d.ts

@@ -4,6 +4,11 @@
  * @output Exports reusable background-color and background-image state styles
  * @position Internal styling utility for interactive core surfaces
  *
+ * Every surface that paints a press composes one of these (or carries its own
+ * `:active` rule), so a change to how the system answers a press is made here
+ * once. `pressedBackgroundColor` is the press without the hover, for controls
+ * whose hover is a colour or nothing.
+ *
  * Keep the enabled guard outside the individual states. StyleX assigns an
  * extra priority bucket (and generated selector specificity) to media-nested
  * rules. Repeating `:active` inside the hover-capable branch gives hover and
@@ -22,5 +27,8 @@ export declare const interactionOverlayStyles: Readonly<{
     readonly backgroundImageOnNeutral: Readonly<{
         readonly backgroundImage: stylex.StyleXClassNameFor<"backgroundImage", string | null>;
     }>;
+    readonly pressedBackgroundColor: Readonly<{
+        readonly backgroundColor: stylex.StyleXClassNameFor<"backgroundColor", "light-dark(#05365919, #FFFFFF19)" | null>;
+    }>;
 }>;
 //# sourceMappingURL=interactionOverlay.stylex.d.ts.map

package/dist/utils/interactionOverlay.stylex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactionOverlay.stylex.d.ts","sourceRoot":"","sources":["../../src/utils/interactionOverlay.stylex.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAC;AAU3C,eAAO,MAAM,wBAAwB;;;;;;;;;;EA2CnC,CAAC"}
+{"version":3,"file":"interactionOverlay.stylex.d.ts","sourceRoot":"","sources":["../../src/utils/interactionOverlay.stylex.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAC;AAU3C,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;EA0DnC,CAAC"}