Skip to content

Commit 1012f71

Browse files
committed
/default/serverDefault/g
1 parent 468785e commit 1012f71

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

docs/modeling-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,15 +316,15 @@ class Foo {
316316
}
317317
```
318318

319-
#### `@default`
319+
#### `@server_default`
320320

321-
The default value if the property is not specified.
321+
The server side default value if the property is not specified.
322322
Default values can only be specified on optional properties.
323323

324324
```ts
325325
class Foo {
326326
bar: string
327-
/** @default hello */
327+
/** @server_default hello */
328328
baz?: string
329329
faz: string
330330
}

output/schema/schema.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106074,9 +106074,9 @@
106074106074
],
106075106075
"query": [
106076106076
{
106077-
"default": true,
106078106077
"name": "allow_no_indices",
106079106078
"required": false,
106079+
"serverDefault": true,
106080106080
"type": {
106081106081
"kind": "instance_of",
106082106082
"type": {
@@ -106086,9 +106086,9 @@
106086106086
}
106087106087
},
106088106088
{
106089-
"default": false,
106090106089
"name": "ccs_minimize_roundtrips",
106091106090
"required": false,
106091+
"serverDefault": false,
106092106092
"type": {
106093106093
"kind": "instance_of",
106094106094
"type": {
@@ -106120,9 +106120,9 @@
106120106120
}
106121106121
},
106122106122
{
106123-
"default": true,
106124106123
"name": "ignore_throttled",
106125106124
"required": false,
106125+
"serverDefault": true,
106126106126
"type": {
106127106127
"kind": "instance_of",
106128106128
"type": {
@@ -106132,9 +106132,9 @@
106132106132
}
106133106133
},
106134106134
{
106135-
"default": false,
106136106135
"name": "ignore_unavailable",
106137106136
"required": false,
106137+
"serverDefault": false,
106138106138
"type": {
106139106139
"kind": "instance_of",
106140106140
"type": {
@@ -106155,9 +106155,9 @@
106155106155
}
106156106156
},
106157106157
{
106158-
"default": false,
106159106158
"name": "profile",
106160106159
"required": false,
106160+
"serverDefault": false,
106161106161
"type": {
106162106162
"kind": "instance_of",
106163106163
"type": {
@@ -106200,9 +106200,9 @@
106200106200
}
106201106201
},
106202106202
{
106203-
"default": false,
106204106203
"name": "total_hits_as_integer",
106205106204
"required": false,
106205+
"serverDefault": false,
106206106206
"since": "7.0.0",
106207106207
"type": {
106208106208
"kind": "instance_of",
@@ -106213,9 +106213,9 @@
106213106213
}
106214106214
},
106215106215
{
106216-
"default": false,
106217106216
"name": "typed_keys",
106218106217
"required": false,
106218+
"serverDefault": false,
106219106219
"type": {
106220106220
"kind": "instance_of",
106221106221
"type": {

specification/compiler/model/metamodel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export class Property {
131131
description?: string
132132
docUrl?: string
133133
since?: string
134-
default?: boolean | string | number
134+
serverDefault?: boolean | string | number
135135
deprecation?: Deprecation
136136
/**
137137
* If specified takes precedence over `name` when generating code. `name` is always the value

specification/compiler/model/utils.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ export function hoistTypeAnnotations (type: model.TypeDefinition, jsDocs: JSDoc[
527527

528528
/** Lifts jsDoc type annotations to fixed properties on Property */
529529
function hoistPropertyAnnotations (property: model.Property, jsDocs: JSDoc[]): void {
530-
const validTags = ['stability', 'prop_serializer', 'doc_url', 'aliases', 'identifier', 'since', 'description', 'default']
530+
const validTags = ['stability', 'prop_serializer', 'doc_url', 'aliases', 'identifier', 'since', 'description', 'server_default']
531531
const tags = parseJsDocTags(jsDocs)
532532
setTags(jsDocs, property, tags, validTags, (tags, tag, value) => {
533533
if (tag.endsWith('_serializer')) {
@@ -542,20 +542,20 @@ function hoistPropertyAnnotations (property: model.Property, jsDocs: JSDoc[]): v
542542
property.since = value
543543
} else if (tag === 'description') {
544544
property.description = value
545-
} else if (tag === 'default') {
545+
} else if (tag === 'server_default') {
546546
assert(jsDocs, property.type.kind === 'instance_of', `Default values can only be configured for instance_of types, you are using ${property.type.kind}`)
547547
assert(jsDocs, !property.required, 'Default values can only be specified on optional properties')
548548
switch (property.type.type.name) {
549549
case 'boolean':
550550
assert(jsDocs, value === 'true' || value === 'false', `The default value for ${property.name} should be a boolean`)
551-
property.default = value === 'true'
551+
property.serverDefault = value === 'true'
552552
break
553553
case 'number':
554554
assert(jsDocs, !isNaN(Number(value)), `The default value for ${property.name} should be a number`)
555-
property.default = Number(value)
555+
property.serverDefault = Number(value)
556556
break
557557
default:
558-
property.default = value
558+
property.serverDefault = value
559559
}
560560
} else {
561561
assert(jsDocs, false, `Unhandled tag: '${tag}' with value: '${value}' on property ${property.name}`)

specification/specs/search/search_template/SearchTemplateRequest.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,29 @@ interface SearchTemplateRequest extends RequestBase {
2828
type?: Types // deprecated: 7.0
2929
}
3030
query_parameters?: {
31-
/** @default true */
31+
/** @server_default true */
3232
allow_no_indices?: boolean
33-
/** @default false */
33+
/** @server_default false */
3434
ccs_minimize_roundtrips?: boolean
3535
expand_wildcards?: ExpandWildcards
36-
/** default false */
36+
/** server_default false */
3737
explain?: boolean
38-
/** @default true */
38+
/** @server_default true */
3939
ignore_throttled?: boolean
40-
/** @default false */
40+
/** @server_default false */
4141
ignore_unavailable?: boolean
4242
preference?: string
43-
/** @default false */
43+
/** @server_default false */
4444
profile?: boolean
4545
routing?: Routing
4646
scroll?: Time
4747
search_type?: SearchType
4848
/**
4949
* @since 7.0.0
50-
* @default false
50+
* @server_default false
5151
*/
5252
total_hits_as_integer?: boolean
53-
/** @default false */
53+
/** @server_default false */
5454
typed_keys?: boolean
5555
}
5656
body?: {

0 commit comments

Comments
 (0)