ropegeo-common 1.10.2 → 1.10.3

package/dist/models/api/params/routesParams.d.ts

@@ -5,28 +5,29 @@ import './registerDifficultyParamsParsers';
 import { DifficultyParams } from './difficultyParams';
 /**
  * Validated params for getRoutes (GET /routes).
- * Global request: no `region` query param. Region-scoped: `region` id required; optional `source`
- * pipe-list (omit or empty = all sources). `source` must not appear without `region`.
- * Optional `route-types` query param is a pipe-list of {@link RouteType} values (omit or empty = all types).
+ * Either a region scope (`region-id` + `region-source`) or a global source allow-list (`sources`),
+ * never both. Optional `route-types` query param is a pipe-list of {@link RouteType} values.
  * Includes page-based `limit` and `page` (defaults {@link PaginationParams.DEFAULT_LIMIT} / {@link PaginationParams.DEFAULT_PAGE}).
  */
 export declare class RoutesParams extends PaginationParams {
     /**
-     * Null when not region-scoped. When set, `source` null or empty list means all sources
-     * for that region.
+     * Null when not region-scoped. When set, `source` is the single catalogue for that region.
      */
     readonly region: {
         id: string;
-        source: PageDataSource[] | null;
+        source: PageDataSource;
     } | null;
+    /** Global source allow-list when not region-scoped; null = all sources. Mutually exclusive with `region`. */
+    readonly sources: PageDataSource[] | null;
     /** Null = no route-type filter; non-empty = allow-list (pipe-encoded in query strings as `route-types`). */
     readonly routeTypes: RouteType[] | null;
     readonly difficulty: DifficultyParams | null;
     constructor(options: {
         region: {
             id: string;
-            source: PageDataSource[] | null;
+            source: PageDataSource;
         } | null;
+        sources?: PageDataSource[] | null;
         routeTypes?: RouteType[] | null;
         difficulty?: DifficultyParams | null;
         limit?: number;
@@ -34,7 +35,7 @@ export declare class RoutesParams extends PaginationParams {
     });
     withPage(page: number): RoutesParams;
     /** Null = all sources; non-empty = allow-list. */
-    private static normalizeSourceList;
+    private static normalizeSourcesList;
     toQueryString(): string;
     static fromQueryStringParams(q: Record<string, string | undefined>): RoutesParams;
     private static parseLimitQuery;
@@ -48,10 +49,12 @@ export declare class RoutesParams extends PaginationParams {
     private static parseSourcePipe;
     private static parseSourceToken;
     /**
-     * Validates a JSON-like object: optional `region` null or `{ id, source }` where `source`
-     * is `PageDataSource[]`, null, or a single `PageDataSource` string (legacy).
+     * Validates a JSON-like object: optional `region` null or `{ id, source }` with a single
+     * `source` string, optional top-level `region-id` / `region-source`, optional `sources`
+     * (string pipe-list or string array). `region` and `sources` must not both be active.
      */
     static fromResult(result: unknown, requiredRegion?: boolean): RoutesParams;
+    private static optionalSourcesFromResult;
     private static paginationFromResult;
     private static optionalPositiveInt;
     private static optionalRouteTypesFromResult;

package/dist/models/api/params/routesParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routesParams.d.ts","sourceRoot":"","sources":["../../../../src/models/api/params/routesParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAKtD;;;;;;GAMG;AACH,qBAAa,YAAa,SAAQ,gBAAgB;IAC9C;;;OAGG;IACH,SAAgB,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/E,4GAA4G;IAC5G,SAAgB,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/C,SAAgB,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;gBAExC,OAAO,EAAE;QACjB,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;SAAE,GAAG,IAAI,CAAC;QAC/D,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAChC,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QACrC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB;IAkCD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IAUpC,kDAAkD;IAClD,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAclC,aAAa,IAAI,MAAM;IAevB,MAAM,CAAC,qBAAqB,CACxB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GACtC,YAAY;IA0Cf,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,cAAc;IAY7B,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAOlC,OAAO,CAAC,MAAM,CAAC,cAAc;IAQ7B,0EAA0E;IAC1E,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAcrC,kFAAkF;IAClF,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAUjC,OAAO,CAAC,MAAM,CAAC,eAAe;IAS9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAU/B;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,UAAQ,GAAG,YAAY;IAoFxE,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAkBnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsBlC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAwB3C,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAkB3C,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAWrC"}
+{"version":3,"file":"routesParams.d.ts","sourceRoot":"","sources":["../../../../src/models/api/params/routesParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAKtD;;;;;GAKG;AACH,qBAAa,YAAa,SAAQ,gBAAgB;IAC9C;;OAEG;IACH,SAAgB,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,cAAc,CAAA;KAAE,GAAG,IAAI,CAAC;IACtE,6GAA6G;IAC7G,SAAgB,OAAO,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACjD,4GAA4G;IAC5G,SAAgB,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/C,SAAgB,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;gBAExC,OAAO,EAAE;QACjB,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,cAAc,CAAA;SAAE,GAAG,IAAI,CAAC;QACtD,OAAO,CAAC,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QAClC,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAChC,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;QACrC,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB;IAiDD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;IAWpC,kDAAkD;IAClD,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAcnC,aAAa,IAAI,MAAM;IAgBvB,MAAM,CAAC,qBAAqB,CACxB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GACtC,YAAY;IAgEf,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,cAAc;IAY7B,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAOlC,OAAO,CAAC,MAAM,CAAC,cAAc;IAQ7B,0EAA0E;IAC1E,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAcrC,kFAAkF;IAClF,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAUjC,OAAO,CAAC,MAAM,CAAC,eAAe;IAS9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAU/B;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,UAAQ,GAAG,YAAY;IAkHxE,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAsBxC,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAkBnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsBlC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAwB3C,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAkB3C,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAWrC"}

package/dist/models/api/params/routesParams.js

@@ -10,9 +10,8 @@ const difficultyParams_1 = require("./difficultyParams");
 const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 /**
  * Validated params for getRoutes (GET /routes).
- * Global request: no `region` query param. Region-scoped: `region` id required; optional `source`
- * pipe-list (omit or empty = all sources). `source` must not appear without `region`.
- * Optional `route-types` query param is a pipe-list of {@link RouteType} values (omit or empty = all types).
+ * Either a region scope (`region-id` + `region-source`) or a global source allow-list (`sources`),
+ * never both. Optional `route-types` query param is a pipe-list of {@link RouteType} values.
  * Includes page-based `limit` and `page` (defaults {@link PaginationParams.DEFAULT_LIMIT} / {@link PaginationParams.DEFAULT_PAGE}).
  */
 class RoutesParams extends paginationParams_1.PaginationParams {
@@ -33,19 +32,29 @@ class RoutesParams extends paginationParams_1.PaginationParams {
                 throw new Error('RoutesParams.region.id must be non-empty when region is set');
             }
             if (!UUID_REGEX.test(id)) {
-                throw new Error('Query parameter "region" must be a valid UUID');
+                throw new Error('Query parameter "region-id" must be a valid UUID');
             }
-            const src = RoutesParams.normalizeSourceList(reg.source);
-            regionNorm = { id, source: src };
+            if (!Object.values(pageDataSource_1.PageDataSource).includes(reg.source)) {
+                throw new Error(`Invalid PageDataSource for region: ${JSON.stringify(reg.source)}`);
+            }
+            regionNorm = { id, source: reg.source };
+        }
+        const sourcesNorm = RoutesParams.normalizeSourcesList(options.sources ?? null);
+        if (regionNorm !== null &&
+            sourcesNorm !== null &&
+            sourcesNorm.length > 0) {
+            throw new Error('RoutesParams: region and sources cannot both be set');
         }
         super(limit, page);
         this.region = regionNorm;
+        this.sources = sourcesNorm;
         this.routeTypes = routeTypes;
         this.difficulty = diff;
     }
     withPage(page) {
         return new RoutesParams({
             region: this.region,
+            sources: this.sources,
             routeTypes: this.routeTypes,
             difficulty: this.difficulty,
             limit: this.limit,
@@ -53,7 +62,7 @@ class RoutesParams extends paginationParams_1.PaginationParams {
         });
     }
     /** Null = all sources; non-empty = allow-list. */
-    static normalizeSourceList(list) {
+    static normalizeSourcesList(list) {
         if (list == null || list.length === 0)
             return null;
         const out = [];
@@ -69,10 +78,11 @@ class RoutesParams extends paginationParams_1.PaginationParams {
     toQueryString() {
         const p = new URLSearchParams(super.toQueryString());
         if (this.region !== null) {
-            p.set('region', this.region.id);
-            if (this.region.source != null && this.region.source.length > 0) {
-                p.set('source', this.region.source.join('|'));
-            }
+            p.set('region-id', this.region.id);
+            p.set('region-source', this.region.source);
+        }
+        if (this.sources != null && this.sources.length > 0) {
+            p.set('sources', this.sources.join('|'));
         }
         if (this.routeTypes != null && this.routeTypes.length > 0) {
             p.set('route-types', this.routeTypes.join('|'));
@@ -83,30 +93,45 @@ class RoutesParams extends paginationParams_1.PaginationParams {
     static fromQueryStringParams(q) {
         const limit = RoutesParams.parseLimitQuery(q);
         const page = RoutesParams.parsePageQuery(q);
-        const regionRaw = (q.region ?? q.Region ?? '').trim();
-        const sourceRaw = (q.source ?? q.Source ?? '').trim();
+        const regionIdRaw = (q['region-id'] ?? q['Region-Id'] ?? '').trim();
+        const regionSourceRaw = (q['region-source'] ??
+            q['Region-Source'] ??
+            '').trim();
+        const sourcesRaw = (q.sources ?? q.Sources ?? '').trim();
         const routeTypesStr = (q['route-types'] ?? q['Route-Types'] ?? '').trim();
         const routeTypes = routeTypesStr === ''
             ? null
             : RoutesParams.parseRouteTypePipe(routeTypesStr);
         const difficulty = RoutesParams.normalizeDifficulty(difficultyParams_1.DifficultyParams.fromQueryStringParams(q));
-        if (regionRaw === '') {
-            if (sourceRaw !== '') {
-                throw new Error('Query parameter "source" must not be set without "region"');
+        const sourcesParsed = sourcesRaw === ''
+            ? null
+            : RoutesParams.parseSourcePipe(sourcesRaw);
+        if (regionIdRaw === '') {
+            if (regionSourceRaw !== '') {
+                throw new Error('Query parameter "region-source" must not be set without "region-id"');
             }
             return new RoutesParams({
                 region: null,
+                sources: sourcesParsed,
                 routeTypes,
                 difficulty,
                 limit,
                 page,
             });
         }
-        const sources = sourceRaw === ''
-            ? null
-            : RoutesParams.parseSourcePipe(sourceRaw);
+        if (!UUID_REGEX.test(regionIdRaw)) {
+            throw new Error('Query parameter "region-id" must be a valid UUID');
+        }
+        if (regionSourceRaw === '') {
+            throw new Error('Query parameter "region-source" is required when "region-id" is set');
+        }
+        if (sourcesParsed != null && sourcesParsed.length > 0) {
+            throw new Error('Query parameters "region-id" / "region-source" cannot be combined with "sources"');
+        }
+        const regionSource = RoutesParams.parseSourceToken(regionSourceRaw);
         return new RoutesParams({
-            region: { id: regionRaw, source: sources },
+            region: { id: regionIdRaw, source: regionSource },
+            sources: null,
             routeTypes,
             difficulty,
             limit,
@@ -189,11 +214,12 @@ class RoutesParams extends paginationParams_1.PaginationParams {
             if (s === lower || s === value)
                 return s;
         }
-        throw new Error(`Query parameter "source" token must be one of: ${Object.values(pageDataSource_1.PageDataSource).join(', ')}`);
+        throw new Error(`PageDataSource token must be one of: ${Object.values(pageDataSource_1.PageDataSource).join(', ')}`);
     }
     /**
-     * Validates a JSON-like object: optional `region` null or `{ id, source }` where `source`
-     * is `PageDataSource[]`, null, or a single `PageDataSource` string (legacy).
+     * Validates a JSON-like object: optional `region` null or `{ id, source }` with a single
+     * `source` string, optional top-level `region-id` / `region-source`, optional `sources`
+     * (string pipe-list or string array). `region` and `sources` must not both be active.
      */
     static fromResult(result, requiredRegion = false) {
         if (result == null || typeof result !== 'object') {
@@ -201,69 +227,94 @@ class RoutesParams extends paginationParams_1.PaginationParams {
         }
         const r = result;
         const { limit, page } = RoutesParams.paginationFromResult(r);
-        const raw = r.region ?? r.Region;
-        if (typeof raw === 'string') {
-            throw new Error('RoutesParams.region must be an object { id, source? } or null, not a string');
-        }
-        if (raw === null || raw === undefined) {
-            if (requiredRegion) {
-                throw new Error('RoutesParams: region must be a non-null { id, source? } object when requiredRegion is true');
+        const flatId = RoutesParams.coerceTrimmedString(r['region-id'] ?? r['Region-Id'], 'region-id');
+        const flatSource = RoutesParams.coerceTrimmedString(r['region-source'] ?? r['Region-Source'], 'region-source');
+        const rawNested = r.region ?? r.Region;
+        if (typeof rawNested === 'string') {
+            throw new Error('RoutesParams.region must be an object { id, source } or null, not a string');
+        }
+        let regionNorm = null;
+        const hasFlatRegion = flatId !== '' || flatSource !== '';
+        const hasNestedRegion = rawNested !== null &&
+            rawNested !== undefined &&
+            typeof rawNested === 'object';
+        if (hasFlatRegion && hasNestedRegion) {
+            throw new Error('RoutesParams: use either nested region or region-id / region-source, not both');
+        }
+        if (hasFlatRegion) {
+            if (flatId === '') {
+                throw new Error('RoutesParams.region-id must be non-empty when region-source is set');
             }
-            const routeTypes = RoutesParams.optionalRouteTypesFromResult(r);
-            const difficulty = RoutesParams.normalizeDifficulty(RoutesParams.optionalDifficultyFromResult(r));
-            return new RoutesParams({
-                region: null,
-                routeTypes,
-                difficulty,
-                limit,
-                page,
-            });
-        }
-        if (typeof raw !== 'object') {
-            throw new Error('RoutesParams.region must be an object or null, got: ' + typeof raw);
-        }
-        const reg = raw;
-        const idStr = RoutesParams.coerceTrimmedString(reg.id ?? reg.Id, 'region.id');
-        if (idStr === '') {
-            throw new Error('RoutesParams.region must include non-empty id');
-        }
-        if (!UUID_REGEX.test(idStr)) {
-            throw new Error('RoutesParams.region.id must be a valid UUID');
-        }
-        const sourceRaw = reg.source ?? reg.Source;
-        let sourceList = null;
-        if (sourceRaw === null || sourceRaw === undefined) {
-            sourceList = null;
-        }
-        else if (Array.isArray(sourceRaw)) {
-            sourceList = sourceRaw.map((item, i) => {
-                if (typeof item !== 'string') {
-                    throw new Error(`RoutesParams.region.source[${i}] must be a string`);
-                }
-                return RoutesParams.parseSourceToken(item);
-            });
-        }
-        else if (typeof sourceRaw === 'string') {
-            if (sourceRaw.trim() !== '') {
-                sourceList = [RoutesParams.parseSourceToken(sourceRaw.trim())];
+            if (!UUID_REGEX.test(flatId)) {
+                throw new Error('RoutesParams.region-id must be a valid UUID');
+            }
+            if (flatSource === '') {
+                throw new Error('RoutesParams.region-source must be non-empty when region-id is set');
+            }
+            regionNorm = {
+                id: flatId,
+                source: RoutesParams.parseSourceToken(flatSource),
+            };
+        }
+        else if (hasNestedRegion) {
+            const reg = rawNested;
+            const idStr = RoutesParams.coerceTrimmedString(reg.id ?? reg.Id, 'region.id');
+            if (idStr === '') {
+                throw new Error('RoutesParams.region must include non-empty id');
+            }
+            if (!UUID_REGEX.test(idStr)) {
+                throw new Error('RoutesParams.region.id must be a valid UUID');
             }
+            const sourceRaw = reg.source ?? reg.Source;
+            if (sourceRaw === null || sourceRaw === undefined) {
+                throw new Error('RoutesParams.region.source must be a non-empty string');
+            }
+            if (typeof sourceRaw !== 'string' || sourceRaw.trim() === '') {
+                throw new Error('RoutesParams.region.source must be a non-empty string');
+            }
+            regionNorm = {
+                id: idStr,
+                source: RoutesParams.parseSourceToken(sourceRaw.trim()),
+            };
         }
-        else {
-            throw new Error('RoutesParams.region.source must be string, string[], or null');
+        if (requiredRegion && regionNorm === null) {
+            throw new Error('RoutesParams: region must be set when requiredRegion is true');
+        }
+        const sourcesNorm = RoutesParams.optionalSourcesFromResult(r);
+        if (regionNorm !== null &&
+            sourcesNorm !== null &&
+            sourcesNorm.length > 0) {
+            throw new Error('RoutesParams: region and sources cannot both be set');
         }
         const routeTypes = RoutesParams.optionalRouteTypesFromResult(r);
         const difficulty = RoutesParams.normalizeDifficulty(RoutesParams.optionalDifficultyFromResult(r));
         return new RoutesParams({
-            region: {
-                id: idStr,
-                source: RoutesParams.normalizeSourceList(sourceList),
-            },
+            region: regionNorm,
+            sources: sourcesNorm,
             routeTypes,
             difficulty,
             limit,
             page,
         });
     }
+    static optionalSourcesFromResult(r) {
+        const v = r.sources ?? r.Sources;
+        if (v === null || v === undefined || v === '')
+            return null;
+        if (typeof v === 'string') {
+            return RoutesParams.parseSourcePipe(v);
+        }
+        if (Array.isArray(v)) {
+            const list = v.map((item, i) => {
+                if (typeof item !== 'string') {
+                    throw new Error(`RoutesParams.sources[${i}] must be a string`);
+                }
+                return RoutesParams.parseSourceToken(item);
+            });
+            return RoutesParams.normalizeSourcesList(list);
+        }
+        throw new Error('RoutesParams.sources must be a string, string[], or null');
+    }
     static paginationFromResult(r) {
         const limit = RoutesParams.optionalPositiveInt(r.limit ?? r.Limit, 'limit', paginationParams_1.PaginationParams.DEFAULT_LIMIT);
         const page = RoutesParams.optionalPositiveInt(r.page ?? r.Page, 'page', paginationParams_1.PaginationParams.DEFAULT_PAGE);
@@ -310,10 +361,10 @@ class RoutesParams extends paginationParams_1.PaginationParams {
             typeof nested !== 'object') {
             throw new Error('RoutesParams.difficulty must be an object or null');
         }
-        const source = nested !== null && nested !== undefined
+        const diffInput = nested !== null && nested !== undefined
             ? nested
             : r;
-        return difficultyParams_1.DifficultyParams.fromResult(source);
+        return difficultyParams_1.DifficultyParams.fromResult(diffInput);
     }
     static coerceTrimmedString(v, key) {
         if (v === null || v === undefined) {

package/dist/models/filters/routeFilter.d.ts

@@ -5,23 +5,23 @@ import './registerDifficultyFilterOptionsParsers';
 import { DifficultyFilterOptions } from './difficultyFilterOptions';
 /**
  * Persisted explore / minimap route filter. Null fields mean “no constraint” on that axis.
+ * Maps only to {@link RoutesParams} `sources`, `routeTypes`, and `difficulty` — not `region`.
  */
 export declare class RouteFilter {
-    source: PageDataSource[] | null;
-    regionId: string | null;
+    /** Null/empty = all data sources. */
+    sources: PageDataSource[] | null;
     /** Null or empty = no route-type filter (all types). */
     routeTypes: RouteType[] | null;
     difficultyOptions: DifficultyFilterOptions | null;
-    constructor(source?: PageDataSource[] | null, regionId?: string | null, routeTypes?: RouteType[] | null, difficultyOptions?: DifficultyFilterOptions | null);
+    constructor(sources?: PageDataSource[] | null, routeTypes?: RouteType[] | null, difficultyOptions?: DifficultyFilterOptions | null);
     toRoutesParams(): RoutesParams;
     toJSON(): Record<string, unknown>;
     toString(): string;
     static fromJsonString(json: string): RouteFilter;
     static fromJSON(parsed: unknown): RouteFilter;
     private static normalizeRouteTypesList;
-    /** Accepts `routeTypes` array or legacy singular `routeType` string. */
     private static parseRouteTypesField;
     private static parseRouteTypeToken;
-    private static parseSourceField;
+    private static parseSourcesField;
 }
 //# sourceMappingURL=routeFilter.d.ts.map

package/dist/models/filters/routeFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routeFilter.d.ts","sourceRoot":"","sources":["../../../src/models/filters/routeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;GAEG;AACH,qBAAa,WAAW;IACpB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,wDAAwD;IACxD,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,uBAAuB,GAAG,IAAI,CAAC;gBAG9C,MAAM,GAAE,cAAc,EAAE,GAAG,IAAW,EACtC,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,UAAU,GAAE,SAAS,EAAE,GAAG,IAAW,EACrC,iBAAiB,GAAE,uBAAuB,GAAG,IAAW;IAQ5D,cAAc,IAAI,YAAY;IAwC9B,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAYjC,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAYhD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,WAAW;IAkB7C,OAAO,CAAC,MAAM,CAAC,uBAAuB;IActC,wEAAwE;IACxE,OAAO,CAAC,MAAM,CAAC,oBAAoB;IA0BnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAOlC,OAAO,CAAC,MAAM,CAAC,gBAAgB;CAmBlC"}
+{"version":3,"file":"routeFilter.d.ts","sourceRoot":"","sources":["../../../src/models/filters/routeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE;;;GAGG;AACH,qBAAa,WAAW;IACpB,qCAAqC;IACrC,OAAO,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACjC,wDAAwD;IACxD,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,uBAAuB,GAAG,IAAI,CAAC;gBAG9C,OAAO,GAAE,cAAc,EAAE,GAAG,IAAW,EACvC,UAAU,GAAE,SAAS,EAAE,GAAG,IAAW,EACrC,iBAAiB,GAAE,uBAAuB,GAAG,IAAW;IAO5D,cAAc,IAAI,YAAY;IAoB9B,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAWjC,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAYhD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,WAAW;IAc7C,OAAO,CAAC,MAAM,CAAC,uBAAuB;IActC,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAiBnC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAOlC,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAmBnC"}

package/dist/models/filters/routeFilter.js

@@ -8,37 +8,21 @@ require("./registerDifficultyFilterOptionsParsers");
 const difficultyFilterOptions_1 = require("./difficultyFilterOptions");
 /**
  * Persisted explore / minimap route filter. Null fields mean “no constraint” on that axis.
+ * Maps only to {@link RoutesParams} `sources`, `routeTypes`, and `difficulty` — not `region`.
  */
 class RouteFilter {
-    constructor(source = null, regionId = null, routeTypes = null, difficultyOptions = null) {
-        this.source = source;
-        this.regionId = regionId;
+    constructor(sources = null, routeTypes = null, difficultyOptions = null) {
+        this.sources = sources;
         this.routeTypes = RouteFilter.normalizeRouteTypesList(routeTypes);
         this.difficultyOptions = difficultyOptions;
     }
     toRoutesParams() {
-        const rid = this.regionId != null && this.regionId.trim() !== ''
-            ? this.regionId.trim()
-            : null;
-        if (rid === null) {
-            if (this.source != null && this.source.length > 0) {
-                throw new Error('RouteFilter: source allow-list requires a non-empty regionId');
-            }
-            return new routesParams_1.RoutesParams({
-                region: null,
-                routeTypes: this.routeTypes != null && this.routeTypes.length > 0
-                    ? [...this.routeTypes]
-                    : null,
-                difficulty: this.difficultyOptions !== null
-                    ? this.difficultyOptions.toDifficultyParams()
-                    : null,
-            });
-        }
-        const src = this.source == null || this.source.length === 0
+        const srcList = this.sources == null || this.sources.length === 0
             ? null
-            : [...this.source];
+            : [...this.sources];
         return new routesParams_1.RoutesParams({
-            region: { id: rid, source: src },
+            region: null,
+            sources: srcList,
             routeTypes: this.routeTypes != null && this.routeTypes.length > 0
                 ? [...this.routeTypes]
                 : null,
@@ -49,8 +33,7 @@ class RouteFilter {
     }
     toJSON() {
         return {
-            source: this.source,
-            regionId: this.regionId,
+            sources: this.sources,
             routeTypes: this.routeTypes,
             difficultyOptions: this.difficultyOptions !== null
                 ? this.difficultyOptions.toJSON()
@@ -75,16 +58,13 @@ class RouteFilter {
             throw new Error('RouteFilter must be a JSON object');
         }
         const o = parsed;
-        const source = RouteFilter.parseSourceField(o.source);
-        const regionId = o.regionId === null || o.regionId === undefined
-            ? null
-            : String(o.regionId);
+        const sources = RouteFilter.parseSourcesField(o.sources);
         const routeTypes = RouteFilter.parseRouteTypesField(o);
         let difficultyOptions = null;
         if (o.difficultyOptions != null && typeof o.difficultyOptions === 'object') {
             difficultyOptions = difficultyFilterOptions_1.DifficultyFilterOptions.fromResult(o.difficultyOptions);
         }
-        return new RouteFilter(source, regionId, routeTypes, difficultyOptions);
+        return new RouteFilter(sources, routeTypes, difficultyOptions);
     }
     static normalizeRouteTypesList(list) {
         if (list == null || list.length === 0)
@@ -99,31 +79,21 @@ class RouteFilter {
         }
         return out;
     }
-    /** Accepts `routeTypes` array or legacy singular `routeType` string. */
     static parseRouteTypesField(o) {
         const raw = o.routeTypes;
-        if (raw !== null && raw !== undefined) {
-            if (!Array.isArray(raw)) {
-                throw new Error('RouteFilter.routeTypes must be an array or null');
-            }
-            const types = raw.map((item, i) => {
-                if (typeof item !== 'string') {
-                    throw new Error(`RouteFilter.routeTypes[${i}] must be a string`);
-                }
-                return RouteFilter.parseRouteTypeToken(item);
-            });
-            return RouteFilter.normalizeRouteTypesList(types);
-        }
-        const legacy = o.routeType;
-        if (legacy === null || legacy === undefined) {
+        if (raw === null || raw === undefined) {
             return null;
         }
-        if (typeof legacy !== 'string') {
-            throw new Error('RouteFilter.routeType must be a string or null');
+        if (!Array.isArray(raw)) {
+            throw new Error('RouteFilter.routeTypes must be an array or null');
         }
-        return RouteFilter.normalizeRouteTypesList([
-            RouteFilter.parseRouteTypeToken(legacy),
-        ]);
+        const types = raw.map((item, i) => {
+            if (typeof item !== 'string') {
+                throw new Error(`RouteFilter.routeTypes[${i}] must be a string`);
+            }
+            return RouteFilter.parseRouteTypeToken(item);
+        });
+        return RouteFilter.normalizeRouteTypesList(types);
     }
     static parseRouteTypeToken(v) {
         if (!Object.values(routeType_1.RouteType).includes(v)) {
@@ -131,16 +101,16 @@ class RouteFilter {
         }
         return v;
     }
-    static parseSourceField(v) {
+    static parseSourcesField(v) {
         if (v === null || v === undefined)
             return null;
         if (!Array.isArray(v)) {
-            throw new Error('RouteFilter.source must be an array or null');
+            throw new Error('RouteFilter.sources must be an array or null');
         }
         const out = [];
         for (const item of v) {
             if (typeof item !== 'string') {
-                throw new Error('RouteFilter.source entries must be strings');
+                throw new Error('RouteFilter.sources entries must be strings');
             }
             if (!Object.values(pageDataSource_1.PageDataSource).includes(item)) {
                 throw new Error(`Invalid PageDataSource: ${JSON.stringify(item)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ropegeo-common",
-    "version": "1.10.2",
+    "version": "1.10.3",
     "description": "Shared domain models and helpers for RopeGeo and WebScraper",
     "license": "ISC",
     "repository": {