refactor: Import types directly from @openmrs/esm-form-engine-lib

- Remove re-exported types from src/types.ts
- Update all files to import FormField, FormPage, FormSection directly from @openmrs/esm-form-engine-lib
- Keep only local types in src/types.ts (FormBuilderSchema, Form, Schema, Concept, etc.)
- This eliminates redundant type re-exports and makes dependencies clearer

Author: RajPrakash681

src/components/interactive-builder/draggable/draggable-question.component.tsx

@@ -6,14 +6,15 @@ import { IconButton } from '@carbon/react';
 import { Draggable, Edit, TrashCan, Copy } from '@carbon/react/icons';
 import { showModal, ChevronDownIcon, ChevronUpIcon } from '@openmrs/esm-framework';
 import MarkdownWrapper from '../markdown-wrapper/markdown-wrapper';
-import type { Question, Schema } from '@types';
+import type { FormField } from '@openmrs/esm-form-engine-lib';
+import type { Schema } from '@types';
 import styles from './draggable-question.scss';
 
 interface DraggableQuestionProps {
-  handleDuplicateQuestion: (question: Question, pageId: number, sectionId: number, questionId?: number) => void;
+  handleDuplicateQuestion: (question: FormField, pageId: number, sectionId: number, questionId?: number) => void;
   onSchemaChange: (schema: Schema) => void;
   pageIndex: number;
-  question: Question;
+  question: FormField;
   questionCount: number;
   questionIndex: number;
   schema: Schema;

src/components/interactive-builder/interactive-builder.component.tsx

@@ -19,8 +19,8 @@ import { showModal, showSnackbar } from '@openmrs/esm-framework';
 import DraggableQuestion from './draggable/draggable-question.component';
 import EditableValue from './editable/editable-value.component';
 import type { DragEndEvent } from '@dnd-kit/core';
-import type { FormSchema } from '@openmrs/esm-form-engine-lib';
-import type { Schema, Question } from '@types';
+import type { FormSchema, FormField } from '@openmrs/esm-form-engine-lib';
+import type { Schema } from '@types';
 import styles from './interactive-builder.scss';
 
 interface ValidationError {
@@ -37,7 +37,7 @@ interface InteractiveBuilderProps {
 }
 
 interface SubQuestionProps {
-  question: Question;
+  question: FormField;
   pageIndex: number;
   sectionIndex: number;
   questionIndex: number;
@@ -257,9 +257,9 @@ const InteractiveBuilder: React.FC<InteractiveBuilderProps> = ({
   );
 
   const duplicateQuestion = useCallback(
-    (question: Question, pageId: number, sectionId: number, questionId?: number) => {
+    (question: FormField, pageId: number, sectionId: number, questionId?: number) => {
       try {
-        const questionToDuplicate: Question = JSON.parse(JSON.stringify(question));
+        const questionToDuplicate: FormField = JSON.parse(JSON.stringify(question));
         questionToDuplicate.id = questionToDuplicate.id + 'Duplicate';
 
         if (Number.isInteger(questionId)) {
@@ -340,7 +340,7 @@ const InteractiveBuilder: React.FC<InteractiveBuilderProps> = ({
       pageIndex: number,
       sectionIndex: number,
       questionId: string | number,
-      newQuestion: Question,
+      newQuestion: FormField,
     ): Schema {
       if (activeQuestion.type === 'question') {
         const newSchema = { ...schema };
@@ -419,7 +419,7 @@ const InteractiveBuilder: React.FC<InteractiveBuilderProps> = ({
     return errors || [];
   };
 
-  const getValidationError = (question: Question) => {
+  const getValidationError = (question: FormField) => {
     const errorField: ValidationError = validationResponse.find(
       (error) =>
         error.field.label === question.label && error.field.id === question.id && error.field.type === question.type,

src/components/interactive-builder/modals/add-form-reference/add-form-reference.modal.tsx

@@ -19,7 +19,8 @@ import {
 import { showSnackbar } from '@openmrs/esm-framework';
 import { useForms } from '@hooks/useForms';
 import { useClobdata } from '@hooks/useClobdata';
-import { type Form as FormType, type Schema, type FormPage, type FormSection, type FormField } from '@types';
+import type { FormPage, FormSection, FormField } from '@openmrs/esm-form-engine-lib';
+import { type Form as FormType, type Schema } from '@types';
 import styles from './add-form-reference.scss';
 
 interface AddFormReferenceModalProps {

src/components/interactive-builder/modals/delete-question/delete-question.modal.tsx

@@ -2,13 +2,14 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
 import { showSnackbar } from '@openmrs/esm-framework';
-import type { Question, Schema } from '@types';
+import type { FormField } from '@openmrs/esm-form-engine-lib';
+import type { Schema } from '@types';
 
 interface DeleteQuestionModal {
   closeModal: () => void;
   onSchemaChange: (schema: Schema) => void;
   pageIndex: number;
-  question: Question;
+  question: FormField;
   questionIndex: number;
   schema: Schema;
   sectionIndex: number;

src/resources/form-validator.resource.ts

@@ -1,5 +1,6 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import type { Question, Schema } from '@types';
+import type { FormField } from '@openmrs/esm-form-engine-lib';
+import type { Schema } from '@types';
 import type { ConfigObject } from '../config-schema';
 
 interface Field {
@@ -32,7 +33,7 @@ export const handleFormValidation = async (
     const asyncTasks: Array<Promise<void>> = [];
 
     parsedForm.pages?.forEach((page) =>
-      page.sections?.forEach((section: { questions: Array<Question> }) =>
+      page.sections?.forEach((section: { questions: Array<FormField> }) =>
         section.questions?.forEach((question) => {
           asyncTasks.push(
             handleQuestionValidation(question, errors, configObject, warnings),

src/types.ts

@@ -1,25 +1,5 @@
 import type { OpenmrsResource } from '@openmrs/esm-framework';
-import type {
-  OpenmrsFormResource,
-  FormField,
-  ProgramState,
-  ReferencedForm,
-  RenderType,
-  RequiredFieldProps,
-  FormReference,
-  OpenmrsEncounter,
-  OpenmrsObs,
-  SessionMode,
-  PostSubmissionAction,
-  FormSchema,
-  FormPage,
-  FormSection,
-  FormQuestionOptions,
-  QuestionAnswerOption,
-  HideProps,
-  DisableProps,
-  RepeatOptions,
-} from '@openmrs/esm-form-engine-lib';
+import type { FormSchema, ProgramState } from '@openmrs/esm-form-engine-lib';
 import type { AuditInfo } from './components/audit-details/audit-details.component';
 import type { questionTypes } from '@constants';
 
@@ -75,26 +55,6 @@ export interface SchemaContextType {
   setSchema: (schema: Schema) => void;
 }
 
-// Using FormPage from form-engine-lib instead of local Page
-export type Page = FormPage;
-// Export FormPage as well for direct imports
-export { FormPage };
-
-// Using FormSection from form-engine-lib instead of local Section
-export type Section = FormSection;
-// Export FormSection as well for direct imports
-export { FormSection };
-
-// Using FormField from form-engine-lib instead of local Question
-export type Question = FormField;
-// Export FormField as well for direct imports
-export { FormField };
-
-// Using FormQuestionOptions from form-engine-lib instead of local QuestionOptions
-export type QuestionOptions = FormQuestionOptions;
-// Export FormQuestionOptions as well for direct imports
-export { FormQuestionOptions };
-
 export interface Answer {
   concept: string;
   label: string;
@@ -142,25 +102,6 @@ export interface PersonAttributeType {
   };
 }
 
-// Export the imported types directly
-export type {
-  OpenmrsEncounter,
-  OpenmrsObs,
-  SessionMode,
-  PostSubmissionAction,
-  FormSchema,
-  QuestionAnswerOption,
-  HideProps,
-  DisableProps,
-  RepeatOptions,
-  OpenmrsFormResource,
-  RenderType,
-  RequiredFieldProps,
-  FormReference,
-  ReferencedForm,
-  ProgramState,
-};
-
 export interface Program {
   uuid: string;
   name: string;