Skip to content

Commit 685acfb

Browse files
alexpmulealexpmule
authored
Merge pull request #910 from mulesoft/build/6.6.67-prep
Release v6.6.67
2 parents 9fe93a6 + f465e87 commit 685acfb

16 files changed

Lines changed: 1978 additions & 4568 deletions

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ registry=https://registry.npmjs.org/
22
@advanced-rest-client:registry=https://registry.npmjs.org/
33
@mulesoft:registry=https://registry.npmjs.org/
44
@salesforce:registry=https://registry.npmjs.org/
5+
@api-components:registry=https://registry.npmjs.org/
56
always-auth=false
67
strict-ssl=true

‎demo/apis.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"models/apic-83/apic-83.raml": "RAML 1.0",
1616
"models/multi-server/multi-server.yaml": { "type": "OAS 3.0", "mime": "application/yaml" },
1717
"models/oas-3-api/oas-3-api.yaml": { "type": "OAS 3.0", "mime": "application/yaml" },
18+
"models/oas31-webhooks/oas31-webhooks.yaml": { "type": "OAS 3.1", "mime": "application/yaml" },
19+
"models/oas32-query-sse/oas32-query-sse.yaml": { "type": "OAS 3.2", "mime": "application/yaml" },
1820
"models/async-api/async-api.yaml": "ASYNC 2.0",
1921
"models/APIC-553/APIC-553.raml": "RAML 1.0",
2022
"models/APIC-554/APIC-554.raml": "RAML 1.0",

