@apidevtools/json-schema-ref-parser 10.1.0 → 11.0.0

package/dist/lib/refs.js

@@ -29,8 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ono_1 = require("@jsdevtools/ono");
 const ref_js_1 = __importDefault(require("./ref.js"));
 const url = __importStar(require("./util/url.js"));
-const isWindows = /^win/.test(globalThis.process ? globalThis.process.platform : "");
-const getPathFromOs = (filePath) => (isWindows ? filePath.replace(/\\/g, "/") : filePath);
+const convert_path_to_posix_1 = __importDefault(require("./util/convert-path-to-posix"));
 /**
  * When you call the resolve method, the value that gets passed to the callback function (or Promise) is a $Refs object. This same object is accessible via the parser.$refs property of $RefParser objects.
  *
@@ -49,7 +48,7 @@ class $Refs {
     paths(...types) {
         const paths = getPaths(this._$refs, types);
         return paths.map((path) => {
-            return getPathFromOs(path.decoded);
+            return (0, convert_path_to_posix_1.default)(path.decoded);
         });
     }
     /**
@@ -63,7 +62,7 @@ class $Refs {
         const $refs = this._$refs;
         const paths = getPaths($refs, types);
         return paths.reduce((obj, path) => {
-            obj[getPathFromOs(path.decoded)] = $refs[path.encoded].value;
+            obj[(0, convert_path_to_posix_1.default)(path.decoded)] = $refs[path.encoded].value;
             return obj;
         }, {});
     }

package/dist/lib/resolve-external.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -70,6 +61,7 @@ function resolveExternal(parser, options) {
  *
  * @param obj - The value to crawl. If it's not an object or array, it will be ignored.
  * @param path - The full path of `obj`, possibly with a JSON Pointer in the hash
+ * @param {boolean} external - Whether `obj` was found in an external document.
  * @param $refs
  * @param options
  * @param seen - Internal.
@@ -80,7 +72,7 @@ function resolveExternal(parser, options) {
  * If any of the JSON references point to files that contain additional JSON references,
  * then the corresponding promise will internally reference an array of promises.
  */
