@ankhorage/zora 19.0.0 → 19.0.1

package/src/features/plugin/application/use-cases/composeZoraPlugins.ts

@@ -0,0 +1,76 @@
+import type {
+  ComposedZoraPluginCatalog,
+  ZoraPluginCompositionErrorCode,
+  ZoraPluginDescriptor,
+} from '../../../../types/plugin';
+import type { ZoraComponentRegistry } from '../../../../types/registry';
+import { ZoraPluginCompositionError } from '../../domain/ZoraPluginCompositionError';
+import { composeZoraPluginMetadata } from './composeZoraPluginMetadata';
+
+/*** Compose a selected ZORA core/plugin descriptor set into one validated authoring/runtime catalog. */
+export function composeZoraPlugins(
+  plugins: readonly ZoraPluginDescriptor[],
+): ComposedZoraPluginCatalog {
+  const descriptors = [...plugins].sort((left, right) =>
+    left.packageName.localeCompare(right.packageName),
+  );
+  const componentRegistry = new Map<string, ZoraComponentRegistry[string]>();
+
+  for (const descriptor of descriptors) {
+    validateRuntime(descriptor);
+    for (const [componentName, component] of sortedEntries(descriptor.componentRegistry)) {
+      componentRegistry.set(componentName, component);
+    }
+  }
+  const metadataCatalog = composeZoraPluginMetadata(descriptors);
+
+  return { ...metadataCatalog, componentRegistry: Object.fromEntries(componentRegistry) };
+}
+
+function validateRuntime(descriptor: ZoraPluginDescriptor): void {
+  const componentMetaNames = new Set(Object.keys(descriptor.componentMeta));
+  const runtimeComponentNames = new Set(Object.keys(descriptor.componentRegistry));
+  for (const componentName of Object.keys(descriptor.componentRegistry).sort()) {
+    if (!componentMetaNames.has(componentName)) {
+      throw compositionError(
+        'missing-component-meta',
+        descriptor.packageName,
+        `ZORA plugin '${descriptor.packageName}' registers runtime component '${componentName}' without component metadata.`,
+        componentName,
+      );
+    }
+  }
+  for (const [componentName, meta] of sortedEntries(descriptor.componentMeta)) {
+    if (meta.directManifestNode && !runtimeComponentNames.has(componentName)) {
+      throw compositionError(
+        'missing-runtime-component',
+        descriptor.packageName,
+        `ZORA plugin '${descriptor.packageName}' exposes direct manifest node '${componentName}' without a runtime component.`,
+        componentName,
+      );
+    }
+  }
+  for (const componentName of descriptor.interactionPolicySupportedComponents ?? []) {
+    if (!runtimeComponentNames.has(componentName)) {
+      throw compositionError(
+        'invalid-interaction-policy-component',
+        descriptor.packageName,
+        `ZORA plugin '${descriptor.packageName}' declares interaction-policy support for unregistered component '${componentName}'.`,
+        componentName,
+      );
+    }
+  }
+}
+
+function sortedEntries<T>(value: Readonly<Record<string, T>>): [string, T][] {
+  return Object.entries(value).sort(([left], [right]) => left.localeCompare(right));
+}
+
+function compositionError(
+  code: ZoraPluginCompositionErrorCode,
+  packageName: string,
+  message: string,
+  componentName?: string,
+): ZoraPluginCompositionError {
+  return new ZoraPluginCompositionError({ code, packageName, message, componentName });
+}

package/src/features/plugin/domain/ZoraPluginCompositionError.ts

@@ -0,0 +1,21 @@
+import type { ZoraPluginCompositionErrorCode } from '../../../types/plugin';
+
+/*** Report one deterministic plugin composition contract violation. */
+export class ZoraPluginCompositionError extends Error {
+  readonly code: ZoraPluginCompositionErrorCode;
+  readonly packageName: string;
+  readonly componentName?: string;
+
+  constructor(args: {
+    readonly code: ZoraPluginCompositionErrorCode;
+    readonly packageName: string;
+    readonly message: string;
+    readonly componentName?: string;
+  }) {
+    super(args.message);
+    this.name = 'ZoraPluginCompositionError';
+    this.code = args.code;
+    this.packageName = args.packageName;
+    this.componentName = args.componentName;
+  }
+}

