@node-minify/core 7.0.0 → 7.1.0

package/lib/compress.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compress = void 0;
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _mkdirp = _interopRequireDefault(require("mkdirp"));
-
 var _utils = require("@node-minify/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /*!
  * node-minify
  * Copyright(c) 2011-2022 Rodolphe Stoclin
@@ -32,28 +27,23 @@ const compress = settings => {
   if (typeof settings.compressor !== 'function') {
     throw new Error(`compressor should be a function, maybe you forgot to install the compressor`);
   }
-
   createDirectory(settings.output);
-
   if (Array.isArray(settings.output)) {
     return settings.sync ? compressArrayOfFilesSync(settings) : compressArrayOfFilesAsync(settings);
   } else {
     return _utils.utils.compressSingleFile(settings);
   }
 };
+
 /**
  * Compress an array of files in sync.
  *
  * @param {Object} settings
  */
-
-
 exports.compress = compress;
-
 const compressArrayOfFilesSync = settings => {
   return settings.input.forEach((input, index) => {
     const content = _utils.utils.getContentFromFiles(input);
-
     return _utils.utils.runSync({
       settings,
       content,
@@ -61,18 +51,16 @@ const compressArrayOfFilesSync = settings => {
     });
   });
 };
+
 /**
  * Compress an array of files in async.
  *
  * @param {Object} settings
  */
-
-
 const compressArrayOfFilesAsync = settings => {
   let sequence = Promise.resolve();
   settings.input.forEach((input, index) => {
     const content = _utils.utils.getContentFromFiles(input);
-
     sequence = sequence.then(() => _utils.utils.runAsync({
       settings,
       content,
@@ -81,28 +69,25 @@ const compressArrayOfFilesAsync = settings => {
   });
   return sequence;
 };
+
 /**
  * Create folder of the target file.
  *
  * @param {String} file - Full path of the file
  */
-
-
 const createDirectory = file => {
   if (Array.isArray(file)) {
     file = file[0];
   }
-
   const dir = file && file.substr(0, file.lastIndexOf('/'));
-
   if (!dir) {
     return;
   }
-
   if (!_fs.default.statSync(dir).isDirectory()) {
     _mkdirp.default.sync(dir);
   }
 };
+
 /**
  * Expose `compress()`.
  */

package/lib/compressInMemory.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compressInMemory = void 0;
-
 var _utils = require("@node-minify/utils");
-
 /*!
  * node-minify
  * Copyright(c) 2011-2022 Rodolphe Stoclin
@@ -26,12 +24,10 @@ const compressInMemory = settings => {
   if (typeof settings.compressor !== 'function') {
     throw new Error(`compressor should be a function, maybe you forgot to install the compressor`);
   }
-
   return _utils.utils.compressSingleFile(settings);
 };
+
 /**
  * Expose `compress()`.
  */
-
-
 exports.compressInMemory = compressInMemory;

package/lib/core.js

@@ -1,11 +1,8 @@
 "use strict";
 
 var _setup = require("./setup");
-
 var _compress = require("./compress");
-
 var _compressInMemory = require("./compressInMemory");
-
 /*!
  * node-minify
  * Copyright(c) 2011-2022 Rodolphe Stoclin
@@ -25,35 +22,29 @@ const minify = settings => {
   return new Promise((resolve, reject) => {
     const method = settings.content ? _compressInMemory.compressInMemory : _compress.compress;
     settings = (0, _setup.setup)(settings);
-
     if (!settings.sync) {
       method(settings).then(minified => {
         if (settings.callback) {
           settings.callback(null, minified);
         }
-
         resolve(minified);
       }).catch(err => {
         if (settings.callback) {
           settings.callback(err);
         }
-
         reject(err);
       });
     } else {
       const minified = method(settings);
-
       if (settings.callback) {
         settings.callback(null, minified);
       }
-
       resolve(minified);
     }
   });
 };
+
 /**
  * Expose `minify()`.
  */
-
-
 module.exports = minify;

package/lib/setup.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setup = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _globby = _interopRequireDefault(require("globby"));
-
 var _utils = require("@node-minify/utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /*!
  * node-minify
  * Copyright(c) 2011-2022 Rodolphe Stoclin
@@ -32,27 +27,28 @@ const defaultSettings = {
   buffer: 1000 * 1024,
   callback: false
 };
+
 /**
  * Run setup.
  *
  * @param {Object} inputSettings
  * @return {Object}
  */
-
 const setup = inputSettings => {
-  let settings = Object.assign(_utils.utils.clone(defaultSettings), inputSettings); // In memory
+  let settings = Object.assign(_utils.utils.clone(defaultSettings), inputSettings);
 
+  // In memory
   if (settings.content) {
     checkMandatoriesMemoryContent(inputSettings);
     return settings;
   }
-
   checkMandatories(inputSettings);
   settings = Object.assign(settings, wildcards(settings.input, settings.publicFolder));
   settings = Object.assign(settings, checkOutput(settings.input, settings.output, settings.publicFolder, settings.replaceInPlace));
   settings = Object.assign(settings, setPublicFolder(settings.input, settings.publicFolder));
   return settings;
 };
+
 /**
  * Check the output path, searching for $1
  * if exist, returns the path remplacing $1 by file name
@@ -63,13 +59,9 @@ const setup = inputSettings => {
  * @param {Boolean} replaceInPlace - True to replace file in same folder
  * @return {Object}
  */
-
-
 exports.setup = setup;
-
 const checkOutput = (input, output, publicFolder, replaceInPlace) => {
   let reg = new RegExp('\\$1');
-
   if (reg.test(output)) {
     if (Array.isArray(input)) {
       const outputMin = input.map(file => _utils.utils.setFileNameMin(file, output, replaceInPlace ? null : publicFolder, replaceInPlace));
@@ -83,6 +75,7 @@ const checkOutput = (input, output, publicFolder, replaceInPlace) => {
     }
   }
 };
+
 /**
  * Handle wildcards in a path, get the real path of each files.
  *
@@ -90,16 +83,14 @@ const checkOutput = (input, output, publicFolder, replaceInPlace) => {
  * @param {String} publicFolder - Path to the public folder
  * @return {Object}
  */
-
-
 const wildcards = (input, publicFolder) => {
   // If it's a string
   if (!Array.isArray(input)) {
     return wildcardsString(input, publicFolder);
   }
-
   return wildcardsArray(input, publicFolder);
 };
+
 /**
  * Handle wildcards in a path (string only), get the real path of each files.
  *
@@ -107,17 +98,14 @@ const wildcards = (input, publicFolder) => {
  * @param {String} publicFolder - Path to the public folder
  * @return {Object}
  */
-
-
 const wildcardsString = (input, publicFolder) => {
   const output = {};
-
   if (input.indexOf('*') > -1) {
     output.input = getFilesFromWildcards(input, publicFolder);
   }
-
   return output;
 };
+
 /**
  * Handle wildcards in a path (array only), get the real path of each files.
  *
@@ -125,35 +113,32 @@ const wildcardsString = (input, publicFolder) => {
  * @param {String} publicFolder - Path to the public folder
  * @return {Object}
  */
-
-
 const wildcardsArray = (input, publicFolder) => {
   let output = {};
   let isWildcardsPresent = false;
-  output.input = input; // Transform all wildcards to path file
+  output.input = input;
 
+  // Transform all wildcards to path file
   const inputWithPublicFolder = input.map(item => {
     if (item.indexOf('*') > -1) {
       isWildcardsPresent = true;
     }
-
     return (publicFolder || '') + item;
   });
-
   if (isWildcardsPresent) {
     output.input = _globby.default.sync(inputWithPublicFolder);
-  } // Remove all wildcards from array
-
+  }
 
+  // Remove all wildcards from array
   for (let i = 0; i < output.input.length; i++) {
     if (output.input[i].indexOf('*') > -1) {
       output.input.splice(i, 1);
       i--;
     }
   }
-
   return output;
 };
+
 /**
  * Get the real path of each files.
  *
@@ -161,17 +146,14 @@ const wildcardsArray = (input, publicFolder) => {
  * @param {String} publicFolder - Path to the public folder
  * @return {Object}
  */
-
-
 const getFilesFromWildcards = (input, publicFolder) => {
   let output = [];
-
   if (input.indexOf('*') > -1) {
     output = _globby.default.sync((publicFolder || '') + input);
   }
-
   return output;
 };
+
 /**
  * Prepend the public folder to each file.
  *
@@ -179,72 +161,63 @@ const getFilesFromWildcards = (input, publicFolder) => {
  * @param {String} publicFolder - Path to the public folder
  * @return {Object}
  */
-
-
 const setPublicFolder = (input, publicFolder) => {
   let output = {};
-
   if (typeof publicFolder !== 'string') {
     return output;
   }
-
   publicFolder = _path.default.normalize(publicFolder);
-
   if (Array.isArray(input)) {
     output.input = input.map(item => {
       // Check if publicFolder is already in path
       if (_path.default.normalize(item).indexOf(publicFolder) > -1) {
         return item;
       }
-
       return _path.default.normalize(publicFolder + item);
     });
     return output;
   }
+  input = _path.default.normalize(input);
 
-  input = _path.default.normalize(input); // Check if publicFolder is already in path
-
+  // Check if publicFolder is already in path
   if (input.indexOf(publicFolder) > -1) {
     output.input = input;
     return output;
   }
-
   output.input = _path.default.normalize(publicFolder + input);
   return output;
 };
+
 /**
  * Check if some settings are here.
  *
  * @param {Object} settings
  */
-
-
 const checkMandatories = settings => {
   ['compressor', 'input', 'output'].forEach(item => mandatory(item, settings));
 };
+
 /**
  * Check if some settings are here for memory content.
  *
  * @param {Object} settings
  */
-
-
 const checkMandatoriesMemoryContent = settings => {
   ['compressor', 'content'].forEach(item => mandatory(item, settings));
 };
+
 /**
  * Check if the setting exist.
  *
  * @param {String} setting
  * @param {Object} settings
  */
-
-
 const mandatory = (setting, settings) => {
   if (!settings[setting]) {
     throw new Error(setting + ' is mandatory.');
   }
 };
+
 /**
  * Expose `setup()`.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node-minify/core",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "core of @node-minify",
   "keywords": [
     "compressor",
@@ -32,9 +32,9 @@
     "url": "https://github.com/srod/node-minify/issues"
   },
   "dependencies": {
-    "@node-minify/utils": "^7.0.0",
+    "@node-minify/utils": "^7.1.0",
     "globby": "11.0.4",
     "mkdirp": "1.0.4"
   },
-  "gitHead": "8b5bda6f1ac9fe7180006f2a19ec3253e8fff4ec"
+  "gitHead": "94cef2d5d653c3bddc3e603b4e25c135b0b6f4b3"
 }