-function crawl(obj, path, $refs, options, seen) {
+function crawl(obj, path, $refs, options, seen, external) {
     seen || (seen = new Set());
     let promises = [];
     if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj) && !seen.has(obj)) {
@@ -88,17 +80,11 @@ function crawl(obj, path, $refs, options, seen) {
         if (ref_js_1.default.isExternal$Ref(obj)) {
             promises.push(resolve$Ref(obj, path, $refs, options));
         }
-        else {
-            for (const key of Object.keys(obj)) {
-                const keyPath = pointer_js_1.default.join(path, key);
-                const value = obj[key];
-                if (ref_js_1.default.isExternal$Ref(value)) {
-                    promises.push(resolve$Ref(value, keyPath, $refs, options));
-                }
-                else {
-                    promises = promises.concat(crawl(value, keyPath, $refs, options, seen));
-                }
-            }
+        const keys = Object.keys(obj);
+        for (const key of keys) {
+            const keyPath = pointer_js_1.default.join(path, key);
+            const value = obj[key];
+            promises = promises.concat(crawl(value, keyPath, $refs, options, seen, external));
         }
     }
     return promises;
@@ -115,34 +101,33 @@ function crawl(obj, path, $refs, options, seen) {
  * The promise resolves once all JSON references in the object have been resolved,
  * including nested references that are contained in externally-referenced files.
  */
-function resolve$Ref($ref, path, $refs, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // console.log('Resolving $ref pointer "%s" at %s', $ref.$ref, path);
-        const resolvedPath = url.resolve(path, $ref.$ref);
-        const withoutHash = url.stripHash(resolvedPath);
-        // Do we already have this $ref?
-        $ref = $refs._$refs[withoutHash];
-        if ($ref) {
-            // We've already parsed this $ref, so use the existing value
-            return Promise.resolve($ref.value);
-        }
-        // Parse the $referenced file/url
-        try {
-            const result = yield (0, parse_js_1.default)(resolvedPath, $refs, options);
-            // Crawl the parsed value
-            // console.log('Resolving $ref pointers in %s', withoutHash);
-            const promises = crawl(result, withoutHash + "#", $refs, options);
-            return Promise.all(promises);
+async function resolve$Ref($ref, path, $refs, options) {
+    // console.log('Resolving $ref pointer "%s" at %s', $ref.$ref, path);
+    const resolvedPath = url.resolve(path, $ref.$ref);
+    const withoutHash = url.stripHash(resolvedPath);
+    // $ref.$ref = url.relative($refs._root$Ref.path, resolvedPath);
+    // Do we already have this $ref?
+    $ref = $refs._$refs[withoutHash];
+    if ($ref) {
+        // We've already parsed this $ref, so use the existing value
+        return Promise.resolve($ref.value);
+    }
+    // Parse the $referenced file/url
+    try {
+        const result = await (0, parse_js_1.default)(resolvedPath, $refs, options);
+        // Crawl the parsed value
+        // console.log('Resolving $ref pointers in %s', withoutHash);
+        const promises = crawl(result, withoutHash + "#", $refs, options, new Set(), true);
+        return Promise.all(promises);
+    }
+    catch (err) {
+        if (!options?.continueOnError || !(0, errors_js_1.isHandledError)(err)) {
+            throw err;
         }
-        catch (err) {
-            if (!(options === null || options === void 0 ? void 0 : options.continueOnError) || !(0, errors_js_1.isHandledError)(err)) {
-                throw err;
-            }
-            if ($refs._$refs[withoutHash]) {
-                err.source = decodeURI(url.stripHash(path));
-                err.path = url.safePointerToPath(url.getHash(path));
-            }
-            return [];
+        if ($refs._$refs[withoutHash]) {
+            err.source = decodeURI(url.stripHash(path));
+            err.path = url.safePointerToPath(url.getHash(path));
         }
-    });
+        return [];
+    }
 }

package/dist/lib/resolvers/file.js

@@ -22,20 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const promises_1 = __importDefault(require("fs/promises"));
+const fs_1 = require("fs");
 const ono_1 = require("@jsdevtools/ono");
 const url = __importStar(require("../util/url.js"));
 const errors_js_1 = require("../util/errors.js");
@@ -55,22 +43,20 @@ exports.default = {
     /**
      * Reads the given file and returns its raw contents as a Buffer.
      */
-    read(file) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let path;
-            try {
-                path = url.toFileSystemPath(file.url);
-            }
-            catch (err) {
-                throw new errors_js_1.ResolverError(ono_1.ono.uri(err, `Malformed URI: ${file.url}`), file.url);
-            }
-            try {
-                const data = yield promises_1.default.readFile(path);
-                return data;
-            }
-            catch (err) {
-                throw new errors_js_1.ResolverError((0, ono_1.ono)(err, `Error opening file "${path}"`), path);
-            }
-        });
+    async read(file) {
+        let path;
+        try {
+            path = url.toFileSystemPath(file.url);
+        }
+        catch (err) {
+            throw new errors_js_1.ResolverError(ono_1.ono.uri(err, `Malformed URI: ${file.url}`), file.url);
+        }
+        try {
+            const data = await fs_1.promises.readFile(path);
+            return data;
+        }
+        catch (err) {
+            throw new errors_js_1.ResolverError((0, ono_1.ono)(err, `Error opening file "${path}"`), path);
+        }
     },
 };

package/dist/lib/resolvers/http.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ono_1 = require("@jsdevtools/ono");
 const url = __importStar(require("../util/url.js"));
@@ -89,71 +80,67 @@ exports.default = {
  * @returns
  * The promise resolves with the raw downloaded data, or rejects if there is an HTTP error.
  */
-function download(u, httpOptions, _redirects) {
-    return __awaiter(this, void 0, void 0, function* () {
-        u = url.parse(u);
-        const redirects = _redirects || [];
-        redirects.push(u.href);
-        try {
-            const res = yield get(u, httpOptions);
-            if (res.status >= 400) {
-                throw (0, ono_1.ono)({ status: res.status }, `HTTP ERROR ${res.status}`);
+async function download(u, httpOptions, _redirects) {
+    u = url.parse(u);
+    const redirects = _redirects || [];
+    redirects.push(u.href);
+    try {
+        const res = await get(u, httpOptions);
+        if (res.status >= 400) {
+            throw (0, ono_1.ono)({ status: res.status }, `HTTP ERROR ${res.status}`);
+        }
+        else if (res.status >= 300) {
+            if (!Number.isNaN(httpOptions.redirects) && redirects.length > httpOptions.redirects) {
+                throw new errors_js_1.ResolverError((0, ono_1.ono)({ status: res.status }, `Error downloading ${redirects[0]}. \nToo many redirects: \n  ${redirects.join(" \n  ")}`));
             }
-            else if (res.status >= 300) {
-                if (!Number.isNaN(httpOptions.redirects) && redirects.length > httpOptions.redirects) {
-                    throw new errors_js_1.ResolverError((0, ono_1.ono)({ status: res.status }, `Error downloading ${redirects[0]}. \nToo many redirects: \n  ${redirects.join(" \n  ")}`));
-                }
-                else if (!("location" in res.headers) || !res.headers.location) {
-                    throw (0, ono_1.ono)({ status: res.status }, `HTTP ${res.status} redirect with no location header`);
-                }
-                else {
-                    const redirectTo = url.resolve(u, res.headers.location);
-                    return download(redirectTo, httpOptions, redirects);
-                }
+            else if (!("location" in res.headers) || !res.headers.location) {
+                throw (0, ono_1.ono)({ status: res.status }, `HTTP ${res.status} redirect with no location header`);
             }
             else {
-                if (res.body) {
-                    const buf = yield res.arrayBuffer();
-                    return Buffer.from(buf);
-                }
-                return Buffer.alloc(0);
+                const redirectTo = url.resolve(u, res.headers.location);
+                return download(redirectTo, httpOptions, redirects);
             }
         }
-        catch (err) {
-            throw new errors_js_1.ResolverError((0, ono_1.ono)(err, `Error downloading ${u.href}`), u.href);
+        else {
+            if (res.body) {
+                const buf = await res.arrayBuffer();
+                return Buffer.from(buf);
+            }
+            return Buffer.alloc(0);
         }
-    });
+    }
+    catch (err) {
+        throw new errors_js_1.ResolverError((0, ono_1.ono)(err, `Error downloading ${u.href}`), u.href);
+    }
 }
 /**
  * Sends an HTTP GET request.
  * The promise resolves with the HTTP Response object.
  */
-function get(u, httpOptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let controller;
-        let timeoutId;
-        if (httpOptions.timeout) {
-            controller = new AbortController();
-            timeoutId = setTimeout(() => controller.abort(), httpOptions.timeout);
-        }
-        if (!global.fetch) {
-            const { default: fetch, Request, Headers } = yield Promise.resolve().then(() => __importStar(require("node-fetch")));
-            // @ts-ignore
-            global.fetch = fetch;
-            // @ts-ignore
-            global.Request = Request;
-            // @ts-ignore
-            global.Headers = Headers;
-        }
-        const response = yield fetch(u, {
-            method: "GET",
-            headers: httpOptions.headers || {},
-            credentials: httpOptions.withCredentials ? "include" : "same-origin",
-            signal: controller ? controller.signal : null,
-        });
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-        return response;
+async function get(u, httpOptions) {
+    let controller;
+    let timeoutId;
+    if (httpOptions.timeout) {
+        controller = new AbortController();
+        timeoutId = setTimeout(() => controller.abort(), httpOptions.timeout);
+    }
+    if (!global.fetch) {
+        const { default: fetch, Request, Headers } = await Promise.resolve().then(() => __importStar(require("node-fetch")));
+        // @ts-ignore
+        global.fetch = fetch;
+        // @ts-ignore
+        global.Request = Request;
+        // @ts-ignore
+        global.Headers = Headers;
+    }
+    const response = await fetch(u, {
+        method: "GET",
+        headers: httpOptions.headers || {},
+        credentials: httpOptions.withCredentials ? "include" : "same-origin",
+        signal: controller ? controller.signal : null,
     });
+    if (timeoutId) {
+        clearTimeout(timeoutId);
+    }
+    return response;
 }

package/dist/lib/util/convert-path-to-posix.d.ts

@@ -0,0 +1 @@
+export default function convertPathToPosix(filePath: string): string;

package/dist/lib/util/convert-path-to-posix.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+function convertPathToPosix(filePath) {
+    const isExtendedLengthPath = filePath.startsWith("\\\\?\\");
+    if (isExtendedLengthPath) {
+        return filePath;
+    }
+    return filePath.split(path_1.default.win32.sep).join(path_1.default.posix.sep);
+}
+exports.default = convertPathToPosix;

package/dist/lib/util/is-windows.d.ts

@@ -0,0 +1 @@
+export declare const isWindows: () => boolean;

package/dist/lib/util/is-windows.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isWindows = void 0;
+const isWindowsConst = /^win/.test(globalThis.process ? globalThis.process.platform : "");
+const isWindows = () => isWindowsConst;
+exports.isWindows = isWindows;

package/dist/lib/util/plugins.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = exports.sort = exports.filter = exports.all = void 0;
 /**
@@ -56,62 +47,60 @@ exports.sort = sort;
  * If the promise rejects, or the callback is called with an error, then the next plugin is called.
  * If ALL plugins fail, then the last error is thrown.
  */
-function run(plugins, method, file, $refs) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let plugin;
-        let lastError;
-        let index = 0;
-        return new Promise((resolve, reject) => {
-            runNextPlugin();
-            function runNextPlugin() {
-                plugin = plugins[index++];
-                if (!plugin) {
-                    // There are no more functions, so re-throw the last error
-                    return reject(lastError);
-                }
-                try {
-                    // console.log('  %s', plugin.name);
-                    const result = getResult(plugin, method, file, callback, $refs);
-                    if (result && typeof result.then === "function") {
-                        // A promise was returned
-                        result.then(onSuccess, onError);
-                    }
-                    else if (result !== undefined) {
-                        // A synchronous result was returned
-                        onSuccess(result);
-                    }
-                    else if (index === plugins.length) {
-                        throw new Error("No promise has been returned or callback has been called.");
-                    }
-                }
-                catch (e) {
-                    onError(e);
-                }
+async function run(plugins, method, file, $refs) {
+    let plugin;
+    let lastError;
+    let index = 0;
+    return new Promise((resolve, reject) => {
+        runNextPlugin();
+        function runNextPlugin() {
+            plugin = plugins[index++];
+            if (!plugin) {
+                // There are no more functions, so re-throw the last error
+                return reject(lastError);
             }
-            function callback(err, result) {
-                if (err) {
-                    onError(err);
+            try {
+                // console.log('  %s', plugin.name);
+                const result = getResult(plugin, method, file, callback, $refs);
+                if (result && typeof result.then === "function") {
+                    // A promise was returned
+                    result.then(onSuccess, onError);
                 }
-                else {
+                else if (result !== undefined) {
+                    // A synchronous result was returned
                     onSuccess(result);
                 }
+                else if (index === plugins.length) {
+                    throw new Error("No promise has been returned or callback has been called.");
+                }
             }
-            function onSuccess(result) {
-                // console.log('    success');
-                resolve({
-                    plugin,
-                    result,
-                });
+            catch (e) {
+                onError(e);
             }
-            function onError(error) {
-                // console.log('    %s', err.message || err);
-                lastError = {
-                    plugin,
-                    error,
-                };
-                runNextPlugin();
+        }
+        function callback(err, result) {
+            if (err) {
+                onError(err);
+            }
+            else {
+                onSuccess(result);
             }
-        });
+        }
+        function onSuccess(result) {
+            // console.log('    success');
+            resolve({
+                plugin,
+                result,
+            });
+        }
+        function onError(error) {
+            // console.log('    %s', err.message || err);
+            lastError = {
+                plugin,
+                error,
+            };
+            runNextPlugin();
+        }
     });
 }
 exports.run = run;

package/dist/lib/util/url.d.ts

@@ -17,7 +17,7 @@ export declare function cwd(): string;
  * @param path
  * @returns
  */
-export declare function getProtocol(path: any): string | undefined;
+export declare function getProtocol(path: string | undefined): string | undefined;
 /**
  * Returns the lowercased file extension of the given URL,
  * or an empty string if it has no extension.
@@ -62,7 +62,7 @@ export declare function isHttp(path: any): boolean;
  * @param path
  * @returns
  */
-export declare function isFileSystemPath(path: any): boolean;
+export declare function isFileSystemPath(path: string | undefined): boolean;
 /**
  * Converts a filesystem path to a properly-encoded URL.
  *
@@ -91,3 +91,4 @@ export declare function toFileSystemPath(path: string | undefined, keepFileProto
  * @returns
  */
 export declare function safePointerToPath(pointer: any): any;
+export declare function relative(from: string | undefined, to: string | undefined): string;

package/dist/lib/util/url.js

@@ -1,9 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safePointerToPath = exports.toFileSystemPath = exports.fromFileSystemPath = exports.isFileSystemPath = exports.isHttp = exports.stripHash = exports.getHash = exports.stripQuery = exports.getExtension = exports.getProtocol = exports.cwd = exports.resolve = exports.parse = void 0;
-const isWindows = /^win/.test(globalThis.process ? globalThis.process.platform : ""), forwardSlashPattern = /\//g, protocolPattern = /^(\w{2,}):\/\//i, jsonPointerSlash = /~1/g, jsonPointerTilde = /~0/g;
-const path_1 = require("path");
-const projectDir = (0, path_1.join)(__dirname, "..", "..");
+exports.relative = exports.safePointerToPath = exports.toFileSystemPath = exports.fromFileSystemPath = exports.isFileSystemPath = exports.isHttp = exports.stripHash = exports.getHash = exports.stripQuery = exports.getExtension = exports.getProtocol = exports.cwd = exports.resolve = exports.parse = void 0;
+const convert_path_to_posix_1 = __importDefault(require("./convert-path-to-posix"));
+const path_1 = __importStar(require("path"));
+const forwardSlashPattern = /\//g;
+const protocolPattern = /^(\w{2,}):\/\//i;
+const jsonPointerSlash = /~1/g;
+const jsonPointerTilde = /~0/g;
+const path_2 = require("path");
+const is_windows_1 = require("./is-windows");
+const projectDir = (0, path_2.join)(__dirname, "..", "..");
 // RegExp patterns to URL-encode special characters in local filesystem paths
 const urlEncodePatterns = [/\?/g, "%3F", /#/g, "%23"];
 // RegExp patterns to URL-decode special characters for local filesystem paths
@@ -51,7 +83,7 @@ exports.cwd = cwd;
  * @returns
  */
 function getProtocol(path) {
-    const match = protocolPattern.exec(path);
+    const match = protocolPattern.exec(path || "");
     if (match) {
         return match[1].toLowerCase();
     }
@@ -173,15 +205,17 @@ exports.isFileSystemPath = isFileSystemPath;
 function fromFileSystemPath(path) {
     // Step 1: On Windows, replace backslashes with forward slashes,
     // rather than encoding them as "%5C"
-    if (isWindows) {
-        const hasProjectDir = path.toUpperCase().includes(projectDir.replace(/\\/g, "\\").toUpperCase());
-        const hasProjectUri = path.toUpperCase().includes(projectDir.replace(/\\/g, "/").toUpperCase());
-        if (hasProjectDir || hasProjectUri) {
-            path = path.replace(/\\/g, "/");
-        }
-        else {
-            path = `${projectDir}/${path}`.replace(/\\/g, "/");
+    if ((0, is_windows_1.isWindows)()) {
+        const upperPath = path.toUpperCase();
+        const projectDirPosixPath = (0, convert_path_to_posix_1.default)(projectDir);
+        const posixUpper = projectDirPosixPath.toUpperCase();
+        const hasProjectDir = upperPath.includes(posixUpper);
+        const hasProjectUri = upperPath.includes(posixUpper);
+        const isAbsolutePath = path_1.win32.isAbsolute(path);
+        if (!(hasProjectDir || hasProjectUri || isAbsolutePath)) {
+            path = (0, path_2.join)(projectDir, path);
         }
+        path = (0, convert_path_to_posix_1.default)(path);
     }
     // Step 2: `encodeURI` will take care of MOST characters
     path = encodeURI(path);
@@ -213,7 +247,7 @@ function toFileSystemPath(path, keepFileProtocol) {
         // Strip-off the protocol, and the initial "/", if there is one
         path = path[7] === "/" ? path.substr(8) : path.substr(7);
         // insert a colon (":") after the drive letter on Windows
-        if (isWindows && path[1] === "/") {
+        if ((0, is_windows_1.isWindows)() && path[1] === "/") {
             path = path[0] + ":" + path.substr(1);
         }
         if (keepFileProtocol) {
@@ -225,11 +259,11 @@ function toFileSystemPath(path, keepFileProtocol) {
             // On Windows, it will start with something like "C:/".
             // On Posix, it will start with "/"
             isFileUrl = false;
-            path = isWindows ? path : "/" + path;
+            path = (0, is_windows_1.isWindows)() ? path : "/" + path;
         }
     }
     // Step 4: Normalize Windows paths (unless it's a "file://" URL)
-    if (isWindows && !isFileUrl) {
+    if ((0, is_windows_1.isWindows)() && !isFileUrl) {
         // Replace forward slashes with backslashes
         path = path.replace(forwardSlashPattern, "\\");
         // Capitalize the drive letter
@@ -258,3 +292,13 @@ function safePointerToPath(pointer) {
     });
 }
 exports.safePointerToPath = safePointerToPath;
+function relative(from, to) {
+    if (!isFileSystemPath(from) || !isFileSystemPath(to)) {
+        return resolve(from, to);
+    }
+    const fromDir = path_1.default.dirname(stripHash(from));
+    const toPath = stripHash(to);
+    const result = path_1.default.relative(fromDir, toPath);
+    return result + getHash(to);
+}
+exports.relative = relative;

package/dist/vite.config.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("vitest/dist/config").UserConfigExport;
+declare const _default: import("vite").UserConfig;
 export default _default;