refactor: use the MapKey symbol from utils 🥳

vinayakkulkarni · Apr 13, 2022 · 57ca82d · 57ca82d
1 parent f3d9146
commit 57ca82d
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 27 deletions.
diff --git a/src/controls/VControlAttribution.vue b/src/controls/VControlAttribution.vue
@@ -7,8 +7,7 @@
   import { AttributionControl } from 'mapbox-gl';
   import type { PropType } from 'vue';
   import { defineComponent, onMounted } from 'vue';
-  import { MapKey } from '../../types/symbols';
-  import { injectStrict } from '../utils';
+  import { injectStrict, MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VControlAttribution',

diff --git a/src/controls/VControlFullscreen.vue b/src/controls/VControlFullscreen.vue
@@ -3,8 +3,7 @@
   import { FullscreenControl } from 'mapbox-gl';
   import type { PropType } from 'vue';
   import { defineComponent, onMounted } from 'vue';
-  import { MapKey } from '../../types/symbols';
-  import { injectStrict } from '../utils';
+  import { injectStrict, MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VControlFullscreen',

diff --git a/src/controls/VControlGeolocate.vue b/src/controls/VControlGeolocate.vue
@@ -3,9 +3,8 @@
   import { GeolocateControl } from 'mapbox-gl';
   import type { PropType } from 'vue';
   import { defineComponent, onMounted } from 'vue';
-  import { MapKey } from '../../types/symbols';
   import { geolocateControlEvents as events } from '../constants/events/geolocate';
-  import { injectStrict } from '../utils';
+  import { injectStrict, MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VControlFullscreen',

diff --git a/src/controls/VControlNavigation.vue b/src/controls/VControlNavigation.vue
@@ -2,8 +2,7 @@
   import { NavigationControl } from 'mapbox-gl';
   import type { PropType } from 'vue';
   import { defineComponent, onMounted } from 'vue';
-  import { MapKey } from '../../types/symbols';
-  import { injectStrict } from '../utils';
+  import { injectStrict, MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VControlFullscreen',

diff --git a/src/controls/VControlScale.vue b/src/controls/VControlScale.vue
@@ -2,8 +2,7 @@
   import { ScaleControl } from 'mapbox-gl';
   import type { PropType } from 'vue';
   import { defineComponent, onMounted } from 'vue';
-  import { MapKey } from '../../types/symbols';
-  import { injectStrict } from '../utils';
+  import { injectStrict, MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VControlFullscreen',

diff --git a/src/layers/mapbox/VLayerMapboxCanvas.vue b/src/layers/mapbox/VLayerMapboxCanvas.vue
@@ -8,8 +8,7 @@
   import type { AnyLayer, GeoJSONSourceRaw } from 'mapbox-gl';
   import type { PropType, Ref } from 'vue';
   import { defineComponent, onMounted, ref, watch } from 'vue';
-  import { MapKey } from '../../../types/symbols';
-  import { injectStrict } from '../../utils';
+  import { injectStrict, MapKey } from '../../utils';
 
   export default defineComponent({
     name: 'VLayerMapboxCanvas',

diff --git a/src/layers/mapbox/VLayerMapboxGeojson.vue b/src/layers/mapbox/VLayerMapboxGeojson.vue
@@ -8,8 +8,7 @@
   import type { AnyLayer, GeoJSONSourceRaw } from 'mapbox-gl';
   import type { PropType, Ref } from 'vue';
   import { defineComponent, onMounted, ref, watch } from 'vue';
-  import { MapKey } from '../../../types/symbols';
-  import { injectStrict } from '../../utils';
+  import { injectStrict, MapKey } from '../../utils';
 
   export default defineComponent({
     name: 'VLayerMapboxGeojson',

diff --git a/src/layers/mapbox/VLayerMapboxImage.vue b/src/layers/mapbox/VLayerMapboxImage.vue
@@ -7,8 +7,7 @@
   import type { AnyLayer, ImageSourceRaw } from 'mapbox-gl';
   import type { PropType, Ref } from 'vue';
   import { defineComponent, onMounted, ref, watch } from 'vue';
-  import { MapKey } from '../../../types/symbols';
-  import { injectStrict } from '../../utils';
+  import { injectStrict, MapKey } from '../../utils';
 
   export default defineComponent({
     name: 'VLayerMapboxImage',

diff --git a/src/layers/mapbox/VLayerMapboxRaster.vue b/src/layers/mapbox/VLayerMapboxRaster.vue
@@ -8,8 +8,7 @@
   import type { AnyLayer, GeoJSONSourceRaw } from 'mapbox-gl';
   import type { PropType, Ref } from 'vue';
   import { defineComponent, onMounted, ref, watch } from 'vue';
-  import { MapKey } from '../../../types/symbols';
-  import { injectStrict } from '../../utils';
+  import { injectStrict, MapKey } from '../../utils';
 
   export default defineComponent({
     name: 'VLayerMapboxRaster',

diff --git a/src/layers/mapbox/VLayerMapboxVector.vue b/src/layers/mapbox/VLayerMapboxVector.vue
@@ -7,8 +7,7 @@
   import type { AnyLayer, VectorSource } from 'mapbox-gl';
   import type { PropType, Ref } from 'vue';
   import { defineComponent, onMounted, ref, watch } from 'vue';
-  import { MapKey } from '../../../types/symbols';
-  import { injectStrict } from '../../utils';
+  import { injectStrict, MapKey } from '../../utils';
 
   export default defineComponent({
     name: 'VLayerMapboxVector',

diff --git a/src/layers/mapbox/VLayerMapboxVideo.vue b/src/layers/mapbox/VLayerMapboxVideo.vue
@@ -7,8 +7,7 @@
   import type { AnyLayer, VectorSource } from 'mapbox-gl';
   import type { PropType, Ref } from 'vue';
   import { defineComponent, onMounted, ref, watch } from 'vue';
-  import { MapKey } from '../../../types/symbols';
-  import { injectStrict } from '../../utils';
+  import { injectStrict, MapKey } from '../../utils';
 
   export default defineComponent({
     name: 'VLayerMapboxVideo',

diff --git a/src/map/VMap.vue b/src/map/VMap.vue
@@ -8,8 +8,8 @@
   import { Map } from 'mapbox-gl';
   import type { PropType, Ref, SetupContext } from 'vue';
   import { defineComponent, onMounted, provide, ref } from 'vue';
-  import { MapKey } from '../../types/symbols';
   import { mapEvents } from '../constants/events';
+  import { MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VMap',

diff --git a/src/markers/VMarker.vue b/src/markers/VMarker.vue
@@ -19,10 +19,9 @@
   import { Marker } from 'mapbox-gl';
   import type { PropType, Ref, SetupContext } from 'vue';
   import { defineComponent, onMounted, ref } from 'vue';
-  import { MapKey } from '../../types/symbols';
   import { markerDOMEvents, markerMapEvents } from '../constants/events';
   import VPopup from '../popups/VPopup.vue';
-  import { injectStrict } from '../utils';
+  import { injectStrict, MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VMarker',

diff --git a/src/popups/VPopup.vue b/src/popups/VPopup.vue
@@ -8,9 +8,8 @@
   import { Popup } from 'mapbox-gl';
   import type { PropType, Ref, SetupContext } from 'vue';
   import { defineComponent, onBeforeUnmount, onMounted, ref } from 'vue';
-  import { MapKey } from '../../types/symbols';
   import { popupEvents } from '../constants/events';
-  import { injectStrict } from '../utils';
+  import { injectStrict, MapKey } from '../utils';
 
   export default defineComponent({
     name: 'VPopup',

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -15,3 +15,5 @@ export function injectStrict<T>(key: InjectionKey<T>, fallback?: T): T {
   }
   return resolved;
 }
+
+export { MapKey } from './symbols';
diff --git a/src/utils/symbols.ts b/src/utils/symbols.ts
@@ -0,0 +1,6 @@
+import type { Map } from 'mapbox-gl';
+import type { InjectionKey, Ref } from 'vue';
+
+const MapKey: InjectionKey<Ref<Map>> = Symbol('Map');
+
+export { MapKey };
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       return resolved;
     }
+    export { MapKey } from './symbols';