swc-project · kdy1 · Oct 25, 2023 · Oct 24, 2023 · Oct 24, 2023 · Oct 24, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/constify/package.json b/packages/constify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-constify",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "SWC plugin for optimization",
   "main": "swc_plugin_constify.wasm",
   "scripts": {

diff --git a/packages/constify/transform/Cargo.toml b/packages/constify/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_constify"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.18.0"
+version = "0.19.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/emotion/package.json b/packages/emotion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-emotion",
-  "version": "2.5.93",
+  "version": "2.5.94",
   "description": "SWC plugin for emotion css-in-js library",
   "main": "swc_plugin_emotion.wasm",
   "scripts": {

diff --git a/packages/emotion/transform/Cargo.toml b/packages/emotion/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_emotion"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.54.0"
+version = "0.55.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-jest",
-  "version": "1.5.93",
+  "version": "1.5.94",
   "description": "SWC plugin for jest",
   "main": "swc_plugin_jest.wasm",
   "scripts": {

diff --git a/packages/loadable-components/package.json b/packages/loadable-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-loadable-components",
-  "version": "0.3.93",
+  "version": "0.3.94",
   "description": "SWC plugin for `@loadable/components`",
   "main": "swc_plugin_loadable_components.wasm",
   "scripts": {

diff --git a/packages/noop/package.json b/packages/noop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-noop",
-  "version": "1.5.91",
+  "version": "1.5.92",
   "description": "Noop SWC plugin, for debugging",
   "main": "swc_plugin_noop.wasm",
   "scripts": {

diff --git a/packages/react-remove-properties/package.json b/packages/react-remove-properties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-react-remove-properties",
-  "version": "1.5.93",
+  "version": "1.5.94",
   "description": "SWC plugin for https://www.npmjs.com/package/babel-plugin-react-remove-properties",
   "main": "swc_plugin_react_remove_properties.wasm",
   "scripts": {

diff --git a/packages/react-remove-properties/transform/Cargo.toml b/packages/react-remove-properties/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "react_remove_properties"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.6.0"
+version = "0.7.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/relay/README.md b/packages/relay/README.md
@@ -63,3 +63,24 @@ const swcConfig = require("./.swcrc.js")
 ```
 
 > Note: We're using a `.swcrc.js` file extension up above and importing the config directly because Relay needs access to `__dirname`, which can't be derived from the default JSON parsed from `.swcrc`.
+
+#### Output import paths
+
+By default, `@swc/plugin-relay` will transpile import paths based on the `language` option.
+You can use `outputFileExtension` to change the file extension of the generated import paths.
+
+```js
+plugins: [
+    [
+        "@swc/plugin-relay",
+        {
+            rootDir: __dirname,
+            artifactDirectory: "src/__generated__",
+            language: "typescript",
+            eagerEsModules: true,
+            outputFileExtension: "js",
+        },
+    ],
+],
+```
+In this example typescript graphql files will output transpiled import path of `javascript` ending with `.js`.
diff --git a/packages/relay/package.json b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-relay",
-  "version": "1.5.93",
+  "version": "1.5.94",
   "description": "SWC plugin for relay",
   "main": "swc_plugin_relay.wasm",
   "types": "./types.d.ts",

diff --git a/packages/relay/src/lib.rs b/packages/relay/src/lib.rs
@@ -6,7 +6,7 @@ use swc_core::{
     ecma::{ast::Program, visit::FoldWith},
     plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
 };
-use swc_relay::{relay, Config, RelayLanguageConfig};
+use swc_relay::{relay, Config, RelayLanguageConfig, OutputFileExtension};
 
 #[plugin_transform]
 fn relay_plugin_transform(program: Program, metadata: TransformPluginProgramMetadata) -> Program {
@@ -40,6 +40,9 @@ fn relay_plugin_transform(program: Program, metadata: TransformPluginProgramMeta
     let language = plugin_config["language"]
         .as_str()
         .map_or(RelayLanguageConfig::TypeScript, |v| v.try_into().unwrap());
+    let output_file_extension = plugin_config["outputFileExtension"]
+        .as_str()
+        .map_or(OutputFileExtension::Undefined, |v| v.try_into().unwrap());
     let eager_es_modules = plugin_config["eagerEsModules"]
         .as_bool()
         .unwrap_or_default();
@@ -48,6 +51,7 @@ fn relay_plugin_transform(program: Program, metadata: TransformPluginProgramMeta
         artifact_directory,
         language,
         eager_es_modules,
+        output_file_extension
     };
 
     let mut relay = relay(

diff --git a/packages/relay/transform/Cargo.toml b/packages/relay/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_relay"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.26.0"
+version = "0.27.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/relay/transform/src/lib.rs b/packages/relay/transform/src/lib.rs
@@ -21,6 +21,14 @@ pub enum RelayLanguageConfig {
     Flow,
 }
 
+#[derive(Copy, Clone, Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum OutputFileExtension {
+    TypeScript,
+    JavaScript,
+    Undefined
+}
+
 impl<'a> TryFrom<&'a str> for RelayLanguageConfig {
     type Error = String;
 
@@ -33,12 +41,31 @@ impl<'a> TryFrom<&'a str> for RelayLanguageConfig {
     }
 }
 
+
+impl<'a> TryFrom<&'a str> for OutputFileExtension {
+    type Error = String;
+
+    fn try_from(value: &'a str) -> Result<Self, Self::Error> {
+        match value {
+            "ts" => Ok(Self::TypeScript),
+            "js" => Ok(Self::JavaScript),
+            _ => Err(format!("Unexpected output file extension value '{}'", value)),
+        }
+    }
+}
+
 impl Default for RelayLanguageConfig {
     fn default() -> Self {
         Self::Flow
     }
 }
 
+impl Default for OutputFileExtension {
+    fn default() -> Self {
+        Self::Undefined
+    }
+}
+
 #[derive(Debug, Clone)]
 struct RelayImport {
     path: JsWord,
@@ -81,6 +108,8 @@ pub struct Config {
     pub language: RelayLanguageConfig,
     #[serde(default)]
     pub eager_es_modules: bool,
+    #[serde(default)]
+    pub output_file_extension: OutputFileExtension,
 }
 
 fn pull_first_operation_name_from_tpl(tpl: &TaggedTpl) -> Option<String> {
@@ -159,14 +188,14 @@ impl<'a> Relay<'a> {
         real_file_name: &Path,
         definition_name: &str,
     ) -> Result<PathBuf, BuildRequirePathError> {
-        let filename = match &self.config.language {
-            RelayLanguageConfig::Flow => format!("{}.graphql.js", definition_name),
-            RelayLanguageConfig::TypeScript => {
-                format!("{}.graphql.ts", definition_name)
-            }
-            RelayLanguageConfig::JavaScript => {
-                format!("{}.graphql.js", definition_name)
-            }
+        let filename = match &self.config.output_file_extension {
+            OutputFileExtension::JavaScript => format!("{}.graphql.js", definition_name),
+            OutputFileExtension::TypeScript => format!("{}.graphql.ts", definition_name),
+            OutputFileExtension::Undefined => match &self.config.language {
+                RelayLanguageConfig::Flow => format!("{}.graphql.js", definition_name),
+                RelayLanguageConfig::TypeScript => format!("{}.graphql.ts", definition_name),
+                RelayLanguageConfig::JavaScript => format!("{}.graphql.js", definition_name),
+            },
         };
 
         if let Some(artifact_directory) = &self.config.artifact_directory {

diff --git a/packages/relay/transform/tests/fixture.rs b/packages/relay/transform/tests/fixture.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use swc_common::FileName;
 use swc_ecma_transforms_testing::test_fixture;
-use swc_relay::{relay, Config, RelayLanguageConfig};
+use swc_relay::{relay, Config, RelayLanguageConfig, OutputFileExtension};
 
 #[testing::fixture("tests/fixture/simple/**/input.js")]
 fn fixture(input: PathBuf) {
@@ -16,6 +16,7 @@ fn fixture(input: PathBuf) {
                     artifact_directory: None,
                     language: RelayLanguageConfig::TypeScript,
                     eager_es_modules: false,
+                    output_file_extension: OutputFileExtension::Undefined,
                 },
                 FileName::Real("file.js".parse().unwrap()),
                 Default::default(),
@@ -41,6 +42,59 @@ fn fixture_es_modules(input: PathBuf) {
                     artifact_directory: None,
                     language: RelayLanguageConfig::TypeScript,
                     eager_es_modules: true,
+                    output_file_extension: OutputFileExtension::Undefined,
+                },
+                FileName::Real("file.js".parse().unwrap()),
+                Default::default(),
+                None,
+                None,
+            )
+        },
+        &input,
+        &output,
+        Default::default(),
+    );
+}
+
+#[testing::fixture("tests/fixture/outputFileExtension/javascript/**/input.js")]
+fn fixture_output_file_extension_javascript(input: PathBuf) {
+    let output = input.parent().unwrap().join("output.js");
+
+    test_fixture(
+        Default::default(),
+        &|_| {
+            relay(
+                &Config {
+                    artifact_directory: None,
+                    language: RelayLanguageConfig::TypeScript,
+                    eager_es_modules: true,
+                    output_file_extension: OutputFileExtension::JavaScript,
+                },
+                FileName::Real("file.js".parse().unwrap()),
+                Default::default(),
+                None,
+                None,
+            )
+        },
+        &input,
+        &output,
+        Default::default(),
+    );
+}
+
+#[testing::fixture("tests/fixture/outputFileExtension/typescript/**/input.js")]
+fn fixture_output_file_extension_typescript(input: PathBuf) {
+    let output = input.parent().unwrap().join("output.js");
+
+    test_fixture(
+        Default::default(),
+        &|_| {
+            relay(
+                &Config {
+                    artifact_directory: None,
+                    language: RelayLanguageConfig::JavaScript,
+                    eager_es_modules: true,
+                    output_file_extension: OutputFileExtension::TypeScript,
                 },
                 FileName::Real("file.js".parse().unwrap()),
                 Default::default(),

diff --git a/packages/relay/transform/tests/fixture/outputFileExtension/javascript/input.js b/packages/relay/transform/tests/fixture/outputFileExtension/javascript/input.js
@@ -0,0 +1,10 @@
+const myFragment = graphql`
+  fragment FooFragment on Bar {
+    id
+  }
+`
+useQuery(graphql`
+  query FooQuery {
+    id
+  }
+`)
diff --git a/packages/relay/transform/tests/fixture/outputFileExtension/javascript/output.js b/packages/relay/transform/tests/fixture/outputFileExtension/javascript/output.js
@@ -0,0 +1,4 @@
+import __FooFragment from "__generated__/FooFragment.graphql.js";
+import __FooQuery from "__generated__/FooQuery.graphql.js";
+const myFragment = __FooFragment;
+useQuery(__FooQuery);