From 473ff4ae14d974bc859f81f3fa985cde7e485b4d Mon Sep 17 00:00:00 2001 From: Sendil Kumar N Date: Wed, 20 Mar 2019 09:56:42 +0100 Subject: [PATCH] chore(types): add type information (#791) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **What kind of change does this PR introduce?** Adds some type related information and removed where it is obvious **Did you add tests for your changes?** N/A **If relevant, did you update the documentation?** N/A **Summary** leverage on type inference r? @evenstensberg @ematipico @dhruvdutt **Does this PR introduce a breaking change?** **Other information** --- packages/add/index.ts | 8 ++-- packages/generate-loader/index.ts | 2 +- packages/generate-plugin/index.ts | 2 +- packages/generators/add-generator.ts | 13 +++--- packages/generators/addon-generator.ts | 2 +- packages/generators/init-generator.ts | 4 +- packages/generators/remove-generator.ts | 4 +- packages/generators/utils/validate.ts | 4 +- packages/init/index.ts | 2 +- packages/init/init.ts | 10 ++--- packages/migrate/index.ts | 8 ++-- packages/remove/index.ts | 6 +-- packages/serve/index.ts | 2 +- packages/update/index.ts | 6 +-- packages/utils/ast-utils.ts | 19 ++++++--- packages/utils/copy-utils.ts | 8 ++-- packages/utils/defineTest.ts | 56 +++++++++++-------------- packages/utils/modify-config-helper.ts | 6 +-- packages/utils/npm-exists.ts | 4 +- packages/utils/npm-packages-exists.ts | 2 +- packages/utils/package-manager.ts | 4 +- packages/utils/scaffold.ts | 8 ++-- packages/utils/validate-identifier.ts | 8 ++-- packages/webpack-scaffold/index.ts | 4 +- 24 files changed, 95 insertions(+), 97 deletions(-) diff --git a/packages/add/index.ts b/packages/add/index.ts index 21a80f2d2a9..bc5fe92f195 100644 --- a/packages/add/index.ts +++ b/packages/add/index.ts @@ -9,13 +9,13 @@ import modifyConfigHelper from "@webpack-cli/utils/modify-config-helper"; * we're given on a generator * */ -const DEFAULT_WEBPACK_CONFIG_FILENAME: string = "webpack.config.js"; +const DEFAULT_WEBPACK_CONFIG_FILENAME = "webpack.config.js"; export default function add(...args: string[]): Function { - const filePaths: string[] = args.slice(3); - let configFile: string = DEFAULT_WEBPACK_CONFIG_FILENAME; + const filePaths = args.slice(3); + let configFile = DEFAULT_WEBPACK_CONFIG_FILENAME; if (filePaths.length) { - configFile = filePaths[0]; + configFile = filePaths[0]; } return modifyConfigHelper("add", defaultGenerator, configFile); diff --git a/packages/generate-loader/index.ts b/packages/generate-loader/index.ts index 83dc9cea9fc..b56835cfc97 100644 --- a/packages/generate-loader/index.ts +++ b/packages/generate-loader/index.ts @@ -10,7 +10,7 @@ import { IYeoman } from "./types/Yeoman"; export default function loaderCreator(): void { const env = yeoman.createEnv(); - const generatorName: string = "webpack-loader-generator"; + const generatorName = "webpack-loader-generator"; env.registerStub(LoaderGenerator, generatorName); diff --git a/packages/generate-plugin/index.ts b/packages/generate-plugin/index.ts index 6c31d6d43df..c5fab329c0a 100644 --- a/packages/generate-plugin/index.ts +++ b/packages/generate-plugin/index.ts @@ -10,7 +10,7 @@ import { IYeoman } from "./types/Yeoman"; export default function pluginCreator(): void { const env = yeoman.createEnv(); - const generatorName: string = "webpack-plugin-generator"; + const generatorName = "webpack-plugin-generator"; env.registerStub(PluginGenerator, generatorName); diff --git a/packages/generators/add-generator.ts b/packages/generators/add-generator.ts index 57548e98c92..134c10be8b4 100644 --- a/packages/generators/add-generator.ts +++ b/packages/generators/add-generator.ts @@ -11,7 +11,6 @@ import { AutoComplete, Confirm, IInquirerInput, - IInquirerList, Input, List, } from "@webpack-cli/webpack-scaffold"; @@ -51,7 +50,7 @@ function replaceAt(str: string, index: number, replace: string): string { * is present */ const traverseAndGetProperties = (arr: object[], prop: string): boolean => { - let hasProp: boolean = false; + let hasProp = false; arr.forEach((p: object): void => { if (p[prop]) { hasProp = true; @@ -174,7 +173,7 @@ export default class AddGenerator extends Generator { }); } } - const temp: string = action; + const temp = action; if (action === "resolveLoader") { action = "resolve"; } @@ -426,11 +425,11 @@ export default class AddGenerator extends Generator { .then((p: string) => { if (p) { this.dependencies.push(answerToAction.actionAnswer); - const normalizePluginName: string = answerToAction.actionAnswer.replace( + const normalizePluginName = answerToAction.actionAnswer.replace( "-webpack-plugin", "Plugin", ); - const pluginName: string = replaceAt( + const pluginName = replaceAt( normalizePluginName, 0, normalizePluginName.charAt(0).toUpperCase(), @@ -472,7 +471,7 @@ export default class AddGenerator extends Generator { return; } // Either we are adding directly at the property, else we're in a prop.theOne scenario - const actionMessage: string = + const actionMessage = isDeepProp[1] === "other" ? `What do you want the key on ${ action @@ -518,7 +517,7 @@ export default class AddGenerator extends Generator { ); } else { // We got the schema prop, we've correctly prompted it, and can add it directly - this.configuration.config.item = action + "." + isDeepProp[1]; + this.configuration.config.item = `${action}.${isDeepProp[1]}`; this.configuration.config.webpackOptions[action] = { [isDeepProp[1]]: deepPropAns.deepProp, }; diff --git a/packages/generators/addon-generator.ts b/packages/generators/addon-generator.ts index 8e56d92e5cf..7f83dddf104 100644 --- a/packages/generators/addon-generator.ts +++ b/packages/generators/addon-generator.ts @@ -46,7 +46,7 @@ export default function addonGenerator( } public default() { - const currentDirName: string = path.basename(this.destinationPath()); + const currentDirName = path.basename(this.destinationPath()); if (currentDirName !== this.props.name) { this.log(` Your project must be inside a folder named ${this.props.name} diff --git a/packages/generators/init-generator.ts b/packages/generators/init-generator.ts index cc7f8246573..90207de3c61 100644 --- a/packages/generators/init-generator.ts +++ b/packages/generators/init-generator.ts @@ -430,7 +430,7 @@ export default class InitGenerator extends Generator { public installPlugins() { if (this.isProd) { this.dependencies = this.dependencies.filter( - (p: string) => p !== "terser-webpack-plugin", + (p: string): boolean => p !== "terser-webpack-plugin", ); } else { this.configuration.config.topScope.push( @@ -439,7 +439,7 @@ export default class InitGenerator extends Generator { "\n", ); } - const packager: string = getPackageManager(); + const packager = getPackageManager(); const opts: { dev?: boolean, "save-dev"?: boolean, diff --git a/packages/generators/remove-generator.ts b/packages/generators/remove-generator.ts index cec7c7a08a2..d81bdeeaf94 100644 --- a/packages/generators/remove-generator.ts +++ b/packages/generators/remove-generator.ts @@ -33,8 +33,8 @@ export default class RemoveGenerator extends Generator { }, }; - let configPath: string = path.resolve(process.cwd(), "webpack.config.js"); - const webpackConfigExists: boolean = fs.existsSync(configPath); + let configPath = path.resolve(process.cwd(), "webpack.config.js"); + const webpackConfigExists = fs.existsSync(configPath); if (!webpackConfigExists) { configPath = null; // end the generator stating webpack config not found or to specify the config diff --git a/packages/generators/utils/validate.ts b/packages/generators/utils/validate.ts index b1ff173ca54..806e2fdb074 100644 --- a/packages/generators/utils/validate.ts +++ b/packages/generators/utils/validate.ts @@ -7,9 +7,7 @@ * Or a string if the user hasn't written anything */ export default function validate(value: string): string | boolean { - const pass: number = value.length; - - if (pass) { + if (value.length) { return true; } diff --git a/packages/init/index.ts b/packages/init/index.ts index bb80bd0fae3..a412bceebfb 100644 --- a/packages/init/index.ts +++ b/packages/init/index.ts @@ -14,7 +14,7 @@ import npmPackagesExists from "@webpack-cli/utils/npm-packages-exists"; */ export default function initializeInquirer(...args: string[]): Function | void { - const packages: string[] = args.slice(3); + const packages = args.slice(3); if (packages.length === 0) { return modifyConfigHelper("init", defaultGenerator); diff --git a/packages/init/init.ts b/packages/init/init.ts index a564cd239c7..5e77c0075b6 100644 --- a/packages/init/init.ts +++ b/packages/init/init.ts @@ -42,11 +42,11 @@ export default function runTransform(webpackProperties: IWebpackProperties, acti .keys(webpackProperties) .filter((p: string): boolean => p !== "configFile" && p !== "configPath"); - const initActionNotDefined: boolean = (action && action !== "init") || false; + const initActionNotDefined = (action && action !== "init") || false; webpackConfig.forEach((scaffoldPiece: string): Promise => { const config: IConfiguration = webpackProperties[scaffoldPiece]; - const transformations: string[] = mapOptionsToTransform(config); + const transformations = mapOptionsToTransform(config); const ast = j( initActionNotDefined ? webpackProperties.configFile @@ -58,12 +58,12 @@ export default function runTransform(webpackProperties: IWebpackProperties, acti return astTransform(j, ast, config.webpackOptions[f], transformAction, f); }) .then((value: string[]): void | PromiseLike => { - let configurationName: string = "webpack.config.js"; + let configurationName = "webpack.config.js"; if (config.configName) { - configurationName = "webpack." + config.configName + ".js"; + configurationName = `webpack.${config.configName}.js`; } - const outputPath: string = initActionNotDefined + const outputPath = initActionNotDefined ? webpackProperties.configPath : path.join(process.cwd(), configurationName); diff --git a/packages/migrate/index.ts b/packages/migrate/index.ts index ea51eb87364..2a34c453438 100644 --- a/packages/migrate/index.ts +++ b/packages/migrate/index.ts @@ -42,14 +42,14 @@ declare var process: { */ export default function migrate(...args: string[]): void | Promise { - const filePaths: string[] = args.slice(3); + const filePaths = args.slice(3); if (!filePaths.length) { - const errMsg: string = "\n ✖ Please specify a path to your webpack config \n "; + const errMsg = "\n ✖ Please specify a path to your webpack config \n "; console.error(chalk.red(errMsg)); return; } - const currentConfigPath: string = path.resolve(process.cwd(), filePaths[0]); + const currentConfigPath = path.resolve(process.cwd(), filePaths[0]); let outputConfigPath: string; if (!filePaths[1]) { @@ -232,7 +232,7 @@ function runMigration(currentConfigPath: string, outputConfigPath: string): Prom }); }) .catch((err: object): void => { - const errMsg: string = "\n ✖ ︎Migration aborted due to some errors: \n"; + const errMsg = "\n ✖ ︎Migration aborted due to some errors: \n"; console.error(chalk.red(errMsg)); console.error(err); process.exitCode = 1; diff --git a/packages/remove/index.ts b/packages/remove/index.ts index ce6e0dbf8e0..429cbd8805c 100644 --- a/packages/remove/index.ts +++ b/packages/remove/index.ts @@ -11,10 +11,10 @@ import modifyConfigHelper from "@webpack-cli/utils/modify-config-helper"; */ export default function remove(...args: string[]): Function { - const DEFAULT_WEBPACK_CONFIG_FILENAME: string = "webpack.config.js"; + const DEFAULT_WEBPACK_CONFIG_FILENAME = "webpack.config.js"; - const filePaths: string[] = args.slice(3); - let configFile: string = DEFAULT_WEBPACK_CONFIG_FILENAME; + const filePaths = args.slice(3); + let configFile = DEFAULT_WEBPACK_CONFIG_FILENAME; if (filePaths.length) { configFile = filePaths[0]; } diff --git a/packages/serve/index.ts b/packages/serve/index.ts index 7272733435d..d4fa9cad4a0 100644 --- a/packages/serve/index.ts +++ b/packages/serve/index.ts @@ -52,7 +52,7 @@ const getRootPathModule = (dep: string): string => path.resolve(process.cwd(), d */ function serve() { - const packageJSONPath: string = getRootPathModule("package.json"); + const packageJSONPath = getRootPathModule("package.json"); if (!packageJSONPath) { console.error( "\n", diff --git a/packages/update/index.ts b/packages/update/index.ts index 09f398b0915..8e15be5217d 100644 --- a/packages/update/index.ts +++ b/packages/update/index.ts @@ -11,10 +11,10 @@ import modifyConfigHelper from "@webpack-cli/utils/modify-config-helper"; */ export default function update(...args: string[]): Function { - const DEFAULT_WEBPACK_CONFIG_FILENAME: string = "webpack.config.js"; + const DEFAULT_WEBPACK_CONFIG_FILENAME = "webpack.config.js"; - const filePaths: string[] = args.slice(3); - let configFile: string = DEFAULT_WEBPACK_CONFIG_FILENAME; + const filePaths = args.slice(3); + let configFile = DEFAULT_WEBPACK_CONFIG_FILENAME; if (filePaths.length) { configFile = filePaths[0]; } diff --git a/packages/utils/ast-utils.ts b/packages/utils/ast-utils.ts index 03222303e50..53e2e60e685 100644 --- a/packages/utils/ast-utils.ts +++ b/packages/utils/ast-utils.ts @@ -8,9 +8,10 @@ import * as validateIdentifier from "./validate-identifier"; * @param {Array} paths - Array of strings containing the traversal path * @returns {Any} Value at given traversal path */ + function safeTraverse(obj: INode, paths: string[]): any { let val: INode = obj; - let idx: number = 0; + let idx = 0; while (idx < paths.length) { if (!val) { @@ -28,13 +29,19 @@ function safeTraverse(obj: INode, paths: string[]): any { * @param {Node} path - AST node * @returns {String|Boolean} type at given path. */ + function safeTraverseAndGetType(path: INode): string | boolean { const pathValue: INode = safeTraverse(path, ["value", "value"]); return pathValue ? pathValue.type : false; } -// Convert nested MemberExpressions to strings like webpack.optimize.DedupePlugin -function memberExpressionToPathString(path: INode) { +/** + * Convert nested MemberExpressions to strings like webpack.optimize.DedupePlugin + * @param {Node} path - AST node + * @returns {String} member expression string. + */ + +function memberExpressionToPathString(path: INode): string { if (path && path.object) { return [memberExpressionToPathString(path.object), path.property.name].join( ".", @@ -230,7 +237,7 @@ function addOrUpdateConfigObject( if (propertyExists) { rootNode.properties - .filter((path: INode) => path.key.name === configProperty) + .filter((path: INode): boolean => path.key.name === configProperty) .forEach((path: INode) => { const newProperties = path.value.properties.filter( (p: INode) => p.key.name !== key, @@ -269,7 +276,7 @@ function findAndRemovePluginByName(j: IJSCodeshift, node: INode, pluginName: str let rootPath: INode; findPluginsByName(j, node, [pluginName]) - .filter((path: INode) => safeTraverse(path, ["parent", "value"])) + .filter((path: INode): boolean => safeTraverse(path, ["parent", "value"])) .forEach((path: INode) => { rootPath = safeTraverse(path, ["parent", "parent", "parent", "value"]); const arrayPath: INode = path.parent.value; @@ -324,7 +331,7 @@ function createOrUpdatePluginByName(j: IJSCodeshift, rootNodePath: INode, plugin // Search for same keys in the existing object const existingProps = j(currentProps) .find(j.Identifier) - .filter((p: INode) => opt.key.value === p.value.name); + .filter((p: INode): boolean => opt.key.value === p.value.name); if (existingProps.size()) { // Replacing values for the same key diff --git a/packages/utils/copy-utils.ts b/packages/utils/copy-utils.ts index d7f98fa6639..5f78d92b3d4 100644 --- a/packages/utils/copy-utils.ts +++ b/packages/utils/copy-utils.ts @@ -20,9 +20,9 @@ export const generatorCopy = ( generator, templateDir: string, ): (filePath: string) => void => (filePath: string): void => { - const sourceParts: string[] = templateDir.split(path.delimiter); + const sourceParts = templateDir.split(path.delimiter); sourceParts.push.apply(sourceParts, filePath.split("/")); - const targetParts: string[] = path.dirname(filePath).split("/"); + const targetParts = path.dirname(filePath).split("/"); targetParts.push(path.basename(filePath, ".tpl")); generator.fs.copy( @@ -47,9 +47,9 @@ export const generatorCopyTpl = ( templateDir: string, templateData: object, ): (filePath: string) => void => (filePath: string): void => { - const sourceParts: string[] = templateDir.split(path.delimiter); + const sourceParts = templateDir.split(path.delimiter); sourceParts.push.apply(sourceParts, filePath.split("/")); - const targetParts: string[] = path.dirname(filePath).split("/"); + const targetParts = path.dirname(filePath).split("/"); targetParts.push(path.basename(filePath, ".tpl").slice(1)); generator.fs.copyTpl( diff --git a/packages/utils/defineTest.ts b/packages/utils/defineTest.ts index a2a570207f2..b5b076cfa4b 100644 --- a/packages/utils/defineTest.ts +++ b/packages/utils/defineTest.ts @@ -56,20 +56,20 @@ function runSingleTransform( if (!testFilePrefix) { testFilePrefix = transformName; } - const fixtureDir: string = path.join( - dirName, - "__tests__", - "__testfixtures__", + const fixtureDir = path.join( + dirName, + "__tests__", + "__testfixtures__", ); - const inputPath: string = path.join(fixtureDir, testFilePrefix + ".input.js"); - const source: string = fs.readFileSync(inputPath, "utf8"); + const inputPath = path.join(fixtureDir, `${testFilePrefix}.input.js`); + const source = fs.readFileSync(inputPath, "utf8"); let module: IModule; // Assumes transform and test are on the same level if (action) { - module = require(path.join(dirName, "recursive-parser" + ".ts")); + module = require(path.join(dirName, "recursive-parser.ts")); } else { - module = require(path.join(dirName, transformName + ".ts")); + module = require(path.join(dirName, `${transformName}.ts`)); } // Handle ES6 modules using default export for the transform const transform = module.default ? module.default : module; @@ -78,22 +78,22 @@ function runSingleTransform( // a fresh copy of jscodeshift on every test run. let jscodeshift: IJSCodeshift = require("jscodeshift/dist/core"); if (module.parser) { - jscodeshift = jscodeshift.withParser(module.parser); + jscodeshift = jscodeshift.withParser(module.parser); } const ast: INode = jscodeshift(source); if (initOptions || typeof initOptions === "boolean") { - return transform( - jscodeshift, - ast, - initOptions, - action, - transformName, - ).toSource({ - quote: "single", - }); + return transform( + jscodeshift, + ast, + initOptions, + action, + transformName, + ).toSource({ + quote: "single", + }); } return transform(jscodeshift, ast, source, action).toSource({ - quote: "single", + quote: "single", }); } @@ -122,18 +122,12 @@ export default function defineTest( action?: object | string, ): void { const testName: string = testFilePrefix - ? `transforms correctly using "${testFilePrefix}" data` - : "transforms correctly"; + ? `transforms correctly using "${testFilePrefix}" data` + : "transforms correctly"; describe(transformName, () => { - it(testName, () => { - const output = runSingleTransform( - dirName, - transformName, - testFilePrefix, - transformObject, - action, - ); - expect(output).toMatchSnapshot(); - }); + it(testName, () => { + const output = runSingleTransform(dirName, transformName, testFilePrefix, transformObject, action); + expect(output).toMatchSnapshot(); + }); }); } diff --git a/packages/utils/modify-config-helper.ts b/packages/utils/modify-config-helper.ts index d1066c029c3..219a45ae5fe 100644 --- a/packages/utils/modify-config-helper.ts +++ b/packages/utils/modify-config-helper.ts @@ -75,7 +75,7 @@ export default function modifyHelperUtil( } const env = yeoman.createEnv("webpack", null); - const generatorName: string = `webpack-${action}-generator`; + const generatorName = `webpack-${action}-generator`; if (!generator) { generator = class extends Generator { @@ -91,12 +91,12 @@ export default function modifyHelperUtil( env.run(generatorName).then((_: void) => { let configModule: object; try { - const confPath: string = path.resolve(process.cwd(), ".yo-rc.json"); + const confPath = path.resolve(process.cwd(), ".yo-rc.json"); configModule = require(confPath); // Change structure of the config to be transformed const tmpConfig: object = {}; Object.keys(configModule).forEach((prop: string): void => { - const configs: string[] = Object.keys(configModule[prop].configuration); + const configs = Object.keys(configModule[prop].configuration); configs.forEach((conf: string): void => { tmpConfig[conf] = configModule[prop].configuration[conf]; }); diff --git a/packages/utils/npm-exists.ts b/packages/utils/npm-exists.ts index 2856f439e96..2abc29b40c3 100644 --- a/packages/utils/npm-exists.ts +++ b/packages/utils/npm-exists.ts @@ -12,8 +12,8 @@ const constant = (value: boolean) => (res: got.Response): boolean | Prom */ export default function npmExists(moduleName: string): Promise { - const hostname: string = "https://www.npmjs.org"; - const pkgUrl: string = `${hostname}/package/${moduleName}`; + const hostname = "https://www.npmjs.org"; + const pkgUrl = `${hostname}/package/${moduleName}`; return got(pkgUrl, { method: "HEAD", }) diff --git a/packages/utils/npm-packages-exists.ts b/packages/utils/npm-packages-exists.ts index 2d206cfe54c..a1987c3332d 100644 --- a/packages/utils/npm-packages-exists.ts +++ b/packages/utils/npm-packages-exists.ts @@ -4,7 +4,7 @@ import isLocalPath from "./is-local-path"; import npmExists from "./npm-exists"; import { resolvePackages } from "./resolve-packages"; -const WEBPACK_SCAFFOLD_PREFIX: string = "webpack-scaffold"; +const WEBPACK_SCAFFOLD_PREFIX = "webpack-scaffold"; /** * diff --git a/packages/utils/package-manager.ts b/packages/utils/package-manager.ts index 0660cd3bf78..0a48e062607 100644 --- a/packages/utils/package-manager.ts +++ b/packages/utils/package-manager.ts @@ -69,10 +69,10 @@ export function spawnChild(pkg: string): SpawnSyncReturns { */ export function getPackageManager(): string { - const hasLocalNPM: boolean = fs.existsSync( + const hasLocalNPM = fs.existsSync( path.resolve(process.cwd(), "package-lock.json"), ); - const hasLocalYarn: boolean = fs.existsSync(path.resolve(process.cwd(), "yarn.lock")); + const hasLocalYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock")); if (hasLocalNPM) { return "npm"; } else if (hasLocalYarn) { diff --git a/packages/utils/scaffold.ts b/packages/utils/scaffold.ts index 3edfa815991..c1bd9ecbeca 100644 --- a/packages/utils/scaffold.ts +++ b/packages/utils/scaffold.ts @@ -19,7 +19,7 @@ import { INode } from "./types/NodePath"; */ function mapOptionsToTransform(config: IConfig): string[] { - return Object.keys(config.webpackOptions).filter((k: string) => propTypes.has(k)); + return Object.keys(config.webpackOptions).filter((k: string): boolean => propTypes.has(k)); } /** @@ -34,15 +34,15 @@ function mapOptionsToTransform(config: IConfig): string[] { export default function runTransform(transformConfig: ITransformConfig, action: string): void { // webpackOptions.name sent to nameTransform if match - const webpackConfig = Object.keys(transformConfig).filter((p: string) => { + const webpackConfig = Object.keys(transformConfig).filter((p: string): boolean => { return p !== "configFile" && p !== "configPath"; }); - const initActionNotDefined: boolean = action && action !== "init" ? true : false; + const initActionNotDefined = action && action !== "init" ? true : false; webpackConfig.forEach((scaffoldPiece: string) => { const config: IConfig = transformConfig[scaffoldPiece]; - const transformations: string[] = mapOptionsToTransform(config); + const transformations = mapOptionsToTransform(config); if (config.topScope && transformations.indexOf("topScope") === -1) { transformations.push("topScope"); diff --git a/packages/utils/validate-identifier.ts b/packages/utils/validate-identifier.ts index 341af6c6bd6..b3d0b155acf 100644 --- a/packages/utils/validate-identifier.ts +++ b/packages/utils/validate-identifier.ts @@ -3,7 +3,7 @@ // predicate containing a big ugly `switch` statement is faster than // a regular expression, and on Chrome the two are about on par. // https://tc39.github.io/ecma262/#sec-keywords -function isKeyword(code: string) { +function isKeyword(code: string): boolean { switch (code.length) { case 2: return code === "if" || code === "in" || code === "do"; @@ -78,7 +78,7 @@ function isKeyword(code: string) { // code point above 128. /* tslint:disable: max-line-length */ -let nonASCIIidentifierStartChars: string = +let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0-\u08b2\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua7ad\ua7b0\ua7b1\ua7f7-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab5f\uab64\uab65\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc"; let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e4-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d01-\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19b0-\u19c0\u19c8\u19c9\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1cf8\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8e0-\ua8f1\ua900-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2d\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f"; @@ -97,7 +97,7 @@ nonASCIIidentifierStartChars = nonASCIIidentifierChars = null; // >0xffff code points that are a valid part of identifiers. The // offset starts at 0x10000, and each pair of numbers represents an // offset to the next range, and then a size of the range. -const astralIdentifierStartCodes: number[] = [ +const astralIdentifierStartCodes = [ 0, 11, 2, @@ -428,7 +428,7 @@ const astralIdentifierStartCodes: number[] = [ 541, ]; -const astralIdentifierCodes: number[] = [ +const astralIdentifierCodes = [ 509, 0, 227, diff --git a/packages/webpack-scaffold/index.ts b/packages/webpack-scaffold/index.ts index 093f6a6bd02..e666071046d 100755 --- a/packages/webpack-scaffold/index.ts +++ b/packages/webpack-scaffold/index.ts @@ -33,13 +33,13 @@ export function createDynamicPromise(arrOrString: string[] | string): string { if (Array.isArray(arrOrString)) { return ( "() => new Promise((resolve) => resolve([" + - arrOrString.map((func: string) => { + arrOrString.map((func: string): string => { return "'" + func + "'"; }) + "]))" ); } else { - return "() => new Promise((resolve) => resolve(" + "'" + arrOrString + "'" + "))"; + return `() => new Promise((resolve) => resolve('${arrOrString}'))`; } }