route-helpers-generator 1.0.4 → 1.0.8

package/README.md

@@ -10,13 +10,12 @@ Create methods to easily generate paths and url
 * qs - ^6.5.1
 * cli-table - ^0.3.1
 * randexp - ^0.5.3
-* url
 
 ## Install
 
 ```
 npm install --save route-helpers-generator
-or 
+or
 yarn add route-helpers-generator
 ```
 
@@ -31,7 +30,7 @@ Declare some routes:
 import RoutesHelper, {generatePathMethod, generateUrlMethod, generateMatch} from 'route-helpers-generator'
 
 const userMatch = generateMatch('/users/:id');
-userMatch('/users/1') // => {id: 1} 
+userMatch('/users/1') // => {id: 1}
 userMatch('/users') // => null
 
 const userPath = generatePathMethod('/users/:id');
@@ -83,3 +82,4 @@ export default routesHelper;
 ## Release
 
 `npm publish`
+`npm unpublish route-helpers-generator@version`

package/dist/generateMatch.js

@@ -6,25 +6,43 @@ Object.defineProperty(exports, "__esModule", {
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var _qs = require('qs');
 
 var _qs2 = _interopRequireDefault(_qs);
 
 var _pathToRegexp = require('path-to-regexp');
 
-var _url = require('url');
-
-var _url2 = _interopRequireDefault(_url);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _toArray(arr) { return Array.isArray(arr) ? arr : Array.from(arr); }
 
+var parseURL = function parseURL(url) {
+	if ((typeof url === 'undefined' ? 'undefined' : _typeof(url)) === 'object') return url;
+	if (!url.match(/^http/)) url = 'https://test.com' + url;
+	var regex = /^(https?):\/\/([^:/]+)(:\d+)?(\/[^?#]*)?(\?[^#]*)?(#.*)?$/;
+	var match = url.match(regex);
+	if (match) {
+		var _match = _slicedToArray(match, 7),
+		    protocol = _match[1],
+		    hostname = _match[2],
+		    port = _match[3],
+		    pathname = _match[4],
+		    search = _match[5],
+		    hash = _match[6];
+
+		return { protocol: protocol, hostname: hostname, port: port, pathname: pathname, search: search, hash: hash };
+	}
+	return null;
+};
 var generateMatch = function generateMatch(path) {
 	var keys = [];
 	var regexp = (0, _pathToRegexp.pathToRegexp)(path, keys);
 	return function (url) {
-		url = _url2.default.parse(url);
+		url = parseURL(url);
 		var formatMatch = url.pathname.match(/\.([^.]+)$/);
 		var format = formatMatch && formatMatch[1];
 		var match = regexp.exec(url.pathname.replace(/\.[^.]+$/, ''));
@@ -32,15 +50,15 @@ var generateMatch = function generateMatch(path) {
 			return null;
 		}
 
-		var _match = _toArray(match),
-		    values = _match.slice(1);
+		var _match2 = _toArray(match),
+		    values = _match2.slice(1);
 
 		var params = keys.reduce(function (memo, key, index) {
 			memo[key.name] = values[index];
 			return memo;
 		}, {});
 		url.hash && (params.hash = url.hash.replace(/^#/, ''));
-		url.query && (params = _extends({}, params, _qs2.default.parse(url.query)));
+		url.search && (params = _extends({}, params, _qs2.default.parse(url.search.replace(/^\?/, ''))));
 		format && (params.format = format);
 		return params;
 	};

package/dist/generateMatch.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generateMatch.js"],"names":["generateMatch","path","keys","regexp","url","parse","formatMatch","pathname","match","format","exec","replace","values","params","reduce","memo","key","index","name","hash","query"],"mappings":";;;;;;;;AAAA;;;;AACA;;AACA;;;;;;;;AAEA,IAAMA,gBAAgB,SAAhBA,aAAgB,CAACC,IAAD,EAAU;AAC/B,KAAIC,OAAO,EAAX;AACA,KAAMC,SAAS,gCAAaF,IAAb,EAAmBC,IAAnB,CAAf;AACA,QAAO,UAACE,GAAD,EAAS;AACfA,QAAM,cAAIC,KAAJ,CAAUD,GAAV,CAAN;AACA,MAAME,cAAcF,IAAIG,QAAJ,CAAaC,KAAb,CAAmB,YAAnB,CAApB;AACA,MAAMC,SAASH,eAAeA,YAAY,CAAZ,CAA9B;AACA,MAAME,QAAQL,OAAOO,IAAP,CAAYN,IAAIG,QAAJ,CAAaI,OAAb,CAAqB,UAArB,EAAiC,EAAjC,CAAZ,CAAd;AACA,MAAI,CAACH,KAAL,EAAY;AACX,UAAO,IAAP;AACA;;AAPc,wBAQOA,KARP;AAAA,MAQHI,MARG;;AASf,MAAIC,SAASX,KAAKY,MAAL,CAAY,UAACC,IAAD,EAAOC,GAAP,EAAYC,KAAZ,EAAsB;AAC9CF,QAAKC,IAAIE,IAAT,IAAiBN,OAAOK,KAAP,CAAjB;AACA,UAAOF,IAAP;AACA,GAHY,EAGV,EAHU,CAAb;AAIAX,MAAIe,IAAJ,KAAaN,OAAOM,IAAP,GAAcf,IAAIe,IAAJ,CAASR,OAAT,CAAiB,IAAjB,EAAuB,EAAvB,CAA3B;AACAP,MAAIgB,KAAJ,KAAcP,sBAAaA,MAAb,EAAwB,aAAGR,KAAH,CAASD,IAAIgB,KAAb,CAAxB,CAAd;AACAX,aAAWI,OAAOJ,MAAP,GAAgBA,MAA3B;AACA,SAAOI,MAAP;AACA,EAjBD;AAkBA,CArBD;;kBAuBeb,a","file":"generateMatch.js","sourcesContent":["import qs from 'qs'\nimport {pathToRegexp} from 'path-to-regexp'\nimport Url from 'url'\n\nconst generateMatch = (path) => {\n\tlet keys = [];\n\tconst regexp = pathToRegexp(path, keys);\n\treturn (url) => {\n\t\turl = Url.parse(url);\n\t\tconst formatMatch = url.pathname.match(/\\.([^.]+)$/);\n\t\tconst format = formatMatch && formatMatch[1];\n\t\tconst match = regexp.exec(url.pathname.replace(/\\.[^.]+$/, ''));\n\t\tif (!match) {\n\t\t\treturn null;\n\t\t}\n\t\tconst [, ...values] = match;\n\t\tlet params = keys.reduce((memo, key, index) => {\n\t\t\tmemo[key.name] = values[index];\n\t\t\treturn memo;\n\t\t}, {});\n\t\turl.hash && (params.hash = url.hash.replace(/^#/, ''));\n\t\turl.query && (params = {...params, ...qs.parse(url.query)});\n\t\tformat && (params.format = format);\n\t\treturn params;\n\t};\n};\n\nexport default generateMatch;\n"]}
+{"version":3,"sources":["../src/generateMatch.js"],"names":["parseURL","url","match","regex","protocol","hostname","port","pathname","search","hash","generateMatch","path","keys","regexp","formatMatch","format","exec","replace","values","params","reduce","memo","key","index","name","parse"],"mappings":";;;;;;;;;;;;AAAA;;;;AACA;;;;;;AAEA,IAAMA,WAAW,SAAXA,QAAW,CAACC,GAAD,EAAS;AACzB,KAAI,QAAOA,GAAP,yCAAOA,GAAP,OAAgB,QAApB,EAA8B,OAAOA,GAAP;AAC9B,KAAI,CAACA,IAAIC,KAAJ,CAAU,OAAV,CAAL,EAAyBD,MAAM,qBAAqBA,GAA3B;AACzB,KAAME,QAAQ,2DAAd;AACA,KAAMD,QAAQD,IAAIC,KAAJ,CAAUC,KAAV,CAAd;AACA,KAAID,KAAJ,EAAW;AAAA,8BACmDA,KADnD;AAAA,MACDE,QADC;AAAA,MACSC,QADT;AAAA,MACmBC,IADnB;AAAA,MACyBC,QADzB;AAAA,MACmCC,MADnC;AAAA,MAC2CC,IAD3C;;AAEV,SAAO,EAAEL,kBAAF,EAAYC,kBAAZ,EAAsBC,UAAtB,EAA4BC,kBAA5B,EAAsCC,cAAtC,EAA8CC,UAA9C,EAAP;AACA;AACD,QAAO,IAAP;AACA,CAVD;AAWA,IAAMC,gBAAgB,SAAhBA,aAAgB,CAACC,IAAD,EAAU;AAC/B,KAAIC,OAAO,EAAX;AACA,KAAMC,SAAS,gCAAaF,IAAb,EAAmBC,IAAnB,CAAf;AACA,QAAO,UAACX,GAAD,EAAS;AACfA,QAAMD,SAASC,GAAT,CAAN;AACA,MAAMa,cAAcb,IAAIM,QAAJ,CAAaL,KAAb,CAAmB,YAAnB,CAApB;AACA,MAAMa,SAASD,eAAeA,YAAY,CAAZ,CAA9B;AACA,MAAMZ,QAAQW,OAAOG,IAAP,CAAYf,IAAIM,QAAJ,CAAaU,OAAb,CAAqB,UAArB,EAAiC,EAAjC,CAAZ,CAAd;AACA,MAAI,CAACf,KAAL,EAAY;AACX,UAAO,IAAP;AACA;;AAPc,yBAQOA,KARP;AAAA,MAQHgB,MARG;;AASf,MAAIC,SAASP,KAAKQ,MAAL,CAAY,UAACC,IAAD,EAAOC,GAAP,EAAYC,KAAZ,EAAsB;AAC9CF,QAAKC,IAAIE,IAAT,IAAiBN,OAAOK,KAAP,CAAjB;AACA,UAAOF,IAAP;AACA,GAHY,EAGV,EAHU,CAAb;AAIApB,MAAIQ,IAAJ,KAAaU,OAAOV,IAAP,GAAcR,IAAIQ,IAAJ,CAASQ,OAAT,CAAiB,IAAjB,EAAuB,EAAvB,CAA3B;AACAhB,MAAIO,MAAJ,KAAeW,sBAAaA,MAAb,EAAwB,aAAGM,KAAH,CAASxB,IAAIO,MAAJ,CAAWS,OAAX,CAAmB,KAAnB,EAA0B,EAA1B,CAAT,CAAxB,CAAf;AACAF,aAAWI,OAAOJ,MAAP,GAAgBA,MAA3B;AACA,SAAOI,MAAP;AACA,EAjBD;AAkBA,CArBD;;kBAuBeT,a","file":"generateMatch.js","sourcesContent":["import qs from 'qs'\nimport {pathToRegexp} from 'path-to-regexp'\n\nconst parseURL = (url) => {\n\tif (typeof(url) === 'object') return url;\n\tif (!url.match(/^http/)) url = 'https://test.com' + url\n\tconst regex = /^(https?):\\/\\/([^:/]+)(:\\d+)?(\\/[^?#]*)?(\\?[^#]*)?(#.*)?$/;\n\tconst match = url.match(regex);\n\tif (match) {\n\t\tconst [, protocol, hostname, port, pathname, search, hash] = match;\n\t\treturn { protocol, hostname, port, pathname, search, hash };\n\t}\n\treturn null\n};\nconst generateMatch = (path) => {\n\tlet keys = [];\n\tconst regexp = pathToRegexp(path, keys);\n\treturn (url) => {\n\t\turl = parseURL(url);\n\t\tconst formatMatch = url.pathname.match(/\\.([^.]+)$/);\n\t\tconst format = formatMatch && formatMatch[1];\n\t\tconst match = regexp.exec(url.pathname.replace(/\\.[^.]+$/, ''));\n\t\tif (!match) {\n\t\t\treturn null;\n\t\t}\n\t\tconst [, ...values] = match;\n\t\tlet params = keys.reduce((memo, key, index) => {\n\t\t\tmemo[key.name] = values[index];\n\t\t\treturn memo;\n\t\t}, {});\n\t\turl.hash && (params.hash = url.hash.replace(/^#/, ''));\n\t\turl.search && (params = {...params, ...qs.parse(url.search.replace(/^\\?/, ''))});\n\t\tformat && (params.format = format);\n\t\treturn params;\n\t};\n};\n\nexport default generateMatch;\n"]}

package/dist/generatePathMethod.js

@@ -28,7 +28,7 @@ var generatePathMethod = function generatePathMethod(path) {
 			}) === -1 && key !== 'hash' && key !== 'format' && (queryValues[key] = data[key]);
 		});
 		var path = pathFunc(data, options);
-		var query = _qs2.default.stringify(queryValues, { arrayFormat: 'brackets' });
+		var query = _qs2.default.stringify(queryValues, Object.assign({ arrayFormat: 'brackets' }, options || {}));
 		var hash = (data || {}).hash || '';
 		var format = (data || {}).format || '';
 		return '' + path + (format && '.' + format) + (query && '?') + query + (hash && '#') + hash;

package/dist/generatePathMethod.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/generatePathMethod.js"],"names":["generatePathMethod","path","tokens","tokenNames","map","token","name","filter","pathFunc","data","options","queryValues","Object","keys","forEach","key","findIndex","tokenName","query","stringify","arrayFormat","hash","format"],"mappings":";;;;;;AAAA;;;;AACA;;;;AAEA,IAAMA,qBAAqB,SAArBA,kBAAqB,CAACC,IAAD,EAAU;AACpC,KAAMC,SAAS,yBAAMD,IAAN,CAAf;AACA,KAAME,aAAaD,OAAOE,GAAP,CAAW,UAACC,KAAD;AAAA,SAAW,OAAOA,KAAP,KAAiB,QAAjB,GAA4B,IAA5B,GAAmCA,MAAMC,IAApD;AAAA,EAAX,EAAqEC,MAArE,CAA4E,UAACF,KAAD;AAAA,SAAWA,KAAX;AAAA,EAA5E,CAAnB;AACA,KAAMG,WAAW,oCAAiBN,MAAjB,CAAjB;AACA,QAAO,CAACC,UAAD,EAAa,UAACM,IAAD,EAAOC,OAAP,EAAmB;AACtC,MAAIC,cAAc,EAAlB;AACAC,SAAOC,IAAP,CAAYJ,QAAQ,EAApB,EAAwBK,OAAxB,CAAgC,UAACC,GAAD,EAAS;AACxCZ,cAAWa,SAAX,CAAqB,UAACC,SAAD;AAAA,WAAeA,cAAcF,GAA7B;AAAA,IAArB,MAA2D,CAAC,CAA5D,IACAA,QAAQ,MADR,IAEAA,QAAQ,QAFR,KAGCJ,YAAYI,GAAZ,IAAmBN,KAAKM,GAAL,CAHpB;AAIA,GALD;AAMA,MAAMd,OAAOO,SAASC,IAAT,EAAeC,OAAf,CAAb;AACA,MAAMQ,QAAQ,aAAGC,SAAH,CAAaR,WAAb,EAA0B,EAAES,aAAa,UAAf,EAA1B,CAAd;AACA,MAAMC,OAAO,CAACZ,QAAQ,EAAT,EAAaY,IAAb,IAAqB,EAAlC;AACA,MAAMC,SAAS,CAACb,QAAQ,EAAT,EAAaa,MAAb,IAAuB,EAAtC;AACA,cAAUrB,IAAV,IAAiBqB,gBAAcA,MAA/B,KAA0CJ,SAAS,GAAnD,IAAyDA,KAAzD,IAAiEG,QAAQ,GAAzE,IAA+EA,IAA/E;AACA,EAbM,CAAP;AAcA,CAlBD;;kBAoBerB,kB","file":"generatePathMethod.js","sourcesContent":["import qs from 'qs'\nimport {parse, tokensToFunction} from 'path-to-regexp'\n\nconst generatePathMethod = (path) => {\n\tconst tokens = parse(path);\n\tconst tokenNames = tokens.map((token) => typeof token === 'string' ? null : token.name).filter((token) => token);\n\tconst pathFunc = tokensToFunction(tokens);\n\treturn [tokenNames, (data, options) => {\n\t\tlet queryValues = {};\n\t\tObject.keys(data || {}).forEach((key) => {\n\t\t\ttokenNames.findIndex((tokenName) => tokenName === key) === -1 &&\n\t\t\tkey !== 'hash' &&\n\t\t\tkey !== 'format' &&\n\t\t\t(queryValues[key] = data[key]);\n\t\t});\n\t\tconst path = pathFunc(data, options);\n\t\tconst query = qs.stringify(queryValues, { arrayFormat: 'brackets' });\n\t\tconst hash = (data || {}).hash || '';\n\t\tconst format = (data || {}).format || '';\n\t\treturn `${path}${format && `.${format}`}${query && '?'}${query}${hash && '#'}${hash}`;\n\t}];\n};\n\nexport default generatePathMethod;\n"]}
+{"version":3,"sources":["../src/generatePathMethod.js"],"names":["generatePathMethod","path","tokens","tokenNames","map","token","name","filter","pathFunc","data","options","queryValues","Object","keys","forEach","key","findIndex","tokenName","query","stringify","assign","arrayFormat","hash","format"],"mappings":";;;;;;AAAA;;;;AACA;;;;AAEA,IAAMA,qBAAqB,SAArBA,kBAAqB,CAACC,IAAD,EAAU;AACpC,KAAMC,SAAS,yBAAMD,IAAN,CAAf;AACA,KAAME,aAAaD,OAAOE,GAAP,CAAW,UAACC,KAAD;AAAA,SAAW,OAAOA,KAAP,KAAiB,QAAjB,GAA4B,IAA5B,GAAmCA,MAAMC,IAApD;AAAA,EAAX,EAAqEC,MAArE,CAA4E,UAACF,KAAD;AAAA,SAAWA,KAAX;AAAA,EAA5E,CAAnB;AACA,KAAMG,WAAW,oCAAiBN,MAAjB,CAAjB;AACA,QAAO,CAACC,UAAD,EAAa,UAACM,IAAD,EAAOC,OAAP,EAAmB;AACtC,MAAIC,cAAc,EAAlB;AACAC,SAAOC,IAAP,CAAYJ,QAAQ,EAApB,EAAwBK,OAAxB,CAAgC,UAACC,GAAD,EAAS;AACxCZ,cAAWa,SAAX,CAAqB,UAACC,SAAD;AAAA,WAAeA,cAAcF,GAA7B;AAAA,IAArB,MAA2D,CAAC,CAA5D,IACAA,QAAQ,MADR,IAEAA,QAAQ,QAFR,KAGCJ,YAAYI,GAAZ,IAAmBN,KAAKM,GAAL,CAHpB;AAIA,GALD;AAMA,MAAMd,OAAOO,SAASC,IAAT,EAAeC,OAAf,CAAb;AACA,MAAMQ,QAAQ,aAAGC,SAAH,CAAaR,WAAb,EAA0BC,OAAOQ,MAAP,CAAc,EAAEC,aAAa,UAAf,EAAd,EAA2CX,WAAW,EAAtD,CAA1B,CAAd;AACA,MAAMY,OAAO,CAACb,QAAQ,EAAT,EAAaa,IAAb,IAAqB,EAAlC;AACA,MAAMC,SAAS,CAACd,QAAQ,EAAT,EAAac,MAAb,IAAuB,EAAtC;AACA,cAAUtB,IAAV,IAAiBsB,gBAAcA,MAA/B,KAA0CL,SAAS,GAAnD,IAAyDA,KAAzD,IAAiEI,QAAQ,GAAzE,IAA+EA,IAA/E;AACA,EAbM,CAAP;AAcA,CAlBD;;kBAoBetB,kB","file":"generatePathMethod.js","sourcesContent":["import qs from 'qs'\nimport {parse, tokensToFunction} from 'path-to-regexp'\n\nconst generatePathMethod = (path) => {\n\tconst tokens = parse(path);\n\tconst tokenNames = tokens.map((token) => typeof token === 'string' ? null : token.name).filter((token) => token);\n\tconst pathFunc = tokensToFunction(tokens);\n\treturn [tokenNames, (data, options) => {\n\t\tlet queryValues = {};\n\t\tObject.keys(data || {}).forEach((key) => {\n\t\t\ttokenNames.findIndex((tokenName) => tokenName === key) === -1 &&\n\t\t\tkey !== 'hash' &&\n\t\t\tkey !== 'format' &&\n\t\t\t(queryValues[key] = data[key]);\n\t\t});\n\t\tconst path = pathFunc(data, options);\n\t\tconst query = qs.stringify(queryValues, Object.assign({ arrayFormat: 'brackets' }, options || {}));\n\t\tconst hash = (data || {}).hash || '';\n\t\tconst format = (data || {}).format || '';\n\t\treturn `${path}${format && `.${format}`}${query && '?'}${query}${hash && '#'}${hash}`;\n\t}];\n};\n\nexport default generatePathMethod;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "route-helpers-generator",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "description": "Create methods to easily generate paths and url",
   "main": "dist/index.js",
   "files": [
@@ -20,7 +20,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Prizrack13/route-helpers-generator.git"
+    "url": "git+https://github.com/Prizrack13/route-helpers-generator.git"
   },
   "homepage": "https://github.com//Prizrack13/route-helpers-generator",
   "keywords": [

package/src/generateMatch.js

@@ -1,12 +1,22 @@
 import qs from 'qs'
 import {pathToRegexp} from 'path-to-regexp'
-import Url from 'url'
 
+const parseURL = (url) => {
+	if (typeof(url) === 'object') return url;
+	if (!url.match(/^http/)) url = 'https://test.com' + url
+	const regex = /^(https?):\/\/([^:/]+)(:\d+)?(\/[^?#]*)?(\?[^#]*)?(#.*)?$/;
+	const match = url.match(regex);
+	if (match) {
+		const [, protocol, hostname, port, pathname, search, hash] = match;
+		return { protocol, hostname, port, pathname, search, hash };
+	}
+	return null
+};
 const generateMatch = (path) => {
 	let keys = [];
 	const regexp = pathToRegexp(path, keys);
 	return (url) => {
-		url = Url.parse(url);
+		url = parseURL(url);
 		const formatMatch = url.pathname.match(/\.([^.]+)$/);
 		const format = formatMatch && formatMatch[1];
 		const match = regexp.exec(url.pathname.replace(/\.[^.]+$/, ''));
@@ -19,7 +29,7 @@ const generateMatch = (path) => {
 			return memo;
 		}, {});
 		url.hash && (params.hash = url.hash.replace(/^#/, ''));
-		url.query && (params = {...params, ...qs.parse(url.query)});
+		url.search && (params = {...params, ...qs.parse(url.search.replace(/^\?/, ''))});
 		format && (params.format = format);
 		return params;
 	};

package/src/generatePathMethod.js

@@ -14,7 +14,7 @@ const generatePathMethod = (path) => {
 			(queryValues[key] = data[key]);
 		});
 		const path = pathFunc(data, options);
-		const query = qs.stringify(queryValues, { arrayFormat: 'brackets' });
+		const query = qs.stringify(queryValues, Object.assign({ arrayFormat: 'brackets' }, options || {}));
 		const hash = (data || {}).hash || '';
 		const format = (data || {}).format || '';
 		return `${path}${format && `.${format}`}${query && '?'}${query}${hash && '#'}${hash}`;