Skip to content

Commit c393ac8

Browse files
antmendozaantmendoza
committed
fix typo Bearerpropsdef from spec
Signed-off-by: Antonio Mendoza Pérez <antmendoza@gmail.com>
1 parent 7240315 commit c393ac8

File tree

12 files changed

+99
-99
lines changed

12 files changed

+99
-99
lines changed

‎src/lib/builders/beareripropsdef-builder.ts renamed to ‎src/lib/builders/bearerpropsdef-builder.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ import { validate } from '../utils';
2020

2121
/**
2222
* The internal function used by the builder proxy to validate and return its underlying object
23-
* @param {Specification.Beareripropsdef} data The underlying object
24-
* @returns {Specification.Beareripropsdef} The validated underlying object
23+
* @param {Specification.Bearerpropsdef} data The underlying object
24+
* @returns {Specification.Bearerpropsdef} The validated underlying object
2525
*/
26-
function beareripropsdefBuildingFn(data: Specification.Beareripropsdef): () => Specification.Beareripropsdef {
26+
function bearerpropsdefBuildingFn(data: Specification.Bearerpropsdef): () => Specification.Bearerpropsdef {
2727
return () => {
28-
const model = new Specification.Beareripropsdef(data);
28+
const model = new Specification.Bearerpropsdef(data);
2929

30-
validate('Beareripropsdef', model);
30+
validate('Bearerpropsdef', model);
3131
return model;
3232
};
3333
}
3434

3535
/**
36-
* A factory to create a builder proxy for the type `Specification.Beareripropsdef`
37-
* @returns {Specification.Beareripropsdef} A builder for `Specification.Beareripropsdef`
36+
* A factory to create a builder proxy for the type `Specification.Bearerpropsdef`
37+
* @returns {Specification.Bearerpropsdef} A builder for `Specification.Bearerpropsdef`
3838
*/
39-
export function beareripropsdefBuilder(): Builder<Specification.Beareripropsdef> {
40-
return builder<Specification.Beareripropsdef>(beareripropsdefBuildingFn);
39+
export function bearerpropsdefBuilder(): Builder<Specification.Bearerpropsdef> {
40+
return builder<Specification.Bearerpropsdef>(bearerpropsdefBuildingFn);
4141
}

‎src/lib/builders/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export * from './action-builder';
1919
export * from './actiondatafilter-builder';
2020
export * from './authdef-builder';
2121
export * from './basicpropsdef-builder';
22-
export * from './beareripropsdef-builder';
22+
export * from './bearerpropsdef-builder';
2323
export * from './branch-builder';
2424
export * from './callbackstate-builder';
2525
export * from './continueasdef-builder';

‎src/lib/definitions/beareripropsdef.ts renamed to ‎src/lib/definitions/bearerpropsdef.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { Metadata } from './metadata';
1818
import { overwriteMetadata } from './utils';
19-
export class Beareripropsdef {
19+
export class Bearerpropsdef {
2020
constructor(model: any) {
2121
Object.assign(this, model);
2222
overwriteMetadata(this);

‎src/lib/definitions/specification.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export * from './action';
1919
export * from './actiondatafilter';
2020
export * from './authdef';
2121
export * from './basicpropsdef';
22-
export * from './beareripropsdef';
22+
export * from './bearerpropsdef';
2323
export * from './branch';
2424
export * from './callbackstate';
2525
export * from './continueasdef';

‎src/lib/definitions/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ export type Auth = string /* uri */ | [Authdef, ...Authdef[]];
101101

102102
export type Errors = string /* uri */ | [Errordef, ...Errordef[]];
103103

104-
export type Properties = Specification.Basicpropsdef | Specification.Beareripropsdef | Specification.Oauth2propsdef;
104+
export type Properties = Specification.Basicpropsdef | Specification.Bearerpropsdef | Specification.Oauth2propsdef;

‎src/lib/definitions/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ export function overwritePropertiesIfObject(object: { properties: string | Speci
268268
}
269269

270270
if (properties.token) {
271-
object.properties = new Specification.Beareripropsdef(object);
271+
object.properties = new Specification.Bearerpropsdef(object);
272272
}
273273

274274
if (properties.grantType) {

‎src/lib/schema/__merged.json

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,6 +2026,29 @@
20262026
"description": "Timeout duration to wait for consuming defined events (ISO 8601 duration format)",
20272027
"minLength": 1
20282028
},
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+
},
20292052
"eventdef": {
20302053
"type": "object",
20312054
"properties": {
@@ -2113,12 +2136,46 @@
21132136
"contextAttributeName"
21142137
]
21152138
},
2116-
"metadata": {
2139+
"function": {
21172140
"type": "object",
2118-
"description": "Metadata information",
2119-
"additionalProperties": {
2120-
"type": "string"
2121-
}
2141+
"properties": {
2142+
"name": {
2143+
"type": "string",
2144+
"description": "Unique function name",
2145+
"minLength": 1
2146+
},
2147+
"operation": {
2148+
"type": "string",
2149+
"description": "If type is `rest`, <path_to_openapi_definition>#<operation_id>. If type is `asyncapi`, <path_to_asyncapi_definition>#<operation_id>. If type is `rpc`, <path_to_grpc_proto_file>#<service_name>#<service_method>. If type is `graphql`, <url_to_graphql_endpoint>#<literal \\\"mutation\\\" or \\\"query\\\">#<query_or_mutation_name>. If type is `odata`, <URI_to_odata_service>#<Entity_Set_Name>. If type is `expression`, defines the workflow expression.",
2150+
"minLength": 1
2151+
},
2152+
"type": {
2153+
"type": "string",
2154+
"description": "Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, or `expression`. Default is `rest`",
2155+
"enum": [
2156+
"rest",
2157+
"asyncapi",
2158+
"rpc",
2159+
"graphql",
2160+
"odata",
2161+
"expression"
2162+
],
2163+
"default": "rest"
2164+
},
2165+
"authRef": {
2166+
"type": "string",
2167+
"description": "References an auth definition name to be used to access to resource defined in the operation parameter",
2168+
"minLength": 1
2169+
},
2170+
"metadata": {
2171+
"$ref": "#/definitions/metadata"
2172+
}
2173+
},
2174+
"additionalProperties": false,
2175+
"required": [
2176+
"name",
2177+
"operation"
2178+
]
21222179
},
21232180
"retrydef": {
21242181
"type": "object",
@@ -2205,7 +2262,7 @@
22052262
},
22062263
{
22072264
"title": "Bearer Auth Info State",
2208-
"$ref": "#/definitions/beareripropsdef"
2265+
"$ref": "#/definitions/bearerpropsdef"
22092266
},
22102267
{
22112268
"title": "OAuth2 Info",
@@ -2251,7 +2308,7 @@
22512308
}
22522309
]
22532310
},
2254-
"beareripropsdef": {
2311+
"bearerpropsdef": {
22552312
"oneOf": [
22562313
{
22572314
"type": "string",
@@ -2366,69 +2423,12 @@
23662423
}
23672424
]
23682425
},
2369-
"errordef": {
2370-
"type": "object",
2371-
"properties": {
2372-
"name": {
2373-
"type": "string",
2374-
"description": "Domain-specific error name",
2375-
"minLength": 1
2376-
},
2377-
"code": {
2378-
"type": "string",
2379-
"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 '*'",
2380-
"minLength": 1
2381-
},
2382-
"description": {
2383-
"type": "string",
2384-
"description": "Error description"
2385-
}
2386-
},
2387-
"additionalProperties": false,
2388-
"required": [
2389-
"name"
2390-
]
2391-
},
2392-
"function": {
2426+
"metadata": {
23932427
"type": "object",
2394-
"properties": {
2395-
"name": {
2396-
"type": "string",
2397-
"description": "Unique function name",
2398-
"minLength": 1
2399-
},
2400-
"operation": {
2401-
"type": "string",
2402-
"description": "If type is `rest`, <path_to_openapi_definition>#<operation_id>. If type is `asyncapi`, <path_to_asyncapi_definition>#<operation_id>. If type is `rpc`, <path_to_grpc_proto_file>#<service_name>#<service_method>. If type is `graphql`, <url_to_graphql_endpoint>#<literal \\\"mutation\\\" or \\\"query\\\">#<query_or_mutation_name>. If type is `odata`, <URI_to_odata_service>#<Entity_Set_Name>. If type is `expression`, defines the workflow expression.",
2403-
"minLength": 1
2404-
},
2405-
"type": {
2406-
"type": "string",
2407-
"description": "Defines the function type. Is either `rest`, `asyncapi, `rpc`, `graphql`, `odata`, or `expression`. Default is `rest`",
2408-
"enum": [
2409-
"rest",
2410-
"asyncapi",
2411-
"rpc",
2412-
"graphql",
2413-
"odata",
2414-
"expression"
2415-
],
2416-
"default": "rest"
2417-
},
2418-
"authRef": {
2419-
"type": "string",
2420-
"description": "References an auth definition name to be used to access to resource defined in the operation parameter",
2421-
"minLength": 1
2422-
},
2423-
"metadata": {
2424-
"$ref": "#/definitions/metadata"
2425-
}
2426-
},
2427-
"additionalProperties": false,
2428-
"required": [
2429-
"name",
2430-
"operation"
2431-
]
2428+
"description": "Metadata information",
2429+
"additionalProperties": {
2430+
"type": "string"
2431+
}
24322432
},
24332433
"secrets": {
24342434
"oneOf": [

‎src/lib/schema/auth.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"title": "Bearer Auth Info State",
59-
"$ref": "#/definitions/beareripropsdef"
59+
"$ref": "#/definitions/bearerpropsdef"
6060
},
6161
{
6262
"title": "OAuth2 Info",
@@ -102,7 +102,7 @@
102102
}
103103
]
104104
},
105-
"beareripropsdef": {
105+
"bearerpropsdef": {
106106
"oneOf": [
107107
{
108108
"type": "string",

‎src/lib/schema/types/workflow.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ export interface Authdef {
302302
* Defines the auth type
303303
*/
304304
scheme?: 'basic' | 'bearer' | 'oauth2';
305-
properties: string | Basicpropsdef | Beareripropsdef | Oauth2propsdef;
305+
properties: string | Basicpropsdef | Bearerpropsdef | Oauth2propsdef;
306306
}
307307
export type Basicpropsdef =
308308
| string
@@ -317,7 +317,7 @@ export type Basicpropsdef =
317317
password: string;
318318
metadata?: /* Metadata information */ Metadata;
319319
};
320-
export type Beareripropsdef =
320+
export type Bearerpropsdef =
321321
| string
322322
| {
323323
/**

‎src/lib/schema/validation/validators-paths.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ export const validatorsPaths: [string, string][] = [
6060
['Statedatafilter', 'https://serverlessworkflow.io/schemas/0.7/workflow.json#/definitions/statedatafilter'],
6161
['Eventdatafilter', 'https://serverlessworkflow.io/schemas/0.7/workflow.json#/definitions/eventdatafilter'],
6262
['Actiondatafilter', 'https://serverlessworkflow.io/schemas/0.7/workflow.json#/definitions/actiondatafilter'],
63+
['Metadata', 'https://serverlessworkflow.io/schemas/0.7/common.json#/definitions/metadata'],
6364
['WorkflowExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/workflowExecTimeout'],
6465
['StateExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/stateExecTimeout'],
6566
['ActionExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/actionExecTimeout'],
6667
['BranchExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/branchExecTimeout'],
6768
['EventTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/eventTimeout'],
69+
['Retrydef', 'https://serverlessworkflow.io/schemas/0.7/retries.json#/definitions/retrydef'],
70+
['Function', 'https://serverlessworkflow.io/schemas/0.7/functions.json#/definitions/function'],
71+
['Errordef', 'https://serverlessworkflow.io/schemas/0.7/errors.json#/definitions/errordef'],
6872
['Eventdef', 'https://serverlessworkflow.io/schemas/0.7/events.json#/definitions/eventdef'],
6973
['CorrelationDef', 'https://serverlessworkflow.io/schemas/0.7/events.json#/definitions/correlationDef'],
70-
['Errordef', 'https://serverlessworkflow.io/schemas/0.7/errors.json#/definitions/errordef'],
71-
['Function', 'https://serverlessworkflow.io/schemas/0.7/functions.json#/definitions/function'],
72-
['Metadata', 'https://serverlessworkflow.io/schemas/0.7/common.json#/definitions/metadata'],
7374
['Authdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/authdef'],
7475
['Basicpropsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/basicpropsdef'],
75-
['Beareripropsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/beareripropsdef'],
76+
['Bearerpropsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/bearerpropsdef'],
7677
['Oauth2propsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/oauth2propsdef'],
77-
['Retrydef', 'https://serverlessworkflow.io/schemas/0.7/retries.json#/definitions/retrydef'],
7878
['Secrets', 'https://serverlessworkflow.io/schemas/0.7/secrets.json#/secrets'],
7979
['Timeouts', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/timeouts'],
8080
['Errors', 'https://serverlessworkflow.io/schemas/0.7/errors.json#/errors'],

‎src/lib/validation/validators-paths.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ export const validatorsPaths: [string, string][] = [
6060
['Statedatafilter', 'https://serverlessworkflow.io/schemas/0.7/workflow.json#/definitions/statedatafilter'],
6161
['Eventdatafilter', 'https://serverlessworkflow.io/schemas/0.7/workflow.json#/definitions/eventdatafilter'],
6262
['Actiondatafilter', 'https://serverlessworkflow.io/schemas/0.7/workflow.json#/definitions/actiondatafilter'],
63+
['Metadata', 'https://serverlessworkflow.io/schemas/0.7/common.json#/definitions/metadata'],
6364
['WorkflowExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/workflowExecTimeout'],
6465
['StateExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/stateExecTimeout'],
6566
['ActionExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/actionExecTimeout'],
6667
['BranchExecTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/branchExecTimeout'],
6768
['EventTimeout', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/definitions/eventTimeout'],
69+
['Retrydef', 'https://serverlessworkflow.io/schemas/0.7/retries.json#/definitions/retrydef'],
70+
['Function', 'https://serverlessworkflow.io/schemas/0.7/functions.json#/definitions/function'],
71+
['Errordef', 'https://serverlessworkflow.io/schemas/0.7/errors.json#/definitions/errordef'],
6872
['Eventdef', 'https://serverlessworkflow.io/schemas/0.7/events.json#/definitions/eventdef'],
6973
['CorrelationDef', 'https://serverlessworkflow.io/schemas/0.7/events.json#/definitions/correlationDef'],
70-
['Errordef', 'https://serverlessworkflow.io/schemas/0.7/errors.json#/definitions/errordef'],
71-
['Function', 'https://serverlessworkflow.io/schemas/0.7/functions.json#/definitions/function'],
72-
['Metadata', 'https://serverlessworkflow.io/schemas/0.7/common.json#/definitions/metadata'],
7374
['Authdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/authdef'],
7475
['Basicpropsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/basicpropsdef'],
75-
['Beareripropsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/beareripropsdef'],
76+
['Bearerpropsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/bearerpropsdef'],
7677
['Oauth2propsdef', 'https://serverlessworkflow.io/schemas/0.7/auth.json#/definitions/oauth2propsdef'],
77-
['Retrydef', 'https://serverlessworkflow.io/schemas/0.7/retries.json#/definitions/retrydef'],
7878
['Secrets', 'https://serverlessworkflow.io/schemas/0.7/secrets.json#/secrets'],
7979
['Timeouts', 'https://serverlessworkflow.io/schemas/0.7/timeouts.json#/timeouts'],
8080
['Errors', 'https://serverlessworkflow.io/schemas/0.7/errors.json#/errors'],

‎tests/lib/definitions/util.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe('Util ', () => {
9393
expect(target.properties.constructor.name).toBe('Basicpropsdef');
9494
});
9595

96-
it('should create an instance of Beareripropsdef', () => {
96+
it('should create an instance of Bearerpropsdef', () => {
9797
const source = {
9898
properties: {
9999
token: 'token',
@@ -102,7 +102,7 @@ describe('Util ', () => {
102102

103103
const target = Object.assign({}, source);
104104
overwritePropertiesIfObject(target);
105-
expect(target.properties.constructor.name).toBe('Beareripropsdef');
105+
expect(target.properties.constructor.name).toBe('Bearerpropsdef');
106106
});
107107

108108
it('should create an instance of Oauth2propsdef', () => {

0 commit comments

Comments
 (0)