@thymian/plugin-openapi 0.2.1-canary.20260828-417e634 → 0.2.1-canary.20260831-0c538fe
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/dist/http-filter-expression-to-operation-filter.d.ts.map +1 -1
- package/dist/http-filter-expression-to-operation-filter.js +2 -4
- package/dist/http-filter-expression-to-operation-filter.js.map +1 -1
- package/dist/processors/openapi.processor.d.ts.map +1 -1
- package/dist/processors/openapi.processor.js +2 -2
- package/dist/processors/openapi.processor.js.map +1 -1
- package/dist/url-path.d.ts +24 -0
- package/dist/url-path.d.ts.map +1 -0
- package/dist/url-path.js +26 -0
- package/dist/url-path.js.map +1 -0
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-filter-expression-to-operation-filter.d.ts","sourceRoot":"","sources":["../src/http-filter-expression-to-operation-filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAM1D,OAAO,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"http-filter-expression-to-operation-filter.d.ts","sourceRoot":"","sources":["../src/http-filter-expression-to-operation-filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAM1D,OAAO,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,MAAM,uBAAuB,GAAG,CAAC,IAAI,EAAE;IAC3C,eAAe,EAAE,UAAU,CAAC,eAAe,CAAC;IAC5C,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;CAC/B,KAAK,OAAO,CAAC;AAwQd,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,oBAAoB,GAC/B,uBAAuB,CAEzB"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { createFilterVisitor, equalsIgnoreCase, visitHttpFilter, } from '@thymian/core';
|
|
2
2
|
import { resolveOpenApiReference } from './processors/openapi-reference-resolver.js';
|
|
3
|
-
|
|
4
|
-
return (baseUrl + path).replace(/\/\//g, '/');
|
|
5
|
-
}
|
|
3
|
+
import { joinUrlPath } from './url-path.js';
|
|
6
4
|
function hasQueryParam(params, param) {
|
|
7
5
|
return Object.keys(params.queryParameters).some((p) => equalsIgnoreCase(p, param));
|
|
8
6
|
}
|
|
@@ -111,7 +109,7 @@ const visitor = createFilterVisitor({
|
|
|
111
109
|
if (typeof path === 'undefined') {
|
|
112
110
|
return () => false;
|
|
113
111
|
}
|
|
114
|
-
return ({ path: p, serverInfo }) =>
|
|
112
|
+
return ({ path: p, serverInfo }) => joinUrlPath(serverInfo.basePath, p).endsWith(path);
|
|
115
113
|
},
|
|
116
114
|
visitHasResponse({ filter }) {
|
|
117
115
|
const nestedFilter = httpFilterExpressionToOperationFilter(filter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-filter-expression-to-operation-filter.js","sourceRoot":"","sources":["../src/http-filter-expression-to-operation-filter.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,GAChB,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"http-filter-expression-to-operation-filter.js","sourceRoot":"","sources":["../src/http-filter-expression-to-operation-filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openapi.processor.d.ts","sourceRoot":"","sources":["../../src/processors/openapi.processor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openapi.processor.d.ts","sourceRoot":"","sources":["../../src/processors/openapi.processor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,oBAAoB,EAEzB,KAAK,MAAM,EACX,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAG/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAqB,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAS9E,MAAM,MAAM,uBAAuB,GAAG,UAAU,CAAC;AAEjD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,UAAU,CAAC,UAAU,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAS5B,CAAC;AAKF,qBAAa,gBAAgB;IAUzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAZzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAEzD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA8B;IAErE,OAAO,CAAC,qBAAqB,CAAgB;IAE7C,OAAO,CAAC,UAAU,CAAU;gBAGT,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,uBAAuB,EAChC,SAAS,EAAE,SAAS,EACpB,MAAM,gBAAsB;IAG/C,OAAO,CAAC,iBAAiB;IA8BzB,OAAO,CAAC,sBAAsB;IA8GvB,OAAO,CACZ,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAC7B,MAAM,EAAE,oBAAoB,EAC5B,UAAU,GAAE,MAA4B,GACvC,aAAa;CAyFjB;AAED,MAAM,MAAM,uBAAuB,GAAG,CACpC,eAAe,EAAE,UAAU,CAAC,eAAe,EAC3C,QAAQ,EAAE,UAAU,CAAC,QAAQ,KAC1B,OAAO,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { join } from 'node:path';
|
|
2
1
|
import { isNodeType, ThymianFormat, } from '@thymian/core';
|
|
3
2
|
import { httpFilterExpressionToOperationFilter } from '../http-filter-expression-to-operation-filter.js';
|
|
3
|
+
import { joinUrlPath } from '../url-path.js';
|
|
4
4
|
import { extractServerInfo } from './extract-server-info.js';
|
|
5
5
|
import { processLinkObjectParameters } from './link-object.processor.js';
|
|
6
6
|
import { resolveOpenApiReference } from './openapi-reference-resolver.js';
|
|
@@ -70,7 +70,7 @@ export class OpenapiProcessor {
|
|
|
70
70
|
protocol: operationServerInfo.protocol,
|
|
71
71
|
operationId: operationObject.operationId,
|
|
72
72
|
method,
|
|
73
|
-
path:
|
|
73
|
+
path: joinUrlPath(operationServerInfo.basePath, path),
|
|
74
74
|
sourceName: this.sourceName,
|
|
75
75
|
}, document);
|
|
76
76
|
const responsesAndLinks = processResponsesObject(operationObject.responses, parameters, document);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openapi.processor.js","sourceRoot":"","sources":["../../src/processors/openapi.processor.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"openapi.processor.js","sourceRoot":"","sources":["../../src/processors/openapi.processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Joins the base path of a server URL with an OpenAPI path template.
|
|
3
|
+
*
|
|
4
|
+
* Both operands are URL path segments: `basePath` comes from the `pathname` of
|
|
5
|
+
* a server URL (see `extractServerInfo`) and `path` is a key of the OpenAPI
|
|
6
|
+
* `paths` object. `node:path`'s `join` must never be used for this — its
|
|
7
|
+
* separator is platform dependent, so it produces `\v1\pets` on Windows, and it
|
|
8
|
+
* resolves `.` and `..` segments, which silently rewrites a path template into
|
|
9
|
+
* a different operation.
|
|
10
|
+
*
|
|
11
|
+
* Semantics:
|
|
12
|
+
* - Exactly one `/` separates the two operands, and any run of slashes in the
|
|
13
|
+
* result collapses to a single one, so a trailing slash on `basePath` and a
|
|
14
|
+
* leading slash on `path` do not double up.
|
|
15
|
+
* - The result is always rooted: an empty `basePath` means "the server root",
|
|
16
|
+
* so `('', 'pets')` yields `/pets`.
|
|
17
|
+
* - A trailing slash on `path` is preserved — `/pets` and `/pets/` are
|
|
18
|
+
* different resources.
|
|
19
|
+
* - `.` and `..` segments are passed through verbatim. A path template is an
|
|
20
|
+
* operation identity, not a file location, and resolving them would change
|
|
21
|
+
* which operation a selector or filter names.
|
|
22
|
+
*/
|
|
23
|
+
export declare function joinUrlPath(basePath: string, path: string): string;
|
|
24
|
+
//# sourceMappingURL=url-path.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-path.d.ts","sourceRoot":"","sources":["../src/url-path.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAElE"}
|
package/dist/url-path.js
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Joins the base path of a server URL with an OpenAPI path template.
|
|
3
|
+
*
|
|
4
|
+
* Both operands are URL path segments: `basePath` comes from the `pathname` of
|
|
5
|
+
* a server URL (see `extractServerInfo`) and `path` is a key of the OpenAPI
|
|
6
|
+
* `paths` object. `node:path`'s `join` must never be used for this — its
|
|
7
|
+
* separator is platform dependent, so it produces `\v1\pets` on Windows, and it
|
|
8
|
+
* resolves `.` and `..` segments, which silently rewrites a path template into
|
|
9
|
+
* a different operation.
|
|
10
|
+
*
|
|
11
|
+
* Semantics:
|
|
12
|
+
* - Exactly one `/` separates the two operands, and any run of slashes in the
|
|
13
|
+
* result collapses to a single one, so a trailing slash on `basePath` and a
|
|
14
|
+
* leading slash on `path` do not double up.
|
|
15
|
+
* - The result is always rooted: an empty `basePath` means "the server root",
|
|
16
|
+
* so `('', 'pets')` yields `/pets`.
|
|
17
|
+
* - A trailing slash on `path` is preserved — `/pets` and `/pets/` are
|
|
18
|
+
* different resources.
|
|
19
|
+
* - `.` and `..` segments are passed through verbatim. A path template is an
|
|
20
|
+
* operation identity, not a file location, and resolving them would change
|
|
21
|
+
* which operation a selector or filter names.
|
|
22
|
+
*/
|
|
23
|
+
export function joinUrlPath(basePath, path) {
|
|
24
|
+
return `${basePath}/${path}`.replace(/\/{2,}/g, '/');
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=url-path.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"url-path.js","sourceRoot":"","sources":["../src/url-path.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,IAAY;IACxD,OAAO,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AACvD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thymian/plugin-openapi",
|
|
3
|
-
"version": "0.2.1-canary.
|
|
3
|
+
"version": "0.2.1-canary.20260831-0c538fe",
|
|
4
4
|
"description": "Thymian plugin for loading, parsing, and transforming OpenAPI specifications",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"bugs": {
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"@scalar/json-magic": "^0.9.0",
|
|
43
43
|
"@scalar/openapi-parser": "^0.23.2",
|
|
44
44
|
"@scalar/openapi-upgrader": "^0.1.4",
|
|
45
|
-
"@thymian/common-cli": "0.2.1-canary.
|
|
46
|
-
"@thymian/core": "0.2.1-canary.
|
|
45
|
+
"@thymian/common-cli": "0.2.1-canary.20260831-0c538fe",
|
|
46
|
+
"@thymian/core": "0.2.1-canary.20260831-0c538fe",
|
|
47
47
|
"jsonc-parser": "^3.2.0",
|
|
48
48
|
"tinyglobby": "^0.2.14",
|
|
49
49
|
"tslib": "^2.3.0",
|