@spyglassmc/core 0.4.0 → 0.4.1

package/lib/processor/linter/builtin.js

@@ -28,7 +28,7 @@ export function nameConvention(key) {
 export const quote = (node, ctx) => {
     const config = ctx.ruleValue;
     const mustValueBeQuoted = node.options.unquotable
-        ? [...node.value].some(c => !isAllowedCharacter(c, node.options.unquotable))
+        ? [...node.value].some((c) => !isAllowedCharacter(c, node.options.unquotable))
         : true;
     const isQuoteRequired = config.always || mustValueBeQuoted;
     const isQuoteProhibited = config.always === false && !mustValueBeQuoted;
@@ -66,8 +66,7 @@ export var configValidator;
             new RegExp(val);
         }
         catch (e) {
-            logger.error(wrapError(name, localize('') // FIXME
-            ), e);
+            logger.error(wrapError(name, localize('')), e);
             return false;
         }
         return true;
@@ -82,27 +81,27 @@ export function registerLinters(meta) {
     meta.registerLinter('nameOfObjective', {
         configValidator: configValidator.nameConvention,
         linter: nameConvention('value'),
-        nodePredicate: n => n.symbol && n.symbol.category === 'objective',
+        nodePredicate: (n) => n.symbol && n.symbol.category === 'objective',
     });
     meta.registerLinter('nameOfScoreHolder', {
         configValidator: configValidator.nameConvention,
         linter: nameConvention('value'),
-        nodePredicate: n => n.symbol && n.symbol.category === 'score_holder',
+        nodePredicate: (n) => n.symbol && n.symbol.category === 'score_holder',
     });
     meta.registerLinter('nameOfTag', {
         configValidator: configValidator.nameConvention,
         linter: nameConvention('value'),
-        nodePredicate: n => n.symbol && n.symbol.category === 'tag',
+        nodePredicate: (n) => n.symbol && n.symbol.category === 'tag',
     });
     meta.registerLinter('nameOfTeam', {
         configValidator: configValidator.nameConvention,
         linter: nameConvention('value'),
-        nodePredicate: n => n.symbol && n.symbol.category === 'team',
+        nodePredicate: (n) => n.symbol && n.symbol.category === 'team',
     });
     meta.registerLinter('undeclaredSymbol', {
         configValidator: configValidator.symbolLinterConfig,
         linter: undeclaredSymbol,
-        nodePredicate: n => n.symbol && !McdocCategories.includes(n.symbol.category),
+        nodePredicate: (n) => n.symbol && !McdocCategories.includes(n.symbol.category),
     });
 }
 //# sourceMappingURL=builtin.js.map

package/lib/service/CacheService.js

@@ -36,7 +36,8 @@ export class CacheService {
             }
             try {
                 // TODO: Don't update this for every single change.
-                this.checksums.files[doc.uri] = await this.project.externals.crypto.getSha1(doc.getText());
+                this.checksums.files[doc.uri] =
+                    await this.project.externals.crypto.getSha1(doc.getText());
             }
             catch (e) {
                 if (!this.project.externals.error.isKind(e, 'EISDIR')) {
@@ -75,7 +76,7 @@ export class CacheService {
      * @returns `${cacheRoot}symbols/${sha1(projectRoot)}.json`
      */
     async getCacheFileUri() {
-        return this.#cacheFilePath ??= new Uri(`symbols/${await this.project.externals.crypto.getSha1(this.project.projectRoot)}.json.gz`, this.cacheRoot).toString();
+        return (this.#cacheFilePath ??= new Uri(`symbols/${await this.project.externals.crypto.getSha1(this.project.projectRoot)}.json.gz`, this.cacheRoot).toString());
     }
     async load() {
         const __profiler = this.project.profilers.get('cache#load');
@@ -84,7 +85,7 @@ export class CacheService {
         try {
             filePath = await this.getCacheFileUri();
             this.project.logger.info(`[CacheService#load] symbolCachePath = “${filePath}”`);
-            const cache = await fileUtil.readGzippedJson(this.project.externals, filePath);
+            const cache = (await fileUtil.readGzippedJson(this.project.externals, filePath));
             __profiler.task('Read File');
             if (cache.version === LatestCacheVersion) {
                 this.checksums = cache.checksums;
@@ -127,7 +128,7 @@ export class CacheService {
             }
         }
         for (const [uri, checksum] of Object.entries(this.checksums.files)) {
-            if (unchangedRoots.some(root => uri.startsWith(root))) {
+            if (unchangedRoots.some((root) => uri.startsWith(root))) {
                 ans.unchangedFiles.push(uri);
                 continue;
             }
@@ -141,7 +142,8 @@ export class CacheService {
                 }
             }
             catch (e) {
-                if (this.project.externals.error.isKind(e, 'ENOENT') || this.project.externals.error.isKind(e, 'EISDIR')) {
+                if (this.project.externals.error.isKind(e, 'ENOENT') ||
+                    this.project.externals.error.isKind(e, 'EISDIR')) {
                     ans.removedFiles.push(uri);
                 }
                 else {
@@ -185,7 +187,8 @@ export class CacheService {
         return false;
     }
     async hasFileChangedSinceCache(doc) {
-        return this.checksums.files[doc.uri] !== await this.project.externals.crypto.getSha1(doc.getText());
+        return (this.checksums.files[doc.uri] !==
+            (await this.project.externals.crypto.getSha1(doc.getText())));
     }
     reset() {
         this.#hasValidatedFiles = false;

package/lib/service/Config.d.ts

@@ -189,8 +189,8 @@ export declare namespace SymbolLinterConfig {
     }
 }
 /**
-* Config which simulates the default vanilla command system.
-*/
+ * Config which simulates the default vanilla command system.
+ */
 export declare const VanillaConfig: Config;
 declare type ConfigEvent = {
     config: Config;

package/lib/service/Config.js

@@ -4,10 +4,10 @@ import { FileCategories, RegistryCategories } from '../symbol/index.js';
 export var LinterSeverity;
 (function (LinterSeverity) {
     function is(value) {
-        return value === 'hint' ||
+        return (value === 'hint' ||
             value === 'information' ||
             value === 'warning' ||
-            value === 'error';
+            value === 'error');
     }
     LinterSeverity.is = is;
     function toErrorSeverity(value) {
@@ -64,7 +64,8 @@ export var SymbolLinterConfig;
             const value = v;
             return ((value.if === undefined || Arrayable.is(value.if, Condition.is)) &&
                 (value.then === undefined || Action.is(value.then)) &&
-                (value.override === undefined || Arrayable.is(value.override, Complex.is)));
+                (value.override === undefined ||
+                    Arrayable.is(value.override, Complex.is)));
         }
         Complex.is = is;
     })(Complex = SymbolLinterConfig.Complex || (SymbolLinterConfig.Complex = {}));
@@ -75,22 +76,29 @@ export var SymbolLinterConfig;
                 return false;
             }
             const value = v;
-            return ((value.category === undefined || Arrayable.is(value.category, TypePredicates.isString)) &&
-                (value.pattern === undefined || Arrayable.is(value.pattern, TypePredicates.isString)) &&
-                (value.excludePattern === undefined || Arrayable.is(value.excludePattern, TypePredicates.isString)) &&
-                (value.namespace === undefined || Arrayable.is(value.namespace, TypePredicates.isString)) &&
-                (value.excludeNamespace === undefined || Arrayable.is(value.excludeNamespace, TypePredicates.isString)));
+            return ((value.category === undefined ||
+                Arrayable.is(value.category, TypePredicates.isString)) &&
+                (value.pattern === undefined ||
+                    Arrayable.is(value.pattern, TypePredicates.isString)) &&
+                (value.excludePattern === undefined ||
+                    Arrayable.is(value.excludePattern, TypePredicates.isString)) &&
+                (value.namespace === undefined ||
+                    Arrayable.is(value.namespace, TypePredicates.isString)) &&
+                (value.excludeNamespace === undefined ||
+                    Arrayable.is(value.excludeNamespace, TypePredicates.isString)));
         }
         Condition.is = is;
     })(Condition = SymbolLinterConfig.Condition || (SymbolLinterConfig.Condition = {}));
     let Action;
     (function (Action) {
         function isDeclare(value) {
-            return value !== undefined && ['block', 'file', 'public'].includes(value.declare);
+            return (value !== undefined &&
+                ['block', 'file', 'public'].includes(value.declare));
         }
         Action.isDeclare = isDeclare;
         function isReport(value) {
-            return value !== undefined && ['inherit', 'hint', 'information', 'warning', 'error'].includes(value.report);
+            return (value !== undefined &&
+                ['inherit', 'hint', 'information', 'warning', 'error'].includes(value.report));
         }
         Action.isReport = isReport;
         function is(v) {
@@ -104,14 +112,12 @@ export var SymbolLinterConfig;
     })(Action = SymbolLinterConfig.Action || (SymbolLinterConfig.Action = {}));
 })(SymbolLinterConfig || (SymbolLinterConfig = {}));
 /**
-* Config which simulates the default vanilla command system.
-*/
+ * Config which simulates the default vanilla command system.
+ */
 export const VanillaConfig = {
     env: {
         dataSource: 'GitHub',
-        dependencies: [
-            '@vanilla-mcdoc',
-        ],
+        dependencies: ['@vanilla-mcdoc'],
         feature: {
             codeActions: true,
             colors: true,
@@ -122,9 +128,7 @@ export const VanillaConfig = {
             formatting: true,
             hover: true,
             inlayHint: {
-                enabledNodes: [
-                    'mcfunction:command_child/unknown',
-                ],
+                enabledNodes: ['mcfunction:command_child/unknown'],
             },
             semanticColoring: true,
             selectionRanges: true,
@@ -253,7 +257,7 @@ export class ConfigService {
         return ConfigService.merge(this.defaultConfig, ans);
     }
     static isConfigFile(uri) {
-        return ConfigService.ConfigFileNames.some(n => uri.endsWith(`/${n}`));
+        return ConfigService.ConfigFileNames.some((n) => uri.endsWith(`/${n}`));
     }
     static merge(base, ...overrides) {
         // FIXME

package/lib/service/Downloader.js

@@ -30,17 +30,22 @@ export class Downloader {
             out.cacheUri = cacheUri = new Uri(`downloader/${id}`, this.cacheRoot).toString();
             cacheChecksumUri = new Uri(`downloader/${id}${checksumExtension}`, this.cacheRoot).toString();
             try {
-                out.checksum = checksum = await this.download({ ...checksumJob, id: id + checksumExtension });
+                out.checksum = checksum = await this.download({
+                    ...checksumJob,
+                    id: id + checksumExtension,
+                });
                 try {
-                    const cacheChecksum = bufferToString(await fileUtil.readFile(this.externals, cacheChecksumUri))
-                        .slice(0, -1); // Remove ending newline
+                    const cacheChecksum = bufferToString(await fileUtil.readFile(this.externals, cacheChecksumUri)).slice(0, -1); // Remove ending newline
                     if (checksum === cacheChecksum) {
                         try {
                             const cachedBuffer = await fileUtil.readFile(this.externals, cacheUri);
                             if (ttl) {
-                                this.#memoryCache.set(uri, { buffer: cachedBuffer, time: performance.now() });
+                                this.#memoryCache.set(uri, {
+                                    buffer: cachedBuffer,
+                                    time: performance.now(),
+                                });
                             }
-                            const deserializer = cache.deserializer ?? (b => b);
+                            const deserializer = cache.deserializer ?? ((b) => b);
                             const ans = await transformer(deserializer(cachedBuffer));
                             this.logger.info(`[Downloader] [${id}] Skipped downloading thanks to cache ${cacheChecksum}`);
                             return ans;
@@ -85,7 +90,7 @@ export class Downloader {
                     }
                 }
                 try {
-                    const serializer = cache.serializer ?? (b => b);
+                    const serializer = cache.serializer ?? ((b) => b);
                     await fileUtil.writeFile(this.externals, cacheUri, serializer(buffer));
                 }
                 catch (e) {
@@ -100,7 +105,7 @@ export class Downloader {
             if (cache && cacheUri) {
                 try {
                     const cachedBuffer = await fileUtil.readFile(this.externals, cacheUri);
-                    const deserializer = cache.deserializer ?? (b => b);
+                    const deserializer = cache.deserializer ?? ((b) => b);
                     const ans = await transformer(deserializer(cachedBuffer));
                     this.logger.warn(`[Downloader] [${id}] Fell back to cached file “${cacheUri}”`);
                     return ans;

package/lib/service/FileService.js

@@ -128,7 +128,8 @@ export class FileUriSupporter {
         const files = new Map();
         for (let { uri } of dependencies) {
             try {
-                if (fileUtil.isFileUri(uri) && (await externals.fs.stat(uri)).isDirectory()) {
+                if (fileUtil.isFileUri(uri) &&
+                    (await externals.fs.stat(uri)).isDirectory()) {
                     uri = fileUtil.ensureEndingSlash(uri);
                     roots.push(uri);
                     files.set(uri, await externals.fs.getAllFiles(uri));
@@ -150,7 +151,12 @@ export class ArchiveUriSupporter {
     externals;
     entries;
     static Protocol = 'archive:';
-    static SupportedArchiveExtnames = ['.tar', '.tar.bz2', '.tar.gz', '.zip'];
+    static SupportedArchiveExtnames = [
+        '.tar',
+        '.tar.bz2',
+        '.tar.gz',
+        '.zip',
+    ];
     protocol = ArchiveUriSupporter.Protocol;
     /**
      * @param entries A map from archive URIs to unzipped entries.
@@ -204,7 +210,7 @@ export class ArchiveUriSupporter {
         }
     }
     static getUri(archiveUri, pathInArchive = '') {
-        return `${ArchiveUriSupporter.Protocol}//${encodeURIComponent(archiveUri)}/${pathInArchive.replace(/\\/g, '/')}`;
+        return `${ArchiveUriSupporter.Protocol}${encodeURIComponent(archiveUri)}?path=${encodeURIComponent(pathInArchive.replace(/\\/g, '/'))}`;
     }
     /**
      * @throws When `uri` has the wrong protocol or hostname.
@@ -213,16 +219,22 @@ export class ArchiveUriSupporter {
         if (uri.protocol !== ArchiveUriSupporter.Protocol) {
             throw new Error(`Expected protocol “${ArchiveUriSupporter.Protocol}” in “${uri}”`);
         }
+        const path = uri.searchParams.get('path');
+        if (!path) {
+            throw new Error(`Missing path in archive uri “${uri.toString()}”`);
+        }
         return {
-            archiveUri: decodeURIComponent(uri.hostname),
-            pathInArchive: uri.pathname.charAt(0) === '/' ? uri.pathname.slice(1) : uri.pathname,
+            archiveUri: decodeURIComponent(uri.pathname),
+            pathInArchive: path.charAt(0) === '/' ? path.slice(1) : path,
         };
     }
     static async create(dependencies, externals, logger, checksums) {
         const entries = new Map();
         for (const { uri, info } of dependencies) {
             try {
-                if (uri.startsWith('file:') && ArchiveUriSupporter.SupportedArchiveExtnames.some(ext => uri.endsWith(ext)) && (await externals.fs.stat(uri)).isFile()) {
+                if (uri.startsWith('file:') &&
+                    ArchiveUriSupporter.SupportedArchiveExtnames.some((ext) => uri.endsWith(ext)) &&
+                    (await externals.fs.stat(uri)).isFile()) {
                     const rootUri = ArchiveUriSupporter.getUri(uri);
                     const cachedChecksum = checksums[rootUri];
                     if (cachedChecksum !== undefined) {
@@ -233,8 +245,10 @@ export class ArchiveUriSupporter {
                             continue;
                         }
                     }
-                    const files = await externals.archive.decompressBall(await externals.fs.readFile(uri), { stripLevel: typeof info?.startDepth === 'number' ? info.startDepth : 0 });
-                    entries.set(uri, new Map(files.map(f => [f.path.replace(/\\/g, '/'), f])));
+                    const files = await externals.archive.decompressBall(await externals.fs.readFile(uri), {
+                        stripLevel: typeof info?.startDepth === 'number' ? info.startDepth : 0,
+                    });
+                    entries.set(uri, new Map(files.map((f) => [f.path.replace(/\\/g, '/'), f])));
                 }
             }
             catch (e) {

package/lib/service/MetaRegistry.js

@@ -1,5 +1,5 @@
 import { Lazy } from '../common/index.js';
-import { binder, checker, colorizer, completer, formatter, linter } from '../processor/index.js';
+import { binder, checker, colorizer, completer, formatter, linter, } from '../processor/index.js';
 /* istanbul ignore next */
 /**
  * The meta registry of Spyglass. You can register new parsers, processors, and languages here.
@@ -51,13 +51,13 @@ export class MetaRegistry {
      * An array of file extensions (including the leading dot (`.`)) that are supported.
      */
     getSupportedFileExtensions() {
-        return [...this.#languages.values()].flatMap(v => v.extensions);
+        return [...this.#languages.values()].flatMap((v) => v.extensions);
     }
     /**
      * An array of characters that trigger a completion request.
      */
     getTriggerCharacters() {
-        return Array.from(this.#languages.values()).flatMap(v => v.triggerCharacters ?? []);
+        return Array.from(this.#languages.values()).flatMap((v) => v.triggerCharacters ?? []);
     }
     /**
      * @param fileExtension The file extension including the leading dot. e.g. `".mcfunction"`.
@@ -109,7 +109,8 @@ export class MetaRegistry {
     }
     shouldComplete(languageID, triggerCharacter) {
         const language = this.#languages.get(languageID);
-        return !triggerCharacter || !!language?.triggerCharacters?.includes(triggerCharacter);
+        return (!triggerCharacter ||
+            !!language?.triggerCharacters?.includes(triggerCharacter));
     }
     getCompleterForLanguageID(languageID) {
         return this.#languages.get(languageID)?.completer ?? completer.fallback;
@@ -136,11 +137,11 @@ export class MetaRegistry {
         return this.#inlayHintProviders;
     }
     getLinter(ruleName) {
-        return this.#linters.get(ruleName) ?? {
+        return (this.#linters.get(ruleName) ?? {
             configValidator: () => false,
             linter: linter.noop,
             nodePredicate: () => false,
-        };
+        });
     }
     registerLinter(ruleName, options) {
         this.#linters.set(ruleName, options);

package/lib/service/Profiler.js

@@ -42,7 +42,7 @@ class TopNImpl {
         this.logger.info(`[Profiler: ${this.id}] Min/Avg/Max: ${this.#minTime} / ${totalDuration / this.#taskCount} / ${this.#maxTime} ms`);
         this.logger.info(`[Profiler: ${this.id}] Top ${Math.min(this.n, this.#topTasks.length)} task(s):`);
         for (const [name, time] of this.#topTasks) {
-            this.logger.info(`[Profiler: ${this.id}] ${name}${' '.repeat(longestTaskNameLength - name.length)} - ${time} ms (${time / totalDuration * 100}%)`);
+            this.logger.info(`[Profiler: ${this.id}] ${name}${' '.repeat(longestTaskNameLength - name.length)} - ${time} ms (${(time / totalDuration) * 100}%)`);
         }
     }
 }
@@ -83,7 +83,9 @@ class TotalImpl {
     }
 }
 class NoopImpl {
-    task() { return this; }
+    task() {
+        return this;
+    }
     finalize() { }
 }
 export class ProfilerFactory {
@@ -96,9 +98,12 @@ export class ProfilerFactory {
     get(id, style = 'total', n) {
         if (this.#enabledProfilers.has(id)) {
             switch (style) {
-                case 'top-n': return new TopNImpl(id, this.logger, n);
-                case 'total': return new TotalImpl(id, this.logger);
-                default: return Dev.assertNever(style);
+                case 'top-n':
+                    return new TopNImpl(id, this.logger, n);
+                case 'total':
+                    return new TotalImpl(id, this.logger);
+                default:
+                    return Dev.assertNever(style);
             }
         }
         else {

package/lib/service/Project.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { bufferToString, Logger, SingletonPromise, StateProxy } from '../common/index.js';
+import { bufferToString, Logger, normalizeUri, SingletonPromise, StateProxy, } from '../common/index.js';
 import { FileNode } from '../node/index.js';
 import { file } from '../parser/index.js';
 import { traversePreOrder } from '../processor/index.js';
@@ -13,11 +13,11 @@ import { LanguageError, Source } from '../source/index.js';
 import { SymbolUtil } from '../symbol/index.js';
 import { CacheService } from './CacheService.js';
 import { ConfigService, LinterConfigValue } from './Config.js';
-import { BinderContext, CheckerContext, LinterContext, ParserContext, UriBinderContext } from './Context.js';
+import { BinderContext, CheckerContext, LinterContext, ParserContext, UriBinderContext, } from './Context.js';
 import { DependencyKey } from './Dependency.js';
 import { Downloader } from './Downloader.js';
 import { LinterErrorReporter } from './ErrorReporter.js';
-import { ArchiveUriSupporter, FileService, FileUriSupporter } from './FileService.js';
+import { ArchiveUriSupporter, FileService, FileUriSupporter, } from './FileService.js';
 import { fileUtil } from './fileUtil.js';
 import { MetaRegistry } from './MetaRegistry.js';
 import { ProfilerFactory } from './Profiler.js';
@@ -125,7 +125,8 @@ export class Project {
         const ans = new Set(rawRoots);
         // Identify roots indicated by `pack.mcmeta`.
         for (const file of this.getTrackedFiles()) {
-            if (file.endsWith(Project.RootSuffix) && rawRoots.some(r => file.startsWith(r))) {
+            if (file.endsWith(Project.RootSuffix) &&
+                rawRoots.some((r) => file.startsWith(r))) {
                 ans.add(file.slice(0, 1 - Project.RootSuffix.length));
             }
         }
@@ -151,8 +152,7 @@ export class Project {
      */
     getTrackedFiles() {
         const extensions = this.meta.getSupportedFileExtensions();
-        return [...this.#dependencyFiles, ...this.#watchedFiles]
-            .filter(file => extensions.includes(fileUtil.extname(file) ?? ''));
+        return [...this.#dependencyFiles, ...this.#watchedFiles].filter((file) => extensions.includes(fileUtil.extname(file) ?? ''));
     }
     constructor({ cacheRoot, defaultConfig, downloader, externals, fs = FileService.create(externals, cacheRoot), initializers = [], logger = Logger.create(), profilers = ProfilerFactory.noop(), projectRoot, }) {
         this.#cacheRoot = cacheRoot;
@@ -178,13 +178,12 @@ export class Project {
         this.setInitPromise();
         this.setReadyPromise();
         this.#cacheSaverIntervalId = setInterval(() => this.cacheService.save(), CacheAutoSaveInterval);
-        this
-            .on('documentUpdated', ({ doc, node }) => {
+        this.on('documentUpdated', ({ doc, node }) => {
             // if (!this.#isReady) {
             // 	return
             // }
             this.emit('documentErrored', {
-                errors: FileNode.getErrors(node).map(e => LanguageError.withPosRange(e, doc)),
+                errors: FileNode.getErrors(node).map((e) => LanguageError.withPosRange(e, doc)),
                 uri: doc.uri,
                 version: doc.version,
             });
@@ -237,7 +236,7 @@ export class Project {
                 meta: this.meta,
                 projectRoot: this.projectRoot,
             };
-            const results = await Promise.allSettled(this.#initializers.map(init => init(initCtx)));
+            const results = await Promise.allSettled(this.#initializers.map((init) => init(initCtx)));
             let ctx = {};
             results.forEach(async (r, i) => {
                 if (r.status === 'rejected') {
@@ -294,7 +293,7 @@ export class Project {
             this.fs.register('file:', fileUriSupporter, true);
             this.fs.register(ArchiveUriSupporter.Protocol, archiveUriSupporter, true);
         };
-        const listProjectFiles = () => new Promise(resolve => {
+        const listProjectFiles = () => new Promise((resolve) => {
             this.#watchedFiles.clear();
             this.#watcherReady = false;
             this.#watcher = this.externals.fs
@@ -303,34 +302,31 @@ export class Project {
                 this.#watcherReady = true;
                 resolve();
             })
-                .on('add', uri => {
+                .on('add', (uri) => {
                 this.#watchedFiles.add(uri);
                 if (this.#watcherReady) {
                     this.emit('fileCreated', { uri });
                 }
             })
-                .on('change', uri => {
+                .on('change', (uri) => {
                 if (this.#watcherReady) {
                     this.emit('fileModified', { uri });
                 }
             })
-                .on('unlink', uri => {
+                .on('unlink', (uri) => {
                 this.#watchedFiles.delete(uri);
                 if (this.#watcherReady) {
                     this.emit('fileDeleted', { uri });
                 }
             })
-                .on('error', e => {
+                .on('error', (e) => {
                 this.logger.error('[Project] [chokidar]', e);
             });
         });
         const ready = async () => {
             await this.init();
             const __profiler = this.profilers.get('project#ready');
-            await Promise.all([
-                listDependencyFiles(),
-                listProjectFiles(),
-            ]);
+            await Promise.all([listDependencyFiles(), listProjectFiles()]);
             this.#dependencyFiles = new Set(this.fs.listFiles());
             this.#dependencyRoots = new Set(this.fs.listRoots());
             this.updateRoots();
@@ -424,7 +420,7 @@ export class Project {
         return this.restart();
     }
     normalizeUri(uri) {
-        return this.fs.mapFromDisk(this.externals.uri.normalize(uri));
+        return this.fs.mapFromDisk(normalizeUri(uri));
     }
     static TextDocumentCacheMaxLength = 268435456;
     #textDocumentCache = new Map();
@@ -574,7 +570,7 @@ export class Project {
                     ruleName,
                     ruleValue,
                 });
-                traversePreOrder(node, () => true, () => true, node => {
+                traversePreOrder(node, () => true, () => true, (node) => {
                     if (nodePredicate(node)) {
                         const proxy = StateProxy.create(node);
                         linter(proxy, ctx);
@@ -589,7 +585,9 @@ export class Project {
     }
     // @SingletonPromise()
     async ensureBindingStarted(uri) {
-        if (this.#symbolUpToDateUris.has(uri) || this.#bindingInProgressUris.has(uri)) {
+        uri = this.normalizeUri(uri);
+        if (this.#symbolUpToDateUris.has(uri) ||
+            this.#bindingInProgressUris.has(uri)) {
             return;
         }
         this.#bindingInProgressUris.add(uri);
@@ -635,8 +633,8 @@ export class Project {
      * @throws If there is no `TextDocument` corresponding to the URI.
      */
     async onDidChange(uri, changes, version) {
-        this.#symbolUpToDateUris.delete(uri);
         uri = this.normalizeUri(uri);
+        this.#symbolUpToDateUris.delete(uri);
         if (!fileUtil.isFileUri(uri)) {
             return; // We only accept `file:` scheme for client-managed URIs.
         }
@@ -665,17 +663,21 @@ export class Project {
         this.tryClearingCache(uri);
     }
     async ensureClientManagedChecked(uri) {
+        uri = this.normalizeUri(uri);
         const result = this.#clientManagedDocAndNodes.get(uri);
-        if (result && this.#isReady) {
+        if (result) {
             const { doc, node } = result;
-            await this.bind(doc, node);
-            await this.check(doc, node);
-            this.emit('documentUpdated', { doc, node });
-            return { doc, node };
+            if (this.#isReady) {
+                await this.bind(doc, node);
+                await this.check(doc, node);
+                this.emit('documentUpdated', result);
+            }
+            return result;
         }
         return undefined;
     }
     getClientManaged(uri) {
+        uri = this.normalizeUri(uri);
         return this.#clientManagedDocAndNodes.get(uri);
     }
     async showCacheRoot() {
@@ -696,10 +698,14 @@ export class Project {
         }
     }
     shouldRemove(uri) {
-        return !this.#clientManagedUris.has(uri) && !this.#dependencyFiles.has(uri) && !this.#watchedFiles.has(uri);
+        return (!this.#clientManagedUris.has(uri) &&
+            !this.#dependencyFiles.has(uri) &&
+            !this.#watchedFiles.has(uri));
     }
     isOnlyWatched(uri) {
-        return this.#watchedFiles.has(uri) && !this.#clientManagedUris.has(uri) && !this.#dependencyFiles.has(uri);
+        return (this.#watchedFiles.has(uri) &&
+            !this.#clientManagedUris.has(uri) &&
+            !this.#dependencyFiles.has(uri));
     }
 }
 __decorate([