refactoring - v1.0.20

jeffy-g · Jan 4, 2024 · 9ec20aa · 9ec20aa
1 parent c82ad8b
commit 9ec20aa
Show file tree

Hide file tree

Showing 6 changed files with 197 additions and 135 deletions.
diff --git a/cjs/index.js b/cjs/index.js
@@ -32,7 +32,10 @@ let detector;
     const isPromise = (o) => typeof o.then === "function";
     let cacheLocal = "";
     /**
-     * @type {NsOsLocale.TInternalLocaleDetectorSig}
+     * @template {true | void} IsAsync
+     * @template {Conditional<IsAsync, string, Promise<string>>} R
+     * @param {IsAsync=} async
+     * @returns {(options?: NsOsLocale.LocaleDetectorOptions) => R}
      */
     const detectorBase = (async) => (options = {}) => {
         /* eslint-disable indent */
@@ -42,7 +45,7 @@ let detector;
             return (async ? Promise.resolve(cacheLocal) : cacheLocal);
         }
         const functions = localeGetters[+(!!async)];
-        /** @type {NsOsLocale.TInternalLocaleDetectorResult} */
+        /** @type {R} */
         let locale;
         /**
          * @param {string} l
@@ -52,18 +55,18 @@ let detector;
         const withCache = (l, mustPromise) => {
             l = l.replace(/_/, "-");
             cacheLocal = cache ? l : "";
-            return (mustPromise ? Promise.resolve(l) : l);
+            return /** @type {NsOsLocale.TInternalLocaleDetectorResult} */ (mustPromise ? Promise.resolve(l) : l);
         };
         const envLocale = getEnvLocale();
         if (envLocale || !options.spawn) {
-            locale = purgeExtraToken(envLocale);
+            locale = /** @type {R} */ (purgeExtraToken(envLocale));
         }
         else {
             let { platform } = process;
             if (platform !== "win32" && platform !== "darwin") {
                 platform = "linux";
             }
-            locale = functions[platform]();
+            locale = /** @type {R} */ (functions[platform]());
         }
         return (isPromise(locale) ? locale.then(withCache) : withCache(locale, async === true || void 0));
     };
@@ -77,7 +80,7 @@ let detector;
             enumerable: false,
         },
         version: {
-            value: "v1.0.19",
+            value: "v1.0.20",
             enumerable: true,
         },
     });

diff --git a/cjs/lib.js b/cjs/lib.js
@@ -181,8 +181,8 @@ const [getUnixLocale, getUnixLocaleSync] = /** @type {(cmd: TLocalCmdToken) => T
  * @see {@link module:lcid}
  */
 const parseLCID = (result) => {
-    const lcidCode = parseInt(result.replace("Locale", ""), 16);
-    return lcid.from(lcidCode) || defaultLocale;
+    const lcidCode = +("0x" + result.replace(/Locale|\s/g, ""));
+    return lcid.from(lcidCode) || /* istanbul ignore next */ defaultLocale;
 };
 const [getWinLocale, getWinLocaleSync] = /** @type {(a: TLocalCmdToken, b: string[]) => TAsyncSyncPair} */ ((command, args) => {
     return [

diff --git a/esm/index.js → esm/index.mjs b/esm/index.js → esm/index.mjs
@@ -14,7 +14,7 @@
 // @ts-ignore
 ///<reference path="../index.d.ts"/>
 ///<reference types="basic-types"/>
-import * as lib from "./lib";
+import * as lib from "./lib.mjs";
 /**
  * @typedef {(o: any) => o is Promise<any>} TPromiseChecker
  */
@@ -29,7 +29,10 @@ let detector;
     const isPromise = (o) => typeof o.then === "function";
     let cacheLocal = "";
     /**
-     * @type {NsOsLocale.TInternalLocaleDetectorSig}
+     * @template {true | void} IsAsync
+     * @template {Conditional<IsAsync, string, Promise<string>>} R
+     * @param {IsAsync=} async
+     * @returns {(options?: NsOsLocale.LocaleDetectorOptions) => R}
      */
     const detectorBase = (async) => (options = {}) => {
         /* eslint-disable indent */
@@ -39,7 +42,7 @@ let detector;
             return (async ? Promise.resolve(cacheLocal) : cacheLocal);
         }
         const functions = localeGetters[+(!!async)];
-        /** @type {NsOsLocale.TInternalLocaleDetectorResult} */
+        /** @type {R} */
         let locale;
         /**
          * @param {string} l
@@ -49,18 +52,18 @@ let detector;
         const withCache = (l, mustPromise) => {
             l = l.replace(/_/, "-");
             cacheLocal = cache ? l : "";
-            return (mustPromise ? Promise.resolve(l) : l);
+            return /** @type {NsOsLocale.TInternalLocaleDetectorResult} */ (mustPromise ? Promise.resolve(l) : l);
         };
         const envLocale = getEnvLocale();
         if (envLocale || !options.spawn) {
-            locale = purgeExtraToken(envLocale);
+            locale = /** @type {R} */ (purgeExtraToken(envLocale));
         }
         else {
             let { platform } = process;
             if (platform !== "win32" && platform !== "darwin") {
                 platform = "linux";
             }
-            locale = functions[platform]();
+            locale = /** @type {R} */ (functions[platform]());
         }
         return (isPromise(locale) ? locale.then(withCache) : withCache(locale, async === true || void 0));
     };
@@ -74,7 +77,7 @@ let detector;
             enumerable: false,
         },
         version: {
-            value: "v1.0.19",
+            value: "v1.0.20",
             enumerable: true,
         },
     });

diff --git a/esm/lib.js → esm/lib.mjs b/esm/lib.js → esm/lib.mjs
@@ -178,8 +178,8 @@ const [getUnixLocale, getUnixLocaleSync] = /** @type {(cmd: TLocalCmdToken) => T
  * @see {@link module:lcid}
  */
 const parseLCID = (result) => {
-    const lcidCode = parseInt(result.replace("Locale", ""), 16);
-    return lcid.from(lcidCode) || defaultLocale;
+    const lcidCode = +("0x" + result.replace(/Locale|\s/g, ""));
+    return lcid.from(lcidCode) || /* istanbul ignore next */ defaultLocale;
 };
 const [getWinLocale, getWinLocaleSync] = /** @type {(a: TLocalCmdToken, b: string[]) => TAsyncSyncPair} */ ((command, args) => {
     return [

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "os-locale-s",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "Its a light weight version that minimizes the dependency module of `os-locale`",
   "private": false,
   "main": "./cjs/index.js",
-  "module": "./esm/index.js",
+  "module": "./esm/index.mjs",
   "types": "./index.d.ts",
   "sideEffects": false,
   "author": {
@@ -51,6 +51,7 @@
     "lcid": "^4.0.1"
   },
   "devDependencies": {
+    "@types/node": "^20.10.6",
     "jest": "29.7.0"
   },
   "scripts": {