@vitest/utils 4.1.0-beta.4 → 4.1.0-beta.6

package/README.md

@@ -0,0 +1,7 @@
+# @vitest/utils
+
+[![NPM version](https://img.shields.io/npm/v/@vitest/utils?color=a1b858&label=)](https://npmx.dev/package/@vitest/utils)
+
+Internal shared utilities used by other Vitest packages.
+
+[GitHub](https://github.com/vitest-dev/vitest/tree/main/packages/utils) | [Documentation](https://vitest.dev/)

package/dist/diff.js

@@ -2012,8 +2012,8 @@ function diff(a, b, options) {
 		}
 		aDisplay = truncate(aDisplay);
 		bDisplay = truncate(bDisplay);
-		const aDiff = `${aColor(`${aIndicator} ${aAnnotation}:`)} \n${aDisplay}`;
-		const bDiff = `${bColor(`${bIndicator} ${bAnnotation}:`)} \n${bDisplay}`;
+		const aDiff = `${aColor(`${aIndicator} ${aAnnotation}:`)}\n${aDisplay}`;
+		const bDiff = `${bColor(`${bIndicator} ${bAnnotation}:`)}\n${bDisplay}`;
 		return `${aDiff}\n\n${bDiff}`;
 	}
 	if (omitDifference) {

package/dist/helpers.d.ts

@@ -61,6 +61,7 @@ declare function createDefer<T>(): DeferPromise<T>;
 */
 declare function getCallLastIndex(code: string): number | null;
 declare function isNegativeNaN(val: number): boolean;
+declare function ordinal(i: number): string;
 /**
 * Deep merge :P
 *
@@ -71,5 +72,5 @@ declare function isNegativeNaN(val: number): boolean;
 declare function deepMerge<T extends object = object>(target: T, ...sources: any[]): T;
 declare function unique<T>(array: T[]): T[];
 
-export { assertTypes, cleanUrl, clone, createDefer, createSimpleStackTrace, deepClone, deepMerge, filterOutComments, getCallLastIndex, getOwnProperties, getType, isBareImport, isExternalUrl, isNegativeNaN, isObject, isPrimitive, nanoid, noop, notNullish, objectAttr, shuffle, slash, toArray, unique, unwrapId, withTrailingSlash, wrapId };
+export { assertTypes, cleanUrl, clone, createDefer, createSimpleStackTrace, deepClone, deepMerge, filterOutComments, getCallLastIndex, getOwnProperties, getType, isBareImport, isExternalUrl, isNegativeNaN, isObject, isPrimitive, nanoid, noop, notNullish, objectAttr, ordinal, shuffle, slash, toArray, unique, unwrapId, withTrailingSlash, wrapId };
 export type { DeferPromise };

package/dist/helpers.js

@@ -286,6 +286,20 @@ function isPlainObject(val) {
 function isMergeableObject(item) {
 	return isPlainObject(item) && !Array.isArray(item);
 }
+function ordinal(i) {
+	const j = i % 10;
+	const k = i % 100;
+	if (j === 1 && k !== 11) {
+		return `${i}st`;
+	}
+	if (j === 2 && k !== 12) {
+		return `${i}nd`;
+	}
+	if (j === 3 && k !== 13) {
+		return `${i}rd`;
+	}
+	return `${i}th`;
+}
 /**
 * Deep merge :P
 *
@@ -320,4 +334,4 @@ function unique(array) {
 	return Array.from(new Set(array));
 }
 
-export { assertTypes, cleanUrl, clone, createDefer, createSimpleStackTrace, deepClone, deepMerge, filterOutComments, getCallLastIndex, getOwnProperties, getType, isBareImport, isExternalUrl, isNegativeNaN, isObject, isPrimitive, nanoid, noop, notNullish, objectAttr, shuffle, slash, toArray, unique, unwrapId, withTrailingSlash, wrapId };
+export { assertTypes, cleanUrl, clone, createDefer, createSimpleStackTrace, deepClone, deepMerge, filterOutComments, getCallLastIndex, getOwnProperties, getType, isBareImport, isExternalUrl, isNegativeNaN, isObject, isPrimitive, nanoid, noop, notNullish, objectAttr, ordinal, shuffle, slash, toArray, unique, unwrapId, withTrailingSlash, wrapId };

package/dist/source-map/node.d.ts

@@ -0,0 +1,6 @@
+interface ExtractedSourceMap {
+	map: any;
+}
+declare function extractSourcemapFromFile(code: string, filePath: string): ExtractedSourceMap | undefined;
+
+export { extractSourcemapFromFile };

package/dist/source-map/node.js

@@ -0,0 +1,23 @@
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+import convertSourceMap from 'convert-source-map';
+
+// based on vite
+// https://github.com/vitejs/vite/blob/84079a84ad94de4c1ef4f1bdb2ab448ff2c01196/packages/vite/src/node/server/sourcemap.ts#L149
+function extractSourcemapFromFile(code, filePath) {
+	const map = (convertSourceMap.fromSource(code) || convertSourceMap.fromMapFileSource(code, createConvertSourceMapReadMap(filePath)))?.toObject();
+	return map ? { map } : undefined;
+}
+function createConvertSourceMapReadMap(originalFileName) {
+	return (filename) => {
+		// convertSourceMap can detect invalid filename from comments.
+		// fallback to empty source map to avoid errors.
+		const targetPath = path.resolve(path.dirname(originalFileName), filename);
+		if (existsSync(targetPath)) {
+			return readFileSync(targetPath, "utf-8");
+		}
+		return "{}";
+	};
+}
+
+export { extractSourcemapFromFile };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@vitest/utils",
   "type": "module",
-  "version": "4.1.0-beta.4",
+  "version": "4.1.0-beta.6",
   "description": "Shared Vitest utility functions",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
-  "homepage": "https://github.com/vitest-dev/vitest/tree/main/packages/utils#readme",
+  "homepage": "https://github.com/vitest-dev/vitest/tree/main/packages/utils",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vitest-dev/vitest.git",
@@ -56,6 +56,10 @@
       "types": "./dist/source-map.d.ts",
       "default": "./dist/source-map.js"
     },
+    "./source-map/node": {
+      "types": "./dist/source-map/node.d.ts",
+      "default": "./dist/source-map/node.js"
+    },
     "./serialize": {
       "types": "./dist/serialize.d.ts",
       "default": "./dist/serialize.js"
@@ -69,6 +73,9 @@
     "*": {
       "source-map": [
         "dist/source-map.d.ts"
+      ],
+      "source-map/node": [
+        "dist/source-map/node.d.ts"
       ]
     }
   },
@@ -77,11 +84,13 @@
     "dist"
   ],
   "dependencies": {
+    "convert-source-map": "^2.0.0",
     "tinyrainbow": "^3.0.3",
-    "@vitest/pretty-format": "4.1.0-beta.4"
+    "@vitest/pretty-format": "4.1.0-beta.6"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "0.3.31",
+    "@types/convert-source-map": "^2.0.3",
     "@types/estree": "^1.0.8",
     "diff-sequences": "^29.6.3",
     "loupe": "^3.2.1"