@semiont/react-ui 0.4.21 → 0.4.22

package/src/components/resource/__tests__/event-formatting.test.ts

@@ -9,10 +9,14 @@ import {
 } from '../event-formatting';
 
 // Mock api-client functions
-vi.mock('@semiont/api-client', () => ({
+vi.mock('@semiont/core', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@semiont/core')>();
+  return {
+    ...actual,
   getExactText: vi.fn((selector: any) => selector?.exact ?? null),
   getTargetSelector: vi.fn((target: any) => target?.selector ?? null),
-}));
+  };
+});
 
 const t = vi.fn((key: string, params?: Record<string, string | number>) => {
   if (params) return `${key}(${JSON.stringify(params)})`;

package/src/components/resource/event-formatting.ts

@@ -6,11 +6,10 @@
  */
 
 import type { StoredEventLike, PersistedEventType } from '@semiont/core';
-import type { components } from '@semiont/core';
-import { getExactText, getTargetSelector } from '@semiont/api-client';
+import { getExactText, getTargetSelector } from '@semiont/core';
 import { ANNOTATORS } from '../../lib/annotation-registry';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 type TranslateFn = (key: string, params?: Record<string, string | number>) => string;
 
 // =============================================================================

package/src/components/resource/panels/AssessmentEntry.tsx

@@ -1,14 +1,12 @@
 'use client';
 
 import type { Ref } from 'react';
-import type { components } from '@semiont/core';
-import { getAnnotationExactText } from '@semiont/api-client';
+import type { Annotation } from '@semiont/core';
+import { getAnnotationExactText } from '@semiont/core';
 import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useHoverEmitter } from '../../../hooks/useHoverEmitter';
 
-type Annotation = components['schemas']['Annotation'];
-
 // W3C Annotation TextualBody type
 interface TextualBody {
   type: 'TextualBody';
@@ -88,7 +86,7 @@ export function AssessmentEntry({
       data-type="assessment"
       data-focused={isFocused ? 'true' : 'false'}
       onClick={() => {
-        session?.client.emit('browse:click', { annotationId: assessment.id, motivation: assessment.motivation });
+        session?.client.browse.click(assessment.id, assessment.motivation);
       }}
       {...hoverProps}
     >

package/src/components/resource/panels/AssessmentPanel.tsx

@@ -6,13 +6,13 @@ import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useEventSubscriptions } from '../../../contexts/useEventSubscription';
 import type { components, Selector } from '@semiont/core';
-import { getTextPositionSelector, getTargetSelector } from '@semiont/api-client';
+import { getTextPositionSelector, getTargetSelector } from '@semiont/core';
 import { AssessmentEntry } from './AssessmentEntry';
 import { AssistSection } from './AssistSection';
 import { PanelHeader } from './PanelHeader';
 import './AssessmentPanel.css';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 type Motivation = components['schemas']['Motivation'];
 type JobProgress = components['schemas']['JobProgress'];
 
@@ -147,7 +147,7 @@ export function AssessmentPanel({
         ? { type: 'TextualBody', value: trimmed, purpose: 'assessing' }
         : undefined;
 
-      session?.client.emit('mark:submit', {
+      session?.client.mark.submit({
         motivation: 'assessing',
         selector: pendingAnnotation.selector,
         ...(body !== undefined ? { body } : {}),
@@ -162,7 +162,7 @@ export function AssessmentPanel({
 
     const handleEscape = (e: KeyboardEvent) => {
       if (e.key === 'Escape') {
-        session?.client.emit('mark:cancel-pending', undefined);
+        session?.client.mark.cancelPending();
         setNewAssessmentText('');
       }
     };
@@ -215,7 +215,7 @@ export function AssessmentPanel({
             <div className="semiont-annotation-prompt__actions">
               <button
                 onClick={() => {
-                  session?.client.emit('mark:cancel-pending', undefined);
+                  session?.client.mark.cancelPending();
                   setNewAssessmentText('');
                 }}
                 className="semiont-button semiont-button--secondary"

package/src/components/resource/panels/AssistSection.tsx

@@ -70,15 +70,11 @@ export function AssistSection({
       annotationType === 'assessment' ? 'assessing' :
       'commenting';
 
-    // Emit mark:assist-request event with options
-    session?.client.emit('mark:assist-request', {
-      motivation,
-      options: {
-        instructions: instructions.trim() || undefined,
-        tone: (annotationType === 'comment' || annotationType === 'assessment') && tone ? tone : undefined,
-        density: (annotationType === 'comment' || annotationType === 'assessment' || annotationType === 'highlight') && useDensity ? density : undefined,
-        language: (annotationType === 'comment' || annotationType === 'assessment') ? locale : undefined,
-      },
+    session?.client.mark.requestAssist(motivation, {
+      instructions: instructions.trim() || undefined,
+      tone: (annotationType === 'comment' || annotationType === 'assessment') && tone ? tone : undefined,
+      density: (annotationType === 'comment' || annotationType === 'assessment' || annotationType === 'highlight') && useDensity ? density : undefined,
+      language: (annotationType === 'comment' || annotationType === 'assessment') ? locale : undefined,
     });
 
     setInstructions('');
@@ -87,7 +83,7 @@ export function AssistSection({
   }, [annotationType, instructions, tone, useDensity, density, locale, session]);
 
   const handleDismissProgress = useCallback(() => {
-    session?.client.emit('mark:progress-dismiss', undefined);
+    session?.client.mark.dismissProgress();
   }, [session]);
 
   return (

package/src/components/resource/panels/CollaborationPanel.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import type { ConnectionState } from '@semiont/api-client';
+import type { ConnectionState } from '@semiont/core';
 import { useTranslations } from '../../../contexts/TranslationContext';
 import './CollaborationPanel.css';
 

package/src/components/resource/panels/CommentEntry.tsx

@@ -2,14 +2,12 @@
 
 import { useState, useEffect, useRef, useImperativeHandle, type Ref } from 'react';
 import { useTranslations } from '../../../contexts/TranslationContext';
-import type { components } from '@semiont/core';
-import { getAnnotationExactText, getCommentText } from '@semiont/api-client';
+import type { Annotation } from '@semiont/core';
+import { getAnnotationExactText, getCommentText } from '@semiont/core';
 import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useHoverEmitter } from '../../../hooks/useHoverEmitter';
 
-type Annotation = components['schemas']['Annotation'];
-
 interface CommentEntryProps {
   comment: Annotation;
   isFocused: boolean;
@@ -87,7 +85,7 @@ export function CommentEntry({
       data-type="comment"
       data-focused={isFocused ? 'true' : 'false'}
       onClick={() => {
-        session?.client.emit('browse:click', { annotationId: comment.id, motivation: comment.motivation });
+        session?.client.browse.click(comment.id, comment.motivation);
       }}
       {...hoverProps}
     >

package/src/components/resource/panels/CommentsPanel.tsx

@@ -6,13 +6,13 @@ import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useEventSubscriptions } from '../../../contexts/useEventSubscription';
 import type { components, Selector } from '@semiont/core';
-import { getTextPositionSelector, getTargetSelector } from '@semiont/api-client';
+import { getTextPositionSelector, getTargetSelector } from '@semiont/core';
 import { CommentEntry } from './CommentEntry';
 import { AssistSection } from './AssistSection';
 import { PanelHeader } from './PanelHeader';
 import './CommentsPanel.css';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 type Motivation = components['schemas']['Motivation'];
 type JobProgress = components['schemas']['JobProgress'];
 
@@ -167,7 +167,7 @@ export function CommentsPanel({
 
   const handleSaveNewComment = () => {
     if (newCommentText.trim() && pendingAnnotation) {
-      session?.client.emit('mark:submit', {
+      session?.client.mark.submit({
         motivation: 'commenting',
         selector: pendingAnnotation.selector,
         body: [{ type: 'TextualBody', value: newCommentText, purpose: 'commenting' }],
@@ -182,7 +182,7 @@ export function CommentsPanel({
 
     const handleEscape = (e: KeyboardEvent) => {
       if (e.key === 'Escape') {
-        session?.client.emit('mark:cancel-pending', undefined);
+        session?.client.mark.cancelPending();
         setNewCommentText('');
       }
     };
@@ -224,7 +224,7 @@ export function CommentsPanel({
             <div className="semiont-annotation-prompt__actions">
               <button
                 onClick={() => {
-                  session?.client.emit('mark:cancel-pending', undefined);
+                  session?.client.mark.cancelPending();
                   setNewCommentText('');
                 }}
                 className="semiont-button semiont-button--secondary"

package/src/components/resource/panels/HighlightEntry.tsx

@@ -1,14 +1,12 @@
 'use client';
 
 import type { Ref } from 'react';
-import type { components } from '@semiont/core';
-import { getAnnotationExactText } from '@semiont/api-client';
+import type { Annotation } from '@semiont/core';
+import { getAnnotationExactText } from '@semiont/core';
 import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useHoverEmitter } from '../../../hooks/useHoverEmitter';
 
-type Annotation = components['schemas']['Annotation'];
-
 interface HighlightEntryProps {
   highlight: Annotation;
   isFocused: boolean;
@@ -51,7 +49,7 @@ export function HighlightEntry({
       data-type="highlight"
       data-focused={isFocused ? 'true' : 'false'}
       onClick={() => {
-        session?.client.emit('browse:click', { annotationId: highlight.id, motivation: highlight.motivation });
+        session?.client.browse.click(highlight.id, highlight.motivation);
       }}
       {...hoverProps}
     >

package/src/components/resource/panels/HighlightPanel.tsx

@@ -6,13 +6,13 @@ import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useEventSubscriptions } from '../../../contexts/useEventSubscription';
 import type { components, Selector } from '@semiont/core';
-import { getTextPositionSelector, getTargetSelector } from '@semiont/api-client';
+import { getTextPositionSelector, getTargetSelector } from '@semiont/core';
 import { HighlightEntry } from './HighlightEntry';
 import { AssistSection } from './AssistSection';
 import { PanelHeader } from './PanelHeader';
 import './HighlightPanel.css';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 type Motivation = components['schemas']['Motivation'];
 type JobProgress = components['schemas']['JobProgress'];
 
@@ -132,7 +132,7 @@ export function HighlightPanel({
   // per the W3C Web Annotation Model.
   useEffect(() => {
     if (pendingAnnotation && pendingAnnotation.motivation === 'highlighting') {
-      session?.client.emit('mark:submit', {
+      session?.client.mark.submit({
         motivation: 'highlighting',
         selector: pendingAnnotation.selector,
       });

package/src/components/resource/panels/ReferenceEntry.tsx

@@ -3,9 +3,9 @@
 import type { Ref } from 'react';
 import type { RouteBuilder } from '../../../contexts/RoutingContext';
 import { useTranslations } from '../../../contexts/TranslationContext';
-import type { components } from '@semiont/core';
-import { annotationId, resourceId } from '@semiont/core';
-import { getAnnotationExactText, isBodyResolved, getBodySource, getFragmentSelector, getSvgSelector, getTargetSelector } from '@semiont/api-client';
+import type { Annotation } from '@semiont/core';
+import { resourceId } from '@semiont/core';
+import { getAnnotationExactText, isBodyResolved, getBodySource, getFragmentSelector, getSvgSelector, getTargetSelector } from '@semiont/core';
 import { getEntityTypes } from '@semiont/ontology';
 import { getResourceIcon } from '../../../lib/resource-utils';
 import { useSemiont } from '../../../session/SemiontProvider';
@@ -13,8 +13,6 @@ import { useObservable } from '../../../hooks/useObservable';
 import { useObservableExternalNavigation } from '../../../hooks/useObservableBrowse';
 import { useHoverEmitter } from '../../../hooks/useHoverEmitter';
 
-type Annotation = components['schemas']['Annotation'];
-
 // Extended annotation type with runtime properties added by backend enrichment
 interface EnrichedAnnotation extends Annotation {
   _resolvedDocumentName?: string;
@@ -78,15 +76,15 @@ export function ReferenceEntry({
     if (source && resolvedResourceUri && semiont) {
       semiont.bind.body(
         resourceId(source),
-        annotationId(reference.id),
+        reference.id,
         [{ op: 'remove', item: { type: 'SpecificResource', source: resolvedResourceUri, purpose: 'linking' } }],
       ).catch(() => { /* error handled by events-stream */ });
     }
   };
 
   const handleInitiateWizard = () => {
-    session?.client.emit('bind:initiate', {
-      annotationId: annotationId(reference.id),
+    session?.client.bind.initiate({
+      annotationId: reference.id,
       resourceId: resourceId(source),
       defaultTitle: selectedText,
       entityTypes,
@@ -112,7 +110,7 @@ export function ReferenceEntry({
       data-type="reference"
       data-focused={isFocused ? 'true' : 'false'}
       onClick={() => {
-        session?.client.emit('browse:click', { annotationId: reference.id, motivation: reference.motivation });
+        session?.client.browse.click(reference.id, reference.motivation);
       }}
       {...hoverProps}
     >

package/src/components/resource/panels/ReferencesPanel.tsx

@@ -9,13 +9,13 @@ import type { RouteBuilder, LinkComponentProps } from '../../../contexts/Routing
 import { AnnotateReferencesProgressWidget } from '../../AnnotateReferencesProgressWidget';
 import { ReferenceEntry } from './ReferenceEntry';
 import type { components, Selector } from '@semiont/core';
-import { getTextPositionSelector, getTargetSelector } from '@semiont/api-client';
+import { getTextPositionSelector, getTargetSelector } from '@semiont/core';
 import { PanelHeader } from './PanelHeader';
 import './ReferencesPanel.css';
 
 type JobProgress = components['schemas']['JobProgress'];
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 type Motivation = components['schemas']['Motivation'];
 type ReferencedBy = components['schemas']['GetReferencedByResponse']['referencedBy'][number];
 
@@ -203,12 +203,9 @@ export function ReferencesPanel({
   // Clear log when starting new annotation
   const handleAssist = () => {
     setLastDetectionLog(null);
-    session?.client.emit('mark:assist-request', {
-      motivation: 'linking',
-      options: {
-        entityTypes: selectedEntityTypes,
-        includeDescriptiveReferences,
-      },
+    session?.client.mark.requestAssist('linking', {
+      entityTypes: selectedEntityTypes,
+      includeDescriptiveReferences,
     });
   };
 
@@ -246,7 +243,7 @@ export function ReferencesPanel({
   const handleCreateReference = () => {
     if (pendingAnnotation) {
       const entityType = pendingEntityTypes.join(',') || undefined;
-      session?.client.emit('mark:submit', {
+      session?.client.mark.submit({
         motivation: 'linking',
         selector: pendingAnnotation.selector,
         body: entityType ? [{ type: 'TextualBody', value: entityType, purpose: 'tagging' }] : [],
@@ -261,7 +258,7 @@ export function ReferencesPanel({
 
     const handleEscape = (e: KeyboardEvent) => {
       if (e.key === 'Escape') {
-        session?.client.emit('mark:cancel-pending', undefined);
+        session?.client.mark.cancelPending();
         setPendingEntityTypes([]);
       }
     };
@@ -313,7 +310,7 @@ export function ReferencesPanel({
             <div className="semiont-annotation-prompt__actions">
               <button
                 onClick={() => {
-                  session?.client.emit('mark:cancel-pending', undefined);
+                  session?.client.mark.cancelPending();
                   setPendingEntityTypes([]);
                 }}
                 className="semiont-button semiont-button--secondary"

package/src/components/resource/panels/ResourceInfoPanel.tsx

@@ -3,7 +3,7 @@
 import { useTranslations } from '../../../contexts/TranslationContext';
 import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
-import { formatLocaleDisplay } from '@semiont/api-client';
+import { formatLocaleDisplay } from '@semiont/core';
 import { resourceId as makeResourceId, type components } from '@semiont/core';
 import './ResourceInfoPanel.css';
 
@@ -149,7 +149,7 @@ export function ResourceInfoPanel({
                     <button
                       key={id}
                       className="semiont-resource-info-panel__link"
-                      onClick={() => session?.client.emit('browse:reference-navigate', { resourceId: id })}
+                      onClick={() => session?.client.browse.navigateReference(makeResourceId(id))}
                     >
                       {i > 0 && ', '}{id}
                     </button>
@@ -192,7 +192,7 @@ export function ResourceInfoPanel({
       {/* Clone Action */}
       <div className="semiont-resource-info-panel__action-section">
         <button
-          onClick={() => session?.client.emit('yield:clone', undefined)}
+          onClick={() => session?.client.yield.clone()}
           className="semiont-resource-button semiont-resource-button--secondary"
         >
           🔗 {t('clone')}
@@ -207,7 +207,7 @@ export function ResourceInfoPanel({
         {isArchived ? (
           <>
             <button
-              onClick={() => session?.client.emit('mark:unarchive', { resourceId: makeResourceId(resourceId) })}
+              onClick={() => session?.client.mark.unarchive(makeResourceId(resourceId))}
               className="semiont-resource-button semiont-resource-button--secondary"
             >
               📤 {t('unarchive')}
@@ -219,7 +219,7 @@ export function ResourceInfoPanel({
         ) : (
           <>
             <button
-              onClick={() => session?.client.emit('mark:archive', { resourceId: makeResourceId(resourceId) })}
+              onClick={() => session?.client.mark.archive(makeResourceId(resourceId))}
               className="semiont-resource-button semiont-resource-button--archive"
             >
               📦 {t('archive')}

package/src/components/resource/panels/StatisticsPanel.tsx

@@ -1,12 +1,11 @@
 'use client';
 
 import { useTranslations } from '../../../contexts/TranslationContext';
-import type { components } from '@semiont/core';
-import { isBodyResolved } from '@semiont/api-client';
+import { isBodyResolved } from '@semiont/core';
 import { getEntityTypes } from '@semiont/ontology';
 import './StatisticsPanel.css';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 
 interface StatisticsPanelProps {
   highlights: Annotation[];

package/src/components/resource/panels/TagEntry.tsx

@@ -1,16 +1,14 @@
 'use client';
 
 import type { Ref } from 'react';
-import type { components } from '@semiont/core';
-import { getAnnotationExactText } from '@semiont/api-client';
+import type { Annotation } from '@semiont/core';
+import { getAnnotationExactText } from '@semiont/core';
 import { getTagCategory, getTagSchemaId } from '@semiont/ontology';
 import { getTagSchema } from '../../../lib/tag-schemas';
 import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useHoverEmitter } from '../../../hooks/useHoverEmitter';
 
-type Annotation = components['schemas']['Annotation'];
-
 interface TagEntryProps {
   tag: Annotation;
   isFocused: boolean;
@@ -36,7 +34,7 @@ export function TagEntry({
     <div
       ref={ref}
       onClick={() => {
-        session?.client.emit('browse:click', { annotationId: tag.id, motivation: tag.motivation });
+        session?.client.browse.click(tag.id, tag.motivation);
       }}
       {...hoverProps}
       className={`semiont-annotation-entry${isHovered ? ' semiont-annotation-pulse' : ''}`}

package/src/components/resource/panels/TaggingPanel.tsx

@@ -6,13 +6,13 @@ import { useSemiont } from '../../../session/SemiontProvider';
 import { useObservable } from '../../../hooks/useObservable';
 import { useEventSubscriptions } from '../../../contexts/useEventSubscription';
 import type { components, Selector } from '@semiont/core';
-import { getTextPositionSelector, getTargetSelector } from '@semiont/api-client';
+import { getTextPositionSelector, getTargetSelector } from '@semiont/core';
 import { TagEntry } from './TagEntry';
 import { PanelHeader } from './PanelHeader';
 import { getAllTagSchemas } from '../../../lib/tag-schemas';
 import './TaggingPanel.css';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 type Motivation = components['schemas']['Motivation'];
 type JobProgress = components['schemas']['JobProgress'];
 
@@ -189,12 +189,9 @@ export function TaggingPanel({
 
   const handleAssist = () => {
     if (selectedCategories.size > 0) {
-      session?.client.emit('mark:assist-request', {
-        motivation: 'tagging',
-        options: {
-          schemaId: selectedSchemaId,
-          categories: Array.from(selectedCategories),
-        },
+      session?.client.mark.requestAssist('tagging', {
+        schemaId: selectedSchemaId,
+        categories: Array.from(selectedCategories),
       });
       setSelectedCategories(new Set()); // Reset after annotation
     }
@@ -206,7 +203,7 @@ export function TaggingPanel({
 
     const handleEscape = (e: KeyboardEvent) => {
       if (e.key === 'Escape') {
-        session?.client.emit('mark:cancel-pending', undefined);
+        session?.client.mark.cancelPending();
       }
     };
 
@@ -268,7 +265,7 @@ export function TaggingPanel({
                   className="semiont-select"
                   onChange={(e) => {
                     if (e.target.value && pendingAnnotation) {
-                      session?.client.emit('mark:submit', {
+                      session?.client.mark.submit({
                         motivation: 'tagging',
                         selector: pendingAnnotation.selector,
                         body: [
@@ -299,7 +296,7 @@ export function TaggingPanel({
             {/* Cancel button */}
             <div className="semiont-annotation-prompt__footer">
               <button
-                onClick={() => session?.client.emit('mark:cancel-pending', undefined)}
+                onClick={() => session?.client.mark.cancelPending()}
                 className="semiont-button semiont-button--secondary"
                 data-type="tag"
               >

package/src/components/resource/panels/UnifiedAnnotationsPanel.tsx

@@ -14,7 +14,7 @@ import { CommentsPanel } from './CommentsPanel';
 import { TaggingPanel } from './TaggingPanel';
 import './UnifiedAnnotationsPanel.css';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 type Motivation = components['schemas']['Motivation'];
 type TabKey = 'statistics' | 'reference' | 'highlight' | 'assessment' | 'comment' | 'tag';
 

package/src/components/resource/panels/__tests__/AssessmentEntry.test.tsx

@@ -6,18 +6,18 @@ import { renderWithProviders } from '../../../../test-utils';
 import userEvent from '@testing-library/user-event';
 import type { components } from '@semiont/core';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 
 // Mock @semiont/api-client
-vi.mock('@semiont/api-client', async () => {
-  const actual = await vi.importActual('@semiont/api-client');
+vi.mock('@semiont/core', async () => {
+  const actual = await vi.importActual('@semiont/core');
   return {
     ...actual,
     getAnnotationExactText: vi.fn(),
   };
 });
 
-import { getAnnotationExactText } from '@semiont/api-client';
+import { getAnnotationExactText } from '@semiont/core';
 import type { MockedFunction } from 'vitest';
 import { AssessmentEntry } from '../AssessmentEntry';
 

package/src/components/resource/panels/__tests__/AssessmentPanel.test.tsx

@@ -8,7 +8,7 @@ import { AssessmentPanel } from '../AssessmentPanel';
 import type { components, EventBus } from '@semiont/core';
 import { createTestSemiontWrapper } from '../../../../test-utils';
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 
 // Composition-based event tracker
 interface TrackedEvent {
@@ -58,8 +58,8 @@ vi.mock('../../../../contexts/TranslationContext', () => ({
 }));
 
 // Mock @semiont/api-client utilities
-vi.mock('@semiont/api-client', async () => {
-  const actual = await vi.importActual('@semiont/api-client');
+vi.mock('@semiont/core', async () => {
+  const actual = await vi.importActual('@semiont/core');
   return {
     ...actual,
     getTextPositionSelector: vi.fn(),
@@ -86,8 +86,7 @@ vi.mock('../AssistSection', () => ({
   ),
 }));
 
-import { getTextPositionSelector, getTargetSelector } from '@semiont/api-client';
-
+import { getTextPositionSelector, getTargetSelector } from '@semiont/core';
 const mockGetTextPositionSelector = getTextPositionSelector as MockedFunction<typeof getTextPositionSelector>;
 const mockGetTargetSelector = getTargetSelector as MockedFunction<typeof getTargetSelector>;
 

package/src/components/resource/panels/__tests__/CommentEntry.test.tsx

@@ -8,7 +8,7 @@ import { CommentEntry } from '../CommentEntry';
 import type { components } from '@semiont/core';
 import type { EventBus } from "@semiont/core"
 
-type Annotation = components['schemas']['Annotation'];
+import type { Annotation } from '@semiont/core';
 
 // Mock TranslationContext
 vi.mock('../../../../contexts/TranslationContext', () => ({
@@ -24,8 +24,8 @@ vi.mock('../../../../contexts/TranslationContext', () => ({
 }));
 
 // Mock @semiont/api-client utilities
-vi.mock('@semiont/api-client', async () => {
-  const actual = await vi.importActual('@semiont/api-client');
+vi.mock('@semiont/core', async () => {
+  const actual = await vi.importActual('@semiont/core');
   return {
     ...actual,
     getCommentText: vi.fn(),
@@ -33,7 +33,7 @@ vi.mock('@semiont/api-client', async () => {
   };
 });
 
-import { getCommentText, getAnnotationExactText } from '@semiont/api-client';
+import { getCommentText, getAnnotationExactText } from '@semiont/core';
 import type { MockedFunction } from 'vitest';
 
 const mockGetCommentText = getCommentText as MockedFunction<typeof getCommentText>;