@playpilot/tpi 5.20.1 → 5.20.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@playpilot/tpi",
-	"version": "5.20.1",
+	"version": "5.20.2",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",

package/src/lib/injection.ts

@@ -254,7 +254,7 @@ export function injectLinksInDocument(elements: HTMLElement[], injections: LinkI
     }
   }
 
-  addLinkInjectionEventListeners(validInjections)
+  addLinkInjectionEventListeners(foundInjections)
   addCSSVariablesToLinks()
 
   const afterArticleInjections = filterInvalidAfterArticleInjections(mergedInjections)
@@ -269,7 +269,7 @@ export function injectLinksInDocument(elements: HTMLElement[], injections: LinkI
 
     const matchingElement = document.querySelector(`[${keyDataAttribute}="${injection.key}"]`)
     const failed = isValidPlaylinkType(injection) && !injection.inactive && !injection.removed && !injection.after_article && !matchingElement
-    const containsSentence = !!elements.find(element => cleanPhrase(element.innerText).includes(cleanPhrase(injection.sentence)))
+    const containsSentence = foundInjections.find(i => i.key === injection.key)
     const failedMessage =
       !failed ? '' :
         failedMessages[injection.key] ||

package/src/lib/text.ts

@@ -61,7 +61,11 @@ export function replaceBetween(text: string, replacement: string, startIndex: nu
 export function cleanPhrase(phrase: string): string {
   return decodeHtmlEntities(phrase)
     .toLowerCase()
+    .normalize('NFD')
+    .replace(/\p{Diacritic}/gu, '') // Replace accents and other diacritic symbols (https://stackoverflow.com/a/51874002/1665157)
     .replace(/\s+/g, '') // Replace any number of white space with nothing
+    .replace(/['"‘’“”]/g, '"') // Replace all qoutes with the same type of quote
+    .replace(/^['"]+|['"]+$/g, '') // Remove leading and trailing quotes
     .replace(/\.*$/, '') // Remove trailing periods
     .replaceAll('…', '...') // Replace ellipsis character with regular characters
 }

package/src/tests/lib/injections.test.js

@@ -312,6 +312,50 @@ describe('linkInjection.js', () => {
       expect(document.querySelectorAll('[data-playpilot-injection-key]')).toHaveLength(2)
     })
 
+    it('Should disregard missing trailing periods', () => {
+      document.body.innerHTML = '<p>This is a sentence with a phrase in it</p>'
+
+      const elements = Array.from(document.body.querySelectorAll('p'))
+      const injection = generateInjection('This is a sentence with a phrase in it.', 'a phrase')
+
+      injectLinksInDocument(elements, { aiInjections: [injection], manualInjections: [] })
+
+      expect(document.querySelectorAll('[data-playpilot-injection-key]')).toHaveLength(1)
+    })
+
+    it('Should disregard additional quotes', () => {
+      document.body.innerHTML = '<p>This is part of a paragraph. This is a sentence with a phrase in it."</p>'
+
+      const elements = Array.from(document.body.querySelectorAll('p'))
+      const injection = generateInjection('"This is a sentence with a phrase in it."', 'a phrase')
+
+      injectLinksInDocument(elements, { aiInjections: [injection], manualInjections: [] })
+
+      expect(document.querySelectorAll('[data-playpilot-injection-key]')).toHaveLength(1)
+    })
+
+    it('Should disregard differences in accents', () => {
+      document.body.innerHTML = '<p>This is à sentence with a phràse in it."</p>'
+
+      const elements = Array.from(document.body.querySelectorAll('p'))
+      const injection = generateInjection('This is a sentence with a phrase in it.', 'a phràse')
+
+      injectLinksInDocument(elements, { aiInjections: [injection], manualInjections: [] })
+
+      expect(document.querySelectorAll('[data-playpilot-injection-key]')).toHaveLength(1)
+    })
+
+    it('Should treat different types of quotes as the same', () => {
+      document.body.innerHTML = '<p>This is a “sentence” with a "phrase" in it.</p>'
+
+      const elements = Array.from(document.body.querySelectorAll('p'))
+      const injection = generateInjection('This is a "sentence" with a \'phrase’ in it.', 'phrase')
+
+      injectLinksInDocument(elements, { aiInjections: [injection], manualInjections: [] })
+
+      expect(document.querySelectorAll('[data-playpilot-injection-key]')).toHaveLength(1)
+    })
+
     it('Should leave the text intact if no injections were found', () => {
       document.body.innerHTML = '<p>This is a sentence with an injection.</p>'
 

package/src/tests/lib/text.test.js

@@ -112,6 +112,32 @@ describe('text.js', () => {
     it('Should return given phrase without trailing period', () => {
       expect(cleanPhrase('Some phrase.')).toBe('somephrase')
     })
+
+    it('Should return given phrase without leading or trailing quotes', () => {
+      expect(cleanPhrase('"Some phrase"')).toBe('somephrase')
+      expect(cleanPhrase('Some phrase"')).toBe('somephrase')
+      expect(cleanPhrase('"Some phrase')).toBe('somephrase')
+
+      expect(cleanPhrase('\'Some phrase\'')).toBe('somephrase')
+      expect(cleanPhrase('Some phrase\'')).toBe('somephrase')
+      expect(cleanPhrase('\'Some phrase')).toBe('somephrase')
+    })
+
+    it('Should return given phrase without leading or trailing quotes and trailing period', () => {
+      expect(cleanPhrase('"Some phrase."')).toBe('somephrase')
+    })
+
+    it('Should disregard accents and diacritics', () => {
+      expect(cleanPhrase('María')).toBe(cleanPhrase('Maria'))
+      expect(cleanPhrase('Göteborg')).toBe(cleanPhrase('Goteborg'))
+      expect(cleanPhrase('über')).toBe(cleanPhrase('uber'))
+    })
+
+    it('Should disregard differences in quotes', () => {
+      expect(cleanPhrase('Some "phrase"')).toBe(cleanPhrase('Some \'phrase\''))
+      expect(cleanPhrase('Some ”phrase“')).toBe(cleanPhrase('Some "phrase"'))
+      expect(cleanPhrase('Some ’phrase\'')).toBe(cleanPhrase('Some "phrase"'))
+    })
   })
 
   describe('truncateAroundPhrase', () => {