Use + to conform strings to numbers [refactor]

lib/instrument/internalVars.js

@@ -78,7 +78,7 @@ function checkInternalVarNameClash(varName, state) {
 	if (!internalNameMatch) return;
 
 	const currentNum = state.internalVarsPrefixNum;
-	const newNum = (internalNameMatch[1] * 1 || 0) + 1;
+	const newNum = (+internalNameMatch[1] || 0) + 1;
 	if (newNum > currentNum) state.internalVarsPrefixNum = newNum;
 }
 

lib/serialize/arguments.js

@@ -23,7 +23,7 @@ module.exports = function serializeArguments(args, record) {
 		if (!isIntegerKey(key)) break;
 
 		// Fill gaps (deleted elements) with undefined
-		const index = key * 1;
+		const index = +key;
 		let nextIndex = argumentNodes.length;
 		while (index !== nextIndex) {
 			argumentNodes[nextIndex] = undefinedRecord.varNode;

lib/serialize/boxed.js

@@ -37,7 +37,7 @@ module.exports = {
 				// All numerical keys can be skipped, even ones above max safe integer key as boxed strings
 				// only allow writing to numerical keys within bounds of string length
 				if (!isNumberKey(key)) return false;
-				return key * 1 < len;
+				return +key < len;
 			}
 		);
 	},

lib/serialize/functions.js

@@ -69,7 +69,7 @@ module.exports = {
 			() => `Function JS:\n${js}\nTrace:\n${this.getTraceStack()}\n`
 		);
 
-		const fnId = commentMatch[1] * 1,
+		const fnId = +commentMatch[1],
 			filename = JSON.parse(`"${commentMatch[3]}"`);
 
 		// Get/create file

lib/serialize/objects.js

@@ -68,7 +68,7 @@ module.exports = {
 				// NB: Default prop keys are always valid identifiers
 				const key = nextDefaultProp.name;
 				const memberNode = isIntegerKey(key)
-					? t.memberExpression(record.varNode, t.numericLiteral(key * 1), true)
+					? t.memberExpression(record.varNode, t.numericLiteral(+key), true)
 					: t.memberExpression(record.varNode, t.identifier(key));
 				const assignmentNode = t.unaryExpression('delete', memberNode);
 				createAssignment(record, assignmentNode, memberNode, 'object', true);
@@ -114,7 +114,7 @@ module.exports = {
 					defaultProp = nextDefaultProp;
 				} else if (
 					!isIntegerKey(key)
-					|| (isIntegerKey(nextDefaultKey) && nextDefaultKey * 1 < key * 1)
+					|| (isIntegerKey(nextDefaultKey) && +nextDefaultKey < +key)
 				) {
 					deleteDefaultProps(key);
 					defaultProp = nextDefaultProp;

lib/serialize/output.js

@@ -117,7 +117,7 @@ module.exports = {
 					for (const [exportIndex, importValueRecord] of Object.entries(importRecords)) {
 						const importValueNode = t.memberExpression(
 							importVarNode,
-							t.numericLiteral(exportIndex * 1),
+							t.numericLiteral(+exportIndex),
 							true // computed
 						);
 						importValueRecord.node = importValueNode;

lib/serialize/parseFunction.js

@@ -201,7 +201,7 @@ module.exports = function parseFunction(
 				keyNode = t.identifier(name);
 				accessComputed = false;
 			} else {
-				keyNode = isNumberKey(name) ? t.numericLiteral(name * 1) : t.stringLiteral(name);
+				keyNode = isNumberKey(name) ? t.numericLiteral(+name) : t.stringLiteral(name);
 				accessComputed = true;
 			}
 

lib/serialize/utils.js

@@ -49,7 +49,7 @@ const JS_ID_REGEX = /^[A-Za-z$_][A-Za-z0-9$_]*$/u;
 function isNumberKey(name) {
 	if (name === '0') return true;
 	if (!NUMBER_KEY_REGEX.test(name)) return false; // eslint-disable-line no-use-before-define
-	return Number.isSafeInteger(name * 1);
+	return Number.isSafeInteger(+name);
 }
 
 const NUMBER_KEY_REGEX = /^[1-9][0-9]*$/u;
@@ -62,7 +62,7 @@ const NUMBER_KEY_REGEX = /^[1-9][0-9]*$/u;
  * @returns {boolean} - `true` if is valid integer object key
  */
 function isIntegerKey(name) {
-	return isNumberKey(name) && name * 1 <= MAX_INTEGER_KEY; // eslint-disable-line no-use-before-define
+	return isNumberKey(name) && +name <= MAX_INTEGER_KEY; // eslint-disable-line no-use-before-define
 }
 
 const MAX_INTEGER_KEY = 4294967294;
@@ -88,7 +88,7 @@ const JS_ID_ILLEGAL_CHARS_REGEX = /[^A-Za-z0-9$_]+/gu,
  */
 function createKeyNode(key) {
 	if (isJsIdentifier(key)) return t.identifier(key);
-	if (isNumberKey(key)) return t.numericLiteral(key * 1);
+	if (isNumberKey(key)) return t.numericLiteral(+key);
 	return t.stringLiteral(key);
 }
 

lib/serialize/values.js

@@ -141,7 +141,7 @@ module.exports = {
 			const typeName = isGetter ? 'getter' : 'setter';
 			const parentRecord = this.serializeValue(parent, null, `<parent global ${typeName} ${key}>`);
 			const parentVarNode = parentRecord.varNode;
-			const keyNode = isNumberKey(key) ? t.numericLiteral(key * 1) : t.stringLiteral(key);
+			const keyNode = isNumberKey(key) ? t.numericLiteral(+key) : t.stringLiteral(key);
 			const getDescriptorRecord = this.serializeValue(Object.getOwnPropertyDescriptor);
 			node = t.memberExpression(
 				t.callExpression(

lib/serialize/varNames.js

@@ -98,7 +98,7 @@ class UnmangledVarNameFactory extends VarNameFactory {
 	transform(name, isPrivate) {
 		if (isPrivate) name = `${PRIVATE_PREFIX}${name}`;
 		const [, nameWithoutPostfix, numStr] = name.match(NAME_REGEX);
-		let num = numStr ? numStr * 1 : -1;
+		let num = numStr ? +numStr : -1;
 
 		const usedNum = this.used.get(nameWithoutPostfix);
 		if (usedNum !== undefined && num <= usedNum) num = usedNum + 1;