@spyglassmc/core 0.4.39 → 0.4.40

package/lib/common/TwoWayMap.d.ts

@@ -12,10 +12,10 @@ export declare class TwoWayMap<K, V> implements Map<K, V> {
     hasValue(value: V): boolean;
     set(key: K, value: V): this;
     forEach(callbackfn: (value: V, key: K, map: TwoWayMap<K, V>) => void, thisArg?: any): void;
-    entries(): IterableIterator<[K, V]>;
-    keys(): IterableIterator<K>;
-    values(): IterableIterator<V>;
-    [Symbol.iterator](): IterableIterator<[K, V]>;
+    entries(): MapIterator<[K, V]>;
+    keys(): MapIterator<K>;
+    values(): MapIterator<V>;
+    [Symbol.iterator](): MapIterator<[K, V]>;
     [Symbol.toStringTag]: string;
 }
 //# sourceMappingURL=TwoWayMap.d.ts.map

package/lib/common/externals/BrowserExternals.js

@@ -113,7 +113,7 @@ class BrowserFileSystem {
         if (typeof data === 'string') {
             data = new TextEncoder().encode(data);
         }
-        data = arrayBufferToBase64(data);
+        data = arrayBufferToBase64(data.buffer);
         this.states[location] = { type: 'file', content: data };
         this.saveStates();
     }
@@ -135,7 +135,7 @@ export const BrowserExternals = {
             if (typeof data === 'string') {
                 data = new TextEncoder().encode(data);
             }
-            const hash = await crypto.subtle.digest('SHA-1', data);
+            const hash = await crypto.subtle.digest('SHA-1', data.buffer);
             return uint8ArrayToHex(new Uint8Array(hash));
         },
     },

package/lib/common/externals/NodeJsExternals.d.ts

@@ -1,25 +1,20 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import chokidar from 'chokidar';
-import decompress from 'decompress';
-import { Buffer } from 'node:buffer';
 import { EventEmitter } from 'node:events';
 import fs from 'node:fs';
