classnames-minifier 0.2.0 → 0.2.2

package/dist/ClassnamesMinifier.js

@@ -20,15 +20,28 @@ class ClassnamesMinifier {
         else {
             const manifestDir = path_1.default.join(config.cacheDir, "ncm-meta");
             const manifestPath = path_1.default.join(manifestDir, "manifest.json");
+            let distCleared = false;
             if (config.cacheDir) {
-                (0, validateDist_1.default)(config, manifestPath);
+                const errors = (0, validateDist_1.default)(config, manifestPath);
+                if (errors) {
+                    if (!config.disableDistDeletion) {
+                        (0, rmDist_1.default)(config.distDir, errors);
+                        distCleared = true;
+                    }
+                    else {
+                        console.log(`classnames-minifier: ${errors}"disableDistDeletion" option was set to true`);
+                    }
+                }
             }
             const { freedNamesPolicy = "transmit", blockLimit = 100000 } = config.experimental || {};
             if (freedNamesPolicy === "block" &&
                 this.converterMinified.freeClasses.length > blockLimit &&
                 config.distDir) {
+                distCleared = true;
                 (0, rmDist_1.default)(config.distDir, `Freed names exceeds the limit (${blockLimit})`);
-                this.converterMinified.clean();
+            }
+            if (distCleared) {
+                this.converterMinified.reset();
             }
             if (!fs_1.default.existsSync(manifestDir))
                 fs_1.default.mkdirSync(manifestDir, { recursive: true });

package/dist/lib/ConverterMinified.d.ts

@@ -22,8 +22,8 @@ declare class ConverterMinified {
     private currentLoopLength;
     private nameMap;
     constructor({ cacheDir, prefix, reservedNames, experimental }: Config);
-    clean: () => void;
-    private recycleCache;
+    reset: () => void;
+    private invalidateCache;
     private generateClassName;
     private getTargetClassName;
     getLocalIdent({ resourcePath }: LoaderContext<any>, _localIdent: string, origName: string): string;

package/dist/lib/ConverterMinified.js

@@ -78,15 +78,18 @@ class ConverterMinified {
         this.nextLoopEndsWith = 26;
         this.currentLoopLength = 0;
         this.nameMap = [0];
-        this.clean = () => {
+        this.reset = () => {
             this.dirtyСache = {};
             this.freeClasses = [];
             this.lastIndex = 0;
             this.nextLoopEndsWith = 26;
             this.currentLoopLength = 0;
             this.nameMap = [0];
+            if (this.cacheDir) {
+                this.invalidateCache(this.cacheDir);
+            }
         };
-        this.recycleCache = (cacheDir) => {
+        this.invalidateCache = (cacheDir) => {
             this.cacheDir = cacheDir;
             if (!(0, fs_1.existsSync)(cacheDir))
                 (0, fs_1.mkdirSync)(cacheDir, { recursive: true });
@@ -94,6 +97,9 @@ class ConverterMinified {
             if (cachedFiles.length) {
                 console.log("classnames-minifier: Restoring pairs of classes...");
             }
+            else {
+                return;
+            }
             const usedClassNames = [];
             const dirtyСache = {};
             let prevLastIndex = 0;
@@ -142,7 +148,7 @@ class ConverterMinified {
         this.reservedNames = reservedNames;
         this.freedNamesPolicy = (experimental === null || experimental === void 0 ? void 0 : experimental.freedNamesPolicy) || "transmit";
         if (cacheDir)
-            this.recycleCache(path_1.default.join(cacheDir, "ncm"));
+            this.invalidateCache(path_1.default.join(cacheDir, "ncm"));
     }
     generateClassName() {
         const symbolsCount = 62;

package/dist/lib/validateConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const validKeys = ["prefix", "reservedNames", "cacheDir", "distDir", "disableDistDeletion"];
+const validKeys = ["prefix", "reservedNames", "cacheDir", "distDir", "disableDistDeletion", "experimental"];
 const validateIsObject = (config) => {
     if (!config)
         return false;

package/dist/lib/validateDist.d.ts

@@ -1,3 +1,3 @@
 import type { Config } from "./types/plugin";
-declare const validateDist: (pluginOptions: Config, manifestPath: string) => void;
+declare const validateDist: (pluginOptions: Config, manifestPath: string) => string | undefined;
 export default validateDist;

package/dist/lib/validateDist.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const configuration_1 = require("./constants/configuration");
-const rmDist_1 = __importDefault(require("./rmDist"));
 const readManifest = (manifestPath) => {
     try {
         const prevData = fs_1.default.readFileSync(manifestPath, { encoding: "utf-8" });
@@ -52,13 +51,6 @@ const validateDist = (pluginOptions, manifestPath) => {
     else {
         configurationError = `Can not find the package cache manifest at ${manifestPath}\n`;
     }
-    if (configurationError) {
-        if (!disableDistDeletion) {
-            (0, rmDist_1.default)(distDir, configurationError);
-        }
-        else {
-            console.log(`classnames-minifier: ${configurationError}"disableDistDeletion" option was set to true`);
-        }
-    }
+    return configurationError;
 };
 exports.default = validateDist;

package/package.json

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