Fix incorrect name for expression defines

developit · developit · commit ab4080c3b4d5 · 2020-04-19T22:00:54.000Z
diff --git a/src/index.js b/src/index.js
@@ -33,9 +33,13 @@ const toReplacementExpression = (value, name) => {
 		return [JSON.stringify(matches[2]), name];
 	}
 
-	// --define A=1,B=true produces int/boolean literal, and
 	// --define @assign=Object.assign replaces expressions with expressions:
-	if (/^(true|false|\d+)$/i.test(value) || name[0] === '@') {
+	if (name[0] === '@') {
+		return [value, name.substring(1)];
+	}
+
+	// --define A=1,B=true produces int/boolean literal:
+	if (/^(true|false|\d+)$/i.test(value)) {
 		return [value, name];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,13 @@ const toReplacementExpression = (value, name) => {`
`33`	`33`	`return [JSON.stringify(matches[2]), name];`
`34`	`34`	`}`
`35`	`35`
`36`		`- // --define A=1,B=true produces int/boolean literal, and`
`37`	`36`	`// --define @assign=Object.assign replaces expressions with expressions:`
`38`		`- if (/^(true\|false\|\d+)$/i.test(value) \|\| name[0] === '@') {`
	`37`	`+ if (name[0] === '@') {`
	`38`	`+ return [value, name.substring(1)];`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ // --define A=1,B=true produces int/boolean literal:`
	`42`	`+ if (/^(true\|false\|\d+)$/i.test(value)) {`
`39`	`43`	`return [value, name];`
`40`	`44`	`}`
`41`	`45`