Skip to content

Commit 900ab8b

Browse files
antmendozaantmendoza
authored
Merge pull request #139 from antmendoza/update_spec_main
update to spec main branch
2 parents 130ca46 + 48c1cce commit 900ab8b

File tree

10 files changed

+199
-208
lines changed

10 files changed

+199
-208
lines changed

‎src/lib/definitions/function.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ export class Function {
3232
*/
3333
operation: string;
3434
/**
35-
* Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, or `expression`. Default is `rest`
35+
* Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, `expression`, or `custom`. Default is `rest`
3636
*/
37-
type?: 'rest' | 'asyncapi' | 'rpc' | 'graphql' | 'odata' | 'expression';
37+
type?: 'rest' | 'asyncapi' | 'rpc' | 'graphql' | 'odata' | 'expression' | "custom";
3838
/**
3939
* References an auth definition name to be used to access to resource defined in the operation parameter
4040
*/

‎src/lib/definitions/utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function overwriteScheduleIfObject(object: { schedule: string | Specifica
3131
* Modify the provided object, set the value to 'start' property as an instance of Specification.Startdef class, if the provided value is an object
3232
* @param object to set/overwrite the property
3333
*/
34-
export function overwriteStartIfObject(object: { start: string | Specification.Startdef }): void {
34+
export function overwriteStartIfObject(object: { start?: string | Specification.Startdef }): void {
3535
if (isObject(object.start)) {
3636
object.start = new Specification.Startdef(object.start);
3737
}

‎src/lib/definitions/workflow.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class Workflow {
7575
/**
7676
* Workflow name
7777
*/
78-
name: string;
78+
name?: string;
7979
/**
8080
* Workflow description
8181
*/
@@ -106,7 +106,7 @@ export class Workflow {
106106
| {
107107
[key: string]: any;
108108
};
109-
start: string | Startdef;
109+
start?: string | Startdef;
110110
/**
111111
* Serverless Workflow schema version
112112
*/

‎src/lib/diagram/mermaidState.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ export class MermaidState {
3434

3535
private definitions(): string {
3636
return (
37-
this.definitionName() + '\n' + this.definitionType() + (this.definitionDetails() !== undefined ? '\n' + this.definitionDetails() : '')
37+
this.definitionName() +
38+
'\n' +
39+
this.definitionType() +
40+
(this.definitionDetails() !== undefined ? '\n' + this.definitionDetails() : '')
3841
);
3942
}
4043

@@ -54,7 +57,7 @@ export class MermaidState {
5457
}
5558

5659
private stateName() {
57-
return this.state.name?.replace(" ", "_");
60+
return this.state.name?.replace(' ', '_');
5861
}
5962

6063
private startTransition() {

‎src/lib/schema/__merged.json‎

Lines changed: 88 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -176,17 +176,13 @@
176176
"required": [
177177
"id",
178178
"specVersion",
179-
"name",
180-
"start",
181179
"states"
182180
]
183181
},
184182
{
185183
"required": [
186184
"key",
187185
"specVersion",
188-
"name",
189-
"start",
190186
"states"
191187
]
192188
}
@@ -1612,7 +1608,6 @@
16121608
"name",
16131609
"type",
16141610
"inputCollection",
1615-
"iterationParam",
16161611
"actions"
16171612
]
16181613
},
@@ -1623,7 +1618,6 @@
16231618
"name",
16241619
"type",
16251620
"inputCollection",
1626-
"iterationParam",
16271621
"actions",
16281622
"end"
16291623
]
@@ -1633,7 +1627,6 @@
16331627
"name",
16341628
"type",
16351629
"inputCollection",
1636-
"iterationParam",
16371630
"actions",
16381631
"transition"
16391632
]
@@ -1949,6 +1942,84 @@
19491942
"additionalProperties": false,
19501943
"required": []
19511944
},
1945+
"errordef": {
1946+
"type": "object",
1947+
"properties": {
1948+
"name": {
1949+
"type": "string",
1950+
"description": "Domain-specific error name",
1951+
"minLength": 1
1952+
},
1953+
"code": {
1954+
"type": "string",
1955+
"description": "Error code. Can be used in addition to the name to help runtimes resolve to technical errors/exceptions. Should not be defined if error is set to '*'",
1956+
"minLength": 1
1957+
},
1958+
"description": {
1959+
"type": "string",
1960+
"description": "Error description"
1961+
}
1962+
},
1963+
"additionalProperties": false,
1964+
"required": [
1965+
"name"
1966+
]
1967+
},
1968+
"retrydef": {
1969+
"type": "object",
1970+
"properties": {
1971+
"name": {
1972+
"type": "string",
1973+
"description": "Unique retry strategy name",
1974+
"minLength": 1
1975+
},
1976+
"delay": {
1977+
"type": "string",
1978+
"description": "Time delay between retry attempts (ISO 8601 duration format)"
1979+
},
1980+
"maxDelay": {
1981+
"type": "string",
1982+
"description": "Maximum time delay between retry attempts (ISO 8601 duration format)"
1983+
},
1984+
"increment": {
1985+
"type": "string",
1986+
"description": "Static value by which the delay increases during each attempt (ISO 8601 time format)"
1987+
},
1988+
"multiplier": {
1989+
"type": [
1990+
"number",
1991+
"string"
1992+
],
1993+
"minimum": 0,
1994+
"minLength": 1,
1995+
"multipleOf": 0.01,
1996+
"description": "Numeric value, if specified the delay between retries is multiplied by this value."
1997+
},
1998+
"maxAttempts": {
1999+
"type": [
2000+
"number",
2001+
"string"
2002+
],
2003+
"minimum": 1,
2004+
"minLength": 0,
2005+
"description": "Maximum number of retry attempts."
2006+
},
2007+
"jitter": {
2008+
"type": [
2009+
"number",
2010+
"string"
2011+
],
2012+
"minimum": 0,
2013+
"maximum": 1,
2014+
"description": "If float type, maximum amount of random time added or subtracted from the delay between each retry relative to total delay (between 0 and 1). If string type, absolute maximum amount of random time added or subtracted from the delay between each retry (ISO 8601 duration format)"
2015+
}
2016+
},
2017+
"additionalProperties": false,
2018+
"required": [
2019+
"name",
2020+
"maxAttempts"
2021+
]
2022+
},
19522023
"workflowExecTimeout": {
19532024
"oneOf": [
19542025
{
@@ -2026,29 +2097,6 @@
20262097
"description": "Timeout duration to wait for consuming defined events (ISO 8601 duration format)",
20272098
"minLength": 1
20282099
},
2029-
"errordef": {
2030-
"type": "object",
2031-
"properties": {
2032-
"name": {
2033-
"type": "string",
2034-
"description": "Domain-specific error name",
2035-
"minLength": 1
2036-
},
2037-
"code": {
2038-
"type": "string",
2039-
"description": "Error code. Can be used in addition to the name to help runtimes resolve to technical errors/exceptions. Should not be defined if error is set to '*'",
2040-
"minLength": 1
2041-
},
2042-
"description": {
2043-
"type": "string",
2044-
"description": "Error description"
2045-
}
2046-
},
2047-
"additionalProperties": false,
2048-
"required": [
2049-
"name"
2050-
]
2051-
},
20522100
"eventdef": {
20532101
"type": "object",
20542102
"properties": {
@@ -2136,6 +2184,13 @@
21362184
"contextAttributeName"
21372185
]
21382186
},
2187+
"metadata": {
2188+
"type": "object",
2189+
"description": "Metadata information",
2190+
"additionalProperties": {
2191+
"type": "string"
2192+
}
2193+
},
21392194
"function": {
21402195
"type": "object",
21412196
"properties": {
@@ -2151,14 +2206,15 @@
21512206
},
21522207
"type": {
21532208
"type": "string",
2154-
"description": "Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, or `expression`. Default is `rest`",
2209+
"description": "Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, `expression`, or `custom`. Default is `rest`",
21552210
"enum": [
21562211
"rest",
21572212
"asyncapi",
21582213
"rpc",
21592214
"graphql",
21602215
"odata",
2161-
"expression"
2216+
"expression",
2217+
"custom"
21622218
],
21632219
"default": "rest"
21642220
},
@@ -2177,61 +2233,6 @@
21772233
"operation"
21782234
]
21792235
},
2180-
"retrydef": {
2181-
"type": "object",
2182-
"properties": {
2183-
"name": {
2184-
"type": "string",
2185-
"description": "Unique retry strategy name",
2186-
"minLength": 1
2187-
},
2188-
"delay": {
2189-
"type": "string",
2190-
"description": "Time delay between retry attempts (ISO 8601 duration format)"
2191-
},
2192-
"maxDelay": {
2193-
"type": "string",
2194-
"description": "Maximum time delay between retry attempts (ISO 8601 duration format)"
2195-
},
2196-
"increment": {
2197-
"type": "string",
2198-
"description": "Static value by which the delay increases during each attempt (ISO 8601 time format)"
2199-
},
2200-
"multiplier": {
2201-
"type": [
2202-
"number",
2203-
"string"
2204-
],
2205-
"minimum": 0,
2206-
"minLength": 1,
2207-
"multipleOf": 0.01,
2208-
"description": "Numeric value, if specified the delay between retries is multiplied by this value."
2209-
},
2210-
"maxAttempts": {
2211-
"type": [
2212-
"number",
2213-
"string"
2214-
],
2215-
"minimum": 1,
2216-
"minLength": 0,
2217-
"description": "Maximum number of retry attempts."
2218-
},
2219-
"jitter": {
2220-
"type": [
2221-
"number",
2222-
"string"
2223-
],
2224-
"minimum": 0,
2225-
"maximum": 1,
2226-
"description": "If float type, maximum amount of random time added or subtracted from the delay between each retry relative to total delay (between 0 and 1). If string type, absolute maximum amount of random time added or subtracted from the delay between each retry (ISO 8601 duration format)"
2227-
}
2228-
},
2229-
"additionalProperties": false,
2230-
"required": [
2231-
"name",
2232-
"maxAttempts"
2233-
]
2234-
},
22352236
"authdef": {
22362237
"type": "object",
22372238
"properties": {
@@ -2423,13 +2424,6 @@
24232424
}
24242425
]
24252426
},
2426-
"metadata": {
2427-
"type": "object",
2428-
"description": "Metadata information",
2429-
"additionalProperties": {
2430-
"type": "string"
2431-
}
2432-
},
24332427
"secrets": {
24342428
"oneOf": [
24352429
{

‎src/lib/schema/functions.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,15 @@
4141
},
4242
"type": {
4343
"type": "string",
44-
"description": "Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, or `expression`. Default is `rest`",
44+
"description": "Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, `expression`, or `custom`. Default is `rest`",
4545
"enum": [
4646
"rest",
4747
"asyncapi",
4848
"rpc",
4949
"graphql",
5050
"odata",
51-
"expression"
51+
"expression",
52+
"custom"
5253
],
5354
"default": "rest"
5455
},

0 commit comments

Comments
 (0)