@sumaris-net/ngx-components 18.12.5 → 18.12.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/doc/changelog.md +3 -0
- package/esm2022/src/app/shared/file/url.utils.mjs +6 -5
- package/fesm2022/sumaris-net.ngx-components.mjs +5 -4
- package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
- package/package.json +1 -1
- package/src/app/shared/file/url.utils.d.ts +1 -1
- package/src/assets/manifest.json +1 -1
package/doc/changelog.md
CHANGED
|
@@ -1449,3 +1449,6 @@ enh: Environment: add useHash property to configure Angular router to use hash U
|
|
|
1449
1449
|
|
|
1450
1450
|
# 18.12.5
|
|
1451
1451
|
- enh(functions) Add function `UrlUtils.appendQueryParams()` to append q queryParams (as a map) to an url
|
|
1452
|
+
|
|
1453
|
+
# 18.12.6
|
|
1454
|
+
- enh(functions) Allow `UrlUtils.appendQueryParams()` to get url as `string | any[]`
|
|
@@ -113,15 +113,16 @@ export class UrlUtils {
|
|
|
113
113
|
* @param queryParams
|
|
114
114
|
*/
|
|
115
115
|
static appendQueryParams(url, queryParams) {
|
|
116
|
-
|
|
117
|
-
|
|
116
|
+
const urlStr = typeof url === 'string' ? url : this.addStartingSlash(url.join('/'));
|
|
117
|
+
if (isNilOrBlank(urlStr) || !queryParams)
|
|
118
|
+
return urlStr;
|
|
118
119
|
const queryString = Object.entries(queryParams)
|
|
119
120
|
.filter(([_, value]) => isNotNil(value))
|
|
120
121
|
.map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
|
|
121
122
|
.join('&');
|
|
122
123
|
if (isNilOrBlank(queryString))
|
|
123
|
-
return
|
|
124
|
-
return
|
|
124
|
+
return urlStr;
|
|
125
|
+
return urlStr + (urlStr.includes('?') ? '&' : '?') + queryString;
|
|
125
126
|
}
|
|
126
127
|
/**
|
|
127
128
|
* Extracts and returns the root URL from the given complete URL string.
|
|
@@ -191,4 +192,4 @@ export class UrlUtils {
|
|
|
191
192
|
return this.addTrailingSlash(basePath) + this.removeStartingSlash(relativePath);
|
|
192
193
|
}
|
|
193
194
|
}
|
|
194
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"url.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/file/url.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { isNilOrBlank, isNotNil } from '../functions';\n\nexport abstract class UrlUtils {\n  /**\n   * Determines if a given URL is a relative URL.\n   *\n   * @param {string | null} href - The URL to check.\n   * @return {boolean} True if the URL is relative, false otherwise.\n   */\n  static isRelativeUrl(href: string | null): boolean {\n    if (!href) return false;\n    return !href.startsWith('http:') && !href.startsWith('https:') && !href.startsWith('mailto:') && !href.startsWith('tel:');\n  }\n\n  /**\n   * Determines if a given URL is an internal URL.\n   *\n   * @param {string | null} href - The URL to be checked. Can be a string representing the URL or null.\n   * @return {boolean} Returns true if the URL is internal, otherwise false.\n   */\n  static isInternalUrl(href: string | null): boolean {\n    if (!href) return false;\n    return href.startsWith(window.location.origin) || this.isRelativeUrl(href);\n  }\n\n  static isExternalUrl(href: string | null): boolean {\n    if (!href) return false;\n    return !this.isInternalUrl(href);\n  }\n\n  /**\n   * Removes the query string from the given URL, returning only the base URL.\n   *\n   * @param {string} url - The URL from which the query string will be stripped.\n   * @return {string} The URL without the query string.\n   */\n  static stripQuery(url: string): string {\n    return /[^?]*/.exec(url)[0];\n  }\n\n  /**\n   * Removes the fragment and query components from a given URL string.\n   *\n   * @param {string} url - The URL string to process.\n   * @return {string} The URL without its fragment and query components.\n   */\n  static stripFragmentAndQuery(url: string): string {\n    if (!url) return url;\n    return this.stripQuery(/[^#]*/.exec(url)[0]);\n  }\n\n  /**\n   * Extracts the fragment identifier from the given URL.\n   *\n   * @param {string} url - The URL from which to extract the fragment.\n   * @return {string} The fragment identifier of the URL, excluding the '#' symbol.\n   */\n  static getFragment(url: string): string {\n    if (isNilOrBlank(url)) return '';\n\n    const match = url.match(/#(.*)$/);\n    return match ? match[1] : '';\n  }\n\n  static resolveRelativeUrl(baseUrl: string, relativePath: string, opts?: { absoluteByDefault: boolean }): string {\n    if (!baseUrl) throw new Error(\"Missing 'baseUrl' argument\");\n    if (!relativePath) throw new Error(\"Missing 'relativePath' argument\");\n    if (!this.isRelativeUrl(relativePath)) throw new Error('Should be a relative path');\n\n    // Detect absolute URL\n    if (relativePath.startsWith('/') || (opts?.absoluteByDefault && !relativePath.startsWith('.'))) {\n      baseUrl = this.getRootUrl(baseUrl);\n    }\n\n    return UrlUtils.normalizeUrl(UrlUtils.concat(baseUrl, relativePath));\n  }\n\n  /**\n   * Resolves a given URL by normalizing its parts, removing unnecessary path segments like \".\" and \"..\".\n   *\n   * @param {string} url - The URL to be resolved. Must be a non-empty string.\n   * @return {string} The resolved and cleaned URL string.\n   * @throws {Error} If the provided URL is missing or undefined.\n   */\n  static normalizeUrl(url: string): string {\n    if (!url) throw new Error(\"Missing 'url' argument\");\n    return this.cleanUrl(url)\n      .split('/')\n      .reduce((res, part) => {\n        if (part === '.') return res;\n        if (part === '..' && res.length > 0) return res.slice(0, -1);\n        return res.concat(part);\n      }, [])\n      .join('/');\n  }\n\n  /**\n   * This function completes a base URL with an object containing key-value pairs\n   * representing the query parameters to add. It properly encodes the\n   * parameters and ensures they are added with the appropriate separator ('?' or '&').\n   * Parameters with null or undefined values are automatically filtered out.\n   *\n   * @example\n   * // In a template\n   * <a [href]=\"'https://example.com' | appendQueryParams:{id: 123, name: 'test'}\">Link</a>\n   * // Result: https://example.com?id=123&name=test\n   *\n   * @example\n   * // If the URL already contains parameters\n   * <a [href]=\"'https://example.com?page=1' | appendQueryParams:{sort: 'asc'}\">Link</a>\n   * // Result: https://example.com?page=1&sort=asc\n   *\n   * @param url\n   * @param queryParams\n   */\n  static appendQueryParams(url: string, queryParams: { [key: string]: any }): string {\n    if (isNilOrBlank(url) || !queryParams) return url;\n    const queryString = Object.entries(queryParams)\n      .filter(([_, value]) => isNotNil(value))\n      .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)\n      .join('&');\n    if (isNilOrBlank(queryString)) return url;\n    return url + (url.includes('?') ? '&' : '?') + queryString;\n  }\n\n  /**\n   * Extracts and returns the root URL from the given complete URL string.\n   *\n   * @param {string} url - The complete URL string from which the root URL will be extracted.\n   * @return {string} The root URL including the protocol and host (and port if present).\n   * @throws {Error} Throws an error if the provided URL is missing or is in an invalid format.\n   */\n  static getRootUrl(url: string): string {\n    if (!url) throw new Error(\"Missing 'url' argument\");\n    let [protocol, path] = url.split('//', 2);\n    if (!protocol || isNilOrBlank(path)) throw new Error(`Invalid URL format: ${url}`);\n    const hostAndPort = path.split('/', 2)[0];\n    return `${protocol}//${hostAndPort}`;\n  }\n\n  /**\n   * Retrieves the parent URL or directory path from the provided URL.\n   * This method handles both relative and absolute URLs.\n   *\n   * @param {string} url - The URL from which to derive the parent path.\n   *                       Must be a valid URL or relative path.\n   * @return {string} The parent URL or directory path. Throws an error if the input is invalid.\n   */\n  static getParent(url: string): string {\n    if (!url) throw new Error(\"Missing 'url' argument\");\n    const cleanUrl = this.stripFragmentAndQuery(url);\n    if (cleanUrl.endsWith('/')) return cleanUrl; // Skip if already a parent directory\n    const parentPath = cleanUrl + '/' + '..';\n    if (this.isRelativeUrl(url)) {\n      return this.resolveRelativeUrl(window.location.href, parentPath);\n    }\n    return this.normalizeUrl(parentPath);\n  }\n\n  /**\n   * Cleans the provided URL by encoding it safely and replacing specific patterns.\n   *\n   * @param {string} href - The URL string to be cleaned.\n   * @return {string|null} The cleaned and encoded URL string, or null if an error occurs.\n   */\n  static cleanUrl(href: string): string {\n    try {\n      href = encodeURI(href).replace(/%25/g, '%');\n    } catch (e) {\n      return null;\n    }\n    return href;\n  }\n\n  static addTrailingSlash(url: string): string {\n    return url.endsWith('/') ? url : url + '/';\n  }\n\n  static addStartingSlash(url: string): string {\n    return url.startsWith('/') ? url : '/' + url;\n  }\n\n  static removeStartingSlash(url: string): string {\n    return url.startsWith('/') ? url.substring(1) : url;\n  }\n\n  static concat(basePath: string, relativePath: string): string {\n    if (!basePath) return relativePath;\n    if (!relativePath) return basePath;\n    return this.addTrailingSlash(basePath) + this.removeStartingSlash(relativePath);\n  }\n}\n"]}
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"url.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/file/url.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { isNilOrBlank, isNotNil } from '../functions';\n\nexport abstract class UrlUtils {\n  /**\n   * Determines if a given URL is a relative URL.\n   *\n   * @param {string | null} href - The URL to check.\n   * @return {boolean} True if the URL is relative, false otherwise.\n   */\n  static isRelativeUrl(href: string | null): boolean {\n    if (!href) return false;\n    return !href.startsWith('http:') && !href.startsWith('https:') && !href.startsWith('mailto:') && !href.startsWith('tel:');\n  }\n\n  /**\n   * Determines if a given URL is an internal URL.\n   *\n   * @param {string | null} href - The URL to be checked. Can be a string representing the URL or null.\n   * @return {boolean} Returns true if the URL is internal, otherwise false.\n   */\n  static isInternalUrl(href: string | null): boolean {\n    if (!href) return false;\n    return href.startsWith(window.location.origin) || this.isRelativeUrl(href);\n  }\n\n  static isExternalUrl(href: string | null): boolean {\n    if (!href) return false;\n    return !this.isInternalUrl(href);\n  }\n\n  /**\n   * Removes the query string from the given URL, returning only the base URL.\n   *\n   * @param {string} url - The URL from which the query string will be stripped.\n   * @return {string} The URL without the query string.\n   */\n  static stripQuery(url: string): string {\n    return /[^?]*/.exec(url)[0];\n  }\n\n  /**\n   * Removes the fragment and query components from a given URL string.\n   *\n   * @param {string} url - The URL string to process.\n   * @return {string} The URL without its fragment and query components.\n   */\n  static stripFragmentAndQuery(url: string): string {\n    if (!url) return url;\n    return this.stripQuery(/[^#]*/.exec(url)[0]);\n  }\n\n  /**\n   * Extracts the fragment identifier from the given URL.\n   *\n   * @param {string} url - The URL from which to extract the fragment.\n   * @return {string} The fragment identifier of the URL, excluding the '#' symbol.\n   */\n  static getFragment(url: string): string {\n    if (isNilOrBlank(url)) return '';\n\n    const match = url.match(/#(.*)$/);\n    return match ? match[1] : '';\n  }\n\n  static resolveRelativeUrl(baseUrl: string, relativePath: string, opts?: { absoluteByDefault: boolean }): string {\n    if (!baseUrl) throw new Error(\"Missing 'baseUrl' argument\");\n    if (!relativePath) throw new Error(\"Missing 'relativePath' argument\");\n    if (!this.isRelativeUrl(relativePath)) throw new Error('Should be a relative path');\n\n    // Detect absolute URL\n    if (relativePath.startsWith('/') || (opts?.absoluteByDefault && !relativePath.startsWith('.'))) {\n      baseUrl = this.getRootUrl(baseUrl);\n    }\n\n    return UrlUtils.normalizeUrl(UrlUtils.concat(baseUrl, relativePath));\n  }\n\n  /**\n   * Resolves a given URL by normalizing its parts, removing unnecessary path segments like \".\" and \"..\".\n   *\n   * @param {string} url - The URL to be resolved. Must be a non-empty string.\n   * @return {string} The resolved and cleaned URL string.\n   * @throws {Error} If the provided URL is missing or undefined.\n   */\n  static normalizeUrl(url: string): string {\n    if (!url) throw new Error(\"Missing 'url' argument\");\n    return this.cleanUrl(url)\n      .split('/')\n      .reduce((res, part) => {\n        if (part === '.') return res;\n        if (part === '..' && res.length > 0) return res.slice(0, -1);\n        return res.concat(part);\n      }, [])\n      .join('/');\n  }\n\n  /**\n   * This function completes a base URL with an object containing key-value pairs\n   * representing the query parameters to add. It properly encodes the\n   * parameters and ensures they are added with the appropriate separator ('?' or '&').\n   * Parameters with null or undefined values are automatically filtered out.\n   *\n   * @example\n   * // In a template\n   * <a [href]=\"'https://example.com' | appendQueryParams:{id: 123, name: 'test'}\">Link</a>\n   * // Result: https://example.com?id=123&name=test\n   *\n   * @example\n   * // If the URL already contains parameters\n   * <a [href]=\"'https://example.com?page=1' | appendQueryParams:{sort: 'asc'}\">Link</a>\n   * // Result: https://example.com?page=1&sort=asc\n   *\n   * @param url\n   * @param queryParams\n   */\n  static appendQueryParams(url: string | any[], queryParams: { [key: string]: any }): string {\n    const urlStr = typeof url === 'string' ? url : this.addStartingSlash(url.join('/'));\n    if (isNilOrBlank(urlStr) || !queryParams) return urlStr;\n    const queryString = Object.entries(queryParams)\n      .filter(([_, value]) => isNotNil(value))\n      .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)\n      .join('&');\n    if (isNilOrBlank(queryString)) return urlStr;\n    return urlStr + (urlStr.includes('?') ? '&' : '?') + queryString;\n  }\n\n  /**\n   * Extracts and returns the root URL from the given complete URL string.\n   *\n   * @param {string} url - The complete URL string from which the root URL will be extracted.\n   * @return {string} The root URL including the protocol and host (and port if present).\n   * @throws {Error} Throws an error if the provided URL is missing or is in an invalid format.\n   */\n  static getRootUrl(url: string): string {\n    if (!url) throw new Error(\"Missing 'url' argument\");\n    let [protocol, path] = url.split('//', 2);\n    if (!protocol || isNilOrBlank(path)) throw new Error(`Invalid URL format: ${url}`);\n    const hostAndPort = path.split('/', 2)[0];\n    return `${protocol}//${hostAndPort}`;\n  }\n\n  /**\n   * Retrieves the parent URL or directory path from the provided URL.\n   * This method handles both relative and absolute URLs.\n   *\n   * @param {string} url - The URL from which to derive the parent path.\n   *                       Must be a valid URL or relative path.\n   * @return {string} The parent URL or directory path. Throws an error if the input is invalid.\n   */\n  static getParent(url: string): string {\n    if (!url) throw new Error(\"Missing 'url' argument\");\n    const cleanUrl = this.stripFragmentAndQuery(url);\n    if (cleanUrl.endsWith('/')) return cleanUrl; // Skip if already a parent directory\n    const parentPath = cleanUrl + '/' + '..';\n    if (this.isRelativeUrl(url)) {\n      return this.resolveRelativeUrl(window.location.href, parentPath);\n    }\n    return this.normalizeUrl(parentPath);\n  }\n\n  /**\n   * Cleans the provided URL by encoding it safely and replacing specific patterns.\n   *\n   * @param {string} href - The URL string to be cleaned.\n   * @return {string|null} The cleaned and encoded URL string, or null if an error occurs.\n   */\n  static cleanUrl(href: string): string {\n    try {\n      href = encodeURI(href).replace(/%25/g, '%');\n    } catch (e) {\n      return null;\n    }\n    return href;\n  }\n\n  static addTrailingSlash(url: string): string {\n    return url.endsWith('/') ? url : url + '/';\n  }\n\n  static addStartingSlash(url: string): string {\n    return url.startsWith('/') ? url : '/' + url;\n  }\n\n  static removeStartingSlash(url: string): string {\n    return url.startsWith('/') ? url.substring(1) : url;\n  }\n\n  static concat(basePath: string, relativePath: string): string {\n    if (!basePath) return relativePath;\n    if (!relativePath) return basePath;\n    return this.addTrailingSlash(basePath) + this.removeStartingSlash(relativePath);\n  }\n}\n"]}
|
|
@@ -5682,15 +5682,16 @@ class UrlUtils {
|
|
|
5682
5682
|
* @param queryParams
|
|
5683
5683
|
*/
|
|
5684
5684
|
static appendQueryParams(url, queryParams) {
|
|
5685
|
-
|
|
5686
|
-
|
|
5685
|
+
const urlStr = typeof url === 'string' ? url : this.addStartingSlash(url.join('/'));
|
|
5686
|
+
if (isNilOrBlank(urlStr) || !queryParams)
|
|
5687
|
+
return urlStr;
|
|
5687
5688
|
const queryString = Object.entries(queryParams)
|
|
5688
5689
|
.filter(([_, value]) => isNotNil(value))
|
|
5689
5690
|
.map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
|
|
5690
5691
|
.join('&');
|
|
5691
5692
|
if (isNilOrBlank(queryString))
|
|
5692
|
-
return
|
|
5693
|
-
return
|
|
5693
|
+
return urlStr;
|
|
5694
|
+
return urlStr + (urlStr.includes('?') ? '&' : '?') + queryString;
|
|
5694
5695
|
}
|
|
5695
5696
|
/**
|
|
5696
5697
|
* Extracts and returns the root URL from the given complete URL string.
|