.

package.json

@@ -92,8 +92,11 @@
     "@lazy-cjk/zh-table-list": "^1.0.80",
     "@lazy-num/sum": "^1.0.7",
     "@lazy-random/fake-lib-r-math-rng": "^1.0.7",
+    "@lazy-random/preset-seedrandom": "^1.0.7",
+    "@lazy-random/simple-wrap": "^1.0.7",
     "@lazy-random/util-distributions": "^1.0.7",
     "@lazy-random/util-probabilities": "^1.0.7",
+    "@lazy-random/util-test": "^1.0.2",
     "@yarn-tool/find-deps": "^1.0.56",
     "@yarn-tool/ws-changed": "^1.0.65",
     "array-hyper-unique": "^2.0.6",

packages/@novel-segment/sort-dict-table/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.8](https://github.com/bluelovers/ws-segment/compare/@novel-segment/sort-dict-table@1.0.7...@novel-segment/sort-dict-table@1.0.8) (2022-05-21)
+
+
+### 🔖　Miscellaneous
+
+* . ([76e117f](https://github.com/bluelovers/ws-segment/commit/76e117f57ec156de4110d8a872133da17f1260db))
+
+
+
+
+
 ## [1.0.7](https://github.com/bluelovers/ws-segment/compare/@novel-segment/sort-dict-table@1.0.6...@novel-segment/sort-dict-table@1.0.7) (2022-05-21)
 
 

packages/@novel-segment/sort-dict-table/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novel-segment/sort-dict-table",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "",
   "keywords": [
     "NLP",
@@ -118,8 +118,8 @@
   "dependencies": {
     "@novel-segment/loader-line": "^1.0.17",
     "@novel-segment/loaders": "^1.0.32",
-    "@novel-segment/util": "^1.0.59",
-    "@novel-segment/util-compare": "^1.0.6",
+    "@novel-segment/util": "^1.0.60",
+    "@novel-segment/util-compare": "^1.0.7",
     "tslib": "^2.4.0"
   },
   "publishConfig": {

packages/@novel-segment/sort-dict-table/src/index.ts

@@ -16,7 +16,7 @@ export interface IOptions
 	cbIgnore?(cur: IHandleDictTable): any
 }
 
-export function sortLines(lines: string[], file?: string, options?: IOptions)
+export function sortLines(lines: string[], file?: string, options?: IOptions): IHandleDictTable[]
 {
 	const cbIgnore = options?.cbIgnore ?? (() => {});
 

packages/@novel-segment/sort-synonym/dist/index.cjs.development.cjs

@@ -5,7 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var utilCompare = require('@novel-segment/util-compare');
 var arrayHyperUnique = require('array-hyper-unique');
 var loaderLine = require('@novel-segment/loader-line');
-var util = require('@novel-segment/util');
+var conv = require('@novel-segment/util/conv');
+var sort = require('@novel-segment/util/sort');
 
 function sortLines(lines, file) {
   const list = utilCompare.handleDictLines(lines, function (list, cur) {
@@ -19,9 +20,9 @@ function sortLines(lines, file) {
       let ls = cur.data.slice(1);
       ls = arrayHyperUnique.array_unique(ls).filter(v => v != w);
       ls.sort(function (a, b) {
-        let ca = util.getCjkName(a, utilCompare.USE_CJK_MODE);
-        let cb = util.getCjkName(b, utilCompare.USE_CJK_MODE);
-        return util.zhDictCompare(ca, cb) || util.zhDictCompare(a, b);
+        let ca = conv.getCjkName(a, utilCompare.USE_CJK_MODE);
+        let cb = conv.getCjkName(b, utilCompare.USE_CJK_MODE);
+        return sort.zhDictCompare(ca, cb) || sort.zhDictCompare(a, b);
       });
       cur.line = [w].concat(ls).join(',');
 
@@ -30,7 +31,7 @@ function sortLines(lines, file) {
       }
     }
 
-    const cjk_id = util.getCjkName(w, utilCompare.USE_CJK_MODE);
+    const cjk_id = conv.getCjkName(w, utilCompare.USE_CJK_MODE);
     cur.cjk_id = cjk_id;
     return true;
   }, {
@@ -67,7 +68,7 @@ function SortList(ls) {
       return a.index - b.index;
     }
 
-    let ret = util.zhDictCompare(a.cjk_id, b.cjk_id) || util.zhDictCompare(b.data[0], a.data[0]) || a.index - b.index || 0;
+    let ret = sort.zhDictCompare(a.cjk_id, b.cjk_id) || sort.zhDictCompare(a.data[0], b.data[0]) || a.index - b.index || 0;
     return ret;
   });
 }

packages/@novel-segment/sort-synonym/dist/index.cjs.production.min.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@novel-segment/util-compare"),t=require("array-hyper-unique"),i=require("@novel-segment/loader-line"),n=require("@novel-segment/util");function sortLines(i,r){return SortList(e.handleDictLines(i,(function(i,o){o.file=r;let[l]=o.data;if(o.line_type=e.chkLineType(o.line),1===o.line_type)l=l.replace(/^\/\//,"");else if(0===o.line_type){let i=o.data.slice(1);if(i=t.array_unique(i).filter((e=>e!=l)),i.sort((function(t,i){let r=n.getCjkName(t,e.USE_CJK_MODE),o=n.getCjkName(i,e.USE_CJK_MODE);return n.zhDictCompare(r,o)||n.zhDictCompare(t,i)})),o.line=[l].concat(i).join(","),!i.length)return!1}const s=n.getCjkName(l,e.USE_CJK_MODE);return o.cjk_id=s,!0}),{parseFn:e=>e.split(",")}))}function SortList(e){return e.sort((function(e,t){if(2===e.line_type||2===t.line_type){if(2!==t.line_type)return-1;if(2!==e.line_type)return 1;const i=/^\/\/\s+@/.test(e.line),n=/^\/\/\s+@/.test(t.line);return i&&!n?-1:!i&&n?1:e.index-t.index}return 1===e.line_type&&1===t.line_type?e.index-t.index:n.zhDictCompare(e.cjk_id,t.cjk_id)||n.zhDictCompare(t.data[0],e.data[0])||e.index-t.index||0}))}exports.SortList=SortList,exports.default=sortLines,exports.loadFile=function loadFile(e){return i.load(e).then((t=>sortLines(t,e)))},exports.sortLines=sortLines;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@novel-segment/util-compare"),t=require("array-hyper-unique"),i=require("@novel-segment/loader-line"),n=require("@novel-segment/util/conv"),r=require("@novel-segment/util/sort");function sortLines(i,o){return SortList(e.handleDictLines(i,(function(i,l){l.file=o;let[s]=l.data;if(l.line_type=e.chkLineType(l.line),1===l.line_type)s=s.replace(/^\/\//,"");else if(0===l.line_type){let i=l.data.slice(1);if(i=t.array_unique(i).filter((e=>e!=s)),i.sort((function(t,i){let o=n.getCjkName(t,e.USE_CJK_MODE),l=n.getCjkName(i,e.USE_CJK_MODE);return r.zhDictCompare(o,l)||r.zhDictCompare(t,i)})),l.line=[s].concat(i).join(","),!i.length)return!1}const u=n.getCjkName(s,e.USE_CJK_MODE);return l.cjk_id=u,!0}),{parseFn:e=>e.split(",")}))}function SortList(e){return e.sort((function(e,t){if(2===e.line_type||2===t.line_type){if(2!==t.line_type)return-1;if(2!==e.line_type)return 1;const i=/^\/\/\s+@/.test(e.line),n=/^\/\/\s+@/.test(t.line);return i&&!n?-1:!i&&n?1:e.index-t.index}return 1===e.line_type&&1===t.line_type?e.index-t.index:r.zhDictCompare(e.cjk_id,t.cjk_id)||r.zhDictCompare(e.data[0],t.data[0])||e.index-t.index||0}))}exports.SortList=SortList,exports.default=sortLines,exports.loadFile=function loadFile(e){return i.load(e).then((t=>sortLines(t,e)))},exports.sortLines=sortLines;
 //# sourceMappingURL=index.cjs.production.min.cjs.map

packages/@novel-segment/sort-synonym/dist/index.esm.mjs

@@ -4,7 +4,9 @@ import { array_unique as i } from "array-hyper-unique";
 
 import { load as r } from "@novel-segment/loader-line";
 
-import { getCjkName as l, zhDictCompare as o } from "@novel-segment/util";
+import { getCjkName as o } from "@novel-segment/util/conv";
+
+import { zhDictCompare as l } from "@novel-segment/util/sort";
 
 function sortLines(r, s) {
   return SortList(e(r, (function(e, r) {
@@ -13,12 +15,12 @@ function sortLines(r, s) {
     if (r.line_type = t(r.line), 1 === r.line_type) u = u.replace(/^\/\//, ""); else if (0 === r.line_type) {
       let e = r.data.slice(1);
       if (e = i(e).filter((e => e != u)), e.sort((function(e, t) {
-        let i = l(e, n), r = l(t, n);
-        return o(i, r) || o(e, t);
+        let i = o(e, n), r = o(t, n);
+        return l(i, r) || l(e, t);
       })), r.line = [ u ].concat(e).join(","), !e.length) return !1;
     }
-    const a = l(u, n);
-    return r.cjk_id = a, !0;
+    const f = o(u, n);
+    return r.cjk_id = f, !0;
   }), {
     parseFn: e => e.split(",")
   }));
@@ -36,7 +38,7 @@ function SortList(e) {
       const n = /^\/\/\s+@/.test(e.line), i = /^\/\/\s+@/.test(t.line);
       return n && !i ? -1 : !n && i ? 1 : e.index - t.index;
     }
-    return 1 === e.line_type && 1 === t.line_type ? e.index - t.index : o(e.cjk_id, t.cjk_id) || o(t.data[0], e.data[0]) || e.index - t.index || 0;
+    return 1 === e.line_type && 1 === t.line_type ? e.index - t.index : l(e.cjk_id, t.cjk_id) || l(e.data[0], t.data[0]) || e.index - t.index || 0;
   }));
 }
 

packages/@novel-segment/sort-synonym/src/index.ts

@@ -9,8 +9,8 @@ import {
 import { array_unique } from 'array-hyper-unique';
 import { ArrayTwoOrMore } from '@novel-segment/types';
 import { load } from '@novel-segment/loader-line';
-import { getCjkName, zhDictCompare } from '@novel-segment/util';
-import { EnumSortCompareOrder } from '@novel-segment/util/sort';
+import { getCjkName } from '@novel-segment/util/conv';
+import { EnumSortCompareOrder, zhDictCompare } from '@novel-segment/util/sort';
 
 export type IHandleDictSynonym = ILoadDictFileRow2<ArrayTwoOrMore<string>>
 
@@ -115,7 +115,7 @@ export function SortList<T extends ILoadDictFileRow2<any> = ILoadDictFileRow2>(l
 		}
 
 		let ret = zhDictCompare(a.cjk_id, b.cjk_id)
-			|| zhDictCompare(b.data[0], a.data[0])
+			|| zhDictCompare(a.data[0], b.data[0])
 			|| (a.index - b.index)
 			|| EnumSortCompareOrder.KEEP
 		;