fix(rescript-openapi): code cleanup, attribution fixes, and documentation updates

Fix all clippy warnings (collapsible if-let, unused params, too-many-args),
remove dead codegen::generate function and duplicate StringEnum branches,
correct SPDX copyright headers and Cargo.toml author attribution, update
README with missing CLI flags and fix module import path, and bring
STATE.scm up to date with actual test counts and session history.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: hyperpolymath

rescript-ecosystem/packages/bindings/openapi/.machines_readable/6scm/STATE.scm

@@ -6,7 +6,7 @@
     (version "0.1.0")
     (schema-version "1.0")
     (created "2025-01-05")
-    (updated "2026-01-05")
+    (updated "2026-03-03")
     (project "rescript-openapi")
     (repo "github.com/hyperpolymath/rescript-openapi"))
 
@@ -37,7 +37,7 @@
       "Authentication (Bearer token, API key)"
       "File watching with --watch flag"
       "Dry run with --dry-run flag"
-      "Snapshot tests with insta (6 passing)"))
+      "Snapshot tests with insta (12 tests passing, 13 snapshots)"))
 
   (route-to-mvp
     (milestone "m1-compiles" (status completed)
@@ -96,4 +96,24 @@
         "Security audit passed (0 vulnerabilities)"
         "Performance tested (<10ms generation)"
         "All 6 tests passing"
-        "Ready for crates.io publish"))))
+        "Ready for crates.io publish"))
+    (session "2026-02-24-dual-track"
+      (accomplishments
+        "Implemented dual-track architecture (OOTB vs Streamlined)"
+        "Added --client-mode flag (full, functor-only, none)"
+        "Added --unified flag for single-module output"
+        "Added --variant-mode flag (polymorphic, standard)"
+        "Added rescript-openapi.toml project config support"
+        "ADR-001: Dual-Track Generation Architecture documented"
+        "All 12 tests passing, 13 snapshots"))
+    (session "2026-03-03-cleanup"
+      (accomplishments
+        "Fixed 3 clippy warnings (collapsible if-let, unused param, too-many-args)"
+        "Removed dead codegen::generate function"
+        "Fixed duplicate StringEnum branches in RsType::to_rescript"
+        "Fixed all SPDX copyright headers (2025 Hyperpolymath -> 2026 Jonathan D.A. Jewell)"
+        "Fixed Cargo.toml author attribution"
+        "Updated README with missing CLI flags"
+        "Fixed README module import (RescriptSchema -> RescriptSchema.S)"
+        "Added SPDX header to DECISIONS.md"
+        "Updated STATE.scm with correct test counts and session history"))))

rescript-ecosystem/packages/bindings/openapi/Cargo.toml

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: PMPL-1.0-or-later
-# SPDX-FileCopyrightText: 2025 Hyperpolymath
+# SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
 
 [package]
 name = "rescript-openapi"
 version = "0.1.0"
 edition = "2021"
-authors = ["Hyperpolymath <hello@hyperpolymath.com>"]
+authors = ["Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>"]
 description = "Generate type-safe ReScript clients from OpenAPI specifications"
 readme = "README.adoc"
 license = "PMPL-1.0-or-later"

rescript-ecosystem/packages/bindings/openapi/DECISIONS.md

@@ -1,3 +1,6 @@
+<!-- SPDX-License-Identifier: PMPL-1.0-or-later -->
+<!-- SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell -->
+
 # Architectural Decisions - rescript-openapi
 
 ## Dual-Track Generation: OOTB vs. Streamlined

rescript-ecosystem/packages/bindings/openapi/README.adoc

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: PMPL-1.0-or-later
-// SPDX-FileCopyrightText: 2025 Hyperpolymath
+// SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
 
 = rescript-openapi
 :toc:
@@ -72,6 +72,30 @@ This generates:
 | `--with-client`
 | Generate HTTP client
 | `true`
+
+| `--unified`
+| Generate single module with types + schemas
+| `false`
+
+| `--client-mode`
+| Client generation: `full`, `functor-only`, `none`
+| `full`
+
+| `--variant-mode`
+| Variant style: `polymorphic`, `standard`
+| `polymorphic`
+
+| `-c, --config`
+| Path to `rescript-openapi.toml` config file
+| `rescript-openapi.toml`
+
+| `-w, --watch`
+| Watch input file and regenerate on change
+| `false`
+
+| `--dry-run`
+| Print generated code to stdout
+| `false`
 |===
 
 === Validate Spec
