updated deps

README.md

@@ -80,6 +80,26 @@ Type: `String`
 
 [estemplate](https://github.com/RReverser/estemplate) string to be used for generating AST.
 
+#### queryMapper
+
+Custom `queryMapper` RxJS mapper or function that produces such a mapper (when passed `options`).
+
+#### replaces
+
+Custom `replaces` ie. `Rx.Observable.fromArray(...)` or a function that produces it.
+
+#### squery
+
+Custom `squery`, by default `require('grasp-squery')`
+
+#### traverse
+
+Custom `traverse` replacer, by default `require('estraverse').replace`
+
+#### estemplate
+
+Custom `estemplate`, by default `require('estemplate')`
+
 ## License
 
 [MIT License](http://en.wikipedia.org/wiki/MIT_License)

index.js

@@ -2,17 +2,46 @@
 
 var Rx = require('rx');
 var squery = require('grasp-squery');
-var Map = require('es6-map');
+var Map = Map || require('es6-map');
 var traverse = require('estraverse').replace;
 var estemplate = require('estemplate');
 
+function defaultMapper(options) {
+ return function (files) {
+ return files.flatMap(function (file) {
+ return options.replaces
+ .flatMap(function (replace) {
+ var handler = replace.handler;
+
+ return Rx.Observable.fromArray(options.squery.queryParsed(replace.selector, file.program)).map(function (node) {
+ return [node, handler(node)];
+ });
+ })
+ .filter(function (replace) { return replace[1] !== undefined })
+ .toArray()
+ .map(function (replaces) {
+ file.program = options.traverse(file.program, {
+ leave: Map.prototype.get.bind(new Map(replaces))
+ });
+
+ return file;
+ });
+ });
+ }
+}
+
 module.exports = function (options) {
- var replaces = Rx.Observable.fromArray(Object.keys(options)).map(function (selector) {
+ options = options || {}
+ options.squery = options.squery || squery
+ options.traverse = options.traverse || traverse
+ options.estemplate = options.estemplate || estemplate
+
+ var defaultReplaces = Rx.Observable.fromArray(Object.keys(options)).map(function (selector) {
  var handler = options[selector];
 
  if (typeof handler === 'string') {
  var canBeExprStmt = handler.slice(-1) === ';';
- var tmpl = estemplate.compile(handler, {tolerant: true});
+ var tmpl = options.estemplate.compile(handler, {tolerant: true});
 
  handler = function (node) {
  var ast = tmpl(node);
@@ -40,30 +69,17 @@ module.exports = function (options) {
  }
 
  return {
- selector: squery.parse(selector),
+ selector: options.squery.parse(selector),
  handler: handler
  };
  });
 
- return function (files) {
- return files.flatMap(function (file) {
- return replaces
- .flatMap(function (replace) {
- var handler = replace.handler;
+ var replaces = options.replaces || defaultReplaces
+ replaces = typeof replaces === 'function' ? replaces(options) : replaces
+ options.replaces = replaces
 
- return Rx.Observable.fromArray(squery.queryParsed(replace.selector, file.program)).map(function (node) {
- return [node, handler(node)];
- });
- })
- .filter(function (replace) { return replace[1] !== undefined })
- .toArray()
- .map(function (replaces) {
- file.program = traverse(file.program, {
- leave: Map.prototype.get.bind(new Map(replaces))
- });
+ var qMapper = options.queryMapper || defaultMapper
+ qMapper = typeof qMapper === 'function' ? qMapper(options) : qMapper
 
- return file;
- });
- });
- }
+ return qMapper
 };

package.json

@@ -1,6 +1,6 @@
 {
  "name": "aster-squery",
- "version": "0.1.2",
+ "version": "0.1.3",
  "description": "Replace nodes with CSS-like selectors in aster.",
  "author": "Ingvar Stepanyan <me@rreverser.com> (https://github.com/RReverser)",
  "repository": "asterjs/aster-squery",
@@ -21,16 +21,16 @@
  "test": "mocha"
  },
  "dependencies": {
- "es6-map": "^0.1.0",
- "estemplate": "^0.1.1",
- "estraverse": "^1.5.1",
- "grasp-squery": "^0.2.2",
- "rx": "^2.3.11"
+ "es6-map": "^0.1.4",
+ "estemplate": "^0.5.1",
+ "estraverse": "^4.2.0",
+ "grasp-squery": "^0.3.0",
+ "rx": "^4.1.0"
  },
  "devDependencies": {
  "chai": "*",
- "escodegen": "^1.4.1",
- "esprima": "^1.2.2",
+ "escodegen": "^1.8.1",
+ "esprima": "^3.1.0",
  "mocha": "*"
  }
 }

test/test.js

@@ -34,7 +34,11 @@ it('function handler', function (done) {
  })(Rx.Observable.fromArray(input))
  .pluck('program')
  .map(generate)
- .zip(expected, assert.equal)
+ // .zip(expected, assert.equal)
+ .do(function (file) {
+ assert.equal(file, expected[0]);
+ })
+
  .subscribe(function () {}, done, done);
 });
 
@@ -54,6 +58,11 @@ it('template handler', function (done) {
  })(Rx.Observable.fromArray(input))
  .pluck('program')
  .map(generate)
- .zip(expected, assert.equal)
+ // .zip(expected, assert.equal)
+ .do(function (file) {
+ assert.equal(file, expected[0]);
+ // assert.equal(file.program.type, 'Program');
+ })
+
  .subscribe(function () {}, done, done);
 });