Merge pull request #12 from quesabe/update-deps-danger.11

updated danger, eslint, ramda typings, some typos

package.json

@@ -26,31 +26,34 @@
   },
   "license": "ISC",
   "devDependencies": {
-    "@babel/parser": "7.13.15",
-    "@babel/preset-env": "7.13.10",
-    "@babel/preset-typescript": "7.13.0",
-    "@ottofeller/eslint-config-ottofeller": "0.8.2",
-    "@rollup/plugin-commonjs": "17.1.0",
-    "@rollup/plugin-node-resolve": "11.2.0",
-    "@rollup/plugin-typescript": "8.2.0",
-    "@types/jest": "26.0.21",
-    "babel-jest": "26.6.3",
+    "@babel/preset-env": "7.16.11",
+    "@babel/preset-typescript": "7.16.7",
+    "@ottofeller/eslint-config-ottofeller": "0.15.6",
+    "@rollup/plugin-commonjs": "21.0.1",
+    "@rollup/plugin-node-resolve": "13.1.3",
+    "@rollup/plugin-typescript": "8.3.0",
+    "@types/jest": "27.4.1",
+    "babel-jest": "27.5.1",
     "babel-plugin-module-resolver": "4.1.0",
     "babel-preset-node": "5.1.1",
-    "eslint": "7.22.0",
-    "rollup": "2.58.3",
-    "ts-jest": "26.5.4",
-    "tslib": "2.1.0",
-    "typescript": "4.2.3"
+    "eslint": "8.9.0",
+    "jest": "27.5.1",
+    "rollup": "2.68.0",
+    "ts-jest": "27.1.3",
+    "tslib": "2.3.1",
+    "typescript": "4.5.5"
   },
   "dependencies": {
-    "@types/ramda": "0.27.39",
-    "danger": "10.6.4",
-    "jest": "26.6.3",
-    "ramda": "0.27.1"
+    "@babel/parser": "7.17.3",
+    "@types/ramda": "0.27.64",
+    "danger": "11.0.2",
+    "ramda": "0.28.0"
+  },
+  "peerDependencies": {
+    "danger": ">=11.0.2"
   },
   "eslintConfig": {
-    "extends": "@ottofeller/eslint-config-ottofeller/node"
+    "extends": "@ottofeller/eslint-config-ottofeller/eslint.node"
   },
   "jest": {
     "coveragePathIgnorePatterns": [

src/bump-package-version/__tests__/index.ts

@@ -15,7 +15,7 @@ describe('The rule that requires bumping the version in package.json in every pu
           git: {
             fileMatch: (path: string) => ({edited: path.startsWith(includePaths[1])}),
 
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars -- exact signature required for a mock
             JSONDiffForFile: async (filename: string): Promise<JSONDiff> => ({
               version: {added: [], after: '0.0.1', before: '0.0.1', removed: []},
             }),
@@ -36,7 +36,7 @@ describe('The rule that requires bumping the version in package.json in every pu
           git: {
             fileMatch: (path: string) => ({edited: path.startsWith(includePaths[1])}),
 
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars -- exact signature required for a mock
             JSONDiffForFile: async (filename: string): Promise<JSONDiff> => ({
               version: {added: [], after: '0.0.1', before: '0.2.0', removed: []},
             }),

src/bump-package-version/index.ts

@@ -1,7 +1,8 @@
+import * as R from 'ramda'
 import {DangerDSLType} from 'danger'
 
 /**
- * Checks all @includePaths and in case of presence of edited files 
+ * Checks all @includePaths and in case of presence of edited files
  * requires version in `package.json` to be updated.
  * Parameter @restrictToBranches defines branches to run the check for.
  */
@@ -14,18 +15,17 @@ export const bumpPackageVersion = async (params: {
   if(!params.restrictToBranches.includes(params.danger.github.pr.base.ref)) {
     return
   }
-
-  // eslint-disable-next-line fp/no-loops
-  for(const includePath of params.includePaths) {
+
+  R.forEach(async includePath => {
     // If there are no edits in the includePath the version should not be bumped
     if(!params.danger.git.fileMatch(`${includePath}/**/*`).edited) {
-      continue
+      return
     }
 
     const packageJson = await params.danger.git.JSONDiffForFile(`${includePath}/package.json`)
 
     if(!packageJson || !packageJson.version || packageJson.version.after === packageJson.version.before) {
       params.fail(`The version in package.json must be updated in ${includePath}`)
     }
-  }
+  }, params.includePaths)
 }

src/common-code-dir/__tests__/index.ts

@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+/* eslint-disable max-lines -- too many tests, need those extra lines */
 import * as fs from 'fs'
 import * as R from 'ramda'
 import {commonCodeDir} from '../index'
@@ -11,13 +11,13 @@ describe('Common code dir rule', () => {
 
     // @ts-ignore
     fs.readdirSync.mockImplementation((path: string) => {
-      /*
+      /* Folder structure
         src/
           common/
             helpers/
               some-helper/
                 index.tsx
-              
+
               index.tsx
 
           ComponentA/
@@ -101,7 +101,7 @@ describe('Common code dir rule', () => {
       danger: {git: {
         fileMatch: () => ({edited: true, getKeyedPaths: () => ({edited: ['src/ComponentA/index.tsx']})}),
       }} as DangerDSLType,
-      
+
       fail        : failMock,
       includePaths: ['src/'],
     })
@@ -229,15 +229,15 @@ describe('Common code dir rule', () => {
       danger: {git: {
         fileMatch: () => ({edited: true, getKeyedPaths: () => ({edited: ['src/ComponentA/index.tsx']})}),
       }} as DangerDSLType,
-      
+
       fail        : failMock,
       includePaths: ['src/'],
     })
 
     expect(failMock).not.toHaveBeenCalled()
   })
 
-  it('doesn\'t throw a fail in case multiple imports from node_mmodules', () => {
+  it('doesn\'t throw a fail in case multiple imports from node_modules', () => {
     const failMock = jest.fn()
 
     // @ts-ignore

src/common-code-dir/index.ts

@@ -30,13 +30,13 @@ const readdirNested = (params: {allFoundFiles: Array<string>, path: string}): Ar
  * - Construct plain array of all imports
  * - If an import paths counts more than once and has no "/common/" string included, throw a fail().
 
- * @param danger Dnager instance
+ * @param danger Danger instance
  * @param fail Danger fail function
  * @param includePaths paths to include
  * @param excludePaths paths to exclude
  * @param baseImportPath base path for imports resolution
  * @param extraCommonDirNames extra folders for common code
- * @param babelPlugins babel plugins used in code parsing 
+ * @param babelPlugins babel plugins used in code parsing
  * (`jsx` and `typescript` are included by default)
  */
 export const commonCodeDir = (params: {
@@ -56,7 +56,7 @@ export const commonCodeDir = (params: {
     },
 
     R.toPairs(R.compose<
-      Array<string>,
+      Array<Array<string>>,
       Array<Array<string>>,
       Array<string>,
       Array<Array<string>>,
@@ -83,7 +83,7 @@ export const commonCodeDir = (params: {
       R.flatten,
 
       R.map(innerPath => R.compose<
-        string,
+        Array<string>,
         Array<babelTypes.Statement>,
         Array<babelTypes.Statement>,
         Array<string | undefined>,
@@ -116,7 +116,7 @@ export const commonCodeDir = (params: {
             ).program.body
           } catch(error) {
             if(error instanceof Error) {
-              params.fail(`${error.name} occured while parsing file:\n${error.message}\n${filePath}`)
+              params.fail(`${error.name} ocurred while parsing file:\n${error.message}\n${filePath}`)
             }else{
               params.fail(`Error happened: ${error}`)
             }
@@ -125,14 +125,13 @@ export const commonCodeDir = (params: {
           return []
         },
       )(innerPath)),
-
       R.flatten,
 
       // Find all js/jsx/ts/tsx files (including nested ones) in a dir
       // Exclude unit tests, their imports should not be considered as common
       // Exclude node_modules folders
       // Exclude path that include excludePath string
-      R.map(includePath => R.filter(
+      R.map<string, Array<string>>(includePath => R.filter(
         innerPath => !R.isEmpty(R.match(/(js|jsx|ts|tsx)$/i, innerPath))
           && R.isEmpty(R.match(/__tests__/i, innerPath))
           && R.isEmpty(R.match(/\/node_modules\//i, innerPath))

src/hasura/__tests__/index.ts

@@ -20,7 +20,7 @@ describe('Hasura rules', () => {
             ]}),
           }),
         }} as DangerDSLType,
-        
+
         hasuraMigrationsPath: 'hasura/migrations',
         maxMigrationsLimit  : 10,
         warn                : warnMock,
@@ -37,11 +37,11 @@ describe('Hasura rules', () => {
             getKeyedPaths: () => ({edited: [
               'src/some-file/index.tsx', 'hasura/migrations/1/up', 'hasura/migrations/1/down', 'hasura/migrations/2/up',
               'hasura/migrations/2/down', 'hasura/migrations/3/up', 'hasura/migrations/3/down',
-              'hasura/migrations/4/up', 'hasura/migrations/4/down', 
+              'hasura/migrations/4/up', 'hasura/migrations/4/down',
             ]}),
           }),
         }} as DangerDSLType,
-        
+
         hasuraMigrationsPath: 'hasura/migrations',
         maxMigrationsLimit  : 10,
         warn                : warnMock,
@@ -52,7 +52,7 @@ describe('Hasura rules', () => {
   })
 
   describe('Codegen missing', () => {
-    it('throws a warn if there are Hasura migraions updates but no schema and codegen generated types updates', () => {
+    it('throws a warn if there are Hasura migrations updates but no schema and codegen generated types updates', () => {
       const warnMock = jest.fn()
       const codegenFileExtension = 'generated.ts'
       const codegenPaths = ['generated', 'graphql']

src/hasura/codegen-missing.ts

@@ -3,9 +3,9 @@ import {DangerDSLType} from 'danger'
 
 /**
  * Searches for Hasura migrations in edited files.
- * If present, warns in ccase of no changes in codegen files and `schema.json`.
- * 
- * @param danger Dnager instance
+ * If present, warns in case of no changes in codegen files and `schema.json`.
+ *
+ * @param danger Danger instance
  * @param warn Danger warn function
  * @param hasuraMigrationsPath paths to Hasura migrations
  * @param codegenPaths paths to codegen files
@@ -27,7 +27,7 @@ export const codegenMissing = (params: {
     return
   }
 
-  const codegenEditedFiles = R.compose<Array<string>, Array<Array<string>>, Array<string>>(
+  const codegenEditedFiles = R.compose<Array<Array<string>>, Array<Array<string>>, Array<string>>(
     R.flatten,
 
     R.map(path => {

src/hasura/squash-migrations.ts

@@ -3,8 +3,8 @@ import {DangerDSLType} from 'danger'
 /**
  * Searches for Hasura migrations in edited files.
  * If present, warns if the quantity of migration files to be within specified limit.
- * 
- * @param danger Dnager instance
+ *
+ * @param danger Danger instance
  * @param warn Danger warn function
  * @param hasuraMigrationsPath paths to Hasura migrations
  * @param maxMigrationsLimit maximum allowed migration files quantity

src/nextjs/disallow-extension-in-dirs.ts

@@ -2,14 +2,14 @@ import * as R from 'ramda'
 import {DangerDSLType} from 'danger'
 
 /**
- * Disallow a file extension in the selected dirs 
+ * Disallow a file extension in the selected dirs
  * and provides a required extension for the files.
- * 
- * @param danger Dnager instance
+ *
+ * @param danger Danger instance
  * @param fail Danger fail function
  * @param excludePaths paths to exclude
  * @param includePaths paths to include
- * @param extension not allowed estension
+ * @param extension not allowed extension
  * @param requireExtension required extension
  */
 export const disallowExtensionInDirs = (params: {

src/react/__tests__/index.ts

@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+/* eslint-disable max-lines -- too many tests, need those extra lines */
 import * as fs from 'fs'
 import {componentHasTests, dirNameRestrictions} from '../index'
 import {DangerDSLType} from 'danger'
@@ -18,31 +18,31 @@ describe('React rules', () => {
       it(`does not check "${dirName}" folders`, () => {
         const componentFilePath = 'src/another/Component/index.tsx'
         const testFilePath = `src/another/Component/${dirName}/index.tsx`
-        
+
         // @ts-ignore
         fs.readFileSync.mockImplementation((path: string) => {
           if(path === testFilePath || path === componentFilePath) {
             return validReactComponent
           }
         })
-  
+
         dirNameRestrictions({
           danger: {git: {
             created_files: [] as Array<string>,
-  
+
             fileMatch: (file: string) => ({
               getKeyedPaths: () => ({created: [''], edited: [file]}),
             }),
-  
+
             modified_files: [testFilePath],
           }} as DangerDSLType,
-  
+
           fail        : failMock,
           includePaths: ['src'],
         })
-  
+
         expect(failMock).not.toHaveBeenCalled()
-  
+
         // Once per each path component, but not for "dirName"
         expect(fs.readFileSync).toHaveBeenCalledTimes(3)
       })
@@ -298,7 +298,7 @@ describe('React rules', () => {
   describe('Check for test coverage', () => {
     const fsMock = (path: string) => {
       switch(path){
-      case'src/ComponentWithInvalidTest/__tests__/index.tsx': 
+      case'src/ComponentWithInvalidTest/__tests__/index.tsx':
         return 'import {SomeOtherStuff} from \'../index\''
       case'src/ComponentWithInvalidTest/index.tsx':
         return 'const ComponentWithInvalidTest = memo(function NewComponent() { return null })'
@@ -318,7 +318,7 @@ describe('React rules', () => {
         return validReactComponent
 
       default: {
-        let error: Error & { code?: string } = new Error()
+        let error: Error & {code?: string} = new Error()
         error.code = 'ENOENT'
         throw error
       }}