@spyglassmc/core 0.4.40 → 0.4.41

package/README.md

@@ -12,6 +12,4 @@ This package is the core of the Spyglass Project. It defines the structure of a
 ## Exports
 
 * `@spyglassmc/core`: Contains all core functionalities.
-* `@spyglassmc/core/lib/browser.js`: Contains browser-specific features.
-* `@spyglassmc/core/lib/nodejs.js`: Contains Node.js-specific features.
-* `@spyglassmc/core/test-out/utils.js`: For internal development use only. Does not exist in the package published to npm.
+* `@spyglassmc/core/test/utils.ts`: For internal development use only. Does not exist in the package published to npm.

package/lib/parser/float.js

@@ -1,8 +1,8 @@
 import { localize } from '@spyglassmc/locales';
-import { Range, Source } from '../source/index.js';
+import { ErrorSeverity, Range, Source } from '../source/index.js';
 import { Failure } from './Parser.js';
 const fallbackOnOutOfRange = (ans, _src, ctx, options) => {
-    ctx.err.report(localize('expected', localize('float.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* ErrorSeverity.Error */);
+    ctx.err.report(localize('expected', localize('float.between', options.min ?? '-∞', options.max ?? '+∞')), ans, ErrorSeverity.Error);
 };
 export function float(options) {
     return (src, ctx) => {

package/lib/parser/integer.js

@@ -1,8 +1,8 @@
 import { localize } from '@spyglassmc/locales';
-import { Range, Source } from '../source/index.js';
+import { ErrorSeverity, Range, Source } from '../source/index.js';
 import { Failure } from './Parser.js';
 const fallbackOnOutOfRange = (ans, _src, ctx, options) => {
-    ctx.err.report(localize('expected', localize('integer.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* ErrorSeverity.Error */);
+    ctx.err.report(localize('expected', localize('integer.between', options.min ?? '-∞', options.max ?? '+∞')), ans, ErrorSeverity.Error);
 };
 export function integer(options) {
     return (src, ctx) => {

package/lib/parser/list.js

@@ -1,5 +1,5 @@
 import { localeQuote, localize } from '@spyglassmc/locales';
-import { Range } from '../source/index.js';
+import { ErrorSeverity, Range } from '../source/index.js';
 import { Failure } from './Parser.js';
 import { attempt } from './util.js';
 export function list({ start, value, sep, trailingSep, end }) {
@@ -46,7 +46,7 @@ export function list({ start, value, sep, trailingSep, end }) {
             // Trailing item sep.
             if (hasValueSep && !trailingSep) {
                 const trailingRange = ans.children[ans.children.length - 1].sep;
-                ctx.err.report(localize('parser.list.trailing-sep'), trailingRange, 3 /* ErrorSeverity.Error */, {
+                ctx.err.report(localize('parser.list.trailing-sep'), trailingRange, ErrorSeverity.Error, {
                     codeAction: {
                         title: localize('code-action.remove-trailing-separation'),
                         isPreferred: true,

package/lib/parser/long.js

@@ -1,8 +1,8 @@
 import { localize } from '@spyglassmc/locales';
-import { Range, Source } from '../source/index.js';
+import { ErrorSeverity, Range, Source } from '../source/index.js';
 import { Failure } from './Parser.js';
 const fallbackOnOutOfRange = (ans, _src, ctx, options) => {
-    ctx.err.report(localize('expected', localize('long.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* ErrorSeverity.Error */);
+    ctx.err.report(localize('expected', localize('long.between', options.min ?? '-∞', options.max ?? '+∞')), ans, ErrorSeverity.Error);
 };
 export function long(options) {
     return (src, ctx) => {

package/lib/parser/record.js

@@ -1,5 +1,5 @@
 import { localeQuote, localize } from '@spyglassmc/locales';
-import { Range } from '../source/index.js';
+import { ErrorSeverity, Range } from '../source/index.js';
 import { Failure } from './Parser.js';
 import { attempt } from './util.js';
 /**
@@ -82,7 +82,7 @@ export function record({ start, pair, end }) {
             // Trailing pair end.
             if (hasPairEnd && !pair.trailingEnd) {
                 const trailingRange = ans.children[ans.children.length - 1].end;
-                ctx.err.report(localize('parser.record.trailing-end'), trailingRange, 3 /* ErrorSeverity.Error */, {
+                ctx.err.report(localize('parser.record.trailing-end'), trailingRange, ErrorSeverity.Error, {
                     codeAction: {
                         title: localize('code-action.remove-trailing-separation'),
                         isPreferred: true,

package/lib/parser/resourceLocation.js

@@ -1,6 +1,6 @@
 import { arrayToMessage, localize } from '@spyglassmc/locales';
 import { ResourceLocation } from '../common/index.js';
-import { Range } from '../source/index.js';
+import { ErrorSeverity, Range } from '../source/index.js';
 const Terminators = new Set([
     ' ',
     '\r',
@@ -104,7 +104,7 @@ export function resourceLocation(options) {
                 ctx.err.report(localize('parser.resource-location.tag-required'), ans);
             }
             if (!ans.namespace && options.requireCanonical) {
-                ctx.err.report(localize('parser.resource-location.namespace-expected'), ans, 3 /* ErrorSeverity.Error */, {
+                ctx.err.report(localize('parser.resource-location.namespace-expected'), ans, ErrorSeverity.Error, {
                     codeAction: {
                         title: localize('code-action.add-default-namespace'),
                         isPreferred: true,

package/lib/processor/binder/builtin.js

@@ -2,6 +2,7 @@ import { localize } from '@spyglassmc/locales';
 import { ResourceLocation, StateProxy } from '../../common/index.js';
 import { ResourceLocationNode } from '../../node/index.js';
 import { ErrorReporter } from '../../service/index.js';
+import { ErrorSeverity } from '../../source/index.js';
 import { traversePreOrder } from '../util.js';
 import { AsyncBinder, SyncBinder } from './Binder.js';
 export function attempt(binder, node, ctx) {
@@ -107,7 +108,7 @@ export const resourceLocation = SyncBinder.create((node, ctx) => {
     }
     if (node.options.pool && !node.options.allowUnknown) {
         if (!node.options.pool.includes(sanitizedRaw)) {
-            ctx.err.report(localize('expected', node.options.pool), node, 3 /* ErrorSeverity.Error */);
+            ctx.err.report(localize('expected', node.options.pool), node, ErrorSeverity.Error);
         }
         return;
     }

package/lib/service/CacheService.js

@@ -54,7 +54,7 @@ export class CacheService {
                 }
                 catch (e) {
                     if (!this.project.externals.error.isKind(e, 'EISDIR')) {
-                        this.project.logger.error(`[CacheService#hash-root] ${root}`);
+                        this.project.logger.error(`[CacheService#hash-root] ${root}`, e);
                     }
                 }
             }

package/lib/service/Config.d.ts

@@ -264,7 +264,7 @@ export declare class ConfigService implements ExternalEventEmitter {
     emit(event: 'changed', data: ConfigEvent): boolean;
     emit(event: 'error', data: ErrorEvent): boolean;
     load(): Promise<Config>;
-    private static isConfigFile;
+    static isConfigFile(this: void, uri: string): boolean;
     static merge(base: Config, ...overrides: any[]): Config;
 }
 export {};

package/lib/service/Config.js

@@ -1,5 +1,6 @@
 import rfdc from 'rfdc';
 import { Arrayable, bufferToString, merge, TypePredicates } from '../common/index.js';
+import { ErrorSeverity } from '../source/index.js';
 import { DataFileCategories, RegistryCategories } from '../symbol/index.js';
 export var LinterSeverity;
 (function (LinterSeverity) {
@@ -13,13 +14,13 @@ export var LinterSeverity;
     function toErrorSeverity(value) {
         switch (value) {
             case 'error':
-                return 3 /* ErrorSeverity.Error */;
+                return ErrorSeverity.Error;
             case 'hint':
-                return 0 /* ErrorSeverity.Hint */;
+                return ErrorSeverity.Hint;
             case 'information':
-                return 1 /* ErrorSeverity.Information */;
+                return ErrorSeverity.Information;
             case 'warning':
-                return 2 /* ErrorSeverity.Warning */;
+                return ErrorSeverity.Warning;
         }
     }
     LinterSeverity.toErrorSeverity = toErrorSeverity;
@@ -36,7 +37,7 @@ export var LinterConfigValue;
         if (Array.isArray(value) && LinterSeverity.is(value[0])) {
             return { ruleSeverity: LinterSeverity.toErrorSeverity(value[0]), ruleValue: value[1] };
         }
-        return { ruleSeverity: 2 /* ErrorSeverity.Warning */, ruleValue: value };
+        return { ruleSeverity: ErrorSeverity.Warning, ruleValue: value };
     }
     LinterConfigValue.destruct = destruct;
 })(LinterConfigValue || (LinterConfigValue = {}));

package/lib/service/ErrorReporter.js

@@ -1,5 +1,5 @@
 import { localize } from '@spyglassmc/locales';
-import { LanguageError, Range } from '../source/index.js';
+import { ErrorSeverity, LanguageError, Range } from '../source/index.js';
 export class ErrorReporter {
     source;
     errors = [];
@@ -9,7 +9,7 @@ export class ErrorReporter {
     /**
      * Reports a new error.
      */
-    report(message, range, severity = 3 /* ErrorSeverity.Error */, info) {
+    report(message, range, severity = ErrorSeverity.Error, info) {
         if (message.trim() === '') {
             throw new Error('Tried to report an error with no message');
         }

package/lib/service/Project.d.ts

@@ -132,6 +132,7 @@ export declare class Project implements ExternalEventEmitter {
     on(event: 'ready', callbackFn: (data: EmptyEvent) => void): this;
     on(event: 'rootsUpdated', callbackFn: (data: RootsEvent) => void): this;
     on(event: 'symbolRegistrarExecuted', callbackFn: (data: SymbolRegistrarEvent) => void): this;
+    on(event: 'configChanged', callbackFn: (data: Config) => void): this;
     once(event: 'documentErrored', callbackFn: (data: DocumentErrorEvent) => void): this;
     once(event: 'documentUpdated', callbackFn: (data: DocumentEvent) => void): this;
     once(event: 'documentRemoved', callbackFn: (data: FileEvent) => void): this;
@@ -139,6 +140,7 @@ export declare class Project implements ExternalEventEmitter {
     once(event: 'ready', callbackFn: (data: EmptyEvent) => void): this;
     once(event: 'rootsUpdated', callbackFn: (data: RootsEvent) => void): this;
     once(event: 'symbolRegistrarExecuted', callbackFn: (data: SymbolRegistrarEvent) => void): this;
+    once(event: 'configChanged', callbackFn: (data: Config) => void): this;
     emit(event: 'documentErrored', data: DocumentErrorEvent): boolean;
     emit(event: 'documentUpdated', data: DocumentEvent): boolean;
     emit(event: 'documentRemoved', data: FileEvent): boolean;
@@ -146,6 +148,7 @@ export declare class Project implements ExternalEventEmitter {
     emit(event: 'ready', data: EmptyEvent): boolean;
     emit(event: 'rootsUpdated', data: RootsEvent): boolean;
     emit(event: 'symbolRegistrarExecuted', data: SymbolRegistrarEvent): boolean;
+    emit(event: 'configChanged', data: Config): boolean;
     /**
      * Get all files that are tracked and supported.
      *

package/lib/service/Project.js

@@ -173,6 +173,7 @@ export class Project {
         this.#configService.on('changed', ({ config }) => {
             this.config = config;
             this.logger.info('[Project] [Config] Changed');
+            this.emit('configChanged', config);
         }).on('error', ({ error, uri }) => this.logger.error(`[Project] [Config] Failed loading ${uri}`, error));
         this.setInitPromise();
         this.setReadyPromise();
@@ -729,7 +730,8 @@ export class Project {
      *                 its file extension.
      */
     shouldExclude(uri, language) {
-        return !this.isSupportedLanguage(uri, language) || this.isUserExcluded(uri);
+        return (!this.isSupportedLanguage(uri, language) && !ConfigService.isConfigFile(uri))
+            || this.isUserExcluded(uri);
     }
     isSupportedLanguage(uri, language) {
         language ??= this.guessLanguageID(uri);

package/lib/source/LanguageError.d.ts

@@ -24,7 +24,7 @@ export declare namespace LanguageError {
      */
     function withPosRange(error: LanguageError, doc: TextDocument): PosRangeLanguageError;
 }
-export declare const enum ErrorSeverity {
+export declare enum ErrorSeverity {
     Hint = 0,
     Information = 1,
     Warning = 2,

package/lib/source/LanguageError.js

@@ -1,7 +1,7 @@
 import { PositionRange } from './PositionRange.js';
 export var LanguageError;
 (function (LanguageError) {
-    function create(message, range, severity = 3 /* ErrorSeverity.Error */, info, source) {
+    function create(message, range, severity = ErrorSeverity.Error, info, source) {
         const ans = { range, message, severity };
         if (info) {
             ans.info = info;
@@ -26,4 +26,11 @@ export var LanguageError;
     }
     LanguageError.withPosRange = withPosRange;
 })(LanguageError || (LanguageError = {}));
+export var ErrorSeverity;
+(function (ErrorSeverity) {
+    ErrorSeverity[ErrorSeverity["Hint"] = 0] = "Hint";
+    ErrorSeverity[ErrorSeverity["Information"] = 1] = "Information";
+    ErrorSeverity[ErrorSeverity["Warning"] = 2] = "Warning";
+    ErrorSeverity[ErrorSeverity["Error"] = 3] = "Error";
+})(ErrorSeverity || (ErrorSeverity = {}));
 //# sourceMappingURL=LanguageError.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/core",
-  "version": "0.4.40",
+  "version": "0.4.41",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,7 +24,7 @@
     "rfdc": "^1.3.0",
     "vscode-languageserver-textdocument": "^1.0.4",
     "whatwg-url": "^14.0.0",
-    "@spyglassmc/locales": "0.3.20"
+    "@spyglassmc/locales": "0.3.21"
   },
   "devDependencies": {
     "@types/decompress": "^4.2.3",