Merge branch 'release/1.1.1'

Author: mrmckeb

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-plugin-css-modules",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "lib/index.js",
   "author": "Brody McKee <[email protected]>",
   "license": "MIT",

src/helpers/__tests__/cssSnapshots.test.ts

@@ -1,7 +1,7 @@
 import { readFileSync } from 'fs';
 import { IICSSExports } from 'icss-utils';
 import { join } from 'path';
-import { createExports, getClasses, FileTypes } from '../cssSnapshots';
+import { createExports, getClasses, getFileType } from '../cssSnapshots';
 
 const testFileNames = [
   'test.module.css',
@@ -12,20 +12,19 @@ const testFileNames = [
 ];
 
 describe('utils / cssSnapshots', () => {
-  testFileNames.forEach((filename) => {
+  testFileNames.forEach((fileName) => {
     let classes: IICSSExports;
-    const isLess = filename.includes('less');
-    const fileType = isLess ? FileTypes.less : FileTypes.css;
+    const fileType = getFileType(fileName);
     const testFile = readFileSync(
-      join(__dirname, 'fixtures', filename),
+      join(__dirname, 'fixtures', fileName),
       'utf8',
     );
 
     beforeAll(() => {
       classes = getClasses(testFile, fileType);
     });
 
-    describe(`with file '${filename}'`, () => {
+    describe(`with file '${fileName}'`, () => {
       describe('getClasses', () => {
         it('should return an object matching expected CSS', () => {
           expect(classes).toMatchSnapshot();

src/helpers/cssSnapshots.ts

@@ -21,15 +21,14 @@ const flattenClassNames = (
 ) => previousValue.concat(currentValue);
 
 export const enum FileTypes {
-  css = 'css',
-  sass = 'sass',
+  scss = 'scss',
   less = 'less',
 }
 
-export const getClasses = (
-  css: string,
-  fileType: FileTypes = FileTypes.css,
-) => {
+export const getFileType = (fileName: string) =>
+  fileName.endsWith('less') ? FileTypes.less : FileTypes.scss;
+
+export const getClasses = (css: string, fileType: FileTypes) => {
   try {
     let transformedCss = '';
 
@@ -51,8 +50,8 @@ export const getClasses = (
 
 export const createExports = (classes: IICSSExports, options: Options) => {
   const isCamelCase = (className: string) =>
-  !NOT_CAMELCASE_REGEXP.test(className);
-const isReservedWord = (className: string) => !reserved.check(className);
+    !NOT_CAMELCASE_REGEXP.test(className);
+  const isReservedWord = (className: string) => !reserved.check(className);
 
   const processedClasses = Object.keys(classes)
     .map(transformClasses(options.camelCase))
@@ -77,11 +76,13 @@ export default classes;
 
 export const getDtsSnapshot = (
   ts: typeof ts_module,
+  fileName: string,
   scriptSnapshot: ts.IScriptSnapshot,
   options: Options,
 ) => {
   const css = scriptSnapshot.getText(0, scriptSnapshot.getLength());
-  const classes = getClasses(css);
+  const fileType = getFileType(fileName);
+  const classes = getClasses(css, fileType);
   const dts = createExports(classes, options);
   return ts.ScriptSnapshot.fromString(dts);
 };

src/index.ts

@@ -15,8 +15,6 @@ function init({ typescript: ts }: { typescript: typeof ts_module }) {
     const { isCSS, isRelativeCSS } = createMatchers(options);
     _isCSS = isCSS;
 
-    info.project.projectService.logger.info(`******** isCSS: ${isCSS}`);
-
     // Creates new virtual source files for the CSS modules.
     const _createLanguageServiceSourceFile = ts.createLanguageServiceSourceFile;
     ts.createLanguageServiceSourceFile = (
@@ -25,7 +23,7 @@ function init({ typescript: ts }: { typescript: typeof ts_module }) {
       ...rest
     ): ts.SourceFile => {
       if (isCSS(fileName)) {
-        scriptSnapshot = getDtsSnapshot(ts, scriptSnapshot, options);
+        scriptSnapshot = getDtsSnapshot(ts, fileName, scriptSnapshot, options);
       }
       const sourceFile = _createLanguageServiceSourceFile(
         fileName,
@@ -46,7 +44,12 @@ function init({ typescript: ts }: { typescript: typeof ts_module }) {
       ...rest
     ): ts.SourceFile => {
       if (isCSS(sourceFile.fileName)) {
-        scriptSnapshot = getDtsSnapshot(ts, scriptSnapshot, options);
+        scriptSnapshot = getDtsSnapshot(
+          ts,
+          sourceFile.fileName,
+          scriptSnapshot,
+          options,
+        );
       }
       sourceFile = _updateLanguageServiceSourceFile(
         sourceFile,