Merge branch '1.1.0RC1'

package.json

@@ -16,9 +16,10 @@
   "repository": "ericmorand/glslify-require",
   "license": "Apache-2.0",
   "dependencies": {
-    "browserify-transform-tools": "^1.7.0",
+    "event-emitter": "^0.3.4",
     "glslify": "^6.0.1",
-    "glslify-deps": "^1.3.0"
+    "glslify-deps": "^1.3.0",
+    "through2": "^2.0.3"
   },
   "devDependencies": {
     "browserify": "^14.1.0",

src/index.js

@@ -1,12 +1,16 @@
-let transform = require('./transform');
-let path = require('path');
+let glslify = require('glslify');
 
 module.exports = function (b, opts) {
   if (typeof b === 'string') {
     throw new Error('glslify-require appears to have been configured as a transform; it must be configured as a plugin.');
   }
 
-  b.transform(transform, {
-    b: b
+  let Glslyfier = require('./lib/glslyfier')(glslify);
+  let glslyfier = new Glslyfier(opts);
+
+  glslyfier.emitter.on('file', function(file) {
+    b.emit('file', file);
   });
+
+  b.transform(glslyfier.transform.bind(glslyfier));
 };

src/lib/glslyfier.js

@@ -0,0 +1,47 @@
+let through = require('through2');
+let glslifyDeps = require('glslify-deps');
+let path = require('path');
+
+module.exports = function(glslify) {
+  let Glslyfier = function() {
+    this.emitter = require('event-emitter')();
+  };
+
+  Glslyfier.prototype.transform = function(file) {
+    if (path.extname(file) == '.glsl') {
+      let emitter = this.emitter;
+      let src = null;
+
+      let transform = function (chunk, enc, cb) {
+        src = glslify.compile(chunk, {
+          basedir: path.dirname(file)
+        });
+
+        cb();
+      };
+
+      let flush = function (cb) {
+        let self = this;
+        let depper = glslifyDeps();
+
+        depper.add(file, function(err, deps) {
+          deps.forEach(function(dep) {
+            if (!dep.entry) {
+              emitter.emit('file', dep.file);
+            }
+          });
+
+          self.push('module.exports = ' + JSON.stringify(src) + ';');
+
+          cb();
+        });
+      };
+
+      return through(transform, flush);
+    }
+
+    return through();
+  };
+
+  return Glslyfier;
+};

test/fixtures/foo.glsl

@@ -1,9 +1,7 @@
-struct Foo {
-  vec3 bar;
-};
+#pragma glslify: bar = require(./sub/bar)
 
-struct Foo2 {
-  vec3 bar;
-};
+float foo() {
+  return bar;
+}
 
-#pragma glslify: export(Foo)
+#pragma glslify: export(foo)

test/fixtures/main.glsl

@@ -1,5 +1,5 @@
 #pragma glslify: foo = require(./foo)
 
 void main() {
-  bar = foo;
+  foobar = foo();
 }

test/fixtures/secondary.glsl

@@ -0,0 +1,2 @@
+void secondary() {
+}

test/fixtures/sub/bar.glsl

@@ -0,0 +1,3 @@
+float v = 5;
+
+#pragma glslify: export(v)

test/render.js → test/plugin.js

@@ -10,7 +10,7 @@ tap.test('plugin', function (test) {
   test.test('should render a valid bundle', function (t) {
     let browserify = new Browserify();
     let deps = [];
-    let file = path.resolve('test/render/index.js');
+    let file = path.resolve('test/plugin/index.js');
 
     browserify
       .add(file)
@@ -20,14 +20,16 @@ tap.test('plugin', function (test) {
       .plugin(plugin)
       .bundle(function (err, buf) {
         if (err) {
-          t.fail(err);
+          t.fail(err.message);
         }
         else {
-          t.equal(deps.length, 3);
+          t.equal(deps.length, 5);
 
           let wantedDeps = [
             path.resolve('test/fixtures/main.glsl'),
-            path.resolve('test/fixtures/foo.glsl')
+            path.resolve('test/fixtures/foo.glsl'),
+            path.resolve('test/fixtures/sub/bar.glsl'),
+            path.resolve('test/fixtures/secondary.glsl'),
           ];
 
           wantedDeps.forEach(function (wantedDep) {

test/plugin/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+  main: require('../fixtures/main.glsl'),
+  secondary: require('../fixtures/secondary.glsl')
+};

test/transform.js

@@ -1,29 +1,40 @@
 const fs = require('fs');
 const tap = require('tap');
 const path = require('path');
-const transformTools = require('browserify-transform-tools');
-
-const transform = require('../src/transform');
+const glslify = require('glslify');
+const through = require('through2');
 
 tap.test('transform', function (test) {
   test.plan(1);
 
+  let Glslyfier = require('../src/lib/glslyfier')(glslify);
+  let glslyfier = new Glslyfier();
+
+  let transform = glslyfier.transform.bind(glslyfier);
+
   test.test('should return a valid source', function (t) {
     let file = path.resolve('test/fixtures/main.glsl');
+    let data = null;
+
+    fs.createReadStream(file)
+      .pipe(transform(file))
+      .pipe(through(function(chunk, enc, cb) {
+        data = chunk.toString();
 
-    transformTools.runTransform(transform, file, {},
-      function (err, transformed) {
-        if (err) {
+        cb();
+      }))
+      .on('finish', function () {
+        fs.readFile(path.resolve('test/transform/wanted.js'), function(err, readData) {
+          t.same(data, readData.toString());
+
+          t.end();
+        });
+      })
+      .on('error', function (err) {
           t.fail(err);
-        }
-        else {
-          let wanted = fs.readFileSync(path.resolve('test/transform/wanted.js'));
 
-          t.same(transformed, wanted.toString());
+          t.end();
         }
-
-        t.end();
-      }
-    );
+      );
   });
 });