Merge branch 'feature/resource-query'

Merges #10

Author: mcmath

README.md

@@ -40,6 +40,13 @@ module.exports = {
 };
 ```
 
+Data may also be passed through a resource query. These data take precedence
+over any options with the same name.
+
+```js
+import "./index.ejs?page=home";
+```
+
 ## Options
 
 All properties passed as loader options will be available to your

src/index.js

@@ -1,4 +1,4 @@
-import {getOptions} from 'loader-utils';
+import {getOptions, parseQuery} from 'loader-utils';
 import {addDependencies, saveDependencies} from './cache';
 import {render} from './render';
 
@@ -16,14 +16,22 @@ export default function ejsHtmlLoader(src) {
 }
 
 function renderTemplate(ctx, src) {
-  let data = getOptions(ctx);
+  let data = getData(ctx);
   let {rendered, deps} = render(ctx, src, data);
 
   saveDependencies(ctx, deps);
 
   return rendered;
 }
 
+function getData(ctx) {
+  return Object.assign({}, getOptions(ctx), getResourceQuery(ctx));
+}
+
+function getResourceQuery(ctx) {
+  return parseQuery(ctx.resourceQuery || "?");
+}
+
 function emitError(ctx, msg) {
   addDependencies(ctx);
   ctx.emitError(`ejs-html-loader\n${msg}`);

test/fixtures/resource-query.ejs

@@ -0,0 +1 @@
+<%- one %><%- two %><%- three %>

test/fixtures/resource-query.js

@@ -0,0 +1 @@
+require("./resource-query.ejs?one=abc&two=xyz");

test/index.coffee

@@ -31,6 +31,15 @@ describe 'ejs-html-loader', ->
                 entry: 'simple.js'
                 query: 'heading=togo'
 
+    context 'options passed through resource query', ->
+
+        it 'renders template', ->
+            compile /abcxyz123/,
+                entry: 'resource-query.js'
+                ejsHtml:
+                    two: '987'
+                    three: '123'
+
     context 'with include statement', ->
 
         it 'includes partial', ->