Merge pull request #8 from fmal/fix/customMatcher

Improve `customMatcher` support

Author: mrmckeb

src/helpers/__tests__/cssExtensions.test.ts

@@ -1,4 +1,9 @@
-import { isCSS, isRelativeCSS } from '../cssExtensions';
+import {
+  isCSS,
+  isRelativeCSS,
+  setExtensionsPattern,
+  DEFAULT_EXTENSIONS_PATTERN,
+} from '../cssExtensions';
 
 describe('utils / cssExtensions', () => {
   describe('isCSS', () => {
@@ -26,4 +31,18 @@ describe('utils / cssExtensions', () => {
       expect(isRelativeCSS('myfile.module.css')).toBe(false);
     });
   });
+
+  describe('setExtensionsPattern', () => {
+    afterEach(() => setExtensionsPattern(DEFAULT_EXTENSIONS_PATTERN));
+
+    it('should overwrite default extensions pattern', () => {
+      const pattern = new RegExp('\\.css$');
+      setExtensionsPattern(pattern);
+
+      expect(isCSS('./myfile.css')).toBe(true);
+      expect(isCSS('./myfile.scss')).toBe(false);
+      expect(isRelativeCSS('../folder/myfile.css')).toBe(true);
+      expect(isRelativeCSS('../folders/myfile.scss')).toBe(false);
+    });
+  });
 });

src/helpers/cssExtensions.ts

@@ -1,7 +1,16 @@
 const isRelative = (fileName: string) => /^\.\.?($|[\\/])/.test(fileName);
 
-export const isCSS = (fileName: string) =>
-  /\.module\.(sa|sc|c)ss$/.test(fileName);
+export const DEFAULT_EXTENSIONS_PATTERN = /\.module\.(sa|sc|c)ss$/;
+
+let extensionsPattern: RegExp = DEFAULT_EXTENSIONS_PATTERN;
+
+export const isCSS = (fileName: string) => extensionsPattern.test(fileName);
 
 export const isRelativeCSS = (fileName: string) =>
   isCSS(fileName) && isRelative(fileName);
+
+export const setExtensionsPattern = (newPattern?: RegExp) => {
+  if (newPattern !== undefined) {
+    extensionsPattern = newPattern;
+  }
+};

src/index.ts

@@ -1,24 +1,30 @@
 import * as path from 'path';
 import * as ts_module from 'typescript/lib/tsserverlibrary';
-import { isCSS as _isCSS, isRelativeCSS } from './helpers/cssExtensions';
+import {
+  isCSS,
+  isRelativeCSS,
+  setExtensionsPattern,
+} from './helpers/cssExtensions';
 import { getDtsSnapshot } from './helpers/cssSnapshots';
 
 function init({ typescript: ts }: { typescript: typeof ts_module }) {
-  let isCSS = _isCSS;
   function create(info: ts.server.PluginCreateInfo) {
     // User options for plugin.
     const options: IOptions = info.config.options || {};
 
     // Allow custom matchers to be used, handling bad matcher patterns;
+    let extensionsPattern: RegExp | undefined;
     try {
       const { customMatcher } = options;
       if (customMatcher) {
-        isCSS = (fileName) => new RegExp(customMatcher).test(fileName);
+        extensionsPattern = new RegExp(customMatcher);
       }
     } catch (e) {
       // TODO: Provide error/warning to user.
     }
 
+    setExtensionsPattern(extensionsPattern);
+
     // Creates new virtual source files for the CSS modules.
     const _createLanguageServiceSourceFile = ts.createLanguageServiceSourceFile;
     ts.createLanguageServiceSourceFile = (