Expand body identifier use (#756)

Author: delvedor

compiler/model/build-model.ts

@@ -249,22 +249,21 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
             if (property.valueOf.kind === 'instance_of' && property.valueOf.type.name === 'Void') {
               assert(member, false, 'There is no need to use Void in requets definitions, just remove the body declaration.')
             } else {
-              type.body = { kind: 'value', value: property.valueOf }
-              const openGenerics = declaration.getTypeParameters().map(modelGenerics)
-              if ((property.valueOf.kind === 'instance_of' && openGenerics.includes(property.valueOf.type.name)) ||
-                   property.valueOf.kind === 'array_of') {
-                const tags = parseJsDocTags(member.getJsDocs())
-                assert(
-                  member,
-                  tags.identifier != null,
-                  'You should configure a body @identifier'
-                )
-                assert(
-                  member.getJsDocs(),
-                  !pathAndQueryProperties.includes(tags.identifier),
-                  `The identifier '${tags.identifier}' already exists as a property in the path or query.`
-                )
-                type.body.identifier = tags.identifier
+              const tags = parseJsDocTags(member.getJsDocs())
+              assert(
+                member,
+                tags.identifier != null,
+                'You should configure a body @identifier'
+              )
+              assert(
+                member.getJsDocs(),
+                !pathAndQueryProperties.includes(tags.identifier),
+                `The identifier '${tags.identifier}' already exists as a property in the path or query.`
+              )
+              type.body = {
+                kind: 'value',
+                value: property.valueOf,
+                identifier: tags.identifier
               }
             }
           } else if (Array.isArray(property.properties)) {

output/schema/schema.json

@@ -30,5 +30,6 @@ export interface Request extends RequestBase {
   path_parts: {
     name: Name
   }
+  /** @identifier policy */
   body: AutoscalingPolicy
 }

output/schema/validation-errors.json

@@ -40,9 +40,6 @@ export interface Request extends RequestBase {
     preserve_existing?: boolean
     timeout?: Time
   }
-  body: IndexSettingsBody
-}
-
-export class IndexSettingsBody extends IndexSettings {
-  settings?: IndexSettings
+  /** @identifier settings */
+  body: IndexSettings
 }

output/typescript/types.ts

@@ -44,5 +44,6 @@ export interface Request extends RequestBase {
      */
     master_timeout?: Time
   }
+  /** @identifier template */
   body?: IndexTemplate
 }

specification/autoscaling/put_autoscaling_policy/PutAutoscalingPolicyRequest.ts

@@ -30,5 +30,6 @@ export interface Request extends RequestBase {
   path_parts: {
     id: Id
   }
+  /** @identifier pipeline */
   body: Pipeline
 }

specification/indices/put_settings/IndicesPutSettingsRequest.ts

@@ -27,5 +27,6 @@ import { RequestBase } from '@_types/Base'
  * @stability stable
  */
 export interface Request extends RequestBase {
+  /** @identifier detector */
   body?: Detector
 }

specification/indices/simulate_template/IndicesSimulateTemplateRequest.ts

@@ -31,5 +31,6 @@ export interface Request extends RequestBase {
     index: IndexName
     rollup_index: IndexName
   }
+  /** @identifier config */
   body?: UserDefinedValue // TODO: This API is experimental and no docs exist describing it. Requires reverse engineering if made stable
 }

specification/logstash/put_pipeline/LogstashPutPipelineRequest.ts

@@ -32,5 +32,6 @@ export interface Request extends RequestBase {
   query_parameters: {
     refresh?: Refresh
   }
+  /** @identifier privileges */
   body?: Dictionary<string, Dictionary<string, Actions>>
 }