Mechanical refactor to group imports from common and govuk directories

src/lib/BaselayerSwitcher.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Select from "./govuk/Select.svelte";
+  import { Select } from "./govuk";
 
   // TODO Be specific about "streets" | "hybrid", but then we need actual error
   // handling when we parse it from URL params

src/lib/Legend.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { colors } from "../colors";
   import type { Schema } from "../types";
-  import CollapsibleCard from "./common/CollapsibleCard.svelte";
+  import { CollapsibleCard } from "./common";
 
   export let schema: Schema;
 </script>

src/lib/ZoomOutMap.svelte

@@ -3,7 +3,7 @@
   import icon from "../../assets/zoom_out_map.svg";
   import { bbox } from "../maplibre_helpers";
   import { map } from "../stores";
-  import SecondaryButton from "./govuk/SecondaryButton.svelte";
+  import { SecondaryButton } from "./govuk";
 
   export let boundaryGeojson: GeoJSON;
 

src/lib/browse/Filters.svelte

@@ -2,10 +2,8 @@
   import { onMount } from "svelte";
   import { gjScheme } from "../../stores";
   import type { FeatureUnion } from "../../types";
-  import CollapsibleCard from "../common/CollapsibleCard.svelte";
-  import FormElement from "../govuk/FormElement.svelte";
-  import SecondaryButton from "../govuk/SecondaryButton.svelte";
-  import Select from "../govuk/Select.svelte";
+  import { CollapsibleCard } from "../common";
+  import { FormElement, SecondaryButton, Select } from "../govuk";
   import { type Scheme } from "./data";
 
   // These are immutable; re-create this component if they change

src/lib/browse/SchemeCard.svelte

@@ -2,8 +2,8 @@
   import type { FeatureCollection } from "geojson";
   import { bbox } from "../../maplibre_helpers";
   import { gjScheme, map } from "../../stores";
-  import CollapsibleCard from "../common/CollapsibleCard.svelte";
-  import SecondaryButton from "../govuk/SecondaryButton.svelte";
+  import { CollapsibleCard } from "../common";
+  import { SecondaryButton } from "../govuk";
   import type { Scheme } from "./data";
 
   export let scheme: Scheme;

src/lib/common/ConfirmationModal.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from "svelte";
-  import SecondaryButton from "../govuk/SecondaryButton.svelte";
-  import WarningButton from "../govuk/WarningButton.svelte";
+  import { SecondaryButton, WarningButton } from "../govuk";
   import Modal from "./Modal.svelte";
 
   const dispatch = createEventDispatcher();

src/lib/common/FileInput.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormElement from "../govuk/FormElement.svelte";
+  import { FormElement } from "../govuk";
 
   export let label: string;
   // This must be unique in the page

src/lib/common/Modal.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import SecondaryButton from "../govuk/SecondaryButton.svelte";
+  import { SecondaryButton } from "../govuk";
 
   export let title: string;
   export let open = false;

src/lib/common/index.ts

@@ -0,0 +1,9 @@
+export { default as CollapsibleCard } from "./CollapsibleCard.svelte";
+export { default as ConfirmationModal } from "./ConfirmationModal.svelte";
+export { default as DiscreteLegend } from "./DiscreteLegend.svelte";
+export { default as ExternalLink } from "./ExternalLink.svelte";
+export { default as FileInput } from "./FileInput.svelte";
+export { default as HelpIcon } from "./HelpIcon.svelte";
+export { default as Layout } from "./Layout.svelte";
+export { default as MapTooltips } from "./MapTooltips.svelte";
+export { default as Modal } from "./Modal.svelte";

src/lib/draw/StreetViewMode.svelte

@@ -2,8 +2,8 @@
   import type { MapMouseEvent } from "maplibre-gl";
   import { currentMode, map, userSettings } from "../../stores";
   import type { Mode } from "../../types";
-  import CollapsibleCard from "../common/CollapsibleCard.svelte";
-  import Radio from "../govuk/Radio.svelte";
+  import { CollapsibleCard } from "../common";
+  import { Radio } from "../govuk";
   import type { EventHandler } from "./event_handler";
 
   export let eventHandler: EventHandler;

src/lib/draw/point/PointControls.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-  import CollapsibleCard from "../../common/CollapsibleCard.svelte";
-  import SecondaryButton from "../../govuk/SecondaryButton.svelte";
+  import { CollapsibleCard } from "../../common";
+  import { SecondaryButton } from "../../govuk";
   import { PointTool } from "./point_tool";
 
   export let pointTool: PointTool;

src/lib/draw/polygon/PolygonControls.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
-  import CollapsibleCard from "../../common/CollapsibleCard.svelte";
-  import DefaultButton from "../../govuk/DefaultButton.svelte";
-  import SecondaryButton from "../../govuk/SecondaryButton.svelte";
+  import { CollapsibleCard } from "../../common";
+  import { DefaultButton, SecondaryButton } from "../../govuk";
   import { PolygonTool } from "./polygon_tool";
 
   export let polygonTool: PolygonTool;

src/lib/draw/route/RouteControls.svelte

