Support numeric separator (#3626)

* Support numeric separator Ref rollup/rollup#3605 * Fix test * Upgrade license * Add test Co-authored-by: Lukas Taegert-Atkinson <[email protected]>
iDestin · Jun 12, 2020 · bacfcbe · bacfcbe
1 parent 872e9e2
commit bacfcbe
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 5 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -82,6 +82,33 @@ Repository: https://github.com/acornjs/acorn-class-fields
 
 ---------------------------------------
 
+## acorn-numeric-separator
+License: MIT
+By: Adrian Heine
+Repository: https://github.com/acornjs/acorn-numeric-separator
+
+> Copyright (C) 2017-2018 by Adrian Heine
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
+
+---------------------------------------
+
 ## acorn-private-class-elements
 License: MIT
 By: Adrian Heine

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -78,6 +78,7 @@
     "acorn": "^7.3.1",
     "acorn-class-fields": "^0.3.6",
     "acorn-jsx": "^5.2.0",
+    "acorn-numeric-separator": "^0.3.2",
     "acorn-static-class-features": "^0.2.3",
     "acorn-walk": "^7.1.1",
     "buble": "^0.20.0",

diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts
@@ -1,4 +1,5 @@
 import injectClassFields from 'acorn-class-fields';
+import injectNumericSeparator from 'acorn-numeric-separator';
 import injectStaticClassFeatures from 'acorn-static-class-features';
 import {
 	ExternalOption,
@@ -115,6 +116,7 @@ const getAcorn = (config: GenericConfigObject): acorn.Options => ({
 const getAcornInjectPlugins = (config: GenericConfigObject): Function[] => [
 	injectClassFields,
 	injectStaticClassFeatures,
+	injectNumericSeparator,
 	...(ensureArray(config.acornInjectPlugins) as any)
 ];
 

diff --git a/test/form/samples/numeric_separators/_config.js b/test/form/samples/numeric_separators/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'supports numeric separators'
+};
diff --git a/test/form/samples/numeric_separators/_expected.js b/test/form/samples/numeric_separators/_expected.js
@@ -0,0 +1,3 @@
+const x = 123_456;
+
+export { x };
diff --git a/test/form/samples/numeric_separators/main.js b/test/form/samples/numeric_separators/main.js
@@ -0,0 +1 @@
+export const x = 123_456;
diff --git a/test/function/samples/options-hook/_config.js b/test/function/samples/options-hook/_config.js
@@ -15,7 +15,7 @@ module.exports = {
 						preserveParens: false,
 						sourceType: 'module'
 					},
-					acornInjectPlugins: [null, null],
+					acornInjectPlugins: [null, null, null],
 					context: 'undefined',
 					experimentalCacheExpiry: 10,
 					inlineDynamicImports: false,

diff --git a/typings/declarations.d.ts b/typings/declarations.d.ts
@@ -25,3 +25,8 @@ declare module 'acorn-export-ns-from' {
 	const plugin: (BaseParser: typeof acorn.Parser) => typeof acorn.Parser;
 	export default plugin;
 }
+
+declare module 'acorn-numeric-separator' {
+	const plugin: (BaseParser: typeof acorn.Parser) => typeof acorn.Parser;
+	export default plugin;
+}