browser-extension-utils 0.1.14 → 0.1.16

package/lib/index.d.ts

@@ -138,7 +138,7 @@ export function getOffsetPosition(
 }
 
 // eslint-disable-next-line @typescript-eslint/ban-types
-export function runOnce(key: string, func: Function): any
+export async function runOnce(key: string, func: Function): Promise<any>
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 export function runWhenHeadExists(func: Function): void

package/lib/index.js

@@ -26,18 +26,29 @@ export const $$ = (selectors, element) => [
 export const querySelector = $
 export const querySelectorAll = $$
 
+export const getRootElement = (type) =>
+  type === 1
+    ? doc.head || doc.body || doc.documentElement
+    : type === 2
+    ? doc.body || doc.documentElement
+    : doc.documentElement
+
 export const createElement = (tagName, attributes) =>
   setAttributes(doc.createElement(tagName), attributes)
 
 export const addElement = (parentNode, tagName, attributes) => {
-  if (!parentNode) {
+  if (typeof parentNode === "string") {
+    return addElement(null, parentNode, tagName)
+  }
+
+  if (!tagName) {
     return
   }
 
-  if (typeof parentNode === "string") {
-    attributes = tagName
-    tagName = parentNode
-    parentNode = doc.head
+  if (!parentNode) {
+    parentNode = /^(script|link|style|meta)$/.test(tagName)
+      ? getRootElement(1)
+      : getRootElement(2)
   }
 
   if (typeof tagName === "string") {
@@ -54,7 +65,7 @@ export const addElement = (parentNode, tagName, attributes) => {
 
 export const addStyle = (styleText) => {
   const element = createElement("style", { textContent: styleText })
-  doc.head.append(element)
+  getRootElement(1).append(element)
   return element
 }
 
@@ -312,17 +323,17 @@ export const getOffsetPosition = (element, referElement) => {
 }
 
 const runOnceCache = {}
-export const runOnce = (key, func) => {
-  if (!key) {
-    return func()
-  }
-
+export const runOnce = async (key, func) => {
   if (Object.hasOwn(runOnceCache, key)) {
     return runOnceCache[key]
   }
 
-  const result = func()
-  runOnceCache[key] = result
+  const result = await func()
+
+  if (key) {
+    runOnceCache[key] = result
+  }
+
   return result
 }
 

package/lib/userscript.js

@@ -1,8 +1,7 @@
 import {
-  doc,
+  getRootElement,
   setAttributes,
   addElement as _addElement,
-  addStyle as _addStyle,
 } from "./index.js"
 
 export * from "./index.js"
@@ -24,19 +23,39 @@ process.env.PLASMO_TAG === "dev" &&
 export const addElement =
   typeof GM_addElement === "function"
     ? (parentNode, tagName, attributes) => {
-        if (!parentNode) {
+        if (typeof parentNode === "string") {
+          return addElement(null, parentNode, tagName)
+        }
+
+        if (!tagName) {
           return
         }
 
-        if (typeof parentNode === "string") {
-          attributes = tagName
-          tagName = parentNode
-          parentNode = doc.head
+        if (!parentNode) {
+          parentNode = /^(script|link|style|meta)$/.test(tagName)
+            ? getRootElement(1)
+            : getRootElement(2)
         }
 
         if (typeof tagName === "string") {
-          const element = GM_addElement(tagName)
-          setAttributes(element, attributes)
+          let attributes2
+          if (attributes) {
+            const entries1 = []
+            const entries2 = []
+            for (const entry of Object.entries(attributes)) {
+              if (/^(on\w+|innerHTML)$/.test(entry[0])) {
+                entries2.push(entry)
+              } else {
+                entries1.push(entry)
+              }
+            }
+
+            attributes = Object.fromEntries(entries1)
+            attributes2 = Object.fromEntries(entries2)
+          }
+
+          const element = GM_addElement(null, tagName, attributes)
+          setAttributes(element, attributes2)
           parentNode.append(element)
           return element
         }
@@ -48,10 +67,8 @@ export const addElement =
       }
     : _addElement
 
-export const addStyle =
-  typeof GM_addStyle === "function"
-    ? (styleText) => GM_addStyle(styleText)
-    : _addStyle
+export const addStyle = (styleText) =>
+  addElement(null, "style", { textContent: styleText })
 
 // Only register menu on top frame
 export const registerMenuCommand = (name, callback, accessKey) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension-utils",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Utilities for developing browser extensions and userscripts",
   "type": "module",
   "main": "./lib/index.js",
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/PipecraftNet/browser-extension-utils.git"
+    "url": "git+https://github.com/utags/browser-extension-utils.git"
   },
   "keywords": [
     "extensions",
@@ -25,9 +25,9 @@
   "author": "Pipecraft",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/PipecraftNet/browser-extension-utils/issues"
+    "url": "https://github.com/utags/browser-extension-utils/issues"
   },
-  "homepage": "https://github.com/PipecraftNet/browser-extension-utils#readme",
+  "homepage": "https://github.com/utags/browser-extension-utils#readme",
   "devDependencies": {
     "prettier": "^2.8.8",
     "xo": "^0.55.0"