Merge pull request #211 from sasjs/quick-fix

fix: pass lintConfig as param to isIgnored function

README.md

@@ -23,8 +23,9 @@ 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,
@@ -48,16 +49,18 @@ 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`.
+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"]
+  "noGremlins": true,
+  "allowedGremlins": ["0x0080", "0x3000"]
 }
 ```
 
@@ -122,6 +125,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.
@@ -131,16 +149,16 @@ On *nix systems, it is imperative that autocall macros are in lowercase. When sh
 
 ### 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)).
+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
+- 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).
 
@@ -149,13 +167,13 @@ The `maxDataLineLength` setting is always the _higher_ of `maxDataLineLength` an
 
 See also:
 
- * [hasDoxygenHeader](#hasdoxygenheader)
- * [maxHeaderLineLength](#maxheaderlinelength)
- * [maxLineLength](#maxlinelength)
+- [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.
+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).
 
@@ -164,9 +182,9 @@ The `maxHeaderLineLength` setting is always the _higher_ of `maxHeaderLineLength
 
 See also:
 
- * [hasDoxygenHeader](#hasdoxygenheader)
- * [maxDataLineLength](#maxdatalinelength)
- * [maxLineLength](#maxlinelength)
+- [hasDoxygenHeader](#hasdoxygenheader)
+- [maxDataLineLength](#maxdatalinelength)
+- [maxLineLength](#maxlinelength)
 
 ### maxLineLength
 
@@ -181,12 +199,12 @@ We strongly recommend a line length limit, and set the bar at 80. To turn this f
 
 See also:
 
- * [maxDataLineLength](#maxdatalinelength)
- * [maxHeaderLineLength](#maxheaderlinelength)
+- [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)
 
@@ -212,6 +230,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).
@@ -247,11 +272,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.

sasjslint-schema.json

@@ -20,7 +20,7 @@
     "noSpacesInFileNames": true,
     "noTabs": true,
     "noTrailingSpaces": true,
-    "lineEndings": "lf",
+    "lineEndings": "off",
     "strictMacroDefinition": true,
     "ignoreList": ["sajsbuild", "sasjsresults"]
   },
@@ -182,9 +182,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": {

src/format/formatProject.ts

@@ -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)
 }

src/lint/lintFile.ts

@@ -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)

src/lint/lintFolder.ts

@@ -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) => {

src/lint/lintProject.ts

@@ -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)
 }

src/types/LineEndings.ts

@@ -1,4 +1,5 @@
 export enum LineEndings {
   LF = 'lf',
-  CRLF = 'crlf'
+  CRLF = 'crlf',
+  OFF = 'off'
 }

src/types/LintConfig.spec.ts

@@ -168,7 +168,8 @@ describe('LintConfig', () => {
       hasMacroNameInMend: true,
       noNestedMacros: true,
       hasMacroParentheses: true,
-      noGremlins: true
+      noGremlins: true,
+      lineEndings: 'lf'
     })
 
     expect(config).toBeTruthy()

src/types/LintConfig.ts

@@ -82,8 +82,7 @@ export class LintConfig {
       }
     }
 
-    this.fileLintRules.push(lineEndings)
-    if (json?.lineEndings) {
+    if (json?.lineEndings && json.lineEndings !== LineEndings.OFF) {
       if (
         json.lineEndings !== LineEndings.LF &&
         json.lineEndings !== LineEndings.CRLF
@@ -92,6 +91,7 @@ export class LintConfig {
           `Invalid value for lineEndings: can be ${LineEndings.LF} or ${LineEndings.CRLF}`
         )
       }
+      this.fileLintRules.push(lineEndings)
       this.lineEndings = json.lineEndings
     }
 

src/utils/getLintConfig.spec.ts

@@ -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
 

src/utils/getLintConfig.ts

@@ -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,6 +12,7 @@ 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,
@@ -29,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)
   })

src/utils/getProjectRoot.ts

@@ -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) {