prisma-to-zod-v4 0.5.8 → 0.5.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +902 -843
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -174,16 +174,16 @@ var require_util = __commonJS({
|
|
|
174
174
|
}
|
|
175
175
|
exports2.urlGenerate = urlGenerate;
|
|
176
176
|
function normalize(aPath) {
|
|
177
|
-
var
|
|
177
|
+
var path3 = aPath;
|
|
178
178
|
var url = urlParse(aPath);
|
|
179
179
|
if (url) {
|
|
180
180
|
if (!url.path) {
|
|
181
181
|
return aPath;
|
|
182
182
|
}
|
|
183
|
-
|
|
183
|
+
path3 = url.path;
|
|
184
184
|
}
|
|
185
|
-
var isAbsolute = exports2.isAbsolute(
|
|
186
|
-
var parts =
|
|
185
|
+
var isAbsolute = exports2.isAbsolute(path3);
|
|
186
|
+
var parts = path3.split(/\/+/);
|
|
187
187
|
for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
|
|
188
188
|
part = parts[i];
|
|
189
189
|
if (part === ".") {
|
|
@@ -200,15 +200,15 @@ var require_util = __commonJS({
|
|
|
200
200
|
}
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
|
-
|
|
204
|
-
if (
|
|
205
|
-
|
|
203
|
+
path3 = parts.join("/");
|
|
204
|
+
if (path3 === "") {
|
|
205
|
+
path3 = isAbsolute ? "/" : ".";
|
|
206
206
|
}
|
|
207
207
|
if (url) {
|
|
208
|
-
url.path =
|
|
208
|
+
url.path = path3;
|
|
209
209
|
return urlGenerate(url);
|
|
210
210
|
}
|
|
211
|
-
return
|
|
211
|
+
return path3;
|
|
212
212
|
}
|
|
213
213
|
exports2.normalize = normalize;
|
|
214
214
|
function join(aRoot, aPath) {
|
|
@@ -1838,7 +1838,7 @@ var require_source_map_support = __commonJS({
|
|
|
1838
1838
|
"node_modules/source-map-support/source-map-support.js"(exports2, module2) {
|
|
1839
1839
|
"use strict";
|
|
1840
1840
|
var SourceMapConsumer = require_source_map().SourceMapConsumer;
|
|
1841
|
-
var
|
|
1841
|
+
var path3 = require("path");
|
|
1842
1842
|
var fs;
|
|
1843
1843
|
try {
|
|
1844
1844
|
fs = require("fs");
|
|
@@ -1899,18 +1899,18 @@ var require_source_map_support = __commonJS({
|
|
|
1899
1899
|
};
|
|
1900
1900
|
}
|
|
1901
1901
|
var retrieveFile = handlerExec(retrieveFileHandlers);
|
|
1902
|
-
retrieveFileHandlers.push(function(
|
|
1903
|
-
|
|
1904
|
-
if (/^file:/.test(
|
|
1905
|
-
|
|
1902
|
+
retrieveFileHandlers.push(function(path4) {
|
|
1903
|
+
path4 = path4.trim();
|
|
1904
|
+
if (/^file:/.test(path4)) {
|
|
1905
|
+
path4 = path4.replace(/file:\/\/\/(\w:)?/, function(protocol, drive) {
|
|
1906
1906
|
return drive ? "" : (
|
|
1907
1907
|
// file:///C:/dir/file -> C:/dir/file
|
|
1908
1908
|
"/"
|
|
1909
1909
|
);
|
|
1910
1910
|
});
|
|
1911
1911
|
}
|
|
1912
|
-
if (
|
|
1913
|
-
return fileContentsCache[
|
|
1912
|
+
if (path4 in fileContentsCache) {
|
|
1913
|
+
return fileContentsCache[path4];
|
|
1914
1914
|
}
|
|
1915
1915
|
var contents = "";
|
|
1916
1916
|
try {
|
|
@@ -1918,7 +1918,7 @@ var require_source_map_support = __commonJS({
|
|
|
1918
1918
|
var xhr = new XMLHttpRequest();
|
|
1919
1919
|
xhr.open(
|
|
1920
1920
|
"GET",
|
|
1921
|
-
|
|
1921
|
+
path4,
|
|
1922
1922
|
/** async */
|
|
1923
1923
|
false
|
|
1924
1924
|
);
|
|
@@ -1926,24 +1926,24 @@ var require_source_map_support = __commonJS({
|
|
|
1926
1926
|
if (xhr.readyState === 4 && xhr.status === 200) {
|
|
1927
1927
|
contents = xhr.responseText;
|
|
1928
1928
|
}
|
|
1929
|
-
} else if (fs.existsSync(
|
|
1930
|
-
contents = fs.readFileSync(
|
|
1929
|
+
} else if (fs.existsSync(path4)) {
|
|
1930
|
+
contents = fs.readFileSync(path4, "utf8");
|
|
1931
1931
|
}
|
|
1932
1932
|
} catch (er) {
|
|
1933
1933
|
}
|
|
1934
|
-
return fileContentsCache[
|
|
1934
|
+
return fileContentsCache[path4] = contents;
|
|
1935
1935
|
});
|
|
1936
1936
|
function supportRelativeURL(file, url) {
|
|
1937
1937
|
if (!file) return url;
|
|
1938
|
-
var dir =
|
|
1938
|
+
var dir = path3.dirname(file);
|
|
1939
1939
|
var match = /^\w+:\/\/[^\/]*/.exec(dir);
|
|
1940
1940
|
var protocol = match ? match[0] : "";
|
|
1941
1941
|
var startPath = dir.slice(protocol.length);
|
|
1942
1942
|
if (protocol && /^\/\w\:/.test(startPath)) {
|
|
1943
1943
|
protocol += "/";
|
|
1944
|
-
return protocol +
|
|
1944
|
+
return protocol + path3.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
|
|
1945
1945
|
}
|
|
1946
|
-
return protocol +
|
|
1946
|
+
return protocol + path3.resolve(dir.slice(protocol.length), url);
|
|
1947
1947
|
}
|
|
1948
1948
|
function retrieveSourceMapURL(source) {
|
|
1949
1949
|
var fileData;
|
|
@@ -10179,17 +10179,17 @@ ${lanes.join("\n")}
|
|
|
10179
10179
|
}
|
|
10180
10180
|
function createSingleWatcherPerName(cache, useCaseSensitiveFileNames2, name, callback, createWatcher) {
|
|
10181
10181
|
const toCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
|
|
10182
|
-
const
|
|
10183
|
-
const existing = cache.get(
|
|
10182
|
+
const path3 = toCanonicalFileName(name);
|
|
10183
|
+
const existing = cache.get(path3);
|
|
10184
10184
|
if (existing) {
|
|
10185
10185
|
existing.callbacks.push(callback);
|
|
10186
10186
|
} else {
|
|
10187
|
-
cache.set(
|
|
10187
|
+
cache.set(path3, {
|
|
10188
10188
|
watcher: createWatcher(
|
|
10189
10189
|
// Cant infer types correctly so lets satisfy checker
|
|
10190
10190
|
(param1, param2, param3) => {
|
|
10191
10191
|
var _a;
|
|
10192
|
-
return (_a = cache.get(
|
|
10192
|
+
return (_a = cache.get(path3)) == null ? void 0 : _a.callbacks.slice().forEach((cb) => cb(param1, param2, param3));
|
|
10193
10193
|
}
|
|
10194
10194
|
),
|
|
10195
10195
|
callbacks: [callback]
|
|
@@ -10197,10 +10197,10 @@ ${lanes.join("\n")}
|
|
|
10197
10197
|
}
|
|
10198
10198
|
return {
|
|
10199
10199
|
close: () => {
|
|
10200
|
-
const watcher = cache.get(
|
|
10200
|
+
const watcher = cache.get(path3);
|
|
10201
10201
|
if (!watcher) return;
|
|
10202
10202
|
if (!orderedRemoveItem(watcher.callbacks, callback) || watcher.callbacks.length) return;
|
|
10203
|
-
cache.delete(
|
|
10203
|
+
cache.delete(path3);
|
|
10204
10204
|
closeFileWatcherOf(watcher);
|
|
10205
10205
|
}
|
|
10206
10206
|
};
|
|
@@ -10452,13 +10452,13 @@ ${lanes.join("\n")}
|
|
|
10452
10452
|
(newChildWatches || (newChildWatches = [])).push(childWatcher);
|
|
10453
10453
|
}
|
|
10454
10454
|
}
|
|
10455
|
-
function isIgnoredPath(
|
|
10456
|
-
return some(ignoredPaths, (searchPath) => isInPath(
|
|
10455
|
+
function isIgnoredPath(path3, options) {
|
|
10456
|
+
return some(ignoredPaths, (searchPath) => isInPath(path3, searchPath)) || isIgnoredByWatchOptions(path3, options, useCaseSensitiveFileNames2, getCurrentDirectory);
|
|
10457
10457
|
}
|
|
10458
|
-
function isInPath(
|
|
10459
|
-
if (
|
|
10458
|
+
function isInPath(path3, searchPath) {
|
|
10459
|
+
if (path3.includes(searchPath)) return true;
|
|
10460
10460
|
if (useCaseSensitiveFileNames2) return false;
|
|
10461
|
-
return toCanonicalFilePath(
|
|
10461
|
+
return toCanonicalFilePath(path3).includes(searchPath);
|
|
10462
10462
|
}
|
|
10463
10463
|
}
|
|
10464
10464
|
var FileSystemEntryKind = /* @__PURE__ */ ((FileSystemEntryKind2) => {
|
|
@@ -10836,8 +10836,8 @@ ${lanes.join("\n")}
|
|
|
10836
10836
|
}
|
|
10837
10837
|
function patchWriteFileEnsuringDirectory(sys2) {
|
|
10838
10838
|
const originalWriteFile = sys2.writeFile;
|
|
10839
|
-
sys2.writeFile = (
|
|
10840
|
-
|
|
10839
|
+
sys2.writeFile = (path3, data, writeBom) => writeFileEnsuringDirectories(
|
|
10840
|
+
path3,
|
|
10841
10841
|
data,
|
|
10842
10842
|
!!writeBom,
|
|
10843
10843
|
(path22, data2, writeByteOrderMark) => originalWriteFile.call(sys2, path22, data2, writeByteOrderMark),
|
|
@@ -10881,7 +10881,7 @@ ${lanes.join("\n")}
|
|
|
10881
10881
|
// Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
|
|
10882
10882
|
// (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
|
|
10883
10883
|
fsSupportsRecursiveFsWatch,
|
|
10884
|
-
getAccessibleSortedChildDirectories: (
|
|
10884
|
+
getAccessibleSortedChildDirectories: (path3) => getAccessibleFileSystemEntries(path3).directories,
|
|
10885
10885
|
realpath,
|
|
10886
10886
|
tscWatchFile: process.env.TSC_WATCHFILE,
|
|
10887
10887
|
useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
|
|
@@ -10908,7 +10908,7 @@ ${lanes.join("\n")}
|
|
|
10908
10908
|
watchFile: watchFile2,
|
|
10909
10909
|
watchDirectory,
|
|
10910
10910
|
preferNonRecursiveWatch: !fsSupportsRecursiveFsWatch,
|
|
10911
|
-
resolvePath: (
|
|
10911
|
+
resolvePath: (path3) => _path.resolve(path3),
|
|
10912
10912
|
fileExists,
|
|
10913
10913
|
directoryExists,
|
|
10914
10914
|
getAccessibleFileSystemEntries,
|
|
@@ -10943,8 +10943,8 @@ ${lanes.join("\n")}
|
|
|
10943
10943
|
}
|
|
10944
10944
|
return process.memoryUsage().heapUsed;
|
|
10945
10945
|
},
|
|
10946
|
-
getFileSize(
|
|
10947
|
-
const stat =
|
|
10946
|
+
getFileSize(path3) {
|
|
10947
|
+
const stat = statSync2(path3);
|
|
10948
10948
|
if (stat == null ? void 0 : stat.isFile()) {
|
|
10949
10949
|
return stat.size;
|
|
10950
10950
|
}
|
|
@@ -10988,14 +10988,14 @@ ${lanes.join("\n")}
|
|
|
10988
10988
|
}
|
|
10989
10989
|
};
|
|
10990
10990
|
return nodeSystem;
|
|
10991
|
-
function
|
|
10991
|
+
function statSync2(path3) {
|
|
10992
10992
|
try {
|
|
10993
|
-
return _fs.statSync(
|
|
10993
|
+
return _fs.statSync(path3, statSyncOptions);
|
|
10994
10994
|
} catch {
|
|
10995
10995
|
return void 0;
|
|
10996
10996
|
}
|
|
10997
10997
|
}
|
|
10998
|
-
function enableCPUProfiler(
|
|
10998
|
+
function enableCPUProfiler(path3, cb) {
|
|
10999
10999
|
if (activeSession) {
|
|
11000
11000
|
cb();
|
|
11001
11001
|
return false;
|
|
@@ -11010,7 +11010,7 @@ ${lanes.join("\n")}
|
|
|
11010
11010
|
session.post("Profiler.enable", () => {
|
|
11011
11011
|
session.post("Profiler.start", () => {
|
|
11012
11012
|
activeSession = session;
|
|
11013
|
-
profilePath =
|
|
11013
|
+
profilePath = path3;
|
|
11014
11014
|
cb();
|
|
11015
11015
|
});
|
|
11016
11016
|
});
|
|
@@ -11047,7 +11047,7 @@ ${lanes.join("\n")}
|
|
|
11047
11047
|
activeSession.post("Profiler.stop", (err, { profile }) => {
|
|
11048
11048
|
var _a;
|
|
11049
11049
|
if (!err) {
|
|
11050
|
-
if ((_a =
|
|
11050
|
+
if ((_a = statSync2(profilePath)) == null ? void 0 : _a.isDirectory()) {
|
|
11051
11051
|
profilePath = _path.join(profilePath, `${(/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-")}+P${process.pid}.cpuprofile`);
|
|
11052
11052
|
}
|
|
11053
11053
|
try {
|
|
@@ -11154,9 +11154,9 @@ ${lanes.join("\n")}
|
|
|
11154
11154
|
}
|
|
11155
11155
|
}
|
|
11156
11156
|
}
|
|
11157
|
-
function getAccessibleFileSystemEntries(
|
|
11157
|
+
function getAccessibleFileSystemEntries(path3) {
|
|
11158
11158
|
try {
|
|
11159
|
-
const entries = _fs.readdirSync(
|
|
11159
|
+
const entries = _fs.readdirSync(path3 || ".", { withFileTypes: true });
|
|
11160
11160
|
const files = [];
|
|
11161
11161
|
const directories = [];
|
|
11162
11162
|
for (const dirent of entries) {
|
|
@@ -11166,8 +11166,8 @@ ${lanes.join("\n")}
|
|
|
11166
11166
|
}
|
|
11167
11167
|
let stat;
|
|
11168
11168
|
if (typeof dirent === "string" || dirent.isSymbolicLink()) {
|
|
11169
|
-
const name = combinePaths(
|
|
11170
|
-
stat =
|
|
11169
|
+
const name = combinePaths(path3, entry);
|
|
11170
|
+
stat = statSync2(name);
|
|
11171
11171
|
if (!stat) {
|
|
11172
11172
|
continue;
|
|
11173
11173
|
}
|
|
@@ -11187,11 +11187,11 @@ ${lanes.join("\n")}
|
|
|
11187
11187
|
return emptyFileSystemEntries;
|
|
11188
11188
|
}
|
|
11189
11189
|
}
|
|
11190
|
-
function readDirectory(
|
|
11191
|
-
return matchFiles(
|
|
11190
|
+
function readDirectory(path3, extensions, excludes, includes, depth) {
|
|
11191
|
+
return matchFiles(path3, extensions, excludes, includes, useCaseSensitiveFileNames2, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
|
|
11192
11192
|
}
|
|
11193
|
-
function fileSystemEntryExists(
|
|
11194
|
-
const stat =
|
|
11193
|
+
function fileSystemEntryExists(path3, entryKind) {
|
|
11194
|
+
const stat = statSync2(path3);
|
|
11195
11195
|
if (!stat) {
|
|
11196
11196
|
return false;
|
|
11197
11197
|
}
|
|
@@ -11204,47 +11204,47 @@ ${lanes.join("\n")}
|
|
|
11204
11204
|
return false;
|
|
11205
11205
|
}
|
|
11206
11206
|
}
|
|
11207
|
-
function fileExists(
|
|
11207
|
+
function fileExists(path3) {
|
|
11208
11208
|
return fileSystemEntryExists(
|
|
11209
|
-
|
|
11209
|
+
path3,
|
|
11210
11210
|
0
|
|
11211
11211
|
/* File */
|
|
11212
11212
|
);
|
|
11213
11213
|
}
|
|
11214
|
-
function directoryExists(
|
|
11214
|
+
function directoryExists(path3) {
|
|
11215
11215
|
return fileSystemEntryExists(
|
|
11216
|
-
|
|
11216
|
+
path3,
|
|
11217
11217
|
1
|
|
11218
11218
|
/* Directory */
|
|
11219
11219
|
);
|
|
11220
11220
|
}
|
|
11221
|
-
function getDirectories(
|
|
11222
|
-
return getAccessibleFileSystemEntries(
|
|
11221
|
+
function getDirectories(path3) {
|
|
11222
|
+
return getAccessibleFileSystemEntries(path3).directories.slice();
|
|
11223
11223
|
}
|
|
11224
|
-
function fsRealPathHandlingLongPath(
|
|
11225
|
-
return
|
|
11224
|
+
function fsRealPathHandlingLongPath(path3) {
|
|
11225
|
+
return path3.length < 260 ? _fs.realpathSync.native(path3) : _fs.realpathSync(path3);
|
|
11226
11226
|
}
|
|
11227
|
-
function realpath(
|
|
11227
|
+
function realpath(path3) {
|
|
11228
11228
|
try {
|
|
11229
|
-
return fsRealpath(
|
|
11229
|
+
return fsRealpath(path3);
|
|
11230
11230
|
} catch {
|
|
11231
|
-
return
|
|
11231
|
+
return path3;
|
|
11232
11232
|
}
|
|
11233
11233
|
}
|
|
11234
|
-
function getModifiedTime3(
|
|
11234
|
+
function getModifiedTime3(path3) {
|
|
11235
11235
|
var _a;
|
|
11236
|
-
return (_a =
|
|
11236
|
+
return (_a = statSync2(path3)) == null ? void 0 : _a.mtime;
|
|
11237
11237
|
}
|
|
11238
|
-
function setModifiedTime(
|
|
11238
|
+
function setModifiedTime(path3, time) {
|
|
11239
11239
|
try {
|
|
11240
|
-
_fs.utimesSync(
|
|
11240
|
+
_fs.utimesSync(path3, time, time);
|
|
11241
11241
|
} catch {
|
|
11242
11242
|
return;
|
|
11243
11243
|
}
|
|
11244
11244
|
}
|
|
11245
|
-
function deleteFile(
|
|
11245
|
+
function deleteFile(path3) {
|
|
11246
11246
|
try {
|
|
11247
|
-
return _fs.unlinkSync(
|
|
11247
|
+
return _fs.unlinkSync(path3);
|
|
11248
11248
|
} catch {
|
|
11249
11249
|
return;
|
|
11250
11250
|
}
|
|
@@ -11284,41 +11284,41 @@ ${lanes.join("\n")}
|
|
|
11284
11284
|
function isAnyDirectorySeparator(charCode) {
|
|
11285
11285
|
return charCode === 47 || charCode === 92;
|
|
11286
11286
|
}
|
|
11287
|
-
function isUrl(
|
|
11288
|
-
return getEncodedRootLength(
|
|
11287
|
+
function isUrl(path3) {
|
|
11288
|
+
return getEncodedRootLength(path3) < 0;
|
|
11289
11289
|
}
|
|
11290
|
-
function isRootedDiskPath(
|
|
11291
|
-
return getEncodedRootLength(
|
|
11290
|
+
function isRootedDiskPath(path3) {
|
|
11291
|
+
return getEncodedRootLength(path3) > 0;
|
|
11292
11292
|
}
|
|
11293
|
-
function isDiskPathRoot(
|
|
11294
|
-
const rootLength = getEncodedRootLength(
|
|
11295
|
-
return rootLength > 0 && rootLength ===
|
|
11293
|
+
function isDiskPathRoot(path3) {
|
|
11294
|
+
const rootLength = getEncodedRootLength(path3);
|
|
11295
|
+
return rootLength > 0 && rootLength === path3.length;
|
|
11296
11296
|
}
|
|
11297
|
-
function pathIsAbsolute(
|
|
11298
|
-
return getEncodedRootLength(
|
|
11297
|
+
function pathIsAbsolute(path3) {
|
|
11298
|
+
return getEncodedRootLength(path3) !== 0;
|
|
11299
11299
|
}
|
|
11300
|
-
function pathIsRelative(
|
|
11301
|
-
return /^\.\.?(?:$|[\\/])/.test(
|
|
11300
|
+
function pathIsRelative(path3) {
|
|
11301
|
+
return /^\.\.?(?:$|[\\/])/.test(path3);
|
|
11302
11302
|
}
|
|
11303
|
-
function pathIsBareSpecifier(
|
|
11304
|
-
return !pathIsAbsolute(
|
|
11303
|
+
function pathIsBareSpecifier(path3) {
|
|
11304
|
+
return !pathIsAbsolute(path3) && !pathIsRelative(path3);
|
|
11305
11305
|
}
|
|
11306
11306
|
function hasExtension(fileName) {
|
|
11307
11307
|
return getBaseFileName(fileName).includes(".");
|
|
11308
11308
|
}
|
|
11309
|
-
function fileExtensionIs(
|
|
11310
|
-
return
|
|
11309
|
+
function fileExtensionIs(path3, extension) {
|
|
11310
|
+
return path3.length > extension.length && endsWith(path3, extension);
|
|
11311
11311
|
}
|
|
11312
|
-
function fileExtensionIsOneOf(
|
|
11312
|
+
function fileExtensionIsOneOf(path3, extensions) {
|
|
11313
11313
|
for (const extension of extensions) {
|
|
11314
|
-
if (fileExtensionIs(
|
|
11314
|
+
if (fileExtensionIs(path3, extension)) {
|
|
11315
11315
|
return true;
|
|
11316
11316
|
}
|
|
11317
11317
|
}
|
|
11318
11318
|
return false;
|
|
11319
11319
|
}
|
|
11320
|
-
function hasTrailingDirectorySeparator(
|
|
11321
|
-
return
|
|
11320
|
+
function hasTrailingDirectorySeparator(path3) {
|
|
11321
|
+
return path3.length > 0 && isAnyDirectorySeparator(path3.charCodeAt(path3.length - 1));
|
|
11322
11322
|
}
|
|
11323
11323
|
function isVolumeCharacter(charCode) {
|
|
11324
11324
|
return charCode >= 97 && charCode <= 122 || charCode >= 65 && charCode <= 90;
|
|
@@ -11332,111 +11332,111 @@ ${lanes.join("\n")}
|
|
|
11332
11332
|
}
|
|
11333
11333
|
return -1;
|
|
11334
11334
|
}
|
|
11335
|
-
function getEncodedRootLength(
|
|
11336
|
-
if (!
|
|
11337
|
-
const ch0 =
|
|
11335
|
+
function getEncodedRootLength(path3) {
|
|
11336
|
+
if (!path3) return 0;
|
|
11337
|
+
const ch0 = path3.charCodeAt(0);
|
|
11338
11338
|
if (ch0 === 47 || ch0 === 92) {
|
|
11339
|
-
if (
|
|
11340
|
-
const p1 =
|
|
11341
|
-
if (p1 < 0) return
|
|
11339
|
+
if (path3.charCodeAt(1) !== ch0) return 1;
|
|
11340
|
+
const p1 = path3.indexOf(ch0 === 47 ? directorySeparator : altDirectorySeparator, 2);
|
|
11341
|
+
if (p1 < 0) return path3.length;
|
|
11342
11342
|
return p1 + 1;
|
|
11343
11343
|
}
|
|
11344
|
-
if (isVolumeCharacter(ch0) &&
|
|
11345
|
-
const ch2 =
|
|
11344
|
+
if (isVolumeCharacter(ch0) && path3.charCodeAt(1) === 58) {
|
|
11345
|
+
const ch2 = path3.charCodeAt(2);
|
|
11346
11346
|
if (ch2 === 47 || ch2 === 92) return 3;
|
|
11347
|
-
if (
|
|
11347
|
+
if (path3.length === 2) return 2;
|
|
11348
11348
|
}
|
|
11349
|
-
const schemeEnd =
|
|
11349
|
+
const schemeEnd = path3.indexOf(urlSchemeSeparator);
|
|
11350
11350
|
if (schemeEnd !== -1) {
|
|
11351
11351
|
const authorityStart = schemeEnd + urlSchemeSeparator.length;
|
|
11352
|
-
const authorityEnd =
|
|
11352
|
+
const authorityEnd = path3.indexOf(directorySeparator, authorityStart);
|
|
11353
11353
|
if (authorityEnd !== -1) {
|
|
11354
|
-
const scheme =
|
|
11355
|
-
const authority =
|
|
11356
|
-
if (scheme === "file" && (authority === "" || authority === "localhost") && isVolumeCharacter(
|
|
11357
|
-
const volumeSeparatorEnd = getFileUrlVolumeSeparatorEnd(
|
|
11354
|
+
const scheme = path3.slice(0, schemeEnd);
|
|
11355
|
+
const authority = path3.slice(authorityStart, authorityEnd);
|
|
11356
|
+
if (scheme === "file" && (authority === "" || authority === "localhost") && isVolumeCharacter(path3.charCodeAt(authorityEnd + 1))) {
|
|
11357
|
+
const volumeSeparatorEnd = getFileUrlVolumeSeparatorEnd(path3, authorityEnd + 2);
|
|
11358
11358
|
if (volumeSeparatorEnd !== -1) {
|
|
11359
|
-
if (
|
|
11359
|
+
if (path3.charCodeAt(volumeSeparatorEnd) === 47) {
|
|
11360
11360
|
return ~(volumeSeparatorEnd + 1);
|
|
11361
11361
|
}
|
|
11362
|
-
if (volumeSeparatorEnd ===
|
|
11362
|
+
if (volumeSeparatorEnd === path3.length) {
|
|
11363
11363
|
return ~volumeSeparatorEnd;
|
|
11364
11364
|
}
|
|
11365
11365
|
}
|
|
11366
11366
|
}
|
|
11367
11367
|
return ~(authorityEnd + 1);
|
|
11368
11368
|
}
|
|
11369
|
-
return ~
|
|
11369
|
+
return ~path3.length;
|
|
11370
11370
|
}
|
|
11371
11371
|
return 0;
|
|
11372
11372
|
}
|
|
11373
|
-
function getRootLength(
|
|
11374
|
-
const rootLength = getEncodedRootLength(
|
|
11373
|
+
function getRootLength(path3) {
|
|
11374
|
+
const rootLength = getEncodedRootLength(path3);
|
|
11375
11375
|
return rootLength < 0 ? ~rootLength : rootLength;
|
|
11376
11376
|
}
|
|
11377
|
-
function getDirectoryPath(
|
|
11378
|
-
|
|
11379
|
-
const rootLength = getRootLength(
|
|
11380
|
-
if (rootLength ===
|
|
11381
|
-
|
|
11382
|
-
return
|
|
11383
|
-
}
|
|
11384
|
-
function getBaseFileName(
|
|
11385
|
-
|
|
11386
|
-
const rootLength = getRootLength(
|
|
11387
|
-
if (rootLength ===
|
|
11388
|
-
|
|
11389
|
-
const name =
|
|
11377
|
+
function getDirectoryPath(path3) {
|
|
11378
|
+
path3 = normalizeSlashes(path3);
|
|
11379
|
+
const rootLength = getRootLength(path3);
|
|
11380
|
+
if (rootLength === path3.length) return path3;
|
|
11381
|
+
path3 = removeTrailingDirectorySeparator(path3);
|
|
11382
|
+
return path3.slice(0, Math.max(rootLength, path3.lastIndexOf(directorySeparator)));
|
|
11383
|
+
}
|
|
11384
|
+
function getBaseFileName(path3, extensions, ignoreCase) {
|
|
11385
|
+
path3 = normalizeSlashes(path3);
|
|
11386
|
+
const rootLength = getRootLength(path3);
|
|
11387
|
+
if (rootLength === path3.length) return "";
|
|
11388
|
+
path3 = removeTrailingDirectorySeparator(path3);
|
|
11389
|
+
const name = path3.slice(Math.max(getRootLength(path3), path3.lastIndexOf(directorySeparator) + 1));
|
|
11390
11390
|
const extension = extensions !== void 0 && ignoreCase !== void 0 ? getAnyExtensionFromPath(name, extensions, ignoreCase) : void 0;
|
|
11391
11391
|
return extension ? name.slice(0, name.length - extension.length) : name;
|
|
11392
11392
|
}
|
|
11393
|
-
function tryGetExtensionFromPath(
|
|
11393
|
+
function tryGetExtensionFromPath(path3, extension, stringEqualityComparer) {
|
|
11394
11394
|
if (!startsWith(extension, ".")) extension = "." + extension;
|
|
11395
|
-
if (
|
|
11396
|
-
const pathExtension =
|
|
11395
|
+
if (path3.length >= extension.length && path3.charCodeAt(path3.length - extension.length) === 46) {
|
|
11396
|
+
const pathExtension = path3.slice(path3.length - extension.length);
|
|
11397
11397
|
if (stringEqualityComparer(pathExtension, extension)) {
|
|
11398
11398
|
return pathExtension;
|
|
11399
11399
|
}
|
|
11400
11400
|
}
|
|
11401
11401
|
}
|
|
11402
|
-
function getAnyExtensionFromPathWorker(
|
|
11402
|
+
function getAnyExtensionFromPathWorker(path3, extensions, stringEqualityComparer) {
|
|
11403
11403
|
if (typeof extensions === "string") {
|
|
11404
|
-
return tryGetExtensionFromPath(
|
|
11404
|
+
return tryGetExtensionFromPath(path3, extensions, stringEqualityComparer) || "";
|
|
11405
11405
|
}
|
|
11406
11406
|
for (const extension of extensions) {
|
|
11407
|
-
const result = tryGetExtensionFromPath(
|
|
11407
|
+
const result = tryGetExtensionFromPath(path3, extension, stringEqualityComparer);
|
|
11408
11408
|
if (result) return result;
|
|
11409
11409
|
}
|
|
11410
11410
|
return "";
|
|
11411
11411
|
}
|
|
11412
|
-
function getAnyExtensionFromPath(
|
|
11412
|
+
function getAnyExtensionFromPath(path3, extensions, ignoreCase) {
|
|
11413
11413
|
if (extensions) {
|
|
11414
|
-
return getAnyExtensionFromPathWorker(removeTrailingDirectorySeparator(
|
|
11414
|
+
return getAnyExtensionFromPathWorker(removeTrailingDirectorySeparator(path3), extensions, ignoreCase ? equateStringsCaseInsensitive : equateStringsCaseSensitive);
|
|
11415
11415
|
}
|
|
11416
|
-
const baseFileName = getBaseFileName(
|
|
11416
|
+
const baseFileName = getBaseFileName(path3);
|
|
11417
11417
|
const extensionIndex = baseFileName.lastIndexOf(".");
|
|
11418
11418
|
if (extensionIndex >= 0) {
|
|
11419
11419
|
return baseFileName.substring(extensionIndex);
|
|
11420
11420
|
}
|
|
11421
11421
|
return "";
|
|
11422
11422
|
}
|
|
11423
|
-
function pathComponents(
|
|
11424
|
-
const root =
|
|
11425
|
-
const rest =
|
|
11423
|
+
function pathComponents(path3, rootLength) {
|
|
11424
|
+
const root = path3.substring(0, rootLength);
|
|
11425
|
+
const rest = path3.substring(rootLength).split(directorySeparator);
|
|
11426
11426
|
if (rest.length && !lastOrUndefined(rest)) rest.pop();
|
|
11427
11427
|
return [root, ...rest];
|
|
11428
11428
|
}
|
|
11429
|
-
function getPathComponents(
|
|
11430
|
-
|
|
11431
|
-
return pathComponents(
|
|
11429
|
+
function getPathComponents(path3, currentDirectory = "") {
|
|
11430
|
+
path3 = combinePaths(currentDirectory, path3);
|
|
11431
|
+
return pathComponents(path3, getRootLength(path3));
|
|
11432
11432
|
}
|
|
11433
11433
|
function getPathFromPathComponents(pathComponents2, length2) {
|
|
11434
11434
|
if (pathComponents2.length === 0) return "";
|
|
11435
11435
|
const root = pathComponents2[0] && ensureTrailingDirectorySeparator(pathComponents2[0]);
|
|
11436
11436
|
return root + pathComponents2.slice(1, length2).join(directorySeparator);
|
|
11437
11437
|
}
|
|
11438
|
-
function normalizeSlashes(
|
|
11439
|
-
return
|
|
11438
|
+
function normalizeSlashes(path3) {
|
|
11439
|
+
return path3.includes("\\") ? path3.replace(backslashRegExp, directorySeparator) : path3;
|
|
11440
11440
|
}
|
|
11441
11441
|
function reducePathComponents(components) {
|
|
11442
11442
|
if (!some(components)) return [];
|
|
@@ -11457,39 +11457,39 @@ ${lanes.join("\n")}
|
|
|
11457
11457
|
}
|
|
11458
11458
|
return reduced;
|
|
11459
11459
|
}
|
|
11460
|
-
function combinePaths(
|
|
11461
|
-
if (
|
|
11460
|
+
function combinePaths(path3, ...paths) {
|
|
11461
|
+
if (path3) path3 = normalizeSlashes(path3);
|
|
11462
11462
|
for (let relativePath of paths) {
|
|
11463
11463
|
if (!relativePath) continue;
|
|
11464
11464
|
relativePath = normalizeSlashes(relativePath);
|
|
11465
|
-
if (!
|
|
11466
|
-
|
|
11465
|
+
if (!path3 || getRootLength(relativePath) !== 0) {
|
|
11466
|
+
path3 = relativePath;
|
|
11467
11467
|
} else {
|
|
11468
|
-
|
|
11468
|
+
path3 = ensureTrailingDirectorySeparator(path3) + relativePath;
|
|
11469
11469
|
}
|
|
11470
11470
|
}
|
|
11471
|
-
return
|
|
11471
|
+
return path3;
|
|
11472
11472
|
}
|
|
11473
|
-
function resolvePath(
|
|
11474
|
-
return normalizePath(some(paths) ? combinePaths(
|
|
11473
|
+
function resolvePath(path3, ...paths) {
|
|
11474
|
+
return normalizePath(some(paths) ? combinePaths(path3, ...paths) : normalizeSlashes(path3));
|
|
11475
11475
|
}
|
|
11476
|
-
function getNormalizedPathComponents(
|
|
11477
|
-
return reducePathComponents(getPathComponents(
|
|
11476
|
+
function getNormalizedPathComponents(path3, currentDirectory) {
|
|
11477
|
+
return reducePathComponents(getPathComponents(path3, currentDirectory));
|
|
11478
11478
|
}
|
|
11479
|
-
function getNormalizedAbsolutePath(
|
|
11480
|
-
let rootLength = getRootLength(
|
|
11479
|
+
function getNormalizedAbsolutePath(path3, currentDirectory) {
|
|
11480
|
+
let rootLength = getRootLength(path3);
|
|
11481
11481
|
if (rootLength === 0 && currentDirectory) {
|
|
11482
|
-
|
|
11483
|
-
rootLength = getRootLength(
|
|
11482
|
+
path3 = combinePaths(currentDirectory, path3);
|
|
11483
|
+
rootLength = getRootLength(path3);
|
|
11484
11484
|
} else {
|
|
11485
|
-
|
|
11485
|
+
path3 = normalizeSlashes(path3);
|
|
11486
11486
|
}
|
|
11487
|
-
const simpleNormalized = simpleNormalizePath(
|
|
11487
|
+
const simpleNormalized = simpleNormalizePath(path3);
|
|
11488
11488
|
if (simpleNormalized !== void 0) {
|
|
11489
11489
|
return simpleNormalized.length > rootLength ? removeTrailingDirectorySeparator(simpleNormalized) : simpleNormalized;
|
|
11490
11490
|
}
|
|
11491
|
-
const length2 =
|
|
11492
|
-
const root =
|
|
11491
|
+
const length2 = path3.length;
|
|
11492
|
+
const root = path3.substring(0, rootLength);
|
|
11493
11493
|
let normalized;
|
|
11494
11494
|
let index = rootLength;
|
|
11495
11495
|
let segmentStart = index;
|
|
@@ -11497,23 +11497,23 @@ ${lanes.join("\n")}
|
|
|
11497
11497
|
let seenNonDotDotSegment = rootLength !== 0;
|
|
11498
11498
|
while (index < length2) {
|
|
11499
11499
|
segmentStart = index;
|
|
11500
|
-
let ch =
|
|
11500
|
+
let ch = path3.charCodeAt(index);
|
|
11501
11501
|
while (ch === 47 && index + 1 < length2) {
|
|
11502
11502
|
index++;
|
|
11503
|
-
ch =
|
|
11503
|
+
ch = path3.charCodeAt(index);
|
|
11504
11504
|
}
|
|
11505
11505
|
if (index > segmentStart) {
|
|
11506
|
-
normalized ?? (normalized =
|
|
11506
|
+
normalized ?? (normalized = path3.substring(0, segmentStart - 1));
|
|
11507
11507
|
segmentStart = index;
|
|
11508
11508
|
}
|
|
11509
|
-
let segmentEnd =
|
|
11509
|
+
let segmentEnd = path3.indexOf(directorySeparator, index + 1);
|
|
11510
11510
|
if (segmentEnd === -1) {
|
|
11511
11511
|
segmentEnd = length2;
|
|
11512
11512
|
}
|
|
11513
11513
|
const segmentLength = segmentEnd - segmentStart;
|
|
11514
|
-
if (segmentLength === 1 &&
|
|
11515
|
-
normalized ?? (normalized =
|
|
11516
|
-
} else if (segmentLength === 2 &&
|
|
11514
|
+
if (segmentLength === 1 && path3.charCodeAt(index) === 46) {
|
|
11515
|
+
normalized ?? (normalized = path3.substring(0, normalizedUpTo));
|
|
11516
|
+
} else if (segmentLength === 2 && path3.charCodeAt(index) === 46 && path3.charCodeAt(index + 1) === 46) {
|
|
11517
11517
|
if (!seenNonDotDotSegment) {
|
|
11518
11518
|
if (normalized !== void 0) {
|
|
11519
11519
|
normalized += normalized.length === rootLength ? ".." : "/..";
|
|
@@ -11522,9 +11522,9 @@ ${lanes.join("\n")}
|
|
|
11522
11522
|
}
|
|
11523
11523
|
} else if (normalized === void 0) {
|
|
11524
11524
|
if (normalizedUpTo - 2 >= 0) {
|
|
11525
|
-
normalized =
|
|
11525
|
+
normalized = path3.substring(0, Math.max(rootLength, path3.lastIndexOf(directorySeparator, normalizedUpTo - 2)));
|
|
11526
11526
|
} else {
|
|
11527
|
-
normalized =
|
|
11527
|
+
normalized = path3.substring(0, normalizedUpTo);
|
|
11528
11528
|
}
|
|
11529
11529
|
} else {
|
|
11530
11530
|
const lastSlash = normalized.lastIndexOf(directorySeparator);
|
|
@@ -11542,36 +11542,36 @@ ${lanes.join("\n")}
|
|
|
11542
11542
|
normalized += directorySeparator;
|
|
11543
11543
|
}
|
|
11544
11544
|
seenNonDotDotSegment = true;
|
|
11545
|
-
normalized +=
|
|
11545
|
+
normalized += path3.substring(segmentStart, segmentEnd);
|
|
11546
11546
|
} else {
|
|
11547
11547
|
seenNonDotDotSegment = true;
|
|
11548
11548
|
normalizedUpTo = segmentEnd;
|
|
11549
11549
|
}
|
|
11550
11550
|
index = segmentEnd + 1;
|
|
11551
11551
|
}
|
|
11552
|
-
return normalized ?? (length2 > rootLength ? removeTrailingDirectorySeparator(
|
|
11552
|
+
return normalized ?? (length2 > rootLength ? removeTrailingDirectorySeparator(path3) : path3);
|
|
11553
11553
|
}
|
|
11554
|
-
function normalizePath(
|
|
11555
|
-
|
|
11556
|
-
let normalized = simpleNormalizePath(
|
|
11554
|
+
function normalizePath(path3) {
|
|
11555
|
+
path3 = normalizeSlashes(path3);
|
|
11556
|
+
let normalized = simpleNormalizePath(path3);
|
|
11557
11557
|
if (normalized !== void 0) {
|
|
11558
11558
|
return normalized;
|
|
11559
11559
|
}
|
|
11560
|
-
normalized = getNormalizedAbsolutePath(
|
|
11561
|
-
return normalized && hasTrailingDirectorySeparator(
|
|
11560
|
+
normalized = getNormalizedAbsolutePath(path3, "");
|
|
11561
|
+
return normalized && hasTrailingDirectorySeparator(path3) ? ensureTrailingDirectorySeparator(normalized) : normalized;
|
|
11562
11562
|
}
|
|
11563
|
-
function simpleNormalizePath(
|
|
11564
|
-
if (!relativePathSegmentRegExp.test(
|
|
11565
|
-
return
|
|
11563
|
+
function simpleNormalizePath(path3) {
|
|
11564
|
+
if (!relativePathSegmentRegExp.test(path3)) {
|
|
11565
|
+
return path3;
|
|
11566
11566
|
}
|
|
11567
|
-
let simplified =
|
|
11567
|
+
let simplified = path3.replace(/\/\.\//g, "/");
|
|
11568
11568
|
if (simplified.startsWith("./")) {
|
|
11569
11569
|
simplified = simplified.slice(2);
|
|
11570
11570
|
}
|
|
11571
|
-
if (simplified !==
|
|
11572
|
-
|
|
11573
|
-
if (!relativePathSegmentRegExp.test(
|
|
11574
|
-
return
|
|
11571
|
+
if (simplified !== path3) {
|
|
11572
|
+
path3 = simplified;
|
|
11573
|
+
if (!relativePathSegmentRegExp.test(path3)) {
|
|
11574
|
+
return path3;
|
|
11575
11575
|
}
|
|
11576
11576
|
}
|
|
11577
11577
|
return void 0;
|
|
@@ -11587,31 +11587,31 @@ ${lanes.join("\n")}
|
|
|
11587
11587
|
const nonCanonicalizedPath = isRootedDiskPath(fileName) ? normalizePath(fileName) : getNormalizedAbsolutePath(fileName, basePath);
|
|
11588
11588
|
return getCanonicalFileName(nonCanonicalizedPath);
|
|
11589
11589
|
}
|
|
11590
|
-
function removeTrailingDirectorySeparator(
|
|
11591
|
-
if (hasTrailingDirectorySeparator(
|
|
11592
|
-
return
|
|
11590
|
+
function removeTrailingDirectorySeparator(path3) {
|
|
11591
|
+
if (hasTrailingDirectorySeparator(path3)) {
|
|
11592
|
+
return path3.substr(0, path3.length - 1);
|
|
11593
11593
|
}
|
|
11594
|
-
return
|
|
11594
|
+
return path3;
|
|
11595
11595
|
}
|
|
11596
|
-
function ensureTrailingDirectorySeparator(
|
|
11597
|
-
if (!hasTrailingDirectorySeparator(
|
|
11598
|
-
return
|
|
11596
|
+
function ensureTrailingDirectorySeparator(path3) {
|
|
11597
|
+
if (!hasTrailingDirectorySeparator(path3)) {
|
|
11598
|
+
return path3 + directorySeparator;
|
|
11599
11599
|
}
|
|
11600
|
-
return
|
|
11600
|
+
return path3;
|
|
11601
11601
|
}
|
|
11602
|
-
function ensurePathIsNonModuleName(
|
|
11603
|
-
return !pathIsAbsolute(
|
|
11602
|
+
function ensurePathIsNonModuleName(path3) {
|
|
11603
|
+
return !pathIsAbsolute(path3) && !pathIsRelative(path3) ? "./" + path3 : path3;
|
|
11604
11604
|
}
|
|
11605
|
-
function changeAnyExtension(
|
|
11606
|
-
const pathext = extensions !== void 0 && ignoreCase !== void 0 ? getAnyExtensionFromPath(
|
|
11607
|
-
return pathext ?
|
|
11605
|
+
function changeAnyExtension(path3, ext, extensions, ignoreCase) {
|
|
11606
|
+
const pathext = extensions !== void 0 && ignoreCase !== void 0 ? getAnyExtensionFromPath(path3, extensions, ignoreCase) : getAnyExtensionFromPath(path3);
|
|
11607
|
+
return pathext ? path3.slice(0, path3.length - pathext.length) + (startsWith(ext, ".") ? ext : "." + ext) : path3;
|
|
11608
11608
|
}
|
|
11609
|
-
function changeFullExtension(
|
|
11610
|
-
const declarationExtension = getDeclarationFileExtension(
|
|
11609
|
+
function changeFullExtension(path3, newExtension) {
|
|
11610
|
+
const declarationExtension = getDeclarationFileExtension(path3);
|
|
11611
11611
|
if (declarationExtension) {
|
|
11612
|
-
return
|
|
11612
|
+
return path3.slice(0, path3.length - declarationExtension.length) + (startsWith(newExtension, ".") ? newExtension : "." + newExtension);
|
|
11613
11613
|
}
|
|
11614
|
-
return changeAnyExtension(
|
|
11614
|
+
return changeAnyExtension(path3, newExtension);
|
|
11615
11615
|
}
|
|
11616
11616
|
var relativePathSegmentRegExp = /\/\/|(?:^|\/)\.\.?(?:$|\/)/;
|
|
11617
11617
|
function comparePathsWorker(a, b, componentComparer) {
|
|
@@ -23064,8 +23064,8 @@ ${lanes.join("\n")}
|
|
|
23064
23064
|
function getResolvedExternalModuleName(host, file, referenceFile) {
|
|
23065
23065
|
return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
|
|
23066
23066
|
}
|
|
23067
|
-
function getCanonicalAbsolutePath(host,
|
|
23068
|
-
return host.getCanonicalFileName(getNormalizedAbsolutePath(
|
|
23067
|
+
function getCanonicalAbsolutePath(host, path3) {
|
|
23068
|
+
return host.getCanonicalFileName(getNormalizedAbsolutePath(path3, host.getCurrentDirectory()));
|
|
23069
23069
|
}
|
|
23070
23070
|
function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
|
|
23071
23071
|
const file = resolver.getExternalModuleFileFromDeclaration(declaration);
|
|
@@ -23108,20 +23108,20 @@ ${lanes.join("\n")}
|
|
|
23108
23108
|
}
|
|
23109
23109
|
function getDeclarationEmitOutputFilePathWorker(fileName, options, host) {
|
|
23110
23110
|
const outputDir = options.declarationDir || options.outDir;
|
|
23111
|
-
const
|
|
23112
|
-
const declarationExtension = getDeclarationEmitExtensionForPath(
|
|
23113
|
-
return removeFileExtension(
|
|
23111
|
+
const path3 = outputDir ? getSourceFilePathInNewDirWorker(fileName, outputDir, host.getCurrentDirectory(), host.getCommonSourceDirectory(), (f) => host.getCanonicalFileName(f)) : fileName;
|
|
23112
|
+
const declarationExtension = getDeclarationEmitExtensionForPath(path3);
|
|
23113
|
+
return removeFileExtension(path3) + declarationExtension;
|
|
23114
23114
|
}
|
|
23115
|
-
function getDeclarationEmitExtensionForPath(
|
|
23116
|
-
return fileExtensionIsOneOf(
|
|
23115
|
+
function getDeclarationEmitExtensionForPath(path3) {
|
|
23116
|
+
return fileExtensionIsOneOf(path3, [
|
|
23117
23117
|
".mjs",
|
|
23118
23118
|
".mts"
|
|
23119
23119
|
/* Mts */
|
|
23120
|
-
]) ? ".d.mts" : fileExtensionIsOneOf(
|
|
23120
|
+
]) ? ".d.mts" : fileExtensionIsOneOf(path3, [
|
|
23121
23121
|
".cjs",
|
|
23122
23122
|
".cts"
|
|
23123
23123
|
/* Cts */
|
|
23124
|
-
]) ? ".d.cts" : fileExtensionIsOneOf(
|
|
23124
|
+
]) ? ".d.cts" : fileExtensionIsOneOf(path3, [
|
|
23125
23125
|
".json"
|
|
23126
23126
|
/* Json */
|
|
23127
23127
|
]) ? `.d.json.ts` : (
|
|
@@ -23129,8 +23129,8 @@ ${lanes.join("\n")}
|
|
|
23129
23129
|
".d.ts"
|
|
23130
23130
|
);
|
|
23131
23131
|
}
|
|
23132
|
-
function getPossibleOriginalInputExtensionForExtension(
|
|
23133
|
-
return fileExtensionIsOneOf(
|
|
23132
|
+
function getPossibleOriginalInputExtensionForExtension(path3) {
|
|
23133
|
+
return fileExtensionIsOneOf(path3, [
|
|
23134
23134
|
".d.mts",
|
|
23135
23135
|
".mjs",
|
|
23136
23136
|
".mts"
|
|
@@ -23139,7 +23139,7 @@ ${lanes.join("\n")}
|
|
|
23139
23139
|
".mts",
|
|
23140
23140
|
".mjs"
|
|
23141
23141
|
/* Mjs */
|
|
23142
|
-
] : fileExtensionIsOneOf(
|
|
23142
|
+
] : fileExtensionIsOneOf(path3, [
|
|
23143
23143
|
".d.cts",
|
|
23144
23144
|
".cjs",
|
|
23145
23145
|
".cts"
|
|
@@ -23148,7 +23148,7 @@ ${lanes.join("\n")}
|
|
|
23148
23148
|
".cts",
|
|
23149
23149
|
".cjs"
|
|
23150
23150
|
/* Cjs */
|
|
23151
|
-
] : fileExtensionIsOneOf(
|
|
23151
|
+
] : fileExtensionIsOneOf(path3, [`.d.json.ts`]) ? [
|
|
23152
23152
|
".json"
|
|
23153
23153
|
/* Json */
|
|
23154
23154
|
] : [
|
|
@@ -23233,12 +23233,12 @@ ${lanes.join("\n")}
|
|
|
23233
23233
|
createDirectory(directoryPath);
|
|
23234
23234
|
}
|
|
23235
23235
|
}
|
|
23236
|
-
function writeFileEnsuringDirectories(
|
|
23236
|
+
function writeFileEnsuringDirectories(path3, data, writeByteOrderMark, writeFile2, createDirectory, directoryExists) {
|
|
23237
23237
|
try {
|
|
23238
|
-
writeFile2(
|
|
23238
|
+
writeFile2(path3, data, writeByteOrderMark);
|
|
23239
23239
|
} catch {
|
|
23240
|
-
ensureDirectoriesExist(getDirectoryPath(normalizePath(
|
|
23241
|
-
writeFile2(
|
|
23240
|
+
ensureDirectoriesExist(getDirectoryPath(normalizePath(path3)), createDirectory, directoryExists);
|
|
23241
|
+
writeFile2(path3, data, writeByteOrderMark);
|
|
23242
23242
|
}
|
|
23243
23243
|
}
|
|
23244
23244
|
function getLineOfLocalPosition(sourceFile, pos) {
|
|
@@ -23938,20 +23938,20 @@ ${lanes.join("\n")}
|
|
|
23938
23938
|
}
|
|
23939
23939
|
return getStringFromExpandedCharCodes(expandedCharCodes);
|
|
23940
23940
|
}
|
|
23941
|
-
function readJsonOrUndefined(
|
|
23942
|
-
const jsonText = isString(hostOrText) ? hostOrText : hostOrText.readFile(
|
|
23941
|
+
function readJsonOrUndefined(path3, hostOrText) {
|
|
23942
|
+
const jsonText = isString(hostOrText) ? hostOrText : hostOrText.readFile(path3);
|
|
23943
23943
|
if (!jsonText) return void 0;
|
|
23944
23944
|
let result = tryParseJson(jsonText);
|
|
23945
23945
|
if (result === void 0) {
|
|
23946
|
-
const looseResult = parseConfigFileTextToJson(
|
|
23946
|
+
const looseResult = parseConfigFileTextToJson(path3, jsonText);
|
|
23947
23947
|
if (!looseResult.error) {
|
|
23948
23948
|
result = looseResult.config;
|
|
23949
23949
|
}
|
|
23950
23950
|
}
|
|
23951
23951
|
return result;
|
|
23952
23952
|
}
|
|
23953
|
-
function readJson(
|
|
23954
|
-
return readJsonOrUndefined(
|
|
23953
|
+
function readJson(path3, host) {
|
|
23954
|
+
return readJsonOrUndefined(path3, host) || {};
|
|
23955
23955
|
}
|
|
23956
23956
|
function tryParseJson(text) {
|
|
23957
23957
|
try {
|
|
@@ -25101,7 +25101,7 @@ ${lanes.join("\n")}
|
|
|
25101
25101
|
getSymlinkedFiles: () => symlinkedFiles,
|
|
25102
25102
|
getSymlinkedDirectories: () => symlinkedDirectories,
|
|
25103
25103
|
getSymlinkedDirectoriesByRealpath: () => symlinkedDirectoriesByRealpath,
|
|
25104
|
-
setSymlinkedFile: (
|
|
25104
|
+
setSymlinkedFile: (path3, real) => (symlinkedFiles || (symlinkedFiles = /* @__PURE__ */ new Map())).set(path3, real),
|
|
25105
25105
|
setSymlinkedDirectory: (symlink, real) => {
|
|
25106
25106
|
let symlinkPath = toPath(symlink, cwd, getCanonicalFileName);
|
|
25107
25107
|
if (!containsIgnoredPath(symlinkPath)) {
|
|
@@ -25161,8 +25161,8 @@ ${lanes.join("\n")}
|
|
|
25161
25161
|
function stripLeadingDirectorySeparator(s) {
|
|
25162
25162
|
return isAnyDirectorySeparator(s.charCodeAt(0)) ? s.slice(1) : void 0;
|
|
25163
25163
|
}
|
|
25164
|
-
function tryRemoveDirectoryPrefix(
|
|
25165
|
-
const withoutPrefix = tryRemovePrefix(
|
|
25164
|
+
function tryRemoveDirectoryPrefix(path3, dirPath, getCanonicalFileName) {
|
|
25165
|
+
const withoutPrefix = tryRemovePrefix(path3, dirPath, getCanonicalFileName);
|
|
25166
25166
|
return withoutPrefix === void 0 ? void 0 : stripLeadingDirectorySeparator(withoutPrefix);
|
|
25167
25167
|
}
|
|
25168
25168
|
var reservedCharacterPattern = /[^\w\s/]/g;
|
|
@@ -25288,25 +25288,25 @@ ${lanes.join("\n")}
|
|
|
25288
25288
|
function replaceWildcardCharacter(match, singleAsteriskRegexFragment) {
|
|
25289
25289
|
return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
|
|
25290
25290
|
}
|
|
25291
|
-
function getFileMatcherPatterns(
|
|
25292
|
-
|
|
25291
|
+
function getFileMatcherPatterns(path3, excludes, includes, useCaseSensitiveFileNames2, currentDirectory) {
|
|
25292
|
+
path3 = normalizePath(path3);
|
|
25293
25293
|
currentDirectory = normalizePath(currentDirectory);
|
|
25294
|
-
const absolutePath = combinePaths(currentDirectory,
|
|
25294
|
+
const absolutePath = combinePaths(currentDirectory, path3);
|
|
25295
25295
|
return {
|
|
25296
25296
|
includeFilePatterns: map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), (pattern) => `^${pattern}$`),
|
|
25297
25297
|
includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
|
|
25298
25298
|
includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
|
|
25299
25299
|
excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
|
|
25300
|
-
basePaths: getBasePaths(
|
|
25300
|
+
basePaths: getBasePaths(path3, includes, useCaseSensitiveFileNames2)
|
|
25301
25301
|
};
|
|
25302
25302
|
}
|
|
25303
25303
|
function getRegexFromPattern(pattern, useCaseSensitiveFileNames2) {
|
|
25304
25304
|
return new RegExp(pattern, useCaseSensitiveFileNames2 ? "" : "i");
|
|
25305
25305
|
}
|
|
25306
|
-
function matchFiles(
|
|
25307
|
-
|
|
25306
|
+
function matchFiles(path3, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath) {
|
|
25307
|
+
path3 = normalizePath(path3);
|
|
25308
25308
|
currentDirectory = normalizePath(currentDirectory);
|
|
25309
|
-
const patterns = getFileMatcherPatterns(
|
|
25309
|
+
const patterns = getFileMatcherPatterns(path3, excludes, includes, useCaseSensitiveFileNames2, currentDirectory);
|
|
25310
25310
|
const includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map((pattern) => getRegexFromPattern(pattern, useCaseSensitiveFileNames2));
|
|
25311
25311
|
const includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames2);
|
|
25312
25312
|
const excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames2);
|
|
@@ -25351,17 +25351,17 @@ ${lanes.join("\n")}
|
|
|
25351
25351
|
}
|
|
25352
25352
|
}
|
|
25353
25353
|
}
|
|
25354
|
-
function getBasePaths(
|
|
25355
|
-
const basePaths = [
|
|
25354
|
+
function getBasePaths(path3, includes, useCaseSensitiveFileNames2) {
|
|
25355
|
+
const basePaths = [path3];
|
|
25356
25356
|
if (includes) {
|
|
25357
25357
|
const includeBasePaths = [];
|
|
25358
25358
|
for (const include of includes) {
|
|
25359
|
-
const absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(
|
|
25359
|
+
const absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path3, include));
|
|
25360
25360
|
includeBasePaths.push(getIncludeBasePath(absolute));
|
|
25361
25361
|
}
|
|
25362
25362
|
includeBasePaths.sort(getStringComparer(!useCaseSensitiveFileNames2));
|
|
25363
25363
|
for (const includeBasePath of includeBasePaths) {
|
|
25364
|
-
if (every(basePaths, (basePath) => !containsPath(basePath, includeBasePath,
|
|
25364
|
+
if (every(basePaths, (basePath) => !containsPath(basePath, includeBasePath, path3, !useCaseSensitiveFileNames2))) {
|
|
25365
25365
|
basePaths.push(includeBasePath);
|
|
25366
25366
|
}
|
|
25367
25367
|
}
|
|
@@ -25604,10 +25604,10 @@ ${lanes.join("\n")}
|
|
|
25604
25604
|
const match = str.match(/\//g);
|
|
25605
25605
|
return match ? match.length : 0;
|
|
25606
25606
|
}
|
|
25607
|
-
function compareNumberOfDirectorySeparators(path1,
|
|
25607
|
+
function compareNumberOfDirectorySeparators(path1, path22) {
|
|
25608
25608
|
return compareValues(
|
|
25609
25609
|
numberOfDirectorySeparators(path1),
|
|
25610
|
-
numberOfDirectorySeparators(
|
|
25610
|
+
numberOfDirectorySeparators(path22)
|
|
25611
25611
|
);
|
|
25612
25612
|
}
|
|
25613
25613
|
var extensionsToRemove = [
|
|
@@ -25625,24 +25625,24 @@ ${lanes.join("\n")}
|
|
|
25625
25625
|
".json"
|
|
25626
25626
|
/* Json */
|
|
25627
25627
|
];
|
|
25628
|
-
function removeFileExtension(
|
|
25628
|
+
function removeFileExtension(path3) {
|
|
25629
25629
|
for (const ext of extensionsToRemove) {
|
|
25630
|
-
const extensionless = tryRemoveExtension(
|
|
25630
|
+
const extensionless = tryRemoveExtension(path3, ext);
|
|
25631
25631
|
if (extensionless !== void 0) {
|
|
25632
25632
|
return extensionless;
|
|
25633
25633
|
}
|
|
25634
25634
|
}
|
|
25635
|
-
return
|
|
25635
|
+
return path3;
|
|
25636
25636
|
}
|
|
25637
|
-
function tryRemoveExtension(
|
|
25638
|
-
return fileExtensionIs(
|
|
25637
|
+
function tryRemoveExtension(path3, extension) {
|
|
25638
|
+
return fileExtensionIs(path3, extension) ? removeExtension(path3, extension) : void 0;
|
|
25639
25639
|
}
|
|
25640
|
-
function removeExtension(
|
|
25641
|
-
return
|
|
25640
|
+
function removeExtension(path3, extension) {
|
|
25641
|
+
return path3.substring(0, path3.length - extension.length);
|
|
25642
25642
|
}
|
|
25643
|
-
function changeExtension(
|
|
25643
|
+
function changeExtension(path3, newExtension) {
|
|
25644
25644
|
return changeAnyExtension(
|
|
25645
|
-
|
|
25645
|
+
path3,
|
|
25646
25646
|
newExtension,
|
|
25647
25647
|
extensionsToRemove,
|
|
25648
25648
|
/*ignoreCase*/
|
|
@@ -25668,8 +25668,8 @@ ${lanes.join("\n")}
|
|
|
25668
25668
|
let matchableStringSet;
|
|
25669
25669
|
let patterns;
|
|
25670
25670
|
const pathList = getOwnKeys(paths);
|
|
25671
|
-
for (const
|
|
25672
|
-
const patternOrStr = tryParsePattern(
|
|
25671
|
+
for (const path3 of pathList) {
|
|
25672
|
+
const patternOrStr = tryParsePattern(path3);
|
|
25673
25673
|
if (patternOrStr === void 0) {
|
|
25674
25674
|
continue;
|
|
25675
25675
|
} else if (typeof patternOrStr === "string") {
|
|
@@ -25696,15 +25696,15 @@ ${lanes.join("\n")}
|
|
|
25696
25696
|
function resolutionExtensionIsTSOrJson(ext) {
|
|
25697
25697
|
return extensionIsTS(ext) || ext === ".json";
|
|
25698
25698
|
}
|
|
25699
|
-
function extensionFromPath(
|
|
25700
|
-
const ext = tryGetExtensionFromPath2(
|
|
25701
|
-
return ext !== void 0 ? ext : Debug.fail(`File ${
|
|
25699
|
+
function extensionFromPath(path3) {
|
|
25700
|
+
const ext = tryGetExtensionFromPath2(path3);
|
|
25701
|
+
return ext !== void 0 ? ext : Debug.fail(`File ${path3} has unknown extension.`);
|
|
25702
25702
|
}
|
|
25703
|
-
function isAnySupportedFileExtension(
|
|
25704
|
-
return tryGetExtensionFromPath2(
|
|
25703
|
+
function isAnySupportedFileExtension(path3) {
|
|
25704
|
+
return tryGetExtensionFromPath2(path3) !== void 0;
|
|
25705
25705
|
}
|
|
25706
|
-
function tryGetExtensionFromPath2(
|
|
25707
|
-
return find(extensionsToRemove, (e) => fileExtensionIs(
|
|
25706
|
+
function tryGetExtensionFromPath2(path3) {
|
|
25707
|
+
return find(extensionsToRemove, (e) => fileExtensionIs(path3, e));
|
|
25708
25708
|
}
|
|
25709
25709
|
function isCheckJsEnabledForFile(sourceFile, compilerOptions) {
|
|
25710
25710
|
return sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : compilerOptions.checkJs;
|
|
@@ -26013,8 +26013,8 @@ ${lanes.join("\n")}
|
|
|
26013
26013
|
return false;
|
|
26014
26014
|
}
|
|
26015
26015
|
}
|
|
26016
|
-
function containsIgnoredPath(
|
|
26017
|
-
return some(ignoredPaths, (p) =>
|
|
26016
|
+
function containsIgnoredPath(path3) {
|
|
26017
|
+
return some(ignoredPaths, (p) => path3.includes(p));
|
|
26018
26018
|
}
|
|
26019
26019
|
function getContainingNodeArray(node) {
|
|
26020
26020
|
if (!node.parent) return void 0;
|
|
@@ -45822,7 +45822,7 @@ ${lanes.join("\n")}
|
|
|
45822
45822
|
const typeReferenceDirectives = context.typeReferenceDirectives;
|
|
45823
45823
|
const libReferenceDirectives = context.libReferenceDirectives;
|
|
45824
45824
|
forEach(toArray(entryOrList), (arg) => {
|
|
45825
|
-
const { types, lib, path:
|
|
45825
|
+
const { types, lib, path: path3, ["resolution-mode"]: res, preserve: _preserve } = arg.arguments;
|
|
45826
45826
|
const preserve = _preserve === "true" ? true : void 0;
|
|
45827
45827
|
if (arg.arguments["no-default-lib"] === "true") {
|
|
45828
45828
|
context.hasNoDefaultLib = true;
|
|
@@ -45831,8 +45831,8 @@ ${lanes.join("\n")}
|
|
|
45831
45831
|
typeReferenceDirectives.push({ pos: types.pos, end: types.end, fileName: types.value, ...parsed ? { resolutionMode: parsed } : {}, ...preserve ? { preserve } : {} });
|
|
45832
45832
|
} else if (lib) {
|
|
45833
45833
|
libReferenceDirectives.push({ pos: lib.pos, end: lib.end, fileName: lib.value, ...preserve ? { preserve } : {} });
|
|
45834
|
-
} else if (
|
|
45835
|
-
referencedFiles.push({ pos:
|
|
45834
|
+
} else if (path3) {
|
|
45835
|
+
referencedFiles.push({ pos: path3.pos, end: path3.end, fileName: path3.value, ...preserve ? { preserve } : {} });
|
|
45836
45836
|
} else {
|
|
45837
45837
|
reportDiagnostic(arg.range.pos, arg.range.end - arg.range.pos, Diagnostics.Invalid_reference_directive_syntax);
|
|
45838
45838
|
}
|
|
@@ -48261,9 +48261,9 @@ ${lanes.join("\n")}
|
|
|
48261
48261
|
if (specs[0] === defaultIncludeSpec) return void 0;
|
|
48262
48262
|
return specs;
|
|
48263
48263
|
}
|
|
48264
|
-
function matchesSpecs(
|
|
48264
|
+
function matchesSpecs(path3, includeSpecs, excludeSpecs, host) {
|
|
48265
48265
|
if (!includeSpecs) return returnTrue;
|
|
48266
|
-
const patterns = getFileMatcherPatterns(
|
|
48266
|
+
const patterns = getFileMatcherPatterns(path3, excludeSpecs, includeSpecs, host.useCaseSensitiveFileNames, host.getCurrentDirectory());
|
|
48267
48267
|
const excludeRe = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, host.useCaseSensitiveFileNames);
|
|
48268
48268
|
const includeRe = patterns.includeFilePattern && getRegexFromPattern(patterns.includeFilePattern, host.useCaseSensitiveFileNames);
|
|
48269
48269
|
if (includeRe) {
|
|
@@ -48908,9 +48908,9 @@ ${lanes.join("\n")}
|
|
|
48908
48908
|
const setPropertyInResultIfNotUndefined = (propertyName) => {
|
|
48909
48909
|
if (ownConfig.raw[propertyName]) return;
|
|
48910
48910
|
if (extendsRaw[propertyName]) {
|
|
48911
|
-
result[propertyName] = map(extendsRaw[propertyName], (
|
|
48911
|
+
result[propertyName] = map(extendsRaw[propertyName], (path3) => startsWithConfigDirTemplate(path3) || isRootedDiskPath(path3) ? path3 : combinePaths(
|
|
48912
48912
|
relativeDifference || (relativeDifference = convertToRelativePath(getDirectoryPath(extendedConfigPath), basePath, createGetCanonicalFileName(host.useCaseSensitiveFileNames))),
|
|
48913
|
-
|
|
48913
|
+
path3
|
|
48914
48914
|
));
|
|
48915
48915
|
}
|
|
48916
48916
|
};
|
|
@@ -49064,11 +49064,11 @@ ${lanes.join("\n")}
|
|
|
49064
49064
|
return void 0;
|
|
49065
49065
|
}
|
|
49066
49066
|
function getExtendedConfig(sourceFile, extendedConfigPath, host, resolutionStack, errors, extendedConfigCache, result) {
|
|
49067
|
-
const
|
|
49067
|
+
const path3 = host.useCaseSensitiveFileNames ? extendedConfigPath : toFileNameLowerCase(extendedConfigPath);
|
|
49068
49068
|
let value;
|
|
49069
49069
|
let extendedResult;
|
|
49070
49070
|
let extendedConfig;
|
|
49071
|
-
if (extendedConfigCache && (value = extendedConfigCache.get(
|
|
49071
|
+
if (extendedConfigCache && (value = extendedConfigCache.get(path3))) {
|
|
49072
49072
|
({ extendedResult, extendedConfig } = value);
|
|
49073
49073
|
} else {
|
|
49074
49074
|
extendedResult = readJsonConfigFile(extendedConfigPath, (path22) => host.readFile(path22));
|
|
@@ -49086,7 +49086,7 @@ ${lanes.join("\n")}
|
|
|
49086
49086
|
);
|
|
49087
49087
|
}
|
|
49088
49088
|
if (extendedConfigCache) {
|
|
49089
|
-
extendedConfigCache.set(
|
|
49089
|
+
extendedConfigCache.set(path3, { extendedResult, extendedConfig });
|
|
49090
49090
|
}
|
|
49091
49091
|
}
|
|
49092
49092
|
if (sourceFile) {
|
|
@@ -49354,24 +49354,24 @@ ${lanes.join("\n")}
|
|
|
49354
49354
|
}
|
|
49355
49355
|
const match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames2);
|
|
49356
49356
|
if (match) {
|
|
49357
|
-
const { key, path:
|
|
49357
|
+
const { key, path: path3, flags } = match;
|
|
49358
49358
|
const existingPath = wildCardKeyToPath.get(key);
|
|
49359
49359
|
const existingFlags = existingPath !== void 0 ? wildcardDirectories[existingPath] : void 0;
|
|
49360
49360
|
if (existingFlags === void 0 || existingFlags < flags) {
|
|
49361
|
-
wildcardDirectories[existingPath !== void 0 ? existingPath :
|
|
49362
|
-
if (existingPath === void 0) wildCardKeyToPath.set(key,
|
|
49361
|
+
wildcardDirectories[existingPath !== void 0 ? existingPath : path3] = flags;
|
|
49362
|
+
if (existingPath === void 0) wildCardKeyToPath.set(key, path3);
|
|
49363
49363
|
if (flags === 1) {
|
|
49364
49364
|
recursiveKeys.push(key);
|
|
49365
49365
|
}
|
|
49366
49366
|
}
|
|
49367
49367
|
}
|
|
49368
49368
|
}
|
|
49369
|
-
for (const
|
|
49370
|
-
if (hasProperty(wildcardDirectories,
|
|
49369
|
+
for (const path3 in wildcardDirectories) {
|
|
49370
|
+
if (hasProperty(wildcardDirectories, path3)) {
|
|
49371
49371
|
for (const recursiveKey of recursiveKeys) {
|
|
49372
|
-
const key = toCanonicalKey(
|
|
49372
|
+
const key = toCanonicalKey(path3, useCaseSensitiveFileNames2);
|
|
49373
49373
|
if (key !== recursiveKey && containsPath(recursiveKey, key, basePath, !useCaseSensitiveFileNames2)) {
|
|
49374
|
-
delete wildcardDirectories[
|
|
49374
|
+
delete wildcardDirectories[path3];
|
|
49375
49375
|
}
|
|
49376
49376
|
}
|
|
49377
49377
|
}
|
|
@@ -49379,8 +49379,8 @@ ${lanes.join("\n")}
|
|
|
49379
49379
|
}
|
|
49380
49380
|
return wildcardDirectories;
|
|
49381
49381
|
}
|
|
49382
|
-
function toCanonicalKey(
|
|
49383
|
-
return useCaseSensitiveFileNames2 ?
|
|
49382
|
+
function toCanonicalKey(path3, useCaseSensitiveFileNames2) {
|
|
49383
|
+
return useCaseSensitiveFileNames2 ? path3 : toFileNameLowerCase(path3);
|
|
49384
49384
|
}
|
|
49385
49385
|
function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames2) {
|
|
49386
49386
|
const match = wildcardDirectoryPattern.exec(spec);
|
|
@@ -49396,10 +49396,10 @@ ${lanes.join("\n")}
|
|
|
49396
49396
|
};
|
|
49397
49397
|
}
|
|
49398
49398
|
if (isImplicitGlob(spec.substring(spec.lastIndexOf(directorySeparator) + 1))) {
|
|
49399
|
-
const
|
|
49399
|
+
const path3 = removeTrailingDirectorySeparator(spec);
|
|
49400
49400
|
return {
|
|
49401
|
-
key: toCanonicalKey(
|
|
49402
|
-
path:
|
|
49401
|
+
key: toCanonicalKey(path3, useCaseSensitiveFileNames2),
|
|
49402
|
+
path: path3,
|
|
49403
49403
|
flags: 1
|
|
49404
49404
|
/* Recursive */
|
|
49405
49405
|
};
|
|
@@ -49638,11 +49638,11 @@ ${lanes.join("\n")}
|
|
|
49638
49638
|
}
|
|
49639
49639
|
return;
|
|
49640
49640
|
}
|
|
49641
|
-
const
|
|
49641
|
+
const path3 = normalizePath(combinePaths(baseDirectory, fileName));
|
|
49642
49642
|
if (state.traceEnabled) {
|
|
49643
|
-
trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName,
|
|
49643
|
+
trace(state.host, Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path3);
|
|
49644
49644
|
}
|
|
49645
|
-
return
|
|
49645
|
+
return path3;
|
|
49646
49646
|
}
|
|
49647
49647
|
function readPackageJsonTypesFields(jsonContent, baseDirectory, state) {
|
|
49648
49648
|
return readPackageJsonPathField(jsonContent, "typings", baseDirectory, state) || readPackageJsonPathField(jsonContent, "types", baseDirectory, state);
|
|
@@ -49724,9 +49724,9 @@ ${lanes.join("\n")}
|
|
|
49724
49724
|
return typeRoots;
|
|
49725
49725
|
}
|
|
49726
49726
|
var nodeModulesAtTypes = combinePaths("node_modules", "@types");
|
|
49727
|
-
function arePathsEqual(path1,
|
|
49727
|
+
function arePathsEqual(path1, path22, host) {
|
|
49728
49728
|
const useCaseSensitiveFileNames2 = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
|
|
49729
|
-
return comparePaths(path1,
|
|
49729
|
+
return comparePaths(path1, path22, !useCaseSensitiveFileNames2) === 0;
|
|
49730
49730
|
}
|
|
49731
49731
|
function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
|
|
49732
49732
|
const resolvedFileName = realPath(fileName, host, traceEnabled);
|
|
@@ -50156,13 +50156,13 @@ ${lanes.join("\n")}
|
|
|
50156
50156
|
directoryToModuleNameMap.update(options2);
|
|
50157
50157
|
}
|
|
50158
50158
|
function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
|
|
50159
|
-
const
|
|
50160
|
-
return getOrCreateCache(directoryToModuleNameMap, redirectedReference,
|
|
50159
|
+
const path3 = toPath(directoryName, currentDirectory, getCanonicalFileName);
|
|
50160
|
+
return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path3, () => createModeAwareCache());
|
|
50161
50161
|
}
|
|
50162
50162
|
function getFromDirectoryCache(name, mode, directoryName, redirectedReference) {
|
|
50163
50163
|
var _a, _b;
|
|
50164
|
-
const
|
|
50165
|
-
return (_b = (_a = directoryToModuleNameMap.getMapOfCacheRedirects(redirectedReference)) == null ? void 0 : _a.get(
|
|
50164
|
+
const path3 = toPath(directoryName, currentDirectory, getCanonicalFileName);
|
|
50165
|
+
return (_b = (_a = directoryToModuleNameMap.getMapOfCacheRedirects(redirectedReference)) == null ? void 0 : _a.get(path3)) == null ? void 0 : _b.get(name, mode);
|
|
50166
50166
|
}
|
|
50167
50167
|
}
|
|
50168
50168
|
function createModeAwareCacheKey(specifier, mode) {
|
|
@@ -50239,14 +50239,14 @@ ${lanes.join("\n")}
|
|
|
50239
50239
|
return directoryPathMap.get(toPath(directory, currentDirectory, getCanonicalFileName));
|
|
50240
50240
|
}
|
|
50241
50241
|
function set(directory, result) {
|
|
50242
|
-
const
|
|
50243
|
-
if (directoryPathMap.has(
|
|
50242
|
+
const path3 = toPath(directory, currentDirectory, getCanonicalFileName);
|
|
50243
|
+
if (directoryPathMap.has(path3)) {
|
|
50244
50244
|
return;
|
|
50245
50245
|
}
|
|
50246
|
-
directoryPathMap.set(
|
|
50246
|
+
directoryPathMap.set(path3, result);
|
|
50247
50247
|
const resolvedFileName = getResolvedFileName(result);
|
|
50248
|
-
const commonPrefix = resolvedFileName && getCommonPrefix(
|
|
50249
|
-
let current =
|
|
50248
|
+
const commonPrefix = resolvedFileName && getCommonPrefix(path3, resolvedFileName);
|
|
50249
|
+
let current = path3;
|
|
50250
50250
|
while (current !== commonPrefix) {
|
|
50251
50251
|
const parent2 = getDirectoryPath(current);
|
|
50252
50252
|
if (parent2 === current || directoryPathMap.has(parent2)) {
|
|
@@ -50810,16 +50810,16 @@ ${lanes.join("\n")}
|
|
|
50810
50810
|
const combined = combinePaths(containingDirectory, moduleName);
|
|
50811
50811
|
const parts = getPathComponents(combined);
|
|
50812
50812
|
const lastPart = lastOrUndefined(parts);
|
|
50813
|
-
const
|
|
50814
|
-
return { path:
|
|
50813
|
+
const path3 = lastPart === "." || lastPart === ".." ? ensureTrailingDirectorySeparator(normalizePath(combined)) : normalizePath(combined);
|
|
50814
|
+
return { path: path3, parts };
|
|
50815
50815
|
}
|
|
50816
|
-
function realPath(
|
|
50816
|
+
function realPath(path3, host, traceEnabled) {
|
|
50817
50817
|
if (!host.realpath) {
|
|
50818
|
-
return
|
|
50818
|
+
return path3;
|
|
50819
50819
|
}
|
|
50820
|
-
const real = normalizePath(host.realpath(
|
|
50820
|
+
const real = normalizePath(host.realpath(path3));
|
|
50821
50821
|
if (traceEnabled) {
|
|
50822
|
-
trace(host, Diagnostics.Resolving_real_path_for_0_result_1,
|
|
50822
|
+
trace(host, Diagnostics.Resolving_real_path_for_0_result_1, path3, real);
|
|
50823
50823
|
}
|
|
50824
50824
|
return real;
|
|
50825
50825
|
}
|
|
@@ -50864,25 +50864,25 @@ ${lanes.join("\n")}
|
|
|
50864
50864
|
return void 0;
|
|
50865
50865
|
}
|
|
50866
50866
|
var nodeModulesPathPart = "/node_modules/";
|
|
50867
|
-
function pathContainsNodeModules(
|
|
50868
|
-
return
|
|
50867
|
+
function pathContainsNodeModules(path3) {
|
|
50868
|
+
return path3.includes(nodeModulesPathPart);
|
|
50869
50869
|
}
|
|
50870
50870
|
function parseNodeModuleFromPath(resolved, isFolder) {
|
|
50871
|
-
const
|
|
50872
|
-
const idx =
|
|
50871
|
+
const path3 = normalizePath(resolved);
|
|
50872
|
+
const idx = path3.lastIndexOf(nodeModulesPathPart);
|
|
50873
50873
|
if (idx === -1) {
|
|
50874
50874
|
return void 0;
|
|
50875
50875
|
}
|
|
50876
50876
|
const indexAfterNodeModules = idx + nodeModulesPathPart.length;
|
|
50877
|
-
let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(
|
|
50878
|
-
if (
|
|
50879
|
-
indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(
|
|
50877
|
+
let indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path3, indexAfterNodeModules, isFolder);
|
|
50878
|
+
if (path3.charCodeAt(indexAfterNodeModules) === 64) {
|
|
50879
|
+
indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path3, indexAfterPackageName, isFolder);
|
|
50880
50880
|
}
|
|
50881
|
-
return
|
|
50881
|
+
return path3.slice(0, indexAfterPackageName);
|
|
50882
50882
|
}
|
|
50883
|
-
function moveToNextDirectorySeparatorIfAvailable(
|
|
50884
|
-
const nextSeparatorIndex =
|
|
50885
|
-
return nextSeparatorIndex === -1 ? isFolder ?
|
|
50883
|
+
function moveToNextDirectorySeparatorIfAvailable(path3, prevSeparatorIndex, isFolder) {
|
|
50884
|
+
const nextSeparatorIndex = path3.indexOf(directorySeparator, prevSeparatorIndex + 1);
|
|
50885
|
+
return nextSeparatorIndex === -1 ? isFolder ? path3.length : prevSeparatorIndex : nextSeparatorIndex;
|
|
50886
50886
|
}
|
|
50887
50887
|
function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
|
|
50888
50888
|
return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
|
|
@@ -51024,8 +51024,8 @@ ${lanes.join("\n")}
|
|
|
51024
51024
|
return extensions & 4 && !isDeclarationFileName(candidate + originalExtension) && tryExtension(`.d${originalExtension}.ts`) || void 0;
|
|
51025
51025
|
}
|
|
51026
51026
|
function tryExtension(ext, resolvedUsingTsExtension) {
|
|
51027
|
-
const
|
|
51028
|
-
return
|
|
51027
|
+
const path3 = tryFile(candidate + ext, onlyRecordFailures, state);
|
|
51028
|
+
return path3 === void 0 ? void 0 : { path: path3, ext, resolvedUsingTsExtension: !state.candidateIsFromPackageJsonField && resolvedUsingTsExtension };
|
|
51029
51029
|
}
|
|
51030
51030
|
}
|
|
51031
51031
|
function tryFile(fileName, onlyRecordFailures, state) {
|
|
@@ -51721,10 +51721,10 @@ ${lanes.join("\n")}
|
|
|
51721
51721
|
/*value*/
|
|
51722
51722
|
void 0
|
|
51723
51723
|
);
|
|
51724
|
-
function toAbsolutePath(
|
|
51724
|
+
function toAbsolutePath(path3) {
|
|
51725
51725
|
var _a2, _b2;
|
|
51726
|
-
if (
|
|
51727
|
-
return getNormalizedAbsolutePath(
|
|
51726
|
+
if (path3 === void 0) return path3;
|
|
51727
|
+
return getNormalizedAbsolutePath(path3, (_b2 = (_a2 = state.host).getCurrentDirectory) == null ? void 0 : _b2.call(_a2));
|
|
51728
51728
|
}
|
|
51729
51729
|
function combineDirectoryPath(root, dir) {
|
|
51730
51730
|
return ensureTrailingDirectorySeparator(combinePaths(root, dir));
|
|
@@ -51975,10 +51975,10 @@ ${lanes.join("\n")}
|
|
|
51975
51975
|
trace(state.host, Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
|
|
51976
51976
|
}
|
|
51977
51977
|
const resolved = forEach(paths[matchedPatternText], (subst) => {
|
|
51978
|
-
const
|
|
51979
|
-
const candidate = normalizePath(combinePaths(baseDirectory,
|
|
51978
|
+
const path3 = matchedStar ? replaceFirstStar(subst, matchedStar) : subst;
|
|
51979
|
+
const candidate = normalizePath(combinePaths(baseDirectory, path3));
|
|
51980
51980
|
if (state.traceEnabled) {
|
|
51981
|
-
trace(state.host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst,
|
|
51981
|
+
trace(state.host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path3);
|
|
51982
51982
|
}
|
|
51983
51983
|
const extension = tryGetExtensionFromPath2(subst);
|
|
51984
51984
|
if (extension !== void 0) {
|
|
@@ -56131,10 +56131,10 @@ ${lanes.join("\n")}
|
|
|
56131
56131
|
if (a === void 0 || b === void 0) return false;
|
|
56132
56132
|
return comparePaths(a, b, ignoreCase) === 0;
|
|
56133
56133
|
}
|
|
56134
|
-
function countPathComponents(
|
|
56134
|
+
function countPathComponents(path3) {
|
|
56135
56135
|
let count = 0;
|
|
56136
|
-
for (let i = startsWith(
|
|
56137
|
-
if (
|
|
56136
|
+
for (let i = startsWith(path3, "./") ? 2 : 0; i < path3.length; i++) {
|
|
56137
|
+
if (path3.charCodeAt(i) === 47) count++;
|
|
56138
56138
|
}
|
|
56139
56139
|
return count;
|
|
56140
56140
|
}
|
|
@@ -56251,9 +56251,9 @@ ${lanes.join("\n")}
|
|
|
56251
56251
|
host,
|
|
56252
56252
|
/*preferSymlinks*/
|
|
56253
56253
|
true,
|
|
56254
|
-
(
|
|
56255
|
-
const isInNodeModules = pathContainsNodeModules(
|
|
56256
|
-
allFileNames.set(
|
|
56254
|
+
(path3, isRedirect) => {
|
|
56255
|
+
const isInNodeModules = pathContainsNodeModules(path3);
|
|
56256
|
+
allFileNames.set(path3, { path: info.getCanonicalFileName(path3), isRedirect, isInNodeModules });
|
|
56257
56257
|
importedFileFromNodeModules = importedFileFromNodeModules || isInNodeModules;
|
|
56258
56258
|
}
|
|
56259
56259
|
);
|
|
@@ -56261,8 +56261,8 @@ ${lanes.join("\n")}
|
|
|
56261
56261
|
for (let directory = info.canonicalSourceDirectory; allFileNames.size !== 0; ) {
|
|
56262
56262
|
const directoryStart = ensureTrailingDirectorySeparator(directory);
|
|
56263
56263
|
let pathsInDirectory;
|
|
56264
|
-
allFileNames.forEach(({ path:
|
|
56265
|
-
if (startsWith(
|
|
56264
|
+
allFileNames.forEach(({ path: path3, isRedirect, isInNodeModules }, fileName) => {
|
|
56265
|
+
if (startsWith(path3, directoryStart)) {
|
|
56266
56266
|
(pathsInDirectory || (pathsInDirectory = [])).push({ path: fileName, isRedirect, isInNodeModules });
|
|
56267
56267
|
allFileNames.delete(fileName);
|
|
56268
56268
|
}
|
|
@@ -56565,17 +56565,17 @@ ${lanes.join("\n")}
|
|
|
56565
56565
|
}
|
|
56566
56566
|
return processEnding(shortest, allowedEndings, compilerOptions);
|
|
56567
56567
|
}
|
|
56568
|
-
function tryGetModuleNameAsNodeModule({ path:
|
|
56568
|
+
function tryGetModuleNameAsNodeModule({ path: path3, isRedirect }, { getCanonicalFileName, canonicalSourceDirectory }, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
|
|
56569
56569
|
if (!host.fileExists || !host.readFile) {
|
|
56570
56570
|
return void 0;
|
|
56571
56571
|
}
|
|
56572
|
-
const parts = getNodeModulePathParts(
|
|
56572
|
+
const parts = getNodeModulePathParts(path3);
|
|
56573
56573
|
if (!parts) {
|
|
56574
56574
|
return void 0;
|
|
56575
56575
|
}
|
|
56576
56576
|
const preferences = getModuleSpecifierPreferences(userPreferences, host, options, importingSourceFile);
|
|
56577
56577
|
const allowedEndings = preferences.getAllowedEndingsInPreferredOrder();
|
|
56578
|
-
let moduleSpecifier =
|
|
56578
|
+
let moduleSpecifier = path3;
|
|
56579
56579
|
let isPackageRootPath = false;
|
|
56580
56580
|
if (!packageNameOnly) {
|
|
56581
56581
|
let packageRootIndex = parts.packageRootIndex;
|
|
@@ -56596,7 +56596,7 @@ ${lanes.join("\n")}
|
|
|
56596
56596
|
break;
|
|
56597
56597
|
}
|
|
56598
56598
|
if (!moduleFileName) moduleFileName = moduleFileToTry;
|
|
56599
|
-
packageRootIndex =
|
|
56599
|
+
packageRootIndex = path3.indexOf(directorySeparator, packageRootIndex + 1);
|
|
56600
56600
|
if (packageRootIndex === -1) {
|
|
56601
56601
|
moduleSpecifier = processEnding(moduleFileName, allowedEndings, options, host);
|
|
56602
56602
|
break;
|
|
@@ -56616,9 +56616,9 @@ ${lanes.join("\n")}
|
|
|
56616
56616
|
return getEmitModuleResolutionKind(options) === 1 && packageName === nodeModulesDirectoryName ? void 0 : packageName;
|
|
56617
56617
|
function tryDirectoryWithPackageJson(packageRootIndex) {
|
|
56618
56618
|
var _a, _b;
|
|
56619
|
-
const packageRootPath =
|
|
56619
|
+
const packageRootPath = path3.substring(0, packageRootIndex);
|
|
56620
56620
|
const packageJsonPath = combinePaths(packageRootPath, "package.json");
|
|
56621
|
-
let moduleFileToTry =
|
|
56621
|
+
let moduleFileToTry = path3;
|
|
56622
56622
|
let maybeBlockedByTypesVersions = false;
|
|
56623
56623
|
const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
|
|
56624
56624
|
if (isPackageJsonInfo(cachedPackageJson) || cachedPackageJson === void 0 && host.fileExists(packageJsonPath)) {
|
|
@@ -56631,7 +56631,7 @@ ${lanes.join("\n")}
|
|
|
56631
56631
|
const fromExports = (packageJsonContent == null ? void 0 : packageJsonContent.exports) ? tryGetModuleNameFromExports(
|
|
56632
56632
|
options,
|
|
56633
56633
|
host,
|
|
56634
|
-
|
|
56634
|
+
path3,
|
|
56635
56635
|
packageRootPath,
|
|
56636
56636
|
packageName2,
|
|
56637
56637
|
packageJsonContent.exports,
|
|
@@ -56641,12 +56641,12 @@ ${lanes.join("\n")}
|
|
|
56641
56641
|
return { ...fromExports, verbatimFromExports: true };
|
|
56642
56642
|
}
|
|
56643
56643
|
if (packageJsonContent == null ? void 0 : packageJsonContent.exports) {
|
|
56644
|
-
return { moduleFileToTry:
|
|
56644
|
+
return { moduleFileToTry: path3, blockedByExports: true };
|
|
56645
56645
|
}
|
|
56646
56646
|
}
|
|
56647
56647
|
const versionPaths = (packageJsonContent == null ? void 0 : packageJsonContent.typesVersions) ? getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions) : void 0;
|
|
56648
56648
|
if (versionPaths) {
|
|
56649
|
-
const subModuleName =
|
|
56649
|
+
const subModuleName = path3.slice(packageRootPath.length + 1);
|
|
56650
56650
|
const fromPaths = tryGetModuleNameFromPaths(
|
|
56651
56651
|
subModuleName,
|
|
56652
56652
|
versionPaths.paths,
|
|
@@ -56681,7 +56681,7 @@ ${lanes.join("\n")}
|
|
|
56681
56681
|
return { moduleFileToTry };
|
|
56682
56682
|
}
|
|
56683
56683
|
}
|
|
56684
|
-
function tryGetAnyFileFromPath(host,
|
|
56684
|
+
function tryGetAnyFileFromPath(host, path3) {
|
|
56685
56685
|
if (!host.fileExists) return;
|
|
56686
56686
|
const extensions = flatten(getSupportedExtensions({ allowJs: true }, [{ extension: "node", isMixedContent: false }, {
|
|
56687
56687
|
extension: "json",
|
|
@@ -56690,15 +56690,15 @@ ${lanes.join("\n")}
|
|
|
56690
56690
|
/* JSON */
|
|
56691
56691
|
}]));
|
|
56692
56692
|
for (const e of extensions) {
|
|
56693
|
-
const fullPath =
|
|
56693
|
+
const fullPath = path3 + e;
|
|
56694
56694
|
if (host.fileExists(fullPath)) {
|
|
56695
56695
|
return fullPath;
|
|
56696
56696
|
}
|
|
56697
56697
|
}
|
|
56698
56698
|
}
|
|
56699
|
-
function getPathsRelativeToRootDirs(
|
|
56699
|
+
function getPathsRelativeToRootDirs(path3, rootDirs, getCanonicalFileName) {
|
|
56700
56700
|
return mapDefined(rootDirs, (rootDir) => {
|
|
56701
|
-
const relativePath = getRelativePathIfInSameVolume(
|
|
56701
|
+
const relativePath = getRelativePathIfInSameVolume(path3, rootDir, getCanonicalFileName);
|
|
56702
56702
|
return relativePath !== void 0 && isPathRelativeToParent(relativePath) ? void 0 : relativePath;
|
|
56703
56703
|
});
|
|
56704
56704
|
}
|
|
@@ -56815,10 +56815,10 @@ ${lanes.join("\n")}
|
|
|
56815
56815
|
return void 0;
|
|
56816
56816
|
}
|
|
56817
56817
|
}
|
|
56818
|
-
function getRelativePathIfInSameVolume(
|
|
56818
|
+
function getRelativePathIfInSameVolume(path3, directoryPath, getCanonicalFileName) {
|
|
56819
56819
|
const relativePath = getRelativePathToDirectoryOrUrl(
|
|
56820
56820
|
directoryPath,
|
|
56821
|
-
|
|
56821
|
+
path3,
|
|
56822
56822
|
directoryPath,
|
|
56823
56823
|
getCanonicalFileName,
|
|
56824
56824
|
/*isAbsolutePathAnUrl*/
|
|
@@ -56826,8 +56826,8 @@ ${lanes.join("\n")}
|
|
|
56826
56826
|
);
|
|
56827
56827
|
return isRootedDiskPath(relativePath) ? void 0 : relativePath;
|
|
56828
56828
|
}
|
|
56829
|
-
function isPathRelativeToParent(
|
|
56830
|
-
return startsWith(
|
|
56829
|
+
function isPathRelativeToParent(path3) {
|
|
56830
|
+
return startsWith(path3, "..");
|
|
56831
56831
|
}
|
|
56832
56832
|
function getDefaultResolutionModeForFile(file, host, compilerOptions) {
|
|
56833
56833
|
return isFullSourceFile(file) ? host.getDefaultResolutionModeForFile(file) : getDefaultResolutionModeForFileWorker(file, compilerOptions);
|
|
@@ -71876,10 +71876,10 @@ ${lanes.join("\n")}
|
|
|
71876
71876
|
const text = identifier.escapedText;
|
|
71877
71877
|
if (text) {
|
|
71878
71878
|
const parentSymbol = name.kind === 167 ? getUnresolvedSymbolForEntityName(name.left) : name.kind === 212 ? getUnresolvedSymbolForEntityName(name.expression) : void 0;
|
|
71879
|
-
const
|
|
71880
|
-
let result = unresolvedSymbols.get(
|
|
71879
|
+
const path3 = parentSymbol ? `${getSymbolPath(parentSymbol)}.${text}` : text;
|
|
71880
|
+
let result = unresolvedSymbols.get(path3);
|
|
71881
71881
|
if (!result) {
|
|
71882
|
-
unresolvedSymbols.set(
|
|
71882
|
+
unresolvedSymbols.set(path3, result = createSymbol(
|
|
71883
71883
|
524288,
|
|
71884
71884
|
text,
|
|
71885
71885
|
1048576
|
|
@@ -76680,24 +76680,24 @@ ${lanes.join("\n")}
|
|
|
76680
76680
|
}
|
|
76681
76681
|
return;
|
|
76682
76682
|
}
|
|
76683
|
-
let
|
|
76683
|
+
let path3 = "";
|
|
76684
76684
|
const secondaryRootErrors = [];
|
|
76685
76685
|
while (stack.length) {
|
|
76686
76686
|
const [msg, ...args] = stack.pop();
|
|
76687
76687
|
switch (msg.code) {
|
|
76688
76688
|
case Diagnostics.Types_of_property_0_are_incompatible.code: {
|
|
76689
|
-
if (
|
|
76690
|
-
|
|
76689
|
+
if (path3.indexOf("new ") === 0) {
|
|
76690
|
+
path3 = `(${path3})`;
|
|
76691
76691
|
}
|
|
76692
76692
|
const str = "" + args[0];
|
|
76693
|
-
if (
|
|
76694
|
-
|
|
76693
|
+
if (path3.length === 0) {
|
|
76694
|
+
path3 = `${str}`;
|
|
76695
76695
|
} else if (isIdentifierText(str, getEmitScriptTarget(compilerOptions))) {
|
|
76696
|
-
|
|
76696
|
+
path3 = `${path3}.${str}`;
|
|
76697
76697
|
} else if (str[0] === "[" && str[str.length - 1] === "]") {
|
|
76698
|
-
|
|
76698
|
+
path3 = `${path3}${str}`;
|
|
76699
76699
|
} else {
|
|
76700
|
-
|
|
76700
|
+
path3 = `${path3}[${str}]`;
|
|
76701
76701
|
}
|
|
76702
76702
|
break;
|
|
76703
76703
|
}
|
|
@@ -76705,7 +76705,7 @@ ${lanes.join("\n")}
|
|
|
76705
76705
|
case Diagnostics.Construct_signature_return_types_0_and_1_are_incompatible.code:
|
|
76706
76706
|
case Diagnostics.Call_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code:
|
|
76707
76707
|
case Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code: {
|
|
76708
|
-
if (
|
|
76708
|
+
if (path3.length === 0) {
|
|
76709
76709
|
let mappedMsg = msg;
|
|
76710
76710
|
if (msg.code === Diagnostics.Call_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code) {
|
|
76711
76711
|
mappedMsg = Diagnostics.Call_signature_return_types_0_and_1_are_incompatible;
|
|
@@ -76716,7 +76716,7 @@ ${lanes.join("\n")}
|
|
|
76716
76716
|
} else {
|
|
76717
76717
|
const prefix = msg.code === Diagnostics.Construct_signature_return_types_0_and_1_are_incompatible.code || msg.code === Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code ? "new " : "";
|
|
76718
76718
|
const params = msg.code === Diagnostics.Call_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code || msg.code === Diagnostics.Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1.code ? "" : "...";
|
|
76719
|
-
|
|
76719
|
+
path3 = `${prefix}${path3}(${params})`;
|
|
76720
76720
|
}
|
|
76721
76721
|
break;
|
|
76722
76722
|
}
|
|
@@ -76732,10 +76732,10 @@ ${lanes.join("\n")}
|
|
|
76732
76732
|
return Debug.fail(`Unhandled Diagnostic: ${msg.code}`);
|
|
76733
76733
|
}
|
|
76734
76734
|
}
|
|
76735
|
-
if (
|
|
76735
|
+
if (path3) {
|
|
76736
76736
|
reportError(
|
|
76737
|
-
|
|
76738
|
-
|
|
76737
|
+
path3[path3.length - 1] === ")" ? Diagnostics.The_types_returned_by_0_are_incompatible_between_these_types : Diagnostics.The_types_of_0_are_incompatible_between_these_types,
|
|
76738
|
+
path3
|
|
76739
76739
|
);
|
|
76740
76740
|
} else {
|
|
76741
76741
|
secondaryRootErrors.shift();
|
|
@@ -131803,9 +131803,9 @@ ${lanes.join("\n")}
|
|
|
131803
131803
|
function createAddOutput() {
|
|
131804
131804
|
let outputs;
|
|
131805
131805
|
return { addOutput, getOutputs };
|
|
131806
|
-
function addOutput(
|
|
131807
|
-
if (
|
|
131808
|
-
(outputs || (outputs = [])).push(
|
|
131806
|
+
function addOutput(path3) {
|
|
131807
|
+
if (path3) {
|
|
131808
|
+
(outputs || (outputs = [])).push(path3);
|
|
131809
131809
|
}
|
|
131810
131810
|
}
|
|
131811
131811
|
function getOutputs() {
|
|
@@ -137031,7 +137031,7 @@ ${lanes.join("\n")}
|
|
|
137031
137031
|
return {
|
|
137032
137032
|
useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
|
|
137033
137033
|
fileExists,
|
|
137034
|
-
readFile: (
|
|
137034
|
+
readFile: (path3, encoding) => host.readFile(path3, encoding),
|
|
137035
137035
|
directoryExists: host.directoryExists && directoryExists,
|
|
137036
137036
|
getDirectories,
|
|
137037
137037
|
readDirectory,
|
|
@@ -137048,8 +137048,8 @@ ${lanes.join("\n")}
|
|
|
137048
137048
|
function getCachedFileSystemEntries(rootDirPath) {
|
|
137049
137049
|
return cachedReadDirectoryResult.get(ensureTrailingDirectorySeparator(rootDirPath));
|
|
137050
137050
|
}
|
|
137051
|
-
function getCachedFileSystemEntriesForBaseDir(
|
|
137052
|
-
const entries = getCachedFileSystemEntries(getDirectoryPath(
|
|
137051
|
+
function getCachedFileSystemEntriesForBaseDir(path3) {
|
|
137052
|
+
const entries = getCachedFileSystemEntries(getDirectoryPath(path3));
|
|
137053
137053
|
if (!entries) {
|
|
137054
137054
|
return entries;
|
|
137055
137055
|
}
|
|
@@ -137104,8 +137104,8 @@ ${lanes.join("\n")}
|
|
|
137104
137104
|
return index >= 0;
|
|
137105
137105
|
}
|
|
137106
137106
|
function writeFile2(fileName, data, writeByteOrderMark) {
|
|
137107
|
-
const
|
|
137108
|
-
const result = getCachedFileSystemEntriesForBaseDir(
|
|
137107
|
+
const path3 = toPath3(fileName);
|
|
137108
|
+
const result = getCachedFileSystemEntriesForBaseDir(path3);
|
|
137109
137109
|
if (result) {
|
|
137110
137110
|
updateFilesOfFileSystemEntry(
|
|
137111
137111
|
result,
|
|
@@ -137117,17 +137117,17 @@ ${lanes.join("\n")}
|
|
|
137117
137117
|
return host.writeFile(fileName, data, writeByteOrderMark);
|
|
137118
137118
|
}
|
|
137119
137119
|
function fileExists(fileName) {
|
|
137120
|
-
const
|
|
137121
|
-
const result = getCachedFileSystemEntriesForBaseDir(
|
|
137120
|
+
const path3 = toPath3(fileName);
|
|
137121
|
+
const result = getCachedFileSystemEntriesForBaseDir(path3);
|
|
137122
137122
|
return result && hasEntry(result.sortedAndCanonicalizedFiles, getCanonicalFileName(getBaseNameOfFileName(fileName))) || host.fileExists(fileName);
|
|
137123
137123
|
}
|
|
137124
137124
|
function directoryExists(dirPath) {
|
|
137125
|
-
const
|
|
137126
|
-
return cachedReadDirectoryResult.has(ensureTrailingDirectorySeparator(
|
|
137125
|
+
const path3 = toPath3(dirPath);
|
|
137126
|
+
return cachedReadDirectoryResult.has(ensureTrailingDirectorySeparator(path3)) || host.directoryExists(dirPath);
|
|
137127
137127
|
}
|
|
137128
137128
|
function createDirectory(dirPath) {
|
|
137129
|
-
const
|
|
137130
|
-
const result = getCachedFileSystemEntriesForBaseDir(
|
|
137129
|
+
const path3 = toPath3(dirPath);
|
|
137130
|
+
const result = getCachedFileSystemEntriesForBaseDir(path3);
|
|
137131
137131
|
if (result) {
|
|
137132
137132
|
const baseName = getBaseNameOfFileName(dirPath);
|
|
137133
137133
|
const canonicalizedBaseName = getCanonicalFileName(baseName);
|
|
@@ -137155,15 +137155,15 @@ ${lanes.join("\n")}
|
|
|
137155
137155
|
}
|
|
137156
137156
|
return host.readDirectory(rootDir, extensions, excludes, includes, depth);
|
|
137157
137157
|
function getFileSystemEntries(dir) {
|
|
137158
|
-
const
|
|
137159
|
-
if (
|
|
137160
|
-
return rootResult || getFileSystemEntriesFromHost(dir,
|
|
137158
|
+
const path3 = toPath3(dir);
|
|
137159
|
+
if (path3 === rootDirPath) {
|
|
137160
|
+
return rootResult || getFileSystemEntriesFromHost(dir, path3);
|
|
137161
137161
|
}
|
|
137162
|
-
const result = tryReadDirectory2(dir,
|
|
137163
|
-
return result !== void 0 ? result || getFileSystemEntriesFromHost(dir,
|
|
137162
|
+
const result = tryReadDirectory2(dir, path3);
|
|
137163
|
+
return result !== void 0 ? result || getFileSystemEntriesFromHost(dir, path3) : emptyFileSystemEntries;
|
|
137164
137164
|
}
|
|
137165
|
-
function getFileSystemEntriesFromHost(dir,
|
|
137166
|
-
if (rootSymLinkResult &&
|
|
137165
|
+
function getFileSystemEntriesFromHost(dir, path3) {
|
|
137166
|
+
if (rootSymLinkResult && path3 === rootDirPath) return rootSymLinkResult;
|
|
137167
137167
|
const result = {
|
|
137168
137168
|
files: map(host.readDirectory(
|
|
137169
137169
|
dir,
|
|
@@ -137176,7 +137176,7 @@ ${lanes.join("\n")}
|
|
|
137176
137176
|
), getBaseNameOfFileName) || emptyArray,
|
|
137177
137177
|
directories: host.getDirectories(dir) || emptyArray
|
|
137178
137178
|
};
|
|
137179
|
-
if (
|
|
137179
|
+
if (path3 === rootDirPath) rootSymLinkResult = result;
|
|
137180
137180
|
return result;
|
|
137181
137181
|
}
|
|
137182
137182
|
}
|
|
@@ -137635,15 +137635,15 @@ ${lanes.join("\n")}
|
|
|
137635
137635
|
return getDirectoryPath(normalizePath(system.getExecutingFilePath()));
|
|
137636
137636
|
}
|
|
137637
137637
|
const newLine = getNewLineCharacter(options);
|
|
137638
|
-
const realpath = system.realpath && ((
|
|
137638
|
+
const realpath = system.realpath && ((path3) => system.realpath(path3));
|
|
137639
137639
|
const compilerHost = {
|
|
137640
137640
|
getSourceFile: createGetSourceFile((fileName) => compilerHost.readFile(fileName), setParentNodes),
|
|
137641
137641
|
getDefaultLibLocation,
|
|
137642
137642
|
getDefaultLibFileName: (options2) => combinePaths(getDefaultLibLocation(), getDefaultLibFileName(options2)),
|
|
137643
137643
|
writeFile: createWriteFileMeasuringIO(
|
|
137644
|
-
(
|
|
137645
|
-
(
|
|
137646
|
-
(
|
|
137644
|
+
(path3, data, writeByteOrderMark) => system.writeFile(path3, data, writeByteOrderMark),
|
|
137645
|
+
(path3) => (compilerHost.createDirectory || system.createDirectory)(path3),
|
|
137646
|
+
(path3) => directoryExists(path3)
|
|
137647
137647
|
),
|
|
137648
137648
|
getCurrentDirectory: memoize(() => system.getCurrentDirectory()),
|
|
137649
137649
|
useCaseSensitiveFileNames: () => system.useCaseSensitiveFileNames,
|
|
@@ -137654,9 +137654,9 @@ ${lanes.join("\n")}
|
|
|
137654
137654
|
trace: (s) => system.write(s + newLine),
|
|
137655
137655
|
directoryExists: (directoryName) => system.directoryExists(directoryName),
|
|
137656
137656
|
getEnvironmentVariable: (name) => system.getEnvironmentVariable ? system.getEnvironmentVariable(name) : "",
|
|
137657
|
-
getDirectories: (
|
|
137657
|
+
getDirectories: (path3) => system.getDirectories(path3),
|
|
137658
137658
|
realpath,
|
|
137659
|
-
readDirectory: (
|
|
137659
|
+
readDirectory: (path3, extensions, include, exclude, depth) => system.readDirectory(path3, extensions, include, exclude, depth),
|
|
137660
137660
|
createDirectory: (d) => system.createDirectory(d),
|
|
137661
137661
|
createHash: maybeBind(system, system.createHash)
|
|
137662
137662
|
};
|
|
@@ -138095,13 +138095,13 @@ ${lanes.join("\n")}
|
|
|
138095
138095
|
}
|
|
138096
138096
|
function getLibraryNameFromLibFileName(libFileName) {
|
|
138097
138097
|
const components = libFileName.split(".");
|
|
138098
|
-
let
|
|
138098
|
+
let path3 = components[1];
|
|
138099
138099
|
let i = 2;
|
|
138100
138100
|
while (components[i] && components[i] !== "d") {
|
|
138101
|
-
|
|
138101
|
+
path3 += (i === 2 ? "/" : "-") + components[i];
|
|
138102
138102
|
i++;
|
|
138103
138103
|
}
|
|
138104
|
-
return "@typescript/lib-" +
|
|
138104
|
+
return "@typescript/lib-" + path3;
|
|
138105
138105
|
}
|
|
138106
138106
|
function isReferencedFile(reason) {
|
|
138107
138107
|
switch (reason == null ? void 0 : reason.kind) {
|
|
@@ -139177,18 +139177,18 @@ ${lanes.join("\n")}
|
|
|
139177
139177
|
filesByName.set(newSourceFile.path, newSourceFile);
|
|
139178
139178
|
}
|
|
139179
139179
|
const oldFilesByNameMap = oldProgram.getFilesByNameMap();
|
|
139180
|
-
oldFilesByNameMap.forEach((oldFile,
|
|
139180
|
+
oldFilesByNameMap.forEach((oldFile, path3) => {
|
|
139181
139181
|
if (!oldFile) {
|
|
139182
|
-
filesByName.set(
|
|
139182
|
+
filesByName.set(path3, oldFile);
|
|
139183
139183
|
return;
|
|
139184
139184
|
}
|
|
139185
|
-
if (oldFile.path ===
|
|
139185
|
+
if (oldFile.path === path3) {
|
|
139186
139186
|
if (oldProgram.isSourceFileFromExternalLibrary(oldFile)) {
|
|
139187
139187
|
sourceFilesFoundSearchingNodeModules.set(oldFile.path, true);
|
|
139188
139188
|
}
|
|
139189
139189
|
return;
|
|
139190
139190
|
}
|
|
139191
|
-
filesByName.set(
|
|
139191
|
+
filesByName.set(path3, filesByName.get(oldFile.path));
|
|
139192
139192
|
});
|
|
139193
139193
|
const isConfigIdentical = oldOptions.configFile && oldOptions.configFile === options.configFile || !oldOptions.configFile && !options.configFile && !optionsHaveChanges(oldOptions, options, optionDeclarations);
|
|
139194
139194
|
programDiagnostics.reuseStateFromOldProgram(oldProgram.getProgramDiagnosticsContainer(), isConfigIdentical);
|
|
@@ -139226,9 +139226,9 @@ ${lanes.join("\n")}
|
|
|
139226
139226
|
getModeForResolutionAtIndex: getModeForResolutionAtIndex2,
|
|
139227
139227
|
readFile: (f) => host.readFile(f),
|
|
139228
139228
|
fileExists: (f) => {
|
|
139229
|
-
const
|
|
139230
|
-
if (getSourceFileByPath(
|
|
139231
|
-
if (missingFileNames.has(
|
|
139229
|
+
const path3 = toPath3(f);
|
|
139230
|
+
if (getSourceFileByPath(path3)) return true;
|
|
139231
|
+
if (missingFileNames.has(path3)) return false;
|
|
139232
139232
|
return host.fileExists(f);
|
|
139233
139233
|
},
|
|
139234
139234
|
realpath: maybeBind(host, host.realpath),
|
|
@@ -139368,8 +139368,8 @@ ${lanes.join("\n")}
|
|
|
139368
139368
|
function getSourceFile(fileName) {
|
|
139369
139369
|
return getSourceFileByPath(toPath3(fileName));
|
|
139370
139370
|
}
|
|
139371
|
-
function getSourceFileByPath(
|
|
139372
|
-
return filesByName.get(
|
|
139371
|
+
function getSourceFileByPath(path3) {
|
|
139372
|
+
return filesByName.get(path3) || void 0;
|
|
139373
139373
|
}
|
|
139374
139374
|
function getDiagnosticsHelper(sourceFile, getDiagnostics2, cancellationToken) {
|
|
139375
139375
|
if (sourceFile) {
|
|
@@ -140012,16 +140012,16 @@ ${lanes.join("\n")}
|
|
|
140012
140012
|
addFilePreprocessingFileExplainingDiagnostic(existingFile, reason, Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, [fileName, existingFile.fileName]);
|
|
140013
140013
|
}
|
|
140014
140014
|
}
|
|
140015
|
-
function createRedirectedSourceFile(redirectTarget, unredirected, fileName,
|
|
140015
|
+
function createRedirectedSourceFile(redirectTarget, unredirected, fileName, path3, resolvedPath, originalFileName, sourceFileOptions) {
|
|
140016
140016
|
var _a2;
|
|
140017
140017
|
const redirect = parseNodeFactory.createRedirectedSourceFile({ redirectTarget, unredirected });
|
|
140018
140018
|
redirect.fileName = fileName;
|
|
140019
|
-
redirect.path =
|
|
140019
|
+
redirect.path = path3;
|
|
140020
140020
|
redirect.resolvedPath = resolvedPath;
|
|
140021
140021
|
redirect.originalFileName = originalFileName;
|
|
140022
140022
|
redirect.packageJsonLocations = ((_a2 = sourceFileOptions.packageJsonLocations) == null ? void 0 : _a2.length) ? sourceFileOptions.packageJsonLocations : void 0;
|
|
140023
140023
|
redirect.packageJsonScope = sourceFileOptions.packageJsonScope;
|
|
140024
|
-
sourceFilesFoundSearchingNodeModules.set(
|
|
140024
|
+
sourceFilesFoundSearchingNodeModules.set(path3, currentNodeModulesDepth > 0);
|
|
140025
140025
|
return redirect;
|
|
140026
140026
|
}
|
|
140027
140027
|
function findSourceFile(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
|
|
@@ -140043,18 +140043,18 @@ ${lanes.join("\n")}
|
|
|
140043
140043
|
}
|
|
140044
140044
|
function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
|
|
140045
140045
|
var _a2, _b2;
|
|
140046
|
-
const
|
|
140046
|
+
const path3 = toPath3(fileName);
|
|
140047
140047
|
if (useSourceOfProjectReferenceRedirect) {
|
|
140048
|
-
let source = getRedirectFromOutput(
|
|
140048
|
+
let source = getRedirectFromOutput(path3);
|
|
140049
140049
|
if (!source && host.realpath && options.preserveSymlinks && isDeclarationFileName(fileName) && fileName.includes(nodeModulesPathPart)) {
|
|
140050
140050
|
const realPath2 = toPath3(host.realpath(fileName));
|
|
140051
|
-
if (realPath2 !==
|
|
140051
|
+
if (realPath2 !== path3) source = getRedirectFromOutput(realPath2);
|
|
140052
140052
|
}
|
|
140053
140053
|
if (source == null ? void 0 : source.source) {
|
|
140054
140054
|
const file2 = findSourceFile(source.source, isDefaultLib, ignoreNoDefaultLib, reason, packageId);
|
|
140055
140055
|
if (file2) addFileToFilesByName(
|
|
140056
140056
|
file2,
|
|
140057
|
-
|
|
140057
|
+
path3,
|
|
140058
140058
|
fileName,
|
|
140059
140059
|
/*redirectedPath*/
|
|
140060
140060
|
void 0
|
|
@@ -140063,8 +140063,8 @@ ${lanes.join("\n")}
|
|
|
140063
140063
|
}
|
|
140064
140064
|
}
|
|
140065
140065
|
const originalFileName = fileName;
|
|
140066
|
-
if (filesByName.has(
|
|
140067
|
-
const file2 = filesByName.get(
|
|
140066
|
+
if (filesByName.has(path3)) {
|
|
140067
|
+
const file2 = filesByName.get(path3);
|
|
140068
140068
|
const addedReason = addFileIncludeReason(
|
|
140069
140069
|
file2 || void 0,
|
|
140070
140070
|
reason,
|
|
@@ -140130,28 +140130,28 @@ ${lanes.join("\n")}
|
|
|
140130
140130
|
const packageIdKey = packageIdToString(packageId);
|
|
140131
140131
|
const fileFromPackageId = packageIdToSourceFile.get(packageIdKey);
|
|
140132
140132
|
if (fileFromPackageId) {
|
|
140133
|
-
const dupFile = createRedirectedSourceFile(fileFromPackageId, file, fileName,
|
|
140133
|
+
const dupFile = createRedirectedSourceFile(fileFromPackageId, file, fileName, path3, toPath3(fileName), originalFileName, sourceFileOptions);
|
|
140134
140134
|
redirectTargetsMap.add(fileFromPackageId.path, fileName);
|
|
140135
|
-
addFileToFilesByName(dupFile,
|
|
140135
|
+
addFileToFilesByName(dupFile, path3, fileName, redirectedPath);
|
|
140136
140136
|
addFileIncludeReason(
|
|
140137
140137
|
dupFile,
|
|
140138
140138
|
reason,
|
|
140139
140139
|
/*checkExisting*/
|
|
140140
140140
|
false
|
|
140141
140141
|
);
|
|
140142
|
-
sourceFileToPackageName.set(
|
|
140142
|
+
sourceFileToPackageName.set(path3, packageIdToPackageName(packageId));
|
|
140143
140143
|
processingOtherFiles.push(dupFile);
|
|
140144
140144
|
return dupFile;
|
|
140145
140145
|
} else if (file) {
|
|
140146
140146
|
packageIdToSourceFile.set(packageIdKey, file);
|
|
140147
|
-
sourceFileToPackageName.set(
|
|
140147
|
+
sourceFileToPackageName.set(path3, packageIdToPackageName(packageId));
|
|
140148
140148
|
}
|
|
140149
140149
|
}
|
|
140150
|
-
addFileToFilesByName(file,
|
|
140150
|
+
addFileToFilesByName(file, path3, fileName, redirectedPath);
|
|
140151
140151
|
if (file) {
|
|
140152
|
-
sourceFilesFoundSearchingNodeModules.set(
|
|
140152
|
+
sourceFilesFoundSearchingNodeModules.set(path3, currentNodeModulesDepth > 0);
|
|
140153
140153
|
file.fileName = fileName;
|
|
140154
|
-
file.path =
|
|
140154
|
+
file.path = path3;
|
|
140155
140155
|
file.resolvedPath = toPath3(fileName);
|
|
140156
140156
|
file.originalFileName = originalFileName;
|
|
140157
140157
|
file.packageJsonLocations = ((_b2 = sourceFileOptions.packageJsonLocations) == null ? void 0 : _b2.length) ? sourceFileOptions.packageJsonLocations : void 0;
|
|
@@ -140163,7 +140163,7 @@ ${lanes.join("\n")}
|
|
|
140163
140163
|
false
|
|
140164
140164
|
);
|
|
140165
140165
|
if (host.useCaseSensitiveFileNames()) {
|
|
140166
|
-
const pathLowerCase = toFileNameLowerCase(
|
|
140166
|
+
const pathLowerCase = toFileNameLowerCase(path3);
|
|
140167
140167
|
const existingFile = filesByNameIgnoreCase.get(pathLowerCase);
|
|
140168
140168
|
if (existingFile) {
|
|
140169
140169
|
reportFileNamesDifferOnlyInCasingError(fileName, existingFile, reason);
|
|
@@ -140196,18 +140196,18 @@ ${lanes.join("\n")}
|
|
|
140196
140196
|
}
|
|
140197
140197
|
return false;
|
|
140198
140198
|
}
|
|
140199
|
-
function addFileToFilesByName(file,
|
|
140199
|
+
function addFileToFilesByName(file, path3, fileName, redirectedPath) {
|
|
140200
140200
|
if (redirectedPath) {
|
|
140201
140201
|
updateFilesByNameMap(fileName, redirectedPath, file);
|
|
140202
|
-
updateFilesByNameMap(fileName,
|
|
140202
|
+
updateFilesByNameMap(fileName, path3, file || false);
|
|
140203
140203
|
} else {
|
|
140204
|
-
updateFilesByNameMap(fileName,
|
|
140204
|
+
updateFilesByNameMap(fileName, path3, file);
|
|
140205
140205
|
}
|
|
140206
140206
|
}
|
|
140207
|
-
function updateFilesByNameMap(fileName,
|
|
140208
|
-
filesByName.set(
|
|
140209
|
-
if (file !== void 0) missingFileNames.delete(
|
|
140210
|
-
else missingFileNames.set(
|
|
140207
|
+
function updateFilesByNameMap(fileName, path3, file) {
|
|
140208
|
+
filesByName.set(path3, file);
|
|
140209
|
+
if (file !== void 0) missingFileNames.delete(path3);
|
|
140210
|
+
else missingFileNames.set(path3, fileName);
|
|
140211
140211
|
}
|
|
140212
140212
|
function getRedirectFromSourceFile(fileName) {
|
|
140213
140213
|
return mapSourceFileToResolvedRef == null ? void 0 : mapSourceFileToResolvedRef.get(toPath3(fileName));
|
|
@@ -140215,8 +140215,8 @@ ${lanes.join("\n")}
|
|
|
140215
140215
|
function forEachResolvedProjectReference2(cb) {
|
|
140216
140216
|
return forEachResolvedProjectReference(resolvedProjectReferences, cb);
|
|
140217
140217
|
}
|
|
140218
|
-
function getRedirectFromOutput(
|
|
140219
|
-
return mapOutputFileToResolvedRef == null ? void 0 : mapOutputFileToResolvedRef.get(
|
|
140218
|
+
function getRedirectFromOutput(path3) {
|
|
140219
|
+
return mapOutputFileToResolvedRef == null ? void 0 : mapOutputFileToResolvedRef.get(path3);
|
|
140220
140220
|
}
|
|
140221
140221
|
function isSourceOfProjectReferenceRedirect(fileName) {
|
|
140222
140222
|
return useSourceOfProjectReferenceRedirect && !!getRedirectFromSourceFile(fileName);
|
|
@@ -140515,7 +140515,7 @@ ${lanes.join("\n")}
|
|
|
140515
140515
|
}
|
|
140516
140516
|
const getCommonSourceDirectory3 = memoize(() => getCommonSourceDirectoryOfConfig(resolvedRef.commandLine, !host.useCaseSensitiveFileNames()));
|
|
140517
140517
|
commandLine.fileNames.forEach((fileName) => {
|
|
140518
|
-
const
|
|
140518
|
+
const path3 = toPath3(fileName);
|
|
140519
140519
|
let outputDts;
|
|
140520
140520
|
if (!isDeclarationFileName(fileName) && !fileExtensionIs(
|
|
140521
140521
|
fileName,
|
|
@@ -140529,7 +140529,7 @@ ${lanes.join("\n")}
|
|
|
140529
140529
|
outputDts = outDts;
|
|
140530
140530
|
}
|
|
140531
140531
|
}
|
|
140532
|
-
mapSourceFileToResolvedRef.set(
|
|
140532
|
+
mapSourceFileToResolvedRef.set(path3, { resolvedRef, outputDts });
|
|
140533
140533
|
});
|
|
140534
140534
|
}
|
|
140535
140535
|
if (commandLine.projectReferences) {
|
|
@@ -141217,9 +141217,9 @@ ${lanes.join("\n")}
|
|
|
141217
141217
|
host.compilerHost.fileExists = fileExists;
|
|
141218
141218
|
let directoryExists;
|
|
141219
141219
|
if (originalDirectoryExists) {
|
|
141220
|
-
directoryExists = host.compilerHost.directoryExists = (
|
|
141221
|
-
if (originalDirectoryExists.call(host.compilerHost,
|
|
141222
|
-
handleDirectoryCouldBeSymlink(
|
|
141220
|
+
directoryExists = host.compilerHost.directoryExists = (path3) => {
|
|
141221
|
+
if (originalDirectoryExists.call(host.compilerHost, path3)) {
|
|
141222
|
+
handleDirectoryCouldBeSymlink(path3);
|
|
141223
141223
|
return true;
|
|
141224
141224
|
}
|
|
141225
141225
|
if (!host.getResolvedProjectReferences()) return false;
|
|
@@ -141238,14 +141238,14 @@ ${lanes.join("\n")}
|
|
|
141238
141238
|
});
|
|
141239
141239
|
}
|
|
141240
141240
|
return fileOrDirectoryExistsUsingSource(
|
|
141241
|
-
|
|
141241
|
+
path3,
|
|
141242
141242
|
/*isFile*/
|
|
141243
141243
|
false
|
|
141244
141244
|
);
|
|
141245
141245
|
};
|
|
141246
141246
|
}
|
|
141247
141247
|
if (originalGetDirectories) {
|
|
141248
|
-
host.compilerHost.getDirectories = (
|
|
141248
|
+
host.compilerHost.getDirectories = (path3) => !host.getResolvedProjectReferences() || originalDirectoryExists && originalDirectoryExists.call(host.compilerHost, path3) ? originalGetDirectories.call(host.compilerHost, path3) : [];
|
|
141249
141249
|
}
|
|
141250
141250
|
if (originalRealpath) {
|
|
141251
141251
|
host.compilerHost.realpath = (s) => {
|
|
@@ -141912,12 +141912,12 @@ ${lanes.join("\n")}
|
|
|
141912
141912
|
state.allFileNames = void 0;
|
|
141913
141913
|
}
|
|
141914
141914
|
BuilderState2.releaseCache = releaseCache2;
|
|
141915
|
-
function getFilesAffectedBy(state, programOfThisState,
|
|
141915
|
+
function getFilesAffectedBy(state, programOfThisState, path3, cancellationToken, host) {
|
|
141916
141916
|
var _a;
|
|
141917
141917
|
const result = getFilesAffectedByWithOldState(
|
|
141918
141918
|
state,
|
|
141919
141919
|
programOfThisState,
|
|
141920
|
-
|
|
141920
|
+
path3,
|
|
141921
141921
|
cancellationToken,
|
|
141922
141922
|
host
|
|
141923
141923
|
);
|
|
@@ -141925,8 +141925,8 @@ ${lanes.join("\n")}
|
|
|
141925
141925
|
return result;
|
|
141926
141926
|
}
|
|
141927
141927
|
BuilderState2.getFilesAffectedBy = getFilesAffectedBy;
|
|
141928
|
-
function getFilesAffectedByWithOldState(state, programOfThisState,
|
|
141929
|
-
const sourceFile = programOfThisState.getSourceFileByPath(
|
|
141928
|
+
function getFilesAffectedByWithOldState(state, programOfThisState, path3, cancellationToken, host) {
|
|
141929
|
+
const sourceFile = programOfThisState.getSourceFileByPath(path3);
|
|
141930
141930
|
if (!sourceFile) {
|
|
141931
141931
|
return emptyArray;
|
|
141932
141932
|
}
|
|
@@ -141936,9 +141936,9 @@ ${lanes.join("\n")}
|
|
|
141936
141936
|
return (state.referencedMap ? getFilesAffectedByUpdatedShapeWhenModuleEmit : getFilesAffectedByUpdatedShapeWhenNonModuleEmit)(state, programOfThisState, sourceFile, cancellationToken, host);
|
|
141937
141937
|
}
|
|
141938
141938
|
BuilderState2.getFilesAffectedByWithOldState = getFilesAffectedByWithOldState;
|
|
141939
|
-
function updateSignatureOfFile(state, signature,
|
|
141940
|
-
state.fileInfos.get(
|
|
141941
|
-
(state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = /* @__PURE__ */ new Set())).add(
|
|
141939
|
+
function updateSignatureOfFile(state, signature, path3) {
|
|
141940
|
+
state.fileInfos.get(path3).signature = signature;
|
|
141941
|
+
(state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = /* @__PURE__ */ new Set())).add(path3);
|
|
141942
141942
|
}
|
|
141943
141943
|
BuilderState2.updateSignatureOfFile = updateSignatureOfFile;
|
|
141944
141944
|
function computeDtsSignature(programOfThisState, sourceFile, cancellationToken, host, onNewSignature) {
|
|
@@ -142007,10 +142007,10 @@ ${lanes.join("\n")}
|
|
|
142007
142007
|
const seenMap = /* @__PURE__ */ new Set();
|
|
142008
142008
|
const queue = [sourceFile.resolvedPath];
|
|
142009
142009
|
while (queue.length) {
|
|
142010
|
-
const
|
|
142011
|
-
if (!seenMap.has(
|
|
142012
|
-
seenMap.add(
|
|
142013
|
-
const references = state.referencedMap.getValues(
|
|
142010
|
+
const path3 = queue.pop();
|
|
142011
|
+
if (!seenMap.has(path3)) {
|
|
142012
|
+
seenMap.add(path3);
|
|
142013
|
+
const references = state.referencedMap.getValues(path3);
|
|
142014
142014
|
if (references) {
|
|
142015
142015
|
for (const key of references.keys()) {
|
|
142016
142016
|
queue.push(key);
|
|
@@ -142018,9 +142018,9 @@ ${lanes.join("\n")}
|
|
|
142018
142018
|
}
|
|
142019
142019
|
}
|
|
142020
142020
|
}
|
|
142021
|
-
return arrayFrom(mapDefinedIterator(seenMap.keys(), (
|
|
142021
|
+
return arrayFrom(mapDefinedIterator(seenMap.keys(), (path3) => {
|
|
142022
142022
|
var _a;
|
|
142023
|
-
return ((_a = programOfThisState.getSourceFileByPath(
|
|
142023
|
+
return ((_a = programOfThisState.getSourceFileByPath(path3)) == null ? void 0 : _a.fileName) ?? path3;
|
|
142024
142024
|
}));
|
|
142025
142025
|
}
|
|
142026
142026
|
BuilderState2.getAllDependencies = getAllDependencies;
|
|
@@ -142199,7 +142199,7 @@ ${lanes.join("\n")}
|
|
|
142199
142199
|
oldInfo.version !== info.version || // Implied formats dont match
|
|
142200
142200
|
oldInfo.impliedFormat !== info.impliedFormat || // Referenced files changed
|
|
142201
142201
|
!hasSameKeys(newReferences = referencedMap && referencedMap.getValues(sourceFilePath), oldReferencedMap && oldReferencedMap.getValues(sourceFilePath)) || // Referenced file was deleted in the new program
|
|
142202
|
-
newReferences && forEachKey(newReferences, (
|
|
142202
|
+
newReferences && forEachKey(newReferences, (path3) => !state.fileInfos.has(path3) && oldState.fileInfos.has(path3))) {
|
|
142203
142203
|
addFileToChangeSet(sourceFilePath);
|
|
142204
142204
|
} else {
|
|
142205
142205
|
const sourceFile = newProgram.getSourceFileByPath(sourceFilePath);
|
|
@@ -142265,8 +142265,8 @@ ${lanes.join("\n")}
|
|
|
142265
142265
|
}
|
|
142266
142266
|
if (useOldState && state.semanticDiagnosticsPerFile.size !== state.fileInfos.size && oldState.checkPending !== state.checkPending) state.buildInfoEmitPending = true;
|
|
142267
142267
|
return state;
|
|
142268
|
-
function addFileToChangeSet(
|
|
142269
|
-
state.changedFilesSet.add(
|
|
142268
|
+
function addFileToChangeSet(path3) {
|
|
142269
|
+
state.changedFilesSet.add(path3);
|
|
142270
142270
|
if (outFilePath) {
|
|
142271
142271
|
canCopySemanticDiagnostics = false;
|
|
142272
142272
|
canCopyEmitDiagnostics = false;
|
|
@@ -142330,9 +142330,9 @@ ${lanes.join("\n")}
|
|
|
142330
142330
|
result.relatedInformation = relatedInformation ? relatedInformation.length ? relatedInformation.map((r) => convertToDiagnosticRelatedInformation(r, diagnosticFilePath, newProgram, toPathInBuildInfoDirectory)) : [] : void 0;
|
|
142331
142331
|
return result;
|
|
142332
142332
|
});
|
|
142333
|
-
function toPathInBuildInfoDirectory(
|
|
142333
|
+
function toPathInBuildInfoDirectory(path3) {
|
|
142334
142334
|
buildInfoDirectory ?? (buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory())));
|
|
142335
|
-
return toPath(
|
|
142335
|
+
return toPath(path3, buildInfoDirectory, newProgram.getCanonicalFileName);
|
|
142336
142336
|
}
|
|
142337
142337
|
}
|
|
142338
142338
|
function convertToDiagnosticRelatedInformation(diagnostic, diagnosticFilePath, newProgram, toPath3) {
|
|
@@ -142407,10 +142407,10 @@ ${lanes.join("\n")}
|
|
|
142407
142407
|
state.affectedFilesPendingEmit = void 0;
|
|
142408
142408
|
state.programEmitPending = void 0;
|
|
142409
142409
|
}
|
|
142410
|
-
(_b = state.affectedFilesPendingEmit) == null ? void 0 : _b.forEach((emitKind,
|
|
142410
|
+
(_b = state.affectedFilesPendingEmit) == null ? void 0 : _b.forEach((emitKind, path3) => {
|
|
142411
142411
|
const pending = !isForDtsErrors ? emitKind & 7 : emitKind & (7 | 48);
|
|
142412
|
-
if (!pending) state.affectedFilesPendingEmit.delete(
|
|
142413
|
-
else state.affectedFilesPendingEmit.set(
|
|
142412
|
+
if (!pending) state.affectedFilesPendingEmit.delete(path3);
|
|
142413
|
+
else state.affectedFilesPendingEmit.set(path3, pending);
|
|
142414
142414
|
});
|
|
142415
142415
|
if (state.programEmitPending) {
|
|
142416
142416
|
const pending = !isForDtsErrors ? state.programEmitPending & 7 : state.programEmitPending & (7 | 48);
|
|
@@ -142430,11 +142430,11 @@ ${lanes.join("\n")}
|
|
|
142430
142430
|
function getNextAffectedFilePendingEmit(state, emitOnlyDtsFiles, isForDtsErrors) {
|
|
142431
142431
|
var _a;
|
|
142432
142432
|
if (!((_a = state.affectedFilesPendingEmit) == null ? void 0 : _a.size)) return void 0;
|
|
142433
|
-
return forEachEntry(state.affectedFilesPendingEmit, (emitKind,
|
|
142433
|
+
return forEachEntry(state.affectedFilesPendingEmit, (emitKind, path3) => {
|
|
142434
142434
|
var _a2;
|
|
142435
|
-
const affectedFile = state.program.getSourceFileByPath(
|
|
142435
|
+
const affectedFile = state.program.getSourceFileByPath(path3);
|
|
142436
142436
|
if (!affectedFile || !sourceFileMayBeEmitted(affectedFile, state.program)) {
|
|
142437
|
-
state.affectedFilesPendingEmit.delete(
|
|
142437
|
+
state.affectedFilesPendingEmit.delete(path3);
|
|
142438
142438
|
return void 0;
|
|
142439
142439
|
}
|
|
142440
142440
|
const seenKind = (_a2 = state.seenEmittedFiles) == null ? void 0 : _a2.get(affectedFile.resolvedPath);
|
|
@@ -142450,11 +142450,11 @@ ${lanes.join("\n")}
|
|
|
142450
142450
|
function getNextPendingEmitDiagnosticsFile(state, isForDtsErrors) {
|
|
142451
142451
|
var _a;
|
|
142452
142452
|
if (!((_a = state.emitDiagnosticsPerFile) == null ? void 0 : _a.size)) return void 0;
|
|
142453
|
-
return forEachEntry(state.emitDiagnosticsPerFile, (diagnostics,
|
|
142453
|
+
return forEachEntry(state.emitDiagnosticsPerFile, (diagnostics, path3) => {
|
|
142454
142454
|
var _a2;
|
|
142455
|
-
const affectedFile = state.program.getSourceFileByPath(
|
|
142455
|
+
const affectedFile = state.program.getSourceFileByPath(path3);
|
|
142456
142456
|
if (!affectedFile || !sourceFileMayBeEmitted(affectedFile, state.program)) {
|
|
142457
|
-
state.emitDiagnosticsPerFile.delete(
|
|
142457
|
+
state.emitDiagnosticsPerFile.delete(path3);
|
|
142458
142458
|
return void 0;
|
|
142459
142459
|
}
|
|
142460
142460
|
const seenKind = ((_a2 = state.seenEmittedFiles) == null ? void 0 : _a2.get(affectedFile.resolvedPath)) || 0;
|
|
@@ -142489,10 +142489,10 @@ ${lanes.join("\n")}
|
|
|
142489
142489
|
host
|
|
142490
142490
|
);
|
|
142491
142491
|
}
|
|
142492
|
-
function handleDtsMayChangeOf(state,
|
|
142493
|
-
removeSemanticDiagnosticsOf(state,
|
|
142494
|
-
if (!state.changedFilesSet.has(
|
|
142495
|
-
const sourceFile = state.program.getSourceFileByPath(
|
|
142492
|
+
function handleDtsMayChangeOf(state, path3, invalidateJsFiles, cancellationToken, host) {
|
|
142493
|
+
removeSemanticDiagnosticsOf(state, path3);
|
|
142494
|
+
if (!state.changedFilesSet.has(path3)) {
|
|
142495
|
+
const sourceFile = state.program.getSourceFileByPath(path3);
|
|
142496
142496
|
if (sourceFile) {
|
|
142497
142497
|
BuilderState.updateShapeSignature(
|
|
142498
142498
|
state,
|
|
@@ -142506,13 +142506,13 @@ ${lanes.join("\n")}
|
|
|
142506
142506
|
if (invalidateJsFiles) {
|
|
142507
142507
|
addToAffectedFilesPendingEmit(
|
|
142508
142508
|
state,
|
|
142509
|
-
|
|
142509
|
+
path3,
|
|
142510
142510
|
getBuilderFileEmit(state.compilerOptions)
|
|
142511
142511
|
);
|
|
142512
142512
|
} else if (getEmitDeclarations(state.compilerOptions)) {
|
|
142513
142513
|
addToAffectedFilesPendingEmit(
|
|
142514
142514
|
state,
|
|
142515
|
-
|
|
142515
|
+
path3,
|
|
142516
142516
|
state.compilerOptions.declarationMap ? 56 : 24
|
|
142517
142517
|
/* Dts */
|
|
142518
142518
|
);
|
|
@@ -142520,17 +142520,17 @@ ${lanes.join("\n")}
|
|
|
142520
142520
|
}
|
|
142521
142521
|
}
|
|
142522
142522
|
}
|
|
142523
|
-
function removeSemanticDiagnosticsOf(state,
|
|
142523
|
+
function removeSemanticDiagnosticsOf(state, path3) {
|
|
142524
142524
|
if (!state.semanticDiagnosticsFromOldState) {
|
|
142525
142525
|
return true;
|
|
142526
142526
|
}
|
|
142527
|
-
state.semanticDiagnosticsFromOldState.delete(
|
|
142528
|
-
state.semanticDiagnosticsPerFile.delete(
|
|
142527
|
+
state.semanticDiagnosticsFromOldState.delete(path3);
|
|
142528
|
+
state.semanticDiagnosticsPerFile.delete(path3);
|
|
142529
142529
|
return !state.semanticDiagnosticsFromOldState.size;
|
|
142530
142530
|
}
|
|
142531
|
-
function isChangedSignature(state,
|
|
142532
|
-
const oldSignature = Debug.checkDefined(state.oldSignatures).get(
|
|
142533
|
-
const newSignature = Debug.checkDefined(state.fileInfos.get(
|
|
142531
|
+
function isChangedSignature(state, path3) {
|
|
142532
|
+
const oldSignature = Debug.checkDefined(state.oldSignatures).get(path3) || void 0;
|
|
142533
|
+
const newSignature = Debug.checkDefined(state.fileInfos.get(path3)).signature;
|
|
142534
142534
|
return newSignature !== oldSignature;
|
|
142535
142535
|
}
|
|
142536
142536
|
function handleDtsMayChangeOfGlobalScope(state, filePath, invalidateJsFiles, cancellationToken, host) {
|
|
@@ -142637,13 +142637,13 @@ ${lanes.join("\n")}
|
|
|
142637
142637
|
}
|
|
142638
142638
|
function getBinderAndCheckerDiagnosticsOfFile(state, sourceFile, cancellationToken, semanticDiagnosticsPerFile) {
|
|
142639
142639
|
semanticDiagnosticsPerFile ?? (semanticDiagnosticsPerFile = state.semanticDiagnosticsPerFile);
|
|
142640
|
-
const
|
|
142641
|
-
const cachedDiagnostics = semanticDiagnosticsPerFile.get(
|
|
142640
|
+
const path3 = sourceFile.resolvedPath;
|
|
142641
|
+
const cachedDiagnostics = semanticDiagnosticsPerFile.get(path3);
|
|
142642
142642
|
if (cachedDiagnostics) {
|
|
142643
142643
|
return filterSemanticDiagnostics(cachedDiagnostics, state.compilerOptions);
|
|
142644
142644
|
}
|
|
142645
142645
|
const diagnostics = state.program.getBindAndCheckDiagnostics(sourceFile, cancellationToken);
|
|
142646
|
-
semanticDiagnosticsPerFile.set(
|
|
142646
|
+
semanticDiagnosticsPerFile.set(path3, diagnostics);
|
|
142647
142647
|
state.buildInfoEmitPending = true;
|
|
142648
142648
|
return filterSemanticDiagnostics(diagnostics, state.compilerOptions);
|
|
142649
142649
|
}
|
|
@@ -142791,11 +142791,11 @@ ${lanes.join("\n")}
|
|
|
142791
142791
|
if ((_b = state.affectedFilesPendingEmit) == null ? void 0 : _b.size) {
|
|
142792
142792
|
const fullEmitForOptions = getBuilderFileEmit(state.compilerOptions);
|
|
142793
142793
|
const seenFiles = /* @__PURE__ */ new Set();
|
|
142794
|
-
for (const
|
|
142795
|
-
if (tryAddToSet(seenFiles,
|
|
142796
|
-
const file = state.program.getSourceFileByPath(
|
|
142794
|
+
for (const path3 of arrayFrom(state.affectedFilesPendingEmit.keys()).sort(compareStringsCaseSensitive)) {
|
|
142795
|
+
if (tryAddToSet(seenFiles, path3)) {
|
|
142796
|
+
const file = state.program.getSourceFileByPath(path3);
|
|
142797
142797
|
if (!file || !sourceFileMayBeEmitted(file, state.program)) continue;
|
|
142798
|
-
const fileId = toFileId(
|
|
142798
|
+
const fileId = toFileId(path3), pendingEmit = state.affectedFilesPendingEmit.get(path3);
|
|
142799
142799
|
affectedFilesPendingEmit = append(
|
|
142800
142800
|
affectedFilesPendingEmit,
|
|
142801
142801
|
pendingEmit === fullEmitForOptions ? fileId : (
|
|
@@ -142829,17 +142829,17 @@ ${lanes.join("\n")}
|
|
|
142829
142829
|
version: version2
|
|
142830
142830
|
};
|
|
142831
142831
|
return buildInfo;
|
|
142832
|
-
function relativeToBuildInfoEnsuringAbsolutePath(
|
|
142833
|
-
return relativeToBuildInfo(getNormalizedAbsolutePath(
|
|
142832
|
+
function relativeToBuildInfoEnsuringAbsolutePath(path3) {
|
|
142833
|
+
return relativeToBuildInfo(getNormalizedAbsolutePath(path3, currentDirectory));
|
|
142834
142834
|
}
|
|
142835
|
-
function relativeToBuildInfo(
|
|
142836
|
-
return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory,
|
|
142835
|
+
function relativeToBuildInfo(path3) {
|
|
142836
|
+
return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path3, state.program.getCanonicalFileName));
|
|
142837
142837
|
}
|
|
142838
|
-
function toFileId(
|
|
142839
|
-
let fileId = fileNameToFileId.get(
|
|
142838
|
+
function toFileId(path3) {
|
|
142839
|
+
let fileId = fileNameToFileId.get(path3);
|
|
142840
142840
|
if (fileId === void 0) {
|
|
142841
|
-
fileNames.push(relativeToBuildInfo(
|
|
142842
|
-
fileNameToFileId.set(
|
|
142841
|
+
fileNames.push(relativeToBuildInfo(path3));
|
|
142842
|
+
fileNameToFileId.set(path3, fileId = fileNames.length);
|
|
142843
142843
|
}
|
|
142844
142844
|
return fileId;
|
|
142845
142845
|
}
|
|
@@ -142853,8 +142853,8 @@ ${lanes.join("\n")}
|
|
|
142853
142853
|
}
|
|
142854
142854
|
return fileIdListId;
|
|
142855
142855
|
}
|
|
142856
|
-
function tryAddRoot(
|
|
142857
|
-
const file = state.program.getSourceFile(
|
|
142856
|
+
function tryAddRoot(path3, fileId) {
|
|
142857
|
+
const file = state.program.getSourceFile(path3);
|
|
142858
142858
|
if (!state.program.getFileIncludeReasons().get(file.path).some(
|
|
142859
142859
|
(r) => r.kind === 0
|
|
142860
142860
|
/* RootFile */
|
|
@@ -142871,10 +142871,10 @@ ${lanes.join("\n")}
|
|
|
142871
142871
|
}
|
|
142872
142872
|
function toResolvedRoot() {
|
|
142873
142873
|
let result;
|
|
142874
|
-
rootFileNames.forEach((
|
|
142875
|
-
const file = state.program.getSourceFileByPath(
|
|
142876
|
-
if (file &&
|
|
142877
|
-
result = append(result, [toFileId(file.resolvedPath), toFileId(
|
|
142874
|
+
rootFileNames.forEach((path3) => {
|
|
142875
|
+
const file = state.program.getSourceFileByPath(path3);
|
|
142876
|
+
if (file && path3 !== file.resolvedPath) {
|
|
142877
|
+
result = append(result, [toFileId(file.resolvedPath), toFileId(path3)]);
|
|
142878
142878
|
}
|
|
142879
142879
|
});
|
|
142880
142880
|
return result;
|
|
@@ -142982,8 +142982,8 @@ ${lanes.join("\n")}
|
|
|
142982
142982
|
function toChangeFileSet() {
|
|
142983
142983
|
let changeFileSet;
|
|
142984
142984
|
if (state.changedFilesSet.size) {
|
|
142985
|
-
for (const
|
|
142986
|
-
changeFileSet = append(changeFileSet, toFileId(
|
|
142985
|
+
for (const path3 of arrayFrom(state.changedFilesSet.keys()).sort(compareStringsCaseSensitive)) {
|
|
142986
|
+
changeFileSet = append(changeFileSet, toFileId(path3));
|
|
142987
142987
|
}
|
|
142988
142988
|
}
|
|
142989
142989
|
return changeFileSet;
|
|
@@ -143482,8 +143482,8 @@ ${lanes.join("\n")}
|
|
|
143482
143482
|
const changedFilesSet = new Set(map(buildInfo.changeFileSet, toFilePath));
|
|
143483
143483
|
if (isIncrementalBundleEmitBuildInfo(buildInfo)) {
|
|
143484
143484
|
buildInfo.fileInfos.forEach((fileInfo, index) => {
|
|
143485
|
-
const
|
|
143486
|
-
fileInfos.set(
|
|
143485
|
+
const path3 = toFilePath(index + 1);
|
|
143486
|
+
fileInfos.set(path3, isString(fileInfo) ? { version: fileInfo, signature: void 0, affectsGlobalScope: void 0, impliedFormat: void 0 } : fileInfo);
|
|
143487
143487
|
});
|
|
143488
143488
|
state = {
|
|
143489
143489
|
fileInfos,
|
|
@@ -143502,10 +143502,10 @@ ${lanes.join("\n")}
|
|
|
143502
143502
|
filePathsSetList = (_b = buildInfo.fileIdsList) == null ? void 0 : _b.map((fileIds) => new Set(fileIds.map(toFilePath)));
|
|
143503
143503
|
const emitSignatures = ((_c = buildInfo.options) == null ? void 0 : _c.composite) && !buildInfo.options.outFile ? /* @__PURE__ */ new Map() : void 0;
|
|
143504
143504
|
buildInfo.fileInfos.forEach((fileInfo, index) => {
|
|
143505
|
-
const
|
|
143505
|
+
const path3 = toFilePath(index + 1);
|
|
143506
143506
|
const stateFileInfo = toBuilderStateFileInfoForMultiEmit(fileInfo);
|
|
143507
|
-
fileInfos.set(
|
|
143508
|
-
if (emitSignatures && stateFileInfo.signature) emitSignatures.set(
|
|
143507
|
+
fileInfos.set(path3, stateFileInfo);
|
|
143508
|
+
if (emitSignatures && stateFileInfo.signature) emitSignatures.set(path3, stateFileInfo.signature);
|
|
143509
143509
|
});
|
|
143510
143510
|
(_d = buildInfo.emitSignatures) == null ? void 0 : _d.forEach((value) => {
|
|
143511
143511
|
if (isNumber(value)) emitSignatures.delete(toFilePath(value));
|
|
@@ -143559,11 +143559,11 @@ ${lanes.join("\n")}
|
|
|
143559
143559
|
close: noop,
|
|
143560
143560
|
hasChangedEmitSignature: returnFalse
|
|
143561
143561
|
};
|
|
143562
|
-
function toPathInBuildInfoDirectory(
|
|
143563
|
-
return toPath(
|
|
143562
|
+
function toPathInBuildInfoDirectory(path3) {
|
|
143563
|
+
return toPath(path3, buildInfoDirectory, getCanonicalFileName);
|
|
143564
143564
|
}
|
|
143565
|
-
function toAbsolutePath(
|
|
143566
|
-
return getNormalizedAbsolutePath(
|
|
143565
|
+
function toAbsolutePath(path3) {
|
|
143566
|
+
return getNormalizedAbsolutePath(path3, buildInfoDirectory);
|
|
143567
143567
|
}
|
|
143568
143568
|
function toFilePath(fileId) {
|
|
143569
143569
|
return filePaths[fileId - 1];
|
|
@@ -143602,30 +143602,30 @@ ${lanes.join("\n")}
|
|
|
143602
143602
|
const roots = /* @__PURE__ */ new Map();
|
|
143603
143603
|
const resolvedRoots = new Map(program.resolvedRoot);
|
|
143604
143604
|
program.fileInfos.forEach((fileInfo, index) => {
|
|
143605
|
-
const
|
|
143605
|
+
const path3 = toPath(program.fileNames[index], buildInfoDirectory, getCanonicalFileName);
|
|
143606
143606
|
const version22 = isString(fileInfo) ? fileInfo : fileInfo.version;
|
|
143607
|
-
fileInfos.set(
|
|
143607
|
+
fileInfos.set(path3, version22);
|
|
143608
143608
|
if (rootIndex < program.root.length) {
|
|
143609
143609
|
const current = program.root[rootIndex];
|
|
143610
143610
|
const fileId = index + 1;
|
|
143611
143611
|
if (isArray(current)) {
|
|
143612
143612
|
if (current[0] <= fileId && fileId <= current[1]) {
|
|
143613
|
-
addRoot(fileId,
|
|
143613
|
+
addRoot(fileId, path3);
|
|
143614
143614
|
if (current[1] === fileId) rootIndex++;
|
|
143615
143615
|
}
|
|
143616
143616
|
} else if (current === fileId) {
|
|
143617
|
-
addRoot(fileId,
|
|
143617
|
+
addRoot(fileId, path3);
|
|
143618
143618
|
rootIndex++;
|
|
143619
143619
|
}
|
|
143620
143620
|
}
|
|
143621
143621
|
});
|
|
143622
143622
|
return { fileInfos, roots };
|
|
143623
|
-
function addRoot(fileId,
|
|
143623
|
+
function addRoot(fileId, path3) {
|
|
143624
143624
|
const root = resolvedRoots.get(fileId);
|
|
143625
143625
|
if (root) {
|
|
143626
|
-
roots.set(toPath(program.fileNames[root - 1], buildInfoDirectory, getCanonicalFileName),
|
|
143626
|
+
roots.set(toPath(program.fileNames[root - 1], buildInfoDirectory, getCanonicalFileName), path3);
|
|
143627
143627
|
} else {
|
|
143628
|
-
roots.set(
|
|
143628
|
+
roots.set(path3, void 0);
|
|
143629
143629
|
}
|
|
143630
143630
|
}
|
|
143631
143631
|
}
|
|
@@ -143700,11 +143700,11 @@ ${lanes.join("\n")}
|
|
|
143700
143700
|
newConfigFileParsingDiagnostics
|
|
143701
143701
|
);
|
|
143702
143702
|
}
|
|
143703
|
-
function removeIgnoredPath(
|
|
143704
|
-
if (endsWith(
|
|
143705
|
-
return removeSuffix(
|
|
143703
|
+
function removeIgnoredPath(path3) {
|
|
143704
|
+
if (endsWith(path3, "/node_modules/.staging")) {
|
|
143705
|
+
return removeSuffix(path3, "/.staging");
|
|
143706
143706
|
}
|
|
143707
|
-
return some(ignoredPaths, (searchPath) =>
|
|
143707
|
+
return some(ignoredPaths, (searchPath) => path3.includes(searchPath)) ? void 0 : path3;
|
|
143708
143708
|
}
|
|
143709
143709
|
function perceivedOsRootLengthForWatching(pathComponents2, length2) {
|
|
143710
143710
|
if (length2 <= 1) return 1;
|
|
@@ -143730,8 +143730,8 @@ ${lanes.join("\n")}
|
|
|
143730
143730
|
const perceivedOsRootLength = perceivedOsRootLengthForWatching(pathComponents2, length2);
|
|
143731
143731
|
return length2 > perceivedOsRootLength + 1;
|
|
143732
143732
|
}
|
|
143733
|
-
function canWatchDirectoryOrFilePath(
|
|
143734
|
-
return canWatchDirectoryOrFile(getPathComponents(
|
|
143733
|
+
function canWatchDirectoryOrFilePath(path3) {
|
|
143734
|
+
return canWatchDirectoryOrFile(getPathComponents(path3));
|
|
143735
143735
|
}
|
|
143736
143736
|
function canWatchAtTypes(atTypes) {
|
|
143737
143737
|
return canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(getDirectoryPath(atTypes));
|
|
@@ -144025,11 +144025,11 @@ ${lanes.join("\n")}
|
|
|
144025
144025
|
filesWithChangedSetOfUnresolvedImports = void 0;
|
|
144026
144026
|
return collected;
|
|
144027
144027
|
}
|
|
144028
|
-
function isFileWithInvalidatedNonRelativeUnresolvedImports(
|
|
144028
|
+
function isFileWithInvalidatedNonRelativeUnresolvedImports(path3) {
|
|
144029
144029
|
if (!filesWithInvalidatedNonRelativeUnresolvedImports) {
|
|
144030
144030
|
return false;
|
|
144031
144031
|
}
|
|
144032
|
-
const value = filesWithInvalidatedNonRelativeUnresolvedImports.get(
|
|
144032
|
+
const value = filesWithInvalidatedNonRelativeUnresolvedImports.get(path3);
|
|
144033
144033
|
return !!value && !!value.length;
|
|
144034
144034
|
}
|
|
144035
144035
|
function createHasInvalidatedResolutions(customHasInvalidatedResolutions, customHasInvalidatedLibResolutions) {
|
|
@@ -144037,7 +144037,7 @@ ${lanes.join("\n")}
|
|
|
144037
144037
|
const collected = filesWithInvalidatedResolutions;
|
|
144038
144038
|
filesWithInvalidatedResolutions = void 0;
|
|
144039
144039
|
return {
|
|
144040
|
-
hasInvalidatedResolutions: (
|
|
144040
|
+
hasInvalidatedResolutions: (path3) => customHasInvalidatedResolutions(path3) || allModuleAndTypeResolutionsAreInvalidated || !!(collected == null ? void 0 : collected.has(path3)) || isFileWithInvalidatedNonRelativeUnresolvedImports(path3),
|
|
144041
144041
|
hasInvalidatedLibResolutions: (libFileName) => {
|
|
144042
144042
|
var _a;
|
|
144043
144043
|
return customHasInvalidatedLibResolutions(libFileName) || !!((_a = resolvedLibraries == null ? void 0 : resolvedLibraries.get(libFileName)) == null ? void 0 : _a.isInvalidated);
|
|
@@ -144093,11 +144093,11 @@ ${lanes.join("\n")}
|
|
|
144093
144093
|
if (expected) impliedFormatPackageJsons.set(newFile.resolvedPath, newFile.packageJsonLocations);
|
|
144094
144094
|
else impliedFormatPackageJsons.delete(newFile.resolvedPath);
|
|
144095
144095
|
});
|
|
144096
|
-
impliedFormatPackageJsons.forEach((existing,
|
|
144097
|
-
const newFile = newProgram == null ? void 0 : newProgram.getSourceFileByPath(
|
|
144098
|
-
if (!newFile || newFile.resolvedPath !==
|
|
144096
|
+
impliedFormatPackageJsons.forEach((existing, path3) => {
|
|
144097
|
+
const newFile = newProgram == null ? void 0 : newProgram.getSourceFileByPath(path3);
|
|
144098
|
+
if (!newFile || newFile.resolvedPath !== path3) {
|
|
144099
144099
|
existing.forEach((location) => fileWatchesOfAffectingLocations.get(location).files--);
|
|
144100
|
-
impliedFormatPackageJsons.delete(
|
|
144100
|
+
impliedFormatPackageJsons.delete(path3);
|
|
144101
144101
|
}
|
|
144102
144102
|
});
|
|
144103
144103
|
}
|
|
@@ -144116,16 +144116,16 @@ ${lanes.join("\n")}
|
|
|
144116
144116
|
packageDirWatchers.delete(packageDirPath);
|
|
144117
144117
|
}
|
|
144118
144118
|
}
|
|
144119
|
-
function closeDirectoryWatchesOfFailedLookup(watcher,
|
|
144119
|
+
function closeDirectoryWatchesOfFailedLookup(watcher, path3) {
|
|
144120
144120
|
if (watcher.refCount === 0) {
|
|
144121
|
-
directoryWatchesOfFailedLookups.delete(
|
|
144121
|
+
directoryWatchesOfFailedLookups.delete(path3);
|
|
144122
144122
|
watcher.watcher.close();
|
|
144123
144123
|
}
|
|
144124
144124
|
}
|
|
144125
|
-
function closeFileWatcherOfAffectingLocation(watcher,
|
|
144125
|
+
function closeFileWatcherOfAffectingLocation(watcher, path3) {
|
|
144126
144126
|
var _a;
|
|
144127
144127
|
if (watcher.files === 0 && watcher.resolutions === 0 && !((_a = watcher.symlinks) == null ? void 0 : _a.size)) {
|
|
144128
|
-
fileWatchesOfAffectingLocations.delete(
|
|
144128
|
+
fileWatchesOfAffectingLocations.delete(path3);
|
|
144129
144129
|
watcher.watcher.close();
|
|
144130
144130
|
}
|
|
144131
144131
|
}
|
|
@@ -144144,10 +144144,10 @@ ${lanes.join("\n")}
|
|
|
144144
144144
|
logChanges
|
|
144145
144145
|
}) {
|
|
144146
144146
|
var _a;
|
|
144147
|
-
const
|
|
144148
|
-
const resolutionsInFile = perFileCache.get(
|
|
144147
|
+
const path3 = resolutionHost.toPath(containingFile);
|
|
144148
|
+
const resolutionsInFile = perFileCache.get(path3) || perFileCache.set(path3, createModeAwareCache()).get(path3);
|
|
144149
144149
|
const resolvedModules = [];
|
|
144150
|
-
const hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(
|
|
144150
|
+
const hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path3);
|
|
144151
144151
|
const program = resolutionHost.getCurrentProgram();
|
|
144152
144152
|
const oldRedirect = program && ((_a = program.getRedirectFromSourceFile(containingFile)) == null ? void 0 : _a.resolvedRef);
|
|
144153
144153
|
const unmatchedRedirects = oldRedirect ? !redirectedReference || redirectedReference.sourceFile.path !== oldRedirect.sourceFile.path : !!redirectedReference;
|
|
@@ -144165,13 +144165,13 @@ ${lanes.join("\n")}
|
|
|
144165
144165
|
}
|
|
144166
144166
|
resolutionsInFile.set(name, mode, resolution);
|
|
144167
144167
|
if (resolution !== existingResolution) {
|
|
144168
|
-
watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution,
|
|
144168
|
+
watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path3, getResolutionWithResolvedFileName, deferWatchingNonRelativeResolution);
|
|
144169
144169
|
if (existingResolution) {
|
|
144170
|
-
stopWatchFailedLookupLocationOfResolution(existingResolution,
|
|
144170
|
+
stopWatchFailedLookupLocationOfResolution(existingResolution, path3, getResolutionWithResolvedFileName);
|
|
144171
144171
|
}
|
|
144172
144172
|
}
|
|
144173
144173
|
if (logChanges && filesWithChangedSetOfUnresolvedImports && !resolutionIsEqualTo(existingResolution, resolution)) {
|
|
144174
|
-
filesWithChangedSetOfUnresolvedImports.push(
|
|
144174
|
+
filesWithChangedSetOfUnresolvedImports.push(path3);
|
|
144175
144175
|
logChanges = false;
|
|
144176
144176
|
}
|
|
144177
144177
|
} else {
|
|
@@ -144202,7 +144202,7 @@ ${lanes.join("\n")}
|
|
|
144202
144202
|
if (resolutionsInFile.size() !== seenNamesInFile.size()) {
|
|
144203
144203
|
resolutionsInFile.forEach((resolution, name, mode) => {
|
|
144204
144204
|
if (!seenNamesInFile.has(name, mode)) {
|
|
144205
|
-
stopWatchFailedLookupLocationOfResolution(resolution,
|
|
144205
|
+
stopWatchFailedLookupLocationOfResolution(resolution, path3, getResolutionWithResolvedFileName);
|
|
144206
144206
|
resolutionsInFile.delete(name, mode);
|
|
144207
144207
|
}
|
|
144208
144208
|
});
|
|
@@ -144276,18 +144276,18 @@ ${lanes.join("\n")}
|
|
|
144276
144276
|
if (!resolution || resolution.isInvalidated) {
|
|
144277
144277
|
const existingResolution = resolution;
|
|
144278
144278
|
resolution = resolveLibrary(libraryName, resolveFrom, options, host, libraryResolutionCache);
|
|
144279
|
-
const
|
|
144279
|
+
const path3 = resolutionHost.toPath(resolveFrom);
|
|
144280
144280
|
watchFailedLookupLocationsOfExternalModuleResolutions(
|
|
144281
144281
|
libraryName,
|
|
144282
144282
|
resolution,
|
|
144283
|
-
|
|
144283
|
+
path3,
|
|
144284
144284
|
getResolvedModuleFromResolution,
|
|
144285
144285
|
/*deferWatchingNonRelativeResolution*/
|
|
144286
144286
|
false
|
|
144287
144287
|
);
|
|
144288
144288
|
resolvedLibraries.set(libFileName, resolution);
|
|
144289
144289
|
if (existingResolution) {
|
|
144290
|
-
stopWatchFailedLookupLocationOfResolution(existingResolution,
|
|
144290
|
+
stopWatchFailedLookupLocationOfResolution(existingResolution, path3, getResolvedModuleFromResolution);
|
|
144291
144291
|
}
|
|
144292
144292
|
} else {
|
|
144293
144293
|
if (isTraceEnabled(options, host)) {
|
|
@@ -144306,8 +144306,8 @@ ${lanes.join("\n")}
|
|
|
144306
144306
|
}
|
|
144307
144307
|
function resolveSingleModuleNameWithoutWatching(moduleName, containingFile) {
|
|
144308
144308
|
var _a, _b;
|
|
144309
|
-
const
|
|
144310
|
-
const resolutionsInFile = resolvedModuleNames.get(
|
|
144309
|
+
const path3 = resolutionHost.toPath(containingFile);
|
|
144310
|
+
const resolutionsInFile = resolvedModuleNames.get(path3);
|
|
144311
144311
|
const resolution = resolutionsInFile == null ? void 0 : resolutionsInFile.get(
|
|
144312
144312
|
moduleName,
|
|
144313
144313
|
/*mode*/
|
|
@@ -144464,13 +144464,13 @@ ${lanes.join("\n")}
|
|
|
144464
144464
|
(symlinkWatcher.symlinks ?? (symlinkWatcher.symlinks = /* @__PURE__ */ new Set())).add(affectingLocation);
|
|
144465
144465
|
}
|
|
144466
144466
|
}
|
|
144467
|
-
function invalidateAffectingFileWatcher(
|
|
144467
|
+
function invalidateAffectingFileWatcher(path3, packageJsonMap) {
|
|
144468
144468
|
var _a;
|
|
144469
|
-
const watcher = fileWatchesOfAffectingLocations.get(
|
|
144470
|
-
if (watcher == null ? void 0 : watcher.resolutions) (affectingPathChecks ?? (affectingPathChecks = /* @__PURE__ */ new Set())).add(
|
|
144471
|
-
if (watcher == null ? void 0 : watcher.files) (affectingPathChecksForFile ?? (affectingPathChecksForFile = /* @__PURE__ */ new Set())).add(
|
|
144469
|
+
const watcher = fileWatchesOfAffectingLocations.get(path3);
|
|
144470
|
+
if (watcher == null ? void 0 : watcher.resolutions) (affectingPathChecks ?? (affectingPathChecks = /* @__PURE__ */ new Set())).add(path3);
|
|
144471
|
+
if (watcher == null ? void 0 : watcher.files) (affectingPathChecksForFile ?? (affectingPathChecksForFile = /* @__PURE__ */ new Set())).add(path3);
|
|
144472
144472
|
(_a = watcher == null ? void 0 : watcher.symlinks) == null ? void 0 : _a.forEach((path22) => invalidateAffectingFileWatcher(path22, packageJsonMap));
|
|
144473
|
-
packageJsonMap == null ? void 0 : packageJsonMap.delete(resolutionHost.toPath(
|
|
144473
|
+
packageJsonMap == null ? void 0 : packageJsonMap.delete(resolutionHost.toPath(path3));
|
|
144474
144474
|
}
|
|
144475
144475
|
function watchFailedLookupLocationOfNonRelativeModuleResolutions() {
|
|
144476
144476
|
nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfResolution);
|
|
@@ -144709,7 +144709,7 @@ ${lanes.join("\n")}
|
|
|
144709
144709
|
function invalidatePackageJsonMap() {
|
|
144710
144710
|
const packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
|
|
144711
144711
|
if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
|
|
144712
|
-
packageJsonMap.forEach((_value,
|
|
144712
|
+
packageJsonMap.forEach((_value, path3) => isInvalidatedFailedLookup(path3) ? packageJsonMap.delete(path3) : void 0);
|
|
144713
144713
|
}
|
|
144714
144714
|
}
|
|
144715
144715
|
function invalidateResolutionsOfFailedLookupLocations() {
|
|
@@ -145327,9 +145327,9 @@ ${lanes.join("\n")}
|
|
|
145327
145327
|
getDefaultLibLocation: maybeBind(host, host.getDefaultLibLocation),
|
|
145328
145328
|
getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
|
|
145329
145329
|
writeFile: createWriteFileMeasuringIO(
|
|
145330
|
-
(
|
|
145331
|
-
(
|
|
145332
|
-
(
|
|
145330
|
+
(path3, data, writeByteOrderMark) => host.writeFile(path3, data, writeByteOrderMark),
|
|
145331
|
+
(path3) => host.createDirectory(path3),
|
|
145332
|
+
(path3) => host.directoryExists(path3)
|
|
145333
145333
|
),
|
|
145334
145334
|
getCurrentDirectory: memoize(() => host.getCurrentDirectory()),
|
|
145335
145335
|
useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
|
|
@@ -145400,16 +145400,16 @@ ${lanes.join("\n")}
|
|
|
145400
145400
|
getCurrentDirectory: memoize(() => system.getCurrentDirectory()),
|
|
145401
145401
|
getDefaultLibLocation,
|
|
145402
145402
|
getDefaultLibFileName: (options) => combinePaths(getDefaultLibLocation(), getDefaultLibFileName(options)),
|
|
145403
|
-
fileExists: (
|
|
145404
|
-
readFile: (
|
|
145405
|
-
directoryExists: (
|
|
145406
|
-
getDirectories: (
|
|
145407
|
-
readDirectory: (
|
|
145403
|
+
fileExists: (path3) => system.fileExists(path3),
|
|
145404
|
+
readFile: (path3, encoding) => system.readFile(path3, encoding),
|
|
145405
|
+
directoryExists: (path3) => system.directoryExists(path3),
|
|
145406
|
+
getDirectories: (path3) => system.getDirectories(path3),
|
|
145407
|
+
readDirectory: (path3, extensions, exclude, include, depth) => system.readDirectory(path3, extensions, exclude, include, depth),
|
|
145408
145408
|
realpath: maybeBind(system, system.realpath),
|
|
145409
145409
|
getEnvironmentVariable: maybeBind(system, system.getEnvironmentVariable),
|
|
145410
145410
|
trace: (s) => system.write(s + system.newLine),
|
|
145411
|
-
createDirectory: (
|
|
145412
|
-
writeFile: (
|
|
145411
|
+
createDirectory: (path3) => system.createDirectory(path3),
|
|
145412
|
+
writeFile: (path3, data, writeByteOrderMark) => system.writeFile(path3, data, writeByteOrderMark),
|
|
145413
145413
|
createHash: maybeBind(system, system.createHash),
|
|
145414
145414
|
createProgram: createProgram2 || createEmitAndSemanticDiagnosticsBuilderProgram,
|
|
145415
145415
|
storeSignatureInfo: system.storeSignatureInfo,
|
|
@@ -145722,7 +145722,7 @@ ${lanes.join("\n")}
|
|
|
145722
145722
|
originalWriteFile,
|
|
145723
145723
|
readFileWithCache
|
|
145724
145724
|
} = changeCompilerHostLikeToUseCache(compilerHost, toPath3);
|
|
145725
|
-
if (isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, (
|
|
145725
|
+
if (isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, (path3) => getSourceVersion(path3, readFileWithCache), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
|
|
145726
145726
|
if (hasChangedConfigFileParsingErrors) {
|
|
145727
145727
|
if (reportFileChangeDetectedOnCreateProgram) {
|
|
145728
145728
|
reportWatchDiagnostic(Diagnostics.File_change_detected_Starting_incremental_compilation);
|
|
@@ -145816,14 +145816,14 @@ ${lanes.join("\n")}
|
|
|
145816
145816
|
return typeof hostSourceFile.version === "boolean";
|
|
145817
145817
|
}
|
|
145818
145818
|
function fileExists(fileName) {
|
|
145819
|
-
const
|
|
145820
|
-
if (isFileMissingOnHost(sourceFilesCache.get(
|
|
145819
|
+
const path3 = toPath3(fileName);
|
|
145820
|
+
if (isFileMissingOnHost(sourceFilesCache.get(path3))) {
|
|
145821
145821
|
return false;
|
|
145822
145822
|
}
|
|
145823
145823
|
return directoryStructureHost.fileExists(fileName);
|
|
145824
145824
|
}
|
|
145825
|
-
function getVersionedSourceFileByPath(fileName,
|
|
145826
|
-
const hostSourceFile = sourceFilesCache.get(
|
|
145825
|
+
function getVersionedSourceFileByPath(fileName, path3, languageVersionOrOptions, onError, shouldCreateNewSourceFile) {
|
|
145826
|
+
const hostSourceFile = sourceFilesCache.get(path3);
|
|
145827
145827
|
if (isFileMissingOnHost(hostSourceFile)) {
|
|
145828
145828
|
return void 0;
|
|
145829
145829
|
}
|
|
@@ -145835,41 +145835,41 @@ ${lanes.join("\n")}
|
|
|
145835
145835
|
hostSourceFile.sourceFile = sourceFile;
|
|
145836
145836
|
hostSourceFile.version = sourceFile.version;
|
|
145837
145837
|
if (!hostSourceFile.fileWatcher) {
|
|
145838
|
-
hostSourceFile.fileWatcher = watchFilePath(
|
|
145838
|
+
hostSourceFile.fileWatcher = watchFilePath(path3, fileName, onSourceFileChange, 250, watchOptions, WatchType.SourceFile);
|
|
145839
145839
|
}
|
|
145840
145840
|
} else {
|
|
145841
145841
|
if (hostSourceFile.fileWatcher) {
|
|
145842
145842
|
hostSourceFile.fileWatcher.close();
|
|
145843
145843
|
}
|
|
145844
|
-
sourceFilesCache.set(
|
|
145844
|
+
sourceFilesCache.set(path3, false);
|
|
145845
145845
|
}
|
|
145846
145846
|
} else {
|
|
145847
145847
|
if (sourceFile) {
|
|
145848
|
-
const fileWatcher = watchFilePath(
|
|
145849
|
-
sourceFilesCache.set(
|
|
145848
|
+
const fileWatcher = watchFilePath(path3, fileName, onSourceFileChange, 250, watchOptions, WatchType.SourceFile);
|
|
145849
|
+
sourceFilesCache.set(path3, { sourceFile, version: sourceFile.version, fileWatcher });
|
|
145850
145850
|
} else {
|
|
145851
|
-
sourceFilesCache.set(
|
|
145851
|
+
sourceFilesCache.set(path3, false);
|
|
145852
145852
|
}
|
|
145853
145853
|
}
|
|
145854
145854
|
return sourceFile;
|
|
145855
145855
|
}
|
|
145856
145856
|
return hostSourceFile.sourceFile;
|
|
145857
145857
|
}
|
|
145858
|
-
function nextSourceFileVersion(
|
|
145859
|
-
const hostSourceFile = sourceFilesCache.get(
|
|
145858
|
+
function nextSourceFileVersion(path3) {
|
|
145859
|
+
const hostSourceFile = sourceFilesCache.get(path3);
|
|
145860
145860
|
if (hostSourceFile !== void 0) {
|
|
145861
145861
|
if (isFileMissingOnHost(hostSourceFile)) {
|
|
145862
|
-
sourceFilesCache.set(
|
|
145862
|
+
sourceFilesCache.set(path3, { version: false });
|
|
145863
145863
|
} else {
|
|
145864
145864
|
hostSourceFile.version = false;
|
|
145865
145865
|
}
|
|
145866
145866
|
}
|
|
145867
145867
|
}
|
|
145868
|
-
function getSourceVersion(
|
|
145869
|
-
const hostSourceFile = sourceFilesCache.get(
|
|
145868
|
+
function getSourceVersion(path3, readFileWithCache) {
|
|
145869
|
+
const hostSourceFile = sourceFilesCache.get(path3);
|
|
145870
145870
|
if (!hostSourceFile) return void 0;
|
|
145871
145871
|
if (hostSourceFile.version) return hostSourceFile.version;
|
|
145872
|
-
const text = readFileWithCache(
|
|
145872
|
+
const text = readFileWithCache(path3);
|
|
145873
145873
|
return text !== void 0 ? getSourceFileVersionAsHashFromText(compilerHost, text) : void 0;
|
|
145874
145874
|
}
|
|
145875
145875
|
function onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath) {
|
|
@@ -146048,28 +146048,28 @@ ${lanes.join("\n")}
|
|
|
146048
146048
|
}
|
|
146049
146049
|
function onReleaseParsedCommandLine(fileName) {
|
|
146050
146050
|
var _a;
|
|
146051
|
-
const
|
|
146052
|
-
const config = parsedConfigs == null ? void 0 : parsedConfigs.get(
|
|
146051
|
+
const path3 = toPath3(fileName);
|
|
146052
|
+
const config = parsedConfigs == null ? void 0 : parsedConfigs.get(path3);
|
|
146053
146053
|
if (!config) return;
|
|
146054
|
-
parsedConfigs.delete(
|
|
146054
|
+
parsedConfigs.delete(path3);
|
|
146055
146055
|
if (config.watchedDirectories) clearMap(config.watchedDirectories, closeFileWatcherOf);
|
|
146056
146056
|
(_a = config.watcher) == null ? void 0 : _a.close();
|
|
146057
|
-
clearSharedExtendedConfigFileWatcher(
|
|
146057
|
+
clearSharedExtendedConfigFileWatcher(path3, sharedExtendedConfigFileWatchers);
|
|
146058
146058
|
}
|
|
146059
|
-
function watchFilePath(
|
|
146060
|
-
return watchFile2(file, (fileName, eventKind) => callback(fileName, eventKind,
|
|
146059
|
+
function watchFilePath(path3, file, callback, pollingInterval, options, watchType) {
|
|
146060
|
+
return watchFile2(file, (fileName, eventKind) => callback(fileName, eventKind, path3), pollingInterval, options, watchType);
|
|
146061
146061
|
}
|
|
146062
|
-
function onSourceFileChange(fileName, eventKind,
|
|
146063
|
-
updateCachedSystemWithFile(fileName,
|
|
146064
|
-
if (eventKind === 2 && sourceFilesCache.has(
|
|
146065
|
-
resolutionCache.invalidateResolutionOfFile(
|
|
146062
|
+
function onSourceFileChange(fileName, eventKind, path3) {
|
|
146063
|
+
updateCachedSystemWithFile(fileName, path3, eventKind);
|
|
146064
|
+
if (eventKind === 2 && sourceFilesCache.has(path3)) {
|
|
146065
|
+
resolutionCache.invalidateResolutionOfFile(path3);
|
|
146066
146066
|
}
|
|
146067
|
-
nextSourceFileVersion(
|
|
146067
|
+
nextSourceFileVersion(path3);
|
|
146068
146068
|
scheduleProgramUpdate();
|
|
146069
146069
|
}
|
|
146070
|
-
function updateCachedSystemWithFile(fileName,
|
|
146070
|
+
function updateCachedSystemWithFile(fileName, path3, eventKind) {
|
|
146071
146071
|
if (cachedDirectoryStructureHost) {
|
|
146072
|
-
cachedDirectoryStructureHost.addOrDeleteFile(fileName,
|
|
146072
|
+
cachedDirectoryStructureHost.addOrDeleteFile(fileName, path3, eventKind);
|
|
146073
146073
|
}
|
|
146074
146074
|
}
|
|
146075
146075
|
function watchMissingFilePath(missingFilePath, missingFileName) {
|
|
@@ -146290,9 +146290,9 @@ ${lanes.join("\n")}
|
|
|
146290
146290
|
}
|
|
146291
146291
|
function createSolutionBuilderHostBase(system, createProgram2, reportDiagnostic, reportSolutionBuilderStatus) {
|
|
146292
146292
|
const host = createProgramHost(system, createProgram2);
|
|
146293
|
-
host.getModifiedTime = system.getModifiedTime ? (
|
|
146294
|
-
host.setModifiedTime = system.setModifiedTime ? (
|
|
146295
|
-
host.deleteFile = system.deleteFile ? (
|
|
146293
|
+
host.getModifiedTime = system.getModifiedTime ? (path3) => system.getModifiedTime(path3) : returnUndefined;
|
|
146294
|
+
host.setModifiedTime = system.setModifiedTime ? (path3, date) => system.setModifiedTime(path3, date) : noop;
|
|
146295
|
+
host.deleteFile = system.deleteFile ? (path3) => system.deleteFile(path3) : noop;
|
|
146296
146296
|
host.reportDiagnostic = reportDiagnostic || createDiagnosticReporter(system);
|
|
146297
146297
|
host.reportSolutionBuilderStatus = reportSolutionBuilderStatus || createBuilderStatusReporter(system);
|
|
146298
146298
|
host.now = maybeBind(system, system.now);
|
|
@@ -146463,8 +146463,8 @@ ${lanes.join("\n")}
|
|
|
146463
146463
|
}
|
|
146464
146464
|
function toResolvedConfigFilePath(state, fileName) {
|
|
146465
146465
|
const { resolvedConfigFilePaths } = state;
|
|
146466
|
-
const
|
|
146467
|
-
if (
|
|
146466
|
+
const path3 = resolvedConfigFilePaths.get(fileName);
|
|
146467
|
+
if (path3 !== void 0) return path3;
|
|
146468
146468
|
const resolvedPath = toPath2(state, fileName);
|
|
146469
146469
|
resolvedConfigFilePaths.set(fileName, resolvedPath);
|
|
146470
146470
|
return resolvedPath;
|
|
@@ -146852,7 +146852,7 @@ ${lanes.join("\n")}
|
|
|
146852
146852
|
void 0,
|
|
146853
146853
|
(name, text, writeByteOrderMark, onError, sourceFiles, data) => {
|
|
146854
146854
|
var _a2;
|
|
146855
|
-
const
|
|
146855
|
+
const path3 = toPath2(state, name);
|
|
146856
146856
|
emittedOutputs.set(toPath2(state, name), name);
|
|
146857
146857
|
if (data == null ? void 0 : data.buildInfo) {
|
|
146858
146858
|
now || (now = getCurrentTime(state.host));
|
|
@@ -146882,7 +146882,7 @@ ${lanes.join("\n")}
|
|
|
146882
146882
|
);
|
|
146883
146883
|
if (data == null ? void 0 : data.differsOnlyInMap) state.host.setModifiedTime(name, modifiedTime);
|
|
146884
146884
|
else if (!isIncremental && state.watch) {
|
|
146885
|
-
(outputTimeStampMap || (outputTimeStampMap = getOutputTimeStampMap(state, projectPath))).set(
|
|
146885
|
+
(outputTimeStampMap || (outputTimeStampMap = getOutputTimeStampMap(state, projectPath))).set(path3, now || (now = getCurrentTime(state.host)));
|
|
146886
146886
|
}
|
|
146887
146887
|
},
|
|
146888
146888
|
cancellationToken,
|
|
@@ -147066,8 +147066,8 @@ ${lanes.join("\n")}
|
|
|
147066
147066
|
return !!value.watcher;
|
|
147067
147067
|
}
|
|
147068
147068
|
function getModifiedTime2(state, fileName) {
|
|
147069
|
-
const
|
|
147070
|
-
const existing = state.filesWatched.get(
|
|
147069
|
+
const path3 = toPath2(state, fileName);
|
|
147070
|
+
const existing = state.filesWatched.get(path3);
|
|
147071
147071
|
if (state.watch && !!existing) {
|
|
147072
147072
|
if (!isFileWatcherWithModifiedTime(existing)) return existing;
|
|
147073
147073
|
if (existing.modifiedTime) return existing.modifiedTime;
|
|
@@ -147075,20 +147075,20 @@ ${lanes.join("\n")}
|
|
|
147075
147075
|
const result = getModifiedTime(state.host, fileName);
|
|
147076
147076
|
if (state.watch) {
|
|
147077
147077
|
if (existing) existing.modifiedTime = result;
|
|
147078
|
-
else state.filesWatched.set(
|
|
147078
|
+
else state.filesWatched.set(path3, result);
|
|
147079
147079
|
}
|
|
147080
147080
|
return result;
|
|
147081
147081
|
}
|
|
147082
147082
|
function watchFile(state, file, callback, pollingInterval, options, watchType, project) {
|
|
147083
|
-
const
|
|
147084
|
-
const existing = state.filesWatched.get(
|
|
147083
|
+
const path3 = toPath2(state, file);
|
|
147084
|
+
const existing = state.filesWatched.get(path3);
|
|
147085
147085
|
if (existing && isFileWatcherWithModifiedTime(existing)) {
|
|
147086
147086
|
existing.callbacks.push(callback);
|
|
147087
147087
|
} else {
|
|
147088
147088
|
const watcher = state.watchFile(
|
|
147089
147089
|
file,
|
|
147090
147090
|
(fileName, eventKind, modifiedTime) => {
|
|
147091
|
-
const existing2 = Debug.checkDefined(state.filesWatched.get(
|
|
147091
|
+
const existing2 = Debug.checkDefined(state.filesWatched.get(path3));
|
|
147092
147092
|
Debug.assert(isFileWatcherWithModifiedTime(existing2));
|
|
147093
147093
|
existing2.modifiedTime = modifiedTime;
|
|
147094
147094
|
existing2.callbacks.forEach((cb) => cb(fileName, eventKind, modifiedTime));
|
|
@@ -147098,14 +147098,14 @@ ${lanes.join("\n")}
|
|
|
147098
147098
|
watchType,
|
|
147099
147099
|
project
|
|
147100
147100
|
);
|
|
147101
|
-
state.filesWatched.set(
|
|
147101
|
+
state.filesWatched.set(path3, { callbacks: [callback], watcher, modifiedTime: existing });
|
|
147102
147102
|
}
|
|
147103
147103
|
return {
|
|
147104
147104
|
close: () => {
|
|
147105
|
-
const existing2 = Debug.checkDefined(state.filesWatched.get(
|
|
147105
|
+
const existing2 = Debug.checkDefined(state.filesWatched.get(path3));
|
|
147106
147106
|
Debug.assert(isFileWatcherWithModifiedTime(existing2));
|
|
147107
147107
|
if (existing2.callbacks.length === 1) {
|
|
147108
|
-
state.filesWatched.delete(
|
|
147108
|
+
state.filesWatched.delete(path3);
|
|
147109
147109
|
closeFileWatcherOf(existing2);
|
|
147110
147110
|
} else {
|
|
147111
147111
|
unorderedRemoveItem(existing2.callbacks, callback);
|
|
@@ -147120,19 +147120,19 @@ ${lanes.join("\n")}
|
|
|
147120
147120
|
return result;
|
|
147121
147121
|
}
|
|
147122
147122
|
function getBuildInfoCacheEntry(state, buildInfoPath, resolvedConfigPath) {
|
|
147123
|
-
const
|
|
147123
|
+
const path3 = toPath2(state, buildInfoPath);
|
|
147124
147124
|
const existing = state.buildInfoCache.get(resolvedConfigPath);
|
|
147125
|
-
return (existing == null ? void 0 : existing.path) ===
|
|
147125
|
+
return (existing == null ? void 0 : existing.path) === path3 ? existing : void 0;
|
|
147126
147126
|
}
|
|
147127
147127
|
function getBuildInfo3(state, buildInfoPath, resolvedConfigPath, modifiedTime) {
|
|
147128
|
-
const
|
|
147128
|
+
const path3 = toPath2(state, buildInfoPath);
|
|
147129
147129
|
const existing = state.buildInfoCache.get(resolvedConfigPath);
|
|
147130
|
-
if (existing !== void 0 && existing.path ===
|
|
147130
|
+
if (existing !== void 0 && existing.path === path3) {
|
|
147131
147131
|
return existing.buildInfo || void 0;
|
|
147132
147132
|
}
|
|
147133
147133
|
const value = state.readFileWithCache(buildInfoPath);
|
|
147134
147134
|
const buildInfo = value ? getBuildInfo(buildInfoPath, value) : void 0;
|
|
147135
|
-
state.buildInfoCache.set(resolvedConfigPath, { path:
|
|
147135
|
+
state.buildInfoCache.set(resolvedConfigPath, { path: path3, buildInfo: buildInfo || false, modifiedTime: modifiedTime || missingFileModifiedTime });
|
|
147136
147136
|
return buildInfo;
|
|
147137
147137
|
}
|
|
147138
147138
|
function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
|
|
@@ -147313,11 +147313,11 @@ ${lanes.join("\n")}
|
|
|
147313
147313
|
const outputTimeStampMap = getOutputTimeStampMap(state, resolvedPath);
|
|
147314
147314
|
for (const output of outputs) {
|
|
147315
147315
|
if (output === buildInfoPath) continue;
|
|
147316
|
-
const
|
|
147317
|
-
let outputTime = outputTimeStampMap == null ? void 0 : outputTimeStampMap.get(
|
|
147316
|
+
const path3 = toPath2(state, output);
|
|
147317
|
+
let outputTime = outputTimeStampMap == null ? void 0 : outputTimeStampMap.get(path3);
|
|
147318
147318
|
if (!outputTime) {
|
|
147319
147319
|
outputTime = getModifiedTime(state.host, output);
|
|
147320
|
-
outputTimeStampMap == null ? void 0 : outputTimeStampMap.set(
|
|
147320
|
+
outputTimeStampMap == null ? void 0 : outputTimeStampMap.set(path3, outputTime);
|
|
147321
147321
|
}
|
|
147322
147322
|
if (outputTime === missingFileModifiedTime) {
|
|
147323
147323
|
return {
|
|
@@ -147371,7 +147371,7 @@ ${lanes.join("\n")}
|
|
|
147371
147371
|
const packageJsonLookups = state.lastCachedPackageJsonLookups.get(resolvedPath);
|
|
147372
147372
|
const dependentPackageFileStatus = packageJsonLookups && forEachKey(
|
|
147373
147373
|
packageJsonLookups,
|
|
147374
|
-
(
|
|
147374
|
+
(path3) => checkConfigFileUpToDateStatus(state, path3, oldestOutputFileTime, oldestOutputFileName)
|
|
147375
147375
|
);
|
|
147376
147376
|
if (dependentPackageFileStatus) return dependentPackageFileStatus;
|
|
147377
147377
|
return {
|
|
@@ -147421,8 +147421,8 @@ ${lanes.join("\n")}
|
|
|
147421
147421
|
if (!skipOutputs || outputs.length !== skipOutputs.size) {
|
|
147422
147422
|
let reportVerbose = !!state.options.verbose;
|
|
147423
147423
|
for (const file of outputs) {
|
|
147424
|
-
const
|
|
147425
|
-
if (skipOutputs == null ? void 0 : skipOutputs.has(
|
|
147424
|
+
const path3 = toPath2(state, file);
|
|
147425
|
+
if (skipOutputs == null ? void 0 : skipOutputs.has(path3)) continue;
|
|
147426
147426
|
if (reportVerbose) {
|
|
147427
147427
|
reportVerbose = false;
|
|
147428
147428
|
reportStatus(state, verboseMessage, proj.options.configFilePath);
|
|
@@ -147430,8 +147430,8 @@ ${lanes.join("\n")}
|
|
|
147430
147430
|
host.setModifiedTime(file, now || (now = getCurrentTime(state.host)));
|
|
147431
147431
|
if (file === buildInfoPath) getBuildInfoCacheEntry(state, buildInfoPath, projectPath).modifiedTime = now;
|
|
147432
147432
|
else if (outputTimeStampMap) {
|
|
147433
|
-
outputTimeStampMap.set(
|
|
147434
|
-
modifiedOutputs.add(
|
|
147433
|
+
outputTimeStampMap.set(path3, now);
|
|
147434
|
+
modifiedOutputs.add(path3);
|
|
147435
147435
|
}
|
|
147436
147436
|
}
|
|
147437
147437
|
}
|
|
@@ -147859,8 +147859,8 @@ ${lanes.join("\n")}
|
|
|
147859
147859
|
close: () => stopWatching(state)
|
|
147860
147860
|
};
|
|
147861
147861
|
}
|
|
147862
|
-
function relName(state,
|
|
147863
|
-
return convertToRelativePath(
|
|
147862
|
+
function relName(state, path3) {
|
|
147863
|
+
return convertToRelativePath(path3, state.compilerHost.getCurrentDirectory(), state.compilerHost.getCanonicalFileName);
|
|
147864
147864
|
}
|
|
147865
147865
|
function reportStatus(state, message, ...args) {
|
|
147866
147866
|
state.host.reportSolutionBuilderStatus(createCompilerDiagnostic(message, ...args));
|
|
@@ -148079,13 +148079,13 @@ ${lanes.join("\n")}
|
|
|
148079
148079
|
} else if (file.isDeclarationFile) {
|
|
148080
148080
|
return "Definitions";
|
|
148081
148081
|
}
|
|
148082
|
-
const
|
|
148083
|
-
if (fileExtensionIsOneOf(
|
|
148082
|
+
const path3 = file.path;
|
|
148083
|
+
if (fileExtensionIsOneOf(path3, supportedTSExtensionsFlat)) {
|
|
148084
148084
|
return "TypeScript";
|
|
148085
|
-
} else if (fileExtensionIsOneOf(
|
|
148085
|
+
} else if (fileExtensionIsOneOf(path3, supportedJSExtensionsFlat)) {
|
|
148086
148086
|
return "JavaScript";
|
|
148087
148087
|
} else if (fileExtensionIs(
|
|
148088
|
-
|
|
148088
|
+
path3,
|
|
148089
148089
|
".json"
|
|
148090
148090
|
/* Json */
|
|
148091
148091
|
)) {
|
|
@@ -148697,7 +148697,7 @@ ${lanes.join("\n")}
|
|
|
148697
148697
|
);
|
|
148698
148698
|
}
|
|
148699
148699
|
}
|
|
148700
|
-
const commandLine = parseCommandLine(commandLineArgs, (
|
|
148700
|
+
const commandLine = parseCommandLine(commandLineArgs, (path3) => system.readFile(path3));
|
|
148701
148701
|
if (commandLine.options.generateCpuProfile && system.enableCPUProfiler) {
|
|
148702
148702
|
system.enableCPUProfiler(commandLine.options.generateCpuProfile, () => executeCommandLineWorker(
|
|
148703
148703
|
system,
|
|
@@ -150573,12 +150573,12 @@ ${lanes.join("\n")}
|
|
|
150573
150573
|
return nodeCoreModules.has(moduleName) ? "node" : moduleName;
|
|
150574
150574
|
}
|
|
150575
150575
|
function loadSafeList(host, safeListPath) {
|
|
150576
|
-
const result = readConfigFile(safeListPath, (
|
|
150576
|
+
const result = readConfigFile(safeListPath, (path3) => host.readFile(path3));
|
|
150577
150577
|
return new Map(Object.entries(result.config));
|
|
150578
150578
|
}
|
|
150579
150579
|
function loadTypesMap(host, typesMapPath) {
|
|
150580
150580
|
var _a;
|
|
150581
|
-
const result = readConfigFile(typesMapPath, (
|
|
150581
|
+
const result = readConfigFile(typesMapPath, (path3) => host.readFile(path3));
|
|
150582
150582
|
if ((_a = result.config) == null ? void 0 : _a.simpleMap) {
|
|
150583
150583
|
return new Map(Object.entries(result.config.simpleMap));
|
|
150584
150584
|
}
|
|
@@ -150590,9 +150590,9 @@ ${lanes.join("\n")}
|
|
|
150590
150590
|
}
|
|
150591
150591
|
const inferredTypings = /* @__PURE__ */ new Map();
|
|
150592
150592
|
fileNames = mapDefined(fileNames, (fileName) => {
|
|
150593
|
-
const
|
|
150594
|
-
if (hasJSFileExtension(
|
|
150595
|
-
return
|
|
150593
|
+
const path3 = normalizePath(fileName);
|
|
150594
|
+
if (hasJSFileExtension(path3)) {
|
|
150595
|
+
return path3;
|
|
150596
150596
|
}
|
|
150597
150597
|
});
|
|
150598
150598
|
const filesToWatch = [];
|
|
@@ -150654,7 +150654,7 @@ ${lanes.join("\n")}
|
|
|
150654
150654
|
let manifestTypingNames;
|
|
150655
150655
|
if (host.fileExists(manifestPath)) {
|
|
150656
150656
|
filesToWatch2.push(manifestPath);
|
|
150657
|
-
manifest = readConfigFile(manifestPath, (
|
|
150657
|
+
manifest = readConfigFile(manifestPath, (path3) => host.readFile(path3)).config;
|
|
150658
150658
|
manifestTypingNames = flatMap([manifest.dependencies, manifest.devDependencies, manifest.optionalDependencies, manifest.peerDependencies], getOwnKeys);
|
|
150659
150659
|
addInferredTypings(manifestTypingNames, `Typing names in '${manifestPath}' dependencies`);
|
|
150660
150660
|
}
|
|
@@ -150688,7 +150688,7 @@ ${lanes.join("\n")}
|
|
|
150688
150688
|
if (log) log(`Searching for typing names in ${packagesFolderPath}; all files: ${JSON.stringify(dependencyManifestNames)}`);
|
|
150689
150689
|
for (const manifestPath2 of dependencyManifestNames) {
|
|
150690
150690
|
const normalizedFileName = normalizePath(manifestPath2);
|
|
150691
|
-
const result2 = readConfigFile(normalizedFileName, (
|
|
150691
|
+
const result2 = readConfigFile(normalizedFileName, (path3) => host.readFile(path3));
|
|
150692
150692
|
const manifest2 = result2.config;
|
|
150693
150693
|
if (!manifest2.name) {
|
|
150694
150694
|
continue;
|
|
@@ -153468,14 +153468,14 @@ ${lanes.join("\n")}
|
|
|
153468
153468
|
function tryGetDirectories(host, directoryName) {
|
|
153469
153469
|
return tryIOAndConsumeErrors(host, host.getDirectories, directoryName) || [];
|
|
153470
153470
|
}
|
|
153471
|
-
function tryReadDirectory(host,
|
|
153472
|
-
return tryIOAndConsumeErrors(host, host.readDirectory,
|
|
153471
|
+
function tryReadDirectory(host, path3, extensions, exclude, include) {
|
|
153472
|
+
return tryIOAndConsumeErrors(host, host.readDirectory, path3, extensions, exclude, include) || emptyArray;
|
|
153473
153473
|
}
|
|
153474
|
-
function tryFileExists(host,
|
|
153475
|
-
return tryIOAndConsumeErrors(host, host.fileExists,
|
|
153474
|
+
function tryFileExists(host, path3) {
|
|
153475
|
+
return tryIOAndConsumeErrors(host, host.fileExists, path3);
|
|
153476
153476
|
}
|
|
153477
|
-
function tryDirectoryExists(host,
|
|
153478
|
-
return tryAndIgnoreErrors(() => directoryProbablyExists(
|
|
153477
|
+
function tryDirectoryExists(host, path3) {
|
|
153478
|
+
return tryAndIgnoreErrors(() => directoryProbablyExists(path3, host)) || false;
|
|
153479
153479
|
}
|
|
153480
153480
|
function tryAndIgnoreErrors(cb) {
|
|
153481
153481
|
try {
|
|
@@ -154317,13 +154317,13 @@ ${lanes.join("\n")}
|
|
|
154317
154317
|
function getIsExcluded(excludePatterns, host) {
|
|
154318
154318
|
var _a;
|
|
154319
154319
|
const realpathsWithSymlinks = (_a = host.getSymlinkCache) == null ? void 0 : _a.call(host).getSymlinkedDirectoriesByRealpath();
|
|
154320
|
-
return ({ fileName, path:
|
|
154320
|
+
return ({ fileName, path: path3 }) => {
|
|
154321
154321
|
if (excludePatterns.some((p) => p.test(fileName))) return true;
|
|
154322
154322
|
if ((realpathsWithSymlinks == null ? void 0 : realpathsWithSymlinks.size) && pathContainsNodeModules(fileName)) {
|
|
154323
154323
|
let dir = getDirectoryPath(fileName);
|
|
154324
154324
|
return forEachAncestorDirectoryStoppingAtGlobalCache(
|
|
154325
154325
|
host,
|
|
154326
|
-
getDirectoryPath(
|
|
154326
|
+
getDirectoryPath(path3),
|
|
154327
154327
|
(dirPath) => {
|
|
154328
154328
|
const symlinks = realpathsWithSymlinks.get(ensureTrailingDirectorySeparator(dirPath));
|
|
154329
154329
|
if (symlinks) {
|
|
@@ -155979,14 +155979,14 @@ ${lanes.join("\n")}
|
|
|
155979
155979
|
return settingsOrHost;
|
|
155980
155980
|
}
|
|
155981
155981
|
function acquireDocument(fileName, compilationSettings, scriptSnapshot, version22, scriptKind, languageVersionOrOptions) {
|
|
155982
|
-
const
|
|
155982
|
+
const path3 = toPath(fileName, currentDirectory, getCanonicalFileName);
|
|
155983
155983
|
const key = getKeyForCompilationSettings(getCompilationSettings(compilationSettings));
|
|
155984
|
-
return acquireDocumentWithKey(fileName,
|
|
155984
|
+
return acquireDocumentWithKey(fileName, path3, compilationSettings, key, scriptSnapshot, version22, scriptKind, languageVersionOrOptions);
|
|
155985
155985
|
}
|
|
155986
|
-
function acquireDocumentWithKey(fileName,
|
|
155986
|
+
function acquireDocumentWithKey(fileName, path3, compilationSettings, key, scriptSnapshot, version22, scriptKind, languageVersionOrOptions) {
|
|
155987
155987
|
return acquireOrUpdateDocument(
|
|
155988
155988
|
fileName,
|
|
155989
|
-
|
|
155989
|
+
path3,
|
|
155990
155990
|
compilationSettings,
|
|
155991
155991
|
key,
|
|
155992
155992
|
scriptSnapshot,
|
|
@@ -155998,14 +155998,14 @@ ${lanes.join("\n")}
|
|
|
155998
155998
|
);
|
|
155999
155999
|
}
|
|
156000
156000
|
function updateDocument(fileName, compilationSettings, scriptSnapshot, version22, scriptKind, languageVersionOrOptions) {
|
|
156001
|
-
const
|
|
156001
|
+
const path3 = toPath(fileName, currentDirectory, getCanonicalFileName);
|
|
156002
156002
|
const key = getKeyForCompilationSettings(getCompilationSettings(compilationSettings));
|
|
156003
|
-
return updateDocumentWithKey(fileName,
|
|
156003
|
+
return updateDocumentWithKey(fileName, path3, compilationSettings, key, scriptSnapshot, version22, scriptKind, languageVersionOrOptions);
|
|
156004
156004
|
}
|
|
156005
|
-
function updateDocumentWithKey(fileName,
|
|
156005
|
+
function updateDocumentWithKey(fileName, path3, compilationSettings, key, scriptSnapshot, version22, scriptKind, languageVersionOrOptions) {
|
|
156006
156006
|
return acquireOrUpdateDocument(
|
|
156007
156007
|
fileName,
|
|
156008
|
-
|
|
156008
|
+
path3,
|
|
156009
156009
|
getCompilationSettings(compilationSettings),
|
|
156010
156010
|
key,
|
|
156011
156011
|
scriptSnapshot,
|
|
@@ -156021,7 +156021,7 @@ ${lanes.join("\n")}
|
|
|
156021
156021
|
Debug.assert(scriptKind === void 0 || !entry || entry.sourceFile.scriptKind === scriptKind, `Script kind should match provided ScriptKind:${scriptKind} and sourceFile.scriptKind: ${entry == null ? void 0 : entry.sourceFile.scriptKind}, !entry: ${!entry}`);
|
|
156022
156022
|
return entry;
|
|
156023
156023
|
}
|
|
156024
|
-
function acquireOrUpdateDocument(fileName,
|
|
156024
|
+
function acquireOrUpdateDocument(fileName, path3, compilationSettingsOrHost, key, scriptSnapshot, version22, acquiring, scriptKind, languageVersionOrOptions) {
|
|
156025
156025
|
var _a, _b, _c, _d;
|
|
156026
156026
|
scriptKind = ensureScriptKind(fileName, scriptKind);
|
|
156027
156027
|
const compilationSettings = getCompilationSettings(compilationSettingsOrHost);
|
|
@@ -156029,7 +156029,7 @@ ${lanes.join("\n")}
|
|
|
156029
156029
|
const scriptTarget = scriptKind === 6 ? 100 : getEmitScriptTarget(compilationSettings);
|
|
156030
156030
|
const sourceFileOptions = typeof languageVersionOrOptions === "object" ? languageVersionOrOptions : {
|
|
156031
156031
|
languageVersion: scriptTarget,
|
|
156032
|
-
impliedNodeFormat: host && getImpliedNodeFormatForFile(
|
|
156032
|
+
impliedNodeFormat: host && getImpliedNodeFormatForFile(path3, (_d = (_c = (_b = (_a = host.getCompilerHost) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getModuleResolutionCache) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.getPackageJsonInfoCache(), host, compilationSettings),
|
|
156033
156033
|
setExternalModuleIndicator: getSetExternalModuleIndicator(compilationSettings),
|
|
156034
156034
|
jsDocParsingMode
|
|
156035
156035
|
};
|
|
@@ -156042,15 +156042,15 @@ ${lanes.join("\n")}
|
|
|
156042
156042
|
if (buckets.size > oldBucketCount) {
|
|
156043
156043
|
tracing.instant(tracing.Phase.Session, "createdDocumentRegistryBucket", { configFilePath: compilationSettings.configFilePath, key: keyWithMode });
|
|
156044
156044
|
}
|
|
156045
|
-
const otherBucketKey = !isDeclarationFileName(
|
|
156045
|
+
const otherBucketKey = !isDeclarationFileName(path3) && forEachEntry(buckets, (bucket2, bucketKey) => bucketKey !== keyWithMode && bucket2.has(path3) && bucketKey);
|
|
156046
156046
|
if (otherBucketKey) {
|
|
156047
|
-
tracing.instant(tracing.Phase.Session, "documentRegistryBucketOverlap", { path:
|
|
156047
|
+
tracing.instant(tracing.Phase.Session, "documentRegistryBucketOverlap", { path: path3, key1: otherBucketKey, key2: keyWithMode });
|
|
156048
156048
|
}
|
|
156049
156049
|
}
|
|
156050
|
-
const bucketEntry = bucket.get(
|
|
156050
|
+
const bucketEntry = bucket.get(path3);
|
|
156051
156051
|
let entry = bucketEntry && getDocumentRegistryEntry(bucketEntry, scriptKind);
|
|
156052
156052
|
if (!entry && externalCache) {
|
|
156053
|
-
const sourceFile = externalCache.getDocument(keyWithMode,
|
|
156053
|
+
const sourceFile = externalCache.getDocument(keyWithMode, path3);
|
|
156054
156054
|
if (sourceFile && sourceFile.scriptKind === scriptKind && sourceFile.text === getSnapshotText(scriptSnapshot)) {
|
|
156055
156055
|
Debug.assert(acquiring);
|
|
156056
156056
|
entry = {
|
|
@@ -156071,7 +156071,7 @@ ${lanes.join("\n")}
|
|
|
156071
156071
|
scriptKind
|
|
156072
156072
|
);
|
|
156073
156073
|
if (externalCache) {
|
|
156074
|
-
externalCache.setDocument(keyWithMode,
|
|
156074
|
+
externalCache.setDocument(keyWithMode, path3, sourceFile);
|
|
156075
156075
|
}
|
|
156076
156076
|
entry = {
|
|
156077
156077
|
sourceFile,
|
|
@@ -156082,7 +156082,7 @@ ${lanes.join("\n")}
|
|
|
156082
156082
|
if (entry.sourceFile.version !== version22) {
|
|
156083
156083
|
entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version22, scriptSnapshot.getChangeRange(entry.sourceFile.scriptSnapshot));
|
|
156084
156084
|
if (externalCache) {
|
|
156085
|
-
externalCache.setDocument(keyWithMode,
|
|
156085
|
+
externalCache.setDocument(keyWithMode, path3, entry.sourceFile);
|
|
156086
156086
|
}
|
|
156087
156087
|
}
|
|
156088
156088
|
if (acquiring) {
|
|
@@ -156093,35 +156093,35 @@ ${lanes.join("\n")}
|
|
|
156093
156093
|
return entry.sourceFile;
|
|
156094
156094
|
function setBucketEntry() {
|
|
156095
156095
|
if (!bucketEntry) {
|
|
156096
|
-
bucket.set(
|
|
156096
|
+
bucket.set(path3, entry);
|
|
156097
156097
|
} else if (isDocumentRegistryEntry(bucketEntry)) {
|
|
156098
156098
|
const scriptKindMap = /* @__PURE__ */ new Map();
|
|
156099
156099
|
scriptKindMap.set(bucketEntry.sourceFile.scriptKind, bucketEntry);
|
|
156100
156100
|
scriptKindMap.set(scriptKind, entry);
|
|
156101
|
-
bucket.set(
|
|
156101
|
+
bucket.set(path3, scriptKindMap);
|
|
156102
156102
|
} else {
|
|
156103
156103
|
bucketEntry.set(scriptKind, entry);
|
|
156104
156104
|
}
|
|
156105
156105
|
}
|
|
156106
156106
|
}
|
|
156107
156107
|
function releaseDocument(fileName, compilationSettings, scriptKind, impliedNodeFormat) {
|
|
156108
|
-
const
|
|
156108
|
+
const path3 = toPath(fileName, currentDirectory, getCanonicalFileName);
|
|
156109
156109
|
const key = getKeyForCompilationSettings(compilationSettings);
|
|
156110
|
-
return releaseDocumentWithKey(
|
|
156110
|
+
return releaseDocumentWithKey(path3, key, scriptKind, impliedNodeFormat);
|
|
156111
156111
|
}
|
|
156112
|
-
function releaseDocumentWithKey(
|
|
156112
|
+
function releaseDocumentWithKey(path3, key, scriptKind, impliedNodeFormat) {
|
|
156113
156113
|
const bucket = Debug.checkDefined(buckets.get(getDocumentRegistryBucketKeyWithMode(key, impliedNodeFormat)));
|
|
156114
|
-
const bucketEntry = bucket.get(
|
|
156114
|
+
const bucketEntry = bucket.get(path3);
|
|
156115
156115
|
const entry = getDocumentRegistryEntry(bucketEntry, scriptKind);
|
|
156116
156116
|
entry.languageServiceRefCount--;
|
|
156117
156117
|
Debug.assert(entry.languageServiceRefCount >= 0);
|
|
156118
156118
|
if (entry.languageServiceRefCount === 0) {
|
|
156119
156119
|
if (isDocumentRegistryEntry(bucketEntry)) {
|
|
156120
|
-
bucket.delete(
|
|
156120
|
+
bucket.delete(path3);
|
|
156121
156121
|
} else {
|
|
156122
156122
|
bucketEntry.delete(scriptKind);
|
|
156123
156123
|
if (bucketEntry.size === 1) {
|
|
156124
|
-
bucket.set(
|
|
156124
|
+
bucket.set(path3, firstDefinedIterator(bucketEntry.values(), identity));
|
|
156125
156125
|
}
|
|
156126
156126
|
}
|
|
156127
156127
|
}
|
|
@@ -156157,10 +156157,10 @@ ${lanes.join("\n")}
|
|
|
156157
156157
|
}
|
|
156158
156158
|
function getPathUpdater(oldFileOrDirPath, newFileOrDirPath, getCanonicalFileName, sourceMapper) {
|
|
156159
156159
|
const canonicalOldPath = getCanonicalFileName(oldFileOrDirPath);
|
|
156160
|
-
return (
|
|
156161
|
-
const originalPath = sourceMapper && sourceMapper.tryGetSourcePosition({ fileName:
|
|
156162
|
-
const updatedPath = getUpdatedPath(originalPath ? originalPath.fileName :
|
|
156163
|
-
return originalPath ? updatedPath === void 0 ? void 0 : makeCorrespondingRelativeChange(originalPath.fileName, updatedPath,
|
|
156160
|
+
return (path3) => {
|
|
156161
|
+
const originalPath = sourceMapper && sourceMapper.tryGetSourcePosition({ fileName: path3, pos: 0 });
|
|
156162
|
+
const updatedPath = getUpdatedPath(originalPath ? originalPath.fileName : path3);
|
|
156163
|
+
return originalPath ? updatedPath === void 0 ? void 0 : makeCorrespondingRelativeChange(originalPath.fileName, updatedPath, path3, getCanonicalFileName) : updatedPath;
|
|
156164
156164
|
};
|
|
156165
156165
|
function getUpdatedPath(pathToUpdate) {
|
|
156166
156166
|
if (getCanonicalFileName(pathToUpdate) === canonicalOldPath) return newFileOrDirPath;
|
|
@@ -156236,10 +156236,10 @@ ${lanes.join("\n")}
|
|
|
156236
156236
|
}
|
|
156237
156237
|
return false;
|
|
156238
156238
|
}
|
|
156239
|
-
function relativePath(
|
|
156239
|
+
function relativePath(path3) {
|
|
156240
156240
|
return getRelativePathFromDirectory(
|
|
156241
156241
|
configDir,
|
|
156242
|
-
|
|
156242
|
+
path3,
|
|
156243
156243
|
/*ignoreCase*/
|
|
156244
156244
|
!useCaseSensitiveFileNames2
|
|
156245
156245
|
);
|
|
@@ -157047,8 +157047,8 @@ ${lanes.join("\n")}
|
|
|
157047
157047
|
return toPath(fileName, currentDirectory, getCanonicalFileName);
|
|
157048
157048
|
}
|
|
157049
157049
|
function getDocumentPositionMapper2(generatedFileName, sourceFileName) {
|
|
157050
|
-
const
|
|
157051
|
-
const value = documentPositionMappers.get(
|
|
157050
|
+
const path3 = toPath3(generatedFileName);
|
|
157051
|
+
const value = documentPositionMappers.get(path3);
|
|
157052
157052
|
if (value) return value;
|
|
157053
157053
|
let mapper;
|
|
157054
157054
|
if (host.getDocumentPositionMapper) {
|
|
@@ -157062,7 +157062,7 @@ ${lanes.join("\n")}
|
|
|
157062
157062
|
(f) => !host.fileExists || host.fileExists(f) ? host.readFile(f) : void 0
|
|
157063
157063
|
);
|
|
157064
157064
|
}
|
|
157065
|
-
documentPositionMappers.set(
|
|
157065
|
+
documentPositionMappers.set(path3, mapper || identitySourceMapConsumer);
|
|
157066
157066
|
return mapper || identitySourceMapConsumer;
|
|
157067
157067
|
}
|
|
157068
157068
|
function tryGetSourcePosition(info) {
|
|
@@ -157090,21 +157090,21 @@ ${lanes.join("\n")}
|
|
|
157090
157090
|
function getSourceFile(fileName) {
|
|
157091
157091
|
const program = host.getProgram();
|
|
157092
157092
|
if (!program) return void 0;
|
|
157093
|
-
const
|
|
157094
|
-
const file = program.getSourceFileByPath(
|
|
157095
|
-
return file && file.resolvedPath ===
|
|
157093
|
+
const path3 = toPath3(fileName);
|
|
157094
|
+
const file = program.getSourceFileByPath(path3);
|
|
157095
|
+
return file && file.resolvedPath === path3 ? file : void 0;
|
|
157096
157096
|
}
|
|
157097
157097
|
function getOrCreateSourceFileLike(fileName) {
|
|
157098
|
-
const
|
|
157099
|
-
const fileFromCache = sourceFileLike.get(
|
|
157098
|
+
const path3 = toPath3(fileName);
|
|
157099
|
+
const fileFromCache = sourceFileLike.get(path3);
|
|
157100
157100
|
if (fileFromCache !== void 0) return fileFromCache ? fileFromCache : void 0;
|
|
157101
157101
|
if (!host.readFile || host.fileExists && !host.fileExists(fileName)) {
|
|
157102
|
-
sourceFileLike.set(
|
|
157102
|
+
sourceFileLike.set(path3, false);
|
|
157103
157103
|
return void 0;
|
|
157104
157104
|
}
|
|
157105
157105
|
const text = host.readFile(fileName);
|
|
157106
157106
|
const file = text ? createSourceFileLike(text) : false;
|
|
157107
|
-
sourceFileLike.set(
|
|
157107
|
+
sourceFileLike.set(path3, file);
|
|
157108
157108
|
return file ? file : void 0;
|
|
157109
157109
|
}
|
|
157110
157110
|
function getSourceFileLike(fileName) {
|
|
@@ -165190,12 +165190,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
165190
165190
|
directoryExists: (directoryName) => {
|
|
165191
165191
|
return directoryProbablyExists(directoryName, host);
|
|
165192
165192
|
},
|
|
165193
|
-
getDirectories: (
|
|
165194
|
-
return host.getDirectories ? host.getDirectories(
|
|
165193
|
+
getDirectories: (path3) => {
|
|
165194
|
+
return host.getDirectories ? host.getDirectories(path3) : [];
|
|
165195
165195
|
},
|
|
165196
|
-
readDirectory: (
|
|
165196
|
+
readDirectory: (path3, extensions, exclude, include, depth) => {
|
|
165197
165197
|
Debug.checkDefined(host.readDirectory, "'LanguageServiceHost.readDirectory' must be implemented to correctly process 'projectReferences'");
|
|
165198
|
-
return host.readDirectory(
|
|
165198
|
+
return host.readDirectory(path3, extensions, exclude, include, depth);
|
|
165199
165199
|
},
|
|
165200
165200
|
onReleaseOldSourceFile,
|
|
165201
165201
|
onReleaseParsedCommandLine,
|
|
@@ -165258,11 +165258,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
165258
165258
|
program.getTypeChecker();
|
|
165259
165259
|
return;
|
|
165260
165260
|
function getParsedCommandLine(fileName) {
|
|
165261
|
-
const
|
|
165262
|
-
const existing = parsedCommandLines == null ? void 0 : parsedCommandLines.get(
|
|
165261
|
+
const path3 = toPath(fileName, currentDirectory, getCanonicalFileName);
|
|
165262
|
+
const existing = parsedCommandLines == null ? void 0 : parsedCommandLines.get(path3);
|
|
165263
165263
|
if (existing !== void 0) return existing || void 0;
|
|
165264
165264
|
const result = host.getParsedCommandLine ? host.getParsedCommandLine(fileName) : getParsedCommandLineOfConfigFileUsingSourceFile(fileName);
|
|
165265
|
-
(parsedCommandLines || (parsedCommandLines = /* @__PURE__ */ new Map())).set(
|
|
165265
|
+
(parsedCommandLines || (parsedCommandLines = /* @__PURE__ */ new Map())).set(path3, result || false);
|
|
165266
165266
|
return result;
|
|
165267
165267
|
}
|
|
165268
165268
|
function getParsedCommandLineOfConfigFileUsingSourceFile(configFileName) {
|
|
@@ -165304,7 +165304,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
165304
165304
|
function getOrCreateSourceFile(fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) {
|
|
165305
165305
|
return getOrCreateSourceFileByPath(fileName, toPath(fileName, currentDirectory, getCanonicalFileName), languageVersionOrOptions, onError, shouldCreateNewSourceFile);
|
|
165306
165306
|
}
|
|
165307
|
-
function getOrCreateSourceFileByPath(fileName,
|
|
165307
|
+
function getOrCreateSourceFileByPath(fileName, path3, languageVersionOrOptions, _onError, shouldCreateNewSourceFile) {
|
|
165308
165308
|
Debug.assert(compilerHost, "getOrCreateSourceFileByPath called after typical CompilerHost lifetime, check the callstack something with a reference to an old host.");
|
|
165309
165309
|
const scriptSnapshot = host.getScriptSnapshot(fileName);
|
|
165310
165310
|
if (!scriptSnapshot) {
|
|
@@ -165313,17 +165313,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
165313
165313
|
const scriptKind = getScriptKind(fileName, host);
|
|
165314
165314
|
const scriptVersion = host.getScriptVersion(fileName);
|
|
165315
165315
|
if (!shouldCreateNewSourceFile) {
|
|
165316
|
-
const oldSourceFile = program && program.getSourceFileByPath(
|
|
165316
|
+
const oldSourceFile = program && program.getSourceFileByPath(path3);
|
|
165317
165317
|
if (oldSourceFile) {
|
|
165318
165318
|
if (scriptKind === oldSourceFile.scriptKind || releasedScriptKinds.has(oldSourceFile.resolvedPath)) {
|
|
165319
|
-
return documentRegistry.updateDocumentWithKey(fileName,
|
|
165319
|
+
return documentRegistry.updateDocumentWithKey(fileName, path3, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
|
|
165320
165320
|
} else {
|
|
165321
165321
|
documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
|
|
165322
165322
|
releasedScriptKinds.add(oldSourceFile.resolvedPath);
|
|
165323
165323
|
}
|
|
165324
165324
|
}
|
|
165325
165325
|
}
|
|
165326
|
-
return documentRegistry.acquireDocumentWithKey(fileName,
|
|
165326
|
+
return documentRegistry.acquireDocumentWithKey(fileName, path3, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
|
|
165327
165327
|
}
|
|
165328
165328
|
}
|
|
165329
165329
|
function getProgram() {
|
|
@@ -165929,7 +165929,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
165929
165929
|
return isArray(action) ? Promise.all(action.map((a) => applySingleCodeActionCommand(a))) : applySingleCodeActionCommand(action);
|
|
165930
165930
|
}
|
|
165931
165931
|
function applySingleCodeActionCommand(action) {
|
|
165932
|
-
const getPath = (
|
|
165932
|
+
const getPath = (path3) => toPath(path3, currentDirectory, getCanonicalFileName);
|
|
165933
165933
|
Debug.assertEqual(action.type, "install package");
|
|
165934
165934
|
return host.installPackage ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName }) : Promise.reject("Host does not implement `installPackage`");
|
|
165935
165935
|
}
|
|
@@ -166273,8 +166273,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
166273
166273
|
function isLetterOrDigit(char) {
|
|
166274
166274
|
return char >= 97 && char <= 122 || char >= 65 && char <= 90 || char >= 48 && char <= 57;
|
|
166275
166275
|
}
|
|
166276
|
-
function isNodeModulesFile(
|
|
166277
|
-
return
|
|
166276
|
+
function isNodeModulesFile(path3) {
|
|
166277
|
+
return path3.includes("/node_modules/");
|
|
166278
166278
|
}
|
|
166279
166279
|
}
|
|
166280
166280
|
function getRenameInfo2(fileName, position, preferences) {
|
|
@@ -179908,11 +179908,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
179908
179908
|
}
|
|
179909
179909
|
});
|
|
179910
179910
|
}
|
|
179911
|
-
function generateJSDocParamTagsForDestructuring(
|
|
179911
|
+
function generateJSDocParamTagsForDestructuring(path3, pattern, initializer, dotDotDotToken, isJs, isSnippet, checker, options, preferences) {
|
|
179912
179912
|
if (!isJs) {
|
|
179913
179913
|
return [
|
|
179914
179914
|
getJSDocParamAnnotation(
|
|
179915
|
-
|
|
179915
|
+
path3,
|
|
179916
179916
|
initializer,
|
|
179917
179917
|
dotDotDotToken,
|
|
179918
179918
|
isJs,
|
|
@@ -179926,7 +179926,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
179926
179926
|
)
|
|
179927
179927
|
];
|
|
179928
179928
|
}
|
|
179929
|
-
return patternWorker(
|
|
179929
|
+
return patternWorker(path3, pattern, initializer, dotDotDotToken, { tabstop: 1 });
|
|
179930
179930
|
function patternWorker(path22, pattern2, initializer2, dotDotDotToken2, counter) {
|
|
179931
179931
|
if (isObjectBindingPattern(pattern2) && !dotDotDotToken2) {
|
|
179932
179932
|
const oldTabstop = counter.tabstop;
|
|
@@ -184549,21 +184549,21 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
184549
184549
|
function getFragmentDirectory(fragment) {
|
|
184550
184550
|
return containsSlash(fragment) ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
|
|
184551
184551
|
}
|
|
184552
|
-
function getCompletionsForPathMapping(
|
|
184553
|
-
const parsedPath = tryParsePattern(
|
|
184552
|
+
function getCompletionsForPathMapping(path3, patterns, fragment, packageDirectory, extensionOptions, isExports, isImports, program, host, moduleSpecifierResolutionHost) {
|
|
184553
|
+
const parsedPath = tryParsePattern(path3);
|
|
184554
184554
|
if (!parsedPath) {
|
|
184555
184555
|
return emptyArray;
|
|
184556
184556
|
}
|
|
184557
184557
|
if (typeof parsedPath === "string") {
|
|
184558
184558
|
return justPathMappingName(
|
|
184559
|
-
|
|
184559
|
+
path3,
|
|
184560
184560
|
"script"
|
|
184561
184561
|
/* scriptElement */
|
|
184562
184562
|
);
|
|
184563
184563
|
}
|
|
184564
184564
|
const remainingFragment = tryRemovePrefix(fragment, parsedPath.prefix);
|
|
184565
184565
|
if (remainingFragment === void 0) {
|
|
184566
|
-
const starIsFullPathComponent = endsWith(
|
|
184566
|
+
const starIsFullPathComponent = endsWith(path3, "/*");
|
|
184567
184567
|
return starIsFullPathComponent ? justPathMappingName(
|
|
184568
184568
|
parsedPath.prefix,
|
|
184569
184569
|
"directory"
|
|
@@ -184649,9 +184649,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
184649
184649
|
function getDirectoryMatches(directoryName) {
|
|
184650
184650
|
return mapDefined(tryGetDirectories(host, directoryName), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
|
|
184651
184651
|
}
|
|
184652
|
-
function trimPrefixAndSuffix(
|
|
184652
|
+
function trimPrefixAndSuffix(path3, prefix) {
|
|
184653
184653
|
return firstDefined(matchingSuffixes, (suffix) => {
|
|
184654
|
-
const inner = withoutStartAndEnd(normalizePath(
|
|
184654
|
+
const inner = withoutStartAndEnd(normalizePath(path3), prefix, suffix);
|
|
184655
184655
|
return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
|
|
184656
184656
|
});
|
|
184657
184657
|
}
|
|
@@ -184659,8 +184659,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
184659
184659
|
function withoutStartAndEnd(s, start, end) {
|
|
184660
184660
|
return startsWith(s, start) && endsWith(s, end) ? s.slice(start.length, s.length - end.length) : void 0;
|
|
184661
184661
|
}
|
|
184662
|
-
function removeLeadingDirectorySeparator(
|
|
184663
|
-
return
|
|
184662
|
+
function removeLeadingDirectorySeparator(path3) {
|
|
184663
|
+
return path3[0] === directorySeparator ? path3.slice(1) : path3;
|
|
184664
184664
|
}
|
|
184665
184665
|
function getAmbientModuleCompletions(fragment, fragmentDirectory, checker) {
|
|
184666
184666
|
const ambientModules = checker.getAmbientModules().map((sym) => stripQuotes(sym.name));
|
|
@@ -184775,10 +184775,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
|
|
|
184775
184775
|
/* ESNext */
|
|
184776
184776
|
) ? void 0 : createTextSpan(textStart + offset, length2);
|
|
184777
184777
|
}
|
|
184778
|
-
function isPathRelativeToScript(
|
|
184779
|
-
if (
|
|
184780
|
-
const slashIndex =
|
|
184781
|
-
const slashCharCode =
|
|
184778
|
+
function isPathRelativeToScript(path3) {
|
|
184779
|
+
if (path3 && path3.length >= 2 && path3.charCodeAt(0) === 46) {
|
|
184780
|
+
const slashIndex = path3.length >= 3 && path3.charCodeAt(1) === 46 ? 2 : 1;
|
|
184781
|
+
const slashCharCode = path3.charCodeAt(slashIndex);
|
|
184782
184782
|
return slashCharCode === 47 || slashCharCode === 92;
|
|
184783
184783
|
}
|
|
184784
184784
|
return false;
|
|
@@ -200749,17 +200749,17 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
200749
200749
|
function createNormalizedPathMap() {
|
|
200750
200750
|
const map2 = /* @__PURE__ */ new Map();
|
|
200751
200751
|
return {
|
|
200752
|
-
get(
|
|
200753
|
-
return map2.get(
|
|
200752
|
+
get(path3) {
|
|
200753
|
+
return map2.get(path3);
|
|
200754
200754
|
},
|
|
200755
|
-
set(
|
|
200756
|
-
map2.set(
|
|
200755
|
+
set(path3, value) {
|
|
200756
|
+
map2.set(path3, value);
|
|
200757
200757
|
},
|
|
200758
|
-
contains(
|
|
200759
|
-
return map2.has(
|
|
200758
|
+
contains(path3) {
|
|
200759
|
+
return map2.has(path3);
|
|
200760
200760
|
},
|
|
200761
|
-
remove(
|
|
200762
|
-
map2.delete(
|
|
200761
|
+
remove(path3) {
|
|
200762
|
+
map2.delete(path3);
|
|
200763
200763
|
}
|
|
200764
200764
|
};
|
|
200765
200765
|
}
|
|
@@ -201272,12 +201272,12 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
201272
201272
|
return fileName[0] === "^" || (fileName.includes("walkThroughSnippet:/") || fileName.includes("untitled:/")) && getBaseFileName(fileName)[0] === "^" || fileName.includes(":^") && !fileName.includes(directorySeparator);
|
|
201273
201273
|
}
|
|
201274
201274
|
var ScriptInfo = class {
|
|
201275
|
-
constructor(host, fileName, scriptKind, hasMixedContent,
|
|
201275
|
+
constructor(host, fileName, scriptKind, hasMixedContent, path3, initialVersion) {
|
|
201276
201276
|
this.host = host;
|
|
201277
201277
|
this.fileName = fileName;
|
|
201278
201278
|
this.scriptKind = scriptKind;
|
|
201279
201279
|
this.hasMixedContent = hasMixedContent;
|
|
201280
|
-
this.path =
|
|
201280
|
+
this.path = path3;
|
|
201281
201281
|
this.containingProjects = [];
|
|
201282
201282
|
this.isDynamic = isDynamicFileName(fileName);
|
|
201283
201283
|
this.textStorage = new TextStorage(host, this, initialVersion);
|
|
@@ -201912,8 +201912,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
201912
201912
|
useCaseSensitiveFileNames() {
|
|
201913
201913
|
return this.projectService.host.useCaseSensitiveFileNames;
|
|
201914
201914
|
}
|
|
201915
|
-
readDirectory(
|
|
201916
|
-
return this.directoryStructureHost.readDirectory(
|
|
201915
|
+
readDirectory(path3, extensions, exclude, include, depth) {
|
|
201916
|
+
return this.directoryStructureHost.readDirectory(path3, extensions, exclude, include, depth);
|
|
201917
201917
|
}
|
|
201918
201918
|
readFile(fileName) {
|
|
201919
201919
|
return this.projectService.host.readFile(fileName);
|
|
@@ -201922,8 +201922,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
201922
201922
|
return this.projectService.host.writeFile(fileName, content);
|
|
201923
201923
|
}
|
|
201924
201924
|
fileExists(file) {
|
|
201925
|
-
const
|
|
201926
|
-
return !!this.projectService.getScriptInfoForPath(
|
|
201925
|
+
const path3 = this.toPath(file);
|
|
201926
|
+
return !!this.projectService.getScriptInfoForPath(path3) || !this.isWatchedMissingFile(path3) && this.directoryStructureHost.fileExists(file);
|
|
201927
201927
|
}
|
|
201928
201928
|
/** @internal */
|
|
201929
201929
|
resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
|
|
@@ -201948,11 +201948,11 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
201948
201948
|
resolveLibrary(libraryName, resolveFrom, options, libFileName) {
|
|
201949
201949
|
return this.resolutionCache.resolveLibrary(libraryName, resolveFrom, options, libFileName);
|
|
201950
201950
|
}
|
|
201951
|
-
directoryExists(
|
|
201952
|
-
return this.directoryStructureHost.directoryExists(
|
|
201951
|
+
directoryExists(path3) {
|
|
201952
|
+
return this.directoryStructureHost.directoryExists(path3);
|
|
201953
201953
|
}
|
|
201954
|
-
getDirectories(
|
|
201955
|
-
return this.directoryStructureHost.getDirectories(
|
|
201954
|
+
getDirectories(path3) {
|
|
201955
|
+
return this.directoryStructureHost.getDirectories(path3);
|
|
201956
201956
|
}
|
|
201957
201957
|
/** @internal */
|
|
201958
201958
|
getCachedDirectoryStructureHost() {
|
|
@@ -202215,16 +202215,16 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202215
202215
|
}
|
|
202216
202216
|
}));
|
|
202217
202217
|
}
|
|
202218
|
-
getSourceFile(
|
|
202218
|
+
getSourceFile(path3) {
|
|
202219
202219
|
if (!this.program) {
|
|
202220
202220
|
return void 0;
|
|
202221
202221
|
}
|
|
202222
|
-
return this.program.getSourceFileByPath(
|
|
202222
|
+
return this.program.getSourceFileByPath(path3);
|
|
202223
202223
|
}
|
|
202224
202224
|
/** @internal */
|
|
202225
|
-
getSourceFileOrConfigFile(
|
|
202225
|
+
getSourceFileOrConfigFile(path3) {
|
|
202226
202226
|
const options = this.program.getCompilerOptions();
|
|
202227
|
-
return
|
|
202227
|
+
return path3 === options.configFilePath ? options.configFile : this.getSourceFile(path3);
|
|
202228
202228
|
}
|
|
202229
202229
|
close() {
|
|
202230
202230
|
var _a;
|
|
@@ -202401,8 +202401,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202401
202401
|
}
|
|
202402
202402
|
// add a root file that doesnt exist on host
|
|
202403
202403
|
addMissingFileRoot(fileName) {
|
|
202404
|
-
const
|
|
202405
|
-
this.rootFilesMap.set(
|
|
202404
|
+
const path3 = this.projectService.toPath(fileName);
|
|
202405
|
+
this.rootFilesMap.set(path3, { fileName });
|
|
202406
202406
|
this.markAsDirty();
|
|
202407
202407
|
}
|
|
202408
202408
|
removeFile(info, fileExists, detachFromProject) {
|
|
@@ -202568,22 +202568,22 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202568
202568
|
const toRemove = new Map(this.typingWatchers);
|
|
202569
202569
|
if (!this.typingWatchers) this.typingWatchers = /* @__PURE__ */ new Map();
|
|
202570
202570
|
this.typingWatchers.isInvoked = false;
|
|
202571
|
-
const createProjectWatcher = (
|
|
202572
|
-
const canonicalPath = this.toPath(
|
|
202571
|
+
const createProjectWatcher = (path3, typingsWatcherType) => {
|
|
202572
|
+
const canonicalPath = this.toPath(path3);
|
|
202573
202573
|
toRemove.delete(canonicalPath);
|
|
202574
202574
|
if (!this.typingWatchers.has(canonicalPath)) {
|
|
202575
202575
|
const watchType = typingsWatcherType === "FileWatcher" ? WatchType.TypingInstallerLocationFile : WatchType.TypingInstallerLocationDirectory;
|
|
202576
202576
|
this.typingWatchers.set(
|
|
202577
202577
|
canonicalPath,
|
|
202578
202578
|
canWatchDirectoryOrFilePath(canonicalPath) ? typingsWatcherType === "FileWatcher" ? this.projectService.watchFactory.watchFile(
|
|
202579
|
-
|
|
202579
|
+
path3,
|
|
202580
202580
|
() => !this.typingWatchers.isInvoked ? this.onTypingInstallerWatchInvoke() : this.writeLog(`TypingWatchers already invoked`),
|
|
202581
202581
|
2e3,
|
|
202582
202582
|
this.projectService.getWatchOptions(this),
|
|
202583
202583
|
watchType,
|
|
202584
202584
|
this
|
|
202585
202585
|
) : this.projectService.watchFactory.watchDirectory(
|
|
202586
|
-
|
|
202586
|
+
path3,
|
|
202587
202587
|
(f) => {
|
|
202588
202588
|
if (this.typingWatchers.isInvoked) return this.writeLog(`TypingWatchers already invoked`);
|
|
202589
202589
|
if (!fileExtensionIs(
|
|
@@ -202598,7 +202598,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202598
202598
|
this.projectService.getWatchOptions(this),
|
|
202599
202599
|
watchType,
|
|
202600
202600
|
this
|
|
202601
|
-
) : (this.writeLog(`Skipping watcher creation at ${
|
|
202601
|
+
) : (this.writeLog(`Skipping watcher creation at ${path3}:: ${getDetailWatchInfo(watchType, this)}`), noopFileWatcher)
|
|
202602
202602
|
);
|
|
202603
202603
|
}
|
|
202604
202604
|
};
|
|
@@ -202643,9 +202643,9 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202643
202643
|
/* DirectoryWatcher */
|
|
202644
202644
|
);
|
|
202645
202645
|
}
|
|
202646
|
-
toRemove.forEach((watch,
|
|
202646
|
+
toRemove.forEach((watch, path3) => {
|
|
202647
202647
|
watch.close();
|
|
202648
|
-
this.typingWatchers.delete(
|
|
202648
|
+
this.typingWatchers.delete(path3);
|
|
202649
202649
|
});
|
|
202650
202650
|
}
|
|
202651
202651
|
/** @internal */
|
|
@@ -202679,9 +202679,9 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202679
202679
|
let hasNewProgram = false;
|
|
202680
202680
|
if (this.program && (!oldProgram || this.program !== oldProgram && this.program.structureIsReused !== 2)) {
|
|
202681
202681
|
hasNewProgram = true;
|
|
202682
|
-
this.rootFilesMap.forEach((value,
|
|
202682
|
+
this.rootFilesMap.forEach((value, path3) => {
|
|
202683
202683
|
var _a2;
|
|
202684
|
-
const file = this.program.getSourceFileByPath(
|
|
202684
|
+
const file = this.program.getSourceFileByPath(path3);
|
|
202685
202685
|
const info = value.info;
|
|
202686
202686
|
if (!file || ((_a2 = value.info) == null ? void 0 : _a2.path) === file.resolvedPath) return;
|
|
202687
202687
|
value.info = this.projectService.getScriptInfo(file.fileName);
|
|
@@ -202837,8 +202837,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202837
202837
|
);
|
|
202838
202838
|
return fileWatcher;
|
|
202839
202839
|
}
|
|
202840
|
-
isWatchedMissingFile(
|
|
202841
|
-
return !!this.missingFilesMap && this.missingFilesMap.has(
|
|
202840
|
+
isWatchedMissingFile(path3) {
|
|
202841
|
+
return !!this.missingFilesMap && this.missingFilesMap.has(path3);
|
|
202842
202842
|
}
|
|
202843
202843
|
/** @internal */
|
|
202844
202844
|
addGeneratedFileWatch(generatedFile, sourceFile) {
|
|
@@ -202847,17 +202847,17 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
202847
202847
|
this.generatedFilesMap = this.createGeneratedFileWatcher(generatedFile);
|
|
202848
202848
|
}
|
|
202849
202849
|
} else {
|
|
202850
|
-
const
|
|
202850
|
+
const path3 = this.toPath(sourceFile);
|
|
202851
202851
|
if (this.generatedFilesMap) {
|
|
202852
202852
|
if (isGeneratedFileWatcher(this.generatedFilesMap)) {
|
|
202853
202853
|
Debug.fail(`${this.projectName} Expected to not have --out watcher for generated file with options: ${JSON.stringify(this.compilerOptions)}`);
|
|
202854
202854
|
return;
|
|
202855
202855
|
}
|
|
202856
|
-
if (this.generatedFilesMap.has(
|
|
202856
|
+
if (this.generatedFilesMap.has(path3)) return;
|
|
202857
202857
|
} else {
|
|
202858
202858
|
this.generatedFilesMap = /* @__PURE__ */ new Map();
|
|
202859
202859
|
}
|
|
202860
|
-
this.generatedFilesMap.set(
|
|
202860
|
+
this.generatedFilesMap.set(path3, this.createGeneratedFileWatcher(generatedFile));
|
|
202861
202861
|
}
|
|
202862
202862
|
}
|
|
202863
202863
|
createGeneratedFileWatcher(generatedFile) {
|
|
@@ -203257,7 +203257,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
203257
203257
|
isDefaultProjectForOpenFiles() {
|
|
203258
203258
|
return !!forEachEntry(
|
|
203259
203259
|
this.projectService.openFiles,
|
|
203260
|
-
(_projectRootPath,
|
|
203260
|
+
(_projectRootPath, path3) => this.projectService.tryGetDefaultProjectForFile(this.projectService.getScriptInfoForPath(path3)) === this
|
|
203261
203261
|
);
|
|
203262
203262
|
}
|
|
203263
203263
|
/** @internal */
|
|
@@ -204431,33 +204431,33 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
204431
204431
|
getCurrentDirectory: () => service.host.getCurrentDirectory(),
|
|
204432
204432
|
useCaseSensitiveFileNames: service.host.useCaseSensitiveFileNames
|
|
204433
204433
|
};
|
|
204434
|
-
function watchFile2(
|
|
204434
|
+
function watchFile2(path3, callback) {
|
|
204435
204435
|
return getOrCreateFileWatcher(
|
|
204436
204436
|
watchedFiles,
|
|
204437
|
-
|
|
204437
|
+
path3,
|
|
204438
204438
|
callback,
|
|
204439
|
-
(id) => ({ eventName: CreateFileWatcherEvent, data: { id, path:
|
|
204439
|
+
(id) => ({ eventName: CreateFileWatcherEvent, data: { id, path: path3 } })
|
|
204440
204440
|
);
|
|
204441
204441
|
}
|
|
204442
|
-
function watchDirectory(
|
|
204442
|
+
function watchDirectory(path3, callback, recursive) {
|
|
204443
204443
|
return getOrCreateFileWatcher(
|
|
204444
204444
|
recursive ? watchedDirectoriesRecursive : watchedDirectories,
|
|
204445
|
-
|
|
204445
|
+
path3,
|
|
204446
204446
|
callback,
|
|
204447
204447
|
(id) => ({
|
|
204448
204448
|
eventName: CreateDirectoryWatcherEvent,
|
|
204449
204449
|
data: {
|
|
204450
204450
|
id,
|
|
204451
|
-
path:
|
|
204451
|
+
path: path3,
|
|
204452
204452
|
recursive: !!recursive,
|
|
204453
204453
|
// Special case node_modules as we watch it for changes to closed script infos as well
|
|
204454
|
-
ignoreUpdate: !
|
|
204454
|
+
ignoreUpdate: !path3.endsWith("/node_modules") ? true : void 0
|
|
204455
204455
|
}
|
|
204456
204456
|
})
|
|
204457
204457
|
);
|
|
204458
204458
|
}
|
|
204459
|
-
function getOrCreateFileWatcher({ pathToId, idToCallbacks },
|
|
204460
|
-
const key = service.toPath(
|
|
204459
|
+
function getOrCreateFileWatcher({ pathToId, idToCallbacks }, path3, callback, event) {
|
|
204460
|
+
const key = service.toPath(path3);
|
|
204461
204461
|
let id = pathToId.get(key);
|
|
204462
204462
|
if (!id) pathToId.set(key, id = ids++);
|
|
204463
204463
|
let callbacks = idToCallbacks.get(id);
|
|
@@ -204626,13 +204626,13 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
204626
204626
|
return getNormalizedAbsolutePath(fileName, this.host.getCurrentDirectory());
|
|
204627
204627
|
}
|
|
204628
204628
|
/** @internal */
|
|
204629
|
-
setDocument(key,
|
|
204630
|
-
const info = Debug.checkDefined(this.getScriptInfoForPath(
|
|
204629
|
+
setDocument(key, path3, sourceFile) {
|
|
204630
|
+
const info = Debug.checkDefined(this.getScriptInfoForPath(path3));
|
|
204631
204631
|
info.cacheSourceFile = { key, sourceFile };
|
|
204632
204632
|
}
|
|
204633
204633
|
/** @internal */
|
|
204634
|
-
getDocument(key,
|
|
204635
|
-
const info = this.getScriptInfoForPath(
|
|
204634
|
+
getDocument(key, path3) {
|
|
204635
|
+
const info = this.getScriptInfoForPath(path3);
|
|
204636
204636
|
return info && info.cacheSourceFile && info.cacheSourceFile.key === key ? info.cacheSourceFile.sourceFile : void 0;
|
|
204637
204637
|
}
|
|
204638
204638
|
/** @internal */
|
|
@@ -204754,7 +204754,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
204754
204754
|
const event = {
|
|
204755
204755
|
eventName: ProjectsUpdatedInBackgroundEvent,
|
|
204756
204756
|
data: {
|
|
204757
|
-
openFiles: arrayFrom(this.openFiles.keys(), (
|
|
204757
|
+
openFiles: arrayFrom(this.openFiles.keys(), (path3) => this.getScriptInfoForPath(path3).fileName)
|
|
204758
204758
|
}
|
|
204759
204759
|
};
|
|
204760
204760
|
this.eventHandler(event);
|
|
@@ -204976,11 +204976,11 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
204976
204976
|
}
|
|
204977
204977
|
delayUpdateSourceInfoProjects(sourceInfos) {
|
|
204978
204978
|
if (sourceInfos) {
|
|
204979
|
-
sourceInfos.forEach((_value,
|
|
204979
|
+
sourceInfos.forEach((_value, path3) => this.delayUpdateProjectsOfScriptInfoPath(path3));
|
|
204980
204980
|
}
|
|
204981
204981
|
}
|
|
204982
|
-
delayUpdateProjectsOfScriptInfoPath(
|
|
204983
|
-
const info = this.getScriptInfoForPath(
|
|
204982
|
+
delayUpdateProjectsOfScriptInfoPath(path3) {
|
|
204983
|
+
const info = this.getScriptInfoForPath(path3);
|
|
204984
204984
|
if (info) {
|
|
204985
204985
|
this.delayUpdateProjectGraphs(
|
|
204986
204986
|
info.containingProjects,
|
|
@@ -205074,8 +205074,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205074
205074
|
const project = this.getConfiguredProjectByCanonicalConfigFilePath(projectCanonicalPath);
|
|
205075
205075
|
if (!project) return;
|
|
205076
205076
|
if (configuredProjectForConfig !== project && this.getHostPreferences().includeCompletionsForModuleExports) {
|
|
205077
|
-
const
|
|
205078
|
-
if (find((_a = project.getCurrentProgram()) == null ? void 0 : _a.getResolvedProjectReferences(), (ref) => (ref == null ? void 0 : ref.sourceFile.path) ===
|
|
205077
|
+
const path3 = this.toPath(configFileName);
|
|
205078
|
+
if (find((_a = project.getCurrentProgram()) == null ? void 0 : _a.getResolvedProjectReferences(), (ref) => (ref == null ? void 0 : ref.sourceFile.path) === path3)) {
|
|
205079
205079
|
project.markAutoImportProviderAsDirty();
|
|
205080
205080
|
}
|
|
205081
205081
|
}
|
|
@@ -205130,10 +205130,10 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205130
205130
|
});
|
|
205131
205131
|
return;
|
|
205132
205132
|
}
|
|
205133
|
-
const
|
|
205134
|
-
project.resolutionCache.removeResolutionsFromProjectReferenceRedirects(
|
|
205133
|
+
const path3 = this.toPath(canonicalConfigFilePath);
|
|
205134
|
+
project.resolutionCache.removeResolutionsFromProjectReferenceRedirects(path3);
|
|
205135
205135
|
this.delayUpdateProjectGraph(project);
|
|
205136
|
-
if (this.getHostPreferences().includeCompletionsForModuleExports && find((_c = project.getCurrentProgram()) == null ? void 0 : _c.getResolvedProjectReferences(), (ref) => (ref == null ? void 0 : ref.sourceFile.path) ===
|
|
205136
|
+
if (this.getHostPreferences().includeCompletionsForModuleExports && find((_c = project.getCurrentProgram()) == null ? void 0 : _c.getResolvedProjectReferences(), (ref) => (ref == null ? void 0 : ref.sourceFile.path) === path3)) {
|
|
205137
205137
|
project.markAutoImportProviderAsDirty();
|
|
205138
205138
|
}
|
|
205139
205139
|
}
|
|
@@ -205158,20 +205158,20 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205158
205158
|
canonicalConfigFilePath,
|
|
205159
205159
|
"Change in config file detected"
|
|
205160
205160
|
);
|
|
205161
|
-
this.openFiles.forEach((_projectRootPath,
|
|
205161
|
+
this.openFiles.forEach((_projectRootPath, path3) => {
|
|
205162
205162
|
var _a, _b;
|
|
205163
|
-
const configFileForOpenFile = this.configFileForOpenFiles.get(
|
|
205164
|
-
if (!((_a = configFileExistenceInfo.openFilesImpactedByConfigFile) == null ? void 0 : _a.has(
|
|
205165
|
-
this.configFileForOpenFiles.delete(
|
|
205166
|
-
const info = this.getScriptInfoForPath(
|
|
205163
|
+
const configFileForOpenFile = this.configFileForOpenFiles.get(path3);
|
|
205164
|
+
if (!((_a = configFileExistenceInfo.openFilesImpactedByConfigFile) == null ? void 0 : _a.has(path3))) return;
|
|
205165
|
+
this.configFileForOpenFiles.delete(path3);
|
|
205166
|
+
const info = this.getScriptInfoForPath(path3);
|
|
205167
205167
|
const newConfigFileNameForInfo = this.getConfigFileNameForFile(
|
|
205168
205168
|
info,
|
|
205169
205169
|
/*findFromCacheOnly*/
|
|
205170
205170
|
false
|
|
205171
205171
|
);
|
|
205172
205172
|
if (!newConfigFileNameForInfo) return;
|
|
205173
|
-
if (!((_b = this.pendingOpenFileProjectUpdates) == null ? void 0 : _b.has(
|
|
205174
|
-
(this.pendingOpenFileProjectUpdates ?? (this.pendingOpenFileProjectUpdates = /* @__PURE__ */ new Map())).set(
|
|
205173
|
+
if (!((_b = this.pendingOpenFileProjectUpdates) == null ? void 0 : _b.has(path3))) {
|
|
205174
|
+
(this.pendingOpenFileProjectUpdates ?? (this.pendingOpenFileProjectUpdates = /* @__PURE__ */ new Map())).set(path3, configFileForOpenFile);
|
|
205175
205175
|
}
|
|
205176
205176
|
});
|
|
205177
205177
|
this.delayEnsureProjectForOpenFiles();
|
|
@@ -205266,8 +205266,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205266
205266
|
return project;
|
|
205267
205267
|
}
|
|
205268
205268
|
assignOrphanScriptInfosToInferredProject() {
|
|
205269
|
-
this.openFiles.forEach((projectRootPath,
|
|
205270
|
-
const info = this.getScriptInfoForPath(
|
|
205269
|
+
this.openFiles.forEach((projectRootPath, path3) => {
|
|
205270
|
+
const info = this.getScriptInfoForPath(path3);
|
|
205271
205271
|
if (info.isOrphan()) {
|
|
205272
205272
|
this.assignOrphanScriptInfoToInferredProject(info, projectRootPath);
|
|
205273
205273
|
}
|
|
@@ -205579,8 +205579,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205579
205579
|
this.configuredProjects.forEach(printProjectWithoutFileNames);
|
|
205580
205580
|
this.inferredProjects.forEach(printProjectWithoutFileNames);
|
|
205581
205581
|
this.logger.info("Open files: ");
|
|
205582
|
-
this.openFiles.forEach((projectRootPath,
|
|
205583
|
-
const info = this.getScriptInfoForPath(
|
|
205582
|
+
this.openFiles.forEach((projectRootPath, path3) => {
|
|
205583
|
+
const info = this.getScriptInfoForPath(path3);
|
|
205584
205584
|
this.logger.info(` FileName: ${info.fileName} ProjectRootPath: ${projectRootPath}`);
|
|
205585
205585
|
this.logger.info(` Projects: ${info.containingProjects.map((p) => p.getProjectName())}`);
|
|
205586
205586
|
});
|
|
@@ -205906,12 +205906,12 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205906
205906
|
const newRootFile = propertyReader.getFileName(f);
|
|
205907
205907
|
const fileName = toNormalizedPath(newRootFile);
|
|
205908
205908
|
const isDynamic = isDynamicFileName(fileName);
|
|
205909
|
-
let
|
|
205909
|
+
let path3;
|
|
205910
205910
|
if (!isDynamic && !project.fileExists(newRootFile)) {
|
|
205911
|
-
|
|
205912
|
-
const existingValue = projectRootFilesMap.get(
|
|
205911
|
+
path3 = normalizedPathToPath(fileName, this.currentDirectory, this.toCanonicalFileName);
|
|
205912
|
+
const existingValue = projectRootFilesMap.get(path3);
|
|
205913
205913
|
if (existingValue) {
|
|
205914
|
-
if (((_a = existingValue.info) == null ? void 0 : _a.path) ===
|
|
205914
|
+
if (((_a = existingValue.info) == null ? void 0 : _a.path) === path3) {
|
|
205915
205915
|
project.removeFile(
|
|
205916
205916
|
existingValue.info,
|
|
205917
205917
|
/*fileExists*/
|
|
@@ -205923,7 +205923,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205923
205923
|
}
|
|
205924
205924
|
existingValue.fileName = fileName;
|
|
205925
205925
|
} else {
|
|
205926
|
-
projectRootFilesMap.set(
|
|
205926
|
+
projectRootFilesMap.set(path3, { fileName });
|
|
205927
205927
|
}
|
|
205928
205928
|
} else {
|
|
205929
205929
|
const scriptKind = propertyReader.getScriptKind(f, this.hostConfiguration.extraFileExtensions);
|
|
@@ -205937,8 +205937,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205937
205937
|
/*deferredDeleteOk*/
|
|
205938
205938
|
false
|
|
205939
205939
|
));
|
|
205940
|
-
|
|
205941
|
-
const existingValue = projectRootFilesMap.get(
|
|
205940
|
+
path3 = scriptInfo.path;
|
|
205941
|
+
const existingValue = projectRootFilesMap.get(path3);
|
|
205942
205942
|
if (!existingValue || existingValue.info !== scriptInfo) {
|
|
205943
205943
|
project.addRoot(scriptInfo, fileName);
|
|
205944
205944
|
if (scriptInfo.isScriptOpen()) {
|
|
@@ -205948,11 +205948,11 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205948
205948
|
existingValue.fileName = fileName;
|
|
205949
205949
|
}
|
|
205950
205950
|
}
|
|
205951
|
-
newRootScriptInfoMap.set(
|
|
205951
|
+
newRootScriptInfoMap.set(path3, true);
|
|
205952
205952
|
}
|
|
205953
205953
|
if (projectRootFilesMap.size > newRootScriptInfoMap.size) {
|
|
205954
|
-
projectRootFilesMap.forEach((value,
|
|
205955
|
-
if (!newRootScriptInfoMap.has(
|
|
205954
|
+
projectRootFilesMap.forEach((value, path3) => {
|
|
205955
|
+
if (!newRootScriptInfoMap.has(path3)) {
|
|
205956
205956
|
if (value.info) {
|
|
205957
205957
|
project.removeFile(
|
|
205958
205958
|
value.info,
|
|
@@ -205961,7 +205961,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
205961
205961
|
true
|
|
205962
205962
|
);
|
|
205963
205963
|
} else {
|
|
205964
|
-
projectRootFilesMap.delete(
|
|
205964
|
+
projectRootFilesMap.delete(path3);
|
|
205965
205965
|
}
|
|
205966
205966
|
}
|
|
205967
205967
|
});
|
|
@@ -206198,8 +206198,8 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
206198
206198
|
}
|
|
206199
206199
|
/** @internal */
|
|
206200
206200
|
getScriptInfoOrConfig(uncheckedFileName) {
|
|
206201
|
-
const
|
|
206202
|
-
const info = this.getScriptInfoForNormalizedPath(
|
|
206201
|
+
const path3 = toNormalizedPath(uncheckedFileName);
|
|
206202
|
+
const info = this.getScriptInfoForNormalizedPath(path3);
|
|
206203
206203
|
if (info) return info;
|
|
206204
206204
|
const configProject = this.configuredProjects.get(this.toPath(uncheckedFileName));
|
|
206205
206205
|
return configProject && configProject.getCompilerOptions().configFile;
|
|
@@ -206211,7 +206211,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
206211
206211
|
this.filenameToScriptInfo.entries(),
|
|
206212
206212
|
(entry) => entry[1].deferredDelete ? void 0 : entry
|
|
206213
206213
|
),
|
|
206214
|
-
([
|
|
206214
|
+
([path3, scriptInfo]) => ({ path: path3, fileName: scriptInfo.fileName })
|
|
206215
206215
|
);
|
|
206216
206216
|
this.logger.msg(
|
|
206217
206217
|
`Could not find file ${JSON.stringify(fileName)}.
|
|
@@ -206243,7 +206243,7 @@ All files are: ${JSON.stringify(names)}`,
|
|
|
206243
206243
|
if (!projects) {
|
|
206244
206244
|
projects = createMultiMap();
|
|
206245
206245
|
projects.add(toAddInfo.path, project);
|
|
206246
|
-
} else if (!forEachEntry(projects, (projs,
|
|
206246
|
+
} else if (!forEachEntry(projects, (projs, path3) => path3 === toAddInfo.path ? false : contains(projs, project))) {
|
|
206247
206247
|
projects.add(toAddInfo.path, project);
|
|
206248
206248
|
}
|
|
206249
206249
|
}
|
|
@@ -206405,8 +206405,8 @@ All files are: ${JSON.stringify(names)}`,
|
|
|
206405
206405
|
}
|
|
206406
206406
|
getOrCreateScriptInfoWorker(fileName, currentDirectory, openedByClient, fileContent, scriptKind, hasMixedContent, hostToQueryFileExistsOn, deferredDeleteOk) {
|
|
206407
206407
|
Debug.assert(fileContent === void 0 || openedByClient, "ScriptInfo needs to be opened by client to be able to set its user defined content");
|
|
206408
|
-
const
|
|
206409
|
-
let info = this.filenameToScriptInfo.get(
|
|
206408
|
+
const path3 = normalizedPathToPath(fileName, currentDirectory, this.toCanonicalFileName);
|
|
206409
|
+
let info = this.filenameToScriptInfo.get(path3);
|
|
206410
206410
|
if (!info) {
|
|
206411
206411
|
const isDynamic = isDynamicFileName(fileName);
|
|
206412
206412
|
Debug.assert(isRootedDiskPath(fileName) || isDynamic || openedByClient, "", () => `${JSON.stringify({ fileName, currentDirectory, hostCurrentDirectory: this.currentDirectory, openKeys: arrayFrom(this.openFilesWithNonRootedDiskPath.keys()) })}
|
|
@@ -206418,7 +206418,7 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
206418
206418
|
if (!openedByClient && !isDynamic && !(hostToQueryFileExistsOn || this.host).fileExists(fileName)) {
|
|
206419
206419
|
return;
|
|
206420
206420
|
}
|
|
206421
|
-
info = new ScriptInfo(this.host, fileName, scriptKind, hasMixedContent,
|
|
206421
|
+
info = new ScriptInfo(this.host, fileName, scriptKind, hasMixedContent, path3, this.filenameToScriptInfoVersion.get(path3));
|
|
206422
206422
|
this.filenameToScriptInfo.set(info.path, info);
|
|
206423
206423
|
this.filenameToScriptInfoVersion.delete(info.path);
|
|
206424
206424
|
if (!openedByClient) {
|
|
@@ -206565,9 +206565,9 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
206565
206565
|
getSourceFileLike(fileName, projectNameOrProject, declarationInfo) {
|
|
206566
206566
|
const project = projectNameOrProject.projectName ? projectNameOrProject : this.findProject(projectNameOrProject);
|
|
206567
206567
|
if (project) {
|
|
206568
|
-
const
|
|
206569
|
-
const sourceFile = project.getSourceFile(
|
|
206570
|
-
if (sourceFile && sourceFile.resolvedPath ===
|
|
206568
|
+
const path3 = project.toPath(fileName);
|
|
206569
|
+
const sourceFile = project.getSourceFile(path3);
|
|
206570
|
+
if (sourceFile && sourceFile.resolvedPath === path3) return sourceFile;
|
|
206571
206571
|
}
|
|
206572
206572
|
const info = this.getOrCreateScriptInfoNotOpenedByClient(
|
|
206573
206573
|
fileName,
|
|
@@ -206733,8 +206733,8 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
206733
206733
|
}
|
|
206734
206734
|
});
|
|
206735
206735
|
});
|
|
206736
|
-
this.openFiles.forEach((_projectRootPath,
|
|
206737
|
-
const info = this.getScriptInfoForPath(
|
|
206736
|
+
this.openFiles.forEach((_projectRootPath, path3) => {
|
|
206737
|
+
const info = this.getScriptInfoForPath(path3);
|
|
206738
206738
|
if (find(info.containingProjects, isExternalProject)) return;
|
|
206739
206739
|
this.tryFindDefaultConfiguredProjectAndLoadAncestorsForOpenScriptInfo(
|
|
206740
206740
|
info,
|
|
@@ -206787,14 +206787,14 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
206787
206787
|
const pendingOpenFileProjectUpdates = this.pendingOpenFileProjectUpdates;
|
|
206788
206788
|
this.pendingOpenFileProjectUpdates = void 0;
|
|
206789
206789
|
pendingOpenFileProjectUpdates == null ? void 0 : pendingOpenFileProjectUpdates.forEach(
|
|
206790
|
-
(_config,
|
|
206791
|
-
this.getScriptInfoForPath(
|
|
206790
|
+
(_config, path3) => this.tryFindDefaultConfiguredProjectAndLoadAncestorsForOpenScriptInfo(
|
|
206791
|
+
this.getScriptInfoForPath(path3),
|
|
206792
206792
|
5
|
|
206793
206793
|
/* Create */
|
|
206794
206794
|
)
|
|
206795
206795
|
);
|
|
206796
|
-
this.openFiles.forEach((projectRootPath,
|
|
206797
|
-
const info = this.getScriptInfoForPath(
|
|
206796
|
+
this.openFiles.forEach((projectRootPath, path3) => {
|
|
206797
|
+
const info = this.getScriptInfoForPath(path3);
|
|
206798
206798
|
if (info.isOrphan()) {
|
|
206799
206799
|
this.assignOrphanScriptInfoToInferredProject(info, projectRootPath);
|
|
206800
206800
|
} else {
|
|
@@ -207305,9 +207305,9 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
207305
207305
|
}
|
|
207306
207306
|
});
|
|
207307
207307
|
if (!toRemoveConfiguredProjects.size) return toRemoveConfiguredProjects;
|
|
207308
|
-
forEachEntry(this.openFiles, (_projectRootPath,
|
|
207309
|
-
if (openFilesWithRetainedConfiguredProject == null ? void 0 : openFilesWithRetainedConfiguredProject.has(
|
|
207310
|
-
const info = this.getScriptInfoForPath(
|
|
207308
|
+
forEachEntry(this.openFiles, (_projectRootPath, path3) => {
|
|
207309
|
+
if (openFilesWithRetainedConfiguredProject == null ? void 0 : openFilesWithRetainedConfiguredProject.has(path3)) return;
|
|
207310
|
+
const info = this.getScriptInfoForPath(path3);
|
|
207311
207311
|
if (find(info.containingProjects, isExternalProject)) return;
|
|
207312
207312
|
const result = this.tryFindDefaultConfiguredProjectAndLoadAncestorsForOpenScriptInfo(
|
|
207313
207313
|
info,
|
|
@@ -207356,8 +207356,8 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
207356
207356
|
sourceInfos = info.sourceMapFilePath.sourceInfos;
|
|
207357
207357
|
}
|
|
207358
207358
|
if (!sourceInfos) return;
|
|
207359
|
-
if (!forEachKey(sourceInfos, (
|
|
207360
|
-
const info2 = this.getScriptInfoForPath(
|
|
207359
|
+
if (!forEachKey(sourceInfos, (path3) => {
|
|
207360
|
+
const info2 = this.getScriptInfoForPath(path3);
|
|
207361
207361
|
return !!info2 && (info2.isScriptOpen() || !info2.isOrphan());
|
|
207362
207362
|
})) {
|
|
207363
207363
|
return;
|
|
@@ -207381,7 +207381,7 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
207381
207381
|
sourceInfos = info.sourceMapFilePath.sourceInfos;
|
|
207382
207382
|
}
|
|
207383
207383
|
if (sourceInfos) {
|
|
207384
|
-
sourceInfos.forEach((_value,
|
|
207384
|
+
sourceInfos.forEach((_value, path3) => toRemoveScriptInfos.delete(path3));
|
|
207385
207385
|
}
|
|
207386
207386
|
}
|
|
207387
207387
|
});
|
|
@@ -207864,9 +207864,9 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
207864
207864
|
}
|
|
207865
207865
|
);
|
|
207866
207866
|
}
|
|
207867
|
-
watchPackageJsonFile(file,
|
|
207867
|
+
watchPackageJsonFile(file, path3, project) {
|
|
207868
207868
|
Debug.assert(project !== void 0);
|
|
207869
|
-
let result = (this.packageJsonFilesMap ?? (this.packageJsonFilesMap = /* @__PURE__ */ new Map())).get(
|
|
207869
|
+
let result = (this.packageJsonFilesMap ?? (this.packageJsonFilesMap = /* @__PURE__ */ new Map())).get(path3);
|
|
207870
207870
|
if (!result) {
|
|
207871
207871
|
let watcher = this.watchFactory.watchFile(
|
|
207872
207872
|
file,
|
|
@@ -207874,11 +207874,11 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
207874
207874
|
switch (eventKind) {
|
|
207875
207875
|
case 0:
|
|
207876
207876
|
case 1:
|
|
207877
|
-
this.packageJsonCache.addOrUpdate(fileName,
|
|
207877
|
+
this.packageJsonCache.addOrUpdate(fileName, path3);
|
|
207878
207878
|
this.onPackageJsonChange(result);
|
|
207879
207879
|
break;
|
|
207880
207880
|
case 2:
|
|
207881
|
-
this.packageJsonCache.delete(
|
|
207881
|
+
this.packageJsonCache.delete(path3);
|
|
207882
207882
|
this.onPackageJsonChange(result);
|
|
207883
207883
|
result.projects.clear();
|
|
207884
207884
|
result.close();
|
|
@@ -207895,11 +207895,11 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
207895
207895
|
if (result.projects.size || !watcher) return;
|
|
207896
207896
|
watcher.close();
|
|
207897
207897
|
watcher = void 0;
|
|
207898
|
-
(_a = this.packageJsonFilesMap) == null ? void 0 : _a.delete(
|
|
207899
|
-
this.packageJsonCache.invalidate(
|
|
207898
|
+
(_a = this.packageJsonFilesMap) == null ? void 0 : _a.delete(path3);
|
|
207899
|
+
this.packageJsonCache.invalidate(path3);
|
|
207900
207900
|
}
|
|
207901
207901
|
};
|
|
207902
|
-
this.packageJsonFilesMap.set(
|
|
207902
|
+
this.packageJsonFilesMap.set(path3, result);
|
|
207903
207903
|
}
|
|
207904
207904
|
result.projects.add(project);
|
|
207905
207905
|
(project.packageJsonWatches ?? (project.packageJsonWatches = /* @__PURE__ */ new Set())).add(result);
|
|
@@ -208089,14 +208089,14 @@ Dynamic files must always be opened with service's current directory or service
|
|
|
208089
208089
|
);
|
|
208090
208090
|
}
|
|
208091
208091
|
};
|
|
208092
|
-
function addOrUpdate(fileName,
|
|
208092
|
+
function addOrUpdate(fileName, path3) {
|
|
208093
208093
|
const packageJsonInfo = Debug.checkDefined(createPackageJsonInfo(fileName, host.host));
|
|
208094
|
-
packageJsons.set(
|
|
208095
|
-
directoriesWithoutPackageJson.delete(getDirectoryPath(
|
|
208094
|
+
packageJsons.set(path3, packageJsonInfo);
|
|
208095
|
+
directoriesWithoutPackageJson.delete(getDirectoryPath(path3));
|
|
208096
208096
|
}
|
|
208097
|
-
function invalidate(
|
|
208098
|
-
packageJsons.delete(
|
|
208099
|
-
directoriesWithoutPackageJson.delete(getDirectoryPath(
|
|
208097
|
+
function invalidate(path3) {
|
|
208098
|
+
packageJsons.delete(path3);
|
|
208099
|
+
directoriesWithoutPackageJson.delete(getDirectoryPath(path3));
|
|
208100
208100
|
}
|
|
208101
208101
|
function directoryHasPackageJson(directory) {
|
|
208102
208102
|
return packageJsons.has(combinePaths(directory, "package.json")) ? -1 : directoriesWithoutPackageJson.has(directory) ? 0 : 3;
|
|
@@ -208293,8 +208293,8 @@ ${json}${newLine}`;
|
|
|
208293
208293
|
function combineProjectOutput(defaultValue, getValue, projects, action) {
|
|
208294
208294
|
const outputs = flatMapToMutable(isArray(projects) ? projects : projects.projects, (project) => action(project, defaultValue));
|
|
208295
208295
|
if (!isArray(projects) && projects.symLinkedProjects) {
|
|
208296
|
-
projects.symLinkedProjects.forEach((projects2,
|
|
208297
|
-
const value = getValue(
|
|
208296
|
+
projects.symLinkedProjects.forEach((projects2, path3) => {
|
|
208297
|
+
const value = getValue(path3);
|
|
208298
208298
|
outputs.push(...flatMap(projects2, (project) => action(project, value)));
|
|
208299
208299
|
});
|
|
208300
208300
|
}
|
|
@@ -208440,9 +208440,9 @@ ${json}${newLine}`;
|
|
|
208440
208440
|
});
|
|
208441
208441
|
return results.filter((o) => o.references.length !== 0);
|
|
208442
208442
|
}
|
|
208443
|
-
function forEachProjectInProjects(projects,
|
|
208443
|
+
function forEachProjectInProjects(projects, path3, cb) {
|
|
208444
208444
|
for (const project of isArray(projects) ? projects : projects.projects) {
|
|
208445
|
-
cb(project,
|
|
208445
|
+
cb(project, path3);
|
|
208446
208446
|
}
|
|
208447
208447
|
if (!isArray(projects) && projects.symLinkedProjects) {
|
|
208448
208448
|
projects.symLinkedProjects.forEach((symlinkedProjects, symlinkedPath) => {
|
|
@@ -208456,8 +208456,8 @@ ${json}${newLine}`;
|
|
|
208456
208456
|
const resultsMap = /* @__PURE__ */ new Map();
|
|
208457
208457
|
const queue = createQueue();
|
|
208458
208458
|
queue.enqueue({ project: defaultProject, location: initialLocation });
|
|
208459
|
-
forEachProjectInProjects(projects, initialLocation.fileName, (project,
|
|
208460
|
-
const location = { fileName:
|
|
208459
|
+
forEachProjectInProjects(projects, initialLocation.fileName, (project, path3) => {
|
|
208460
|
+
const location = { fileName: path3, pos: initialLocation.pos };
|
|
208461
208461
|
queue.enqueue({ project, location });
|
|
208462
208462
|
});
|
|
208463
208463
|
const projectService = defaultProject.projectService;
|
|
@@ -210299,8 +210299,8 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
210299
210299
|
nodeModulesPathParts.packageRootIndex
|
|
210300
210300
|
);
|
|
210301
210301
|
const packageName = getPackageNameFromTypesPackageName(unmangleScopedPackageName(packageNamePathPart));
|
|
210302
|
-
const
|
|
210303
|
-
if (entrypoints && some(entrypoints, (e) => project.toPath(e) ===
|
|
210302
|
+
const path3 = project.toPath(fileName);
|
|
210303
|
+
if (entrypoints && some(entrypoints, (e) => project.toPath(e) === path3)) {
|
|
210304
210304
|
return (_b = auxiliaryProject.resolutionCache.resolveSingleModuleNameWithoutWatching(packageName, resolveFromFile).resolvedModule) == null ? void 0 : _b.resolvedFileName;
|
|
210305
210305
|
} else {
|
|
210306
210306
|
const pathToFileInPackage = fileName.substring(nodeModulesPathParts.packageRootIndex + 1);
|
|
@@ -211080,7 +211080,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
211080
211080
|
}
|
|
211081
211081
|
return combineProjectOutput(
|
|
211082
211082
|
info,
|
|
211083
|
-
(
|
|
211083
|
+
(path3) => this.projectService.getScriptInfoForPath(path3),
|
|
211084
211084
|
projects,
|
|
211085
211085
|
(project, info2) => {
|
|
211086
211086
|
if (!project.compileOnSaveEnabled || !project.languageServiceEnabled || project.isOrphan()) {
|
|
@@ -211107,7 +211107,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
|
|
|
211107
211107
|
return args.richResponse ? { emitSkipped: true, diagnostics: [] } : false;
|
|
211108
211108
|
}
|
|
211109
211109
|
const scriptInfo = project.getScriptInfo(file);
|
|
211110
|
-
const { emitSkipped, diagnostics } = project.emitFile(scriptInfo, (
|
|
211110
|
+
const { emitSkipped, diagnostics } = project.emitFile(scriptInfo, (path3, data, writeByteOrderMark) => this.host.writeFile(path3, data, writeByteOrderMark));
|
|
211111
211111
|
return args.richResponse ? {
|
|
211112
211112
|
emitSkipped,
|
|
211113
211113
|
diagnostics: args.includeLinePosition ? this.convertToDiagnosticsWithLinePositionFromDiagnosticFile(diagnostics) : diagnostics.map((d) => formatDiagnosticToProtocol(
|
|
@@ -213047,11 +213047,12 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
|
|
|
213047
213047
|
});
|
|
213048
213048
|
|
|
213049
213049
|
// package.json
|
|
213050
|
-
var version = "0.5.
|
|
213050
|
+
var version = "0.5.9";
|
|
213051
213051
|
|
|
213052
213052
|
// src/index.ts
|
|
213053
213053
|
var import_generator_helper = require("@prisma/generator-helper");
|
|
213054
213054
|
var import_typescript = __toESM(require_typescript());
|
|
213055
|
+
var import_path2 = __toESM(require("path"));
|
|
213055
213056
|
|
|
213056
213057
|
// src/config.ts
|
|
213057
213058
|
var import_zod = require("zod");
|
|
@@ -213252,8 +213253,42 @@ var getZodConstructor = (field, getRelatedModelName = (name) => name.toString(),
|
|
|
213252
213253
|
// src/generator.ts
|
|
213253
213254
|
var parseNativeTypes = (schemaPath) => {
|
|
213254
213255
|
var _a;
|
|
213255
|
-
|
|
213256
|
-
|
|
213256
|
+
let schemaContent = "";
|
|
213257
|
+
let resolvedPath = schemaPath;
|
|
213258
|
+
try {
|
|
213259
|
+
if (!(0, import_fs.existsSync)(resolvedPath)) {
|
|
213260
|
+
const withFile = import_path.default.join(schemaPath, "schema.prisma");
|
|
213261
|
+
const parentDir = import_path.default.dirname(schemaPath);
|
|
213262
|
+
if ((0, import_fs.existsSync)(withFile)) {
|
|
213263
|
+
resolvedPath = withFile;
|
|
213264
|
+
} else if ((0, import_fs.existsSync)(parentDir)) {
|
|
213265
|
+
resolvedPath = parentDir;
|
|
213266
|
+
} else {
|
|
213267
|
+
console.warn(`Schema path not found: ${schemaPath}`);
|
|
213268
|
+
return /* @__PURE__ */ new Map();
|
|
213269
|
+
}
|
|
213270
|
+
}
|
|
213271
|
+
const stat = (0, import_fs.statSync)(resolvedPath);
|
|
213272
|
+
if (stat.isFile()) {
|
|
213273
|
+
schemaContent = (0, import_fs.readFileSync)(resolvedPath, "utf-8");
|
|
213274
|
+
} else if (stat.isDirectory()) {
|
|
213275
|
+
const prismaFiles = findPrismaFiles(resolvedPath);
|
|
213276
|
+
if (prismaFiles.length === 0) {
|
|
213277
|
+
console.warn(`No .prisma files found in ${resolvedPath}`);
|
|
213278
|
+
return /* @__PURE__ */ new Map();
|
|
213279
|
+
}
|
|
213280
|
+
prismaFiles.forEach((filePath) => {
|
|
213281
|
+
schemaContent += (0, import_fs.readFileSync)(filePath, "utf-8") + "\n";
|
|
213282
|
+
});
|
|
213283
|
+
}
|
|
213284
|
+
} catch (error) {
|
|
213285
|
+
console.error(`Error reading schema path: ${schemaPath}`, error);
|
|
213286
|
+
return /* @__PURE__ */ new Map();
|
|
213287
|
+
}
|
|
213288
|
+
if (!schemaContent) {
|
|
213289
|
+
console.warn(`No schema content found at ${schemaPath}`);
|
|
213290
|
+
return /* @__PURE__ */ new Map();
|
|
213291
|
+
}
|
|
213257
213292
|
const nativeTypes = /* @__PURE__ */ new Map();
|
|
213258
213293
|
const modelRegex = /model\s+(\w+)\s*\{([^}]+)\}/g;
|
|
213259
213294
|
const fieldRegex = /(\w+)\s+(\w+(?:\[\])?)\s+([^;\n]+)/g;
|
|
@@ -213277,6 +213312,28 @@ var parseNativeTypes = (schemaPath) => {
|
|
|
213277
213312
|
}
|
|
213278
213313
|
return nativeTypes;
|
|
213279
213314
|
};
|
|
213315
|
+
var findPrismaFiles = (dir) => {
|
|
213316
|
+
const prismaFiles = [];
|
|
213317
|
+
try {
|
|
213318
|
+
const files = (0, import_fs.readdirSync)(dir);
|
|
213319
|
+
files.forEach((file) => {
|
|
213320
|
+
const fullPath = import_path.default.join(dir, file);
|
|
213321
|
+
try {
|
|
213322
|
+
const stat = (0, import_fs.statSync)(fullPath);
|
|
213323
|
+
if (stat.isDirectory() && !file.startsWith(".")) {
|
|
213324
|
+
prismaFiles.push(...findPrismaFiles(fullPath));
|
|
213325
|
+
} else if (file.endsWith(".prisma")) {
|
|
213326
|
+
prismaFiles.push(fullPath);
|
|
213327
|
+
}
|
|
213328
|
+
} catch (error) {
|
|
213329
|
+
console.warn(`Could not read ${fullPath}`);
|
|
213330
|
+
}
|
|
213331
|
+
});
|
|
213332
|
+
} catch (error) {
|
|
213333
|
+
console.error(`Error reading directory ${dir}`);
|
|
213334
|
+
}
|
|
213335
|
+
return prismaFiles;
|
|
213336
|
+
};
|
|
213280
213337
|
var writeImportsForModel = (model, sourceFile, config, { schemaPath, outputPath, clientPath }) => {
|
|
213281
213338
|
const { relatedModelName } = useModelNames(config);
|
|
213282
213339
|
const importList = [
|
|
@@ -213287,11 +213344,12 @@ var writeImportsForModel = (model, sourceFile, config, { schemaPath, outputPath,
|
|
|
213287
213344
|
}
|
|
213288
213345
|
];
|
|
213289
213346
|
if (config.imports) {
|
|
213347
|
+
const baseDir = schemaPath.endsWith(".prisma") ? import_path.default.dirname(schemaPath) : schemaPath;
|
|
213290
213348
|
importList.push({
|
|
213291
213349
|
kind: import_ts_morph.StructureKind.ImportDeclaration,
|
|
213292
213350
|
namespaceImport: "imports",
|
|
213293
213351
|
moduleSpecifier: dotSlash(
|
|
213294
|
-
import_path.default.relative(outputPath, import_path.default.resolve(
|
|
213352
|
+
import_path.default.relative(outputPath, import_path.default.resolve(baseDir, config.imports))
|
|
213295
213353
|
)
|
|
213296
213354
|
});
|
|
213297
213355
|
}
|
|
@@ -213369,8 +213427,7 @@ var writeTypeSpecificSchemas = (model, sourceFile, config, _prismaOptions) => {
|
|
|
213369
213427
|
};
|
|
213370
213428
|
var generateSchemaForModel = (model, sourceFile, config, { schemaPath }) => {
|
|
213371
213429
|
const { modelName } = useModelNames(config);
|
|
213372
|
-
const
|
|
213373
|
-
const nativeTypes = parseNativeTypes(actualSchemaPath);
|
|
213430
|
+
const nativeTypes = parseNativeTypes(schemaPath);
|
|
213374
213431
|
const modelNativeTypes = nativeTypes.get(model.name) || /* @__PURE__ */ new Map();
|
|
213375
213432
|
sourceFile.addVariableStatement({
|
|
213376
213433
|
declarationKind: import_ts_morph.VariableDeclarationKind.Const,
|
|
@@ -213444,11 +213501,11 @@ var populateModelFile = (model, sourceFile, config, prismaOptions) => {
|
|
|
213444
213501
|
generateRelatedSchemaForModel(model, sourceFile, config, prismaOptions);
|
|
213445
213502
|
};
|
|
213446
213503
|
var generateBarrelFile = (models, indexFile) => {
|
|
213447
|
-
models.forEach(
|
|
213448
|
-
|
|
213504
|
+
models.forEach((model) => {
|
|
213505
|
+
indexFile.addExportDeclaration({
|
|
213449
213506
|
moduleSpecifier: `./${model.name.toLowerCase()}`
|
|
213450
|
-
})
|
|
213451
|
-
);
|
|
213507
|
+
});
|
|
213508
|
+
});
|
|
213452
213509
|
};
|
|
213453
213510
|
|
|
213454
213511
|
// src/index.ts
|
|
@@ -213464,7 +213521,8 @@ var import_ts_morph2 = require("ts-morph");
|
|
|
213464
213521
|
onGenerate(options) {
|
|
213465
213522
|
const project = new import_ts_morph2.Project();
|
|
213466
213523
|
const models = [...options.dmmf.datamodel.models];
|
|
213467
|
-
const
|
|
213524
|
+
const schemaPath = options.schemaPath;
|
|
213525
|
+
const schemaDir = import_path2.default.dirname(schemaPath);
|
|
213468
213526
|
const outputPath = options.generator.output.value;
|
|
213469
213527
|
const clientPath = options.otherGenerators.find(
|
|
213470
213528
|
(each) => each.provider.value === "prisma-client-js"
|
|
@@ -213478,7 +213536,8 @@ var import_ts_morph2 = require("ts-morph");
|
|
|
213478
213536
|
const prismaOptions = {
|
|
213479
213537
|
clientPath,
|
|
213480
213538
|
outputPath,
|
|
213481
|
-
schemaPath
|
|
213539
|
+
schemaPath: schemaDir
|
|
213540
|
+
// Pass the directory, not the file
|
|
213482
213541
|
};
|
|
213483
213542
|
const indexFile = project.createSourceFile(
|
|
213484
213543
|
`${outputPath}/index.ts`,
|