refactor: consistent type imports

.eslintrc.js

@@ -35,6 +35,10 @@ module.exports = defineConfig({
     'no-restricted-syntax': ['error', 'LabeledStatement', 'WithStatement'],
     'no-shadow': 'off',
     '@typescript-eslint/ban-types': 'warn',
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      { prefer: 'type-imports', disallowTypeAnnotations: false },
+    ],
     '@typescript-eslint/no-explicit-any': 'off',
     '@typescript-eslint/no-shadow': 'error',
     '@typescript-eslint/no-unused-vars': ['warn', { ignoreRestSiblings: true }],

apps/admin/src/app.vue

@@ -99,7 +99,8 @@
 <script lang="ts">
 import groupBy from 'lodash/groupBy';
 import pluralize from 'pluralize';
-import Vue, { VueConstructor } from 'vue';
+import type { VueConstructor } from 'vue';
+import Vue from 'vue';
 import type { Location } from 'vue-router';
 import type { Dictionary } from '@intake24/common/types';
 import { ConfirmDialog, setsLanguage, ServiceWorker } from '@intake24/ui';

apps/admin/src/components/data-tables/action-bar/action-bar.vue

@@ -14,7 +14,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor, PropType } from 'vue';
+import type { VueConstructor, PropType } from 'vue';
+import Vue from 'vue';
 import upperFirst from 'lodash/upperFirst';
 import Delete from './delete.vue';
 import Read from './read.vue';

apps/admin/src/components/data-tables/data-table.vue

@@ -41,7 +41,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor, PropType } from 'vue';
+import type { VueConstructor, PropType } from 'vue';
+import Vue from 'vue';
 import { mapActions, mapState } from 'pinia';
 import type { DataOptions } from 'vuetify';
 import isEqual from 'lodash/isEqual';

apps/admin/src/components/data-tables/embedded-data-table.vue

@@ -43,7 +43,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor } from 'vue';
+import type { VueConstructor } from 'vue';
+import Vue from 'vue';
 import type { DataOptions } from 'vuetify';
 import isEqual from 'lodash/isEqual';
 import type { Dictionary } from '@intake24/common/types';

apps/admin/src/components/entry/detail-mixin.ts

@@ -1,4 +1,5 @@
-import Vue, { VueConstructor } from 'vue';
+import type { VueConstructor } from 'vue';
+import Vue from 'vue';
 import type { DetailMixin } from '@intake24/admin/types';
 import fetchEntry from './fetch-entry';
 import hasEntry from './has-entry';

apps/admin/src/components/entry/fetch-entry.ts

@@ -1,4 +1,5 @@
-import Vue, { VueConstructor } from 'vue';
+import type { VueConstructor } from 'vue';
+import Vue from 'vue';
 import { mapActions } from 'pinia';
 import type { HasEntryMixin } from '@intake24/admin/types';
 import { useEntry } from '@intake24/admin/stores';

apps/admin/src/components/entry/form-mixin.ts

@@ -1,4 +1,5 @@
-import Vue, { VueConstructor } from 'vue';
+import type { VueConstructor } from 'vue';
+import Vue from 'vue';
 import isEqual from 'lodash/isEqual';
 import pick from 'lodash/pick';
 import { mapActions } from 'pinia';

apps/admin/src/components/entry/layout.vue

@@ -80,7 +80,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor, PropType } from 'vue';
+import type { VueConstructor, PropType } from 'vue';
+import Vue from 'vue';
 import has from 'lodash/has';
 import { ConfirmDialog } from '@intake24/ui';
 import hasResource from '@intake24/admin/mixins/has-resource';

apps/admin/src/components/feedback/cards/card-list.vue

@@ -71,7 +71,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent, ref } from '@vue/composition-api';
 import isEqual from 'lodash/isEqual';
 import draggable from 'vuedraggable';
 import type { Card } from '@intake24/common/feedback';

apps/admin/src/components/feedback/cards/card-types/character.vue

