webext-schema 3.0.1 → 4.0.0

package/modules/browser.js

@@ -346,8 +346,9 @@ export const createNotification = async (id, opt) => {
   let func;
   if (isGranted) {
     const { notifications } = browser;
-    !notifications.onClosed.hasListener(clearNotification) &&
+    if (!notifications.onClosed.hasListener(clearNotification)) {
       notifications.onClosed.addListener(clearNotification);
+    }
     func = notifications.create(id, opt);
   }
   return func || null;
@@ -424,21 +425,29 @@ export const getOs = async () => {
 /**
  * make a connection
  *
- * @param {string} [extId] - extension ID
- * @param {object} [info] - info
+ * @param {number|string} [id] - tab ID / extension ID / host name
+ * @param {object|boolean} [info] - connection info / connect to native app
  * @returns {object} - runtime.Port
  */
-export const makeConnection = async (extId, info) => {
+export const makeConnection = async (id, info) => {
   let port;
-  if (isString(extId)) {
+  if (Number.isInteger(id)) {
     if (isObjectNotEmpty(info)) {
-      port = await runtime.connect(extId, info);
+      port = await tabs.connect(id, info);
+    } else {
+      port = await tabs.connect(id);
+    }
+  } else if (isString(id)) {
+    if (info && getType(info) === 'Boolean') {
+      port = await runtime.connectNative(id);
+    } else if (isObjectNotEmpty(info)) {
+      port = await runtime.connect(id, info);
     } else {
-      port = await runtime.connect(extId);
+      port = await runtime.connect(id);
     }
-  } else if (isObjectNotEmpty(extId)) {
-    port = await runtime.connect(extId);
-  } else if (!extId && isObjectNotEmpty(info)) {
+  } else if (isObjectNotEmpty(id)) {
+    port = await runtime.connect(id);
+  } else if (!id && isObjectNotEmpty(info)) {
     port = await runtime.connect(info);
   } else {
     port = await runtime.connect();
@@ -449,7 +458,7 @@ export const makeConnection = async (extId, info) => {
 /**
  * send message
  *
- * @param {number|string} id - tabId or extension ID
+ * @param {number|string} id - tab ID / extension ID
  * @param {*} msg - message
  * @param {object} opt - options
  * @returns {?Function} - tabs.sendMessage() | runtime.sendMessage()
@@ -728,17 +737,12 @@ export const queryTabs = async opt => {
 export const execScriptToTab = async (tabId, opt = {}) => {
   let res;
   try {
-    const isGranted = await isPermissionGranted({
-      permissions: ['activeTab']
-    });
     if (Number.isInteger(tabId)) {
       res = await tabs.executeScript(tabId, opt);
-    } else if (isGranted) {
-      if (isObjectNotEmpty(tabId)) {
-        res = await tabs.executeScript(tabId);
-      } else {
-        res = await tabs.executeScript(opt);
-      }
+    } else if (isObjectNotEmpty(tabId)) {
+      res = await tabs.executeScript(tabId);
+    } else if (isObjectNotEmpty(opt)) {
+      res = await tabs.executeScript(opt);
     } else {
       res = null;
     }
@@ -978,7 +982,9 @@ export const warmupTab = async tabId => {
   if (!Number.isInteger(tabId)) {
     throw new TypeError(`Expected Number but got ${getType(tabId)}.`);
   }
-  typeof tabs.warmup === 'function' && await tabs.warmup(tabId);
+  if (typeof tabs.warmup === 'function') {
+    await tabs.warmup(tabId);
+  }
 };
 
 /**
@@ -1080,7 +1086,7 @@ export const getWindow = async (windowId, opt) => {
 export const checkIncognitoWindowExists = async () => {
   const arr = await getAllNormalWindows();
   let bool;
-  if (arr && arr.length) {
+  if (arr?.length) {
     for (const win of arr) {
       bool = win.incognito;
       if (bool) {

package/modules/common.js

@@ -66,7 +66,7 @@ export const getType = o =>
  */
 export const isObjectNotEmpty = o => {
   const items = /Object/i.test(getType(o)) && Object.keys(o);
-  return !!(items && items.length);
+  return !!(items?.length);
 };
 
 /**

package/modules/update.js

@@ -15,7 +15,7 @@ import process from 'process';
 /* constants */
 const DIR_CWD = process.cwd();
 const PERM_FILE = 0o644;
-export const ESR_VER = 91;
+export const ESR_VER = 102;
 
 /**
  * fetch text
@@ -168,9 +168,7 @@ export const getMailExtSchemaData = async baseUrl => {
   ];
   const func = [];
   for (const item of items) {
-    if (!excludeFile.includes(item)) {
-      func.push(getSchemaData(item, schemaUrl));
-    }
+    !excludeFile.includes(item) && func.push(getSchemaData(item, schemaUrl));
   }
   return Promise.all(func);
 };

package/package.json

@@ -29,24 +29,24 @@
   },
   "dependencies": {
     "camelize": "^1.0.0",
-    "commander": "^9.2.0",
+    "commander": "^9.3.0",
     "decamelize": "^6.0.0",
     "json5": "^2.2.1",
-    "node-fetch": "^3.2.4",
+    "node-fetch": "^3.2.5",
     "sinon": "^14.0.0"
   },
   "devDependencies": {
-    "c8": "^7.11.2",
+    "c8": "^7.11.3",
     "chai": "^4.3.6",
-    "eslint": "^8.15.0",
+    "eslint": "^8.17.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsdoc": "^39.2.9",
+    "eslint-plugin-jsdoc": "^39.3.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "mocha": "^10.0.0",
-    "nock": "^13.2.4",
+    "nock": "^13.2.6",
     "npm-run-all": "^4.1.5"
   },
-  "version": "3.0.1"
+  "version": "4.0.0"
 }

package/schemas/beta/webext.json

@@ -3066,7 +3066,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -6430,7 +6430,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -7275,7 +7275,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -10910,7 +10910,8 @@
               "additionalProperties": {
                 "$ref": "experiments.ExperimentAPI"
               },
-              "optional": true
+              "optional": true,
+              "privileged": true
             }
           }
         }
@@ -11761,7 +11762,8 @@
               "items": {
                 "type": "string"
               },
-              "optional": true
+              "optional": true,
+              "privileged": true
             }
           }
         }
@@ -13089,17 +13091,30 @@
             }
           ]
         },
+        {
+          "id": "PermissionPrivileged",
+          "choices": [
+            {
+              "type": "string",
+              "enum": [
+                "mozillaAddons"
+              ]
+            }
+          ]
+        },
         {
           "id": "PermissionNoPrompt",
           "choices": [
             {
-              "$ref": "OptionalPermission"
+              "$ref": "OptionalPermissionNoPrompt"
+            },
+            {
+              "$ref": "PermissionPrivileged"
             },
             {
               "type": "string",
               "enum": [
                 "alarms",
-                "mozillaAddons",
                 "storage",
                 "unlimitedStorage"
               ]
@@ -13443,7 +13458,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -14865,7 +14880,8 @@
               "type": "boolean",
               "optional": true,
               "default": false,
-              "description": "Whether to create all cookies as nonPersistent (i.e., session) cookies."
+              "description": "Whether to create all cookies as nonPersistent (i.e., session) cookies.",
+              "deprecated": "This property has no effect anymore and its value is always <code>false<code>."
             }
           }
         }
@@ -15720,8 +15736,7 @@
               "type": "string",
               "enum": [
                 "scripting"
-              ],
-              "min_manifest_version": 3
+              ]
             }
           ]
         }
@@ -15733,7 +15748,6 @@
       "permissions": [
         "scripting"
       ],
-      "min_manifest_version": 3,
       "types": [
         {
           "id": "ScriptInjection",
@@ -16635,7 +16649,7 @@
           }
         },
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",

package/schemas/central/webext.json

@@ -3066,7 +3066,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -6430,7 +6430,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -7275,7 +7275,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -10910,7 +10910,8 @@
               "additionalProperties": {
                 "$ref": "experiments.ExperimentAPI"
               },
-              "optional": true
+              "optional": true,
+              "privileged": true
             }
           }
         }
@@ -11761,7 +11762,8 @@
               "items": {
                 "type": "string"
               },
-              "optional": true
+              "optional": true,
+              "privileged": true
             }
           }
         }
@@ -13089,17 +13091,30 @@
             }
           ]
         },
+        {
+          "id": "PermissionPrivileged",
+          "choices": [
+            {
+              "type": "string",
+              "enum": [
+                "mozillaAddons"
+              ]
+            }
+          ]
+        },
         {
           "id": "PermissionNoPrompt",
           "choices": [
             {
-              "$ref": "OptionalPermission"
+              "$ref": "OptionalPermissionNoPrompt"
+            },
+            {
+              "$ref": "PermissionPrivileged"
             },
             {
               "type": "string",
               "enum": [
                 "alarms",
-                "mozillaAddons",
                 "storage",
                 "unlimitedStorage"
               ]
@@ -13443,7 +13458,7 @@
       "namespace": "manifest",
       "types": [
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",
@@ -16634,7 +16649,7 @@
           }
         },
         {
-          "$extend": "PermissionNoPrompt",
+          "$extend": "PermissionPrivileged",
           "choices": [
             {
               "type": "string",