jest-watch-typeahead 0.1.0-2 → 0.2.1

package/CHANGELOG.md

@@ -1,10 +1,30 @@
 ## master
 
+## 0.2.0
+
+### Features
+
+- Add support for plugin config ([#13](https://github.com/jest-community/jest-watch-typeahead/pull/13))
+
+### Fixes
+
+- Make matching case insensitive ([#18](https://github.com/jest-community/jest-watch-typeahead/pull/18))
+- fix: migrate to use jest-watcher ([#6](https://github.com/jest-community/jest-watch-typeahead/pull/6))
+
+### Chore & Maintenance
+
+- Upgrade Prettier to 1.13.7 ([#17](https://github.com/jest-community/jest-watch-typeahead/pull/17))
+- New directory structure ([#14](https://github.com/jest-community/jest-watch-typeahead/pull/14))
+- Move ansi-escapes to dependencies _23f22d4_
+- Setup Travis and add tests ([#12](https://github.com/jest-community/jest-watch-typeahead/pull/12))
+
+## 0.1.0
+
 ### Features
 
-* Add test name typeahead ([#1](https://github.com/jest-community/jest-watch-typeahead/pull/1))
-* Rename to jest-watch-typeahead
+- Add test name typeahead ([#1](https://github.com/jest-community/jest-watch-typeahead/pull/1))
+- Rename to jest-watch-typeahead
 
-### 0.0.1
+## 0.0.1
 
 Initial Release

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Rogelio Guzman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -51,6 +51,22 @@ module.exports = {
 };
 ```
 
+### Configuring your key and prompt name
+
+```js
+module.exports = {
+  watchPlugins: [
+    [
+      'jest-watch-typeahead/filename',
+      {
+        key: 'k',
+        prompt: 'do something with my custom prompt',
+      },
+    ],
+  ],
+};
+```
+
 ### Run Jest in watch mode
 
 ```bash

package/build/file_name_pattern_prompt.js

@@ -4,10 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
-
 var _chalk = require('chalk');
 
 var _chalk2 = _interopRequireDefault(_chalk);
@@ -16,11 +12,9 @@ var _stringLength = require('string-length');
 
 var _stringLength2 = _interopRequireDefault(_stringLength);
 
-var _utils = require('./lib/utils');
-
-var _Prompt = require('./shared/Prompt');
+var _jestWatcher = require('jest-watcher');
 
-var _Prompt2 = _interopRequireDefault(_Prompt);
+var _utils = require('./lib/utils');
 
 var _pattern_mode_helpers = require('./shared/pattern_mode_helpers');
 
@@ -28,120 +22,84 @@ var _scroll2 = require('./shared/scroll');
 
 var _scroll3 = _interopRequireDefault(_scroll2);
 
-var _pattern_prompt = require('./shared/pattern_prompt');
-
-var _pattern_prompt2 = _interopRequireDefault(_pattern_prompt);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+class FileNamePatternPrompt extends _jestWatcher.PatternPrompt {
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+  constructor(pipe, prompt) {
+    super(pipe, prompt);
+    this._entityName = 'filenames';
+    this._searchSources = [];
+  }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+  _onChange(pattern, options) {
+    super._onChange(pattern, options);
+    this._printTypeahead(pattern, options);
+  }
 
-var FileNamePatternPrompt = function (_PatternPrompt) {
-  _inherits(FileNamePatternPrompt, _PatternPrompt);
+  _printTypeahead(pattern, options) {
+    const matchedTests = this._getMatchedTests(pattern);
+    const total = matchedTests.length;
+    const pipe = this._pipe;
+    const prompt = this._prompt;
 
-  function FileNamePatternPrompt(pipe, prompt) {
-    _classCallCheck(this, FileNamePatternPrompt);
+    (0, _jestWatcher.printPatternCaret)(pattern, pipe);
 
-    var _this = _possibleConstructorReturn(this, (FileNamePatternPrompt.__proto__ || Object.getPrototypeOf(FileNamePatternPrompt)).call(this, pipe, prompt));
+    if (pattern) {
+      (0, _pattern_mode_helpers.printPatternMatches)(total, 'file', pipe);
 
-    _this._entityName = 'filenames';
-    _this._searchSources = [];
-    return _this;
-  }
+      const prefix = `  ${_chalk2.default.dim('\u203A')} `;
+      const padding = (0, _stringLength2.default)(prefix) + 2;
+      const width = (0, _utils.getTerminalWidth)();
 
-  _createClass(FileNamePatternPrompt, [{
-    key: '_onChange',
-    value: function _onChange(pattern, options) {
-      _get(FileNamePatternPrompt.prototype.__proto__ || Object.getPrototypeOf(FileNamePatternPrompt.prototype), '_onChange', this).call(this, pattern, options);
-      this._printTypeahead(pattern, options);
-    }
-  }, {
-    key: '_printTypeahead',
-    value: function _printTypeahead(pattern, options) {
-      var matchedTests = this._getMatchedTests(pattern);
-      var total = matchedTests.length;
-      var pipe = this._pipe;
-      var prompt = this._prompt;
+      var _scroll = (0, _scroll3.default)(total, options);
 
-      (0, _pattern_mode_helpers.printPatternCaret)(pattern, pipe);
+      const start = _scroll.start,
+            end = _scroll.end,
+            index = _scroll.index;
 
-      if (pattern) {
-        (0, _pattern_mode_helpers.printPatternMatches)(total, 'file', pipe);
 
-        var prefix = `  ${_chalk2.default.dim('\u203A')} `;
-        var padding = (0, _stringLength2.default)(prefix) + 2;
-        var width = (0, _utils.getTerminalWidth)();
+      prompt.setPromptLength(total);
 
-        var _scroll = (0, _scroll3.default)(total, options),
-            start = _scroll.start,
-            end = _scroll.end,
-            index = _scroll.index;
+      matchedTests.slice(start, end).map(({ path, context }) => {
+        const filePath = (0, _utils.trimAndFormatPath)(padding, context.config, path, width);
+        return (0, _utils.highlight)(path, filePath, pattern, context.config.rootDir);
+      }).map((item, i) => (0, _pattern_mode_helpers.formatTypeaheadSelection)(item, i, index, prompt)).forEach(item => (0, _pattern_mode_helpers.printTypeaheadItem)(item, pipe));
 
-        prompt.setTypeaheadLength(total);
-
-        matchedTests.slice(start, end).map(function (_ref) {
-          var path = _ref.path,
-              context = _ref.context;
-
-          var filePath = (0, _utils.trimAndFormatPath)(padding, context.config, path, width);
-          return (0, _utils.highlight)(path, filePath, pattern, context.config.rootDir);
-        }).map(function (item, i) {
-          return (0, _pattern_mode_helpers.formatTypeaheadSelection)(item, i, index, prompt);
-        }).forEach(function (item) {
-          return (0, _pattern_mode_helpers.printTypeaheadItem)(item, pipe);
-        });
-
-        if (total > end) {
-          (0, _pattern_mode_helpers.printMore)('file', pipe, total - end);
-        }
-      } else {
-        (0, _pattern_mode_helpers.printStartTyping)('filename', pipe);
+      if (total > end) {
+        (0, _pattern_mode_helpers.printMore)('file', pipe, total - end);
       }
-
-      (0, _pattern_mode_helpers.printRestoredPatternCaret)(pattern, this._currentUsageRows, pipe);
+    } else {
+      (0, _pattern_mode_helpers.printStartTyping)('filename', pipe);
     }
-  }, {
-    key: '_getMatchedTests',
-    value: function _getMatchedTests(pattern) {
-      var regex = void 0;
-
-      try {
-        regex = new RegExp(pattern, 'i');
-      } catch (e) {
-        regex = null;
-      }
 
-      var tests = [];
-      if (regex) {
-        this._searchSources.forEach(function (_ref2) {
-          var testPaths = _ref2.testPaths,
-              config = _ref2.config;
-
-          tests = tests.concat(testPaths.filter(function (testPath) {
-            return testPath.match(pattern);
-          }).map(function (path) {
-            return {
-              path,
-              context: { config }
-            };
-          }));
-        });
-      }
+    (0, _jestWatcher.printRestoredPatternCaret)(pattern, this._currentUsageRows, pipe);
+  }
+
+  _getMatchedTests(pattern) {
+    let regex;
 
-      return tests;
+    try {
+      regex = new RegExp(pattern, 'i');
+    } catch (e) {
+      regex = null;
     }
-  }, {
-    key: 'updateSearchSources',
-    value: function updateSearchSources(searchSources) {
-      this._searchSources = searchSources;
+
+    let tests = [];
+    if (regex) {
+      this._searchSources.forEach(({ testPaths, config }) => {
+        tests = tests.concat(testPaths.filter(testPath => testPath.match(pattern)).map(path => ({
+          path,
+          context: { config }
+        })));
+      });
     }
-  }]);
 
-  return FileNamePatternPrompt;
-}(_pattern_prompt2.default);
+    return tests;
+  }
 
+  updateSearchSources(searchSources) {
+    this._searchSources = searchSources;
+  }
+}
 exports.default = FileNamePatternPrompt;

package/build/file_name_plugin/plugin.js

@@ -0,0 +1,57 @@
+"use strict";
+
+var _jestWatcher = require("jest-watcher");
+
+var _prompt = _interopRequireDefault(require("./prompt"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class FileNamePlugin {
+  constructor({
+    stdin,
+    stdout,
+    config = {}
+  }) {
+    this._stdin = stdin;
+    this._stdout = stdout;
+    this._prompt = new _jestWatcher.Prompt();
+    this._projects = [];
+    this._usageInfo = {
+      key: config.key || 'p',
+      prompt: config.prompt || 'filter by a filename regex pattern'
+    };
+  }
+
+  apply(jestHooks) {
+    jestHooks.onFileChange(({
+      projects
+    }) => {
+      this._projects = projects;
+    });
+  }
+
+  onKey(key) {
+    this._prompt.put(key);
+  }
+
+  run(globalConfig, updateConfigAndRun) {
+    const p = new _prompt.default(this._stdout, this._prompt);
+    p.updateSearchSources(this._projects);
+    return new Promise((res, rej) => {
+      p.run(value => {
+        updateConfigAndRun({
+          mode: 'watch',
+          testPathPattern: value
+        });
+        res();
+      }, rej);
+    });
+  }
+
+  getUsageInfo() {
+    return this._usageInfo;
+  }
+
+}
+
+module.exports = FileNamePlugin;

package/build/file_name_plugin/prompt.js

@@ -0,0 +1,104 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _ansiEscapes = _interopRequireDefault(require("ansi-escapes"));
+
+var _stringLength = _interopRequireDefault(require("string-length"));
+
+var _jestWatcher = require("jest-watcher");
+
+var _utils = require("../lib/utils");
+
+var _pattern_mode_helpers = require("../lib/pattern_mode_helpers");
+
+var _scroll2 = _interopRequireDefault(require("../lib/scroll"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class FileNamePatternPrompt extends _jestWatcher.PatternPrompt {
+  constructor(pipe, prompt) {
+    super(pipe, prompt);
+    this._entityName = 'filenames';
+    this._searchSources = [];
+  }
+
+  _onChange(pattern, options) {
+    super._onChange(pattern, options);
+
+    this._printTypeahead(pattern, options);
+  }
+
+  _printTypeahead(pattern, options) {
+    const matchedTests = this._getMatchedTests(pattern);
+
+    const total = matchedTests.length;
+    const pipe = this._pipe;
+    const prompt = this._prompt;
+    (0, _jestWatcher.printPatternCaret)(pattern, pipe);
+    pipe.write(_ansiEscapes.default.cursorLeft);
+
+    if (pattern) {
+      (0, _pattern_mode_helpers.printPatternMatches)(total, 'file', pipe);
+      const prefix = `  ${_chalk.default.dim('\u203A')} `;
+      const padding = (0, _stringLength.default)(prefix) + 2;
+      const width = (0, _utils.getTerminalWidth)(pipe);
+
+      const _scroll = (0, _scroll2.default)(total, options),
+            start = _scroll.start,
+            end = _scroll.end,
+            index = _scroll.index;
+
+      prompt.setPromptLength(total);
+      matchedTests.slice(start, end).map(({
+        path,
+        context
+      }) => {
+        const filePath = (0, _utils.trimAndFormatPath)(padding, context.config, path, width);
+        return (0, _utils.highlight)(path, filePath, pattern, context.config.rootDir);
+      }).map((item, i) => (0, _pattern_mode_helpers.formatTypeaheadSelection)(item, i, index, prompt)).forEach(item => (0, _pattern_mode_helpers.printTypeaheadItem)(item, pipe));
+
+      if (total > end) {
+        (0, _pattern_mode_helpers.printMore)('file', pipe, total - end);
+      }
+    } else {
+      (0, _pattern_mode_helpers.printStartTyping)('filename', pipe);
+    }
+
+    (0, _jestWatcher.printRestoredPatternCaret)(pattern, this._currentUsageRows, pipe);
+  }
+
+  _getMatchedTests(pattern) {
+    let regex;
+
+    try {
+      regex = new RegExp(pattern, 'i');
+    } catch (e) {
+      return [];
+    }
+
+    return this._searchSources.reduce((tests, {
+      testPaths,
+      config
+    }) => {
+      return tests.concat(testPaths.filter(testPath => regex.test(testPath)).map(path => ({
+        path,
+        context: {
+          config
+        }
+      })));
+    }, []);
+  }
+
+  updateSearchSources(searchSources) {
+    this._searchSources = searchSources;
+  }
+
+}
+
+exports.default = FileNamePatternPrompt;

package/build/file_name_plugin.js

@@ -1,10 +1,6 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _Prompt = require('./shared/Prompt');
-
-var _Prompt2 = _interopRequireDefault(_Prompt);
+var _jestWatcher = require('jest-watcher');
 
 var _file_name_pattern_prompt = require('./file_name_pattern_prompt');
 
@@ -12,63 +8,46 @@ var _file_name_pattern_prompt2 = _interopRequireDefault(_file_name_pattern_promp
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var FileNamePlugin = function () {
-  function FileNamePlugin(_ref) {
-    var stdin = _ref.stdin,
-        stdout = _ref.stdout;
-
-    _classCallCheck(this, FileNamePlugin);
+class FileNamePlugin {
 
+  constructor({
+    stdin,
+    stdout
+  }) {
     this._stdin = stdin;
     this._stdout = stdout;
-    this._prompt = new _Prompt2.default();
+    this._prompt = new _jestWatcher.Prompt();
     this._projects = [];
   }
 
-  _createClass(FileNamePlugin, [{
-    key: 'apply',
-    value: function apply(jestHooks) {
-      var _this = this;
-
-      jestHooks.onFileChange(function (_ref2) {
-        var projects = _ref2.projects;
-
-        _this._projects = projects;
-      });
-    }
-  }, {
-    key: 'onKey',
-    value: function onKey(key) {
-      this._prompt.put(key);
-    }
-  }, {
-    key: 'run',
-    value: function run(globalConfig, updateConfigAndRun) {
-      var p = new _file_name_pattern_prompt2.default(this._stdout, this._prompt);
-      p.updateSearchSources(this._projects);
-      return new Promise(function (res, rej) {
-        p.run(function (value) {
-          updateConfigAndRun({ mode: 'watch', testPathPattern: value });
-          res();
-        }, rej);
-      });
-    }
+  apply(jestHooks) {
+    jestHooks.onFileChange(({ projects }) => {
+      this._projects = projects;
+    });
+  }
 
-    // eslint-disable-next-line class-methods-use-this
+  onKey(key) {
+    this._prompt.put(key);
+  }
 
-  }, {
-    key: 'getUsageInfo',
-    value: function getUsageInfo() {
-      return {
-        key: 'p',
-        prompt: 'filter by a filename regex pattern'
-      };
-    }
-  }]);
+  run(globalConfig, updateConfigAndRun) {
+    const p = new _file_name_pattern_prompt2.default(this._stdout, this._prompt);
+    p.updateSearchSources(this._projects);
+    return new Promise((res, rej) => {
+      p.run(value => {
+        updateConfigAndRun({ mode: 'watch', testPathPattern: value });
+        res();
+      }, rej);
+    });
+  }
 
-  return FileNamePlugin;
-}();
+  // eslint-disable-next-line class-methods-use-this
+  getUsageInfo() {
+    return {
+      key: 'p',
+      prompt: 'filter by a filename regex pattern'
+    };
+  }
+}
 
 module.exports = FileNamePlugin;

package/build/lib/pattern_mode_helpers.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatTypeaheadSelection = exports.printTypeaheadItem = exports.printMore = exports.printStartTyping = exports.printPatternMatches = void 0;
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _stripAnsi = _interopRequireDefault(require("strip-ansi"));
+
+var _jestWatcher = require("jest-watcher");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const pluralize = (count, text) => count === 1 ? text : `${text}s`;
+
+const printPatternMatches = (count, entity, pipe, extraText = '') => {
+  const pluralized = pluralize(count, entity);
+  const result = count ? `\n\n Pattern matches ${count} ${pluralized}` : `\n\n Pattern matches no ${pluralized}`;
+  pipe.write(result + extraText);
+};
+
+exports.printPatternMatches = printPatternMatches;
+
+const printStartTyping = (entity, pipe) => {
+  pipe.write(`\n\n ${_chalk.default.italic.yellow(`Start typing to filter by a ${entity} regex pattern.`)}`);
+};
+
+exports.printStartTyping = printStartTyping;
+
+const printMore = (entity, pipe, more) => {
+  pipe.write(`\n   ${_chalk.default.dim(`...and ${more} more ${pluralize(more, entity)}`)}`);
+};
+
+exports.printMore = printMore;
+
+const printTypeaheadItem = (item, pipe) => pipe.write(`\n ${_chalk.default.dim('\u203A')} ${item}`);
+
+exports.printTypeaheadItem = printTypeaheadItem;
+
+const formatTypeaheadSelection = (item, index, activeIndex, prompt) => {
+  if (index === activeIndex) {
+    prompt.setPromptSelection((0, _stripAnsi.default)(item));
+    return _chalk.default.black.bgYellow((0, _stripAnsi.default)(item));
+  }
+
+  return item;
+};
+
+exports.formatTypeaheadSelection = formatTypeaheadSelection;

package/build/lib/scroll.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+const scroll = (size, {
+  offset,
+  max
+}) => {
+  let start = 0;
+  let index = Math.min(offset, size);
+  const halfScreen = max / 2;
+
+  if (index <= halfScreen) {
+    start = 0;
+  } else {
+    if (size >= max) {
+      start = Math.min(index - halfScreen - 1, size - max);
+    }
+
+    index = Math.min(index - start, size);
+  }
+
+  return {
+    end: Math.min(size, start + max),
+    index,
+    start
+  };
+};
+
+var _default = scroll;
+exports.default = _default;