2.3.2-alpha.0

Author: righ

typescript/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "covertable",
-  "version": "2.3.1",
+  "version": "2.3.2-alpha.0",
   "description": "A flexible pairwise tool written in TypeScript",
   "homepage": "https://github.com/walkframe/covertable",
   "repository": {

typescript/package.json

@@ -1,5 +1,5 @@
 import { default as make, sorters, criteria } from '../index';
-import { product, combinations, range, len, all, getItems } from '../utils';
+import { product, combinations, range, len, all, getItems } from '../lib';
 import { FactorsType, Scalar, Dict, PairType } from '../types';
 
 const getPairs = function* (factors: FactorsType, length = 2) {

typescript/src/__tests__/index.test.ts

@@ -1,5 +1,5 @@
 import {CriterionArgsType, IncompleteType, PairType} from '../types';
-import {getCandidate, combinations, ascOrder, unique} from '../utils';
+import {getCandidate, combinations, ascOrder, unique} from '../lib';
 
 const getNumRemovablePairs = (indexes: Set<number>, incomplete: IncompleteType, length: number) => {
   let num = 0;

typescript/src/criteria/greedy.ts

@@ -1,5 +1,5 @@
 import {CriterionArgsType, IncompleteType, PairType} from '../types';
-import {getCandidate} from '../utils';
+import {getCandidate} from '../lib';
 
 export default function* (
   incomplete: IncompleteType,

typescript/src/criteria/index.ts

@@ -1,6 +1,11 @@
-import * as sorters from "./sorters/index";
-import * as criteria from "./criteria/index";
-import * as exceptions from "./exceptions";
+
+import hash from "./sorters/hash";
+import random from "./sorters/random";
+
+import greedy from "./criteria/greedy";
+import simple from "./criteria/simple";
+
+import {InvalidCondition} from "./exceptions";
 import {
   range,
   product,
@@ -11,7 +16,8 @@ import {
   ascOrder,
   primeGenerator,
   unique,
-} from "./utils";
+} from "./lib";
+
 import {
   IndicesType,
   FactorsType,
@@ -162,7 +168,7 @@ class Row extends Map<Scalar, number> implements RowType {
       }
     });
     if (!this.filled()) {
-      throw new exceptions.InvalidCondition();
+      throw new InvalidCondition();
     }
     return this;
   }
@@ -174,8 +180,8 @@ const makeAsync = function* <T extends FactorsType>(
 ) {
   let {
     length = 2,
-    sorter = sorters.hash,
-    criterion = criteria.greedy,
+    sorter = hash,
+    criterion = greedy,
     seed = "",
     tolerance = 0,
   } = options;
@@ -235,6 +241,14 @@ const make = <T extends FactorsType>(factors: T, options: OptionsType = {}) => {
   return [...makeAsync(factors, options)];
 };
 
-export { make as default, make, makeAsync, sorters, criteria };
+const sorters = { hash, random };
+const criteria = { greedy, simple };
+
+export { 
+  make as default, 
+  make, 
+  makeAsync, 
+  sorters, 
+  criteria,
+};
 
-export { PictConstraintsLexer } from "./utils/pict";

typescript/src/criteria/simple.ts

@@ -1,6 +1,8 @@
 // @ts-ignore 2307
 export { hex as md5 } from 'js-md5';
-import { FactorsType, Scalar, ParentsType, CandidateType, PairType } from './types';
+import { 
+  FactorsType, Scalar, ParentsType, CandidateType, PairType,
+} from './types';
 
 // https://gist.github.com/righ/71e32be8e33f74bde516c06f80c941e8
 

typescript/src/index.ts

@@ -1,4 +1,4 @@
-import {md5} from '../utils';
+import {md5} from '../lib';
 import {
   PairType,
   SortArgsType,