browser-extension-settings 0.8.2 → 0.8.4

package/lib/settings.ts

@@ -25,14 +25,6 @@ import { createSwitchOption } from "./switch"
 import { besVersion } from "./common"
 import { i, resetI18n, localeNames } from "./messages/index"
 
-// Declare GM global variable for userscript environment
-// eslint-disable-next-line @typescript-eslint/naming-convention
-declare const GM:
-  | {
-      registerMenuCommand?: (name: string, function_: () => void) => void
-    }
-  | undefined
-
 const prefix = "browser_extension_settings_v2_"
 
 type SettingsOptions = {
@@ -123,11 +115,16 @@ let settingsTable: SettingsTable = {}
 let settings = {}
 async function getSettings() {
   return (
-    ((await getValue(storageKey)) as Record<string, unknown> | undefined) ?? {}
+    (await getValue<Record<string, boolean | string | undefined>>(
+      storageKey
+    )) ?? {}
   )
 }
 
-async function saveSettingsValue(key: string, value: any) {
+async function saveSettingsValue(
+  key: string,
+  value: boolean | string | undefined
+) {
   const settings = await getSettings()
   settings[key] =
     settingsTable[key] && settingsTable[key].defaultValue === value
@@ -160,10 +157,12 @@ export async function saveSettingsValues(
   await setValue(storageKey, settings)
 }
 
-export function getSettingsValue(key: string): boolean | string | undefined {
+export function getSettingsValue<T = boolean | string | undefined>(
+  key: string
+): T {
   return Object.hasOwn(settings, key)
-    ? (settings[key] as boolean | string | undefined)
-    : (settingsTable[key]?.defaultValue as boolean | string | undefined)
+    ? (settings[key] as T)
+    : (settingsTable[key]?.defaultValue as T)
 }
 
 const closeModal = () => {
@@ -246,7 +245,7 @@ async function updateOptions() {
             root
           ) as HTMLInputElement
           if (checkbox) {
-            checkbox.checked = getSettingsValue(key) as boolean
+            checkbox.checked = getSettingsValue(key)
           }
 
           break
@@ -273,7 +272,7 @@ async function updateOptions() {
             root
           ) as HTMLTextAreaElement
           if (textArea) {
-            textArea.value = getSettingsValue(key) as string
+            textArea.value = getSettingsValue(key)
           }
 
           break
@@ -288,7 +287,7 @@ async function updateOptions() {
 
   if (typeof settingsOptions.onViewUpdate === "function") {
     const settingsMain = createSettingsElement()
-    settingsOptions.onViewUpdate(settingsMain)
+    settingsOptions.onViewUpdate(settingsMain!)
   }
 }
 
@@ -379,11 +378,10 @@ function createSettingsElement() {
     const getOptionGroup = (index: number) => {
       if (index > optionGroups.length) {
         for (let i = optionGroups.length; i < index; i++) {
-          optionGroups.push(
-            addElement(settingsMain!, "div", {
-              class: "option_groups",
-            })
-          )
+          const optionGroup = addElement(settingsMain, "div", {
+            class: "option_groups",
+          })
+          if (optionGroup) optionGroups.push(optionGroup)
         }
       }
 
@@ -537,7 +535,7 @@ function createSettingsElement() {
 
     if (settingsOptions.footer) {
       const footer = addElement(settingsMain, "footer")
-      footer.innerHTML = createHTML(
+      footer!.innerHTML = createHTML(
         typeof settingsOptions.footer === "string"
           ? settingsOptions.footer
           : `<p>Made with ❤️ by
@@ -632,8 +630,7 @@ let lastLocale: string | undefined
 // Reset settings UI on init and locale change
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const resetSettingsUI = (optionsProvider: () => SettingsOptions) => {
-  lastLocale =
-    (getSettingsValue("locale") as string | undefined) || getPrefferedLocale()
+  lastLocale = getSettingsValue("locale") || getPrefferedLocale()
   resetI18n(lastLocale)
 
   const options = optionsProvider()
@@ -663,14 +660,14 @@ const resetSettingsUI = (optionsProvider: () => SettingsOptions) => {
 }
 
 export const initSettings = async (optionsProvider: () => SettingsOptions) => {
-  addValueChangeListener(storageKey, async () => {
+  await addValueChangeListener(storageKey, async () => {
     settings = await getSettings()
     // console.log(JSON.stringify(settings, null, 2))
     await updateOptions()
     // addSideMenu()
 
     const newLocale =
-      (getSettingsValue("locale") as string | undefined) || getPrefferedLocale()
+      getSettingsValue<string | undefined>("locale") || getPrefferedLocale()
     // console.log("lastLocale:", lastLocale, "newLocale:", newLocale)
     if (lastLocale !== newLocale) {
       const isShown = isSettingsShown()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension-settings",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "Settings module for developing browser extensions and userscripts",
   "type": "module",
   "main": "./lib/index.ts",
@@ -31,13 +31,13 @@
   "homepage": "https://github.com/utags/browser-extension-settings#readme",
   "dependencies": {
     "browser-extension-i18n": "^0.1.3",
-    "browser-extension-storage": "^0.1.2",
-    "browser-extension-utils": "^0.2.2"
+    "browser-extension-storage": "^0.2.8",
+    "browser-extension-utils": "^0.3.3"
   },
   "devDependencies": {
     "@types/chrome": "^0.1.32",
     "@vitest/coverage-v8": "^4.0.16",
-    "jsdom": "^27.3.0",
+    "jsdom": "^27.4.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.7.4",
     "typescript": "^5.9.3",