@spyglassmc/core 0.4.20 → 0.4.21

package/lib/node/RecordNode.d.ts

@@ -2,6 +2,7 @@ import type { Range } from '../source/index.js';
 import type { AstNode } from './AstNode.js';
 export interface RecordBaseNode<K extends AstNode, V extends AstNode> extends AstNode {
     readonly children: PairNode<K, V>[];
+    innerRange?: Range;
 }
 export interface RecordNode<K extends AstNode, V extends AstNode> extends RecordBaseNode<K, V> {
     type: 'record';

package/lib/parser/list.js

@@ -45,7 +45,20 @@ export function list({ start, value, sep, trailingSep, end }) {
             }
             // Trailing item sep.
             if (hasValueSep && !trailingSep) {
-                ctx.err.report(localize('parser.list.trailing-sep'), ans.children[ans.children.length - 1].sep);
+                const trailingRange = ans.children[ans.children.length - 1].sep;
+                ctx.err.report(localize('parser.list.trailing-sep'), trailingRange, 3 /* ErrorSeverity.Error */, {
+                    codeAction: {
+                        title: localize('code-action.remove-trailing-separation'),
+                        isPreferred: true,
+                        changes: [
+                            {
+                                type: 'edit',
+                                range: trailingRange,
+                                text: '',
+                            },
+                        ],
+                    },
+                });
             }
             // End.
             if (!src.trySkip(end)) {

package/lib/parser/record.js

@@ -9,6 +9,7 @@ export function record({ start, pair, end }) {
     return (src, ctx) => {
         const ans = { type: 'record', range: Range.create(src), children: [] };
         if (src.trySkip(start)) {
+            ans.innerRange = Range.create(src);
             src.skipWhitespace();
             let requiresPairEnd = false;
             let hasPairEnd = false;
@@ -80,9 +81,23 @@ export function record({ start, pair, end }) {
             }
             // Trailing pair end.
             if (hasPairEnd && !pair.trailingEnd) {
-                ctx.err.report(localize('parser.record.trailing-end'), ans.children[ans.children.length - 1].end);
+                const trailingRange = ans.children[ans.children.length - 1].end;
+                ctx.err.report(localize('parser.record.trailing-end'), trailingRange, 3 /* ErrorSeverity.Error */, {
+                    codeAction: {
+                        title: localize('code-action.remove-trailing-separation'),
+                        isPreferred: true,
+                        changes: [
+                            {
+                                type: 'edit',
+                                range: trailingRange,
+                                text: '',
+                            },
+                        ],
+                    },
+                });
             }
             // End.
+            ans.innerRange.end = src.cursor;
             if (!src.trySkip(end)) {
                 ctx.err.report(localize('expected', localeQuote(end)), src);
             }

package/lib/parser/resourceLocation.js

@@ -104,7 +104,20 @@ 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);
+                ctx.err.report(localize('parser.resource-location.namespace-expected'), ans, 3 /* ErrorSeverity.Error */, {
+                    codeAction: {
+                        title: localize('code-action.add-default-namespace'),
+                        isPreferred: true,
+                        changes: [
+                            {
+                                type: 'edit',
+                                range: Range.create(start),
+                                text: ResourceLocation.DefaultNamespace
+                                    + ResourceLocation.NamespacePathSep,
+                            },
+                        ],
+                    },
+                });
             }
         }
         return ans;

package/lib/processor/codeActions/CodeAction.d.ts

@@ -0,0 +1,8 @@
+import type { AstNode } from '../../node/index.js';
+import type { CodeActionProviderContext } from '../../service/index.js';
+import type { LanguageError, LanguageErrorAction } from '../../source/index.js';
+export interface CodeAction extends LanguageErrorAction {
+    errors?: LanguageError[];
+}
+export type CodeActionProvider<N extends AstNode = AstNode> = (node: N, ctx: CodeActionProviderContext) => readonly CodeAction[];
+//# sourceMappingURL=CodeAction.d.ts.map

package/lib/processor/codeActions/CodeAction.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=CodeAction.js.map

package/lib/processor/codeActions/builtin.d.ts

@@ -0,0 +1,8 @@
+import type { AstNode } from '../../node/index.js';
+import { FileNode } from '../../node/index.js';
+import type { MetaRegistry } from '../../service/index.js';
+import type { CodeActionProvider } from './CodeAction.js';
+export declare const fallback: CodeActionProvider<AstNode>;
+export declare const file: CodeActionProvider<FileNode<AstNode>>;
+export declare function registerProviders(meta: MetaRegistry): void;
+//# sourceMappingURL=builtin.d.ts.map

package/lib/processor/codeActions/builtin.js

@@ -0,0 +1,29 @@
+import { FileNode } from '../../node/index.js';
+import { Range } from '../../source/index.js';
+import { traversePreOrder } from '../util.js';
+export const fallback = (node, ctx) => {
+    const ans = [];
+    traversePreOrder(node, (node) => Range.containsRange(node.range, ctx.range, true), (node) => ctx.meta.hasCodeActionProvider(node.type), (node) => ans.push(...ctx.meta.getCodeActionProvider(node.type)(node, ctx)));
+    return ans;
+};
+export const file = (node, ctx) => {
+    const ans = [];
+    for (const error of FileNode.getErrors(node)) {
+        const action = error.info?.codeAction;
+        if (!action) {
+            continue;
+        }
+        if (!Range.containsRange(error.range, ctx.range, true)) {
+            continue;
+        }
+        ans.push({
+            ...action,
+            errors: [error],
+        });
+    }
+    return ans;
+};
+export function registerProviders(meta) {
+    meta.registerCodeActionProvider('file', file);
+}
+//# sourceMappingURL=builtin.js.map

package/lib/processor/codeActions/index.d.ts

@@ -0,0 +1,3 @@
+export * as codeActions from './builtin.js';
+export * from './CodeAction.js';
+//# sourceMappingURL=index.d.ts.map

package/lib/processor/codeActions/index.js

@@ -0,0 +1,3 @@
+export * as codeActions from './builtin.js';
+export * from './CodeAction.js';
+//# sourceMappingURL=index.js.map

package/lib/processor/completer/builtin.js

@@ -62,7 +62,7 @@ const prefixed = (node, ctx) => {
 };
 export function record(o) {
     return (node, ctx) => {
-        if (!Range.contains(Range.translate(node, 1, -1), ctx.offset, true)) {
+        if (!node.innerRange || !Range.contains(node.innerRange, ctx.offset, true)) {
             return [];
         }
         const completeKeys = (pair) => o.key(node, pair, ctx, pair?.key ?? ctx.offset, false, false, existingKeys);

package/lib/processor/index.d.ts

@@ -1,5 +1,6 @@
 export * from './binder/index.js';
 export * from './checker/index.js';
+export * from './codeActions/index.js';
 export * from './ColorInfoProvider.js';
 export * from './colorizer/index.js';
 export * from './completer/index.js';

package/lib/processor/index.js

@@ -1,5 +1,6 @@
 export * from './binder/index.js';
 export * from './checker/index.js';
+export * from './codeActions/index.js';
 export * from './ColorInfoProvider.js';
 export * from './colorizer/index.js';
 export * from './completer/index.js';

package/lib/processor/linter/builtin/undeclaredSymbol.js

@@ -14,10 +14,21 @@ export const undeclaredSymbol = (node, ctx) => {
         });
     }
     if (Config.Action.isReport(action)) {
+        const info = {};
+        const uriBuilder = ctx.meta.getUriBuilder(node.symbol.category);
+        if (uriBuilder) {
+            const uri = uriBuilder(node.symbol.identifier, ctx);
+            if (uri) {
+                info.codeAction = {
+                    title: localize('code-action.create-undeclared-file', node.symbol.category, localeQuote(node.symbol.identifier)),
+                    changes: [{ type: 'create', uri }],
+                };
+            }
+        }
         const severityOverride = action.report === 'inherit'
             ? undefined
             : LinterSeverity.toErrorSeverity(action.report);
-        ctx.err.lint(localize('linter.undeclared-symbol.message', node.symbol.category, localeQuote(node.symbol.identifier)), node, undefined, severityOverride);
+        ctx.err.lint(localize('linter.undeclared-symbol.message', node.symbol.category, localeQuote(node.symbol.identifier)), node, info, severityOverride);
     }
 };
 function getAction(config, symbol, ctx) {

package/lib/service/Config.js

@@ -107,7 +107,11 @@ export const VanillaConfig = {
     env: {
         dataSource: 'GitHub',
         dependencies: ['@vanilla-datapack', '@vanilla-resourcepack', '@vanilla-mcdoc'],
-        exclude: ['.*/**'],
+        exclude: [
+            '.*/**',
+            '**/node_modules/**',
+            '**/__pycache__/**',
+        ],
         customResources: {},
         feature: {
             codeActions: true,

package/lib/service/Context.d.ts

@@ -112,6 +112,15 @@ interface FormatterContextOptions extends ProcessorContextOptions {
 export declare namespace FormatterContext {
     function create(project: ProjectData, opts: FormatterContextOptions): FormatterContext;
 }
+export interface CodeActionProviderContext extends ProcessorContext {
+    range: Range;
+}
+export interface CodeActionProviderContextOptions extends ProcessorContextOptions {
+    range: Range;
+}
+export declare namespace CodeActionProviderContext {
+    function create(project: ProjectData, opts: CodeActionProviderContextOptions): CodeActionProviderContext;
+}
 export interface ColorizerContext extends ProcessorWithRangeContext {
 }
 export interface ColorizerContextOptions extends ProcessorWithRangeContextOptions {

package/lib/service/Context.js

@@ -104,6 +104,13 @@ export var FormatterContext;
     }
     FormatterContext.create = create;
 })(FormatterContext || (FormatterContext = {}));
+export var CodeActionProviderContext;
+(function (CodeActionProviderContext) {
+    function create(project, opts) {
+        return { ...ProcessorContext.create(project, opts), range: opts.range };
+    }
+    CodeActionProviderContext.create = create;
+})(CodeActionProviderContext || (CodeActionProviderContext = {}));
 export var ColorizerContext;
 (function (ColorizerContext) {
     function create(project, opts) {

package/lib/service/MetaRegistry.d.ts

@@ -3,12 +3,13 @@ import { Lazy } from '../common/index.js';
 import type { AstNode } from '../node/index.js';
 import type { Parser } from '../parser/index.js';
 import type { Formatter } from '../processor/formatter/index.js';
-import type { Binder, Checker, Colorizer, Completer, InlayHintProvider } from '../processor/index.js';
+import type { Binder, Checker, CodeActionProvider, Colorizer, Completer, InlayHintProvider } from '../processor/index.js';
 import type { Linter } from '../processor/linter/Linter.js';
 import type { SignatureHelpProvider } from '../processor/SignatureHelpProvider.js';
 import type { DependencyKey, DependencyProvider } from './Dependency.js';
 import type { FileExtension } from './fileUtil.js';
 import type { SymbolRegistrar } from './SymbolRegistrar.js';
+import type { UriBuilder } from './UriBuilder.js';
 import type { UriBinder, UriSorter, UriSorterRegistration } from './UriProcessor.js';
 export interface LanguageOptions {
     /**
@@ -69,6 +70,9 @@ export declare class MetaRegistry {
     hasChecker<N extends AstNode>(type: N['type']): boolean;
     getChecker<N extends AstNode>(type: N['type']): Checker<N>;
     registerChecker<N extends AstNode>(type: N['type'], checker: Checker<N>): void;
+    hasCodeActionProvider<N extends AstNode>(type: N['type']): boolean;
+    getCodeActionProvider<N extends AstNode>(type: N['type']): CodeActionProvider<N>;
+    registerCodeActionProvider<N extends AstNode>(type: N['type'], codeActionProvider: CodeActionProvider<N>): void;
     hasColorizer<N extends AstNode>(type: N['type']): boolean;
     getColorizer<N extends AstNode>(type: N['type']): Colorizer<N>;
     registerColorizer<N extends AstNode>(type: N['type'], colorizer: Colorizer<N>): void;
@@ -111,6 +115,9 @@ export declare class MetaRegistry {
     getCustom<T>(group: string): Map<string, T> | undefined;
     registerUriBinder(uriBinder: UriBinder): void;
     get uriBinders(): Set<UriBinder>;
+    hasUriBuilder(category: string): boolean;
+    getUriBuilder(category: string): UriBuilder | undefined;
+    registerUriBuilder(category: string, builder: UriBuilder): void;
     setUriSorter(uriSorter: UriSorterRegistration): void;
     get uriSorter(): UriSorter;
 }

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, codeActions, 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.
@@ -12,6 +12,7 @@ export class MetaRegistry {
     #binders = new Map();
     #checkers = new Map();
     #colorizers = new Map();
+    #codeActionProviders = new Map();
     #completers = new Map();
     #dependencyProviders = new Map();
     #formatters = new Map();
@@ -22,10 +23,12 @@ export class MetaRegistry {
     #symbolRegistrars = new Map();
     #custom = new Map();
     #uriBinders = new Set();
+    #uriBuilders = new Map();
     #uriSorter = () => 0;
     constructor() {
         binder.registerBinders(this);
         checker.registerCheckers(this);
+        codeActions.registerProviders(this);
         colorizer.registerColorizers(this);
         completer.registerCompleters(this);
         formatter.registerFormatters(this);
@@ -90,6 +93,15 @@ export class MetaRegistry {
     registerChecker(type, checker) {
         this.#checkers.set(type, checker);
     }
+    hasCodeActionProvider(type) {
+        return this.#codeActionProviders.has(type);
+    }
+    getCodeActionProvider(type) {
+        return this.#codeActionProviders.get(type) ?? codeActions.fallback;
+    }
+    registerCodeActionProvider(type, codeActionProvider) {
+        this.#codeActionProviders.set(type, codeActionProvider);
+    }
     hasColorizer(type) {
         return this.#colorizers.has(type);
     }
@@ -198,6 +210,15 @@ export class MetaRegistry {
     get uriBinders() {
         return this.#uriBinders;
     }
+    hasUriBuilder(category) {
+        return this.#uriBuilders.has(category);
+    }
+    getUriBuilder(category) {
+        return this.#uriBuilders.get(category);
+    }
+    registerUriBuilder(category, builder) {
+        this.#uriBuilders.set(category, builder);
+    }
     setUriSorter(uriSorter) {
         const nextSorter = this.#uriSorter;
         this.#uriSorter = (a, b) => uriSorter(a, b, nextSorter);

package/lib/service/Project.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
 };
-import * as micromatch from 'micromatch';
+import picomatch from 'picomatch';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { bufferToString, Logger, normalizeUri, SingletonPromise, StateProxy, } from '../common/index.js';
 import { FileNode } from '../node/index.js';
@@ -729,7 +729,7 @@ export class Project {
             return false;
         }
         for (const rel of fileUtil.getRels(uri, this.projectRoots)) {
-            if (micromatch.any(rel, this.config.env.exclude)) {
+            if (picomatch(this.config.env.exclude, { dot: true, posixSlashes: false })(rel)) {
                 return true;
             }
         }

package/lib/service/Service.d.ts

@@ -2,7 +2,7 @@ import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { Logger } from '../common/index.js';
 import type { FileNode } from '../node/index.js';
 import { AstNode } from '../node/index.js';
-import type { Color, ColorInfo, ColorToken, InlayHint, SignatureHelp } from '../processor/index.js';
+import type { CodeAction, Color, ColorInfo, ColorToken, InlayHint, SignatureHelp } from '../processor/index.js';
 import { ColorPresentation } from '../processor/index.js';
 import { Range } from '../source/index.js';
 import type { SymbolUsageType } from '../symbol/index.js';
@@ -25,6 +25,7 @@ export declare class Service {
     constructor({ isDebugging, logger, profilers, project }: Options);
     private debug;
     colorize(node: FileNode<AstNode>, doc: TextDocument, range?: Range): readonly ColorToken[];
+    getCodeActions(node: FileNode<AstNode>, doc: TextDocument, range: Range): readonly CodeAction[];
     getColorInfo(node: FileNode<AstNode>, doc: TextDocument): ColorInfo[];
     getColorPresentation(file: FileNode<AstNode>, doc: TextDocument, range: Range, color: Color): ColorPresentation[];
     complete(node: FileNode<AstNode>, doc: TextDocument, offset: number, triggerCharacter?: string): import("../processor/index.js").CompletionItem[];

package/lib/service/Service.js

@@ -2,7 +2,7 @@ import { AstNode } from '../node/index.js';
 import { ColorPresentation, completer, traversePreOrder } from '../processor/index.js';
 import { Range } from '../source/index.js';
 import { SymbolUsageTypes } from '../symbol/index.js';
-import { ColorizerContext, CompleterContext, FormatterContext, ProcessorContext, SignatureHelpProviderContext, } from './Context.js';
+import { CodeActionProviderContext, ColorizerContext, CompleterContext, FormatterContext, ProcessorContext, SignatureHelpProviderContext, } from './Context.js';
 import { fileUtil } from './fileUtil.js';
 import { Hover } from './Hover.js';
 import { ProfilerFactory } from './Profiler.js';
@@ -36,6 +36,18 @@ export class Service {
         }
         return [];
     }
+    getCodeActions(node, doc, range) {
+        try {
+            this.debug(`Getting code actions ${doc.uri} # ${doc.version} @ ${Range.toString(range)}`);
+            const codeActionProvider = this.project.meta.getCodeActionProvider(node.type);
+            const ctx = CodeActionProviderContext.create(this.project, { doc, range });
+            return codeActionProvider(node, ctx);
+        }
+        catch (e) {
+            this.logger.error(`[Service] [getCodeActions] Failed for ${doc.uri} # ${doc.version}`, e);
+        }
+        return [];
+    }
     getColorInfo(node, doc) {
         try {
             this.debug(`Getting color info for ${doc.uri} # ${doc.version}`);

package/lib/service/UriBuilder.d.ts

@@ -0,0 +1,11 @@
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { RootUriString } from '../service/index.js';
+import type { Config } from './Config.js';
+export type UriBuilder = (identifier: string, ctx: UriBuilderContext) => string | undefined;
+export interface UriBuilderContext {
+    doc: TextDocument;
+    project: Record<string, string>;
+    roots: readonly RootUriString[];
+    config: Config;
+}
+//# sourceMappingURL=UriBuilder.d.ts.map

package/lib/service/UriBuilder.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=UriBuilder.js.map

package/lib/service/fileUtil.d.ts

@@ -31,6 +31,8 @@ export declare namespace fileUtil {
      * getRel(['file:///root/foo/', 'file:///root/'], 'file:///outsider.json') // -> undefined
      */
     function getRel(uri: string, rootUris: readonly RootUriString[]): string | undefined;
+    function getRoots(uri: string, rootUris: readonly RootUriString[]): Generator<RootUriString, undefined, unknown>;
+    function getRoot(uri: string, rootUris: readonly RootUriString[]): string | undefined;
     function isRootUri(uri: string): uri is RootUriString;
     function ensureEndingSlash(uri: string): RootUriString;
     function join(fromUri: string, toUri: string): string;

package/lib/service/fileUtil.js

@@ -60,6 +60,20 @@ export var fileUtil;
         return getRels(uri, rootUris).next().value;
     }
     fileUtil.getRel = getRel;
+    function* getRoots(uri, rootUris) {
+        for (const root of rootUris) {
+            const rel = getRelativeUriFromBase(uri, root);
+            if (rel !== undefined) {
+                yield root;
+            }
+        }
+        return undefined;
+    }
+    fileUtil.getRoots = getRoots;
+    function getRoot(uri, rootUris) {
+        return getRoots(uri, rootUris).next().value;
+    }
+    fileUtil.getRoot = getRoot;
     function isRootUri(uri) {
         return uri.endsWith('/');
     }

package/lib/service/index.d.ts

@@ -13,5 +13,6 @@ export * from './Project.js';
 export * from './Service.js';
 export * from './SymbolLocations.js';
 export * from './SymbolRegistrar.js';
+export * from './UriBuilder.js';
 export * from './UriProcessor.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/service/index.js

@@ -14,5 +14,6 @@ export * from './Project.js';
 export * from './Service.js';
 export * from './SymbolLocations.js';
 export * from './SymbolRegistrar.js';
+export * from './UriBuilder.js';
 export * from './UriProcessor.js';
 //# sourceMappingURL=index.js.map

package/lib/source/LanguageError.d.ts

@@ -31,7 +31,7 @@ export declare const enum ErrorSeverity {
     Error = 3
 }
 export interface LanguageErrorInfo {
-    codeAction?: string;
+    codeAction?: LanguageErrorAction;
     deprecated?: boolean;
     unnecessary?: boolean;
     related?: {
@@ -39,4 +39,17 @@ export interface LanguageErrorInfo {
         message: string;
     }[];
 }
+export interface LanguageErrorAction {
+    title: string;
+    isPreferred?: boolean;
+    changes?: CodeActionChange[];
+}
+export type CodeActionChange = {
+    type: 'edit';
+    range: Range;
+    text: string;
+} | {
+    type: 'create';
+    uri: string;
+};
 //# sourceMappingURL=LanguageError.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/core",
-  "version": "0.4.20",
+  "version": "0.4.21",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,17 +19,17 @@
     "chokidar": "^3.5.2",
     "decompress": "^4.2.1",
     "follow-redirects": "^1.14.8",
-    "micromatch": "^4.0.8",
+    "picomatch": "^4.0.2",
     "pako": "^2.0.4",
     "rfdc": "^1.3.0",
     "vscode-languageserver-textdocument": "^1.0.4",
     "whatwg-url": "^14.0.0",
-    "@spyglassmc/locales": "0.3.11"
+    "@spyglassmc/locales": "0.3.12"
   },
   "devDependencies": {
     "@types/decompress": "^4.2.3",
     "@types/follow-redirects": "^1.14.1",
-    "@types/micromatch": "^4.0.9",
+    "@types/picomatch": "^3.0.1",
     "@types/pako": "^2.0.0",
     "@types/whatwg-url": "^11.0.4"
   },