diff --git a/server/middleware/parseURL.js b/server/middleware/parseURL.js index 58f71f8..e3e3b5a 100644 --- a/server/middleware/parseURL.js +++ b/server/middleware/parseURL.js @@ -2,14 +2,14 @@ const validateNpmPackageName = require("validate-npm-package-name"); const parsePackageURL = require("../utils/parsePackageURL"); const createSearch = require("./utils/createSearch"); -const KnownQueryParams = { +const knownQueryParams = { main: true, meta: true, module: true }; function isKnownQueryParam(param) { - return !!KnownQueryParams[param]; + return !!knownQueryParams[param]; } function queryIsKnown(query) { diff --git a/server/utils/validatePackageName.js b/server/utils/isValidPackageName.js similarity index 62% rename from server/utils/validatePackageName.js rename to server/utils/isValidPackageName.js index 29ed28c..a698755 100644 --- a/server/utils/validatePackageName.js +++ b/server/utils/isValidPackageName.js @@ -1,7 +1,7 @@ const validateNpmPackageName = require("validate-npm-package-name"); -function validatePackageName(packageName) { +function isValidPackageName(packageName) { return validateNpmPackageName(packageName).errors == null; } -module.exports = validatePackageName; +module.exports = isValidPackageName; diff --git a/server/utils/parsePackageURL.js b/server/utils/parsePackageURL.js index 481a17d..6019786 100644 --- a/server/utils/parsePackageURL.js +++ b/server/utils/parsePackageURL.js @@ -1,5 +1,5 @@ const url = require("url"); -const validatePackageName = require("./validatePackageName"); +const isValidPackageName = require("./isValidPackageName"); const URLFormat = /^\/((?:@[^/@]+\/)?[^/@]+)(?:@([^/]+))?(\/.*)?$/; @@ -15,18 +15,22 @@ function decodeParam(param) { return ""; } -function parsePackageURL(packageURL) { - const { pathname, search, query } = url.parse(packageURL, true); +function parsePackageURL(originalURL) { + const { pathname, search, query } = url.parse(originalURL, true); const match = URLFormat.exec(pathname); // Disallow invalid URL formats. - if (match == null) return null; + if (match == null) { + return null; + } const packageName = match[1]; // Disallow invalid npm package names. - if (!validatePackageName(packageName)) return null; + if (!isValidPackageName(packageName)) { + return null; + } const packageVersion = decodeParam(match[2]) || "latest"; const filename = decodeParam(match[3]);