@@ -51,10 +51,12 @@
 
 <script lang="ts">
 import { useEntry } from '@intake24/admin/stores';
-import { Character, characterTypes } from '@intake24/common/feedback';
+import type { Character } from '@intake24/common/feedback';
+import { characterTypes } from '@intake24/common/feedback';
 import type { NutrientTypeEntry } from '@intake24/common/types/http/admin';
 import { characterImageMap } from '@intake24/ui/feedback';
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import CharacterSentiments from '../partials/character-sentiments.vue';
 
 export default defineComponent({

apps/admin/src/components/feedback/cards/card-types/five-a-day.vue

@@ -15,7 +15,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { FiveADay } from '@intake24/common/feedback';
 import CardContent from '../partials/card-content.vue';
 import CardThresholds from '../partials/card-thresholds.vue';

apps/admin/src/components/feedback/cards/card-types/nutrient-group.vue

@@ -77,7 +77,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { NutrientGroup } from '@intake24/common/feedback';
 import type { NutrientTypeEntry } from '@intake24/common/types/http/admin';
 import { useEntry } from '@intake24/admin/stores';

apps/admin/src/components/feedback/cards/partials/card-content.vue

@@ -35,7 +35,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import { tinymce } from '@intake24/admin/components/tinymce';
 import { LanguageSelector } from '@intake24/admin/components/forms';
 import type { RuleCallback } from '@intake24/admin/types';

apps/admin/src/components/feedback/cards/partials/card-thresholds.vue

@@ -41,7 +41,8 @@
 
 <script lang="ts">
 import isEqual from 'lodash/isEqual';
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import { tinymce } from '@intake24/admin/components/tinymce';
 import { LanguageSelector } from '@intake24/admin/components/forms';
 import type { CustomCard } from '@intake24/common/feedback';

apps/admin/src/components/feedback/cards/partials/card-unit.vue

@@ -25,7 +25,8 @@
 
 <script lang="ts">
 import isEqual from 'lodash/isEqual';
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import { tinymce } from '@intake24/admin/components/tinymce';
 import { LanguageSelector } from '@intake24/admin/components/forms';
 import type { RuleCallback } from '@intake24/admin/types';

apps/admin/src/components/feedback/cards/partials/character-sentiments.vue

@@ -69,13 +69,10 @@
 
 <script lang="ts">
 import isEqual from 'lodash/isEqual';
-import { defineComponent, PropType } from '@vue/composition-api';
-import {
-  Character,
-  characterSentimentTypes,
-  CharacterSentiment,
-  sentiments,
-} from '@intake24/common/feedback';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
+import type { Character, CharacterSentiment } from '@intake24/common/feedback';
+import { characterSentimentTypes, sentiments } from '@intake24/common/feedback';
 import { LanguageSelector } from '@intake24/admin/components/forms';
 import { copy } from '@intake24/common/util';
 

apps/admin/src/components/feedback/demographic-groups/demographic-group-list.vue

@@ -196,8 +196,10 @@
 
 <script lang="ts">
 import draggable from 'vuedraggable';
-import { defineComponent, PropType, ref } from '@vue/composition-api';
-import { DemographicGroup, nutrientRuleTypes, sexes } from '@intake24/common/feedback';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent, ref } from '@vue/composition-api';
+import type { DemographicGroup } from '@intake24/common/feedback';
+import { nutrientRuleTypes, sexes } from '@intake24/common/feedback';
 import type { NutrientTypeEntry } from '@intake24/common/types/http/admin';
 import type { PhysicalActivityLevelAttributes } from '@intake24/common/types/models';
 import { useEntry } from '@intake24/admin/stores';

apps/admin/src/components/feedback/demographic-groups/demographic-group-range.vue

@@ -35,7 +35,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { Range } from '@intake24/common/feedback';
 
 export type RangeType = 'age' | 'height' | 'weight';

apps/admin/src/components/feedback/demographic-groups/demographic-group-sectors.vue

@@ -90,8 +90,10 @@
 
 <script lang="ts">
 import isEqual from 'lodash/isEqual';
-import { defineComponent, PropType } from '@vue/composition-api';
-import { DemographicGroupScaleSector, sentiments } from '@intake24/common/feedback';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
+import type { DemographicGroupScaleSector } from '@intake24/common/feedback';
+import { sentiments } from '@intake24/common/feedback';
 import { tinymce } from '@intake24/admin/components/tinymce';
 import { LanguageSelector } from '@intake24/admin/components/forms';
 import { copy } from '@intake24/common/util';

apps/admin/src/components/feedback/henry-coefficients/henry-coefficient-list.vue

@@ -171,8 +171,10 @@
 
 <script lang="ts">
 import draggable from 'vuedraggable';
-import { defineComponent, PropType } from '@vue/composition-api';
-import { HenryCoefficient, Sex, sexes } from '@intake24/common/feedback';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
+import type { HenryCoefficient, Sex } from '@intake24/common/feedback';
+import { sexes } from '@intake24/common/feedback';
 import { LoadSectionDialog } from '@intake24/admin/components/schemes';
 import { ConfirmDialog } from '@intake24/ui';
 import { getHenryCoefficientDefaults } from './henry-coefficient';

apps/admin/src/components/feedback/list.ts

@@ -1,5 +1,6 @@
 import isEqual from 'lodash/isEqual';
-import { ref, SetupContext, toRefs, UnwrapRef, UnwrapRefSimple, watch } from '@vue/composition-api';
+import type { SetupContext, UnwrapRef, UnwrapRefSimple } from '@vue/composition-api';
+import { ref, toRefs, watch } from '@vue/composition-api';
 import { copy } from '@intake24/common/util';
 
 export type ListProps<T> = {

apps/admin/src/components/feedback/preview/preview.vue

@@ -33,9 +33,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import { FeedbackChartArea, FeedbackCardArea } from '@intake24/ui/components/feedback';
-import { FeedbackCardParameters, buildTopFoods, buildCardParams } from '@intake24/ui/feedback';
+import type { FeedbackCardParameters } from '@intake24/ui/feedback';
+import { buildTopFoods, buildCardParams } from '@intake24/ui/feedback';
 import type { FeedbackSchemeEntry } from '@intake24/common/types/http/admin';
 import { feedbackService } from '@intake24/admin/services';
 import * as previewData from './preview-data';

apps/admin/src/components/feedback/top-foods/color-list.vue

@@ -68,7 +68,8 @@
 
 <script lang="ts">
 import draggable from 'vuedraggable';
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import { useList } from '..';
 
 export default defineComponent({

apps/admin/src/components/feedback/top-foods/nutrient-list.vue

@@ -127,9 +127,11 @@
 import draggable from 'vuedraggable';
 import { ConfirmDialog } from '@intake24/ui';
 import { LanguageSelector } from '@intake24/admin/components/forms';
-import { defaultTopFoods, TopFoodNutrientType } from '@intake24/common/feedback';
+import type { TopFoodNutrientType } from '@intake24/common/feedback';
+import { defaultTopFoods } from '@intake24/common/feedback';
 import type { NutrientTypeEntry } from '@intake24/common/types/http/admin';
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { RuleCallback } from '@intake24/admin/types';
 import { useList } from '..';
 

apps/admin/src/components/forms/auto-complete.vue

@@ -22,7 +22,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor, PropType } from 'vue';
+import type { VueConstructor, PropType } from 'vue';
+import Vue from 'vue';
 import debounce from 'lodash/debounce';
 import type { Dictionary } from '@intake24/common/types';
 

apps/admin/src/components/forms/language-selector.vue

@@ -56,7 +56,8 @@
 
 <script lang="ts">
 import type { LanguageListEntry } from '@intake24/common/types/http/admin';
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { LocaleTranslation } from '@intake24/common/types';
 import { useEntry } from '@intake24/admin/stores';
 

apps/admin/src/components/gallery/gallery.vue

@@ -70,7 +70,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor, PropType } from 'vue';
+import type { VueConstructor, PropType } from 'vue';
+import Vue from 'vue';
 import { mapActions, mapState } from 'pinia';
 import type { Dictionary } from '@intake24/common/types';
 import type { Pagination, PaginationMeta } from '@intake24/common/types/models';

apps/admin/src/components/meals/meal-list.vue

@@ -128,7 +128,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType, ref } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent, ref } from '@vue/composition-api';
 import draggable from 'vuedraggable';
 import { copy } from '@intake24/common/util';
 import type { Meal, Meals } from '@intake24/common/types';