-import type { RootUriString } from '../../index.js';
+import type { DecompressedFile, RootUriString } from '../../index.js';
 import type { FsLocation, FsWatcher } from './index.js';
 export declare function getNodeJsExternals({ cacheRoot }?: {
     cacheRoot?: RootUriString;
 }): Readonly<{
     archive: {
-        decompressBall(buffer: Uint8Array, options: {
-            stripLevel?: number | undefined;
-        } | undefined): Promise<decompress.File[]>;
-        gunzip(buffer: Uint8Array): Promise<Buffer>;
-        gzip(buffer: Uint8Array): Promise<Buffer>;
+        decompressBall(buffer: Uint8Array<ArrayBuffer>, options: {
+            stripLevel?: number;
+        } | undefined): Promise<DecompressedFile[]>;
+        gunzip(buffer: Uint8Array<ArrayBuffer>): Promise<NonSharedBuffer>;
+        gzip(buffer: Uint8Array<ArrayBuffer>): Promise<NonSharedBuffer>;
     };
     crypto: {
-        getSha1(data: string | Uint8Array): Promise<string>;
+        getSha1(data: string | Uint8Array<ArrayBuffer>): Promise<string>;
     };
     error: {
         createKind(kind: import("./index.js").ExternalErrorKind, message: string): Error;
@@ -31,18 +26,18 @@ export declare function getNodeJsExternals({ cacheRoot }?: {
     fs: {
         chmod(location: FsLocation, mode: number): Promise<void>;
         mkdir(location: FsLocation, options: {
-            mode?: number | undefined;
-            recursive?: boolean | undefined;
+            mode?: number;
+            recursive?: boolean;
         } | undefined): Promise<undefined>;
-        readdir(location: FsLocation): Promise<fs.Dirent[]>;
-        readFile(location: FsLocation): Promise<Buffer>;
+        readdir(location: FsLocation): Promise<fs.Dirent<string>[]>;
+        readFile(location: FsLocation): Promise<NonSharedBuffer>;
         showFile(location: FsLocation): Promise<void>;
         stat(location: FsLocation): Promise<fs.Stats>;
         unlink(location: FsLocation): Promise<void>;
         watch(locations: FsLocation[], { usePolling }?: {
-            usePolling?: boolean | undefined;
+            usePolling?: boolean;
         }): ChokidarWatcherWrapper;
-        writeFile(location: FsLocation, data: string | Uint8Array, options: {
+        writeFile(location: FsLocation, data: string | Uint8Array<ArrayBuffer>, options: {
             mode: number;
         } | undefined): Promise<void>;
     };
@@ -53,14 +48,14 @@ export declare function getNodeJsExternals({ cacheRoot }?: {
 }>;
 export declare const NodeJsExternals: Readonly<{
     archive: {
-        decompressBall(buffer: Uint8Array, options: {
-            stripLevel?: number | undefined;
-        } | undefined): Promise<decompress.File[]>;
-        gunzip(buffer: Uint8Array): Promise<Buffer>;
-        gzip(buffer: Uint8Array): Promise<Buffer>;
+        decompressBall(buffer: Uint8Array<ArrayBuffer>, options: {
+            stripLevel?: number;
+        } | undefined): Promise<DecompressedFile[]>;
+        gunzip(buffer: Uint8Array<ArrayBuffer>): Promise<NonSharedBuffer>;
+        gzip(buffer: Uint8Array<ArrayBuffer>): Promise<NonSharedBuffer>;
     };
     crypto: {
-        getSha1(data: string | Uint8Array): Promise<string>;
+        getSha1(data: string | Uint8Array<ArrayBuffer>): Promise<string>;
     };
     error: {
         createKind(kind: import("./index.js").ExternalErrorKind, message: string): Error;
@@ -72,18 +67,18 @@ export declare const NodeJsExternals: Readonly<{
     fs: {
         chmod(location: FsLocation, mode: number): Promise<void>;
         mkdir(location: FsLocation, options: {
-            mode?: number | undefined;
-            recursive?: boolean | undefined;
+            mode?: number;
+            recursive?: boolean;
         } | undefined): Promise<undefined>;
-        readdir(location: FsLocation): Promise<fs.Dirent[]>;
-        readFile(location: FsLocation): Promise<Buffer>;
+        readdir(location: FsLocation): Promise<fs.Dirent<string>[]>;
+        readFile(location: FsLocation): Promise<NonSharedBuffer>;
         showFile(location: FsLocation): Promise<void>;
         stat(location: FsLocation): Promise<fs.Stats>;
         unlink(location: FsLocation): Promise<void>;
         watch(locations: FsLocation[], { usePolling }?: {
-            usePolling?: boolean | undefined;
+            usePolling?: boolean;
         }): ChokidarWatcherWrapper;
-        writeFile(location: FsLocation, data: string | Uint8Array, options: {
+        writeFile(location: FsLocation, data: string | Uint8Array<ArrayBuffer>, options: {
             mode: number;
         } | undefined): Promise<void>;
     };

package/lib/common/externals/index.d.ts

@@ -1,17 +1,17 @@
 import type { Uri } from '../util.js';
 export interface Externals {
     archive: {
-        decompressBall: (buffer: Uint8Array, options?: {
+        decompressBall: (buffer: Uint8Array<ArrayBuffer>, options?: {
             stripLevel?: number;
         }) => Promise<DecompressedFile[]>;
-        gzip: (buffer: Uint8Array) => Promise<Uint8Array>;
-        gunzip: (buffer: Uint8Array) => Promise<Uint8Array>;
+        gzip: (buffer: Uint8Array<ArrayBuffer>) => Promise<Uint8Array<ArrayBuffer>>;
+        gunzip: (buffer: Uint8Array<ArrayBuffer>) => Promise<Uint8Array<ArrayBuffer>>;
     };
     crypto: {
         /**
          * @returns SHA-1 digest of the given data in hexadecimal format.
          */
-        getSha1: (data: string | Uint8Array) => Promise<string>;
+        getSha1: (data: string | Uint8Array<ArrayBuffer>) => Promise<string>;
     };
     error: {
         /**
@@ -33,7 +33,7 @@ export interface Externals {
     };
 }
 export interface DecompressedFile {
-    data: Uint8Array;
+    data: Uint8Array<ArrayBuffer>;
     mode: number;
     mtime: string;
     path: string;
@@ -63,7 +63,7 @@ export interface ExternalFileSystem {
         isFile(): boolean;
         isSymbolicLink(): boolean;
     }[]>;
-    readFile(location: FsLocation): Promise<Uint8Array>;
+    readFile(location: FsLocation): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * Show the file/directory in the platform-specific explorer program.
      *
@@ -81,7 +81,7 @@ export interface ExternalFileSystem {
     /**
      * @param options `mode` - File mode bit mask (e.g. `0o775`).
      */
-    writeFile(location: FsLocation, data: string | Uint8Array, options?: {
+    writeFile(location: FsLocation, data: string | Uint8Array<ArrayBuffer>, options?: {
         mode: number;
     }): Promise<void>;
 }

package/lib/common/util.d.ts

@@ -68,7 +68,7 @@ export declare namespace TypePredicates {
     function isString(value: unknown): value is string;
 }
 export declare function promisifyAsyncIterable<T, U>(iterable: AsyncIterable<T>, joiner: (chunks: T[]) => U): Promise<U>;
-export declare function parseGzippedJson(externals: Externals, buffer: Uint8Array): Promise<unknown>;
+export declare function parseGzippedJson(externals: Externals, buffer: Uint8Array<ArrayBuffer>): Promise<unknown>;
 /**
  * @returns Is Plain Old JavaScript Object (POJO).
  */

package/lib/service/Config.d.ts

@@ -255,7 +255,7 @@ export declare class ConfigService implements ExternalEventEmitter {
     #private;
     private readonly project;
     private readonly defaultConfig;
-    static readonly ConfigFileNames: readonly ["spyglass.json", ".spyglassrc.json"];
+    static readonly ConfigFileNames: readonly ["spyglass.json", ".spyglassrc", ".spyglassrc.json"];
     constructor(project: Project, defaultConfig?: Config);
     on(event: 'changed', callbackFn: (data: ConfigEvent) => void): this;
     on(event: 'error', callbackFn: (data: ErrorEvent) => void): this;

package/lib/service/Config.js

@@ -219,7 +219,7 @@ export const VanillaConfig = {
 export class ConfigService {
     project;
     defaultConfig;
-    static ConfigFileNames = Object.freeze(['spyglass.json', '.spyglassrc.json']);
+    static ConfigFileNames = Object.freeze(['spyglass.json', '.spyglassrc', '.spyglassrc.json']);
     #eventEmitter;
     constructor(project, defaultConfig = VanillaConfig) {
         this.project = project;

package/lib/service/Dependency.d.ts

@@ -8,7 +8,7 @@ export type Dependency = {
 } | {
     type: 'tarball-ram';
     name: string;
-    data: Uint8Array;
+    data: Uint8Array<ArrayBuffer>;
     stripLevel?: number;
 };
 export type DependencyKey = `@${string}`;

package/lib/service/FileService.d.ts

@@ -15,7 +15,7 @@ export interface UriProtocolSupporter {
      * @returns The content of the file at `uri`.
      * @throws If the URI doesn't exist in the file system.
      */
-    readFile(uri: string): Promise<Uint8Array>;
+    readFile(uri: string): Promise<Uint8Array<ArrayBuffer>>;
     listFiles(): Iterable<string>;
     /**
      * Each URI in this array must end with a slash (`/`).
@@ -58,7 +58,7 @@ export declare class FileServiceImpl implements FileService {
      * A two-way map from mapped physical URIs to virtual URIs.
      */
     private readonly map;
-    constructor(externals: Externals, virtualUrisRoot?: `${string}/` | undefined);
+    constructor(externals: Externals, virtualUrisRoot?: RootUriString | undefined);
     register(protocol: Protocol, supporter: UriProtocolSupporter, force?: boolean): void;
     unregister(protocol: Protocol): void;
     /**
@@ -74,9 +74,9 @@ export declare class FileServiceImpl implements FileService {
     /**
      * @throws
      */
-    readFile(uri: string): Promise<Uint8Array>;
-    listFiles(): Generator<string, void, undefined>;
-    listRoots(): Generator<`${string}/`, void, undefined>;
+    readFile(uri: string): Promise<Uint8Array<ArrayBuffer>>;
+    listFiles(): Generator<string, void, any>;
+    listRoots(): Generator<`${string}/`, void, any>;
     mapToDisk(virtualUri: string): Promise<string | undefined>;
     mapFromDisk(mappedUri: string): string;
 }
@@ -87,8 +87,8 @@ export declare class FileUriSupporter implements UriProtocolSupporter {
     readonly protocol = "file:";
     private constructor();
     hash(uri: string): Promise<string>;
-    readFile(uri: string): Promise<Uint8Array>;
-    listFiles(): Generator<string, void, undefined>;
+    readFile(uri: string): Promise<Uint8Array<ArrayBuffer>>;
+    listFiles(): Generator<string, void, unknown>;
     listRoots(): `${string}/`[];
     mapToDisk(uri: string): Promise<string | undefined>;
     static create(dependencies: readonly Dependency[], externals: Externals, logger: Logger): Promise<FileUriSupporter>;
@@ -98,14 +98,13 @@ export declare class ArchiveUriSupporter implements UriProtocolSupporter {
     private readonly logger;
     private readonly entries;
     static readonly Protocol = "archive:";
-    private static readonly SupportedArchiveExtnames;
     readonly protocol = "archive:";
     /**
      * @param entries A map from archive names to unzipped entries.
      */
     private constructor();
     hash(uri: string): Promise<string>;
-    readFile(uri: string): Promise<Uint8Array>;
+    readFile(uri: string): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * @throws
      */

package/lib/service/FileService.js

@@ -161,7 +161,6 @@ export class ArchiveUriSupporter {
     logger;
     entries;
     static Protocol = 'archive:';
-    static SupportedArchiveExtnames = ['.tar', '.tar.bz2', '.tar.gz', '.zip'];
     protocol = ArchiveUriSupporter.Protocol;
     /**
      * @param entries A map from archive names to unzipped entries.

package/lib/service/Service.d.ts

@@ -28,7 +28,7 @@ export declare class Service {
     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[];
+    complete(node: FileNode<AstNode>, doc: TextDocument, offset: number, triggerCharacter?: string): import("../index.js").CompletionItem[];
     dataHackPubify(initialism: string): string;
     format(node: FileNode<AstNode>, doc: TextDocument, tabSize: number, insertSpaces: boolean): string;
     getHover(file: FileNode<AstNode>, doc: TextDocument, offset: number): Hover | undefined;

package/lib/service/fileUtil.d.ts

@@ -72,7 +72,7 @@ export declare namespace fileUtil {
     function getAllFiles(externals: Externals, root: FsLocation, depth?: number): Promise<string[]>;
     function markReadOnly(externals: Externals, path: FsLocation): Promise<void>;
     function unlink(externals: Externals, path: FsLocation): Promise<void>;
-    function readFile(externals: Externals, path: FsLocation): Promise<Uint8Array>;
+    function readFile(externals: Externals, path: FsLocation): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * @throws
      *
@@ -85,7 +85,7 @@ export declare namespace fileUtil {
      * * Mode: `0o666` (`rw-rw-rw-`)
      * * Flag: `w`
      */
-    function writeFile(externals: Externals, path: FsLocation, data: Uint8Array | string, mode?: number): Promise<void>;
+    function writeFile(externals: Externals, path: FsLocation, data: Uint8Array<ArrayBuffer> | string, mode?: number): Promise<void>;
     /**
      * @throws
      */
@@ -99,11 +99,11 @@ export declare namespace fileUtil {
     /**
      * @throws
      */
-    function readGzippedFile(externals: Externals, path: FsLocation): Promise<Uint8Array>;
+    function readGzippedFile(externals: Externals, path: FsLocation): Promise<Uint8Array<ArrayBuffer>>;
     /**
      * @throws
      */
-    function writeGzippedFile(externals: Externals, path: FsLocation, buffer: Uint8Array | string): Promise<void>;
+    function writeGzippedFile(externals: Externals, path: FsLocation, buffer: Uint8Array<ArrayBuffer> | string): Promise<void>;
     /**
      * @throws
      */

package/lib/symbol/SymbolUtil.d.ts

@@ -206,7 +206,7 @@ export declare class SymbolUtil implements ExternalEventEmitter {
         type: SymbolUsageType;
         location: SymbolLocation;
     }) => unknown): void;
-    static isVisibilityInGlobal(v: SymbolVisibility | undefined): boolean;
+    static isVisibilityInGlobal(v: SymbolVisibility | undefined): v is SymbolVisibility.Public | SymbolVisibility.Restricted | undefined;
     static areVisibilitiesCompatible(v1: SymbolVisibility | undefined, v2: SymbolVisibility | undefined): boolean;
 }
 interface SymbolAddition {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/core",
-  "version": "0.4.39",
+  "version": "0.4.40",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,7 +11,7 @@
   },
   "scripts": {
     "release": "npm publish",
-    "release:dry": "npm publish --dry-run"
+    "release:dry": "npm publish --tag latest --dry-run"
   },
   "dependencies": {
     "base64-arraybuffer": "^1.0.2",
@@ -24,7 +24,7 @@
     "rfdc": "^1.3.0",
     "vscode-languageserver-textdocument": "^1.0.4",
     "whatwg-url": "^14.0.0",
-    "@spyglassmc/locales": "0.3.19"
+    "@spyglassmc/locales": "0.3.20"
   },
   "devDependencies": {
     "@types/decompress": "^4.2.3",