@jeniex/utils 1.0.3 → 1.0.5

package/browser/index.cjs

@@ -38,25 +38,34 @@ async function sleep(milliSeconds) {
     });
 }
 
-const scriptInfo = typeof GM === 'undefined' ? GM_info : GM.info;
-const SCRIPT_NAME = scriptInfo.script.name;
+let infoObject;
+if (typeof GM !== 'undefined') {
+    infoObject = GM.info;
+}
+else if (typeof GM_info === 'undefined') {
+    infoObject = GM_info;
+}
+else {
+    infoObject = { script: { name: document.title } };
+}
+const scriptName = infoObject.script.name;
 /** The identifier of the script to be used in logging */
-const LOG_ID = `[${SCRIPT_NAME}]:`;
+const logId = `[${scriptName}]:`;
 /** The initial tab URL on the script run */
-const TAB_URL = window.location.href;
+const tabURL = window.location.href;
 
 function alert(message) {
     if (message === undefined) {
-        window.alert(`[ ${SCRIPT_NAME} ]`);
+        window.alert(`[ ${scriptName} ]`);
         return;
     }
-    window.alert(`[ ${SCRIPT_NAME} ]\n\n${message}`);
+    window.alert(`[ ${scriptName} ]\n\n${message}`);
 }
 function confirm(message) {
-    return window.confirm(`[ ${SCRIPT_NAME} ]\n\n${message}`);
+    return window.confirm(`[ ${scriptName} ]\n\n${message}`);
 }
 function prompt(message, _default) {
-    return window.prompt(`[ ${SCRIPT_NAME} ]\n\n${message}`, _default);
+    return window.prompt(`[ ${scriptName} ]\n\n${message}`, _default);
 }
 
 function $(selectors, parent) {
@@ -81,6 +90,7 @@ function createFlagMessage(flag) {
         message += `\n\n${values.join(' | ')}`;
     }
     if (type === 'number' && flag.range !== undefined) {
+        message += '\n';
         const [min, max] = flag.range;
         if (min !== undefined) {
             message += `\nMinimum: ${min}`;
@@ -150,9 +160,6 @@ async function getOptions(flags) {
 
 exports.$ = $;
 exports.$$ = $$;
-exports.LOG_ID = LOG_ID;
-exports.SCRIPT_NAME = SCRIPT_NAME;
-exports.TAB_URL = TAB_URL;
 exports.alert = alert;
 exports.asserted = asserted;
 exports.confirm = confirm;
@@ -163,6 +170,9 @@ exports.isNotNullish = isNotNullish;
 exports.isNullish = isNullish;
 exports.isString = isString;
 exports.isTruthy = isTruthy;
+exports.logId = logId;
 exports.noop = noop;
 exports.prompt = prompt;
+exports.scriptName = scriptName;
 exports.sleep = sleep;
+exports.tabURL = tabURL;

package/browser/index.d.ts

@@ -15,12 +15,6 @@ declare function sleep(milliSeconds: number): Promise<void>;
 type Nullable<T> = T | null | undefined;
 type Fn<T = any, U = void> = (param: T) => U;
 
-declare const SCRIPT_NAME: string;
-/** The identifier of the script to be used in logging */
-declare const LOG_ID: string;
-/** The initial tab URL on the script run */
-declare const TAB_URL: string;
-
 declare function alert(message?: string): void;
 declare function confirm(message: string): boolean;
 declare function prompt(message: string, _default?: string): string | null;
@@ -30,6 +24,12 @@ type Selectors = string[] | string;
 declare function $<T = HTMLElement>(selectors: Selectors, parent?: Parent): T;
 declare function $$<T extends Element = HTMLElement>(selectors: Selectors, parent?: Parent): NodeListOf<T>;
 
+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;
+
 interface FlagBase {
     name: string;
     message: string;
@@ -56,4 +56,4 @@ type Options = Record<string, FlagValue>;
 
 declare function getOptions(flags: Flag[]): Promise<Options>;
 
-export { $, $$, Flag, Fn, LOG_ID, Nullable, SCRIPT_NAME, TAB_URL, alert, asserted, confirm, ensureJoin, getOptions, isFalsy, isNotNullish, isNullish, isString, isTruthy, noop, prompt, sleep };
+export { $, $$, Flag, Fn, Nullable, alert, asserted, confirm, ensureJoin, getOptions, isFalsy, isNotNullish, isNullish, isString, isTruthy, logId, noop, prompt, scriptName, sleep, tabURL };

package/browser/{index.mjs → index.js}

@@ -36,25 +36,34 @@ async function sleep(milliSeconds) {
     });
 }
 
-const scriptInfo = typeof GM === 'undefined' ? GM_info : GM.info;
-const SCRIPT_NAME = scriptInfo.script.name;
+let infoObject;
+if (typeof GM !== 'undefined') {
+    infoObject = GM.info;
+}
+else if (typeof GM_info === 'undefined') {
+    infoObject = GM_info;
+}
+else {
+    infoObject = { script: { name: document.title } };
+}
+const scriptName = infoObject.script.name;
 /** The identifier of the script to be used in logging */
-const LOG_ID = `[${SCRIPT_NAME}]:`;
+const logId = `[${scriptName}]:`;
 /** The initial tab URL on the script run */
-const TAB_URL = window.location.href;
+const tabURL = window.location.href;
 
 function alert(message) {
     if (message === undefined) {
-        window.alert(`[ ${SCRIPT_NAME} ]`);
+        window.alert(`[ ${scriptName} ]`);
         return;
     }
-    window.alert(`[ ${SCRIPT_NAME} ]\n\n${message}`);
+    window.alert(`[ ${scriptName} ]\n\n${message}`);
 }
 function confirm(message) {
-    return window.confirm(`[ ${SCRIPT_NAME} ]\n\n${message}`);
+    return window.confirm(`[ ${scriptName} ]\n\n${message}`);
 }
 function prompt(message, _default) {
-    return window.prompt(`[ ${SCRIPT_NAME} ]\n\n${message}`, _default);
+    return window.prompt(`[ ${scriptName} ]\n\n${message}`, _default);
 }
 
 function $(selectors, parent) {
@@ -79,6 +88,7 @@ function createFlagMessage(flag) {
         message += `\n\n${values.join(' | ')}`;
     }
     if (type === 'number' && flag.range !== undefined) {
+        message += '\n';
         const [min, max] = flag.range;
         if (min !== undefined) {
             message += `\nMinimum: ${min}`;
@@ -146,4 +156,4 @@ async function getOptions(flags) {
     return options;
 }
 
-export { $, $$, LOG_ID, SCRIPT_NAME, TAB_URL, alert, asserted, confirm, ensureJoin, getOptions, isFalsy, isNotNullish, isNullish, isString, isTruthy, noop, prompt, sleep };
+export { $, $$, alert, asserted, confirm, ensureJoin, getOptions, isFalsy, isNotNullish, isNullish, isString, isTruthy, logId, noop, prompt, scriptName, sleep, tabURL };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeniex/utils",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "author": "JenieX",
   "homepage": "https://github.com/JenieX/utils",
   "type": "module",
@@ -10,12 +10,12 @@
   "exports": {
     "./browser": {
       "types": "./browser/index.d.ts",
-      "import": "./browser/index.mjs",
+      "import": "./browser/index.js",
       "require": "./browser/index.cjs"
     },
     "./node": {
       "types": "./node/index.d.ts",
-      "import": "./node/index.mjs",
+      "import": "./node/index.js",
       "require": "./node/index.cjs"
     }
   },