@spyglassmc/core 0.1.2 → 0.2.0

package/lib/service/Project.js

@@ -1,125 +1,141 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _Project_cacheSaverIntervalId, _Project_clientManagedUris, _Project_configService, _Project_docAndNodes, _Project_initializers, _Project_initPromise, _Project_readyPromise, _Project_watchedFiles, _Project_watcher, _Project_watcherReady, _Project_isReady, _Project_dependencyRoots, _Project_dependencyFiles, _Project_roots, _Project_ctx, _Project_cacheRoot;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Project = exports.ProjectData = void 0;
-const chokidar_1 = __importDefault(require("chokidar"));
-const events_1 = __importDefault(require("events"));
-const p_limit_1 = __importDefault(require("p-limit"));
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const _1 = require(".");
-const common_1 = require("../common");
-const node_1 = require("../node");
-const parser_1 = require("../parser");
-const processor_1 = require("../processor");
-const source_1 = require("../source");
-const symbol_1 = require("../symbol");
-const CacheService_1 = require("./CacheService");
-const Config_1 = require("./Config");
-const Context_1 = require("./Context");
-const Dependency_1 = require("./Dependency");
-const Downloader_1 = require("./Downloader");
-const ErrorReporter_1 = require("./ErrorReporter");
-const FileService_1 = require("./FileService");
-const fileUtil_1 = require("./fileUtil");
-const Logger_1 = require("./Logger");
-const MetaRegistry_1 = require("./MetaRegistry");
-const Profiler_1 = require("./Profiler");
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { bufferToString, CachePromise } from '../common/index.js';
+import { FileNode } from '../node/index.js';
+import { file } from '../parser/index.js';
+import { traversePreOrder } from '../processor/index.js';
+import { Source } from '../source/index.js';
+import { SymbolUtil } from '../symbol/index.js';
+import { CacheService } from './CacheService.js';
+import { ConfigService, LinterConfigValue } from './Config.js';
+import { 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 { fileUtil } from './fileUtil.js';
+import { Logger } from './Logger.js';
+import { MetaRegistry } from './MetaRegistry.js';
+import { ProfilerFactory } from './Profiler.js';
 const CacheAutoSaveInterval = 600000; // 10 Minutes.
-var ProjectData;
-(function (ProjectData) {
-    function mock(data = {}) {
-        const cacheRoot = data.cacheRoot ?? '/some/random/garbage/path/that/definitely/does/not/exist';
-        const logger = data.logger ?? Logger_1.Logger.create();
-        const downloader = data.downloader ?? new Downloader_1.Downloader(cacheRoot, logger, _1.LowLevelDownloader.mock({ fixtures: {} }));
-        return {
-            cacheRoot,
-            config: data.config ?? Config_1.VanillaConfig,
-            ctx: data.ctx ?? {},
-            downloader,
-            ensureParsedAndChecked: data.ensureParsedAndChecked,
-            fs: data.fs ?? FileService_1.FileService.create('file:///cache/'),
-            get: data.get ?? (() => undefined),
-            logger,
-            meta: data.meta ?? new MetaRegistry_1.MetaRegistry(),
-            profilers: data.profilers ?? Profiler_1.ProfilerFactory.noop(),
-            projectRoot: data.projectRoot ?? 'file:///',
-            roots: data.roots ?? [],
-            symbols: data.symbols ?? new symbol_1.SymbolUtil({}),
-        };
-    }
-    ProjectData.mock = mock;
-})(ProjectData = exports.ProjectData || (exports.ProjectData = {}));
 /* istanbul ignore next */
 /**
  * Manage all tracked documents and errors.
  */
-class Project extends events_1.default {
-    constructor({ cacheRoot, downloader, fs = FileService_1.FileService.create(cacheRoot), initializers = [], logger = Logger_1.Logger.create(), profilers = Profiler_1.ProfilerFactory.noop(), projectPath, }) {
-        super();
-        _Project_cacheSaverIntervalId.set(this, void 0);
-        /**
-         * URI of files that are currently managed by the language client.
-         */
-        _Project_clientManagedUris.set(this, new Set());
-        _Project_configService.set(this, void 0);
-        _Project_docAndNodes.set(this, new Map());
-        _Project_initializers.set(this, void 0);
-        _Project_initPromise.set(this, void 0);
-        _Project_readyPromise.set(this, void 0);
-        _Project_watchedFiles.set(this, new Set());
-        _Project_watcher.set(this, void 0);
-        _Project_watcherReady.set(this, false);
-        _Project_isReady.set(this, false);
-        this.meta = new MetaRegistry_1.MetaRegistry();
-        _Project_dependencyRoots.set(this, void 0);
-        _Project_dependencyFiles.set(this, void 0);
-        _Project_roots.set(this, []
-        /**
-         * All tracked root URIs. Each URI in this array is guaranteed to end with a slash (`/`).
-         *
-         * Includes the roots of all dependencies, the project root, and all data pack roots identified
-         * by `pack.mcmeta` files.
-         *
-         * Some URIs in the array may overlap with each other. In such cases, the deeper ones are guaranteed to come
-         * before the shallower ones (e.g. `file:///foo/bar/` will come before `file:///foo/`).
-         */
-        );
-        _Project_ctx.set(this, void 0);
-        _Project_cacheRoot.set(this, void 0);
-        __classPrivateFieldSet(this, _Project_cacheRoot, cacheRoot, "f");
-        this.cacheService = new CacheService_1.CacheService(cacheRoot, this);
-        __classPrivateFieldSet(this, _Project_configService, new Config_1.ConfigService(this), "f");
-        this.downloader = downloader ?? new Downloader_1.Downloader(cacheRoot, logger);
+export class Project {
+    static RootSuffix = '/pack.mcmeta';
+    #cacheSaverIntervalId;
+    cacheService;
+    /**
+     * URI of files that are currently managed by the language client.
+     */
+    #clientManagedUris = new Set();
+    #configService;
+    #docAndNodes = new Map();
+    #eventEmitter;
+    #initializers;
+    #initPromise;
+    #readyPromise;
+    #watchedFiles = new Set();
+    #watcher;
+    #watcherReady = false;
+    #isReady = false;
+    get isReady() {
+        return this.#isReady;
+    }
+    config;
+    downloader;
+    externals;
+    fs;
+    logger;
+    meta = new MetaRegistry();
+    profilers;
+    projectRoot;
+    symbols;
+    #dependencyRoots;
+    #dependencyFiles;
+    #roots = [];
+    /**
+     * All tracked root URIs. Each URI in this array is guaranteed to end with a slash (`/`).
+     *
+     * Includes the roots of all dependencies, the project root, and all data pack roots identified
+     * by `pack.mcmeta` files.
+     *
+     * Some URIs in the array may overlap with each other. In such cases, the deeper ones are guaranteed to come
+     * before the shallower ones (e.g. `file:///foo/bar/` will come before `file:///foo/`).
+     */
+    get roots() {
+        return this.#roots;
+    }
+    #ctx;
+    /**
+     * Arbitrary information that will be included in the `project` property of all `Context`s.
+     */
+    get ctx() {
+        return this.#ctx;
+    }
+    #cacheRoot;
+    /**
+     * File URI to a directory where all cache files of Spyglass should be stored.
+     */
+    get cacheRoot() {
+        return this.#cacheRoot;
+    }
+    updateRoots() {
+        const rawRoots = [...this.#dependencyRoots, this.projectRoot];
+        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))) {
+                ans.add(file.slice(0, 1 - Project.RootSuffix.length));
+            }
+        }
+        this.#roots = [...ans].sort((a, b) => b.length - a.length);
+        this.emit('rootsUpdated', { roots: this.#roots });
+    }
+    on(event, callbackFn) {
+        this.#eventEmitter.on(event, callbackFn);
+        return this;
+    }
+    once(event, callbackFn) {
+        this.#eventEmitter.once(event, callbackFn);
+        return this;
+    }
+    emit(event, ...args) {
+        return this.#eventEmitter.emit(event, ...args);
+    }
+    /**
+     * Get all files that are tracked and supported.
+     *
+     * Files in cached archives may not show up in the result as those files
+     * are not loaded into the memory.
+     */
+    getTrackedFiles() {
+        const extensions = this.meta.getSupportedFileExtensions();
+        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;
+        this.#eventEmitter = new externals.event.EventEmitter();
+        this.externals = externals;
         this.fs = fs;
-        __classPrivateFieldSet(this, _Project_initializers, initializers, "f");
+        this.#initializers = initializers;
         this.logger = logger;
         this.profilers = profilers;
-        this.projectPath = projectPath;
-        this.projectRoot = fileUtil_1.fileUtil.ensureEndingSlash(fileUtil_1.fileUtil.pathToFileUri(projectPath));
-        this.symbols = new symbol_1.SymbolUtil({});
-        __classPrivateFieldSet(this, _Project_ctx, {}, "f");
+        this.projectRoot = projectRoot;
+        this.cacheService = new CacheService(cacheRoot, this);
+        this.#configService = new ConfigService(this, defaultConfig);
+        this.downloader = downloader ?? new Downloader(cacheRoot, externals, logger);
+        this.symbols = new SymbolUtil({}, externals.event.EventEmitter);
+        this.#ctx = {};
         this.logger.info(`[Project] [init] cacheRoot = “${cacheRoot}”`);
-        __classPrivateFieldGet(this, _Project_configService, "f")
+        this.#configService
             .on('changed', ({ config }) => {
             this.config = config;
             this.logger.info('[Project] [Config] Changed');
@@ -127,15 +143,15 @@ class Project extends events_1.default {
             .on('error', ({ error, uri }) => this.logger.error(`[Project] [Config] Failed loading “${uri}”`, error));
         this.setInitPromise();
         this.setReadyPromise();
-        __classPrivateFieldSet(this, _Project_cacheSaverIntervalId, setInterval(() => this.cacheService.save(), CacheAutoSaveInterval), "f");
+        this.#cacheSaverIntervalId = setInterval(() => this.cacheService.save(), CacheAutoSaveInterval);
         this
             .on('documentUpdated', ({ doc, node }) => {
-            if (!__classPrivateFieldGet(this, _Project_isReady, "f")) {
+            if (!this.#isReady) {
                 return;
             }
             this.emit('documentErrorred', {
                 doc,
-                errors: node_1.FileNode.getErrors(node),
+                errors: FileNode.getErrors(node),
                 node,
             });
         })
@@ -148,7 +164,7 @@ class Project extends events_1.default {
         })
             .on('fileModified', async ({ uri }) => {
             if (this.isOnlyWatched(uri)) {
-                __classPrivateFieldGet(this, _Project_docAndNodes, "f").delete(uri);
+                this.#docAndNodes.delete(uri);
                 await this.ensureParsedAndChecked(uri);
             }
         })
@@ -160,11 +176,11 @@ class Project extends events_1.default {
             this.tryClearingCache(uri);
         })
             .on('ready', () => {
-            __classPrivateFieldSet(this, _Project_isReady, true, "f");
+            this.#isReady = true;
             // Recheck client managed files.
             const promises = [];
-            for (const uri of __classPrivateFieldGet(this, _Project_clientManagedUris, "f")) {
-                const result = __classPrivateFieldGet(this, _Project_docAndNodes, "f").get(uri);
+            for (const uri of this.#clientManagedUris) {
+                const result = this.#docAndNodes.get(uri);
                 if (result) {
                     promises.push(this.check(result.doc, result.node));
                 }
@@ -172,85 +188,36 @@ class Project extends events_1.default {
             Promise.all(promises).catch(e => this.logger.error('[Project#ready] Error occurred when rechecking client managed files after ready', e));
         });
     }
-    get isReady() {
-        return __classPrivateFieldGet(this, _Project_isReady, "f");
-    }
-    /**
-     * All tracked root URIs. Each URI in this array is guaranteed to end with a slash (`/`).
-     *
-     * Includes the roots of all dependencies, the project root, and all data pack roots identified
-     * by `pack.mcmeta` files.
-     *
-     * Some URIs in the array may overlap with each other. In such cases, the deeper ones are guaranteed to come
-     * before the shallower ones (e.g. `file:///foo/bar/` will come before `file:///foo/`).
-     */
-    get roots() {
-        return __classPrivateFieldGet(this, _Project_roots, "f");
-    }
-    /**
-     * Arbitrary information that will be included in the `project` property of all `Context`s.
-     */
-    get ctx() {
-        return __classPrivateFieldGet(this, _Project_ctx, "f");
-    }
-    /**
-     * File path to a directory where all cache files of Spyglass should be stored.
-     */
-    get cacheRoot() {
-        return __classPrivateFieldGet(this, _Project_cacheRoot, "f");
-    }
-    updateRoots() {
-        const rawRoots = [...__classPrivateFieldGet(this, _Project_dependencyRoots, "f"), this.projectRoot];
-        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))) {
-                ans.add(file.slice(0, 1 - Project.RootSuffix.length));
-            }
-        }
-        __classPrivateFieldSet(this, _Project_roots, [...ans].sort((a, b) => b.length - a.length), "f");
-        this.emit('rootsUpdated', { roots: __classPrivateFieldGet(this, _Project_roots, "f") });
-    }
-    /**
-     * Get all files that are tracked and supported.
-     *
-     * Files in cached archives may not show up in the result as those files
-     * are not loaded into the memory.
-     */
-    getTrackedFiles() {
-        const extensions = this.meta.getSupportedFileExtensions();
-        return [...__classPrivateFieldGet(this, _Project_dependencyFiles, "f"), ...__classPrivateFieldGet(this, _Project_watchedFiles, "f")]
-            .filter(file => extensions.includes(fileUtil_1.fileUtil.extname(file) ?? ''));
-    }
     setInitPromise() {
         const loadConfig = async () => {
-            this.config = await __classPrivateFieldGet(this, _Project_configService, "f").load();
+            this.config = await this.#configService.load();
         };
         const callIntializers = async () => {
             const initCtx = {
                 cacheRoot: this.cacheRoot,
                 config: this.config,
                 downloader: this.downloader,
+                externals: this.externals,
                 logger: this.logger,
                 meta: this.meta,
                 projectRoot: this.projectRoot,
             };
-            const results = await Promise.allSettled(__classPrivateFieldGet(this, _Project_initializers, "f").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') {
-                    this.logger.error(`[Project] [callInitializers] [${i}] “${__classPrivateFieldGet(this, _Project_initializers, "f")[i].name}”`, r.reason);
+                    this.logger.error(`[Project] [callInitializers] [${i}] “${this.#initializers[i].name}”`, r.reason);
                 }
                 else if (r.value) {
                     ctx = { ...ctx, ...r.value };
                 }
             });
-            __classPrivateFieldSet(this, _Project_ctx, ctx, "f");
+            this.#ctx = ctx;
         };
         const init = async () => {
             const __profiler = this.profilers.get('project#init');
             const { symbols } = await this.cacheService.load();
-            this.symbols = new symbol_1.SymbolUtil(symbols);
+            this.symbols = new SymbolUtil(symbols, this.externals.event.EventEmitter);
             this.symbols.buildCache();
             __profiler.task('Load Cache');
             await loadConfig();
@@ -258,13 +225,13 @@ class Project extends events_1.default {
             await callIntializers();
             __profiler.task('Initialize').finalize();
         };
-        __classPrivateFieldSet(this, _Project_initPromise, init(), "f");
+        this.#initPromise = init();
     }
     setReadyPromise() {
         const getDependencies = async () => {
             const ans = [];
             for (const dependency of this.config.env.dependencies) {
-                if (Dependency_1.DependencyKey.is(dependency)) {
+                if (DependencyKey.is(dependency)) {
                     const provider = this.meta.getDependencyProvider(dependency);
                     if (provider) {
                         try {
@@ -287,55 +254,51 @@ class Project extends events_1.default {
         };
         const listDependencyFiles = async () => {
             const dependencies = await getDependencies();
-            const fileUriSupporter = await FileService_1.FileUriSupporter.create(dependencies, this.logger);
-            const archiveUriSupporter = await FileService_1.ArchiveUriSupporter.create(dependencies, this.logger, this.cacheService.checksums.roots);
+            const fileUriSupporter = await FileUriSupporter.create(dependencies, this.externals, this.logger);
+            const archiveUriSupporter = await ArchiveUriSupporter.create(dependencies, this.externals, this.logger, this.cacheService.checksums.roots);
             this.fs.register('file:', fileUriSupporter, true);
-            this.fs.register(FileService_1.ArchiveUriSupporter.Protocol, archiveUriSupporter, true);
+            this.fs.register(ArchiveUriSupporter.Protocol, archiveUriSupporter, true);
         };
         const listProjectFiles = () => new Promise(resolve => {
-            __classPrivateFieldSet(this, _Project_watcherReady, false, "f");
-            __classPrivateFieldSet(this, _Project_watcher, chokidar_1.default
-                .watch(this.projectPath, { ignoreInitial: false })
+            this.#watcherReady = false;
+            this.#watcher = this.externals.fs
+                .watch(this.projectRoot)
                 .once('ready', () => {
-                __classPrivateFieldSet(this, _Project_watcherReady, true, "f");
+                this.#watcherReady = true;
                 resolve();
             })
-                .on('add', path => {
-                const uri = fileUtil_1.fileUtil.pathToFileUri(path);
-                __classPrivateFieldGet(this, _Project_watchedFiles, "f").add(uri);
-                if (__classPrivateFieldGet(this, _Project_watcherReady, "f")) {
+                .on('add', uri => {
+                this.#watchedFiles.add(uri);
+                if (this.#watcherReady) {
                     this.emit('fileCreated', { uri });
                 }
             })
-                .on('change', path => {
-                const uri = fileUtil_1.fileUtil.pathToFileUri(path);
-                if (__classPrivateFieldGet(this, _Project_watcherReady, "f")) {
+                .on('change', uri => {
+                if (this.#watcherReady) {
                     this.emit('fileModified', { uri });
                 }
             })
-                .on('unlink', path => {
-                const uri = fileUtil_1.fileUtil.pathToFileUri(path);
-                __classPrivateFieldGet(this, _Project_watchedFiles, "f").delete(uri);
-                if (__classPrivateFieldGet(this, _Project_watcherReady, "f")) {
+                .on('unlink', uri => {
+                this.#watchedFiles.delete(uri);
+                if (this.#watcherReady) {
                     this.emit('fileDeleted', { uri });
                 }
             })
                 .on('error', e => {
                 this.logger.error('[Project] [chokidar]', e);
-            }), "f");
+            });
         });
         const ready = async () => {
             await this.init();
             const __profiler = this.profilers.get('project#ready');
-            const limit = (0, p_limit_1.default)(8);
             const ensureParsed = this.ensureParsed.bind(this);
             const ensureChecked = this.ensureChecked.bind(this);
             await Promise.all([
                 listDependencyFiles(),
                 listProjectFiles(),
             ]);
-            __classPrivateFieldSet(this, _Project_dependencyFiles, new Set(this.fs.listFiles()), "f");
-            __classPrivateFieldSet(this, _Project_dependencyRoots, new Set(this.fs.listRoots()), "f");
+            this.#dependencyFiles = new Set(this.fs.listFiles());
+            this.#dependencyRoots = new Set(this.fs.listRoots());
             this.updateRoots();
             __profiler.task('List Files');
             for (const [id, { checksum, registrar }] of this.meta.symbolRegistrars) {
@@ -370,27 +333,27 @@ class Project extends events_1.default {
             __profiler.task('Check Files').finalize();
             this.emit('ready', {});
         };
-        __classPrivateFieldSet(this, _Project_readyPromise, ready(), "f");
+        this.#readyPromise = ready();
     }
     async init() {
-        await __classPrivateFieldGet(this, _Project_initPromise, "f");
+        await this.#initPromise;
         return this;
     }
     async ready() {
-        await __classPrivateFieldGet(this, _Project_readyPromise, "f");
+        await this.#readyPromise;
         return this;
     }
     /**
      * Behavior of the `Project` instance is undefined after this function has settled.
      */
     async close() {
-        clearInterval(__classPrivateFieldGet(this, _Project_cacheSaverIntervalId, "f"));
-        await __classPrivateFieldGet(this, _Project_watcher, "f").close();
+        clearInterval(this.#cacheSaverIntervalId);
+        await this.#watcher.close();
         await this.cacheService.save();
     }
     async restart() {
         try {
-            await __classPrivateFieldGet(this, _Project_watcher, "f").close();
+            await this.#watcher.close();
             this.setReadyPromise();
             await this.ready();
         }
@@ -402,14 +365,14 @@ class Project extends events_1.default {
         return this.cacheService.reset();
     }
     normalizeUri(uri) {
-        return this.fs.mapFromDisk(fileUtil_1.fileUtil.normalize(uri));
+        return this.fs.mapFromDisk(this.externals.uri.normalize(uri));
     }
     /**
      * @returns The language ID of the file, or the file extension without the leading dot.
      */
     getLanguageID(uri) {
         uri = this.normalizeUri(uri);
-        const ext = fileUtil_1.fileUtil.extname(uri) ?? '.plaintext';
+        const ext = fileUtil.extname(uri) ?? '.plaintext';
         return this.meta.getLanguageID(ext) ?? ext.slice(1);
     }
     /**
@@ -417,23 +380,23 @@ class Project extends events_1.default {
      */
     get(uri) {
         uri = this.normalizeUri(uri);
-        return __classPrivateFieldGet(this, _Project_docAndNodes, "f").get(uri);
+        return this.#docAndNodes.get(uri);
     }
     /**
      * @throws FS-related errors
      */
     async ensureParsed(uri) {
         uri = this.normalizeUri(uri);
-        if (__classPrivateFieldGet(this, _Project_docAndNodes, "f").has(uri)) {
-            return __classPrivateFieldGet(this, _Project_docAndNodes, "f").get(uri);
+        if (this.#docAndNodes.has(uri)) {
+            return this.#docAndNodes.get(uri);
         }
         const languageID = this.getLanguageID(uri);
         if (!this.meta.isSupportedLanguage(languageID)) {
             return undefined;
         }
         try {
-            const content = (0, common_1.bufferToString)(await this.fs.readFile(uri));
-            const doc = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageID, -1, content);
+            const content = bufferToString(await this.fs.readFile(uri));
+            const doc = TextDocument.create(uri, languageID, -1, content);
             return this.parseAndCache(doc);
         }
         catch (e) {
@@ -446,22 +409,22 @@ class Project extends events_1.default {
         return this.cache(doc, node);
     }
     parse(doc) {
-        const ctx = Context_1.ParserContext.create(this, { doc });
-        const src = new source_1.Source(doc.getText());
+        const ctx = ParserContext.create(this, { doc });
+        const src = new Source(doc.getText());
         let ans;
         ctx.symbols.clear({ contributor: 'parser', uri: doc.uri });
-        ctx.symbols.contributeAs('parser', () => ans = (0, parser_1.file)()(src, ctx));
+        ctx.symbols.contributeAs('parser', () => ans = file()(src, ctx));
         return ans;
     }
     cache(doc, node) {
         const data = { doc, node };
-        __classPrivateFieldGet(this, _Project_docAndNodes, "f").set(doc.uri, data);
+        this.#docAndNodes.set(doc.uri, data);
         this.emit('documentUpdated', data);
         return data;
     }
     async check(doc, node) {
         const checker = this.meta.getChecker(node.type);
-        const ctx = Context_1.CheckerContext.create(this, { doc });
+        const ctx = CheckerContext.create(this, { doc });
         ctx.symbols.clear({ contributor: 'checker', uri: doc.uri });
         await ctx.symbols.contributeAsAsync('checker', async () => {
             await checker(node, ctx);
@@ -483,7 +446,7 @@ class Project extends events_1.default {
     lint(doc, node) {
         node.linterErrors = [];
         for (const [ruleName, rawValue] of Object.entries(this.config.lint)) {
-            const result = Config_1.LinterConfigValue.destruct(rawValue);
+            const result = LinterConfigValue.destruct(rawValue);
             if (!result) {
                 // Rule is disabled (i.e. set to `null`) in the config.
                 continue;
@@ -494,13 +457,13 @@ class Project extends events_1.default {
                 // Config value is invalid.
                 continue;
             }
-            const ctx = Context_1.LinterContext.create(this, {
+            const ctx = LinterContext.create(this, {
                 doc,
-                err: new ErrorReporter_1.LinterErrorReporter(ruleName, ruleSeverity),
+                err: new LinterErrorReporter(ruleName, ruleSeverity),
                 ruleName,
                 ruleValue,
             });
-            (0, processor_1.traversePreOrder)(node, () => true, () => true, node => {
+            traversePreOrder(node, () => true, () => true, node => {
                 if (nodePredicate(node)) {
                     linter(node, ctx);
                 }
@@ -528,13 +491,13 @@ class Project extends events_1.default {
     }
     async ensureParsedAndCheckedOnlyWhenReady(uri) {
         const result = await this.ensureParsed(uri);
-        if (__classPrivateFieldGet(this, _Project_isReady, "f") && result) {
+        if (this.#isReady && result) {
             await this.ensureChecked(result.doc, result.node);
         }
         return result;
     }
     bind(param) {
-        const ctx = Context_1.UriBinderContext.create(this);
+        const ctx = UriBinderContext.create(this);
         if (typeof param === 'string') {
             ctx.symbols.clear({ contributor: 'uri_binder', uri: param });
         }
@@ -550,13 +513,13 @@ class Project extends events_1.default {
      */
     onDidOpen(uri, languageID, version, content) {
         uri = this.normalizeUri(uri);
-        if (!fileUtil_1.fileUtil.isFileUri(uri)) {
+        if (!fileUtil.isFileUri(uri)) {
             return; // We only accept `file:` scheme for client-managed URIs.
         }
-        __classPrivateFieldGet(this, _Project_clientManagedUris, "f").add(uri);
-        const doc = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageID, version, content);
+        this.#clientManagedUris.add(uri);
+        const doc = TextDocument.create(uri, languageID, version, content);
         const { node } = this.parseAndCache(doc);
-        if (__classPrivateFieldGet(this, _Project_isReady, "f")) {
+        if (this.#isReady) {
             this.check(doc, node);
         }
     }
@@ -566,16 +529,16 @@ class Project extends events_1.default {
      */
     onDidChange(uri, changes, version) {
         uri = this.normalizeUri(uri);
-        if (!fileUtil_1.fileUtil.isFileUri(uri)) {
+        if (!fileUtil.isFileUri(uri)) {
             return; // We only accept `file:` scheme for client-managed URIs.
         }
         const result = this.get(uri);
         if (!result) {
             throw new Error(`Document for “${uri}” is not cached. This should not happen. Did the language client send a didChange notification without sending a didOpen one?`);
         }
-        vscode_languageserver_textdocument_1.TextDocument.update(result.doc, changes, version);
+        TextDocument.update(result.doc, changes, version);
         const { node } = this.parseAndCache(result.doc);
-        if (__classPrivateFieldGet(this, _Project_isReady, "f")) {
+        if (this.#isReady) {
             this.check(result.doc, node);
         }
     }
@@ -584,18 +547,18 @@ class Project extends events_1.default {
      */
     onDidClose(uri) {
         uri = this.normalizeUri(uri);
-        if (!fileUtil_1.fileUtil.isFileUri(uri)) {
+        if (!fileUtil.isFileUri(uri)) {
             return; // We only accept `file:` scheme for client-managed URIs.
         }
-        __classPrivateFieldGet(this, _Project_clientManagedUris, "f").delete(uri);
+        this.#clientManagedUris.delete(uri);
         this.tryClearingCache(uri);
     }
     async showCacheRoot() {
-        if (!__classPrivateFieldGet(this, _Project_cacheRoot, "f")) {
+        if (!this.#cacheRoot) {
             return;
         }
         try {
-            await fileUtil_1.fileUtil.showFile(__classPrivateFieldGet(this, _Project_cacheRoot, "f"));
+            await this.externals.fs.showFile(this.#cacheRoot);
         }
         catch (e) {
             this.logger.error('[Service#showCacheRoot]', e);
@@ -603,33 +566,30 @@ class Project extends events_1.default {
     }
     tryClearingCache(uri) {
         if (this.shouldRemove(uri)) {
-            __classPrivateFieldGet(this, _Project_docAndNodes, "f").delete(uri);
+            this.#docAndNodes.delete(uri);
             this.emit('documentRemoved', { uri });
         }
     }
     shouldRemove(uri) {
-        return !__classPrivateFieldGet(this, _Project_clientManagedUris, "f").has(uri) && !__classPrivateFieldGet(this, _Project_dependencyFiles, "f").has(uri) && !__classPrivateFieldGet(this, _Project_watchedFiles, "f").has(uri);
+        return !this.#clientManagedUris.has(uri) && !this.#dependencyFiles.has(uri) && !this.#watchedFiles.has(uri);
     }
     isOnlyWatched(uri) {
-        return __classPrivateFieldGet(this, _Project_watchedFiles, "f").has(uri) && !__classPrivateFieldGet(this, _Project_clientManagedUris, "f").has(uri) && !__classPrivateFieldGet(this, _Project_dependencyFiles, "f").has(uri);
+        return this.#watchedFiles.has(uri) && !this.#clientManagedUris.has(uri) && !this.#dependencyFiles.has(uri);
     }
 }
-_Project_cacheSaverIntervalId = new WeakMap(), _Project_clientManagedUris = new WeakMap(), _Project_configService = new WeakMap(), _Project_docAndNodes = new WeakMap(), _Project_initializers = new WeakMap(), _Project_initPromise = new WeakMap(), _Project_readyPromise = new WeakMap(), _Project_watchedFiles = new WeakMap(), _Project_watcher = new WeakMap(), _Project_watcherReady = new WeakMap(), _Project_isReady = new WeakMap(), _Project_dependencyRoots = new WeakMap(), _Project_dependencyFiles = new WeakMap(), _Project_roots = new WeakMap(), _Project_ctx = new WeakMap(), _Project_cacheRoot = new WeakMap();
-Project.RootSuffix = '/pack.mcmeta';
 __decorate([
-    (0, common_1.CachePromise)()
+    CachePromise()
 ], Project.prototype, "ensureParsed", null);
 __decorate([
-    (0, common_1.CachePromise)()
+    CachePromise()
 ], Project.prototype, "check", null);
 __decorate([
-    (0, common_1.CachePromise)()
+    CachePromise()
 ], Project.prototype, "ensureChecked", null);
 __decorate([
-    (0, common_1.CachePromise)()
+    CachePromise()
 ], Project.prototype, "ensureParsedAndChecked", null);
 __decorate([
-    (0, common_1.CachePromise)()
+    CachePromise()
 ], Project.prototype, "ensureParsedAndCheckedOnlyWhenReady", null);
-exports.Project = Project;
 //# sourceMappingURL=Project.js.map