cspell-trie-lib 5.18.4 → 5.19.1

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/lib/distance/distanceAStarWeighted.d.ts

@@ -9,6 +9,7 @@ export interface ExResult {
     a: string;
     b: string;
     cost: number;
+    penalty: number;
     segments: {
         a: string;
         b: string;

package/dist/lib/distance/distanceAStarWeighted.js

@@ -13,17 +13,20 @@ const PairingHeap_1 = require("../utils/PairingHeap");
  */
 function distanceAStarWeighted(wordA, wordB, map, cost = 100) {
     const best = _distanceAStarWeightedEx(wordA, wordB, map, cost);
-    return best ? best.c + best.p : -1;
+    const penalty = map.calcAdjustment(wordB);
+    return best.c + best.p + penalty;
 }
 exports.distanceAStarWeighted = distanceAStarWeighted;
 function distanceAStarWeightedEx(wordA, wordB, map, cost = 100) {
     const best = _distanceAStarWeightedEx(wordA, wordB, map, cost);
     const aa = '^' + wordA + '$';
     const bb = '^' + wordB + '$';
+    const penalty = map.calcAdjustment(wordB);
     const result = {
         a: aa,
         b: bb,
-        cost: best.c + best.p,
+        cost: best.c + best.p + penalty,
+        penalty,
         segments: [],
     };
     const segments = result.segments;

package/dist/lib/distance/formatResultEx.js

@@ -23,7 +23,7 @@ function vizWidth(s) {
 function formatExResult(ex) {
     if (!ex)
         return '<undefined>';
-    const { cost, segments } = ex;
+    const { cost, segments, penalty } = ex;
     const asString = segments.map(({ a, b, c, p }) => ({
         a: `<${a}>`,
         b: `<${b}>`,
@@ -47,7 +47,8 @@ function formatExResult(ex) {
     const b = 'b: |' + parts.map(({ b, w }) => pR(b, w)).join('|') + '|';
     const c = 'c: |' + parts.map(({ c, w }) => pL(c, w)).join('|') + '|';
     const p = 'p: |' + parts.map(({ p, w }) => pL(p, w)).join('|') + '|';
-    return `<${ex.a.slice(1, -1)}> -> <${ex.b.slice(1, -1)}> (${cost})\n${[a, b, c, p].join('\n')}\n`;
+    const penaltyMsg = penalty ? `[+${penalty}]` : '';
+    return `<${ex.a.slice(1, -1)}> -> <${ex.b.slice(1, -1)}> (${cost - penalty}${penaltyMsg})\n${[a, b, c, p].join('\n')}\n`;
 }
 exports.formatExResult = formatExResult;
 function formattedDistance(wordA, wordB, weightMap, cost) {

package/dist/lib/distance/weightedMaps.d.ts

@@ -45,12 +45,24 @@ export interface WeightMap {
     readonly insDel: TrieCost;
     readonly replace: TrieTrieCost;
     readonly swap: TrieTrieCost;
+    readonly adjustments: Map<string, PenaltyAdjustment>;
     calcInsDelCosts(pos: CostPosition): Iterable<CostPosition>;
     calcSwapCosts(pos: CostPosition): Iterable<CostPosition>;
     calcReplaceCosts(pos: CostPosition): Iterable<CostPosition>;
+    calcAdjustment(word: string): number;
+}
+export interface PenaltyAdjustment {
+    /** Penalty Identifier */
+    id: string;
+    /** RegExp Pattern to match */
+    regexp: RegExp;
+    /** Penalty to apply */
+    penalty: number;
 }
 export declare function createWeightMap(...defs: SuggestionCostMapDef[]): WeightMap;
 export declare function addDefToWeightMap(map: WeightMap, def: SuggestionCostMapDef, ...defs: SuggestionCostMapDef[]): WeightMap;
+export declare function addAdjustment(map: WeightMap, ...adjustments: PenaltyAdjustment[]): WeightMap;
+export declare function addAdjustment(map: WeightMap, adjustment: PenaltyAdjustment): WeightMap;
 export declare function addDefsToWeightMap(map: WeightMap, defs: SuggestionCostMapDef[]): WeightMap;
 export declare function splitMapSubstringsIterable(map: string): Iterable<string>;
 export declare function splitMapSubstrings(map: string): string[];

package/dist/lib/distance/weightedMaps.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__testing__ = exports.lookupReplaceCost = exports.prettyPrintWeightMap = exports.prettyPrintSwap = exports.prettyPrintReplace = exports.splitMapSubstrings = exports.splitMapSubstringsIterable = exports.addDefsToWeightMap = exports.addDefToWeightMap = exports.createWeightMap = void 0;
+exports.__testing__ = exports.lookupReplaceCost = exports.prettyPrintWeightMap = exports.prettyPrintSwap = exports.prettyPrintReplace = exports.splitMapSubstrings = exports.splitMapSubstringsIterable = exports.addDefsToWeightMap = exports.addAdjustment = exports.addDefToWeightMap = exports.createWeightMap = void 0;
 const suggestCollector_1 = require("../suggestions/suggestCollector");
 const matchPossibleWordSeparators = /[+∙•・●]/g;
 function createWeightMap(...defs) {
@@ -13,6 +13,13 @@ function addDefToWeightMap(map, ...defs) {
     return addDefsToWeightMap(map, defs);
 }
 exports.addDefToWeightMap = addDefToWeightMap;
+function addAdjustment(map, ...adjustments) {
+    for (const adj of adjustments) {
+        map.adjustments.set(adj.id, adj);
+    }
+    return map;
+}
+exports.addAdjustment = addAdjustment;
 function addDefsToWeightMap(map, defs) {
     function addSet(set, def) {
         addSetToTrieCost(map.insDel, set, def.insDel, def.penalty);
@@ -181,6 +188,7 @@ class _WeightedMap {
         this.insDel = {};
         this.replace = {};
         this.swap = {};
+        this.adjustments = new Map();
     }
     *calcInsDelCosts(pos) {
         const { a, ai, b, bi, c, p } = pos;
@@ -215,6 +223,20 @@ class _WeightedMap {
             }
         }
     }
+    calcAdjustment(word) {
+        let penalty = 0;
+        for (const adj of this.adjustments.values()) {
+            if (adj.regexp.global) {
+                for (const _m of word.matchAll(adj.regexp)) {
+                    penalty += adj.penalty;
+                }
+            }
+            else if (adj.regexp.test(word)) {
+                penalty += adj.penalty;
+            }
+        }
+        return penalty;
+    }
 }
 function prettyPrintInsDel(trie, pfx = '', indent = '  ') {
     function* walk() {

package/dist/lib/io/importExport.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/lib/mappers/mapDictionaryInfo.d.ts

@@ -1,4 +1,6 @@
 import type { DictionaryInformation } from '../models/DictionaryInformation';
 import type { SuggestionCostMapDef } from '../models/suggestionCostsDef';
+import { PenaltyAdjustment } from '../distance/weightedMaps';
 export declare function mapDictionaryInformation(dictInfo: DictionaryInformation): SuggestionCostMapDef[];
+export declare function mapDictionaryInformationToAdjustment(dictInfo: DictionaryInformation): PenaltyAdjustment[];
 //# sourceMappingURL=mapDictionaryInfo.d.ts.map

package/dist/lib/mappers/mapDictionaryInfo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapDictionaryInformation = void 0;
+exports.mapDictionaryInformationToAdjustment = exports.mapDictionaryInformation = void 0;
 const cspell_pipe_1 = require("@cspell/cspell-pipe");
 const locale_1 = require("../models/locale");
 const util_1 = require("../utils/util");
@@ -52,4 +52,18 @@ function processAccents(accents, editCost) {
     const cs = toCharSets(accents, '\u0300-\u0341', editCost.accentCosts);
     return cs.map((cs) => (0, mapToSuggestionCostDef_1.parseAccents)(cs, editCost)).filter(util_1.isDefined);
 }
+function mapDictionaryInformationToAdjustment(dictInfo) {
+    if (!dictInfo.adjustments)
+        return [];
+    return dictInfo.adjustments.map(mapAdjustment);
+}
+exports.mapDictionaryInformationToAdjustment = mapDictionaryInformationToAdjustment;
+function mapAdjustment(adj) {
+    const { id, regexp, penalty } = adj;
+    return {
+        id: id,
+        regexp: new RegExp(regexp),
+        penalty,
+    };
+}
 //# sourceMappingURL=mapDictionaryInfo.js.map

package/dist/lib/mappers/mapDictionaryInfoToWeightMap.js

@@ -10,9 +10,29 @@ const defaultDefs = [
         penalty: 200,
     },
 ];
+const defaultAdjustments = [
+    {
+        id: 'compound-case-change',
+        regexp: /\p{Ll}∙\p{Lu}/gu,
+        penalty: 1000,
+    },
+    {
+        id: 'short-compounds-1',
+        regexp: /^[^∙]{0,2}(?=∙)|∙[^∙]{0,2}(?=∙|$)/gm,
+        penalty: 100,
+    },
+    {
+        id: 'short-compounds-3',
+        regexp: /^[^∙]{3}(?=∙)|∙[^∙]{3}(?=∙|$)/gm,
+        penalty: 50,
+    },
+];
 function mapDictionaryInformationToWeightMap(dictInfo) {
     const defs = (0, mapDictionaryInfo_1.mapDictionaryInformation)(dictInfo).concat(defaultDefs);
-    return (0, weightedMaps_1.createWeightMap)(...defs);
+    const adjustments = (0, mapDictionaryInfo_1.mapDictionaryInformationToAdjustment)(dictInfo);
+    const map = (0, weightedMaps_1.createWeightMap)(...defs);
+    (0, weightedMaps_1.addAdjustment)(map, ...defaultAdjustments, ...adjustments);
+    return map;
 }
 exports.mapDictionaryInformationToWeightMap = mapDictionaryInformationToWeightMap;
 exports.__testing__ = {};

package/dist/lib/suggestions/suggestCollector.js

@@ -150,8 +150,9 @@ function suggestionCollector(wordToMatch, options) {
         const sorted = values.sort(compSuggestionResults).map(cleanCompoundResult);
         let i = Math.min(sorted.length, numSuggestions) - 1;
         const limit = includeTies ? sorted.length : Math.min(sorted.length, numSuggestions);
-        const maxCost = sorted[i].cost;
-        for (++i; i < limit && sorted[i].cost === maxCost; ++i) {
+        const iCost = sorted[i].cost;
+        const maxCost = Math.min(iCost, weightMap ? changeLimit * BASE_COST - 1 : iCost);
+        for (i = 1; i < limit && sorted[i].cost <= maxCost; ++i) {
             // loop
         }
         sorted.length = i;

package/dist/lib/suggestions/walker/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/lib/trie-util.d.ts

@@ -1,6 +1,6 @@
 import { Sequence } from 'gensequence';
 import { PartialTrieOptions, TrieNode, TrieOptions, TrieRoot } from './TrieNode';
-import type { Mandatory, PartialWithUndefined } from './types';
+import type { PartialWithUndefined, RemoveUndefined } from './types';
 import { YieldResult } from './walker';
 export declare function insert(text: string, node?: TrieNode): TrieNode;
 export declare function isWordTerminationNode(node: TrieNode): boolean;
@@ -54,5 +54,5 @@ export declare const normalizeWordToLowercase: (text: string) => string;
  */
 export declare const normalizeWordForCaseInsensitive: (text: string) => string[];
 export declare function isDefined<T>(t: T | undefined): t is T;
-export declare function clean<T>(t: T): Mandatory<T>;
+export declare function clean<T>(t: T): RemoveUndefined<T>;
 //# sourceMappingURL=trie-util.d.ts.map

package/dist/lib/types.d.ts

@@ -66,4 +66,5 @@ export declare type RemoveUndefined<T> = {
  * Make all `undefined` optional and removes the `undefined`
  */
 export declare type UndefinedToOptional<T> = RemoveUndefined<MakeOptional<T>>;
+export declare type ArrayItem<T extends Array<unknown>> = T extends Array<infer R> ? R : never;
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/walker.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-trie-lib",
-  "version": "5.18.4",
+  "version": "5.19.1",
   "description": "Trie Data Structure to support cspell.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,21 +37,21 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-pipe": "^5.18.4",
-    "fs-extra": "^10.0.0",
+    "@cspell/cspell-pipe": "^5.19.1",
+    "fs-extra": "^10.0.1",
     "gensequence": "^3.1.1"
   },
   "engines": {
     "node": ">=12.13.0"
   },
   "devDependencies": {
-    "@cspell/cspell-types": "^5.18.4",
-    "@cspell/dict-en_us": "^2.1.5",
+    "@cspell/cspell-types": "^5.19.1",
+    "@cspell/dict-en_us": "^2.1.7",
     "@cspell/dict-es-es": "^2.1.0",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^17.0.15",
-    "jest": "^27.5.0",
+    "@types/node": "^17.0.21",
+    "jest": "^27.5.1",
     "rimraf": "^3.0.2"
   },
-  "gitHead": "26769ba64ce9eff227492524e5210709bec36416"
+  "gitHead": "622cd59a44bf1f76d538e3cf37983f387c5423e8"
 }