From d2666fe0398eaa8a2f5de8ad2d483f7615587ff4 Mon Sep 17 00:00:00 2001
From: Dunqing <29533304+Dunqing@users.noreply.github.com>
Date: Thu, 29 Aug 2024 07:35:09 +0000
Subject: [PATCH] refactor(transformer/object-rest-spread): move plugin-relates
 files to `object_rest_spread` mod (#5320)

Both `object_spread` and `object_rest` belong to `object_rest_object`, so moving them to the plugin mod makes the file structure clearer
---
 crates/oxc_transformer/src/es2018/mod.rs                    | 2 --
 .../{object_rest_spread.rs => object_rest_spread/mod.rs}    | 6 ++++--
 .../src/es2018/{ => object_rest_spread}/object_rest.rs      | 3 ++-
 .../src/es2018/{ => object_rest_spread}/object_spread.rs    | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename crates/oxc_transformer/src/es2018/{object_rest_spread.rs => object_rest_spread/mod.rs} (95%)
 rename crates/oxc_transformer/src/es2018/{ => object_rest_spread}/object_rest.rs (94%)
 rename crates/oxc_transformer/src/es2018/{ => object_rest_spread}/object_spread.rs (98%)

diff --git a/crates/oxc_transformer/src/es2018/mod.rs b/crates/oxc_transformer/src/es2018/mod.rs
index 36265adce..a8e14f75a 100644
--- a/crates/oxc_transformer/src/es2018/mod.rs
+++ b/crates/oxc_transformer/src/es2018/mod.rs
@@ -1,6 +1,4 @@
-mod object_rest;
 mod object_rest_spread;
-mod object_spread;
 mod options;
 
 pub use object_rest_spread::{ObjectRestSpread, ObjectRestSpreadOptions};
diff --git a/crates/oxc_transformer/src/es2018/object_rest_spread.rs b/crates/oxc_transformer/src/es2018/object_rest_spread/mod.rs
similarity index 95%
rename from crates/oxc_transformer/src/es2018/object_rest_spread.rs
rename to crates/oxc_transformer/src/es2018/object_rest_spread/mod.rs
index 8afae6356..21eac149c 100644
--- a/crates/oxc_transformer/src/es2018/object_rest_spread.rs
+++ b/crates/oxc_transformer/src/es2018/object_rest_spread/mod.rs
@@ -28,12 +28,14 @@
 
 use crate::context::Ctx;
 
+use object_rest::ObjectRest;
+use object_spread::ObjectSpread;
 use oxc_ast::ast::*;
 use oxc_traverse::{Traverse, TraverseCtx};
 use serde::Deserialize;
 use std::rc::Rc;
-
-use super::{object_rest::ObjectRest, object_spread::ObjectSpread};
+mod object_rest;
+mod object_spread;
 
 #[derive(Debug, Default, Clone, Copy, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
diff --git a/crates/oxc_transformer/src/es2018/object_rest.rs b/crates/oxc_transformer/src/es2018/object_rest_spread/object_rest.rs
similarity index 94%
rename from crates/oxc_transformer/src/es2018/object_rest.rs
rename to crates/oxc_transformer/src/es2018/object_rest_spread/object_rest.rs
index e263d1206..aa31390cc 100644
--- a/crates/oxc_transformer/src/es2018/object_rest.rs
+++ b/crates/oxc_transformer/src/es2018/object_rest_spread/object_rest.rs
@@ -24,9 +24,10 @@
 //! * Babel plugin implementation: <https://github.com/babel/babel/tree/main/packages/babel-plugin-transform-object-rest-spread>
 //! * Object rest/spread TC39 proposal: <https://github.com/tc39/proposal-object-rest-spread>
 
-use super::object_rest_spread::ObjectRestSpreadOptions;
 use crate::context::Ctx;
 
+use super::ObjectRestSpreadOptions;
+
 pub struct ObjectRest<'a> {
     _ctx: Ctx<'a>,
     _options: ObjectRestSpreadOptions,
diff --git a/crates/oxc_transformer/src/es2018/object_spread.rs b/crates/oxc_transformer/src/es2018/object_rest_spread/object_spread.rs
similarity index 98%
rename from crates/oxc_transformer/src/es2018/object_spread.rs
rename to crates/oxc_transformer/src/es2018/object_rest_spread/object_spread.rs
index a6ac19fcc..538b16c5e 100644
--- a/crates/oxc_transformer/src/es2018/object_spread.rs
+++ b/crates/oxc_transformer/src/es2018/object_rest_spread/object_spread.rs
@@ -26,7 +26,6 @@
 //! * Babel plugin implementation: <https://github.com/babel/babel/tree/main/packages/babel-plugin-transform-object-rest-spread>
 //! * Object rest/spread TC39 proposal: <https://github.com/tc39/proposal-object-rest-spread>
 
-use super::object_rest_spread::ObjectRestSpreadOptions;
 use crate::context::Ctx;
 
 use oxc_ast::ast::*;
@@ -34,6 +33,8 @@ use oxc_semantic::{ReferenceFlags, SymbolId};
 use oxc_span::SPAN;
 use oxc_traverse::{Traverse, TraverseCtx};
 
+use super::ObjectRestSpreadOptions;
+
 pub struct ObjectSpread<'a> {
     _ctx: Ctx<'a>,
     options: ObjectRestSpreadOptions,