feat: add file path in error result (#885)

taiga-family · Sep 13, 2024 · 3963cec · 3963cec
1 parent 6edf419
commit 3963cec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/libs/ng-morph/src/utils/get-declaration-getter.ts b/libs/ng-morph/src/utils/get-declaration-getter.ts
@@ -10,13 +10,16 @@ export function getDeclarationGetter<
 >(getFn: (pattern: Pattern) => Declaration[]) {
     return function getDeclaration(
         pattern: Pattern,
-        query?: Query<Omit<Structure, 'kind'>>,
+        query?: Query<Structure>,
     ): Declaration[] {
-        return getFn(pattern).filter((declaration) =>
-            // TODO: refactor it to support new typings
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            matchQuery(declaration.getStructure(), query),
-        );
+        return getFn(pattern).filter((declaration) => {
+            try {
+                return matchQuery(declaration.getStructure(), query);
+            } catch (error: unknown) {
+                const filePath = declaration.getSourceFile().getFilePath();
+
+                throw new Error(`Error in ${filePath}\n${(error as Error).message}`);
+            }
+        });
     };
 }
diff --git a/libs/ng-morph/src/utils/match-query.ts b/libs/ng-morph/src/utils/match-query.ts
@@ -57,15 +57,15 @@ function coerceName<T extends string>(name: T | {name: T}): T {
 }
 
 export function matchQuery<T extends Structure>(
-    value: Record<any, any> & T,
+    value: Record<any, any> | T,
     query?: Query<T> & Record<any, any>,
 ): boolean {
     return (
         !query ||
         Object.keys(query).every((key) =>
-            coerceArray(value[key])
+            coerceArray((value as unknown as Record<any, any>)?.[key])
                 .map(coerceName)
-                .some((v) => {
+                .some((v: unknown) => {
                     const patterns = coerceArray(query[key]);
 
                     return typeof v === 'string'