fix(noRedeclare): allow merging namespace + variable (#4772)

rome · Aug 19, 2023 · 9f3bbe9 · 9f3bbe9
1 parent 85645de
commit 9f3bbe9
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/crates/rome_js_analyze/tests/specs/suspicious/noRedeclare/valid-declaration-merging.ts b/crates/rome_js_analyze/tests/specs/suspicious/noRedeclare/valid-declaration-merging.ts
@@ -69,6 +69,28 @@ export namespace Orientation {
 	export function f(): void {}
 }
 
+// variable and namespace merging
+declare namespace bodyParser {
+	interface BodyParser {
+		/** @deprecated */
+		(): void
+	}
+	interface Options {
+		inflate?: boolean | undefined
+	}
+}
+declare const bodyParser: bodyParser.BodyParser
+
+namespace ConcreteNamespaceMergeVar {
+    export interface Foo {
+        foo: string
+    }
+}
+
+export const ConcreteNamespaceMergeVar = { foo: 'bar' }
+ConcreteNamespaceMergeVar.foo = 'baz'
+type Bar = ConcreteNamespaceMergeVar.Foo
+
 // namespace merging
 export namespace X {
 	export function f(): void {}

diff --git a/crates/rome_js_analyze/tests/specs/suspicious/noRedeclare/valid-declaration-merging.ts.snap b/crates/rome_js_analyze/tests/specs/suspicious/noRedeclare/valid-declaration-merging.ts.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/rome_js_analyze/tests/spec_tests.rs
-assertion_line: 91
+assertion_line: 80
 expression: valid-declaration-merging.ts
 ---
 # Input
@@ -76,6 +76,28 @@ export namespace Orientation {
 	export function f(): void {}
 }
 
+// variable and namespace merging
+declare namespace bodyParser {
+	interface BodyParser {
+		/** @deprecated */
+		(): void
+	}
+	interface Options {
+		inflate?: boolean | undefined
+	}
+}
+declare const bodyParser: bodyParser.BodyParser
+
+namespace ConcreteNamespaceMergeVar {
+    export interface Foo {
+        foo: string
+    }
+}
+
+export const ConcreteNamespaceMergeVar = { foo: 'bar' }
+ConcreteNamespaceMergeVar.foo = 'baz'
+type Bar = ConcreteNamespaceMergeVar.Foo
+
 // namespace merging
 export namespace X {
 	export function f(): void {}

diff --git a/crates/rome_js_syntax/src/binding_ext.rs b/crates/rome_js_syntax/src/binding_ext.rs
@@ -135,6 +135,7 @@ impl AnyJsBindingDeclaration {
                 AnyJsBindingDeclaration::TsModuleDeclaration(_),
                 AnyJsBindingDeclaration::JsClassDeclaration(_)
                 | AnyJsBindingDeclaration::JsFunctionDeclaration(_)
+                | AnyJsBindingDeclaration::JsVariableDeclarator(_)
                 | AnyJsBindingDeclaration::TsDeclareFunctionDeclaration(_)
                 | AnyJsBindingDeclaration::TsEnumDeclaration(_)
                 | AnyJsBindingDeclaration::TsInterfaceDeclaration(_)