‎demo/element/app.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ class ApicApplication extends DemoBase {
2222
['demo-api', 'Demo API'],
2323
['multi-server', 'Multi Server API'],
2424
['oas-3-api', 'OAS 3 API'],
25+
['oas31-webhooks', '★ OAS 3.1 - Webhooks (TD-0333486)'],
26+
['oas32-query-sse', '★ OAS 3.2 - QUERY + SSE (TD-0333486)'],
2527
['async-api', 'AsyncAPI'],
2628
['APIC-553', 'APIC-553'],
2729
['APIC-557', 'APIC-557'],

‎demo/models/oas31-webhooks/oas31-webhooks.yaml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
openapi: 3.1.0
2+
info:
3+
title: Webhooks + Schema Composition Spike
4+
version: 1.0.0
5+
paths:
6+
/pets:
7+
get:
8+
operationId: listPets
9+
summary: List pets
10+
responses:
11+
"200":
12+
description: A list of pets
13+
content:
14+
application/json:
15+
schema:
16+
type: array
17+
items:
18+
$ref: "#/components/schemas/Pet"
19+
20+
# Top-level `webhooks` map of Path Item Objects, confirmed in OAS 3.1.0 spec
21+
# (versions/3.1.0.md, field `webhooks`, sibling to `paths`/`components`).
22+
webhooks:
23+
newPet:
24+
post:
25+
operationId: newPetWebhook
26+
summary: Notify subscriber of a newly created pet
27+
requestBody:
28+
required: true
29+
content:
30+
application/json:
31+
schema:
32+
$ref: "#/components/schemas/Pet"
33+
responses:
34+
"200":
35+
description: Webhook received successfully
36+
37+
components:
38+
schemas:
39+
Pet:
40+
# allOf: base fields + discriminated extra fields
41+
allOf:
42+
- $ref: "#/components/schemas/PetBase"
43+
- $ref: "#/components/schemas/PetKindFields"
44+
45+
PetBase:
46+
type: object
47+
required: [id, name]
48+
properties:
49+
id:
50+
type: integer
51+
name:
52+
type: string
53+
kind:
54+
type: string
55+
enum: [dog, cat]
56+
57+
# if/then/else conditional (JSON Schema 2020-12, dialect used by OAS 3.1)
58+
PetKindFields:
59+
if:
60+
properties:
61+
kind:
62+
const: dog
63+
then:
64+
properties:
65+
breed:
66+
type: string
67+
required: [breed]
68+
else:
69+
properties:
70+
indoor:
71+
type: boolean
72+
required: [indoor]
73+
74+
# oneOf: mutually exclusive contact methods
75+
ContactMethod:
76+
oneOf:
77+
- $ref: "#/components/schemas/EmailContact"
78+
- $ref: "#/components/schemas/PhoneContact"
79+
80+
EmailContact:
81+
type: object
82+
required: [email]
83+
properties:
84+
email:
85+
type: string
86+
format: email
87+
88+
PhoneContact:
89+
type: object
90+
required: [phone]
91+
properties:
92+
phone:
93+
type: string
94+
95+
# anyOf: owner may have one or more identifiers present
96+
OwnerIdentifiers:
97+
anyOf:
98+
- required: [ownerId]
99+
properties:
100+
ownerId:
101+
type: integer
102+
- required: [ownerEmail]
103+
properties:
104+
ownerEmail:
105+
type: string
106+
format: email

‎demo/models/oas32-query-sse/oas32-query-sse.yaml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
openapi: 3.2.0
2+
info:
3+
title: QUERY Method + SSE Streaming Spike
4+
version: 1.0.0
5+
paths:
6+
/pets:
7+
# `query` is a Path Item Object fixed field (sibling to get/post/etc.),
8+
# confirmed in OAS 3.2.0 spec (versions/3.2.0.md, field `path-item-query`):
9+
# "A definition of a QUERY operation, as defined in the most recent IETF
10+
# draft (draft-ietf-httpbis-safe-method-w-body) ... on this path."
11+
# QUERY is safe/idempotent but carries a request body (unlike GET).
12+
query:
13+
operationId: queryPets
14+
summary: Search pets using a structured filter body
15+
requestBody:
16+
required: true
17+
content:
18+
application/json:
19+
schema:
20+
type: object
21+
properties:
22+
kind:
23+
type: string
24+
maxAge:
25+
type: integer
26+
responses:
27+
"200":
28+
description: Matching pets
29+
content:
30+
application/json:
31+
schema:
32+
type: array
33+
items:
34+
type: object
35+
properties:
36+
id:
37+
type: integer
38+
name:
39+
type: string
40+
41+
/pets/events:
42+
get:
43+
operationId: streamPetEvents
44+
summary: Stream pet lifecycle events via Server-Sent Events
45+
responses:
46+
"200":
47+
description: A live stream of pet events
48+
content:
49+
# Confirmed in OAS 3.2.0 spec: `itemSchema` on the Media Type
50+
# Object describes each individual event in a streaming/
51+
# sequential media type; `text/event-stream` is explicitly
52+
# called out under "Special Considerations for Server-Sent
53+
# Events" and demonstrated with itemSchema in that section.
54+
text/event-stream:
55+
itemSchema:
56+
type: object
57+
required: [event]
58+
properties:
59+
event:
60+
type: string
61+
enum: [petCreated, petUpdated, petDeleted]
62+
data:
63+
contentMediaType: application/json
64+
contentSchema:
65+
type: object
66+
required: [id]
67+
properties:
68+
id:
69+
type: integer
70+
retry:
71+
type: integer

‎demo/standalone/app.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ class ApicApplication extends DemoBase {
3333
['demo-api-v4', 'AMF v4'],
3434
['APIC-319', 'APIC-319'],
3535
['multi-server', 'OAS multi server'],
36+
['oas31-webhooks', '★ OAS 3.1 - Webhooks (TD-0333486)'],
37+
['oas32-query-sse', '★ OAS 3.2 - QUERY + SSE (TD-0333486)'],
3638
['async-api', 'AsyncAPI'],
3739
['APIC-560', 'AsyncAPI560'],
3840
['APIC-570', 'AsyncAPI570'],

‎demo/themed/anypoint.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class ApicApplication extends DemoBase {
2525
['data-type-fragment', 'RAML data type fragment'],
2626
['demo-api', 'Demo API'],
2727
['APIC-538', 'APIC-538'],
28+
['oas31-webhooks', '★ OAS 3.1 - Webhooks (TD-0333486)'],
29+
['oas32-query-sse', '★ OAS 3.2 - QUERY + SSE (TD-0333486)'],
2830
];
2931
}
3032

‎demo/themed/dark.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ class ApicApplication extends DemoBase {
1616
['httpbin', 'HTTPbin API'],
1717
['data-type-fragment', 'RAML data type fragment'],
1818
['demo-api', 'Demo API'],
19-
['grpc-test', 'gRPC Test API']
19+
['grpc-test', 'gRPC Test API'],
20+
['oas31-webhooks', '★ OAS 3.1 - Webhooks (TD-0333486)'],
21+
['oas32-query-sse', '★ OAS 3.2 - QUERY + SSE (TD-0333486)']
2022
];
2123
}
2224

0 commit comments

Comments
 (0)