@serwist/utils 9.5.2 → 9.5.3

package/dist/browserslist.d.ts

@@ -0,0 +1,9 @@
+import type Browserslist from "browserslist";
+/**
+ * Loads and converts Browserslist into esbuild's `target` option.
+ *
+ * @param cwd
+ * @returns
+ */
+export declare const browserslistToEsbuild: (browserslist: typeof Browserslist, cwd: string, defaultBrowserslist: string[]) => string[];
+//# sourceMappingURL=browserslist.d.ts.map

package/dist/browserslist.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"browserslist.d.ts","sourceRoot":"","sources":["../src/browserslist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,cAAc,CAAC;AAO7C;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,cAAc,OAAO,YAAY,EAAE,KAAK,MAAM,EAAE,qBAAqB,MAAM,EAAE,KAAG,MAAM,EAqD3H,CAAC"}

package/dist/compare.d.ts

@@ -0,0 +1,2 @@
+export declare const compare: <T extends string | number>(a: T, b: T) => 1 | -1 | 0;
+//# sourceMappingURL=compare.d.ts.map

package/dist/compare.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../src/compare.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,eAI5D,CAAC"}

package/dist/constants.d.ts

@@ -0,0 +1,4 @@
+/** @see https://esbuild.github.io/api/#target */
+export declare const SUPPORTED_ESBUILD_TARGETS: string[];
+export declare const UNSUPPORTED_BROWSERLIST_TARGETS: string[];
+//# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,eAAO,MAAM,yBAAyB,UAAmG,CAAC;AAE1I,eAAO,MAAM,+BAA+B,UAA0C,CAAC"}

package/dist/index.d.ts

@@ -1,6 +1,10 @@
-import { nonNullable } from "./nonNullable.js";
+import { nonNullable } from "./non-nullable.js";
 import { parallel } from "./parallel.js";
-import { toUnix } from "./toUnix.js";
+import { toUnix } from "./to-unix.js";
+export { browserslistToEsbuild } from "./browserslist.js";
+export { compare } from "./compare.js";
+export { SUPPORTED_ESBUILD_TARGETS, UNSUPPORTED_BROWSERLIST_TARGETS } from "./constants.js";
+export { compareSemver } from "./semver.js";
 export { nonNullable, parallel, toUnix };
 export type * from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAEzC,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,yBAAyB,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAEzC,mBAAmB,YAAY,CAAC"}

package/dist/index.js

