@rxap/schematics-open-api 14.1.1 → 14.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +13 -0
- package/README.md +1 -1
- package/package.json +3 -3
- package/src/lib/coerce-open-api-project.js +2 -2
- package/src/lib/coerce-open-api-project.js.map +1 -1
- package/src/lib/types.js +27 -3
- package/src/lib/types.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,19 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [14.1.2](https://gitlab.com/rxap/packages/compare/@rxap/schematics-open-api@14.1.1...@rxap/schematics-open-api@14.1.2) (2023-01-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* cleanup serialized open api operation object ([75c90ad](https://gitlab.com/rxap/packages/commit/75c90ad18a60ac659a6e14a687307fc486b367a7))
|
|
12
|
+
* **schematics:** update open api schematics package ([c4a1839](https://gitlab.com/rxap/packages/commit/c4a18398f459d913a34ae31b7c8c6f88ce3fd3fc))
|
|
13
|
+
* support open api projects with sub directories ([65d7db8](https://gitlab.com/rxap/packages/commit/65d7db840b5ae92462d8b02216837fa9e9c47dfd))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
6
19
|
## [14.1.1](https://gitlab.com/rxap/packages/compare/@rxap/schematics-open-api@14.1.0...@rxap/schematics-open-api@14.1.1) (2022-12-14)
|
|
7
20
|
|
|
8
21
|
**Note:** Version bump only for package @rxap/schematics-open-api
|
package/README.md
CHANGED
|
@@ -15,6 +15,6 @@
|
|
|
15
15
|
# Installation
|
|
16
16
|
|
|
17
17
|
```
|
|
18
|
-
yarn add @rxap/schematics-open-api @rxap/json-schema-to-typescript@^
|
|
18
|
+
yarn add @rxap/schematics-open-api @rxap/json-schema-to-typescript@^14.0.3 @rxap/schematics-utilities@^14.0.3
|
|
19
19
|
```
|
|
20
20
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rxap/schematics-open-api",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.1.2",
|
|
4
4
|
"dependencies": {
|
|
5
5
|
"tslib": "^2.3.1"
|
|
6
6
|
},
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"email": "incoming+rxap-packages-14898188-issue-@incoming.gitlab.com"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
|
-
"@rxap/json-schema-to-typescript": "^
|
|
41
|
-
"@rxap/schematics-utilities": "^14.0.
|
|
40
|
+
"@rxap/json-schema-to-typescript": "^14.0.3",
|
|
41
|
+
"@rxap/schematics-utilities": "^14.0.4",
|
|
42
42
|
"openapi-types": "^10.0.0",
|
|
43
43
|
"ts-morph": "^13.0.3",
|
|
44
44
|
"semver": "^7.3.5"
|
|
@@ -6,7 +6,7 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
|
6
6
|
function CoerceOpenApiProject(project, prefix, directory) {
|
|
7
7
|
return (host) => {
|
|
8
8
|
const angularJson = (0, schematics_utilities_1.GetAngularJson)(host);
|
|
9
|
-
const projectName = `${directory ? directory + '-' : ''}${project}`;
|
|
9
|
+
const projectName = `${directory ? directory.split('/').join('-') + '-' : ''}${project}`;
|
|
10
10
|
if (!angularJson.projects.hasOwnProperty(projectName)) {
|
|
11
11
|
const defaultProject = angularJson.projects[angularJson.defaultProject];
|
|
12
12
|
const defaultProjectPrefix = prefix !== null && prefix !== void 0 ? prefix : defaultProject.prefix;
|
|
@@ -24,7 +24,7 @@ function CoerceOpenApiProject(project, prefix, directory) {
|
|
|
24
24
|
if (Object.keys(paths).length) {
|
|
25
25
|
for (const key of Object.keys(paths)) {
|
|
26
26
|
if (directory) {
|
|
27
|
-
if (key.match(new RegExp(`\/${directory}-${project}$`))) {
|
|
27
|
+
if (key.match(new RegExp(`\/${directory.split('/').join('-')}-${project}$`))) {
|
|
28
28
|
delete paths[key];
|
|
29
29
|
paths[key + '/*'] = [`libs/${directory}/${project}/src/lib/*`];
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-open-api-project.js","sourceRoot":"","sources":["../../../../../libs/open-api/src/lib/coerce-open-api-project.ts"],"names":[],"mappings":";;;AAAA,2DAAwF;AACxF,qEAA4D;AAE5D,SAAgB,oBAAoB,CAAC,OAAe,EAAE,MAAc,EAAE,SAAkB;IACtF,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,WAAW,GAAG,IAAA,qCAAc,EAAC,IAAI,CAAQ,CAAC;QAEhD,MAAM,WAAW,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"coerce-open-api-project.js","sourceRoot":"","sources":["../../../../../libs/open-api/src/lib/coerce-open-api-project.ts"],"names":[],"mappings":";;;AAAA,2DAAwF;AACxF,qEAA4D;AAE5D,SAAgB,oBAAoB,CAAC,OAAe,EAAE,MAAc,EAAE,SAAkB;IACtF,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,WAAW,GAAG,IAAA,qCAAc,EAAC,IAAI,CAAQ,CAAC;QAEhD,MAAM,WAAW,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;QAEzF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE;YACrD,MAAM,cAAc,GAAS,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAC9E,MAAM,oBAAoB,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,cAAc,CAAC,MAAM,CAAC;YAC7D,OAAO,IAAA,kBAAK,EAAC;gBACX,IAAA,8BAAiB,EAAC,eAAe,EAAE,SAAS,EAAE;oBAC5C,IAAI,EAAE,OAAO;oBACb,UAAU,EAAE,IAAI,oBAAoB,IAAI,WAAW,EAAE;oBACrD,MAAM;oBACN,SAAS;iBACV,CAAC;gBACF,CAAC,IAAI,EAAE,EAAE;;oBACP,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAC7B,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,0CAAE,QAAQ,EAAE,mCAAI,IAAI,CACrD,CAAC;oBAEF,MAAM,KAAK,GAAG,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,eAAe,0CAAE,KAAK,mCAAI,EAAE,CAAC;oBAEzD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;wBAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;4BACpC,IAAI,SAAS,EAAE;gCACb,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,EAAE;oCAC5E,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;oCAClB,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,SAAS,IAAI,OAAO,YAAY,CAAC,CAAC;iCAChE;6BACF;iCAAM;gCACL,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,OAAO,GAAG,CAAC,CAAC,EAAE;oCAC1C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;oCAClB,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,OAAO,YAAY,CAAC,CAAC;iCACnD;6BACF;yBACF;wBAED,IAAI,CAAC,SAAS,CACZ,qBAAqB,EACrB,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC,CAC3C,CAAC;qBACH;gBACH,CAAC;aACF,CAAC,CAAC;SACJ;QAED,OAAO,IAAA,iBAAI,GAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AAjDD,oDAiDC"}
|
package/src/lib/types.js
CHANGED
|
@@ -2,12 +2,36 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AssertWithOperationId = exports.HasOperationId = exports.GenerateParameterToOperationObjectWithMetadata = void 0;
|
|
4
4
|
function GenerateParameterToOperationObjectWithMetadata(parameter) {
|
|
5
|
-
const
|
|
5
|
+
const whitelist = ['method', 'path', 'operationId', 'parameters', 'responses', 'requestBody'];
|
|
6
6
|
const copy = {};
|
|
7
|
-
for (const key of Object.keys(parameter).filter(k =>
|
|
7
|
+
for (const key of Object.keys(parameter).filter(k => whitelist.includes(k))) {
|
|
8
8
|
copy[key] = parameter[key];
|
|
9
9
|
}
|
|
10
|
-
|
|
10
|
+
if (parameter.responses) {
|
|
11
|
+
copy.responses = {};
|
|
12
|
+
for (const status of Object.keys(parameter.responses).filter(status => Number(status) >= 200 && Number(status) < 300)) {
|
|
13
|
+
copy.responses[status] = parameter.responses[status];
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
function removeHumanProperties(obj) {
|
|
17
|
+
if (obj && typeof obj === 'object') {
|
|
18
|
+
if (Array.isArray(obj)) {
|
|
19
|
+
return obj.map(item => removeHumanProperties(item));
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
return obj;
|
|
24
|
+
}
|
|
25
|
+
const clean = {};
|
|
26
|
+
const blacklist = ['description', 'example', 'summary'];
|
|
27
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
28
|
+
if (!blacklist.includes(key)) {
|
|
29
|
+
clean[key] = removeHumanProperties(value);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
return clean;
|
|
33
|
+
}
|
|
34
|
+
return removeHumanProperties(copy);
|
|
11
35
|
}
|
|
12
36
|
exports.GenerateParameterToOperationObjectWithMetadata = GenerateParameterToOperationObjectWithMetadata;
|
|
13
37
|
function HasOperationId(operation) {
|
package/src/lib/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../libs/open-api/src/lib/types.ts"],"names":[],"mappings":";;;AAkBA,SAAgB,8CAA8C,CAAC,SAA4B;IACzF,MAAM,SAAS,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../libs/open-api/src/lib/types.ts"],"names":[],"mappings":";;;AAkBA,SAAgB,8CAA8C,CAAC,SAA4B;IACzF,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAC,MAAM,EAAC,aAAa,EAAC,YAAY,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAQ,EAAE,CAAC;IACrB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3E,IAAI,CAAC,GAAG,CAAC,GAAI,SAAiB,CAAC,GAAG,CAAC,CAAC;KACrC;IACD,IAAI,SAAS,CAAC,SAAS,EAAE;QACvB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,EAAE;YACrH,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SACtD;KACF;IACD,SAAS,qBAAqB,CAAC,GAAQ;QACrC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAClC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACtB,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;aACrD;SACF;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;QACD,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,MAAM,SAAS,GAAG,CAAC,aAAa,EAAC,SAAS,EAAC,SAAS,CAAC,CAAC;QACtD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC5B,KAAK,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;aAC3C;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AA9BD,wGA8BC;AAED,SAAgB,cAAc,CAAC,SAAoC;IACjE,OAAO,CAAC,CAAC,SAAS,CAAC,WAAW,CAAA;AAChC,CAAC;AAFD,wCAEC;AAED,SAAgB,qBAAqB,CAAC,SAAoC;IACxE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;KAC7D;AACH,CAAC;AAJD,sDAIC"}
|