@cspell/cspell-tools 7.0.1-alpha.6 → 7.0.1-alpha.7

package/dist/compile.d.ts

@@ -1,4 +1,5 @@
 import type { CompileCommonAppOptions } from './AppOptions.js';
 import type { FeatureFlags } from './FeatureFlags/index.js';
+export declare const configFileHeader = "# yaml-language-server: $schema=https://raw.githubusercontent.com/streetsidesoftware/cspell/main/packages/cspell-tools/cspell-tools.config.schema.json\n\n";
 export declare function processCompileAction(src: string[], options: CompileCommonAppOptions, featureFlags: FeatureFlags | undefined): Promise<void>;
 //# sourceMappingURL=compile.d.ts.map

package/dist/compile.js

@@ -7,6 +7,7 @@ import { getSystemFeatureFlags, parseFlags } from './FeatureFlags/index.js';
 import { globP } from './util/globP.js';
 getSystemFeatureFlags().register('compound', 'Enable compound dictionary sources.');
 const defaultConfigFile = 'cspell-tools.config.yaml';
+export const configFileHeader = '# yaml-language-server: $schema=https://raw.githubusercontent.com/streetsidesoftware/cspell/main/packages/cspell-tools/cspell-tools.config.schema.json\n\n';
 export async function processCompileAction(src, options, featureFlags) {
     const ff = featureFlags || getSystemFeatureFlags();
     parseFlags(ff, options.experimental || []);
@@ -26,7 +27,7 @@ async function useCompile(src, options) {
     return options.init ? initConfig(request) : compile(request);
 }
 async function initConfig(request) {
-    const content = YAML.stringify(request, null, 2);
+    const content = configFileHeader + YAML.stringify(request, null, 2);
     console.log('Writing config file: %s', defaultConfigFile);
     await writeFile(defaultConfigFile, content);
     console.log(`Init complete.

package/dist/compiler/compile.js

@@ -67,9 +67,9 @@ async function processFiles(action, filesToProcess, mergeTarget) {
     }), opConcatMap(function* (ftp) {
         yield* ftp.words;
         logWithTimestamp('Done processing %s', rel(ftp.src));
-    })
+    }), 
     // opMap((a) => (console.warn(a), a))
-    );
+    logProgress());
     await action(words, dst);
     logWithTimestamp('Done "%s"', rel(dst));
 }
@@ -134,4 +134,18 @@ async function readFileSource(fileSource, sourceOptions) {
 function normalizeTargetName(name) {
     return name.replace(/((\.txt|\.dic|\.aff|\.trie)(\.gz)?)?$/, '').replace(/[^\p{L}\p{M}.\w\\/-]/gu, '_');
 }
+function logProgress(freq = 100000) {
+    function* logProgress(iter) {
+        const _freq = freq;
+        let count = 0;
+        for (const v of iter) {
+            ++count;
+            if (!(count % _freq)) {
+                logWithTimestamp('Progress: Words Processed - %s', count.toLocaleString());
+            }
+            yield v;
+        }
+    }
+    return logProgress;
+}
 //# sourceMappingURL=compile.js.map

package/dist/compiler/createCompileRequest.js

@@ -1,13 +1,13 @@
 import * as path from 'path';
 export function createCompileRequest(sourceFiles, options) {
-    const { max_depth, maxDepth, experimental = [], split, keepRawCase, useLegacySplitter } = options;
+    options = { ...options };
+    options.maxDepth ??= options.max_depth;
+    const { maxDepth, split, keepRawCase, useLegacySplitter } = options;
     const sources = [...sourceFiles, ...(options.listFile || []).map((listFile) => ({ listFile }))];
     const targets = calcTargets(sources, options);
-    const generateNonStrict = experimental.includes('compound') || undefined;
     const req = {
         targets,
-        generateNonStrict,
-        maxDepth: parseNumber(maxDepth) ?? parseNumber(max_depth),
+        maxDepth: parseNumber(maxDepth),
         split: useLegacySplitter ? 'legacy' : split,
         /**
          * Do not generate lower case / accent free versions of words.
@@ -18,17 +18,21 @@ export function createCompileRequest(sourceFiles, options) {
     return req;
 }
 function calcTargets(sources, options) {
-    const { merge, output = '.' } = options;
+    const { merge, output = '.', experimental = [] } = options;
+    const generateNonStrict = experimental.includes('compound') || undefined;
+    // console.log('%o', sources);
     const format = calcFormat(options);
+    const sort = (format === 'plaintext' && options.sort) || undefined;
     if (merge) {
         const target = {
             name: merge,
             targetDirectory: output,
             compress: options.compress,
             format,
-            sources,
-            sort: options.sort,
+            sources: sources.map(normalizeSource),
+            sort,
             trieBase: parseNumber(options.trieBase),
+            generateNonStrict,
         };
         return [target];
     }
@@ -39,9 +43,10 @@ function calcTargets(sources, options) {
             targetDirectory: output,
             compress: options.compress,
             format,
-            sources: [source],
+            sources: [normalizeSource(source)],
             sort: options.sort,
             trieBase: parseNumber(options.trieBase),
+            generateNonStrict,
         };
         return target;
     });
@@ -63,4 +68,17 @@ function baseNameOfSource(source) {
 function isFileSource(source) {
     return typeof source !== 'string' && source.filename !== undefined;
 }
+function normalizeSource(source) {
+    if (typeof source === 'string') {
+        return normalizeSourcePath(source);
+    }
+    if (isFileSource(source))
+        return { ...source, filename: normalizeSourcePath(source.filename) };
+    return { ...source, listFile: normalizeSourcePath(source.listFile) };
+}
+function normalizeSourcePath(source) {
+    const cwd = process.cwd();
+    const rel = path.relative(cwd, source);
+    return rel.split('\\').join('/');
+}
 //# sourceMappingURL=createCompileRequest.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cspell/cspell-tools",
-  "version": "7.0.1-alpha.6",
+  "version": "7.0.1-alpha.7",
   "description": "Tools to assist with the development of cSpell",
   "publishConfig": {
     "access": "public"
@@ -50,13 +50,13 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-pipe": "7.0.1-alpha.6",
+    "@cspell/cspell-pipe": "7.0.1-alpha.7",
     "commander": "^11.0.0",
     "cosmiconfig": "8.0.0",
-    "cspell-trie-lib": "7.0.1-alpha.6",
+    "cspell-trie-lib": "7.0.1-alpha.7",
     "gensequence": "^5.0.2",
     "glob": "^10.3.3",
-    "hunspell-reader": "7.0.1-alpha.6",
+    "hunspell-reader": "7.0.1-alpha.7",
     "yaml": "^2.3.1"
   },
   "engines": {
@@ -72,5 +72,5 @@
     "ts-json-schema-generator": "^1.2.0"
   },
   "main": "bin.js",
-  "gitHead": "42a31c7216a9af068ae4b7c3921f8edd327f756f"
+  "gitHead": "719c2f9f55c79d35074f8493a37de6f40077325d"
 }