mirror of
https://github.com/sasjs/lint.git
synced 2025-12-10 17:34:36 +00:00
Compare commits
53 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb7f70e83a | ||
|
|
7f9ed5e61e | ||
|
|
63255fa3c8 | ||
|
|
00af205a55 | ||
|
|
e74663ba54 | ||
|
|
a9cb4d8dac | ||
|
|
ed58b288b5 | ||
|
|
be173d2e2b | ||
|
|
3e4809c352 | ||
|
|
f0ab349bf7 | ||
|
|
0c5588023d | ||
|
|
8badfd9358 | ||
| 0dfd1fb85b | |||
|
|
04cfa454f8 | ||
| 2cb73da0eb | |||
|
|
22cc42446c | ||
|
|
0fe79273e0 | ||
|
|
3d7f88aacb | ||
|
|
1677eca957 | ||
|
|
a1ebb51230 | ||
| 496e0bc8fc | |||
|
|
f8b15c7d4d | ||
|
|
74e8df2a7b | ||
|
|
12e4eeb287 | ||
| bc7a7a7645 | |||
|
|
40e90995f8 | ||
|
|
80d0b39637 | ||
| c3a466f485 | |||
| 38656e9e89 | |||
| 386d0f5ff3 | |||
|
|
ad59159b62 | ||
|
|
591f498d6d | ||
| b5b8e7b00b | |||
| 7a46e9857e | |||
|
|
985ed41a4b | ||
| fa07a7789c | |||
| 9a44984264 | |||
| 54f887fc6d | |||
|
|
5f0ef8616c | ||
|
|
04858eab99 | ||
|
|
86fc4b8718 | ||
| fef3eb5503 | |||
| 9dca298a2f | |||
| 3ec75cdbfb | |||
| 20476c557f | |||
| ed96ba092b | |||
|
|
b8b357c514 | ||
|
|
701c160ec1 | ||
| e6dc319844 | |||
| b6e9ee0825 | |||
|
|
4cb2fe8a69 | ||
|
|
6c3b716988 | ||
| 844f1ad154 |
4
.github/workflows/publish.yml
vendored
4
.github/workflows/publish.yml
vendored
@@ -13,7 +13,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: Install Dependencies
|
||||
run: npm ci
|
||||
- name: Check Code Style
|
||||
@@ -21,7 +21,7 @@ jobs:
|
||||
- name: Build Project
|
||||
run: npm run build
|
||||
- name: Semantic Release
|
||||
uses: cycjimmy/semantic-release-action@v2
|
||||
uses: cycjimmy/semantic-release-action@v3
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
|
||||
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
|
||||
118
README.md
118
README.md
@@ -8,6 +8,8 @@
|
||||
|
||||
Our goal is to help SAS developers everywhere spend less time on code reviews, bug fixing and arguing about standards - and more time delivering extraordinary business value.
|
||||
|
||||
*Note:* The SASjs project and its repositories are not affiliated with SAS Institute.
|
||||
|
||||
# Linting
|
||||
|
||||
@sasjs/lint is used by the following products:
|
||||
@@ -23,9 +25,12 @@ Configuration is via a `.sasjslint` file with the following structure (these are
|
||||
"hasDoxygenHeader": true,
|
||||
"hasMacroNameInMend": true,
|
||||
"hasMacroParentheses": true,
|
||||
"ignoreList": ["sajsbuild/", "sasjsresults/"],
|
||||
"ignoreList": ["sasjsbuild/", "sasjsresults/"],
|
||||
"indentationMultiple": 2,
|
||||
"lineEndings": "off",
|
||||
"lowerCaseFileNames": true,
|
||||
"maxDataLineLength": 80,
|
||||
"maxHeaderLineLength": 80,
|
||||
"maxLineLength": 80,
|
||||
"noNestedMacros": true,
|
||||
"noGremlins": true,
|
||||
@@ -46,9 +51,24 @@ Each setting can have three states:
|
||||
|
||||
For more details, and the default state, see the description of each rule below. It is also possible to change whether a rule returns ERROR or WARN using the `severityLevels` object.
|
||||
|
||||
Configuring a non-zero return code (ERROR) is helpful when running `sasjs lint` as part of a git pre-commit hook. An example is available [here](https://github.com/sasjs/template_jobs/blob/main/.git-hooks/pre-commit).
|
||||
|
||||
### allowedGremlins
|
||||
|
||||
An array of hex codes that represents allowed gremlins (invisible / undesirable characters). To allow all gremlins, you can also set the `noGremlins` rule to `false`. The full gremlin list is [here](https://github.com/sasjs/lint/blob/main/src/utils/gremlinCharacters.ts).
|
||||
|
||||
Example:
|
||||
|
||||
```json
|
||||
{
|
||||
"noGremlins": true,
|
||||
"allowedGremlins": ["0x0080", "0x3000"]
|
||||
}
|
||||
```
|
||||
|
||||
### defaultHeader
|
||||
|
||||
This isn't actually a rule - but rather a formatting setting, which applies to SAS program that do NOT begin with `/**`. It can be triggered by running `sasjs lint fix` in the SASjs CLI, or by hitting "save" when using the SASjs VS Code extension (with "formatOnSave" in place)
|
||||
This isn't a rule, but a formatting setting, which applies to SAS program that do NOT begin with `/**`. It can be triggered by running `sasjs lint fix` in the SASjs CLI, or by hitting "save" when using the SASjs VS Code extension (with "formatOnSave" in place)
|
||||
|
||||
The default header is as follows:
|
||||
|
||||
@@ -107,6 +127,21 @@ This will check each line to ensure that the count of leading spaces can be divi
|
||||
- Default: 2
|
||||
- Severity: WARNING
|
||||
|
||||
### lineEndings
|
||||
|
||||
This setting ensures the line endings in a file to conform the configured type. Possible values are `lf`, `crlf` and `off` (off means rule is set to be off). If the value is missing, null or undefined then the check would also be switched off (no default applied).
|
||||
|
||||
- Default: "off"
|
||||
- Severity: WARNING
|
||||
|
||||
Example (to enforce unix line endings):
|
||||
|
||||
```json
|
||||
{
|
||||
"lineEndings": "lf"
|
||||
}
|
||||
```
|
||||
|
||||
### lowerCaseFileNames
|
||||
|
||||
On *nix systems, it is imperative that autocall macros are in lowercase. When sharing code between windows and *nix systems, the difference in case sensitivity can also be a cause of lost developer time. For this reason, we recommend that sas filenames are always lowercase.
|
||||
@@ -114,6 +149,45 @@ On *nix systems, it is imperative that autocall macros are in lowercase. When sh
|
||||
- Default: true
|
||||
- Severity: WARNING
|
||||
|
||||
### maxDataLineLength
|
||||
|
||||
Datalines can be very wide, so to avoid the need to increase `maxLineLength` for the entire project, it is possible to raise the line length limit for the data records only. On a related note, as a developer, you should also be aware that code submitted in batch may have a default line length limit which is lower than you expect. See this [usage note](https://support.sas.com/kb/15/883.html) (and thanks to [sasutils for reminding us](https://github.com/sasjs/lint/issues/47#issuecomment-1064340104)).
|
||||
|
||||
This feature will work for the following statements:
|
||||
|
||||
- cards
|
||||
- cards4
|
||||
- datalines
|
||||
- datalines4
|
||||
- parmcards
|
||||
- parmcards4
|
||||
|
||||
The `maxDataLineLength` setting is always the _higher_ of `maxDataLineLength` and `maxLineLength` (if you set a lower number, it is ignored).
|
||||
|
||||
- Default: 80
|
||||
- Severity: WARNING
|
||||
|
||||
See also:
|
||||
|
||||
- [hasDoxygenHeader](#hasdoxygenheader)
|
||||
- [maxHeaderLineLength](#maxheaderlinelength)
|
||||
- [maxLineLength](#maxlinelength)
|
||||
|
||||
### maxHeaderLineLength
|
||||
|
||||
In a program header it can be necessary to insert items such as URLs or markdown tables, that cannot be split over multiple lines. To avoid the need to increase `maxLineLength` for the entire project, it is possible to raise the line length limit for the header section only.
|
||||
|
||||
The `maxHeaderLineLength` setting is always the _higher_ of `maxHeaderLineLength` and `maxLineLength` (if you set a lower number, it is ignored).
|
||||
|
||||
- Default: 80
|
||||
- Severity: WARNING
|
||||
|
||||
See also:
|
||||
|
||||
- [hasDoxygenHeader](#hasdoxygenheader)
|
||||
- [maxDataLineLength](#maxdatalinelength)
|
||||
- [maxLineLength](#maxlinelength)
|
||||
|
||||
### maxLineLength
|
||||
|
||||
Code becomes far more readable when line lengths are short. The most compelling reason for short line lengths is to avoid the need to scroll when performing a side-by-side 'compare' between two files (eg as part of a GIT feature branch review). A longer discussion on optimal code line length can be found [here](https://stackoverflow.com/questions/578059/studies-on-optimal-code-width)
|
||||
@@ -125,9 +199,14 @@ We strongly recommend a line length limit, and set the bar at 80. To turn this f
|
||||
- Default: 80
|
||||
- Severity: WARNING
|
||||
|
||||
See also:
|
||||
|
||||
- [maxDataLineLength](#maxdatalinelength)
|
||||
- [maxHeaderLineLength](#maxheaderlinelength)
|
||||
|
||||
### noGremlins
|
||||
|
||||
Capture zero-width whitespace and other non-standard characters. The logic is borrowed from the [VSCode Gremlins Extension](https://github.com/nhoizey/vscode-gremlins) - if you are looking for more advanced gremlin zapping capabilities, we highly recommend to use their extension instead.
|
||||
Capture zero-width whitespace and other non-standard characters. The logic is borrowed from the [VSCode Gremlins Extension](https://github.com/nhoizey/vscode-gremlins) - if you are looking for more advanced gremlin zapping capabilities, we highly recommend to use their extension instead.
|
||||
|
||||
The list of characters can be found in this file: [https://github.com/sasjs/lint/blob/main/src/utils/gremlinCharacters.ts](https://github.com/sasjs/lint/blob/main/src/utils/gremlinCharacters.ts)
|
||||
|
||||
@@ -153,6 +232,13 @@ In addition, when such files are used in URLs, they are often padded with a mess
|
||||
- Default: true
|
||||
- Severity: WARNING
|
||||
|
||||
As an alternative (or in addition) to using a lint rule, you can also set the following in your `.gitignore` file to prevent files with spaces from being committed:
|
||||
|
||||
```
|
||||
# prevent files/folders with spaces
|
||||
**\ **
|
||||
```
|
||||
|
||||
### noTabs
|
||||
|
||||
Whilst there are some arguments for using tabs (such as the ability to set your own indentation width, and to reduce character count) there are many, many, many developers who think otherwise. We're in that camp. Sorry (not sorry).
|
||||
@@ -168,6 +254,21 @@ This will highlight lines with trailing spaces. Trailing spaces serve no useful
|
||||
- Default: true
|
||||
- severity: WARNING
|
||||
|
||||
### hasRequiredMacroOptions
|
||||
|
||||
This will require macros to have the options listed as "requiredMacroOptions." This is helpful if you want to ensure all macros are SECURE.
|
||||
|
||||
- Default: false
|
||||
- severity: WARNING
|
||||
|
||||
Example
|
||||
```json
|
||||
{
|
||||
"hasRequiredMacroOptions": true,
|
||||
"requiredMacroOptions": ["SECURE", "SRC"]
|
||||
}
|
||||
```
|
||||
|
||||
## severityLevel
|
||||
|
||||
This setting allows the default severity to be adjusted. This is helpful when running the lint in a pipeline or git hook. Simply list the rules you would like to adjust along with the desired setting ("warn" or "error"), eg as follows:
|
||||
@@ -188,11 +289,6 @@ This setting allows the default severity to be adjusted. This is helpful when ru
|
||||
- "warn" - show warning in the log (doesn’t affect exit code)
|
||||
- "error" - show error in the log (exit code is 1 when triggered)
|
||||
|
||||
## Upcoming Linting Rules:
|
||||
|
||||
- `noGremlins` -> identifies all invisible characters, other than spaces / tabs / line endings. If you really need that bell character, use a hex literal!
|
||||
- `lineEndings` -> set a standard line ending, such as LF or CRLF
|
||||
|
||||
# SAS Formatter
|
||||
|
||||
A formatter will automatically apply rules when you hit SAVE, which can save a LOT of time.
|
||||
@@ -211,6 +307,12 @@ We're looking to implement the following rules:
|
||||
|
||||
We are also investigating some harder stuff, such as automatic indentation and code layout
|
||||
|
||||
# Further resources
|
||||
|
||||
* Using the linter on terminal: https://vid.4gl.io/w/vmJspCjcBoc5QtzwZkZRvi
|
||||
* Longer intro to sasjs lint: https://vid.4gl.io/w/nDtkQFV1E8rtaa2BuM6U5s
|
||||
* CLI docs: https://cli.sasjs.io/lint
|
||||
|
||||
# Sponsorship & Contributions
|
||||
|
||||
SASjs is an open source framework! Contributions are welcomed. If you would like to see a feature, because it would be useful in your project, but you don't have the requisite (Typescript) experience - then how about you engage us on a short project and we build it for you?
|
||||
|
||||
10900
package-lock.json
generated
10900
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@@ -39,16 +39,16 @@
|
||||
},
|
||||
"homepage": "https://github.com/sasjs/lint#readme",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^26.0.23",
|
||||
"@types/node": "^15.12.2",
|
||||
"all-contributors-cli": "^6.20.0",
|
||||
"jest": "^26.6.3",
|
||||
"@types/jest": "29.2.5",
|
||||
"@types/node": "18.11.18",
|
||||
"all-contributors-cli": "6.24.0",
|
||||
"jest": "29.3.1",
|
||||
"rimraf": "^3.0.2",
|
||||
"ts-jest": "^26.5.6",
|
||||
"ts-jest": "29.0.3",
|
||||
"typescript": "^4.3.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@sasjs/utils": "^2.19.0",
|
||||
"ignore": "^5.2.0"
|
||||
"@sasjs/utils": "2.52.0",
|
||||
"ignore": "5.2.4"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,14 +13,18 @@
|
||||
"indentationMultiple": 2,
|
||||
"lowerCaseFileNames": true,
|
||||
"maxLineLength": 80,
|
||||
"maxHeaderLineLength": 80,
|
||||
"maxDataLineLength": 80,
|
||||
"noGremlins": true,
|
||||
"noNestedMacros": true,
|
||||
"noSpacesInFileNames": true,
|
||||
"noTabs": true,
|
||||
"noTrailingSpaces": true,
|
||||
"lineEndings": "lf",
|
||||
"lineEndings": "off",
|
||||
"strictMacroDefinition": true,
|
||||
"ignoreList": ["sajsbuild", "sasjsresults"]
|
||||
"ignoreList": ["sajsbuild", "sasjsresults"],
|
||||
"hasRequiredMacroOptions": false,
|
||||
"requiredMacroOptions": []
|
||||
},
|
||||
"examples": [
|
||||
{
|
||||
@@ -30,7 +34,10 @@
|
||||
"noSpacesInFileNames": true,
|
||||
"lowerCaseFileNames": true,
|
||||
"maxLineLength": 80,
|
||||
"maxHeaderLineLength": 80,
|
||||
"maxDataLineLength": 80,
|
||||
"noGremlins": true,
|
||||
"allowedGremlins": ["0x0080", "0x3000"],
|
||||
"noTabs": true,
|
||||
"indentationMultiple": 4,
|
||||
"hasMacroNameInMend": true,
|
||||
@@ -38,7 +45,9 @@
|
||||
"hasMacroParentheses": true,
|
||||
"lineEndings": "crlf",
|
||||
"strictMacroDefinition": true,
|
||||
"ignoreList": ["sajsbuild", "sasjsresults"]
|
||||
"ignoreList": ["sajsbuild", "sasjsresults"],
|
||||
"hasRequiredMacroOptions": false,
|
||||
"requiredMacroOptions": []
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
@@ -74,6 +83,18 @@
|
||||
"default": [true],
|
||||
"examples": [true, false]
|
||||
},
|
||||
"allowedGremlins": {
|
||||
"$id": "#/properties/allowedGremlins",
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "string",
|
||||
"pattern": "^0x[0-9A-Fa-f]{4}$"
|
||||
},
|
||||
"title": "allowedGremlins",
|
||||
"description": "An array of hex codes that represents allowed gremlins.",
|
||||
"default": [],
|
||||
"examples": ["0x0080", "0x3000"]
|
||||
},
|
||||
"hasMacroNameInMend": {
|
||||
"$id": "#/properties/hasMacroNameInMend",
|
||||
"type": "boolean",
|
||||
@@ -114,6 +135,22 @@
|
||||
"default": 80,
|
||||
"examples": [60, 80, 120]
|
||||
},
|
||||
"maxHeaderLineLength": {
|
||||
"$id": "#/properties/maxHeaderLineLength",
|
||||
"type": "number",
|
||||
"title": "maxHeaderLineLength",
|
||||
"description": "Enforces a configurable maximum line length for header section. Shows a warning for lines exceeding this length.",
|
||||
"default": 80,
|
||||
"examples": [60, 80, 120]
|
||||
},
|
||||
"maxDataLineLength": {
|
||||
"$id": "#/properties/maxDataLineLength",
|
||||
"type": "number",
|
||||
"title": "maxDataLineLength",
|
||||
"description": "Enforces a configurable maximum line length for data section. Shows a warning for lines exceeding this length.",
|
||||
"default": 80,
|
||||
"examples": [60, 80, 120]
|
||||
},
|
||||
"noNestedMacros": {
|
||||
"$id": "#/properties/noNestedMacros",
|
||||
"type": "boolean",
|
||||
@@ -149,9 +186,10 @@
|
||||
"lineEndings": {
|
||||
"$id": "#/properties/lineEndings",
|
||||
"type": "string",
|
||||
"enum": ["lf", "crlf", "off"],
|
||||
"title": "lineEndings",
|
||||
"description": "Enforces the configured terminating character for each line. Shows a warning when incorrect line endings are present.",
|
||||
"default": "lf",
|
||||
"default": "off",
|
||||
"examples": ["lf", "crlf"]
|
||||
},
|
||||
"strictMacroDefinition": {
|
||||
@@ -170,6 +208,22 @@
|
||||
"default": ["sasjsbuild/", "sasjsresults/"],
|
||||
"examples": ["sasjs/tests", "tmp/scratch.sas"]
|
||||
},
|
||||
"hasRequiredMacroOptions": {
|
||||
"$id": "#/properties/hasRequiredMacroOptions",
|
||||
"type": "boolean",
|
||||
"title": "hasRequiredMacroOptions",
|
||||
"description": "Enforces required macro options as defined by requiredMacroOptions",
|
||||
"default": false,
|
||||
"examples": [true, false]
|
||||
},
|
||||
"requiredMacroOptions": {
|
||||
"$id": "#/properties/requiredMacroOptions",
|
||||
"type": "array",
|
||||
"title": "requiredMacroOptions",
|
||||
"description": "An array of macro options to require all macros to include.",
|
||||
"default": [],
|
||||
"examples": ["['SECURE']", "['SRC', 'STMT']"]
|
||||
},
|
||||
"severityLevel": {
|
||||
"$id": "#/properties/severityLevel",
|
||||
"type": "object",
|
||||
@@ -286,6 +340,13 @@
|
||||
"type": "string",
|
||||
"enum": ["error", "warn"],
|
||||
"default": "warn"
|
||||
},
|
||||
"hasRequiredMacroOptions": {
|
||||
"$id": "#/properties/severityLevel/hasRequiredMacroOptions",
|
||||
"title": "hasRequiredMacroOptions",
|
||||
"type": "string",
|
||||
"enum": ["error", "warn"],
|
||||
"default": "warn"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,11 +8,12 @@ import { formatFolder } from './formatFolder'
|
||||
* @returns {Promise<FormatResult>} Resolves successfully when all SAS files in the current project have been formatted.
|
||||
*/
|
||||
export const formatProject = async (): Promise<FormatResult> => {
|
||||
const projectRoot =
|
||||
(await getProjectRoot()) || process.projectDir || process.currentDir
|
||||
const projectRoot = (await getProjectRoot()) || process.currentDir
|
||||
if (!projectRoot) {
|
||||
throw new Error('SASjs Project Root was not found.')
|
||||
}
|
||||
|
||||
console.info(`Formatting all .sas files under ${projectRoot}`)
|
||||
|
||||
return await formatFolder(projectRoot)
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ export const lintFile = async (
|
||||
filePath: string,
|
||||
configuration?: LintConfig
|
||||
): Promise<Diagnostic[]> => {
|
||||
if (await isIgnored(filePath)) return []
|
||||
if (await isIgnored(filePath, configuration)) return []
|
||||
|
||||
const config = configuration || (await getLintConfig())
|
||||
const text = await readFile(filePath)
|
||||
|
||||
@@ -26,7 +26,7 @@ export const lintFolder = async (
|
||||
const config = configuration || (await getLintConfig())
|
||||
let diagnostics: Map<string, Diagnostic[]> = new Map<string, Diagnostic[]>()
|
||||
|
||||
if (await isIgnored(folderPath)) return diagnostics
|
||||
if (await isIgnored(folderPath, config)) return diagnostics
|
||||
|
||||
const fileNames = await listSasFiles(folderPath)
|
||||
await asyncForEach(fileNames, async (fileName) => {
|
||||
|
||||
@@ -6,10 +6,12 @@ import { lintFolder } from './lintFolder'
|
||||
* @returns {Promise<Map<string, Diagnostic[]>>} Resolves with a map with array of diagnostic objects, each containing a warning, line number and column number, and grouped by file path.
|
||||
*/
|
||||
export const lintProject = async () => {
|
||||
const projectRoot =
|
||||
(await getProjectRoot()) || process.projectDir || process.currentDir
|
||||
const projectRoot = (await getProjectRoot()) || process.currentDir
|
||||
if (!projectRoot) {
|
||||
throw new Error('SASjs Project Root was not found.')
|
||||
}
|
||||
|
||||
console.info(`Linting all .sas files under ${projectRoot}`)
|
||||
|
||||
return await lintFolder(projectRoot)
|
||||
}
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
import { LintConfig, Diagnostic } from '../types'
|
||||
import { splitText } from '../utils'
|
||||
import { LintConfig, Diagnostic, LineLintRuleOptions } from '../types'
|
||||
import { getHeaderLinesCount, splitText } from '../utils'
|
||||
import { checkIsDataLine, getDataSectionsDetail } from '../utils'
|
||||
|
||||
export const processText = (text: string, config: LintConfig) => {
|
||||
const lines = splitText(text, config)
|
||||
const headerLinesCount = getHeaderLinesCount(text, config)
|
||||
const dataSections = getDataSectionsDetail(text, config)
|
||||
const diagnostics: Diagnostic[] = []
|
||||
diagnostics.push(...processContent(config, text))
|
||||
lines.forEach((line, index) => {
|
||||
diagnostics.push(...processLine(config, line, index + 1))
|
||||
const isHeaderLine = index + 1 <= headerLinesCount
|
||||
const isDataLine = checkIsDataLine(dataSections, index)
|
||||
diagnostics.push(
|
||||
...processLine(config, line, index + 1, { isHeaderLine, isDataLine })
|
||||
)
|
||||
})
|
||||
|
||||
return diagnostics
|
||||
@@ -36,11 +43,12 @@ const processContent = (config: LintConfig, content: string): Diagnostic[] => {
|
||||
export const processLine = (
|
||||
config: LintConfig,
|
||||
line: string,
|
||||
lineNumber: number
|
||||
lineNumber: number,
|
||||
options: LineLintRuleOptions
|
||||
): Diagnostic[] => {
|
||||
const diagnostics: Diagnostic[] = []
|
||||
config.lineLintRules.forEach((rule) => {
|
||||
diagnostics.push(...rule.test(line, lineNumber, config))
|
||||
diagnostics.push(...rule.test(line, lineNumber, config, options))
|
||||
})
|
||||
|
||||
return diagnostics
|
||||
|
||||
123
src/rules/file/hasRequiredMacroOptions.spec.ts
Normal file
123
src/rules/file/hasRequiredMacroOptions.spec.ts
Normal file
@@ -0,0 +1,123 @@
|
||||
import { LintConfig, Severity } from '../../types'
|
||||
import { hasRequiredMacroOptions } from './hasRequiredMacroOptions'
|
||||
|
||||
describe('hasRequiredMacroOptions - test', () => {
|
||||
it('should return an empty array when the content has the required macro option(s)', () => {
|
||||
const contentSecure = '%macro somemacro/ SECURE;'
|
||||
const configSecure = new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: ['SECURE']
|
||||
})
|
||||
expect(hasRequiredMacroOptions.test(contentSecure, configSecure)).toEqual(
|
||||
[]
|
||||
)
|
||||
|
||||
const contentSecureSrc = '%macro somemacro/ SECURE SRC;'
|
||||
const configSecureSrc = new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: ['SECURE', 'SRC']
|
||||
})
|
||||
expect(
|
||||
hasRequiredMacroOptions.test(contentSecureSrc, configSecureSrc)
|
||||
).toEqual([])
|
||||
|
||||
const configEmpty = new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: ['']
|
||||
})
|
||||
expect(hasRequiredMacroOptions.test(contentSecureSrc, configEmpty)).toEqual(
|
||||
[]
|
||||
)
|
||||
})
|
||||
|
||||
it('should return an array with a single diagnostic when Macro does not contain the required option', () => {
|
||||
const configSecure = new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: ['SECURE']
|
||||
})
|
||||
|
||||
const contentMinXOperator = '%macro somemacro(var1, var2)/minXoperator;'
|
||||
expect(
|
||||
hasRequiredMacroOptions.test(contentMinXOperator, configSecure)
|
||||
).toEqual([
|
||||
{
|
||||
message: `Macro 'somemacro' does not contain the required option 'SECURE'`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 0,
|
||||
endColumnNumber: 0,
|
||||
severity: Severity.Warning
|
||||
}
|
||||
])
|
||||
|
||||
const contentSecureSplit = '%macro somemacro(var1, var2)/ SE CURE;'
|
||||
expect(
|
||||
hasRequiredMacroOptions.test(contentSecureSplit, configSecure)
|
||||
).toEqual([
|
||||
{
|
||||
message: `Macro 'somemacro' does not contain the required option 'SECURE'`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 0,
|
||||
endColumnNumber: 0,
|
||||
severity: Severity.Warning
|
||||
}
|
||||
])
|
||||
|
||||
const contentNoOption = '%macro somemacro(var1, var2);'
|
||||
expect(hasRequiredMacroOptions.test(contentNoOption, configSecure)).toEqual(
|
||||
[
|
||||
{
|
||||
message: `Macro 'somemacro' does not contain the required option 'SECURE'`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 0,
|
||||
endColumnNumber: 0,
|
||||
severity: Severity.Warning
|
||||
}
|
||||
]
|
||||
)
|
||||
})
|
||||
|
||||
it('should return an array with a two diagnostics when Macro does not contain the required options', () => {
|
||||
const configSrcStmt = new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: ['SRC', 'STMT'],
|
||||
severityLevel: { hasRequiredMacroOptions: 'warn' }
|
||||
})
|
||||
const contentMinXOperator = '%macro somemacro(var1, var2)/minXoperator;'
|
||||
expect(
|
||||
hasRequiredMacroOptions.test(contentMinXOperator, configSrcStmt)
|
||||
).toEqual([
|
||||
{
|
||||
message: `Macro 'somemacro' does not contain the required option 'SRC'`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 0,
|
||||
endColumnNumber: 0,
|
||||
severity: Severity.Warning
|
||||
},
|
||||
{
|
||||
message: `Macro 'somemacro' does not contain the required option 'STMT'`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 0,
|
||||
endColumnNumber: 0,
|
||||
severity: Severity.Warning
|
||||
}
|
||||
])
|
||||
})
|
||||
|
||||
it('should return an array with a one diagnostic when Macro contains 1 of 2 required options', () => {
|
||||
const configSrcStmt = new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: ['SRC', 'STMT'],
|
||||
severityLevel: { hasRequiredMacroOptions: 'error' }
|
||||
})
|
||||
const contentSrc = '%macro somemacro(var1, var2)/ SRC;'
|
||||
expect(hasRequiredMacroOptions.test(contentSrc, configSrcStmt)).toEqual([
|
||||
{
|
||||
message: `Macro 'somemacro' does not contain the required option 'STMT'`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 0,
|
||||
endColumnNumber: 0,
|
||||
severity: Severity.Error
|
||||
}
|
||||
])
|
||||
})
|
||||
})
|
||||
52
src/rules/file/hasRequiredMacroOptions.ts
Normal file
52
src/rules/file/hasRequiredMacroOptions.ts
Normal file
@@ -0,0 +1,52 @@
|
||||
import { Diagnostic, LintConfig, Macro, Severity } from '../../types'
|
||||
import { FileLintRule } from '../../types/LintRule'
|
||||
import { LintRuleType } from '../../types/LintRuleType'
|
||||
import { parseMacros } from '../../utils/parseMacros'
|
||||
|
||||
const name = 'hasRequiredMacroOptions'
|
||||
const description = 'Enforce required macro options'
|
||||
const message = 'Macro defined without required options'
|
||||
|
||||
const processOptions = (
|
||||
macro: Macro,
|
||||
diagnostics: Diagnostic[],
|
||||
config?: LintConfig
|
||||
): void => {
|
||||
const optionsPresent = macro.declaration.split('/')?.[1]?.trim() ?? ''
|
||||
const severity = config?.severityLevel[name] || Severity.Warning
|
||||
|
||||
config?.requiredMacroOptions.forEach((option) => {
|
||||
if (!optionsPresent.includes(option)) {
|
||||
diagnostics.push({
|
||||
message: `Macro '${macro.name}' does not contain the required option '${option}'`,
|
||||
lineNumber: macro.startLineNumbers[0],
|
||||
startColumnNumber: 0,
|
||||
endColumnNumber: 0,
|
||||
severity
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const test = (value: string, config?: LintConfig) => {
|
||||
const diagnostics: Diagnostic[] = []
|
||||
|
||||
const macros = parseMacros(value, config)
|
||||
|
||||
macros.forEach((macro) => {
|
||||
processOptions(macro, diagnostics, config)
|
||||
})
|
||||
|
||||
return diagnostics
|
||||
}
|
||||
|
||||
/**
|
||||
* Lint rule that checks if a macro has the required options
|
||||
*/
|
||||
export const hasRequiredMacroOptions: FileLintRule = {
|
||||
type: LintRuleType.File,
|
||||
name,
|
||||
description,
|
||||
message,
|
||||
test
|
||||
}
|
||||
@@ -4,3 +4,4 @@ export { hasMacroParentheses } from './hasMacroParentheses'
|
||||
export { lineEndings } from './lineEndings'
|
||||
export { noNestedMacros } from './noNestedMacros'
|
||||
export { strictMacroDefinition } from './strictMacroDefinition'
|
||||
export { hasRequiredMacroOptions } from './hasRequiredMacroOptions'
|
||||
|
||||
@@ -41,4 +41,44 @@ describe('maxLineLength', () => {
|
||||
'Prow scuttle parrel provost Sail ho shrouds spirits boom mizzenmast yard'
|
||||
expect(maxLineLength.test(line, 1)).toEqual([])
|
||||
})
|
||||
|
||||
it('should return an array with a single diagnostic when the line in header section exceeds the specified length', () => {
|
||||
const line = 'This line is from header section'
|
||||
const config = new LintConfig({
|
||||
maxLineLength: 10,
|
||||
maxHeaderLineLength: 15
|
||||
})
|
||||
expect(maxLineLength.test(line, 1, config, { isHeaderLine: true })).toEqual(
|
||||
[
|
||||
{
|
||||
message: `Line exceeds maximum length by ${
|
||||
line.length - config.maxHeaderLineLength
|
||||
} characters`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 1,
|
||||
endColumnNumber: 1,
|
||||
severity: Severity.Warning
|
||||
}
|
||||
]
|
||||
)
|
||||
})
|
||||
|
||||
it('should return an array with a single diagnostic when the line in data section exceeds the specified length', () => {
|
||||
const line = 'GROUP_LOGIC:$3. SUBGROUP_LOGIC:$3. SUBGROUP_ID:8.'
|
||||
const config = new LintConfig({
|
||||
maxLineLength: 10,
|
||||
maxDataLineLength: 15
|
||||
})
|
||||
expect(maxLineLength.test(line, 1, config, { isDataLine: true })).toEqual([
|
||||
{
|
||||
message: `Line exceeds maximum length by ${
|
||||
line.length - config.maxDataLineLength
|
||||
} characters`,
|
||||
lineNumber: 1,
|
||||
startColumnNumber: 1,
|
||||
endColumnNumber: 1,
|
||||
severity: Severity.Warning
|
||||
}
|
||||
])
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,15 +1,32 @@
|
||||
import { LintConfig } from '../../types'
|
||||
import { LineLintRule } from '../../types/LintRule'
|
||||
import { LineLintRule, LineLintRuleOptions } from '../../types/LintRule'
|
||||
import { LintRuleType } from '../../types/LintRuleType'
|
||||
import { Severity } from '../../types/Severity'
|
||||
import { DefaultLintConfiguration } from '../../utils'
|
||||
|
||||
const name = 'maxLineLength'
|
||||
const description = 'Restrict lines to the specified length.'
|
||||
const message = 'Line exceeds maximum length'
|
||||
|
||||
const test = (value: string, lineNumber: number, config?: LintConfig) => {
|
||||
const test = (
|
||||
value: string,
|
||||
lineNumber: number,
|
||||
config?: LintConfig,
|
||||
options?: LineLintRuleOptions
|
||||
) => {
|
||||
const severity = config?.severityLevel[name] || Severity.Warning
|
||||
const maxLineLength = config?.maxLineLength || 80
|
||||
let maxLineLength = DefaultLintConfiguration.maxLineLength
|
||||
|
||||
if (config) {
|
||||
if (options?.isHeaderLine) {
|
||||
maxLineLength = Math.max(config.maxLineLength, config.maxHeaderLineLength)
|
||||
} else if (options?.isDataLine) {
|
||||
maxLineLength = Math.max(config.maxLineLength, config.maxDataLineLength)
|
||||
} else {
|
||||
maxLineLength = config.maxLineLength
|
||||
}
|
||||
}
|
||||
|
||||
if (value.length <= maxLineLength) return []
|
||||
return [
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Severity } from '../../types/Severity'
|
||||
import { noGremlins } from './noGremlins'
|
||||
import { noGremlins, charFromHex } from './noGremlins'
|
||||
import { LintConfig } from '../../types'
|
||||
|
||||
describe('noTabs', () => {
|
||||
it('should return an empty array when the line does not have any gremlin', () => {
|
||||
@@ -8,8 +8,19 @@ describe('noTabs', () => {
|
||||
})
|
||||
|
||||
it('should return a diagnostic array when the line contains gremlins', () => {
|
||||
const line = "– ‘ %put 'hello';"
|
||||
const line = `${charFromHex('0x0080')} ${charFromHex(
|
||||
'0x3000'
|
||||
)} %put 'hello';`
|
||||
const diagnostics = noGremlins.test(line, 1)
|
||||
expect(diagnostics.length).toEqual(2)
|
||||
})
|
||||
|
||||
it('should return an empty array when the line contains gremlins but those gremlins are allowed', () => {
|
||||
const config = new LintConfig({ allowedGremlins: ['0x0080', '0x3000'] })
|
||||
const line = `${charFromHex('0x0080')} ${charFromHex(
|
||||
'0x3000'
|
||||
)} %put 'hello';`
|
||||
const diagnostics = noGremlins.test(line, 1, config)
|
||||
expect(diagnostics.length).toEqual(0)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -10,15 +10,18 @@ const message = 'Line contains a gremlin'
|
||||
|
||||
const test = (value: string, lineNumber: number, config?: LintConfig) => {
|
||||
const severity = config?.severityLevel[name] || Severity.Warning
|
||||
const allowedGremlins = config?.allowedGremlins || []
|
||||
|
||||
const diagnostics: Diagnostic[] = []
|
||||
|
||||
const gremlins: any = {}
|
||||
|
||||
for (const [hexCode, config] of Object.entries(gremlinCharacters)) {
|
||||
gremlins[charFromHex(hexCode)] = Object.assign({}, config, {
|
||||
hexCode
|
||||
})
|
||||
for (const [hexCode, gremlinConfig] of Object.entries(gremlinCharacters)) {
|
||||
if (!allowedGremlins.includes(hexCode)) {
|
||||
gremlins[charFromHex(hexCode)] = Object.assign({}, gremlinConfig, {
|
||||
hexCode
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const regexpWithAllChars = new RegExp(
|
||||
@@ -56,4 +59,5 @@ export const noGremlins: LineLintRule = {
|
||||
test
|
||||
}
|
||||
|
||||
const charFromHex = (hexCode: string) => String.fromCodePoint(parseInt(hexCode))
|
||||
export const charFromHex = (hexCode: string) =>
|
||||
String.fromCodePoint(parseInt(hexCode))
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export enum LineEndings {
|
||||
LF = 'lf',
|
||||
CRLF = 'crlf'
|
||||
CRLF = 'crlf',
|
||||
OFF = 'off'
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { hasRequiredMacroOptions } from '../rules/file'
|
||||
import { LineEndings } from './LineEndings'
|
||||
import { LintConfig } from './LintConfig'
|
||||
import { LintRuleType } from './LintRuleType'
|
||||
@@ -31,6 +32,28 @@ describe('LintConfig', () => {
|
||||
).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should create an instance with the maxLineLength flag off by setting value to 0', () => {
|
||||
const config = new LintConfig({ maxLineLength: 0 })
|
||||
|
||||
expect(config).toBeTruthy()
|
||||
expect(config.lineLintRules.length).toBeGreaterThan(0)
|
||||
expect(config.fileLintRules.length).toBeGreaterThan(0)
|
||||
expect(
|
||||
config.lineLintRules.find((rule) => rule.name === 'maxLineLength')
|
||||
).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should create an instance with the maxLineLength flag off by setting value to a negative number', () => {
|
||||
const config = new LintConfig({ maxLineLength: -1 })
|
||||
|
||||
expect(config).toBeTruthy()
|
||||
expect(config.lineLintRules.length).toBeGreaterThan(0)
|
||||
expect(config.fileLintRules.length).toBeGreaterThan(0)
|
||||
expect(
|
||||
config.lineLintRules.find((rule) => rule.name === 'maxLineLength')
|
||||
).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should create an instance with the hasDoxygenHeader flag off', () => {
|
||||
const config = new LintConfig({ hasDoxygenHeader: false })
|
||||
|
||||
@@ -146,7 +169,9 @@ describe('LintConfig', () => {
|
||||
hasMacroNameInMend: true,
|
||||
noNestedMacros: true,
|
||||
hasMacroParentheses: true,
|
||||
noGremlins: true
|
||||
hasRequiredMacroOptions: true,
|
||||
noGremlins: true,
|
||||
lineEndings: 'lf'
|
||||
})
|
||||
|
||||
expect(config).toBeTruthy()
|
||||
@@ -164,7 +189,7 @@ describe('LintConfig', () => {
|
||||
expect(config.lineLintRules[5].name).toEqual('noGremlins')
|
||||
expect(config.lineLintRules[5].type).toEqual(LintRuleType.Line)
|
||||
|
||||
expect(config.fileLintRules.length).toEqual(6)
|
||||
expect(config.fileLintRules.length).toEqual(7)
|
||||
expect(config.fileLintRules[0].name).toEqual('lineEndings')
|
||||
expect(config.fileLintRules[0].type).toEqual(LintRuleType.File)
|
||||
expect(config.fileLintRules[1].name).toEqual('hasDoxygenHeader')
|
||||
@@ -177,6 +202,8 @@ describe('LintConfig', () => {
|
||||
expect(config.fileLintRules[4].type).toEqual(LintRuleType.File)
|
||||
expect(config.fileLintRules[5].name).toEqual('strictMacroDefinition')
|
||||
expect(config.fileLintRules[5].type).toEqual(LintRuleType.File)
|
||||
expect(config.fileLintRules[6].name).toEqual('hasRequiredMacroOptions')
|
||||
expect(config.fileLintRules[6].type).toEqual(LintRuleType.File)
|
||||
|
||||
expect(config.pathLintRules.length).toEqual(2)
|
||||
expect(config.pathLintRules[0].name).toEqual('noSpacesInFileNames')
|
||||
@@ -184,4 +211,25 @@ describe('LintConfig', () => {
|
||||
expect(config.pathLintRules[1].name).toEqual('lowerCaseFileNames')
|
||||
expect(config.pathLintRules[1].type).toEqual(LintRuleType.Path)
|
||||
})
|
||||
|
||||
it('should throw an error with an invalid value for requiredMacroOptions', () => {
|
||||
expect(
|
||||
() =>
|
||||
new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: 'test'
|
||||
})
|
||||
).toThrowError(
|
||||
`Property "requiredMacroOptions" can only be an array of strings.`
|
||||
)
|
||||
expect(
|
||||
() =>
|
||||
new LintConfig({
|
||||
hasRequiredMacroOptions: true,
|
||||
requiredMacroOptions: ['test', 2]
|
||||
})
|
||||
).toThrowError(
|
||||
`Property "requiredMacroOptions" has invalid type of values. It can only contain strings.`
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -4,7 +4,8 @@ import {
|
||||
noNestedMacros,
|
||||
hasMacroParentheses,
|
||||
lineEndings,
|
||||
strictMacroDefinition
|
||||
strictMacroDefinition,
|
||||
hasRequiredMacroOptions
|
||||
} from '../rules/file'
|
||||
import {
|
||||
indentationMultiple,
|
||||
@@ -29,14 +30,18 @@ import { Severity } from './Severity'
|
||||
*/
|
||||
export class LintConfig {
|
||||
readonly ignoreList: string[] = []
|
||||
readonly allowedGremlins: string[] = []
|
||||
readonly lineLintRules: LineLintRule[] = []
|
||||
readonly fileLintRules: FileLintRule[] = []
|
||||
readonly pathLintRules: PathLintRule[] = []
|
||||
readonly maxLineLength: number = 80
|
||||
readonly maxHeaderLineLength: number = 80
|
||||
readonly maxDataLineLength: number = 80
|
||||
readonly indentationMultiple: number = 2
|
||||
readonly lineEndings: LineEndings = LineEndings.LF
|
||||
readonly defaultHeader: string = getDefaultHeader()
|
||||
readonly severityLevel: { [key: string]: Severity } = {}
|
||||
readonly requiredMacroOptions: string[] = []
|
||||
|
||||
constructor(json?: any) {
|
||||
if (json?.ignoreList) {
|
||||
@@ -66,13 +71,20 @@ export class LintConfig {
|
||||
this.lineLintRules.pop()
|
||||
}
|
||||
|
||||
this.lineLintRules.push(maxLineLength)
|
||||
if (!isNaN(json?.maxLineLength)) {
|
||||
if (json?.maxLineLength > 0) {
|
||||
this.lineLintRules.push(maxLineLength)
|
||||
this.maxLineLength = json.maxLineLength
|
||||
|
||||
if (!isNaN(json?.maxHeaderLineLength)) {
|
||||
this.maxHeaderLineLength = json.maxHeaderLineLength
|
||||
}
|
||||
|
||||
if (!isNaN(json?.maxDataLineLength)) {
|
||||
this.maxDataLineLength = json.maxDataLineLength
|
||||
}
|
||||
}
|
||||
|
||||
this.fileLintRules.push(lineEndings)
|
||||
if (json?.lineEndings) {
|
||||
if (json?.lineEndings && json.lineEndings !== LineEndings.OFF) {
|
||||
if (
|
||||
json.lineEndings !== LineEndings.LF &&
|
||||
json.lineEndings !== LineEndings.CRLF
|
||||
@@ -81,6 +93,7 @@ export class LintConfig {
|
||||
`Invalid value for lineEndings: can be ${LineEndings.LF} or ${LineEndings.CRLF}`
|
||||
)
|
||||
}
|
||||
this.fileLintRules.push(lineEndings)
|
||||
this.lineEndings = json.lineEndings
|
||||
}
|
||||
|
||||
@@ -121,8 +134,50 @@ export class LintConfig {
|
||||
this.fileLintRules.push(strictMacroDefinition)
|
||||
}
|
||||
|
||||
if (json?.hasRequiredMacroOptions) {
|
||||
this.fileLintRules.push(hasRequiredMacroOptions)
|
||||
|
||||
if (json?.requiredMacroOptions) {
|
||||
if (
|
||||
Array.isArray(json.requiredMacroOptions) &&
|
||||
json.requiredMacroOptions.length > 0
|
||||
) {
|
||||
json.requiredMacroOptions.forEach((item: any) => {
|
||||
if (typeof item === 'string') {
|
||||
this.requiredMacroOptions.push(item)
|
||||
} else {
|
||||
throw new Error(
|
||||
`Property "requiredMacroOptions" has invalid type of values. It can only contain strings.`
|
||||
)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
throw new Error(
|
||||
`Property "requiredMacroOptions" can only be an array of strings.`
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (json?.noGremlins !== false) {
|
||||
this.lineLintRules.push(noGremlins)
|
||||
|
||||
if (json?.allowedGremlins) {
|
||||
if (Array.isArray(json.allowedGremlins)) {
|
||||
json.allowedGremlins.forEach((item: any) => {
|
||||
if (typeof item === 'string' && /^0x[0-9a-f]{4}$/i.test(item))
|
||||
this.allowedGremlins.push(item)
|
||||
else
|
||||
throw new Error(
|
||||
`Property "allowedGremlins" has invalid type of values. It can contain only strings of form hexcode like '["0x0080", "0x3000"]'`
|
||||
)
|
||||
})
|
||||
} else {
|
||||
throw new Error(
|
||||
`Property "allowedGremlins" can only be an array of strings of form hexcode like '["0x0080", "0x3000"]'`
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (json?.severityLevel) {
|
||||
|
||||
@@ -13,12 +13,22 @@ export interface LintRule {
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface LineLintRuleOptions {
|
||||
isHeaderLine?: boolean
|
||||
isDataLine?: boolean
|
||||
}
|
||||
|
||||
/**
|
||||
* A LineLintRule is run once per line of text.
|
||||
*/
|
||||
export interface LineLintRule extends LintRule {
|
||||
type: LintRuleType.Line
|
||||
test: (value: string, lineNumber: number, config?: LintConfig) => Diagnostic[]
|
||||
test: (
|
||||
value: string,
|
||||
lineNumber: number,
|
||||
config?: LintConfig,
|
||||
options?: LineLintRuleOptions
|
||||
) => Diagnostic[]
|
||||
fix?: (value: string, config?: LintConfig) => string
|
||||
}
|
||||
|
||||
|
||||
113
src/utils/getDataSectionDetail.spec.ts
Normal file
113
src/utils/getDataSectionDetail.spec.ts
Normal file
@@ -0,0 +1,113 @@
|
||||
import { LintConfig } from '../types'
|
||||
import { getDataSectionsDetail, checkIsDataLine } from './getDataSectionsDetail'
|
||||
import { DefaultLintConfiguration } from './getLintConfig'
|
||||
|
||||
const datalines = `GROUP_LOGIC:$3. SUBGROUP_LOGIC:$3. SUBGROUP_ID:8. VARIABLE_NM:$32. OPERATOR_NM:$10. RAW_VALUE:$4000.
|
||||
AND,AND,1,LIBREF,CONTAINS,"'DC'"
|
||||
AND,OR,2,DSN,=,"'MPE_LOCK_ANYTABLE'"`
|
||||
|
||||
const datalinesBeginPattern1 = `datalines;`
|
||||
const datalinesBeginPattern2 = `datalines4;`
|
||||
const datalinesBeginPattern3 = `cards;`
|
||||
const datalinesBeginPattern4 = `cards4;`
|
||||
const datalinesBeginPattern5 = `parmcards;`
|
||||
const datalinesBeginPattern6 = `parmcards4;`
|
||||
|
||||
const datalinesEndPattern1 = `;`
|
||||
const datalinesEndPattern2 = `;;;;`
|
||||
|
||||
describe('getDataSectionsDetail', () => {
|
||||
const config = new LintConfig(DefaultLintConfiguration)
|
||||
it(`should return the detail of data section when it begins and ends with '${datalinesBeginPattern1}' and '${datalinesEndPattern1}' markers`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern1}\n${datalines}\n${datalinesEndPattern1}\n%put world;`
|
||||
expect(getDataSectionsDetail(text, config)).toEqual([
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
])
|
||||
})
|
||||
|
||||
it(`should return the detail of data section when it begins and ends with '${datalinesBeginPattern2}' and '${datalinesEndPattern2}' markers`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern2}\n${datalines}\n${datalinesEndPattern2}\n%put world;`
|
||||
expect(getDataSectionsDetail(text, config)).toEqual([
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
])
|
||||
})
|
||||
|
||||
it(`should return the detail of data section when it begins and ends with '${datalinesBeginPattern3}' and '${datalinesEndPattern1}' markers`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern3}\n${datalines}\n${datalinesEndPattern1}\n%put world;`
|
||||
expect(getDataSectionsDetail(text, config)).toEqual([
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
])
|
||||
})
|
||||
|
||||
it(`should return the detail of data section when it begins and ends with '${datalinesBeginPattern4}' and '${datalinesEndPattern2}' markers`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern4}\n${datalines}\n${datalinesEndPattern2}\n%put world;`
|
||||
expect(getDataSectionsDetail(text, config)).toEqual([
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
])
|
||||
})
|
||||
|
||||
it(`should return the detail of data section when it begins and ends with '${datalinesBeginPattern5}' and '${datalinesEndPattern1}' markers`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern5}\n${datalines}\n${datalinesEndPattern1}\n%put world;`
|
||||
expect(getDataSectionsDetail(text, config)).toEqual([
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
])
|
||||
})
|
||||
|
||||
it(`should return the detail of data section when it begins and ends with '${datalinesBeginPattern6}' and '${datalinesEndPattern2}' markers`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern6}\n${datalines}\n${datalinesEndPattern2}\n%put world;`
|
||||
expect(getDataSectionsDetail(text, config)).toEqual([
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
])
|
||||
})
|
||||
})
|
||||
|
||||
describe('checkIsDataLine', () => {
|
||||
const config = new LintConfig(DefaultLintConfiguration)
|
||||
it(`should return true if a line index is in a range of any data section`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern1}\n${datalines}\n${datalinesEndPattern1}\n%put world;`
|
||||
expect(
|
||||
checkIsDataLine(
|
||||
[
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
],
|
||||
4
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
|
||||
it(`should return false if a line index is not in a range of any of data sections`, () => {
|
||||
const text = `%put hello\n${datalinesBeginPattern1}\n${datalines}\n${datalinesEndPattern1}\n%put world;`
|
||||
expect(
|
||||
checkIsDataLine(
|
||||
[
|
||||
{
|
||||
start: 1,
|
||||
end: 5
|
||||
}
|
||||
],
|
||||
8
|
||||
)
|
||||
).toBe(false)
|
||||
})
|
||||
})
|
||||
58
src/utils/getDataSectionsDetail.ts
Normal file
58
src/utils/getDataSectionsDetail.ts
Normal file
@@ -0,0 +1,58 @@
|
||||
import { LintConfig } from '../types'
|
||||
import { splitText } from './splitText'
|
||||
|
||||
interface DataSectionsDetail {
|
||||
start: number
|
||||
end: number
|
||||
}
|
||||
|
||||
export const getDataSectionsDetail = (text: string, config: LintConfig) => {
|
||||
const dataSections: DataSectionsDetail[] = []
|
||||
const lines = splitText(text, config)
|
||||
|
||||
const dataSectionStartRegex1 = new RegExp(
|
||||
'^(datalines;)|(cards;)|(parmcards;)'
|
||||
)
|
||||
const dataSectionEndRegex1 = new RegExp(';')
|
||||
const dataSectionStartRegex2 = new RegExp(
|
||||
'^(datalines4;)|(cards4;)|(parmcards4;)'
|
||||
)
|
||||
const dataSectionEndRegex2 = new RegExp(';;;;')
|
||||
|
||||
let dataSectionStarted = false
|
||||
let dataSectionStartIndex = -1
|
||||
let dataSectionEndRegex = dataSectionEndRegex1
|
||||
|
||||
lines.forEach((line, index) => {
|
||||
if (dataSectionStarted) {
|
||||
if (dataSectionEndRegex.test(line)) {
|
||||
dataSections.push({ start: dataSectionStartIndex, end: index })
|
||||
dataSectionStarted = false
|
||||
}
|
||||
} else {
|
||||
if (dataSectionStartRegex1.test(line)) {
|
||||
dataSectionStarted = true
|
||||
dataSectionStartIndex = index
|
||||
dataSectionEndRegex = dataSectionEndRegex1
|
||||
} else if (dataSectionStartRegex2.test(line)) {
|
||||
dataSectionStarted = true
|
||||
dataSectionStartIndex = index
|
||||
dataSectionEndRegex = dataSectionEndRegex2
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return dataSections
|
||||
}
|
||||
|
||||
export const checkIsDataLine = (
|
||||
dataSections: DataSectionsDetail[],
|
||||
lineIndex: number
|
||||
) => {
|
||||
for (const dataSection of dataSections) {
|
||||
if (lineIndex >= dataSection.start && lineIndex <= dataSection.end)
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
21
src/utils/getHeaderLinesCount.spec.ts
Normal file
21
src/utils/getHeaderLinesCount.spec.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
import { LintConfig } from '../types'
|
||||
import { getHeaderLinesCount } from './getHeaderLinesCount'
|
||||
import { DefaultLintConfiguration } from './getLintConfig'
|
||||
|
||||
const sasCodeWithHeader = `/**
|
||||
@file
|
||||
@brief <Your brief here>
|
||||
<h4> SAS Macros </h4>
|
||||
**/
|
||||
%put hello world;
|
||||
`
|
||||
|
||||
const sasCodeWithoutHeader = `%put hello world;`
|
||||
|
||||
describe('getHeaderLinesCount', () => {
|
||||
it('should return the number of line header spans upon', () => {
|
||||
const config = new LintConfig(DefaultLintConfiguration)
|
||||
expect(getHeaderLinesCount(sasCodeWithHeader, config)).toEqual(5)
|
||||
expect(getHeaderLinesCount(sasCodeWithoutHeader, config)).toEqual(0)
|
||||
})
|
||||
})
|
||||
23
src/utils/getHeaderLinesCount.ts
Normal file
23
src/utils/getHeaderLinesCount.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { LintConfig } from '../types'
|
||||
import { splitText } from './splitText'
|
||||
|
||||
/**
|
||||
* This function returns the number of lines the header spans upon.
|
||||
* The file must start with "/*" and the header will finish with ⇙
|
||||
*/
|
||||
export const getHeaderLinesCount = (text: string, config: LintConfig) => {
|
||||
let count = 0
|
||||
|
||||
if (text.trimStart().startsWith('/*')) {
|
||||
const lines = splitText(text, config)
|
||||
|
||||
for (const line of lines) {
|
||||
count++
|
||||
if (line.match(/\*\//)) {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return count
|
||||
}
|
||||
@@ -2,7 +2,7 @@ import * as fileModule from '@sasjs/utils/file'
|
||||
import { LintConfig } from '../types/LintConfig'
|
||||
import { getLintConfig } from './getLintConfig'
|
||||
|
||||
const expectedFileLintRulesCount = 6
|
||||
const expectedFileLintRulesCount = 5
|
||||
const expectedLineLintRulesCount = 6
|
||||
const expectedPathLintRulesCount = 2
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
import path from 'path'
|
||||
import os from 'os'
|
||||
import { LintConfig } from '../types/LintConfig'
|
||||
import { readFile } from '@sasjs/utils/file'
|
||||
import { getProjectRoot } from './getProjectRoot'
|
||||
import { LineEndings } from '../types/LineEndings'
|
||||
|
||||
export const getDefaultHeader = () =>
|
||||
`/**{lineEnding} @file{lineEnding} @brief <Your brief here>{lineEnding} <h4> SAS Macros </h4>{lineEnding}**/`
|
||||
@@ -10,12 +12,15 @@ export const getDefaultHeader = () =>
|
||||
* Default configuration that is used when a .sasjslint file is not found
|
||||
*/
|
||||
export const DefaultLintConfiguration = {
|
||||
lineEndings: LineEndings.OFF,
|
||||
noTrailingSpaces: true,
|
||||
noEncodedPasswords: true,
|
||||
hasDoxygenHeader: true,
|
||||
noSpacesInFileNames: true,
|
||||
lowerCaseFileNames: true,
|
||||
maxLineLength: 80,
|
||||
maxHeaderLineLength: 80,
|
||||
maxDataLineLength: 80,
|
||||
noTabIndentation: true,
|
||||
indentationMultiple: 2,
|
||||
hasMacroNameInMend: true,
|
||||
@@ -27,14 +32,15 @@ export const DefaultLintConfiguration = {
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches the config from the .sasjslint file and creates a LintConfig object.
|
||||
* Fetches the config from the .sasjslint file (at project root or home directory) and creates a LintConfig object.
|
||||
* Returns the default configuration when a .sasjslint file is unavailable.
|
||||
* @returns {Promise<LintConfig>} resolves with an object representing the current lint configuration.
|
||||
*/
|
||||
export async function getLintConfig(): Promise<LintConfig> {
|
||||
const projectRoot = await getProjectRoot()
|
||||
const lintFileLocation = projectRoot || os.homedir()
|
||||
const configuration = await readFile(
|
||||
path.join(projectRoot, '.sasjslint')
|
||||
path.join(lintFileLocation, '.sasjslint')
|
||||
).catch((_) => {
|
||||
return JSON.stringify(DefaultLintConfiguration)
|
||||
})
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import path from 'path'
|
||||
import os from 'os'
|
||||
import { fileExists } from '@sasjs/utils/file'
|
||||
|
||||
/**
|
||||
@@ -11,10 +12,11 @@ export async function getProjectRoot(): Promise<string> {
|
||||
let rootFound = false
|
||||
let i = 1
|
||||
let currentLocation = process.cwd()
|
||||
const homeDir = os.homedir()
|
||||
|
||||
const maxLevels = currentLocation.split(path.sep).length
|
||||
|
||||
while (i <= maxLevels && !rootFound) {
|
||||
while (i <= maxLevels && !rootFound && currentLocation !== homeDir) {
|
||||
const isRoot = await fileExists(path.join(currentLocation, '.sasjslint'))
|
||||
|
||||
if (isRoot) {
|
||||
|
||||
@@ -6,3 +6,5 @@ export * from './isIgnored'
|
||||
export * from './listSasFiles'
|
||||
export * from './splitText'
|
||||
export * from './getIndicesOf'
|
||||
export * from './getHeaderLinesCount'
|
||||
export * from './getDataSectionsDetail'
|
||||
|
||||
Reference in New Issue
Block a user