apps/admin/src/components/polls-for-jobs/polls-job-list.vue

@@ -51,7 +51,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { JobEntry } from '@intake24/common/types/http/admin';
 
 export default defineComponent({

apps/admin/src/components/prompts/list/load-prompt-dialog.vue

@@ -92,7 +92,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor, PropType } from 'vue';
+import type { VueConstructor, PropType } from 'vue';
+import Vue from 'vue';
 import { copy } from '@intake24/common/util';
 import debounce from 'lodash/debounce';
 import type { PromptQuestion } from '@intake24/common/prompts';

apps/admin/src/components/prompts/list/prompt-list-item.vue

@@ -104,7 +104,8 @@
 
 <script lang="ts">
 import isEqual from 'lodash/isEqual';
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import { copy } from '@intake24/common/util';
 import type { PromptQuestion } from '@intake24/common/prompts';
 import { ConfirmDialog } from '@intake24/ui';

apps/admin/src/components/prompts/list/prompt-list.vue

@@ -46,7 +46,8 @@
 
 <script lang="ts">
 import isEqual from 'lodash/isEqual';
-import { defineComponent, PropType, ref } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent, ref } from '@vue/composition-api';
 import draggable from 'vuedraggable';
 import type { PromptQuestion } from '@intake24/common/prompts';
 import type { SurveyQuestionSection, MealSection } from '@intake24/common/schemes';

