@spyglassmc/core 0.4.18 → 0.4.20

package/lib/service/CacheService.js

@@ -130,8 +130,8 @@ export class CacheService {
                 ans.unchangedFiles.push(uri);
                 continue;
             }
-            if (this.project.ignore.ignores(uri)) {
-                ans.unchangedFiles.push(uri);
+            if (this.project.shouldExclude(uri)) {
+                ans.removedFiles.push(uri);
                 continue;
             }
             try {

package/lib/service/Config.d.ts

@@ -59,7 +59,7 @@ export interface EnvConfig {
      */
     dependencies: string[];
     /**
-     * A list of file patterns to exclude. Each value in this array can either be a glob pattern or the special string `@gitignore`.
+     * A list of file patterns to exclude.
      */
     exclude: string[];
     /**

package/lib/service/Config.js

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

package/lib/service/FileService.d.ts

@@ -95,6 +95,7 @@ export declare class FileUriSupporter implements UriProtocolSupporter {
 }
 export declare class ArchiveUriSupporter implements UriProtocolSupporter {
     private readonly externals;
+    private readonly logger;
     private readonly entries;
     static readonly Protocol = "archive:";
     private static readonly SupportedArchiveExtnames;

package/lib/service/FileService.js

@@ -154,6 +154,7 @@ export class FileUriSupporter {
 }
 export class ArchiveUriSupporter {
     externals;
+    logger;
     entries;
     static Protocol = 'archive:';
     static SupportedArchiveExtnames = ['.tar', '.tar.bz2', '.tar.gz', '.zip'];
@@ -161,8 +162,9 @@ export class ArchiveUriSupporter {
     /**
      * @param entries A map from archive names to unzipped entries.
      */
-    constructor(externals, entries) {
+    constructor(externals, logger, entries) {
         this.externals = externals;
+        this.logger = logger;
         this.entries = entries;
     }
     async hash(uri) {
@@ -199,6 +201,7 @@ export class ArchiveUriSupporter {
     }
     *listFiles() {
         for (const [archiveName, files] of this.entries.entries()) {
+            this.logger.info(`[ArchiveUriSupporter#listFiles] Listing ${files.size} files from ${archiveName}`);
             for (const file of files.values()) {
                 yield ArchiveUriSupporter.getUri(archiveName, file.path);
             }
@@ -236,27 +239,17 @@ export class ArchiveUriSupporter {
                     if (entries.has(archiveName)) {
                         throw new Error(`A different URI with ${archiveName} already exists`);
                     }
-                    /// Debug message for #1609
-                    logger.info(`[ArchiveUriSupporter#create] Extracting archive ${archiveName} from ${uri}`);
                     const files = await externals.archive.decompressBall(await externals.fs.readFile(uri), { stripLevel: typeof info?.startDepth === 'number' ? info.startDepth : 0 });
-                    const newEntries = new Map(files.map((f) => [f.path.replace(/\\/g, '/'), f]));
                     /// Debug message for #1609
-                    logger.info(`[ArchiveUriSupporter#create] Extracted ${files.length} files, adding ${newEntries.size} entries`);
-                    for (const [path, entry] of [...newEntries.entries()].slice(0, 20)) {
-                        logger.info(`[ArchiveUriSupporter#create] ${path} (${entry.data.length} bytes)`);
-                    }
-                    entries.set(archiveName, newEntries);
+                    logger.info(`[ArchiveUriSupporter#create] Extracted ${files.length} files from ${archiveName}`);
+                    entries.set(archiveName, new Map(files.map((f) => [f.path.replace(/\\/g, '/'), f])));
                 }
             }
             catch (e) {
                 logger.error(`[ArchiveUriSupporter#create] Bad dependency ${uri}`, e);
             }
         }
-        /// Debug message for #1609
-        logger.info(`[ArchiveUriSupporter#create] Finalizing with ${entries.size} archives: ${[
-            ...entries.keys(),
-        ]}`);
-        return new ArchiveUriSupporter(externals, entries);
+        return new ArchiveUriSupporter(externals, logger, entries);
     }
 }
 async function hashFile(externals, uri) {

package/lib/service/Project.d.ts

@@ -1,4 +1,3 @@
-import type { Ignore } from 'ignore';
 import type { TextDocumentContentChangeEvent } from 'vscode-languageserver-textdocument';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import type { ExternalEventEmitter, Externals } from '../common/index.js';
@@ -98,11 +97,9 @@ export type ProjectData = Pick<Project, 'cacheRoot' | 'config' | 'downloader' |
 export declare class Project implements ExternalEventEmitter {
     #private;
     private static readonly RootSuffix;
-    private static readonly GitIgnore;
     readonly cacheService: CacheService;
     get isReady(): boolean;
     config: Config;
-    ignore: Ignore;
     readonly downloader: Downloader;
     readonly externals: Externals;
     readonly fs: FileService;
@@ -161,7 +158,6 @@ export declare class Project implements ExternalEventEmitter {
     getTrackedFiles(): string[];
     constructor({ cacheRoot, defaultConfig, downloader, externals, fs, initializers, isDebugging, logger, profilers, projectRoots, }: ProjectOptions);
     private setInitPromise;
-    private readGitignore;
     private setReadyPromise;
     /**
      * Load the config file and initialize parsers and processors.
@@ -203,6 +199,7 @@ export declare class Project implements ExternalEventEmitter {
     ensureClientManagedChecked(uri: string): Promise<DocAndNode | undefined>;
     getClientManaged(uri: string): DocAndNode | undefined;
     showCacheRoot(): Promise<void>;
+    shouldExclude(uri: string): boolean;
     private tryClearingCache;
     private shouldRemove;
     private isOnlyWatched;

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 ignore from 'ignore';
+import * as micromatch from 'micromatch';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { bufferToString, Logger, normalizeUri, SingletonPromise, StateProxy, } from '../common/index.js';
 import { FileNode } from '../node/index.js';
@@ -63,7 +63,6 @@ const CacheAutoSaveInterval = 600_000; // 10 Minutes.
  */
 export class Project {
     static RootSuffix = '/pack.mcmeta';
-    static GitIgnore = '.gitignore';
     /** Prevent circular binding. */
     #bindingInProgressUris = new Set();
     #cacheSaverIntervalId;
@@ -85,7 +84,6 @@ export class Project {
         return this.#isReady;
     }
     config;
-    ignore = ignore();
     downloader;
     externals;
     fs;
@@ -155,10 +153,11 @@ export class Project {
      */
     getTrackedFiles() {
         const extensions = this.meta.getSupportedFileExtensions();
+        this.logger.info(`[Project#getTrackedFiles] Supported file extensions: ${extensions}`);
         const supportedFiles = [...this.#dependencyFiles ?? [], ...this.#watchedFiles]
             .filter((file) => extensions.includes(fileUtil.extname(file) ?? ''));
-        const filteredFiles = this.ignore.filter(supportedFiles);
-        return filteredFiles;
+        this.logger.info(`[Project#getTrackedFiles] Listed ${supportedFiles.length} supported files`);
+        return supportedFiles;
     }
     constructor({ cacheRoot, defaultConfig, downloader, externals, fs = FileService.create(externals, cacheRoot), initializers = [], isDebugging = false, logger = Logger.create(), profilers = ProfilerFactory.noop(), projectRoots, }) {
         this.#cacheRoot = cacheRoot;
@@ -224,21 +223,6 @@ export class Project {
         });
     }
     setInitPromise() {
-        const loadConfig = async () => {
-            this.config = await this.#configService.load();
-            this.ignore = ignore();
-            for (const pattern of this.config.env.exclude) {
-                if (pattern === '@gitignore') {
-                    const gitignore = await this.readGitignore();
-                    if (gitignore) {
-                        this.ignore.add(gitignore);
-                    }
-                }
-                else {
-                    this.ignore.add(pattern);
-                }
-            }
-        };
         const callIntializers = async () => {
             const initCtx = {
                 cacheRoot: this.cacheRoot,
@@ -268,29 +252,13 @@ export class Project {
             this.symbols = new SymbolUtil(symbols, this.externals.event.EventEmitter);
             this.symbols.buildCache();
             __profiler.task('Load Cache');
-            await loadConfig();
+            this.config = await this.#configService.load();
             __profiler.task('Load Config');
             await callIntializers();
             __profiler.task('Initialize').finalize();
         };
         this.#initPromise = init();
     }
-    async readGitignore() {
-        if (this.projectRoots.length === 0) {
-            return undefined;
-        }
-        try {
-            const uri = this.projectRoots[0] + Project.GitIgnore;
-            const contents = await this.externals.fs.readFile(uri);
-            return bufferToString(contents);
-        }
-        catch (e) {
-            if (!this.externals.error.isKind(e, 'ENOENT')) {
-                this.logger.error(`[Project] [readGitignore]`, e);
-            }
-        }
-        return undefined;
-    }
     setReadyPromise() {
         const getDependencies = async () => {
             const ans = [];
@@ -336,15 +304,24 @@ export class Project {
                 this.#watcherReady = true;
                 resolve();
             }).on('add', (uri) => {
+                if (this.shouldExclude(uri)) {
+                    return;
+                }
                 this.#watchedFiles.add(uri);
                 if (this.#watcherReady) {
                     this.emit('fileCreated', { uri });
                 }
             }).on('change', (uri) => {
+                if (this.shouldExclude(uri)) {
+                    return;
+                }
                 if (this.#watcherReady) {
                     this.emit('fileModified', { uri });
                 }
             }).on('unlink', (uri) => {
+                if (this.shouldExclude(uri)) {
+                    return;
+                }
                 this.#watchedFiles.delete(uri);
                 if (this.#watcherReady) {
                     this.emit('fileDeleted', { uri });
@@ -390,6 +367,17 @@ export class Project {
             __profiler.task('Bind URIs');
             const files = [...addedFiles, ...changedFiles].sort(this.meta.uriSorter);
             __profiler.task('Sort URIs');
+            const fileCountByExtension = new Map();
+            for (const file of files) {
+                const ext = fileUtil.extname(file)?.replace(/^\./, '');
+                if (ext) {
+                    fileCountByExtension.set(ext, (fileCountByExtension.get(ext) ?? 0) + 1);
+                }
+            }
+            this.logger.info(`[Project#ready] == Files to bind ==`);
+            for (const [ext, count] of fileCountByExtension.entries()) {
+                this.logger.info(`[Project#ready] File extension ${ext}: ${count}`);
+            }
             const __bindProfiler = this.profilers.get('project#ready#bind', 'top-n', 50);
             for (const uri of files) {
                 await this.ensureBindingStarted(uri);
@@ -657,6 +645,9 @@ export class Project {
         if (!fileUtil.isFileUri(uri)) {
             return; // We only accept `file:` scheme for client-managed URIs.
         }
+        if (this.shouldExclude(uri)) {
+            return;
+        }
         const doc = TextDocument.create(uri, languageID, version, content);
         const node = this.parse(doc);
         this.#clientManagedUris.add(uri);
@@ -676,6 +667,9 @@ export class Project {
         if (!fileUtil.isFileUri(uri)) {
             return; // We only accept `file:` scheme for client-managed URIs.
         }
+        if (this.shouldExclude(uri)) {
+            return;
+        }
         const doc = this.#clientManagedDocAndNodes.get(uri)?.doc;
         if (!doc) {
             throw new Error(`TextDocument for ${uri} is not cached. This should not happen. Did the language client send a didChange notification without sending a didOpen one, or is there a logic error on our side resulting the 'read' function overriding the 'TextDocument' created in the 'didOpen' notification handler?`);
@@ -730,6 +724,17 @@ export class Project {
             this.logger.error('[Service#showCacheRoot]', e);
         }
     }
+    shouldExclude(uri) {
+        if (this.config.env.exclude.length === 0) {
+            return false;
+        }
+        for (const rel of fileUtil.getRels(uri, this.projectRoots)) {
+            if (micromatch.any(rel, this.config.env.exclude)) {
+                return true;
+            }
+        }
+        return false;
+    }
     tryClearingCache(uri) {
         if (this.shouldRemove(uri)) {
             this.removeCachedTextDocument(uri);

package/package.json

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