Merge remote-tracking branch 'origin/codex/4247-rails-ts-types' into codex/4248-rpc-helper

* origin/codex/4247-rails-ts-types:
  Reject raw template interpolation

Author: justin808

react_on_rails/lib/react_on_rails/typescript_response_types.rb

@@ -15,6 +15,7 @@ module TypeScriptResponseTypes
     RAW_TYPE_GROUP_CLOSES = { "(" => ")", "[" => "]", "{" => "}", "<" => ">" }.freeze
     RAW_TYPE_GROUP_ENDS = RAW_TYPE_GROUP_CLOSES.values.freeze
     RAW_TYPE_STRING_LITERAL_PATTERN = /'(?:\\.|[^'\\])*'|"(?:\\.|[^"\\])*"|`(?:\\.|[^`\\])*`/
+    RAW_TYPE_TEMPLATE_INTERPOLATION_PATTERN = /\$\{/
     RAW_TYPE_NESTING_TOKEN_PATTERN = /#{RAW_TYPE_STRING_LITERAL_PATTERN.source}|=>|[({\[<]|[)}\]>]|,/
     RAW_TYPE_UNSAFE_LINE_BREAK_PATTERN = /[\r\n\u2028\u2029]/
     RAW_TYPE_UNSAFE_NON_STRING_PATTERN = %r{;|//|/\*|\*/}
@@ -68,6 +69,7 @@ def validate_fields!(fields)
 
       def unsafe_raw_type_expression?(expression)
         expression.match?(RAW_TYPE_UNSAFE_LINE_BREAK_PATTERN) ||
+          expression.match?(RAW_TYPE_TEMPLATE_INTERPOLATION_PATTERN) ||
           expression.gsub(RAW_TYPE_STRING_LITERAL_PATTERN, "").match?(RAW_TYPE_UNSAFE_NON_STRING_PATTERN) ||
           unsafe_raw_type_nesting?(expression)
       end

react_on_rails/sig/react_on_rails/typescript_response_types.rbs

@@ -5,6 +5,7 @@ module ReactOnRails
     IDENTIFIER_PATTERN: Regexp
     OPTION_KEYS: Array[Symbol]
     WRAPPER_TYPE_KEYS: Array[Symbol]
+    RAW_TYPE_TEMPLATE_INTERPOLATION_PATTERN: Regexp
     RESERVED_TYPE_NAMES: Array[String]
     GENERATED_TYPE_NAMES: Array[String]
     SCALAR_TYPES: Hash[Symbol, String]

react_on_rails/spec/react_on_rails/typescript_response_types_raw_validation_spec.rb

@@ -65,6 +65,18 @@
     end.to raise_error(ReactOnRails::Error, /single-line type expressions/)
   end
 
+  it "rejects raw TypeScript template literal interpolation" do
+    response_types.define_response(
+      "events.show",
+      type_name: "EventsShowResponse",
+      fields: { slug: { raw: "`project-${string}`" } }
+    )
+
+    expect do
+      response_types.to_d_ts
+    end.to raise_error(ReactOnRails::Error, /single-line type expressions/)
+  end
+
   it "rejects raw TypeScript expressions with ECMAScript line separators" do
     response_types.define_response(
       "events.show",