github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplified the utils.js code

Browse Source
This commit is contained in:
Reina128
2024-08-09 11:36:32 -07:00
parent e55febbecb
commit d26472ef64
1 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tools/utils/utils.js
View File

@@ -34,11 +34,7 @@ exports.parseUrl = function (str, defaults) {
}
var hasScheme = exports.hasScheme(str);
if (! hasScheme) {
str = "http://" + str;
}
var parsed = url.parse(str);
const parsed = url.parse(hasScheme ? str : `http://${str}`);
// for consistency remove colon at the end of protocol
parsed.protocol = parsed.protocol.replace(/\:$/, '');
@@ -59,10 +55,7 @@ exports.parseUrl = function (str, defaults) {
exports.formatUrl = function (options) {
// For consistency with `Meteor.absoluteUrl`, add a trailing slash to make
// this a valid URL
if (!options.pathname)
options.pathname = "/";
return url.format(options);
return url.format({ ...options, pathname: options.pathname || "/" });
};
exports.ipAddress = function () {
@@ -88,11 +81,6 @@ ${addressEntries.map(entry => entry.address).join(', ')}`);
return addressEntries[0].address;
};
exports.hasScheme = function (str) {
return !! str.match(/^[A-Za-z][A-Za-z0-9+-\.]*\:\/\//);
};
exports.hasScheme = function (str) {
return !! str.match(/^[A-Za-z][A-Za-z0-9+-\.]*\:\/\//);
};
@@ -105,20 +93,8 @@ exports.isIPv4Address = function (str) {
// Prints a package list in a nice format.
// Input is an array of objects with keys 'name' and 'description'.
exports.printPackageList = function (items, options) {
options = options || {};
var rows = _.map(items, function (item) {
var name = item.name;
var description = item.description || 'No description';
return [name, description];
});
var alphaSort = function (row) {
return row[0];
};
rows = _.sortBy(rows, alphaSort);
var Console = require('../console/console.js').Console;
const rows = _.sortBy(items.map(item => [item.name, item.description || 'No description']), row => row[0]);
const Console = require('../console/console.js').Console;
return Console.printTwoColumns(rows, options);
};
@@ -773,3 +749,4 @@ export function isEmacs() {
emacsDetected = !! (process.env.EMACS === "t" || process.env.INSIDE_EMACS);
return emacsDetected;
}