Skip to content

Fix LESS extension matching #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2019
Merged

Fix LESS extension matching #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f06641e
Fix LESS extension matching
mrmckeb May 26, 2019
aedfdb9
Move fileType check
mrmckeb May 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/helpers/__tests__/cssSnapshots.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import { readFileSync } from 'fs';
import { IICSSExports } from 'icss-utils';
import { join } from 'path';
import { createExports, getClasses, FileTypes } from '../cssSnapshots';
import {
createExports,
getClasses,
FileTypes,
getFileType,
} from '../cssSnapshots';

const testFileNames = [
'test.module.css',
Expand All @@ -12,20 +17,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();
Expand Down
19 changes: 10 additions & 9 deletions src/helpers/cssSnapshots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';

Expand All @@ -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))
Expand All @@ -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);
};
11 changes: 7 additions & 4 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand All @@ -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,
Expand All @@ -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,
Expand Down