fix: parse query relations typing and allowed matching

tada5hi · Oct 18, 2022 · b60f9f4 · b60f9f4
1 parent 93ffacd
commit b60f9f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/src/parameter/relations/parse.ts b/src/parameter/relations/parse.ts
@@ -7,15 +7,16 @@
 
 import minimatch from 'minimatch';
 import { applyMapping, hasOwnProperty } from '../../utils';
+import { isPathCoveredByParseOptionsAllowed } from '../utils';
 
 import { RelationsParseOptions, RelationsParseOutput } from './type';
 import { includeParents } from './utils';
 
 // --------------------------------------------------
 
-export function parseQueryRelations(
+export function parseQueryRelations<T extends Record<string, any> = Record<string, any>>(
     data: unknown,
-    options?: RelationsParseOptions,
+    options?: RelationsParseOptions<T>,
 ): RelationsParseOutput {
     options ??= {};
 
@@ -58,16 +59,7 @@ export function parseQueryRelations(
     }
 
     if (options.allowed) {
-        items = items
-            .filter((item) => {
-                for (let i = 0; i < options.allowed.length; i++) {
-                    if (minimatch(item, options.allowed[i])) {
-                        return true;
-                    }
-                }
-
-                return false;
-            });
+        items = items.filter((item) => isPathCoveredByParseOptionsAllowed(options.allowed, item));
     }
 
     if (options.includeParents) {

diff --git a/test/unit/relations.spec.ts b/test/unit/relations.spec.ts
@@ -75,14 +75,6 @@ describe('src/relations/index.ts', () => {
             { key: 'profile.photos', value: 'photos' },
         ] as RelationsParseOutput);
 
-        // nested data with alias
-        allowed = parseQueryRelations(['profile.photos', 'profile.photos.abc', 'profile.abc'], { allowed: ['profile.photos**'] });
-        expect(allowed).toEqual([
-            { key: 'profile', value: 'profile' },
-            { key: 'profile.photos', value: 'photos' },
-            { key: 'profile.photos.abc', value: 'abc' },
-        ] as RelationsParseOutput);
-
         // null data
         allowed = parseQueryRelations(null);
         expect(allowed).toEqual([]);