@ankhorage/zora 19.0.0 → 20.0.0

package/src/{theme → features/theme}/zoraDefaultTheme.ts

@@ -1,4 +1,4 @@
-import type { ZoraTheme } from './types';
+import type { ZoraTheme } from '../../types/theme';
 
 export const zoraDefaultTheme: ZoraTheme = {
   id: 'zora',

package/src/features/time-picker/adapters/inbound/TimePicker.native.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { TimePickerProps } from '../../../../types/time-picker';
 import { useBottomSheet } from '../../../bottom-sheet/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { TimePickerContent } from '../../composition/TimePickerContent';
 import { TimePickerField } from '../../composition/TimePickerField';
 import { TimePickerTrigger } from '../../composition/TimePickerTrigger';

package/src/features/time-picker/adapters/inbound/TimePicker.web.tsx

@@ -1,9 +1,9 @@
 import { Popover } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { TimePickerProps } from '../../../../types/time-picker';
 import { Surface } from '../../../surface/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { TimePickerContent } from '../../composition/TimePickerContent';
 import { TimePickerField } from '../../composition/TimePickerField';
 import { TimePickerTrigger } from '../../composition/TimePickerTrigger';

package/src/features/time-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('TimePicker keeps one manifest contract across native and web presentation hosts', async () => {
   const nativeSource = await Bun.file(

package/src/features/time-picker/timePickerMeta.ts

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

package/src/features/timeline/adapters/inbound/Timeline.tsx

@@ -1,13 +1,13 @@
 import type { RoleSemantics, SurfaceTheme } from '@ankhorage/surface';
 import React from 'react';
 
-import type { ZoraColor } from '../../../../internal/recipes';
-import { resolveIconSize } from '../../../../internal/recipes';
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
+import type { ZoraColor } from '../../../../types/theme';
 import type { TimelineItem, TimelineProps } from '../../../../types/timeline';
 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';
 

package/src/features/timeline/meta.ts

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

package/src/features/toast/adapters/inbound/Toast.tsx

@@ -1,8 +1,8 @@
 import { Toast as SurfaceToast } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ToastProps } from '../../../../types/toast';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Renders a toast notification message with ZORA theme scoping. */
 export const Toast = withZoraThemeScope(ToastInner);

package/src/features/toast/public.test.ts

@@ -1,13 +1,13 @@
 import { expect, test } from 'bun:test';
 
-import { ZORA_COMPONENT_META } from '../../metadata/componentMeta';
+import { ZORA_COMPONENT_META } from '../authoring/componentMeta';
 
 test('Toast stays imperative and installs its host only when the ZoraProvider capability is enabled', async () => {
   const [publicSource, providerSource, webCapabilities, nativeCapabilities] = await Promise.all([
     Bun.file('src/features/toast/public.ts').text(),
-    Bun.file('src/theme/ZoraProvider.tsx').text(),
-    Bun.file('src/theme/ZoraRuntimeCapabilities.web.tsx').text(),
-    Bun.file('src/theme/ZoraRuntimeCapabilities.native.tsx').text(),
+    Bun.file('src/features/theme/adapters/inbound/ZoraProvider.tsx').text(),
+    Bun.file('src/features/theme/composition/ZoraRuntimeCapabilities.web.tsx').text(),
+    Bun.file('src/features/theme/composition/ZoraRuntimeCapabilities.native.tsx').text(),
   ]);
 
   expect(ZORA_COMPONENT_META.Toast?.directManifestNode).toBe(false);

package/src/features/toast/toastMeta.ts

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

package/src/features/toast/toastProviderMeta.ts

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

package/src/features/toolbar/adapters/inbound/Toolbar.tsx

@@ -1,7 +1,7 @@
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ToolbarProps } from '../../../../types/toolbar';
 import { Card } from '../../../card/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Renders a visible horizontal group of contextual actions and controls. */
 export const Toolbar = withZoraThemeScope(ToolbarInner);

package/src/features/toolbar/toolbarMeta.ts

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

package/src/features/tree-view/adapters/inbound/TreeItem.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
-import type { ZoraBaseProps } from '../../../../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from '../../../../types/base';
 import type { TreeItemNode, TreeItemRenderProps } from '../../../../types/tree-view';
 import { IconButton } from '../../../button/public';
 import { View } from '../../../layout/public';
 import { ListItem } from '../../../list/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 interface TreeItemProps<TId extends string = string> extends ZoraBaseProps {
   node: TreeItemNode<TId>;

package/src/features/tree-view/adapters/inbound/TreeView.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { TreeViewProps } from '../../../../types/tree-view';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { TreeItem } from './TreeItem';
 
 function TreeViewInner<TId extends string = string>({

package/src/features/tree-view/meta.ts

@@ -1,4 +1,4 @@
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
 
 const TREE_NOTE = 'Tree view pattern component; not represented as a manifest node in v1.';
 

package/src/features/typography/adapters/inbound/Heading.tsx

@@ -2,10 +2,10 @@ import { resolveResponsive, useResponsiveRuntime } from '@ankhorage/surface';
 import React from 'react';
 import { Platform, Text as ReactNativeText, type TextStyle } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { useZoraThemeRecipe } from '../../../../theme/useZoraThemeRecipe';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { HeadingProps } from '../../../../types/heading';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
+import { useZoraThemeRecipe } from '../../../theme/composition/useZoraThemeRecipe';
 import { resolveHeadingRecipe } from '../../utils/resolveHeadingRecipe';
 import { resolveHeadingSizeFromLevel } from '../../utils/resolveHeadingSizeFromLevel';
 import { resolveHeadingThemeRecipe } from '../../utils/resolveHeadingThemeRecipe';

package/src/features/typography/adapters/inbound/Text.tsx

@@ -2,10 +2,10 @@ import { resolveResponsive, useResponsiveRuntime } from '@ankhorage/surface';
 import React from 'react';
 import { Platform, Text as ReactNativeText, type TextStyle } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { useZoraThemeRecipe } from '../../../../theme/useZoraThemeRecipe';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { TextProps } from '../../../../types/text';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
+import { useZoraThemeRecipe } from '../../../theme/composition/useZoraThemeRecipe';
 import { resolveTextStyle } from '../../utils/resolveTextStyle';
 import { resolveTextThemeRecipe } from '../../utils/resolveTextThemeRecipe';
 /***

package/src/features/typography/headingMeta.ts

@@ -1,6 +1,6 @@
-import { COMPONENT_THEME_AUTHORING } from '../../constants';
-import { ZORA_COLORS, ZORA_EMPHASES } from '../../internal/colorModel';
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
+import { COMPONENT_THEME_AUTHORING } from '../authoring/constants';
+import { ZORA_COLORS, ZORA_EMPHASES } from '../theme/colorModel';
 
 export const headingMeta = {
   name: 'Heading',

package/src/features/typography/textMeta.ts

@@ -1,6 +1,6 @@
-import { COMPONENT_THEME_AUTHORING } from '../../constants';
-import { ZORA_COLORS, ZORA_EMPHASES } from '../../internal/colorModel';
-import type { ZoraComponentMeta } from '../../metadata';
+import type { ZoraComponentMeta } from '../authoring';
+import { COMPONENT_THEME_AUTHORING } from '../authoring/constants';
+import { ZORA_COLORS, ZORA_EMPHASES } from '../theme/colorModel';
 
 export const textMeta = {
   name: 'Text',

package/src/features/typography/utils/headingThemeRecipeMeta.ts

@@ -1,5 +1,5 @@
-import { ZORA_COLORS, ZORA_EMPHASES } from '../../../internal/colorModel';
-import type { ZoraThemeRecipeMeta } from '../../../metadata/themeRecipeTypes';
+import type { ZoraThemeRecipeMeta } from '../../../types/theme-recipe';
+import { ZORA_COLORS, ZORA_EMPHASES } from '../../theme/colorModel';
 
 export const headingThemeRecipeMeta = {
   name: 'Heading',

package/src/features/typography/utils/textThemeRecipeMeta.ts

@@ -1,5 +1,5 @@
-import { ZORA_COLORS, ZORA_EMPHASES } from '../../../internal/colorModel';
-import type { ZoraThemeRecipeMeta } from '../../../metadata/themeRecipeTypes';
+import type { ZoraThemeRecipeMeta } from '../../../types/theme-recipe';
+import { ZORA_COLORS, ZORA_EMPHASES } from '../../theme/colorModel';
 
 export const textThemeRecipeMeta = {
   name: 'Text',

package/src/features/uploader/adapters/inbound/Uploader.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { UploadAsset, UploaderProps, UploadType } from '../../../../types/upload';
 import { Button } from '../../../button/public';
 import { Dialog } from '../../../dialog/public';
@@ -9,6 +8,7 @@ import { Icon } from '../../../icon/public';
 import { Image } from '../../../image/public';
 import { View } from '../../../layout/public';
 import { Progress } from '../../../progress/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Text } from '../../../typography/public';
 import { validateUploadAsset } from '../../application/use-cases/validateUploadAsset';
 import { createUploadPicker } from '../../composition/createUploadPicker';

package/src/features/uploader/public.test.ts

@@ -22,8 +22,8 @@ describe('ZORA Uploader public contract', () => {
   test('removes the superseded image preview and upload field APIs', async () => {
     const [rootSource, registrySource, metadataSource] = await Promise.all([
       Bun.file('src/index.ts').text(),
-      Bun.file('src/registry.ts').text(),
-      Bun.file('src/metadata/componentMeta.ts').text(),
+      Bun.file('src/features/registry/ZORA_COMPONENT_REGISTRY.ts').text(),
+      Bun.file('src/features/authoring/componentMeta.ts').text(),
     ]);
     const publicSurface = `${rootSource}\n${registrySource}\n${metadataSource}`;
 

package/src/features/uploader/uploaderMeta.ts

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

package/src/index.ts

@@ -1,5 +1,3 @@
-export { ZORA_CORE_PLUGIN } from './corePlugin';
-export { ZORA_CORE_PLUGIN_METADATA } from './corePluginMetadata';
 export {
   Accordion,
   AccordionItem,
@@ -44,6 +42,39 @@ export {
   SignInForm,
   SignUpForm,
 } from './features/auth/public';
+export type {
+  ZoraBindableComponentType,
+  ZoraComponentBlueprint,
+  ZoraComponentCategory,
+  ZoraComponentEventMeta,
+  ZoraComponentEventPayloadFieldMeta,
+  ZoraComponentEventPayloadFieldType,
+  ZoraComponentEventPayloadKind,
+  ZoraComponentI18nMeta,
+  ZoraComponentManifestPolicy,
+  ZoraComponentMeta,
+  ZoraComponentMetaRegistry,
+  ZoraComponentPropArrayItemSchema,
+  ZoraComponentPropAuthoring,
+  ZoraComponentPropSchema,
+  ZoraComponentPropType,
+  ZoraComponentPropValue,
+  ZoraComponentSlotMeta,
+  ZoraThemeRecipeBooleanFieldMeta,
+  ZoraThemeRecipeChoiceFieldMeta,
+  ZoraThemeRecipeFieldMeta,
+  ZoraThemeRecipeKind,
+  ZoraThemeRecipeMeta,
+  ZoraThemeRecipeMetaRegistry,
+  ZoraThemeRecipeTokenFieldMeta,
+  ZoraThemeTokenFamily,
+} from './features/authoring';
+export {
+  ZORA_BINDABLE_COMPONENT_META,
+  ZORA_COMPONENT_META,
+  ZORA_THEME_RECIPE_META,
+  ZORA_THEME_TOKEN_FAMILIES,
+} from './features/authoring';
 export type { AvatarProps, AvatarShape, AvatarSize } from './features/avatar/public';
 export type { AvatarGroupItem, AvatarGroupProps } from './features/avatar/public';
 export { Avatar, resolveAvatarInitials } from './features/avatar/public';
@@ -239,6 +270,12 @@ export { MissingElement, type MissingElementProps } from './features/missing-ele
 export { Pagination, type PaginationProps } from './features/pagination/public';
 export type { PaletteItemProps } from './features/palette-item/public';
 export { PaletteItem } from './features/palette-item/public';
+export {
+  composeZoraPluginMetadata,
+  ZORA_CORE_PLUGIN_METADATA,
+  ZoraPluginCompositionError,
+} from './features/plugin/public';
+export { composeZoraPlugins, ZORA_CORE_PLUGIN } from './features/plugin/runtime';
 export {
   PopoverMenu,
   type PopoverMenuAction,
@@ -266,6 +303,7 @@ export type {
   ReaderSurfaceProps,
 } from './features/reader/public';
 export { ReaderSurface, resolveReaderProgress } from './features/reader/public';
+export { ZORA_COMPONENT_REGISTRY } from './features/registry/public';
 export type {
   BarcodeScannerViewProps,
   BarcodeScanResult,
@@ -314,6 +352,20 @@ export {
   Tabs,
   type TabsProps,
 } from './features/tabs/public';
+export type {
+  ZoraColor,
+  ZoraEmphasis,
+  ZoraPaletteColor,
+  ZoraStatusColor,
+} from './features/theme/colorModel';
+export {
+  ZORA_COLORS,
+  ZORA_EMPHASES,
+  ZORA_PALETTE_COLORS,
+  ZORA_STATUS_COLORS,
+} from './features/theme/colorModel';
+export * from './features/theme/public';
+export * from './features/theme/runtime';
 export {
   TimePicker,
   type TimePickerProps,
@@ -360,51 +412,6 @@ export type {
   ValidateUploadAssetInput,
 } from './features/uploader/public';
 export { Uploader, validateUploadAsset } from './features/uploader/public';
-export type {
-  ZoraColor,
-  ZoraEmphasis,
-  ZoraPaletteColor,
-  ZoraStatusColor,
-} from './internal/colorModel';
-export {
-  ZORA_COLORS,
-  ZORA_EMPHASES,
-  ZORA_PALETTE_COLORS,
-  ZORA_STATUS_COLORS,
-} from './internal/colorModel';
-export type {
-  ZoraBindableComponentType,
-  ZoraComponentBlueprint,
-  ZoraComponentCategory,
-  ZoraComponentEventMeta,
-  ZoraComponentEventPayloadFieldMeta,
-  ZoraComponentEventPayloadFieldType,
-  ZoraComponentEventPayloadKind,
-  ZoraComponentI18nMeta,
-  ZoraComponentManifestPolicy,
-  ZoraComponentMeta,
-  ZoraComponentMetaRegistry,
-  ZoraComponentPropArrayItemSchema,
-  ZoraComponentPropAuthoring,
-  ZoraComponentPropSchema,
-  ZoraComponentPropType,
-  ZoraComponentPropValue,
-  ZoraComponentSlotMeta,
-  ZoraThemeRecipeBooleanFieldMeta,
-  ZoraThemeRecipeChoiceFieldMeta,
-  ZoraThemeRecipeFieldMeta,
-  ZoraThemeRecipeKind,
-  ZoraThemeRecipeMeta,
-  ZoraThemeRecipeMetaRegistry,
-  ZoraThemeRecipeTokenFieldMeta,
-  ZoraThemeTokenFamily,
-} from './metadata';
-export {
-  ZORA_BINDABLE_COMPONENT_META,
-  ZORA_COMPONENT_META,
-  ZORA_THEME_RECIPE_META,
-  ZORA_THEME_TOKEN_FAMILIES,
-} from './metadata';
 export type {
   ComposedZoraPluginCatalog,
   ComposedZoraPluginMetadataCatalog,
@@ -412,12 +419,5 @@ export type {
   ZoraPluginDescriptor,
   ZoraPluginMetadata,
   ZoraPluginPlacement,
-} from './pluginComposition';
-export {
-  composeZoraPluginMetadata,
-  composeZoraPlugins,
-  ZoraPluginCompositionError,
-} from './pluginComposition';
-export type { ZoraComponentRegistry } from './registry';
-export { ZORA_COMPONENT_REGISTRY } from './registry';
-export * from './theme';
+} from './types/plugin';
+export type { ZoraComponentRegistry } from './types/registry';

package/src/interactionPolicy.test.ts

@@ -24,7 +24,7 @@ function readFeature(...segments: string[]): string {
 
 describe('InteractionPolicy declaration', () => {
   test('ZoraBaseProps uses the canonical Surface type', () => {
-    const source = readSource('theme/ZoraBaseProps.ts');
+    const source = readSource('types/base.ts');
 
     expect(source).toContain("import type { InteractionPolicy } from '@ankhorage/surface';");
     expect(source).toContain('interactionPolicy?: InteractionPolicy;');
@@ -32,7 +32,7 @@ describe('InteractionPolicy declaration', () => {
 
   test('no duplicate local InteractionPolicy type declarations in ZORA source', () => {
     const files = [
-      readSource('theme/ZoraBaseProps.ts'),
+      readSource('types/base.ts'),
       readSource('types/app-bar.ts'),
       readSource('types/breadcrumbs.ts'),
       readSource('types/empty-state.ts'),
@@ -50,7 +50,7 @@ describe('InteractionPolicy declaration', () => {
   });
 
   test('registry contract is compile-time only', () => {
-    const registrySource = readSource('registry.ts');
+    const registrySource = readFeature('registry', 'ZORA_COMPONENT_REGISTRY.ts');
 
     expect(registrySource).not.toMatch(/type\s+InteractionPolicy/);
     expect(registrySource).toContain(

package/src/structureOwnership.test.ts

@@ -0,0 +1,71 @@
+import { existsSync, readdirSync } from 'node:fs';
+
+import { describe, expect, test } from 'bun:test';
+
+describe('src ownership', () => {
+  test('keeps only feature and type owner directories at the package source root', () => {
+    const directories = readdirSync('src', { withFileTypes: true })
+      .filter((entry) => entry.isDirectory())
+      .map((entry) => entry.name)
+      .sort();
+
+    expect(directories).toEqual(['features', 'types']);
+  });
+
+  test('does not reintroduce technical ownership roots', () => {
+    for (const path of [
+      'src/constants.ts',
+      'src/constants',
+      'src/context',
+      'src/internal',
+      'src/metadata',
+      'src/theme',
+      'src/utils',
+    ]) {
+      expect(existsSync(path), path).toBe(false);
+    }
+  });
+
+  test('keeps reusable authoring, plugin, registry, and theme types centralized', () => {
+    for (const path of [
+      'src/types/authoring.ts',
+      'src/types/plugin.ts',
+      'src/types/registry.ts',
+      'src/types/theme.ts',
+      'src/types/theme-recipe.ts',
+    ]) {
+      expect(existsSync(path), path).toBe(true);
+    }
+
+    for (const path of [
+      'src/features/authoring/types.ts',
+      'src/features/authoring/themeRecipeTypes.ts',
+      'src/features/theme/ZoraBaseProps.ts',
+      'src/features/theme/ThemeModeToggleProps.ts',
+    ]) {
+      expect(existsSync(path), path).toBe(false);
+    }
+  });
+
+  test('keeps deliberate feature facades instead of legacy catch-all implementation files', () => {
+    for (const path of [
+      'src/features/plugin/public.ts',
+      'src/features/plugin/runtime.ts',
+      'src/features/registry/public.ts',
+      'src/features/theme/public.ts',
+      'src/features/theme/runtime.ts',
+    ]) {
+      expect(existsSync(path), path).toBe(true);
+    }
+
+    for (const path of [
+      'src/features/plugin/pluginComposition.ts',
+      'src/features/plugin/corePlugin.ts',
+      'src/features/plugin/corePluginMetadata.ts',
+      'src/features/registry/registry.ts',
+      'src/features/theme/index.ts',
+    ]) {
+      expect(existsSync(path), path).toBe(false);
+    }
+  });
+});

package/src/types/accordion.ts

@@ -7,7 +7,7 @@ import type {
 } from '@ankhorage/surface';
 import type React from 'react';
 
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
 
 export type { AccordionMode } from '@ankhorage/surface';
 

package/src/types/activity-indicator.ts

@@ -1,6 +1,6 @@
 import type { ActivityIndicatorProps as ReactNativeActivityIndicatorProps } from 'react-native';
 
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
 
 export interface ActivityIndicatorProps
   extends ZoraBaseProps, Omit<ReactNativeActivityIndicatorProps, 'color'> {

package/src/types/app-bar.ts

@@ -1,7 +1,7 @@
 import type { ButtonIconSpec } from '@ankhorage/surface';
 import type React from 'react';
 
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
 import type { PopoverMenuAction } from './popover-menu';
 
 export type AppBarMode =

package/src/types/auth.ts

@@ -2,7 +2,7 @@ import type { ButtonIconSpec } from '@ankhorage/surface';
 import type React from 'react';
 
 import type { ButtonProps } from '../features/button/public';
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
 import type { FormFieldConfig, FormValues } from './form';
 
 export type AuthIdentifierKind = 'email' | 'phone' | 'username';

package/src/types/avatar-group.ts

@@ -2,8 +2,8 @@ import type { ButtonIconSpec } from '@ankhorage/surface';
 import type { ImageSourcePropType } from 'react-native';
 
 import type { AvatarShape, AvatarSize } from '../features/avatar/public';
-import type { ZoraColor } from '../internal/recipes';
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
+import type { ZoraColor } from './theme';
 
 export interface AvatarGroupItem {
   id?: string;

package/src/types/avatar.ts

@@ -1,8 +1,8 @@
 import type { ButtonIconSpec } from '@ankhorage/surface';
 import type { ImageSourcePropType } from 'react-native';
 
-import type { ZoraColor } from '../internal/recipes';
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
+import type { ZoraColor } from './theme';
 
 export type AvatarSize = 'xs' | 's' | 'm' | 'l' | 'xl';
 

package/src/types/badge.ts

@@ -1,8 +1,11 @@
 import type { BadgeProps as SurfaceBadgeProps } from '@ankhorage/surface';
 import type React from 'react';
 
-import type { ZoraBadgeVariant, ZoraColor, ZoraControlSize } from '../internal/recipes';
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
+import type { ZoraControlSize } from './control';
+import type { ZoraColor } from './theme';
+
+export type ZoraBadgeVariant = NonNullable<SurfaceBadgeProps['variant']>;
 
 export interface BadgeProps
   extends

package/src/{theme/ZoraBaseProps.ts → types/base.ts}

@@ -1,6 +1,6 @@
 import type { InteractionPolicy } from '@ankhorage/surface';
 
-import type { ZoraThemeId, ZoraThemeMode } from './types';
+import type { ZoraThemeId, ZoraThemeMode } from './theme';
 
 export interface ZoraBaseProps {
   /**

package/src/types/breadcrumbs.ts

@@ -1,6 +1,6 @@
 import type { ButtonIconSpec } from '@ankhorage/surface';
 
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
 
 export interface BreadcrumbItem {
   id: string;

package/src/types/button-group.ts

@@ -1,7 +1,7 @@
 import type React from 'react';
 
 import type { ViewProps } from '../features/layout/public';
-import type { ZoraBaseProps } from '../theme/ZoraBaseProps';
+import type { ZoraBaseProps } from './base';
 
 export type ButtonGroupAlign = 'start' | 'center' | 'end' | 'stretch' | 'between';
 export type ButtonGroupOrientation = 'horizontal' | 'vertical' | 'responsive';