Merge branch 'release/2.0.2' into main

Author: wimpyprogrammer

src/.babelrc renamed to .babelrc

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

.editorconfig

@@ -5,11 +5,11 @@
 		"plugin:jest/recommended",
 		"plugin:@typescript-eslint/eslint-recommended",
 		"plugin:@typescript-eslint/recommended",
-		"prettier",
-		"prettier/@typescript-eslint"
+		"prettier"
 	],
 	"parserOptions": {
-		"ecmaVersion": 2018
+		"ecmaVersion": 2018,
+		"project": ["./**/tsconfig.json", "./**/tsconfig.test.json"]
 	},
 	"rules": {
 		"import/extensions": [
@@ -22,7 +22,7 @@
 		"import/no-extraneous-dependencies": [
 			"error",
 			{
-				"devDependencies": ["**/*.spec.{js,ts}", "**/jest.config.js"]
+				"devDependencies": ["**/*.spec.{js,ts}", "**/*.config.js"]
 			}
 		],
 		"import/no-unresolved": [
@@ -49,7 +49,8 @@
 			"LabeledStatement",
 			"WithStatement"
 		],
-		"@typescript-eslint/explicit-function-return-type": "off"
+		"@typescript-eslint/explicit-function-return-type": "off",
+		"@typescript-eslint/explicit-module-boundary-types": "off"
 	},
 	"settings": {
 		"import/parsers": {

.eslintrc.json

@@ -0,0 +1,36 @@
+name: Security Scan
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+  schedule:
+    # 10:17 on Fridays
+    - cron: '17 10 * * 5'
+  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/security-scan.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={@babel/*,ts-jest,typescript} .babelrc tsconfig*.json 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 }}

.github/workflows/tests.yml

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

.publishrc

@@ -3,8 +3,8 @@
 [![npm package](https://badge.fury.io/js/regex-to-strings.svg)](https://badge.fury.io/js/regex-to-strings)
 ![node version](https://img.shields.io/node/v/regex-to-strings.svg)
 ![npm type definitions](https://img.shields.io/npm/types/regex-to-strings)
-[![Build Status](https://travis-ci.org/wimpyprogrammer/regex-to-strings.svg?branch=master)](https://travis-ci.org/wimpyprogrammer/regex-to-strings)
-[![codecov](https://codecov.io/gh/wimpyprogrammer/regex-to-strings/branch/master/graph/badge.svg)](https://codecov.io/gh/wimpyprogrammer/regex-to-strings)
+![Tests](https://github.com/wimpyprogrammer/regex-to-strings/workflows/Tests/badge.svg)
+[![codecov](https://codecov.io/gh/wimpyprogrammer/regex-to-strings/branch/main/graph/badge.svg)](https://codecov.io/gh/wimpyprogrammer/regex-to-strings)
 [![Known Vulnerabilities](https://snyk.io/test/github/wimpyprogrammer/regex-to-strings/badge.svg)](https://snyk.io/test/github/wimpyprogrammer/regex-to-strings)
 
 Generate strings that match a Regular Expression pattern. Efficiently generate all possible matches, or only the quantity you need.
@@ -108,7 +108,7 @@ console.log(strings); // ['6', '5', '0', '2', '7', '9', '4', '3', '1', '8']
 
 `regex-to-strings` uses [`regexp-tree`](https://www.npmjs.com/package/regexp-tree) to parse your Regular Expression, and so the Regular Expression syntax you can use is largely determined by that library. If your pattern is not recognized by `regex-to-strings`, [try parsing it with `regexp-tree`](https://astexplorer.net/#/gist/4ea2b52f0e546af6fb14f9b2f5671c1c/39b55944da3e5782396ffa1fea3ba68d126cd394) to see if the syntax is supported.
 
-`regex-to-strings` also includes [extensive positive **and** negative tests](https://github.com/wimpyprogrammer/regex-to-strings/blob/master/src/pattern.spec.ts) that track which Regular Expression features are supported.
+`regex-to-strings` also includes [extensive positive **and** negative tests](https://github.com/wimpyprogrammer/regex-to-strings/blob/main/src/pattern.spec.ts) that track which Regular Expression features are supported.
 
 ### Regular Expressions with unbounded repetition
 

.travis.yml

@@ -27,7 +27,9 @@ export default class DemoForm {
 	protected $errorContainer: HTMLDivElement;
 	protected $errorMessage: HTMLPreElement;
 
+	// eslint-disable-next-line @typescript-eslint/no-empty-function
 	public onSubmit: () => void = () => {};
+	// eslint-disable-next-line @typescript-eslint/no-empty-function
 	public onCancel: () => void = () => {};
 
 	private onInputKeydown(event: KeyboardEvent): boolean {

README.md

@@ -32,11 +32,11 @@ export default class DemoOutput {
 
 		if (isBlockOutput) {
 			this.$expansions.innerHTML = expansions
-				.map(string => `<div class="alert alert-light">${escape(string)}</div>`)
+				.map((value) => `<div class="alert alert-light">${escape(value)}</div>`)
 				.join('\n');
 		} else {
 			this.$expansions.innerHTML = expansions
-				.map(string => `<span>${escape(string)}</span>`)
+				.map((value) => `<span>${escape(value)}</span>`)
 				.join(delimiter);
 		}
 

demo/src/components/demo-form.ts

@@ -11,7 +11,7 @@ import {
 	isCountResult,
 	isExpandResult,
 } from './worker/messages';
-// @ts-ignore Ignore lack of default export.  This is handled by worker-loader.
+// @ts-expect-error Ignore lack of default export.  This is handled by worker-loader.
 import DemoWorker from './worker';
 
 import './demo.scss';
@@ -97,7 +97,7 @@ $form.onCancel = () => {
 	hideWaitingState();
 };
 
-UrlStorage.onChange(newData => {
+UrlStorage.onChange((newData) => {
 	$form.populate(newData);
 	if (!$form.validate()) return;
 

demo/src/components/demo-output.ts

@@ -1,18 +1,18 @@
 /* eslint no-param-reassign: ["error", { "props": true, "ignorePropertyModificationsFor": ["field"] }] */
 import './auto-expand-field.scss';
 
+type anyFn = (...args: unknown[]) => void;
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * @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[]) {
 		clearTimeout(timeoutID);
-		const context = this;
-
-		timeoutID = window.setTimeout(() => func.apply(context, args), wait);
+		timeoutID = window.setTimeout(() => func.apply(this, args), wait);
 	} as any) as F;
 }
 /* eslint-enable @typescript-eslint/no-explicit-any */

demo/src/demo.ts

@@ -1,3 +1,4 @@
-export function getElement<T extends Element>(selector: string) {
-	return document.querySelector(selector) as T;
+export function getElement<T extends Element>(selector: string): T {
+	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+	return document.querySelector(selector)!;
 }

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

@@ -56,7 +56,7 @@ export function write(data: FormInput) {
  * @param fn The function to run and receive the new data
  */
 export function onChange(fn: (newData: StoredInput) => void) {
-	return history.listen(location => {
+	return history.listen((location) => {
 		const newData = parse(location);
 		fn(newData);
 	});

demo/src/utils/dom.ts

@@ -9,7 +9,7 @@ import {
 	isExpandRequest,
 	OptimizeResult,
 } from './messages';
-import { expand, toRegExp } from '../../../src/index';
+import { expand, toRegExp } from '../../../src';
 
 function assertNeverRequest(x: never): never {
 	throw new TypeError(`Unexpected message: ${x}`);

demo/src/utils/url-storage.ts

@@ -1,5 +1,5 @@
-/* eslint-disable no-empty-function, no-useless-constructor, @typescript-eslint/no-parameter-properties */
-import { expand } from '../../../src/index';
+/* eslint-disable max-classes-per-file, no-useless-constructor */
+import { expand } from '../../../src';
 
 interface WorkerMessage {
 	readonly kind: string;

demo/src/worker/index.ts

@@ -13,7 +13,7 @@ const featuresToPolyfill = [
 	'es.symbol.iterator',
 ].join(',');
 
-// @ts-ignore worker-specific function that is unrecognized
+// @ts-expect-error worker-specific function that is unrecognized
 importScripts(
 	`https://polyfill.app/api/polyfill?features=${featuresToPolyfill}&context=worker`
 );

demo/src/worker/messages.ts

@@ -5,10 +5,10 @@
 			"es5",
 			"es2015.core",
 			"es2015.iterable",
-			"es2016.array.include",
-			"es2017.string"
+			"es2016.array.include"
 		]
 	},
-	"extends": "../tsconfig.release.json",
-	"include": ["../src", "./src"]
+	"extends": "../tsconfig.json",
+	"include": ["src"],
+	"references": [{ "path": "../src" }]
 }

demo/src/worker/polyfills.ts

@@ -1,5 +1,7 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+/// <reference types="node" />;
+/* eslint-disable @typescript-eslint/no-var-requires */
 const { resolve } = require('path');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
 module.exports = {
 	entry: './demo/src/demo.ts',
@@ -9,6 +11,7 @@ module.exports = {
 		lodash: '_',
 		RegexColorizer: 'RegexColorizer',
 	},
+	plugins: [new CleanWebpackPlugin()],
 	module: {
 		rules: [
 			{
@@ -29,6 +32,7 @@ module.exports = {
 						options: {
 							compilerOptions: { noEmit: false },
 							configFile: resolve(__dirname, './tsconfig.json'),
+							projectReferences: true,
 						},
 					},
 				],

demo/tsconfig.json

@@ -6,7 +6,7 @@ module.exports = {
 	],
 	globals: {
 		'ts-jest': {
-			tsConfig: 'tsconfig.test.json',
+			tsconfig: 'src/tsconfig.test.json',
 		},
 	},
 	preset: 'ts-jest',