@checkdigit/eslint-plugin 7.6.0-PR.75-8118 → 7.6.0-PR.75-4751
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-mjs/agent/fetch-then.mjs +4 -72
- package/dist-mjs/agent/no-fixture.mjs +21 -20
- package/dist-mjs/agent/no-service-wrapper.mjs +4 -4
- package/dist-mjs/agent/no-supertest.mjs +12 -34
- package/dist-mjs/agent/response-reference.mjs +2 -5
- package/dist-mjs/require-resolve-full-response.mjs +5 -5
- package/dist-types/agent/fetch-then.d.ts +1 -1
- package/dist-types/agent/response-reference.d.ts +0 -1
- package/package.json +1 -1
- package/src/agent/fetch-then.ts +87 -88
- package/src/agent/no-fixture.ts +48 -21
- package/src/agent/no-service-wrapper.ts +3 -3
- package/src/agent/no-supertest.ts +37 -40
- package/src/agent/response-reference.ts +10 -10
- package/src/require-resolve-full-response.ts +4 -4
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
// src/agent/fetch-then.ts
|
|
2
2
|
import { strict as assert } from "node:assert";
|
|
3
|
-
import "@typescript-eslint/scope-manager";
|
|
4
3
|
import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
|
|
5
|
-
import { getEnclosingFunction,
|
|
4
|
+
import { getEnclosingFunction, getParent, isUsedInArrayOrAsArgument } from "../library/ts-tree.mjs";
|
|
6
5
|
import getDocumentationUrl from "../get-documentation-url.mjs";
|
|
7
6
|
import { getIndentation } from "../library/format.mjs";
|
|
8
7
|
import { isValidPropertyName } from "../library/variable.mjs";
|
|
9
|
-
import { hasAssertions
|
|
8
|
+
import { hasAssertions } from "./fetch.mjs";
|
|
10
9
|
import { replaceEndpointUrlPrefixWithBasePath } from "./url.mjs";
|
|
11
10
|
var ruleId = "fetch-then";
|
|
12
11
|
function analyzeFixtureCall(call, results, sourceCode) {
|
|
@@ -96,37 +95,6 @@ function createResponseAssertions(fixtureCallInformation, sourceCode, responseVa
|
|
|
96
95
|
nonStatusAssertions
|
|
97
96
|
};
|
|
98
97
|
}
|
|
99
|
-
function getResponseHeadersAccesses(responseVariables, scopeManager, sourceCode) {
|
|
100
|
-
const responseHeadersAccesses = [];
|
|
101
|
-
for (const responseVariable of responseVariables) {
|
|
102
|
-
for (const responseReference of responseVariable.references) {
|
|
103
|
-
const responseAccess = getParent(responseReference.identifier);
|
|
104
|
-
if (!responseAccess || responseAccess.type !== AST_NODE_TYPES.MemberExpression) {
|
|
105
|
-
continue;
|
|
106
|
-
}
|
|
107
|
-
const responseAccessParent = getParent(responseAccess);
|
|
108
|
-
if (!responseAccessParent) {
|
|
109
|
-
continue;
|
|
110
|
-
}
|
|
111
|
-
if (responseAccessParent.type === AST_NODE_TYPES.CallExpression && responseAccessParent.arguments[0]?.type === AST_NODE_TYPES.ArrowFunctionExpression) {
|
|
112
|
-
responseHeadersAccesses.push(
|
|
113
|
-
...getResponseHeadersAccesses(
|
|
114
|
-
scopeManager.getDeclaredVariables(responseAccessParent.arguments[0]),
|
|
115
|
-
scopeManager,
|
|
116
|
-
sourceCode
|
|
117
|
-
)
|
|
118
|
-
);
|
|
119
|
-
continue;
|
|
120
|
-
}
|
|
121
|
-
if (responseAccess.computed && responseAccess.property.type === AST_NODE_TYPES.Literal && responseAccessParent.type === AST_NODE_TYPES.MemberExpression) {
|
|
122
|
-
responseHeadersAccesses.push(responseAccessParent);
|
|
123
|
-
} else {
|
|
124
|
-
responseHeadersAccesses.push(responseAccess);
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
return responseHeadersAccesses;
|
|
129
|
-
}
|
|
130
98
|
var createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
|
|
131
99
|
var rule = createRule({
|
|
132
100
|
name: ruleId,
|
|
@@ -138,7 +106,7 @@ var rule = createRule({
|
|
|
138
106
|
},
|
|
139
107
|
messages: {
|
|
140
108
|
preferNativeFetch: "Prefer native fetch API over customized fixture API.",
|
|
141
|
-
shouldUseHeaderGetter:
|
|
109
|
+
// shouldUseHeaderGetter: 'Getter should be used to access response headers.',
|
|
142
110
|
unknownError: 'Unknown error occurred in file "{{fileName}}": {{ error }}.'
|
|
143
111
|
},
|
|
144
112
|
fixable: "code",
|
|
@@ -214,42 +182,6 @@ ${indentation}`) : fetchCallText;
|
|
|
214
182
|
return fixer.replaceText(fixtureCallInformation.fixtureNode, replacementText);
|
|
215
183
|
}
|
|
216
184
|
});
|
|
217
|
-
const responsesVariable = getEnclosingStatement(fixtureCallInformation.fixtureNode);
|
|
218
|
-
if (!responsesVariable) {
|
|
219
|
-
return;
|
|
220
|
-
}
|
|
221
|
-
const responseVariableReferences = scopeManager.getDeclaredVariables(responsesVariable);
|
|
222
|
-
const responseHeadersAccesses = getResponseHeadersAccesses(
|
|
223
|
-
responseVariableReferences,
|
|
224
|
-
scopeManager,
|
|
225
|
-
sourceCode
|
|
226
|
-
);
|
|
227
|
-
for (const responseHeadersAccess of responseHeadersAccesses) {
|
|
228
|
-
if (isInvalidResponseHeadersAccess(responseHeadersAccess)) {
|
|
229
|
-
const headerAccess = getParent(responseHeadersAccess);
|
|
230
|
-
if (headerAccess?.type === AST_NODE_TYPES.MemberExpression) {
|
|
231
|
-
const headerNameNode = headerAccess.property;
|
|
232
|
-
const headerName = headerAccess.computed ? sourceCode.getText(headerNameNode) : `'${sourceCode.getText(headerNameNode)}'`;
|
|
233
|
-
const headerAccessReplacementText = `${sourceCode.getText(headerAccess.object)}.get(${headerName})`;
|
|
234
|
-
context.report({
|
|
235
|
-
node: headerAccess,
|
|
236
|
-
messageId: "shouldUseHeaderGetter",
|
|
237
|
-
fix(fixer) {
|
|
238
|
-
return fixer.replaceText(headerAccess, headerAccessReplacementText);
|
|
239
|
-
}
|
|
240
|
-
});
|
|
241
|
-
} else if (headerAccess?.type === AST_NODE_TYPES.CallExpression && responseHeadersAccess.property.type === AST_NODE_TYPES.Identifier && responseHeadersAccess.property.name === "get") {
|
|
242
|
-
const headerAccessReplacementText = `${sourceCode.getText(responseHeadersAccess.object)}.headers.get(${sourceCode.getText(headerAccess.arguments[0])})`;
|
|
243
|
-
context.report({
|
|
244
|
-
node: headerAccess,
|
|
245
|
-
messageId: "shouldUseHeaderGetter",
|
|
246
|
-
fix(fixer) {
|
|
247
|
-
return fixer.replaceText(headerAccess, headerAccessReplacementText);
|
|
248
|
-
}
|
|
249
|
-
});
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
185
|
} catch (error) {
|
|
254
186
|
console.error(`Failed to apply ${ruleId} rule for file "${context.filename}":`, error);
|
|
255
187
|
context.report({
|
|
@@ -270,4 +202,4 @@ export {
|
|
|
270
202
|
fetch_then_default as default,
|
|
271
203
|
ruleId
|
|
272
204
|
};
|
|
273
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
205
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FnZW50L2ZldGNoLXRoZW4udHMiXSwKICAibWFwcGluZ3MiOiAiO0FBUUEsU0FBUyxVQUFVLGNBQWM7QUFHakMsU0FBUyxnQkFBZ0IsbUJBQTZCO0FBR3RELFNBQVMsc0JBQXNCLFdBQVcsaUNBQWlDO0FBQzNFLE9BQU8seUJBQXlCO0FBQ2hDLFNBQVMsc0JBQXNCO0FBQy9CLFNBQVMsMkJBQTJCO0FBQ3BDLFNBQVMscUJBQXFCO0FBQzlCLFNBQVMsNENBQTRDO0FBRTlDLElBQU0sU0FBUztBQVV0QixTQUFTLG1CQUFtQixNQUErQixTQUFpQyxZQUF3QjtBQUNsSCxRQUFNLFNBQVMsVUFBVSxJQUFJO0FBQzdCLE1BQUksQ0FBQyxRQUFRO0FBQ1g7QUFBQSxFQUNGO0FBRUEsTUFBSTtBQUNKLE1BQUksT0FBTyxTQUFTLGVBQWUsa0JBQWtCO0FBQ25ELFlBQVEsY0FBYztBQUN0QjtBQUFBLEVBQ0Y7QUFFQSxNQUFJLE9BQU8sU0FBUyxTQUFTLGVBQWUsWUFBWTtBQUN0RCxRQUFJLE9BQU8sU0FBUyxTQUFTLFVBQVU7QUFFckMsWUFBTSxnQkFBZ0IsVUFBVSxNQUFNO0FBQ3RDLGFBQU8sR0FBRyxpQkFBaUIsY0FBYyxTQUFTLGVBQWUsY0FBYztBQUMvRSxjQUFRLGFBQWEsQ0FBQyxHQUFJLFFBQVEsY0FBYyxDQUFDLEdBQUksY0FBYyxTQUFrQztBQUNyRyxpQkFBVztBQUFBLElBQ2IsV0FBVyxPQUFPLFNBQVMsU0FBUyxRQUFRO0FBRTFDLFlBQU0sc0JBQXNCLFVBQVUsTUFBTTtBQUM1QyxhQUFPLEdBQUcsdUJBQXVCLG9CQUFvQixTQUFTLGVBQWUsY0FBYztBQUMzRixjQUFRLGNBQWMsb0JBQW9CLFVBQVUsQ0FBQztBQUNyRCxpQkFBVztBQUFBLElBQ2IsV0FBVyxPQUFPLFNBQVMsU0FBUyxPQUFPO0FBRXpDLFlBQU0sdUJBQXVCLFVBQVUsTUFBTTtBQUM3QyxhQUFPLEdBQUcsd0JBQXdCLHFCQUFxQixTQUFTLGVBQWUsY0FBYztBQUM3RixZQUFNLENBQUMsTUFBTSxLQUFLLElBQUkscUJBQXFCO0FBQzNDLGNBQVEsaUJBQWlCLENBQUMsR0FBSSxRQUFRLGtCQUFrQixDQUFDLEdBQUksRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUM1RSxpQkFBVztBQUFBLElBQ2I7QUFBQSxFQUNGLE9BQU87QUFDTCxVQUFNLElBQUksTUFBTSw0REFBNEQsV0FBVyxRQUFRLE1BQU0sQ0FBQyxHQUFHO0FBQUEsRUFDM0c7QUFDQSxNQUFJLFVBQVU7QUFDWix1QkFBbUIsVUFBVSxTQUFTLFVBQVU7QUFBQSxFQUNsRDtBQUNGO0FBR0EsU0FBUyx5QkFDUCx3QkFDQSxZQUNBLHNCQUNBO0FBQ0EsTUFBSTtBQUNKLFFBQU0sc0JBQWdDLENBQUM7QUFDdkMsYUFBVyxtQkFBbUIsdUJBQXVCLGNBQWMsQ0FBQyxHQUFHO0FBQ3JFLFFBQUksZ0JBQWdCLFdBQVcsR0FBRztBQUNoQyxZQUFNLENBQUMsaUJBQWlCLElBQUk7QUFDNUIsYUFBTyxHQUFHLGlCQUFpQjtBQUMzQixVQUNHLGtCQUFrQixTQUFTLGVBQWUsb0JBQ3pDLGtCQUFrQixPQUFPLFNBQVMsZUFBZSxjQUNqRCxrQkFBa0IsT0FBTyxTQUFTLGlCQUNwQyxrQkFBa0IsU0FBUyxlQUFlLFdBQzFDLFdBQVcsUUFBUSxpQkFBaUIsRUFBRSxTQUFTLGNBQWMsR0FDN0Q7QUFFQSwwQkFBa0IsZ0JBQWdCLG9CQUFvQixZQUFZLFdBQVcsUUFBUSxpQkFBaUIsQ0FBQztBQUFBLE1BQ3pHLFdBQVcsa0JBQWtCLFNBQVMsZUFBZSx5QkFBeUI7QUFFNUUsWUFBSSxlQUFlLFdBQVcsUUFBUSxrQkFBa0IsSUFBSTtBQUU1RCxjQUFNLENBQUMsd0JBQXdCLElBQUksa0JBQWtCO0FBQ3JELGVBQU8sR0FBRywwQkFBMEIsU0FBUyxlQUFlLFVBQVU7QUFDdEUsY0FBTSwrQkFBK0IseUJBQXlCO0FBQzlELFlBQUksaUNBQWlDLHNCQUFzQjtBQUN6RCx5QkFBZSxhQUFhO0FBQUEsWUFDMUIsSUFBSSxPQUFPLE1BQU0sNEJBQTRCLE9BQU8sSUFBSTtBQUFBLFlBQ3hEO0FBQUEsVUFDRjtBQUFBLFFBQ0Y7QUFDQSw0QkFBb0IsS0FBSywyQkFBMkIsWUFBWSxHQUFHO0FBQUEsTUFDckUsV0FBVyxrQkFBa0IsU0FBUyxlQUFlLFlBQVk7QUFFL0QsNEJBQW9CO0FBQUEsVUFDbEIsMkJBQTJCLFdBQVcsUUFBUSxpQkFBaUIsQ0FBQyxJQUFJLG9CQUFvQjtBQUFBLFFBQzFGO0FBQUEsTUFDRixXQUNFLGtCQUFrQixTQUFTLGVBQWUsb0JBQzFDLGtCQUFrQixTQUFTLGVBQWUsZ0JBQzFDO0FBRUEsNEJBQW9CO0FBQUEsVUFDbEIsMEJBQTBCLG9CQUFvQixZQUFZLFdBQVcsUUFBUSxpQkFBaUIsQ0FBQztBQUFBLFFBQ2pHO0FBQUEsTUFDRixPQUFPO0FBQ0wsY0FBTSxJQUFJLE1BQU0scURBQXFELFdBQVcsUUFBUSxpQkFBaUIsQ0FBQyxHQUFHO0FBQUEsTUFDL0c7QUFBQSxJQUNGLFdBQVcsZ0JBQWdCLFdBQVcsR0FBRztBQUV2QyxZQUFNLENBQUMsWUFBWSxXQUFXLElBQUk7QUFDbEMsYUFBTyxHQUFHLGNBQWMsV0FBVztBQUNuQyxZQUFNLG1CQUFtQixHQUFHLG9CQUFvQjtBQUNoRCxVQUFJLFlBQVksU0FBUyxlQUFlLFdBQVcsWUFBWSxpQkFBaUIsUUFBUTtBQUN0Riw0QkFBb0I7QUFBQSxVQUNsQixhQUFhLGdCQUFnQixRQUFRLFdBQVcsUUFBUSxVQUFVLENBQUMsV0FBVyxXQUFXLFFBQVEsV0FBVyxDQUFDO0FBQUEsUUFDL0c7QUFBQSxNQUNGLE9BQU87QUFDTCw0QkFBb0I7QUFBQSxVQUNsQixnQkFBZ0IsZ0JBQWdCLFFBQVEsV0FBVyxRQUFRLFVBQVUsQ0FBQyxNQUFNLFdBQVcsUUFBUSxXQUFXLENBQUM7QUFBQSxRQUM3RztBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNBLFNBQU87QUFBQSxJQUNMO0FBQUEsSUFDQTtBQUFBLEVBQ0Y7QUFDRjtBQThDQSxJQUFNLGFBQWEsWUFBWSxZQUFZLENBQUMsU0FBUyxvQkFBb0IsSUFBSSxDQUFDO0FBQzlFLElBQU0sT0FBcUUsV0FBVztBQUFBLEVBQ3BGLE1BQU07QUFBQSxFQUNOLE1BQU07QUFBQSxJQUNKLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxNQUNKLGFBQWE7QUFBQSxNQUNiLEtBQUssb0JBQW9CLE1BQU07QUFBQSxJQUNqQztBQUFBLElBQ0EsVUFBVTtBQUFBLE1BQ1IsbUJBQW1CO0FBQUE7QUFBQSxNQUVuQixjQUFjO0FBQUEsSUFDaEI7QUFBQSxJQUNBLFNBQVM7QUFBQSxJQUNULFFBQVEsQ0FBQztBQUFBLEVBQ1g7QUFBQSxFQUNBLGdCQUFnQixDQUFDO0FBQUEsRUFDakIsT0FBTyxTQUFTO0FBQ2QsVUFBTSxhQUFhLFFBQVE7QUFDM0IsVUFBTSxlQUFlLFdBQVc7QUFDaEMsV0FBTyxHQUFHLFlBQVk7QUFFdEIsV0FBTztBQUFBLE1BQ0wsMEZBQTBGLENBQ3hGLGdCQUNHO0FBQ0gsWUFBSTtBQUNGLGNBQUksQ0FBQyxjQUFjLFdBQVcsR0FBRztBQUUvQjtBQUFBLFVBQ0Y7QUFFQSxjQUFJLEVBQUUsMEJBQTBCLFdBQVcsS0FBSyxxQkFBcUIsV0FBVyxHQUFHLFVBQVUsUUFBUTtBQUNuRztBQUFBLFVBQ0Y7QUFFQSxnQkFBTSxrQkFBa0IsWUFBWTtBQUNwQyxpQkFBTyxHQUFHLGdCQUFnQixTQUFTLGVBQWUsZ0JBQWdCO0FBQ2xFLGdCQUFNLGNBQWMsZUFBZSxhQUFhLFVBQVU7QUFFMUQsZ0JBQU0sQ0FBQyxlQUFlLElBQUksWUFBWTtBQUN0QyxpQkFBTyxHQUFHLG9CQUFvQixNQUFTO0FBRXZDLGdCQUFNLHlCQUF5QixDQUFDO0FBQ2hDLDZCQUFtQixhQUFhLHdCQUF3QixVQUFVO0FBR2xFLGdCQUFNLDBCQUEwQixXQUFXLFFBQVEsZUFBZTtBQUNsRSxnQkFBTSx1QkFBdUIscUNBQXFDLHVCQUF1QjtBQUd6RixnQkFBTSxhQUFhLGdCQUFnQjtBQUNuQyxpQkFBTyxHQUFHLFdBQVcsU0FBUyxlQUFlLFVBQVU7QUFDdkQsZ0JBQU0sNEJBQTRCO0FBQUEsWUFDaEM7QUFBQSxZQUNBLGNBQWMsV0FBVyxLQUFLLFlBQVksQ0FBQztBQUFBLFlBQzNDLEdBQUksdUJBQXVCLGNBQ3ZCLENBQUMsMEJBQTBCLFdBQVcsUUFBUSx1QkFBdUIsV0FBVyxDQUFDLElBQUksSUFDckYsQ0FBQztBQUFBLFlBQ0wsR0FBSSx1QkFBdUIsaUJBQ3ZCO0FBQUEsY0FDRTtBQUFBLGNBQ0EsR0FBRyx1QkFBdUIsZUFBZTtBQUFBLGdCQUN2QyxDQUFDLEVBQUUsTUFBTSxNQUFNO0FBQUE7QUFBQSxrQkFFYixPQUFPLEtBQUssU0FBUyxlQUFlLFVBQVcsb0JBQW9CLEtBQUssS0FBSyxJQUFJLEtBQUssUUFBUSxJQUFJLEtBQUssS0FBSyxNQUFPLElBQUksV0FBVyxRQUFRLElBQUksQ0FBQyxHQUFHLEtBQUssV0FBVyxRQUFRLEtBQUssQ0FBQztBQUFBO0FBQUEsY0FDcEw7QUFBQSxjQUNBO0FBQUEsWUFDRixJQUNBLENBQUM7QUFBQSxZQUNMO0FBQUEsVUFDRixFQUFFLEtBQUs7QUFBQSxFQUFLLFdBQVcsRUFBRTtBQUV6QixnQkFBTSw0QkFBNEI7QUFDbEMsZ0JBQU0sRUFBRSxpQkFBaUIsb0JBQW9CLElBQUk7QUFBQSxZQUMvQztBQUFBLFlBQ0E7QUFBQSxZQUNBO0FBQUEsVUFDRjtBQUdBLGdCQUFNLHFCQUFxQjtBQUMzQixnQkFBTSxnQkFBZ0IsU0FBUyxvQkFBb0IsS0FBSyx5QkFBeUI7QUFDakYsZ0JBQU0sc0NBQXNDO0FBQUEsWUFDMUMsR0FBSSxvQkFBb0IsU0FBWSxDQUFDLGVBQWUsSUFBSSxDQUFDO0FBQUEsWUFDekQsR0FBRztBQUFBLFVBQ0wsRUFBRSxLQUFLO0FBQUEsRUFBTSxXQUFXLEVBQUU7QUFDMUIsZ0JBQU0sa0JBQWtCLHVCQUF1QixhQUMzQztBQUFBLFlBQ0U7QUFBQSxZQUNBLEdBQUcsYUFBYSxVQUFVLHlCQUF5QjtBQUFBLFlBQ25ELHdDQUF3QyxLQUFLLEtBQUssS0FBSyxtQ0FBbUM7QUFBQSxZQUMxRixZQUFZLHlCQUF5QjtBQUFBLFlBQ3JDO0FBQUEsVUFDRixFQUFFLEtBQUs7QUFBQSxFQUFLLFdBQVcsRUFBRSxJQUN6QjtBQUVKLGtCQUFRLE9BQU87QUFBQSxZQUNiLE1BQU07QUFBQSxZQUNOLFdBQVc7QUFBQSxZQUNYLElBQUksT0FBTztBQUNULHFCQUFPLE1BQU0sWUFBWSx1QkFBdUIsYUFBYSxlQUFlO0FBQUEsWUFDOUU7QUFBQSxVQUNGLENBQUM7QUFBQSxRQStDSCxTQUFTLE9BQU87QUFFZCxrQkFBUSxNQUFNLG1CQUFtQixNQUFNLG1CQUFtQixRQUFRLFFBQVEsTUFBTSxLQUFLO0FBQ3JGLGtCQUFRLE9BQU87QUFBQSxZQUNiLE1BQU07QUFBQSxZQUNOLFdBQVc7QUFBQSxZQUNYLE1BQU07QUFBQSxjQUNKLFVBQVUsUUFBUTtBQUFBLGNBQ2xCLE9BQU8saUJBQWlCLFFBQVEsTUFBTSxTQUFTLElBQUksS0FBSyxVQUFVLEtBQUs7QUFBQSxZQUN6RTtBQUFBLFVBQ0YsQ0FBQztBQUFBLFFBQ0g7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFDRixDQUFDO0FBRUQsSUFBTyxxQkFBUTsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -137,7 +137,7 @@ function createResponseAssertions(fixtureCallInformation, sourceCode, responseVa
|
|
|
137
137
|
nonStatusAssertions
|
|
138
138
|
};
|
|
139
139
|
}
|
|
140
|
-
function getResponseVariableNameToUse(scopeManager, fixtureCallInformation, scopeVariablesMap) {
|
|
140
|
+
function getResponseVariableNameToUse(methodName, urlArgumentNode, originalUrlArgumentText, scopeManager, fixtureCallInformation, scopeVariablesMap) {
|
|
141
141
|
if (fixtureCallInformation.variableAssignment) {
|
|
142
142
|
assert.ok(
|
|
143
143
|
fixtureCallInformation.variableAssignment.expression.type === AST_NODE_TYPES.AssignmentExpression && fixtureCallInformation.variableAssignment.expression.left.type === AST_NODE_TYPES.Identifier
|
|
@@ -160,14 +160,25 @@ function getResponseVariableNameToUse(scopeManager, fixtureCallInformation, scop
|
|
|
160
160
|
scopeVariables = [...scope.set.keys()];
|
|
161
161
|
scopeVariablesMap.set(scope, scopeVariables);
|
|
162
162
|
}
|
|
163
|
+
let responseVariableNameBase = "response";
|
|
164
|
+
if (urlArgumentNode.type === AST_NODE_TYPES.Literal || urlArgumentNode.type === AST_NODE_TYPES.TemplateLiteral) {
|
|
165
|
+
const urlWithoutQuotes = originalUrlArgumentText.replace(/['"`]/gu, "");
|
|
166
|
+
const urlWithoutQuery = urlWithoutQuotes.includes("?") ? urlWithoutQuotes.slice(0, urlWithoutQuotes.indexOf("?")) : urlWithoutQuotes;
|
|
167
|
+
const parts = urlWithoutQuery.startsWith("${") ? urlWithoutQuery.split("/").slice(1) : (
|
|
168
|
+
// eslint-disable-next-line no-magic-numbers
|
|
169
|
+
urlWithoutQuery.split("/").slice(3)
|
|
170
|
+
);
|
|
171
|
+
responseVariableNameBase = [...parts.filter((part) => part !== "tenant"), methodName.toLocaleLowerCase()].map((part) => part.split(/[-]/u)).flat().filter((part) => part.trim() !== "" && !/\$\{.*\}/u.test(part)).map((part) => `${part[0]?.toUpperCase() ?? ""}${part.slice(1)}`).join("");
|
|
172
|
+
responseVariableNameBase = `${responseVariableNameBase[0]?.toLowerCase() ?? ""}${responseVariableNameBase.slice(1)}Response`;
|
|
173
|
+
}
|
|
163
174
|
let responseVariableCounter = 0;
|
|
164
175
|
let responseVariableNameToUse;
|
|
165
176
|
while (responseVariableNameToUse === void 0) {
|
|
166
|
-
responseVariableCounter
|
|
167
|
-
responseVariableNameToUse = `response${responseVariableCounter === 1 ? "" : responseVariableCounter.toString()}`;
|
|
177
|
+
responseVariableNameToUse = `${responseVariableNameBase}${responseVariableCounter === 0 ? "" : responseVariableCounter.toString()}`;
|
|
168
178
|
if (scopeVariables.includes(responseVariableNameToUse)) {
|
|
169
179
|
responseVariableNameToUse = void 0;
|
|
170
180
|
}
|
|
181
|
+
responseVariableCounter++;
|
|
171
182
|
}
|
|
172
183
|
scopeVariables.push(responseVariableNameToUse);
|
|
173
184
|
return responseVariableNameToUse;
|
|
@@ -216,7 +227,7 @@ var rule = createRule({
|
|
|
216
227
|
const {
|
|
217
228
|
variable: responseVariable,
|
|
218
229
|
bodyReferences: responseBodyReferences,
|
|
219
|
-
headersReferences: responseHeadersReferences,
|
|
230
|
+
// headersReferences: responseHeadersReferences,
|
|
220
231
|
statusReferences: responseStatusReferences,
|
|
221
232
|
destructuringBodyVariable: destructuringResponseBodyVariable,
|
|
222
233
|
destructuringStatusVariable: destructuringResponseStatusVariable,
|
|
@@ -227,9 +238,10 @@ var rule = createRule({
|
|
|
227
238
|
const methodNode = fixtureFunction.property;
|
|
228
239
|
assert.ok(methodNode.type === AST_NODE_TYPES.Identifier);
|
|
229
240
|
const methodName = methodNode.name.toUpperCase();
|
|
241
|
+
const methodNameToUse = methodName === "DEL" ? "DELETE" : methodName;
|
|
230
242
|
const fetchRequestArgumentLines = [
|
|
231
243
|
"{",
|
|
232
|
-
` method: '${
|
|
244
|
+
` method: '${methodNameToUse}',`,
|
|
233
245
|
...fixtureCallInformation.requestBody ? [` body: JSON.stringify(${sourceCode.getText(fixtureCallInformation.requestBody)}),`] : [],
|
|
234
246
|
// eslint-disable-next-line no-nested-ternary
|
|
235
247
|
...fixtureCallInformation.requestHeadersObjectLiteral ? [` headers: ${sourceCode.getText(fixtureCallInformation.requestHeadersObjectLiteral)},`] : fixtureCallInformation.requestHeaders ? [
|
|
@@ -246,6 +258,9 @@ var rule = createRule({
|
|
|
246
258
|
].join(`
|
|
247
259
|
${indentation}`);
|
|
248
260
|
const responseVariableNameToUse = getResponseVariableNameToUse(
|
|
261
|
+
methodNameToUse,
|
|
262
|
+
urlArgumentNode,
|
|
263
|
+
originalUrlArgumentText,
|
|
249
264
|
scopeManager,
|
|
250
265
|
fixtureCallInformation,
|
|
251
266
|
scopeVariablesMap
|
|
@@ -331,20 +346,6 @@ ${indentation}`
|
|
|
331
346
|
if (fixtureCallInformation.inlineBodyReference) {
|
|
332
347
|
yield fixer.replaceText(fixtureCallInformation.inlineBodyReference, redefineResponseBodyVariableName);
|
|
333
348
|
}
|
|
334
|
-
for (const responseHeadersReference of responseHeadersReferences) {
|
|
335
|
-
const parent = getParent(responseHeadersReference);
|
|
336
|
-
assert.ok(parent);
|
|
337
|
-
let headerName;
|
|
338
|
-
if (parent.type === AST_NODE_TYPES.MemberExpression) {
|
|
339
|
-
const headerNameNode = parent.property;
|
|
340
|
-
headerName = parent.computed ? sourceCode.getText(headerNameNode) : `'${sourceCode.getText(headerNameNode)}'`;
|
|
341
|
-
} else if (parent.type === AST_NODE_TYPES.CallExpression) {
|
|
342
|
-
const headerNameNode = parent.arguments[0];
|
|
343
|
-
headerName = sourceCode.getText(headerNameNode);
|
|
344
|
-
}
|
|
345
|
-
assert.ok(headerName !== void 0);
|
|
346
|
-
yield fixer.replaceText(parent, `${responseVariableNameToUse}.headers.get(${headerName})`);
|
|
347
|
-
}
|
|
348
349
|
for (const responseStatusReference of responseStatusReferences) {
|
|
349
350
|
if (responseStatusReference.property.type === AST_NODE_TYPES.Identifier && responseStatusReference.property.name === "statusCode") {
|
|
350
351
|
yield fixer.replaceText(responseStatusReference.property, `status`);
|
|
@@ -379,4 +380,4 @@ export {
|
|
|
379
380
|
no_fixture_default as default,
|
|
380
381
|
ruleId
|
|
381
382
|
};
|
|
382
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/agent/no-fixture.ts"],
  "mappings": "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",
  "names": []
}

|
|
383
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/agent/no-fixture.ts"],
  "mappings": "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",
  "names": []
}

|
|
@@ -27,8 +27,8 @@ var rule = createRule({
|
|
|
27
27
|
create(context) {
|
|
28
28
|
const sourceCode = context.sourceCode;
|
|
29
29
|
const scopeManager = sourceCode.scopeManager;
|
|
30
|
-
const
|
|
31
|
-
const typeChecker =
|
|
30
|
+
const parserServices = ESLintUtils.getParserServices(context);
|
|
31
|
+
const typeChecker = parserServices.program.getTypeChecker();
|
|
32
32
|
function isUrlArgumentValid(urlArgument, scope) {
|
|
33
33
|
if (urlArgument?.type === AST_NODE_TYPES.Literal && typeof urlArgument.value === "string" || urlArgument?.type === AST_NODE_TYPES.TemplateLiteral) {
|
|
34
34
|
const urlText = sourceCode.getText(urlArgument);
|
|
@@ -49,7 +49,7 @@ var rule = createRule({
|
|
|
49
49
|
return false;
|
|
50
50
|
}
|
|
51
51
|
function getType(identifier) {
|
|
52
|
-
const variable =
|
|
52
|
+
const variable = parserServices.esTreeNodeToTSNodeMap.get(identifier);
|
|
53
53
|
const variableType = typeChecker.getTypeAtLocation(variable);
|
|
54
54
|
return typeChecker.typeToString(variableType);
|
|
55
55
|
}
|
|
@@ -182,4 +182,4 @@ export {
|
|
|
182
182
|
no_service_wrapper_default as default,
|
|
183
183
|
ruleId
|
|
184
184
|
};
|
|
185
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FnZW50L25vLXNlcnZpY2Utd3JhcHBlci50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLFVBQVUsY0FBYztBQUVqQyxTQUFTLHNCQUFrQztBQUMzQyxTQUFTLGdCQUFnQixtQkFBNkI7QUFFdEQsT0FBTyx5QkFBeUI7QUFDaEMsU0FBUyw2QkFBNkI7QUFDdEMsU0FBUyxzQkFBc0I7QUFDL0IsU0FBUyxxQkFBcUIsMENBQTBDO0FBRWpFLElBQU0sU0FBUztBQUV0QixJQUFNLGFBQWEsWUFBWSxZQUFZLENBQUMsU0FBUyxvQkFBb0IsSUFBSSxDQUFDO0FBRTlFLElBQU0sT0FBd0YsV0FBVztBQUFBLEVBQ3ZHLE1BQU07QUFBQSxFQUNOLE1BQU07QUFBQSxJQUNKLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxNQUNKLGFBQWE7QUFBQSxJQUNmO0FBQUEsSUFDQSxVQUFVO0FBQUEsTUFDUixtQkFBbUI7QUFBQSxNQUNuQixnQkFDRTtBQUFBLE1BQ0YsY0FDRTtBQUFBLElBQ0o7QUFBQSxJQUNBLFNBQVM7QUFBQSxJQUNULFFBQVEsQ0FBQztBQUFBLEVBQ1g7QUFBQSxFQUNBLGdCQUFnQixDQUFDO0FBQUEsRUFDakIsT0FBTyxTQUFTO0FBQ2QsVUFBTSxhQUFhLFFBQVE7QUFDM0IsVUFBTSxlQUFlLFdBQVc7QUFDaEMsVUFBTSxpQkFBaUIsWUFBWSxrQkFBa0IsT0FBTztBQUM1RCxVQUFNLGNBQWMsZUFBZSxRQUFRLGVBQWU7QUFFMUQsYUFBUyxtQkFBbUIsYUFBd0MsT0FBYztBQUNoRixVQUNHLGFBQWEsU0FBUyxlQUFlLFdBQVcsT0FBTyxZQUFZLFVBQVUsWUFDOUUsYUFBYSxTQUFTLGVBQWUsaUJBQ3JDO0FBQ0EsY0FBTSxVQUFVLFdBQVcsUUFBUSxXQUFXO0FBQzlDLGVBQU8sb0JBQW9CLE9BQU87QUFBQSxNQUNwQztBQUVBLFVBQUksYUFBYSxTQUFTLGVBQWUsWUFBWTtBQUNuRCxjQUFNLGdCQUFnQixNQUFNLFVB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
|
|
@@ -55,21 +55,6 @@ function analyzeFixtureCall(call, results, sourceCode) {
|
|
|
55
55
|
assert.ok(assertionCall && assertionCall.type === AST_NODE_TYPES.CallExpression);
|
|
56
56
|
results.assertions = [...results.assertions ?? [], assertionCall.arguments];
|
|
57
57
|
nextCall = assertionCall;
|
|
58
|
-
} else if (parent.property.name === "send") {
|
|
59
|
-
const sendRequestBodyCall = getParent(parent);
|
|
60
|
-
assert.ok(sendRequestBodyCall && sendRequestBodyCall.type === AST_NODE_TYPES.CallExpression);
|
|
61
|
-
results.requestBody = sendRequestBodyCall.arguments[0];
|
|
62
|
-
nextCall = sendRequestBodyCall;
|
|
63
|
-
} else if (parent.property.name === "set") {
|
|
64
|
-
const setRequestHeaderCall = getParent(parent);
|
|
65
|
-
assert.ok(setRequestHeaderCall && setRequestHeaderCall.type === AST_NODE_TYPES.CallExpression);
|
|
66
|
-
const [arg1, arg2] = setRequestHeaderCall.arguments;
|
|
67
|
-
if (arg1.type === AST_NODE_TYPES.ObjectExpression) {
|
|
68
|
-
results.requestHeadersObjectLiteral = arg1;
|
|
69
|
-
} else {
|
|
70
|
-
results.requestHeaders = [...results.requestHeaders ?? [], { name: arg1, value: arg2 }];
|
|
71
|
-
}
|
|
72
|
-
nextCall = setRequestHeaderCall;
|
|
73
58
|
}
|
|
74
59
|
} else {
|
|
75
60
|
throw new Error(`Unexpected expression in fixture/supertest call ${sourceCode.getText(parent)}.`);
|
|
@@ -130,7 +115,7 @@ function createResponseAssertions(fixtureCallInformation, sourceCode, responseVa
|
|
|
130
115
|
nonStatusAssertions
|
|
131
116
|
};
|
|
132
117
|
}
|
|
133
|
-
function getResponseVariableNameToUse(scopeManager, fixtureCallInformation, scopeVariablesMap) {
|
|
118
|
+
function getResponseVariableNameToUse(supertestFunctionName, scopeManager, fixtureCallInformation, scopeVariablesMap) {
|
|
134
119
|
if (fixtureCallInformation.variableAssignment) {
|
|
135
120
|
assert.ok(
|
|
136
121
|
fixtureCallInformation.variableAssignment.expression.type === AST_NODE_TYPES.AssignmentExpression && fixtureCallInformation.variableAssignment.expression.left.type === AST_NODE_TYPES.Identifier
|
|
@@ -156,11 +141,11 @@ function getResponseVariableNameToUse(scopeManager, fixtureCallInformation, scop
|
|
|
156
141
|
let responseVariableCounter = 0;
|
|
157
142
|
let responseVariableNameToUse;
|
|
158
143
|
while (responseVariableNameToUse === void 0) {
|
|
159
|
-
responseVariableCounter
|
|
160
|
-
responseVariableNameToUse = `response${responseVariableCounter === 1 ? "" : responseVariableCounter.toString()}`;
|
|
144
|
+
responseVariableNameToUse = `${supertestFunctionName}Response${responseVariableCounter === 0 ? "" : responseVariableCounter.toString()}`;
|
|
161
145
|
if (scopeVariables.includes(responseVariableNameToUse)) {
|
|
162
146
|
responseVariableNameToUse = void 0;
|
|
163
147
|
}
|
|
148
|
+
responseVariableCounter++;
|
|
164
149
|
}
|
|
165
150
|
scopeVariables.push(responseVariableNameToUse);
|
|
166
151
|
return responseVariableNameToUse;
|
|
@@ -200,6 +185,12 @@ var rule = createRule({
|
|
|
200
185
|
if (supertestCall.callee.object.type !== AST_NODE_TYPES.CallExpression || supertestCall.callee.object.callee.type === AST_NODE_TYPES.MemberExpression && supertestCall.callee.object.callee.property.type === AST_NODE_TYPES.Identifier && supertestCall.callee.object.callee.property.name === "expect") {
|
|
201
186
|
return;
|
|
202
187
|
}
|
|
188
|
+
if (supertestCall.callee.object.callee.type === AST_NODE_TYPES.MemberExpression && supertestCall.callee.object.callee.object.type === AST_NODE_TYPES.MemberExpression && supertestCall.callee.object.callee.object.object.type === AST_NODE_TYPES.Identifier && supertestCall.callee.object.callee.object.object.name === "fixture" && supertestCall.callee.object.callee.object.property.type === AST_NODE_TYPES.Identifier && supertestCall.callee.object.callee.object.property.name === "api") {
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
const fullSupertestFunctionName = sourceCode.getText(supertestCall.callee.object.callee);
|
|
192
|
+
const supertestFunctionName = fullSupertestFunctionName.split(".").pop();
|
|
193
|
+
assert.ok(supertestFunctionName !== void 0);
|
|
203
194
|
if (isUsedInArrayOrAsArgument(supertestCall) || getEnclosingFunction(supertestCall)?.async === false) {
|
|
204
195
|
return;
|
|
205
196
|
}
|
|
@@ -211,13 +202,14 @@ var rule = createRule({
|
|
|
211
202
|
const {
|
|
212
203
|
variable: responseVariable,
|
|
213
204
|
bodyReferences: responseBodyReferences,
|
|
214
|
-
headersReferences: responseHeadersReferences,
|
|
205
|
+
// headersReferences: responseHeadersReferences,
|
|
215
206
|
statusReferences: responseStatusReferences,
|
|
216
207
|
destructuringBodyVariable: destructuringResponseBodyVariable,
|
|
217
208
|
destructuringHeadersVariable: destructuringResponseHeadersVariable,
|
|
218
209
|
destructuringStatusVariable: destructuringResponseStatusVariable
|
|
219
210
|
} = analyzeResponseReferences(fixtureCallInformation.variableDeclaration, scopeManager);
|
|
220
211
|
const responseVariableNameToUse = getResponseVariableNameToUse(
|
|
212
|
+
supertestFunctionName,
|
|
221
213
|
scopeManager,
|
|
222
214
|
fixtureCallInformation,
|
|
223
215
|
scopeVariablesMap
|
|
@@ -303,20 +295,6 @@ ${indentation}`
|
|
|
303
295
|
if (fixtureCallInformation.inlineBodyReference) {
|
|
304
296
|
yield fixer.replaceText(fixtureCallInformation.inlineBodyReference, redefineResponseBodyVariableName);
|
|
305
297
|
}
|
|
306
|
-
for (const responseHeadersReference of responseHeadersReferences) {
|
|
307
|
-
const parent = getParent(responseHeadersReference);
|
|
308
|
-
assert.ok(parent);
|
|
309
|
-
let headerName;
|
|
310
|
-
if (parent.type === AST_NODE_TYPES.MemberExpression) {
|
|
311
|
-
const headerNameNode = parent.property;
|
|
312
|
-
headerName = parent.computed ? sourceCode.getText(headerNameNode) : `'${sourceCode.getText(headerNameNode)}'`;
|
|
313
|
-
} else if (parent.type === AST_NODE_TYPES.CallExpression) {
|
|
314
|
-
const headerNameNode = parent.arguments[0];
|
|
315
|
-
headerName = sourceCode.getText(headerNameNode);
|
|
316
|
-
}
|
|
317
|
-
assert.ok(headerName !== void 0);
|
|
318
|
-
yield fixer.replaceText(parent, `${responseVariableNameToUse}.headers.get(${headerName})`);
|
|
319
|
-
}
|
|
320
298
|
for (const responseStatusReference of responseStatusReferences) {
|
|
321
299
|
if (responseStatusReference.property.type === AST_NODE_TYPES.Identifier && responseStatusReference.property.name === "statusCode") {
|
|
322
300
|
yield fixer.replaceText(responseStatusReference.property, `status`);
|
|
@@ -351,4 +329,4 @@ export {
|
|
|
351
329
|
no_supertest_default as default,
|
|
352
330
|
ruleId
|
|
353
331
|
};
|
|
354
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/agent/no-supertest.ts"],
  "mappings": "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",
  "names": []
}

|
|
332
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/agent/no-supertest.ts"],
  "mappings": ";AAQA,SAAS,UAAU,cAAc;AAEjC,SAAS,gBAAgB,mBAA6B;AAItD;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,OAAO,yBAAyB;AAChC,SAAS,sBAAsB;AAC/B,SAAS,iCAAiC;AAC1C,SAAS,8BAA8B,iCAAiC,sCAAsC;AAEvG,IAAM,SAAS;AAqBtB,SAAS,mBAAmB,MAA+B,SAAiC,YAAwB;AAClH,QAAM,SAAS,UAAU,IAAI;AAC7B,SAAO,GAAG,QAAQ,qDAAqD;AAEvE,MAAI;AACJ,MAAI,OAAO,SAAS,eAAe,iBAAiB;AAElD,YAAQ,cAAc;AACtB,YAAQ,WAAW;AAAA,EACrB,WACE,OAAO,SAAS,eAAe,mBAC/B,OAAO,SAAS,eAAe,kBAC/B,OAAO,SAAS,eAAe,yBAC/B;AAEA,YAAQ,cAAc;AACtB,YAAQ,WAAW;AAAA,EACrB,WAAW,OAAO,SAAS,eAAe,iBAAiB;AACzD,YAAQ,cAAc;AACtB,UAAM,qBAAqB,sBAAsB,MAAM;AACvD,WAAO,GAAG,kBAAkB;AAC5B,UAAM,cAAc,UAAU,MAAM;AACpC,QAAI,aAAa,SAAS,eAAe,kBAAkB;AACzD,cAAQ,WAAW;AACnB,cAAQ,sBAAsB;AAC9B,UAAI,YAAY,SAAS,SAAS,eAAe,cAAc,YAAY,SAAS,SAAS,QAAQ;AACnG,gBAAQ,sBAAsB;AAAA,MAChC;AACA,UACE,YAAY,SAAS,SAAS,eAAe,eAC5C,YAAY,SAAS,SAAS,YAAY,YAAY,SAAS,SAAS,eACzE;AACA,gBAAQ,wBAAwB;AAAA,MAClC;AACA,UACE,YAAY,SAAS,SAAS,eAAe,eAC5C,YAAY,SAAS,SAAS,YAAY,YAAY,SAAS,SAAS,YACzE;AACA,gBAAQ,yBAAyB;AAAA,MACnC;AAAA,IACF,WAAW,mBAAmB,SAAS,eAAe,qBAAqB;AACzE,cAAQ,sBAAsB;AAC9B,cAAQ,WAAW;AAAA,IACrB,WACE,mBAAmB,SAAS,eAAe,uBAC3C,mBAAmB,WAAW,SAAS,eAAe,sBACtD;AACA,cAAQ,qBAAqB;AAC7B,cAAQ,WAAW;AAAA,IACrB,OAAO;AACL,cAAQ,WAAW;AAAA,IACrB;AAAA,EACF,WAAW,OAAO,SAAS,eAAe,oBAAoB,OAAO,SAAS,SAAS,eAAe,YAAY;AAChH,QAAI,OAAO,SAAS,SAAS,UAAU;AAErC,YAAM,gBAAgB,UAAU,MAAM;AACtC,aAAO,GAAG,iBAAiB,cAAc,SAAS,eAAe,cAAc;AAC/E,cAAQ,aAAa,CAAC,GAAI,QAAQ,cAAc,CAAC,GAAI,cAAc,SAAkC;AACrG,iBAAW;AAAA,IACb;AAAA,EACF,OAAO;AACL,UAAM,IAAI,MAAM,mDAAmD,WAAW,QAAQ,MAAM,CAAC,GAAG;AAAA,EAClG;AACA,MAAI,UAAU;AACZ,uBAAmB,UAAU,SAAS,UAAU;AAAA,EAClD;AACF;AAGA,SAAS,yBACP,wBACA,YACA,sBACA,sCACA;AACA,MAAI;AACJ,QAAM,sBAAgC,CAAC;AACvC,aAAW,mBAAmB,uBAAuB,cAAc,CAAC,GAAG;AACrE,QAAI,gBAAgB,WAAW,GAAG;AAChC,YAAM,CAAC,iBAAiB,IAAI;AAC5B,aAAO,GAAG,iBAAiB;AAC3B,UACG,kBAAkB,SAAS,eAAe,oBACzC,kBAAkB,OAAO,SAAS,eAAe,cACjD,kBAAkB,OAAO,SAAS,iBACpC,kBAAkB,SAAS,eAAe,WAC1C,WAAW,QAAQ,iBAAiB,EAAE,SAAS,cAAc,GAC7D;AAEA,0BAAkB,gBAAgB,oBAAoB,YAAY,WAAW,QAAQ,iBAAiB,CAAC;AAAA,MACzG,WAAW,kBAAkB,SAAS,eAAe,yBAAyB;AAE5E,YAAI,eAAe,WAAW,QAAQ,kBAAkB,IAAI;AAE5D,cAAM,CAAC,wBAAwB,IAAI,kBAAkB;AACrD,eAAO,GAAG,0BAA0B,SAAS,eAAe,UAAU;AACtE,cAAM,+BAA+B,yBAAyB;AAC9D,YAAI,iCAAiC,sBAAsB;AACzD,yBAAe,aAAa;AAAA,YAC1B,IAAI,OAAO,MAAM,4BAA4B,OAAO,IAAI;AAAA,YACxD;AAAA,UACF;AAAA,QACF;AACA,4BAAoB,KAAK,2BAA2B,YAAY,GAAG;AAAA,MACrE,WAAW,kBAAkB,SAAS,eAAe,YAAY;AAE/D,4BAAoB;AAAA,UAClB,2BAA2B,WAAW,QAAQ,iBAAiB,CAAC,IAAI,oBAAoB;AAAA,QAC1F;AAAA,MACF,WACE,kBAAkB,SAAS,eAAe,oBAC1C,kBAAkB,SAAS,eAAe,gBAC1C;AAEA,4BAAoB;AAAA,UAClB,0BAA0B,oBAAoB,YAAY,WAAW,QAAQ,iBAAiB,CAAC;AAAA,QACjG;AAAA,MACF,OAAO;AACL,cAAM,IAAI,MAAM,qDAAqD,WAAW,QAAQ,iBAAiB,CAAC,GAAG;AAAA,MAC/G;AAAA,IACF,WAAW,gBAAgB,WAAW,GAAG;AAEvC,YAAM,CAAC,YAAY,WAAW,IAAI;AAClC,aAAO,GAAG,cAAc,WAAW;AACnC,YAAM,mBACJ,yCAAyC,SACrC,qCAAqC,OACrC,GAAG,oBAAoB;AAC7B,UAAI,YAAY,SAAS,eAAe,WAAW,YAAY,iBAAiB,QAAQ;AACtF,4BAAoB;AAAA,UAClB,aAAa,gBAAgB,QAAQ,WAAW,QAAQ,UAAU,CAAC,WAAW,WAAW,QAAQ,WAAW,CAAC;AAAA,QAC/G;AAAA,MACF,OAAO;AACL,4BAAoB;AAAA,UAClB,gBAAgB,gBAAgB,QAAQ,WAAW,QAAQ,UAAU,CAAC,MAAM,WAAW,QAAQ,WAAW,CAAC;AAAA,QAC7G;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEA,SAAS,6BACP,uBACA,cACA,wBACA,mBACA;AACA,MAAI,uBAAuB,oBAAoB;AAC7C,WAAO;AAAA,MACL,uBAAuB,mBAAmB,WAAW,SAAS,eAAe,wBAC3E,uBAAuB,mBAAmB,WAAW,KAAK,SAAS,eAAe;AAAA,IACtF;AACA,WAAO,uBAAuB,mBAAmB,WAAW,KAAK;AAAA,EACnE;AAEA,MAAI,uBAAuB,qBAAqB;AAC9C,UAAM,mBAAmB,uBAAuB,oBAAoB,aAAa,CAAC;AAElF,QAAI,qBAAqB,UAAa,iBAAiB,GAAG,SAAS,eAAe,YAAY;AAC5F,aAAO,iBAAiB,GAAG;AAAA,IAC7B;AAAA,EACF;AAEA,QAAM,qBAAqB,sBAAsB,uBAAuB,QAAQ;AAChF,eAAa,qBAAqB,uBAAuB,QAAQ;AACjE,SAAO,GAAG,kBAAkB;AAC5B,QAAM,QAAQ,aAAa,QAAQ,kBAAkB;AACrD,SAAO,GAAG,UAAU,IAAI;AACxB,MAAI,iBAAiB,kBAAkB,IAAI,KAAK;AAChD,MAAI,CAAC,gBAAgB;AACnB,qBAAiB,CAAC,GAAG,MAAM,IAAI,KAAK,CAAC;AACrC,sBAAkB,IAAI,OAAO,cAAc;AAAA,EAC7C;AAEA,MAAI,0BAA0B;AAC9B,MAAI;AACJ,SAAO,8BAA8B,QAAW;AAC9C,gCAA4B,GAAG,qBAAqB,WAAW,4BAA4B,IAAI,KAAK,wBAAwB,SAAS,CAAC;AACtI,QAAI,eAAe,SAAS,yBAAyB,GAAG;AACtD,kCAA4B;AAAA,IAC9B;AACA;AAAA,EACF;AACA,iBAAe,KAAK,yBAAyB;AAC7C,SAAO;AACT;AAEA,SAAS,2BAA2B,uBAA2D;AAC7F,QAAM,SAAS,UAAU,qBAAqB;AAC9C,SAAO,QAAQ,SAAS,eAAe,sBAAsB,OAAO,GAAG,SAAS,eAAe;AACjG;AAEA,IAAM,aAAa,YAAY,YAAY,CAAC,SAAS,oBAAoB,IAAI,CAAC;AAE9E,IAAM,OAAqE,WAAW;AAAA,EACpF,MAAM;AAAA,EACN,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,MAAM;AAAA,MACJ,aAAa;AAAA,MACb,KAAK,oBAAoB,MAAM;AAAA,IACjC;AAAA,IACA,UAAU;AAAA,MACR,mBAAmB;AAAA,MACnB,cAAc;AAAA,IAChB;AAAA,IACA,SAAS;AAAA,IACT,QAAQ,CAAC;AAAA,EACX;AAAA,EACA,gBAAgB,CAAC;AAAA;AAAA,EAEjB,OAAO,SAAS;AACd,UAAM,aAAa,QAAQ;AAC3B,UAAM,eAAe,WAAW;AAChC,WAAO,GAAG,iBAAiB,IAAI;AAC/B,UAAM,oBAAoB,oBAAI,IAAqB;AAEnD,WAAO;AAAA;AAAA,MAEL,iDAAiD,CAC/C,kBAEG;AACH,YAAI;AACF,iBAAO,GAAG,cAAc,OAAO,SAAS,eAAe,gBAAgB;AACvE,cACE,cAAc,OAAO,OAAO,SAAS,eAAe,kBACnD,cAAc,OAAO,OAAO,OAAO,SAAS,eAAe,oBAC1D,cAAc,OAAO,OAAO,OAAO,SAAS,SAAS,eAAe,cACpE,cAAc,OAAO,OAAO,OAAO,SAAS,SAAS,UACvD;AAEA;AAAA,UACF;AACA,cACE,cAAc,OAAO,OAAO,OAAO,SAAS,eAAe,oBAC3D,cAAc,OAAO,OAAO,OAAO,OAAO,SAAS,eAAe,oBAClE,cAAc,OAAO,OAAO,OAAO,OAAO,OAAO,SAAS,eAAe,cACzE,cAAc,OAAO,OAAO,OAAO,OAAO,OAAO,SAAS,aAC1D,cAAc,OAAO,OAAO,OAAO,OAAO,SAAS,SAAS,eAAe,cAC3E,cAAc,OAAO,OAAO,OAAO,OAAO,SAAS,SAAS,OAC5D;AAEA;AAAA,UACF;AAEA,gBAAM,4BAA4B,WAAW,QAAQ,cAAc,OAAO,OAAO,MAAM;AACvF,gBAAM,wBAAwB,0BAA0B,MAAM,GAAG,EAAE,IAAI;AACvE,iBAAO,GAAG,0BAA0B,MAAS;AAE7C,cAAI,0BAA0B,aAAa,KAAK,qBAAqB,aAAa,GAAG,UAAU,OAAO;AAEpG;AAAA,UACF;AAEA,gBAAM,cAAc,eAAe,eAAe,UAAU;AAE5D,gBAAM,yBAAyB,CAAC;AAChC,gBAAM,kBAAkB,cAAc,OAAO;AAC7C,6BAAmB,iBAAiB,wBAAwB,UAAU;AACtE,iCAAuB,YAAY,KAAK,EAAE,IAAI,CAAC,QAAQ,WAAW,QAAQ,GAAG,CAAC;AAE9E,gBAAM;AAAA,YACJ,UAAU;AAAA,YACV,gBAAgB;AAAA;AAAA,YAEhB,kBAAkB;AAAA,YAClB,2BAA2B;AAAA,YAC3B,8BAA8B;AAAA,YAC9B,6BAA6B;AAAA,UAC/B,IAAI,0BAA0B,uBAAuB,qBAAqB,YAAY;AAEtF,gBAAM,4BAA4B;AAAA,YAChC;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAEA,gBAAM,2CACJ,sCAAsC,UACtC,uBAAuB,wBAAwB,UAC9C,uBAAuB,SAAS,KAAK,CAAC,uBAAuB,KAAK,0BAA0B;AAC/F,gBAAM,mCAAmC,GAAG,yBAAyB;AAErE,gBAAM,6CACJ,wCAAwC,UACxC,uBAAuB,0BAA0B;AACnD,gBAAM,qCAAqC,GAAG,yBAAyB;AAEvE,gBAAM,8CACH,yCAAyC;AAAA,UAEvC,qCAAgE,SAAS,eAAe,iBAC3F,uBAAuB,2BAA2B;AACpD,gBAAM,sCAAsC,GAAG,yBAAyB;AAExE,gBAAM,uCACH,uBAAuB,uBAAuB,UAC7C,qBAAqB,UACrB,uBAAuB,eAAe,UACxC,4CACA,8CACA;AAEF,gBAAM,2CAA2C,uCAC7C;AAAA;AAAA,YAEE,GAAI,oCACA;AAAA;AAAA,cAEE,GAAG,uBAAuB,qBAAqB,QAAQ,OAAO,IAAK,kCAA6D,SAAS,eAAe,gBAAgB,WAAW,QAAQ,iCAA2D,IAAK,kCAA+C,IAAI,MAAM,6BAA6B,yBAAyB,CAAC;AAAA,YAC7W,IACA,2CACE;AAAA,cACE,SAAS,gCAAgC,MAAM,6BAA6B,yBAAyB,CAAC;AAAA,YACxG,IACA,CAAC;AAAA;AAAA,YAEP,GAAI,sCACA;AAAA;AAAA,cAEE,GAAG,uBAAuB,qBAAqB,QAAQ,OAAO,IAAK,oCAA+D,SAAS,eAAe,gBAAgB,WAAW,QAAQ,mCAA6D,IAAK,oCAAiD,IAAI,MAAM,+BAA+B,yBAAyB,CAAC;AAAA,YACrX,IACA,6CACE;AAAA,cACE,SAAS,kCAAkC,MAAM,+BAA+B,yBAAyB,CAAC;AAAA,YAC5G,IACA,CAAC;AAAA;AAAA,YAEP,GAAI;AAAA;AAAA,cAEC,qCAAgE,SACjE,eAAe,gBACZ,qCAAgE,WAAW,IAAI,CAAC,aAAa;AAC5F,uBAAO,GAAG,SAAS,SAAS,eAAe,QAAQ;AACnD,uBAAO,GAAG,SAAS,MAAM,SAAS,eAAe,UAAU;AAE3D,uBAAO,GAAG,uBAAuB,qBAAqB,QAAQ,OAAO,IAAI,SAAS,MAAM,IAAI,MAAM,gCAAgC,yBAAyB,CAAC,QAAQ,SAAS,IAAI,SAAS,eAAe,UAAU,WAAW,QAAQ,SAAS,GAAG,IAAI,IAAI,WAAW,QAAQ,SAAS,GAAG,CAAC,GAAG;AAAA,cAC/R,CAAC,IACD;AAAA,gBACE,GAAG,uBAAuB,qBAAqB,QAAQ,OAAO,IAAK,qCAAkD,IAAI,MAAM,gCAAgC,yBAAyB,CAAC;AAAA,cAC3L;AAAA,gBACF,8CACE;AAAA,cACE,SAAS,mCAAmC,MAAM,gCAAgC,yBAAyB,CAAC;AAAA,YAC9G,IACA,CAAC;AAAA,UACT,IACA,CAAC;AAEL,gBAAM,EAAE,iBAAiB,oBAAoB,IAAI;AAAA,YAC/C;AAAA,YACA;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAGA,gBAAM,gBAAgB,WAAW,QAAQ,eAAe;AACxD,gBAAM,qBAAqB,CAAC,uCACxB,gBACA,GAAG,uBAAuB,qBAAqB,QAAQ,OAAO,IAAI,yBAAyB,YAAY,aAAa;AAExH,gBAAM,gBAAgB,uCAClB,uBAAuB,WACvB,uBAAuB;AAC3B,gBAAM,sCAAsC;AAAA,YAC1C;AAAA,YACA,GAAI,oBAAoB,SAAY,CAAC,eAAe,IAAI,CAAC;AAAA,YACzD,GAAG;AAAA,YACH,GAAG;AAAA,UACL,EAAE,KAAK;AAAA,EAAM,WAAW,EAAE;AAE1B,kBAAQ,OAAO;AAAA,YACb,MAAM;AAAA,YACN,WAAW;AAAA,YAEX,CAAC,IAAI,OAAO;AACV,kBAAI,uBAAuB,qBAAqB;AAC9C,sBAAM,uBAAuB;AAAA,kBAC3B;AAAA,kBACA,GAAG,mCAAmC;AAAA,EAAM,WAAW;AAAA,gBACzD,EAAE,KAAK,EAAE;AACT,sBAAM,MAAM,iBAAiB,uBAAuB,qBAAqB,oBAAoB;AAAA,cAC/F,OAAO;AACL,sBAAM,MAAM,YAAY,eAAe,kBAAkB;AAEzD,sBAAM,sBAAsB,WAAW,QAAQ,aAAa,EAAE,SAAS,GAAG;AAC1E,sBAAM,MAAM;AAAA,kBACV;AAAA,kBACA,sBAAsB,GAAG,mCAAmC,MAAM;AAAA,gBACpE;AAAA,cACF;AAGA,yBAAW,yBAAyB,wBAAwB;AAC1D,sBAAM,MAAM;AAAA,kBACV;AAAA,kBACA,4CAA4C,CAAC,2BAA2B,qBAAqB,IACzF,mCACA,6BAA6B,yBAAyB;AAAA,gBAC5D;AAAA,cACF;AACA,kBAAI,uBAAuB,qBAAqB;AAC9C,sBAAM,MAAM,YAAY,uBAAuB,qBAAqB,gCAAgC;AAAA,cACtG;AAqBA,yBAAW,2BAA2B,0BAA0B;AAC9D,oBACE,wBAAwB,SAAS,SAAS,eAAe,cACzD,wBAAwB,SAAS,SAAS,cAC1C;AACA,wBAAM,MAAM,YAAY,wBAAwB,UAAU,QAAQ;AAAA,gBACpE;AAAA,cACF;AAGA,kBACE,uBAAuB,SAAS,SAAS,eAAe,mBACxD,uBAAuB,eAAe,QACtC;AACA,sBAAM,MAAM;AAAA,kBACV,uBAAuB;AAAA,kBACvB;AAAA,EAAK,WAAW,UAAU,yBAAyB;AAAA,gBACrD;AAAA,cACF;AAAA,YACF;AAAA,UACF,CAAC;AAAA,QACH,SAAS,OAAO;AAEd,kBAAQ,MAAM,mBAAmB,MAAM,mBAAmB,QAAQ,QAAQ,MAAM,KAAK;AACrF,kBAAQ,OAAO;AAAA,YACb,MAAM;AAAA,YACN,WAAW;AAAA,YACX,MAAM;AAAA,cACJ,UAAU,QAAQ;AAAA,cAClB,OAAO,iBAAiB,QAAQ,MAAM,SAAS,IAAI,KAAK,UAAU,KAAK;AAAA,YACzE;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;AAED,IAAO,uBAAQ;",
  "names": []
}

|
|
@@ -7,7 +7,7 @@ var log = debug("eslint-plugin:response-reference");
|
|
|
7
7
|
function analyzeResponseReferences(variableDeclaration, scopeManager) {
|
|
8
8
|
const results = {
|
|
9
9
|
bodyReferences: [],
|
|
10
|
-
headersReferences: [],
|
|
10
|
+
// headersReferences: [],
|
|
11
11
|
statusReferences: []
|
|
12
12
|
};
|
|
13
13
|
if (!variableDeclaration) {
|
|
@@ -27,9 +27,6 @@ function analyzeResponseReferences(variableDeclaration, scopeManager) {
|
|
|
27
27
|
results.bodyReferences = responseReferences.filter(
|
|
28
28
|
(node) => node?.type === AST_NODE_TYPES.MemberExpression && node.property.type === AST_NODE_TYPES.Identifier && node.property.name === "body"
|
|
29
29
|
);
|
|
30
|
-
results.headersReferences = responseReferences.filter(
|
|
31
|
-
(node) => node?.type === AST_NODE_TYPES.MemberExpression && node.property.type === AST_NODE_TYPES.Identifier && (node.property.name === "header" || node.property.name === "headers" || node.property.name === "get")
|
|
32
|
-
);
|
|
33
30
|
results.statusReferences = responseReferences.filter(
|
|
34
31
|
(node) => node?.type === AST_NODE_TYPES.MemberExpression && node.property.type === AST_NODE_TYPES.Identifier && (node.property.name === "status" || node.property.name === "statusCode")
|
|
35
32
|
);
|
|
@@ -75,4 +72,4 @@ function analyzeResponseReferences(variableDeclaration, scopeManager) {
|
|
|
75
72
|
export {
|
|
76
73
|
analyzeResponseReferences
|
|
77
74
|
};
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FnZW50L3Jlc3BvbnNlLXJlZmVyZW5jZS50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLFVBQVUsY0FBYztBQUVqQyxPQUFPLFdBQVc7QUFFbEIsU0FBUyxzQkFBZ0M7QUFFekMsU0FBUyxpQkFBaUI7QUFFMUIsSUFBTSxNQUFNLE1BQU0sa0NBQWtDO0FBUTdDLFNBQVMsMEJBQ2QscUJBQ0EsY0FVQTtBQUNBLFFBQU0sVUFTRjtBQUFBLElBQ0YsZ0JBQWdCLENBQUM7QUFBQTtBQUFBLElBRWpCLGtCQUFrQixDQUFDO0FBQUEsRUFDckI7QUFDQSxNQUFJLENBQUMscUJBQXFCO0FBQ3hCLFdBQU87QUFBQSxFQUNUO0FBRUEsUUFBTSxvQkFBb0IsYUFBYSxxQkFBcUIsbUJBQW1CO0FBQy9FLGFBQVcsb0JBQW9CLG1CQUFtQjtBQUNoRCxVQUFNLGFBQWEsaUJBQWlCLFlBQVksQ0FBQztBQUNqRCxXQUFPLEdBQUcsVUFBVTtBQUNwQixVQUFNLG1CQUFtQixVQUFVLFVBQVU7QUFDN0MsV0FBTyxHQUFHLGdCQUFnQjtBQUMxQixRQUFJLGlCQUFpQixTQUFTLGVBQWUsb0JBQW9CO0FBRS9ELGNBQVEsV0FBVztBQUNuQixZQUFNLHFCQUFxQixpQkFBaUIsV0FBVztBQUFBLFFBQUksQ0FBQyxzQkFDMUQsVUFBVSxrQkFBa0IsVUFBVTtBQUFBLE1BQ3hDO0FBRUEsY0FBUSxpQkFBaUIsbUJBQW1CO0FBQUEsUUFDMUMsQ0FBQyxTQUNDLE1BQU0sU0FBUyxlQUFlLG9CQUM5QixLQUFLLFNBQVMsU0FBUyxlQUFlLGNBQ3RDLEtBQUssU0FBUyxTQUFTO0FBQUEsTUFDM0I7QUFTQSxjQUFRLG1CQUFtQixtQkFBbUI7QUFBQSxRQUM1QyxDQUFDLFNBQ0MsTUFBTSxTQUFTLGVBQWUsb0JBQzlCLEtBQUssU0FBUyxTQUFTLGVBQWUsZUFDckMsS0FBSyxTQUFTLFNBQVMsWUFBWSxLQUFLLFNBQVMsU0FBUztBQUFBLE1BQy9EO0FBQUEsSUFDRjtBQUFBO0FBQUEsTUFFRSxpQkFBaUIsU0FBUyxlQUFlLFlBQ3pDLGlCQUFpQixJQUFJLFNBQVMsZUFBZSxjQUM3QyxpQkFBaUIsSUFBSSxTQUFTO0FBQUEsTUFDOUI7QUFDQSxjQUFRLDRCQUE0QjtBQUFBLElBQ3RDO0FBQUE7QUFBQSxNQUVFLGlCQUFpQixTQUFTLGVBQWUsWUFDekMsaUJBQWlCLElBQUksU0FBUyxlQUFlLGVBQzVDLGlCQUFpQixJQUFJLFNBQVMsWUFBWSxpQkFBaUIsSUFBSSxTQUFTO0FBQUEsTUFDekU7QUFDQSxjQUFRLDhCQUE4QjtBQUFBLElBQ3hDO0FBQUE7QUFBQSxNQUVFLGlCQUFpQixTQUFTLGVBQWUsWUFDekMsaUJBQWlCLElBQUksU0FBUyxlQUFlLGNBQzdDLGlCQUFpQixJQUFJLFNBQVM7QUFBQSxNQUM5QjtBQUNBLGNBQVEsK0JBQStCO0FBQ3ZDLGNBQVEsaUNBQWlDLGlCQUFpQixXQUN2RCxJQUFJLENBQUMsY0FBYyxVQUFVLFVBQVUsRUFDdkMsSUFBSSxTQUFTLEVBQ2I7QUFBQSxRQUNDLENBQUMsV0FDQyxRQUFRLFNBQVMsZUFBZSxvQkFDaEMsT0FBTyxTQUFTLFNBQVMsZUFBZSxjQUN4QyxPQUFPLFNBQVMsU0FBUyxTQUN6QixVQUFVLE1BQU0sR0FBRyxTQUFTLGVBQWU7QUFBQSxNQUMvQztBQUFBLElBQ0osV0FBVyxpQkFBaUIsU0FBUyxlQUFlLFVBQVU7QUFDNUQsWUFBTSxTQUFTLFVBQVUsZ0JBQWdCO0FBQ3pDLFVBQUksUUFBUSxTQUFTLGVBQWUsZUFBZTtBQUVqRCxjQUFNLFVBQVUsVUFBVSxNQUFNO0FBQ2hDLFlBQ0UsU0FBUyxTQUFTLGVBQWUsWUFDakMsUUFBUSxJQUFJLFNBQVMsZUFBZSxjQUNwQyxRQUFRLElBQUksU0FBUyxRQUNyQjtBQUNBLGtCQUFRLDRCQUE0QjtBQUFBLFFBQ3RDO0FBQ0EsWUFDRSxTQUFTLFNBQVMsZUFBZSxZQUNqQyxRQUFRLElBQUksU0FBUyxlQUFlLGVBQ25DLFFBQVEsSUFBSSxTQUFTLFlBQVksUUFBUSxJQUFJLFNBQVMsZUFDdkQ7QUFDQSxrQkFBUSw4QkFBOEI7QUFBQSxRQUN4QztBQUNBLFlBQ0UsU0FBUyxTQUFTLGVBQWUsWUFDakMsUUFBUSxJQUFJLFNBQVMsZUFBZSxlQUNuQyxRQUFRLElBQUksU0FBUyxZQUFZLFFBQVEsSUFBSSxTQUFTLFlBQ3ZEO0FBQ0Esa0JBQVEsK0JBQStCO0FBQUEsUUFDekM7QUFBQSxNQUNGO0FBQUEsSUFDRixPQUFPO0FBQ0wsVUFBSSwyQ0FBMkMsZ0JBQWdCO0FBQy9ELFlBQU0sSUFBSSxNQUFNLHdDQUF3QyxpQkFBaUIsSUFBSSxFQUFFO0FBQUEsSUFDakY7QUFBQSxFQUNGO0FBQ0EsU0FBTztBQUNUOyIsCiAgIm5hbWVzIjogW10KfQo=
|
|
@@ -25,8 +25,8 @@ var rule = createRule({
|
|
|
25
25
|
create(context) {
|
|
26
26
|
const sourceCode = context.sourceCode;
|
|
27
27
|
const scopeManager = sourceCode.scopeManager;
|
|
28
|
-
const
|
|
29
|
-
const typeChecker =
|
|
28
|
+
const parserServices = ESLintUtils.getParserServices(context);
|
|
29
|
+
const typeChecker = parserServices.program.getTypeChecker();
|
|
30
30
|
function isUrlArgumentValid(urlArgument, scope) {
|
|
31
31
|
if (urlArgument?.type === AST_NODE_TYPES.Literal && typeof urlArgument.value === "string" || urlArgument?.type === AST_NODE_TYPES.TemplateLiteral) {
|
|
32
32
|
const urlText = sourceCode.getText(urlArgument);
|
|
@@ -47,7 +47,7 @@ var rule = createRule({
|
|
|
47
47
|
return false;
|
|
48
48
|
}
|
|
49
49
|
function getType(identifier) {
|
|
50
|
-
const variable =
|
|
50
|
+
const variable = parserServices.esTreeNodeToTSNodeMap.get(identifier);
|
|
51
51
|
const variableType = typeChecker.getTypeAtLocation(variable);
|
|
52
52
|
return typeChecker.typeToString(variableType);
|
|
53
53
|
}
|
|
@@ -130,7 +130,7 @@ var rule = createRule({
|
|
|
130
130
|
if (optionsTypeString === "FullResponseOptions") {
|
|
131
131
|
return;
|
|
132
132
|
}
|
|
133
|
-
const variable =
|
|
133
|
+
const variable = parserServices.esTreeNodeToTSNodeMap.get(optionsArgument);
|
|
134
134
|
const optionType = typeChecker.getTypeAtLocation(variable);
|
|
135
135
|
const resolveWithFullResponseProperty = optionType.getProperty("resolveWithFullResponse");
|
|
136
136
|
if (resolveWithFullResponseProperty?.declarations?.[0]?.getText() === "resolveWithFullResponse: true") {
|
|
@@ -170,4 +170,4 @@ export {
|
|
|
170
170
|
require_resolve_full_response_default as default,
|
|
171
171
|
ruleId
|
|
172
172
|
};
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlcXVpcmUtcmVzb2x2ZS1mdWxsLXJlc3BvbnNlLnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQVFBLFNBQVMsVUFBVSxjQUFjO0FBQ2pDLFNBQVMsZ0JBQWdCLG1CQUE2QjtBQUN0RCxTQUFTLHNCQUFrQztBQUMzQyxPQUFPLHlCQUF5QjtBQUNoQyxTQUFTLDZCQUE2QjtBQUUvQixJQUFNLFNBQVM7QUFFZixJQUFNLG1CQUEyQjtBQUVqQyxJQUFNLHVCQUErQjtBQUU1QyxJQUFNLGFBQWEsWUFBWSxZQUFZLENBQUMsU0FBUyxvQkFBb0IsSUFBSSxDQUFDO0FBRTlFLElBQU0sT0FBa0UsV0FBVztBQUFBLEVBQ2pGLE1BQU07QUFBQSxFQUNOLE1BQU07QUFBQSxJQUNKLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxNQUNKLGFBQWE7QUFBQSxJQUNmO0FBQUEsSUFDQSxVQUFVO0FBQUEsTUFDUixnQkFDRTtBQUFBLE1BQ0YsY0FBYztBQUFBLElBQ2hCO0FBQUEsSUFDQSxRQUFRLENBQUM7QUFBQSxFQUNYO0FBQUEsRUFDQSxnQkFBZ0IsQ0FBQztBQUFBLEVBQ2pCLE9BQU8sU0FBUztBQUNkLFVBQU0sYUFBYSxRQUFRO0FBQzNCLFVBQU0sZUFBZSxXQUFXO0FBQ2hDLFVBQU0saUJBQWlCLFlBQVksa0JBQWtCLE9BQU87QUFDNUQsVUFBTSxjQUFjLGVBQWUsUUFBUSxlQUFlO0FBRTFELGFBQVMsbUJBQW1CLGFBQXdDLE9BQWM7QUFDaEYsVUFDRyxhQUFhLFNBQVMsZUFBZSxXQUFXLE9BQU8sWUFBWSxVQUFVLFlBQzlFLGFBQWEsU0FBUyxlQUFlLGlCQUNyQztBQUNBLGNBQU0sVUFBVSxXQUFXLFFBQVEsV0FBVztBQUM5QyxlQUFPLGlCQUFpQixLQUFLLE9BQU8sS0FBSyxxQkFBcUIsS0FBSyxPQUFPO0FBQUEsTUFDNUU7QUFFQSxVQUFJLGFBQWEsU0FBUyxlQUFlLFlBQVk7QUFDbkQsY0FBTSxnQkFBZ0IsTUFBTSxVQUFVLEtBQUssQ0FB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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ESLintUtils } from '@typescript-eslint/utils';
|
|
2
2
|
export declare const ruleId = "fetch-then";
|
|
3
|
-
declare const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'
|
|
3
|
+
declare const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'>;
|
|
4
4
|
export default rule;
|
|
@@ -8,7 +8,6 @@ import type { ScopeManager, Variable } from '@typescript-eslint/scope-manager';
|
|
|
8
8
|
export declare function analyzeResponseReferences(variableDeclaration: TSESTree.VariableDeclaration | undefined, scopeManager: ScopeManager): {
|
|
9
9
|
variable?: Variable;
|
|
10
10
|
bodyReferences: TSESTree.MemberExpression[];
|
|
11
|
-
headersReferences: TSESTree.MemberExpression[];
|
|
12
11
|
statusReferences: TSESTree.MemberExpression[];
|
|
13
12
|
destructuringBodyVariable?: Variable | TSESTree.ObjectPattern;
|
|
14
13
|
destructuringHeadersVariable?: Variable | TSESTree.ObjectPattern;
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@checkdigit/eslint-plugin","version":"7.6.0-PR.75-
|
|
1
|
+
{"name":"@checkdigit/eslint-plugin","version":"7.6.0-PR.75-4751","description":"Check Digit eslint plugins","keywords":["eslint","eslintplugin"],"homepage":"https://github.com/checkdigit/eslint-plugin#readme","bugs":{"url":"https://github.com/checkdigit/eslint-plugin/issues"},"repository":{"type":"git","url":"https://github.com/checkdigit/eslint-plugin"},"license":"MIT","author":"Check Digit, LLC","sideEffects":false,"type":"module","exports":{".":{"types":"./dist-types/index.d.ts","import":"./dist-mjs/index.mjs","default":"./dist-mjs/index.mjs"}},"files":["src","dist-types","dist-mjs","!src/**/test/**","!src/**/*.test.ts","!src/**/*.spec.ts","!dist-types/**/test/**","!dist-types/**/*.test.d.ts","!dist-types/**/*.spec.d.ts","!dist-mjs/**/test/**","!dist-mjs/**/*.test.mjs","!dist-mjs/**/*.spec.mjs","SECURITY.md"],"scripts":{"build:dist-mjs":"rimraf dist-mjs && npx builder --type=module --sourceMap --outDir=dist-mjs && node dist-mjs/index.mjs","build:dist-types":"rimraf dist-types && npx builder --type=types --outDir=dist-types","ci:compile":"tsc --noEmit","ci:coverage":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=true","ci:lint":"npm run lint","ci:style":"npm run prettier","ci:test":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=false","lint":"eslint --max-warnings 0 .","lint:fix":"eslint --max-warnings 0 --fix .","prepare":"","prepublishOnly":"npm run build:dist-types && npm run build:dist-mjs","prettier":"prettier --ignore-path .gitignore --list-different .","prettier:fix":"prettier --ignore-path .gitignore --write .","test":"npm run ci:compile && npm run ci:test && npm run ci:lint && npm run ci:style"},"prettier":"@checkdigit/prettier-config","jest":{"preset":"@checkdigit/jest-config"},"dependencies":{"@typescript-eslint/type-utils":"^8.15.0","@typescript-eslint/utils":"^8.15.0","debug":"^4.3.7","ts-api-utils":"^1.4.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^5.5.1","@checkdigit/typescript-config":"^8.0.0","@eslint/js":"^9.15.0","@types/debug":"^4.1.12","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@typescript-eslint/parser":"^8.15.0","@typescript-eslint/rule-tester":"^8.15.0","eslint":"^9.15.0","eslint-config-prettier":"^9.1.0","eslint-import-resolver-typescript":"^3.6.3","eslint-plugin-eslint-plugin":"^6.3.2","eslint-plugin-import":"^2.31.0","eslint-plugin-no-only-tests":"^3.3.0","eslint-plugin-no-secrets":"^1.1.2","eslint-plugin-node":"^11.1.0","eslint-plugin-sonarjs":"1.0.4","http-status-codes":"^2.3.0","rimraf":"^6.0.1","typescript-eslint":"^8.15.0"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=20.17"}}
|
package/src/agent/fetch-then.ts
CHANGED
|
@@ -8,15 +8,15 @@
|
|
|
8
8
|
|
|
9
9
|
import { strict as assert } from 'node:assert';
|
|
10
10
|
|
|
11
|
-
import { ScopeManager, Variable } from '@typescript-eslint/scope-manager';
|
|
11
|
+
// import { ScopeManager, Variable } from '@typescript-eslint/scope-manager';
|
|
12
12
|
import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils';
|
|
13
13
|
import type { SourceCode } from '@typescript-eslint/utils/ts-eslint';
|
|
14
14
|
|
|
15
|
-
import { getEnclosingFunction,
|
|
15
|
+
import { getEnclosingFunction, getParent, isUsedInArrayOrAsArgument } from '../library/ts-tree';
|
|
16
16
|
import getDocumentationUrl from '../get-documentation-url';
|
|
17
17
|
import { getIndentation } from '../library/format';
|
|
18
18
|
import { isValidPropertyName } from '../library/variable';
|
|
19
|
-
import { hasAssertions
|
|
19
|
+
import { hasAssertions } from './fetch';
|
|
20
20
|
import { replaceEndpointUrlPrefixWithBasePath } from './url';
|
|
21
21
|
|
|
22
22
|
export const ruleId = 'fetch-then';
|
|
@@ -143,52 +143,52 @@ function createResponseAssertions(
|
|
|
143
143
|
};
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
function getResponseHeadersAccesses(responseVariables: Variable[], scopeManager: ScopeManager, sourceCode: SourceCode) {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
146
|
+
// function getResponseHeadersAccesses(responseVariables: Variable[], scopeManager: ScopeManager, sourceCode: SourceCode) {
|
|
147
|
+
// const responseHeadersAccesses: TSESTree.MemberExpression[] = [];
|
|
148
|
+
// for (const responseVariable of responseVariables) {
|
|
149
|
+
// for (const responseReference of responseVariable.references) {
|
|
150
|
+
// const responseAccess = getParent(responseReference.identifier);
|
|
151
|
+
// if (!responseAccess || responseAccess.type !== AST_NODE_TYPES.MemberExpression) {
|
|
152
|
+
// continue;
|
|
153
|
+
// }
|
|
154
154
|
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
155
|
+
// const responseAccessParent = getParent(responseAccess);
|
|
156
|
+
// if (!responseAccessParent) {
|
|
157
|
+
// continue;
|
|
158
|
+
// }
|
|
159
159
|
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
160
|
+
// if (
|
|
161
|
+
// responseAccessParent.type === AST_NODE_TYPES.CallExpression &&
|
|
162
|
+
// responseAccessParent.arguments[0]?.type === AST_NODE_TYPES.ArrowFunctionExpression
|
|
163
|
+
// ) {
|
|
164
|
+
// // map-like operation against responses, e.g. responses.map((response) => response.headers.etag)
|
|
165
|
+
// responseHeadersAccesses.push(
|
|
166
|
+
// ...getResponseHeadersAccesses(
|
|
167
|
+
// scopeManager.getDeclaredVariables(responseAccessParent.arguments[0]),
|
|
168
|
+
// scopeManager,
|
|
169
|
+
// sourceCode,
|
|
170
|
+
// ),
|
|
171
|
+
// );
|
|
172
|
+
// continue;
|
|
173
|
+
// }
|
|
174
174
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
}
|
|
175
|
+
// if (
|
|
176
|
+
// responseAccess.computed &&
|
|
177
|
+
// responseAccess.property.type === AST_NODE_TYPES.Literal &&
|
|
178
|
+
// responseAccessParent.type === AST_NODE_TYPES.MemberExpression
|
|
179
|
+
// ) {
|
|
180
|
+
// // header access through indexed responses array, e.g. responses[0].headers, responses[1].get(...), etc.
|
|
181
|
+
// responseHeadersAccesses.push(responseAccessParent);
|
|
182
|
+
// } else {
|
|
183
|
+
// responseHeadersAccesses.push(responseAccess);
|
|
184
|
+
// }
|
|
185
|
+
// }
|
|
186
|
+
// }
|
|
187
|
+
// return responseHeadersAccesses;
|
|
188
|
+
// }
|
|
189
189
|
|
|
190
190
|
const createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
|
|
191
|
-
const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'
|
|
191
|
+
const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = createRule({
|
|
192
192
|
name: ruleId,
|
|
193
193
|
meta: {
|
|
194
194
|
type: 'suggestion',
|
|
@@ -198,7 +198,7 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch' | 'shoul
|
|
|
198
198
|
},
|
|
199
199
|
messages: {
|
|
200
200
|
preferNativeFetch: 'Prefer native fetch API over customized fixture API.',
|
|
201
|
-
shouldUseHeaderGetter: 'Getter should be used to access response headers.',
|
|
201
|
+
// shouldUseHeaderGetter: 'Getter should be used to access response headers.',
|
|
202
202
|
unknownError: 'Unknown error occurred in file "{{fileName}}": {{ error }}.',
|
|
203
203
|
},
|
|
204
204
|
fixable: 'code',
|
|
@@ -213,7 +213,6 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch' | 'shoul
|
|
|
213
213
|
return {
|
|
214
214
|
'CallExpression[callee.object.object.name="fixture"][callee.object.property.name="api"]': (
|
|
215
215
|
fixtureCall: TSESTree.CallExpression,
|
|
216
|
-
// eslint-disable-next-line sonarjs/cognitive-complexity
|
|
217
216
|
) => {
|
|
218
217
|
try {
|
|
219
218
|
if (!hasAssertions(fixtureCall)) {
|
|
@@ -294,51 +293,51 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch' | 'shoul
|
|
|
294
293
|
},
|
|
295
294
|
});
|
|
296
295
|
|
|
297
|
-
const responsesVariable = getEnclosingStatement(fixtureCallInformation.fixtureNode);
|
|
298
|
-
if (!responsesVariable) {
|
|
299
|
-
|
|
300
|
-
}
|
|
296
|
+
// const responsesVariable = getEnclosingStatement(fixtureCallInformation.fixtureNode);
|
|
297
|
+
// if (!responsesVariable) {
|
|
298
|
+
// return;
|
|
299
|
+
// }
|
|
301
300
|
|
|
302
|
-
const responseVariableReferences = scopeManager.getDeclaredVariables(responsesVariable);
|
|
303
|
-
const responseHeadersAccesses = getResponseHeadersAccesses(
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
);
|
|
308
|
-
for (const responseHeadersAccess of responseHeadersAccesses) {
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
301
|
+
// const responseVariableReferences = scopeManager.getDeclaredVariables(responsesVariable);
|
|
302
|
+
// const responseHeadersAccesses = getResponseHeadersAccesses(
|
|
303
|
+
// responseVariableReferences,
|
|
304
|
+
// scopeManager,
|
|
305
|
+
// sourceCode,
|
|
306
|
+
// );
|
|
307
|
+
// for (const responseHeadersAccess of responseHeadersAccesses) {
|
|
308
|
+
// if (isInvalidResponseHeadersAccess(responseHeadersAccess)) {
|
|
309
|
+
// const headerAccess = getParent(responseHeadersAccess);
|
|
310
|
+
// if (headerAccess?.type === AST_NODE_TYPES.MemberExpression) {
|
|
311
|
+
// const headerNameNode = headerAccess.property;
|
|
312
|
+
// const headerName = headerAccess.computed
|
|
313
|
+
// ? sourceCode.getText(headerNameNode)
|
|
314
|
+
// : `'${sourceCode.getText(headerNameNode)}'`;
|
|
315
|
+
// const headerAccessReplacementText = `${sourceCode.getText(headerAccess.object)}.get(${headerName})`;
|
|
317
316
|
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
317
|
+
// context.report({
|
|
318
|
+
// node: headerAccess,
|
|
319
|
+
// messageId: 'shouldUseHeaderGetter',
|
|
320
|
+
// fix(fixer) {
|
|
321
|
+
// return fixer.replaceText(headerAccess, headerAccessReplacementText);
|
|
322
|
+
// },
|
|
323
|
+
// });
|
|
324
|
+
// } else if (
|
|
325
|
+
// headerAccess?.type === AST_NODE_TYPES.CallExpression &&
|
|
326
|
+
// responseHeadersAccess.property.type === AST_NODE_TYPES.Identifier &&
|
|
327
|
+
// responseHeadersAccess.property.name === 'get'
|
|
328
|
+
// ) {
|
|
329
|
+
// const headerAccessReplacementText = `${sourceCode.getText(responseHeadersAccess.object)}.headers.get(${sourceCode.getText(headerAccess.arguments[0])})`;
|
|
331
330
|
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
}
|
|
331
|
+
// context.report({
|
|
332
|
+
// node: headerAccess,
|
|
333
|
+
// messageId: 'shouldUseHeaderGetter',
|
|
334
|
+
// fix(fixer) {
|
|
335
|
+
// return fixer.replaceText(headerAccess, headerAccessReplacementText);
|
|
336
|
+
// },
|
|
337
|
+
// });
|
|
338
|
+
// }
|
|
339
|
+
// }
|
|
340
|
+
// }
|
|
342
341
|
} catch (error) {
|
|
343
342
|
// eslint-disable-next-line no-console
|
|
344
343
|
console.error(`Failed to apply ${ruleId} rule for file "${context.filename}":`, error);
|
package/src/agent/no-fixture.ts
CHANGED
|
@@ -218,6 +218,9 @@ function createResponseAssertions(
|
|
|
218
218
|
}
|
|
219
219
|
|
|
220
220
|
function getResponseVariableNameToUse(
|
|
221
|
+
methodName: string,
|
|
222
|
+
urlArgumentNode: TSESTree.CallExpressionArgument,
|
|
223
|
+
originalUrlArgumentText: string,
|
|
221
224
|
scopeManager: ScopeManager,
|
|
222
225
|
fixtureCallInformation: FixtureCallInformation,
|
|
223
226
|
scopeVariablesMap: Map<Scope, string[]>,
|
|
@@ -249,14 +252,34 @@ function getResponseVariableNameToUse(
|
|
|
249
252
|
scopeVariablesMap.set(scope, scopeVariables);
|
|
250
253
|
}
|
|
251
254
|
|
|
255
|
+
let responseVariableNameBase = 'response';
|
|
256
|
+
if (urlArgumentNode.type === AST_NODE_TYPES.Literal || urlArgumentNode.type === AST_NODE_TYPES.TemplateLiteral) {
|
|
257
|
+
const urlWithoutQuotes = originalUrlArgumentText.replace(/['"`]/gu, '');
|
|
258
|
+
const urlWithoutQuery = urlWithoutQuotes.includes('?')
|
|
259
|
+
? urlWithoutQuotes.slice(0, urlWithoutQuotes.indexOf('?'))
|
|
260
|
+
: urlWithoutQuotes;
|
|
261
|
+
const parts = urlWithoutQuery.startsWith('${')
|
|
262
|
+
? urlWithoutQuery.split('/').slice(1)
|
|
263
|
+
: // eslint-disable-next-line no-magic-numbers
|
|
264
|
+
urlWithoutQuery.split('/').slice(3);
|
|
265
|
+
|
|
266
|
+
responseVariableNameBase = [...parts.filter((part) => part !== 'tenant'), methodName.toLocaleLowerCase()]
|
|
267
|
+
.map((part) => part.split(/[-]/u))
|
|
268
|
+
.flat()
|
|
269
|
+
.filter((part) => part.trim() !== '' && !/\$\{.*\}/u.test(part)) // keep only non-empty parts that are not path parameters
|
|
270
|
+
.map((part) => `${part[0]?.toUpperCase() ?? ''}${part.slice(1)}`)
|
|
271
|
+
.join('');
|
|
272
|
+
responseVariableNameBase = `${responseVariableNameBase[0]?.toLowerCase() ?? ''}${responseVariableNameBase.slice(1)}Response`;
|
|
273
|
+
}
|
|
274
|
+
|
|
252
275
|
let responseVariableCounter = 0;
|
|
253
276
|
let responseVariableNameToUse;
|
|
254
277
|
while (responseVariableNameToUse === undefined) {
|
|
255
|
-
responseVariableCounter
|
|
256
|
-
responseVariableNameToUse = `response${responseVariableCounter === 1 ? '' : responseVariableCounter.toString()}`;
|
|
278
|
+
responseVariableNameToUse = `${responseVariableNameBase}${responseVariableCounter === 0 ? '' : responseVariableCounter.toString()}`;
|
|
257
279
|
if (scopeVariables.includes(responseVariableNameToUse)) {
|
|
258
280
|
responseVariableNameToUse = undefined;
|
|
259
281
|
}
|
|
282
|
+
responseVariableCounter++;
|
|
260
283
|
}
|
|
261
284
|
scopeVariables.push(responseVariableNameToUse);
|
|
262
285
|
return responseVariableNameToUse;
|
|
@@ -320,7 +343,7 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
320
343
|
const {
|
|
321
344
|
variable: responseVariable,
|
|
322
345
|
bodyReferences: responseBodyReferences,
|
|
323
|
-
headersReferences: responseHeadersReferences,
|
|
346
|
+
// headersReferences: responseHeadersReferences,
|
|
324
347
|
statusReferences: responseStatusReferences,
|
|
325
348
|
destructuringBodyVariable: destructuringResponseBodyVariable,
|
|
326
349
|
destructuringStatusVariable: destructuringResponseStatusVariable,
|
|
@@ -335,10 +358,11 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
335
358
|
const methodNode = fixtureFunction.property; // get/put/etc.
|
|
336
359
|
assert.ok(methodNode.type === AST_NODE_TYPES.Identifier);
|
|
337
360
|
const methodName = methodNode.name.toUpperCase();
|
|
361
|
+
const methodNameToUse = methodName === 'DEL' ? 'DELETE' : methodName;
|
|
338
362
|
|
|
339
363
|
const fetchRequestArgumentLines = [
|
|
340
364
|
'{',
|
|
341
|
-
` method: '${
|
|
365
|
+
` method: '${methodNameToUse}',`,
|
|
342
366
|
...(fixtureCallInformation.requestBody
|
|
343
367
|
? [` body: JSON.stringify(${sourceCode.getText(fixtureCallInformation.requestBody)}),`]
|
|
344
368
|
: []),
|
|
@@ -360,6 +384,9 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
360
384
|
].join(`\n${indentation}`);
|
|
361
385
|
|
|
362
386
|
const responseVariableNameToUse = getResponseVariableNameToUse(
|
|
387
|
+
methodNameToUse,
|
|
388
|
+
urlArgumentNode,
|
|
389
|
+
originalUrlArgumentText,
|
|
363
390
|
scopeManager,
|
|
364
391
|
fixtureCallInformation,
|
|
365
392
|
scopeVariablesMap,
|
|
@@ -494,23 +521,23 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
494
521
|
yield fixer.replaceText(fixtureCallInformation.inlineBodyReference, redefineResponseBodyVariableName);
|
|
495
522
|
}
|
|
496
523
|
|
|
497
|
-
// handle response headers references
|
|
498
|
-
for (const responseHeadersReference of responseHeadersReferences) {
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
}
|
|
524
|
+
// // handle response headers references
|
|
525
|
+
// for (const responseHeadersReference of responseHeadersReferences) {
|
|
526
|
+
// const parent = getParent(responseHeadersReference);
|
|
527
|
+
// assert.ok(parent);
|
|
528
|
+
// let headerName;
|
|
529
|
+
// if (parent.type === AST_NODE_TYPES.MemberExpression) {
|
|
530
|
+
// const headerNameNode = parent.property;
|
|
531
|
+
// headerName = parent.computed
|
|
532
|
+
// ? sourceCode.getText(headerNameNode)
|
|
533
|
+
// : `'${sourceCode.getText(headerNameNode)}'`;
|
|
534
|
+
// } else if (parent.type === AST_NODE_TYPES.CallExpression) {
|
|
535
|
+
// const headerNameNode = parent.arguments[0];
|
|
536
|
+
// headerName = sourceCode.getText(headerNameNode);
|
|
537
|
+
// }
|
|
538
|
+
// assert.ok(headerName !== undefined);
|
|
539
|
+
// yield fixer.replaceText(parent, `${responseVariableNameToUse}.headers.get(${headerName})`);
|
|
540
|
+
// }
|
|
514
541
|
|
|
515
542
|
// convert response.statusCode to response.status
|
|
516
543
|
for (const responseStatusReference of responseStatusReferences) {
|
|
@@ -41,8 +41,8 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch' | 'inval
|
|
|
41
41
|
create(context) {
|
|
42
42
|
const sourceCode = context.sourceCode;
|
|
43
43
|
const scopeManager = sourceCode.scopeManager;
|
|
44
|
-
const
|
|
45
|
-
const typeChecker =
|
|
44
|
+
const parserServices = ESLintUtils.getParserServices(context);
|
|
45
|
+
const typeChecker = parserServices.program.getTypeChecker();
|
|
46
46
|
|
|
47
47
|
function isUrlArgumentValid(urlArgument: TSESTree.Node | undefined, scope: Scope) {
|
|
48
48
|
if (
|
|
@@ -70,7 +70,7 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch' | 'inval
|
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
function getType(identifier: TSESTree.Identifier) {
|
|
73
|
-
const variable =
|
|
73
|
+
const variable = parserServices.esTreeNodeToTSNodeMap.get(identifier);
|
|
74
74
|
const variableType = typeChecker.getTypeAtLocation(variable);
|
|
75
75
|
return typeChecker.typeToString(variableType);
|
|
76
76
|
}
|
|
@@ -36,9 +36,6 @@ interface FixtureCallInformation {
|
|
|
36
36
|
fixtureNode: TSESTree.AwaitExpression | TSESTree.CallExpression;
|
|
37
37
|
variableDeclaration?: TSESTree.VariableDeclaration;
|
|
38
38
|
variableAssignment?: TSESTree.ExpressionStatement;
|
|
39
|
-
requestBody?: TSESTree.Expression;
|
|
40
|
-
requestHeaders?: { name: TSESTree.Expression; value: TSESTree.Expression }[];
|
|
41
|
-
requestHeadersObjectLiteral?: TSESTree.ObjectExpression;
|
|
42
39
|
assertions?: TSESTree.Expression[][];
|
|
43
40
|
inlineStatementNode?: TSESTree.Node;
|
|
44
41
|
inlineBodyReference?: TSESTree.MemberExpression;
|
|
@@ -107,23 +104,6 @@ function analyzeFixtureCall(call: TSESTree.CallExpression, results: FixtureCallI
|
|
|
107
104
|
assert.ok(assertionCall && assertionCall.type === AST_NODE_TYPES.CallExpression);
|
|
108
105
|
results.assertions = [...(results.assertions ?? []), assertionCall.arguments as TSESTree.Expression[]];
|
|
109
106
|
nextCall = assertionCall;
|
|
110
|
-
} else if (parent.property.name === 'send') {
|
|
111
|
-
// request body
|
|
112
|
-
const sendRequestBodyCall = getParent(parent);
|
|
113
|
-
assert.ok(sendRequestBodyCall && sendRequestBodyCall.type === AST_NODE_TYPES.CallExpression);
|
|
114
|
-
results.requestBody = sendRequestBodyCall.arguments[0] as TSESTree.Expression;
|
|
115
|
-
nextCall = sendRequestBodyCall;
|
|
116
|
-
} else if (parent.property.name === 'set') {
|
|
117
|
-
// request headers
|
|
118
|
-
const setRequestHeaderCall = getParent(parent);
|
|
119
|
-
assert.ok(setRequestHeaderCall && setRequestHeaderCall.type === AST_NODE_TYPES.CallExpression);
|
|
120
|
-
const [arg1, arg2] = setRequestHeaderCall.arguments as [TSESTree.Expression, TSESTree.Expression];
|
|
121
|
-
if (arg1.type === AST_NODE_TYPES.ObjectExpression) {
|
|
122
|
-
results.requestHeadersObjectLiteral = arg1;
|
|
123
|
-
} else {
|
|
124
|
-
results.requestHeaders = [...(results.requestHeaders ?? []), { name: arg1, value: arg2 }];
|
|
125
|
-
}
|
|
126
|
-
nextCall = setRequestHeaderCall;
|
|
127
107
|
}
|
|
128
108
|
} else {
|
|
129
109
|
throw new Error(`Unexpected expression in fixture/supertest call ${sourceCode.getText(parent)}.`);
|
|
@@ -211,6 +191,7 @@ function createResponseAssertions(
|
|
|
211
191
|
}
|
|
212
192
|
|
|
213
193
|
function getResponseVariableNameToUse(
|
|
194
|
+
supertestFunctionName: string,
|
|
214
195
|
scopeManager: ScopeManager,
|
|
215
196
|
fixtureCallInformation: FixtureCallInformation,
|
|
216
197
|
scopeVariablesMap: Map<Scope, string[]>,
|
|
@@ -245,11 +226,11 @@ function getResponseVariableNameToUse(
|
|
|
245
226
|
let responseVariableCounter = 0;
|
|
246
227
|
let responseVariableNameToUse;
|
|
247
228
|
while (responseVariableNameToUse === undefined) {
|
|
248
|
-
responseVariableCounter
|
|
249
|
-
responseVariableNameToUse = `response${responseVariableCounter === 1 ? '' : responseVariableCounter.toString()}`;
|
|
229
|
+
responseVariableNameToUse = `${supertestFunctionName}Response${responseVariableCounter === 0 ? '' : responseVariableCounter.toString()}`;
|
|
250
230
|
if (scopeVariables.includes(responseVariableNameToUse)) {
|
|
251
231
|
responseVariableNameToUse = undefined;
|
|
252
232
|
}
|
|
233
|
+
responseVariableCounter++;
|
|
253
234
|
}
|
|
254
235
|
scopeVariables.push(responseVariableNameToUse);
|
|
255
236
|
return responseVariableNameToUse;
|
|
@@ -298,11 +279,26 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
298
279
|
(supertestCall.callee.object.callee.type === AST_NODE_TYPES.MemberExpression &&
|
|
299
280
|
supertestCall.callee.object.callee.property.type === AST_NODE_TYPES.Identifier &&
|
|
300
281
|
supertestCall.callee.object.callee.property.name === 'expect')
|
|
282
|
+
) {
|
|
283
|
+
// skip nested expect call chain, only focus on the first expect call
|
|
284
|
+
return;
|
|
285
|
+
}
|
|
286
|
+
if (
|
|
287
|
+
supertestCall.callee.object.callee.type === AST_NODE_TYPES.MemberExpression &&
|
|
288
|
+
supertestCall.callee.object.callee.object.type === AST_NODE_TYPES.MemberExpression &&
|
|
289
|
+
supertestCall.callee.object.callee.object.object.type === AST_NODE_TYPES.Identifier &&
|
|
290
|
+
supertestCall.callee.object.callee.object.object.name === 'fixture' &&
|
|
291
|
+
supertestCall.callee.object.callee.object.property.type === AST_NODE_TYPES.Identifier &&
|
|
292
|
+
supertestCall.callee.object.callee.object.property.name === 'api'
|
|
301
293
|
) {
|
|
302
294
|
// skip nested expect calls, only focus on the top level
|
|
303
295
|
return;
|
|
304
296
|
}
|
|
305
297
|
|
|
298
|
+
const fullSupertestFunctionName = sourceCode.getText(supertestCall.callee.object.callee);
|
|
299
|
+
const supertestFunctionName = fullSupertestFunctionName.split('.').pop();
|
|
300
|
+
assert.ok(supertestFunctionName !== undefined);
|
|
301
|
+
|
|
306
302
|
if (isUsedInArrayOrAsArgument(supertestCall) || getEnclosingFunction(supertestCall)?.async === false) {
|
|
307
303
|
// skip and leave it to "fetch-then" rule to handle it because no "await" can be used here
|
|
308
304
|
return;
|
|
@@ -318,7 +314,7 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
318
314
|
const {
|
|
319
315
|
variable: responseVariable,
|
|
320
316
|
bodyReferences: responseBodyReferences,
|
|
321
|
-
headersReferences: responseHeadersReferences,
|
|
317
|
+
// headersReferences: responseHeadersReferences,
|
|
322
318
|
statusReferences: responseStatusReferences,
|
|
323
319
|
destructuringBodyVariable: destructuringResponseBodyVariable,
|
|
324
320
|
destructuringHeadersVariable: destructuringResponseHeadersVariable,
|
|
@@ -326,6 +322,7 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
326
322
|
} = analyzeResponseReferences(fixtureCallInformation.variableDeclaration, scopeManager);
|
|
327
323
|
|
|
328
324
|
const responseVariableNameToUse = getResponseVariableNameToUse(
|
|
325
|
+
supertestFunctionName,
|
|
329
326
|
scopeManager,
|
|
330
327
|
fixtureCallInformation,
|
|
331
328
|
scopeVariablesMap,
|
|
@@ -460,23 +457,23 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'preferNativeFetch'> = creat
|
|
|
460
457
|
yield fixer.replaceText(fixtureCallInformation.inlineBodyReference, redefineResponseBodyVariableName);
|
|
461
458
|
}
|
|
462
459
|
|
|
463
|
-
// handle response headers references
|
|
464
|
-
for (const responseHeadersReference of responseHeadersReferences) {
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
}
|
|
460
|
+
// // handle response headers references
|
|
461
|
+
// for (const responseHeadersReference of responseHeadersReferences) {
|
|
462
|
+
// const parent = getParent(responseHeadersReference);
|
|
463
|
+
// assert.ok(parent);
|
|
464
|
+
// let headerName;
|
|
465
|
+
// if (parent.type === AST_NODE_TYPES.MemberExpression) {
|
|
466
|
+
// const headerNameNode = parent.property;
|
|
467
|
+
// headerName = parent.computed
|
|
468
|
+
// ? sourceCode.getText(headerNameNode)
|
|
469
|
+
// : `'${sourceCode.getText(headerNameNode)}'`;
|
|
470
|
+
// } else if (parent.type === AST_NODE_TYPES.CallExpression) {
|
|
471
|
+
// const headerNameNode = parent.arguments[0];
|
|
472
|
+
// headerName = sourceCode.getText(headerNameNode);
|
|
473
|
+
// }
|
|
474
|
+
// assert.ok(headerName !== undefined);
|
|
475
|
+
// yield fixer.replaceText(parent, `${responseVariableNameToUse}.headers.get(${headerName})`);
|
|
476
|
+
// }
|
|
480
477
|
|
|
481
478
|
// convert response.statusCode to response.status
|
|
482
479
|
for (const responseStatusReference of responseStatusReferences) {
|
|
@@ -28,7 +28,7 @@ export function analyzeResponseReferences(
|
|
|
28
28
|
): {
|
|
29
29
|
variable?: Variable;
|
|
30
30
|
bodyReferences: TSESTree.MemberExpression[];
|
|
31
|
-
headersReferences: TSESTree.MemberExpression[];
|
|
31
|
+
// headersReferences: TSESTree.MemberExpression[];
|
|
32
32
|
statusReferences: TSESTree.MemberExpression[];
|
|
33
33
|
destructuringBodyVariable?: Variable | TSESTree.ObjectPattern;
|
|
34
34
|
destructuringHeadersVariable?: Variable | TSESTree.ObjectPattern;
|
|
@@ -38,7 +38,7 @@ export function analyzeResponseReferences(
|
|
|
38
38
|
const results: {
|
|
39
39
|
variable?: Variable;
|
|
40
40
|
bodyReferences: TSESTree.MemberExpression[];
|
|
41
|
-
headersReferences: TSESTree.MemberExpression[];
|
|
41
|
+
// headersReferences: TSESTree.MemberExpression[];
|
|
42
42
|
statusReferences: TSESTree.MemberExpression[];
|
|
43
43
|
destructuringBodyVariable?: Variable | TSESTree.ObjectPattern;
|
|
44
44
|
destructuringHeadersVariable?: Variable | TSESTree.ObjectPattern;
|
|
@@ -46,7 +46,7 @@ export function analyzeResponseReferences(
|
|
|
46
46
|
destructuringHeadersReferences?: TSESTree.MemberExpression[] | undefined;
|
|
47
47
|
} = {
|
|
48
48
|
bodyReferences: [],
|
|
49
|
-
headersReferences: [],
|
|
49
|
+
// headersReferences: [],
|
|
50
50
|
statusReferences: [],
|
|
51
51
|
};
|
|
52
52
|
if (!variableDeclaration) {
|
|
@@ -72,13 +72,13 @@ export function analyzeResponseReferences(
|
|
|
72
72
|
node.property.type === AST_NODE_TYPES.Identifier &&
|
|
73
73
|
node.property.name === 'body',
|
|
74
74
|
);
|
|
75
|
-
// e.g. response.headers / response.header / response.get()
|
|
76
|
-
results.headersReferences = responseReferences.filter(
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
);
|
|
75
|
+
// // e.g. response.headers / response.header / response.get()
|
|
76
|
+
// results.headersReferences = responseReferences.filter(
|
|
77
|
+
// (node): node is TSESTree.MemberExpression =>
|
|
78
|
+
// node?.type === AST_NODE_TYPES.MemberExpression &&
|
|
79
|
+
// node.property.type === AST_NODE_TYPES.Identifier &&
|
|
80
|
+
// (node.property.name === 'header' || node.property.name === 'headers' || node.property.name === 'get'),
|
|
81
|
+
// );
|
|
82
82
|
// e.g. response.status / response.statusCode
|
|
83
83
|
results.statusReferences = responseReferences.filter(
|
|
84
84
|
(node): node is TSESTree.MemberExpression =>
|
|
@@ -38,8 +38,8 @@ const rule: ESLintUtils.RuleModule<'invalidOptions' | 'unknownError'> = createRu
|
|
|
38
38
|
create(context) {
|
|
39
39
|
const sourceCode = context.sourceCode;
|
|
40
40
|
const scopeManager = sourceCode.scopeManager;
|
|
41
|
-
const
|
|
42
|
-
const typeChecker =
|
|
41
|
+
const parserServices = ESLintUtils.getParserServices(context);
|
|
42
|
+
const typeChecker = parserServices.program.getTypeChecker();
|
|
43
43
|
|
|
44
44
|
function isUrlArgumentValid(urlArgument: TSESTree.Node | undefined, scope: Scope) {
|
|
45
45
|
if (
|
|
@@ -67,7 +67,7 @@ const rule: ESLintUtils.RuleModule<'invalidOptions' | 'unknownError'> = createRu
|
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
function getType(identifier: TSESTree.Identifier) {
|
|
70
|
-
const variable =
|
|
70
|
+
const variable = parserServices.esTreeNodeToTSNodeMap.get(identifier);
|
|
71
71
|
const variableType = typeChecker.getTypeAtLocation(variable);
|
|
72
72
|
return typeChecker.typeToString(variableType);
|
|
73
73
|
}
|
|
@@ -171,7 +171,7 @@ const rule: ESLintUtils.RuleModule<'invalidOptions' | 'unknownError'> = createRu
|
|
|
171
171
|
if (optionsTypeString === 'FullResponseOptions') {
|
|
172
172
|
return;
|
|
173
173
|
}
|
|
174
|
-
const variable =
|
|
174
|
+
const variable = parserServices.esTreeNodeToTSNodeMap.get(optionsArgument);
|
|
175
175
|
const optionType = typeChecker.getTypeAtLocation(variable);
|
|
176
176
|
const resolveWithFullResponseProperty = optionType.getProperty('resolveWithFullResponse');
|
|
177
177
|
if (resolveWithFullResponseProperty?.declarations?.[0]?.getText() === 'resolveWithFullResponse: true') {
|