refactor: 💡 use import type

Author: kaisermann

src/autoProcess.ts

@@ -12,7 +12,7 @@ import { hasPostCssInstalled } from './modules/hasPostcssInstalled';
 import { concat } from './modules/concat';
 import { parseFile } from './modules/parseFile';
 import { addLanguageAlias } from './modules/language';
-import { throwUnsupportedError, throwError } from './modules/errors';
+import { throwError } from './modules/errors';
 
 interface Transformers {
   typescript?: TransformerOptions<Options.Typescript>;
@@ -28,10 +28,38 @@ interface Transformers {
   [languageName: string]: TransformerOptions;
 }
 
-type AutoPreprocessOptions = Transformers & {
+type AutoPreprocessOptions = {
+  /** @deprecated for svelte v3 use instead a array of processors */
+  onBefore?: ({
+    content,
+    filename,
+  }: {
+    content: string;
+    filename: string;
+  }) => Promise<string> | string;
   markupTagName?: string;
+  /** @deprecated add transformer config directly to svelte-preprocess options object */
+  transformers?: Transformers;
   aliases?: Array<[string, string]>;
   preserve?: string[];
+  typescript?: TransformerOptions<Options.Typescript>;
+  scss?: TransformerOptions<Options.Sass>;
+  sass?: TransformerOptions<Options.Sass>;
+  less?: TransformerOptions<Options.Less>;
+  stylus?: TransformerOptions<Options.Stylus>;
+  postcss?: TransformerOptions<Options.Postcss>;
+  babel?: TransformerOptions<Options.Babel>;
+  coffeescript?: TransformerOptions<Options.Coffeescript>;
+  pug?: TransformerOptions<Options.Pug>;
+  globalStyle?: Options.GlobalStyle;
+  // workaround while we don't have this
+  // https://github.com/microsoft/TypeScript/issues/17867
+  [languageName: string]:
+    | string
+    | Promise<string>
+    | Array<[string, string]>
+    | string[]
+    | TransformerOptions;
 };
 
 const ALIAS_OPTION_OVERRIDES: Record<string, any> = {
@@ -130,14 +158,14 @@ export function autoPreprocess(
       return;
     }
 
-    if (lang === targetLanguage) {
+    if (
+      lang === targetLanguage ||
+      transformers[lang] === false ||
+      transformers[alias] === false
+    ) {
       return { code: content, dependencies };
     }
 
-    if (transformers[lang] === false || transformers[alias] === false) {
-      throwUnsupportedError(alias, filename);
-    }
-
     const transformed = await runTransformer(
       lang,
       getTransformerOptions(lang, alias),

src/modules/language.ts

@@ -1,6 +1,6 @@
 import { basename } from 'path';
 
-import { PreprocessorArgs } from '../types';
+import type { PreprocessorArgs } from '../types';
 
 export const ALIAS_MAP = new Map([
   ['pcss', 'css'],

src/modules/parseFile.ts

@@ -1,7 +1,7 @@
 import { readFile, access } from 'fs';
 import { resolve, dirname } from 'path';
 
-import { PreprocessorArgs } from '../types';
+import type { PreprocessorArgs } from '../types';
 import { getLanguage } from './language';
 
 export const resolveSrc = (importerFile: string, srcPath: string) =>

src/processors/babel.ts

@@ -1,4 +1,4 @@
-import { PreprocessorGroup, Options } from '../types';
+import type { PreprocessorGroup, Options } from '../types';
 import { concat } from '../modules/concat';
 import { parseFile } from '../modules/parseFile';
 

src/processors/coffeescript.ts

@@ -1,4 +1,4 @@
-import { PreprocessorGroup, Options } from '../types';
+import type { PreprocessorGroup, Options } from '../types';
 import { parseFile } from '../modules/parseFile';
 import { concat } from '../modules/concat';
 

src/processors/globalStyle.ts

@@ -1,4 +1,4 @@
-import { PreprocessorGroup } from '../types';
+import type { PreprocessorGroup } from '../types';
 
 export default (): PreprocessorGroup => {
   return {

src/processors/less.ts

@@ -1,4 +1,4 @@
-import { PreprocessorGroup, Options } from '../types';
+import type { PreprocessorGroup, Options } from '../types';
 import { parseFile } from '../modules/parseFile';
 import { concat } from '../modules/concat';
 

src/processors/postcss.ts

@@ -1,5 +1,5 @@
+import type { PreprocessorGroup, Options } from '../types';
 import { parseFile } from '../modules/parseFile';
-import { PreprocessorGroup, Options } from '../types';
 import { concat } from '../modules/concat';
 
 /** Adapted from https://github.com/TehShrike/svelte-preprocess-postcss */

src/processors/pug.ts

@@ -1,4 +1,4 @@
-import { Options, PreprocessorGroup } from '../types';
+import type { Options, PreprocessorGroup } from '../types';
 
 export default (options?: Options.Pug): PreprocessorGroup => ({
   async markup({ content, filename }) {

src/processors/replace.ts

@@ -1,4 +1,4 @@
-import { PreprocessorGroup, Options } from '../types';
+import type { PreprocessorGroup, Options } from '../types';
 
 export default (options: Options.Replace): PreprocessorGroup => ({
   async markup({ content, filename }) {

src/processors/scss.ts

@@ -1,5 +1,5 @@
+import type { PreprocessorGroup, Options } from '../types';
 import { parseFile } from '../modules/parseFile';
-import { PreprocessorGroup, Options } from '../types';
 import { concat } from '../modules/concat';
 
 export default (options?: Options.Sass): PreprocessorGroup => ({

src/processors/stylus.ts

@@ -1,5 +1,5 @@
+import type { Options, PreprocessorGroup } from '../types';
 import { parseFile } from '../modules/parseFile';
-import { Options, PreprocessorGroup } from '../types';
 import { concat } from '../modules/concat';
 
 export default (options?: Options.Stylus): PreprocessorGroup => ({

src/processors/typescript.ts

@@ -1,4 +1,4 @@
-import { Options, PreprocessorGroup } from '../types';
+import type { Options, PreprocessorGroup } from '../types';
 import { parseFile } from '../modules/parseFile';
 import { concat } from '../modules/concat';
 

src/transformers/babel.ts

@@ -1,6 +1,6 @@
 import { transformAsync } from '@babel/core';
 
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 const transformer: Transformer<Options.Babel> = async ({
   content,

src/transformers/coffeescript.ts

@@ -1,6 +1,6 @@
 import coffeescript from 'coffeescript';
 
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 const transformer: Transformer<Options.Coffeescript> = ({
   content,

src/transformers/globalStyle.ts

@@ -1,6 +1,6 @@
 import postcss, { AtRule } from 'postcss';
 
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 import { globalifySelector } from '../modules/globalifySelector';
 
 const selectorPattern = /:global(?!\()/;

src/transformers/less.ts

@@ -1,7 +1,7 @@
 import less from 'less';
 
 import { getIncludePaths } from '../modules/getIncludePaths';
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 const transformer: Transformer<Options.Less> = async ({
   content,

src/transformers/postcss.ts

@@ -1,6 +1,6 @@
 import postcss from 'postcss';
 
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 const process = async (
   { plugins, parser, syntax }: Options.Postcss,

src/transformers/pug.ts

@@ -1,7 +1,7 @@
 import detectIndent from 'detect-indent';
 import pug from 'pug';
 
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 // Mixins to use svelte template features
 const GET_MIXINS = (identationType: 'tab' | 'space') =>

src/transformers/replace.ts

@@ -1,4 +1,4 @@
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 const transformer: Transformer<Options.Replace> = async ({
   content,
@@ -7,7 +7,7 @@ const transformer: Transformer<Options.Replace> = async ({
   let newContent = content;
 
   for (const [regex, replacer] of options) {
-    newContent = newContent.replace(regex, replacer);
+    newContent = newContent.replace(regex, replacer as any);
   }
 
   return {

src/transformers/scss.ts

@@ -1,6 +1,6 @@
-import { Result } from 'sass';
+import type { Result } from 'sass';
 
-import { Transformer, Processed, Options } from '../types';
+import type { Transformer, Processed, Options } from '../types';
 import { getIncludePaths } from '../modules/getIncludePaths';
 import { importAny } from '../modules/importAny';
 

src/transformers/stylus.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import stylus from 'stylus';
 
 import { getIncludePaths } from '../modules/getIncludePaths';
-import { Processed, Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 const transformer: Transformer<Options.Stylus> = ({
   content,
@@ -15,7 +15,7 @@ const transformer: Transformer<Options.Stylus> = ({
     ...options,
   };
 
-  return new Promise<Processed>((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     const style = stylus(content, {
       filename,
       ...options,

src/transformers/typescript.ts

@@ -3,7 +3,7 @@ import { dirname, basename, resolve } from 'path';
 
 import ts from 'typescript';
 
-import { Transformer, Options } from '../types';
+import type { Transformer, Options } from '../types';
 
 type CompilerOptions = Options.Typescript['compilerOptions'];
 

src/types/index.ts

@@ -1,13 +1,13 @@
-import {
+import type {
   Processed as SvelteProcessed,
   Preprocessor,
 } from 'svelte/types/compiler/preprocess';
 
-import * as Options from './options';
+import type * as Options from './options';
 
-export { Options };
+export type { Options };
 
-export {
+export type {
   Processed as SvelteProcessed,
   PreprocessorGroup,
   Preprocessor,
@@ -17,14 +17,14 @@ export type PreprocessorArgs = Preprocessor extends (options: infer T) => any
   ? T
   : never;
 
-export interface TransformerArgs<T> {
+export type TransformerArgs<T> = {
   content: string;
   filename: string;
   attributes?: Record<string, any>;
   map?: string | object;
   dianostics?: unknown[];
   options?: T;
-}
+};
 
 export type Processed = SvelteProcessed & {
   diagnostics?: any[];

src/types/options.ts

@@ -1,12 +1,8 @@
-import postcss from 'postcss';
-import { Options as SassOptions, render, renderSync } from 'sass';
-import { Options as PugOptions } from 'pug';
-import { CompilerOptions } from 'typescript';
-import { TransformOptions as BabelOptions } from '@babel/core';
-
-export type Replace = Array<
-  [RegExp, string] | [RegExp, (substring: string, ...args: any[]) => string]
->;
+import type postcss from 'postcss';
+import type { Options as SassOptions, render, renderSync } from 'sass';
+import type { Options as PugOptions } from 'pug';
+import type { CompilerOptions } from 'typescript';
+import type { TransformOptions as BabelOptions } from '@babel/core';
 
 export interface Coffeescript {
   inlineMap?: boolean;
@@ -71,3 +67,7 @@ export interface Typescript {
 export interface GlobalStyle {
   sourceMap: boolean;
 }
+
+export type Replace = Array<
+  [RegExp, string] | [RegExp, (substring: string, ...args: any[]) => string]
+>;