(nuxt) move shared/data.ts to app/src/data.ts because it is only useful in an app context

app/components/CalendarBanner.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import useConfig from '../composables/useConfig.ts';
 
+import { loadCalendar } from '~/src/data.ts';
 import { Day } from '~~/shared/calendar/helpers.ts';
-import { loadCalendar } from '~~/shared/data.ts';
 
 const props = withDefaults(defineProps<{
     day?: Day;

app/components/FlagList.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { loadPronouns } from '~/src/data.ts';
 import { buildPronoun } from '~~/shared/buildPronoun.ts';
 import type { Pronoun } from '~~/shared/classes.ts';
-import { loadPronouns } from '~~/shared/data.ts';
 import { buildFlags } from '~~/shared/flags.ts';
 import type { Flag } from '~~/shared/flags.ts';
 

app/components/GrammarTable.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { loadGrammarTableVariantsConverter } from '~~/shared/data.ts';
+import { loadGrammarTableVariantsConverter } from '~/src/data.ts';
 import type { Example, ExampleValues } from '~~/shared/language/examples.ts';
 import { expandVariantsForSection } from '~~/shared/language/grammarTables.ts';
 import type { GrammarTableDefinition, Variant, SectionDefinition } from '~~/shared/language/grammarTables.ts';

app/components/Literature.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { loadPronouns } from '~/src/data.ts';
 import { getPronoun } from '~~/shared/buildPronoun.ts';
 import type { Pronoun, Source } from '~~/shared/classes.ts';
-import { loadPronouns } from '~~/shared/data.ts';
 
 const props = defineProps<{
     pronoun?: Pronoun;

app/components/Logo.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { storeToRefs } from 'pinia';
 
+import { loadCalendar } from '~/src/data.ts';
 import { useMainStore } from '~/store/index.ts';
 import logoSvg from '~~/public/logo/logo.svg?raw';
 import { Day } from '~~/shared/calendar/helpers.ts';
-import { loadCalendar } from '~~/shared/data.ts';
 import { ImmutableArray } from '~~/shared/helpers.ts';
 
 const props = withDefaults(defineProps<{

app/components/NameCount.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import useConfig from '~/composables/useConfig.ts';
-import { loadNameCount } from '~~/shared/data.ts';
+import { loadNameCount } from '~/src/data.ts';
 
 const props = defineProps<{
     name: string;

app/components/Profile.vue

@@ -4,8 +4,8 @@ import { useNuxtApp } from 'nuxt/app';
 import useConfig from '~/composables/useConfig.ts';
 import useMainPronoun from '~/composables/useMainPronoun.ts';
 import useSpelling from '~/composables/useSpelling.ts';
+import { loadCalendar, loadPronounLibrary } from '~/src/data.ts';
 import type { TermsEntryRaw } from '~~/shared/classes.ts';
-import { loadCalendar, loadPronounLibrary } from '~~/shared/data.ts';
 import { buildFlags } from '~~/shared/flags.ts';
 import { buildImageUrl } from '~~/shared/helpers.ts';
 import type { Profile, UserWithProfiles } from '~~/shared/profile.ts';

app/components/SimplePronounList.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { loadPronounLibrary } from '~/src/data.ts';
 import { buildPronounUsage } from '~~/shared/buildPronoun.ts';
 import type { Pronoun } from '~~/shared/classes.ts';
-import { loadPronounLibrary } from '~~/shared/data.ts';
 
 const props = defineProps<{
     pronouns: Pronoun[] | string[];

app/components/SourceItem.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { loadPronounLibrary } from '~/src/data.ts';
 import type { Source } from '~~/shared/classes.ts';
-import { loadPronounLibrary } from '~~/shared/data.ts';
 import { getUrlForLocale } from '~~/shared/domain.ts';
 import { changeSourceInjectionKey } from '~~/shared/injectionKeys.ts';
 

app/components/SourceSubmitForm.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import useConfig from '~/composables/useConfig.ts';
 import useDialogue from '~/composables/useDialogue.ts';
+import { loadPronounLibrary } from '~/src/data.ts';
 import { Source } from '~~/shared/classes.ts';
-import { loadPronounLibrary } from '~~/shared/data.ts';
 
 type FormData = Pick<Source, 'pronouns' | 'type' | 'author' | 'title' | 'extra' | 'year' | 'fragments' | 'comment'
     | 'images' | 'link' | 'spoiler' | 'key'> & { base: string | null };

app/components/TermsDictionary.vue

@@ -3,8 +3,8 @@ import type { ComponentExposed } from 'vue-component-type-helpers';
 
 import type Table from '~/components/Table.vue';
 import type TermsSubmitForm from '~/components/TermsSubmitForm.vue';
+import { loadCalendar } from '~/src/data.ts';
 import { TermsEntry } from '~~/shared/classes.ts';
-import { loadCalendar } from '~~/shared/data.ts';
 import { buildDict, clearLinkedText } from '~~/shared/helpers.ts';
 
 const props = defineProps<{

app/components/nouns/NounsClassExample.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { loadNounsData } from '~~/shared/data.ts';
+import { loadNounsData } from '~/src/data.ts';
 import { resolveDeclensionByCase, symbolsByNumeri } from '~~/shared/nouns.ts';
 import type { NounClass, NounConvention, NounWord, Numerus } from '~~/shared/nouns.ts';
 

app/components/nouns/NounsConventionPage.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import useSimpleHead from '~/composables/useSimpleHead.ts';
-import { loadNounsData } from '~~/shared/data.ts';
+import { loadNounsData } from '~/src/data.ts';
 import { Example } from '~~/shared/language/examples.ts';
 import { MorphemeValues } from '~~/shared/language/morphemes.ts';
 import type { NounConvention } from '~~/shared/nouns.ts';

app/components/nouns/NounsConventionsIndex.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { loadNounsData } from '~~/shared/data.ts';
+import { loadNounsData } from '~/src/data.ts';
 
 const nounsData = await loadNounsData();
 </script>

app/components/nouns/NounsConventionsIndexGroup.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { loadNounsData } from '~~/shared/data.ts';
+import { loadNounsData } from '~/src/data.ts';
 import type { NounConventionGroup } from '~~/shared/nouns.ts';
 
 const props = defineProps<{

app/components/nouns/NounsConventionsIndexItem.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { loadNounsData } from '~~/shared/data.ts';
+import { loadNounsData } from '~/src/data.ts';
 import { resolveFirstDeclension } from '~~/shared/nouns.ts';
 import type { NounConvention, NounWord } from '~~/shared/nouns.ts';
 

app/components/nouns/NounsDeclension.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { loadNounsData } from '~~/shared/data.ts';
+import { loadNounsData } from '~/src/data.ts';
 import { capitalise } from '~~/shared/helpers.ts';
 import { getFirstDeclension, resolveArticles, resolveDeclensionByCase } from '~~/shared/nouns.ts';
 import type { Numerus, NounWord } from '~~/shared/nouns.ts';

app/components/nouns/NounsSubmitForm.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { loadNounAbbreviations } from '~/src/data.ts';
 import type { Config } from '~~/locale/config.ts';
 import type { Noun, NounRaw } from '~~/shared/classes.ts';
-import { loadNounAbbreviations } from '~~/shared/data.ts';
 import { fromUnionEntries } from '~~/shared/helpers.ts';
 import { collapseNounWordsInjectionKey } from '~~/shared/injectionKeys.ts';
 import { filterIrregularWords, genders } from '~~/shared/nouns.ts';

app/components/nouns/NounsTemplatesTable.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { loadNounTemplates } from '~/src/data.ts';
 import { Noun } from '~~/shared/classes.ts';
-import { loadNounTemplates } from '~~/shared/data.ts';
 import { availableGenders, gendersWithNumerus } from '~~/shared/nouns.ts';
 
 const props = withDefaults(defineProps<{

app/components/pronouns/PronounsCustomGenerator.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { loadPronounExamples, loadPronounLibrary } from '~/src/data.ts';
 import { ExampleCategory, Pronoun } from '~~/shared/classes.ts';
 import Compressor from '~~/shared/compressor.ts';
-import { loadPronounExamples, loadPronounLibrary } from '~~/shared/data.ts';
 
 const config = useConfig();
 if (!config.pronouns.enabled || !config.pronouns.generator.enabled) {

app/components/pronouns/PronounsDetailPage.vue

@@ -3,9 +3,9 @@ import { useNuxtApp } from 'nuxt/app';
 
 import useConfig from '~/composables/useConfig.ts';
 import useSimpleHead from '~/composables/useSimpleHead.ts';
+import { loadPronounExamples, loadPronounLibrary } from '~/src/data.ts';
 import { ExampleCategory, SourceLibrary } from '~~/shared/classes.ts';
 import type { Pronoun } from '~~/shared/classes.ts';
-import { loadPronounExamples, loadPronounLibrary } from '~~/shared/data.ts';
 
 const props = defineProps<{
     pronoun: Pronoun;

app/components/pronouns/PronounsIndex.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { loadPronounLibrary } from '~/src/data.ts';
 import { buildAnyPronounsList, headerForVariant } from '~~/shared/buildPronoun.ts';
-import { loadPronounLibrary } from '~~/shared/data.ts';
 
 defineProps<{
     examples?: boolean;

app/components/pronouns/PronounsMorphemeWithPronunciation.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { loadPronounExamples } from '~/src/data.ts';
 import type { Pronoun } from '~~/shared/classes.ts';
-import { loadPronounExamples } from '~~/shared/data.ts';
 import type { Example } from '~~/shared/language/examples.ts';
 
 const props = withDefaults(defineProps<{

app/components/pronouns/PronounsMultipleGenerator.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { loadPronouns } from '~~/shared/data.ts';
+import { loadPronouns } from '~/src/data.ts';
 
 const config = useConfig();
 const pronouns = await loadPronouns(config);

app/middleware/languageItemFromPath.ts

@@ -1,8 +1,8 @@
 import { defineNuxtRouteMiddleware, useNuxtApp } from 'nuxt/app';
 
+import { loadNounsData, loadPronounLibrary } from '~/src/data.ts';
 import type { Config } from '~~/locale/config.ts';
 import { buildPronoun } from '~~/shared/buildPronoun.ts';
-import { loadNounsData, loadPronounLibrary } from '~~/shared/data.ts';
 import type { Translator } from '~~/shared/translator.ts';
 
 const findPronoun = async (path: string, config: Config, translator: Translator) => {

app/pages/admin/index.vue

@@ -2,11 +2,11 @@
 import { useNuxtApp } from 'nuxt/app';
 
 import useSimpleHead from '~/composables/useSimpleHead.ts';
+import { loadConfig } from '~/src/data.ts';
 import { useMainStore } from '~/store/index.ts';
 import type { LocalDescriptionWithConfig } from '~~/server/admin.ts';
 import buildLocaleList from '~~/shared/buildLocaleList.ts';
 import { longtimeCookieSetting } from '~~/shared/cookieSettings.ts';
-import { loadConfig } from '~~/shared/data.ts';
 import { formatFonts } from '~~/shared/fonts.ts';
 import { newDate } from '~~/shared/helpers.ts';
 

app/pages/calendar/[[year]].vue

@@ -4,8 +4,8 @@ import { useNuxtApp, useRoute } from 'nuxt/app';
 import Page from '~/components/Page.vue';
 import useConfig from '~/composables/useConfig.ts';
 import useSimpleHead from '~/composables/useSimpleHead.ts';
+import { loadCalendar } from '~/src/data.ts';
 import { Day } from '~~/shared/calendar/helpers.ts';
-import { loadCalendar } from '~~/shared/data.ts';
 
 definePageMeta({
     name: 'calendar',

app/pages/calendar/[year]-[month]-[day].vue

@@ -4,8 +4,8 @@ import { useNuxtApp, useRoute } from 'nuxt/app';
 import Page from '~/components/Page.vue';
 import useConfig from '~/composables/useConfig.ts';
 import useSimpleHead from '~/composables/useSimpleHead.ts';
+import { loadCalendar } from '~/src/data.ts';
 import { Day } from '~~/shared/calendar/helpers.ts';
-import { loadCalendar } from '~~/shared/data.ts';
 
 definePageMeta({
     name: 'calendarDay',

app/pages/people.vue

@@ -2,7 +2,7 @@
 import { useNuxtApp } from 'nuxt/app';
 
 import useSimpleHead from '~/composables/useSimpleHead.ts';
-import { loadPeople } from '~~/shared/data.ts';
+import { loadPeople } from '~/src/data.ts';
 
 definePageMeta({
     translatedPaths: (config) => translatedPathByConfigModule(config.people),

app/pages/profile/[username].vue

@@ -4,10 +4,10 @@ import { useNuxtApp, useFetch } from 'nuxt/app';
 import useConfig from '~/composables/useConfig.ts';
 import useMainPronoun from '~/composables/useMainPronoun.ts';
 import useSimpleHead from '~/composables/useSimpleHead.ts';
+import { loadPronounLibrary } from '~/src/data.ts';
 import type { LocaleDescription } from '~~/locale/locales.ts';
 import type { TermsEntryRaw } from '~~/shared/classes.ts';
 import { longtimeCookieSetting } from '~~/shared/cookieSettings.ts';
-import { loadPronounLibrary } from '~~/shared/data.ts';
 import { getUrlForLocale } from '~~/shared/domain.ts';
 import { buildFlags } from '~~/shared/flags.ts';
 import { sleep } from '~~/shared/helpers.ts';

app/pages/profile/editor.vue

@@ -8,11 +8,11 @@ import useDialogue from '~/composables/useDialogue.ts';
 import useLinkUtils from '~/composables/useLinkUtils.ts';
 import useMainPronoun from '~/composables/useMainPronoun.ts';
 import useSimpleHead from '~/composables/useSimpleHead.ts';
+import { loadCalendar, loadPronounLibrary } from '~/src/data.ts';
 import { useMainStore } from '~/store/index.ts';
 import type { Config } from '~~/locale/config.ts';
 import { birthdateRange, formatDate, parseDate } from '~~/shared/birthdate.ts';
 import { buildPronounUsage } from '~~/shared/buildPronoun.ts';
-import { loadCalendar, loadPronounLibrary } from '~~/shared/data.ts';
 import { getUrlForLocale } from '~~/shared/domain.ts';
 import { buildList, isValidLink } from '~~/shared/helpers.ts';
 import { addPronounInjectionKey } from '~~/shared/injectionKeys.ts';

app/pages/pronouns/any.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
+import { loadPronounExamples, loadPronounLibrary } from '~/src/data.ts';
 import { buildAnyPronounsList, normaliseKey } from '~~/shared/buildPronoun.ts';
 import { ExampleCategory } from '~~/shared/classes.ts';
 import type { Pronoun, MergedPronounGroup } from '~~/shared/classes.ts';
-import { loadPronounExamples, loadPronounLibrary } from '~~/shared/data.ts';
 
 definePageMeta({
     translatedPaths: (config) => {

app/pages/sources.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type SourceSubmitForm from '~/components/SourceSubmitForm.vue';
+import { loadPronounLibrary } from '~/src/data.ts';
 import { Source, SourceLibrary } from '~~/shared/classes.ts';
-import { loadPronounLibrary } from '~~/shared/data.ts';
 import { changeSourceInjectionKey } from '~~/shared/injectionKeys.ts';
 
 definePageMeta({

app/plugins/locale.ts

@@ -1,9 +1,9 @@
 import { DateTime, Settings } from 'luxon';
 
+import { loadConfig, loadTranslations } from '~/src/data.ts';
 import baseTranslations from '~~/locale/_base/translations.suml';
 import buildLocaleList from '~~/shared/buildLocaleList.ts';
 import type { Pronoun } from '~~/shared/classes.ts';
-import { loadConfig, loadTranslations } from '~~/shared/data.ts';
 import { buildDict } from '~~/shared/helpers.ts';
 import { Translator } from '~~/shared/translator.ts';
 

app/router.options.ts

@@ -1,6 +1,6 @@
 import type { RouterOptions } from '@nuxt/schema';
 
-import { loadConfig } from '~~/shared/data.ts';
+import { loadConfig } from '~/src/data.ts';
 
 const routerOptions: RouterOptions = {
     routes: async (routes) => {

app/src/data.ts

@@ -1,12 +1,11 @@
-import { parsePronouns, parsePronounGroups } from './buildPronoun.ts';
-import { PronounExample, NounTemplate, PronounLibrary, Person } from './classes.ts';
-import { buildList } from './helpers.ts';
-
 import type { Config } from '~~/locale/config.ts';
 import type { PronounExamplesData } from '~~/locale/data.ts';
 import type { Translations } from '~~/locale/translations.ts';
+import { parsePronouns, parsePronounGroups } from '~~/shared/buildPronoun.ts';
 import { buildCalendar } from '~~/shared/calendar/calendar.ts';
+import { PronounExample, NounTemplate, PronounLibrary, Person } from '~~/shared/classes.ts';
 import { getLocaleForUrl, getUrlForLocale } from '~~/shared/domain.ts';
+import { buildList } from '~~/shared/helpers.ts';
 import { Example } from '~~/shared/language/examples.ts';
 import type { VariantsFromBaseConverter } from '~~/shared/language/grammarTables.ts';
 import type { NounsData } from '~~/shared/nouns.ts';