Skip to content

Commit bc8c104

Browse files
committed
chore: reverse aliasing parameter
1 parent ef31350 commit bc8c104

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Core: `REGISTRY_URL`, `REGISTRY_SECRET`, `DATA_DIR`, `FONTS_DIR`, `PORT`, `LOG_L
5252

5353
Filtering & aliases (comma-separated):
5454
- `TILESET_INCLUDE` / `TILESET_EXCLUDE` — whitelist/blacklist tileset IDs
55-
- `TILESET_ALIASES``source:alias` pairs to remap tileset serving keys
55+
- `TILESET_ALIASES``alias:source` pairs to remap tileset serving keys
5656
- `STYLE_INCLUDE` / `STYLE_EXCLUDE` / `STYLE_ALIASES` — same for styles
5757

5858
## Testing

src/build-config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export const buildTileserverConfig = async (): Promise<TileserverConfig> => {
5353

5454
if (config.tilesetInclude.length) log.info(`TILESET_INCLUDE: ${config.tilesetInclude.join(', ')}`)
5555
if (config.tilesetExclude.length) log.info(`TILESET_EXCLUDE: ${config.tilesetExclude.join(', ')}`)
56-
if (Object.keys(config.tilesetAliases).length) log.info(`TILESET_ALIASES: ${Object.entries(config.tilesetAliases).map(([s, a]) => `${s}:${a}`).join(', ')}`)
56+
if (Object.keys(config.tilesetAliases).length) log.info(`TILESET_ALIASES: ${Object.entries(config.tilesetAliases).map(([s, a]) => `${a}:${s}`).join(', ')}`)
5757

5858
const filteredTilesets = filterArtefacts(tilesets, config.tilesetInclude, config.tilesetExclude)
5959
if (filteredTilesets.length !== tilesets.length) {
@@ -79,7 +79,7 @@ export const buildTileserverConfig = async (): Promise<TileserverConfig> => {
7979

8080
if (config.styleInclude.length) log.info(`STYLE_INCLUDE: ${config.styleInclude.join(', ')}`)
8181
if (config.styleExclude.length) log.info(`STYLE_EXCLUDE: ${config.styleExclude.join(', ')}`)
82-
if (Object.keys(config.styleAliases).length) log.info(`STYLE_ALIASES: ${Object.entries(config.styleAliases).map(([s, a]) => `${s}:${a}`).join(', ')}`)
82+
if (Object.keys(config.styleAliases).length) log.info(`STYLE_ALIASES: ${Object.entries(config.styleAliases).map(([s, a]) => `${a}:${s}`).join(', ')}`)
8383

8484
const filteredStyles = filterArtefacts(styles, config.styleInclude, config.styleExclude)
8585
if (filteredStyles.length !== styles.length) {

src/config-parse.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export const parseAliases = (v: string): Record<string, string> => {
55
if (!v) return {}
66
const map: Record<string, string> = {}
77
for (const pair of v.split(',')) {
8-
const [source, alias] = pair.split(':').map(s => s.trim())
9-
if (source && alias) map[source] = alias
8+
const [alias, source] = pair.split(':').map(s => s.trim())
9+
if (alias && source) map[source] = alias
1010
}
1111
return map
1212
}

tests/filter-aliases.unit.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,33 @@ test.describe('parseAliases', () => {
2626
expect(parseAliases('')).toEqual({})
2727
})
2828

29-
test('parses source:alias pairs', () => {
30-
expect(parseAliases('world:france')).toEqual({ world: 'france' })
29+
test('parses alias:source pairs', () => {
30+
expect(parseAliases('france:world')).toEqual({ world: 'france' })
3131
})
3232

3333
test('parses multiple pairs', () => {
34-
expect(parseAliases('world:france,contours-2026:contours')).toEqual({
34+
expect(parseAliases('france:world,contours:contours-2026')).toEqual({
3535
world: 'france',
3636
'contours-2026': 'contours'
3737
})
3838
})
3939

4040
test('trims whitespace around keys and values', () => {
41-
expect(parseAliases(' world : france , foo : bar ')).toEqual({
41+
expect(parseAliases(' france : world , bar : foo ')).toEqual({
4242
world: 'france',
4343
foo: 'bar'
4444
})
4545
})
4646

4747
test('skips malformed entries without colon', () => {
48-
expect(parseAliases('good:pair,nocolon,also:fine')).toEqual({
48+
expect(parseAliases('pair:good,nocolon,fine:also')).toEqual({
4949
good: 'pair',
5050
also: 'fine'
5151
})
5252
})
5353

54-
test('skips entries with empty source or alias', () => {
55-
expect(parseAliases(':alias,source:,ok:ok')).toEqual({ ok: 'ok' })
54+
test('skips entries with empty alias or source', () => {
55+
expect(parseAliases(':source,alias:,ok:ok')).toEqual({ ok: 'ok' })
5656
})
5757
})
5858

0 commit comments

Comments
 (0)