Merge pull request #47 from vordgi/ncm-44

ncm-44 fix reservednames logic

package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-classnames-minifier",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Library for configuring style modules to generate compressed classes",
   "main": "dist/withClassnamesMinifier.js",
   "types": "dist/withClassnamesMinifier.d.ts",

src/lib/converters/ConverterMinified.ts

@@ -61,7 +61,9 @@ class ConverterMinified implements ConverterBase {
         const cachedMatchings = classnames.reduce<{[orig: string]: string}>((acc, cur) => {
           const [origClass, newClass] = cur.split('=');
           acc[origClass] = newClass;
-          usedClassNames.push(newClass);
+          if (!usedClassNames.includes(newClass)) {
+            usedClassNames.push(newClass);
+          }
           return acc;
         }, {});
         dirtyСache[resourcePath] = {
@@ -118,16 +120,17 @@ class ConverterMinified implements ConverterBase {
     return currentClassname;
   }
 
-  getTargetClassName() {
+  getTargetClassName(origName: string) {
     let targetClassName: string;
     if (this.freeClasses.length) {
       targetClassName = this.freeClasses.shift() as string;
     } else {
       targetClassName = this.generateClassName();
     }
 
-    while (this.reservedNames.includes(targetClassName)) {
-      targetClassName = this.getTargetClassName();
+    if (this.reservedNames.includes(targetClassName)) {
+      targetClassName = this.getTargetClassName(origName);
+      this.lastIndex += 1;
     }
 
     return targetClassName;
@@ -141,7 +144,7 @@ class ConverterMinified implements ConverterBase {
 
     if (currentCache.matchings[origName]) return currentCache.matchings[origName];
 
-    let targetClassName = this.getTargetClassName();
+    let targetClassName = this.getTargetClassName(origName);
     currentCache.matchings[origName] = targetClassName;
     currentCache.type = 'updated';
     this.lastIndex += 1;