Merge branch 'release/1.2.0' into main

Author: wimpyprogrammer

.babelrc

@@ -1,3 +1,4 @@
 {
-	"presets": ["@babel/env", "@babel/preset-typescript"]
+	"presets": ["@babel/env", "@babel/preset-typescript"],
+	"ignore": ["**/*.spec.js", "**/*.spec.ts"]
 }

.editorconfig

@@ -9,6 +9,10 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = tab
 
+[*.yml]
+indent_style = space
+indent_size = 2
+
 [package.json]
 indent_style = space
 indent_size = 2

.eslintrc.json

@@ -1,9 +1,9 @@
 {
 	"parser": "@typescript-eslint/parser",
+	"plugins": ["@typescript-eslint"],
 	"extends": [
 		"airbnb-base",
 		"plugin:jest/recommended",
-		"plugin:@typescript-eslint/eslint-recommended",
 		"plugin:@typescript-eslint/recommended",
 		"prettier",
 		"prettier/@typescript-eslint"
@@ -12,6 +12,7 @@
 		"ecmaVersion": 2018
 	},
 	"rules": {
+		"@typescript-eslint/no-shadow": "error",
 		"import/extensions": [
 			"error",
 			{
@@ -24,7 +25,8 @@
 				"devDependencies": ["**/*.spec.{js,ts}"]
 			}
 		],
-		"import/prefer-default-export": "off"
+		"import/prefer-default-export": "off",
+		"no-shadow": "off"
 	},
 	"settings": {
 		"import/parsers": {

.github/workflows/security-scan.yml

@@ -0,0 +1,36 @@
+name: Security Scan
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+  schedule:
+    # 13:44 on Saturdays
+    - cron: '44 13 * * 6'
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['javascript']
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/tests.yml

@@ -0,0 +1,48 @@
+name: Tests
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+  schedule:
+    # 00:00 on Saturdays
+    - cron: '0 0 * * SAT'
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [10.x, 14.x]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: '2'
+
+      - name: Test on Node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - run: npm install
+      - run: npm run lint
+      - run: npm run build
+      - run: npm run test
+      - run: npx testpack-cli --keep={ts-jest,typescript} src/e2e.spec.ts
+
+      - name: Upload test coverage report to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          fail_ci_if_error: true
+
+      - name: Run Snyk to check for vulnerabilities
+        uses: snyk/actions/node@master
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.publishrc

@@ -4,7 +4,7 @@
     "uncommittedChanges": true,
     "untrackedFiles": true,
     "sensitiveData": true,
-    "branch": "master",
+    "branch": "main",
     "gitTag": true
   },
   "confirm": true,

.travis.yml

@@ -3,8 +3,8 @@
 [![npm package](https://badge.fury.io/js/strings-to-regex.svg)](https://badge.fury.io/js/strings-to-regex)
 ![node version](https://img.shields.io/node/v/strings-to-regex.svg)
 ![npm type definitions](https://img.shields.io/npm/types/strings-to-regex)
-[![Build Status](https://travis-ci.org/wimpyprogrammer/strings-to-regex.svg?branch=master)](https://travis-ci.org/wimpyprogrammer/strings-to-regex)
-[![codecov](https://codecov.io/gh/wimpyprogrammer/strings-to-regex/branch/master/graph/badge.svg)](https://codecov.io/gh/wimpyprogrammer/strings-to-regex)
+![Tests status](https://github.com/wimpyprogrammer/strings-to-regex/workflows/Tests/badge.svg)
+[![codecov](https://codecov.io/gh/wimpyprogrammer/strings-to-regex/branch/main/graph/badge.svg)](https://codecov.io/gh/wimpyprogrammer/strings-to-regex)
 [![Known Vulnerabilities](https://snyk.io/test/github/wimpyprogrammer/strings-to-regex/badge.svg)](https://snyk.io/test/github/wimpyprogrammer/strings-to-regex)
 
 Generate a compact Regular Expression that matches a finite set.

README.md

@@ -42,7 +42,7 @@
 		/>
 		<link rel="stylesheet" href="styles.css" />
 
-		<script src="https://cdn.polyfill.io/v2/polyfill.js?features=Array.from,Map,Set&flags=gated"></script>
+		<script src="https://cdn.polyfill.io/v2/polyfill.js?features=Array.from,Event,Map,Set,URL&flags=gated"></script>
 	</head>
 
 	<body>
@@ -169,7 +169,7 @@
 			<footer>
 				<p class="float-left">
 					&copy;
-					<a href="http://www.wimpyprogrammer.com/">WimpyProgrammer.com</a> 2018
+					<a href="http://www.wimpyprogrammer.com/">WimpyProgrammer.com</a> 2019
 				</p>
 				<p class="float-right">
 					<a href="https://github.com/wimpyprogrammer/strings-to-regex"

demo/index.html

@@ -1,4 +1,4 @@
-import { condense, condenseIgnoreCase } from '../../src/index';
+import { condense, condenseIgnoreCase } from '../../src';
 import { autoExpandTextarea } from './utils/auto-expand-field';
 import { parseString, WhitespaceHandling } from './utils/wordList';
 

demo/src/demo.ts

@@ -1,19 +1,19 @@
 /* eslint no-param-reassign: ["error", { "props": true, "ignorePropertyModificationsFor": ["field"] }] */
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
+type anyFn = (...args: unknown[]) => void;
+
 /**
  * @see https://gist.github.com/fr-ser/ded7690b245223094cd876069456ed6c
  */
-function debounce<F extends Function>(func: F, wait: number): F {
+function debounce<F extends anyFn>(func: F, wait: number): F {
 	let timeoutID: number;
 
-	return (function debounced(this: any, ...args: any[]) {
+	return (function debounced(this: unknown, ...args: unknown[]) {
 		clearTimeout(timeoutID);
 
 		timeoutID = window.setTimeout(() => func.apply(this, args), wait);
-	} as any) as F;
+	} as unknown) as F;
 }
-/* eslint-enable @typescript-eslint/no-explicit-any */
 
 /**
  * Grow or shrink a <textarea> field's height to fit its contents.

demo/src/utils/auto-expand-field.ts

@@ -1,69 +1,48 @@
 import { parseString, WhitespaceHandling } from './wordList';
 
-interface TestCase {
-	delimiter: string;
-	inputString: string;
-}
-
 const { Preserve, TrimLeadingAndTrailing } = WhitespaceHandling;
 
 describe('parseString', () => {
-	it('returns an empty array when input string is empty', () => {
-		function testInput(input: string): void {
-			const wordList = parseString(input, ',', Preserve);
+	it.each(['', null, undefined])(
+		'returns an empty array when input string is %p',
+		input => {
+			const wordList = parseString(input as string, ',', Preserve);
 			expect(wordList).toEqual([]);
 		}
+	);
 
-		['', null, undefined].forEach(val => testInput(val as string));
-	});
-
-	it('returns entire input string in array when delimiter is empty', () => {
-		function testDelimiter(delimiter: string): void {
+	it.each(['', null, undefined])(
+		'returns entire input string in array when delimiter is %p',
+		testDelimiter => {
+			const delimiter = testDelimiter as string;
 			const wordList = parseString(' some input string ', delimiter, Preserve);
 			expect(wordList).toEqual([' some input string ']);
 		}
+	);
 
-		['', null, undefined].forEach(val => testDelimiter(val as string));
-	});
-
-	it('returns entire input string in array when delimiter is not present in input string', () => {
-		function testDelimiter(delimiter: string): void {
+	it.each([',', '\n', '\t'])(
+		'returns entire input string in array when delimiter %p is not present in input string',
+		delimiter => {
 			const wordList = parseString(' some input string ', delimiter, Preserve);
 			expect(wordList).toEqual([' some input string ']);
 		}
-
-		[',', '\n', '\t'].forEach(testDelimiter);
-	});
-
-	it('splits input string by delimiter', () => {
-		const expectedResult = ['foo', 'Bar', ' b@z '];
-		const testCases: TestCase[] = [
-			{ delimiter: ',', inputString: 'foo,Bar, b@z ' },
-			{ delimiter: '\t', inputString: 'foo	Bar	 b@z ' },
-			{ delimiter: 'aaa', inputString: 'fooaaaBaraaa b@z ' },
-		];
-
-		function testSplit({ delimiter, inputString }: TestCase): void {
-			const wordList = parseString(inputString, delimiter, Preserve);
-			expect(wordList).toEqual(expectedResult);
-		}
-
-		testCases.forEach(testSplit);
+	);
+
+	it.each([
+		['foo,Bar, b@z ', ','],
+		['foo	Bar	 b@z ', '\t'],
+		['fooaaaBaraaa b@z ', 'aaa'],
+	])('splits input string %p by delimiter %p', (inputString, delimiter) => {
+		const wordList = parseString(inputString, delimiter, Preserve);
+		expect(wordList).toEqual(['foo', 'Bar', ' b@z ']);
 	});
 
-	it('splits input string by whitespace delimiter', () => {
-		const expectedResult = ['foo', 'Bar', 'b@z', ''];
-		const testCases: TestCase[] = [
-			{ delimiter: ' ', inputString: 'foo Bar b@z ' },
-			{ delimiter: '  ', inputString: 'foo  Bar  b@z  ' },
-		];
-
-		function testSplit({ delimiter, inputString }: TestCase): void {
-			const wordList = parseString(inputString, delimiter, Preserve);
-			expect(wordList).toEqual(expectedResult);
-		}
-
-		testCases.forEach(testSplit);
+	it.each([
+		['foo Bar b@z ', ' '],
+		['foo  Bar  b@z  ', '  '],
+	])('splits input string %p by delimiter %p', (inputString, delimiter) => {
+		const wordList = parseString(inputString, delimiter, Preserve);
+		expect(wordList).toEqual(['foo', 'Bar', 'b@z', '']);
 	});
 
 	it('splits multiline input string by newline delimiter', () => {

demo/src/utils/wordList.spec.ts

@@ -47,6 +47,12 @@ select:invalid {
 	transition: border-color 0.6s ease-out;
 }
 
+footer:after {
+	content: '';
+	clear: both;
+	display: table;
+}
+
 @media (min-width: 576px) {
 	label + select {
 		margin-left: 0.5em;

demo/styles.css

@@ -14,7 +14,6 @@ module.exports = {
 						loader: 'ts-loader',
 						options: {
 							compilerOptions: {
-								checkJs: false, // workaround for TypeStrong/ts-loader#702
 								noEmit: false,
 							},
 							configFile: resolve(__dirname, './tsconfig.json'),