@spyglassmc/core 0.1.1 → 0.3.0

package/lib/symbol/SymbolUtil.js

@@ -1,72 +1,69 @@
-"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 _SymbolUtil_global, _SymbolUtil_trimmableSymbols, _SymbolUtil_cache, _SymbolUtil_currentContributor, _SymbolQuery_doc, _SymbolQuery_node, _SymbolQuery_createdWithUri, _SymbolQuery_currentContributor, _SymbolQuery_hasTriggeredIf, _SymbolQuery_map, _SymbolQuery_parentSymbol, _SymbolQuery_symbol;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SymbolFormatter = exports.SymbolQuery = exports.SymbolUtil = void 0;
-const assert_1 = require("assert");
-const events_1 = __importDefault(require("events"));
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const source_1 = require("../source");
-const Symbol_1 = require("./Symbol");
-class SymbolUtil extends events_1.default {
-    constructor(global, 
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { Range } from '../source/index.js';
+import { SymbolLocation, SymbolPath, SymbolUsageTypes } from './Symbol.js';
+export class SymbolUtil {
+    #global;
+    #eventEmitter;
+    #eventEmitterConstructor;
+    #trimmableSymbols = new Set();
+    #cache = Object.create(null);
+    #currentContributor;
+    /**
+     * @internal
+     */
+    _delayedOps = [];
+    /**
+     * @internal
+     */
+    _inDelayMode;
+    get global() {
+        return this.#global;
+    }
+    constructor(global, eventEmitterConstructor, 
     /** @internal */
     _currentContributor, 
     /** @internal */
     _inDelayMode = false) {
-        super();
-        _SymbolUtil_global.set(this, void 0);
-        _SymbolUtil_trimmableSymbols.set(this, new Set());
-        _SymbolUtil_cache.set(this, Object.create(null));
-        _SymbolUtil_currentContributor.set(this, void 0);
-        /**
-         * @internal
-         */
-        this._delayedOps = [];
-        __classPrivateFieldSet(this, _SymbolUtil_global, global, "f");
-        __classPrivateFieldSet(this, _SymbolUtil_currentContributor, _currentContributor, "f");
+        this.#eventEmitter = new eventEmitterConstructor();
+        this.#eventEmitterConstructor = eventEmitterConstructor;
+        this.#global = global;
+        this.#currentContributor = _currentContributor;
         this._inDelayMode = _inDelayMode;
         this
             .on('symbolCreated', ({ symbol }) => {
-            __classPrivateFieldGet(this, _SymbolUtil_trimmableSymbols, "f").add(Symbol_1.SymbolPath.toString(symbol));
+            this.#trimmableSymbols.add(SymbolPath.toString(symbol));
         })
             .on('symbolRemoved', ({ symbol }) => {
-            __classPrivateFieldGet(this, _SymbolUtil_trimmableSymbols, "f").delete(Symbol_1.SymbolPath.toString(symbol));
+            this.#trimmableSymbols.delete(SymbolPath.toString(symbol));
         })
             .on('symbolLocationCreated', ({ symbol, location }) => {
-            var _a, _b, _c;
-            const cache = (_a = __classPrivateFieldGet(this, _SymbolUtil_cache, "f"))[_b = location.contributor ?? 'undefined'] ?? (_a[_b] = Object.create(null));
-            const fileSymbols = cache[_c = location.uri] ?? (cache[_c] = new Set());
-            const path = Symbol_1.SymbolPath.toString(symbol);
+            const cache = this.#cache[location.contributor ?? 'undefined'] ??= Object.create(null);
+            const fileSymbols = cache[location.uri] ??= new Set();
+            const path = SymbolPath.toString(symbol);
             fileSymbols.add(path);
-            __classPrivateFieldGet(this, _SymbolUtil_trimmableSymbols, "f").delete(path);
+            this.#trimmableSymbols.delete(path);
         })
             .on('symbolLocationRemoved', ({ symbol }) => {
-            const path = Symbol_1.SymbolPath.toString(symbol);
-            __classPrivateFieldGet(this, _SymbolUtil_trimmableSymbols, "f").add(path);
+            const path = SymbolPath.toString(symbol);
+            this.#trimmableSymbols.add(path);
         });
     }
-    get global() {
-        return __classPrivateFieldGet(this, _SymbolUtil_global, "f");
+    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);
     }
     /**
      * Build the internal cache of the SymbolUtil according to the current global symbol table.
@@ -87,7 +84,7 @@ class SymbolUtil extends events_1.default {
      * `applyDelayedEdits` is called, the original SymbolUtil will also be modified.
      */
     clone() {
-        return new SymbolUtil(__classPrivateFieldGet(this, _SymbolUtil_global, "f"), __classPrivateFieldGet(this, _SymbolUtil_currentContributor, "f"), true);
+        return new SymbolUtil(this.#global, this.#eventEmitterConstructor, this.#currentContributor, true);
     }
     /**
      * Apply edits done during the delay mode.
@@ -98,24 +95,24 @@ class SymbolUtil extends events_1.default {
         this._inDelayMode = false;
     }
     contributeAs(contributor, fn) {
-        const originalValue = __classPrivateFieldGet(this, _SymbolUtil_currentContributor, "f");
-        __classPrivateFieldSet(this, _SymbolUtil_currentContributor, contributor, "f");
+        const originalValue = this.#currentContributor;
+        this.#currentContributor = contributor;
         try {
             fn();
         }
         finally {
-            __classPrivateFieldSet(this, _SymbolUtil_currentContributor, originalValue, "f");
+            this.#currentContributor = originalValue;
         }
         return this;
     }
     async contributeAsAsync(contributor, fn) {
-        const originalValue = __classPrivateFieldGet(this, _SymbolUtil_currentContributor, "f");
-        __classPrivateFieldSet(this, _SymbolUtil_currentContributor, contributor, "f");
+        const originalValue = this.#currentContributor;
+        this.#currentContributor = contributor;
         try {
             await fn();
         }
         finally {
-            __classPrivateFieldSet(this, _SymbolUtil_currentContributor, originalValue, "f");
+            this.#currentContributor = originalValue;
         }
         return this;
     }
@@ -129,10 +126,10 @@ class SymbolUtil extends events_1.default {
     clear({ uri, contributor, predicate = () => true }) {
         const getCaches = () => {
             if (contributor) {
-                return __classPrivateFieldGet(this, _SymbolUtil_cache, "f")[contributor] ? [__classPrivateFieldGet(this, _SymbolUtil_cache, "f")[contributor]] : [];
+                return this.#cache[contributor] ? [this.#cache[contributor]] : [];
             }
             else {
-                return Object.values(__classPrivateFieldGet(this, _SymbolUtil_cache, "f"));
+                return Object.values(this.#cache);
             }
         };
         const getPaths = () => {
@@ -140,12 +137,12 @@ class SymbolUtil extends events_1.default {
             const sets = uri
                 ? caches.map(cache => cache[uri] ?? new Set())
                 : caches.map(cache => Object.values(cache)).flat();
-            return sets.map(s => [...s]).flat().map(Symbol_1.SymbolPath.fromString);
+            return sets.map(s => [...s]).flat().map(SymbolPath.fromString);
         };
         const getTables = () => {
             return uri
-                ? [__classPrivateFieldGet(this, _SymbolUtil_global, "f")]
-                : [__classPrivateFieldGet(this, _SymbolUtil_global, "f")];
+                ? [this.#global]
+                : [this.#global];
         };
         const paths = getPaths();
         const tables = getTables();
@@ -163,6 +160,15 @@ class SymbolUtil extends events_1.default {
         }
     }
     lookup(category, path, node) {
+        while (node) {
+            if (node.locals) {
+                const result = SymbolUtil.lookupTable(node.locals, category, path);
+                if (result.symbol) {
+                    return result;
+                }
+            }
+            node = node.parent;
+        }
         return SymbolUtil.lookupTable(this.global, category, path);
     }
     query(doc, category, ...path) {
@@ -172,7 +178,7 @@ class SymbolUtil extends events_1.default {
         return new SymbolQuery({
             category,
             doc,
-            contributor: __classPrivateFieldGet(this, _SymbolUtil_currentContributor, "f"),
+            contributor: this.#currentContributor,
             map: visible ? parentMap : undefined,
             parentSymbol: parentSymbol,
             path,
@@ -207,14 +213,14 @@ class SymbolUtil extends events_1.default {
                 trimSymbol(symbol.parentSymbol);
             }
         };
-        for (const pathString of __classPrivateFieldGet(this, _SymbolUtil_trimmableSymbols, "f")) {
-            const path = Symbol_1.SymbolPath.fromString(pathString);
+        for (const pathString of this.#trimmableSymbols) {
+            const path = SymbolPath.fromString(pathString);
             const { symbol } = SymbolUtil.lookupTable(table, path.category, path.path);
             trimSymbol(symbol);
         }
     }
     removeLocationsFromSymbol(symbol, predicate) {
-        for (const type of Symbol_1.SymbolUsageTypes) {
+        for (const type of SymbolUsageTypes) {
             if (!symbol[type]) {
                 continue;
             }
@@ -304,7 +310,7 @@ class SymbolUtil extends events_1.default {
                 symbol.desc = addition.desc;
             }
             if (addition.relations && Object.keys(addition.relations).length) {
-                symbol.relations ?? (symbol.relations = {});
+                symbol.relations ??= {};
                 for (const relationship of Object.keys(addition.relations)) {
                     symbol.relations[relationship] = addition.relations[relationship];
                 }
@@ -315,12 +321,12 @@ class SymbolUtil extends events_1.default {
             if ('visibility' in addition) {
                 // Visibility changes are only accepted if the change wouldn't result in the
                 // symbol being stored in a different symbol table.
-                const inGlobalTable = (v) => v === undefined || v === 2 /* Public */ || v === 3 /* Restricted */;
+                const inGlobalTable = (v) => v === undefined || v === 2 /* SymbolVisibility.Public */ || v === 3 /* SymbolVisibility.Restricted */;
                 if (symbol.visibility === addition.visibility || (inGlobalTable(symbol.visibility) && inGlobalTable(addition.visibility))) {
                     symbol.visibility = addition.visibility;
                 }
                 else {
-                    throw new Error(`Cannot change visibility from ${symbol.visibility} to ${addition.visibility}: ${JSON.stringify(Symbol_1.SymbolPath.fromSymbol(symbol))}`);
+                    throw new Error(`Cannot change visibility from ${symbol.visibility} to ${addition.visibility}: ${JSON.stringify(SymbolPath.fromSymbol(symbol))}`);
                 }
             }
             if (addition.visibilityRestriction?.length) {
@@ -331,9 +337,9 @@ class SymbolUtil extends events_1.default {
     amendSymbolUsage(symbol, addition, doc, contributor) {
         if (addition) {
             const type = addition.type ?? 'reference';
-            const arr = symbol[type] ?? (symbol[type] = []);
-            const range = source_1.Range.get((SymbolAdditionUsageWithNode.is(addition) ? addition.node : addition.range) ?? 0);
-            const location = Symbol_1.SymbolLocation.create(doc, range, addition.fullRange, contributor, {
+            const arr = symbol[type] ??= [];
+            const range = Range.get((SymbolAdditionUsageWithNode.is(addition) ? addition.node : addition.range) ?? 0);
+            const location = SymbolLocation.create(doc, range, addition.fullRange, contributor, {
                 accessType: addition.accessType,
                 skipRenaming: addition.skipRenaming,
             });
@@ -369,11 +375,11 @@ class SymbolUtil extends events_1.default {
     }
     static isVisible(symbol, _uri) {
         switch (symbol.visibility) {
-            case 3 /* Restricted */:
+            case 3 /* SymbolVisibility.Restricted */:
                 return false; // FIXME: check with workspace root URIs.
-            case 0 /* Block */:
-            case 1 /* File */:
-            case 2 /* Public */:
+            case 0 /* SymbolVisibility.Block */:
+            case 1 /* SymbolVisibility.File */:
+            case 2 /* SymbolVisibility.Public */:
             default:
                 return true;
         }
@@ -412,7 +418,7 @@ class SymbolUtil extends events_1.default {
      * @throws If the symbol does not have any declarations or definitions.
      */
     static getDeclaredLocation(symbol) {
-        return symbol.declaration?.[0] ?? symbol.definition?.[0] ?? (() => { throw new Error(`Cannot get declared location of ${JSON.stringify(Symbol_1.SymbolPath.fromSymbol(symbol))}`); })();
+        return symbol.declaration?.[0] ?? symbol.definition?.[0] ?? (() => { throw new Error(`Cannot get declared location of ${JSON.stringify(SymbolPath.fromSymbol(symbol))}`); })();
     }
     static forEachSymbolInMap(map, fn) {
         for (const symbol of Object.values(map)) {
@@ -428,20 +434,19 @@ class SymbolUtil extends events_1.default {
         }
     }
     static forEachLocationOfSymbol(symbol, fn) {
-        for (const type of Symbol_1.SymbolUsageTypes) {
+        for (const type of SymbolUsageTypes) {
             symbol[type]?.forEach(location => fn({ type, location }));
         }
     }
     static isVisibilityInGlobal(v) {
-        return v === undefined || v === 2 /* Public */ || v === 3 /* Restricted */;
+        return v === undefined || v === 2 /* SymbolVisibility.Public */ || v === 3 /* SymbolVisibility.Restricted */;
     }
     static areVisibilitiesCompatible(v1, v2) {
         return ((this.isVisibilityInGlobal(v1) && this.isVisibilityInGlobal(v2)) ||
-            (v1 === 0 /* Block */ && v2 === 0 /* Block */) ||
-            (v1 === 1 /* File */ && v2 === 1 /* File */));
+            (v1 === 0 /* SymbolVisibility.Block */ && v2 === 0 /* SymbolVisibility.Block */) ||
+            (v1 === 1 /* SymbolVisibility.File */ && v2 === 1 /* SymbolVisibility.File */));
     }
 }
-_SymbolUtil_global = new WeakMap(), _SymbolUtil_trimmableSymbols = new WeakMap(), _SymbolUtil_cache = new WeakMap(), _SymbolUtil_currentContributor = new WeakMap();
 __decorate([
     DelayModeSupport()
 ], SymbolUtil.prototype, "clear", null);
@@ -451,7 +456,6 @@ __decorate([
 __decorate([
     DelayModeSupport()
 ], SymbolUtil.prototype, "removeLocationsFromSymbol", null);
-exports.SymbolUtil = SymbolUtil;
 var SymbolAdditionUsageWithRange;
 (function (SymbolAdditionUsageWithRange) {
     /* istanbul ignore next */
@@ -469,65 +473,71 @@ var SymbolAdditionUsageWithNode;
     SymbolAdditionUsageWithNode.is = is;
 })(SymbolAdditionUsageWithNode || (SymbolAdditionUsageWithNode = {}));
 /* istanbul ignore next */
-class SymbolQuery {
+export class SymbolQuery {
+    category;
+    path;
+    #doc;
+    #node;
+    /**
+     * If only a string URI (instead of a {@link TextDocument}) is provided when constructing this class.
+     *
+     * If this is `true`, {@link SymbolAdditionUsageWithRange.range} is ignored and treated as `[0, 0)` when entering symbols through this class.
+     */
+    #createdWithUri;
+    #currentContributor;
+    #hasTriggeredIf = false;
+    /**
+     * The map where the queried symbol is stored. `undefined` if the map hasn't been created yet.
+     */
+    #map;
+    #parentSymbol;
+    /**
+     * The queried symbol. `undefined` if the symbol hasn't been created yet.
+     */
+    #symbol;
+    /**
+     * The {@link SymbolUtil} where this query was created.
+     */
+    util;
+    get symbol() {
+        return this.#symbol;
+    }
+    get visibleMembers() {
+        return SymbolUtil.filterVisibleSymbols(this.#doc.uri, this.path.length === 0 ? this.#map : this.#symbol?.members);
+    }
     constructor({ category, contributor, doc, map, parentSymbol, path, symbol, util }) {
-        _SymbolQuery_doc.set(this, void 0);
-        _SymbolQuery_node.set(this, void 0);
-        /**
-         * If only a string URI (instead of a {@link TextDocument}) is provided when constructing this class.
-         *
-         * If this is `true`, {@link SymbolAdditionUsageWithRange.range} is ignored and treated as `[0, 0)` when entering symbols through this class.
-         */
-        _SymbolQuery_createdWithUri.set(this, void 0);
-        _SymbolQuery_currentContributor.set(this, void 0);
-        _SymbolQuery_hasTriggeredIf.set(this, false
-        /**
-         * The map where the queried symbol is stored. `undefined` if the map hasn't been created yet.
-         */
-        );
-        /**
-         * The map where the queried symbol is stored. `undefined` if the map hasn't been created yet.
-         */
-        _SymbolQuery_map.set(this, void 0);
-        _SymbolQuery_parentSymbol.set(this, void 0);
-        /**
-         * The queried symbol. `undefined` if the symbol hasn't been created yet.
-         */
-        _SymbolQuery_symbol.set(this, void 0);
         this.category = category;
         this.path = path;
         if (typeof doc === 'string') {
-            doc = vscode_languageserver_textdocument_1.TextDocument.create(doc, '', 0, '');
-            __classPrivateFieldSet(this, _SymbolQuery_createdWithUri, true, "f");
+            doc = TextDocument.create(doc, '', 0, '');
+            this.#createdWithUri = true;
         }
         else if (isDocAndNode(doc)) {
-            __classPrivateFieldSet(this, _SymbolQuery_node, doc.node, "f");
+            this.#node = doc.node;
             doc = doc.doc;
         }
-        __classPrivateFieldSet(this, _SymbolQuery_doc, doc, "f");
-        __classPrivateFieldSet(this, _SymbolQuery_currentContributor, contributor, "f");
-        __classPrivateFieldSet(this, _SymbolQuery_map, map, "f");
-        __classPrivateFieldSet(this, _SymbolQuery_parentSymbol, parentSymbol, "f");
-        __classPrivateFieldSet(this, _SymbolQuery_symbol, symbol, "f");
+        this.#doc = doc;
+        this.#currentContributor = contributor;
+        this.#map = map;
+        this.#parentSymbol = parentSymbol;
+        this.#symbol = symbol;
         this.util = util;
     }
-    get symbol() {
-        return __classPrivateFieldGet(this, _SymbolQuery_symbol, "f");
-    }
-    get visibleMembers() {
-        return SymbolUtil.filterVisibleSymbols(__classPrivateFieldGet(this, _SymbolQuery_doc, "f").uri, this.path.length === 0 ? __classPrivateFieldGet(this, _SymbolQuery_map, "f") : __classPrivateFieldGet(this, _SymbolQuery_symbol, "f")?.members);
-    }
     heyGimmeDaSymbol() {
-        return __classPrivateFieldGet(this, _SymbolQuery_symbol, "f");
+        return this.#symbol;
+    }
+    getData(predicate) {
+        const data = this.#symbol?.data;
+        return predicate(data) ? data : undefined;
     }
     with(fn) {
         fn(this);
         return this;
     }
     if(predicate, fn) {
-        if (predicate.call(this, __classPrivateFieldGet(this, _SymbolQuery_symbol, "f"), this)) {
-            fn.call(this, __classPrivateFieldGet(this, _SymbolQuery_symbol, "f"), this);
-            __classPrivateFieldSet(this, _SymbolQuery_hasTriggeredIf, true, "f");
+        if (predicate.call(this, this.#symbol, this)) {
+            fn.call(this, this.#symbol, this);
+            this.#hasTriggeredIf = true;
         }
         return this;
     }
@@ -577,8 +587,8 @@ class SymbolQuery {
      * Calls `fn` if none of the former `if` conditions are met.
      */
     else(fn) {
-        if (!__classPrivateFieldGet(this, _SymbolQuery_hasTriggeredIf, "f")) {
-            fn.call(this, __classPrivateFieldGet(this, _SymbolQuery_symbol, "f"), this);
+        if (!this.#hasTriggeredIf) {
+            fn.call(this, this.#symbol, this);
         }
         return this;
     }
@@ -597,29 +607,37 @@ class SymbolQuery {
         return this.else(() => this.resolveAlias());
     }
     _enter(addition) {
+        /**
+         * Get a proper visibility from the addition:
+         * * If the visibility is specified, use it.
+         * * If the visibility is `undefined`, use the visibility of the symbol, or `Public` if unapplicable.
+         */
+        const getAdditionVisibility = (addition) => {
+            return addition.data?.visibility ?? this.symbol?.visibility ?? 2 /* SymbolVisibility.Public */;
+        };
         const getMap = (addition) => {
-            var _a, _b;
-            if (__classPrivateFieldGet(this, _SymbolQuery_map, "f") && SymbolUtil.areVisibilitiesCompatible(addition.data?.visibility, __classPrivateFieldGet(this, _SymbolQuery_symbol, "f")?.visibility)) {
-                return __classPrivateFieldGet(this, _SymbolQuery_map, "f");
+            const additionVisibility = getAdditionVisibility(addition);
+            if (this.#map && SymbolUtil.areVisibilitiesCompatible(additionVisibility, this.#symbol?.visibility)) {
+                return this.#map;
             }
             if (this.path.length > 1) {
-                if (__classPrivateFieldGet(this, _SymbolQuery_parentSymbol, "f")) {
-                    if (!SymbolUtil.areVisibilitiesCompatible(addition.data?.visibility, __classPrivateFieldGet(this, _SymbolQuery_parentSymbol, "f").visibility)) {
-                        throw new Error(`Cannot enter member “${this.getPath()}” of ${SymbolFormatter.stringifyVisibility(addition.data?.visibility)} visibility to parent of ${SymbolFormatter.stringifyVisibility(__classPrivateFieldGet(this, _SymbolQuery_parentSymbol, "f").visibility)} visibility`);
+                if (this.#parentSymbol) {
+                    if (!SymbolUtil.areVisibilitiesCompatible(additionVisibility, this.#parentSymbol.visibility)) {
+                        throw new Error(`Cannot enter member “${this.getPath()}” of ${SymbolFormatter.stringifyVisibility(additionVisibility)} visibility to parent of ${SymbolFormatter.stringifyVisibility(this.#parentSymbol.visibility)} visibility`);
                     }
-                    return (_a = __classPrivateFieldGet(this, _SymbolQuery_parentSymbol, "f")).members ?? (_a.members = {});
+                    return this.#parentSymbol.members ??= {};
                 }
             }
             else {
                 let table;
-                if (SymbolUtil.isVisibilityInGlobal(addition.data?.visibility)) {
+                if (SymbolUtil.isVisibilityInGlobal(additionVisibility)) {
                     table = this.util.global;
                 }
-                else if (addition.data?.visibility === 1 /* File */) {
-                    if (!__classPrivateFieldGet(this, _SymbolQuery_node, "f")) {
-                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(addition.data?.visibility)} visibility as no node is supplied`);
+                else if (additionVisibility === 1 /* SymbolVisibility.File */) {
+                    if (!this.#node) {
+                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(additionVisibility)} visibility as no node is supplied`);
                     }
-                    let node = __classPrivateFieldGet(this, _SymbolQuery_node, "f");
+                    let node = this.#node;
                     while (node) {
                         if (node.type === 'file') {
                             table = node.locals;
@@ -628,14 +646,14 @@ class SymbolQuery {
                         node = node.parent;
                     }
                     if (!table) {
-                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(addition.data?.visibility)} visibility as no file node is supplied`);
+                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(additionVisibility)} visibility as no file node is supplied`);
                     }
                 }
                 else {
-                    if (!__classPrivateFieldGet(this, _SymbolQuery_node, "f")) {
-                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(addition.data?.visibility)} visibility as no node is supplied`);
+                    if (!this.#node) {
+                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(additionVisibility)} visibility as no node is supplied`);
                     }
-                    let node = __classPrivateFieldGet(this, _SymbolQuery_node, "f");
+                    let node = this.#node;
                     while (node) {
                         if (node.locals) {
                             table = node.locals;
@@ -644,22 +662,22 @@ class SymbolQuery {
                         node = node.parent;
                     }
                     if (!table) {
-                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(addition.data?.visibility)} visibility as no node with locals is supplied`);
+                        throw new Error(`Cannot enter “${this.getPath()}” with ${SymbolFormatter.stringifyVisibility(additionVisibility)} visibility as no node with locals is supplied`);
                     }
                 }
                 // TODO: Move part of symbol from global to table.
-                return table[_b = this.category] ?? (table[_b] = {});
+                return table[this.category] ??= {};
             }
             throw new Error(`Cannot create the symbol map for “${this.getPath()}”`);
         };
         // Treat `usage.range` as `[0, 0)` if this class was constructed with a string URI (instead of a `TextDocument`).
-        if (__classPrivateFieldGet(this, _SymbolQuery_createdWithUri, "f") && SymbolAdditionUsageWithRange.is(addition.usage)) {
-            addition.usage.range = source_1.Range.create(0, 0);
+        if (this.#createdWithUri && SymbolAdditionUsageWithRange.is(addition.usage)) {
+            addition.usage.range = Range.create(0, 0);
         }
-        __classPrivateFieldSet(this, _SymbolQuery_map, getMap(addition), "f");
-        __classPrivateFieldSet(this, _SymbolQuery_symbol, this.util.enterMap(__classPrivateFieldGet(this, _SymbolQuery_parentSymbol, "f"), __classPrivateFieldGet(this, _SymbolQuery_map, "f"), this.category, this.path, this.path[this.path.length - 1], addition, __classPrivateFieldGet(this, _SymbolQuery_doc, "f"), __classPrivateFieldGet(this, _SymbolQuery_currentContributor, "f")), "f");
+        this.#map = getMap(addition);
+        this.#symbol = this.util.enterMap(this.#parentSymbol, this.#map, this.category, this.path, this.path[this.path.length - 1], addition, this.#doc, this.#currentContributor);
         if (addition.usage?.node) {
-            addition.usage.node.symbol = __classPrivateFieldGet(this, _SymbolQuery_symbol, "f");
+            addition.usage.node.symbol = this.#symbol;
         }
     }
     /**
@@ -693,13 +711,13 @@ class SymbolQuery {
      * after the error is thrown.
      */
     resolveAlias() {
-        if (__classPrivateFieldGet(this, _SymbolQuery_symbol, "f")) {
-            const result = this.util.resolveAlias(__classPrivateFieldGet(this, _SymbolQuery_symbol, "f"));
+        if (this.#symbol) {
+            const result = this.util.resolveAlias(this.#symbol);
             if (!result) {
                 throw new Error('The current symbol points to an non-existent symbol.');
             }
-            __classPrivateFieldSet(this, _SymbolQuery_symbol, result, "f");
-            __classPrivateFieldSet(this, _SymbolQuery_map, result.parentMap, "f");
+            this.#symbol = result;
+            this.#map = result.parentMap;
         }
         return this;
     }
@@ -708,7 +726,7 @@ class SymbolQuery {
         let doc, identifier, fn;
         if (arguments.length === 2) {
             // Ensure the member query result will not unknowingly have a dummy TextDocument passed down from this class.
-            doc = __classPrivateFieldGet(this, _SymbolQuery_createdWithUri, "f") ? __classPrivateFieldGet(this, _SymbolQuery_doc, "f").uri : __classPrivateFieldGet(this, _SymbolQuery_doc, "f");
+            doc = this.#createdWithUri ? this.#doc.uri : this.#doc;
             identifier = arguments[0];
             fn = arguments[1];
         }
@@ -717,20 +735,20 @@ class SymbolQuery {
             identifier = arguments[1];
             fn = arguments[2];
         }
-        if (__classPrivateFieldGet(this, _SymbolQuery_symbol, "f") === undefined) {
+        if (this.#symbol === undefined) {
             throw new Error(`Tried to query member symbol “${identifier}” from an undefined symbol (path “${this.path.join('.')}”)`);
         }
-        const memberDoc = typeof doc === 'string' && doc === __classPrivateFieldGet(this, _SymbolQuery_doc, "f").uri && !__classPrivateFieldGet(this, _SymbolQuery_createdWithUri, "f")
-            ? __classPrivateFieldGet(this, _SymbolQuery_doc, "f")
+        const memberDoc = typeof doc === 'string' && doc === this.#doc.uri && !this.#createdWithUri
+            ? this.#doc
             : doc;
-        const memberMap = __classPrivateFieldGet(this, _SymbolQuery_symbol, "f").members;
+        const memberMap = this.#symbol.members;
         const memberSymbol = memberMap?.[identifier];
         const memberQueryResult = new SymbolQuery({
             category: this.category,
             doc: memberDoc,
-            contributor: __classPrivateFieldGet(this, _SymbolQuery_currentContributor, "f"),
+            contributor: this.#currentContributor,
             map: memberMap,
-            parentSymbol: __classPrivateFieldGet(this, _SymbolQuery_symbol, "f"),
+            parentSymbol: this.#symbol,
             path: [...this.path, identifier],
             symbol: memberSymbol,
             util: this.util,
@@ -755,18 +773,21 @@ class SymbolQuery {
         return `${this.category}.${this.path.join('/')}`;
     }
 }
-_SymbolQuery_doc = new WeakMap(), _SymbolQuery_node = new WeakMap(), _SymbolQuery_createdWithUri = new WeakMap(), _SymbolQuery_currentContributor = new WeakMap(), _SymbolQuery_hasTriggeredIf = new WeakMap(), _SymbolQuery_map = new WeakMap(), _SymbolQuery_parentSymbol = new WeakMap(), _SymbolQuery_symbol = new WeakMap();
 __decorate([
     DelayModeSupport((self) => self.util)
 ], SymbolQuery.prototype, "_enter", null);
-exports.SymbolQuery = SymbolQuery;
 /* istanbul ignore next */
 /**
  * A series of methods for converting symbol structures to human-readable outputs. Mostly for debug purposes.
  */
-var SymbolFormatter;
+export var SymbolFormatter;
 (function (SymbolFormatter) {
     const IndentChar = '+ ';
+    function assertEqual(a, b) {
+        if (a !== b) {
+            throw new Error(`Assertion error: ${a} !== ${b}`);
+        }
+    }
     function stringifySymbolStack(stack) {
         return stack.map(table => stringifySymbolTable(table)).join('\n------------\n');
     }
@@ -787,7 +808,7 @@ var SymbolFormatter;
         const ans = [];
         for (const identifier of Object.keys(map)) {
             const symbol = map[identifier];
-            assert_1.strict.equal(identifier, symbol.identifier);
+            assertEqual(identifier, symbol.identifier);
             ans.push(stringifySymbol(symbol, indent));
         }
         return ans.join(`\n${indent}------------\n`);
@@ -798,7 +819,7 @@ var SymbolFormatter;
             return 'undefined';
         }
         const ans = [];
-        assert_1.strict.equal(symbol.path[symbol.path.length - 1], symbol.identifier);
+        assertEqual(symbol.path[symbol.path.length - 1], symbol.identifier);
         ans.push(`SYMBOL ${symbol.path.join('.')}` +
             ` {${symbol.category}${symbol.subcategory ? ` (${symbol.subcategory})` : ''}}` +
             ` [${stringifyVisibility(symbol.visibility, symbol.visibilityRestriction)}]`);
@@ -808,7 +829,7 @@ var SymbolFormatter;
         if (symbol.desc) {
             ans.push(`${IndentChar}description: ${symbol.desc}`);
         }
-        for (const type of Symbol_1.SymbolUsageTypes) {
+        for (const type of SymbolUsageTypes) {
             if (symbol[type]) {
                 ans.push(`${IndentChar}${type}:\n${symbol[type].map(v => `${indent}${IndentChar.repeat(2)}${JSON.stringify(v)}`).join(`\n${indent}${IndentChar.repeat(2)}------------\n`)}`);
             }
@@ -826,13 +847,13 @@ var SymbolFormatter;
         let stringVisibility;
         // Const enums cannot be indexed even if `--preserveConstEnums` is on: https://github.com/microsoft/TypeScript/issues/31353
         switch (visibility) {
-            case 0 /* Block */:
+            case 0 /* SymbolVisibility.Block */:
                 stringVisibility = 'Block';
                 break;
-            case 1 /* File */:
+            case 1 /* SymbolVisibility.File */:
                 stringVisibility = 'File';
                 break;
-            case 3 /* Restricted */:
+            case 3 /* SymbolVisibility.Restricted */:
                 stringVisibility = 'Restricted';
                 break;
             default:
@@ -851,7 +872,7 @@ symbol:
 ${stringifySymbol(result.symbol, IndentChar)}`;
     }
     SymbolFormatter.stringifyLookupResult = stringifyLookupResult;
-})(SymbolFormatter = exports.SymbolFormatter || (exports.SymbolFormatter = {}));
+})(SymbolFormatter || (SymbolFormatter = {}));
 /**
  * Make a method support delay mode: if the {@link SymbolUtil} is in delay mode, the actual invocation of the method will be
  * stored to the {@link SymbolUtil._delayedOps} array.