@cspell/cspell-tools 7.3.1 → 7.3.3

package/dist/compiler/Reader.d.ts

@@ -1,4 +1,3 @@
 import type { Reader, ReaderOptions } from './readers/ReaderOptions.js';
-export declare const regHunspellFile: RegExp;
 export declare function createReader(filename: string, options: ReaderOptions): Promise<Reader>;
 //# sourceMappingURL=Reader.d.ts.map

package/dist/compiler/Reader.js

@@ -1,7 +1,7 @@
 import { readHunspellFiles } from './readers/readHunspellFiles.js';
+import { regHunspellFile } from './readers/regHunspellFile.js';
 import { textFileReader } from './readers/textFileReader.js';
 import { trieFileReader } from './readers/trieFileReader.js';
-export const regHunspellFile = /\.(dic|aff)$/i;
 // Readers first match wins
 const readers = [
     { test: /\.trie\b/, method: trieFileReader },

package/dist/compiler/readers/readHunspellFiles.js

@@ -1,7 +1,7 @@
 import { pipe } from '@cspell/cspell-pipe/sync';
 import { COMPOUND_FIX, FORBID_PREFIX } from 'cspell-trie-lib';
 import * as HR from 'hunspell-reader';
-import { regHunspellFile } from '../Reader.js';
+import { regHunspellFile } from './regHunspellFile.js';
 const DEDUPE_SIZE = 1000;
 export async function readHunspellFiles(filename, options) {
     const dicFile = filename.replace(regHunspellFile, '.dic');

package/dist/compiler/readers/readTextFile.js

@@ -1,17 +1,19 @@
+import assert from 'assert';
 import { promises as fs } from 'fs';
-import { promisify } from 'util';
-import * as zlib from 'zlib';
-const gunzip = promisify(zlib.gunzip);
+import { decompress } from '../../gzip/index.js';
 const isGzFile = /\.gz$/;
 export function readTextFile(filename) {
     const content = fs
         .readFile(filename)
-        .then((buffer) => (isGzFile.test(filename) ? gunzip(buffer) : buffer))
-        .then((buffer) => buffer.toString('utf8'));
+        .then(async (buffer) => (isGzFile.test(filename) ? decompress(buffer) : buffer))
+        .then((buffer) => (assertIsBuffer(buffer), buffer.toString('utf8')));
     return content;
 }
 export async function readTextFileLines(filename) {
     const content = await readTextFile(filename);
     return content.split('\n');
 }
+function assertIsBuffer(value) {
+    assert(Buffer.isBuffer(value));
+}
 //# sourceMappingURL=readTextFile.js.map

package/dist/compiler/readers/regHunspellFile.d.ts

@@ -0,0 +1,2 @@
+export declare const regHunspellFile: RegExp;
+//# sourceMappingURL=regHunspellFile.d.ts.map

package/dist/compiler/readers/regHunspellFile.js

@@ -0,0 +1,2 @@
+export const regHunspellFile = /\.(dic|aff)$/i;
+//# sourceMappingURL=regHunspellFile.js.map

package/dist/compiler/wordListParser.js

@@ -106,7 +106,8 @@ export function createParseFileLineMapper(options) {
     function splitLine(line) {
         line = line.replace(/#.*/, ''); // remove comment
         line = line.trim();
-        line = line.replace(/\bU\+[0-9A-F]+\b/gi, '|'); // Remove Unicode Definitions
+        line = line.replace(/\bU\+[0-9A-F]{4}\b/gi, '|'); // Remove Unicode Definitions
+        line = line.replace(/\\U[0-9A-F]{4}/gi, '|'); // Remove Unicode Definitions
         line = line.replace(regNonWordOrDigit, '|');
         line = line.replace(/'(?=\|)/g, ''); // remove trailing '
         line = line.replace(/'$/, ''); // remove trailing '
@@ -121,8 +122,7 @@ export function createParseFileLineMapper(options) {
             .map((a) => a.trim())
             .filter((a) => !!a)
             .filter((a) => !a.match(/^[0-9_-]+$/)) // pure numbers and symbols
-            .filter((a) => !a.match(/^[ux][0-9A-F]*$/i)) // hex digits
-            .filter((a) => !a.match(/^0[xo][0-9A-F]*$/i)); // c-style hex/octal digits
+            .filter((a) => !a.match(/^0[xo][0-9A-F]+$/i)); // c-style hex/octal digits
         return lines;
     }
     function* splitWords(lines) {

package/dist/compiler/writeTextToFile.js

@@ -1,12 +1,10 @@
 import { promises as fs } from 'fs';
-import { promisify } from 'util';
-import * as zlib from 'zlib';
-const gzip = promisify(zlib.gzip);
+import { compress } from '../gzip/index.js';
 const isGzFile = /\.gz$/;
 export async function writeTextToFile(filename, data) {
     const useGz = isGzFile.test(filename);
     const buf = Buffer.from(data, 'utf-8');
-    const buffer = useGz ? await gzip(buf) : buf;
+    const buffer = useGz ? await compress(buf) : buf;
     await fs.writeFile(filename, buffer);
 }
 export function writeTextLinesToFile(filename, lines) {

package/dist/gzip/compressFiles.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 export declare enum OSFlags {
+    auto = -1,
     FAT = 0,
     Unix = 3,
     HPFS = 6,
@@ -8,6 +9,7 @@ export declare enum OSFlags {
 }
 export declare function compressFile(file: string, os?: OSFlags): Promise<string>;
 export declare function compress(buf: string | Uint8Array | Buffer, os?: OSFlags): Promise<Uint8Array>;
+export declare function compressSync(buf: string | Uint8Array | Buffer, os?: OSFlags): Uint8Array;
 export declare function decompress(buf: Uint8Array | Buffer, encoding?: undefined): Promise<Uint8Array>;
 export declare function decompress(buf: Uint8Array | Buffer, encoding: 'utf8'): Promise<string>;
 export declare function decompress(buf: Uint8Array | Buffer, encoding: 'utf8' | undefined): Promise<string | Uint8Array>;

package/dist/gzip/compressFiles.js

@@ -1,10 +1,11 @@
 import { readFile, writeFile } from 'node:fs/promises';
 import { promisify } from 'node:util';
-import { gunzip as gunzipCB, gzip as gz } from 'node:zlib';
+import { gunzip as gunzipCB, gzip as gz, gzipSync } from 'node:zlib';
 const gzip = promisify(gz);
 const gunzip = promisify(gunzipCB);
 export var OSFlags;
 (function (OSFlags) {
+    OSFlags[OSFlags["auto"] = -1] = "auto";
     OSFlags[OSFlags["FAT"] = 0] = "FAT";
     OSFlags[OSFlags["Unix"] = 3] = "Unix";
     OSFlags[OSFlags["HPFS"] = 6] = "HPFS";
@@ -22,8 +23,13 @@ export async function compressFile(file, os) {
     return targetFile;
 }
 export async function compress(buf, os) {
-    const zBuf = await gzip(buf);
-    const osFlag = os ?? zBuf[OSSystemIDOffset];
+    return fixOSSystemID(await gzip(buf), os);
+}
+export function compressSync(buf, os) {
+    return fixOSSystemID(gzipSync(buf), os);
+}
+function fixOSSystemID(zBuf, os = OSFlags.Unix) {
+    const osFlag = os == OSFlags.auto ? zBuf[OSSystemIDOffset] : os;
     zBuf[OSSystemIDOffset] = osFlag;
     return zBuf;
 }

package/dist/gzip/index.d.ts

@@ -1,3 +1,3 @@
-export { compressFile, OSFlags } from './compressFiles.js';
+export { compress, compressFile, decompress, OSFlags } from './compressFiles.js';
 export { gzip } from './gzip.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/gzip/index.js

@@ -1,3 +1,3 @@
-export { compressFile, OSFlags } from './compressFiles.js';
+export { compress, compressFile, decompress, OSFlags } from './compressFiles.js';
 export { gzip } from './gzip.js';
 //# sourceMappingURL=index.js.map

package/dist/test/TestHelper.d.ts

@@ -29,12 +29,11 @@ export interface TestHelper {
      */
     mkdir(...parts: string[]): void;
     /**
-     * copy files
-     * same as shell.cp
+     * copy file
      * @param from
      * @param to
      */
-    cp(from: string, to: string): void;
+    cpFileSync(from: string, to: string): void;
     packageTemp(...parts: string[]): string;
     /**
      * Signal the start of a test.

package/dist/test/TestHelper.js

@@ -1,7 +1,6 @@
 import assert from 'assert';
-import { promises as fs } from 'fs';
+import { mkdirSync, promises as fs, readFileSync, rmSync, statSync, writeFileSync } from 'fs';
 import * as path from 'path';
-import * as shell from 'shelljs';
 import { fileURLToPath } from 'url';
 import { expect } from 'vitest';
 const _dirname = test_dirname(import.meta.url);
@@ -41,7 +40,7 @@ class TestHelperImpl {
      * delete the contents of the temp directory for the current test.
      */
     clearTempDir() {
-        shell.rm('-rf', this.resolveTemp());
+        rmSync(this.resolveTemp(), { force: true, recursive: true });
     }
     /**
      * resolve a path relative to the
@@ -59,15 +58,17 @@ class TestHelperImpl {
      */
     mkdir(...parts) {
         const pTemp = this.resolveTemp(...parts);
-        shell.mkdir('-p', pTemp);
+        mkdirSync(pTemp, { recursive: true });
     }
     /**
      * Copy files from src to dest
      * @param src - glob
      * @param dest - directory or file
      */
-    cp(src, dest) {
-        shell.cp(this.resolveTemp(src), this.resolveTemp(dest));
+    cpFileSync(src, dest) {
+        const srcT = this.resolveTemp(src);
+        const dstT = this.resolveTemp(dest);
+        cpFileSync(srcT, dstT);
     }
     /**
      * resolve a path to the fixtures.
@@ -102,9 +103,17 @@ export function resolvePathToFixture(...segments) {
     return path.resolve(fixtureDir, ...segments);
 }
 export function test_dirname(importMetaUrl) {
-    return path.dirname(test_filename(importMetaUrl));
+    return fileURLToPath(new URL('.', importMetaUrl));
 }
 export function test_filename(importMetaUrl) {
     return fileURLToPath(importMetaUrl);
 }
+function cpFileSync(srcFile, dst) {
+    const statDst = statSync(dst, { throwIfNoEntry: false });
+    if (statDst && statDst.isDirectory()) {
+        dst = path.join(dst, path.basename(srcFile));
+    }
+    const buf = readFileSync(srcFile);
+    writeFileSync(dst, buf);
+}
 //# sourceMappingURL=TestHelper.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cspell/cspell-tools",
-  "version": "7.3.1",
+  "version": "7.3.3",
   "description": "Tools to assist with the development of cSpell",
   "publishConfig": {
     "access": "public"
@@ -48,13 +48,13 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-pipe": "7.3.1",
+    "@cspell/cspell-pipe": "7.3.3",
     "commander": "^11.0.0",
     "cosmiconfig": "8.0.0",
-    "cspell-trie-lib": "7.3.1",
+    "cspell-trie-lib": "7.3.3",
     "gensequence": "^5.0.2",
     "glob": "^10.3.4",
-    "hunspell-reader": "7.3.1",
+    "hunspell-reader": "7.3.3",
     "yaml": "^2.3.2"
   },
   "engines": {
@@ -64,9 +64,8 @@
     "@types/glob": "^8.1.0",
     "@types/shelljs": "^0.8.12",
     "lorem-ipsum": "^2.0.8",
-    "shelljs": "^0.8.5",
     "ts-json-schema-generator": "^1.3.0"
   },
   "module": "bin.mjs",
-  "gitHead": "999b382d928e8288ebb8be5b056d04116213f4ee"
+  "gitHead": "da65ffafaa6a039cedc52d9e029c53ddd273a1fb"
 }