fix(babel): broken detection of identifier declaration

callstack · Sep 11, 2023 · 2438ed3 · 2438ed3
1 parent 521d6c8
commit 2438ed3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...napshots__/removeWithRelated.test.ts.snap → ...napshots__/removeWithRelated.test.ts.snap b/...napshots__/removeWithRelated.test.ts.snap → ...napshots__/removeWithRelated.test.ts.snap
diff --git a/...stkit/src/utils/removeWithRelated.test.ts → ...s/src/__tests__/removeWithRelated.test.ts b/...stkit/src/utils/removeWithRelated.test.ts → ...s/src/__tests__/removeWithRelated.test.ts
@@ -4,10 +4,17 @@ import { join } from 'path';
 import * as babel from '@babel/core';
 import type { NodePath } from '@babel/core';
 import generator from '@babel/generator';
+import type { File as FileNode } from '@babel/types';
 import dedent from 'dedent';
 
-import type { MissedBabelCoreTypes } from '@linaria/babel-preset';
-import { removeWithRelated } from '@linaria/utils';
+import { removeWithRelated } from '../scopeHelpers';
+
+type MissedBabelCoreTypes = {
+  File: new (
+    options: { filename: string },
+    file: { ast: FileNode; code: string }
+  ) => { path: NodePath<FileNode> };
+};
 
 const { File } = babel as typeof babel & MissedBabelCoreTypes;
 

diff --git a/packages/utils/src/findIdentifiers.ts b/packages/utils/src/findIdentifiers.ts
@@ -41,7 +41,8 @@ const checkers: Record<
   any: (ex) => isBindingIdentifier(ex) || isReferencedIdentifier(ex),
   binding: (ex) => isBindingIdentifier(ex),
   declaration: (ex) =>
-    isBindingIdentifier(ex) && ex.scope.getBinding(ex.node.name)?.path === ex,
+    isBindingIdentifier(ex) &&
+    ex.scope.getBinding(ex.node.name)?.identifier === ex.node,
   reference: (ex) => isReferencedIdentifier(ex),
 };