browser-extension-utils 0.1.0 → 0.1.2

package/lib/index.d.ts

@@ -7,22 +7,22 @@ export function toCamelCase(text: string): string
 export function $(
   selectors: string,
   element?: HTMLElement | Document
-): Element | undefined
+): HTMLElement | undefined
 
 export function querySelector(
   selectors: string,
   element?: HTMLElement | Document
-): Element | undefined
+): HTMLElement | undefined
 
 export function $$(
   selectors: string,
   element?: HTMLElement | Document
-): Element[]
+): HTMLElement[]
 
 export function querySelectorAll(
   selectors: string,
   element?: HTMLElement | Document
-): Element[]
+): HTMLElement[]
 
 export function createElement(
   tagName: string,
@@ -105,7 +105,7 @@ export function createSetStyle(styleText: string): SetStyle
 
 export function isUrl(text: string): boolean
 
-export function throttle(func: Function, delay: number): Function
+export function throttle(func: Function, interval: number): Function
 
 export type MenuCallback = (event?: MouseEvent | KeyboardEvent) => void
 export function registerMenuCommand(

package/lib/index.js

@@ -195,19 +195,28 @@ export const isUrl = (text) => /^https?:\/\//.test(text)
 /**
  *
  * @param { function } func
- * @param { number } delay
+ * @param { number } interval
  * @returns
  */
-export const throttle = (func, delay) => {
-  let timer = null
-  return function (...args) {
-    if (!timer) {
-      timer = setTimeout(() => {
-        func.apply(this, args)
-        timer = null
-      }, delay)
+export const throttle = (func, interval) => {
+  let timeoutId = null
+  let next = false
+  const handler = (...args) => {
+    if (timeoutId) {
+      next = true
+    } else {
+      func.apply(this, args)
+      timeoutId = setTimeout(() => {
+        timeoutId = null
+        if (next) {
+          next = false
+          handler()
+        }
+      }, interval)
     }
   }
+
+  return handler
 }
 
 if (typeof Object.hasOwn !== "function") {

package/lib/userscript.js

@@ -1,4 +1,5 @@
 import {
+  doc,
   setAttributes,
   addElement as _addElement,
   addStyle as _addStyle,
@@ -9,14 +10,6 @@ export * from "./index.js"
 // eslint-disable-next-line no-unused-expressions, n/prefer-global/process
 process.env.PLASMO_TAG === "dev" &&
   (() => {
-    /* eslint-disable camelcase */
-    console.log(
-      typeof GM_addElement,
-      typeof GM_addStyle,
-      typeof GM_registerMenuCommand,
-      typeof GM
-    )
-    /* eslint-enable camelcase */
     const functions = document.GMFunctions
     if (typeof functions === "object") {
       for (const key in functions) {
@@ -31,9 +24,20 @@ process.env.PLASMO_TAG === "dev" &&
 export const addElement =
   typeof GM_addElement === "function"
     ? (parentNode, tagName, attributes) => {
-        if (typeof parentNode === "string" || typeof tagName === "string") {
-          const element = GM_addElement(parentNode, tagName)
+        if (!parentNode) {
+          return
+        }
+
+        if (typeof parentNode === "string") {
+          attributes = tagName
+          tagName = parentNode
+          parentNode = doc.head
+        }
+
+        if (typeof tagName === "string") {
+          const element = GM_addElement(tagName)
           setAttributes(element, attributes)
+          parentNode.append(element)
           return element
         }
 
@@ -51,7 +55,12 @@ export const addStyle =
 
 // Only register menu on top frame
 export const registerMenuCommand = (name, callback, accessKey) => {
-  if (window !== top || !GM || !GM.registerMenuCommand) {
+  if (window !== top) {
+    return
+  }
+
+  if (typeof GM.registerMenuCommand !== "function") {
+    console.warn("Do not support GM.registerMenuCommand!")
     return
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension-utils",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Utilities for developing browser extensions and userscripts",
   "type": "module",
   "main": "./lib/index.js",