Merge pull request #9 from Owstin/develop

3x3 subset scramblers with args!

package.json

@@ -1,10 +1,10 @@
 {
   "name": "scrambow",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Javascript Rubik's Cube Scramble Generator ",
   "repository": {
     "type": "git",
-    "url": "git://github.com/Owstin/scrambo.git"
+    "url": "git://github.com/Owstin/scrambow.git"
   },
   "keywords": [
     "scramble",
@@ -16,7 +16,7 @@
   "author": "Austin Moore <[email protected]>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/Owstin/scrambo/issues"
+    "url": "https://github.com/Owstin/scrambow/issues"
   },
   "main": "./dist/scrambow.js",
   "bin": {

src/cli.ts

@@ -12,10 +12,11 @@ cli
   .parse(process.argv);
 
 const out = new Scrambow();
-let scrambles: Array<Scramble>;
+let scrambles: Scramble[];
 
 try {
   out.setType(cli.type.toLowerCase());
+  out.setArgs(cli.args);
   if (cli.seed) {
     out.setSeed(cli.seed);
   }

src/scramblers.ts

@@ -11,32 +11,17 @@ interface Scrambler {
   version?: string;
   initialize: (randomSource: Seed) => Function | void;
   setRandomSource: (randomSource: Seed) => void;
-  getRandomScramble: () => Scramble;
+  getRandomScramble: (args?: string[]) => Scramble;
   setScrambleLength: (length: number) => void;
 }
 
-interface Scramblers {
-  [key: string]: Scrambler
-}
+type Scramblers = Record<string, Scrambler>;
+
+export const scramblers: Scramblers = {};
+
+const register = (scramblers: Scramblers) =>
+  (name: string, scrambler: Scrambler) => {
+    scramblers[name] = scrambler;
+  };
 
-export let scramblers: Scramblers = {};
-scramblers = require('./scramblers/NNN.js');
-scramblers['222'] = require('./scramblers/222.js');
-scramblers['333'] = require('./scramblers/333/standard.js');
-scramblers.edges = require('./scramblers/333/edges.js');
-scramblers.ll = require('./scramblers/333/ll.js');
-scramblers.lsll = require('./scramblers/333/lsll.js');
-scramblers.zzlsll = require('./scramblers/333/zzlsll.js');
-scramblers.nls = require('./scramblers/333/nls.js');
-scramblers.pll = require('./scramblers/333/pll.js');
-scramblers.zzll = require('./scramblers/333/zzll.js');
-scramblers.cmll = require('./scramblers/333/cmll.js');
-scramblers.cmllsune = require('./scramblers/333/cmllsune.js');
-scramblers.ble = require('./scramblers/333/ble.js');
-scramblers.lccp = require('./scramblers/333/lccp.js');
-scramblers.wv = require('./scramblers/333/wv.js');
-scramblers.clock = require('./scramblers/clock.js');
-scramblers.minx = require('./scramblers/minx.js');
-scramblers.pyram = require('./scramblers/pyram.js');
-scramblers.sq1 = require('./scramblers/sq1.js');
-scramblers.skewb = require('./scramblers/skewb.js');
+require('./scramblers/index.js')(register(scramblers));