Add module.exports to globalize.js and template.js.

tools/globalize.js

@@ -1,8 +1,7 @@
 var fs = require('fs');
 
-for (var arg of process.argv.slice(2)) {
+function getNames(part) {
-  var filename = `tmp/${arg}.js`;
+  var basename = part.split('_')[0]; // e.g. template_crx -> template
-  var basename = arg.split('_')[0]; // e.g. template_crx -> template
   var sources  = fs.readdirSync(`src/${basename}`);
 
   // Extract variables to be made global from source file list
@@ -13,9 +12,10 @@ for (var arg of process.argv.slice(2)) {
     var m = f.match(/^([$A-Z][$\w]*)\.coffee$/);
     if (m) names.push(m[1]);
   }
+  return names;
+}
 
-  var script = fs.readFileSync(filename, 'utf8').replace(/\r\n/g, '\n');
+function globalize(script, names) {
-
   var replaced = 0;
 
   script = script.replace(
@@ -26,15 +26,32 @@ for (var arg of process.argv.slice(2)) {
     function(declaration, v, n, e) {
       replaced++;
       var n0 = names.sort().join(', ');
-      if (n0 !== n) throw new Error(`${filename}: expected variables (${n0}) found (${n})`);
+      if (n0 !== n) throw new Error(`expected variables (${n0}) found (${n})`);
       return (e[0] === ',') ? v : '';
     }
 
   );
 
   if (replaced !== 1) {
-    throw new Error(`${filename}: no declaration found`);
+    throw new Error(`no declaration found`);
   }
 
-  fs.writeFileSync(filename, script);
+  return script;
+}
+
+module.exports = {
+  getNames: getNames,
+  globalize: globalize
+};
+
+if (require.main === module) {
+  (function() {
+    for (var part of process.argv.slice(2)) {
+      var filename = `tmp/${part}.js`;
+      var names = getNames(part);
+      var script = fs.readFileSync(filename, 'utf8').replace(/\r\n/g, '\n');
+      script = globalize(script, names);
+      fs.writeFileSync(filename, script);
+    }
+  })();
 }

tools/template.js

@@ -1,32 +1,32 @@
 var fs = require('fs');
-var template = require('lodash.template');
+var _template = require('lodash.template');
 var esprima = require('esprima');
 
 // disable ES6 delimiters
-var templateSettings = {interpolate: /<%=([\s\S]+?)%>/g};
+var _templateSettings = {interpolate: /<%=([\s\S]+?)%>/g};
 
-var obj = {};
+var tools = {};
 
-obj.require = {};
+tools.require = {};
 for (var m of ['style']) {
-  obj.require[m] = () => require(`./${m}`);
+  tools.require[m] = () => require(`./${m}`);
 }
 
-var read     = obj.read     = filename => fs.readFileSync(filename, 'utf8').replace(/\r\n/g, '\n');
+var read     = tools.read     = filename => fs.readFileSync(filename, 'utf8').replace(/\r\n/g, '\n');
-var readJSON = obj.readJSON = filename => JSON.parse(read(filename));
+var readJSON = tools.readJSON = filename => JSON.parse(read(filename));
-obj.readBase64              = filename => fs.readFileSync(filename).toString('base64');
+tools.readBase64              = filename => fs.readFileSync(filename).toString('base64');
 
 // Convert JSON object to Coffeescript expression (via embedded JS).
 var constExpression = data => '`' + JSON.stringify(data).replace(/`/g, '\\`') + '`';
 
-obj.multiline = function(text) {
+tools.multiline = function(text) {
   return text.replace(/\n+/g, '\n').split(/^/m).map(JSON.stringify).join(' +\n').replace(/`/g, '\\`');
 };
 
-obj.importHTML = function(filename) {
+tools.importHTML = function(filename) {
   var text = read(`src/${filename}.html`).replace(/^ +/gm, '').replace(/\r?\n/g, '');
-  text = template(text, templateSettings)(pkg); // variables only; no recursive imports
+  text = _template(text, _templateSettings)(pkg); // variables only; no recursive imports
-  return obj.html(text);
+  return tools.html(text);
 };
 
 function TextStream(text) {
@@ -164,7 +164,7 @@ Placeholder.prototype.build = function() {
 
 // HTML template generator with placeholders of forms ${}, &{}, @{}, and ?{}{}{} (see Placeholder.prototype.build)
 // that checks safety of generated expressions at compile time.
-obj.html = function(template) {
+tools.html = function(template) {
   var stream = new TextStream(template);
   var output = parseHTMLTemplate(stream);
   if (stream.text) {
@@ -173,7 +173,7 @@ obj.html = function(template) {
   return `(innerHTML: ${output})`;
 };
 
-obj.assert = function(flagFile, statement) {
+tools.assert = function(flagFile, statement) {
   if (!readJSON(flagFile)) return '';
   return `throw new Error 'Assertion failed: ' + ${constExpression(statement)} unless ${statement}`;
 };
@@ -181,16 +181,29 @@ obj.assert = function(flagFile, statement) {
 // Import variables from package.json.
 var pkg = readJSON('package.json');
 
-// Take variables from command line.
+function interpolate(text, data) {
-for (var i = 4; i < process.argv.length; i++) {
+  var context = {}, key;
-  var m = process.argv[i].match(/(.*?)=(.*)/);
+  for (key in tools) context[key] = tools[key];
-  pkg[m[1]] = m[2];
+  for (key in pkg) context[key] = pkg[key];
+  if (data) {
+    for (key in data) context[key] = data[key];
+  }
+  return _template(text, _templateSettings)(context);
 }
 
-for (var key in pkg) {
+module.exports = interpolate;
-  obj[key] = pkg[key];
-}
 
-var text = read(process.argv[2]);
+if (require.main === module) {
-text = template(text, templateSettings)(obj);
+  (function() {
-fs.writeFileSync(process.argv[3], text);
+    // Take variables from command line.
+    var data = {};
+    for (var i = 4; i < process.argv.length; i++) {
+      var m = process.argv[i].match(/(.*?)=(.*)/);
+      data[m[1]] = m[2];
+    }
+
+    var text = read(process.argv[2]);
+    text = interpolate(text, data);
+    fs.writeFileSync(process.argv[3], text);
+  })();
+}