fix: pr review comments

Author: dotkas

crates/oapi-codegen/src/emit.rs

@@ -258,7 +258,7 @@ fn emit_type(ty: &RustType) -> Result<TokenStream> {
             quote! { #ident }
         }
         RustType::External { module, name } => {
-            let path: TokenStream = module.parse().map_err(|_| {
+            let path: syn::Path = syn::parse_str(module).map_err(|_| {
                 return Error::UnsupportedSchema {
                     path: "import-mapping".to_owned(),
                     reason: format!("module path `{module}` is not a valid Rust path expression"),

crates/oapi-codegen/src/loader.rs

@@ -80,6 +80,12 @@ impl Spec {
     pub fn resolve_response(&self, reference: &str) -> Result<&Response> {
         let mut current = reference.to_owned();
         for _ in 0..MAX_REF_DEPTH {
+            if ref_file_part(&current).is_some() {
+                return Err(Error::UnsupportedRef {
+                    reference: current.clone(),
+                    reason: "cross-file component response `$ref`s are not supported".to_owned(),
+                });
+            }
             let name = ref_component_name(&current, "responses").ok_or_else(|| {
                 return Error::UnsupportedRef {
                     reference: current.clone(),

crates/oapi-codegen/src/paths.rs

@@ -125,7 +125,7 @@ impl Lowerer<'_> {
         for name in path_param_names(path) {
             let declared = find_path_param(&name, operation, shared_params);
             let ty = match declared {
-                Some(format) => self.param_type(path, &name, format)?,
+                Some(format) => self.param_type(path, method, &name, format)?,
                 None => RustType::String,
             };
             params.push(Param {
@@ -166,19 +166,19 @@ fn path_param_schema<'a>(name: &str, parameters: &'a [ReferenceOr<Parameter>]) -
 
 /// Map a path parameter's schema to a scalar Rust type.
 impl Lowerer<'_> {
-    fn param_type(&self, path: &str, name: &str, format: &ParameterSchemaOrContent) -> Result<RustType> {
+    fn param_type(&self, path: &str, method: &str, name: &str, format: &ParameterSchemaOrContent) -> Result<RustType> {
         let schema = match format {
             ParameterSchemaOrContent::Schema(schema) => schema,
             ParameterSchemaOrContent::Content(_) => {
                 return Err(Error::UnsupportedOperation {
-                    method: "*".to_owned(),
+                    method: method.to_owned(),
                     path: path.to_owned(),
                     reason: format!("path parameter `{name}` uses `content`, which is not supported"),
                 });
             }
         };
         let schema = match schema {
-            ReferenceOr::Reference { reference } => return self.named_from_ref(path, reference),
+            ReferenceOr::Reference { reference } => return self.named_from_ref(path, method, reference),
             ReferenceOr::Item(schema) => schema,
         };
         let ty = match &schema.schema_kind {
@@ -188,7 +188,7 @@ impl Lowerer<'_> {
             SchemaKind::Type(Type::Boolean(_)) => RustType::Bool,
             _ => {
                 return Err(Error::UnsupportedOperation {
-                    method: "*".to_owned(),
+                    method: method.to_owned(),
                     path: path.to_owned(),
                     reason: format!("path parameter `{name}` must be a scalar type"),
                 });
@@ -291,7 +291,7 @@ impl Lowerer<'_> {
     /// their emission.
     fn body_type(&self, path: &str, method: &str, schema: &ReferenceOr<Schema>) -> Result<RustType> {
         match schema {
-            ReferenceOr::Reference { reference } => return self.named_from_ref(path, reference),
+            ReferenceOr::Reference { reference } => return self.named_from_ref(path, method, reference),
             ReferenceOr::Item(schema) => return self.inline_body_type(path, method, schema),
         }
     }
@@ -305,7 +305,7 @@ impl Lowerer<'_> {
             SchemaKind::Type(Type::Boolean(_)) => RustType::Bool,
             SchemaKind::Type(Type::Array(at)) => {
                 let element = match &at.items {
-                    Some(ReferenceOr::Reference { reference }) => self.named_from_ref(path, reference)?,
+                    Some(ReferenceOr::Reference { reference }) => self.named_from_ref(path, method, reference)?,
                     Some(ReferenceOr::Item(item)) => self.inline_body_type(path, method, item)?,
                     None => RustType::Value,
                 };
@@ -326,10 +326,10 @@ impl Lowerer<'_> {
     /// Resolve a `$ref` string to a named type. Same-document references become
     /// a local [`RustType::Named`]; cross-file references are routed through the
     /// `import-mapping` to a [`RustType::External`].
-    fn named_from_ref(&self, path: &str, reference: &str) -> Result<RustType> {
+    fn named_from_ref(&self, path: &str, method: &str, reference: &str) -> Result<RustType> {
         let target = ref_target_name(reference).ok_or_else(|| {
             return Error::UnsupportedOperation {
-                method: "*".to_owned(),
+                method: method.to_owned(),
                 path: path.to_owned(),
                 reason: format!("reference `{reference}` must point at a component schema"),
             };
@@ -339,7 +339,7 @@ impl Lowerer<'_> {
         };
         let module = self.import_mapping.get(file).ok_or_else(|| {
             return Error::UnsupportedOperation {
-                method: "*".to_owned(),
+                method: method.to_owned(),
                 path: path.to_owned(),
                 reason: format!("cross-file reference `{reference}` needs an `import-mapping` entry for `{file}`"),
             };

crates/oapi-codegen/tests/coverage.rs

@@ -333,7 +333,11 @@ const SERVER_FIXTURES: &[&str] = &["server_petstore", "server_refs"];
 
 /// Server fixtures whose generation must fail with a documented error, covering
 /// the slice's deliberate limitations (e.g. `default`/range responses).
-const SERVER_UNSUPPORTED_FIXTURES: &[&str] = &["server_unsupported_default_response", "server_unsupported_ref_param"];
+const SERVER_UNSUPPORTED_FIXTURES: &[&str] = &[
+    "server_unsupported_default_response",
+    "server_unsupported_ref_param",
+    "server_unsupported_xfile_response_ref",
+];
 
 /// Absolute path to the crate's `tests` directory.
 fn tests_dir() -> PathBuf {

crates/oapi-codegen/tests/fixtures/server_unsupported_xfile_response_ref.yaml

@@ -0,0 +1,12 @@
+openapi: 3.0.3
+info:
+  title: Cross-file response ref server
+  version: 1.0.0
+paths:
+  /widgets:
+    get:
+      operationId: listWidgets
+      summary: List widgets.
+      responses:
+        "401":
+          $ref: "schemas/common.yaml#/components/responses/Unauthorized"