webext-schema 5.1.5 → 5.1.7

package/modules/browser.js

@@ -178,7 +178,7 @@ export const updateCommand = async (id, value = '') => {
       value.trim().replace(/\+([a-z])$/, (m, c) => `+${c.toUpperCase()}`);
     if (shortcut === '') {
       func = commands.reset(id);
-    } else if (/^(?:(?:(?:Alt|Command|(?:Mac)?Ctrl)(?:\+Shift)?|Alt\+(?:Command|(?:Mac)?Ctrl)|Command\+(?:Alt|MacCtrl)|Ctrl\+(?:Alt|MacCtrl)|MacCtrl\+(?:Alt|Command|Ctrl))\+(?:[\dA-Z]|F(?:[1-9]|1[0-2])|(?:Page)?(?:Down|Up)|Left|Right|Comma|Period|Home|End|Delete|Insert|Space))|F(?:[1-9]|1[0-2])|Media(?:(?:Next|Prev)Track|PlayPause|Stop)$/.test(shortcut)) {
+    } else if (/^(?:(?:Alt|Command|(?:Mac)?Ctrl)(?:\+Shift)?|Alt\+(?:Command|(?:Mac)?Ctrl)|Command\+(?:Alt|MacCtrl)|Ctrl\+(?:Alt|MacCtrl)|MacCtrl\+(?:Alt|Command|Ctrl))\+[\dA-Z]|F[1-9]|Media(?:(?:Next|Prev)Track|PlayPause|Stop)$/.test(shortcut)) {
       func = commands.update({
         shortcut,
         name: id
@@ -967,7 +967,7 @@ export const highlightTab = async (index, windowId) => {
  * move tab
  *
  * @param {number|Array} tabId - tab ID
- * @param {object} opt - options
+ * @param {object} [opt] - options
  * @returns {Promise.<?Array>} - array of tabs.Tab
  */
 export const moveTab = async (tabId, opt) => {
@@ -978,7 +978,7 @@ export const moveTab = async (tabId, opt) => {
   if (arr && !Array.isArray(arr)) {
     arr = [arr];
   }
-  return arr ?? null;
+  return arr || null;
 };
 
 /**

package/modules/file-util.js

@@ -128,7 +128,7 @@ export const getFileTimestamp = file => {
 export const getFileNameFromFilePath = (file, subst = SUBST) => {
   let name;
   if (isString(file) && isFile(file) &&
-      /^([^.]+)(?:\..+)?$/.test(path.basename(file))) {
+      /^[^.]+(?:\..+)?$/.test(path.basename(file))) {
     [, name] = /^([^.]+)(?:\..+)?$/.exec(path.basename(file));
   }
   return name || subst;

package/modules/schema.js

@@ -28,7 +28,7 @@ export class Schema {
   constructor(...args) {
     const [arg1, arg2] = args;
     this.#channel =
-      isString(arg1) && /(?:(?:centra|mai)l|beta|esr|release)/.test(arg1)
+      isString(arg1) && /(?:centra|mai)l|beta|esr|release/.test(arg1)
         ? arg1
         : 'beta';
     this._sandbox =
@@ -47,7 +47,7 @@ export class Schema {
   }
 
   set channel(ch) {
-    if (isString(ch) && /(?:(?:centra|mai)l|beta|esr|release)/.test(ch)) {
+    if (isString(ch) && /(?:centra|mai)l|beta|esr|release/.test(ch)) {
       this.#channel = ch;
     }
   }

package/modules/update.js

@@ -96,7 +96,7 @@ export const getFileList = async baseUrl => {
   const { href } = new URL('jar.mn', baseUrl);
   const text = await fetchText(href);
   const reg =
-    /content\/(?:(?:brows|messeng)er|extensions)\/schemas\/([\da-zA-Z_]+\.json)/;
+    /content\/(?:(?:brows|messeng)er|extensions)\/schemas\/(\w+\.json)/;
   const items = text.split('\n');
   const arr = [];
   for (const item of items) {

package/package.json

@@ -14,7 +14,7 @@
   "types": "types/index.d.ts",
   "dependencies": {
     "@types/firefox-webext-browser": "^109.0.0",
-    "@types/node": "^18.14.1",
+    "@types/node": "^18.14.2",
     "@types/sinon": "^10.0.13",
     "camelize": "^1.0.1",
     "commander": "^10.0.0",
@@ -25,12 +25,13 @@
   "devDependencies": {
     "c8": "^7.13.0",
     "chai": "^4.3.7",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsdoc": "^40.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-regexp": "^1.12.0",
     "eslint-plugin-unicorn": "^45.0.2",
     "mocha": "^10.2.0",
     "npm-run-all": "^4.1.5",
@@ -55,5 +56,5 @@
     "update-mail": "node index update --channel=mail -i",
     "update-release": "node index update --channel=release -i"
   },
-  "version": "5.1.5"
+  "version": "5.1.7"
 }

package/types/modules/browser.d.ts

@@ -45,7 +45,7 @@ export function getAllTabsInWindow(windowId?: number): Promise<any[] | null>;
 export function getHighlightedTab(windowId?: number): Promise<any[] | null>;
 export function getTab(tabId: number): Promise<object>;
 export function highlightTab(index: number | any[], windowId?: number): Promise<object>;
-export function moveTab(tabId: number | any[], opt: object): Promise<any[] | null>;
+export function moveTab(tabId: number | any[], opt?: object): Promise<any[] | null>;
 export function reloadTab(tabId: number, opt: object): Promise<void>;
 export function removeTab(arg: number | any[]): Promise<void>;
 export function updateTab(tabId: number, opt: object): Promise<object>;