@nuxt/scripts 2.0.0-beta.6 → 2.0.0-beta.8

package/dist/runtime/components/MapLibre/ScriptMapLibreMap.vue

@@ -25,7 +25,7 @@ const props = defineProps({
   interactive: { type: Boolean, required: false, default: true },
   rootAttrs: { type: Object, required: false }
 });
-const emit = defineEmits(["ready", "error", "click", "move", "moveend", "zoom", "zoomend", "rotate", "rotateend", "pitch", "pitchend", "update:center", "update:zoom", "update:bearing", "update:pitch"]);
+const emit = defineEmits(["ready", "error", "load", "styleload", "click", "move", "moveend", "zoom", "zoomend", "rotate", "rotateend", "pitch", "pitchend", "update:center", "update:zoom", "update:bearing", "update:pitch"]);
 const slots = defineSlots();
 const rootEl = useTemplateRef("rootEl");
 const mapEl = useTemplateRef("mapEl");
@@ -48,13 +48,24 @@ onError((error) => {
   loadError.value = error ?? new Error("MapLibre failed to load");
   emit("error", loadError.value);
 });
-const exposed = { maplibre, map, load };
+function fitBounds(bounds, options) {
+  map.value?.fitBounds(bounds, options);
+}
+function easeTo(options) {
+  map.value?.easeTo(options);
+}
+function flyTo(options) {
+  map.value?.flyTo(options);
+}
+const exposed = { maplibre, map, load, fitBounds, easeTo, flyTo };
 defineExpose(exposed);
 provide(MAPLIBRE_MAP_INJECTION_KEY, {
   maplibre,
   map
 });
 function bindMapEvents(instance) {
+  instance.on("load", (event) => emit("load", event));
+  instance.on("style.load", (event) => emit("styleload", event));
   instance.on("click", (event) => emit("click", event));
   instance.on("move", (event) => emit("move", event));
   instance.on("moveend", (event) => {
@@ -82,6 +93,15 @@ function bindMapEvents(instance) {
     emit("error", error);
   });
 }
+function configureCanvasAccessibility(instance) {
+  const canvas = instance.getCanvas();
+  canvas.removeAttribute("role");
+  if (props.interactive && instance.keyboard.isEnabled())
+    return;
+  canvas.setAttribute("tabindex", "-1");
+  canvas.setAttribute("aria-hidden", "true");
+  canvas.removeAttribute("aria-label");
+}
 onMounted(() => {
   onLoaded((instance) => {
     if (isUnmounted || !mapEl.value)
@@ -99,6 +119,7 @@ onMounted(() => {
         pitch: props.pitch,
         interactive: props.interactive
       });
+      configureCanvasAccessibility(mapInstance);
       bindMapEvents(mapInstance);
       map.value = mapInstance;
       mapInstance.once("load", () => {

package/dist/runtime/components/MapLibre/ScriptMapLibreMap.vue.d.ts

@@ -1,119 +1,55 @@
 import type * as MapLibre from 'maplibre-gl';
-import type { HTMLAttributes, ReservedProps, ShallowRef } from 'vue';
-import type { ElementScriptTrigger } from '#nuxt-scripts/types';
+import type { ScriptMapLibreMapExpose, ScriptMapLibreMapProps, ScriptMapLibreMapSlots } from './types.js';
+export type { ScriptMapLibreMapEmits, ScriptMapLibreMapExpose, ScriptMapLibreMapProps, ScriptMapLibreMapSlots, } from './types.js';
 export { MAPLIBRE_MAP_INJECTION_KEY } from './useMapLibreResource.js';
-export interface ScriptMapLibreMapProps {
-    /**
-     * Defines when the MapLibre script loads.
-     * @default 'visible'
-     */
-    trigger?: ElementScriptTrigger;
-    /** MapLibre style URL or inline style specification. */
-    mapStyle: string | MapLibre.StyleSpecification;
-    /** Initial and reactively controlled map center. */
-    center: MapLibre.LngLatLike;
-    /** Initial and reactively controlled zoom level. @default 12 */
-    zoom?: number;
-    /** Initial and reactively controlled bearing in degrees. @default 0 */
-    bearing?: number;
-    /** Initial and reactively controlled pitch in degrees. @default 0 */
-    pitch?: number;
-    /** Options passed to `new maplibregl.Map()`. Dedicated props take precedence. */
-    options?: Omit<MapLibre.MapOptions, 'container'>;
-    /** Inject MapLibre's stylesheet when the script begins loading. @default true */
-    injectStyles?: boolean;
-    /** Custom MapLibre stylesheet URL. */
-    stylesheetUrl?: string;
-    /** Worker URL passed to `maplibregl.setWorkerUrl()`. */
-    workerUrl?: string;
-    /** Width reserved before the map loads. @default 640 */
-    width?: number | string;
-    /** Height reserved before the map loads. @default 400 */
-    height?: number | string;
-    /** Accessible name for an interactive map. @default 'Interactive map' */
-    ariaLabel?: string;
-    /** Disable map input and remove it from the accessibility tree when decorative. @default true */
-    interactive?: boolean;
-    /** Attributes applied to the outer layout container. */
-    rootAttrs?: HTMLAttributes & ReservedProps & Record<string, unknown>;
-}
-export interface ScriptMapLibreMapExpose {
-    maplibre: ShallowRef<typeof MapLibre | undefined>;
-    map: ShallowRef<MapLibre.Map | undefined>;
-    load: () => Promise<unknown> | unknown;
-}
-export interface ScriptMapLibreMapEmits {
-    'ready': [payload: ScriptMapLibreMapExpose];
-    'error': [error: Error];
-    'click': [event: MapLibre.MapEventType['click']];
-    'move': [event: MapLibre.MapEventType['move']];
-    'moveend': [event: MapLibre.MapEventType['moveend']];
-    'zoom': [event: MapLibre.MapEventType['zoom']];
-    'zoomend': [event: MapLibre.MapEventType['zoomend']];
-    'rotate': [event: MapLibre.MapEventType['rotate']];
-    'rotateend': [event: MapLibre.MapEventType['rotateend']];
-    'pitch': [event: MapLibre.MapEventType['pitch']];
-    'pitchend': [event: MapLibre.MapEventType['pitchend']];
-    'update:center': [center: MapLibre.LngLat];
-    'update:zoom': [zoom: number];
-    'update:bearing': [bearing: number];
-    'update:pitch': [pitch: number];
-}
-export interface ScriptMapLibreMapSlots {
-    default?: () => any;
-    loading?: () => any;
-    awaitingLoad?: () => any;
-    error?: (props: {
-        error: Error;
-    }) => any;
-    placeholder?: () => any;
-    /** Text or links that expose the canvas map's essential information to assistive technology. */
-    description?: () => any;
-}
 declare const _default: typeof __VLS_export;
 export default _default;
 declare const __VLS_export: __VLS_WithSlots<import("vue").DefineComponent<ScriptMapLibreMapProps, ScriptMapLibreMapExpose, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     error: (error: Error) => any;
     ready: (payload: ScriptMapLibreMapExpose) => any;
+    load: (event: MapLibre.MapLibreEvent<unknown>) => any;
     click: (event: MapLibre.MapMouseEvent) => any;
-    move: (event: MapLibre.MapMovementEvent) => any;
     zoom: (event: MapLibre.MapMovementEvent) => any;
-    rotate: (event: MapLibre.MapMovementEvent) => any;
-    zoomend: (event: MapLibre.MapMovementEvent) => any;
+    pitch: (event: MapLibre.MapMovementEvent) => any;
+    move: (event: MapLibre.MapMovementEvent) => any;
     moveend: (event: MapLibre.MapMovementEvent) => any;
-    "update:center": (center: MapLibre.LngLat) => any;
-    "update:zoom": (zoom: number) => any;
+    zoomend: (event: MapLibre.MapMovementEvent) => any;
+    rotate: (event: MapLibre.MapMovementEvent) => any;
     rotateend: (event: MapLibre.MapMovementEvent) => any;
-    pitch: (event: MapLibre.MapMovementEvent) => any;
     pitchend: (event: MapLibre.MapMovementEvent) => any;
+    "update:center": (center: MapLibre.LngLat) => any;
+    "update:zoom": (zoom: number) => any;
+    styleload: (event: MapLibre.MapStyleLoadEvent) => any;
     "update:bearing": (bearing: number) => any;
     "update:pitch": (pitch: number) => any;
 }, string, import("vue").PublicProps, Readonly<ScriptMapLibreMapProps> & Readonly<{
     onError?: ((error: Error) => any) | undefined;
     onReady?: ((payload: ScriptMapLibreMapExpose) => any) | undefined;
+    onLoad?: ((event: MapLibre.MapLibreEvent<unknown>) => any) | undefined;
     onClick?: ((event: MapLibre.MapMouseEvent) => any) | undefined;
-    onMove?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
     onZoom?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
-    onRotate?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
-    onZoomend?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
+    onPitch?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
+    onMove?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
     onMoveend?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
-    "onUpdate:center"?: ((center: MapLibre.LngLat) => any) | undefined;
-    "onUpdate:zoom"?: ((zoom: number) => any) | undefined;
+    onZoomend?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
+    onRotate?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
     onRotateend?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
-    onPitch?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
     onPitchend?: ((event: MapLibre.MapMovementEvent) => any) | undefined;
+    "onUpdate:center"?: ((center: MapLibre.LngLat) => any) | undefined;
+    "onUpdate:zoom"?: ((zoom: number) => any) | undefined;
+    onStyleload?: ((event: MapLibre.MapStyleLoadEvent) => any) | undefined;
     "onUpdate:bearing"?: ((bearing: number) => any) | undefined;
     "onUpdate:pitch"?: ((pitch: number) => any) | undefined;
 }>, {
-    trigger: ElementScriptTrigger;
+    trigger: import("../../types.js").ElementScriptTrigger;
     injectStyles: boolean;
     width: number | string;
     height: number | string;
-    zoom: number;
-    ariaLabel: string;
     interactive: boolean;
-    pitch: number;
+    zoom: number;
     bearing: number;
+    pitch: number;
+    ariaLabel: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, ScriptMapLibreMapSlots>;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/MapLibre/ScriptMapLibreMarker.d.vue.ts

@@ -1,25 +1,16 @@
 import type * as MapLibre from 'maplibre-gl';
-type __VLS_Props = {
-    /** Reactive marker position in `[longitude, latitude]` order. */
-    position: MapLibre.LngLatLike;
-    /** Accessible name for the marker element. */
-    ariaLabel?: string;
-    /** Tooltip text for the marker element. */
-    title?: string;
-    /** Options passed to `new maplibregl.Marker()`. Options with public setters also update reactively. */
-    options?: MapLibre.MarkerOptions;
-};
+import type { ScriptMapLibreMarkerProps } from './types.js';
 type __VLS_Slots = {
     default?: () => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
+declare const __VLS_base: import("vue").DefineComponent<ScriptMapLibreMarkerProps, {
     marker: import("vue").ShallowRef<MapLibre.Marker | undefined>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (event: MouseEvent) => any;
     drag: (event: MapLibre.Event<string>) => any;
     dragend: (event: MapLibre.Event<string>) => any;
     dragstart: (event: MapLibre.Event<string>) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<ScriptMapLibreMarkerProps> & Readonly<{
     onClick?: ((event: MouseEvent) => any) | undefined;
     onDrag?: ((event: MapLibre.Event<string>) => any) | undefined;
     onDragend?: ((event: MapLibre.Event<string>) => any) | undefined;

package/dist/runtime/components/MapLibre/ScriptMapLibreMarker.vue.d.ts

@@ -1,25 +1,16 @@
 import type * as MapLibre from 'maplibre-gl';
-type __VLS_Props = {
-    /** Reactive marker position in `[longitude, latitude]` order. */
-    position: MapLibre.LngLatLike;
-    /** Accessible name for the marker element. */
-    ariaLabel?: string;
-    /** Tooltip text for the marker element. */
-    title?: string;
-    /** Options passed to `new maplibregl.Marker()`. Options with public setters also update reactively. */
-    options?: MapLibre.MarkerOptions;
-};
+import type { ScriptMapLibreMarkerProps } from './types.js';
 type __VLS_Slots = {
     default?: () => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
+declare const __VLS_base: import("vue").DefineComponent<ScriptMapLibreMarkerProps, {
     marker: import("vue").ShallowRef<MapLibre.Marker | undefined>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (event: MouseEvent) => any;
     drag: (event: MapLibre.Event<string>) => any;
     dragend: (event: MapLibre.Event<string>) => any;
     dragstart: (event: MapLibre.Event<string>) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<ScriptMapLibreMarkerProps> & Readonly<{
     onClick?: ((event: MouseEvent) => any) | undefined;
     onDrag?: ((event: MapLibre.Event<string>) => any) | undefined;
     onDragend?: ((event: MapLibre.Event<string>) => any) | undefined;

package/dist/runtime/components/MapLibre/ScriptMapLibreNavigationControl.d.vue.ts

@@ -1,12 +1,7 @@
 import type * as MapLibre from 'maplibre-gl';
-type __VLS_Props = {
-    /** Position of the navigation control. */
-    position?: MapLibre.ControlPosition;
-    /** Options passed to `new maplibregl.NavigationControl()`. */
-    options?: MapLibre.NavigationControlOptions;
-};
-declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {
+import type { ScriptMapLibreNavigationControlProps } from './types.js';
+declare const __VLS_export: import("vue").DefineComponent<ScriptMapLibreNavigationControlProps, {
     control: import("vue").ShallowRef<MapLibre.NavigationControl | undefined>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ScriptMapLibreNavigationControlProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/MapLibre/ScriptMapLibreNavigationControl.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { useMapLibreResource } from "./useMapLibreResource";
+defineOptions({ render: () => null });
 const props = defineProps({
   position: { type: null, required: false },
   options: { type: null, required: false }
@@ -17,7 +18,3 @@ const control = useMapLibreResource({
 });
 defineExpose({ control });
 </script>
-
-<template>
-  <!-- nuxt-scripts: MapLibre navigation control -->
-</template>

package/dist/runtime/components/MapLibre/ScriptMapLibreNavigationControl.vue.d.ts

@@ -1,12 +1,7 @@
 import type * as MapLibre from 'maplibre-gl';
-type __VLS_Props = {
-    /** Position of the navigation control. */
-    position?: MapLibre.ControlPosition;
-    /** Options passed to `new maplibregl.NavigationControl()`. */
-    options?: MapLibre.NavigationControlOptions;
-};
-declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {
+import type { ScriptMapLibreNavigationControlProps } from './types.js';
+declare const __VLS_export: import("vue").DefineComponent<ScriptMapLibreNavigationControlProps, {
     control: import("vue").ShallowRef<MapLibre.NavigationControl | undefined>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ScriptMapLibreNavigationControlProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/MapLibre/ScriptMapLibrePopup.d.vue.ts

@@ -1,21 +1,14 @@
 import type * as MapLibre from 'maplibre-gl';
-type __VLS_Props = {
-    /** Position for a standalone popup. Omit when nested inside a marker. */
-    position?: MapLibre.LngLatLike;
-    /** Whether the popup is open. @default false */
-    open?: boolean;
-    /** Options passed to `new maplibregl.Popup()`. Options with public setters also update reactively. */
-    options?: MapLibre.PopupOptions;
-};
+import type { ScriptMapLibrePopupProps } from './types.js';
 type __VLS_Slots = {
     default?: () => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
+declare const __VLS_base: import("vue").DefineComponent<ScriptMapLibrePopupProps, {
     popup: import("vue").ShallowRef<MapLibre.Popup | undefined>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (event: MapLibre.Event<string>) => any;
     open: (event: MapLibre.Event<string>) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<ScriptMapLibrePopupProps> & Readonly<{
     onClose?: ((event: MapLibre.Event<string>) => any) | undefined;
     onOpen?: ((event: MapLibre.Event<string>) => any) | undefined;
 }>, {

package/dist/runtime/components/MapLibre/ScriptMapLibrePopup.vue.d.ts

@@ -1,21 +1,14 @@
 import type * as MapLibre from 'maplibre-gl';
-type __VLS_Props = {
-    /** Position for a standalone popup. Omit when nested inside a marker. */
-    position?: MapLibre.LngLatLike;
-    /** Whether the popup is open. @default false */
-    open?: boolean;
-    /** Options passed to `new maplibregl.Popup()`. Options with public setters also update reactively. */
-    options?: MapLibre.PopupOptions;
-};
+import type { ScriptMapLibrePopupProps } from './types.js';
 type __VLS_Slots = {
     default?: () => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {
+declare const __VLS_base: import("vue").DefineComponent<ScriptMapLibrePopupProps, {
     popup: import("vue").ShallowRef<MapLibre.Popup | undefined>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (event: MapLibre.Event<string>) => any;
     open: (event: MapLibre.Event<string>) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<ScriptMapLibrePopupProps> & Readonly<{
     onClose?: ((event: MapLibre.Event<string>) => any) | undefined;
     onOpen?: ((event: MapLibre.Event<string>) => any) | undefined;
 }>, {

package/dist/runtime/components/MapLibre/ScriptMapLibreScaleControl.d.vue.ts

@@ -0,0 +1,7 @@
+import type * as MapLibre from 'maplibre-gl';
+import type { ScriptMapLibreScaleControlProps } from './types.js';
+declare const __VLS_export: import("vue").DefineComponent<ScriptMapLibreScaleControlProps, {
+    control: import("vue").ShallowRef<MapLibre.ScaleControl | undefined>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ScriptMapLibreScaleControlProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: typeof __VLS_export;
+export default _default;

package/dist/runtime/components/MapLibre/ScriptMapLibreScaleControl.vue

@@ -0,0 +1,25 @@
+<script setup>
+import { watch } from "vue";
+import { useMapLibreResource } from "./useMapLibreResource";
+defineOptions({ render: () => null });
+const props = defineProps({
+  position: { type: null, required: false },
+  options: { type: null, required: false }
+});
+const control = useMapLibreResource({
+  create({ maplibre, map }) {
+    const instance = new maplibre.ScaleControl(props.options);
+    map.addControl(instance, props.position);
+    return instance;
+  },
+  cleanup(instance, { map }) {
+    if (map.hasControl(instance))
+      map.removeControl(instance);
+  }
+});
+watch(() => props.options?.unit, (unit) => {
+  if (control.value && unit)
+    control.value.setUnit(unit);
+});
+defineExpose({ control });
+</script>

package/dist/runtime/components/MapLibre/ScriptMapLibreScaleControl.vue.d.ts

@@ -0,0 +1,7 @@
+import type * as MapLibre from 'maplibre-gl';
+import type { ScriptMapLibreScaleControlProps } from './types.js';
+declare const __VLS_export: import("vue").DefineComponent<ScriptMapLibreScaleControlProps, {
+    control: import("vue").ShallowRef<MapLibre.ScaleControl | undefined>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<ScriptMapLibreScaleControlProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: typeof __VLS_export;
+export default _default;