@spyglassmc/core 0.4.18 → 0.4.19

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.js

@@ -155,9 +155,12 @@ 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) ?? ''));
+        this.logger.info(`[Project#getTrackedFiles] Listed ${supportedFiles.length} supported files`);
         const filteredFiles = this.ignore.filter(supportedFiles);
+        this.logger.info(`[Project#getTrackedFiles] After ignoring, keeping ${filteredFiles.length} tracked files`);
         return filteredFiles;
     }
     constructor({ cacheRoot, defaultConfig, downloader, externals, fs = FileService.create(externals, cacheRoot), initializers = [], isDebugging = false, logger = Logger.create(), profilers = ProfilerFactory.noop(), projectRoots, }) {
@@ -390,6 +393,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/core",
-  "version": "0.4.18",
+  "version": "0.4.19",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",