Skip to content

Commit d736090

Browse files
authored
chore(deps): bump openapi-path-templating to 2.0.1 (#4622)
Closes #4621
1 parent 8abb96c commit d736090

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

package-lock.json

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/apidom-ls/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-beta.5",
117117
"@swagger-api/apidom-reference": "^1.0.0-beta.5",
118118
"@types/ramda": "~0.30.0",
119-
"openapi-path-templating": "^1.4.0",
119+
"openapi-path-templating": "^2.0.1",
120120
"ramda": "~0.30.0",
121121
"ramda-adjunct": "^5.0.0",
122122
"vscode-languageserver-protocol": "^3.17.2",

packages/apidom-ls/src/services/validation/linter-functions.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ import {
1212
includesClasses,
1313
} from '@swagger-api/apidom-core';
1414
import { CompletionItem } from 'vscode-languageserver-types';
15-
import { test, resolve, parse } from 'openapi-path-templating';
15+
import {
16+
test as testPathTemplate,
17+
resolve as resolvePathTemplate,
18+
parse as parsePathTemplate,
19+
} from 'openapi-path-templating';
1620

1721
// eslint-disable-next-line import/no-cycle
1822
import {
@@ -1018,7 +1022,7 @@ export const standardLinterfunctions: FunctionItem[] = [
10181022
function: (element: Element, strict = false) => {
10191023
if (isStringElement(element)) {
10201024
const pathTemplate = toValue(element);
1021-
return test(pathTemplate, { strict });
1025+
return testPathTemplate(pathTemplate, { strict });
10221026
}
10231027
return true;
10241028
},
@@ -1076,8 +1080,8 @@ export const standardLinterfunctions: FunctionItem[] = [
10761080
});
10771081

10781082
const pathTemplate = toValue(element);
1079-
const resolvedPathTemplate = resolve(pathTemplate, pathTemplateResolveParams);
1080-
const includesTemplateExpression = test(resolvedPathTemplate, { strict: true });
1083+
const resolvedPathTemplate = resolvePathTemplate(pathTemplate, pathTemplateResolveParams);
1084+
const includesTemplateExpression = testPathTemplate(resolvedPathTemplate, { strict: true });
10811085

10821086
return !includesTemplateExpression || oneOfParametersIsReferenceObject;
10831087
}
@@ -1116,7 +1120,7 @@ export const standardLinterfunctions: FunctionItem[] = [
11161120
const pathTemplate = toValue(pathItemElement.meta.get('path'));
11171121
const parameterName = toValue((element as ObjectElement).get('name'));
11181122

1119-
const parseResult = parse(pathTemplate);
1123+
const parseResult = parsePathTemplate(pathTemplate);
11201124
if (!parseResult.result.success) return true;
11211125

11221126
const parts: [string, string][] = [];

0 commit comments

Comments
 (0)