cspell-lib 8.14.4 → 8.15.0

package/dist/lib/Document/Document.d.ts

@@ -1,4 +1,4 @@
-import type { Uri } from '../util/Uri.js';
+import type { Uri } from '../util/IUri.js';
 export interface Document {
     uri: UriString;
     text?: string;

package/dist/lib/Document/isBinaryDoc.d.ts

@@ -1,4 +1,4 @@
-import type { Uri } from '../util/Uri.js';
+import type { Uri } from '../util/IUri.js';
 import type { Document } from './Document.js';
 export declare function isBinaryDoc(document: Document): boolean;
 export declare function isBinaryFile(filename: Uri | URL | string, languageId?: string | string[], text?: string): boolean;

package/dist/lib/Models/TextDocument.d.ts

@@ -1,5 +1,5 @@
-import * as Uri from '../util/Uri.js';
-export type DocumentUri = Uri.Uri | URL | string;
+import type { DocumentUri } from '../util/IUri.js';
+export { documentUriToURL } from '../util/Uri.js';
 export interface Position {
     line: number;
     character: number;
@@ -82,5 +82,4 @@ export declare function createTextDocument({ uri, content, languageId, locale, v
 export declare function updateTextDocument(doc: TextDocument, edits: TextDocumentContentChangeEvent[], version?: number): TextDocument;
 export declare function loadTextDocument(filename: string | DocumentUri, languageId?: string): Promise<TextDocument>;
 export declare const isTextDocument: (doc: TextDocument | unknown) => doc is TextDocument;
-export declare function documentUriToURL(uri: DocumentUri): URL;
 //# sourceMappingURL=TextDocument.d.ts.map

package/dist/lib/Models/TextDocument.js

@@ -1,9 +1,9 @@
 import assert from 'node:assert';
-import { toFileURL, toURL } from '@cspell/url';
 import { TextDocument as VsTextDocument } from 'vscode-languageserver-textdocument';
 import { getFileSystem } from '../fileSystem.js';
 import { getLanguagesForBasename } from '../fileTypes.js';
-import * as Uri from '../util/Uri.js';
+import { basename, documentUriToURL, toUri } from '../util/Uri.js';
+export { documentUriToURL } from '../util/Uri.js';
 class TextDocumentImpl {
     languageId;
     locale;
@@ -90,8 +90,8 @@ class TextDocumentImpl {
 }
 export function createTextDocument({ uri, content, languageId, locale, version, }) {
     version = version ?? 1;
-    uri = Uri.toUri(uri);
-    languageId = languageId ?? getLanguagesForBasename(Uri.basename(uri));
+    uri = toUri(uri);
+    languageId = languageId ?? getLanguagesForBasename(basename(uri));
     languageId = languageId.length === 0 ? 'text' : languageId;
     return new TextDocumentImpl(uri, content, languageId, locale, version);
 }
@@ -103,13 +103,10 @@ function isTextDocumentImpl(doc) {
     return doc instanceof TextDocumentImpl;
 }
 export async function loadTextDocument(filename, languageId) {
-    const uri = Uri.toUri(filename);
+    const uri = toUri(filename);
     const url = new URL(uri.toString());
     const file = await getFileSystem().readFile(url);
     return createTextDocument({ uri, languageId, content: file.getText() });
 }
 export const isTextDocument = isTextDocumentImpl;
-export function documentUriToURL(uri) {
-    return toURL(uri instanceof URL ? uri : typeof uri === 'string' ? toFileURL(uri) : new URL(Uri.from(uri).toString()));
-}
 //# sourceMappingURL=TextDocument.js.map

package/dist/lib/spellCheckFile.d.ts

@@ -1,6 +1,6 @@
 import type { CSpellSettingsWithSourceTrace, CSpellUserSettings } from '@cspell/cspell-types';
 import type { Document, DocumentWithText } from './Document/index.js';
-import type { Uri } from './util/Uri.js';
+import type { Uri } from './util/IUri.js';
 import type { ValidateTextOptions, ValidationIssue } from './validator.js';
 export interface SpellCheckFileOptions extends ValidateTextOptions {
     /**

package/dist/lib/util/IUri.d.ts

@@ -0,0 +1,13 @@
+export interface Uri {
+    readonly scheme: string;
+    readonly path: string;
+    readonly authority?: string;
+    readonly fragment?: string;
+    readonly query?: string;
+}
+export interface UriInstance extends Uri {
+    toString(): string;
+    toJSON(): unknown;
+}
+export type DocumentUri = Uri | URL | string;
+//# sourceMappingURL=IUri.d.ts.map

package/dist/lib/util/IUri.js

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

package/dist/lib/util/Uri.d.ts

@@ -1,16 +1,5 @@
 import { URI } from 'vscode-uri';
-import { DocumentUri } from '../Models/TextDocument.js';
-export interface Uri {
-    readonly scheme: string;
-    readonly path: string;
-    readonly authority?: string;
-    readonly fragment?: string;
-    readonly query?: string;
-}
-export interface UriInstance extends Uri {
-    toString(): string;
-    toJSON(): unknown;
-}
+import type { DocumentUri, Uri, UriInstance } from './IUri.js';
 export declare function toUri(uriOrFile: string | Uri | URL): UriInstance;
 export declare function uriToFilePath(uri: DocumentUri): string;
 export declare function fromFilePath(file: string): UriInstance;
@@ -24,7 +13,7 @@ export declare function dirname(uri: Uri): UriInstance;
 export declare function extname(uri: Uri): string;
 export declare function joinPath(uri: Uri, ...paths: string[]): UriInstance;
 export declare function resolvePath(uri: Uri, ...paths: string[]): UriInstance;
-export declare function from(uri: Uri, ...parts: Partial<Uri>[]): UriInstance;
+export declare function uriFrom(uri: Uri, ...parts: Partial<Uri>[]): UriInstance;
 declare class UriImpl extends URI implements UriInstance {
     constructor(uri: Uri);
     toString(): string;
@@ -43,6 +32,7 @@ declare class UriImpl extends URI implements UriInstance {
     static stdin(filePath?: string): UriImpl;
 }
 declare function normalizeFilePath(path: string): string;
+export declare function documentUriToURL(uri: DocumentUri): URL;
 export declare const __testing__: {
     UriImpl: typeof UriImpl;
     normalizeFilePath: typeof normalizeFilePath;

package/dist/lib/util/Uri.js

@@ -1,9 +1,8 @@
 import assert from 'node:assert';
 import { pathToFileURL } from 'node:url';
-import { toFilePathOrHref, toFileURL } from '@cspell/url';
+import { toFilePathOrHref, toFileURL, toURL } from '@cspell/url';
 import { isUrlLike } from 'cspell-io';
 import { URI, Utils } from 'vscode-uri';
-import { documentUriToURL } from '../Models/TextDocument.js';
 const STDIN_PROTOCOL = 'stdin:';
 export function toUri(uriOrFile) {
     if (UriImpl.isUri(uriOrFile))
@@ -69,7 +68,7 @@ export function joinPath(uri, ...paths) {
 export function resolvePath(uri, ...paths) {
     return UriImpl.from(Utils.resolvePath(URI.from(uri), ...paths));
 }
-export function from(uri, ...parts) {
+export function uriFrom(uri, ...parts) {
     return UriImpl.from(uri, ...parts);
 }
 const keys = ['scheme', 'authority', 'path', 'query', 'fragment'];
@@ -155,6 +154,9 @@ function parseStdinUri(uri) {
         fragment: decodeURI(hash),
     };
 }
+export function documentUriToURL(uri) {
+    return toURL(uri instanceof URL ? uri : typeof uri === 'string' ? toFileURL(uri) : new URL(uriFrom(uri).toString()));
+}
 export const __testing__ = {
     UriImpl,
     normalizeFilePath,

package/dist/lib/util/text.d.ts

@@ -1,5 +1,5 @@
 import type { TextDocumentOffset, TextOffset } from '@cspell/cspell-types';
-import type { Uri } from './Uri.js';
+import type { Uri } from './IUri.js';
 export { stringToRegExp } from './textRegex.js';
 export declare function splitCamelCaseWordWithOffset(wo: TextOffset): TextOffset[];
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "8.14.4",
+  "version": "8.15.0",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "module",
   "sideEffects": false,
@@ -33,7 +33,8 @@
     "#test": "vitest run --reporter=hanging-process --reporter=default",
     "test": "vitest run --pool=forks",
     "test:update-snapshot": "vitest run -u",
-    "test:perf": "NODE_ENV=production insight --file \"**/*.perf.{mts,ts}\" --register ts-node/esm",
+    "test:perf": "NODE_ENV=production insight --file \"**/*.perf.{mjs,js}\"",
+    "test:perf:ts": "NODE_ENV=production insight --file \"**/*.perf.{mts,ts}\" --register ts-node/esm",
     "test:perf:prof": "NODE_ENV=production node --cpu-prof ../../node_modules/perf-insight/bin.mjs --file \"dist/**/*.perf.{mjs,js}\" -t 1000"
   },
   "repository": {
@@ -59,22 +60,22 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell/tree/main/packages/cspell-lib#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "8.14.4",
-    "@cspell/cspell-pipe": "8.14.4",
-    "@cspell/cspell-resolver": "8.14.4",
-    "@cspell/cspell-types": "8.14.4",
-    "@cspell/dynamic-import": "8.14.4",
-    "@cspell/filetypes": "8.14.4",
-    "@cspell/strong-weak-map": "8.14.4",
-    "@cspell/url": "8.14.4",
+    "@cspell/cspell-bundled-dicts": "8.15.0",
+    "@cspell/cspell-pipe": "8.15.0",
+    "@cspell/cspell-resolver": "8.15.0",
+    "@cspell/cspell-types": "8.15.0",
+    "@cspell/dynamic-import": "8.15.0",
+    "@cspell/filetypes": "8.15.0",
+    "@cspell/strong-weak-map": "8.15.0",
+    "@cspell/url": "8.15.0",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.5",
-    "cspell-config-lib": "8.14.4",
-    "cspell-dictionary": "8.14.4",
-    "cspell-glob": "8.14.4",
-    "cspell-grammar": "8.14.4",
-    "cspell-io": "8.14.4",
-    "cspell-trie-lib": "8.14.4",
+    "cspell-config-lib": "8.15.0",
+    "cspell-dictionary": "8.15.0",
+    "cspell-glob": "8.15.0",
+    "cspell-grammar": "8.15.0",
+    "cspell-io": "8.15.0",
+    "cspell-trie-lib": "8.15.0",
     "env-paths": "^3.0.0",
     "fast-equals": "^5.0.1",
     "gensequence": "^7.0.0",
@@ -88,14 +89,14 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@cspell/dict-cpp": "^5.1.16",
+    "@cspell/dict-cpp": "^5.1.19",
     "@cspell/dict-csharp": "^4.0.2",
     "@cspell/dict-css": "^4.0.13",
     "@cspell/dict-fa-ir": "^4.0.0",
     "@cspell/dict-fr-fr": "^2.2.2",
-    "@cspell/dict-html": "^4.0.5",
+    "@cspell/dict-html": "^4.0.6",
     "@cspell/dict-nl-nl": "^2.3.0",
-    "@cspell/dict-python": "^4.2.6",
+    "@cspell/dict-python": "^4.2.8",
     "@types/configstore": "^6.0.2",
     "configstore": "^7.0.0",
     "cspell-dict-nl-nl": "^1.1.2",
@@ -103,5 +104,5 @@
     "lorem-ipsum": "^2.0.8",
     "perf-insight": "^1.2.0"
   },
-  "gitHead": "aeedd49f6ef20799eed04076093291fcacbc4b84"
+  "gitHead": "60b04562dfa023eede01929d86fa944163c07256"
 }