jest-watch-typeahead 0.6.1 → 0.6.5

package/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/jest-community/jest-watch-typeahead.svg?branch=master)](https://travis-ci.org/jest-community/jest-watch-typeahead) [![npm version](https://badge.fury.io/js/jest-watch-typeahead.svg)](https://badge.fury.io/js/jest-watch-typeahead)
+[![Build Status](https://github.com/jest-community/jest-watch-typeahead/actions/workflows/nodejs.yml/badge.svg?branch=main)](https://github.com/jest-community/jest-watch-typeahead/actions/workflows/nodejs.yml) [![npm version](https://badge.fury.io/js/jest-watch-typeahead.svg)](https://badge.fury.io/js/jest-watch-typeahead)
 
 <div align="center">
   <a href="https://jestjs.io/">

package/build/file_name_plugin/plugin.js

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
 var _jestWatcher = require("jest-watcher");
 
 var _prompt = _interopRequireDefault(require("./prompt"));
@@ -54,4 +59,4 @@ class FileNamePlugin {
 
 }
 
-module.exports = FileNamePlugin;
+exports.default = FileNamePlugin;

package/build/file_name_plugin/prompt.js

@@ -19,7 +19,7 @@ var _utils = require("../lib/utils");
 
 var _pattern_mode_helpers = require("../lib/pattern_mode_helpers");
 
-var _scroll2 = _interopRequireDefault(require("../lib/scroll"));
+var _scroll = _interopRequireDefault(require("../lib/scroll"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -50,19 +50,18 @@ class FileNamePatternPrompt extends _jestWatcher.PatternPrompt {
       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;
-
+      const {
+        start,
+        end,
+        index
+      } = (0, _scroll.default)(total, options);
       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);
+        return (0, _utils.highlight)(path, filePath, pattern);
       }).map((item, i) => (0, _pattern_mode_helpers.formatTypeaheadSelection)(item, i, index, prompt)).forEach(item => (0, _pattern_mode_helpers.printTypeaheadItem)(item, pipe));
 
       if (total > end) {

package/build/lib/pattern_mode_helpers.js

@@ -9,8 +9,6 @@ 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`;
@@ -35,7 +33,9 @@ const printMore = (entity, pipe, more) => {
 
 exports.printMore = printMore;
 
-const printTypeaheadItem = (item, pipe) => pipe.write(`\n ${_chalk.default.dim('\u203A')} ${item}`);
+const printTypeaheadItem = (item, pipe) => {
+  pipe.write(`\n ${_chalk.default.dim('\u203A')} ${item}`);
+};
 
 exports.printTypeaheadItem = printTypeaheadItem;
 

package/build/lib/utils.js

@@ -15,16 +15,15 @@ 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);
+  const relativeTestPath = _path.default.relative(config.cwd || config.rootDir, testPath);
 
-  const dirname = _path.default.dirname(testPath);
+  const dirname = _path.default.dirname(relativeTestPath);
 
-  const basename = _path.default.basename(testPath);
+  const basename = _path.default.basename(relativeTestPath);
 
   return {
     basename,
@@ -37,8 +36,12 @@ const colorize = (str, start, end) => _chalk.default.dim(str.slice(0, start)) +
 const trimAndFormatPath = (pad, config, testPath, columns) => {
   const maxLength = columns - pad;
   const relative = relativePath(config, testPath);
-  const basename = relative.basename;
-  let dirname = relative.dirname; // length is ok
+  const {
+    basename
+  } = relative;
+  let {
+    dirname
+  } = relative; // length is ok
 
   if ((dirname + _path.default.sep + basename).length <= maxLength) {
     return (0, _slash.default)(_chalk.default.dim(dirname + _path.default.sep) + _chalk.default.bold(basename));
@@ -67,7 +70,7 @@ const getTerminalWidth = (pipe = process.stdout) => pipe.columns;
 
 exports.getTerminalWidth = getTerminalWidth;
 
-const highlight = (rawPath, filePath, pattern, rootDir) => {
+const highlight = (rawPath, filePath, pattern) => {
   const relativePathHead = './';
   let regexp;
 
@@ -77,31 +80,28 @@ const highlight = (rawPath, filePath, pattern, rootDir) => {
     return _chalk.default.dim(filePath);
   }
 
-  rawPath = (0, _stripAnsi.default)(rawPath);
-  filePath = (0, _stripAnsi.default)(filePath);
-  const match = rawPath.match(regexp);
+  const strippedRawPath = (0, _stripAnsi.default)(rawPath);
+  const strippedFilePath = (0, _stripAnsi.default)(filePath);
+  const match = strippedRawPath.match(regexp);
 
-  if (!match) {
-    return _chalk.default.dim(filePath);
+  if (!match || match.index == null) {
+    return _chalk.default.dim(strippedFilePath);
   }
 
-  let offset;
+  const offset = strippedRawPath.length - strippedFilePath.length;
   let trimLength;
 
-  if (filePath.startsWith(TRIMMING_DOTS)) {
-    offset = rawPath.length - filePath.length;
+  if (strippedFilePath.startsWith(TRIMMING_DOTS)) {
     trimLength = TRIMMING_DOTS.length;
-  } else if (filePath.startsWith(relativePathHead)) {
-    offset = rawPath.length - filePath.length;
+  } else if (strippedFilePath.startsWith(relativePathHead)) {
     trimLength = relativePathHead.length;
   } else {
-    offset = rootDir.length + _path.default.sep.length;
     trimLength = 0;
   }
 
   const start = match.index - offset;
   const end = start + match[0].length;
-  return colorize(filePath, Math.max(start, 0), Math.max(end, trimLength));
+  return colorize(strippedFilePath, Math.max(start, 0), Math.max(end, trimLength));
 };
 
 exports.highlight = highlight;
@@ -118,10 +118,9 @@ const formatTestNameByPattern = (testName, pattern, width) => {
 
   const match = inlineTestName.match(regexp);
 
-  if (!match) {
+  if (!match || match.index == null) {
     return _chalk.default.dim(inlineTestName);
-  } // $FlowFixMe
-
+  }
 
   const startPatternIndex = Math.max(match.index, 0);
   const endPatternIndex = startPatternIndex + match[0].length;

package/build/test_name_plugin/plugin.js

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
 var _jestWatcher = require("jest-watcher");
 
 var _prompt = _interopRequireDefault(require("./prompt"));
@@ -54,4 +59,4 @@ class TestNamePlugin {
 
 }
 
-module.exports = TestNamePlugin;
+exports.default = TestNamePlugin;

package/build/test_name_plugin/prompt.js

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
 var _chalk = _interopRequireDefault(require("chalk"));
 
 var _ansiEscapes = _interopRequireDefault(require("ansi-escapes"));
@@ -8,7 +13,7 @@ var _jestWatcher = require("jest-watcher");
 
 var _jestRegexUtil = require("jest-regex-util");
 
-var _scroll2 = _interopRequireDefault(require("../lib/scroll"));
+var _scroll = _interopRequireDefault(require("../lib/scroll"));
 
 var _utils = require("../lib/utils");
 
@@ -44,12 +49,11 @@ class TestNamePatternPrompt extends _jestWatcher.PatternPrompt {
     if (pattern) {
       (0, _pattern_mode_helpers.printPatternMatches)(total, 'test', pipe, ` from ${_chalk.default.yellow('cached')} test suites`);
       const width = (0, _utils.getTerminalWidth)(pipe);
-
-      const _scroll = (0, _scroll2.default)(total, options),
-            start = _scroll.start,
-            end = _scroll.end,
-            index = _scroll.index;
-
+      const {
+        start,
+        end,
+        index
+      } = (0, _scroll.default)(total, options);
       prompt.setPromptLength(total);
       matchedTests.slice(start, end).map(name => (0, _utils.formatTestNameByPattern)(name, pattern, width - 4)).map((item, i) => (0, _pattern_mode_helpers.formatTypeaheadSelection)(item, i, index, prompt)).forEach(item => (0, _pattern_mode_helpers.printTypeaheadItem)(item, pipe));
 
@@ -97,4 +101,4 @@ class TestNamePatternPrompt extends _jestWatcher.PatternPrompt {
 
 }
 
-module.exports = TestNamePatternPrompt;
+exports.default = TestNamePatternPrompt;

package/build/types/Config.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/filename.js

@@ -1,3 +1,4 @@
-const FileNamePlugin = require('./build/file_name_plugin/plugin');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const FileNamePlugin = require('./build/file_name_plugin/plugin').default;
 
 module.exports = FileNamePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-watch-typeahead",
-  "version": "0.6.1",
+  "version": "0.6.5",
   "main": "build/index.js",
   "author": "Rogelio Guzman <rogelioguzmanh@gmail.com>",
   "description": "Jest plugin for filtering by filename or test name",
@@ -18,17 +18,17 @@
   "scripts": {
     "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",
+    "build": "babel --extensions .js,.ts src -d build && rimraf **/*.test.{js,ts},integration build/**/__tests__ build/test_utils",
     "prepublish": "yarn build",
-    "format": "prettier --write \"**/*.js\" \"**/*.md\""
+    "format": "prettier --write \"**/*.js\" \"**/*.md\" \"**/*.ts\"",
+    "typecheck": "yarn tsc -p ."
   },
   "dependencies": {
     "ansi-escapes": "^4.3.1",
     "chalk": "^4.0.0",
-    "jest-regex-util": "^26.0.0",
-    "jest-watcher": "^26.3.0",
+    "jest-regex-util": "^27.0.0",
+    "jest-watcher": "^27.0.0",
     "slash": "^3.0.0",
     "string-length": "^4.0.1",
     "strip-ansi": "^6.0.0"
@@ -37,23 +37,30 @@
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
-    "@babel/preset-flow": "^7.9.0",
+    "@babel/preset-typescript": "^7.10.4",
+    "@jest/types": "^27.0.0",
+    "@semantic-release/changelog": "^5.0.1",
+    "@semantic-release/git": "^9.0.0",
+    "@types/jest": "^27.0.0",
+    "@types/node": "^14.6.4",
+    "@typescript-eslint/eslint-plugin": "^4.0.1",
+    "@typescript-eslint/parser": "^4.0.1",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.0.0",
+    "babel-jest": "^27.0.0",
     "eslint": "^7.8.1",
     "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-flowtype": "^5.2.0",
+    "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-jest": "^24.0.0",
     "eslint-plugin-prettier": "^3.1.3",
-    "flow-bin": "^0.133.0",
-    "jest": "^26.0.0",
+    "jest": "^27.0.0",
     "prettier": "^2.1.1",
-    "rimraf": "^3.0.2"
+    "rimraf": "^3.0.2",
+    "semantic-release": "^17.4.3",
+    "typescript": "^4.0.2"
   },
   "peerDependencies": {
-    "jest": "^26.0.0"
+    "jest": "^26.0.0 || ^27.0.0"
   },
   "jest": {
     "watchPlugins": [
@@ -74,5 +81,22 @@
   },
   "engines": {
     "node": ">=10"
+  },
+  "resolutions": {
+    "semantic-release/@semantic-release/github/fs-extra": "^9.0.0",
+    "semantic-release/@semantic-release/npm/fs-extra": "^9.0.0"
+  },
+  "release": {
+    "branches": [
+      "main"
+    ],
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      "@semantic-release/git",
+      "@semantic-release/github"
+    ]
   }
 }

package/testname.js

@@ -1,3 +1,4 @@
-const TestNamePlugin = require('./build/test_name_plugin/plugin');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const TestNamePlugin = require('./build/test_name_plugin/plugin').default;
 
 module.exports = TestNamePlugin;

package/CHANGELOG.md

@@ -1,93 +0,0 @@
-## 0.6.1
-
-### Fixes
-
-- Provide exact pattern for selected test names
-
-## 0.6.0
-
-### Chore & Maintenance
-
-- Update dependencies and drop Node 8 ([#35](https://github.com/jest-community/jest-watch-typeahead/pull/35))
-
-## 0.5.0
-
-### Chore & Maintenance
-
-- Update dependencies
-
-## 0.4.2
-
-### Fixes
-
-- Fix issue with overly trimmed basenames when formatting test paths ([#33](https://github.com/jest-community/jest-watch-typeahead/pull/33))
-
-## 0.4.1
-
-### Fixes
-
-- Allow selecting tests and files containing regexp special characters ([#32](https://github.com/jest-community/jest-watch-typeahead/pull/32))
-
-### Chore & Maintenance
-
-- Remove build directory before building ([#31](https://github.com/jest-community/jest-watch-typeahead/pull/31))
-
-## 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
-
-- Bump dated dependencies ([#25](https://github.com/jest-community/jest-watch-typeahead/pull/25))
-- Get better truncation for testname typeahead by truncating the start and not the end ([#28](https://github.com/jest-community/jest-watch-typeahead/pull/28))
-
-### Fixes
-
-- Use fullName(to show ancestor titles) for test name pattern plugin ([#26](https://github.com/jest-community/jest-watch-typeahead/pull/26))
-
-## 0.2.1
-
-- Fix cursor in terminal app ([#21](https://github.com/jest-community/jest-watch-typeahead/pull/21))
-
-### Chore & Maintenance
-
-- Bump dated dependencies ([#23](https://github.com/jest-community/jest-watch-typeahead/pull/23))
-
-## 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
-
-## 0.0.1
-
-Initial Release

package/build/test_utils/pluginTester.js

@@ -1,61 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _jestWatcher = require("jest-watcher");
-
-var _stripAnsi = _interopRequireDefault(require("strip-ansi"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-expect.addSnapshotSerializer({
-  test: val => typeof val === 'string',
-  print: val => (0, _stripAnsi.default)(val)
-});
-/**
- * See https://github.com/facebook/jest/pull/7523 for more details
- */
-
-const CLEAR = '\x1B[2J\x1B[3J\x1B[H';
-expect.addSnapshotSerializer({
-  test: val => val.includes(CLEAR),
-  print: val => (0, _stripAnsi.default)(val.replace(CLEAR, '[MOCK - clear]'))
-});
-/**
- * See https://github.com/facebook/jest/pull/7523 for more details
- */
-
-const WINDOWS_CLEAR = '\x1B[2J\x1B[0f';
-expect.addSnapshotSerializer({
-  test: val => val.includes(WINDOWS_CLEAR),
-  print: val => (0, _stripAnsi.default)(val.replace(WINDOWS_CLEAR, '[MOCK - clear]'))
-});
-
-const pluginTester = (Plugin, options = {}) => {
-  const stdout = {
-    columns: (options.stdout || {}).columns || 80,
-    write: jest.fn()
-  };
-  const jestHooks = new _jestWatcher.JestHook();
-  const plugin = new Plugin({
-    stdout,
-    config: options.config
-  });
-  plugin.apply(jestHooks.getSubscriber());
-
-  const type = (...keys) => keys.forEach(key => plugin.onKey(key));
-
-  return {
-    stdout,
-    hookEmitter: jestHooks.getEmitter(),
-    updateConfigAndRun: jest.fn(),
-    plugin,
-    type
-  };
-};
-
-var _default = pluginTester;
-exports.default = _default;