facebook
diff --git a/‎compiler/crates/relay-schema-generation/src/find_resolver_imports.rs
+7-2 b/‎compiler/crates/relay-schema-generation/src/find_resolver_imports.rs
+7-2
diff --git a/‎compiler/crates/relay-schema-generation/tests/docblock/fixtures/strong-type-define-flow-opaque-within.expected
+175 b/‎compiler/crates/relay-schema-generation/tests/docblock/fixtures/strong-type-define-flow-opaque-within.expected
+175
diff --git a/‎compiler/crates/relay-schema-generation/tests/docblock/fixtures/strong-type-define-flow-opaque-within.input
+37 b/‎compiler/crates/relay-schema-generation/tests/docblock/fixtures/strong-type-define-flow-opaque-within.input
+37
diff --git a/‎compiler/crates/relay-schema-generation/tests/docblock_test.rs
+8-1 b/‎compiler/crates/relay-schema-generation/tests/docblock_test.rs
+8-1
@@ -17,6 +17,7 @@ use common::Diagnostic;
 use common::DiagnosticsResult;
 use common::Location;
 use common::SourceLocationKey;
+use hermes_estree::Declaration;
 use hermes_estree::ImportDeclarationSpecifier;
 use hermes_estree::Visitor;
 use hermes_estree::_Literal;
