less 4.5.1 → 4.6.1

package/lib/less-node/file-manager.js

@@ -1,37 +1,42 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var path_1 = tslib_1.__importDefault(require("path"));
-var fs_1 = tslib_1.__importDefault(require("./fs"));
-var abstract_file_manager_js_1 = tslib_1.__importDefault(require("../less/environment/abstract-file-manager.js"));
-var FileManager = function () { };
-FileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(), {
-    supports: function () {
+import path from 'path';
+import { createRequire } from 'module';
+import fs from './fs.js';
+import AbstractFileManager from '../less/environment/abstract-file-manager.js';
+
+const require = createRequire(import.meta.url);
+
+const FileManager = function() {}
+FileManager.prototype = Object.assign(new AbstractFileManager(), {
+    supports() {
         return true;
     },
-    supportsSync: function () {
+
+    supportsSync() {
         return true;
     },
-    loadFile: function (filename, currentDirectory, options, environment, callback) {
-        var fullFilename;
-        var isAbsoluteFilename = this.isPathAbsolute(filename);
-        var filenamesTried = [];
-        var self = this;
-        var prefix = filename.slice(0, 1);
-        var explicit = prefix === '.' || prefix === '/';
-        var result = null;
-        var isNodeModule = false;
-        var npmPrefix = 'npm://';
+
+    loadFile(filename, currentDirectory, options, environment, callback) {
+        let fullFilename;
+        const isAbsoluteFilename = this.isPathAbsolute(filename);
+        const filenamesTried = [];
+        const self = this;
+        const prefix = filename.slice(0, 1);
+        const explicit = prefix === '.' || prefix === '/';
+        let result = null;
+        let isNodeModule = false;
+        const npmPrefix = 'npm://';
+
         options = options || {};
-        var paths = isAbsoluteFilename ? [''] : [currentDirectory];
-        if (options.paths) {
-            paths.push.apply(paths, options.paths);
-        }
-        if (!isAbsoluteFilename && paths.indexOf('.') === -1) {
-            paths.push('.');
-        }
-        var prefixes = options.prefixes || [''];
-        var fileParts = this.extractUrlParts(filename);
+
+        const paths = isAbsoluteFilename ? [''] : [currentDirectory];
+
+        if (options.paths) { paths.push.apply(paths, options.paths); }
+
+        if (!isAbsoluteFilename && paths.indexOf('.') === -1) { paths.push('.'); }
+
+        const prefixes = options.prefixes || [''];
+        const fileParts = this.extractUrlParts(filename);
+
         if (options.syncImport) {
             getFileData(returnData, returnData);
             if (callback) {
@@ -47,6 +52,7 @@ FileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(),
             // to be closed before it continues with the next file
             return new Promise(getFileData);
         }
+
         function returnData(data) {
             if (!data.filename) {
                 result = { error: data };
@@ -55,10 +61,12 @@ FileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(),
                 result = data;
             }
         }
+
         function getFileData(fulfill, reject) {
             (function tryPathIndex(i) {
                 function tryWithExtension() {
-                    var extFilename = options.ext ? self.tryAppendExtension(fullFilename, options.ext) : fullFilename;
+                    const extFilename = options.ext ? self.tryAppendExtension(fullFilename, options.ext) : fullFilename;
+
                     if (extFilename !== fullFilename && !explicit && paths[i] === '.') {
                         try {
                             fullFilename = require.resolve(extFilename);
@@ -78,9 +86,16 @@ FileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(),
                         if (j < prefixes.length) {
                             isNodeModule = false;
                             fullFilename = fileParts.rawPath + prefixes[j] + fileParts.filename;
+
                             if (paths[i]) {
-                                fullFilename = path_1.default.join(paths[i], fullFilename);
+                                if (paths[i].startsWith('#')) {
+                                    // Handling paths starting with '#'
+                                    fullFilename = paths[i].substr(1) + fullFilename;
+                                }else{
+                                    fullFilename = path.join(paths[i], fullFilename);
+                                }
                             }
+
                             if (!explicit && paths[i] === '.') {
                                 try {
                                     fullFilename = require.resolve(fullFilename);
@@ -93,15 +108,16 @@ FileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(),
                             }
                             else {
                                 tryWithExtension();
-                            }
-                            var readFileArgs = [fullFilename];
+                            }                            
+
+                            const readFileArgs = [fullFilename];
                             if (!options.rawBuffer) {
                                 readFileArgs.push('utf-8');
                             }
                             if (options.syncImport) {
                                 try {
-                                    var data = fs_1.default.readFileSync.apply(this, readFileArgs);
-                                    fulfill({ contents: data, filename: fullFilename });
+                                    const data = fs.readFileSync.apply(this, readFileArgs);
+                                    fulfill({ contents: data, filename: fullFilename});
                                 }
                                 catch (e) {
                                     filenamesTried.push(isNodeModule ? npmPrefix + fullFilename : fullFilename);
@@ -109,31 +125,32 @@ FileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(),
                                 }
                             }
                             else {
-                                readFileArgs.push(function (e, data) {
+                                readFileArgs.push(function(e, data) {
                                     if (e) {
                                         filenamesTried.push(isNodeModule ? npmPrefix + fullFilename : fullFilename);
                                         return tryPrefix(j + 1);
-                                    }
-                                    fulfill({ contents: data, filename: fullFilename });
+                                    }   
+                                    fulfill({ contents: data, filename: fullFilename});
                                 });
-                                fs_1.default.readFile.apply(this, readFileArgs);
+                                fs.readFile.apply(this, readFileArgs);
                             }
+
                         }
                         else {
                             tryPathIndex(i + 1);
                         }
                     })(0);
-                }
-                else {
-                    reject({ type: 'File', message: "'".concat(filename, "' wasn't found. Tried - ").concat(filenamesTried.join(',')) });
+                } else {
+                    reject({ type: 'File', message: `'${filename}' wasn't found. Tried - ${filenamesTried.join(',')}` });
                 }
             }(0));
         }
     },
-    loadFileSync: function (filename, currentDirectory, options, environment) {
+
+    loadFileSync(filename, currentDirectory, options, environment) {
         options.syncImport = true;
         return this.loadFile(filename, currentDirectory, options, environment);
     }
 });
-exports.default = FileManager;
-//# sourceMappingURL=file-manager.js.map
+
+export default FileManager;

package/lib/less-node/fs.js

@@ -1,11 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var fs;
+/** @typedef {import('fs')} FS */
+import nodeFs from 'fs';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+
+/** @type {FS} */
+let fs;
 try {
     fs = require('graceful-fs');
+} catch (e) {
+    fs = nodeFs;
 }
-catch (e) {
-    fs = require('fs');
-}
-exports.default = fs;
-//# sourceMappingURL=fs.js.map
+export default fs;

package/lib/less-node/image-size.js

@@ -1,50 +1,59 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var dimension_1 = tslib_1.__importDefault(require("../less/tree/dimension"));
-var expression_1 = tslib_1.__importDefault(require("../less/tree/expression"));
-var function_registry_1 = tslib_1.__importDefault(require("./../less/functions/function-registry"));
-exports.default = (function (environment) {
+import { createRequire } from 'module';
+import Dimension from '../less/tree/dimension.js';
+import Expression from '../less/tree/expression.js';
+import functionRegistry from './../less/functions/function-registry.js';
+
+const require = createRequire(import.meta.url);
+
+export default environment => {
+
     function imageSize(functionContext, filePathNode) {
-        var filePath = filePathNode.value;
-        var currentFileInfo = functionContext.currentFileInfo;
-        var currentDirectory = currentFileInfo.rewriteUrls ?
+        let filePath = filePathNode.value;
+        const currentFileInfo = functionContext.currentFileInfo;
+        const currentDirectory = currentFileInfo.rewriteUrls ?
             currentFileInfo.currentDirectory : currentFileInfo.entryPath;
-        var fragmentStart = filePath.indexOf('#');
+
+        const fragmentStart = filePath.indexOf('#');
         if (fragmentStart !== -1) {
             filePath = filePath.slice(0, fragmentStart);
         }
-        var fileManager = environment.getFileManager(filePath, currentDirectory, functionContext.context, environment, true);
+
+        const fileManager = environment.getFileManager(filePath, currentDirectory, functionContext.context, environment, true);
+
         if (!fileManager) {
             throw {
                 type: 'File',
-                message: "Can not set up FileManager for ".concat(filePathNode)
+                message: `Can not set up FileManager for ${filePathNode}`
             };
         }
-        var fileSync = fileManager.loadFileSync(filePath, currentDirectory, functionContext.context, environment);
+
+        const fileSync = fileManager.loadFileSync(filePath, currentDirectory, functionContext.context, environment);
+
         if (fileSync.error) {
             throw fileSync.error;
         }
-        var sizeOf = require('image-size');
-        return sizeOf(fileSync.filename);
+
+        const sizeOf = require('image-size');
+        return sizeOf ? sizeOf(fileSync.filename) : {width: 0, height: 0};
     }
-    var imageFunctions = {
-        'image-size': function (filePathNode) {
-            var size = imageSize(this, filePathNode);
-            return new expression_1.default([
-                new dimension_1.default(size.width, 'px'),
-                new dimension_1.default(size.height, 'px')
+
+    const imageFunctions = {
+        'image-size': function(filePathNode) {
+            const size = imageSize(this, filePathNode);
+            return new Expression([
+                new Dimension(size.width, 'px'),
+                new Dimension(size.height, 'px')
             ]);
         },
-        'image-width': function (filePathNode) {
-            var size = imageSize(this, filePathNode);
-            return new dimension_1.default(size.width, 'px');
+        'image-width': function(filePathNode) {
+            const size = imageSize(this, filePathNode);
+            return new Dimension(size.width, 'px');
         },
-        'image-height': function (filePathNode) {
-            var size = imageSize(this, filePathNode);
-            return new dimension_1.default(size.height, 'px');
+        'image-height': function(filePathNode) {
+            const size = imageSize(this, filePathNode);
+            return new Dimension(size.height, 'px');
         }
     };
-    function_registry_1.default.addMultiple(imageFunctions);
-});
-//# sourceMappingURL=image-size.js.map
+
+    functionRegistry.addMultiple(imageFunctions);
+};

package/lib/less-node/index.js

@@ -1,22 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var environment_1 = tslib_1.__importDefault(require("./environment"));
-var file_manager_1 = tslib_1.__importDefault(require("./file-manager"));
-var url_file_manager_1 = tslib_1.__importDefault(require("./url-file-manager"));
-var less_1 = tslib_1.__importDefault(require("../less"));
-var less = (0, less_1.default)(environment_1.default, [new file_manager_1.default(), new url_file_manager_1.default()]);
-var lessc_helper_1 = tslib_1.__importDefault(require("./lessc-helper"));
+import { createRequire } from 'module';
+import environment from './environment.js';
+import FileManager from './file-manager.js';
+import UrlFileManager from './url-file-manager.js';
+import createFromEnvironment from '../less/index.js';
+import lesscHelper from './lessc-helper.js';
+import PluginLoader from './plugin-loader.js';
+import fs from './fs.js';
+import defaultOptions from '../less/default-options.js';
+import imageSize from './image-size.js';
+
+const require = createRequire(import.meta.url);
+const { version } = require('../../package.json');
+
+const less = createFromEnvironment(environment, [new FileManager(), new UrlFileManager()], version);
+
 // allow people to create less with their own environment
-less.createFromEnvironment = less_1.default;
-less.lesscHelper = lessc_helper_1.default;
-less.PluginLoader = require('./plugin-loader').default;
-less.fs = require('./fs').default;
-less.FileManager = file_manager_1.default;
-less.UrlFileManager = url_file_manager_1.default;
+less.createFromEnvironment = createFromEnvironment;
+less.lesscHelper = lesscHelper;
+less.PluginLoader = PluginLoader;
+less.fs = fs;
+less.FileManager = FileManager;
+less.UrlFileManager = UrlFileManager;
+
 // Set up options
-less.options = require('../less/default-options').default();
+less.options = defaultOptions();
+
 // provide image-size functionality
-require('./image-size').default(less.environment);
-exports.default = less;
-//# sourceMappingURL=index.js.map
+imageSize(less.environment);
+
+export default less;

package/lib/less-node/lessc-helper.js

@@ -1,23 +1,25 @@
 // lessc_helper.js
 //
 //      helper functions for lessc
-var lessc_helper = {
+const lessc_helper = {
+
     // Stylize a string
-    stylize: function (str, style) {
-        var styles = {
-            'reset': [0, 0],
-            'bold': [1, 22],
-            'inverse': [7, 27],
-            'underline': [4, 24],
-            'yellow': [33, 39],
-            'green': [32, 39],
-            'red': [31, 39],
-            'grey': [90, 39]
+    stylize : function(str, style) {
+        const styles = {
+            'reset'     : [0,   0],
+            'bold'      : [1,  22],
+            'inverse'   : [7,  27],
+            'underline' : [4,  24],
+            'yellow'    : [33, 39],
+            'green'     : [32, 39],
+            'red'       : [31, 39],
+            'grey'      : [90, 39]
         };
-        return "\u001B[".concat(styles[style][0], "m").concat(str, "\u001B[").concat(styles[style][1], "m");
+        return `\x1b[${styles[style][0]}m${str}\x1b[${styles[style][1]}m`;
     },
+
     // Print command line options
-    printUsage: function () {
+    printUsage: function() {
         console.log('usage: lessc [option option=parameter ...] <source> [destination]');
         console.log('');
         console.log('If source is set to `-\' (dash or hyphen-minus), input is read from stdin.');
@@ -68,6 +70,8 @@ var lessc_helper = {
         console.log('                               or --clean-css="advanced"');
         console.log('  --disable-plugin-rule        Disallow @plugin statements');
         console.log('');
+        console.log('  --quiet-deprecations         Suppress deprecation warnings only (keeps other warnings).');
+        console.log('');
         console.log('-------------------------- Deprecated ----------------');
         console.log('  -sm=on|off               Legacy parens-only math. Use --math');
         console.log('  --strict-math=on|off     ');
@@ -86,11 +90,6 @@ var lessc_helper = {
         console.log('Home page: <http://lesscss.org/>');
     }
 };
-// Exports helper functions
-// eslint-disable-next-line no-prototype-builtins
-for (var h in lessc_helper) {
-    if (lessc_helper.hasOwnProperty(h)) {
-        exports[h] = lessc_helper[h];
-    }
-}
-//# sourceMappingURL=lessc-helper.js.map
+
+export const { stylize, printUsage } = lessc_helper;
+export default lessc_helper;

package/lib/less-node/plugin-loader.js

@@ -1,19 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var path_1 = tslib_1.__importDefault(require("path"));
-var abstract_plugin_loader_js_1 = tslib_1.__importDefault(require("../less/environment/abstract-plugin-loader.js"));
+import path from 'path';
+import { createRequire } from 'module';
+import AbstractPluginLoader from '../less/environment/abstract-plugin-loader.js';
+
+const require = createRequire(import.meta.url);
+
 /**
  * Node Plugin Loader
  */
-var PluginLoader = function (less) {
+const PluginLoader = function(less) {
     this.less = less;
-    this.require = function (prefix) {
-        prefix = path_1.default.dirname(prefix);
-        return function (id) {
-            var str = id.substr(0, 2);
+    this.require = prefix => {
+        prefix = path.dirname(prefix);
+        return id => {
+            const str = id.slice(0, 2);
             if (str === '..' || str === './') {
-                return require(path_1.default.join(prefix, id));
+                return require(path.join(prefix, id));
             }
             else {
                 return require(id);
@@ -21,34 +22,41 @@ var PluginLoader = function (less) {
         };
     };
 };
-PluginLoader.prototype = Object.assign(new abstract_plugin_loader_js_1.default(), {
-    loadPlugin: function (filename, basePath, context, environment, fileManager) {
-        var prefix = filename.slice(0, 1);
-        var explicit = prefix === '.' || prefix === '/' || filename.slice(-3).toLowerCase() === '.js';
+
+PluginLoader.prototype = Object.assign(new AbstractPluginLoader(), {
+    loadPlugin(filename, basePath, context, environment, fileManager) {
+        const prefix = filename.slice(0, 1);
+        const explicit = prefix === '.' || prefix === '/' || filename.slice(-3).toLowerCase() === '.js';
         if (!explicit) {
             context.prefixes = ['less-plugin-', ''];
         }
+
         if (context.syncImport) {
             return fileManager.loadFileSync(filename, basePath, context, environment);
         }
-        return new Promise(function (fulfill, reject) {
-            fileManager.loadFile(filename, basePath, context, environment).then(function (data) {
-                try {
-                    fulfill(data);
+
+        return new Promise((fulfill, reject) => {
+            fileManager.loadFile(filename, basePath, context, environment).then(
+                data => {
+                    try {
+                        fulfill(data);
+                    }
+                    catch (e) {
+                        console.log(e);
+                        reject(e);
+                    }
                 }
-                catch (e) {
-                    console.log(e);
-                    reject(e);
-                }
-            }).catch(function (err) {
+            ).catch(err => {
                 reject(err);
             });
         });
     },
-    loadPluginSync: function (filename, basePath, context, environment, fileManager) {
+
+    loadPluginSync(filename, basePath, context, environment, fileManager) {
         context.syncImport = true;
         return this.loadPlugin(filename, basePath, context, environment, fileManager);
     }
 });
-exports.default = PluginLoader;
-//# sourceMappingURL=plugin-loader.js.map
+
+export default PluginLoader;
+

package/lib/less-node/url-file-manager.js

@@ -1,58 +1,60 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
 /* eslint-disable no-unused-vars */
 /**
  * @todo - remove top eslint rule when FileManagers have JSDoc type
  * and are TS-type-checked
  */
-var isUrlRe = /^(?:https?:)?\/\//i;
-var url_1 = tslib_1.__importDefault(require("url"));
-var request;
-var abstract_file_manager_js_1 = tslib_1.__importDefault(require("../less/environment/abstract-file-manager.js"));
-var logger_1 = tslib_1.__importDefault(require("../less/logger"));
-var UrlFileManager = function () { };
-UrlFileManager.prototype = Object.assign(new abstract_file_manager_js_1.default(), {
-    supports: function (filename, currentDirectory, options, environment) {
-        return isUrlRe.test(filename) || isUrlRe.test(currentDirectory);
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+
+const isUrlRe = /^(?:https?:)?\/\//i;
+import url from 'url';
+let request;
+import AbstractFileManager from '../less/environment/abstract-file-manager.js';
+import logger from '../less/logger.js';
+
+const UrlFileManager = function() {}
+UrlFileManager.prototype = Object.assign(new AbstractFileManager(), {
+    supports(filename, currentDirectory, options, environment) {
+        return isUrlRe.test( filename ) || isUrlRe.test(currentDirectory);
     },
-    loadFile: function (filename, currentDirectory, options, environment) {
-        return new Promise(function (fulfill, reject) {
+
+    loadFile(filename, currentDirectory, options, environment) {
+        return new Promise((fulfill, reject) => {
             if (request === undefined) {
-                try {
-                    request = require('needle');
-                }
-                catch (e) {
-                    request = null;
-                }
+                try { request = require('needle'); }
+                catch (e) { request = null; }
             }
             if (!request) {
                 reject({ type: 'File', message: 'optional dependency \'needle\' required to import over http(s)\n' });
                 return;
             }
-            var urlStr = isUrlRe.test(filename) ? filename : url_1.default.resolve(currentDirectory, filename);
+
+            let urlStr = isUrlRe.test( filename ) ? filename : url.resolve(currentDirectory, filename);
+
             /** native-request currently has a bug */
-            var hackUrlStr = urlStr.indexOf('?') === -1 ? urlStr + '?' : urlStr;
-            request.get(hackUrlStr, { follow_max: 5 }, function (err, resp, body) {
+            const hackUrlStr = urlStr.indexOf('?') === -1 ? urlStr + '?' : urlStr
+
+            request.get(hackUrlStr, { follow_max: 5 }, (err, resp, body) => {
                 if (err || resp && resp.statusCode >= 400) {
-                    var message = resp && resp.statusCode === 404
-                        ? "resource '".concat(urlStr, "' was not found\n")
-                        : "resource '".concat(urlStr, "' gave this Error:\n  ").concat(err || resp.statusMessage || resp.statusCode, "\n");
-                    reject({ type: 'File', message: message });
+                    const message = resp && resp.statusCode === 404
+                        ? `resource '${urlStr}' was not found\n`
+                        : `resource '${urlStr}' gave this Error:\n  ${err || resp.statusMessage || resp.statusCode}\n`;
+                    reject({ type: 'File', message });
                     return;
                 }
                 if (resp.statusCode >= 300) {
-                    reject({ type: 'File', message: "resource '".concat(urlStr, "' caused too many redirects") });
+                    reject({ type: 'File', message: `resource '${urlStr}' caused too many redirects` });
                     return;
                 }
                 body = body.toString('utf8');
                 if (!body) {
-                    logger_1.default.warn("Warning: Empty body (HTTP ".concat(resp.statusCode, ") returned by \"").concat(urlStr, "\""));
+                    logger.warn(`Warning: Empty body (HTTP ${resp.statusCode}) returned by "${urlStr}"`);
                 }
                 fulfill({ contents: body || '', filename: urlStr });
             });
         });
     }
 });
-exports.default = UrlFileManager;
-//# sourceMappingURL=url-file-manager.js.map
+
+export default UrlFileManager;