Remove type imports

Author: kaisermann

src/autoProcess.ts

@@ -3,22 +3,32 @@ import stripIndent from 'strip-indent';
 import {
   PreprocessorGroup,
   Preprocessor,
-  Options,
   Processed,
   TransformerArgs,
   TransformerOptions,
   Transformers,
+  Options,
 } from './types';
-import { hasPostCssInstalled } from './modules/hasPostcssInstalled';
+import { hasDepInstalled } from './modules/hasDepInstalled';
 import { concat } from './modules/concat';
 import { parseFile } from './modules/parseFile';
 import { addLanguageAlias } from './modules/language';
 import { throwError } from './modules/errors';
 
-type AutoPreprocessOptions = Transformers & {
+type AutoPreprocessOptions = {
   markupTagName?: string;
   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>;
+  coffeescript?: TransformerOptions<Options.Coffeescript>;
+  pug?: TransformerOptions<Options.Pug>;
+  globalStyle?: Options.GlobalStyle;
+  replace?: Options.Replace;
   // workaround while we don't have this
   // https://github.com/microsoft/TypeScript/issues/17867
   [languageName: string]:
@@ -235,28 +245,23 @@ export function autoPreprocess(
 
       let { code, map, dependencies } = transformResult;
 
-      if (transformers.postcss) {
-        const transformed = await runTransformer(
-          'postcss',
-          transformers.postcss,
-          { content: code, map, filename, attributes },
-        );
+      if (await hasDepInstalled('postcss')) {
+        if (transformers.postcss) {
+          const transformed = await runTransformer(
+            'postcss',
+            transformers.postcss,
+            { content: code, map, filename, attributes },
+          );
 
-        code = transformed.code;
-        map = transformed.map;
-        dependencies = concat(dependencies, transformed.dependencies);
-      }
+          code = transformed.code;
+          map = transformed.map;
+          dependencies = concat(dependencies, transformed.dependencies);
+        }
 
-      if (await hasPostCssInstalled()) {
         const transformed = await runTransformer(
           'globalStyle',
           transformers?.globalStyle,
-          {
-            content: code,
-            map,
-            filename,
-            attributes,
-          },
+          { content: code, map, filename, attributes },
         );
 
         code = transformed.code;

src/modules/hasDepInstalled.ts

@@ -0,0 +1,18 @@
+const cachedResult: Record<string, boolean> = {};
+
+export async function hasDepInstalled(dep: string) {
+  if (cachedResult[dep] != null) {
+    return cachedResult;
+  }
+
+  let result = false;
+
+  try {
+    await import(dep);
+    result = true;
+  } catch (e) {
+    result = false;
+  }
+
+  return (cachedResult[dep] = result);
+}

src/modules/hasPostcssInstalled.ts

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

src/modules/language.ts

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

src/modules/parseFile.ts

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

src/processors/babel.ts

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

src/processors/coffeescript.ts

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

src/processors/globalStyle.ts

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

src/processors/less.ts

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

src/processors/postcss.ts

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

src/processors/pug.ts

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

src/processors/replace.ts

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

src/processors/scss.ts

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

src/processors/stylus.ts

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

src/processors/typescript.ts

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

src/transformers/babel.ts

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

src/transformers/coffeescript.ts

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

src/transformers/globalStyle.ts

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

src/transformers/less.ts

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

src/transformers/postcss.ts

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

src/transformers/pug.ts

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

src/transformers/replace.ts

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

src/transformers/scss.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import stylus from 'stylus';
 
 import { getIncludePaths } from '../modules/getIncludePaths';
-import type { Transformer, Options } from '../types';
+import { Transformer, Options } from '../types';
 
 const transformer: Transformer<Options.Stylus> = ({
   content,

src/transformers/stylus.ts

@@ -3,7 +3,7 @@ import { dirname, basename, resolve } from 'path';
 
 import ts from 'typescript';
 
-import type { Transformer, Options } from '../types';
+import { Transformer, Options } from '../types';
 
 type CompilerOptions = Options.Typescript['compilerOptions'];
 
@@ -130,7 +130,7 @@ function createImportTransformerFromProgram(program: ts.Program) {
       let newImportClause: ts.ImportClause = node.importClause;
 
       if (node.importClause) {
-        // import type {...} from './blah'
+        // import {...} from './blah'
         if (node.importClause?.isTypeOnly) {
           return ts.createEmptyStatement();
         }

src/transformers/typescript.ts

@@ -1,13 +1,13 @@
-import type {
+import {
   Processed as SvelteProcessed,
   Preprocessor,
 } from 'svelte/types/compiler/preprocess';
 
-import type * as Options from './options';
+import * as Options from './options';
 
-export type { Options };
+export { Options };
 
-export type {
+export {
   Processed as SvelteProcessed,
   PreprocessorGroup,
   Preprocessor,

src/types/index.ts

@@ -1,8 +1,8 @@
-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';
+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 interface Coffeescript {
   inlineMap?: boolean;