1- import { IRuleDefinition } from ' ./main/interfaces/IRuleDefinition' ;
2- import { IRulesConfig } from ' ./main/interfaces/IRulesConfig' ;
3- import { FixFlows } from ' ./main/libs/FixFlows' ;
4- import { GetRuleDefinitions } from ' ./main/libs/GetRuleDefinitions' ;
5- import { ParseFlows } from ' ./main/libs/ParseFlows' ;
6- import { ScanFlows } from ' ./main/libs/ScanFlows' ;
7- import { Flow } from ' ./main/models/Flow' ;
8- import { ParsedFlow } from ' ./main/models/ParsedFlow' ;
9- import { ResultDetails } from ' ./main/models/ResultDetails' ;
10- import { RuleResult } from ' ./main/models/RuleResult' ;
11- import { ScanResult } from ' ./main/models/ScanResult' ;
1+ import { IRuleDefinition } from " ./main/interfaces/IRuleDefinition" ;
2+ import { IRulesConfig } from " ./main/interfaces/IRulesConfig" ;
3+ import { FixFlows } from " ./main/libs/FixFlows" ;
4+ import { GetRuleDefinitions } from " ./main/libs/GetRuleDefinitions" ;
5+ import { ParseFlows } from " ./main/libs/ParseFlows" ;
6+ import { ScanFlows } from " ./main/libs/ScanFlows" ;
7+ import { Flow } from " ./main/models/Flow" ;
8+ import { ParsedFlow } from " ./main/models/ParsedFlow" ;
9+ import { ResultDetails } from " ./main/models/ResultDetails" ;
10+ import { RuleResult } from " ./main/models/RuleResult" ;
11+ import { ScanResult } from " ./main/models/ScanResult" ;
1212
1313export function getRules ( ruleNames ?: string [ ] ) : IRuleDefinition [ ] {
1414 if ( ruleNames && ruleNames . length > 0 ) {
15- const ruleSeverityMap = new Map < string , string > ( ruleNames . map ( ( name ) => [ name , ' error' ] ) ) ;
15+ const ruleSeverityMap = new Map < string , string > ( ruleNames . map ( ( name ) => [ name , " error" ] ) ) ;
1616 return GetRuleDefinitions ( ruleSeverityMap ) ;
1717 } else {
1818 return GetRuleDefinitions ( ) ;
@@ -23,13 +23,10 @@ export function parse(selectedUris: any): Promise<ParsedFlow[]> {
2323 return ParseFlows ( selectedUris ) ;
2424}
2525
26-
27-
2826export function scan ( parsedFlows : ParsedFlow [ ] , ruleOptions ?: IRulesConfig ) : ScanResult [ ] {
29-
3027 let flows : Flow [ ] = [ ] ;
31- for ( let flow of parsedFlows ) {
32- if ( ! flow . errorMessage && flow . flow ) {
28+ for ( let flow of parsedFlows ) {
29+ if ( ! flow . errorMessage && flow . flow ) {
3330 flows . push ( flow . flow ) ;
3431 }
3532 }
@@ -62,33 +59,35 @@ export function scan(parsedFlows: ParsedFlow[], ruleOptions?: IRulesConfig): Sca
6259 return scanResults ;
6360}
6461
65- export function fix ( results : ScanResult [ ] ) : ScanResult [ ] {
66-
62+ export function fix ( results : ScanResult [ ] ) : ScanResult [ ] {
6763 let newResults = [ ] ;
68- for ( let result of results ) {
69- if ( result . ruleResults && result . ruleResults . length > 0 ) {
70- let fixables :RuleResult [ ] = result . ruleResults . filter ( ( r ) => r . ruleName === 'UnusedVariable' && r . occurs || r . ruleName === 'UnconnectedElement' && r . occurs ) ;
71- if ( fixables && fixables . length > 0 ) {
64+ for ( let result of results ) {
65+ if ( result . ruleResults && result . ruleResults . length > 0 ) {
66+ let fixables : RuleResult [ ] = result . ruleResults . filter (
67+ ( r ) =>
68+ ( r . ruleName === "UnusedVariable" && r . occurs ) ||
69+ ( r . ruleName === "UnconnectedElement" && r . occurs )
70+ ) ;
71+ if ( fixables && fixables . length > 0 ) {
7272 const newFlow : Flow = FixFlows ( result . flow , fixables ) ;
7373 result . flow = newFlow ;
7474 newResults . push ( result ) ;
7575 }
7676 }
77-
7877 }
7978
80- return newResults
79+ return newResults ;
8180}
8281
83- export { Flow } from ' ./main/models/Flow' ;
84- export { FlowAttribute } from ' ./main/models/FlowAttribute' ;
85- export { FlowElement } from ' ./main/models/FlowElement' ;
86- export { FlowNode } from ' ./main/models/FlowNode' ;
87- export { FlowResource } from ' ./main/models/FlowResource' ;
88- export { FlowType } from ' ./main/models/FlowType' ;
89- export { FlowVariable } from ' ./main/models/FlowVariable' ;
90- export { Compiler } from ' ./main/libs/Compiler' ;
91- export { ScanResult } from ' ./main/models/ScanResult' ;
92- export { RuleResult } from ' ./main/models/RuleResult' ;
93- export { ResultDetails } from ' ./main/models/ResultDetails' ;
94- export { IRuleDefinition } from ' ./main/interfaces/IRuleDefinition' ;
82+ export { Flow } from " ./main/models/Flow" ;
83+ export { FlowAttribute } from " ./main/models/FlowAttribute" ;
84+ export { FlowElement } from " ./main/models/FlowElement" ;
85+ export { FlowNode } from " ./main/models/FlowNode" ;
86+ export { FlowResource } from " ./main/models/FlowResource" ;
87+ export { FlowType } from " ./main/models/FlowType" ;
88+ export { FlowVariable } from " ./main/models/FlowVariable" ;
89+ export { Compiler } from " ./main/libs/Compiler" ;
90+ export { ScanResult } from " ./main/models/ScanResult" ;
91+ export { RuleResult } from " ./main/models/RuleResult" ;
92+ export { ResultDetails } from " ./main/models/ResultDetails" ;
93+ export { IRuleDefinition } from " ./main/interfaces/IRuleDefinition" ;
0 commit comments