186526/unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unneeded req params related to the URL

Browse Source
This commit is contained in:
Michael Jackson
2019-08-08 15:13:19 -07:00
parent 091e13b46a
commit 6ad61a984f
11 changed files with 131 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
modules/utils/__tests__/parsePackagePathname-test.js Normal file
View File

@ -0,0 +1,59 @@
import parsePackagePathname from '../parsePackagePathname.js';
describe('parsePackagePathname', () => {
it('parses plain packages', () => {
expect(parsePackagePathname('/history@1.0.0/umd/history.min.js')).toEqual({
packageName: 'history',
packageVersion: '1.0.0',
packageSpec: 'history@1.0.0',
filename: '/umd/history.min.js'
});
});
it('parses plain packages with a hyphen in the name', () => {
expect(parsePackagePathname('/query-string@5.0.0/index.js')).toEqual({
packageName: 'query-string',
packageVersion: '5.0.0',
packageSpec: 'query-string@5.0.0',
filename: '/index.js'
});
});
it('parses plain packages with no version specified', () => {
expect(parsePackagePathname('/query-string/index.js')).toEqual({
packageName: 'query-string',
packageVersion: 'latest',
packageSpec: 'query-string@latest',
filename: '/index.js'
});
});
it('parses plain packages with version spec', () => {
expect(parsePackagePathname('/query-string@>=4.0.0/index.js')).toEqual({
packageName: 'query-string',
packageVersion: '>=4.0.0',
packageSpec: 'query-string@>=4.0.0',
filename: '/index.js'
});
});
it('parses scoped packages', () => {
expect(
parsePackagePathname('/@angular/router@4.3.3/src/index.d.ts')
).toEqual({
packageName: '@angular/router',
packageVersion: '4.3.3',
packageSpec: '@angular/router@4.3.3',
filename: '/src/index.d.ts'
});
});
it('parses package names with a period in them', () => {
expect(parsePackagePathname('/index.js')).toEqual({
packageName: 'index.js',
packageVersion: 'latest',
packageSpec: 'index.js@latest',
filename: ''
});
});
});

80
modules/utils/__tests__/parsePackageURL-test.js
View File

@ -1,80 +0,0 @@
import parsePackageURL from '../parsePackageURL.js';
describe('parsePackageURL', () => {
it('parses plain packages', () => {
expect(parsePackageURL('/history@1.0.0/umd/history.min.js')).toEqual({
pathname: '/history@1.0.0/umd/history.min.js',
search: '',
query: {},
packageName: 'history',
packageVersion: '1.0.0',
filename: '/umd/history.min.js'
});
});
it('parses plain packages with a hyphen in the name', () => {
expect(parsePackageURL('/query-string@5.0.0/index.js')).toEqual({
pathname: '/query-string@5.0.0/index.js',
search: '',
query: {},
packageName: 'query-string',
packageVersion: '5.0.0',
filename: '/index.js'
});
});
it('parses plain packages with no version specified', () => {
expect(parsePackageURL('/query-string/index.js')).toEqual({
pathname: '/query-string/index.js',
search: '',
query: {},
packageName: 'query-string',
packageVersion: 'latest',
filename: '/index.js'
});
});
it('parses plain packages with version spec', () => {
expect(parsePackageURL('/query-string@>=4.0.0/index.js')).toEqual({
pathname: '/query-string@>=4.0.0/index.js',
search: '',
query: {},
packageName: 'query-string',
packageVersion: '>=4.0.0',
filename: '/index.js'
});
});
it('parses scoped packages', () => {
expect(parsePackageURL('/@angular/router@4.3.3/src/index.d.ts')).toEqual({
pathname: '/@angular/router@4.3.3/src/index.d.ts',
search: '',
query: {},
packageName: '@angular/router',
packageVersion: '4.3.3',
filename: '/src/index.d.ts'
});
});
it('parses package names with a period in them', () => {
expect(parsePackageURL('/index.js')).toEqual({
pathname: '/index.js',
search: '',
query: {},
packageName: 'index.js',
packageVersion: 'latest',
filename: ''
});
});
it('parses valid query parameters', () => {
expect(parsePackageURL('/history?main=browser')).toEqual({
pathname: '/history',
search: '?main=browser',
query: { main: 'browser' },
packageName: 'history',
packageVersion: 'latest',
filename: ''
});
});
});

14
modules/utils/createPackageURL.js
View File

@ -1,14 +1,16 @@
import createSearch from './createSearch.js';
export default function createPackageURL(
packageName,
version,
pathname,
search
packageVersion,
filename,
query
) {
let url = `/${packageName}`;
if (version != null) url += `@${version}`;
if (pathname) url += pathname;
if (search) url += search;
if (packageVersion) url += `@${packageVersion}`;
if (filename) url += filename;
if (query) url += createSearch(query);
return url;
}

26
modules/utils/parsePackagePathname.js Normal file
View File

@ -0,0 +1,26 @@
const packagePathnameFormat = /^\/((?:@[^/@]+\/)?[^/@]+)(?:@([^/]+))?(\/.*)?$/;
export default function parsePackagePathname(pathname) {
try {
pathname = decodeURIComponent(pathname);
} catch (error) {
return null;
}
const match = packagePathnameFormat.exec(pathname);
// Disallow invalid pathnames.
if (match == null) return null;
const packageName = match[1];
const packageVersion = match[2] || 'latest';
const filename = (match[3] || '').replace(/\/\/+/g, '/');
return {
// If the pathname is /@scope/name@version/file.js:
packageName, // @scope/name
packageVersion, // version
packageSpec: `${packageName}@${packageVersion}`, // @scope/name@version
filename // /file.js
};
}

33
modules/utils/parsePackageURL.js
View File

@ -1,33 +0,0 @@
import url from 'url';
const packageURLFormat = /^\/((?:@[^/@]+\/)?[^/@]+)(?:@([^/]+))?(\/.*)?$/;
export default function parsePackageURL(originalURL) {
let { pathname, search, query } = url.parse(originalURL, true);
try {
pathname = decodeURIComponent(pathname);
} catch (error) {
return null;
}
const match = packageURLFormat.exec(pathname);
// Disallow invalid URL formats.
if (match == null) {
return null;
}
const packageName = match[1];
const packageVersion = match[2] || 'latest';
const filename = (match[3] || '').replace(/\/\/+/g, '/');
return {
// If the URL is /@scope/name@version/file.js?main=browser:
pathname, // /@scope/name@version/path.js
search: search || '', // ?main=browser
query, // { main: 'browser' }
packageName, // @scope/name
packageVersion, // version
filename // /file.js
};
}