cloudflare 7.1.0 → 7.3.0

package/src/resources/rulesets/rulesets.ts

@@ -5,18 +5,18 @@ import * as RulesetsAPI from './rulesets';
 import * as RulesAPI from './rules';
 import {
   BaseRules,
-  BlockRule,
+  BlockRule as RulesAPIBlockRule,
   CompressResponseRule,
-  DDoSDynamicRule,
-  ExecuteRule,
-  ForceConnectionCloseRule,
-  LogCustomFieldRule,
-  LogRule,
+  DDoSDynamicRule as RulesAPIDDoSDynamicRule,
+  ExecuteRule as RulesAPIExecuteRule,
+  ForceConnectionCloseRule as RulesAPIForceConnectionCloseRule,
+  LogCustomFieldRule as RulesAPILogCustomFieldRule,
+  LogRule as RulesAPILogRule,
   Logging,
-  ManagedChallengeRule,
-  RedirectRule,
-  RewriteRule,
-  RouteRule,
+  ManagedChallengeRule as RulesAPIManagedChallengeRule,
+  RedirectRule as RulesAPIRedirectRule,
+  RewriteRule as RulesAPIRewriteRule,
+  RouteRule as RulesAPIRouteRule,
   RuleCreateParams,
   RuleCreateResponse,
   RuleDeleteParams,
@@ -25,11 +25,11 @@ import {
   RuleEditResponse,
   Rules,
   RulesetRule,
-  ScoreRule,
-  ServeErrorRule,
-  SetCacheSettingsRule,
+  ScoreRule as RulesAPIScoreRule,
+  ServeErrorRule as RulesAPIServeErrorRule,
+  SetCacheSettingsRule as RulesAPISetCacheSettingsRule,
   SetConfigRule,
-  SkipRule,
+  SkipRule as RulesAPISkipRule,
 } from './rules';
 import * as VersionsAPI from './versions';
 import {
@@ -67,9 +67,6 @@ export class BaseRulesets extends APIResource {
    * @example
    * ```ts
    * const ruleset = await client.rulesets.create({
-   *   kind: 'root',
-   *   name: 'My ruleset',
-   *   phase: 'http_request_firewall_custom',
    *   account_id: 'account_id',
    * });
    * ```
@@ -410,27 +407,27 @@ export namespace RulesetCreateResponse {
      * The list of rules in the ruleset.
      */
     rules: Array<
-      | RulesAPI.BlockRule
-      | Ruleset.RulesetsChallengeRule
-      | RulesAPI.CompressResponseRule
-      | RulesAPI.DDoSDynamicRule
-      | RulesAPI.ExecuteRule
-      | RulesAPI.ForceConnectionCloseRule
-      | Ruleset.RulesetsJSChallengeRule
-      | RulesAPI.LogRule
-      | RulesAPI.LogCustomFieldRule
-      | RulesAPI.ManagedChallengeRule
-      | RulesAPI.RedirectRule
-      | RulesAPI.RewriteRule
-      | RulesAPI.RouteRule
-      | RulesAPI.ScoreRule
-      | RulesAPI.ServeErrorRule
-      | Ruleset.RulesetsSetCacheControlRule
-      | RulesAPI.SetCacheSettingsRule
-      | Ruleset.RulesetsSetCacheTagsRule
-      | RulesAPI.SetConfigRule
-      | RulesAPI.SkipRule
-      | Ruleset.RulesetsTransformResponseHTMLRule
+      | Ruleset.BlockRule
+      | Ruleset.ChallengeRule
+      | Ruleset.ResponseCompressionRule
+      | Ruleset.DDoSDynamicRule
+      | Ruleset.ExecuteRule
+      | Ruleset.ForceConnectionCloseRule
+      | Ruleset.JavaScriptChallengeRule
+      | Ruleset.LogRule
+      | Ruleset.LogCustomFieldRule
+      | Ruleset.ManagedChallengeRule
+      | Ruleset.RedirectRule
+      | Ruleset.RewriteRule
+      | Ruleset.RouteRule
+      | Ruleset.ScoreRule
+      | Ruleset.ServeErrorRule
+      | Ruleset.SetCacheControlRule
+      | Ruleset.SetCacheSettingsRule
+      | Ruleset.SetCacheTagsRule
+      | Ruleset.SetConfigurationRule
+      | Ruleset.SkipRule
+      | Ruleset.TransformResponseHTMLRule
     >;
 
     /**
@@ -445,26 +442,53 @@ export namespace RulesetCreateResponse {
   }
 
   export namespace Ruleset {
-    export interface RulesetsChallengeRule {
+    export interface BlockRule extends Omit<RulesAPI.BlockRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ChallengeRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'challenge';
 
       /**
-       * The unique ID of the rule.
+       * Whether the rule should be executed.
        */
-      id?: string;
+      enabled: boolean;
 
       /**
-       * The action to perform when the rule matches.
+       * The expression defining which traffic will match the rule.
+       */
+      expression: string;
+
+      /**
+       * The timestamp of when the rule was last modified.
+       */
+      last_updated: string;
+
+      /**
+       * The reference of the rule (the rule's ID by default).
+       */
+      ref: string;
+
+      /**
+       * The version of the rule.
        */
-      action?: 'challenge';
+      version: string;
 
       /**
        * The parameters configuring the rule's action.
@@ -481,20 +505,10 @@ export namespace RulesetCreateResponse {
        */
       description?: string;
 
-      /**
-       * Whether the rule should be executed.
-       */
-      enabled?: boolean;
-
       /**
        * Configuration for exposed credential checking.
        */
-      exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
-
-      /**
-       * The expression defining which traffic will match the rule.
-       */
-      expression?: string;
+      exposed_credential_check?: ChallengeRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -504,15 +518,10 @@ export namespace RulesetCreateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsChallengeRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: ChallengeRule.Ratelimit;
     }
 
-    export namespace RulesetsChallengeRule {
+    export namespace ChallengeRule {
       /**
        * Configuration for exposed credential checking.
        */
@@ -580,26 +589,89 @@ export namespace RulesetCreateResponse {
       }
     }
 
-    export interface RulesetsJSChallengeRule {
+    export interface ResponseCompressionRule extends Omit<RulesAPI.CompressResponseRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface DDoSDynamicRule extends Omit<RulesAPI.DDoSDynamicRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ExecuteRule extends Omit<RulesAPI.ExecuteRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ForceConnectionCloseRule extends Omit<RulesAPI.ForceConnectionCloseRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface JavaScriptChallengeRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'js_challenge';
 
       /**
-       * The unique ID of the rule.
+       * Whether the rule should be executed.
        */
-      id?: string;
+      enabled: boolean;
 
       /**
-       * The action to perform when the rule matches.
+       * The expression defining which traffic will match the rule.
+       */
+      expression: string;
+
+      /**
+       * The timestamp of when the rule was last modified.
+       */
+      last_updated: string;
+
+      /**
+       * The reference of the rule (the rule's ID by default).
+       */
+      ref: string;
+
+      /**
+       * The version of the rule.
        */
-      action?: 'js_challenge';
+      version: string;
 
       /**
        * The parameters configuring the rule's action.
@@ -616,20 +688,10 @@ export namespace RulesetCreateResponse {
        */
       description?: string;
 
-      /**
-       * Whether the rule should be executed.
-       */
-      enabled?: boolean;
-
       /**
        * Configuration for exposed credential checking.
        */
-      exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
-
-      /**
-       * The expression defining which traffic will match the rule.
-       */
-      expression?: string;
+      exposed_credential_check?: JavaScriptChallengeRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -639,15 +701,10 @@ export namespace RulesetCreateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsJSChallengeRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: JavaScriptChallengeRule.Ratelimit;
     }
 
-    export namespace RulesetsJSChallengeRule {
+    export namespace JavaScriptChallengeRule {
       /**
        * Configuration for exposed credential checking.
        */
@@ -715,56 +772,154 @@ export namespace RulesetCreateResponse {
       }
     }
 
-    export interface RulesetsSetCacheControlRule {
+    export interface LogRule extends Omit<RulesAPI.LogRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface LogCustomFieldRule extends Omit<RulesAPI.LogCustomFieldRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ManagedChallengeRule extends Omit<RulesAPI.ManagedChallengeRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface RedirectRule extends Omit<RulesAPI.RedirectRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface RewriteRule extends Omit<RulesAPI.RewriteRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface RouteRule extends Omit<RulesAPI.RouteRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ScoreRule extends Omit<RulesAPI.ScoreRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ServeErrorRule extends Omit<RulesAPI.ServeErrorRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface SetCacheControlRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'set_cache_control';
+
+      enabled: boolean;
 
       /**
-       * The unique ID of the rule.
+       * The expression defining which traffic will match the rule.
        */
-      id?: string;
+      expression: string;
 
       /**
-       * The action to perform when the rule matches.
+       * The timestamp of when the rule was last modified.
        */
-      action?: 'set_cache_control';
+      last_updated: string;
 
       /**
-       * The parameters configuring the rule's action.
+       * The reference of the rule (the rule's ID by default).
        */
-      action_parameters?: RulesetsSetCacheControlRule.ActionParameters;
+      ref: string;
 
       /**
-       * The categories of the rule.
+       * The version of the rule.
        */
-      categories?: Array<string>;
+      version: string;
 
       /**
-       * An informative description of the rule.
+       * The parameters configuring the rule's action.
        */
-      description?: string;
+      action_parameters?: SetCacheControlRule.ActionParameters;
 
       /**
-       * Whether the rule should be executed.
+       * The categories of the rule.
        */
-      enabled?: boolean;
+      categories?: Array<string>;
 
       /**
-       * Configuration for exposed credential checking.
+       * An informative description of the rule.
        */
-      exposed_credential_check?: RulesetsSetCacheControlRule.ExposedCredentialCheck;
+      description?: string;
 
       /**
-       * The expression defining which traffic will match the rule.
+       * Configuration for exposed credential checking.
        */
-      expression?: string;
+      exposed_credential_check?: SetCacheControlRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -774,15 +929,10 @@ export namespace RulesetCreateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsSetCacheControlRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: SetCacheControlRule.Ratelimit;
     }
 
-    export namespace RulesetsSetCacheControlRule {
+    export namespace SetCacheControlRule {
       /**
        * The parameters configuring the rule's action.
        */
@@ -1350,37 +1500,61 @@ export namespace RulesetCreateResponse {
       }
     }
 
-    export interface RulesetsSetCacheTagsRule {
+    export interface SetCacheSettingsRule extends Omit<RulesAPI.SetCacheSettingsRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface SetCacheTagsRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'set_cache_tags';
+
+      enabled: boolean;
 
       /**
-       * The unique ID of the rule.
+       * The expression defining which traffic will match the rule.
+       */
+      expression: string;
+
+      /**
+       * The timestamp of when the rule was last modified.
        */
-      id?: string;
+      last_updated: string;
 
       /**
-       * The action to perform when the rule matches.
+       * The reference of the rule (the rule's ID by default).
+       */
+      ref: string;
+
+      /**
+       * The version of the rule.
        */
-      action?: 'set_cache_tags';
+      version: string;
 
       /**
        * The parameters configuring the rule's action.
        */
       action_parameters?:
-        | RulesetsSetCacheTagsRule.AddCacheTagsValues
-        | RulesetsSetCacheTagsRule.AddCacheTagsExpression
-        | RulesetsSetCacheTagsRule.RemoveCacheTagsValues
-        | RulesetsSetCacheTagsRule.RemoveCacheTagsExpression
-        | RulesetsSetCacheTagsRule.SetCacheTagsValues
-        | RulesetsSetCacheTagsRule.SetCacheTagsExpression;
+        | SetCacheTagsRule.AddCacheTagsValues
+        | SetCacheTagsRule.AddCacheTagsExpression
+        | SetCacheTagsRule.RemoveCacheTagsValues
+        | SetCacheTagsRule.RemoveCacheTagsExpression
+        | SetCacheTagsRule.SetCacheTagsValues
+        | SetCacheTagsRule.SetCacheTagsExpression;
 
       /**
        * The categories of the rule.
@@ -1392,20 +1566,10 @@ export namespace RulesetCreateResponse {
        */
       description?: string;
 
-      /**
-       * Whether the rule should be executed.
-       */
-      enabled?: boolean;
-
       /**
        * Configuration for exposed credential checking.
        */
-      exposed_credential_check?: RulesetsSetCacheTagsRule.ExposedCredentialCheck;
-
-      /**
-       * The expression defining which traffic will match the rule.
-       */
-      expression?: string;
+      exposed_credential_check?: SetCacheTagsRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -1415,15 +1579,10 @@ export namespace RulesetCreateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsSetCacheTagsRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: SetCacheTagsRule.Ratelimit;
     }
 
-    export namespace RulesetsSetCacheTagsRule {
+    export namespace SetCacheTagsRule {
       /**
        * Add cache tags using a list of values.
        */
@@ -1581,74 +1740,95 @@ export namespace RulesetCreateResponse {
       }
     }
 
-    export interface RulesetsTransformResponseHTMLRule {
-      /**
-       * The timestamp of when the rule was last modified.
-       */
-      last_updated: string;
+    export interface SetConfigurationRule extends Omit<RulesAPI.SetConfigRule, 'action'> {
+      id: string;
 
-      /**
-       * The version of the rule.
-       */
-      version: string;
+      action: string;
 
-      /**
-       * The unique ID of the rule.
-       */
-      id?: string;
+      enabled: boolean;
 
-      /**
-       * The action to perform when the rule matches.
-       */
-      action?: 'transform_response_html';
+      expression: string;
 
-      /**
-       * The parameters configuring the rule's action.
+      ref: string;
+    }
+
+    export interface SkipRule extends Omit<RulesAPI.SkipRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface TransformResponseHTMLRule {
+      /**
+       * The unique ID of the rule.
        */
-      action_parameters?: RulesetsTransformResponseHTMLRule.ActionParameters;
+      id: string;
 
       /**
-       * The categories of the rule.
+       * The action to perform when the rule matches.
        */
-      categories?: Array<string>;
+      action: 'transform_response_html';
+
+      enabled: boolean;
 
       /**
-       * An informative description of the rule.
+       * The expression defining which traffic will match the rule.
        */
-      description?: string;
+      expression: string;
 
       /**
-       * Whether the rule should be executed.
+       * The timestamp of when the rule was last modified.
        */
-      enabled?: boolean;
+      last_updated: string;
 
       /**
-       * Configuration for exposed credential checking.
+       * The reference of the rule (the rule's ID by default).
        */
-      exposed_credential_check?: RulesetsTransformResponseHTMLRule.ExposedCredentialCheck;
+      ref: string;
 
       /**
-       * The expression defining which traffic will match the rule.
+       * The version of the rule.
        */
-      expression?: string;
+      version: string;
 
       /**
-       * An object configuring the rule's logging behavior.
+       * The parameters configuring the rule's action.
        */
-      logging?: RulesAPI.Logging;
+      action_parameters?: TransformResponseHTMLRule.ActionParameters;
 
       /**
-       * An object configuring the rule's rate limit behavior.
+       * The categories of the rule.
        */
-      ratelimit?: RulesetsTransformResponseHTMLRule.Ratelimit;
+      categories?: Array<string>;
 
       /**
-       * The reference of the rule (the rule's ID by default).
+       * An informative description of the rule.
+       */
+      description?: string;
+
+      /**
+       * Configuration for exposed credential checking.
+       */
+      exposed_credential_check?: TransformResponseHTMLRule.ExposedCredentialCheck;
+
+      /**
+       * An object configuring the rule's logging behavior.
+       */
+      logging?: RulesAPI.Logging;
+
+      /**
+       * An object configuring the rule's rate limit behavior.
        */
-      ref?: string;
+      ratelimit?: TransformResponseHTMLRule.Ratelimit;
     }
 
-    export namespace RulesetsTransformResponseHTMLRule {
+    export namespace TransformResponseHTMLRule {
       /**
        * The parameters configuring the rule's action.
        */
@@ -1767,27 +1947,27 @@ export namespace RulesetUpdateResponse {
      * The list of rules in the ruleset.
      */
     rules: Array<
-      | RulesAPI.BlockRule
-      | Ruleset.RulesetsChallengeRule
-      | RulesAPI.CompressResponseRule
-      | RulesAPI.DDoSDynamicRule
-      | RulesAPI.ExecuteRule
-      | RulesAPI.ForceConnectionCloseRule
-      | Ruleset.RulesetsJSChallengeRule
-      | RulesAPI.LogRule
-      | RulesAPI.LogCustomFieldRule
-      | RulesAPI.ManagedChallengeRule
-      | RulesAPI.RedirectRule
-      | RulesAPI.RewriteRule
-      | RulesAPI.RouteRule
-      | RulesAPI.ScoreRule
-      | RulesAPI.ServeErrorRule
-      | Ruleset.RulesetsSetCacheControlRule
-      | RulesAPI.SetCacheSettingsRule
-      | Ruleset.RulesetsSetCacheTagsRule
-      | RulesAPI.SetConfigRule
-      | RulesAPI.SkipRule
-      | Ruleset.RulesetsTransformResponseHTMLRule
+      | Ruleset.BlockRule
+      | Ruleset.ChallengeRule
+      | Ruleset.ResponseCompressionRule
+      | Ruleset.DDoSDynamicRule
+      | Ruleset.ExecuteRule
+      | Ruleset.ForceConnectionCloseRule
+      | Ruleset.JavaScriptChallengeRule
+      | Ruleset.LogRule
+      | Ruleset.LogCustomFieldRule
+      | Ruleset.ManagedChallengeRule
+      | Ruleset.RedirectRule
+      | Ruleset.RewriteRule
+      | Ruleset.RouteRule
+      | Ruleset.ScoreRule
+      | Ruleset.ServeErrorRule
+      | Ruleset.SetCacheControlRule
+      | Ruleset.SetCacheSettingsRule
+      | Ruleset.SetCacheTagsRule
+      | Ruleset.SetConfigurationRule
+      | Ruleset.SkipRule
+      | Ruleset.TransformResponseHTMLRule
     >;
 
     /**
@@ -1802,26 +1982,53 @@ export namespace RulesetUpdateResponse {
   }
 
   export namespace Ruleset {
-    export interface RulesetsChallengeRule {
+    export interface BlockRule extends Omit<RulesAPI.BlockRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ChallengeRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'challenge';
 
       /**
-       * The unique ID of the rule.
+       * Whether the rule should be executed.
        */
-      id?: string;
+      enabled: boolean;
 
       /**
-       * The action to perform when the rule matches.
+       * The expression defining which traffic will match the rule.
+       */
+      expression: string;
+
+      /**
+       * The timestamp of when the rule was last modified.
+       */
+      last_updated: string;
+
+      /**
+       * The reference of the rule (the rule's ID by default).
+       */
+      ref: string;
+
+      /**
+       * The version of the rule.
        */
-      action?: 'challenge';
+      version: string;
 
       /**
        * The parameters configuring the rule's action.
@@ -1838,20 +2045,10 @@ export namespace RulesetUpdateResponse {
        */
       description?: string;
 
-      /**
-       * Whether the rule should be executed.
-       */
-      enabled?: boolean;
-
       /**
        * Configuration for exposed credential checking.
        */
-      exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
-
-      /**
-       * The expression defining which traffic will match the rule.
-       */
-      expression?: string;
+      exposed_credential_check?: ChallengeRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -1861,15 +2058,10 @@ export namespace RulesetUpdateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsChallengeRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: ChallengeRule.Ratelimit;
     }
 
-    export namespace RulesetsChallengeRule {
+    export namespace ChallengeRule {
       /**
        * Configuration for exposed credential checking.
        */
@@ -1937,26 +2129,89 @@ export namespace RulesetUpdateResponse {
       }
     }
 
-    export interface RulesetsJSChallengeRule {
+    export interface ResponseCompressionRule extends Omit<RulesAPI.CompressResponseRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface DDoSDynamicRule extends Omit<RulesAPI.DDoSDynamicRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ExecuteRule extends Omit<RulesAPI.ExecuteRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ForceConnectionCloseRule extends Omit<RulesAPI.ForceConnectionCloseRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface JavaScriptChallengeRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'js_challenge';
 
       /**
-       * The unique ID of the rule.
+       * Whether the rule should be executed.
        */
-      id?: string;
+      enabled: boolean;
 
       /**
-       * The action to perform when the rule matches.
+       * The expression defining which traffic will match the rule.
+       */
+      expression: string;
+
+      /**
+       * The timestamp of when the rule was last modified.
+       */
+      last_updated: string;
+
+      /**
+       * The reference of the rule (the rule's ID by default).
+       */
+      ref: string;
+
+      /**
+       * The version of the rule.
        */
-      action?: 'js_challenge';
+      version: string;
 
       /**
        * The parameters configuring the rule's action.
@@ -1973,20 +2228,10 @@ export namespace RulesetUpdateResponse {
        */
       description?: string;
 
-      /**
-       * Whether the rule should be executed.
-       */
-      enabled?: boolean;
-
       /**
        * Configuration for exposed credential checking.
        */
-      exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
-
-      /**
-       * The expression defining which traffic will match the rule.
-       */
-      expression?: string;
+      exposed_credential_check?: JavaScriptChallengeRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -1996,15 +2241,10 @@ export namespace RulesetUpdateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsJSChallengeRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: JavaScriptChallengeRule.Ratelimit;
     }
 
-    export namespace RulesetsJSChallengeRule {
+    export namespace JavaScriptChallengeRule {
       /**
        * Configuration for exposed credential checking.
        */
@@ -2072,56 +2312,154 @@ export namespace RulesetUpdateResponse {
       }
     }
 
-    export interface RulesetsSetCacheControlRule {
+    export interface LogRule extends Omit<RulesAPI.LogRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface LogCustomFieldRule extends Omit<RulesAPI.LogCustomFieldRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ManagedChallengeRule extends Omit<RulesAPI.ManagedChallengeRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface RedirectRule extends Omit<RulesAPI.RedirectRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface RewriteRule extends Omit<RulesAPI.RewriteRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface RouteRule extends Omit<RulesAPI.RouteRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ScoreRule extends Omit<RulesAPI.ScoreRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface ServeErrorRule extends Omit<RulesAPI.ServeErrorRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface SetCacheControlRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'set_cache_control';
+
+      enabled: boolean;
 
       /**
-       * The unique ID of the rule.
+       * The expression defining which traffic will match the rule.
        */
-      id?: string;
+      expression: string;
 
       /**
-       * The action to perform when the rule matches.
+       * The timestamp of when the rule was last modified.
        */
-      action?: 'set_cache_control';
+      last_updated: string;
 
       /**
-       * The parameters configuring the rule's action.
+       * The reference of the rule (the rule's ID by default).
        */
-      action_parameters?: RulesetsSetCacheControlRule.ActionParameters;
+      ref: string;
 
       /**
-       * The categories of the rule.
+       * The version of the rule.
        */
-      categories?: Array<string>;
+      version: string;
 
       /**
-       * An informative description of the rule.
+       * The parameters configuring the rule's action.
        */
-      description?: string;
+      action_parameters?: SetCacheControlRule.ActionParameters;
 
       /**
-       * Whether the rule should be executed.
+       * The categories of the rule.
        */
-      enabled?: boolean;
+      categories?: Array<string>;
 
       /**
-       * Configuration for exposed credential checking.
+       * An informative description of the rule.
        */
-      exposed_credential_check?: RulesetsSetCacheControlRule.ExposedCredentialCheck;
+      description?: string;
 
       /**
-       * The expression defining which traffic will match the rule.
+       * Configuration for exposed credential checking.
        */
-      expression?: string;
+      exposed_credential_check?: SetCacheControlRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -2131,15 +2469,10 @@ export namespace RulesetUpdateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsSetCacheControlRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: SetCacheControlRule.Ratelimit;
     }
 
-    export namespace RulesetsSetCacheControlRule {
+    export namespace SetCacheControlRule {
       /**
        * The parameters configuring the rule's action.
        */
@@ -2707,37 +3040,61 @@ export namespace RulesetUpdateResponse {
       }
     }
 
-    export interface RulesetsSetCacheTagsRule {
-      /**
-       * The timestamp of when the rule was last modified.
-       */
-      last_updated: string;
+    export interface SetCacheSettingsRule extends Omit<RulesAPI.SetCacheSettingsRule, 'action'> {
+      id: string;
 
-      /**
-       * The version of the rule.
-       */
-      version: string;
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
 
+    export interface SetCacheTagsRule {
       /**
        * The unique ID of the rule.
        */
-      id?: string;
+      id: string;
 
       /**
        * The action to perform when the rule matches.
        */
-      action?: 'set_cache_tags';
+      action: 'set_cache_tags';
+
+      enabled: boolean;
+
+      /**
+       * The expression defining which traffic will match the rule.
+       */
+      expression: string;
+
+      /**
+       * The timestamp of when the rule was last modified.
+       */
+      last_updated: string;
+
+      /**
+       * The reference of the rule (the rule's ID by default).
+       */
+      ref: string;
+
+      /**
+       * The version of the rule.
+       */
+      version: string;
 
       /**
        * The parameters configuring the rule's action.
        */
       action_parameters?:
-        | RulesetsSetCacheTagsRule.AddCacheTagsValues
-        | RulesetsSetCacheTagsRule.AddCacheTagsExpression
-        | RulesetsSetCacheTagsRule.RemoveCacheTagsValues
-        | RulesetsSetCacheTagsRule.RemoveCacheTagsExpression
-        | RulesetsSetCacheTagsRule.SetCacheTagsValues
-        | RulesetsSetCacheTagsRule.SetCacheTagsExpression;
+        | SetCacheTagsRule.AddCacheTagsValues
+        | SetCacheTagsRule.AddCacheTagsExpression
+        | SetCacheTagsRule.RemoveCacheTagsValues
+        | SetCacheTagsRule.RemoveCacheTagsExpression
+        | SetCacheTagsRule.SetCacheTagsValues
+        | SetCacheTagsRule.SetCacheTagsExpression;
 
       /**
        * The categories of the rule.
@@ -2749,20 +3106,10 @@ export namespace RulesetUpdateResponse {
        */
       description?: string;
 
-      /**
-       * Whether the rule should be executed.
-       */
-      enabled?: boolean;
-
       /**
        * Configuration for exposed credential checking.
        */
-      exposed_credential_check?: RulesetsSetCacheTagsRule.ExposedCredentialCheck;
-
-      /**
-       * The expression defining which traffic will match the rule.
-       */
-      expression?: string;
+      exposed_credential_check?: SetCacheTagsRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -2772,15 +3119,10 @@ export namespace RulesetUpdateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsSetCacheTagsRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: SetCacheTagsRule.Ratelimit;
     }
 
-    export namespace RulesetsSetCacheTagsRule {
+    export namespace SetCacheTagsRule {
       /**
        * Add cache tags using a list of values.
        */
@@ -2938,56 +3280,82 @@ export namespace RulesetUpdateResponse {
       }
     }
 
-    export interface RulesetsTransformResponseHTMLRule {
+    export interface SetConfigurationRule extends Omit<RulesAPI.SetConfigRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface SkipRule extends Omit<RulesAPI.SkipRule, 'action'> {
+      id: string;
+
+      action: string;
+
+      enabled: boolean;
+
+      expression: string;
+
+      ref: string;
+    }
+
+    export interface TransformResponseHTMLRule {
       /**
-       * The timestamp of when the rule was last modified.
+       * The unique ID of the rule.
        */
-      last_updated: string;
+      id: string;
 
       /**
-       * The version of the rule.
+       * The action to perform when the rule matches.
        */
-      version: string;
+      action: 'transform_response_html';
+
+      enabled: boolean;
 
       /**
-       * The unique ID of the rule.
+       * The expression defining which traffic will match the rule.
        */
-      id?: string;
+      expression: string;
 
       /**
-       * The action to perform when the rule matches.
+       * The timestamp of when the rule was last modified.
        */
-      action?: 'transform_response_html';
+      last_updated: string;
 
       /**
-       * The parameters configuring the rule's action.
+       * The reference of the rule (the rule's ID by default).
        */
-      action_parameters?: RulesetsTransformResponseHTMLRule.ActionParameters;
+      ref: string;
 
       /**
-       * The categories of the rule.
+       * The version of the rule.
        */
-      categories?: Array<string>;
+      version: string;
 
       /**
-       * An informative description of the rule.
+       * The parameters configuring the rule's action.
        */
-      description?: string;
+      action_parameters?: TransformResponseHTMLRule.ActionParameters;
 
       /**
-       * Whether the rule should be executed.
+       * The categories of the rule.
        */
-      enabled?: boolean;
+      categories?: Array<string>;
 
       /**
-       * Configuration for exposed credential checking.
+       * An informative description of the rule.
        */
-      exposed_credential_check?: RulesetsTransformResponseHTMLRule.ExposedCredentialCheck;
+      description?: string;
 
       /**
-       * The expression defining which traffic will match the rule.
+       * Configuration for exposed credential checking.
        */
-      expression?: string;
+      exposed_credential_check?: TransformResponseHTMLRule.ExposedCredentialCheck;
 
       /**
        * An object configuring the rule's logging behavior.
@@ -2997,15 +3365,10 @@ export namespace RulesetUpdateResponse {
       /**
        * An object configuring the rule's rate limit behavior.
        */
-      ratelimit?: RulesetsTransformResponseHTMLRule.Ratelimit;
-
-      /**
-       * The reference of the rule (the rule's ID by default).
-       */
-      ref?: string;
+      ratelimit?: TransformResponseHTMLRule.Ratelimit;
     }
 
-    export namespace RulesetsTransformResponseHTMLRule {
+    export namespace TransformResponseHTMLRule {
       /**
        * The parameters configuring the rule's action.
        */
@@ -3158,27 +3521,27 @@ export interface RulesetGetResponse {
    * The list of rules in the ruleset.
    */
   rules: Array<
-    | RulesAPI.BlockRule
-    | RulesetGetResponse.RulesetsChallengeRule
-    | RulesAPI.CompressResponseRule
-    | RulesAPI.DDoSDynamicRule
-    | RulesAPI.ExecuteRule
-    | RulesAPI.ForceConnectionCloseRule
-    | RulesetGetResponse.RulesetsJSChallengeRule
-    | RulesAPI.LogRule
-    | RulesAPI.LogCustomFieldRule
-    | RulesAPI.ManagedChallengeRule
-    | RulesAPI.RedirectRule
-    | RulesAPI.RewriteRule
-    | RulesAPI.RouteRule
-    | RulesAPI.ScoreRule
-    | RulesAPI.ServeErrorRule
-    | RulesetGetResponse.RulesetsSetCacheControlRule
-    | RulesAPI.SetCacheSettingsRule
-    | RulesetGetResponse.RulesetsSetCacheTagsRule
-    | RulesAPI.SetConfigRule
-    | RulesAPI.SkipRule
-    | RulesetGetResponse.RulesetsTransformResponseHTMLRule
+    | RulesetGetResponse.BlockRule
+    | RulesetGetResponse.ChallengeRule
+    | RulesetGetResponse.ResponseCompressionRule
+    | RulesetGetResponse.DDoSDynamicRule
+    | RulesetGetResponse.ExecuteRule
+    | RulesetGetResponse.ForceConnectionCloseRule
+    | RulesetGetResponse.JavaScriptChallengeRule
+    | RulesetGetResponse.LogRule
+    | RulesetGetResponse.LogCustomFieldRule
+    | RulesetGetResponse.ManagedChallengeRule
+    | RulesetGetResponse.RedirectRule
+    | RulesetGetResponse.RewriteRule
+    | RulesetGetResponse.RouteRule
+    | RulesetGetResponse.ScoreRule
+    | RulesetGetResponse.ServeErrorRule
+    | RulesetGetResponse.SetCacheControlRule
+    | RulesetGetResponse.SetCacheSettingsRule
+    | RulesetGetResponse.SetCacheTagsRule
+    | RulesetGetResponse.SetConfigurationRule
+    | RulesetGetResponse.SkipRule
+    | RulesetGetResponse.TransformResponseHTMLRule
   >;
 
   /**
@@ -3193,26 +3556,53 @@ export interface RulesetGetResponse {
 }
 
 export namespace RulesetGetResponse {
-  export interface RulesetsChallengeRule {
+  export interface BlockRule extends Omit<RulesAPI.BlockRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface ChallengeRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The unique ID of the rule.
      */
-    last_updated: string;
+    id: string;
 
     /**
-     * The version of the rule.
+     * The action to perform when the rule matches.
      */
-    version: string;
+    action: 'challenge';
 
     /**
-     * The unique ID of the rule.
+     * Whether the rule should be executed.
      */
-    id?: string;
+    enabled: boolean;
 
     /**
-     * The action to perform when the rule matches.
+     * The expression defining which traffic will match the rule.
      */
-    action?: 'challenge';
+    expression: string;
+
+    /**
+     * The timestamp of when the rule was last modified.
+     */
+    last_updated: string;
+
+    /**
+     * The reference of the rule (the rule's ID by default).
+     */
+    ref: string;
+
+    /**
+     * The version of the rule.
+     */
+    version: string;
 
     /**
      * The parameters configuring the rule's action.
@@ -3229,20 +3619,10 @@ export namespace RulesetGetResponse {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
-
     /**
      * Configuration for exposed credential checking.
      */
-    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
-
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+    exposed_credential_check?: ChallengeRule.ExposedCredentialCheck;
 
     /**
      * An object configuring the rule's logging behavior.
@@ -3252,15 +3632,10 @@ export namespace RulesetGetResponse {
     /**
      * An object configuring the rule's rate limit behavior.
      */
-    ratelimit?: RulesetsChallengeRule.Ratelimit;
-
-    /**
-     * The reference of the rule (the rule's ID by default).
-     */
-    ref?: string;
+    ratelimit?: ChallengeRule.Ratelimit;
   }
 
-  export namespace RulesetsChallengeRule {
+  export namespace ChallengeRule {
     /**
      * Configuration for exposed credential checking.
      */
@@ -3328,26 +3703,89 @@ export namespace RulesetGetResponse {
     }
   }
 
-  export interface RulesetsJSChallengeRule {
+  export interface ResponseCompressionRule extends Omit<RulesAPI.CompressResponseRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface DDoSDynamicRule extends Omit<RulesAPI.DDoSDynamicRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface ExecuteRule extends Omit<RulesAPI.ExecuteRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface ForceConnectionCloseRule extends Omit<RulesAPI.ForceConnectionCloseRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface JavaScriptChallengeRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The unique ID of the rule.
      */
-    last_updated: string;
+    id: string;
 
     /**
-     * The version of the rule.
+     * The action to perform when the rule matches.
      */
-    version: string;
+    action: 'js_challenge';
 
     /**
-     * The unique ID of the rule.
+     * Whether the rule should be executed.
      */
-    id?: string;
+    enabled: boolean;
 
     /**
-     * The action to perform when the rule matches.
+     * The expression defining which traffic will match the rule.
      */
-    action?: 'js_challenge';
+    expression: string;
+
+    /**
+     * The timestamp of when the rule was last modified.
+     */
+    last_updated: string;
+
+    /**
+     * The reference of the rule (the rule's ID by default).
+     */
+    ref: string;
+
+    /**
+     * The version of the rule.
+     */
+    version: string;
 
     /**
      * The parameters configuring the rule's action.
@@ -3364,20 +3802,10 @@ export namespace RulesetGetResponse {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
-
     /**
      * Configuration for exposed credential checking.
      */
-    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
-
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+    exposed_credential_check?: JavaScriptChallengeRule.ExposedCredentialCheck;
 
     /**
      * An object configuring the rule's logging behavior.
@@ -3387,15 +3815,10 @@ export namespace RulesetGetResponse {
     /**
      * An object configuring the rule's rate limit behavior.
      */
-    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
-
-    /**
-     * The reference of the rule (the rule's ID by default).
-     */
-    ref?: string;
+    ratelimit?: JavaScriptChallengeRule.Ratelimit;
   }
 
-  export namespace RulesetsJSChallengeRule {
+  export namespace JavaScriptChallengeRule {
     /**
      * Configuration for exposed credential checking.
      */
@@ -3405,114 +3828,212 @@ export namespace RulesetGetResponse {
        */
       password_expression: string;
 
-      /**
-       * An expression that selects the user ID used in the credentials check.
-       */
-      username_expression: string;
-    }
+      /**
+       * An expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring the rule's rate limit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the rate limit counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: number;
+
+      /**
+       * An expression that defines when the rate limit counter should be incremented. It
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Whether counting is only performed when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * A response header name provided by the origin, which contains the score to
+       * increment rate limit counter with.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
+  export interface LogRule extends Omit<RulesAPI.LogRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface LogCustomFieldRule extends Omit<RulesAPI.LogCustomFieldRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface ManagedChallengeRule extends Omit<RulesAPI.ManagedChallengeRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface RedirectRule extends Omit<RulesAPI.RedirectRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface RewriteRule extends Omit<RulesAPI.RewriteRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface RouteRule extends Omit<RulesAPI.RouteRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface ScoreRule extends Omit<RulesAPI.ScoreRule, 'action'> {
+    id: string;
 
-    /**
-     * An object configuring the rule's rate limit behavior.
-     */
-    export interface Ratelimit {
-      /**
-       * Characteristics of the request on which the rate limit counter will be
-       * incremented.
-       */
-      characteristics: Array<string>;
+    action: string;
 
-      /**
-       * Period in seconds over which the counter is being incremented.
-       */
-      period: number;
+    enabled: boolean;
 
-      /**
-       * An expression that defines when the rate limit counter should be incremented. It
-       * defaults to the same as the rule's expression.
-       */
-      counting_expression?: string;
+    expression: string;
 
-      /**
-       * Period of time in seconds after which the action will be disabled following its
-       * first execution.
-       */
-      mitigation_timeout?: number;
+    ref: string;
+  }
 
-      /**
-       * The threshold of requests per period after which the action will be executed for
-       * the first time.
-       */
-      requests_per_period?: number;
+  export interface ServeErrorRule extends Omit<RulesAPI.ServeErrorRule, 'action'> {
+    id: string;
 
-      /**
-       * Whether counting is only performed when an origin is reached.
-       */
-      requests_to_origin?: boolean;
+    action: string;
 
-      /**
-       * The score threshold per period for which the action will be executed the first
-       * time.
-       */
-      score_per_period?: number;
+    enabled: boolean;
 
-      /**
-       * A response header name provided by the origin, which contains the score to
-       * increment rate limit counter with.
-       */
-      score_response_header_name?: string;
-    }
+    expression: string;
+
+    ref: string;
   }
 
-  export interface RulesetsSetCacheControlRule {
+  export interface SetCacheControlRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The unique ID of the rule.
      */
-    last_updated: string;
+    id: string;
 
     /**
-     * The version of the rule.
+     * The action to perform when the rule matches.
      */
-    version: string;
+    action: 'set_cache_control';
+
+    enabled: boolean;
 
     /**
-     * The unique ID of the rule.
+     * The expression defining which traffic will match the rule.
      */
-    id?: string;
+    expression: string;
 
     /**
-     * The action to perform when the rule matches.
+     * The timestamp of when the rule was last modified.
      */
-    action?: 'set_cache_control';
+    last_updated: string;
 
     /**
-     * The parameters configuring the rule's action.
+     * The reference of the rule (the rule's ID by default).
      */
-    action_parameters?: RulesetsSetCacheControlRule.ActionParameters;
+    ref: string;
 
     /**
-     * The categories of the rule.
+     * The version of the rule.
      */
-    categories?: Array<string>;
+    version: string;
 
     /**
-     * An informative description of the rule.
+     * The parameters configuring the rule's action.
      */
-    description?: string;
+    action_parameters?: SetCacheControlRule.ActionParameters;
 
     /**
-     * Whether the rule should be executed.
+     * The categories of the rule.
      */
-    enabled?: boolean;
+    categories?: Array<string>;
 
     /**
-     * Configuration for exposed credential checking.
+     * An informative description of the rule.
      */
-    exposed_credential_check?: RulesetsSetCacheControlRule.ExposedCredentialCheck;
+    description?: string;
 
     /**
-     * The expression defining which traffic will match the rule.
+     * Configuration for exposed credential checking.
      */
-    expression?: string;
+    exposed_credential_check?: SetCacheControlRule.ExposedCredentialCheck;
 
     /**
      * An object configuring the rule's logging behavior.
@@ -3522,15 +4043,10 @@ export namespace RulesetGetResponse {
     /**
      * An object configuring the rule's rate limit behavior.
      */
-    ratelimit?: RulesetsSetCacheControlRule.Ratelimit;
-
-    /**
-     * The reference of the rule (the rule's ID by default).
-     */
-    ref?: string;
+    ratelimit?: SetCacheControlRule.Ratelimit;
   }
 
-  export namespace RulesetsSetCacheControlRule {
+  export namespace SetCacheControlRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -4098,37 +4614,61 @@ export namespace RulesetGetResponse {
     }
   }
 
-  export interface RulesetsSetCacheTagsRule {
+  export interface SetCacheSettingsRule extends Omit<RulesAPI.SetCacheSettingsRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface SetCacheTagsRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The unique ID of the rule.
      */
-    last_updated: string;
+    id: string;
 
     /**
-     * The version of the rule.
+     * The action to perform when the rule matches.
      */
-    version: string;
+    action: 'set_cache_tags';
+
+    enabled: boolean;
 
     /**
-     * The unique ID of the rule.
+     * The expression defining which traffic will match the rule.
      */
-    id?: string;
+    expression: string;
 
     /**
-     * The action to perform when the rule matches.
+     * The timestamp of when the rule was last modified.
      */
-    action?: 'set_cache_tags';
+    last_updated: string;
+
+    /**
+     * The reference of the rule (the rule's ID by default).
+     */
+    ref: string;
+
+    /**
+     * The version of the rule.
+     */
+    version: string;
 
     /**
      * The parameters configuring the rule's action.
      */
     action_parameters?:
-      | RulesetsSetCacheTagsRule.AddCacheTagsValues
-      | RulesetsSetCacheTagsRule.AddCacheTagsExpression
-      | RulesetsSetCacheTagsRule.RemoveCacheTagsValues
-      | RulesetsSetCacheTagsRule.RemoveCacheTagsExpression
-      | RulesetsSetCacheTagsRule.SetCacheTagsValues
-      | RulesetsSetCacheTagsRule.SetCacheTagsExpression;
+      | SetCacheTagsRule.AddCacheTagsValues
+      | SetCacheTagsRule.AddCacheTagsExpression
+      | SetCacheTagsRule.RemoveCacheTagsValues
+      | SetCacheTagsRule.RemoveCacheTagsExpression
+      | SetCacheTagsRule.SetCacheTagsValues
+      | SetCacheTagsRule.SetCacheTagsExpression;
 
     /**
      * The categories of the rule.
@@ -4140,20 +4680,10 @@ export namespace RulesetGetResponse {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
-
     /**
      * Configuration for exposed credential checking.
      */
-    exposed_credential_check?: RulesetsSetCacheTagsRule.ExposedCredentialCheck;
-
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+    exposed_credential_check?: SetCacheTagsRule.ExposedCredentialCheck;
 
     /**
      * An object configuring the rule's logging behavior.
@@ -4163,15 +4693,10 @@ export namespace RulesetGetResponse {
     /**
      * An object configuring the rule's rate limit behavior.
      */
-    ratelimit?: RulesetsSetCacheTagsRule.Ratelimit;
-
-    /**
-     * The reference of the rule (the rule's ID by default).
-     */
-    ref?: string;
+    ratelimit?: SetCacheTagsRule.Ratelimit;
   }
 
-  export namespace RulesetsSetCacheTagsRule {
+  export namespace SetCacheTagsRule {
     /**
      * Add cache tags using a list of values.
      */
@@ -4329,56 +4854,82 @@ export namespace RulesetGetResponse {
     }
   }
 
-  export interface RulesetsTransformResponseHTMLRule {
+  export interface SetConfigurationRule extends Omit<RulesAPI.SetConfigRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface SkipRule extends Omit<RulesAPI.SkipRule, 'action'> {
+    id: string;
+
+    action: string;
+
+    enabled: boolean;
+
+    expression: string;
+
+    ref: string;
+  }
+
+  export interface TransformResponseHTMLRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The unique ID of the rule.
      */
-    last_updated: string;
+    id: string;
 
     /**
-     * The version of the rule.
+     * The action to perform when the rule matches.
      */
-    version: string;
+    action: 'transform_response_html';
+
+    enabled: boolean;
 
     /**
-     * The unique ID of the rule.
+     * The expression defining which traffic will match the rule.
      */
-    id?: string;
+    expression: string;
 
     /**
-     * The action to perform when the rule matches.
+     * The timestamp of when the rule was last modified.
      */
-    action?: 'transform_response_html';
+    last_updated: string;
 
     /**
-     * The parameters configuring the rule's action.
+     * The reference of the rule (the rule's ID by default).
      */
-    action_parameters?: RulesetsTransformResponseHTMLRule.ActionParameters;
+    ref: string;
 
     /**
-     * The categories of the rule.
+     * The version of the rule.
      */
-    categories?: Array<string>;
+    version: string;
 
     /**
-     * An informative description of the rule.
+     * The parameters configuring the rule's action.
      */
-    description?: string;
+    action_parameters?: TransformResponseHTMLRule.ActionParameters;
 
     /**
-     * Whether the rule should be executed.
+     * The categories of the rule.
      */
-    enabled?: boolean;
+    categories?: Array<string>;
 
     /**
-     * Configuration for exposed credential checking.
+     * An informative description of the rule.
      */
-    exposed_credential_check?: RulesetsTransformResponseHTMLRule.ExposedCredentialCheck;
+    description?: string;
 
     /**
-     * The expression defining which traffic will match the rule.
+     * Configuration for exposed credential checking.
      */
-    expression?: string;
+    exposed_credential_check?: TransformResponseHTMLRule.ExposedCredentialCheck;
 
     /**
      * An object configuring the rule's logging behavior.
@@ -4388,15 +4939,10 @@ export namespace RulesetGetResponse {
     /**
      * An object configuring the rule's rate limit behavior.
      */
-    ratelimit?: RulesetsTransformResponseHTMLRule.Ratelimit;
-
-    /**
-     * The reference of the rule (the rule's ID by default).
-     */
-    ref?: string;
+    ratelimit?: TransformResponseHTMLRule.Ratelimit;
   }
 
-  export namespace RulesetsTransformResponseHTMLRule {
+  export namespace TransformResponseHTMLRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -4476,21 +5022,6 @@ export namespace RulesetGetResponse {
 }
 
 export interface RulesetCreateParams {
-  /**
-   * Body param: The kind of the ruleset.
-   */
-  kind: KindParam;
-
-  /**
-   * Body param: The human-readable name of the ruleset.
-   */
-  name: string;
-
-  /**
-   * Body param: The phase of the ruleset.
-   */
-  phase: PhaseParam;
-
   /**
    * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
    * Zone ID.
@@ -4515,6 +5046,21 @@ export interface RulesetCreateParams {
    */
   description?: string;
 
+  /**
+   * Body param: The kind of the ruleset.
+   */
+  kind?: KindParam;
+
+  /**
+   * Body param: The human-readable name of the ruleset.
+   */
+  name?: string;
+
+  /**
+   * Body param: The phase of the ruleset.
+   */
+  phase?: PhaseParam;
+
   /**
    * Body param: The list of rules in the ruleset.
    */
@@ -4805,9 +5351,6 @@ export namespace RulesetCreateParams {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
     enabled?: boolean;
 
     /**
@@ -5431,9 +5974,6 @@ export namespace RulesetCreateParams {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
     enabled?: boolean;
 
     /**
@@ -5641,9 +6181,6 @@ export namespace RulesetCreateParams {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
     enabled?: boolean;
 
     /**
@@ -6081,9 +6618,6 @@ export namespace RulesetUpdateParams {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
     enabled?: boolean;
 
     /**
@@ -6707,9 +7241,6 @@ export namespace RulesetUpdateParams {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
     enabled?: boolean;
 
     /**
@@ -6917,9 +7448,6 @@ export namespace RulesetUpdateParams {
      */
     description?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
     enabled?: boolean;
 
     /**
@@ -7110,24 +7638,24 @@ export declare namespace Rulesets {
   export {
     Rules as Rules,
     BaseRules as BaseRules,
-    type BlockRule as BlockRule,
+    type RulesAPIBlockRule as BlockRule,
     type CompressResponseRule as CompressResponseRule,
-    type DDoSDynamicRule as DDoSDynamicRule,
-    type ExecuteRule as ExecuteRule,
-    type ForceConnectionCloseRule as ForceConnectionCloseRule,
-    type LogCustomFieldRule as LogCustomFieldRule,
-    type LogRule as LogRule,
+    type RulesAPIDDoSDynamicRule as DDoSDynamicRule,
+    type RulesAPIExecuteRule as ExecuteRule,
+    type RulesAPIForceConnectionCloseRule as ForceConnectionCloseRule,
+    type RulesAPILogCustomFieldRule as LogCustomFieldRule,
+    type RulesAPILogRule as LogRule,
     type Logging as Logging,
-    type ManagedChallengeRule as ManagedChallengeRule,
-    type RedirectRule as RedirectRule,
-    type RewriteRule as RewriteRule,
-    type RouteRule as RouteRule,
+    type RulesAPIManagedChallengeRule as ManagedChallengeRule,
+    type RulesAPIRedirectRule as RedirectRule,
+    type RulesAPIRewriteRule as RewriteRule,
+    type RulesAPIRouteRule as RouteRule,
     type RulesetRule as RulesetRule,
-    type ScoreRule as ScoreRule,
-    type ServeErrorRule as ServeErrorRule,
-    type SetCacheSettingsRule as SetCacheSettingsRule,
+    type RulesAPIScoreRule as ScoreRule,
+    type RulesAPIServeErrorRule as ServeErrorRule,
+    type RulesAPISetCacheSettingsRule as SetCacheSettingsRule,
     type SetConfigRule as SetConfigRule,
-    type SkipRule as SkipRule,
+    type RulesAPISkipRule as SkipRule,
     type RuleCreateResponse as RuleCreateResponse,
     type RuleDeleteResponse as RuleDeleteResponse,
     type RuleEditResponse as RuleEditResponse,