@spyglassmc/core 0.4.17 → 0.4.19

package/lib/processor/completer/Completer.d.ts

@@ -65,6 +65,10 @@ export declare namespace CompletionItem {
      * Escape `$`, `\`, and `}` in `textToInsert`
      */
     function escape(textToInsert: string): string;
+    /**
+     * Un-escape `$`, `\`, and `}` in `textToInsert`
+     */
+    function unescape(textToInsert: string): string;
 }
 export declare class InsertTextBuilder {
     #private;

package/lib/processor/completer/Completer.js

@@ -35,6 +35,13 @@ export var CompletionItem;
         return textToInsert.replace(/([\\$}])/g, '\\$1');
     }
     CompletionItem.escape = escape;
+    /**
+     * Un-escape `$`, `\`, and `}` in `textToInsert`
+     */
+    function unescape(textToInsert) {
+        return textToInsert.replace(/\\([\\$}])/g, '$1');
+    }
+    CompletionItem.unescape = unescape;
 })(CompletionItem || (CompletionItem = {}));
 export class InsertTextBuilder {
     #ans = '';

package/lib/processor/completer/builtin.js

@@ -199,7 +199,10 @@ export function escapeString(value, quote) {
     if (!quote) {
         return value;
     }
-    return value.replaceAll('\\', '\\\\').replaceAll(quote, '\\"');
+    // Un-escape and then re-escape completion
+    value = CompletionItem.unescape(value);
+    value = value.replaceAll('\\', '\\\\').replaceAll(quote, '\\"');
+    return CompletionItem.escape(value);
 }
 export const symbol = (node, ctx) => {
     const path = node.options.parentPath ?? [];

package/lib/service/Downloader.js

@@ -53,7 +53,7 @@ export class Downloader {
                             }
                             const deserializer = cache.deserializer ?? ((b) => b);
                             const ans = await transformer(deserializer(cachedBuffer));
-                            this.logger.info(`[Downloader] [${id}] Skipped downloading thanks to cache ${cacheChecksum}`);
+                            this.logger.info(`[Downloader] [${id}] Skipped downloading thanks to cache ${cacheChecksum} (${cachedBuffer.length} bytes)`);
                             return ans;
                         }
                         catch (e) {
@@ -103,7 +103,7 @@ export class Downloader {
                     this.logger.error(`[Downloader] [${id}] Caching file ${cacheUri}`, e);
                 }
             }
-            this.logger.info(`[Downloader] [${id}] Downloaded from ${uri}`);
+            this.logger.info(`[Downloader] [${id}] Downloaded from ${uri} (${buffer.length} bytes)`);
             return await transformer(buffer);
         }
         catch (e) {
@@ -113,7 +113,7 @@ export class Downloader {
                     const cachedBuffer = await fileUtil.readFile(this.externals, cacheUri);
                     const deserializer = cache.deserializer ?? ((b) => b);
                     const ans = await transformer(deserializer(cachedBuffer));
-                    this.logger.warn(`[Downloader] [${id}] Fell back to cached file ${cacheUri}`);
+                    this.logger.warn(`[Downloader] [${id}] Fell back to cached file ${cacheUri} (${cachedBuffer.length} bytes)`);
                     return ans;
                 }
                 catch (e) {

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);
             }
@@ -237,14 +240,16 @@ export class ArchiveUriSupporter {
                         throw new Error(`A different URI with ${archiveName} already exists`);
                     }
                     const files = await externals.archive.decompressBall(await externals.fs.readFile(uri), { stripLevel: typeof info?.startDepth === 'number' ? info.startDepth : 0 });
+                    /// Debug message for #1609
+                    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(`[SpyglassUriSupporter#create] Bad dependency ${uri}`, e);
+                logger.error(`[ArchiveUriSupporter#create] Bad dependency ${uri}`, e);
             }
         }
-        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/lib/source/Source.d.ts

@@ -37,6 +37,8 @@ export declare class ReadonlySource {
      * @param offset The index to offset from cursor. Defaults to 0
      */
     peek(length?: number, offset?: number): string;
+    canRead(length?: number): boolean;
+    canReadInLine(): boolean;
     /**
      * If the `expectedValue` is right after the cursor, returns `true`. Otherwise returns `false`.
      *
@@ -48,8 +50,8 @@ export declare class ReadonlySource {
     tryPeekAfterWhitespace(expectedValue: string): boolean;
     peekUntil(...terminators: string[]): string;
     peekLine(): string;
-    peekRemaining(): string;
-    matchPattern(regex: RegExp): boolean;
+    peekRemaining(offset?: number): string;
+    matchPattern(regex: RegExp, offset?: number): boolean;
     /**
      * If there is a non-space character between `cursor + offset` (inclusive) and the next newline, returns `true`. Otherwise returns `false`.
      *
@@ -67,8 +69,6 @@ export declare class Source extends ReadonlySource {
     get cursor(): number;
     set cursor(cursor: number);
     clone(): Source;
-    canRead(length?: number): boolean;
-    canReadInLine(): boolean;
     read(): string;
     /**
      * Skips the current character.

package/lib/source/Source.js

@@ -59,6 +59,14 @@ export class ReadonlySource {
     peek(length = 1, offset = 0) {
         return this.string.slice(this.innerCursor + offset, this.innerCursor + offset + length);
     }
+    canRead(length = 1) {
+        const needed = this.innerCursor + length;
+        const available = this.string.length;
+        return this.innerCursor + length <= this.string.length;
+    }
+    canReadInLine() {
+        return this.canRead() && this.peek() !== CR && this.peek() !== LF;
+    }
     /**
      * If the `expectedValue` is right after the cursor, returns `true`. Otherwise returns `false`.
      *
@@ -93,11 +101,11 @@ export class ReadonlySource {
     peekLine() {
         return this.peekUntil(CR, LF);
     }
-    peekRemaining() {
-        return this.string.slice(this.innerCursor);
+    peekRemaining(offset = 0) {
+        return this.string.slice(this.innerCursor + offset);
     }
-    matchPattern(regex) {
-        return regex.test(this.peekRemaining());
+    matchPattern(regex, offset = 0) {
+        return regex.test(this.peekRemaining(offset));
     }
     /**
      * If there is a non-space character between `cursor + offset` (inclusive) and the next newline, returns `true`. Otherwise returns `false`.
@@ -149,12 +157,6 @@ export class Source extends ReadonlySource {
         ans.innerCursor = this.innerCursor;
         return ans;
     }
-    canRead(length = 1) {
-        return this.innerCursor + length <= this.string.length;
-    }
-    canReadInLine() {
-        return this.canRead() && this.peek() !== CR && this.peek() !== LF;
-    }
     read() {
         return this.string.charAt(this.innerCursor++);
     }

package/package.json

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