jest-watch-typeahead 0.3.0 → 0.4.2

package/CHANGELOG.md

@@ -1,4 +1,16 @@
-## master
+## 0.4.0
+
+### Chore & Maintenance
+
+- Update dependencies and drop Node 6 ([#30](https://github.com/jest-community/jest-watch-typeahead/pull/30))
+
+## 0.3.1
+
+### Fixes
+
+- Helpful error message when attempting to use the package main file ([#29](https://github.com/jest-community/jest-watch-typeahead/pull/29))
+
+## 0.3.0
 
 ### Chore & Maintenance
 

package/build/file_name_plugin/plugin.js

@@ -2,8 +2,12 @@
 
 var _jestWatcher = require("jest-watcher");
 
+var _jestRegexUtil = require("jest-regex-util");
+
 var _prompt = _interopRequireDefault(require("./prompt"));
 
+var _utils = require("../lib/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class FileNamePlugin {
@@ -41,7 +45,7 @@ class FileNamePlugin {
       p.run(value => {
         updateConfigAndRun({
           mode: 'watch',
-          testPathPattern: value
+          testPathPattern: (0, _utils.removeTrimmingDots)(value).split('/').map(_jestRegexUtil.escapeStrForRegex).join('/')
         });
         res();
       }, rej);

package/build/index.js

@@ -0,0 +1,10 @@
+"use strict";
+
+throw new Error(`
+jest-watch-typeahead includes two watch plugins: The filename plugin and the testname plugin.
+Please configure Jest as follows:
+"watchPlugins": [
+  "jest-watch-typeahead/filename",
+  "jest-watch-typeahead/testname"
+]
+`);

package/build/lib/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatTestNameByPattern = exports.highlight = exports.getTerminalWidth = exports.trimAndFormatPath = void 0;
+exports.removeTrimmingDots = exports.formatTestNameByPattern = exports.highlight = exports.getTerminalWidth = exports.trimAndFormatPath = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -16,6 +16,9 @@ var _stripAnsi = _interopRequireDefault(require("strip-ansi"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable no-param-reassign */
+const TRIMMING_DOTS = '...';
+const ENTER = '⏎';
+
 const relativePath = (config, testPath) => {
   testPath = _path.default.relative(config.cwd || config.rootDir, testPath);
 
@@ -46,16 +49,16 @@ const trimAndFormatPath = (pad, config, testPath, columns) => {
 
   if (basenameLength + 4 < maxLength) {
     const dirnameLength = maxLength - 4 - basenameLength;
-    dirname = `...${dirname.slice(dirname.length - dirnameLength, dirname.length)}`;
+    dirname = `${TRIMMING_DOTS}${dirname.slice(dirname.length - dirnameLength, dirname.length)}`;
     return (0, _slash.default)(_chalk.default.dim(dirname + _path.default.sep) + _chalk.default.bold(basename));
   }
 
   if (basenameLength + 4 === maxLength) {
-    return (0, _slash.default)(_chalk.default.dim(`...${_path.default.sep}`) + _chalk.default.bold(basename));
+    return (0, _slash.default)(_chalk.default.dim(`${TRIMMING_DOTS}${_path.default.sep}`) + _chalk.default.bold(basename));
   } // can't fit dirname, but can fit trimmed basename
 
 
-  return (0, _slash.default)(_chalk.default.bold(`...${basename.slice(basename.length - maxLength - 4, basename.length)}`));
+  return (0, _slash.default)(_chalk.default.bold(`${TRIMMING_DOTS}${basename.slice(-maxLength + 3)}`));
 };
 
 exports.trimAndFormatPath = trimAndFormatPath;
@@ -65,7 +68,6 @@ const getTerminalWidth = (pipe = process.stdout) => pipe.columns;
 exports.getTerminalWidth = getTerminalWidth;
 
 const highlight = (rawPath, filePath, pattern, rootDir) => {
-  const trim = '...';
   const relativePathHead = './';
   let regexp;
 
@@ -86,9 +88,9 @@ const highlight = (rawPath, filePath, pattern, rootDir) => {
   let offset;
   let trimLength;
 
-  if (filePath.startsWith(trim)) {
+  if (filePath.startsWith(TRIMMING_DOTS)) {
     offset = rawPath.length - filePath.length;
-    trimLength = trim.length;
+    trimLength = TRIMMING_DOTS.length;
   } else if (filePath.startsWith(relativePathHead)) {
     offset = rawPath.length - filePath.length;
     trimLength = relativePathHead.length;
@@ -103,8 +105,6 @@ const highlight = (rawPath, filePath, pattern, rootDir) => {
 };
 
 exports.highlight = highlight;
-const DOTS = '...';
-const ENTER = '⏎';
 
 const formatTestNameByPattern = (testName, pattern, width) => {
   const inlineTestName = testName.replace(/(\r\n|\n|\r)/gm, ENTER);
@@ -131,17 +131,27 @@ const formatTestNameByPattern = (testName, pattern, width) => {
     return colorize(inlineTestName, startPatternIndex, endPatternIndex);
   }
 
-  const numberOfTruncatedChars = DOTS.length + inlineTestName.length - width;
+  const numberOfTruncatedChars = TRIMMING_DOTS.length + inlineTestName.length - width;
   const end = Math.max(endPatternIndex - numberOfTruncatedChars, 0);
   const truncatedTestName = inlineTestName.slice(numberOfTruncatedChars);
   const shouldHighlightDots = startPatternIndex <= numberOfTruncatedChars;
 
   if (shouldHighlightDots) {
-    return colorize(DOTS + truncatedTestName, 0, end + DOTS.length);
+    return colorize(TRIMMING_DOTS + truncatedTestName, 0, end + TRIMMING_DOTS.length);
   }
 
   const start = startPatternIndex - numberOfTruncatedChars;
-  return colorize(DOTS + truncatedTestName, start + DOTS.length, end + DOTS.length);
+  return colorize(TRIMMING_DOTS + truncatedTestName, start + TRIMMING_DOTS.length, end + TRIMMING_DOTS.length);
+};
+
+exports.formatTestNameByPattern = formatTestNameByPattern;
+
+const removeTrimmingDots = value => {
+  if (value.startsWith(TRIMMING_DOTS)) {
+    return value.slice(TRIMMING_DOTS.length);
+  }
+
+  return value;
 };
 
-exports.formatTestNameByPattern = formatTestNameByPattern;
+exports.removeTrimmingDots = removeTrimmingDots;

package/build/test_name_plugin/plugin.js

@@ -2,8 +2,12 @@
 
 var _jestWatcher = require("jest-watcher");
 
+var _jestRegexUtil = require("jest-regex-util");
+
 var _prompt = _interopRequireDefault(require("./prompt"));
 
+var _utils = require("../lib/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class TestNamePlugin {
@@ -41,7 +45,7 @@ class TestNamePlugin {
       p.run(value => {
         updateConfigAndRun({
           mode: 'watch',
-          testNamePattern: value
+          testNamePattern: (0, _jestRegexUtil.escapeStrForRegex)((0, _utils.removeTrimmingDots)(value))
         });
         res();
       }, rej);

package/build/test_utils/pluginTester.js

@@ -33,26 +33,16 @@ expect.addSnapshotSerializer({
   test: val => val.includes(WINDOWS_CLEAR),
   print: val => (0, _stripAnsi.default)(val.replace(WINDOWS_CLEAR, '[MOCK - clear]'))
 });
-jest.mock('ansi-escapes', () => ({
-  clearScreen: '[MOCK - clearScreen]',
-  cursorDown: (count = 1) => `[MOCK - cursorDown(${count})]`,
-  cursorLeft: '[MOCK - cursorLeft]',
-  cursorHide: '[MOCK - cursorHide]',
-  cursorRestorePosition: '[MOCK - cursorRestorePosition]',
-  cursorSavePosition: '[MOCK - cursorSavePosition]',
-  cursorShow: '[MOCK - cursorShow]',
-  cursorTo: (x, y) => `[MOCK - cursorTo(${x}, ${y})]`
-}));
 
-const pluginTester = (Plugin, config = {}) => {
+const pluginTester = (Plugin, options = {}) => {
   const stdout = {
-    columns: 80,
+    columns: (options.stdout || {}).columns || 80,
     write: jest.fn()
   };
   const jestHooks = new _jestWatcher.JestHook();
   const plugin = new Plugin({
     stdout,
-    config
+    config: options.config
   });
   plugin.apply(jestHooks.getSubscriber());
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-watch-typeahead",
-  "version": "0.3.0",
+  "version": "0.4.2",
   "main": "build/index.js",
   "author": "Rogelio Guzman <rogelioguzmanh@gmail.com>",
   "description": "Jest plugin for filtering by filename or test name",
@@ -19,16 +19,18 @@
     "test": "jest",
     "lint": "eslint .",
     "watch": "babel src -w --ignore **/*.test.js,integration -d build",
+    "prebuild": "rimraf build",
     "build": "babel src --ignore **/*.test.js,integration -d build",
     "prepublish": "yarn build",
     "format": "prettier --single-quote --trailing-comma all --write \"!(build)/**/*.js\""
   },
   "dependencies": {
-    "ansi-escapes": "^3.0.0",
+    "ansi-escapes": "^4.2.1",
     "chalk": "^2.4.1",
+    "jest-regex-util": "^24.9.0",
     "jest-watcher": "^24.3.0",
-    "slash": "^2.0.0",
-    "string-length": "^2.0.0",
+    "slash": "^3.0.0",
+    "string-length": "^3.1.0",
     "strip-ansi": "^5.0.0"
   },
   "devDependencies": {
@@ -39,16 +41,17 @@
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^24.3.0",
-    "eslint": "^5.12.1",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-config-prettier": "^4.1.0",
-    "eslint-plugin-flowtype": "^3.2.1",
+    "eslint": "^6.2.0",
+    "eslint-config-airbnb-base": "^14.0.0",
+    "eslint-config-prettier": "^6.1.0",
+    "eslint-plugin-flowtype": "^4.2.0",
     "eslint-plugin-import": "^2.9.0",
     "eslint-plugin-jest": "^22.1.3",
     "eslint-plugin-prettier": "^3.0.1",
-    "flow-bin": "^0.94.0",
+    "flow-bin": "^0.105.2",
     "jest": "^24.3.0",
-    "prettier": "^1.13.7"
+    "prettier": "^1.13.7",
+    "rimraf": "^3.0.0"
   },
   "jest": {
     "watchPlugins": [
@@ -61,6 +64,10 @@
     "testPathIgnorePatterns": [
       "<rootDir>/build/.*",
       "<rootDir>/src/__tests__/pluginTester.js"
+    ],
+    "transformIgnorePatterns": [
+      "/node_modules/",
+      "/__mocks__/"
     ]
   }
 }