@jeniex/utils 1.0.27 → 1.1.3

package/browser/index.cjs

@@ -125,20 +125,7 @@ function capitalize(sentence) {
     return capitalizeWord(sentence);
 }
 
-let infoObject;
-if (typeof GM !== 'undefined') {
-    infoObject = GM.info;
-    // eslint-disable-next-line unicorn/no-negated-condition
-}
-else if (typeof GM_info === 'undefined') {
-    infoObject = { script: { name: document.title } };
-}
-else {
-    infoObject = GM_info;
-}
-const scriptName = infoObject.script.name;
-/** The identifier of the script to be used in logging. */
-const logId = `[${scriptName}]:`;
+const scriptName = GM.info.script.name;
 /** The initial tab URL on the script run. */
 const tabURL = window.location.href;
 
@@ -261,8 +248,7 @@ function $$(selectors, parent) {
  * @param fullURL If provided, it will be our target, otherwise it is the current location.
  */
 function getSearchParam(key, fullURL) {
-    const { search } = new URL(fullURL ?? window.location.href);
-    const searchParams = new URLSearchParams(search);
+    const { searchParams } = new URL(fullURL ?? window.location.href);
     const value = searchParams.get(key);
     if (value === null) {
         return undefined;
@@ -471,6 +457,17 @@ async function getOptions(flags) {
     return options;
 }
 
+function customizeConsole(debug = false) {
+    const base = window.console;
+    const logId = `[${scriptName}]:`;
+    return {
+        log: base.log.bind(base, logId),
+        warn: base.warn.bind(base, logId),
+        error: base.error.bind(base, logId),
+        debug: debug ? base.log.bind(base, logId) : noop,
+    };
+}
+
 exports.$ = $;
 exports.$$ = $$;
 exports.addStyle = addStyle;
@@ -480,6 +477,7 @@ exports.capitalize = capitalize;
 exports.checkVPN = checkVPN;
 exports.checkVPNRandomly = checkVPNRandomly;
 exports.confirm = confirm;
+exports.customizeConsole = customizeConsole;
 exports.fish = fish;
 exports.fishResponse = fishResponse;
 exports.fishX = fishX;
@@ -497,7 +495,6 @@ exports.isObject = isObject;
 exports.isString = isString;
 exports.isTruthy = isTruthy;
 exports.join = join;
-exports.logId = logId;
 exports.noop = noop;
 exports.padZeros = padZeros;
 exports.pageLoad = pageLoad;

package/browser/index.d.ts

@@ -107,8 +107,6 @@ declare function setSearchParam(key: string, value: string, fullURL?: string): s
 declare function removeSearchParams(keys: string[], fullURL?: string): string;
 
 declare const scriptName: string;
-/** The identifier of the script to be used in logging. */
-declare const logId: string;
 /** The initial tab URL on the script run. */
 declare const tabURL: string;
 
@@ -160,4 +158,13 @@ type Options = Record<string, FlagValue>;
 
 declare function getOptions(flags: Flag[]): Promise<Options>;
 
-export { $, $$, Flag, Fn, Nullable, Prettify, addStyle, alert, asserted, capitalize, checkVPN, checkVPNRandomly, confirm, fish, fishResponse, fishX, fishXResponse, getOptions, getSearchParam, imageLoad, isBoolean, isFalsy, isFunction, isNotNullish, isNullish, isNumber, isObject, isString, isTruthy, join, logId, noop, padZeros, pageLoad, prompt, remove, removeSearchParams, saveFile, scriptName, setSearchParam, sleep, tabURL, toString };
+interface CustomizedConsole {
+    log: Console['log'];
+    warn: Console['warn'];
+    error: Console['error'];
+    debug: Console['debug'];
+}
+
+declare function customizeConsole(debug?: boolean): CustomizedConsole;
+
+export { $, $$, Flag, Fn, Nullable, Prettify, addStyle, alert, asserted, capitalize, checkVPN, checkVPNRandomly, confirm, customizeConsole, fish, fishResponse, fishX, fishXResponse, getOptions, getSearchParam, imageLoad, isBoolean, isFalsy, isFunction, isNotNullish, isNullish, isNumber, isObject, isString, isTruthy, join, noop, padZeros, pageLoad, prompt, remove, removeSearchParams, saveFile, scriptName, setSearchParam, sleep, tabURL, toString };

package/browser/index.js

@@ -123,20 +123,7 @@ function capitalize(sentence) {
     return capitalizeWord(sentence);
 }
 
-let infoObject;
-if (typeof GM !== 'undefined') {
-    infoObject = GM.info;
-    // eslint-disable-next-line unicorn/no-negated-condition
-}
-else if (typeof GM_info === 'undefined') {
-    infoObject = { script: { name: document.title } };
-}
-else {
-    infoObject = GM_info;
-}
-const scriptName = infoObject.script.name;
-/** The identifier of the script to be used in logging. */
-const logId = `[${scriptName}]:`;
+const scriptName = GM.info.script.name;
 /** The initial tab URL on the script run. */
 const tabURL = window.location.href;
 
@@ -259,8 +246,7 @@ function $$(selectors, parent) {
  * @param fullURL If provided, it will be our target, otherwise it is the current location.
  */
 function getSearchParam(key, fullURL) {
-    const { search } = new URL(fullURL ?? window.location.href);
-    const searchParams = new URLSearchParams(search);
+    const { searchParams } = new URL(fullURL ?? window.location.href);
     const value = searchParams.get(key);
     if (value === null) {
         return undefined;
@@ -469,4 +455,15 @@ async function getOptions(flags) {
     return options;
 }
 
-export { $, $$, addStyle, alert, asserted, capitalize, checkVPN, checkVPNRandomly, confirm, fish, fishResponse, fishX, fishXResponse, getOptions, getSearchParam, imageLoad, isBoolean, isFalsy, isFunction, isNotNullish, isNullish, isNumber, isObject, isString, isTruthy, join, logId, noop, padZeros, pageLoad, prompt, remove, removeSearchParams, saveFile, scriptName, setSearchParam, sleep, tabURL, toString };
+function customizeConsole(debug = false) {
+    const base = window.console;
+    const logId = `[${scriptName}]:`;
+    return {
+        log: base.log.bind(base, logId),
+        warn: base.warn.bind(base, logId),
+        error: base.error.bind(base, logId),
+        debug: debug ? base.log.bind(base, logId) : noop,
+    };
+}
+
+export { $, $$, addStyle, alert, asserted, capitalize, checkVPN, checkVPNRandomly, confirm, customizeConsole, fish, fishResponse, fishX, fishXResponse, getOptions, getSearchParam, imageLoad, isBoolean, isFalsy, isFunction, isNotNullish, isNullish, isNumber, isObject, isString, isTruthy, join, noop, padZeros, pageLoad, prompt, remove, removeSearchParams, saveFile, scriptName, setSearchParam, sleep, tabURL, toString };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeniex/utils",
-  "version": "1.0.27",
+  "version": "1.1.3",
   "author": "JenieX",
   "homepage": "https://github.com/JenieX/utils",
   "type": "module",