package/src/{pluginComposition.test.ts → features/plugin/pluginComposition.test.ts}

@@ -1,11 +1,9 @@
 import { describe, expect, test } from 'bun:test';
 
-import type { ZoraComponentMeta } from './metadata';
-import {
-  composeZoraPlugins,
-  ZoraPluginCompositionError,
-  type ZoraPluginDescriptor,
-} from './pluginComposition';
+import type { ZoraComponentMeta } from '../../types/authoring';
+import type { ZoraPluginDescriptor } from '../../types/plugin';
+import { composeZoraPlugins } from './application/use-cases/composeZoraPlugins';
+import { ZoraPluginCompositionError } from './domain/ZoraPluginCompositionError';
 
 const pluginLeafMeta: ZoraComponentMeta = {
   name: 'PluginLeaf',

package/src/features/plugin/public.ts

@@ -0,0 +1,3 @@
+export { composeZoraPluginMetadata } from './application/use-cases/composeZoraPluginMetadata';
+export { ZoraPluginCompositionError } from './domain/ZoraPluginCompositionError';
+export { ZORA_CORE_PLUGIN_METADATA } from './ZORA_CORE_PLUGIN_METADATA';

package/src/features/plugin/runtime.ts

@@ -0,0 +1,2 @@
+export { composeZoraPlugins } from './application/use-cases/composeZoraPlugins';
+export { ZORA_CORE_PLUGIN } from './ZORA_CORE_PLUGIN';

package/src/features/popover-menu/adapters/inbound/PopoverMenu.tsx

@@ -4,12 +4,12 @@ import {
 } from '@ankhorage/surface';
 import React from 'react';
 
-import { resolveIconSize } from '../../../../internal/recipes';
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { PopoverMenuAction, PopoverMenuProps } from '../../../../types/popover-menu';
 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';
 
 /*** Presents a ZORA-styled action list through the Surface PopoverMenu capability. */
 export const PopoverMenu = withZoraThemeScope(PopoverMenuInner);

package/src/features/popover-menu/popoverMenuMeta.ts

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

package/src/features/progress/adapters/inbound/Progress.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import { type ProgressProps, resolveProgressRole } from '../../../../types/progress';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { resolveProgressFraction } from '../../utils/resolveProgressFraction';
 
 function resolveProgressHeight(size: NonNullable<ProgressProps['size']>): number {

package/src/features/progress/adapters/inbound/ProgressRing.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import { StyleSheet, View as ReactNativeView } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import { type ProgressRingProps, resolveProgressRole } from '../../../../types/progress';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 import { resolveProgressFraction } from '../../utils/resolveProgressFraction';
 import { resolveProgressRingGeometry } from '../../utils/resolveProgressRingGeometry';

package/src/features/progress/progressMeta.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';
 
 export const progressMeta = {
   name: 'Progress',

package/src/features/rating/adapters/inbound/Rating.tsx

@@ -1,12 +1,12 @@
 import type { RoleSemantics, SurfaceTheme } from '@ankhorage/surface';
 
-import type { ZoraColor } from '../../../../internal/recipes';
-import { resolveIconSize } from '../../../../internal/recipes';
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { RatingProps } from '../../../../types/rating';
+import type { ZoraColor } from '../../../../types/theme';
 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 { resolveRatingSegments } from '../../utils/resolveRatingSegments';
 
 /*** Displays a read-only star rating with optional half steps. */

package/src/features/rating/ratingMeta.ts

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

package/src/features/reader/adapters/inbound/ReaderSurface.tsx

@@ -1,13 +1,13 @@
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ReaderStatus, ReaderSurfaceProps } from '../../../../types/reader';
 import { AppBar } from '../../../app-bar/public';
 import { IconButton } from '../../../button/public';
 import { View } from '../../../layout/public';
 import { Progress } from '../../../progress/public';
 import { Surface } from '../../../surface/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 import { Text } from '../../../typography/public';
 import { resolveReaderProgress } from '../../utils/resolveReaderProgress';
 

package/src/features/reader/meta.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';
 
 const EMPTY_EVENT_FIELDS = [] as const;
 

package/src/features/registry/ZORA_COMPONENT_REGISTRY.ts

@@ -0,0 +1,186 @@
+import type { InteractionPolicyProps } from '@ankhorage/surface';
+import type React from 'react';
+
+import type { ZoraComponentRegistry } from '../../types/registry';
+import { Accordion, AccordionItem } from '../accordion/public';
+import { ActivityIndicator } from '../activity-indicator/public';
+import { AppBar } from '../app-bar/public';
+import {
+  ForgotPasswordForm,
+  OAuthProviderButton,
+  OAuthProviderList,
+  OtpForm,
+  SignInForm,
+  SignUpForm,
+} from '../auth/public';
+import { Avatar, AvatarGroup } from '../avatar/public';
+import { Badge } from '../badge/public';
+import { BottomSheet } from '../bottom-sheet/public';
+import { Breadcrumbs } from '../breadcrumbs/public';
+import { Button, ButtonGroup, IconButton } from '../button/public';
+import { Card, MediaCard, MetricCard, PostCard, ProductCard } from '../card/public';
+import { ChatListItem, MessageBubble } from '../chat/public';
+import { Chip, ChipGroup } from '../chip/public';
+import { CollectionEditor } from '../collection-editor/public';
+import { ContentRail } from '../content-rail/public';
+import { DataTable } from '../data-table/public';
+import { DatePicker } from '../date-picker/public';
+import { Dialog } from '../dialog/public';
+import { EmptyState } from '../empty-state/public';
+import { Checkbox, CheckboxGroup } from '../form/checkbox/public';
+import { Field, Form, FormActions, FormError } from '../form/public';
+import { Radio, RadioGroup } from '../form/radio/public';
+import { SearchInput } from '../form/search-input/public';
+import { Select } from '../form/select/public';
+import { Switch } from '../form/switch/public';
+import { TextInput } from '../form/text-input/public';
+import { Gradient } from '../gradient/public';
+import { Hero } from '../hero/public';
+import { Icon } from '../icon/public';
+import { Image } from '../image/public';
+import { KeyboardAvoidingView } from '../keyboard-avoiding-view/public';
+import { AppShell, Divider, Grid, Screen, ScrollView, View } from '../layout/public';
+import { FlatList, List, ListItem, ListSection, SectionList } from '../list/public';
+import { MissingElement } from '../missing-element/public';
+import { Pagination } from '../pagination/public';
+import { PaletteItem } from '../palette-item/public';
+import { PopoverMenu } from '../popover-menu/public';
+import { Progress, ProgressRing } from '../progress/public';
+import { Rating } from '../rating/public';
+import { ReaderSurface } from '../reader/public';
+import { BarcodeScannerView, CameraPermissionView, ScanOverlay } from '../scanner/public';
+import { ScreenSection, SectionHeader } from '../section/public';
+import { SelectableItem } from '../selection/public';
+import { Skeleton, SkeletonCard, SkeletonList, SkeletonText } from '../skeleton/public';
+import { Surface } from '../surface/public';
+import { Tab, TabList, TabPanel, Tabs } from '../tabs/public';
+import { ThemeModeToggle } from '../theme/adapters/inbound/ThemeModeToggle';
+import { TimePicker } from '../time-picker/public';
+import { Timeline } from '../timeline/public';
+import { Toast } from '../toast/public';
+import { Toolbar } from '../toolbar/public';
+import { TreeItem, TreeView } from '../tree-view/public';
+import { Heading, Text } from '../typography/public';
+import { Uploader } from '../uploader/public';
+
+type ComponentPropsFor<K extends keyof typeof _ZORA_COMPONENT_REGISTRY> = React.ComponentProps<
+  (typeof _ZORA_COMPONENT_REGISTRY)[K]
+>;
+
+type AcceptsSurfaceInteractionPolicyProps<P> = 'interactionPolicy' extends keyof P
+  ? InteractionPolicyProps extends Pick<P, 'interactionPolicy'>
+    ? Pick<P, 'interactionPolicy'> extends InteractionPolicyProps
+      ? true
+      : false
+    : false
+  : false;
+
+type RegistryInteractionPolicyContract = {
+  [K in keyof typeof _ZORA_COMPONENT_REGISTRY]: AcceptsSurfaceInteractionPolicyProps<
+    ComponentPropsFor<K>
+  >;
+};
+
+type _AssertTrue<T extends true> = T;
+type _RegistryInteractionPolicyCheck = _AssertTrue<
+  RegistryInteractionPolicyContract[keyof typeof _ZORA_COMPONENT_REGISTRY]
+>;
+
+const _ZORA_COMPONENT_REGISTRY = {
+  Accordion,
+  AccordionItem,
+  ActivityIndicator,
+  AppBar,
+  Avatar,
+  AvatarGroup,
+  Badge,
+  Breadcrumbs,
+  Button,
+  ButtonGroup,
+  Card,
+  Checkbox,
+  CheckboxGroup,
+  Chip,
+  ChipGroup,
+  DataTable,
+  DatePicker,
+  Dialog,
+  Form,
+  FormActions,
+  FormError,
+  Field,
+  Gradient,
+  Heading,
+  Icon,
+  IconButton,
+  Image,
+  KeyboardAvoidingView,
+  TextInput,
+  MediaCard,
+  MetricCard,
+  Pagination,
+  PopoverMenu,
+  Progress,
+  ProgressRing,
+  Radio,
+  RadioGroup,
+  Rating,
+  SearchInput,
+  Select,
+  Switch,
+  Skeleton,
+  SkeletonCard,
+  SkeletonList,
+  SkeletonText,
+  Tab,
+  TabList,
+  TabPanel,
+  Tabs,
+  Text,
+  TimePicker,
+  Toast,
+  Toolbar,
+  Uploader,
+  BottomSheet,
+  FlatList,
+  SectionList,
+  ScrollView,
+  View,
+  ThemeModeToggle,
+  Divider,
+  Grid,
+  Surface,
+  AppShell,
+  Screen,
+  ScreenSection,
+  ForgotPasswordForm,
+  OAuthProviderButton,
+  OAuthProviderList,
+  OtpForm,
+  SignInForm,
+  SignUpForm,
+  ChatListItem,
+  CollectionEditor,
+  ContentRail,
+  EmptyState,
+  Hero,
+  List,
+  ListItem,
+  ListSection,
+  MessageBubble,
+  MissingElement,
+  PostCard,
+  ProductCard,
+  ReaderSurface,
+  BarcodeScannerView,
+  CameraPermissionView,
+  ScanOverlay,
+  SectionHeader,
+  SelectableItem,
+  PaletteItem,
+  Timeline,
+  TreeItem,
+  TreeView,
+} as const satisfies ZoraComponentRegistry;
+
+export const ZORA_COMPONENT_REGISTRY: ZoraComponentRegistry = _ZORA_COMPONENT_REGISTRY;

package/src/features/registry/public.ts

@@ -0,0 +1 @@
+export { ZORA_COMPONENT_REGISTRY } from './ZORA_COMPONENT_REGISTRY';

package/src/{registry.test.ts → features/registry/registry.test.ts}

@@ -1,11 +1,12 @@
 import { describe, expect, test } from 'bun:test';
 
-import type { ZoraComponentRegistry } from '.';
+import type { ZoraComponentRegistry } from '../../types/registry';
 
 const NON_RUNTIME_COMPONENT_EXPORTS = new Set([
   'GradientRendererProvider',
   'SelectionProvider',
   'ToastProvider',
+  'ZoraPluginCompositionError',
 ]);
 const RUNTIME_THEME_COMPONENT_EXPORTS = ['ThemeModeToggle'] as const;
 const REGISTRY_SNAPSHOT_PREFIX = 'ZORA_REGISTRY_SNAPSHOT:';
@@ -75,8 +76,10 @@ describe('ZORA_COMPONENT_REGISTRY', () => {
     expect(registry).toEqual({});
     expect(registryEntries).toContain('Screen');
     expect(registryEntries).toContain('View');
-    expect(source).toContain("export type { ZoraComponentRegistry } from './registry';");
-    expect(source).toContain("export { ZORA_COMPONENT_REGISTRY } from './registry';");
+    expect(source).toContain("export type { ZoraComponentRegistry } from './types/registry';");
+    expect(source).toContain(
+      "export { ZORA_COMPONENT_REGISTRY } from './features/registry/public';",
+    );
   });
 
   test('covers every public concrete ZORA component export supported for runtime rendering', async () => {

package/src/features/scanner/adapters/inbound/BarcodeScannerView.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { BarcodeScannerViewProps } from '../../../../types/scanner';
 import { Card } from '../../../card/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 { CameraPermissionView } from './CameraPermissionView';
 import { ScanOverlay } from './ScanOverlay';

package/src/features/scanner/adapters/inbound/CameraPermissionView.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { CameraPermissionViewProps } from '../../../../types/scanner';
 import { Button } 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 resolvePermissionCopy(status: CameraPermissionViewProps['status']) {

package/src/features/scanner/adapters/inbound/ScanOverlay.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ScanOverlayProps } from '../../../../types/scanner';
 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 ScanOverlayInner({

package/src/features/scanner/meta.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 scanOverlayMeta = {
   name: 'ScanOverlay',

package/src/features/section/adapters/inbound/ScreenSection.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { ScreenSectionProps } from '../../../../types/section';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { SectionHeader } from './SectionHeader';
 
 function ScreenSectionInner({

package/src/features/section/adapters/inbound/SectionHeader.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { SectionHeaderProps } from '../../../../types/section';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Heading } from '../../../typography/public';
 import { Text } from '../../../typography/public';
 

package/src/features/section/screenSectionMeta.ts

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

package/src/features/section/sectionHeaderMeta.ts

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

package/src/features/selection/meta.ts

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

package/src/features/skeleton/adapters/inbound/Skeleton.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import { useZoraTheme } from '../../../../theme/useZoraTheme';
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { SkeletonProps } from '../../../../types/skeleton';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
+import { useZoraTheme } from '../../../theme/composition/useZoraTheme';
 
 function SkeletonInner({
   themeId: _themeId,

package/src/features/skeleton/adapters/inbound/SkeletonCard.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { SkeletonCardProps } from '../../../../types/skeleton';
 import { ButtonGroup } from '../../../button/public';
 import { Card } from '../../../card/public';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Skeleton } from './Skeleton';
 import { SkeletonText } from './SkeletonText';
 

package/src/features/skeleton/adapters/inbound/SkeletonList.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { SkeletonListProps } from '../../../../types/skeleton';
 import { List, type ListItemProps } from '../../../list/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Skeleton } from './Skeleton';
 import { SkeletonText } from './SkeletonText';
 

package/src/features/skeleton/adapters/inbound/SkeletonText.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { SkeletonTextProps } from '../../../../types/skeleton';
 import { View } from '../../../layout/public';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 import { Skeleton } from './Skeleton';
 
 function clampLines(lines: number): number {

package/src/features/skeleton/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('skeletons support direct authoring and automatic feature loading states', async () => {
   const [dataTableSource, publicSource] = await Promise.all([

package/src/features/skeleton/skeletonMeta.ts

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

package/src/features/surface/adapters/inbound/Surface.tsx

@@ -1,8 +1,8 @@
 import { Surface as SurfaceSurface } from '@ankhorage/surface';
 import React from 'react';
 
-import { withZoraThemeScope } from '../../../../theme/withZoraThemeScope';
 import type { SurfaceProps } from '../../../../types/surface';
+import { withZoraThemeScope } from '../../../theme/adapters/inbound/withZoraThemeScope';
 
 /*** Adapts the themed Surface Surface primitive to ZORA scope and interaction props. */
 export const Surface = withZoraThemeScope(SurfaceInner);

package/src/features/surface/surfaceMeta.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';
 import { LAYOUT_PROPS } from '../layout/constants';
 
 export const surfaceMeta = {