@jsenv/urls 1.2.6 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/urls",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,8 +8,7 @@
     "directory": "packages/urls"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "access": "public"
   },
   "author": {
     "name": "dmail",
@@ -30,4 +29,4 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {}
-}
+}

package/src/inline_content_url_generator.js

@@ -8,10 +8,7 @@ export const generateInlineContentUrl = ({
   lineEnd,
   columnEnd,
 }) => {
-  const generatedName =
-    line === lineEnd
-      ? `L${line}C${column}-L${lineEnd}C${columnEnd}`
-      : `L${line}-L${lineEnd}`
+  const generatedName = `L${line}C${column}-L${lineEnd}C${columnEnd}`
   const filenameRaw = urlToFilename(url)
   const filename = `${filenameRaw}@${generatedName}${extension}`
   // ideally we should keep query params from url

package/src/main.js

@@ -3,7 +3,6 @@ export { generateInlineContentUrl } from "./inline_content_url_generator.js"
 export {
   stringifyUrlTrace,
   stringifyUrlSite,
-  humanizeUrl,
   showSourceLocation,
 } from "./url_trace.js"
 export {
@@ -38,5 +37,5 @@ export { urlToOrigin } from "./url_to_origin.js"
 export { urlToParentUrl } from "./url_to_parent_url.js"
 export { urlToPathname } from "./url_to_pathname.js"
 export { urlToRelativeUrl } from "./url_to_relative_url.js"
-export { urlToRessource } from "./url_to_ressource.js"
+export { urlToResource } from "./url_to_resource.js"
 export { urlToScheme } from "./url_to_scheme.js"

package/src/url_to_parent_url.js

@@ -1,31 +1,28 @@
 import { urlToOrigin } from "./url_to_origin.js"
-import { urlToRessource } from "./url_to_ressource.js"
+import { urlToResource } from "./url_to_resource.js"
 
 export const urlToParentUrl = (url) => {
-  const ressource = urlToRessource(url)
-  const slashLastIndex = ressource.lastIndexOf("/")
+  const resource = urlToResource(url)
+  const slashLastIndex = resource.lastIndexOf("/")
   if (slashLastIndex === -1) {
     const urlAsString = String(url)
     return urlAsString
   }
 
-  const lastCharacterIndex = ressource.length - 1
+  const lastCharacterIndex = resource.length - 1
   if (slashLastIndex === lastCharacterIndex) {
-    const slashPreviousIndex = ressource.lastIndexOf(
-      "/",
-      lastCharacterIndex - 1,
-    )
+    const slashPreviousIndex = resource.lastIndexOf("/", lastCharacterIndex - 1)
     if (slashPreviousIndex === -1) {
       const urlAsString = String(url)
       return urlAsString
     }
 
     const origin = urlToOrigin(url)
-    const parentUrl = `${origin}${ressource.slice(0, slashPreviousIndex + 1)}`
+    const parentUrl = `${origin}${resource.slice(0, slashPreviousIndex + 1)}`
     return parentUrl
   }
 
   const origin = urlToOrigin(url)
-  const parentUrl = `${origin}${ressource.slice(0, slashLastIndex + 1)}`
+  const parentUrl = `${origin}${resource.slice(0, slashLastIndex + 1)}`
   return parentUrl
 }

package/src/url_to_pathname.js

@@ -1,19 +1,19 @@
-import { urlToRessource } from "./url_to_ressource.js"
+import { urlToResource } from "./url_to_resource.js"
 
 export const urlToPathname = (url) => {
-  const ressource = urlToRessource(url)
-  const pathname = ressourceToPathname(ressource)
+  const resource = urlToResource(url)
+  const pathname = resourceToPathname(resource)
   return pathname
 }
 
-const ressourceToPathname = (ressource) => {
-  const searchSeparatorIndex = ressource.indexOf("?")
+const resourceToPathname = (resource) => {
+  const searchSeparatorIndex = resource.indexOf("?")
   if (searchSeparatorIndex > -1) {
-    return ressource.slice(0, searchSeparatorIndex)
+    return resource.slice(0, searchSeparatorIndex)
   }
-  const hashIndex = ressource.indexOf("#")
+  const hashIndex = resource.indexOf("#")
   if (hashIndex > -1) {
-    return ressource.slice(0, hashIndex)
+    return resource.slice(0, hashIndex)
   }
-  return ressource
+  return resource
 }

package/src/url_to_relative_url.js

@@ -20,8 +20,8 @@ export const urlToRelativeUrl = (url, baseUrl) => {
 
   const { pathname, hash, search } = urlObject
   if (pathname === "/") {
-    const baseUrlRessourceWithoutLeadingSlash = baseUrlObject.pathname.slice(1)
-    return baseUrlRessourceWithoutLeadingSlash
+    const baseUrlResourceWithoutLeadingSlash = baseUrlObject.pathname.slice(1)
+    return baseUrlResourceWithoutLeadingSlash
   }
 
   const basePathname = baseUrlObject.pathname

package/src/{url_to_ressource.js → url_to_resource.js}

@@ -1,6 +1,6 @@
 import { urlToScheme } from "./url_to_scheme.js"
 
-export const urlToRessource = (url) => {
+export const urlToResource = (url) => {
   const scheme = urlToScheme(url)
 
   if (scheme === "file") {

package/src/url_trace.js

@@ -3,8 +3,6 @@
 // https://github.com/postcss/postcss/blob/fd30d3df5abc0954a0ec642a3cdc644ab2aacf9c/lib/terminal-highlight.js#L50
 // https://github.com/babel/babel/blob/eea156b2cb8deecfcf82d52aa1b71ba4995c7d68/packages/babel-code-frame/src/index.js#L1
 
-import { urlToFileSystemPath } from "./url_to_filesystem_path.js"
-
 export const stringifyUrlTrace = (trace) => {
   let string = ""
   trace.forEach(({ type, url, line, column, source }, index) => {
@@ -41,7 +39,7 @@ export const stringifyUrlSite = (
     color,
   } = {},
 ) => {
-  let string = `${humanizeUrl(url)}`
+  let string = url
 
   if (typeof line === "number") {
     string += `:${line}`
@@ -67,15 +65,6 @@ export const stringifyUrlSite = (
 ${sourceLoc}`
 }
 
-export const humanizeUrl = (url) => {
-  if (url.startsWith("file://")) {
-    // we prefer file system path because vscode reliably make them clickable
-    // and sometimes it won't for file:// urls
-    return urlToFileSystemPath(url)
-  }
-  return url
-}
-
 export const showSourceLocation = ({
   content,
   line,

package/src/url_utils.js

@@ -1,11 +1,14 @@
 import { urlToOrigin } from "./url_to_origin.js"
 import { urlToExtension } from "./url_to_extension.js"
-import { urlToRessource } from "./url_to_ressource.js"
+import { urlToResource } from "./url_to_resource.js"
 
 export const asUrlWithoutSearch = (url) => {
-  const urlObject = new URL(url)
-  urlObject.search = ""
-  return urlObject.href
+  if (url.includes("?")) {
+    const urlObject = new URL(url)
+    urlObject.search = ""
+    return urlObject.href
+  }
+  return url
 }
 
 export const isValidUrl = (url) => {
@@ -62,8 +65,8 @@ export const injectQueryParams = (url, params) => {
 export const setUrlExtension = (url, extension) => {
   const origin = urlToOrigin(url)
   const currentExtension = urlToExtension(url)
-  const ressource = urlToRessource(url)
-  const [pathname, search] = ressource.split("?")
+  const resource = urlToResource(url)
+  const [pathname, search] = resource.split("?")
   const pathnameWithoutExtension = currentExtension
     ? pathname.slice(0, -currentExtension.length)
     : pathname