@@ -1,10 +1,12 @@
 <script lang="ts">
   import { userSettings } from "../../../stores";
-  import CollapsibleCard from "../../common/CollapsibleCard.svelte";
-  import Checkbox from "../../govuk/Checkbox.svelte";
-  import CheckboxGroup from "../../govuk/CheckboxGroup.svelte";
-  import DefaultButton from "../../govuk/DefaultButton.svelte";
-  import SecondaryButton from "../../govuk/SecondaryButton.svelte";
+  import { CollapsibleCard } from "../../common";
+  import {
+    Checkbox,
+    CheckboxGroup,
+    DefaultButton,
+    SecondaryButton,
+  } from "../../govuk";
   import { RouteTool } from "./route_tool";
 
   export let routeTool: RouteTool;

src/lib/draw/route/SplitRouteMode.svelte

@@ -16,7 +16,7 @@
   } from "../../../maplibre_helpers";
   import { currentMode, gjScheme, map, newFeatureId } from "../../../stores";
   import type { Mode, Feature as OurFeature } from "../../../types";
-  import CollapsibleCard from "../../common/CollapsibleCard.svelte";
+  import { CollapsibleCard } from "../../common";
   import type { EventHandler } from "../event_handler";
 
   const thisMode = "split-route";

src/lib/draw/snap_polygon/SnapPolygonControls.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
-  import CollapsibleCard from "../../common/CollapsibleCard.svelte";
-  import DefaultButton from "../../govuk/DefaultButton.svelte";
-  import SecondaryButton from "../../govuk/SecondaryButton.svelte";
+  import { CollapsibleCard } from "../../common";
+  import { DefaultButton, SecondaryButton } from "../../govuk";
   import { RouteTool } from "../route/route_tool";
 
   export let routeTool: RouteTool;

src/lib/forms/FormV1.svelte

@@ -2,10 +2,7 @@
   import type { Feature, LineString } from "geojson";
   import { prettyPrintMeters } from "../../maplibre_helpers";
   import { gjScheme, routeInfo } from "../../stores";
-  import FormElement from "../govuk/FormElement.svelte";
-  import Radio from "../govuk/Radio.svelte";
-  import SecondaryButton from "../govuk/SecondaryButton.svelte";
-  import TextArea from "../govuk/TextArea.svelte";
+  import { FormElement, Radio, SecondaryButton, TextArea } from "../govuk";
   import RouteInfoLayers from "./RouteInfoLayers.svelte";
 
   export let id: number;

src/lib/forms/RouteInfoLayers.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { routeInfo } from "../../stores";
-  import Select from "../govuk/Select.svelte";
+  import { Select } from "../govuk";
   import LaneDetails from "../layers/LaneDetails.svelte";
   import SpeedLimits from "../layers/SpeedLimits.svelte";
 

src/lib/govuk/Select.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormElement from "../govuk/FormElement.svelte";
+  import { FormElement } from "../govuk";
 
   export let label: string;
   // A unique (per page) ID

src/lib/govuk/index.ts

@@ -0,0 +1,11 @@
+export { default as CheckboxGroup } from "./CheckboxGroup.svelte";
+export { default as Checkbox } from "./Checkbox.svelte";
+export { default as DefaultButton } from "./DefaultButton.svelte";
+export { default as ErrorMessage } from "./ErrorMessage.svelte";
+export { default as FormElement } from "./FormElement.svelte";
+export { default as Radio } from "./Radio.svelte";
+export { default as SecondaryButton } from "./SecondaryButton.svelte";
+export { default as Select } from "./Select.svelte";
+export { default as TextArea } from "./TextArea.svelte";
+export { default as TextInput } from "./TextInput.svelte";
+export { default as WarningButton } from "./WarningButton.svelte";

src/lib/layers/ContextualLayers.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { formOpen, routeInfo } from "../../stores";
-  import Select from "../govuk/Select.svelte";
+  import { Select } from "../govuk";
   import SpeedLimits from "./SpeedLimits.svelte";
 
   let show: "none" | "speed limits" = "none";

src/lib/layers/LaneDetails.svelte

@@ -5,7 +5,7 @@
   import { onMount } from "svelte";
   import { gjScheme, routeInfo } from "../../stores";
   import type { Feature } from "../../types";
-  import HelpIcon from "../common/HelpIcon.svelte";
+  import { HelpIcon } from "../common";
   import IntersectionMarkings from "./lane_details/IntersectionMarkings.svelte";
   import IntersectionPolygons from "./lane_details/IntersectionPolygons.svelte";
   import LaneMarkings from "./lane_details/LaneMarkings.svelte";

src/lib/layers/SpeedLimits.svelte

@@ -15,9 +15,7 @@
   } from "../../maplibre_helpers";
   import { gjScheme, map, routeInfo } from "../../stores";
   import type { Feature } from "../../types";
-  import DiscreteLegend from "../common/DiscreteLegend.svelte";
-  import HelpIcon from "../common/HelpIcon.svelte";
-  import MapTooltips from "../common/MapTooltips.svelte";
+  import { DiscreteLegend, HelpIcon, MapTooltips } from "../common";
 
   // Show along a route if specified, or show all otherwise
   export let id: number | undefined;

