Fix: List method checks (#624)

yelizhenden-mdb · web-flow · commit 044ed0a81565 · 2025-03-27T12:37:40.000Z
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -32,6 +32,7 @@ export default [
           enforceForLogicalOperands: true,
         },
       ],
+      'no-mixed-operators': 'warn',
     },
   },
   {
diff --git a/tools/spectral/ipa/rulesets/functions/IPA105ListMethodHasNoRequestBody.js b/tools/spectral/ipa/rulesets/functions/IPA105ListMethodHasNoRequestBody.js
@@ -15,7 +15,7 @@ export default (input, _, { path, documentInventory }) => {
 
   if (
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }
diff --git a/tools/spectral/ipa/rulesets/functions/IPA105ListMethodResponseIsGetMethodResponse.js b/tools/spectral/ipa/rulesets/functions/IPA105ListMethodResponseIsGetMethodResponse.js
@@ -26,7 +26,7 @@ export default (input, _, { path, documentInventory }) => {
   if (
     !mediaType.endsWith('json') ||
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }
diff --git a/tools/spectral/ipa/rulesets/functions/IPA105ListResponseCodeShouldBe200OK.js b/tools/spectral/ipa/rulesets/functions/IPA105ListResponseCodeShouldBe200OK.js
@@ -17,7 +17,7 @@ export default (input, _, { path, documentInventory }) => {
 
   if (
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }
diff --git a/tools/spectral/ipa/rulesets/functions/IPA106CreateMethodResponseIsGetMethodResponse.js b/tools/spectral/ipa/rulesets/functions/IPA106CreateMethodResponseIsGetMethodResponse.js
@@ -25,7 +25,7 @@ export default (input, _, { path, documentInventory }) => {
   if (
     !mediaType.endsWith('json') ||
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }
diff --git a/tools/spectral/ipa/rulesets/functions/IPA110CollectionsRequestHasItemsPerPageQueryParam.js b/tools/spectral/ipa/rulesets/functions/IPA110CollectionsRequestHasItemsPerPageQueryParam.js
@@ -15,7 +15,7 @@ export default (input, _, { path, documentInventory }) => {
 
   if (
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }
diff --git a/tools/spectral/ipa/rulesets/functions/IPA110CollectionsRequestHasPageNumQueryParam.js b/tools/spectral/ipa/rulesets/functions/IPA110CollectionsRequestHasPageNumQueryParam.js
@@ -15,7 +15,7 @@ export default (input, _, { path, documentInventory }) => {
 
   if (
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }
diff --git a/tools/spectral/ipa/rulesets/functions/IPA110CollectionsResponseDefineResultsArray.js b/tools/spectral/ipa/rulesets/functions/IPA110CollectionsResponseDefineResultsArray.js
@@ -24,7 +24,7 @@ export default (input, _, { path, documentInventory }) => {
   if (
     !mediaType.endsWith('json') ||
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }
diff --git a/tools/spectral/ipa/rulesets/functions/IPA110CollectionsUsePaginatedPrefix.js b/tools/spectral/ipa/rulesets/functions/IPA110CollectionsUsePaginatedPrefix.js
@@ -24,7 +24,7 @@ export default (input, _, { path, documentInventory }) => {
   if (
     !mediaType.endsWith('json') ||
     !isResourceCollectionIdentifier(resourcePath) ||
-    (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))
+    isSingletonResource(getResourcePathItems(resourcePath, oas.paths))
   ) {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ export default [`
`32`	`32`	`enforceForLogicalOperands: true,`
`33`	`33`	`},`
`34`	`34`	`],`
	`35`	`+ 'no-mixed-operators': 'warn',`
`35`	`36`	`},`
`36`	`37`	`},`
`37`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ export default (input, _, { path, documentInventory }) => {`
`15`	`15`
`16`	`16`	`if (`
`17`	`17`	`!isResourceCollectionIdentifier(resourcePath) \|\|`
`18`		`- (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))`
	`18`	`+ isSingletonResource(getResourcePathItems(resourcePath, oas.paths))`
`19`	`19`	`) {`
`20`	`20`	`return;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export default (input, _, { path, documentInventory }) => {`
`26`	`26`	`if (`
`27`	`27`	`!mediaType.endsWith('json') \|\|`
`28`	`28`	`!isResourceCollectionIdentifier(resourcePath) \|\|`
`29`		`- (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))`
	`29`	`+ isSingletonResource(getResourcePathItems(resourcePath, oas.paths))`
`30`	`30`	`) {`
`31`	`31`	`return;`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export default (input, _, { path, documentInventory }) => {`
`17`	`17`
`18`	`18`	`if (`
`19`	`19`	`!isResourceCollectionIdentifier(resourcePath) \|\|`
`20`		`- (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))`
	`20`	`+ isSingletonResource(getResourcePathItems(resourcePath, oas.paths))`
`21`	`21`	`) {`
`22`	`22`	`return;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export default (input, _, { path, documentInventory }) => {`
`25`	`25`	`if (`
`26`	`26`	`!mediaType.endsWith('json') \|\|`
`27`	`27`	`!isResourceCollectionIdentifier(resourcePath) \|\|`
`28`		`- (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))`
	`28`	`+ isSingletonResource(getResourcePathItems(resourcePath, oas.paths))`
`29`	`29`	`) {`
`30`	`30`	`return;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export default (input, _, { path, documentInventory }) => {`
`24`	`24`	`if (`
`25`	`25`	`!mediaType.endsWith('json') \|\|`
`26`	`26`	`!isResourceCollectionIdentifier(resourcePath) \|\|`
`27`		`- (isResourceCollectionIdentifier(resourcePath) && isSingletonResource(getResourcePathItems(resourcePath, oas.paths)))`
	`27`	`+ isSingletonResource(getResourcePathItems(resourcePath, oas.paths))`
`28`	`28`	`) {`
`29`	`29`	`return;`
`30`	`30`	`}`