@ankhorage/zora 19.0.0 → 20.0.0

package/src/features/card/adapters/inbound/MetricCard.tsx

@@ -1,12 +1,13 @@
 import React from 'react';
 
-import { resolveBadgeRecipe, resolveIconSize } from '../../../../internal/recipes';
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { MetricCardProps } from '../../../../types/metric-card';
 import { Badge } from '../../../badge/public';
+import { resolveBadgeRecipe } from '../../../badge/utils/resolveBadgeRecipe';
 import { Icon } from '../../../icon/public';
+import { resolveIconSize } from '../../../icon/utils/resolveIconSize';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Heading } from '../../../typography/public';
 import { Text } from '../../../typography/public';
 import { Card } from '../../public';

package/src/features/card/adapters/inbound/PostCard.test.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../../../metadata';
+import { ZORA_COMPONENT_META } from '../../../authoring';
 
 describe('PostCard', () => {
   test('is registered as a public ZORA pattern', () => {

package/src/features/card/adapters/inbound/PostCard.tsx

@@ -1,8 +1,6 @@
 import React from 'react';
 import { Image as ReactNativeImage } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type {
   PostAction,
   PostAuthor,
@@ -13,6 +11,8 @@ import type {
 import { Avatar } from '../../../avatar/public';
 import { Button } from '../../../button/public';
 import { Divider, View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 import { Card } from '../../public';
 /***

package/src/features/card/adapters/inbound/ProductCard.test.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../../../metadata';
+import { ZORA_COMPONENT_META } from '../../../authoring';
 
 describe('ProductCard', () => {
   test('is registered as a public ZORA pattern', () => {

package/src/features/card/adapters/inbound/ProductCard.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
-import type { ZoraBaseProps } from '../../../../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from '../../../../types/base';
 import type { ProductCardProps } from '../../../../types/product-card';
 import { Badge } from '../../../badge/public';
 import { Button } from '../../../button/public';
 import { Image } from '../../../image/public';
 import { Divider, View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Heading } from '../../../typography/public';
 import { Text } from '../../../typography/public';
 import { Card } from '../../public';

package/src/features/card/cardMeta.ts

@@ -1,6 +1,6 @@
-import { COMPONENT_THEME_AUTHORING } from '../../constants';
-import type { ZoraComponentMeta } from '../../metadata';
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
+import type { ZoraComponentMeta } from '../authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
+import { COMPONENT_THEME_AUTHORING } from '../authoring/constants';
 
 export const cardMeta = {
   name: 'Card',

package/src/features/card/mediaCardMeta.ts

@@ -1,5 +1,5 @@
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 
 export const mediaCardMeta = {
   name: 'MediaCard',

package/src/features/card/metricCardMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
 
 export const metricCardMeta = {
   name: 'MetricCard',

package/src/features/card/postCardMeta.ts

@@ -1,5 +1,5 @@
-import type { ZoraComponentMeta } from '../../metadata';
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
+import type { ZoraComponentMeta } from '../authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 
 export const postCardMeta = {
   name: 'PostCard',

package/src/features/card/productCardMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const productCardMeta = {
   name: 'ProductCard',

package/src/features/card/utils/resolveCardThemeRecipe.ts

@@ -1,6 +1,6 @@
 import type { ThemeRecipeOverrideValue } from '@ankhorage/contracts';
 
-import type { ZoraCardTone } from '../../../internal/recipes';
+import type { ZoraCardTone } from '../../../types/card';
 
 export function resolveCardThemeRecipe(input: {
   readonly tone?: ZoraCardTone;

package/src/features/card/utils/resolveCardVariant.test.ts

@@ -0,0 +1,11 @@
+import { describe, expect, test } from 'bun:test';
+
+import { resolveCardVariant } from './resolveCardVariant';
+
+describe('resolveCardVariant', () => {
+  test('maps card tones to Surface variants', () => {
+    expect(resolveCardVariant()).toBe('raised');
+    expect(resolveCardVariant('outline')).toBe('outline');
+    expect(resolveCardVariant('subtle')).toBe('subtle');
+  });
+});

package/src/features/card/utils/resolveCardVariant.ts

@@ -0,0 +1,15 @@
+import type { CardProps as SurfaceCardProps } from '@ankhorage/surface';
+
+import type { ZoraCardTone } from '../../../types/card';
+
+export function resolveCardVariant(tone: ZoraCardTone = 'default'): SurfaceCardProps['variant'] {
+  switch (tone) {
+    case 'outline':
+      return 'outline';
+    case 'subtle':
+      return 'subtle';
+    case 'default':
+    default:
+      return 'raised';
+  }
+}

package/src/features/card/utils/themeRecipeMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraThemeRecipeMeta } from '../../../metadata/themeRecipeTypes';
+import type { ZoraThemeRecipeMeta } from '../../../types/theme-recipe';
 
 export const cardThemeRecipeMeta = {
   name: 'Card',

package/src/features/chat/adapters/inbound/ChatListItem.test.tsx

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../../../metadata';
+import { ZORA_COMPONENT_META } from '../../../authoring';
 
 describe('ChatListItem', () => {
   test('is registered as a public ZORA pattern', () => {

package/src/features/chat/adapters/inbound/ChatListItem.tsx

@@ -1,12 +1,12 @@
 import { Pressable } from '@ankhorage/surface';
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ChatListAvatar, ChatListItemProps } from '../../../../types/chat';
 import { Avatar } from '../../../avatar/public';
 import { Badge } from '../../../badge/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 
 function resolveAvatarName({

package/src/features/chat/adapters/inbound/MessageBubble.tsx

@@ -1,8 +1,6 @@
 import { Pressable } from '@ankhorage/surface';
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type {
   MessageBubbleAvatar,
   MessageBubbleDirection,
@@ -11,6 +9,8 @@ import type {
 } from '../../../../types/chat';
 import { Avatar } from '../../../avatar/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 
 function resolveAvatarName({

package/src/features/chat/chatListItemMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const chatListItemMeta = {
   name: 'ChatListItem',

package/src/features/chat/messageBubbleMeta.ts

@@ -1,5 +1,5 @@
-import type { ZoraComponentMeta } from '../../metadata';
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
+import type { ZoraComponentMeta } from '../authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 
 export const messageBubbleMeta = {
   name: 'MessageBubble',

package/src/features/chip/adapters/inbound/Chip.tsx

@@ -1,12 +1,12 @@
 import { Pressable } from '@ankhorage/surface';
 import React from 'react';
 
-import { resolveIconSize } from '../../../../internal/recipes';
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ChipInteractionState, ChipProps } from '../../../../types/chip';
 import { Icon } from '../../../icon/public';
+import { resolveIconSize } from '../../../icon/utils/resolveIconSize';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 import { resolveChipColors } from '../../utils/resolveChipColors';
 /***

package/src/features/chip/adapters/inbound/ChipGroup.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ChipGroupItem, ChipGroupProps } from '../../../../types/chip-group';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Chip } from '../../public';
 /***
  * Renders a row or wrap layout of `Chip` items.

package/src/features/chip/chipGroupMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
 
 export const chipGroupMeta = {
   name: 'ChipGroup',

package/src/features/chip/chipMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
 
 export const chipMeta = {
   name: 'Chip',

package/src/features/chip/utils/resolveChipColors.ts

@@ -1,7 +1,7 @@
 import type { RoleSemantics, SurfaceTheme } from '@ankhorage/surface';
 
-import type { ZoraColor } from '../../../internal/recipes';
 import type { ChipColors, ChipInteractionState } from '../../../types/chip';
+import type { ZoraColor } from '../../../types/theme';
 export function resolveChipColors({
   theme,
   color,

package/src/features/collection-editor/adapters/inbound/CollectionEditor.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { CollectionEditorProps } from '../../../../types/collection-editor';
 import { Button } from '../../../button/public';
 import { IconButton } from '../../../button/public';
 import { Card } from '../../../card/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Text } from '../../../typography/public';
 
 function CollectionEditorInner<TItem>({

package/src/features/collection-editor/meta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const collectionEditorMeta = {
   name: 'CollectionEditor',

package/src/features/content-rail/adapters/inbound/ContentRail.tsx

@@ -7,14 +7,14 @@ import {
   type ViewStyle,
 } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type {
   ContentRailProps,
   ContentRailVisibleRangeChangeEvent,
 } from '../../../../types/content-rail';
 import { IconButton } from '../../../button/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 import { resolveContentRailItemWidth } from '../../utils/resolveContentRailItemWidth';
 import { resolveContentRailPhysicalOffset } from '../../utils/resolveContentRailPhysicalOffset';

package/src/features/content-rail/adapters/inbound/ContentRailFlow.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { ScrollView } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
 import type { ContentRailProps } from '../../../../types/content-rail';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 
 /*** Wraps intrinsically sized content in a free horizontal native scroll view. */
 export function ContentRailFlow({

package/src/features/content-rail/contentRailMeta.ts

@@ -1,5 +1,5 @@
-import type { ZoraComponentMeta } from '../../metadata';
-import { CONTENT_RAIL_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
+import type { ZoraComponentMeta } from '../authoring';
+import { CONTENT_RAIL_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 import { CONTENT_RAIL_SPACING_VALUES } from './constants';
 
 export const contentRailMeta = {

package/src/features/data-table/adapters/inbound/DataTable.tsx

@@ -3,7 +3,6 @@ import { Show } from '@ankhorage/surface';
 import React from 'react';
 import { ScrollView, type ViewStyle } from 'react-native';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type {
   DataTableCellContext,
   DataTableColumn,
@@ -20,6 +19,7 @@ import { EmptyState } from '../../../empty-state/public';
 import { View } from '../../../layout/public';
 import { PopoverMenu, type PopoverMenuAction } from '../../../popover-menu/public';
 import { SkeletonList } from '../../../skeleton/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Text, type TextAlign } from '../../../typography/public';
 import { resolveDataTableRowKey } from '../../utils/resolveDataTableRowKey';
 /***

package/src/features/data-table/dataTableMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
 
 export const dataTableMeta = {
   name: 'DataTable',

package/src/features/date-picker/adapters/inbound/DatePicker.native.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { DatePickerProps } from '../../../../types/date-picker';
 import { useBottomSheet } from '../../../bottom-sheet/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { DatePickerContent } from '../../composition/DatePickerContent';
 import { DatePickerField } from '../../composition/DatePickerField';
 import { DatePickerTrigger } from '../../composition/DatePickerTrigger';

package/src/features/date-picker/adapters/inbound/DatePicker.web.tsx

@@ -1,9 +1,9 @@
 import { Popover } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { DatePickerProps } from '../../../../types/date-picker';
 import { Surface } from '../../../surface/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { DatePickerContent } from '../../composition/DatePickerContent';
 import { DatePickerField } from '../../composition/DatePickerField';
 import { DatePickerTrigger } from '../../composition/DatePickerTrigger';

package/src/features/date-picker/datePickerMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const datePickerMeta = {
   name: 'DatePicker',

package/src/features/date-picker/public.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../metadata/componentMeta';
+import { ZORA_COMPONENT_META } from '../authoring/componentMeta';
 
 test('DatePicker keeps one manifest contract across native and web presentation hosts', async () => {
   const nativeSource = await Bun.file(

package/src/features/dialog/adapters/inbound/Dialog.tsx

@@ -2,11 +2,11 @@ import { Modal as SurfaceModal } from '@ankhorage/surface';
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { resolveDialogWidth } from '../../../../internal/recipes';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { DialogProps } from '../../../../types/dialog';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Heading, Text } from '../../../typography/public';
+import { resolveDialogWidth } from '../../utils/resolveDialogWidth';
 
 /*** Renders the product-level dialog composition on top of the Surface modal primitive. */
 export const Dialog = withZoraThemeScope(DialogInner);

package/src/features/dialog/dialogMeta.ts

@@ -1,5 +1,5 @@
-import { CONTAINER_ALLOWED_CHILDREN } from '../../metadata/allowedChildren';
-import type { ZoraComponentMeta } from '../../metadata/types';
+import type { ZoraComponentMeta } from '../../types/authoring';
+import { CONTAINER_ALLOWED_CHILDREN } from '../authoring/allowedChildren';
 
 export const dialogMeta = {
   name: 'Dialog',

package/src/features/dialog/utils/resolveDialogWidth.test.ts

@@ -0,0 +1,10 @@
+import { describe, expect, test } from 'bun:test';
+
+import { resolveDialogWidth } from './resolveDialogWidth';
+
+describe('resolveDialogWidth', () => {
+  test('keeps dialog width presets ordered', () => {
+    expect(resolveDialogWidth('narrow')).toBeLessThan(resolveDialogWidth('default'));
+    expect(resolveDialogWidth('wide')).toBeGreaterThanOrEqual(resolveDialogWidth('default'));
+  });
+});

package/src/features/dialog/utils/resolveDialogWidth.ts

@@ -0,0 +1,13 @@
+import type { ZoraContentWidth } from '../../../types/layout';
+
+export function resolveDialogWidth(width: ZoraContentWidth = 'default'): number {
+  switch (width) {
+    case 'narrow':
+      return 420;
+    case 'wide':
+      return 560;
+    case 'default':
+    default:
+      return 520;
+  }
+}

package/src/features/empty-state/adapters/inbound/EmptyState.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { EmptyStateProps } from '../../../../types/empty-state';
 import { Button } from '../../../button/public';
 import { Card } from '../../../card/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 function EmptyStateInner({
   themeId: _themeId,

package/src/features/empty-state/emptyStateMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 export const emptyStateMeta = {
   name: 'EmptyState',

package/src/features/form/adapters/inbound/Form.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { FormProps } from '../../../../types/form';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { FormActions } from './FormActions';
 
 function FormInner({

package/src/features/form/adapters/inbound/FormActions.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { FormActionsProps } from '../../../../types/form';
 import { Button } from '../../../button/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 function FormActionsInner({
   themeId: _themeId,

package/src/features/form/adapters/inbound/FormError.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { FormErrorProps } from '../../../../types/form';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 
 function FormErrorInner({ themeId: _themeId, mode: _mode, error, testID }: FormErrorProps) {

package/src/features/form/checkbox/adapters/inbound/Checkbox.tsx

@@ -1,8 +1,8 @@
 import { Checkbox as SurfaceCheckbox } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { CheckboxProps } from '../../../../../types/checkbox';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 
 function CheckboxInner({
   themeId: _themeId,

package/src/features/form/checkbox/adapters/inbound/CheckboxGroup.tsx

@@ -1,9 +1,9 @@
 import { Checkbox } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { CheckboxGroupOption, CheckboxGroupProps } from '../../../../../types/checkbox';
 import { View } from '../../../../layout/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 import { Text } from '../../../../typography/public';
 
 function CheckboxGroupInner<TValue extends string>({

package/src/features/form/checkbox/checkboxMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
 
 export const checkboxMeta = {
   name: 'Checkbox',

package/src/features/form/field/adapters/inbound/Field.tsx

@@ -1,9 +1,9 @@
 import { Field as SurfaceField } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { FieldProps } from '../../../../../types/form';
 import { View } from '../../../../layout/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 import { Text } from '../../../../typography/public';
 
 function FieldInner({

package/src/features/form/field/meta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
 
 export const fieldMeta = {
   name: 'Field',

package/src/features/form/formActionsMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 export const formActionsMeta = {
   name: 'FormActions',
   category: 'component',

package/src/features/form/formErrorMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 export const formErrorMeta = {
   name: 'FormError',
   category: 'component',

package/src/features/form/formMeta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 export const formMeta = {
   name: 'Form',
   category: 'component',

package/src/features/form/radio/adapters/inbound/Radio.tsx

@@ -1,8 +1,8 @@
 import { Radio as SurfaceRadio } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { RadioProps } from '../../../../../types/radio';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
 
 function RadioInner({ themeId: _themeId, mode: _mode, interactionPolicy, ...props }: RadioProps) {
   return <SurfaceRadio {...props} interactionPolicy={interactionPolicy} />;

package/src/features/form/radio/adapters/inbound/RadioGroup.tsx

@@ -2,10 +2,10 @@ import { Radio } from '@ankhorage/surface';
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { useZoraThemeRecipe } from '../../../../../theme/useZoraThemeRecipe';
-import { withZoraThemeScope } from '../../../../../theme/withZoraThemeScope';
 import type { RadioGroupProps } from '../../../../../types/radio';
 import { View } from '../../../../layout/public';
+import { withZoraThemeScope } from '../../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraThemeRecipe } from '../../../../theme/composition/useZoraThemeRecipe';
 import { Text } from '../../../../typography/public';
 import { resolveRadioGroupThemeRecipe } from '../../utils/resolveRadioGroupThemeRecipe';
 import { RadioOptionControl } from './RadioOptionControl';

package/src/features/form/radio/radioMeta.ts

@@ -1,5 +1,5 @@
-import { ZORA_COLORS } from '../../../internal/colorModel';
-import type { ZoraComponentMeta } from '../../../metadata';
+import type { ZoraComponentMeta } from '../../authoring';
+import { ZORA_COLORS } from '../../theme/colorModel';
 
 const themeAuthoring = {
   authority: 'theme',