@@ -139,8 +140,12 @@ impl Visitor<'_> for ImportExportVisitor {
     }
 
     fn visit_export_named_declaration(&mut self, ast: &'_ hermes_estree::ExportNamedDeclaration) {
-        if let Some(hermes_estree::Declaration::TypeAlias(node)) = &ast.declaration {
-            let name = (&node.id.name).intern();
+        let maybe_name = ast.declaration.as_ref().and_then(|decl| match decl {
+            Declaration::TypeAlias(node) => Some((&node.id.name).intern()),
+            Declaration::OpaqueType(node) => Some((&node.id.name).intern()),
+            _ => None,
+        });
+        if let Some(name) = maybe_name {
             self.exports.insert(
                 name,
                 ModuleResolutionKey {
 
@@ -0,0 +1,175 @@
+==================================== INPUT ====================================
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+//- Cat.js
+
+export opaque type CatFlowType = {id: string}
+
+/**
+ * @RelayResolver
+ */
+export function Cat(id: DataID): CatFlowType {
+  return {};
+}
+
+
+/**
+ * @RelayResolver
+ */
+export function name(cat: CatFlowType): ?string {
+  return "cat";
+}
+
+
+//- Cat-fields.js
+
+import type {CatFlowType} from 'Cat';
+
+/**
+ * @RelayResolver
+ */
+export function age(cat: CatFlowType): ?number {
+  return 2;
+}
+==================================== OUTPUT ===================================
+Field(
+    TerseRelayResolver(
+        TerseRelayResolverIr {
+            field: FieldDefinition {
+                name: Identifier {
+                    span: 372:376,
+                    token: Token {
+                        span: 372:376,
+                        kind: Identifier,
+                    },
+                    value: "name",
+                },
+                type_: Named(
+                    NamedTypeAnnotation {
+                        name: Identifier {
+                            span: 397:403,
+                            token: Token {
+                                span: 397:403,
+                                kind: Identifier,
+                            },
+                            value: "String",
+                        },
+                    },
+                ),
+                arguments: None,
+                directives: [],
+                description: None,
+                hack_source: None,
+                span: 372:376,
+            },
+            type_: WithLocation {
+                location: Cat.js:282:285,
+                item: "Cat",
+            },
+            root_fragment: None,
+            deprecated: None,
+            semantic_non_null: None,
+            live: None,
+            location: Cat.js:372:376,
+            fragment_arguments: None,
+            source_hash: ResolverSourceHash(
+                "7bd696850a88d12b6ebff3689599d699",
+            ),
+        },
+    ),
+)
+extend type Cat {
+  name: String @relay_resolver(fragment_name: "Cat____relay_model_instance", generated_fragment: true, inject_fragment_data: "__relay_model_instance", has_output_type: true, import_name: "name", import_path: "Cat.js") @resolver_source_hash(value: "7bd696850a88d12b6ebff3689599d699")
+}
+
+
+Field(
+    TerseRelayResolver(
+        TerseRelayResolverIr {
+            field: FieldDefinition {
+                name: Identifier {
+                    span: 82:85,
+                    token: Token {
+                        span: 82:85,
+                        kind: Identifier,
+                    },
+                    value: "age",
+                },
+                type_: Named(
+                    NamedTypeAnnotation {
+                        name: Identifier {
+                            span: 106:112,
+                            token: Token {
+                                span: 106:112,
+                                kind: Identifier,
+                            },
+                            value: "Float",
+                        },
+                    },
+                ),
+                arguments: None,
+                directives: [],
+                description: None,
+                hack_source: None,
+                span: 82:85,
+            },
+            type_: WithLocation {
+                location: Cat.js:282:285,
+                item: "Cat",
+            },
+            root_fragment: None,
+            deprecated: None,
+            semantic_non_null: None,
+            live: None,
+            location: Cat-fields.js:82:85,
+            fragment_arguments: None,
+            source_hash: ResolverSourceHash(
+                "179d2d09d0726f713ad290a603cc35c6",
+            ),
+        },
+    ),
+)
+extend type Cat {
+  age: Float @relay_resolver(fragment_name: "Cat____relay_model_instance", generated_fragment: true, inject_fragment_data: "__relay_model_instance", has_output_type: true, import_name: "age", import_path: "Cat-fields.js") @resolver_source_hash(value: "179d2d09d0726f713ad290a603cc35c6")
+}
+
+
+Type(
+    StrongObjectResolver(
+        StrongObjectIr {
+            type_name: Identifier {
+                span: 282:285,
+                token: Token {
+                    span: 282:285,
+                    kind: Identifier,
+                },
+                value: "Cat",
+            },
+            rhs_location: Cat.js:282:285,
+            root_fragment: WithLocation {
+                location: Cat.js:282:285,
+                item: FragmentDefinitionName(
+                    "Cat__id",
+                ),
+            },
+            description: None,
+            deprecated: None,
+            live: None,
+            semantic_non_null: None,
+            location: Cat.js:282:285,
+            implements_interfaces: [],
+            source_hash: ResolverSourceHash(
+                "7bd696850a88d12b6ebff3689599d699",
+            ),
+        },
+    ),
+)
+type Cat @__RelayResolverModel {
+  id: ID!
+  __relay_model_instance: RelayResolverValue! @relay_resolver(generated_fragment: true, fragment_name: "Cat__id", import_name: "Cat", import_path: "Cat.js", inject_fragment_data: "id") @resolver_source_hash(value: "7bd696850a88d12b6ebff3689599d699") @unselectable(reason: "This field is intended only for Relay's internal use")
+}
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+//- Cat.js
+export opaque type CatFlowType = {id: string}
+
+/**
+ * @RelayResolver
+ */
+export function Cat(id: DataID): CatFlowType {
+  return {};
+}
+
+
+/**
+ * @RelayResolver
+ */
+export function name(cat: CatFlowType): ?string {
+  return "cat";
+}
+
+
+//- Cat-fields.js
+
+import type {CatFlowType} from 'Cat';
+
+/**
+ * @RelayResolver
+ */
+export function age(cat: CatFlowType): ?number {
+  return 2;
+}
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<60da5f3651308056dd8af3ed89aaea8f>>
+ * @generated SignedSource<<b3928d8850e33ef5bfe29d88b154af67>>
  */
 
 mod docblock;
@@ -222,6 +222,13 @@ async fn single_module() {
     test_fixture(transform_fixture, file!(), "single-module.input", "docblock/fixtures/single-module.expected", input, expected).await;
 }
 
+#[tokio::test]
+async fn strong_type_define_flow_opaque_within() {
+    let input = include_str!("docblock/fixtures/strong-type-define-flow-opaque-within.input");
+    let expected = include_str!("docblock/fixtures/strong-type-define-flow-opaque-within.expected");
+    test_fixture(transform_fixture, file!(), "strong-type-define-flow-opaque-within.input", "docblock/fixtures/strong-type-define-flow-opaque-within.expected", input, expected).await;
+}
+
 #[tokio::test]
 async fn strong_type_define_flow_within() {
     let input = include_str!("docblock/fixtures/strong-type-define-flow-within.input");