feat(Smarturl): Enhanced documentation and added method for property setting and chaining in Smarturl

This commit is contained in:
Philipp Kunz 2024-10-03 12:55:37 +02:00
parent ae9e12ba86
commit fac8e52a11
3 changed files with 55 additions and 17 deletions

View File

@ -1,5 +1,11 @@
# Changelog # Changelog
## 2024-10-03 - 3.1.0 - feat(Smarturl)
Enhanced documentation and added method for property setting and chaining in Smarturl
- Added detailed comments to methods and interfaces for better code understanding.
- Introduced a method to set properties in a chainable manner.
## 2024-10-03 - 3.0.8 - fix(core) ## 2024-10-03 - 3.0.8 - fix(core)
Fix code formatting and indentation issues in smarturl.classes.smarturl.ts Fix code formatting and indentation issues in smarturl.classes.smarturl.ts

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@push.rocks/smarturl', name: '@push.rocks/smarturl',
version: '3.0.8', version: '3.1.0',
description: 'A library for parsing URLs in a detailed and flexible way.' description: 'A library for parsing URLs in a detailed and flexible way.'
} }

View File

@ -1,5 +1,7 @@
// Import necessary plugins (if any are used in the module)
import * as plugins from './smarturl.plugins.js'; import * as plugins from './smarturl.plugins.js';
// Interface representing the structure of a URL object
export interface IUrlObject { export interface IUrlObject {
href: string; href: string;
origin: string; origin: string;
@ -16,31 +18,37 @@ export interface IUrlObject {
hash: string; hash: string;
} }
// Interface representing the search parameters as a key-value pair object
export interface ISearchParams { export interface ISearchParams {
[key: string]: string; [key: string]: string;
} }
// Main Smarturl class implementing the IUrlObject interface
export class Smarturl implements IUrlObject { export class Smarturl implements IUrlObject {
// Static method to create a Smarturl instance from a URL string
public static createFromUrl( public static createFromUrl(
urlArg: string, urlArg: string,
optionsArg?: { optionsArg?: {
searchParams?: ISearchParams; searchParams?: ISearchParams;
} }
): Smarturl { ): Smarturl {
// Parse the URL string using the built-in URL class
const parsedUrlInstance = new URL(urlArg); const parsedUrlInstance = new URL(urlArg);
const searchParams: ISearchParams = {}; const searchParams: ISearchParams = {};
// enrichment // Array to hold key-value pairs of search parameters
const searchParamPairs: { const searchParamPairs: {
key: string; key: string;
value: string; value: string;
}[] = []; }[] = [];
// If the URL has search parameters, parse them into key-value pairs
if (parsedUrlInstance.search) { if (parsedUrlInstance.search) {
parsedUrlInstance.search parsedUrlInstance.search
.replace('?', '') .replace('?', '') // Remove the '?' at the beginning
.split('&') .split('&') // Split the query string into individual parameters
.map((searchParamPair) => { .map((searchParamPair) => {
// Split each parameter into key and value and add to the array
searchParamPairs.push({ searchParamPairs.push({
key: searchParamPair.split('=')[0], key: searchParamPair.split('=')[0],
value: searchParamPair.split('=')[1], value: searchParamPair.split('=')[1],
@ -48,15 +56,19 @@ export class Smarturl implements IUrlObject {
}); });
} }
// Convert the array of key-value pairs into an object
for (const searchParamPair of searchParamPairs) { for (const searchParamPair of searchParamPairs) {
searchParams[searchParamPair.key] = searchParamPair.value; searchParams[searchParamPair.key] = searchParamPair.value;
} }
// Merge any additional search parameters provided in optionsArg
if (optionsArg?.searchParams) { if (optionsArg?.searchParams) {
for (const key of Object.keys(optionsArg.searchParams)) { for (const key of Object.keys(optionsArg.searchParams)) {
searchParams[key] = optionsArg.searchParams[key]; searchParams[key] = optionsArg.searchParams[key];
} }
} }
// Reconstruct the path with updated search parameters
let path = parsedUrlInstance.pathname || ''; let path = parsedUrlInstance.pathname || '';
if (Object.keys(searchParams).length > 0) { if (Object.keys(searchParams).length > 0) {
path += '?'; path += '?';
@ -71,8 +83,9 @@ export class Smarturl implements IUrlObject {
} }
} }
// Create an IUrlObject containing all parts of the URL
const parsedUrl: IUrlObject = { const parsedUrl: IUrlObject = {
...parsedUrlInstance, ...parsedUrlInstance, // Spread operator to include all properties from parsedUrlInstance
href: parsedUrlInstance.href, href: parsedUrlInstance.href,
origin: parsedUrlInstance.origin, origin: parsedUrlInstance.origin,
protocol: parsedUrlInstance.protocol, protocol: parsedUrlInstance.protocol,
@ -81,33 +94,35 @@ export class Smarturl implements IUrlObject {
host: parsedUrlInstance.host, host: parsedUrlInstance.host,
hostname: parsedUrlInstance.hostname, hostname: parsedUrlInstance.hostname,
port: parsedUrlInstance.port, port: parsedUrlInstance.port,
path, path, // Updated path with new search parameters
pathname: parsedUrlInstance.pathname, pathname: parsedUrlInstance.pathname,
search: parsedUrlInstance.search, search: parsedUrlInstance.search,
searchParams, searchParams, // The searchParams object we constructed
hash: parsedUrlInstance.hash, hash: parsedUrlInstance.hash,
}; };
// Infer default ports if none are specified based on the protocol
if (!parsedUrl.port && parsedUrl.protocol === 'https:') { if (!parsedUrl.port && parsedUrl.protocol === 'https:') {
// console.log(`inferring port 443 for "https:"`);
parsedUrl.port = '443'; parsedUrl.port = '443';
} }
if (!parsedUrl.port && parsedUrl.protocol === 'http:') { if (!parsedUrl.port && parsedUrl.protocol === 'http:') {
// console.log(`inferring port 80 for "http:"`);
parsedUrl.port = '80'; parsedUrl.port = '80';
} }
// Create a new Smarturl instance and assign the parsed URL properties
const returnSmarturl = new Smarturl(); const returnSmarturl = new Smarturl();
Object.assign(returnSmarturl, parsedUrl); Object.assign(returnSmarturl, parsedUrl); // Copy all properties from parsedUrl to returnSmarturl
return returnSmarturl; return returnSmarturl;
} }
public static createFromParsedUrl(parsedUrlArg: IUrlObject) { // Static method to create a Smarturl instance from an existing IUrlObject
public static createFromParsedUrl(parsedUrlArg: IUrlObject): Smarturl {
const returnSmarturl = new Smarturl(); const returnSmarturl = new Smarturl();
Object.assign(returnSmarturl, parsedUrlArg); Object.assign(returnSmarturl, parsedUrlArg); // Copy all properties from parsedUrlArg to returnSmarturl
return returnSmarturl; return returnSmarturl;
} }
// INSTANCE // INSTANCE PROPERTIES (matching IUrlObject interface)
href: string; href: string;
origin: string; origin: string;
protocol: string; protocol: string;
@ -122,19 +137,35 @@ export class Smarturl implements IUrlObject {
searchParams: ISearchParams; searchParams: ISearchParams;
hash: string; hash: string;
// Constructor initializes searchParams as an empty object
constructor() { constructor() {
this.searchParams = {}; this.searchParams = {};
} }
// Method to create an independent clone of the current Smarturl instance
clone(): Smarturl { clone(): Smarturl {
const clonedInstance = new Smarturl(); const clonedInstance = new Smarturl();
Object.assign(clonedInstance, this); Object.assign(clonedInstance, this); // Copy all properties to the new instance
clonedInstance.searchParams = { ...this.searchParams }; clonedInstance.searchParams = { ...this.searchParams }; // Shallow copy of searchParams to prevent shared references
return clonedInstance; return clonedInstance;
} }
toString() { /**
let userpart = ``; * Typed method to set a property and return the instance for chaining.
* @param prop - The property name to set (must be a key of Smarturl)
* @param value - The value to assign to the property
* @returns The Smarturl instance for method chaining
*/
set<K extends keyof this>(prop: K, value: this[K]): this {
this[prop] = value; // Set the property to the new value
return this; // Return the instance for chaining
}
// Method to convert the Smarturl instance back into a URL string
toString(): string {
let userpart = ``; // Initialize the user part of the URL (username and password)
// Construct the user part based on the presence of username and password
if (this.username && !this.password) { if (this.username && !this.password) {
userpart = `${this.username}@`; userpart = `${this.username}@`;
} }
@ -142,6 +173,7 @@ export class Smarturl implements IUrlObject {
userpart = `${this.username}:${this.password}@`; userpart = `${this.username}:${this.password}@`;
} }
// Construct and return the full URL string
return `${this.protocol}//${userpart}${this.hostname}:${this.port}${this.path}`; return `${this.protocol}//${userpart}${this.hostname}:${this.port}${this.path}`;
} }
} }