chore: update lint config and fix lint issues

Author: kaisermann

.eslintignore

@@ -1,2 +1,3 @@
+node_modules/
 /test/fixtures
 dist/

.eslintrc

@@ -1,7 +1,11 @@
 {
-  "extends": ["kaisermann/typescript"],
+  "extends": ["kiwi"],
   "env": {
     "node": true,
     "jest": true
+  },
+  "rules": {
+    "@typescript-eslint/no-explicit-any": "off",
+    "no-console": "off"
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-preprocess",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,8 +30,8 @@
     "test": "jest",
     "test:watch": "jest --watchAll",
     "test:ci": "jest --silent --no-cache",
-    "lint": "eslint **/*.ts",
-    "format": "prettier --loglevel silent --write \"src/**/*.ts\" && eslint --fix \"src/**/*.ts\"",
+    "lint": "eslint {src,test}/**/*.ts",
+    "format": "prettier --loglevel silent --write \"{src,test}/**/*.ts\" && eslint --fix \"{src,test}/**/*.ts\"",
     "postinstall": "echo \"[svelte-preprocess] Don't forget to install the preprocessors packages that will be used: node-sass/sass, stylus, less, postcss & postcss-load-config, coffeescript, pug, etc...\"",
     "version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1 && git add CHANGELOG.md",
     "tag": "git tag -a v$npm_package_version -m 'Release v$npm_package_version'",
@@ -67,21 +67,22 @@
     "@babel/preset-env": "^7.10.2",
     "@types/jest": "^25.2.3",
     "@types/node": "^14.0.11",
+    "@types/node-sass": "^4.11.1",
     "@types/stylus": "^0.48.32",
     "autoprefixer": "^9.8.0",
     "babel-minify": "^0.5.1",
     "coffeescript": "^2.5.1",
     "conventional-changelog-cli": "^2.0.34",
-    "eslint-config-kaisermann": "0.2.0",
-    "eslint": "^7.1.0",
+    "eslint": "^6.0.0",
+    "eslint-config-kiwi": "^1.0.2",
     "husky": "^4.2.5",
     "jest": "^25.0.0",
     "less": "^3.11.2",
     "lint-staged": "^10.2.9",
     "node-sass": "^4.14.1",
+    "postcss": "^7.0.32",
     "postcss-easy-import": "^3.0.0",
     "postcss-load-config": "^2.1.0",
-    "postcss": "^7.0.32",
     "prettier": "^2.0.5",
     "pug": "^3.0.0",
     "sass": "^1.26.8",

src/autoProcess.ts

@@ -42,7 +42,7 @@ type AutoPreprocessOptions = {
   markupTagName?: string;
   /** @deprecated add transformer config directly to svelte-preprocess options object */
   transformers?: Transformers;
-  aliases?: [string, string][];
+  aliases?: Array<[string, string]>;
   preserve?: string[];
   typescript?: TransformerOptions<Options.Typescript>;
   scss?: TransformerOptions<Options.Sass>;
@@ -60,7 +60,7 @@ type AutoPreprocessOptions = {
   [languageName: string]:
     | string
     | Promise<string>
-    | [string, string][]
+    | Array<[string, string]>
     | string[]
     | TransformerOptions;
 };
@@ -89,7 +89,7 @@ export function autoPreprocess(
     `<${markupTagName}([\\s\\S]*?)(?:>([\\s\\S]*)<\\/${markupTagName}>|/>)`,
   );
 
-  if (aliases && aliases.length) {
+  if (aliases?.length) {
     addLanguageAlias(aliases);
   }
 
@@ -191,8 +191,10 @@ export function autoPreprocess(
         .filter(Boolean)
         .reduce((acc: Record<string, string | boolean>, attr) => {
           const [name, value] = attr.split('=');
+
           // istanbul ignore next
           acc[name] = value ? value.replace(/['"]/g, '') : true;
+
           return acc;
         }, {});
 
@@ -276,6 +278,7 @@ export function autoPreprocess(
           map,
           filename,
         });
+
         code = transformed.code;
         map = transformed.map;
       }

src/index.ts

@@ -2,6 +2,8 @@ import { autoPreprocess } from './autoProcess';
 
 // default auto processor
 // crazy es6/cjs export mix for backward compatibility
+
+// eslint-disable-next-line no-multi-assign
 export default exports = module.exports = autoPreprocess;
 
 // stand-alone processors to be included manually */

src/modules/concat.ts

@@ -3,6 +3,7 @@ export function concat(...arrs: any[]): any[] {
     if (a) {
       return acc.concat(a);
     }
+
     return acc;
   }, []);
 }

src/modules/globalifySelector.ts

@@ -10,6 +10,7 @@ export function globalifySelector(selector: string) {
       if (selectorPart.startsWith(':global')) {
         return selectorPart;
       }
+
       return `:global(${selectorPart})`;
     })
     .join(' ');

src/modules/hasPostcssInstalled.ts

@@ -6,6 +6,7 @@ export async function hasPostCssInstalled() {
   }
 
   let result = false;
+
   try {
     await import('postcss');
     result = true;

src/modules/language.ts

@@ -39,6 +39,7 @@ export const getLanguage = (
       throw new Error('src attribute must be string');
     }
     const parts = basename(attributes.src).split('.');
+
     lang = parts.length > 1 ? parts.pop() : defaultLang;
   }
 

src/modules/parseFile.ts

@@ -2,7 +2,6 @@ import { readFile, access } from 'fs';
 import { resolve, dirname } from 'path';
 
 import { PreprocessorArgs } from '../types';
-
 import { getLanguage } from './language';
 
 export const resolveSrc = (importerFile: string, srcPath: string) =>
@@ -27,12 +26,14 @@ export const parseFile = async (
   language: string,
 ) => {
   const dependencies = [];
+
   if (attributes.src) {
     // istanbul ignore if
     if (typeof attributes.src !== 'string') {
       throw new Error('src attribute must be string');
     }
     let path = attributes.src;
+
     /** Only try to get local files (path starts with ./ or ../) */
     if (path.match(/^(https?:)?\/\//) == null) {
       path = resolveSrc(filename, path);

src/modules/transformers.ts

@@ -1,7 +1,6 @@
 import stripIndent from 'strip-indent';
 
 import { Transformer, TransformerArgs, TransformerOptions } from '../types';
-
 import { throwError } from './errors';
 
 const TRANSFORMERS = {} as {
@@ -10,7 +9,7 @@ const TRANSFORMERS = {} as {
 
 export const runTransformer = async (
   name: string,
-  options: TransformerOptions<any>,
+  options: TransformerOptions,
   { content, map, filename }: TransformerArgs<any>,
 ): Promise<ReturnType<Transformer<unknown>>> => {
   // remove any unnecessary indentation (useful for coffee, pug and sugarss)

src/processors/globalStyle.ts

@@ -6,6 +6,7 @@ export default (): PreprocessorGroup => {
       const { default: transformer } = await import(
         '../transformers/globalStyle'
       );
+
       if (!attributes.global) return { code: content };
 
       return transformer({ content, filename });

src/processors/stylus.ts

@@ -9,6 +9,7 @@ export default (options: Options.Stylus): PreprocessorGroup => ({
       svelteFile,
       'css',
     );
+
     if (lang !== 'stylus') return { code: content };
 
     const transformed = await transformer({ content, filename, options });

src/processors/typescript.ts

@@ -9,6 +9,7 @@ export default (options: Options.Typescript): PreprocessorGroup => ({
       svelteFile,
       'javascript',
     );
+
     if (lang !== 'typescript') return { code: content };
 
     const transformed = await transformer({ content, filename, options });

src/transformers/babel.ts

@@ -17,7 +17,7 @@ const transformer: Transformer<Options.Babel> = async ({
     inputSourceMap: map as any,
     sourceType: 'module',
     // istanbul ignore next
-    sourceMaps: options.sourceMaps ? true : false,
+    sourceMaps: !!options.sourceMaps,
     filename,
     minified: false,
     ast: false,

src/transformers/globalRule.ts

@@ -8,6 +8,7 @@ const selectorPattern = /:global(?!\()/;
 const globalifyRulePlugin = (root: any) => {
   root.walkRules(selectorPattern, (rule: any) => {
     const [beginning, ...rest] = rule.selector.split(selectorPattern);
+
     rule.selector = [beginning, ...rest.map(globalifySelector)]
       .map((str) => str.trim())
       .join(' ')

src/transformers/postcss.ts

@@ -7,6 +7,7 @@ const process = async (
   content: string,
   filename: string,
   sourceMap: string | object,
+  // eslint-disable-next-line max-params
 ) => {
   const { css, map, messages } = await postcss(plugins).process(content, {
     from: filename,
@@ -60,6 +61,7 @@ const transformer: Transformer<Options.Postcss> = async ({
     } else {
       console.error(e);
     }
+
     return { code: content, map, dependencies: [] as any[] };
   }
 

src/transformers/pug.ts

@@ -61,6 +61,7 @@ const transformer: Transformer<Options.Pug> = async ({
     ...options,
     // @types/pug compile() returned value doesn't have `dependencies` prop
   }) as pug.compileTemplate & { dependencies?: string[] };
+
   return {
     code: compiled(),
     dependencies: compiled.dependencies ?? null,

src/transformers/scss.ts

@@ -29,6 +29,8 @@ const transformer: Transformer<Options.Sass> = async ({
 
   if (implementation == null) {
     const mod = await importAny('node-sass', 'sass');
+
+    // eslint-disable-next-line no-multi-assign
     implementation = sass = mod.default;
   }
 

src/transformers/typescript.ts

@@ -25,6 +25,7 @@ function formatDiagnostics(
       createFormatDiagnosticsHost(basePath),
     );
   }
+
   return ts.formatDiagnostic(
     diagnostics,
     createFormatDiagnosticsHost(basePath),
@@ -34,25 +35,31 @@ function formatDiagnostics(
 function getFilenameExtension(filename: string) {
   filename = basename(filename);
   const lastDotIndex = filename.lastIndexOf('.');
+
   if (lastDotIndex <= 0) return '';
+
   return filename.substr(lastDotIndex + 1);
 }
 
 function isSvelteFile(filename: string) {
   const importExtension = getFilenameExtension(filename);
+
   return importExtension === 'svelte' || importExtension === 'html';
 }
 
 const IMPORTEE_PATTERN = /['"](.*?)['"]/;
+
 function isValidSvelteImportDiagnostic(filename: string, diagnostic: any) {
   // TS2307: 'cannot find module'
   if (diagnostic.code !== 2307) return true;
 
   const importeeMatch = diagnostic.messageText.match(IMPORTEE_PATTERN);
+
   // istanbul ignore if
   if (!importeeMatch) return true;
 
   let [, importeePath] = importeeMatch;
+
   /** if we're not dealing with a relative path, assume the file exists */
   if (importeePath[0] !== '.') return false;
 
@@ -74,6 +81,7 @@ const importTransformer: ts.TransformerFactory<ts.SourceFile> = (context) => {
         node.moduleSpecifier,
       );
     }
+
     return ts.visitEachChild(node, (child) => visit(child), context);
   };
 
@@ -85,6 +93,7 @@ const TS_TRANSFORMERS = {
 };
 
 const TS2552_REGEX = /Cannot find name '\$([a-zA-Z0-9_]+)'. Did you mean '([a-zA-Z0-9_]+)'\?/i;
+
 function isValidSvelteReactiveValueDiagnostic(
   filename: string,
   diagnostic: any,
@@ -130,6 +139,7 @@ function compileFileFromMemory(
       languageVersion,
       onError,
       shouldCreateNewSourceFile,
+      // eslint-disable-next-line max-params
     ) =>
       isDummyFile(fileName)
         ? ts.createSourceFile(dummyFileName, code, languageVersion)
@@ -210,6 +220,7 @@ const transformer: Transformer<Options.Typescript> = ({
         tsconfigFile,
         ts.sys.readFile,
       );
+
       if (error) {
         throw new Error(formatDiagnostics(error, basePath));
       }
@@ -224,6 +235,7 @@ const transformer: Transformer<Options.Typescript> = ({
     errors,
     options: convertedCompilerOptions,
   } = ts.convertCompilerOptionsFromJson(compilerOptionsJSON, basePath);
+
   if (errors.length) {
     throw new Error(formatDiagnostics(errors, basePath));
   }
@@ -242,13 +254,16 @@ const transformer: Transformer<Options.Typescript> = ({
     );
   }
 
-  let code, map, diagnostics;
+  let code;
+  let map;
+  let diagnostics;
+
   if (options.transpileOnly || compilerOptions.transpileOnly) {
     ({ outputText: code, sourceMapText: map, diagnostics } = ts.transpileModule(
       content,
       {
         fileName: filename,
-        compilerOptions: compilerOptions,
+        compilerOptions,
         reportDiagnostics: options.reportDiagnostics !== false,
         transformers: TS_TRANSFORMERS,
       },
@@ -263,6 +278,7 @@ const transformer: Transformer<Options.Typescript> = ({
   if (diagnostics.length > 0) {
     // could this be handled elsewhere?
     const formattedDiagnostics = formatDiagnostics(diagnostics, basePath);
+
     console.log(formattedDiagnostics);
   }
 

src/types/index.ts

@@ -21,7 +21,7 @@ export interface TransformerArgs<T> {
   content: string;
   filename: string;
   map?: string | object;
-  dianostics?: Array<unknown>;
+  dianostics?: unknown[];
   options?: T;
 }