fix(napi/parser): move ExportEntry::module_request field to first (#16412)

overlookmotel · overlookmotel · commit 699406af5e58 · 2025-12-02T23:30:56.000Z
Revert the change made in #16403. It's no longer necessary after #16411, because NAPI-RS no longer re-orders the fields.
diff --git a/crates/oxc_syntax/src/generated/derive_estree.rs b/crates/oxc_syntax/src/generated/derive_estree.rs
@@ -46,11 +46,11 @@ impl ESTree for ImportImportName<'_> {
 impl ESTree for ExportEntry<'_> {
     fn serialize<S: Serializer>(&self, serializer: S) {
         let mut state = serializer.serialize_struct();
+        state.serialize_field("moduleRequest", &self.module_request);
         state.serialize_field("importName", &self.import_name);
         state.serialize_field("exportName", &self.export_name);
         state.serialize_field("localName", &self.local_name);
         state.serialize_field("isType", &self.is_type);
-        state.serialize_field("moduleRequest", &self.module_request);
         state.serialize_span(self.span);
         state.end();
     }
diff --git a/crates/oxc_syntax/src/module_record.rs b/crates/oxc_syntax/src/module_record.rs
@@ -231,11 +231,7 @@ impl ImportImportName<'_> {
 #[ast]
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
 #[generate_derive(ESTree)]
-#[estree(
-    no_type,
-    no_ts_def,
-    field_order(import_name, export_name, local_name, is_type, module_request, span)
-)]
+#[estree(no_type, no_ts_def)]
 pub struct ExportEntry<'a> {
     /// Span of the import statement.
     #[estree(skip)]
diff --git a/napi/parser/generated/deserialize/js.js b/napi/parser/generated/deserialize/js.js
@@ -4279,11 +4279,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
   };
diff --git a/napi/parser/generated/deserialize/js_parent.js b/napi/parser/generated/deserialize/js_parent.js
@@ -5012,11 +5012,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
   };
diff --git a/napi/parser/generated/deserialize/js_range.js b/napi/parser/generated/deserialize/js_range.js
@@ -4730,11 +4730,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
     range: [start, end],
diff --git a/napi/parser/generated/deserialize/js_range_parent.js b/napi/parser/generated/deserialize/js_range_parent.js
@@ -5264,11 +5264,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
     range: [start, end],
diff --git a/napi/parser/generated/deserialize/ts.js b/napi/parser/generated/deserialize/ts.js
@@ -4532,11 +4532,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
   };
diff --git a/napi/parser/generated/deserialize/ts_parent.js b/napi/parser/generated/deserialize/ts_parent.js
@@ -5273,11 +5273,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
   };
diff --git a/napi/parser/generated/deserialize/ts_range.js b/napi/parser/generated/deserialize/ts_range.js
@@ -4982,11 +4982,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
     range: [start, end],
diff --git a/napi/parser/generated/deserialize/ts_range_parent.js b/napi/parser/generated/deserialize/ts_range_parent.js
@@ -5532,11 +5532,11 @@ function deserializeExportEntry(pos) {
   let start = deserializeU32(pos),
     end = deserializeU32(pos + 4);
   return {
+    moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
     localName: deserializeExportLocalName(pos + 104),
     isType: deserializeBool(pos + 136),
-    moduleRequest: deserializeOptionNameSpan(pos + 16),
     start,
     end,
     range: [start, end],
diff --git a/napi/parser/src-js/index.d.ts b/napi/parser/src-js/index.d.ts
@@ -209,6 +209,7 @@ export interface StaticExport {
 export interface StaticExportEntry {
   start: number
   end: number
+  moduleRequest: ValueSpan | null
   /** The name under which the desired binding is exported by the module`. */
   importName: ExportImportName
   /** The name used to export this binding by this module. */
@@ -229,7 +230,6 @@ export interface StaticExportEntry {
    * ```
    */
   isType: boolean
-  moduleRequest: ValueSpan | null
 }
 
 export interface StaticImport {
diff --git a/napi/parser/src/types.rs b/napi/parser/src/types.rs
@@ -182,6 +182,7 @@ pub struct ImportName {
 pub struct StaticExportEntry {
     pub start: u32,
     pub end: u32,
+    pub module_request: Option<ValueSpan>,
     /// The name under which the desired binding is exported by the module`.
     pub import_name: ExportImportName,
     /// The name used to export this binding by this module.
@@ -200,7 +201,6 @@ pub struct StaticExportEntry {
     /// export type { foo } from 'mod';
     /// ```
     pub is_type: bool,
-    pub module_request: Option<ValueSpan>,
 }
 
 #[napi(object)]
diff --git a/napi/parser/test/__snapshots__/esm.test.ts.snap b/napi/parser/test/__snapshots__/esm.test.ts.snap
