@checkdigit/eslint-plugin 7.3.0-PR.75-4919 → 7.3.0-PR.75-d748
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-response-body-json.mjs +20 -8
- package/dist-mjs/agent/fix-function-call-arguments.mjs +19 -16
- package/dist-mjs/agent/no-fixture.mjs +13 -4
- package/dist-types/agent/fetch-response-body-json.d.ts +1 -1
- package/package.json +1 -1
- package/src/agent/fetch-response-body-json.ts +30 -11
- package/src/agent/fix-function-call-arguments.ts +31 -19
- package/src/agent/no-fixture.ts +22 -4
|
@@ -13,6 +13,7 @@ var rule = createRule({
|
|
|
13
13
|
description: 'Replace "response.body" with "await response.json()".'
|
|
14
14
|
},
|
|
15
15
|
messages: {
|
|
16
|
+
refactorNeeded: "Please extract the fetch call and check its reponse status code before accessing its response body.",
|
|
16
17
|
replaceBodyWithJson: 'Replace "response.body" with "await response.json()".',
|
|
17
18
|
unknownError: 'Unknown error occurred in file "{{fileName}}": {{ error }}.'
|
|
18
19
|
},
|
|
@@ -31,6 +32,13 @@ var rule = createRule({
|
|
|
31
32
|
const responseType = typeChecker.getTypeAtLocation(responseNode);
|
|
32
33
|
const shouldReplace = responseType.getProperties().some((symbol) => symbol.name === "body") && responseType.getProperties().some((symbol) => symbol.name === "json");
|
|
33
34
|
if (shouldReplace) {
|
|
35
|
+
if (responseBodyNode.object.type !== AST_NODE_TYPES.Identifier) {
|
|
36
|
+
context.report({
|
|
37
|
+
node: responseBodyNode,
|
|
38
|
+
messageId: "refactorNeeded"
|
|
39
|
+
});
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
34
42
|
const enclosingFunction = getAncestor(
|
|
35
43
|
responseBodyNode,
|
|
36
44
|
(node) => node.type === AST_NODE_TYPES.ArrowFunctionExpression || node.type === AST_NODE_TYPES.FunctionExpression || node.type === AST_NODE_TYPES.FunctionDeclaration
|
|
@@ -43,8 +51,12 @@ var rule = createRule({
|
|
|
43
51
|
enclosingStatement
|
|
44
52
|
);
|
|
45
53
|
const responseVariableName = responseBodyNode.object.name;
|
|
46
|
-
const isResponseBodyVariableDeclared = enclosingStatement.type === AST_NODE_TYPES.VariableDeclaration && enclosingStatement.declarations.some(
|
|
47
|
-
|
|
54
|
+
const isResponseBodyVariableDeclared = enclosingStatement.type === AST_NODE_TYPES.VariableDeclaration && enclosingStatement.declarations.some(
|
|
55
|
+
(declaration) => declaration.init === responseBodyNode || declaration.init?.type === AST_NODE_TYPES.TSAsExpression && declaration.init.expression === responseBodyNode
|
|
56
|
+
);
|
|
57
|
+
const responseBodyVariableName = isResponseBodyVariableDeclared ? enclosingStatement.declarations.find(
|
|
58
|
+
(declaration) => declaration.init === responseBodyNode || declaration.init?.type === AST_NODE_TYPES.TSAsExpression && declaration.init.expression === responseBodyNode
|
|
59
|
+
)?.id : `${responseBodyNode.object.name}Body`;
|
|
48
60
|
const change = {
|
|
49
61
|
enclosingFunction,
|
|
50
62
|
enclosingStatement,
|
|
@@ -94,9 +106,9 @@ var rule = createRule({
|
|
|
94
106
|
let remainingChanges;
|
|
95
107
|
if (!isResponseBodyVariableDeclared) {
|
|
96
108
|
fixes.push({
|
|
97
|
-
node: enclosingStatement,
|
|
98
|
-
text: `
|
|
99
|
-
|
|
109
|
+
node: context.sourceCode.getTokenBefore(enclosingStatement),
|
|
110
|
+
text: `
|
|
111
|
+
const ${responseBodyVariableName} = await ${responseVariableName}.json();`,
|
|
100
112
|
insert: true
|
|
101
113
|
});
|
|
102
114
|
remainingChanges = orderedChanges;
|
|
@@ -113,12 +125,12 @@ var rule = createRule({
|
|
|
113
125
|
}
|
|
114
126
|
}
|
|
115
127
|
}
|
|
116
|
-
for (const fix of fixes) {
|
|
128
|
+
for (const fix of fixes.reverse()) {
|
|
117
129
|
context.report({
|
|
118
130
|
node: fix.node,
|
|
119
131
|
messageId: "replaceBodyWithJson",
|
|
120
132
|
fix(fixer) {
|
|
121
|
-
return fix.insert ? fixer.
|
|
133
|
+
return fix.insert ? fixer.insertTextAfter(fix.node, fix.text) : fixer.replaceText(fix.node, fix.text);
|
|
122
134
|
}
|
|
123
135
|
});
|
|
124
136
|
}
|
|
@@ -131,4 +143,4 @@ export {
|
|
|
131
143
|
fetch_response_body_json_default as default,
|
|
132
144
|
ruleId
|
|
133
145
|
};
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FnZW50L2ZldGNoLXJlc3BvbnNlLWJvZHktanNvbi50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLFVBQVUsY0FBYztBQUVqQyxTQUFTLGdCQUFnQixtQkFBNkI7QUFFdEQsT0FBTyx5QkFBeUI7QUFDaEMsU0FBUyxtQkFBbUI7QUFFckIsSUFBTSxTQUFTO0FBRXRCLElBQU0sYUFBYSxZQUFZLFlBQVksQ0FBQyxTQUFTLG9CQUFvQixJQUFJLENBQUM7QUFhOUUsSUFBTSxPQUEwRixXQUFXO0FBQUEsRUFDekcsTUFBTTtBQUFBLEVBQ04sTUFBTTtBQUFBLElBQ0osTUFBTTtBQUFBLElBQ04sTUFBTTtBQUFBLE1BQ0osYUFBYTtBQUFBLElBQ2Y7QUFBQSxJQUNBLFVBQVU7QUFBQSxNQUNSLGdCQUNFO0FBQUEsTUFDRixxQkFBcUI7QUFBQSxNQUNyQixjQUFjO0FBQUEsSUFDaEI7QUFBQSxJQUNBLFNBQVM7QUFBQSxJQUNULFFBQVEsQ0FBQztBQUFBLEVBQ1g7QUFBQSxFQUNBLGdCQUFnQixDQUFDO0FBQUEsRUFDakIsT0FBTyxTQUFTO0FBQ2QsVUFBTSxpQkFBaUIsWUFBWSxrQkFBa0IsT0FBTztBQUM1RCxVQUFNLGNBQWMsZUFBZSxRQUFRLGVBQWU7QUFDMUQsVUFBTSxhQUFhLG9CQUFJLElBQTBDO0FBRWpFLFdBQU87QUFBQSxNQUNMLDBDQUEwQyxDQUFDLHFCQUFnRDtBQUN6RixZQUFJO0FBQ0YsZ0JBQU0sZUFBZSxlQUFlLHNCQUFzQixJQUFJLGlCQUFpQixNQUFNO0FBQ3JGLGdCQUFNLGVBQWUsWUFBWSxrQkFBa0IsWUFBWTtBQUUvRCxnQkFBTSxnQkFDSixhQUFhLGNBQWMsRUFBRSxLQUFLLENBQUMsV0FBVyxPQUFPLFNBQVMsTUFBTSxLQUNwRSxhQUFhLGNBQWMsRUFBRSxLQUFLLENBQUMsV0FBVyxPQUFPLFNBQVMsTUFBTTtBQUV0RSxjQUFJLGVBQWU7QUFDakIsZ0JBQUksaUJBQWlCLE9BQU8sU0FBUyxl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
|
|
@@ -9,7 +9,8 @@ var DEFAULT_OPTIONS = {
|
|
|
9
9
|
"Configuration<ResolvedServices>",
|
|
10
10
|
"Fixture<ResolvedServices>",
|
|
11
11
|
"InboundContext",
|
|
12
|
-
"{ get: () => string; }"
|
|
12
|
+
"{ get: () => string; }",
|
|
13
|
+
"Api"
|
|
13
14
|
]
|
|
14
15
|
};
|
|
15
16
|
var createRule = ESLintUtils.RuleCreator((name) => getDocumentationUrl(name));
|
|
@@ -53,6 +54,16 @@ var rule = createRule({
|
|
|
53
54
|
log("===== file name:", context.filename);
|
|
54
55
|
log("callExpression:", sourceCode.getText(callExpression));
|
|
55
56
|
try {
|
|
57
|
+
const actualParameters = callExpression.arguments;
|
|
58
|
+
if (!actualParameters.some((actualParameter) => {
|
|
59
|
+
const actualType = typeChecker.getTypeAtLocation(
|
|
60
|
+
parserServices.esTreeNodeToTSNodeMap.get(actualParameter)
|
|
61
|
+
);
|
|
62
|
+
const actualTypeString = typeChecker.typeToString(actualType);
|
|
63
|
+
return typesToCheck.includes(actualTypeString) || actualTypeString.endsWith("RequestType");
|
|
64
|
+
})) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
56
67
|
const calleeTsNode = parserServices.esTreeNodeToTSNodeMap.get(callExpression.callee);
|
|
57
68
|
const calleeType = typeChecker.getTypeAtLocation(calleeTsNode);
|
|
58
69
|
const signatures = calleeType.getCallSignatures();
|
|
@@ -60,9 +71,7 @@ var rule = createRule({
|
|
|
60
71
|
return;
|
|
61
72
|
}
|
|
62
73
|
const signature = signatures[0];
|
|
63
|
-
|
|
64
|
-
return;
|
|
65
|
-
}
|
|
74
|
+
assert(signature);
|
|
66
75
|
log("signature:", signature.getDeclaration().getText());
|
|
67
76
|
const expectedParameters = signature.getParameters();
|
|
68
77
|
log(
|
|
@@ -72,7 +81,6 @@ var rule = createRule({
|
|
|
72
81
|
)
|
|
73
82
|
);
|
|
74
83
|
const expectedParametersCount = expectedParameters.length;
|
|
75
|
-
const actualParameters = callExpression.arguments;
|
|
76
84
|
const actualParametersCount = actualParameters.length;
|
|
77
85
|
if (actualParametersCount === 0) {
|
|
78
86
|
return;
|
|
@@ -95,17 +103,12 @@ var rule = createRule({
|
|
|
95
103
|
typeChecker.typeToString(expectedType)
|
|
96
104
|
);
|
|
97
105
|
log("actual type: #", actualParameterIndex, sourceCode.getText(actualParameter), actualTypeString);
|
|
98
|
-
if (
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
log("skipped");
|
|
102
|
-
} else if (typeChecker.isTypeAssignableTo(actualType, expectedType)) {
|
|
103
|
-
parametersToKeep.push(actualParameter);
|
|
104
|
-
expectedParameterIndex++;
|
|
105
|
-
log("matched");
|
|
106
|
-
} else {
|
|
107
|
-
log("not matched");
|
|
106
|
+
if ((typesToCheck.includes(actualTypeString) || actualTypeString.endsWith("RequestType")) && !typeChecker.isTypeAssignableTo(actualType, expectedType)) {
|
|
107
|
+
log("removing un-matched parameter", sourceCode.getText(actualParameter));
|
|
108
|
+
continue;
|
|
108
109
|
}
|
|
110
|
+
parametersToKeep.push(actualParameter);
|
|
111
|
+
expectedParameterIndex++;
|
|
109
112
|
}
|
|
110
113
|
if (parametersToKeep.length === actualParametersCount) {
|
|
111
114
|
return;
|
|
@@ -147,4 +150,4 @@ export {
|
|
|
147
150
|
fix_function_call_arguments_default as default,
|
|
148
151
|
ruleId
|
|
149
152
|
};
|
|
150
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
153
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2FnZW50L2ZpeC1mdW5jdGlvbi1jYWxsLWFyZ3VtZW50cy50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLFVBQVUsY0FBYztBQUNqQyxTQUFTLG1CQUE2QjtBQUN0QyxPQUFPLFdBQVc7QUFDbEIsT0FBTyx5QkFBeUI7QUFFekIsSUFBTSxTQUFTO0FBS3RCLElBQU0sa0JBQWtCO0FBQUEsRUFDdEIsY0FBYztBQUFBLElBQ1o7QUFBQSxJQUNBO0FBQUEsSUFDQTtBQUFBLElBQ0E7QUFBQSxJQUNBO0FBQUEsRUFDRjtBQUNGO0FBRUEsSUFBTSxhQUFhLFlBQVksWUFBWSxDQUFDLFNBQVMsb0JBQW9CLElBQUksQ0FBQztBQUM5RSxJQUFNLE1BQU0sTUFBTSwyQ0FBMkM7QUFFN0QsSUFBTSxPQUdGLFdBQVc7QUFBQSxFQUNiLE1BQU07QUFBQSxFQUNOLE1BQU07QUFBQSxJQUNKLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxNQUNKLGFBQWE7QUFBQSxJQUNmO0FBQUEsSUFDQSxVQUFVO0FBQUEsTUFDUixxQ0FBcUM7QUFBQSxNQUNyQyxjQUFjO0FBQUEsSUFDaEI7QUFBQSxJQUNBLFNBQVM7QUFBQSxJQUNULFFBQVE7QUFBQSxNQUNOO0FBQUEsUUFDRSxNQUFNO0FBQUEsUUFDTixZQUFZO0FBQUEsVUFDVixjQUFjO0FBQUEsWUFDWixhQUFhO0FBQUEsWUFDYixNQUFNO0FBQUEsWUFDTixPQUFPO0FBQUEsY0FDTCxNQUFNO0FBQUEsWUFDUjtBQUFBLFVBQ0Y7QUFBQSxRQUNGO0FBQUEsUUFDQSxzQkFBc0I7QUFBQSxNQUN4QjtBQUFBLElBQ0Y7QUFBQSxFQUNGO0FBQUEsRUFDQSxnQkFBZ0IsQ0FBQyxlQUFlO0FBQUEsRUFDaEMsT0FBTyxTQUFTO0FBRWQsVUFBTSxFQUFFLGFBQWEsSUFBSSxRQUFRLFFBQVEsQ0FBQyxLQUFLO0FBQy9DLFVBQU0saUJBQWlCLFlBQVksa0JBQWtCLE9BQU87QUFDNUQsVUFBTSxjQUFjLGVB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
|
|
@@ -39,6 +39,9 @@ function analyzeFixtureCall(call, results, sourceCode) {
|
|
|
39
39
|
} else if (enclosingStatement.type === "VariableDeclaration") {
|
|
40
40
|
results.variableDeclaration = enclosingStatement;
|
|
41
41
|
results.rootNode = enclosingStatement;
|
|
42
|
+
} else if (enclosingStatement.type === "ExpressionStatement" && enclosingStatement.expression.type === "AssignmentExpression") {
|
|
43
|
+
results.variableAssignment = enclosingStatement;
|
|
44
|
+
results.rootNode = enclosingStatement;
|
|
42
45
|
} else {
|
|
43
46
|
results.rootNode = parent;
|
|
44
47
|
}
|
|
@@ -118,6 +121,12 @@ function createResponseAssertions(fixtureCallInformation, sourceCode, responseVa
|
|
|
118
121
|
};
|
|
119
122
|
}
|
|
120
123
|
function getResponseVariableNameToUse(scopeManager, fixtureCallInformation, scopeVariablesMap) {
|
|
124
|
+
if (fixtureCallInformation.variableAssignment) {
|
|
125
|
+
assert.ok(
|
|
126
|
+
fixtureCallInformation.variableAssignment.expression.type === "AssignmentExpression" && fixtureCallInformation.variableAssignment.expression.left.type === "Identifier"
|
|
127
|
+
);
|
|
128
|
+
return fixtureCallInformation.variableAssignment.expression.left.name;
|
|
129
|
+
}
|
|
121
130
|
if (fixtureCallInformation.variableDeclaration) {
|
|
122
131
|
const firstDeclaration = fixtureCallInformation.variableDeclaration.declarations[0];
|
|
123
132
|
if (firstDeclaration && firstDeclaration.id.type === "Identifier") {
|
|
@@ -221,12 +230,12 @@ ${indentation}`);
|
|
|
221
230
|
);
|
|
222
231
|
const isResponseBodyVariableRedefinitionNeeded = destructuringResponseBodyVariable !== void 0 || fixtureCallInformation.inlineBodyReference !== void 0 || responseBodyReferences.length > 0 && !responseBodyReferences.some(isResponseBodyRedefinition);
|
|
223
232
|
const redefineResponseBodyVariableName = `${responseVariableNameToUse}Body`;
|
|
224
|
-
const isResponseVariableRedefinitionNeeded = responseVariable === void 0 && fixtureCallInformation.assertions !== void 0 || isResponseBodyVariableRedefinitionNeeded;
|
|
233
|
+
const isResponseVariableRedefinitionNeeded = fixtureCallInformation.variableAssignment === void 0 && responseVariable === void 0 && fixtureCallInformation.assertions !== void 0 || isResponseBodyVariableRedefinitionNeeded;
|
|
225
234
|
const responseBodyHeadersVariableRedefineLines = isResponseVariableRedefinitionNeeded ? [
|
|
226
235
|
// eslint-disable-next-line no-nested-ternary
|
|
227
236
|
...destructuringResponseBodyVariable ? [
|
|
228
237
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
229
|
-
|
|
238
|
+
`${fixtureCallInformation.variableDeclaration?.kind ?? "const"} ${destructuringResponseBodyVariable.type === "ObjectPattern" ? sourceCode.getText(destructuringResponseBodyVariable) : destructuringResponseBodyVariable.name} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`
|
|
230
239
|
] : isResponseBodyVariableRedefinitionNeeded ? [
|
|
231
240
|
`const ${redefineResponseBodyVariableName} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`
|
|
232
241
|
] : [],
|
|
@@ -239,7 +248,7 @@ ${indentation}`);
|
|
|
239
248
|
destructuringResponseHeadersVariable
|
|
240
249
|
);
|
|
241
250
|
const fetchCallText = `fetch(${fetchUrlArgumentText}, ${fetchRequestArgumentLines})`;
|
|
242
|
-
const fetchStatementText = !isResponseVariableRedefinitionNeeded ? fetchCallText :
|
|
251
|
+
const fetchStatementText = !isResponseVariableRedefinitionNeeded ? fetchCallText : `${fixtureCallInformation.variableDeclaration?.kind ?? "const"} ${responseVariableNameToUse} = await ${fetchCallText}`;
|
|
243
252
|
const nodeToReplace = isResponseVariableRedefinitionNeeded ? fixtureCallInformation.rootNode : fixtureCallInformation.fixtureNode;
|
|
244
253
|
const appendingAssignmentAndAssertionText = [
|
|
245
254
|
"",
|
|
@@ -324,4 +333,4 @@ export {
|
|
|
324
333
|
no_fixture_default as default,
|
|
325
334
|
ruleId
|
|
326
335
|
};
|
|
327
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/agent/no-fixture.ts"],
  "mappings": "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",
  "names": []
}

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

|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ESLintUtils } from '@typescript-eslint/utils';
|
|
2
2
|
export declare const ruleId = "fetch-response-body-json";
|
|
3
|
-
declare const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'>;
|
|
3
|
+
declare const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson' | 'refactorNeeded'>;
|
|
4
4
|
export default rule;
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@checkdigit/eslint-plugin","version":"7.3.0-PR.75-
|
|
1
|
+
{"name":"@checkdigit/eslint-plugin","version":"7.3.0-PR.75-d748","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.13.0","@typescript-eslint/utils":"8.13.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.14.0","@types/debug":"^4.1.12","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@typescript-eslint/parser":"8.13.0","@typescript-eslint/rule-tester":"8.13.0","eslint":"^9.14.0","eslint-config-prettier":"^9.1.0","eslint-import-resolver-typescript":"^3.6.3","eslint-plugin-eslint-plugin":"^6.3.1","eslint-plugin-import":"^2.31.0","eslint-plugin-no-only-tests":"^3.3.0","eslint-plugin-no-secrets":"^1.0.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.13.0"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=20.17"}}
|
|
@@ -28,7 +28,7 @@ interface Change {
|
|
|
28
28
|
// replacementText: string;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = createRule({
|
|
31
|
+
const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson' | 'refactorNeeded'> = createRule({
|
|
32
32
|
name: ruleId,
|
|
33
33
|
meta: {
|
|
34
34
|
type: 'suggestion',
|
|
@@ -36,6 +36,8 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
|
|
|
36
36
|
description: 'Replace "response.body" with "await response.json()".',
|
|
37
37
|
},
|
|
38
38
|
messages: {
|
|
39
|
+
refactorNeeded:
|
|
40
|
+
'Please extract the fetch call and check its reponse status code before accessing its response body.',
|
|
39
41
|
replaceBodyWithJson: 'Replace "response.body" with "await response.json()".',
|
|
40
42
|
unknownError: 'Unknown error occurred in file "{{fileName}}": {{ error }}.',
|
|
41
43
|
},
|
|
@@ -59,6 +61,14 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
|
|
|
59
61
|
responseType.getProperties().some((symbol) => symbol.name === 'json');
|
|
60
62
|
|
|
61
63
|
if (shouldReplace) {
|
|
64
|
+
if (responseBodyNode.object.type !== AST_NODE_TYPES.Identifier) {
|
|
65
|
+
context.report({
|
|
66
|
+
node: responseBodyNode,
|
|
67
|
+
messageId: 'refactorNeeded',
|
|
68
|
+
});
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
|
|
62
72
|
const enclosingFunction = getAncestor(
|
|
63
73
|
responseBodyNode,
|
|
64
74
|
(node: TSESTree.Node) =>
|
|
@@ -77,14 +87,23 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
|
|
|
77
87
|
const enclosingStatementIndex = (enclosingFunction.body as TSESTree.BlockStatement).body.indexOf(
|
|
78
88
|
enclosingStatement,
|
|
79
89
|
);
|
|
80
|
-
const responseVariableName =
|
|
90
|
+
const responseVariableName = responseBodyNode.object.name;
|
|
81
91
|
const isResponseBodyVariableDeclared =
|
|
82
92
|
enclosingStatement.type === AST_NODE_TYPES.VariableDeclaration &&
|
|
83
|
-
enclosingStatement.declarations.some(
|
|
93
|
+
enclosingStatement.declarations.some(
|
|
94
|
+
(declaration) =>
|
|
95
|
+
declaration.init === responseBodyNode ||
|
|
96
|
+
(declaration.init?.type === AST_NODE_TYPES.TSAsExpression &&
|
|
97
|
+
declaration.init.expression === responseBodyNode),
|
|
98
|
+
);
|
|
84
99
|
const responseBodyVariableName = isResponseBodyVariableDeclared
|
|
85
|
-
? (enclosingStatement.declarations.find(
|
|
86
|
-
|
|
87
|
-
|
|
100
|
+
? (enclosingStatement.declarations.find(
|
|
101
|
+
(declaration) =>
|
|
102
|
+
declaration.init === responseBodyNode ||
|
|
103
|
+
(declaration.init?.type === AST_NODE_TYPES.TSAsExpression &&
|
|
104
|
+
declaration.init.expression === responseBodyNode),
|
|
105
|
+
)?.id as unknown as string)
|
|
106
|
+
: `${responseBodyNode.object.name}Body`;
|
|
88
107
|
|
|
89
108
|
const change: Change = {
|
|
90
109
|
enclosingFunction,
|
|
@@ -121,7 +140,7 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
|
|
|
121
140
|
return;
|
|
122
141
|
}
|
|
123
142
|
|
|
124
|
-
const fixes: { node: TSESTree.Node; text: string; insert: boolean }[] = [];
|
|
143
|
+
const fixes: { node: TSESTree.Node | TSESTree.Token; text: string; insert: boolean }[] = [];
|
|
125
144
|
for (const changesByFunction of allChanges.values()) {
|
|
126
145
|
for (const changesByResponse of changesByFunction.values()) {
|
|
127
146
|
const orderedChanges = changesByResponse.sort(
|
|
@@ -141,8 +160,8 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
|
|
|
141
160
|
let remainingChanges;
|
|
142
161
|
if (!isResponseBodyVariableDeclared) {
|
|
143
162
|
fixes.push({
|
|
144
|
-
node: enclosingStatement,
|
|
145
|
-
text:
|
|
163
|
+
node: context.sourceCode.getTokenBefore(enclosingStatement) as TSESTree.Token,
|
|
164
|
+
text: `\nconst ${responseBodyVariableName} = await ${responseVariableName}.json();`,
|
|
146
165
|
insert: true,
|
|
147
166
|
});
|
|
148
167
|
remainingChanges = orderedChanges;
|
|
@@ -161,12 +180,12 @@ const rule: ESLintUtils.RuleModule<'unknownError' | 'replaceBodyWithJson'> = cre
|
|
|
161
180
|
}
|
|
162
181
|
}
|
|
163
182
|
|
|
164
|
-
for (const fix of fixes) {
|
|
183
|
+
for (const fix of fixes.reverse()) {
|
|
165
184
|
context.report({
|
|
166
185
|
node: fix.node,
|
|
167
186
|
messageId: 'replaceBodyWithJson',
|
|
168
187
|
fix(fixer) {
|
|
169
|
-
return fix.insert ? fixer.
|
|
188
|
+
return fix.insert ? fixer.insertTextAfter(fix.node, fix.text) : fixer.replaceText(fix.node, fix.text);
|
|
170
189
|
},
|
|
171
190
|
});
|
|
172
191
|
}
|
|
@@ -22,6 +22,7 @@ const DEFAULT_OPTIONS = {
|
|
|
22
22
|
'Fixture<ResolvedServices>',
|
|
23
23
|
'InboundContext',
|
|
24
24
|
'{ get: () => string; }',
|
|
25
|
+
'Api',
|
|
25
26
|
],
|
|
26
27
|
};
|
|
27
28
|
|
|
@@ -77,7 +78,21 @@ const rule: ESLintUtils.RuleModule<
|
|
|
77
78
|
|
|
78
79
|
log('===== file name:', context.filename);
|
|
79
80
|
log('callExpression:', sourceCode.getText(callExpression));
|
|
81
|
+
|
|
80
82
|
try {
|
|
83
|
+
const actualParameters = callExpression.arguments;
|
|
84
|
+
if (
|
|
85
|
+
!actualParameters.some((actualParameter) => {
|
|
86
|
+
const actualType = typeChecker.getTypeAtLocation(
|
|
87
|
+
parserServices.esTreeNodeToTSNodeMap.get(actualParameter),
|
|
88
|
+
);
|
|
89
|
+
const actualTypeString = typeChecker.typeToString(actualType);
|
|
90
|
+
return typesToCheck.includes(actualTypeString) || actualTypeString.endsWith('RequestType');
|
|
91
|
+
})
|
|
92
|
+
) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
|
|
81
96
|
const calleeTsNode = parserServices.esTreeNodeToTSNodeMap.get(callExpression.callee);
|
|
82
97
|
const calleeType = typeChecker.getTypeAtLocation(calleeTsNode);
|
|
83
98
|
|
|
@@ -88,13 +103,14 @@ const rule: ESLintUtils.RuleModule<
|
|
|
88
103
|
}
|
|
89
104
|
|
|
90
105
|
const signature = signatures[0];
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
)
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
106
|
+
assert(signature);
|
|
107
|
+
// if (
|
|
108
|
+
// signature === undefined ||
|
|
109
|
+
// (signature.typeParameters !== undefined && signature.typeParameters.length > 0)
|
|
110
|
+
// ) {
|
|
111
|
+
// // ignore complex signatures with type parameters
|
|
112
|
+
// return;
|
|
113
|
+
// }
|
|
98
114
|
|
|
99
115
|
log('signature:', signature.getDeclaration().getText());
|
|
100
116
|
const expectedParameters = signature.getParameters();
|
|
@@ -105,7 +121,6 @@ const rule: ESLintUtils.RuleModule<
|
|
|
105
121
|
),
|
|
106
122
|
);
|
|
107
123
|
const expectedParametersCount = expectedParameters.length;
|
|
108
|
-
const actualParameters = callExpression.arguments;
|
|
109
124
|
const actualParametersCount = actualParameters.length;
|
|
110
125
|
if (actualParametersCount === 0) {
|
|
111
126
|
return;
|
|
@@ -132,18 +147,15 @@ const rule: ESLintUtils.RuleModule<
|
|
|
132
147
|
);
|
|
133
148
|
log('actual type: #', actualParameterIndex, sourceCode.getText(actualParameter), actualTypeString);
|
|
134
149
|
|
|
135
|
-
if (
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
log('
|
|
140
|
-
|
|
141
|
-
parametersToKeep.push(actualParameter);
|
|
142
|
-
expectedParameterIndex++;
|
|
143
|
-
log('matched');
|
|
144
|
-
} else {
|
|
145
|
-
log('not matched');
|
|
150
|
+
if (
|
|
151
|
+
(typesToCheck.includes(actualTypeString) || actualTypeString.endsWith('RequestType')) &&
|
|
152
|
+
!typeChecker.isTypeAssignableTo(actualType, expectedType)
|
|
153
|
+
) {
|
|
154
|
+
log('removing un-matched parameter', sourceCode.getText(actualParameter));
|
|
155
|
+
continue;
|
|
146
156
|
}
|
|
157
|
+
parametersToKeep.push(actualParameter);
|
|
158
|
+
expectedParameterIndex++;
|
|
147
159
|
}
|
|
148
160
|
|
|
149
161
|
if (parametersToKeep.length === actualParametersCount) {
|
package/src/agent/no-fixture.ts
CHANGED
|
@@ -12,6 +12,7 @@ import type {
|
|
|
12
12
|
AwaitExpression,
|
|
13
13
|
CallExpression,
|
|
14
14
|
Expression,
|
|
15
|
+
ExpressionStatement,
|
|
15
16
|
MemberExpression,
|
|
16
17
|
Node,
|
|
17
18
|
ObjectPattern,
|
|
@@ -38,9 +39,10 @@ import { replaceEndpointUrlPrefixWithBasePath } from './url';
|
|
|
38
39
|
export const ruleId = 'no-fixture';
|
|
39
40
|
|
|
40
41
|
interface FixtureCallInformation {
|
|
41
|
-
rootNode: AwaitExpression | ReturnStatement | VariableDeclaration | SimpleCallExpression;
|
|
42
|
+
rootNode: AwaitExpression | ReturnStatement | VariableDeclaration | SimpleCallExpression | ExpressionStatement;
|
|
42
43
|
fixtureNode: AwaitExpression | SimpleCallExpression;
|
|
43
44
|
variableDeclaration?: VariableDeclaration;
|
|
45
|
+
variableAssignment?: ExpressionStatement;
|
|
44
46
|
requestBody?: Expression;
|
|
45
47
|
requestHeaders?: { name: Expression; value: Expression }[];
|
|
46
48
|
assertions?: Expression[][];
|
|
@@ -81,6 +83,12 @@ function analyzeFixtureCall(call: SimpleCallExpression, results: FixtureCallInfo
|
|
|
81
83
|
} else if (enclosingStatement.type === 'VariableDeclaration') {
|
|
82
84
|
results.variableDeclaration = enclosingStatement;
|
|
83
85
|
results.rootNode = enclosingStatement;
|
|
86
|
+
} else if (
|
|
87
|
+
enclosingStatement.type === 'ExpressionStatement' &&
|
|
88
|
+
enclosingStatement.expression.type === 'AssignmentExpression'
|
|
89
|
+
) {
|
|
90
|
+
results.variableAssignment = enclosingStatement;
|
|
91
|
+
results.rootNode = enclosingStatement;
|
|
84
92
|
} else {
|
|
85
93
|
results.rootNode = parent;
|
|
86
94
|
}
|
|
@@ -190,6 +198,14 @@ function getResponseVariableNameToUse(
|
|
|
190
198
|
fixtureCallInformation: FixtureCallInformation,
|
|
191
199
|
scopeVariablesMap: Map<Scope.Scope, string[]>,
|
|
192
200
|
) {
|
|
201
|
+
if (fixtureCallInformation.variableAssignment) {
|
|
202
|
+
assert.ok(
|
|
203
|
+
fixtureCallInformation.variableAssignment.expression.type === 'AssignmentExpression' &&
|
|
204
|
+
fixtureCallInformation.variableAssignment.expression.left.type === 'Identifier',
|
|
205
|
+
);
|
|
206
|
+
return fixtureCallInformation.variableAssignment.expression.left.name;
|
|
207
|
+
}
|
|
208
|
+
|
|
193
209
|
if (fixtureCallInformation.variableDeclaration) {
|
|
194
210
|
const firstDeclaration = fixtureCallInformation.variableDeclaration.declarations[0];
|
|
195
211
|
if (firstDeclaration && firstDeclaration.id.type === 'Identifier') {
|
|
@@ -323,7 +339,9 @@ const rule: Rule.RuleModule = {
|
|
|
323
339
|
const redefineResponseBodyVariableName = `${responseVariableNameToUse}Body`;
|
|
324
340
|
|
|
325
341
|
const isResponseVariableRedefinitionNeeded =
|
|
326
|
-
(
|
|
342
|
+
(fixtureCallInformation.variableAssignment === undefined &&
|
|
343
|
+
responseVariable === undefined &&
|
|
344
|
+
fixtureCallInformation.assertions !== undefined) ||
|
|
327
345
|
isResponseBodyVariableRedefinitionNeeded;
|
|
328
346
|
|
|
329
347
|
const responseBodyHeadersVariableRedefineLines = isResponseVariableRedefinitionNeeded
|
|
@@ -332,7 +350,7 @@ const rule: Rule.RuleModule = {
|
|
|
332
350
|
...(destructuringResponseBodyVariable
|
|
333
351
|
? [
|
|
334
352
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
335
|
-
|
|
353
|
+
`${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${(destructuringResponseBodyVariable as ObjectPattern).type === 'ObjectPattern' ? sourceCode.getText(destructuringResponseBodyVariable as ObjectPattern) : (destructuringResponseBodyVariable as Scope.Variable).name} = ${getResponseBodyRetrievalText(responseVariableNameToUse)}`,
|
|
336
354
|
]
|
|
337
355
|
: isResponseBodyVariableRedefinitionNeeded
|
|
338
356
|
? [
|
|
@@ -356,7 +374,7 @@ const rule: Rule.RuleModule = {
|
|
|
356
374
|
const fetchCallText = `fetch(${fetchUrlArgumentText}, ${fetchRequestArgumentLines})`;
|
|
357
375
|
const fetchStatementText = !isResponseVariableRedefinitionNeeded
|
|
358
376
|
? fetchCallText
|
|
359
|
-
:
|
|
377
|
+
: `${fixtureCallInformation.variableDeclaration?.kind ?? 'const'} ${responseVariableNameToUse} = await ${fetchCallText}`;
|
|
360
378
|
|
|
361
379
|
const nodeToReplace = isResponseVariableRedefinitionNeeded
|
|
362
380
|
? fixtureCallInformation.rootNode
|