emotesjs 0.0.15 → 0.0.18

package/index.js

@@ -1,24 +1,27 @@
 class EmotesJS {
-    cachedEmotes = new Map()
-    isReady = false
-    isLoading = Promise.resolve()
+    #cachedEmotes = new Map()
+    #isReady = false
+    #requireColon = true
+    #height = "1.65rem"
+    #format = "WEBP"
+    #allowedOrigins = "https://cdn.7tv.app"
+
+    loadedEmotes = 0
     channelId = 0
-    requireColon = true
-    height = "1.65rem"
-    format = "WEBP"
-    allowedOrigins = "https://cdn.7tv.app"
+    isLoading = Promise.resolve()
     static instance
 
     constructor(opts) {
-        if (EmotesJS.instance) {
+        if (EmotesJS.instance && EmotesJS.instance.channelId !== 0) {
             return EmotesJS.instance
         }
 
         if (opts) {
             this.channelId = opts.channelId
-            this.requireColon = opts.requireColon
-            this.height = opts.height || this.height
-            this.format = opts.format || this.format
+            this.#requireColon = opts.requireColon
+            this.#requireColon ||= false
+            this.#height = opts.height || this.#height
+            this.#format = opts.format || this.#format
         }
 
         this.isLoading = this.load()
@@ -58,51 +61,57 @@ class EmotesJS {
             let name = emote.data.name
             let url = `https:${emote.data.host.url}`
 
-            if (!url.includes(this.allowedOrigins)) {
+            if (!url.includes(this.#allowedOrigins)) {
                 continue
             }
 
-            let files = emote.data.host.files.filter(x => x.format === this.format)
-            let srcset = files.reduce((acc, curr) => `${url}/${curr.name} ${curr.width}w, ${acc}`, '')
-            let elementString = `<img srcset="${srcset}" alt="${name}" style="height:${this.height}"/>`
+            let files = emote.data.host.files.filter(x => x.format === this.#format)
+            let srcset = files.reduce((acc, curr) => `${url}/${curr.name} ${curr.width}w, ${acc}`, "")
+            let elementString = `<img srcset="${srcset}" alt="${name}" style="height:${this.#height}"/>`
 
-            this.cachedEmotes.set(name, elementString)
+            this.#cachedEmotes.set(name, elementString)
         }
 
-        this.isReady = true
+        this.loadedEmotes = this.#cachedEmotes.size
+
+        this.#isReady = true
     }
 
     parse(text) {
-        if (!text || !this.isReady) {
-            console.log('emotes not ready')
+        if (!text || !this.#isReady) {
+            console.log("emotes not ready")
             return text
         }
 
-        if (this.isReady && this.cachedEmotes.size === 0) {
-            console.log('no emotes loaded')
+        if (this.#isReady && this.#cachedEmotes.size === 0) {
+            console.log("no emotes loaded")
             return text
         }
 
-        let words = text.split(' ')
+        let words = text.split(" ")
 
-        let fullText = ''
+        let fullText = ""
         for (let i = 0; i < words.length; i++) {
             let word = words[i]
 
-            if (this.requireColon && word.startsWith(":")) {
-                let wordKey = word.replace(':', '')
-                let emote = this.cachedEmotes.get(wordKey)
 
-                if (emote) {
-                    fullText += emote + ' '
-                    continue;
-                }
+            if (this.#requireColon && !word.startsWith(":")) {
+                fullText += word + " "
+                continue
+            }
+
+            let wordKey = word.replaceAll(":", "")
+            let emote = this.#cachedEmotes.get(wordKey)
+
+            if (emote) {
+                fullText += emote + " "
+                continue;
             }
 
             fullText += word + " "
         }
 
-        return fullText
+        return fullText.trim()
     }
 
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "emotesjs",
     "description": "",
-    "version": "0.0.15",
+    "version": "0.0.18",
     "license": "MIT",
     "author": {
         "name": "darckfast"
@@ -22,5 +22,10 @@
         "7tv",
         "emotes"
     ],
-    "scripts": {}
+    "scripts": {
+        "test": "vitest run"
+    },
+    "devDependencies": {
+        "vitest": "^3.2.4"
+    }
 }