tiptapify 0.3.4 → 0.3.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tiptapify",
   "types": "./index.d.ts",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Tiptap3 editor with Vuetify3 menu implementation",
   "exports": {
     ".": {

package/src/utils/validateHref.test.ts

@@ -30,6 +30,23 @@ describe('isValidHref', () => {
     expect(isValidHref('https://example.com/a/b?q=1-2_3%40&r=99')).toBe(true)
   })
 
+  it('accepts facebook post, photo and permalink URLs', () => {
+    expect(isValidHref('https://www.facebook.com/user.name/posts/pfbid02abcXYZ123')).toBe(true)
+    expect(isValidHref('https://www.facebook.com/photo/?fbid=123456&set=a.789')).toBe(true)
+    expect(isValidHref('https://m.facebook.com/permalink.php?story_fbid=pfbid0abc&id=100064')).toBe(true)
+    expect(isValidHref('https://fb.watch/abc_DEF12/')).toBe(true)
+  })
+
+  it('accepts dots, underscores and other URL characters in the path', () => {
+    expect(isValidHref('https://example.com/docs/file_v2.pdf')).toBe(true)
+    expect(isValidHref('https://example.com/~user/a+b,c:d')).toBe(true)
+  })
+
+  it('accepts a hyphenated or non-latin domain', () => {
+    expect(isValidHref('https://my-site.com')).toBe(true)
+    expect(isValidHref('https://ліга.укр/новини')).toBe(true)
+  })
+
   it('accepts mailto links', () => {
     expect(isValidHref('mailto:test@example.com')).toBe(true)
   })
@@ -62,6 +79,14 @@ describe('isValidHref', () => {
     expect(isValidHref('https://exa mple.com')).toBe(false)
   })
 
+  it('rejects an http URL without slashes after the protocol', () => {
+    expect(isValidHref('https:example.com')).toBe(false)
+  })
+
+  it('rejects a domain with an empty label', () => {
+    expect(isValidHref('https://example..com')).toBe(false)
+  })
+
   it('rejects plain text', () => {
     expect(isValidHref('not a url')).toBe(false)
   })

package/src/utils/validateHref.ts

@@ -1,21 +1,25 @@
 const azAZ09 = 'a-zA-Z0-9'
 
-const regexHrefProto = 'https?:\\/\\/'
-const regexHrefAuth = `([${azAZ09}]+(:[${azAZ09}]+)?@)?`
-const regexHrefDomain = `[${azAZ09}]+(\\.[${azAZ09}]+(-?[${azAZ09}]+)?)+`
-const regexHrefPath = `(\\/[${azAZ09}\\-]+)*\\/?`
-const regexHrefFragment = '(#[^\\s]*)?'
-const regexHrefQueryParam = `(\\?[${azAZ09}\\-_]+((\\[[${azAZ09}]+\\])?=[${azAZ09}\\-_%]+)?)?`
-const regexHrefQueryParamExtra = `(&[${azAZ09}\\-_]+((\\[[${azAZ09}]+\\])?=[${azAZ09}\\-_%]+)?)*`
-const regexHref = `${regexHrefProto}${regexHrefAuth}${regexHrefDomain}${regexHrefPath}${regexHrefFragment}${regexHrefQueryParam}${regexHrefQueryParamExtra}`
-
 const regexMailto = `mailto:\\w+@[${azAZ09}]+(\\.[${azAZ09}]+)*`
 const regexTel = 'tel:\\+?[0-9]+'
 
-const regexAll = [regexHref, regexMailto, regexTel].join('|')
+const hrefRegex = new RegExp(`^(${regexMailto}|${regexTel})$`, 'i')
+
+const httpPrefixRegex = /^https?:\/\//i
+const hostnameRegex = /^[^.]+(\.[^.]+)+$/
+
+function isValidHttpUrl(href: string): boolean {
+  if (!httpPrefixRegex.test(href) || /\s/.test(href)) {
+    return false
+  }
 
-const hrefRegex = new RegExp(`^(${regexAll})$`, 'i')
+  try {
+    return hostnameRegex.test(new URL(href).hostname)
+  } catch {
+    return false
+  }
+}
 
 export function isValidHref(href: string): boolean {
-  return hrefRegex.test(href || '')
-}
+  return isValidHttpUrl(href || '') || hrefRegex.test(href || '')
+}