hl-core 0.0.10-beta.4 → 0.0.10-beta.40

package/components/Transitions/Animation.vue

@@ -6,6 +6,8 @@
 </template>
 
 <script setup lang="ts">
+import type { Utils } from '../../types';
+
 defineProps({
   type: {
     type: String as PropType<Utils.VuetifyAnimations>,

package/components/Utilities/Chip.vue

@@ -1,10 +1,12 @@
 <template>
-  <label v-if="chip && chip.title" class="transition-all leading-6 px-3 py-1 rounded-pill border-[1px] border-white mr-4 whitespace-nowrap" :class="[textSize, color]"
+  <label v-if="chip && chip.title" class="transition-all leading-6 px-3 rounded-pill border-[1px] border-white mr-4 whitespace-nowrap" :class="[textSize, color]"
     >{{ chip.title }}<v-tooltip v-if="chip.description" activator="parent" location="bottom" :max-width="maxWidth">{{ chip.description }}</v-tooltip></label
   >
 </template>
 
 <script lang="ts">
+import type { ChipComponent } from '../../types';
+
 export default defineComponent({
   props: {
     chip: {

package/components/Utilities/JsonViewer.vue

@@ -14,13 +14,12 @@
 <script lang="ts">
 import VueJsonPretty from 'vue-json-pretty';
 import 'vue-json-pretty/lib/styles.css';
-import { type JSONDataType } from 'vue-json-pretty/types/utils';
 
 export default defineComponent({
   components: { VueJsonPretty },
   props: {
     data: {
-      type: Object as PropType<JSONDataType>,
+      type: Object as PropType<any>,
       required: false,
     },
   },

package/composables/classes.ts

@@ -1,6 +1,7 @@
 import { Statuses, StoreMembers, MemberAppCodes } from '../types/enum';
 import { formatDate } from '.';
 import type { RouteLocationNormalized, RouteLocationNormalizedLoaded } from 'vue-router';
+import type * as Types from '../types';
 
 type LinkType = Partial<RouteLocationNormalized> | Partial<RouteLocationNormalizedLoaded> | string | null | boolean;
 
@@ -17,7 +18,7 @@ class MenuItemConfig {
   disabled?: ComputedRef;
   color?: string;
   show?: ComputedRef;
-  chip?: ChipComponent;
+  chip?: Types.ChipComponent;
 
   constructor(
     id: any = null,
@@ -32,7 +33,7 @@ class MenuItemConfig {
     disabled?: ComputedRef,
     color?: string,
     show?: ComputedRef,
-    chip?: ChipComponent,
+    chip?: Types.ChipComponent,
   ) {
     this.id = id;
     this.title = title;
@@ -87,6 +88,7 @@ export class IDocument {
   iin?: string;
   fileTypeId?: string;
   fileTypeName?: string;
+  fileTypeNameRu?: string;
   fileId?: string;
   page?: number;
   fileName?: string;
@@ -95,6 +97,7 @@ export class IDocument {
   signed?: boolean | null;
   signId?: string | null;
   certificateDate?: string | null;
+  signedType?: number;
 
   constructor(
     id?: string,
@@ -102,6 +105,7 @@ export class IDocument {
     iin?: string,
     fileTypeId?: string,
     fileTypeName?: string,
+    fileTypeNameRu?: string,
     fileId?: string,
     page?: number,
     fileName?: string,
@@ -110,12 +114,14 @@ export class IDocument {
     signed?: boolean | null,
     signId?: string | null,
     certificateDate?: string | null,
+    signedType?: number,
   ) {
     this.id = id;
     this.processInstanceId = processInstanceId;
     this.iin = iin;
     this.fileTypeId = fileTypeId;
     this.fileTypeName = fileTypeName;
+    this.fileTypeNameRu = fileTypeNameRu;
     this.fileId = fileId;
     this.page = page;
     this.fileName = fileName;
@@ -124,14 +130,31 @@ export class IDocument {
     this.signed = signed;
     this.signId = signId;
     this.certificateDate = certificateDate;
+    this.signedType = signedType;
   }
 }
 
 export class DocumentItem extends IDocument {
   constructor(
-    { id, processInstanceId, iin, fileTypeId, fileTypeName, fileId, page, fileName, fileTypeCode, sharedId, signed, signId, certificateDate }: IDocument = new IDocument(),
+    {
+      id,
+      processInstanceId,
+      iin,
+      fileTypeId,
+      fileTypeName,
+      fileTypeNameRu,
+      fileId,
+      page,
+      fileName,
+      fileTypeCode,
+      sharedId,
+      signed,
+      signId,
+      certificateDate,
+      signedType,
+    }: IDocument = new IDocument(),
   ) {
-    super(id, processInstanceId, iin, fileTypeId, fileTypeName, fileId, page, fileName, fileTypeCode, sharedId, signed, signId, certificateDate);
+    super(id, processInstanceId, iin, fileTypeId, fileTypeName, fileTypeNameRu, fileId, page, fileName, fileTypeCode, sharedId, signed, signId, certificateDate, signedType);
   }
 }
 
@@ -179,13 +202,25 @@ export class User {
   roles: string[];
   id: string | null;
   fullName: string | null;
+  code: string;
+  branchCode: string;
 
-  constructor(login: string | null = null, password: string | null = null, roles: string[] = [], id: string | null = null, fullName: string | null = null) {
+  constructor(
+    login: string | null = null,
+    password: string | null = null,
+    roles: string[] = [],
+    id: string | null = null,
+    fullName: string | null = null,
+    code: string = '',
+    branchCode: string = '',
+  ) {
     this.login = login;
     this.password = password;
     this.roles = roles;
     this.id = id;
     this.fullName = fullName;
+    this.code = code;
+    this.branchCode = branchCode;
   }
 
   resetUser() {
@@ -194,6 +229,8 @@ export class User {
     this.roles = [];
     this.id = null;
     this.fullName = null;
+    this.code = '';
+    this.branchCode = '';
   }
 }
 
@@ -383,11 +420,11 @@ export class Contragent extends Person {
 
 export class Member extends Person {
   response?: {
-    contragent?: ContragentType;
-    questionnaires?: ContragentQuestionaries[];
-    contacts?: ContragentContacts[];
-    documents?: ContragentDocuments[];
-    addresses?: ContragentAddress[];
+    contragent?: Types.ContragentType;
+    questionnaires?: Types.ContragentQuestionaries[];
+    contacts?: Types.ContragentContacts[];
+    documents?: Types.ContragentDocuments[];
+    addresses?: Types.ContragentAddress[];
   };
   verifyType: any;
   verifyDate: any;
@@ -427,7 +464,7 @@ export class Member extends Person {
   birthRegion: Value;
   documentType: Value;
   documentNumber: string | null;
-  documentIssuers: Value;
+  documentIssuers: Types.Base.Document.IssuerOther;
   documentDate: string | null;
   documentExpire: string | null;
   signOfResidency: Value;
@@ -451,15 +488,16 @@ export class Member extends Person {
   _phonePattern: RegExp;
   _emailPattern: RegExp;
   gotFromInsis: boolean | null;
-  gosPersonData: Api.GBD.Person | null;
+  gosPersonData: Types.Api.GBD.Person | null;
   parsedDocument: any;
   hasAgreement: boolean | null;
   otpTokenId: string | null;
-  otpCode: string | null;
-  documentsList: ContragentDocuments[];
+  otpCode: string;
+  documentsList: Types.ContragentDocuments[];
   isInsuredUnderage?: boolean = false;
   bankInfo: BankInfoClass;
   transferContractCompany: Value;
+  digitalDocument: IDocument | null;
   identityDocument: {
     documentType: Value;
     documentNumber: string | null;
@@ -586,7 +624,7 @@ export class Member extends Person {
     this.homePhone = homePhone;
     this.email = email;
     this.otpTokenId = null;
-    this.otpCode = null;
+    this.otpCode = '';
     this.address = address;
     this.familyStatus = familyStatus;
     this.isTerror = isTerror;
@@ -604,6 +642,7 @@ export class Member extends Person {
     this.hasAgreement = null;
     this.bankInfo = new BankInfoClass();
     this.transferContractCompany = new Value();
+    this.digitalDocument = null;
     this.identityDocument = {
       documentType: new Value(),
       documentNumber: null,
@@ -771,7 +810,6 @@ export class ProductConditions {
   adbAdditive: string | number | null;
   disabilityMultiply: string | number | null;
   disabilityAdditive: string | number | null;
-  processTariff: Value;
   riskGroup: Value;
   riskGroup2: Value;
   additionalConditionAnnuityPayments: boolean;
@@ -790,6 +828,7 @@ export class ProductConditions {
   fixInsSum: number | string | null;
   calcDate: string | null;
   contractEndDate: string | null;
+  currency: Value;
 
   constructor(
     insuranceCase = null,
@@ -819,7 +858,6 @@ export class ProductConditions {
     adbAdditive = null,
     disabilityMultiply = null,
     disabilityAdditive = null,
-    processTariff = new Value(),
     riskGroup = new Value(),
     riskGroup2 = new Value(),
     additionalConditionAnnuityPayments = false,
@@ -838,6 +876,7 @@ export class ProductConditions {
     fixInsSum = null,
     calcDate = null,
     contractEndDate = null,
+    currency = new Value(),
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -871,7 +910,6 @@ export class ProductConditions {
     this.adbAdditive = adbAdditive;
     this.disabilityMultiply = disabilityMultiply;
     this.disabilityAdditive = disabilityAdditive;
-    this.processTariff = processTariff;
     this.riskGroup = riskGroup;
     this.riskGroup2 = riskGroup2;
     this.additionalConditionAnnuityPayments = additionalConditionAnnuityPayments;
@@ -890,6 +928,7 @@ export class ProductConditions {
     this.fixInsSum = fixInsSum;
     this.calcDate = calcDate;
     this.contractEndDate = contractEndDate;
+    this.currency = currency;
   }
 
   getSingleTripDays() {
@@ -928,7 +967,7 @@ export class MemberSettings {
 }
 
 export class DataStoreClass {
-  projectConfig: Utils.ProjectConfig | null;
+  projectConfig: Types.Utils.ProjectConfig | null;
   // IMP Контроллер фич
   controls: {
     // Cтавит значения по дефолту полям
@@ -973,7 +1012,7 @@ export class DataStoreClass {
   };
   iframeLoading: boolean;
   hasLayoutMargins: boolean;
-  readonly product: Projects | null;
+  readonly product: Types.Projects | null;
   readonly parentProduct: 'efo' | 'auletti';
   showNav: boolean;
   showDisabledMessage: boolean;
@@ -1016,7 +1055,7 @@ export class DataStoreClass {
   historyTotalItems: number;
   isColumnAsc = { ...InitialColumns() };
   idleKey: number;
-  processList: Item[] | null;
+  processList: Types.Item[] | null;
   countries: Value[];
   citizenshipCountries: Value[];
   taxCountries: Value[];
@@ -1033,7 +1072,6 @@ export class DataStoreClass {
   relations: Value[];
   banks: Value[];
   transferContractCompanies: Value[];
-  processTariff: Value[];
   insurancePay: Value[];
   questionRefs: Value[];
   residents: Value[];
@@ -1045,7 +1083,6 @@ export class DataStoreClass {
   fontSize: number;
   isFontChangerOpen: boolean = false;
   isLoading: boolean = false;
-  user: User;
   accessToken: string | null = null;
   refreshToken: string | null = null;
   processIndexRate: Value[];
@@ -1053,18 +1090,18 @@ export class DataStoreClass {
   processPaymentPeriod: Value[];
   dicAnnuityTypeList: Value[];
   processAnnuityPaymentPeriod: Value[];
-  taskList: TaskListItem[];
-  processHistory: TaskHistory[];
-  contragentList: ContragentType[];
+  taskList: Types.TaskListItem[];
+  processHistory: Types.TaskHistory[];
+  contragentList: Types.ContragentType[];
   contragentFormKey: string;
   processCode: number | null;
   groupCode: string;
-  userGroups: Item[];
+  userGroups: Types.Item[];
   onMainPage: boolean;
   SaleChanellPolicy: Value[];
   RegionPolicy: Value[];
   ManagerPolicy: Value[];
-  AgentData: AgentData[];
+  AgentData: Types.AgentData[];
   riskGroup: Value[];
   DicCoverTypePeriod: Value[];
   currencies: {
@@ -1086,7 +1123,7 @@ export class DataStoreClass {
   workTypes: Value[];
   sportsTypes: Value[];
   purposes: Value[];
-
+  programType: Value[];
   constructor() {
     this.projectConfig = null;
     this.filters = {
@@ -1140,6 +1177,7 @@ export class DataStoreClass {
     this.processIndexRate = [];
     this.processGfot = [];
     this.processPaymentPeriod = [];
+    this.programType = [];
     this.dicAnnuityTypeList = [];
     this.processAnnuityPaymentPeriod = [];
     this.questionRefs = [];
@@ -1148,7 +1186,7 @@ export class DataStoreClass {
     this.ManagerPolicy = [];
     this.AgentData = [];
     this.DicCoverTypePeriod = [];
-    this.product = import.meta.env.VITE_PRODUCT ? (import.meta.env.VITE_PRODUCT as Projects) : null;
+    this.product = import.meta.env.VITE_PRODUCT ? (import.meta.env.VITE_PRODUCT as Types.Projects) : null;
     this.parentProduct = import.meta.env.VITE_PARENT_PRODUCT ? import.meta.env.VITE_PARENT_PRODUCT : 'efo';
     this.showNav = true;
     this.showDisabledMessage = false;
@@ -1216,7 +1254,6 @@ export class DataStoreClass {
     this.familyStatuses = [];
     this.disabilityGroups = [];
     this.relations = [];
-    this.processTariff = [];
     this.banks = [];
     this.transferContractCompanies = [];
     this.insurancePay = [];
@@ -1229,7 +1266,6 @@ export class DataStoreClass {
     this.fontSize = 14;
     this.isFontChangerOpen = false;
     this.isLoading = false;
-    this.user = new User();
     this.accessToken = null;
     this.refreshToken = null;
     this.taskList = [];
@@ -1300,10 +1336,10 @@ export class FormStoreClass {
   isUploadedSignedContract: boolean;
   signedContractFormData: any;
   lfb: {
-    clients: ClientV2[];
+    clients: Types.ClientV2[];
     policyholder: PolicyholderClass;
     hasAccidentIncidents: boolean;
-    accidentIncidents: AccidentIncidents[];
+    accidentIncidents: Types.AccidentIncidents[];
     policyholderActivities: PolicyholderActivity[];
     beneficialOwners: BeneficialOwner[];
     beneficialOwnersIndex: number;
@@ -1311,12 +1347,14 @@ export class FormStoreClass {
     clientId: string | null;
     insuredFile: any;
     isPanelInside: boolean;
+    typeChange: string;
+    add: boolean;
   };
-  additionalInsuranceTerms: AddCover[];
-  additionalInsuranceTermsWithout: AddCover[];
-  signUrls: SignUrlType[];
+  additionalInsuranceTerms: Types.AddCover[];
+  additionalInsuranceTermsWithout: Types.AddCover[];
+  signUrls: Types.SignUrlType[];
   epayLink: string | null;
-  invoiceData: EpayResponse | null;
+  invoiceData: Types.EpayResponse | null;
   affilationResolution: {
     id: string | number | null;
     processInstanceId: string | number | null;
@@ -1329,19 +1367,20 @@ export class FormStoreClass {
     date: string | null;
   };
   signedDocumentList: IDocument[];
-  surveyByHealthBase: AnketaFirst | null;
-  surveyByHealthBasePolicyholder: AnketaFirst | null;
-  surveyByCriticalBase: AnketaFirst | null;
-  surveyByCriticalBasePolicyholder: AnketaFirst | null;
+  signatories: any[];
+  surveyByHealthBase: Types.AnketaFirst | null;
+  surveyByHealthBasePolicyholder: Types.AnketaFirst | null;
+  surveyByCriticalBase: Types.AnketaFirst | null;
+  surveyByCriticalBasePolicyholder: Types.AnketaFirst | null;
   definedAnswersId: {
     surveyByHealthBase: any;
     surveyByCriticalBase: any;
     surveyByHealthBasePolicyholder: any;
     surveyByCriticalBasePolicyholder: any;
   };
-  birthInfos: Api.GKB.BirthInfo[];
+  birthInfos: Types.Api.GKB.BirthInfo[];
   SaleChanellPolicy: Value;
-  AgentData: AgentData;
+  AgentData: Types.AgentData;
   RegionPolicy: Value;
   ManagerPolicy: Value;
   isDisabled: {
@@ -1349,6 +1388,7 @@ export class FormStoreClass {
     beneficiaryForm: boolean;
     beneficialOwnerForm: boolean;
     insuredForm: boolean;
+    slaveInsuredForm: boolean;
     policyholdersRepresentativeForm: boolean;
     productConditionsForm: boolean;
     calculatorForm: boolean;
@@ -1380,9 +1420,11 @@ export class FormStoreClass {
     spokesmanApp?: any;
     isTask?: boolean | null;
     createDate?: string | null;
-    policyAppDto?: PolicyAppDto;
-    insisWorkDataApp?: InsisWorkDataApp;
-    addCoverDto?: AddCover[];
+    policyAppDto?: Types.PolicyAppDto;
+    parentPolicyDto?: Types.ParentPolicyDto | null;
+    insisWorkDataApp?: Types.InsisWorkDataApp;
+    addCoverDto?: Types.AddCover[];
+    slave?: any;
   };
   policyholderForm: Member;
   policyholderFormKey: StoreMembers.policyholderForm;
@@ -1395,15 +1437,18 @@ export class FormStoreClass {
   beneficialOwnerFormIndex: number;
   beneficialOwnerFormKey: StoreMembers.beneficialOwnerForm;
   insuredForm: Member[];
+  slaveInsuredForm: Member;
   insuredFormKey: StoreMembers.insuredForm;
   insuredFormIndex: number;
   productConditionsForm: ProductConditions;
   productConditionsFormKey: string;
+  pensionApp: any;
   questionnaireByHealth: any;
   questionnaireByCritical: any[];
   canBeClaimed: boolean | null;
   applicationTaskId: string | null;
-
+  requiredDocuments: RequiredDocument[];
+  isNeedToRecalculate: boolean;
   constructor() {
     this.regNumber = null;
     this.policyNumber = null;
@@ -1424,6 +1469,8 @@ export class FormStoreClass {
       clientId: null,
       insuredFile: null,
       isPanelInside: false,
+      typeChange: 'calculation',
+      add: false,
     };
     this.additionalInsuranceTerms = [];
     this.additionalInsuranceTermsWithout = [];
@@ -1442,6 +1489,7 @@ export class FormStoreClass {
       date: null,
     };
     this.signedDocumentList = [];
+    this.signatories = [];
     this.surveyByHealthBase = null;
     this.surveyByHealthBasePolicyholder = null;
     this.surveyByCriticalBase = null;
@@ -1470,6 +1518,7 @@ export class FormStoreClass {
       beneficiaryForm: true,
       beneficialOwnerForm: true,
       insuredForm: true,
+      slaveInsuredForm: true,
       policyholdersRepresentativeForm: true,
       productConditionsForm: true,
       calculatorForm: true,
@@ -1498,6 +1547,7 @@ export class FormStoreClass {
     this.beneficialOwnerFormIndex = 0;
     this.beneficialOwnerFormKey = StoreMembers.beneficialOwnerForm;
     this.insuredForm = [new Member()];
+    this.slaveInsuredForm = new Member();
     this.insuredFormKey = StoreMembers.insuredForm;
     this.insuredFormIndex = 0;
     this.productConditionsForm = new ProductConditions();
@@ -1506,12 +1556,15 @@ export class FormStoreClass {
     this.questionnaireByCritical = [];
     this.canBeClaimed = null;
     this.applicationTaskId = null;
+    this.requiredDocuments = [];
+    this.isNeedToRecalculate = false;
   }
 }
 
 export class Address {
   country: Value;
   region: Value;
+  state: Value;
   regionType: Value;
   city: Value;
   square: string | null;
@@ -1525,6 +1578,7 @@ export class Address {
   constructor() {
     this.country = new Value();
     this.region = new Value();
+    this.state = new Value();
     this.regionType = new Value();
     this.city = new Value();
     this.square = null;
@@ -1649,7 +1703,7 @@ export class GroupMember extends PhysGroupClass {
   activityTypes: { activityTypeName: string; empoloyeeCount: number }[];
   beneficalOwnerQuest: { order: number; text: string; answer: boolean | null }[];
   authoritedPerson: PhysGroupClass;
-  insuredPolicyData: InsuredPolicyType;
+  insuredPolicyData: Types.InsuredPolicyType;
 
   constructor() {
     super();
@@ -1734,3 +1788,33 @@ export class BeneficialOwner {
     this.id = '';
   }
 }
+
+export class TransferContract {
+  id: string | null;
+  transferContractIsOppv: boolean;
+  transferContractFirstPaymentDate: string;
+  transferContractAmount: number | string;
+  transferContractDate: string;
+  transferContractNumber: string;
+  transferContractRegNumber: string;
+  transferContract: boolean;
+  transferContractCompany: Value;
+  transferContractMonthCount: number | null;
+
+  constructor() {
+    this.id = null;
+    this.transferContractIsOppv = false;
+    this.transferContractFirstPaymentDate = '';
+    this.transferContractAmount = 0;
+    this.transferContractDate = '';
+    this.transferContractNumber = '';
+    this.transferContract = false;
+    this.transferContractRegNumber = '';
+    this.transferContractCompany = new Value();
+    this.transferContractMonthCount = null;
+  }
+}
+
+export class RequiredDocument extends Value {
+  iin: string = '';
+}

package/composables/constants.ts

@@ -18,6 +18,13 @@ export const constants = Object.freeze({
     gns: 16,
     prepensionannuity: 18,
     pensionannuitynew: 19,
+    halykkazynaap: 20,
+    balam: 21,
+    halykkazynaapsms: 23,
+    pensionannuityrefundnew: 24,
+    pensionannuityjointnew: 25,
+    gonsadd: 26,
+    criticalillness: 29,
   },
   amlProducts: {
     checkcontragent: 1,
@@ -36,6 +43,7 @@ export const constants = Object.freeze({
   returnStatementStatuses: [
     Statuses.ApproveForm,
     Statuses.ActuaryForm,
+    Statuses.JuristForm,
     Statuses.DsoUsnsForm,
     Statuses.AccountantForm,
     Statuses.UnderwriterForm,
@@ -74,6 +82,20 @@ export const constants = Object.freeze({
     kzt: '₸',
     usd: '$',
   },
+  pensionAge: {
+    man: 68,
+    woman: 68,
+  },
+  genderByIIN: {
+    '0': 'Ж',
+    '3': 'М',
+    '4': 'Ж',
+    '5': 'М',
+    '6': 'Ж',
+    '7': 'М',
+    '8': 'Ж',
+    '9': 'М',
+  },
   documentTypes: {
     statement: 5,
     contract: 6,
@@ -87,6 +109,11 @@ export const constants = Object.freeze({
     questionnaireInsured: 35,
     invoicePayment: 36,
   },
+  fileTypes: {
+    pdf: 'application/pdf',
+    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    doc: 'application/msword',
+  },
   regex: {
     isoDate: /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)((-(\d{2}):(\d{2})|Z)?)$/,
   },
@@ -162,4 +189,20 @@ export const constants = Object.freeze({
       ids: '',
     },
   ],
+  currencyList: [
+    {
+      code: 'KZT',
+      id: '1',
+      nameKz: 'Тенге',
+      nameRu: 'Тенге',
+      ids: '',
+    },
+    {
+      code: 'USD',
+      id: '2',
+      nameKz: 'С индексацией на курс USD',
+      nameRu: 'С индексацией на курс USD',
+      ids: '',
+    },
+  ],
 });

package/composables/fields.ts

@@ -1,6 +1,8 @@
 import { i18n } from '../configs/i18n';
-import { FieldTypes } from '../types/form';
+import { FieldTypes, type InputBase, type InputType } from '../types/form';
 import { type ComputedRefWithControl } from '@vueuse/core';
+import type { Utils } from '../types';
+import type * as Types from '../types/form';
 
 const t = i18n.t;
 
@@ -37,14 +39,14 @@ export const FieldBase = ({
     fetchFrom,
   }) as InputBase;
 
-export const TextInput = ({ ...rest }: Partial<TextInput>): TextInput => {
+export const TextInput = ({ ...rest }: Partial<Types.TextInput>): Types.TextInput => {
   return {
     ...FieldBase(rest),
     type: FieldTypes.TEXT,
   };
 };
 
-export const SwitchInput = ({ ...rest }: Partial<SwitchInput>): SwitchInput => {
+export const SwitchInput = ({ ...rest }: Partial<Types.SwitchInput>): Types.SwitchInput => {
   return {
     ...FieldBase(rest),
     type: FieldTypes.SWITCH,
@@ -55,7 +57,7 @@ export const SwitchInput = ({ ...rest }: Partial<SwitchInput>): SwitchInput => {
   };
 };
 
-export const NumberInput = ({ ...rest }: Partial<NumberInput>): NumberInput => {
+export const NumberInput = ({ ...rest }: Partial<Types.NumberInput>): Types.NumberInput => {
   return {
     ...FieldBase(rest),
     type: FieldTypes.NUMBER,