Merge branch 'next' into feature/draw-migration

dopenguin · dopenguin · commit 67bf7917e6e5 · 2026-08-10T17:15:32.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,6 +36,10 @@
 		"./plugins/*/store": {
 			"types": "./dist/plugin-*-store.d.ts",
 			"default": "./dist/plugin-*-store.js"
+		},
+		"./lib/*": {
+			"types": "./dist/lib/*.d.ts",
+			"default": "./dist/lib/*.js"
 		}
 	},
 	"repository": {
@@ -127,23 +131,25 @@
 		"magic-string": "^0.30.18",
 		"ol": "10.9.0",
 		"pinia": "^4.0.2",
-		"postcss-html": "^1.8.1",
+		"postcss-html": "^2.0.0",
 		"prettier": "^3.9.6",
 		"stylelint": "^17.14.1",
-		"stylelint-config-recommended-vue": "^1.6.1",
+		"stylelint-config-html": "^2.0.0",
+		"stylelint-config-recommended": "^18.0.0",
+		"stylelint-config-recommended-vue": "^2.0.0",
 		"stylelint-value-no-unknown-custom-properties": "^6.1.1",
 		"tsarch": "^5.4.1",
 		"typedoc": "^0.28.20",
 		"typedoc-plugin-vue": "^1.5.0",
 		"typescript": "~5.9.2",
 		"unplugin-dts": "^1.0.3",
-		"vite": "^8.2.0",
+		"vite": "^8.2.1",
 		"vite-plugin-checker": "^0.14.5",
 		"vite-plugin-commonjs": "^0.10.4",
 		"vite-plugin-kern-extra-icons": "^1.0.1",
 		"vite-plugin-vue-devtools": "^8.2.1",
 		"vitest": "^4.1.10",
-		"vue": "^3.5.40",
+		"vue": "^3.5.41",
 		"vue-tsc": "^3.3.9"
 	},
 	"//": "Relevant overrides until the respective packages fix these vulnerable versions themselves.",
diff --git a/src/lib/getCluster.ts b/src/lib/getCluster.ts
@@ -8,7 +8,11 @@ import VectorLayer from 'ol/layer/Vector'
  * Helper function to retrieve the related cluster of a feature.
  * Returns the feature if it's a cluster feature, or the cluster the feature is in.
  */