apps/admin/src/components/prompts/list/save-as-template-dialog.vue

@@ -65,7 +65,8 @@
 </template>
 
 <script lang="ts">
-import Vue, { VueConstructor, PropType } from 'vue';
+import type { VueConstructor, PropType } from 'vue';
+import Vue from 'vue';
 import pick from 'lodash/pick';
 import { mapActions } from 'pinia';
 import { copy } from '@intake24/common/util';

apps/admin/src/components/prompts/partials/base-prompt.ts

@@ -1,4 +1,5 @@
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { Condition, PromptValidationProps } from '@intake24/common/prompts';
 import type { LocaleTranslation } from '@intake24/common/types';
 import PromptContent from './prompt-content.vue';

apps/admin/src/components/prompts/partials/prompt-conditions.vue

@@ -135,10 +135,12 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import { copy, merge } from '@intake24/common/util';
 import draggable from 'vuedraggable';
-import { Condition, ConditionOp, conditionOps } from '@intake24/common/prompts';
+import type { Condition, ConditionOp } from '@intake24/common/prompts';
+import { conditionOps } from '@intake24/common/prompts';
 import PromptAnswerProps from '@intake24/admin/components/prompts/partials/conditions/prompt-answer-props.vue';
 import RecallNumberProps from '@intake24/admin/components/prompts/partials/conditions/recall-number-props.vue';
 

apps/admin/src/components/prompts/partials/prompt-content.vue

@@ -52,7 +52,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from '@vue/composition-api';
+import type { PropType } from '@vue/composition-api';
+import { defineComponent } from '@vue/composition-api';
 import type { LocaleTranslation } from '@intake24/common/types';
 import { tinymce } from '@intake24/admin/components/tinymce';
 import { LanguageSelector } from '@intake24/admin/components/forms';