src/lib/sidebar/About.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
-  import ExternalLink from "../common/ExternalLink.svelte";
-  import Modal from "../common/Modal.svelte";
+  import { ExternalLink, Modal } from "../common";
 
   export let open: boolean;
 </script>

src/lib/sidebar/EntireScheme.svelte

@@ -10,12 +10,13 @@
     sidebarHover,
   } from "../../stores";
   import { schemaPluralNoun, type Schema, type Scheme } from "../../types";
-  import ConfirmationModal from "../common/ConfirmationModal.svelte";
-  import FileInput from "../common/FileInput.svelte";
-  import ErrorMessage from "../govuk/ErrorMessage.svelte";
-  import SecondaryButton from "../govuk/SecondaryButton.svelte";
-  import TextInput from "../govuk/TextInput.svelte";
-  import WarningButton from "../govuk/WarningButton.svelte";
+  import { ConfirmationModal, FileInput } from "../common";
+  import {
+    ErrorMessage,
+    SecondaryButton,
+    TextInput,
+    WarningButton,
+  } from "../govuk";
 
   export let authorityName: string;
   export let schema: Schema;

src/lib/sidebar/Instructions.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { schemaPluralNoun, type Schema } from "../../types";
-  import Modal from "../common/Modal.svelte";
+  import { Modal } from "../common";
 
   export let open: boolean;
   export let schema: Schema;

src/lib/sidebar/InterventionList.svelte

@@ -6,8 +6,7 @@
   import FormV1 from "../forms/FormV1.svelte";
   import FormV2 from "../forms/FormV2.svelte";
   import PlanningForm from "../forms/PlanningForm.svelte";
-  import SecondaryButton from "../govuk/SecondaryButton.svelte";
-  import WarningButton from "../govuk/WarningButton.svelte";
+  import { SecondaryButton, WarningButton } from "../govuk";
   import AccordionItem from "./AccordionItem.svelte";
 
   export let schema: Schema;

src/pages/App.svelte

@@ -8,11 +8,11 @@
   import authoritiesUrl from "../../assets/authorities.geojson?url";
   import BaselayerSwitcher from "../lib/BaselayerSwitcher.svelte";
   import BoundaryLayer from "../lib/BoundaryLayer.svelte";
-  import Layout from "../lib/common/Layout.svelte";
+  import { Layout } from "../lib/common";
   import HoverLayer from "../lib/draw/HoverLayer.svelte";
   import InterventionLayer from "../lib/draw/InterventionLayer.svelte";
   import Toolbox from "../lib/draw/Toolbox.svelte";
-  import SecondaryButton from "../lib/govuk/SecondaryButton.svelte";
+  import { SecondaryButton } from "../lib/govuk";
   import ContextualLayers from "../lib/layers/ContextualLayers.svelte";
   import Legend from "../lib/Legend.svelte";
   import Map from "../lib/Map.svelte";

src/pages/BrowseSchemes.svelte

@@ -7,12 +7,9 @@
   import { processInput, type Scheme } from "../lib/browse/data";
   import Filters from "../lib/browse/Filters.svelte";
   import SchemeCard from "../lib/browse/SchemeCard.svelte";
-  import FileInput from "../lib/common/FileInput.svelte";
-  import Layout from "../lib/common/Layout.svelte";
-  import MapTooltips from "../lib/common/MapTooltips.svelte";
+  import { FileInput, Layout, MapTooltips } from "../lib/common";
   import InterventionLayer from "../lib/draw/InterventionLayer.svelte";
-  import ErrorMessage from "../lib/govuk/ErrorMessage.svelte";
-  import SecondaryButton from "../lib/govuk/SecondaryButton.svelte";
+  import { ErrorMessage, SecondaryButton } from "../lib/govuk";
   import Legend from "../lib/Legend.svelte";
   import MapLibreMap from "../lib/Map.svelte";
   import ZoomOutMap from "../lib/ZoomOutMap.svelte";

src/pages/ChooseArea.svelte

@@ -5,14 +5,16 @@
   import { initAll } from "govuk-frontend";
   import { Map } from "maplibre-gl";
   import { onMount } from "svelte";
-  import DefaultButton from "../lib/govuk/DefaultButton.svelte";
-  import ErrorMessage from "../lib/govuk/ErrorMessage.svelte";
-  import FormElement from "../lib/govuk/FormElement.svelte";
-  import Radio from "../lib/govuk/Radio.svelte";
-  import SecondaryButton from "../lib/govuk/SecondaryButton.svelte";
+  import {
+    DefaultButton,
+    ErrorMessage,
+    FormElement,
+    Radio,
+    SecondaryButton,
+  } from "../lib/govuk";
   import "maplibre-gl/dist/maplibre-gl.css";
+  import { FileInput } from "../lib/common";
   import { getAuthoritiesGeoJson } from "../lib/common/data_getter";
-  import FileInput from "../lib/common/FileInput.svelte";
   import About from "../lib/sidebar/About.svelte";
   import { bbox } from "../maplibre_helpers";
   import type { Schema } from "../types";