@serwist/utils 10.0.0-preview.1 → 10.0.0-preview.2

package/dist/index.js

@@ -26,8 +26,18 @@ const parallel = async (limit, array, func)=>{
     return results;
 };
 
+const slash = (str)=>{
+    return str.replace(/\\/g, "/");
+};
 const toUnix = (p)=>{
-    return p.replace(/\\/g, "/").replace(/(?<!^)\/+/g, "/");
+    return slash(p).replace(/(?<!^)\/+/g, "/");
+};
+const resolveBasePath = (base)=>{
+    if (isAbsolute(base)) return base;
+    return !base.startsWith("/") && !base.startsWith("./") ? `/${base}` : base;
+};
+const isAbsolute = (url)=>{
+    return url.match(/^(?:[a-z]+:)?\/\//i);
 };
 
-export { nonNullable, parallel, toUnix };
+export { isAbsolute, nonNullable, parallel, resolveBasePath, slash, toUnix };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/utils",
-  "version": "10.0.0-preview.1",
+  "version": "10.0.0-preview.2",
   "type": "module",
   "description": "This module contains internal utilities used by Serwist packages.",
   "files": [
@@ -19,22 +19,37 @@
   "homepage": "https://serwist.pages.dev",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "typesVersions": {
+    "node": {
+      "*": [
+        "./dist/index.node.d.ts"
+      ]
+    }
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
+    "./node": {
+      "types": "./dist/index.node.d.ts",
+      "default": "./dist/index.node.js"
+    },
     "./package.json": "./package.json"
   },
+  "dependencies": {
+    "kolorist": "1.8.0"
+  },
   "devDependencies": {
-    "rollup": "4.34.8",
-    "typescript": "5.7.3",
-    "@serwist/configs": "10.0.0-preview.1"
+    "rollup": "4.40.0",
+    "typescript": "5.8.3",
+    "@serwist/configs": "10.0.0-preview.2"
   },
   "scripts": {
     "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",
     "dev": "rollup --config rollup.config.js --watch",
     "lint": "biome lint ./src",
+    "qcheck": "biome check ./src",
     "typecheck": "tsc"
   }
 }

package/src/index.node.ts

@@ -0,0 +1,3 @@
+export { createLogger } from "./node/log.js";
+export type { LogType, LogLevel, LoggerOptions, Logger } from "./node/log.js";
+export { resolveEntry } from "./node/paths.js";

package/src/index.ts

@@ -1,7 +1,6 @@
 import { nonNullable } from "./nonNullable.js";
 import { parallel } from "./parallel.js";
-import { toUnix } from "./toUnix.js";
-
-export { nonNullable, parallel, toUnix };
 
+export { nonNullable, parallel };
+export { slash, toUnix, resolveBasePath, isAbsolute } from "./paths.js";
 export type * from "./types.js";

package/src/node/log.ts

@@ -0,0 +1,71 @@
+import { readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { cyan, yellow, red } from "kolorist";
+
+export type LogType = "error" | "warn" | "info";
+export type LogLevel = LogType | "silent";
+export interface LogOptions {
+  clear?: boolean;
+  skipLine?: boolean;
+}
+export const LogLevels: Record<LogLevel, number> = {
+  silent: 0,
+  error: 1,
+  warn: 2,
+  info: 3,
+};
+
+export interface LoggerOptions {
+  prefix?: string;
+  showVersion?: boolean;
+  allowClearScreen?: boolean;
+}
+
+export interface Logger {
+  info(msg: string, options?: LogOptions): void;
+  warn(msg: string, options?: LogOptions): void;
+  warnOnce(msg: string, options?: LogOptions): void;
+  error(msg: string, options?: LogOptions): void;
+  clearScreen(type: LogType): void;
+}
+
+const require = createRequire(import.meta.url);
+
+export const createLogger = (level: LogLevel = "info", options: LoggerOptions = {}): Logger => {
+  const { prefix: _prefix = "serwist", showVersion = true, allowClearScreen = true } = options;
+  const packageJson = showVersion ? JSON.parse(readFileSync(require.resolve("@serwist/utils/package.json"), "utf-8")) : null;
+  const prefix = `${_prefix}${showVersion ? ` v${packageJson.version}` : ""}`;
+  const thresh = LogLevels[level];
+  const canClearScreen = allowClearScreen && process.stdout.isTTY && !process.env.CI;
+  const clear = canClearScreen ? console.clear : () => {};
+  const output = (type: LogType, msg: string, options: LogOptions = {}) => {
+    if (thresh >= LogLevels[type]) {
+      const method = type === "info" ? "log" : type;
+      if (options.clear) clear();
+      let tag = type === "error" ? red(prefix) : type === "warn" ? yellow(prefix) : cyan(prefix);
+      console[method](`${options.skipLine ? "\n" : ""}${tag} ${msg}`);
+    }
+  };
+  const warnedMessages = new Set<string>();
+  return {
+    info(msg, opts) {
+      output("info", msg, opts);
+    },
+    warn(msg, opts) {
+      output("warn", msg, opts);
+    },
+    warnOnce(msg, opts) {
+      if (warnedMessages.has(msg)) return;
+      output("warn", msg, opts);
+      warnedMessages.add(msg);
+    },
+    error(msg, opts) {
+      output("error", msg, opts);
+    },
+    clearScreen(type) {
+      if (thresh >= LogLevels[type]) {
+        clear();
+      }
+    },
+  } satisfies Logger;
+};

package/src/node/paths.ts

@@ -0,0 +1,34 @@
+import fs from "node:fs";
+import path from "node:path";
+
+// Source: https://github.com/sveltejs/kit/blob/6419d3eaa7bf1b0a756b28f06a73f71fe042de0a/packages/kit/src/utils/filesystem.js
+// License: MIT
+/**
+ * Resolves a file path without extension. Also handles `/index` if the path
+ * actually points to a directory.
+ * @param ctx
+ * @param api
+ * @returns
+ */
+export const resolveEntry = (entry: string): string | null => {
+  if (fs.existsSync(entry)) {
+    const stats = fs.statSync(entry);
+    if (stats.isDirectory()) {
+      return resolveEntry(path.join(entry, "index"));
+    }
+
+    return entry;
+  }
+  const dir = path.dirname(entry);
+
+  if (fs.existsSync(dir)) {
+    const base = path.basename(entry);
+    const files = fs.readdirSync(dir);
+
+    const found = files.find((file) => file.replace(/\.[^.]+$/, "") === base);
+
+    if (found) return path.join(dir, found);
+  }
+
+  return null;
+};

package/src/paths.ts

@@ -0,0 +1,16 @@
+export const slash = (str: string) => {
+  return str.replace(/\\/g, "/");
+};
+
+export const toUnix = (p: string) => {
+  return slash(p).replace(/(?<!^)\/+/g, "/");
+};
+
+export const resolveBasePath = (base: string) => {
+  if (isAbsolute(base)) return base;
+  return !base.startsWith("/") && !base.startsWith("./") ? `/${base}` : base;
+};
+
+export const isAbsolute = (url: string) => {
+  return url.match(/^(?:[a-z]+:)?\/\//i);
+};

package/src/toUnix.ts

@@ -1,3 +0,0 @@
-export const toUnix = (p: string) => {
-  return p.replace(/\\/g, "/").replace(/(?<!^)\/+/g, "/");
-};