@@ -113,7 +137,7 @@ type userRole = [
 
 [source,rescript]
 ----
-module S = RescriptSchema
+module S = RescriptSchema.S
 
 let userSchema: S.t<user> = S.object(s => ({
   id: s.field("id", S.string),

rescript-ecosystem/packages/bindings/openapi/src/codegen/client.rs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: PMPL-1.0-or-later
-// SPDX-FileCopyrightText: 2025 Hyperpolymath
+// SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
 
 //! HTTP client generation with pluggable HTTP backend
 
@@ -179,7 +179,7 @@ module Make = (Http: HttpClient) => {
 
     // Generate endpoint functions inside the functor
     for endpoint in &spec.endpoints {
-        output.push_str(&generate_endpoint(endpoint, config));
+        output.push_str(&generate_endpoint(endpoint));
         output.push('\n');
     }
 
@@ -205,7 +205,7 @@ module Make = (Http: HttpClient) => {
     Ok(output)
 }
 
-fn generate_endpoint(endpoint: &Endpoint, config: &Config) -> String {
+fn generate_endpoint(endpoint: &Endpoint) -> String {
     let mut output = String::new();
 
     // Documentation
@@ -230,17 +230,17 @@ fn generate_endpoint(endpoint: &Endpoint, config: &Config) -> String {
     let mut params = vec!["config: config".to_string()];
 
     for p in &path_params {
-        params.push(format!("~{}: {}", p.name, p.ty.to_rescript(config)));
+        params.push(format!("~{}: {}", p.name, p.ty.to_rescript()));
     }
 
     if let Some(body) = &endpoint.request_body {
-        params.push(format!("~body: {}", body.ty.to_rescript(config)));
+        params.push(format!("~body: {}", body.ty.to_rescript()));
     }
 
     // Optional query parameters
     for p in &query_params {
         if p.required {
-            params.push(format!("~{}: {}", p.name, p.ty.to_rescript(config)));
+            params.push(format!("~{}: {}", p.name, p.ty.to_rescript()));
         } else {
             params.push(format!("~{}=?", p.name));
         }
@@ -249,7 +249,7 @@ fn generate_endpoint(endpoint: &Endpoint, config: &Config) -> String {
     // Optional header parameters
     for p in &header_params {
         if p.required {
-            params.push(format!("~{}: {}", p.name, p.ty.to_rescript(config)));
+            params.push(format!("~{}: {}", p.name, p.ty.to_rescript()));
         } else {
             params.push(format!("~{}=?", p.name));
         }
@@ -261,7 +261,7 @@ fn generate_endpoint(endpoint: &Endpoint, config: &Config) -> String {
 
     let return_type = success_response
         .and_then(|r| r.ty.as_ref())
-        .map(|t| t.to_rescript(config))
+        .map(|t| t.to_rescript())
         .unwrap_or_else(|| "unit".to_string());
 
     output.push_str(&format!(

rescript-ecosystem/packages/bindings/openapi/src/codegen/mod.rs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: PMPL-1.0-or-later
-// SPDX-FileCopyrightText: 2025 Hyperpolymath
+// SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
 
 //! ReScript code generation from IR
 //!
@@ -12,7 +12,6 @@ pub mod client;
 pub mod schema;
 pub mod types;
 
-use crate::ir::ApiSpec;
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::fs;
@@ -68,52 +67,3 @@ impl ProjectConfig {
     }
 }
 
-/// Generate ReScript code from IR
-pub fn generate(spec: &ApiSpec, config: &Config) -> Result<()> {
-    fs::create_dir_all(&config.output_dir)?;
-
-    if config.unified_module {
-        // Generate Unified Module (Types + Schemas)
-        let mut output = String::new();
-        output.push_str("// SPDX-License-Identifier: PMPL-1.0-or-later\n");
-        output.push_str("// Generated by rescript-openapi - DO NOT EDIT\n");
-        output.push_str(&format!("// Source: {} v{}\n\n", spec.title, spec.version));
-        output.push_str("open RescriptCore\n");
-        output.push_str("module S = RescriptSchema.S\n\n");
-
-        let sccs = schema::topological_sort_scc(&spec.types);
-        for scc in sccs {
-            output.push_str(&types::generate_scc(&scc, config));
-            for type_def in scc {
-                output.push_str(&schema::generate_schema_only(type_def, config));
-                output.push('\n');
-            }
-            output.push('\n');
-        }
-
-        let path = config.output_dir.join(format!("{}.res", config.module_prefix));
-        fs::write(&path, output)?;
-    } else {
-        // Generate separate files (Legacy mode)
-        // Generate Types.res - all type definitions
-        let types_code = types::generate(spec, config)?;
-        let types_path = config.output_dir.join(format!("{}Types.res", config.module_prefix));
-        fs::write(&types_path, types_code)?;
-
-        // Generate Schema.res - rescript-schema validators
-        if config.generate_schema {
-            let schema_code = schema::generate(spec, config)?;
-            let schema_path = config.output_dir.join(format!("{}Schema.res", config.module_prefix));
-            fs::write(&schema_path, schema_code)?;
-        }
-    }
-
-    // Generate Client.res - HTTP client functions
-    if config.generate_client {
-        let client_code = client::generate(spec, config)?;
-        let client_path = config.output_dir.join(format!("{}Client.res", config.module_prefix));
-        fs::write(&client_path, client_code)?;
-    }
-
-    Ok(())
-}

rescript-ecosystem/packages/bindings/openapi/src/codegen/schema.rs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: PMPL-1.0-or-later
-// SPDX-FileCopyrightText: 2025 Hyperpolymath
+// SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
 
 //! rescript-schema validator generation with topological sorting
 
@@ -272,6 +272,7 @@ pub fn topological_sort_scc(types: &[TypeDef]) -> Vec<Vec<&TypeDef>> {
     result
 }
 
+#[allow(clippy::too_many_arguments)]
 fn tarjan_dfs(
     at: usize,
     adj: &Vec<Vec<usize>>,
@@ -330,7 +331,7 @@ fn generate_schema(type_def: &TypeDef, config: &Config) -> String {
             output.push_str(&format!("let {}: S.t<{}> = S.object(s => ({{\n", schema_name, type_name));
 
             for field in fields {
-                output.push_str(&generate_field_schema(field, config));
+                output.push_str(&generate_field_schema(field));
             }
 
             output.push_str(&format!("}}: {}))\n", type_name));
@@ -376,7 +377,7 @@ fn generate_schema(type_def: &TypeDef, config: &Config) -> String {
                             // Wrap the inner schema to transform to variant constructor
                             output.push_str(&format!(
                                 "  {}->S.transform(s => {{\n    parser: v => {}(v),\n    serializer: v => switch v {{ | {}(x) => x | _ => S.fail(\"Expected {}\") }}\n  }}),\n",
-                                ty.to_schema(config),
+                                ty.to_schema(),
                                 case.name,
                                 case.name,
                                 case.name
@@ -405,22 +406,22 @@ fn generate_schema(type_def: &TypeDef, config: &Config) -> String {
                 output.push_str(&format!("/** Schema for {} */\n", doc));
             }
 
-            output.push_str(&format!("let {} = {}\n", schema_name, target.to_schema(config)));
+            output.push_str(&format!("let {} = {}\n", schema_name, target.to_schema()));
         }
     }
 
     output
 }
 
-fn generate_field_schema(field: &Field, config: &Config) -> String {
+fn generate_field_schema(field: &Field) -> String {
     let method = if field.optional { "fieldOr" } else { "field" };
     let default = if field.optional {
         ", None"
     } else {
         ""
     };
 
-    let schema = field.ty.to_schema(config);
+    let schema = field.ty.to_schema();
 
     if field.name != field.original_name {
         format!(

rescript-ecosystem/packages/bindings/openapi/src/codegen/types.rs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: PMPL-1.0-or-later
-// SPDX-FileCopyrightText: 2025 Hyperpolymath
+// SPDX-FileCopyrightText: 2026 Jonathan D.A. Jewell
 
 //! ReScript type generation
 
@@ -89,7 +89,7 @@ pub fn generate_type(type_def: &TypeDef, is_rec: bool, config: &Config) -> Strin
                     output.push_str("  ");
                 }
 
-                output.push_str(&format!("{}: {},\n", field.name, field.ty.to_rescript(config)));
+                output.push_str(&format!("{}: {},\n", field.name, field.ty.to_rescript()));
             }
 
             output.push_str("}\n");
@@ -111,7 +111,7 @@ pub fn generate_type(type_def: &TypeDef, is_rec: bool, config: &Config) -> Strin
                 for case in cases {
                     match &case.payload {
                         Some(ty) => {
-                            output.push_str(&format!("  | {}({})\n", case.name, ty.to_rescript(config)));
+                            output.push_str(&format!("  | {}({})\n", case.name, ty.to_rescript()));
                         }
                         None => {
                             output.push_str(&format!("  | {}\n", case.name));
@@ -143,7 +143,7 @@ pub fn generate_type(type_def: &TypeDef, is_rec: bool, config: &Config) -> Strin
             }
 
             let type_name = name.to_lower_camel_case();
-            output.push_str(&format!("{} {} = {}\n", keyword, type_name, target.to_rescript(config)));
+            output.push_str(&format!("{} {} = {}\n", keyword, type_name, target.to_rescript()));
         }
     }