refactor: refactores types and composables to new ones from theme

Author: Marcin Kwiatkowski

packages/theme/components/CurrencySelector/CurrenciesModal.vue

@@ -30,7 +30,7 @@
     </SfList>
   </SfBottomModal>
 </template>
-<script>
+<script lang="ts">
 import {
   defineComponent, computed, onMounted,
 } from '@nuxtjs/composition-api';
@@ -41,7 +41,7 @@ import {
 } from '@storefront-ui/vue';
 import {
   useCurrency,
-} from '@vue-storefront/magento';
+} from '~/composables';
 import { useHandleChanges } from '~/helpers/magentoConfig/handleChanges';
 
 export default defineComponent({
@@ -58,10 +58,10 @@ export default defineComponent({
   emits: ['closeModal'],
   setup() {
     const {
-      currencies,
+      currency: currencies,
       change: changeCurrency,
       load: loadCurrencies,
-    } = useCurrency('header-currency');
+    } = useCurrency();
 
     const { handleChanges } = useHandleChanges();
 

packages/theme/components/StoreSwitcher/StoresModal.vue

@@ -49,7 +49,7 @@
 <script>
 import { defineComponent, onMounted, computed } from '@nuxtjs/composition-api';
 import { SfList, SfBottomModal, SfCharacteristic } from '@storefront-ui/vue';
-import { useStore } from '@vue-storefront/magento';
+import { useStore } from '~/composables';
 import { storeGetters, storeConfigGetters } from '~/getters';
 import { useHandleChanges } from '~/helpers/magentoConfig/handleChanges';
 
@@ -72,7 +72,7 @@ export default defineComponent({
       stores,
       change: changeStore,
       load: loadStores,
-    } = useStore('header-stores');
+    } = useStore();
 
     const availableStores = computed(() => stores.value ?? []);
 

packages/theme/composables/types.d.ts

@@ -1,4 +1,6 @@
 import { CustomQuery } from '@vue-storefront/core/lib/src/types';
+import {FacetSearchResult} from "@vue-storefront/core";
+import {FacetResultsData, Filter} from "@vue-storefront/magento";
 
 export declare type ComposableFunctionArgs<T> = T & {
   customQuery?: CustomQuery;
@@ -2320,6 +2322,11 @@ export interface CustomerAddress {
   telephone?: Maybe<Scalars['String']>;
   /** The customer's Value-added tax (VAT) number (for corporate customers) */
   vat_id?: Maybe<Scalars['String']>;
+  /** The customer's email **/
+  email: Scalars['String']
+  /** The customer's phone **/
+  phone: Maybe<Scalars['String']>
+
 }
 export interface CustomerAddressAttribute {
   /** Attribute code */
@@ -51444,3 +51451,55 @@ export declare type WishlistQuery = {
     } | null | undefined>;
   } | null | undefined;
 };
+
+export declare type Category = CategoryTree | CategorySearchQuery['categoryList'][0];
+export interface Product extends ProductInterface, ConfigurableProduct, Omit<BundleProduct, 'items'>, Omit<GroupedProduct, 'items'>, Omit<DownloadableProduct, 'items'>, Omit<VirtualProduct, 'items'> {
+}
+export declare type Countries = CountriesListQuery['countries'][0];
+
+export interface TransformedCustomerAddress extends CustomerAddress {
+  street: string,
+  apartment: string,
+  neighborhood: string,
+  extra: string,
+}
+
+export interface AddressGetter {
+  countriesList(countries: Countries[]): {
+    id: string;
+    label: string;
+    englishLabel: string;
+    abbreviation: string;
+  }[];
+  regionList(country: Country): {
+    id: number;
+    label: string;
+    abbreviation: string;
+  }[];
+}
+
+export declare type CartItem = CartItemInterface;
+
+export interface AgnosticPaymentMethod {
+  label: string;
+  value: string;
+}
+
+export declare type ShippingMethod = AvailableShippingMethod;
+
+export declare type SearchData = FacetSearchResult<FacetResultsData>;
+export declare type ReviewMetadata = ProductReviewRatingsMetadataQuery['productReviewRatingsMetadata']['items'][0];
+export interface AgnosticReviewMetadata {
+  id: string;
+  name: string;
+  values: {
+    label: string | number;
+    id: string;
+  }[];
+}
+
+export declare type AvailableStores = AvailableStoresQuery['availableStores'];
+
+export interface ReviewsGetter {
+  reviews: Array<ProductReviews>
+}

packages/theme/composables/useAddresses/index.ts

@@ -1,6 +1,6 @@
 import { Ref, ref, useContext } from '@nuxtjs/composition-api';
 import { Logger } from '@vue-storefront/core';
-import { transformUserCreateAddressInput, transformUserUpdateAddressInput } from '@vue-storefront/magento';
+import { transformUserCreateAddressInput, transformUserUpdateAddressInput } from '~/helpers/userAddressManipulator';
 import { ComposableFunctionArgs } from '~/composables/types';
 import { UseAddressesInterface, UseAddressesParamsInput, UseAddressesErrors } from '~/composables/useAddresses/useAddresses';
 

packages/theme/composables/useConfig/useConfig.d.ts

@@ -1,5 +1,5 @@
 import { ComputedRef, Ref } from '@nuxtjs/composition-api';
-import { StoreConfig } from '@vue-storefront/magento';
+import { StoreConfig } from '~/composables/types';
 
 export interface UseConfigErrors {
   load: Error | null;

packages/theme/composables/useCurrency/useCurrency.d.ts

@@ -1,6 +1,6 @@
 import { ComposableFunctionArgs } from '@vue-storefront/core';
 import { ComputedRef, Ref } from '@nuxtjs/composition-api';
-import { Currency } from '@vue-storefront/magento-api';
+import { Currency } from '~/modules/GraphQL/types';
 
 export interface UseCurrencyErrors {
   load: Error | null;
@@ -9,7 +9,7 @@ export interface UseCurrencyErrors {
 
 export interface UseCurrency {
   load: (params?: ComposableFunctionArgs<{}>) => Promise<void>;
-  change: (params: ComposableFunctionArgs<{ id: string }>) => void;
+  change: (params: ComposableFunctionArgs<{ id: string }>) => Promise<void>;
   currency: ComputedRef<Currency>;
   loading: Ref<boolean>;
   error: Ref<UseCurrencyErrors>;

packages/theme/composables/useMagentoConfiguration.ts

@@ -1,9 +1,9 @@
+import { computed, ComputedRef, useContext } from '@nuxtjs/composition-api';
 import {
   StoreConfig,
-} from '@vue-storefront/magento';
+} from '~/composables/types';
 import { storeConfigGetters } from '~/getters';
 
-import { computed, ComputedRef, useContext } from '@nuxtjs/composition-api';
 import cookieNames from '~/enums/cookieNameEnum';
 import { useConfig } from '~/composables';
 

packages/theme/composables/useStore/index.ts

@@ -3,7 +3,7 @@ import {
   ref, Ref, useContext,
 } from '@nuxtjs/composition-api';
 import { Logger } from '@vue-storefront/core';
-import { StoreConfig } from '@vue-storefront/magento';
+import { StoreConfig } from '~/composables/types';
 import { storeConfigGetters } from '~/getters';
 import { UseStoreInterface, UseStore, UseStoreErrors } from '~/composables/useStore/useStore';
 import { useConfigStore } from '~/stores/config';

packages/theme/getters/_utils.ts

@@ -1,5 +1,5 @@
 import { AgnosticAttribute } from '@vue-storefront/core';
-import { Product } from '@vue-storefront/magento';
+import { Product } from '~/composables/types';
 
 export const getAttributeValue = (attribute) => attribute.values;
 

packages/theme/getters/addressGetter.ts

@@ -1,4 +1,4 @@
-import { Countries, Country, AddressGetter } from '@vue-storefront/magento';
+import { Countries, Country, AddressGetter } from '~/composables/types';
 
 const countriesList: AddressGetter['countriesList'] = (countries: Countries[]) => countries
   .filter((c) => c.id && c.full_name_english && c.full_name_locale)