Changed term 'domain' to 'origin' for a more precise definition.

tomasfn87 · tomasfn87 · commit 35059f34ac93 · 2025-06-11T21:15:40.000-03:00
diff --git a/README.md b/README.md
@@ -17,11 +17,11 @@
 ### Description
 
 - [Parses](https://github.com/tomasfn87/url-parser/blob/main/index.html#L42) a URL in 4 parts:
-  - `Domain`;
+  - `Origin`;
   - `Path`;
   - `Parameters`;
   - `Fragment`.
-- **Domain** tries to [obtain](https://github.com/tomasfn87/url-parser/blob/main/index.html#L218) the site's icon (`favicon`) using a Google API;
+- **Origin** tries to [obtain](https://github.com/tomasfn87/url-parser/blob/main/index.html#L218) the site's icon (`favicon`) using a Google API;
 - **Parameters** and **Fragment** are [parsed](https://github.com/tomasfn87/url-parser/blob/main/index.html#L25) into `key` and (optional) `value`;
 - **Decode**: press the [`Decode`](https://github.com/tomasfn87/url-parser/blob/main/index.html#L161) button to solve encoded characters and actually read the URL's content.
 
diff --git a/README.pt-br.md b/README.pt-br.md
@@ -17,11 +17,11 @@
 ### Descrição
 
 - [Divide](https://github.com/tomasfn87/url-parser/blob/main/index.html#L42) a URL em 4 partes:
-  - `Domínio`;
+  - `Origem`;
   - `Caminho`;
   - `Parâmetros`;
   - `Fragmento`.
-- **Domínio** tenta [obter](https://github.com/tomasfn87/url-parser/blob/main/index.html#L218) o ícone do site (`favicon`) usando uma API do Google;
+- **Origem** tenta [obter](https://github.com/tomasfn87/url-parser/blob/main/index.html#L218) o ícone do site (`favicon`) usando uma API do Google;
 - **Parâmetros** e **Fragmento** são [divididos](https://github.com/tomasfn87/url-parser/blob/main/index.html#L25) em `chave` e `valor` (opcional);
 - **Decodificar**: aperte o botão [`Decodificar`](https://github.com/tomasfn87/url-parser/blob/main/index.html#L161) para resolver caracteres codificados e de fato ler o conteúdo da URL.
 
diff --git a/c++/inc/url_parser/url_parser.h b/c++/inc/url_parser/url_parser.h
@@ -17,7 +17,7 @@ struct KeyOptionalValueData {
 };
 
 struct ParsedUrl {
-    std::string domain;
+    std::string origin;
     std::string path;
     KeyOptionalValueData parameter;
     KeyOptionalValueData fragment;
@@ -55,7 +55,7 @@ class Url {
     const std::string color_4 = "\x1b[34m";
     const std::string color_4_1 = "\x1b[94m";
     const std::string color_str(std::string str, std::string color);
-    const std::vector<char> domain_chars = {':', '/', '.'};
+    const std::vector<char> origin_chars = {':', '/', '.'};
     const std::vector<char> path_chars = {'/'};
     const std::vector<char> key_value_delimiters = {'='};
     const std::vector<char> key_optional_value_chars = {'?', '#', '&', '/'};
diff --git a/c++/src/url_parser/url_parser.cc b/c++/src/url_parser/url_parser.cc
@@ -53,7 +53,7 @@ bool Url::is_valid() {
 void Url::parse_url() {
     std::smatch parts;
     if (std::regex_match(url, parts, url_parts)) {
-        parsed_url.domain = parts[1].str();
+        parsed_url.origin = parts[1].str();
         if (parts[2].str().size())
             parsed_url.path = parts[2].str();
         else
@@ -134,7 +134,7 @@ const std::string Url::color_chars(
 }
 
 const void Url::print_colored_url(bool decode) {
-    std::string d = parsed_url.domain;
+    std::string d = parsed_url.origin;
     std::string p = parsed_url.path;
     std::string q = parsed_url.parameter.base_string;
     std::string f = parsed_url.fragment.base_string;
@@ -145,7 +145,7 @@ const void Url::print_colored_url(bool decode) {
         f = decode_uri_component(f);
     }
     std::cout
-        << color_chars(domain_chars, d, "", color_1_1, "")
+        << color_chars(origin_chars, d, "", color_1_1, "")
         << color_chars(path_chars, p, "", color_2_1, "")
         << color_chars(
             key_optional_value_chars, q, "", color_3_1, color_dim)
@@ -207,7 +207,7 @@ const void Url::print_key_optional_value_list(
 }
 
 const void Url::print_parsed_url(bool decode) {
-    std::string d = parsed_url.domain;
+    std::string d = parsed_url.origin;
     std::string p = parsed_url.path;
     std::string q = parsed_url.parameter.base_string;
     std::string f = parsed_url.fragment.base_string;
@@ -218,8 +218,8 @@ const void Url::print_parsed_url(bool decode) {
         f = decode_uri_component(f);
     }
     std::cout << color_str("→", color_dim) << " "
-        << color_str("Domain", color_1) << color_str(":", color_dim)
-        << "    " << color_chars(domain_chars, d, color_1_1, "", "") << "\n"
+        << color_str("Origin", color_1) << color_str(":", color_dim)
+        << "    " << color_chars(origin_chars, d, color_1_1, "", "") << "\n"
         << color_str("→", color_dim) << " " << color_str("Path", color_2)
         << color_str(":", color_dim) << "      "
         << color_chars(path_chars, p, color_2_1, "", "") << "\n";
diff --git a/index.html b/index.html
@@ -45,7 +45,7 @@
             if (!match) {
                 return undefined;
             }
-            const domain = match[1] || '';
+            const origin = match[1] || '';
             const path = match[2] || '/';
             const queryString = match[3] || '';
             const hashString = match[4] || '';
@@ -55,13 +55,13 @@
             hashString.length > 1 && parseKeyOptionalValue(hashString, fragment, regexp.Fragment);
             return {
                 parts: {
-                    domain: domain,
+                    origin: origin,
                     path: path,
                     parameters: parameters,
                     fragment: fragment
                 },
                 fullUrl: function () {
-                    return domain + path + queryString + hashString;
+                    return origin + path + queryString + hashString;
                 }
             };
         };
@@ -202,7 +202,7 @@ <h2>Analysis Result:</h2>
     
                 let isOdd = true;
     
-                const addTableRow = (label, value, isOdd, isSubtable = false, isDomainRow = false, domain = '') => {
+                const addTableRow = (label, value, isOdd, isSubtable = false, isOriginRow = false, origin = '') => {
                     const row = parsedResultTableBody.insertRow();
                     const bgColor = isOdd ? (isSubtable ? '#2a2a2a' : '#222') : (isSubtable ? '#333' : '#282828');
                     row.style.backgroundColor = bgColor;
@@ -214,35 +214,35 @@ <h2>Analysis Result:</h2>
                     labelCell.style.paddingRight = '15px';
                     valueCell.style.color = '#ccc';
                     valueCell.style.backgroundColor = isOdd ? (isSubtable ? '' : '#333') : (isSubtable ? '' : '#3a3a3a');
-                    if (isDomainRow && domain) {
-                        const faviconUrl = `https://t2.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${`https://${domain.replace(/^\s*\w+:\/\//, '')}`}&size=18`;
+                    if (isOriginRow && origin) {
+                        const faviconUrl = `https://t2.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${`https://${origin.replace(/^\s*\w+:\/\//, '')}`}&size=18`;
                         const faviconImg = document.createElement('img');
                         faviconImg.src = faviconUrl;
                         faviconImg.width = 18;
                         faviconImg.height = 18;
                         faviconImg.style.marginRight = '8px';
                         faviconImg.style.verticalAlign = 'middle';
     
-                        const domainLink = document.createElement('a');
-                        domainLink.href = `https://${domain.replace(/^\s*\w+:\/\//, '')}`;
-                        domainLink.className = 'url-link';
-                        domainLink.textContent = domain;
+                        const originLink = document.createElement('a');
+                        originLink.href = `https://${origin.replace(/^\s*\w+:\/\//, '')}`;
+                        originLink.className = 'url-link';
+                        originLink.textContent = origin;
                         
                         valueCell.innerHTML = '';
                         
                         faviconImg.onload = function() {
                             valueCell.appendChild(faviconImg);
-                            valueCell.appendChild(domainLink);
+                            valueCell.appendChild(originLink);
                         };
                         faviconImg.onerror = function() {
-                            valueCell.appendChild(domainLink);
+                            valueCell.appendChild(originLink);
                         };
                     }
                 };
-                let domain = r.parts.domain;
+                let origin = r.parts.origin;
                 let fullUrl = r.fullUrl();
                 let path = r.parts.path;
-                addTableRow("Domain", domain, isOdd, false, true, domain);
+                addTableRow("Origin", origin, isOdd, false, true, origin);
                 isOdd = !isOdd;
                 addTableRow("Path", path, isOdd);
                 isOdd = !isOdd;
@@ -305,7 +305,7 @@ <h2>Analysis Result:</h2>
                 addTableRow("Full URL", `<a href="${`https://${fullUrl.replace(/^\s*\w+:\/\//, '')}`}" class="url-link">${decode?decodeURIComponent(fullUrl):fullUrl}</a>`, isOdd);
 
                 let link = 'https://'
-                    + parsed_self_url.parts.domain.replace(/^\w+:\/\//, '')
+                    + parsed_self_url.parts.origin.replace(/^\w+:\/\//, '')
                     + parsed_self_url.parts.path
 
                 // YouTube Playlist
@@ -483,7 +483,7 @@ <h2>Analysis Result:</h2>
                         );
                         spotifyPlayer.contentWindow.postMessage({
                             type: 'listeningOn',
-                            domain: window.location.hostname,
+                            origin: window.location.hostname,
                             gtmId: 'MXNVD4PJ'
                         }, 'https://open.spotify.com');
                     }, 250);
diff --git a/js/main.js b/js/main.js
@@ -12,7 +12,7 @@ const main = () => {
     }
     let decode = false;
     const r = new Url({ url: input });
-    if (!r.parsedUrl.parts.domain) {
+    if (!r.parsedUrl.parts.origin) {
         console.log("Invalid URL.");
         return;
     }
@@ -46,9 +46,9 @@ const main = () => {
         return;
     }
     const {title, subtitle, content} = loadConfigFile("config.json");
-    color.log(title, "Domain");
+    color.log(title, "Origin");
     process.stdout.write(":\n- ");
-    color.log(content, `${r.getDomain()}\n`);
+    color.log(content, `${r.getOrigin()}\n`);
     if (r.parsedUrl.parts.path) {
         color.log(title, "Path");
         process.stdout.write(":\n- ");
diff --git a/js/src/url-parser.js b/js/src/url-parser.js
@@ -3,7 +3,7 @@ export default class Url {
         this.url = data.url;
         this.parsedUrl = {
             parts: {
-                domain: '',
+                origin: '',
                 path: '',
                 parameters: { str: '', list: [], obj: {} },
                 fragment: { str: '', list: [], obj: {} }
@@ -26,7 +26,7 @@ export default class Url {
     parseUrl() {
         if (this.RegExp().UrlParts.test(this.url)) {
             const groups = this.RegExp().UrlParts.exec(this.url);
-            this.parsedUrl.parts.domain = groups[1];
+            this.parsedUrl.parts.origin = groups[1];
             this.parsedUrl.parts.path = groups[2] || '/';
             this.parsedUrl.parts.parameters.str = groups[3] || '';
             this.parseKeyOptionalValue(
@@ -54,8 +54,8 @@ export default class Url {
             }
     }
 
-    getDomain() {
-        return this.parsedUrl.parts.domain
+    getOrigin() {
+        return this.parsedUrl.parts.origin
     }
 
     getPath() {
@@ -71,7 +71,7 @@ export default class Url {
     }
 
     getFullUrl() {
-        return this.getDomain() + this.getPath() + this.getParameters()
+        return this.getOrigin() + this.getPath() + this.getParameters()
         + this.getFragment()
     }
     
diff --git a/js/test/url-parser.test.js b/js/test/url-parser.test.js
@@ -2,8 +2,8 @@ import { ClassMethodTest, ClassMethodTester }
     from '../util/test-class-method.js';
 import Url from '../src/url-parser.js';
 
-const getDomainTest = new ClassMethodTest(Url, "getDomain", [], "Url.getDomain");
-getDomainTest.addTestCases([
+const getOriginTest = new ClassMethodTest(Url, "getOrigin", [], "Url.getOrigin");
+getOriginTest.addTestCases([
     {
         input: { url: "https://tagassistant.google.com/?hl=en&utm_source=gtm#/?source=TAG_MANAGER&id=GTM-MXNVD4PJ&gtm_auth=H0X5tN2DEEpfJ0eha8q7Ig&gtm_preview=env-5&cb=5607611040920180" },
         keys: [ "url" ],
@@ -173,7 +173,7 @@ getFullUrlTest.addTestCases([
 ]);
 
 const tester = new ClassMethodTester();
-tester.addTestSet(getDomainTest);
+tester.addTestSet(getOriginTest);
 tester.addTestSet(getPathTest);
 tester.addTestSet(getParametersTest);
 tester.addTestSet(getFragmentTest);