@@ -28,4 +28,73 @@ const parallel = async (limit, array, func)=>{
 
 const toUnix = (p)=>p.replace(/\\/g, "/").replace(/(?<!^)\/+/g, "/");
 
-export { nonNullable, parallel, toUnix };
+const compare = (a, b)=>{
+    if (a < b) return -1;
+    if (a > b) return 1;
+    return 0;
+};
+
+const SUPPORTED_ESBUILD_TARGETS = [
+    "chrome",
+    "deno",
+    "edge",
+    "firefox",
+    "hermes",
+    "ie",
+    "ios",
+    "node",
+    "opera",
+    "rhino",
+    "safari"
+];
+const UNSUPPORTED_BROWSERLIST_TARGETS = [
+    "android 4",
+    "android 3",
+    "android 2"
+];
+
+const compareSemver = (a, b)=>{
+    return compare(Number.parseInt(a[0], 10), Number.parseInt(b[0], 10)) || compare(Number.parseInt(a[1] || "0", 10), Number.parseInt(b[1] || "0", 10)) || compare(Number.parseInt(a[2] || "0", 10), Number.parseInt(b[2] || "0", 10));
+};
+
+const browserslistToEsbuild = (browserslist, cwd, defaultBrowserslist)=>{
+    const browserslistConfig = browserslist.loadConfig({
+        path: cwd
+    }) ?? defaultBrowserslist;
+    return browserslist(browserslistConfig).filter((query)=>!UNSUPPORTED_BROWSERLIST_TARGETS.some((target)=>query.startsWith(target))).map((query)=>{
+        const modified = query === "safari TP" ? browserslist("last 1 safari version")[0] : query;
+        const split = modified.split(" ");
+        if (split[0] === "android" || split[0] === "and_chr") {
+            split[0] = "chrome";
+        }
+        if (split[0] === "and_ff") {
+            split[0] = "firefox";
+        }
+        if (split[0] === "ios_saf" || split[0] === "ios") {
+            split[0] = "safari";
+        }
+        if (split[1].includes("-")) {
+            split[1] = split[1].slice(0, split[1].indexOf("-"));
+        }
+        if (split[1].endsWith(".0")) {
+            split[1] = split[1].slice(0, -2);
+        }
+        return split;
+    }).filter((split)=>SUPPORTED_ESBUILD_TARGETS.includes(split[0]) && /^\d+(\.\d+)*$/.test(split[1])).sort((a, b)=>{
+        if (a[0] === b[0]) {
+            return compareSemver(b[1].split("."), a[1].split("."));
+        } else {
+            return compare(a[0], b[0]);
+        }
+    }).reduce((acc, browser)=>{
+        const existingIndex = acc.findIndex((br)=>br[0] === browser[0]);
+        if (existingIndex !== -1) {
+            acc[existingIndex][1] = browser[1];
+        } else {
+            acc.push(browser);
+        }
+        return acc;
+    }, []).map((split)=>split.join(""));
+};
+
+export { SUPPORTED_ESBUILD_TARGETS, UNSUPPORTED_BROWSERLIST_TARGETS, browserslistToEsbuild, compare, compareSemver, nonNullable, parallel, toUnix };

package/dist/{nonNullable.d.ts → non-nullable.d.ts}

@@ -1,2 +1,2 @@
 export declare const nonNullable: <T>(value: T) => value is NonNullable<T>;
-//# sourceMappingURL=nonNullable.d.ts.map
+//# sourceMappingURL=non-nullable.d.ts.map

package/dist/non-nullable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"non-nullable.d.ts","sourceRoot":"","sources":["../src/non-nullable.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,CAAC,KAAG,KAAK,IAAI,WAAW,CAAC,CAAC,CAA0C,CAAC"}

package/dist/semver.d.ts

@@ -0,0 +1,2 @@
+export declare const compareSemver: (a: string[], b: string[]) => 1 | -1 | 0;
+//# sourceMappingURL=semver.d.ts.map

package/dist/semver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"semver.d.ts","sourceRoot":"","sources":["../src/semver.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa,GAAI,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,eAMrD,CAAC"}

package/dist/{toUnix.d.ts → to-unix.d.ts}

@@ -1,2 +1,2 @@
 export declare const toUnix: (p: string) => string;
-//# sourceMappingURL=toUnix.d.ts.map
+//# sourceMappingURL=to-unix.d.ts.map

package/dist/to-unix.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"to-unix.d.ts","sourceRoot":"","sources":["../src/to-unix.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM,GAAI,GAAG,MAAM,WAAqD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/utils",
-  "version": "9.5.2",
+  "version": "9.5.3",
   "type": "module",
   "description": "This module contains utilities used by Serwist packages.",
   "files": [
@@ -29,9 +29,18 @@
   },
   "devDependencies": {
     "@types/common-tags": "1.8.4",
+    "browserslist": "4.28.1",
     "rollup": "4.57.0",
     "typescript": "5.9.3",
-    "@serwist/configs": "9.5.2"
+    "@serwist/configs": "9.5.3"
+  },
+  "peerDependencies": {
+    "browserslist": ">=4"
+  },
+  "peerDependenciesMeta": {
+    "browserslist": {
+      "optional": true
+    }
   },
   "scripts": {
     "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",

package/src/browserslist.ts

@@ -0,0 +1,67 @@
+import type Browserslist from "browserslist";
+import { compare } from "./compare.js";
+import { SUPPORTED_ESBUILD_TARGETS, UNSUPPORTED_BROWSERLIST_TARGETS } from "./constants.js";
+import { compareSemver } from "./semver.js";
+
+// Original: https://github.com/marcofugaro/browserslist-to-esbuild/blob/0875f1a4ec71f206a634ba406c3528ca5ecf04de/src/index.js
+// License: MIT
+/**
+ * Loads and converts Browserslist into esbuild's `target` option.
+ *
+ * @param cwd
+ * @returns
+ */
+export const browserslistToEsbuild = (browserslist: typeof Browserslist, cwd: string, defaultBrowserslist: string[]): string[] => {
+  const browserslistConfig = browserslist.loadConfig({ path: cwd }) ?? defaultBrowserslist;
+  return (
+    browserslist(browserslistConfig)
+      // Filter out legacy Android webview to avoid converting them into Chrome targets
+      .filter((query) => !UNSUPPORTED_BROWSERLIST_TARGETS.some((target) => query.startsWith(target)))
+      .map((query) => {
+        const modified = query === "safari TP" ? browserslist("last 1 safari version")[0] : query;
+        const split = modified.split(" ");
+        // https://github.com/browserslist/browserslist/blob/5cad191bc1a1e5beb7768ca263503cc15d0dcc7d/README.md?plain=1#L329-L350
+        // https://esbuild.github.io/api/#target
+        if (split[0] === "android" || split[0] === "and_chr") {
+          split[0] = "chrome";
+        }
+        if (split[0] === "and_ff") {
+          split[0] = "firefox";
+        }
+        if (split[0] === "ios_saf" || split[0] === "ios") {
+          split[0] = "safari";
+        }
+        // Remove upper version bound
+        if (split[1].includes("-")) {
+          split[1] = split[1].slice(0, split[1].indexOf("-"));
+        }
+        // Trim ending .0
+        if (split[1].endsWith(".0")) {
+          split[1] = split[1].slice(0, -2);
+        }
+        return split;
+      })
+      // Remove unsupported browsers and invalid versions
+      .filter((split) => SUPPORTED_ESBUILD_TARGETS.includes(split[0]) && /^\d+(\.\d+)*$/.test(split[1]))
+      // Re-sort the result such that the oldest versions end up the latest, same as how
+      // Browserslist does it.
+      .sort((a, b) => {
+        if (a[0] === b[0]) {
+          return compareSemver(b[1].split("."), a[1].split("."));
+        } else {
+          return compare(a[0], b[0]);
+        }
+      })
+      // Only pick the oldest included version for each browser to avoid duplications.
+      .reduce((acc, browser) => {
+        const existingIndex = acc.findIndex((br) => br[0] === browser[0]);
+        if (existingIndex !== -1) {
+          acc[existingIndex][1] = browser[1];
+        } else {
+          acc.push(browser);
+        }
+        return acc;
+      }, [] as string[][])
+      .map((split) => split.join(""))
+  );
+};

package/src/compare.ts

@@ -0,0 +1,5 @@
+export const compare = <T extends string | number>(a: T, b: T) => {
+  if (a < b) return -1;
+  if (a > b) return +1;
+  return 0;
+};

package/src/constants.ts

@@ -0,0 +1,4 @@
+/** @see https://esbuild.github.io/api/#target */
+export const SUPPORTED_ESBUILD_TARGETS = ["chrome", "deno", "edge", "firefox", "hermes", "ie", "ios", "node", "opera", "rhino", "safari"];
+
+export const UNSUPPORTED_BROWSERLIST_TARGETS = ["android 4", "android 3", "android 2"];

package/src/index.ts

@@ -1,7 +1,11 @@
-import { nonNullable } from "./nonNullable.js";
+import { nonNullable } from "./non-nullable.js";
 import { parallel } from "./parallel.js";
-import { toUnix } from "./toUnix.js";
+import { toUnix } from "./to-unix.js";
 
+export { browserslistToEsbuild } from "./browserslist.js";
+export { compare } from "./compare.js";
+export { SUPPORTED_ESBUILD_TARGETS, UNSUPPORTED_BROWSERLIST_TARGETS } from "./constants.js";
+export { compareSemver } from "./semver.js";
 export { nonNullable, parallel, toUnix };
 
 export type * from "./types.js";

package/src/semver.ts

@@ -0,0 +1,11 @@
+// Source: https://github.com/browserslist/browserslist/blob/5cad191bc1a1e5beb7768ca263503cc15d0dcc7d/index.js#L139-L151
+// License: MIT
+import { compare } from "./compare.js";
+
+export const compareSemver = (a: string[], b: string[]) => {
+  return (
+    compare(Number.parseInt(a[0], 10), Number.parseInt(b[0], 10)) ||
+    compare(Number.parseInt(a[1] || "0", 10), Number.parseInt(b[1] || "0", 10)) ||
+    compare(Number.parseInt(a[2] || "0", 10), Number.parseInt(b[2] || "0", 10))
+  );
+};

package/dist/nonNullable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"nonNullable.d.ts","sourceRoot":"","sources":["../src/nonNullable.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,CAAC,KAAG,KAAK,IAAI,WAAW,CAAC,CAAC,CAA0C,CAAC"}

package/dist/toUnix.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"toUnix.d.ts","sourceRoot":"","sources":["../src/toUnix.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM,GAAI,GAAG,MAAM,WAAqD,CAAC"}