Use import type in typescript for all imports

facebook · Aug 3, 2022 · 05592c8 · 05592c8
1 parent 44ecca8
commit 05592c8
Show file tree

Hide file tree

Showing 6 changed files with 228 additions and 59 deletions.
diff --git a/compiler/Cargo.lock b/compiler/Cargo.lock
diff --git a/compiler/crates/relay-compiler/src/artifact_content/content.rs b/compiler/crates/relay-compiler/src/artifact_content/content.rs
@@ -93,7 +93,7 @@ pub fn generate_updatable_query(
     }
 
     write_import_type_from(
-        &project_config.typegen_config.language,
+        &project_config,
         &mut section,
         generated_types.imported_types,
         "relay-runtime",
@@ -257,7 +257,7 @@ pub fn generate_operation(
     }
 
     write_import_type_from(
-        &project_config.typegen_config.language,
+        &project_config,
         &mut section,
         generated_types.imported_types,
         "relay-runtime",
@@ -423,7 +423,7 @@ pub fn generate_split_operation(
         writeln!(section, "/*::")?;
     }
     write_import_type_from(
-        &project_config.typegen_config.language,
+        &project_config,
         &mut section,
         "NormalizationSplitOperation",
         "relay-runtime",
@@ -595,7 +595,7 @@ fn generate_read_only_fragment(
     }
 
     write_import_type_from(
-        &project_config.typegen_config.language,
+        &project_config,
         &mut section,
         generated_types.imported_types,
         "relay-runtime",
@@ -785,15 +785,26 @@ fn generate_use_strict_section(language: &TypegenLanguage) -> Result<GenericSect
 }
 
 fn write_import_type_from(
-    language: &TypegenLanguage,
+    project_config: &ProjectConfig,
     section: &mut dyn Write,
     type_: &str,
     from: &str,
 ) -> FmtResult {
+    let language = &project_config.typegen_config.language;
     match language {
         TypegenLanguage::JavaScript => Ok(()),
         TypegenLanguage::Flow => writeln!(section, "import type {{ {} }} from '{}';", type_, from),
-        TypegenLanguage::TypeScript => writeln!(section, "import {{ {} }} from '{}';", type_, from),
+        TypegenLanguage::TypeScript => writeln!(
+            section,
+            "import {}{{ {} }} from \"{}\";",
+            if project_config.typegen_config.use_import_type_syntax {
+                "type "
+            } else {
+                ""
+            },
+            type_,
+            from
+        ),
     }
 }
 

diff --git a/...ler/crates/relay-typegen/tests/generate_typescript_import_syntax/fixtures/simple.expected b/...ler/crates/relay-typegen/tests/generate_typescript_import_syntax/fixtures/simple.expected
@@ -0,0 +1,24 @@
+==================================== INPUT ====================================
+fragment LinkedField on User {
+  name
+  profilePicture {
+    uri
+    width
+    height
+  }
+}
+==================================== OUTPUT ===================================
+import type { FragmentRefs } from "relay-runtime";
+export type LinkedField$data = {
+  readonly name: string | null;
+  readonly profilePicture: {
+    readonly height: number | null;
+    readonly uri: string | null;
+    readonly width: number | null;
+  } | null;
+  readonly " $fragmentType": "LinkedField";
+};
+export type LinkedField$key = {
+  readonly " $data"?: LinkedField$data;
+  readonly " $fragmentSpreads": FragmentRefs<"LinkedField">;
+};
diff --git a/...iler/crates/relay-typegen/tests/generate_typescript_import_syntax/fixtures/simple.graphql b/...iler/crates/relay-typegen/tests/generate_typescript_import_syntax/fixtures/simple.graphql
@@ -0,0 +1,8 @@
+fragment LinkedField on User {
+  name
+  profilePicture {
+    uri
+    width
+    height
+  }
+}