Remove unnecessary option namedExport

Author: Alexander Grigoriev

README.md

@@ -16,17 +16,16 @@ yarn add -D dts-css-modules-loader
     {
       loader: 'dts-css-modules-loader',
       options: {
-        namedExport: true,
         banner: "// This file is generated automatically"
       }
     },
     {
       loader: 'css-loader',
       options: {
-        modules: true, // this option must be enabled
-        camelCase: 'only',
+        modules: true, // enable the CSS Modules
+        exportOnlyLocals: true // export class names as variables
+        camelCase: 'only', // generate valid name of variables
         localIdentName: '[local]',
-        exportOnlyLocals: true
       }
     },
     'sass-loader'
@@ -35,32 +34,38 @@ yarn add -D dts-css-modules-loader
 ```
 
 ## Options
-### `namedExport`
-When the option is switched on classes exported as variables. Be sure you using `camelCase` option of [css-loader](https://github.com/webpack-contrib/css-loader) to avoid invalid name of variables.
+### `banner`
+Adds a "banner" prefix to each generated file.
+
+## css-loader
+As loader uses output of `css-loader`, generated typings depends on it's options.
 
+When [exportOnlyLocals](https://github.com/webpack-contrib/css-loader#exportonlylocals) is on, class names exported as variables:
 ```ts
-// This file is generated automatically.
 export const button: string;
 export const buttonActive: string;
 ```
+Be sure you using [camelCase](https://github.com/webpack-contrib/css-loader#camelcase) to avoid invalid name of variables.
 
-When option is off:
+When option is off, will be generated following typings:
 ```ts
-// This file is generated automatically.
 export interface I_buttonScss {
-  'button': string
-  'buttonActive': string
+  'paButton': string;
+  'paButtonActive': string;
 }
-declare const styles: I_buttonScss;
-export default styles;
+export const locals: I_buttonScss;
 ```
 
-### `banner`
-Adds a "banner" prefix to each generated file.
-
 ## Usage in Typescript
+
+With `exportOnlyLocals`:
+```ts
+import * as classes from './_button.scss';
+```
+
+Without:
 ```ts
-import * as styles from './_button.scss';
+import { locals as classes } from './_button.scss';
 ```
 
 To avoid errors about the absent module, you need to determine this:
@@ -73,7 +78,7 @@ declare module '*.scss' {
   export = classes;
 }
 ```
-When you add new classname Typescript compiler may not find the generated variable so you need to compile twice your files.
+When you add new class name, Typescript compiler may not find the generated variable so you need to compile twice your files.
 
 ## License
 Licensed under the MIT license.

index.js

@@ -17,9 +17,9 @@ module.exports = function(content) {
   }
 
   {
-    const classes = getClasses(content);
+    const { classes, exportOnlyLocals } = getClasses(content);
 
-    if (options.namedExport) {
+    if (exportOnlyLocals) {
       for (let c of classes) {
         typings += `export const ${c}: string;\n`;
       }
@@ -29,7 +29,7 @@ module.exports = function(content) {
       for (let c of classes) {
         typings += `  '${c}': string;\n`;
       }
-      typings += `}\ndeclare const styles: ${i};\nexport default styles;\n`;
+      typings += `}\nexport const locals: ${i};\n`;
     }
   }
 
@@ -48,13 +48,16 @@ function getClasses(content) {
 
   /** @type {string[]} */
   let classes = [];
+  let exportOnlyLocals = true;
 
-  // when `exportOnlyLocals` is on
+  // check `exportOnlyLocals` is on
   let from = content.indexOf('module.exports = {');
-  // when `exportOnlyLocals` is off
-  from = ~from ? from : content.indexOf('exports.locals = {');
+  if (from === -1) {
+    exportOnlyLocals = false;
+    from = content.indexOf('exports.locals = {');
+  }
 
-  if (~from) {
+  if (from !== -1) {
     content = content.substr(from);
 
     /** @type {RegExpExecArray} */
@@ -66,7 +69,10 @@ function getClasses(content) {
     }
   }
 
-  return classes;
+  return {
+    classes,
+    exportOnlyLocals
+  };
 }
 
 const classesRegex = /"([^"\\/;()\n]+)":/g;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dts-css-modules-loader",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "webpack loader to generate typings for css modules",
   "dependencies": {
     "loader-utils": "^1.2.0"