Skip to content

Commit 39c095e

Browse files
committed
Code Updated as per SonarQube Report Suggestions
1 parent a82fced commit 39c095e

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

src/commands/cm/stacks/validate-regex.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {inquireAlias, inquireModule} from '../../../utils/interactive'
44
import connectStack from '../../../utils/connect-stack'
55
const regexMessages = require('../../../../messages/index.json').validateRegex
66

7-
export default class CmStacksValidateRegex extends Command {
7+
export default class ValidateRegex extends Command {
88
static description = regexMessages.command.description
99

1010
static flags = {
@@ -26,7 +26,7 @@ export default class CmStacksValidateRegex extends Command {
2626
]
2727

2828
async run() {
29-
const {flags} = this.parse(CmStacksValidateRegex)
29+
const commandObject = this.parse(ValidateRegex)
3030

3131
let authToken
3232
try {
@@ -37,21 +37,21 @@ export default class CmStacksValidateRegex extends Command {
3737
})
3838
}
3939

40-
await inquireAlias(flags)
40+
await inquireAlias(commandObject.flags)
4141

4242
let tokenDetails: any
4343
try {
44-
tokenDetails = await this.getToken(flags.alias)
44+
tokenDetails = await this.getToken(commandObject.flags.alias)
4545
} catch (error) {
4646
this.error(regexMessages.errors.tokenNotFound, {
4747
ref: regexMessages.command.addManagementToken,
4848
})
4949
}
5050

51-
await inquireModule(flags)
51+
await inquireModule(commandObject.flags)
5252

5353
try {
54-
await connectStack(flags, authToken, tokenDetails.apiKey)
54+
await connectStack(commandObject.flags, authToken, tokenDetails.apiKey)
5555
} catch (error) {
5656
this.error(regexMessages.errors.stack.fetch)
5757
}

src/utils/process-stack.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {cli} from 'cli-ux'
2-
import safeRegexCheck from './safe-regex'
3-
import generateOutput from './output'
2+
import safeRegex from './safe-regex'
3+
import generateOutput from './generate-output'
44
const regexMessages = require('../../messages/index.json').validateRegex
55

66
export default async function processStack(flags: any, stack: any, startTime: number) {
@@ -12,19 +12,19 @@ export default async function processStack(flags: any, stack: any, startTime: nu
1212
const tableData: object[] = []
1313
if (flags.contentType) {
1414
const contentTypes = stack.contentType().query(query).find()
15-
await contentTypes.then((contentTypes: any) => {
16-
contentTypes.items.forEach((contentType: any) => {
17-
safeRegexCheck(contentType, invalidRegex, tableData, 'Content Type')
15+
await contentTypes.then((contentTypesObject: any) => {
16+
contentTypesObject.items.forEach((contentType: any) => {
17+
safeRegex(contentType, invalidRegex, tableData, 'Content Type')
1818
})
1919
}).catch(() => {
2020
throw new Error(regexMessages.errors.stack.contentTypes)
2121
})
2222
}
2323
if (flags.globalField) {
2424
const globalFields = stack.globalField().query(query).find()
25-
await globalFields.then((globalFields: any) => {
26-
globalFields.items.forEach((globalField: any) => {
27-
safeRegexCheck(globalField, invalidRegex, tableData, 'Global Field')
25+
await globalFields.then((globalFieldsObject: any) => {
26+
globalFieldsObject.items.forEach((globalField: any) => {
27+
safeRegex(globalField, invalidRegex, tableData, 'Global Field')
2828
})
2929
}).catch(() => {
3030
throw new Error(regexMessages.errors.stack.globalFields)

src/utils/safe-regex.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
const safe = require('safe-regex')
22

3-
const safeRegexCheck = (document: any, invalidRegex: any, tableData: any, type: string) => {
3+
const safeRegex = (document: any, invalidRegex: any, tableData: any, type: string) => {
44
const beforeCount = invalidRegex.length
55
function checkSchemaFieldRegex(schema: any, currentPath: string, nested: boolean) {
66
let newPath = ''
7-
function path(currentPath: string, uid: string) {
8-
return currentPath.trim() === '' ? uid : [currentPath, uid].join('.')
7+
function path(currentFieldPath: string, uid: string) {
8+
return currentFieldPath.trim() === '' ? uid : [currentFieldPath, uid].join('.')
99
}
1010
schema.forEach((field: any) => {
1111
newPath = path(currentPath, field.uid)
@@ -52,4 +52,4 @@ const safeRegexCheck = (document: any, invalidRegex: any, tableData: any, type:
5252
checkSchemaFieldRegex(document.schema, '', false)
5353
}
5454

55-
export default safeRegexCheck
55+
export default safeRegex

test/utils/connect-stack.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import processStack from '../../src/utils/process-stack'
55
const regexMessages = require('../../messages/index.json').validateRegex
66

77
jest.mock('@contentstack/management', () => ({client: jest.fn()}))
8-
jest.mock('../../src/utils/output.ts')
8+
jest.mock('../../src/utils/generate-output.ts')
99
jest.mock('../../src/utils/process-stack.ts')
1010

1111
/* @ts-ignore */
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as path from 'path'
22
import * as fs from 'fs'
3-
import generateOutput from '../../src/utils/output'
3+
import generateOutput from '../../src/utils/generate-output'
44
const invalidJsonOutput = require('../data/invalidRegex.json')
55
const invalidTableOutput = require('../data/tableData.json')
66
const regexMessages = require('../../messages/index.json').validateRegex

test/utils/process-stack.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {cli} from 'cli-ux'
22
import processStack from '../../src/utils/process-stack'
3-
import generateOutput from '../../src/utils/output'
3+
import generateOutput from '../../src/utils/generate-output'
44
const validDocument = require('../data/validDocument.json')
55
const regexMessages = require('../../messages/index.json').validateRegex
66

7-
jest.mock('../../src/utils/output.ts')
7+
jest.mock('../../src/utils/generate-output.ts')
88

99
/* @ts-ignore */
1010
cli = ({

test/utils/safe-regex.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import safeRegexCheck from '../../src/utils/safe-regex'
1+
import safeRegex from '../../src/utils/safe-regex'
22
const validDocument = require('../data/validDocument.json')
33
const invalidDocument = require('../data/invalidDocument.json')
44
const invalidJsonOutput = require('../data/invalidRegex.json')
@@ -16,7 +16,7 @@ describe('Safe Regex Check in Schema', () => {
1616
const invalidRegex: object[] = []
1717
const tableData: object[] = []
1818
const moduleType = 'Content Type'
19-
safeRegexCheck(validDocument, invalidRegex, tableData, moduleType)
19+
safeRegex(validDocument, invalidRegex, tableData, moduleType)
2020
expect(invalidRegex).toStrictEqual([])
2121
expect(tableData).toStrictEqual([])
2222
})
@@ -25,7 +25,7 @@ describe('Safe Regex Check in Schema', () => {
2525
const invalidRegex: object[] = []
2626
const tableData: object[] = []
2727
const moduleType = 'Content Type'
28-
safeRegexCheck(invalidDocument, invalidRegex, tableData, moduleType)
28+
safeRegex(invalidDocument, invalidRegex, tableData, moduleType)
2929
expect(invalidRegex).toStrictEqual(invalidJsonOutput)
3030
expect(tableData).toStrictEqual(invalidTableOutput)
3131
})
@@ -36,7 +36,7 @@ describe('Safe Regex Check in Schema', () => {
3636
const invalidRegex: object[] = []
3737
const tableData: object[] = []
3838
const moduleType = 'Global Field'
39-
safeRegexCheck(validDocument, invalidRegex, tableData, moduleType)
39+
safeRegex(validDocument, invalidRegex, tableData, moduleType)
4040
expect(invalidRegex).toStrictEqual([])
4141
expect(tableData).toStrictEqual([])
4242
})
@@ -45,7 +45,7 @@ describe('Safe Regex Check in Schema', () => {
4545
const invalidRegex: object[] = []
4646
const tableData: object[] = []
4747
const moduleType = 'Global Field'
48-
safeRegexCheck(invalidDocument, invalidRegex, tableData, moduleType)
48+
safeRegex(invalidDocument, invalidRegex, tableData, moduleType)
4949
expect(invalidRegex).toStrictEqual(invalidJsonOutputGf)
5050
expect(tableData).toStrictEqual(invalidTableOutputGf)
5151
})

0 commit comments

Comments
 (0)