-export default function (map: Map, feature: Feature, layerId: string): Feature {
+export default function getCluster(
+	map: Map,
+	feature: Feature,
+	layerId: string
+): Feature {
 	if (feature.get('features')) {
 		return feature
 	}
diff --git a/src/lib/getFeatures/bkg.ts b/src/lib/getFeatures/bkg.ts
@@ -34,7 +34,7 @@ function getRequestUrlQuery(
 	return query
 }
 
-export default async function (
+export default async function bkg(
 	signal: AbortSignal,
 	url: string,
 	inputValue: string,
diff --git a/src/lib/getFeatures/mpapi.ts b/src/lib/getFeatures/mpapi.ts
@@ -7,7 +7,7 @@ import { transform } from 'ol/proj'
 
 // AbortSignal is not used as the AbortController is implemented by @masterportal/masterportalapi
 
-export default async function (
+export default async function mpapi(
 	_: AbortSignal,
 	url: string,
 	input: string,
diff --git a/src/plugins/routing/composables/useMarkerLayer.ts b/src/plugins/routing/composables/useMarkerLayer.ts
@@ -0,0 +1,45 @@
+import type { Map } from 'ol'
+import type { Coordinate } from 'ol/coordinate'
+import type VectorSource from 'ol/source/Vector'
+import type { Ref } from 'vue'
+
+import { Feature } from 'ol'
+import { Point } from 'ol/geom'
+import VectorLayer from 'ol/layer/Vector'
+import { Circle, Fill, Stroke, Style } from 'ol/style'
+import { onScopeDispose, watch } from 'vue'
+
+export function useMarkerLayer(
+	map: Map,
+	markerSource: VectorSource,
+	route: Ref<Coordinate[]>
+) {
+	const layer = new VectorLayer({
+		source: markerSource,
+		style: new Style({
+			image: new Circle({
+				radius: 6,
+				fill: new Fill({ color: '#1E90FF' }),
+				stroke: new Stroke({ color: 'white', width: 2 }),
+			}),
+		}),
+	})
+
+	map.addLayer(layer)
+	onScopeDispose(() => {
+		map.removeLayer(layer)
+	})
+
+	watch(route, () => {
+		markerSource.clear()
+		route.value.forEach((coordinate) => {
+			if (coordinate.length) {
+				markerSource.addFeature(
+					new Feature({
+						geometry: new Point(coordinate),
+					})
+				)
+			}
+		})
+	})
+}
diff --git a/src/plugins/routing/composables/useRouteLayer.ts b/src/plugins/routing/composables/useRouteLayer.ts
@@ -5,7 +5,7 @@ import VectorLayer from 'ol/layer/Vector'
 import { Stroke, Style } from 'ol/style'
 import { onScopeDispose } from 'vue'
 
-export function useLayer(map: Map, routeSource: VectorSource) {
+export function useRouteLayer(map: Map, routeSource: VectorSource) {
 	const layer = new VectorLayer({
 		source: routeSource,
 		style: new Style({
diff --git a/src/plugins/routing/store.ts b/src/plugins/routing/store.ts
@@ -25,7 +25,8 @@ import { computed, ref, watch } from 'vue'
 import { useCoreStore } from '@/core/stores'
 import { computedT } from '@/lib/computedT'
 
-import { useLayer } from './composables/useLayer'
+import { useMarkerLayer } from './composables/useMarkerLayer'
+import { useRouteLayer } from './composables/useRouteLayer'
 import { PluginId } from './types'
 import { handleErrors } from './utils/handleErrors'
 
@@ -40,6 +41,7 @@ export const useRoutingStore = defineStore('plugins/routing', () => {
 	const coreStore = useCoreStore()
 
 	const routeSource = new VectorSource()
+	const markerSource = new VectorSource()
 	let abortController: AbortController | null = null
 	let draw: Draw | undefined
 
@@ -270,7 +272,8 @@ export const useRoutingStore = defineStore('plugins/routing', () => {
 		selectedRouteTypesToAvoid.value = []
 	})
 
-	useLayer(coreStore.map, routeSource)
+	useRouteLayer(coreStore.map, routeSource)
+	useMarkerLayer(coreStore.map, markerSource, route)
 
 	function setupPlugin() {
 		initializeDraw()
@@ -312,6 +315,7 @@ export const useRoutingStore = defineStore('plugins/routing', () => {
 		selectedRouteTypesToAvoid.value = []
 		routingResponseData.value = null
 		routeSource.clear()
+		markerSource.clear()
 
 		if (abortController) {
 			abortController.abort()
diff --git a/vite.config.github-io.ts b/vite.config.github-io.ts
@@ -18,11 +18,16 @@ export default defineConfig({
 		}),
 	],
 	build: {
-		outDir: resolve(__dirname, 'examples', 'github-io', 'dist'),
+		outDir: resolve(import.meta.dirname, 'examples', 'github-io', 'dist'),
 		emptyOutDir: true,
 		rollupOptions: {
 			external: ['@polar/polar', '@polar/polar/client', '@polar/polar/store'],
-			input: resolve(__dirname, 'examples', 'github-io', 'index.html'),
+			input: resolve(
+				import.meta.dirname,
+				'examples',
+				'github-io',
+				'index.html'
+			),
 			output: {
 				entryFileNames: '[name].js',
 				chunkFileNames: '[name].js',
diff --git a/vite.config.preview.ts b/vite.config.preview.ts
@@ -29,10 +29,25 @@ export default defineConfig({
 		outDir: '.dist.preview',
 		rollupOptions: {
 			input: {
-				main: resolve(__dirname, 'index.html'),
-				snowbox: resolve(__dirname, 'examples', 'snowbox', 'index.html'),
-				iceberg: resolve(__dirname, 'examples', 'iceberg', 'index.html'),
-				githubIo: resolve(__dirname, 'examples', 'github-io', 'index.html'),
+				main: resolve(import.meta.dirname, 'index.html'),
+				snowbox: resolve(
+					import.meta.dirname,
+					'examples',
+					'snowbox',
+					'index.html'
+				),
+				iceberg: resolve(
+					import.meta.dirname,
+					'examples',
+					'iceberg',
+					'index.html'
+				),
+				githubIo: resolve(
+					import.meta.dirname,
+					'examples',
+					'github-io',
+					'index.html'
+				),
 			},
 		},
 	},
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,6 +1,6 @@
 import vue from '@vitejs/plugin-vue'
-import { globSync } from 'node:fs'
-import { basename, resolve, sep } from 'node:path'
+import { globSync, readdirSync } from 'node:fs'
+import { basename, join, relative, resolve, sep } from 'node:path'
 import dts from 'unplugin-dts/vite'
 import { defineConfig } from 'vite'
 import checker from 'vite-plugin-checker'
@@ -10,6 +10,49 @@ import vueDevTools from 'vite-plugin-vue-devtools'
 
 import enrichedConsole from './vitePlugins/enrichedConsole.js'
 
+/**
+ * Collects public `lib` entries for subpath exports (e.g.`@polar/polar/lib/invisibleStyle`).
+ * A directory with an `index.ts` is exposed only via its folder path;
+ * otherwise each `.ts` file is exposed and subdirectories are traversed.
+ */
+function collectLibEntries() {
+	const baseDir = resolve(import.meta.dirname, 'src')
+	const entries: Record<string, string> = {}
+
+	const toKey = (absPath: string) =>
+		relative(baseDir, absPath).split(sep).join('/')
+	const addEntry = (key: string, file: string) => {
+		if (entries[key]) {
+			console.warn(
+				`[vite.config] Duplicate lib entry key "${key}"; ignoring "${file}".`
+			)
+			return
+		}
+		entries[key] = file
+	}
+	const walk = (currentDir: string) => {
+		const items = readdirSync(currentDir, { withFileTypes: true })
+		if (items.some((item) => item.isFile() && item.name === 'index.ts')) {
+			addEntry(toKey(currentDir), join(currentDir, 'index.ts'))
+			return
+		}
+		for (const item of items) {
+			const full = join(currentDir, item.name)
+			if (item.isDirectory()) {
+				walk(full)
+			} else if (item.isFile() && item.name.endsWith('.ts')) {
+				addEntry(toKey(full).replace(/\.ts$/, ''), full)
+			}
+		}
+	}
+
+	walk(join(baseDir, 'lib'))
+
+	return entries
+}
+
+const libEntries = collectLibEntries()
+
 export default defineConfig(({ mode }) => ({
 	plugins: [
 		// @ts-expect-error | commonJs dts is broken
@@ -63,6 +106,7 @@ export default defineConfig(({ mode }) => ({
 						[`plugin-${basename(path)}-store`, [path, 'store.ts'].join(sep)],
 					])
 				),
+				...libEntries,
 			},
 		},
 		sourcemap: true,
@@ -96,24 +140,40 @@ export default defineConfig(({ mode }) => ({
 								],
 							])
 						),
-						'@polar/polar/client': resolve(__dirname, 'src', 'client.ts'),
+						// lib keys are never a prefix of one another, so their order is irrelevant.
+						...Object.fromEntries(
+							Object.entries(libEntries).map(([key, file]) => [
+								`@polar/polar/${key}`,
+								file,
+							])
+						),
+						'@polar/polar/client': resolve(
+							import.meta.dirname,
+							'src',
+							'client.ts'
+						),
 						'@polar/polar/store': resolve(
-							__dirname,
+							import.meta.dirname,
 							'src',
 							'core',
 							'stores',
 							'index.ts'
 						),
 						'@polar/polar/polar.css': resolve(
-							__dirname,
+							import.meta.dirname,
 							'src',
 							'core',
 							'.polar-dev.css'
 						),
-						'@polar/polar': resolve(__dirname, 'src', 'core', 'index.ts'),
+						'@polar/polar': resolve(
+							import.meta.dirname,
+							'src',
+							'core',
+							'index.ts'
+						),
 					}
 				: {}),
-			'@': resolve(__dirname, 'src'),
+			'@': resolve(import.meta.dirname, 'src'),
 			/* eslint-enable @typescript-eslint/naming-convention */
 		},
 	},
diff --git a/vitePlugins/enrichedConsole.ts b/vitePlugins/enrichedConsole.ts
@@ -5,7 +5,7 @@ const fileRegex = /\.(ts|js|vue)$/
 const consoleRegex = /console\.(log|warn|error|info)\(/g
 
 function stripId(id: string): string | null {
-	const root = resolve(__dirname, '..', 'src')
+	const root = resolve(import.meta.dirname, '..', 'src')
 	if (!id.startsWith(root)) {
 		return null
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ function getRequestUrlQuery(`
`34`	`34`	`return query`
`35`	`35`	`}`
`36`	`36`
`37`		`-export default async function (`
	`37`	`+export default async function bkg(`
`38`	`38`	`signal: AbortSignal,`
`39`	`39`	`url: string,`
`40`	`40`	`inputValue: string,`