Use dataToEsm in plugin

rollup · May 11, 2018 · fb60b3e · fb60b3e
1 parent 70856b5
commit fb60b3e
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 33 deletions.
diff --git a/src/index.js b/src/index.js
@@ -1,9 +1,8 @@
-import {createFilter, makeLegalIdentifier} from 'rollup-pluginutils';
+import {createFilter, dataToEsm} from 'rollup-pluginutils';
 
 export default function json(options = {}) {
 	const filter = createFilter(options.include, options.exclude);
 	const indent = 'indent' in options ? options.indent : '\t';
-	const declarationType = options.preferConst ? 'const' : 'var';
 
 	return {
 		name: 'json',
@@ -17,19 +16,8 @@ export default function json(options = {}) {
 				return {code: `export default ${json};\n`, map: {mappings: ''}};
 			}
 
-			let namedExportCode = '';
-			const defaultExportRows = [];
-			Object.keys(data).forEach(key => {
-				if (key === makeLegalIdentifier(key)) {
-					defaultExportRows.push(`${key}: ${key}`);
-					namedExportCode += `export ${declarationType} ${key} = ${JSON.stringify(data[key])};\n`;
-				} else {
-					defaultExportRows.push(`"${key}": ${JSON.stringify(data[key])}`);
-				}
-			});
-
 			return {
-				code: namedExportCode + `export default {\n${indent}${defaultExportRows.join(`,\n${indent}`)}\n};\n`,
+				code: dataToEsm(data, {preferConst: options.preferConst, indent}),
 				map: {mappings: ''}
 			};
 		}

diff --git a/test/samples/form/customIndent.js b/test/samples/form/customIndent.js
@@ -1,6 +1,7 @@
 export var validKey = true;
-export var nested = {"subKey":"ok"};
-export var array = [1,"2"];
+export var nested = { subKey:"ok" };
+export var array = [ 1,
+  "2" ];
 export default {
   validKey: validKey,
   "invalid-key": 1,

diff --git a/test/samples/form/default.js b/test/samples/form/default.js
@@ -1,6 +1,7 @@
 export var validKey = true;
-export var nested = {"subKey":"ok"};
-export var array = [1,"2"];
+export var nested = {subKey:"ok" };
+export var array = [1,
+	"2" ];
 export default {
 	validKey: validKey,
 	"invalid-key": 1,

diff --git a/test/samples/form/preferConst.js b/test/samples/form/preferConst.js
@@ -1,6 +1,7 @@
 export const validKey = true;
-export const nested = {"subKey":"ok"};
-export const array = [1,"2"];
+export const nested = {subKey:"ok" };
+export const array = [1,
+	"2" ];
 export default {
 	validKey: validKey,
 	"invalid-key": 1,

diff --git a/test/test.js b/test/test.js
@@ -16,8 +16,8 @@ describe('rollup-plugin-json', () => {
 				plugins: [json()]
 			})
 			.then(bundle => bundle.generate({ format: 'cjs' }))
-			.then(({code}) => {
-				const fn = new Function('assert', code);
+			.then(generated => {
+				const fn = new Function('assert', generated.code);
 				fn(assert);
 			});
 	});
@@ -29,8 +29,8 @@ describe('rollup-plugin-json', () => {
 				plugins: [json()]
 			})
 			.then(bundle => bundle.generate({ format: 'cjs' }))
-			.then(({code}) => {
-				const fn = new Function('assert', code);
+			.then(generated => {
+				const fn = new Function('assert', generated.code);
 				fn(assert);
 			});
 	});
@@ -42,8 +42,8 @@ describe('rollup-plugin-json', () => {
 				plugins: [json()]
 			})
 			.then(bundle => bundle.generate({ format: 'cjs' }))
-			.then(({code}) => {
-				const fn = new Function('assert', code);
+			.then(generated => {
+				const fn = new Function('assert', generated.code);
 				fn(assert);
 			});
 	});
@@ -55,14 +55,14 @@ describe('rollup-plugin-json', () => {
 				plugins: [json()]
 			})
 			.then(bundle => bundle.generate({ format: 'cjs' }))
-			.then(({code}) => {
+			.then(generated => {
 				const exports = {};
-				const fn = new Function('exports', code);
+				const fn = new Function('exports', generated.code);
 				fn(exports);
 
 				assert.equal(exports.version, '1.33.7');
 				assert.equal(
-					code.indexOf('this-should-be-excluded'),
+					generated.code.indexOf('this-should-be-excluded'),
 					-1,
 					'should exclude unused properties'
 				);
@@ -76,8 +76,8 @@ describe('rollup-plugin-json', () => {
 				plugins: [resolve({ extensions: ['.js', '.json'] }), json()]
 			})
 			.then(bundle => bundle.generate({ format: 'cjs' }))
-			.then(({code}) => {
-				const fn = new Function('assert', code);
+			.then(generated => {
+				const fn = new Function('assert', generated.code);
 				fn(assert);
 			});
 	});
@@ -89,8 +89,8 @@ describe('rollup-plugin-json', () => {
 				plugins: [json()]
 			})
 			.then(bundle => bundle.generate({ format: 'cjs' }))
-			.then(({code}) => {
-				const fn = new Function('assert', code);
+			.then(generated => {
+				const fn = new Function('assert', generated.code);
 				fn(assert);
 			});
 	});