Collect dependency data from import declarations

package.json

@@ -6,7 +6,7 @@
   "repository": "https://github.com/ractivejs/rcu",
   "dependencies": {
     "eval2": "^0.3.0",
-    "tippex": "^1.1.0",
+    "tippex": "^1.2.0",
     "vlq": "^0.2.0"
   },
   "devDependencies": {

src/parse.js

@@ -1,9 +1,10 @@
-import { match } from 'tippex';
+import { match, replace } from 'tippex';
 import { Ractive } from './init.js';
 import getName from './getName.js';
 import getLinePosition from './utils/getLinePosition.js';
 
-const requirePattern = /require\s*\(\s*(?:"([^"]+)"|'([^']+)')\s*\)/g;
+const requirePattern = /\brequire\s*\(\s*[\'"]([^"\']+)["\']\s*\)/g;
+const importPattern = /\bimport\s+(?:.+\s+from\s+)?[\'"]([^"\']+)["\']/g; // https://gist.github.com/pilwon/ff55634a29bb4456e0dd
 const TEMPLATE_VERSION = 3;
 
 export default function parse ( source ) {
@@ -93,12 +94,16 @@ export default function parse ( source ) {
 		result.scriptStart = getLinePosition( lines, contentStart );
 		result.scriptEnd = getLinePosition( lines, contentEnd );
 
-		result.script = source.slice( contentStart, contentEnd );
+		const script = source.slice( contentStart, contentEnd );
 
-		match( result.script, requirePattern, ( match, doubleQuoted, singleQuoted ) => {
-			const source = doubleQuoted || singleQuoted;
+		result.script = replace( script, /export\s+default\s+/, () => 'component.exports = ' );
+
+		const addUniqueSource = ( match, source ) => {
 			if ( !~modules.indexOf( source ) ) modules.push( source );
-		});
+		};
+
+		match( result.script, requirePattern, addUniqueSource );
+		match( result.script, importPattern, addUniqueSource );
 	}
 
 	return result;

test/parse/input/withExportDefault.html

@@ -0,0 +1,9 @@
+<h1>Hello world!</h1>
+
+<script>
+	export default {
+		oninit: function () {
+			console.log( 'hello world' );
+		}
+	};
+</script>

test/parse/input/withImports.html

@@ -0,0 +1,6 @@
+<script>
+	import { foo } from 'foo';
+	import bar from 'bar';
+	import * as baz from 'baz';
+	import 'qux';
+</script>

test/parse/output/withExportDefault.json

@@ -0,0 +1,10 @@
+{
+	"source": "<h1>Hello world!</h1>\n\n<script>\n\texport default {\n\t\toninit: function () {\n\t\t\tconsole.log( 'hello world' );\n\t\t}\n\t};\n</script>\n",
+	"template": {"v":3,"t":[{"t":7,"e":"h1","f":["Hello world!"],"p":[1,1,0]}]},
+	"script": "\n\tcomponent.exports = {\n\t\toninit: function () {\n\t\t\tconsole.log( 'hello world' );\n\t\t}\n\t};\n",
+	"scriptStart": { "line": 2, "column": 8, "char": 31 },
+	"scriptEnd": { "line": 8, "column": 0, "char": 115 },
+	"css": "",
+	"imports": [],
+	"modules": []
+}

test/parse/output/withImports.json

@@ -0,0 +1,18 @@
+{
+	"source": "<script>\n\timport { foo } from 'foo';\n\timport bar from 'bar';\n\timport * as baz from 'baz';\n\timport 'qux';\n</script>\n",
+	"template": {"v":3,"t":[]},
+	"script": "\n\timport { foo } from 'foo';\n\timport bar from 'bar';\n\timport * as baz from 'baz';\n\timport 'qux';\n",
+	"css": "",
+	"imports": [],
+	"modules": [ "foo", "bar", "baz", "qux" ],
+	"scriptStart": {
+		"line": 0,
+		"column": 8,
+		"char": 8
+	},
+	"scriptEnd": {
+		"line": 5,
+		"column": 0,
+		"char": 105
+	}
+}